Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Open Subsurface Data Universe Software
Platform
System
Search
Commits
51ba7512
Commit
51ba7512
authored
Sep 18, 2020
by
neelesh thakur
Browse files
rollback whitespace changes
parent
5f4ee1f7
Pipeline
#9234
failed
Changes
3
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
provider/search-azure/src/main/java/org/opengroup/osdu/search/provider/azure/provider/impl/CrossTenantInfoServiceImpl.java
View file @
51ba7512
...
@@ -44,11 +44,11 @@ public class CrossTenantInfoServiceImpl implements ITenantInfoService, ICrossTen
...
@@ -44,11 +44,11 @@ public class CrossTenantInfoServiceImpl implements ITenantInfoService, ICrossTen
return
tenantInfo
;
return
tenantInfo
;
}
}
public
String
getPartitionId
()
{
public
String
getPartitionId
(){
return
dpsHeaders
.
getPartitionId
();
return
dpsHeaders
.
getPartitionId
();
}
}
public
TenantInfo
getTenantInfo
(
String
accountId
)
{
public
TenantInfo
getTenantInfo
(
String
accountId
){
return
tenantFactory
.
getTenantInfo
(
accountId
);
return
tenantFactory
.
getTenantInfo
(
accountId
);
}
}
...
@@ -64,4 +64,5 @@ public class CrossTenantInfoServiceImpl implements ITenantInfoService, ICrossTen
...
@@ -64,4 +64,5 @@ public class CrossTenantInfoServiceImpl implements ITenantInfoService, ICrossTen
}
}
return
tenantInfos
;
return
tenantInfos
;
}
}
}
}
provider/search-azure/src/main/java/org/opengroup/osdu/search/provider/azure/provider/impl/ScrollQueryServiceImpl.java
View file @
51ba7512
...
@@ -89,6 +89,7 @@ public class ScrollQueryServiceImpl extends QueryBase implements IScrollQuerySer
...
@@ -89,6 +89,7 @@ public class ScrollQueryServiceImpl extends QueryBase implements IScrollQuerySer
if
(
results
!=
null
)
{
if
(
results
!=
null
)
{
queryResponse
.
setResults
(
results
);
queryResponse
.
setResults
(
results
);
queryResponse
.
setCursor
(
this
.
refreshCursorCache
(
searchScrollResponse
.
getScrollId
(),
dpsHeaders
.
getUserEmail
()));
queryResponse
.
setCursor
(
this
.
refreshCursorCache
(
searchScrollResponse
.
getScrollId
(),
dpsHeaders
.
getUserEmail
()));
this
.
querySuccessAuditLogger
(
searchRequest
);
this
.
querySuccessAuditLogger
(
searchRequest
);
}
}
}
else
{
}
else
{
...
@@ -163,5 +164,4 @@ public class ScrollQueryServiceImpl extends QueryBase implements IScrollQuerySer
...
@@ -163,5 +164,4 @@ public class ScrollQueryServiceImpl extends QueryBase implements IScrollQuerySer
void
queryFailedAuditLogger
(
Query
request
)
{
void
queryFailedAuditLogger
(
Query
request
)
{
this
.
auditLogger
.
queryIndexWithCursorFailed
(
Lists
.
newArrayList
(
request
.
toString
()));
this
.
auditLogger
.
queryIndexWithCursorFailed
(
Lists
.
newArrayList
(
request
.
toString
()));
}
}
}
}
search-core/src/test/java/org/opengroup/osdu/search/smart/models/AttributesTest.java
View file @
51ba7512
...
@@ -109,7 +109,6 @@ public class AttributesTest {
...
@@ -109,7 +109,6 @@ public class AttributesTest {
attribute
.
setName
(
"Operataor"
);
attribute
.
setName
(
"Operataor"
);
attribute
.
setSchemaMapping
(
schemaMapping
);
attribute
.
setSchemaMapping
(
schemaMapping
);
ls
.
add
(
attribute
);
ls
.
add
(
attribute
);
when
(
dpsHeaders
.
getPartitionId
()).
thenReturn
(
"tenant1"
);
when
(
dpsHeaders
.
getPartitionId
()).
thenReturn
(
"tenant1"
);
when
(
elasticClientHandler
.
createRestClient
()).
thenReturn
(
restHighLevelClient
);
when
(
elasticClientHandler
.
createRestClient
()).
thenReturn
(
restHighLevelClient
);
doReturn
(
this
.
indicesClient
).
when
(
this
.
restHighLevelClient
).
indices
();
doReturn
(
this
.
indicesClient
).
when
(
this
.
restHighLevelClient
).
indices
();
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment