o. Updated table validation of non-primary key column to check only kv_json_

o. Updated related tests

Author: Akshay-Sundarraj

src/main/java/com/oracle/nosql/spring/data/core/NosqlTemplateBase.java

@@ -267,19 +267,13 @@ protected boolean doCheckExistingTable(NosqlEntityInformation<?, ?> entityInform
             String tableNonShards = "{" + tableNonShardMap.entrySet()
                     .stream().map(e -> e.getKey() + " " + e.getValue()).
                     collect(Collectors.joining(",")) + "}";
-            String tableOthers = "{" + tableOthersMap.entrySet().stream()
-                    .map(e -> e.getKey() + " " + e.getValue()).
-                    collect(Collectors.joining(",")) + "}";
 
             String entityShards = "{" + entityShardMap.entrySet().stream()
                     .map(e -> e.getKey() + " " + e.getValue()).
                     collect(Collectors.joining(",")) + "}";
             String entityNonShards = "{" + entityNonShardMap.entrySet()
                     .stream().map(e -> e.getKey() + " " + e.getValue()).
                     collect(Collectors.joining(",")) + "}";
-            String entityOthers = "{" + entityOthersMap.entrySet().stream()
-                    .map(e -> e.getKey() + " " + e.getValue()).
-                    collect(Collectors.joining(",")) + "}";
 
             String msg;
             // check shard keys and types match
@@ -297,11 +291,15 @@ protected boolean doCheckExistingTable(NosqlEntityInformation<?, ?> entityInform
                 errors.add(msg);
             }
 
-            // check non-primary keys and types match
-            if (!tableOthers.equals(entityOthers)) {
-                msg = String.format("Non-primary key columns mismatch:" +
-                                "table=%s, entity=%s.", tableOthers,
-                        entityOthers);
+            // check kv_json_ column exist and it's type is JSON
+            if (!tableOthersMap.containsKey(JSON_COLUMN.toLowerCase())) {
+                msg = String.format("'%s' column does not exist in the table",
+                        JSON_COLUMN);
+                errors.add(msg);
+            } else if (!tableOthersMap.get(JSON_COLUMN.toLowerCase()).
+                    equalsIgnoreCase("json")) {
+                msg = String.format("'%s' column type is not JSON in the " +
+                        "table", JSON_COLUMN);
                 errors.add(msg);
             }
 
@@ -342,7 +340,7 @@ protected boolean doCheckExistingTable(NosqlEntityInformation<?, ?> entityInform
             if (LOG.isDebugEnabled()) {
                 LOG.debug("JSON Schema of the table is " + jsonSchema);
             }
-            throw new IllegalStateException(msg, ex);
+            LOG.warn(msg);
         }
 
         if (!errors.isEmpty()) {

src/test/java/com/oracle/nosql/spring/data/test/composite/TestTableCreation.java

@@ -388,8 +388,8 @@ public void testTableMismatchMissingJson() {
         } catch (IllegalArgumentException iae) {
             assertTrue(iae.getMessage().contains("Shard primary keys " +
                     "mismatch"));
-            assertTrue(iae.getMessage().contains("Non-primary key columns " +
-                    "mismatch"));
+            assertTrue(iae.getMessage().contains("'kv_json_' column does not " +
+                    "exist in the table"));
             template.dropTableIfExists(domainClass.getSimpleName());
         }
     }
@@ -409,8 +409,8 @@ public void testTableMismatchMissingJsonType() {
             template.createTableIfNotExists(template.getNosqlEntityInformation(domainClass));
             fail("Expecting IllegalArgumentException but didn't get");
         } catch (IllegalArgumentException iae) {
-            assertTrue(iae.getMessage().contains("Non-primary key columns " +
-                    "mismatch"));
+            assertTrue(iae.getMessage().contains("'kv_json_' column type is " +
+                    "not JSON in the table"));
             template.dropTableIfExists(domainClass.getSimpleName());
         }
     }
@@ -435,8 +435,8 @@ public void testTableMismatchAll() {
                     "mismatch"));
             assertTrue(iae.getMessage().contains("Non-shard primary keys " +
                     "mismatch"));
-            assertTrue(iae.getMessage().contains("Non-primary key columns " +
-                    "mismatch"));
+            assertTrue(iae.getMessage().contains("'kv_json_' column type is " +
+                    "not JSON in the table"));
             template.dropTableIfExists(domainClass.getSimpleName());
         }
     }