JAVA-2263 use method from base for all checks

tomekl007 · tomekl007 · commit bee8cf4ec0d8 · 2019-12-11T15:58:45.000+01:00
diff --git a/mapper-processor/src/main/java/com/datastax/oss/driver/internal/mapper/processor/entity/EntityHelperSchemaValidationMethodGenerator.java b/mapper-processor/src/main/java/com/datastax/oss/driver/internal/mapper/processor/entity/EntityHelperSchemaValidationMethodGenerator.java
@@ -18,7 +18,6 @@
 import static com.datastax.oss.driver.api.mapper.annotations.SchemaHint.*;
 
 import com.datastax.oss.driver.api.core.CqlIdentifier;
-import com.datastax.oss.driver.api.core.metadata.schema.ColumnMetadata;
 import com.datastax.oss.driver.api.core.metadata.schema.TableMetadata;
 import com.datastax.oss.driver.api.core.type.UserDefinedType;
 import com.datastax.oss.driver.api.mapper.annotations.SchemaHint;
@@ -29,7 +28,6 @@
 import com.squareup.javapoet.TypeName;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
 import javax.lang.model.element.Modifier;
@@ -149,24 +147,12 @@ private void findMissingColumnsInTable(MethodSpec.Builder methodBuilder) {
   }
 
   private void generateMissingColumnsCheck(MethodSpec.Builder methodBuilder) {
-    methodBuilder.addStatement(
-        "$1T<$2T, $3T> columns = (($4T) tableMetadata.get()).getColumns()",
-        Map.class,
-        CqlIdentifier.class,
-        ColumnMetadata.class,
-        DefaultTableMetadata.class);
 
     methodBuilder.addStatement(
-        "$1T<$2T> missingTableCqlNames = new $3T<>();",
+        "$1T<$2T> missingTableCqlNames = findMissingColumnsCql(expectedCqlNames, (($3T) tableMetadata.get()).getColumns().keySet())",
         List.class,
         CqlIdentifier.class,
-        ArrayList.class);
-    methodBuilder.beginControlFlow(
-        "for ($1T cqlIdentifier : expectedCqlNames)", CqlIdentifier.class);
-    methodBuilder.beginControlFlow("if (columns.get(cqlIdentifier) == null)");
-    methodBuilder.addStatement("missingTableCqlNames.add(cqlIdentifier)");
-    methodBuilder.endControlFlow();
-    methodBuilder.endControlFlow();
+        DefaultTableMetadata.class);
 
     // Throw if there are any missingTableCqlNames
     CodeBlock missingCqlColumnExceptionMessage =
@@ -256,16 +242,9 @@ private void findMissingColumnsInUdt(MethodSpec.Builder methodBuilder, boolean g
         CqlIdentifier.class);
 
     methodBuilder.addStatement(
-        "$1T<$2T> missingTableCqlNames = new $3T<>();",
+        "$1T<$2T> missingTableCqlNames = findMissingColumnsCql(expectedCqlNames, columns)",
         List.class,
-        CqlIdentifier.class,
-        ArrayList.class);
-    methodBuilder.beginControlFlow(
-        "for ($1T cqlIdentifier : expectedCqlNames)", CqlIdentifier.class);
-    methodBuilder.beginControlFlow("if (!columns.contains(cqlIdentifier))");
-    methodBuilder.addStatement("missingTableCqlNames.add(cqlIdentifier)");
-    methodBuilder.endControlFlow();
-    methodBuilder.endControlFlow();
+        CqlIdentifier.class);
 
     // Throw if there are any missingTableCqlNames
     CodeBlock missingCqlUdtExceptionMessage =
diff --git a/mapper-runtime/src/main/java/com/datastax/oss/driver/internal/mapper/entity/EntityHelperBase.java b/mapper-runtime/src/main/java/com/datastax/oss/driver/internal/mapper/entity/EntityHelperBase.java
@@ -83,11 +83,16 @@ protected void throwIfKeyspaceMissing() {
 
   public List<CqlIdentifier> findMissingColumns(
       List<CqlIdentifier> expected, Collection<ColumnMetadata> actual) {
-    List<CqlIdentifier> missingColumns = new ArrayList<>();
     List<CqlIdentifier> actualCql =
         actual.stream().map(ColumnMetadata::getName).collect(Collectors.toList());
+    return findMissingColumnsCql(expected, actualCql);
+  }
+
+  public List<CqlIdentifier> findMissingColumnsCql(
+      List<CqlIdentifier> expected, Collection<CqlIdentifier> actual) {
+    List<CqlIdentifier> missingColumns = new ArrayList<>();
     for (CqlIdentifier cqlIdentifier : expected) {
-      if (!actualCql.contains(cqlIdentifier)) {
+      if (!actual.contains(cqlIdentifier)) {
         missingColumns.add(cqlIdentifier);
       }
     }
