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
Lib
core
OS Core Common
Commits
3f3a4452
Commit
3f3a4452
authored
Feb 02, 2021
by
Matt Wise
Browse files
bugfixes for StorageService GetRecords endpoint
parent
7be78485
Pipeline
#24432
passed with stages
in 6 minutes and 20 seconds
Changes
3
Pipelines
3
Hide whitespace changes
Inline
Side-by-side
src/main/java/org/opengroup/osdu/core/common/model/storage/MultiRecordInfo.java
View file @
3f3a4452
...
@@ -16,9 +16,12 @@ package org.opengroup.osdu.core.common.model.storage;
...
@@ -16,9 +16,12 @@ package org.opengroup.osdu.core.common.model.storage;
import
java.util.List
;
import
java.util.List
;
import
com.fasterxml.jackson.annotation.JsonIgnoreProperties
;
import
lombok.Data
;
import
lombok.Data
;
@Data
@Data
@JsonIgnoreProperties
(
ignoreUnknown
=
true
)
public
class
MultiRecordInfo
{
public
class
MultiRecordInfo
{
private
List
<
Record
>
records
;
private
List
<
Record
>
records
;
private
List
<
String
>
invalidRecords
;
private
List
<
String
>
invalidRecords
;
...
...
src/main/java/org/opengroup/osdu/core/common/model/storage/Record.java
View file @
3f3a4452
...
@@ -23,6 +23,8 @@ import javax.validation.Valid;
...
@@ -23,6 +23,8 @@ import javax.validation.Valid;
import
javax.validation.constraints.NotEmpty
;
import
javax.validation.constraints.NotEmpty
;
import
javax.validation.constraints.NotNull
;
import
javax.validation.constraints.NotNull
;
import
javax.validation.constraints.Pattern
;
import
javax.validation.constraints.Pattern
;
import
com.fasterxml.jackson.annotation.JsonIgnoreProperties
;
import
com.fasterxml.jackson.annotation.JsonInclude
;
import
com.fasterxml.jackson.annotation.JsonInclude
;
import
com.fasterxml.jackson.annotation.JsonInclude.Include
;
import
com.fasterxml.jackson.annotation.JsonInclude.Include
;
...
@@ -44,6 +46,7 @@ import lombok.NoArgsConstructor;
...
@@ -44,6 +46,7 @@ import lombok.NoArgsConstructor;
@AllArgsConstructor
@AllArgsConstructor
@NoArgsConstructor
@NoArgsConstructor
@ValidLegal
@ValidLegal
@JsonIgnoreProperties
(
ignoreUnknown
=
true
)
public
class
Record
{
public
class
Record
{
private
static
final
String
DATALAKE_RECORD_PREFIX
=
"doc"
;
private
static
final
String
DATALAKE_RECORD_PREFIX
=
"doc"
;
...
...
src/main/java/org/opengroup/osdu/core/common/storage/StorageService.java
View file @
3f3a4452
...
@@ -22,6 +22,7 @@ import org.opengroup.osdu.core.common.http.json.HttpResponseBodyParsingException
...
@@ -22,6 +22,7 @@ import org.opengroup.osdu.core.common.http.json.HttpResponseBodyParsingException
import
org.opengroup.osdu.core.common.model.http.DpsHeaders
;
import
org.opengroup.osdu.core.common.model.http.DpsHeaders
;
import
org.opengroup.osdu.core.common.model.storage.*
;
import
org.opengroup.osdu.core.common.model.storage.*
;
import
java.util.ArrayList
;
import
java.util.Collection
;
import
java.util.Collection
;
import
org.opengroup.osdu.core.common.util.UrlNormalizationUtil
;
import
org.opengroup.osdu.core.common.util.UrlNormalizationUtil
;
...
@@ -71,6 +72,7 @@ public class StorageService implements IStorageService {
...
@@ -71,6 +72,7 @@ public class StorageService implements IStorageService {
@Override
@Override
public
MultiRecordInfo
getRecords
(
Collection
<
String
>
ids
)
throws
StorageException
{
public
MultiRecordInfo
getRecords
(
Collection
<
String
>
ids
)
throws
StorageException
{
MultiRecordIds
input
=
new
MultiRecordIds
();
MultiRecordIds
input
=
new
MultiRecordIds
();
input
.
setRecords
(
new
ArrayList
<
String
>());
input
.
getRecords
().
addAll
(
ids
);
input
.
getRecords
().
addAll
(
ids
);
String
url
=
this
.
createUrl
(
"/query/records"
);
String
url
=
this
.
createUrl
(
"/query/records"
);
HttpResponse
result
=
this
.
httpClient
.
send
(
HttpResponse
result
=
this
.
httpClient
.
send
(
...
...
Write
Preview
Markdown
is supported
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