From dc4e1b8a34172f4761f02348fbc658ad0b58ddce Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Mon, 11 Sep 2017 13:43:33 +0000 Subject: [PATCH] Removed accounting-lib as test dependency git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-publishing/document-store-lib-couchbase@152924 82a268e6-3cf1-43bd-a215-b396298e98cf --- pom.xml | 6 ----- .../persistence/PersistenceCouchBase.java | 27 +++++++------------ .../persistence/PersistenceCouchBaseTest.java | 1 + 3 files changed, 10 insertions(+), 24 deletions(-) diff --git a/pom.xml b/pom.xml index 79f6292..8c88ab4 100644 --- a/pom.xml +++ b/pom.xml @@ -75,12 +75,6 @@ common-authorization test - - org.gcube.accounting - accounting-lib - test - - diff --git a/src/main/java/org/gcube/documentstore/persistence/PersistenceCouchBase.java b/src/main/java/org/gcube/documentstore/persistence/PersistenceCouchBase.java index ceb59a3..694006f 100644 --- a/src/main/java/org/gcube/documentstore/persistence/PersistenceCouchBase.java +++ b/src/main/java/org/gcube/documentstore/persistence/PersistenceCouchBase.java @@ -7,11 +7,10 @@ import java.util.HashMap; import java.util.Map; import java.util.concurrent.TimeUnit; -import org.gcube.accounting.datamodel.AggregatedUsageRecord; -import org.gcube.accounting.datamodel.UsageRecord; import org.gcube.documentstore.persistence.connections.Connection; import org.gcube.documentstore.persistence.connections.Connections; import org.gcube.documentstore.persistence.connections.Nodes; +import org.gcube.documentstore.records.AggregatedRecord; import org.gcube.documentstore.records.DSMapper; import org.gcube.documentstore.records.Record; import org.gcube.documentstore.records.RecordUtility; @@ -36,14 +35,12 @@ public class PersistenceCouchBase extends PersistenceBackend { private static final Logger logger = LoggerFactory.getLogger(PersistenceCouchBase.class); public static final String URL_PROPERTY_KEY = "URL"; - // public static final String USERNAME_PROPERTY_KEY = "username"; public static final String PASSWORD_PROPERTY_KEY = "password"; public static final String BUCKET_NAME_PROPERTY_KEY = "bucketName"; public static final long TIMEOUT_BUCKET = TimeUnit.SECONDS.toMillis(180); public static final long ALIVE_INTERVAL = TimeUnit.HOURS.toMillis(1); - private final static String AGGREGATED_PREFIX = "Aggregated"; protected Map bucketNames; /* The environment configuration */ @@ -55,8 +52,8 @@ public class PersistenceCouchBase extends PersistenceBackend { static { ENV = DefaultCouchbaseEnvironment.builder() - .connectTimeout(TIMEOUT_BUCKET * 1000) - .keepAliveInterval(ALIVE_INTERVAL * 1000) + .connectTimeout(TIMEOUT_BUCKET) + .keepAliveInterval(ALIVE_INTERVAL) .build(); } @@ -74,14 +71,13 @@ public class PersistenceCouchBase extends PersistenceBackend { Map> recordClasses = RecordUtility.getRecordClassesFound(); for (Class recordClass : recordClasses.values()) { Record recordInstance = recordClass.newInstance(); - if (recordInstance instanceof UsageRecord && !(recordInstance instanceof AggregatedUsageRecord)) { + if (recordInstance instanceof Record && !(recordInstance instanceof AggregatedRecord)) { try { - @SuppressWarnings("unchecked") - Class usageRecordClazz = (Class) recordClass; - logger.debug("Trying to get the Bucket for {}", usageRecordClazz); + Class recordClazz = (Class) recordClass; + logger.debug("Trying to get the Bucket for {}", recordClazz); String recordType = recordInstance.getRecordType(); - String bucketName = configuration.getProperty(AGGREGATED_PREFIX + recordType); - logger.debug("Bucket for {} is {}.", usageRecordClazz, bucketName); + String bucketName = configuration.getProperty(recordType); + logger.debug("Bucket for {} is {}.", recordClazz, bucketName); bucketNames.put(recordType, bucketName); }catch (Exception e) { @@ -120,20 +116,15 @@ public class PersistenceCouchBase extends PersistenceBackend { } protected Bucket getBucketConnection(String recordType) { - // Bucket bucket = connectionMap.get(recordType); + Bucket bucket = null; synchronized (Connections.connectionsMap) { bucket = Connections.connectionsMap.get(nodes).getBucketsMap().get(bucketNames.get(recordType)); try { - // logger.debug("PersistenceCouchBase getBucketConnection - // recordType:{}, bucket - // name:{}",recordType,bucketNames.get(recordType)); if (bucket == null) { - // bucket = cluster.openBucket(recordType, password); bucket = Connections.connectionsMap.get(nodes).getCluster().openBucket(bucketNames.get(recordType), password); logger.trace("PersistenceCouchBase getBucketConnection bucket close, open:{}", bucket.toString()); - // connectionMap.put(recordType, bucket); Connections.connectionsMap.get(nodes).getBucketsMap().put(bucketNames.get(recordType), bucket); logger.trace("PersistenceCouchBase getBucketConnection connectionMap:{}", Connections.connectionsMap.get(nodes).getBucketsMap()); diff --git a/src/test/java/org/gcube/documentstore/persistence/PersistenceCouchBaseTest.java b/src/test/java/org/gcube/documentstore/persistence/PersistenceCouchBaseTest.java index f37b24b..81c0815 100644 --- a/src/test/java/org/gcube/documentstore/persistence/PersistenceCouchBaseTest.java +++ b/src/test/java/org/gcube/documentstore/persistence/PersistenceCouchBaseTest.java @@ -33,6 +33,7 @@ public class PersistenceCouchBaseTest extends ScopedTest { PersistenceBackend persistenceBackend = PersistenceBackendFactory.rediscoverPersistenceBackend(fallbackPersistenceBackend, ScopedTest.getCurrentContext()); Assert.assertTrue(persistenceBackend instanceof PersistenceCouchBase); + } }