[SDC-29] Amdocs OnBoard 1707 initial commit.

[sdc.git] / openecomp-be / lib / openecomp-sdc-vendor-software-product-lib / openecomp-sdc-vendor-software-product-core / src / main / java / org / openecomp / sdc / vendorsoftwareproduct / dao / impl / ComponentDaoCassandraImpl.java

diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/dao/impl/ComponentDaoCassandraImpl.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/dao/impl/ComponentDaoCassandraImpl.java
index 8537238..9cdd950 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/dao/impl/ComponentDaoCassandraImpl.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/dao/impl/ComponentDaoCassandraImpl.java
@@ -61,10 +61,10 @@ public class ComponentDaoCassandraImpl extends CassandraBaseDao<ComponentEntity>
         mapper.getTableMetadata().getPartitionKey().get(1).getName());
 
 
-    metadata.setUniqueValuesMetadata(Collections.singletonList(
-        new UniqueValueMetadata(VendorSoftwareProductConstants.UniqueValues.COMPONENT_NAME,
-            Arrays.asList(mapper.getTableMetadata().getPartitionKey().get(0).getName(),
-                mapper.getTableMetadata().getPartitionKey().get(1).getName(), "name"))));
+    metadata.setUniqueValuesMetadata(Collections.singletonList(new UniqueValueMetadata(
+        VendorSoftwareProductConstants.UniqueValues.COMPONENT_NAME,
+        Arrays.asList(mapper.getTableMetadata().getPartitionKey().get(0).getName(),
+            mapper.getTableMetadata().getPartitionKey().get(1).getName(), "name"))));
 
     VersioningManagerFactory.getInstance().createInterface()
         .register(versionableEntityType, metadata);
@@ -93,9 +93,14 @@ public class ComponentDaoCassandraImpl extends CassandraBaseDao<ComponentEntity>
   }
 
   @Override
-  public void updateQuestionnaireData(String vspId, Version version, String id,
+  public ComponentEntity getQuestionnaireData(String vspId, Version version, String componentId) {
+    return accessor.getQuestionnaireData(vspId, versionMapper.toUDT(version), componentId);
+  }
+
+  @Override
+  public void updateQuestionnaireData(String vspId, Version version, String componentId,
                                       String questionnaireData) {
-    accessor.updateQuestionnaireData(questionnaireData, vspId, versionMapper.toUDT(version), id);
+    accessor.updateQuestionnaireData(questionnaireData, vspId, versionMapper.toUDT(version), componentId);
   }
 
   @Override
@@ -103,6 +108,11 @@ public class ComponentDaoCassandraImpl extends CassandraBaseDao<ComponentEntity>
     return accessor.listQuestionnaires(vspId, versionMapper.toUDT(version)).all();
   }
 
+  @Override
+  public Collection<ComponentEntity> listCompositionAndQuestionnaire(String vspId, Version version){
+    return accessor.listCompositionAndQuestionnaire(vspId, versionMapper.toUDT(version)).all();
+  }
+
   @Override
   public void deleteAll(String vspId, Version version) {
     accessor.deleteAll(vspId, version);
@@ -112,24 +122,34 @@ public class ComponentDaoCassandraImpl extends CassandraBaseDao<ComponentEntity>
   interface ComponentAccessor {
 
     @Query(
-        "select vsp_id, version, component_id, composition_data from vsp_component "
-            + "where vsp_id=? and version=?")
+        "select vsp_id, version, component_id, composition_data from vsp_component"
+            + " where vsp_id=? and version=?")
     Result<ComponentEntity> list(String vspId, UDTValue version);
 
     @Query(
-        "select vsp_id, version, component_id, questionnaire_data from vsp_component "
-            + "where vsp_id=? and version=?")
+        "select vsp_id, version, component_id, composition_data, questionnaire_data from vsp_component"
+            + " where vsp_id=? and version=?")
+    Result<ComponentEntity> listCompositionAndQuestionnaire(String vspId, UDTValue version);
+
+    @Query(
+        "select vsp_id, version, component_id, questionnaire_data from vsp_component"
+            + " where vsp_id=? and version=?")
     Result<ComponentEntity> listQuestionnaires(String vspId, UDTValue version);
 
     @Query(
-        "insert into vsp_component (vsp_id, version, component_id, composition_data) "
-            + "values (?,?,?,?)")
+        "select vsp_id, version, component_id, questionnaire_data from vsp_component"
+            + " where vsp_id=? and version=? and component_id=?")
+    ComponentEntity getQuestionnaireData(String vspId, UDTValue version, String id);
+
+    @Query(
+        "insert into vsp_component (vsp_id, version, component_id, composition_data)"
+            + " values (?,?,?,?)")
     ResultSet updateCompositionData(String vspId, UDTValue version, String id,
                                     String compositionData);
 
     @Query(
-        "update vsp_component set questionnaire_data=? where vsp_id=? and version=? "
-            + "and component_id=?")
+        "update vsp_component set questionnaire_data=? where vsp_id=? and version=?"
+            + " and component_id=?")
     ResultSet updateQuestionnaireData(String questionnaireData, String vspId, UDTValue version,
                                       String id);