diff --git a/pom.xml b/pom.xml
index e029f3f..b0571c3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
org.gcube.accounting
accounting-lib
- 3.6.0-SNAPSHOT
+ 4.0.0-SNAPSHOT
Accounting Library
Accounting Library
@@ -30,7 +30,7 @@
org.gcube.distribution
gcube-bom
- 1.4.0
+ 2.0.0-SNAPSHOT
pom
import
@@ -59,8 +59,8 @@
slf4j-api
- com.fasterxml.jackson.core
- jackson-databind
+ org.gcube.common
+ gcube-jackson-databind
diff --git a/src/main/java/org/gcube/accounting/aggregator/RegexRulesAggregator.java b/src/main/java/org/gcube/accounting/aggregator/RegexRulesAggregator.java
index c714422..3e492f2 100644
--- a/src/main/java/org/gcube/accounting/aggregator/RegexRulesAggregator.java
+++ b/src/main/java/org/gcube/accounting/aggregator/RegexRulesAggregator.java
@@ -10,14 +10,13 @@ import java.util.concurrent.TimeUnit;
import org.gcube.accounting.datamodel.validations.validators.MatcherReplace;
import org.gcube.accounting.persistence.AccountingPersistenceConfiguration;
+import org.gcube.com.fasterxml.jackson.databind.JavaType;
+import org.gcube.com.fasterxml.jackson.databind.ObjectMapper;
import org.gcube.documentstore.persistence.ExecutorUtils;
import org.gcube.documentstore.records.DSMapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
public class RegexRulesAggregator implements Runnable {
private static final Logger logger = LoggerFactory.getLogger(RegexRulesAggregator.class);
diff --git a/src/main/java/org/gcube/accounting/datamodel/BasicUsageRecord.java b/src/main/java/org/gcube/accounting/datamodel/BasicUsageRecord.java
index c1ae3be..8683e57 100644
--- a/src/main/java/org/gcube/accounting/datamodel/BasicUsageRecord.java
+++ b/src/main/java/org/gcube/accounting/datamodel/BasicUsageRecord.java
@@ -9,6 +9,7 @@ import java.util.SortedSet;
import org.gcube.accounting.datamodel.validations.annotations.ValidOperationResult;
import org.gcube.accounting.datamodel.validations.validators.ValidOperationResultValidator;
+import org.gcube.com.fasterxml.jackson.annotation.JsonIgnore;
import org.gcube.common.authorization.client.Constants;
import org.gcube.common.authorization.library.AuthorizationEntry;
import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
@@ -20,8 +21,6 @@ import org.gcube.documentstore.records.implementation.validations.annotations.No
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-
/**
* @author Luca Frosini (ISTI - CNR)
*/
diff --git a/src/main/java/org/gcube/accounting/datamodel/UsageRecord.java b/src/main/java/org/gcube/accounting/datamodel/UsageRecord.java
index 2d2811d..24a18ad 100644
--- a/src/main/java/org/gcube/accounting/datamodel/UsageRecord.java
+++ b/src/main/java/org/gcube/accounting/datamodel/UsageRecord.java
@@ -2,11 +2,10 @@ package org.gcube.accounting.datamodel;
import java.io.Serializable;
+import org.gcube.com.fasterxml.jackson.annotation.JsonIgnore;
import org.gcube.documentstore.exception.InvalidValueException;
import org.gcube.documentstore.records.Record;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-
/**
* @author Luca Frosini (ISTI - CNR)
*/
diff --git a/src/main/java/org/gcube/accounting/datamodel/aggregation/AggregatedJobUsageRecord.java b/src/main/java/org/gcube/accounting/datamodel/aggregation/AggregatedJobUsageRecord.java
index 6744a71..aab8277 100644
--- a/src/main/java/org/gcube/accounting/datamodel/aggregation/AggregatedJobUsageRecord.java
+++ b/src/main/java/org/gcube/accounting/datamodel/aggregation/AggregatedJobUsageRecord.java
@@ -11,6 +11,8 @@ import org.gcube.accounting.datamodel.AggregatedUsageRecord;
import org.gcube.accounting.datamodel.basetypes.AbstractJobUsageRecord;
import org.gcube.accounting.datamodel.basetypes.AbstractServiceUsageRecord;
import org.gcube.accounting.datamodel.usagerecords.JobUsageRecord;
+import org.gcube.com.fasterxml.jackson.annotation.JsonIgnore;
+import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName;
import org.gcube.documentstore.exception.InvalidValueException;
import org.gcube.documentstore.exception.NotAggregatableRecordsExceptions;
import org.gcube.documentstore.records.aggregation.AggregationUtility;
@@ -18,9 +20,6 @@ import org.gcube.documentstore.records.implementation.AggregatedField;
import org.gcube.documentstore.records.implementation.RequiredField;
import org.gcube.documentstore.records.implementation.validations.annotations.ValidLong;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-
/**
* This Class is for library internal use only
* @author Luca Frosini (ISTI - CNR)
diff --git a/src/main/java/org/gcube/accounting/datamodel/aggregation/AggregatedPortletUsageRecord.java b/src/main/java/org/gcube/accounting/datamodel/aggregation/AggregatedPortletUsageRecord.java
index 5f047e6..11ede7b 100644
--- a/src/main/java/org/gcube/accounting/datamodel/aggregation/AggregatedPortletUsageRecord.java
+++ b/src/main/java/org/gcube/accounting/datamodel/aggregation/AggregatedPortletUsageRecord.java
@@ -10,12 +10,11 @@ import java.util.Map;
import org.gcube.accounting.datamodel.AggregatedUsageRecord;
import org.gcube.accounting.datamodel.basetypes.AbstractPortletUsageRecord;
import org.gcube.accounting.datamodel.usagerecords.PortletUsageRecord;
+import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName;
import org.gcube.documentstore.exception.InvalidValueException;
import org.gcube.documentstore.exception.NotAggregatableRecordsExceptions;
import org.gcube.documentstore.records.aggregation.AggregationUtility;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-
/**
* This Class is for library internal use only
* @author Luca Frosini (ISTI - CNR)
diff --git a/src/main/java/org/gcube/accounting/datamodel/aggregation/AggregatedServiceUsageRecord.java b/src/main/java/org/gcube/accounting/datamodel/aggregation/AggregatedServiceUsageRecord.java
index 79020f0..e85cf30 100644
--- a/src/main/java/org/gcube/accounting/datamodel/aggregation/AggregatedServiceUsageRecord.java
+++ b/src/main/java/org/gcube/accounting/datamodel/aggregation/AggregatedServiceUsageRecord.java
@@ -10,6 +10,8 @@ import java.util.Map;
import org.gcube.accounting.datamodel.AggregatedUsageRecord;
import org.gcube.accounting.datamodel.basetypes.AbstractServiceUsageRecord;
import org.gcube.accounting.datamodel.usagerecords.ServiceUsageRecord;
+import org.gcube.com.fasterxml.jackson.annotation.JsonIgnore;
+import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName;
import org.gcube.documentstore.exception.InvalidValueException;
import org.gcube.documentstore.exception.NotAggregatableRecordsExceptions;
import org.gcube.documentstore.records.aggregation.AggregationUtility;
@@ -17,9 +19,6 @@ import org.gcube.documentstore.records.implementation.AggregatedField;
import org.gcube.documentstore.records.implementation.RequiredField;
import org.gcube.documentstore.records.implementation.validations.annotations.ValidLong;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-
/**
* This Class is for library internal use only
* @author Luca Frosini (ISTI - CNR)
diff --git a/src/main/java/org/gcube/accounting/datamodel/aggregation/AggregatedStorageStatusRecord.java b/src/main/java/org/gcube/accounting/datamodel/aggregation/AggregatedStorageStatusRecord.java
index b6d44b8..ef98f48 100644
--- a/src/main/java/org/gcube/accounting/datamodel/aggregation/AggregatedStorageStatusRecord.java
+++ b/src/main/java/org/gcube/accounting/datamodel/aggregation/AggregatedStorageStatusRecord.java
@@ -10,13 +10,12 @@ import java.util.Map;
import org.gcube.accounting.datamodel.AggregatedUsageRecord;
import org.gcube.accounting.datamodel.basetypes.AbstractStorageStatusRecord;
import org.gcube.accounting.datamodel.usagerecords.StorageStatusRecord;
+import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName;
import org.gcube.documentstore.exception.InvalidValueException;
import org.gcube.documentstore.exception.NotAggregatableRecordsExceptions;
import org.gcube.documentstore.records.aggregation.AggregationUtility;
import org.gcube.documentstore.records.implementation.AggregatedField;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-
/**
* This Class is for library internal use only
* @author Alessandro Pieve (ISTI - CNR) alessandro.pieve@isti.cnr.it
diff --git a/src/main/java/org/gcube/accounting/datamodel/aggregation/AggregatedStorageUsageRecord.java b/src/main/java/org/gcube/accounting/datamodel/aggregation/AggregatedStorageUsageRecord.java
index 0a59d11..25b4ec8 100644
--- a/src/main/java/org/gcube/accounting/datamodel/aggregation/AggregatedStorageUsageRecord.java
+++ b/src/main/java/org/gcube/accounting/datamodel/aggregation/AggregatedStorageUsageRecord.java
@@ -10,13 +10,12 @@ import java.util.Map;
import org.gcube.accounting.datamodel.AggregatedUsageRecord;
import org.gcube.accounting.datamodel.basetypes.AbstractStorageUsageRecord;
import org.gcube.accounting.datamodel.usagerecords.StorageUsageRecord;
+import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName;
import org.gcube.documentstore.exception.InvalidValueException;
import org.gcube.documentstore.exception.NotAggregatableRecordsExceptions;
import org.gcube.documentstore.records.aggregation.AggregationUtility;
import org.gcube.documentstore.records.implementation.AggregatedField;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-
/**
* This Class is for library internal use only
* @author Luca Frosini (ISTI - CNR)
diff --git a/src/main/java/org/gcube/accounting/datamodel/basetypes/AbstractJobUsageRecord.java b/src/main/java/org/gcube/accounting/datamodel/basetypes/AbstractJobUsageRecord.java
index a01ceda..7e7d3c7 100644
--- a/src/main/java/org/gcube/accounting/datamodel/basetypes/AbstractJobUsageRecord.java
+++ b/src/main/java/org/gcube/accounting/datamodel/basetypes/AbstractJobUsageRecord.java
@@ -7,13 +7,12 @@ import java.io.Serializable;
import java.util.Map;
import org.gcube.accounting.datamodel.BasicUsageRecord;
+import org.gcube.com.fasterxml.jackson.annotation.JsonIgnore;
import org.gcube.documentstore.exception.InvalidValueException;
import org.gcube.documentstore.records.implementation.RequiredField;
import org.gcube.documentstore.records.implementation.validations.annotations.NotEmpty;
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/accounting/datamodel/basetypes/AbstractPortletUsageRecord.java b/src/main/java/org/gcube/accounting/datamodel/basetypes/AbstractPortletUsageRecord.java
index 265092f..696da4b 100644
--- a/src/main/java/org/gcube/accounting/datamodel/basetypes/AbstractPortletUsageRecord.java
+++ b/src/main/java/org/gcube/accounting/datamodel/basetypes/AbstractPortletUsageRecord.java
@@ -7,13 +7,12 @@ import java.io.Serializable;
import java.util.Map;
import org.gcube.accounting.datamodel.BasicUsageRecord;
+import org.gcube.com.fasterxml.jackson.annotation.JsonIgnore;
import org.gcube.documentstore.exception.InvalidValueException;
import org.gcube.documentstore.records.implementation.RequiredField;
import org.gcube.documentstore.records.implementation.validations.annotations.NotEmpty;
import org.gcube.documentstore.records.implementation.validations.annotations.NotEmptyIfNotNull;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-
/**
* @author Luca Frosini (ISTI - CNR)
*/
diff --git a/src/main/java/org/gcube/accounting/datamodel/basetypes/AbstractServiceUsageRecord.java b/src/main/java/org/gcube/accounting/datamodel/basetypes/AbstractServiceUsageRecord.java
index b009623..97b663c 100644
--- a/src/main/java/org/gcube/accounting/datamodel/basetypes/AbstractServiceUsageRecord.java
+++ b/src/main/java/org/gcube/accounting/datamodel/basetypes/AbstractServiceUsageRecord.java
@@ -8,13 +8,12 @@ import java.util.Map;
import org.gcube.accounting.datamodel.BasicUsageRecord;
import org.gcube.accounting.datamodel.validations.annotations.Harmonize;
+import org.gcube.com.fasterxml.jackson.annotation.JsonIgnore;
import org.gcube.documentstore.exception.InvalidValueException;
import org.gcube.documentstore.records.implementation.RequiredField;
import org.gcube.documentstore.records.implementation.validations.annotations.NotEmpty;
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/accounting/datamodel/basetypes/AbstractStorageStatusRecord.java b/src/main/java/org/gcube/accounting/datamodel/basetypes/AbstractStorageStatusRecord.java
index 6b07f73..a9b7c7b 100644
--- a/src/main/java/org/gcube/accounting/datamodel/basetypes/AbstractStorageStatusRecord.java
+++ b/src/main/java/org/gcube/accounting/datamodel/basetypes/AbstractStorageStatusRecord.java
@@ -11,13 +11,12 @@ import org.gcube.accounting.datamodel.BasicUsageRecord;
import org.gcube.accounting.datamodel.validations.annotations.FixDataVolumeSign;
import org.gcube.accounting.datamodel.validations.annotations.ValidDataTypeVolume;
import org.gcube.accounting.datamodel.validations.annotations.ValidURI;
+import org.gcube.com.fasterxml.jackson.annotation.JsonIgnore;
import org.gcube.documentstore.exception.InvalidValueException;
import org.gcube.documentstore.records.implementation.RequiredField;
import org.gcube.documentstore.records.implementation.validations.annotations.NotEmpty;
import org.gcube.documentstore.records.implementation.validations.annotations.ValidLong;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-
/**
* @author Alessandro Pieve (ISTI - CNR) alessandro.pieve@isti.cnr.it
* @author Luca Frosini (ISTI - CNR)
diff --git a/src/main/java/org/gcube/accounting/datamodel/basetypes/AbstractStorageUsageRecord.java b/src/main/java/org/gcube/accounting/datamodel/basetypes/AbstractStorageUsageRecord.java
index 750b795..5ad4bae 100644
--- a/src/main/java/org/gcube/accounting/datamodel/basetypes/AbstractStorageUsageRecord.java
+++ b/src/main/java/org/gcube/accounting/datamodel/basetypes/AbstractStorageUsageRecord.java
@@ -12,14 +12,13 @@ import org.gcube.accounting.datamodel.validations.annotations.FixDataVolumeSign;
import org.gcube.accounting.datamodel.validations.annotations.ValidDataType;
import org.gcube.accounting.datamodel.validations.annotations.ValidOperationType;
import org.gcube.accounting.datamodel.validations.annotations.ValidURI;
+import org.gcube.com.fasterxml.jackson.annotation.JsonIgnore;
import org.gcube.documentstore.exception.InvalidValueException;
import org.gcube.documentstore.records.implementation.RequiredField;
import org.gcube.documentstore.records.implementation.validations.annotations.NotEmpty;
import org.gcube.documentstore.records.implementation.validations.annotations.NotEmptyIfNotNull;
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/accounting/datamodel/usagerecords/JobUsageRecord.java b/src/main/java/org/gcube/accounting/datamodel/usagerecords/JobUsageRecord.java
index 08b7452..1f15f33 100644
--- a/src/main/java/org/gcube/accounting/datamodel/usagerecords/JobUsageRecord.java
+++ b/src/main/java/org/gcube/accounting/datamodel/usagerecords/JobUsageRecord.java
@@ -4,10 +4,9 @@ import java.io.Serializable;
import java.util.Map;
import org.gcube.accounting.datamodel.basetypes.AbstractJobUsageRecord;
+import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName;
import org.gcube.documentstore.exception.InvalidValueException;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-
/**
* @author Luca Frosini (ISTI - CNR)
*/
diff --git a/src/main/java/org/gcube/accounting/datamodel/usagerecords/PortletUsageRecord.java b/src/main/java/org/gcube/accounting/datamodel/usagerecords/PortletUsageRecord.java
index b2e2339..0dfbed3 100644
--- a/src/main/java/org/gcube/accounting/datamodel/usagerecords/PortletUsageRecord.java
+++ b/src/main/java/org/gcube/accounting/datamodel/usagerecords/PortletUsageRecord.java
@@ -4,10 +4,9 @@ import java.io.Serializable;
import java.util.Map;
import org.gcube.accounting.datamodel.basetypes.AbstractPortletUsageRecord;
+import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName;
import org.gcube.documentstore.exception.InvalidValueException;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-
/**
* @author Luca Frosini (ISTI - CNR)
*/
diff --git a/src/main/java/org/gcube/accounting/datamodel/usagerecords/ServiceUsageRecord.java b/src/main/java/org/gcube/accounting/datamodel/usagerecords/ServiceUsageRecord.java
index 39cd9c6..b46c1ac 100644
--- a/src/main/java/org/gcube/accounting/datamodel/usagerecords/ServiceUsageRecord.java
+++ b/src/main/java/org/gcube/accounting/datamodel/usagerecords/ServiceUsageRecord.java
@@ -4,10 +4,9 @@ import java.io.Serializable;
import java.util.Map;
import org.gcube.accounting.datamodel.basetypes.AbstractServiceUsageRecord;
+import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName;
import org.gcube.documentstore.exception.InvalidValueException;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-
/**
* @author Luca Frosini (ISTI - CNR)
*/
diff --git a/src/main/java/org/gcube/accounting/datamodel/usagerecords/StorageStatusRecord.java b/src/main/java/org/gcube/accounting/datamodel/usagerecords/StorageStatusRecord.java
index 88fdf3a..a852beb 100644
--- a/src/main/java/org/gcube/accounting/datamodel/usagerecords/StorageStatusRecord.java
+++ b/src/main/java/org/gcube/accounting/datamodel/usagerecords/StorageStatusRecord.java
@@ -4,9 +4,8 @@ import java.io.Serializable;
import java.util.Map;
import org.gcube.accounting.datamodel.basetypes.AbstractStorageStatusRecord;
+import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName;
import org.gcube.documentstore.exception.InvalidValueException;
-
-import com.fasterxml.jackson.annotation.JsonTypeName;
/**
* @author Alessandro Pieve (ISTI - CNR) alessandro.pieve@isti.cnr.it
*
diff --git a/src/main/java/org/gcube/accounting/datamodel/usagerecords/StorageUsageRecord.java b/src/main/java/org/gcube/accounting/datamodel/usagerecords/StorageUsageRecord.java
index 3763280..54ade8e 100644
--- a/src/main/java/org/gcube/accounting/datamodel/usagerecords/StorageUsageRecord.java
+++ b/src/main/java/org/gcube/accounting/datamodel/usagerecords/StorageUsageRecord.java
@@ -4,10 +4,9 @@ import java.io.Serializable;
import java.util.Map;
import org.gcube.accounting.datamodel.basetypes.AbstractStorageUsageRecord;
+import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName;
import org.gcube.documentstore.exception.InvalidValueException;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-
/**
* @author Luca Frosini (ISTI - CNR)
*/
diff --git a/src/main/java/org/gcube/accounting/datamodel/validations/validators/MatcherReplace.java b/src/main/java/org/gcube/accounting/datamodel/validations/validators/MatcherReplace.java
index f73853d..44744ba 100644
--- a/src/main/java/org/gcube/accounting/datamodel/validations/validators/MatcherReplace.java
+++ b/src/main/java/org/gcube/accounting/datamodel/validations/validators/MatcherReplace.java
@@ -2,11 +2,10 @@ package org.gcube.accounting.datamodel.validations.validators;
import java.util.regex.Matcher;
+import org.gcube.com.fasterxml.jackson.annotation.JsonSetter;
import org.gcube.documentstore.exception.InvalidValueException;
import org.gcube.documentstore.records.DSMapper;
-import com.fasterxml.jackson.annotation.JsonSetter;
-
public class MatcherReplace {
protected MultiMatcher multiMatcher;
diff --git a/src/main/java/org/gcube/accounting/datamodel/validations/validators/MultiMatcher.java b/src/main/java/org/gcube/accounting/datamodel/validations/validators/MultiMatcher.java
index 7b0987d..4f5188b 100644
--- a/src/main/java/org/gcube/accounting/datamodel/validations/validators/MultiMatcher.java
+++ b/src/main/java/org/gcube/accounting/datamodel/validations/validators/MultiMatcher.java
@@ -2,7 +2,7 @@ package org.gcube.accounting.datamodel.validations.validators;
import java.util.regex.Pattern;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+import org.gcube.com.fasterxml.jackson.annotation.JsonIgnore;
public class MultiMatcher {
diff --git a/src/main/java/org/gcube/accounting/persistence/AccountingPersistenceFactory.java b/src/main/java/org/gcube/accounting/persistence/AccountingPersistenceFactory.java
index c5728ed..4f5f34d 100644
--- a/src/main/java/org/gcube/accounting/persistence/AccountingPersistenceFactory.java
+++ b/src/main/java/org/gcube/accounting/persistence/AccountingPersistenceFactory.java
@@ -3,12 +3,9 @@
*/
package org.gcube.accounting.persistence;
-import java.util.HashMap;
-import java.util.Map;
import java.util.concurrent.TimeUnit;
import org.gcube.accounting.aggregator.RegexRulesAggregator;
-import org.gcube.accounting.datamodel.BasicUsageRecord;
import org.gcube.accounting.datamodel.aggregation.AggregatedServiceUsageRecord;
import org.gcube.accounting.datamodel.usagerecords.ServiceUsageRecord;
import org.gcube.documentstore.persistence.PersistenceBackendFactory;
@@ -20,7 +17,10 @@ public class AccountingPersistenceFactory {
private AccountingPersistenceFactory(){}
- protected final static Map persistences;
+ //protected final static Map persistences;
+
+ protected final static AccountingPersistence accountingPersistence;
+
public static void initAccountingPackages(){
PersistenceBackendFactory.addRecordPackage(ServiceUsageRecord.class.getPackage());
@@ -28,7 +28,8 @@ public class AccountingPersistenceFactory {
}
static {
- persistences = new HashMap();
+ //persistences = new HashMap();
+ accountingPersistence = new AccountingPersistence(null);
initAccountingPackages();
}
@@ -37,12 +38,14 @@ public class AccountingPersistenceFactory {
}
public synchronized static AccountingPersistence getPersistence() {
+ /*
String context = BasicUsageRecord.getContextFromToken();
AccountingPersistence accountingPersistence = persistences.get(context);
if(accountingPersistence==null){
accountingPersistence = new AccountingPersistence(context);
persistences.put(context, accountingPersistence);
}
+ */
return accountingPersistence;
}
diff --git a/src/test/java/org/gcube/accounting/aggregator/HarmonizerTest.java b/src/test/java/org/gcube/accounting/aggregator/HarmonizerTest.java
index 9d638ed..c087f58 100644
--- a/src/test/java/org/gcube/accounting/aggregator/HarmonizerTest.java
+++ b/src/test/java/org/gcube/accounting/aggregator/HarmonizerTest.java
@@ -4,14 +4,13 @@ import java.io.InputStream;
import java.util.List;
import org.gcube.accounting.datamodel.validations.validators.MatcherReplace;
+import org.gcube.com.fasterxml.jackson.databind.ObjectMapper;
import org.gcube.documentstore.records.DSMapper;
import org.gcube.testutility.ContextTest;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
public class HarmonizerTest extends ContextTest {
private static final Logger logger = LoggerFactory.getLogger(HarmonizerTest.class);
diff --git a/src/test/java/org/gcube/accounting/datamodel/aggregation/AggregatedServiceUsageRecordTest.java b/src/test/java/org/gcube/accounting/datamodel/aggregation/AggregatedServiceUsageRecordTest.java
index 27a1aee..c08aa6e 100644
--- a/src/test/java/org/gcube/accounting/datamodel/aggregation/AggregatedServiceUsageRecordTest.java
+++ b/src/test/java/org/gcube/accounting/datamodel/aggregation/AggregatedServiceUsageRecordTest.java
@@ -7,6 +7,7 @@ import java.util.Set;
import org.gcube.accounting.datamodel.usagerecords.ServiceUsageRecord;
import org.gcube.accounting.datamodel.usagerecords.ServiceUsageRecordTest;
+import org.gcube.com.fasterxml.jackson.core.JsonProcessingException;
import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
import org.gcube.common.scope.api.ScopeProvider;
import org.gcube.documentstore.exception.InvalidValueException;
@@ -19,8 +20,6 @@ import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.fasterxml.jackson.core.JsonProcessingException;
-
/**
* @author Luca Frosini (ISTI - CNR)
*
diff --git a/src/test/java/org/gcube/accounting/datamodel/usagerecords/ServiceUsageRecordTest.java b/src/test/java/org/gcube/accounting/datamodel/usagerecords/ServiceUsageRecordTest.java
index f221361..15ddf0d 100644
--- a/src/test/java/org/gcube/accounting/datamodel/usagerecords/ServiceUsageRecordTest.java
+++ b/src/test/java/org/gcube/accounting/datamodel/usagerecords/ServiceUsageRecordTest.java
@@ -126,6 +126,18 @@ public class ServiceUsageRecordTest extends ContextTest {
}
+ @Test
+ public void testDeserialization2() throws Exception{
+ RecordUtility.addRecordPackage(ServiceUsageRecord.class.getPackage());
+ RecordUtility.addRecordPackage(AggregatedServiceUsageRecord.class.getPackage());
+
+ String line = "{\"recordType\":\"ServiceUsageRecord\",\"operationCount\":1,\"creationTime\":1591043453061,\"serviceClass\":\"DataAnalysis\",\"callerHost\":\"80.134.224.170\",\"callerQualifier\": \"TOKEN\",\"consumerId\":\"lisa.chong8594\",\"aggregated\":true,\"serviceName\":\"RConnector\",\"duration\":5328,\"maxInvocationTime\":5328,\"scope\":\"/d4science.research-infrastructures.eu/gCubeApps/StockAssessment\",\"host\":\"rstudio.d4science.org:80\",\"startTime\":1591043453058,\"id\":\"ec925c66-a7e9-4b2a-b0bd-8896ba24edab\",\"calledMethod\":\"/gcube/service/connect\",\"endTime\":1591043453058,\"minInvocationTime\":5328,\"operationResult\":\"SUCCESS\"}";
+ Record record = RecordUtility.getRecord(line);
+
+ logger.debug("{}", record);
+
+ }
+
@Test
public void aRegexReplaceTest() throws Exception{
RecordUtility.addRecordPackage(ServiceUsageRecord.class.getPackage());
diff --git a/src/test/java/org/gcube/accounting/datamodel/validations/validators/TestRules.java b/src/test/java/org/gcube/accounting/datamodel/validations/validators/TestRules.java
index c6484e6..f64f9c7 100644
--- a/src/test/java/org/gcube/accounting/datamodel/validations/validators/TestRules.java
+++ b/src/test/java/org/gcube/accounting/datamodel/validations/validators/TestRules.java
@@ -14,6 +14,7 @@ import java.util.Map;
import org.gcube.accounting.aggregator.RegexRulesAggregator;
import org.gcube.accounting.datamodel.aggregation.AggregatedServiceUsageRecord;
import org.gcube.accounting.datamodel.usagerecords.ServiceUsageRecord;
+import org.gcube.com.fasterxml.jackson.databind.ObjectMapper;
import org.gcube.documentstore.exception.NotAggregatableRecordsExceptions;
import org.gcube.documentstore.records.DSMapper;
import org.gcube.testutility.ContextTest;
@@ -23,8 +24,6 @@ import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
public class TestRules extends ContextTest {
private static final Logger logger = LoggerFactory.getLogger(TestRules.class);