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 --- .../java/org/openecomp/core/tools/exportinfo/ExportSerializer.java | 2 +- .../java/org/openecomp/core/tools/importinfo/ImportSingleTable.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'openecomp-be/tools/zusammen-tools/src') diff --git a/openecomp-be/tools/zusammen-tools/src/main/java/org/openecomp/core/tools/exportinfo/ExportSerializer.java b/openecomp-be/tools/zusammen-tools/src/main/java/org/openecomp/core/tools/exportinfo/ExportSerializer.java index 8614d4fcab..92dfeca3c1 100644 --- a/openecomp-be/tools/zusammen-tools/src/main/java/org/openecomp/core/tools/exportinfo/ExportSerializer.java +++ b/openecomp-be/tools/zusammen-tools/src/main/java/org/openecomp/core/tools/exportinfo/ExportSerializer.java @@ -97,7 +97,7 @@ public class ExportSerializer { data = Base64.getEncoder().encodeToString(bytes.array()); break; case TIMESTAMP: - Date rowDate = row.getDate(i); + Date rowDate = row.getTimestamp(i); if (rowDate != null) { data = rowDate.getTime(); } else { diff --git a/openecomp-be/tools/zusammen-tools/src/main/java/org/openecomp/core/tools/importinfo/ImportSingleTable.java b/openecomp-be/tools/zusammen-tools/src/main/java/org/openecomp/core/tools/importinfo/ImportSingleTable.java index 71a260798a..ed016aa997 100644 --- a/openecomp-be/tools/zusammen-tools/src/main/java/org/openecomp/core/tools/importinfo/ImportSingleTable.java +++ b/openecomp-be/tools/zusammen-tools/src/main/java/org/openecomp/core/tools/importinfo/ImportSingleTable.java @@ -81,9 +81,9 @@ public class ImportSingleTable { break; case TIMESTAMP: if (StringUtils.isEmpty(rowData)){ - bind.setDate(i, null); + bind.setTimestamp(i, null); } else { - bind.setDate(i, new Date(Long.parseLong(rowData))); + bind.setTimestamp(i, new Date(Long.parseLong(rowData))); } break; case BOOLEAN: -- cgit 1.2.3-korg