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=df91cca3e4a54af48f20c1e96fbb6a0dd12cbe48;hb=f637a36c9df966c341727910e30241b63cc49c06;hp=09ef76bc153bc37858143dbfdc45abd596a98a63;hpb=15af66b115f3e8046b2d0f2634fb77b3d835f730;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 09ef76b..df91cca 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
@@ -1,4 +1,4 @@
-/**
+/**
  * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
@@ -20,8 +20,6 @@
  */
 package org.onap.aai.sa.searchdbabstraction.util;
 
-import com.fasterxml.jackson.core.JsonParseException;
-import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import java.io.File;
 import java.io.FileInputStream;
@@ -34,12 +32,14 @@ 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 JsonParseException, JsonMappingException, IOException {
+    public static String generateDocumentMappings(String documentSchema) throws IOException {
 
         // Unmarshal the json content into a document schema object.
         ObjectMapper mapper = new ObjectMapper();
@@ -103,10 +103,8 @@ public class DocumentSchemaUtil {
         sb.append("\"type\": \"").append(fieldSchema.getDataType()).append("\"");
 
         // For date type fields we may optionally supply a format specifier.
-        if (fieldSchema.getDataType().equals("date")) {
-            if (fieldSchema.getFormat() != null) {
-                sb.append(", \"format\": \"").append(fieldSchema.getFormat()).append("\"");
-            }
+        if (fieldSchema.getDataType().equals("date") && fieldSchema.getFormat() != null) {
+            sb.append(", \"format\": \"").append(fieldSchema.getFormat()).append("\"");
         }
 
         // If the index field was specified, then append it.