diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/PropertiesProcessor.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/PropertiesProcessor.java
index 643d5304584773d855ced3964f2d7f27855ca284..d10e294c0a11aa4386fecf128af5e63454dd9d9d 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/PropertiesProcessor.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/PropertiesProcessor.java
@@ -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);
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/SchemaToStorageFormatImpl.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/SchemaToStorageFormatImpl.java
index 155b8bf385046281d69bcc2a2be1ed7845608b47..4a64861aeb36b3b46250f40968e42f0776a7314d 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/SchemaToStorageFormatImpl.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/SchemaToStorageFormatImpl.java
@@ -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) {
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/tags/AllOfItem.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/tags/AllOfItem.java
index 8305d2604a366f7a76b17466f7ef2f2e4f214be3..1466dda05ac7a5149fb38baf5acd25e5596b1c1e 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/tags/AllOfItem.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/tags/AllOfItem.java
@@ -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
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/tags/Definition.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/tags/Definition.java
index bf4e0f00b89f1344ecd66dc9f07683067dc6d0f2..fa53e5ebaac9d9253a75efc554bfc4e43dfaeffc 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/tags/Definition.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/tags/Definition.java
@@ -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;
 }
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/tags/Definitions.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/tags/Definitions.java
index 25c019c0a2bb263b00449f2caab199412046e2c5..89b7cacea8b2ee3bff079d26b8a2fa29f662304e 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/tags/Definitions.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/tags/Definitions.java
@@ -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);
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/tags/Items.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/tags/Items.java
index 7316987882f20fe2beaa5aebc1b6d682421f6d59..4241bb69e647ff6fff917f6091a2657865ad4c75 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/tags/Items.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/tags/Items.java
@@ -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;
 }
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/tags/Properties.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/tags/Properties.java
index f50c1f0dad50e18cd121b5a2d2a79ebb73ea8e15..e684a8770a1c990910541435291cbd1f25778348 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/tags/Properties.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/tags/Properties.java
@@ -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;
 }
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/tags/PropertiesData.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/tags/PropertiesData.java
index d970bdc72fcf6ba2ef6de783d7d1235a0236e0a0..11447ea19e02d61e0c6a495f21cd418a48dba14f 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/tags/PropertiesData.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/tags/PropertiesData.java
@@ -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;
 }
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/tags/SchemaRoot.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/tags/SchemaRoot.java
index a06d82efc36ef560619ef37a7618a405a0f7b6b7..94a98f553c583c56d537fe9ac99f31d5bb643a08 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/tags/SchemaRoot.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/tags/SchemaRoot.java
@@ -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;
 }
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/tags/TypeProperty.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/tags/TypeProperty.java
index 284d00a63c5215717f64deb52d6a2a6eadf8da29..cce411073645decea4a3074d397ed4bedcea0369 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/tags/TypeProperty.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/tags/TypeProperty.java
@@ -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;
 }
diff --git a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/di/IndexSchemaServiceOverrideImpl.java b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/di/IndexSchemaServiceOverrideImpl.java
index 82a9a05841b69d7907a9e4b3f39320f1853d09b2..63bac143a1b1c616c723b3780e8974e5e101310e 100644
--- a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/di/IndexSchemaServiceOverrideImpl.java
+++ b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/di/IndexSchemaServiceOverrideImpl.java
@@ -1,7 +1,5 @@
 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) {