1 files changed, 88 insertions, 115 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-core/src/main/java/org/openecomp/sdc/versioning/dao/impl/VersionableEntityDaoCassandraImpl.java b/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-core/src/main/java/org/openecomp/sdc/versioning/dao/impl/VersionableEntityDaoCassandraImpl.java
index 19c62ab43c..fcbbaf77aa 100644
--- a/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-core/src/main/java/org/openecomp/sdc/versioning/dao/impl/VersionableEntityDaoCassandraImpl.java
+++ b/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-core/src/main/java/org/openecomp/sdc/versioning/dao/impl/VersionableEntityDaoCassandraImpl.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,12 +17,17 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.versioning.dao.impl;
 
 import com.datastax.driver.core.ColumnDefinitions;
 import com.datastax.driver.core.ResultSet;
 import com.datastax.driver.core.Row;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 import org.openecomp.core.dao.UniqueValueDao;
 import org.openecomp.core.nosqldb.api.NoSqlDb;
 import org.openecomp.core.nosqldb.factory.NoSqlDbFactory;
@@ -35,135 +40,103 @@ import org.openecomp.sdc.versioning.dao.types.Version;
 import org.openecomp.sdc.versioning.types.UniqueValueMetadata;
 import org.openecomp.sdc.versioning.types.VersionableEntityMetadata;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
 class VersionableEntityDaoCassandraImpl implements VersionableEntityDao {
 
-  private final UniqueValueUtil uniqueValueUtil;
-  private static final NoSqlDb noSqlDb = NoSqlDbFactory.getInstance().createInterface();
-  private static Logger Logger =
-      (Logger) LoggerFactory.getLogger(VersionableEntityDaoCassandraImpl.class);
-
-  public VersionableEntityDaoCassandraImpl(
-      UniqueValueDao uniqueValueDao) {
-    this.uniqueValueUtil = new UniqueValueUtil(uniqueValueDao);
-  }
+    private static final NoSqlDb noSqlDb = NoSqlDbFactory.getInstance().createInterface();
+    private static Logger Logger = (Logger) LoggerFactory.getLogger(VersionableEntityDaoCassandraImpl.class);
+    private final UniqueValueUtil uniqueValueUtil;
 
-  private static String commaSeparatedQuestionMarks(int size) {
-    StringBuilder sb = new StringBuilder(size * 2 - 1);
-    for (int i = 0; i < size; i++) {
-      if (i > 0) {
-        sb.append(',');
-      }
-      sb.append('?');
+    public VersionableEntityDaoCassandraImpl(UniqueValueDao uniqueValueDao) {
+        this.uniqueValueUtil = new UniqueValueUtil(uniqueValueDao);
     }
-    return sb.toString();
 
-  }
+    private static String commaSeparatedQuestionMarks(int size) {
+        StringBuilder sb = new StringBuilder(size * 2 - 1);
+        for (int i = 0; i < size; i++) {
+            if (i > 0) {
+                sb.append(',');
+            }
+            sb.append('?');
+        }
+        return sb.toString();
+    }
 
-  @Override
-  public void initVersion(VersionableEntityMetadata metadata, String entityId, Version baseVersion,
-                          Version newVersion) {
-    ResultSet rows = loadVersionRows(metadata, entityId, baseVersion);
-    List<String> columnNames =
-        rows.getColumnDefinitions().asList().stream().map(ColumnDefinitions.Definition::getName)
+    @Override
+    public void initVersion(VersionableEntityMetadata metadata, String entityId, Version baseVersion, Version newVersion) {
+        ResultSet rows = loadVersionRows(metadata, entityId, baseVersion);
+        List<String> columnNames = rows.getColumnDefinitions().asList().stream().map(ColumnDefinitions.Definition::getName)
             .collect(Collectors.toList());
-
-    String insertCql = String.format("insert into %s (%s) values (%s)", metadata.getName(),
-        CommonMethods.listToSeparatedString(columnNames, ','),
-        commaSeparatedQuestionMarks(columnNames.size()));
-    Logger.debug("insertCql", insertCql);
-
-    for (Row row : rows) {
-      List<Object> columnValues = new ArrayList<>();
-      Map<String, Object> columnNameToValue = new HashMap<>();
-
-      for (String columnName : columnNames) {
-        if (metadata.getVersionIdentifierName().equals(columnName)) {
-          columnValues.add(newVersion);
-          columnNameToValue.put(columnName, newVersion.toString());
-        } else {
-          Object value = row.getObject(columnName);
-          columnValues.add(value);
-          columnNameToValue.put(columnName, value);
+        String insertCql = String.format("insert into %s (%s) values (%s)", metadata.getName(), CommonMethods.listToSeparatedString(columnNames, ','),
+            commaSeparatedQuestionMarks(columnNames.size()));
+        Logger.debug("insertCql", insertCql);
+        for (Row row : rows) {
+            List<Object> columnValues = new ArrayList<>();
+            Map<String, Object> columnNameToValue = new HashMap<>();
+            for (String columnName : columnNames) {
+                if (metadata.getVersionIdentifierName().equals(columnName)) {
+                    columnValues.add(newVersion);
+                    columnNameToValue.put(columnName, newVersion.toString());
+                } else {
+                    Object value = row.getObject(columnName);
+                    columnValues.add(value);
+                    columnNameToValue.put(columnName, value);
+                }
+            }
+            initRowUniqueValues(metadata.getUniqueValuesMetadata(), columnNameToValue);
+            noSqlDb.execute(insertCql, columnValues.toArray());
         }
-      }
-
-      initRowUniqueValues(metadata.getUniqueValuesMetadata(), columnNameToValue);
-
-      noSqlDb.execute(insertCql, columnValues.toArray());
     }
-  }
-
-  @Override
-  public void deleteVersion(VersionableEntityMetadata metadata, String entityId,
-                            Version versionToDelete, Version backToVersion) {
-    deleteRowsUniqueValues(metadata, entityId, versionToDelete);
-
-    String deleteCql = String.format("delete from %s where %s=? and %s=?", metadata.getName(),
-        metadata.getIdentifierName(), metadata.getVersionIdentifierName());
-    noSqlDb.execute(deleteCql, entityId, versionToDelete);
-  }
-
-  @Override
-  public void closeVersion(VersionableEntityMetadata versionableTableMetadata, String entityId,
-                           Version versionToClose) {
-    // redundant in cassandra impl.
-  }
 
-  private ResultSet loadVersionRows(VersionableEntityMetadata metadata, String entityId,
-                                    Version version) {
-    String selectCql = String.format("select * from %s where %s=? and %s=?", metadata.getName(),
-        metadata.getIdentifierName(), metadata.getVersionIdentifierName());
-    Logger.debug("selectCql", selectCql);
-    Logger.debug("entityId", entityId);
-    Logger.debug("version", version);
+    @Override
+    public void deleteVersion(VersionableEntityMetadata metadata, String entityId, Version versionToDelete, Version backToVersion) {
+        deleteRowsUniqueValues(metadata, entityId, versionToDelete);
+        String deleteCql = String
+            .format("delete from %s where %s=? and %s=?", metadata.getName(), metadata.getIdentifierName(), metadata.getVersionIdentifierName());
+        noSqlDb.execute(deleteCql, entityId, versionToDelete);
+    }
 
-    return noSqlDb.execute(selectCql, entityId, version);
-  }
+    @Override
+    public void closeVersion(VersionableEntityMetadata versionableTableMetadata, String entityId, Version versionToClose) {
+        // redundant in cassandra impl.
+    }
 
-  private void initRowUniqueValues(List<UniqueValueMetadata> metadata,
-                                   Map<String, Object> columnNameToValue) {
-    for (UniqueValueMetadata uniqueMetadata : metadata) {
-      List<String> uniqueValueCombination = uniqueMetadata.getUniqueConstraintIdentifiers().stream()
-          .map(colName -> (String) columnNameToValue.get(colName)).collect(Collectors.toList());
-      uniqueValueUtil.createUniqueValue(uniqueMetadata.getType(),
-          uniqueValueCombination.toArray(new String[uniqueValueCombination.size()]));
+    private ResultSet loadVersionRows(VersionableEntityMetadata metadata, String entityId, Version version) {
+        String selectCql = String
+            .format("select * from %s where %s=? and %s=?", metadata.getName(), metadata.getIdentifierName(), metadata.getVersionIdentifierName());
+        Logger.debug("selectCql", selectCql);
+        Logger.debug("entityId", entityId);
+        Logger.debug("version", version);
+        return noSqlDb.execute(selectCql, entityId, version);
     }
-  }
 
-  private void deleteRowUniqueValues(List<UniqueValueMetadata> metadata,
-                                     Map<String, Object> columnNameToValue) {
-    for (UniqueValueMetadata uniqueMetadata : metadata) {
-      List<String> uniqueValueCombination = uniqueMetadata.getUniqueConstraintIdentifiers().stream()
-          .map(colName -> (String) columnNameToValue.get(colName)).collect(Collectors.toList());
-      uniqueValueUtil.deleteUniqueValue(uniqueMetadata.getType(),
-          uniqueValueCombination.toArray(new String[uniqueValueCombination.size()]));
+    private void initRowUniqueValues(List<UniqueValueMetadata> metadata, Map<String, Object> columnNameToValue) {
+        for (UniqueValueMetadata uniqueMetadata : metadata) {
+            List<String> uniqueValueCombination = uniqueMetadata.getUniqueConstraintIdentifiers().stream()
+                .map(colName -> (String) columnNameToValue.get(colName)).collect(Collectors.toList());
+            uniqueValueUtil.createUniqueValue(uniqueMetadata.getType(), uniqueValueCombination.toArray(new String[uniqueValueCombination.size()]));
+        }
     }
-  }
 
-  private void deleteRowsUniqueValues(VersionableEntityMetadata metadata, String entityId,
-                                      Version version) {
-    if (metadata.getUniqueValuesMetadata().isEmpty()) {
-      return;
+    private void deleteRowUniqueValues(List<UniqueValueMetadata> metadata, Map<String, Object> columnNameToValue) {
+        for (UniqueValueMetadata uniqueMetadata : metadata) {
+            List<String> uniqueValueCombination = uniqueMetadata.getUniqueConstraintIdentifiers().stream()
+                .map(colName -> (String) columnNameToValue.get(colName)).collect(Collectors.toList());
+            uniqueValueUtil.deleteUniqueValue(uniqueMetadata.getType(), uniqueValueCombination.toArray(new String[uniqueValueCombination.size()]));
+        }
     }
-    ResultSet rows = loadVersionRows(metadata, entityId, version);
-    List<String> columnNames =
-        rows.getColumnDefinitions().asList().stream().map(ColumnDefinitions.Definition::getName)
-            .collect(Collectors.toList());
 
-    for (Row row : rows) {
-      Map<String, Object> columnNameToValue =
-          columnNames.stream().filter(name -> row.getObject(name) != null).collect(Collectors
-              .toMap(Function.identity(),
-                  columnName -> metadata.getVersionIdentifierName().equals(columnName) ? version
-                      .toString() : row.getObject(columnName)));
-      deleteRowUniqueValues(metadata.getUniqueValuesMetadata(), columnNameToValue);
+    private void deleteRowsUniqueValues(VersionableEntityMetadata metadata, String entityId, Version version) {
+        if (metadata.getUniqueValuesMetadata().isEmpty()) {
+            return;
+        }
+        ResultSet rows = loadVersionRows(metadata, entityId, version);
+        List<String> columnNames = rows.getColumnDefinitions().asList().stream().map(ColumnDefinitions.Definition::getName)
+            .collect(Collectors.toList());
+        for (Row row : rows) {
+            Map<String, Object> columnNameToValue = columnNames.stream().filter(name -> row.getObject(name) != null).collect(Collectors
+                .toMap(Function.identity(),
+                    columnName -> metadata.getVersionIdentifierName().equals(columnName) ? version.toString() : row.getObject(columnName)));
+            deleteRowUniqueValues(metadata.getUniqueValuesMetadata(), columnNameToValue);
+        }
     }
-  }
 }