aboutsummaryrefslogtreecommitdiffstats
path: root/catalog-dao
diff options
context:
space:
mode:
authorshrek2000 <oren.kleks@amdocs.com>2020-01-30 14:52:49 +0200
committershrek2000 <oren.kleks@amdocs.com>2020-01-30 14:52:49 +0200
commit0594c412c406b22725b33633299d85587ee03f08 (patch)
tree66228ad365c77c09219e147e683fae9a4999cce7 /catalog-dao
parent22b57cf9313f0b21a1dca090088b811eec8cca6a (diff)
Upgrade to Cassandra 3
Creating base dockers suitable for Cassandra 3 remove cqlsh version Change-Id: I996bad2341410cdf45c49f191e998acf4781fc5d Issue-ID: SDC-2596 Signed-off-by: shrek2000 <oren.kleks@amdocs.com>
Diffstat (limited to 'catalog-dao')
-rw-r--r--catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/DAOArtifactData.java2
-rw-r--r--catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/SdcSchemaFilesData.java5
-rw-r--r--catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/AuditingGenericEvent.java11
-rw-r--r--catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/togglz/FeatureToggleEvent.java2
-rw-r--r--catalog-dao/src/test/resources/cassandra.yaml3
5 files changed, 16 insertions, 7 deletions
diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/DAOArtifactData.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/DAOArtifactData.java
index 64fac358bf..6d0a32d1d8 100644
--- a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/DAOArtifactData.java
+++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/DAOArtifactData.java
@@ -23,6 +23,7 @@ package org.openecomp.sdc.be.resources.data;
import com.datastax.driver.mapping.annotations.Column;
import com.datastax.driver.mapping.annotations.PartitionKey;
import com.datastax.driver.mapping.annotations.Table;
+import com.datastax.driver.mapping.annotations.Transient;
import java.nio.ByteBuffer;
@@ -68,6 +69,7 @@ public class DAOArtifactData {
}
+ @Transient
public byte[] getDataAsArray() {
// return data;
if (data != null) {
diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/SdcSchemaFilesData.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/SdcSchemaFilesData.java
index 2b92aa3b8d..1ed044082e 100644
--- a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/SdcSchemaFilesData.java
+++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/SdcSchemaFilesData.java
@@ -24,7 +24,7 @@ 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;
-
+import com.datastax.driver.mapping.annotations.Transient;
import java.nio.ByteBuffer;
import java.util.Date;
@@ -105,7 +105,8 @@ public class SdcSchemaFilesData {
this.payload = ByteBuffer.wrap(payload.clone());
}
}
-
+
+ @Transient
public byte[] getPayloadAsArray() {
return payload != null ? payload.array() : null;
}
diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/AuditingGenericEvent.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/AuditingGenericEvent.java
index 57bab5977e..f37f9b9d01 100644
--- a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/AuditingGenericEvent.java
+++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/AuditingGenericEvent.java
@@ -22,7 +22,7 @@ package org.openecomp.sdc.be.resources.data.auditing;
import org.openecomp.sdc.common.datastructure.AuditingFieldsKey;
-
+import com.datastax.driver.mapping.annotations.Transient;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
@@ -30,16 +30,23 @@ import java.util.Map;
import java.util.TimeZone;
public class AuditingGenericEvent {
+ @Transient
protected SimpleDateFormat simpleDateFormat;
protected static String dateFormatPattern = "yyyy-MM-dd HH:mm:ss.SSS z";
+ @Transient
protected String requestId;
+ @Transient
protected String serviceInstanceId;
+ @Transient
protected String action;
+ @Transient
protected String status;
+ @Transient
protected String timestamp;
-
+ @Transient
protected String desc;
+ @Transient
protected Map<String, Object> fields = new HashMap<>();
diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/togglz/FeatureToggleEvent.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/togglz/FeatureToggleEvent.java
index 86bd60a75a..501b421bd5 100644
--- a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/togglz/FeatureToggleEvent.java
+++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/togglz/FeatureToggleEvent.java
@@ -30,6 +30,7 @@ import org.openecomp.sdc.common.log.enums.EcompLoggerErrorCode;
import org.openecomp.sdc.common.log.wrappers.Logger;
import org.togglz.core.Feature;
import org.togglz.core.repository.FeatureState;
+import com.datastax.driver.mapping.annotations.Transient;
import java.util.Map;
@@ -92,6 +93,7 @@ public class FeatureToggleEvent {
this.parameters = Joiner.on(",").withKeyValueSeparator("=").join(featureState.getParameterMap());
}
+ @Transient
public FeatureState getFeatureState() {
Feature feature = ToggleableFeature.getFeatureByName(featureName);
if (feature == null) {
diff --git a/catalog-dao/src/test/resources/cassandra.yaml b/catalog-dao/src/test/resources/cassandra.yaml
index 39f987152a..d512f28230 100644
--- a/catalog-dao/src/test/resources/cassandra.yaml
+++ b/catalog-dao/src/test/resources/cassandra.yaml
@@ -440,9 +440,6 @@ rpc_address: 0.0.0.0
# rpc_interface: eth1
# rpc_interface_prefer_ipv6: false
-# port for Thrift to listen for clients on
-rpc_port: 9160
-
# RPC address to broadcast to drivers and other Cassandra nodes. This cannot
# be set to 0.0.0.0. If left blank, this will be set to the value of
# rpc_address. If rpc_address is set to 0.0.0.0, broadcast_rpc_address must