Skip to content
Snippets Groups Projects
Commit 773e3e14 authored by Sviatoslav Nekhaienko's avatar Sviatoslav Nekhaienko
Browse files

get rid of FieldDefaults

parent fd15a826
No related branches found
No related tags found
1 merge request!60Indexer to read from Schema Service as well as Storage Schema
Pipeline #18293 failed
Stage: .pre
Stage: review
Hide whitespace changes
Inline Side-by-side
Showing
with 32 additions and 64 deletions
indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/PropertiesProcessor.java
+ 8
− 11
View file @ 773e3e14
......@@ -14,8 +14,6 @@
package org.opengroup.osdu.indexer.schema.converter;
import lombok.AccessLevel;
import lombok.experimental.FieldDefaults;
import lombok.extern.java.Log;
import org.apache.http.HttpStatus;
import org.opengroup.osdu.core.common.model.http.AppException;
......@@ -28,25 +26,24 @@ import org.opengroup.osdu.indexer.schema.converter.tags.TypeProperty;
import java.util.*;
import java.util.stream.Stream;
@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
@Log
class PropertiesProcessor {
static String DEF_PREFIX = "#/definitions/";
private static final String DEF_PREFIX = "#/definitions/";
static Set<String> SKIP_DEFINITIONS = new HashSet<>(
private static final Set<String> SKIP_DEFINITIONS = new HashSet<>(
Arrays.asList("AbstractAnyCrsFeatureCollection.1.0.0",
"anyCrsGeoJsonFeatureCollection"));
static Set<String> ARRAY_SUPPORTED_SIMPLE_TYPES = new HashSet<>(
private static final Set<String> ARRAY_SUPPORTED_SIMPLE_TYPES = new HashSet<>(
Arrays.asList("boolean", "integer", "number", "string"));
static Map<String, String> SPEC_DEFINITION_TYPES = new HashMap<String, String>() {{
private static final Map<String, String> SPEC_DEFINITION_TYPES = new HashMap<String, String>() {{
put("AbstractFeatureCollection.1.0.0", "core:dl:geoshape:1.0.0");
put("core_dl_geopoint", "core:dl:geopoint:1.0.0");
put("geoJsonFeatureCollection", "core:dl:geoshape:1.0.0");
}};
static Map<String, String> PRIMITIVE_TYPES_MAP = new HashMap<String, String>() {{
private static final Map<String, String> PRIMITIVE_TYPES_MAP = new HashMap<String, String>() {{
put("boolean", "bool");
put("number", "double");
put("date-time", "datetime");
......@@ -57,9 +54,9 @@ class PropertiesProcessor {
put("int64", "long");
}};
Definitions definitions;
String pathPrefix;
String pathPrefixWithDot;
private final Definitions definitions;
private final String pathPrefix;
private final String pathPrefixWithDot;
public PropertiesProcessor(Definitions definitions) {
this(definitions, null);
......
indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/SchemaToStorageFormatImpl.java
+ 3
− 5
View file @ 773e3e14
......@@ -16,14 +16,13 @@ package org.opengroup.osdu.indexer.schema.converter;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.AccessLevel;
import lombok.experimental.FieldDefaults;
import lombok.extern.java.Log;
import org.apache.http.HttpStatus;
import org.opengroup.osdu.core.common.model.http.AppException;
import org.opengroup.osdu.core.common.search.Preconditions;
import org.opengroup.osdu.indexer.schema.converter.interfaces.SchemaToStorageFormat;
import org.opengroup.osdu.indexer.schema.converter.tags.*;
import org.opengroup.osdu.indexer.schema.converter.tags.PropertiesData;
import org.opengroup.osdu.indexer.schema.converter.tags.SchemaRoot;
import org.springframework.stereotype.Component;
import javax.inject.Inject;
......@@ -34,11 +33,10 @@ import java.util.stream.Collectors;
* Converts schema from Schema Service format to Storage Service format
*/
@Component
@FieldDefaults(makeFinal=true, level= AccessLevel.PRIVATE)
@Log
public class SchemaToStorageFormatImpl implements SchemaToStorageFormat {
ObjectMapper objectMapper;
private ObjectMapper objectMapper;
@Inject
public SchemaToStorageFormatImpl(ObjectMapper objectMapper) {
......
indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/tags/AllOfItem.java
+ 3
− 6
View file @ 773e3e14
......@@ -15,17 +15,14 @@
package org.opengroup.osdu.indexer.schema.converter.tags;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.AccessLevel;
import lombok.Data;
import lombok.experimental.FieldDefaults;
import java.util.Map;
@Data
@FieldDefaults(level= AccessLevel.PRIVATE)
public class AllOfItem {
@JsonProperty("$ref")
String ref;
String type;
Map<String, TypeProperty> properties;
private String ref;
private String type;
private Map<String, TypeProperty> properties;
}
\ No newline at end of file
indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/tags/Definition.java
+ 2
− 5
View file @ 773e3e14
......@@ -14,15 +14,12 @@
package org.opengroup.osdu.indexer.schema.converter.tags;
import lombok.AccessLevel;
import lombok.Data;
import lombok.experimental.FieldDefaults;
import java.util.Map;
@Data
@FieldDefaults(level= AccessLevel.PRIVATE)
public class Definition {
String type;
Map<String, TypeProperty> properties;
private String type;
private Map<String, TypeProperty> properties;
}
indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/tags/Definitions.java
+ 1
− 4
View file @ 773e3e14
......@@ -16,15 +16,12 @@ package org.opengroup.osdu.indexer.schema.converter.tags;
import com.fasterxml.jackson.annotation.JsonAnyGetter;
import com.fasterxml.jackson.annotation.JsonAnySetter;
import lombok.AccessLevel;
import lombok.experimental.FieldDefaults;
import java.util.HashMap;
import java.util.Map;
@FieldDefaults(level= AccessLevel.PRIVATE)
public class Definitions {
Map<String, Definition> items = new HashMap<>();
private Map<String, Definition> items = new HashMap<>();
public Definition getDefinition(String name) {
return items.get(name);
......
indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/tags/Items.java
+ 2
− 5
View file @ 773e3e14
......@@ -14,13 +14,10 @@
package org.opengroup.osdu.indexer.schema.converter.tags;
import lombok.AccessLevel;
import lombok.Data;
import lombok.experimental.FieldDefaults;
@Data
@FieldDefaults(level= AccessLevel.PRIVATE)
public class Items {
String type;
String pattern;
private String type;
private String pattern;
}
indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/tags/Properties.java
+ 2
− 5
View file @ 773e3e14
......@@ -15,14 +15,11 @@
package org.opengroup.osdu.indexer.schema.converter.tags;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.AccessLevel;
import lombok.Data;
import lombok.experimental.FieldDefaults;
@Data
@FieldDefaults(level= AccessLevel.PRIVATE)
public class Properties {
PropertiesData data;
private PropertiesData data;
@JsonProperty("$ref")
String ref;
private String ref;
}
indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/tags/PropertiesData.java
+ 2
− 5
View file @ 773e3e14
......@@ -15,16 +15,13 @@
package org.opengroup.osdu.indexer.schema.converter.tags;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.AccessLevel;
import lombok.Data;
import lombok.experimental.FieldDefaults;
import java.util.List;
@Data
@FieldDefaults(level= AccessLevel.PRIVATE)
public class PropertiesData {
List<AllOfItem> allOf;
private List<AllOfItem> allOf;
@JsonProperty("$ref")
String ref;
private String ref;
}
indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/tags/SchemaRoot.java
+ 2
− 5
View file @ 773e3e14
......@@ -14,13 +14,10 @@
package org.opengroup.osdu.indexer.schema.converter.tags;
import lombok.AccessLevel;
import lombok.Data;
import lombok.experimental.FieldDefaults;
@Data
@FieldDefaults(level= AccessLevel.PRIVATE)
public class SchemaRoot {
Definitions definitions;
Properties properties;
private Definitions definitions;
private Properties properties;
}
indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/tags/TypeProperty.java
+ 6
− 9
View file @ 773e3e14
......@@ -15,20 +15,17 @@
package org.opengroup.osdu.indexer.schema.converter.tags;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.AccessLevel;
import lombok.Data;
import lombok.experimental.FieldDefaults;
import java.util.Map;
@Data
@FieldDefaults(level= AccessLevel.PRIVATE)
public class TypeProperty {
String type;
String pattern;
String format;
private String type;
private String pattern;
private String format;
@JsonProperty("$ref")
String ref;
Items items;
Map<String, TypeProperty> properties;
private String ref;
private Items items;
private Map<String, TypeProperty> properties;
}
provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/di/IndexSchemaServiceOverrideImpl.java
+ 1
− 4
View file @ 773e3e14
package org.opengroup.osdu.indexer.azure.di;
import lombok.AccessLevel;
import lombok.experimental.FieldDefaults;
import org.opengroup.osdu.indexer.service.IndexSchemaServiceImpl;
import org.opengroup.osdu.indexer.service.SchemaService;
import org.springframework.context.annotation.Primary;
......@@ -11,12 +9,11 @@ import javax.inject.Inject;
import java.io.UnsupportedEncodingException;
import java.net.URISyntaxException;
@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
@Primary
@Service
public class IndexSchemaServiceOverrideImpl extends IndexSchemaServiceImpl {
private SchemaService schemaService;
private final SchemaService schemaService;
@Inject
public IndexSchemaServiceOverrideImpl(SchemaService schemaService) {
......
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