[SDC-29] rebase continue work to align source

[sdc.git] / catalog-dao / src / main / java / org / openecomp / sdc / be / resources / data / SdcSchemaFilesData.java

diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/ESSdcSchemaFilesData.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/SdcSchemaFilesData.java
similarity index 73%
rename from catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/ESSdcSchemaFilesData.java
rename to catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/SdcSchemaFilesData.java
index c6ab13b..96ab5ae 100644 (file)
--- a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/ESSdcSchemaFilesData.java
+++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/SdcSchemaFilesData.java
@@ -3,18 +3,22 @@ package org.openecomp.sdc.be.resources.data;
 import java.nio.ByteBuffer;
 import java.util.Date;
 
+import com.datastax.driver.mapping.annotations.ClusteringColumn;
 import com.datastax.driver.mapping.annotations.Column;
+import com.datastax.driver.mapping.annotations.PartitionKey;
 import com.datastax.driver.mapping.annotations.Table;
 
 @Table(keyspace = "sdcartifact", name = "sdcschemafiles")
-public class ESSdcSchemaFilesData {
-               
+public class SdcSchemaFilesData {
+       @PartitionKey(0)
        @Column(name = "sdcreleasenum")
        private String sdcReleaseNum;
-
+       
+       @ClusteringColumn
        @Column(name = "timestamp")
        private Date timestamp;
-
+       
+       @PartitionKey(1)
        @Column(name = "conformanceLevel")
        private String conformanceLevel;
 
@@ -27,19 +31,21 @@ public class ESSdcSchemaFilesData {
        @Column(name = "checksum")
        private String checksum;
        
-       public ESSdcSchemaFilesData() {
+       public SdcSchemaFilesData() {
        
        }
        
-       public ESSdcSchemaFilesData(String sdcReleaseNum, String conformanceLevel, String fileName, byte[] payload){
+       public SdcSchemaFilesData(String sdcReleaseNum, Date timestamp, String conformanceLevel, String fileName, byte[] payload, String checksum){
                this.sdcReleaseNum = sdcReleaseNum;
+               this.timestamp = timestamp;
                this.conformanceLevel = conformanceLevel;
                this.fileName = fileName;
                if(payload != null) {
                        this.payload = ByteBuffer.wrap(payload.clone());
                }
+               this.checksum = checksum;
        }
-
+       
        public String getSdcReleaseNum() {
                return sdcReleaseNum;
        }
@@ -99,4 +105,10 @@ public class ESSdcSchemaFilesData {
        public void setChecksum(String checksum) {
                this.checksum = checksum;
        }
+
+       @Override
+       public String toString() {
+               return "SdcSchemaFilesData [sdcReleaseNum=" + sdcReleaseNum + ", timestamp=" + timestamp + ", conformanceLevel="
+                               + conformanceLevel + ", fileName=" + fileName + ", checksum=" + checksum + "]";
+       }
 }