X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Fsa%2Fsearchdbabstraction%2Futil%2FDocumentSchemaUtil.java;h=1627ae28496309374a5f519d05343396bea54ddb;hb=ecd35f117eb0118f9cbd96fe132a1c359214bfc7;hp=df91cca3e4a54af48f20c1e96fbb6a0dd12cbe48;hpb=f637a36c9df966c341727910e30241b63cc49c06;p=aai%2Fsearch-data-service.git diff --git a/src/main/java/org/onap/aai/sa/searchdbabstraction/util/DocumentSchemaUtil.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/util/DocumentSchemaUtil.java index df91cca..1627ae2 100644 --- a/src/main/java/org/onap/aai/sa/searchdbabstraction/util/DocumentSchemaUtil.java +++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/util/DocumentSchemaUtil.java @@ -32,24 +32,21 @@ import org.onap.aai.sa.rest.DocumentSchema; public class DocumentSchemaUtil { - private DocumentSchemaUtil() { // Do not instantiate - } - private static String dynamicCustomMapping = null; private static final String DYNAMIC_CUSTOM_TEMPALTE_FILE = System.getProperty("CONFIG_HOME") + File.separator + "dynamic-custom-template.json"; - public static String generateDocumentMappings(String documentSchema) throws IOException { + private DocumentSchemaUtil() { // Do not instantiate + } + public static String generateDocumentMappings(String documentSchema) throws IOException { // Unmarshal the json content into a document schema object. ObjectMapper mapper = new ObjectMapper(); DocumentSchema schema = mapper.readValue(documentSchema, DocumentSchema.class); - return generateDocumentMappings(schema); } public static String generateDocumentMappings(DocumentSchema schema) throws IOException { - // Adding dynamic template to add fielddata=true to dynamic fields of type "string" // in order to avoid aggregation queries breaking in ESv6.1.2 if (dynamicCustomMapping == null) {