Commit 5ad23e18 authored by Rustam Lotsmanenko (EPAM)'s avatar Rustam Lotsmanenko (EPAM)
Browse files

Merge branch 'master' into partion-service-as-tenantinfo-provider

parents c9d09d14 eb83b900
Pipeline #42287 passed with stages
in 5 minutes and 9 seconds
......@@ -77,7 +77,7 @@ public final class SwaggerDoc {
public static final String SORT_NOT_VALID_ORDER_OPTION = "Not a valid order option. It can only be either 'ASC' or 'DESC'";
public static final String SORT_ORDER_VALIDATION_NOT_EMPTY_MSG = "'sort.order' can not be null or empty";
public static final String SORT_FIELD_ORDER_SIZE_NOT_MATCH = "'sort.field' and 'sort.order' size do not match";
public static final String LIMIT_DESCRIPTION = "The maximum number of results to return from the given offset. If no limit is provided, then it will return 10 items. Max number of items which can be fetched by the query is 100. (If you wish to fetch large set of items, please use query_with_cursor API)";
public static final String LIMIT_DESCRIPTION = "The maximum number of results to return from the given offset. If no limit is provided, then it will return 10 items. Max number of items which can be fetched by the query is 1000. (If you wish to fetch large set of items, please use query_with_cursor API)";
public static final String QUERY_DESCRIPTION = "The query string in Lucene query string syntax.";
public static final String SORT_DESCRIPTION = "The fields and orders to return sorted results.";
public static final String SORT_FIELD_DESCRIPTION = "The list of fields to sort the results.";
......
......@@ -16,6 +16,7 @@ package org.opengroup.osdu.core.common.legal;
import org.opengroup.osdu.core.common.model.legal.InvalidTagWithReason;
import org.opengroup.osdu.core.common.model.storage.Record;
import org.opengroup.osdu.core.common.model.storage.RecordIdWithVersion;
import org.opengroup.osdu.core.common.model.storage.RecordMetadata;
import java.util.List;
......@@ -27,7 +28,7 @@ public interface ILegalService {
void validateLegalTags(Set<String> legaltags);
void populateLegalInfoFromParents(List<Record> inputRecords, Map<String, RecordMetadata> existingRecordsMetadata,
Map<String, List<String>> recordParentMap);
Map<String, List<RecordIdWithVersion>> recordParentMap);
void validateOtherRelevantDataCountries(Set<String> ordc);
......
......@@ -45,7 +45,7 @@ public interface ILogger extends AutoCloseable {
default void debug(final String loggerName, final String logPrefix, final String message,
final Map<String, String> headers) {
this.info(logPrefix, message, headers);
this.debug(logPrefix, message, headers);
}
void warning(String logPrefix, String message, Map<String, String> headers);
......
package org.opengroup.osdu.core.common.model.storage;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class RecordIdWithVersion {
private String recordId;
private Long recordVersion;
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment