diff --git a/.settings/.gitignore b/.settings/.gitignore
new file mode 100644
index 0000000..6cb3d6d
--- /dev/null
+++ b/.settings/.gitignore
@@ -0,0 +1,2 @@
+/org.eclipse.core.resources.prefs
+/org.eclipse.jdt.core.prefs
diff --git a/pom.xml b/pom.xml
index 5d71cf8..1beb6bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
org.gcube.data.publishing
document-store-lib
- 2.5.1-SNAPSHOT
+ 3.0.0-SNAPSHOT
Document Store Library
Document Store Library:
@@ -39,7 +39,7 @@
org.gcube.distribution
gcube-bom
- 1.4.0
+ 2.0.0-SNAPSHOT
pom
import
@@ -52,8 +52,8 @@
slf4j-api
- com.fasterxml.jackson.core
- jackson-databind
+ org.gcube.common
+ gcube-jackson-databind
diff --git a/src/main/java/org/gcube/documentstore/persistence/ExecutorUtils.java b/src/main/java/org/gcube/documentstore/persistence/ExecutorUtils.java
index 6f56847..6feed28 100644
--- a/src/main/java/org/gcube/documentstore/persistence/ExecutorUtils.java
+++ b/src/main/java/org/gcube/documentstore/persistence/ExecutorUtils.java
@@ -81,10 +81,10 @@ public class ExecutorUtils {
//shutdown the persitentBackendRediscoveryThread
pool.shutdown();
try {
- if(!pool.awaitTermination(100, TimeUnit.MILLISECONDS)) {
+ if(!pool.awaitTermination(1000, TimeUnit.MILLISECONDS)) {
pool.shutdownNow(); // Cancel currently executing tasks
// Wait a while for tasks to respond to being cancelled
- if (!pool.awaitTermination(100, TimeUnit.MILLISECONDS)) {
+ if (!pool.awaitTermination(1000, TimeUnit.MILLISECONDS)) {
logger.error("Unable to shutdown the pool {}", pool);
}
}
diff --git a/src/main/java/org/gcube/documentstore/persistence/PersistenceBackendFactory.java b/src/main/java/org/gcube/documentstore/persistence/PersistenceBackendFactory.java
index d2ad1b7..7f19302 100644
--- a/src/main/java/org/gcube/documentstore/persistence/PersistenceBackendFactory.java
+++ b/src/main/java/org/gcube/documentstore/persistence/PersistenceBackendFactory.java
@@ -176,6 +176,7 @@ public abstract class PersistenceBackendFactory {
persistence = persistenceBackends.get(context);
logger.trace("{} in context {} is {}", PersistenceBackend.class.getSimpleName(), context, persistence);
if(persistence==null){
+
/*
* Setting FallbackPersistence and unlocking.
* There will be another thread which will try to discover the
diff --git a/src/main/java/org/gcube/documentstore/records/AggregatedRecord.java b/src/main/java/org/gcube/documentstore/records/AggregatedRecord.java
index 7b8beec..2b632cb 100644
--- a/src/main/java/org/gcube/documentstore/records/AggregatedRecord.java
+++ b/src/main/java/org/gcube/documentstore/records/AggregatedRecord.java
@@ -6,6 +6,7 @@ package org.gcube.documentstore.records;
import java.util.Calendar;
import java.util.Set;
+import org.gcube.com.fasterxml.jackson.annotation.JsonIgnore;
import org.gcube.documentstore.exception.InvalidValueException;
import org.gcube.documentstore.exception.NotAggregatableRecordsExceptions;
import org.gcube.documentstore.records.implementation.AggregatedField;
@@ -14,8 +15,6 @@ import org.gcube.documentstore.records.implementation.validations.annotations.Va
import org.gcube.documentstore.records.implementation.validations.annotations.ValidInteger;
import org.gcube.documentstore.records.implementation.validations.annotations.ValidLong;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-
/**
* @author Luca Frosini (ISTI - CNR)
diff --git a/src/main/java/org/gcube/documentstore/records/DSMapper.java b/src/main/java/org/gcube/documentstore/records/DSMapper.java
index 4b7b2b4..03e949c 100644
--- a/src/main/java/org/gcube/documentstore/records/DSMapper.java
+++ b/src/main/java/org/gcube/documentstore/records/DSMapper.java
@@ -7,17 +7,16 @@ import java.io.Reader;
import java.io.Writer;
import java.util.List;
+import org.gcube.com.fasterxml.jackson.core.JsonGenerationException;
+import org.gcube.com.fasterxml.jackson.core.JsonParseException;
+import org.gcube.com.fasterxml.jackson.core.JsonProcessingException;
+import org.gcube.com.fasterxml.jackson.databind.DeserializationFeature;
+import org.gcube.com.fasterxml.jackson.databind.JavaType;
+import org.gcube.com.fasterxml.jackson.databind.JsonMappingException;
+import org.gcube.com.fasterxml.jackson.databind.JsonNode;
+import org.gcube.com.fasterxml.jackson.databind.ObjectMapper;
import org.gcube.documentstore.records.implementation.AbstractRecord;
-import com.fasterxml.jackson.core.JsonGenerationException;
-import com.fasterxml.jackson.core.JsonParseException;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
/**
* @author Luca Frosini (ISTI - CNR)
*/
diff --git a/src/main/java/org/gcube/documentstore/records/IdentifiableDeserializableModule.java b/src/main/java/org/gcube/documentstore/records/IdentifiableDeserializableModule.java
index 868275b..b91bd8e 100644
--- a/src/main/java/org/gcube/documentstore/records/IdentifiableDeserializableModule.java
+++ b/src/main/java/org/gcube/documentstore/records/IdentifiableDeserializableModule.java
@@ -2,8 +2,8 @@ package org.gcube.documentstore.records;
import java.io.Serializable;
-import com.fasterxml.jackson.databind.deser.std.StringDeserializer;
-import com.fasterxml.jackson.databind.module.SimpleModule;
+import org.gcube.com.fasterxml.jackson.databind.deser.std.StringDeserializer;
+import org.gcube.com.fasterxml.jackson.databind.module.SimpleModule;
public class IdentifiableDeserializableModule extends SimpleModule {
/**
diff --git a/src/main/java/org/gcube/documentstore/records/Record.java b/src/main/java/org/gcube/documentstore/records/Record.java
index 467aed1..55470f4 100644
--- a/src/main/java/org/gcube/documentstore/records/Record.java
+++ b/src/main/java/org/gcube/documentstore/records/Record.java
@@ -9,14 +9,13 @@ import java.util.Map;
import java.util.Set;
import java.util.SortedSet;
+import org.gcube.com.fasterxml.jackson.annotation.JsonAnyGetter;
+import org.gcube.com.fasterxml.jackson.annotation.JsonAnySetter;
+import org.gcube.com.fasterxml.jackson.annotation.JsonIgnore;
+import org.gcube.com.fasterxml.jackson.annotation.JsonTypeInfo;
import org.gcube.documentstore.exception.InvalidValueException;
import org.gcube.documentstore.records.implementation.RequiredField;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-
/**
* @author Luca Frosini (ISTI - CNR)
*
diff --git a/src/main/java/org/gcube/documentstore/records/RecordUtility.java b/src/main/java/org/gcube/documentstore/records/RecordUtility.java
index e4565e6..217768c 100644
--- a/src/main/java/org/gcube/documentstore/records/RecordUtility.java
+++ b/src/main/java/org/gcube/documentstore/records/RecordUtility.java
@@ -12,12 +12,11 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
+import org.gcube.com.fasterxml.jackson.databind.JsonNode;
import org.gcube.documentstore.exception.InvalidValueException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.fasterxml.jackson.databind.JsonNode;
-
/**
* @author Luca Frosini (ISTI - CNR)
*/
diff --git a/src/main/java/org/gcube/documentstore/records/implementation/AbstractRecord.java b/src/main/java/org/gcube/documentstore/records/implementation/AbstractRecord.java
index d043ab3..c87e7e6 100644
--- a/src/main/java/org/gcube/documentstore/records/implementation/AbstractRecord.java
+++ b/src/main/java/org/gcube/documentstore/records/implementation/AbstractRecord.java
@@ -19,6 +19,7 @@ import java.util.SortedSet;
import java.util.TreeSet;
import java.util.UUID;
+import org.gcube.com.fasterxml.jackson.annotation.JsonIgnore;
import org.gcube.documentstore.exception.InvalidValueException;
import org.gcube.documentstore.records.AggregatedRecord;
import org.gcube.documentstore.records.Record;
@@ -28,8 +29,6 @@ import org.gcube.documentstore.records.implementation.validations.validators.Val
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-
/**
* @author Luca Frosini (ISTI - CNR)