From 4dc878ccce1219a78cd64c3bdaee78421c68d11d Mon Sep 17 00:00:00 2001 From: talig Date: Mon, 11 Jun 2018 12:28:33 +0300 Subject: Upgrade datastax cassandra driver to 3.4.0 Upgrage zusammen to 1.0.0 which uses datastax cassandra driver 3.4.0 Change-Id: Ie7217986b67cd95de015daedd0f7106c2d0a972d Issue-ID: SDC-1416 Signed-off-by: talig --- .../sdc/activitylog/dao/type/ActivityLogEntity.java | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-api/src/main/java') diff --git a/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-api/src/main/java/org/openecomp/sdc/activitylog/dao/type/ActivityLogEntity.java b/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-api/src/main/java/org/openecomp/sdc/activitylog/dao/type/ActivityLogEntity.java index b277fe1cb5..3c65624c15 100644 --- a/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-api/src/main/java/org/openecomp/sdc/activitylog/dao/type/ActivityLogEntity.java +++ b/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-api/src/main/java/org/openecomp/sdc/activitylog/dao/type/ActivityLogEntity.java @@ -18,13 +18,13 @@ package org.openecomp.sdc.activitylog.dao.type; import com.datastax.driver.mapping.annotations.ClusteringColumn; import com.datastax.driver.mapping.annotations.Column; -import com.datastax.driver.mapping.annotations.Enumerated; import com.datastax.driver.mapping.annotations.PartitionKey; import com.datastax.driver.mapping.annotations.Table; import org.openecomp.sdc.versioning.dao.types.Version; import java.util.Date; + @Table(keyspace = "dox", name = "activity_log") public class ActivityLogEntity { @PartitionKey @@ -36,7 +36,6 @@ public class ActivityLogEntity { @ClusteringColumn @Column(name = "activity_id") private String id; - @Enumerated private ActivityType type; private String user; private Date timestamp; @@ -55,7 +54,7 @@ public class ActivityLogEntity { public ActivityLogEntity(String itemId, Version version) { this.itemId = itemId; - setVersion(version); + this.versionId = version == null ? null : version.getId(); } public ActivityLogEntity(String itemId, Version version, ActivityType type, String user, @@ -77,14 +76,6 @@ public class ActivityLogEntity { this.itemId = itemId; } - public Version getVersion() { - return versionId == null ? null : new Version(versionId); - } - - public void setVersion(Version version) { - this.versionId = version == null ? null : version.getId(); - } - public String getVersionId() { return versionId; } -- cgit 1.2.3-korg