From 96979e9289ad6a26118cad71f5877a05b96038b1 Mon Sep 17 00:00:00 2001 From: lucio Date: Mon, 13 Jun 2022 11:26:42 +0200 Subject: [PATCH] removed old providers moving to smartgears 4 --- CHANGELOG.md | 5 ++++ pom.xml | 4 +-- .../datamodel/BasicUsageRecord.java | 27 ++++--------------- .../AccountingPersistenceConfiguration.java | 9 ++++--- .../AggregatedJobUsageRecordTest.java | 12 +-------- .../AggregatedServiceUsageRecordTest.java | 10 ------- .../AggregatedStorageStatusRecordTest.java | 10 ------- .../AggregatedStorageUsageRecordTest.java | 10 ------- .../usagerecords/JobUsageRecordTest.java | 6 ----- .../usagerecords/ServiceUsageRecordTest.java | 6 ----- .../usagerecords/StorageStatusRecordTest.java | 6 ----- .../usagerecords/StorageUsageRecordTest.java | 6 ----- .../org/gcube/testutility/ContextTest.java | 8 ------ 13 files changed, 18 insertions(+), 101 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ecf36a7..efc1aaf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm # Changelog for Accounting Library +## [v5.0.0-SNAPSHOT] + +- removed old Providers + + ## [v4.2.0-SNAPSHOT] - diff --git a/pom.xml b/pom.xml index 1e4d83a..134745b 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ org.gcube.accounting accounting-lib - 4.2.0-SNAPSHOT + 5.0.0-SNAPSHOT Accounting Library Accounting Library @@ -30,7 +30,7 @@ org.gcube.distribution gcube-bom - 2.0.1 + 3.0.0-SNAPSHOT pom import diff --git a/src/main/java/org/gcube/accounting/datamodel/BasicUsageRecord.java b/src/main/java/org/gcube/accounting/datamodel/BasicUsageRecord.java index 8683e57..e331d9a 100644 --- a/src/main/java/org/gcube/accounting/datamodel/BasicUsageRecord.java +++ b/src/main/java/org/gcube/accounting/datamodel/BasicUsageRecord.java @@ -10,10 +10,8 @@ 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; -import org.gcube.common.scope.api.ScopeProvider; +import org.gcube.common.security.providers.SecretManagerProvider; +import org.gcube.common.security.secrets.Secret; import org.gcube.documentstore.exception.InvalidValueException; import org.gcube.documentstore.records.implementation.AbstractRecord; import org.gcube.documentstore.records.implementation.RequiredField; @@ -45,23 +43,7 @@ public abstract class BasicUsageRecord extends AbstractRecord implements UsageRe @ValidOperationResult public static final String OPERATION_RESULT = UsageRecord.OPERATION_RESULT; - public static String getContextFromToken() { - - String scope = ScopeProvider.instance.get(); - if (scope == null) { - String token = SecurityTokenProvider.instance.get(); - - AuthorizationEntry authorizationEntry; - try { - authorizationEntry = Constants.authorizationService().get(token); - } catch (Exception e) { - throw new RuntimeException(e); - } - scope = authorizationEntry.getContext(); - } - return scope; - } - + /** * Initialize variable */ @@ -69,7 +51,8 @@ public abstract class BasicUsageRecord extends AbstractRecord implements UsageRe super.init(); // Backward compatibility try { - this.setScope(getContextFromToken()); + Secret secret = SecretManagerProvider.instance.get(); + this.setScope(secret.getContext()); } catch (Exception e) { logger.warn( "Unable to automaticcally set the scope using scope provider. The record will not be valid if the scope will not be explicitly set."); diff --git a/src/main/java/org/gcube/accounting/persistence/AccountingPersistenceConfiguration.java b/src/main/java/org/gcube/accounting/persistence/AccountingPersistenceConfiguration.java index ba333d2..bba86c1 100644 --- a/src/main/java/org/gcube/accounting/persistence/AccountingPersistenceConfiguration.java +++ b/src/main/java/org/gcube/accounting/persistence/AccountingPersistenceConfiguration.java @@ -6,12 +6,12 @@ package org.gcube.accounting.persistence; import java.util.List; import java.util.Map; -import org.gcube.accounting.datamodel.BasicUsageRecord; import org.gcube.common.encryption.encrypter.StringEncrypter; import org.gcube.common.resources.gcore.ServiceEndpoint; import org.gcube.common.resources.gcore.ServiceEndpoint.AccessPoint; import org.gcube.common.resources.gcore.ServiceEndpoint.Property; import org.gcube.common.resources.gcore.utils.Group; +import org.gcube.common.security.providers.SecretManagerProvider; import org.gcube.documentstore.persistence.PersistenceBackendConfiguration; import org.gcube.resources.discovery.client.api.DiscoveryClient; import org.gcube.resources.discovery.client.queries.api.SimpleQuery; @@ -41,12 +41,13 @@ public class AccountingPersistenceConfiguration extends PersistenceBackendConfig public AccountingPersistenceConfiguration(Class clz) throws Exception { super(); + String context = SecretManagerProvider.instance.get().getContext(); try { ServiceEndpoint serviceEndpoint = getServiceEndpoint(SERVICE_ENDPOINT_CATEGORY, SERVICE_ENDPOINT_NAME, clz); setValues(serviceEndpoint, clz); }catch (Exception e) { - logger.error("Error while instancing {} in context {}", this.getClass().getSimpleName(), - BasicUsageRecord.getContextFromToken(), e); + logger.error("Error while instancing {} in context {}", this.getClass().getSimpleName(), context + , e); } } @@ -65,7 +66,7 @@ public class AccountingPersistenceConfiguration extends PersistenceBackendConfig DiscoveryClient client = ICFactory.clientFor(ServiceEndpoint.class); List serviceEndpoints = client.submit(query); if(serviceEndpoints.size()>1){ - String scope = BasicUsageRecord.getContextFromToken(); + String scope = SecretManagerProvider.instance.get().getContext(); query.addCondition(String.format("$resource/Profile/AccessPoint/Properties/Property/Name/text() eq '%s'", TARGET_SCOPE)); query.addCondition(String.format("$resource/Profile/AccessPoint/Properties/Property/Value/text() eq '%s'", scope)); serviceEndpoints = client.submit(query); diff --git a/src/test/java/org/gcube/accounting/datamodel/aggregation/AggregatedJobUsageRecordTest.java b/src/test/java/org/gcube/accounting/datamodel/aggregation/AggregatedJobUsageRecordTest.java index 2d8045a..3b7f1c7 100644 --- a/src/test/java/org/gcube/accounting/datamodel/aggregation/AggregatedJobUsageRecordTest.java +++ b/src/test/java/org/gcube/accounting/datamodel/aggregation/AggregatedJobUsageRecordTest.java @@ -7,8 +7,6 @@ import java.util.Set; import org.gcube.accounting.datamodel.usagerecords.JobUsageRecord; import org.gcube.accounting.datamodel.usagerecords.JobUsageRecordTest; -import org.gcube.common.authorization.library.provider.SecurityTokenProvider; -import org.gcube.common.scope.api.ScopeProvider; import org.gcube.documentstore.exception.InvalidValueException; import org.gcube.documentstore.exception.NotAggregatableRecordsExceptions; import org.gcube.testutility.ContextTest; @@ -27,8 +25,6 @@ public class AggregatedJobUsageRecordTest extends ContextTest { @Test public void testRequiredFields() throws InvalidValueException { - SecurityTokenProvider.instance.reset(); - ScopeProvider.instance.reset(); JobUsageRecord jobUsageRecord = TestUsageRecord.createTestJobUsageRecord(); Assert.assertTrue(jobUsageRecord.getScope()==null); @@ -56,9 +52,7 @@ public class AggregatedJobUsageRecordTest extends ContextTest { @Test public void secondAsNotAggregated() throws InvalidValueException, NotAggregatableRecordsExceptions { - SecurityTokenProvider.instance.reset(); - ScopeProvider.instance.reset(); - + JobUsageRecord jobUsageRecord = TestUsageRecord.createTestJobUsageRecord(); Assert.assertTrue(jobUsageRecord.getScope()==null); jobUsageRecord.setScope(TestUsageRecord.TEST_SCOPE); @@ -105,8 +99,6 @@ public class AggregatedJobUsageRecordTest extends ContextTest { @Test public void secondAsAggregated() throws InvalidValueException, NotAggregatableRecordsExceptions { - SecurityTokenProvider.instance.reset(); - ScopeProvider.instance.reset(); JobUsageRecord jobUsageRecord = TestUsageRecord.createTestJobUsageRecord(); Assert.assertTrue(jobUsageRecord.getScope()==null); @@ -158,8 +150,6 @@ public class AggregatedJobUsageRecordTest extends ContextTest { @Test public void aggregationStressTest() throws InvalidValueException, NotAggregatableRecordsExceptions { - SecurityTokenProvider.instance.reset(); - ScopeProvider.instance.reset(); JobUsageRecord jobUsageRecord = TestUsageRecord.createTestJobUsageRecord(); Assert.assertTrue(jobUsageRecord.getScope()==null); 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 c08aa6e..3da2c50 100644 --- a/src/test/java/org/gcube/accounting/datamodel/aggregation/AggregatedServiceUsageRecordTest.java +++ b/src/test/java/org/gcube/accounting/datamodel/aggregation/AggregatedServiceUsageRecordTest.java @@ -8,8 +8,6 @@ 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; import org.gcube.documentstore.exception.NotAggregatableRecordsExceptions; import org.gcube.documentstore.records.DSMapper; @@ -30,8 +28,6 @@ public class AggregatedServiceUsageRecordTest extends ContextTest { @Test public void testRequiredFields() throws InvalidValueException { - SecurityTokenProvider.instance.reset(); - ScopeProvider.instance.reset(); ServiceUsageRecord serviceUsageRecord = TestUsageRecord.createTestServiceUsageRecord(); Assert.assertTrue(serviceUsageRecord.getScope()==null); serviceUsageRecord.setScope(TestUsageRecord.TEST_SCOPE); @@ -58,8 +54,6 @@ public class AggregatedServiceUsageRecordTest extends ContextTest { @Test public void secondAsNotAggregated() throws InvalidValueException, NotAggregatableRecordsExceptions { - SecurityTokenProvider.instance.reset(); - ScopeProvider.instance.reset(); ServiceUsageRecord serviceUsageRecord = TestUsageRecord.createTestServiceUsageRecord(); Assert.assertTrue(serviceUsageRecord.getScope()==null); serviceUsageRecord.setScope(TestUsageRecord.TEST_SCOPE); @@ -105,8 +99,6 @@ public class AggregatedServiceUsageRecordTest extends ContextTest { @Test public void secondAsAggregated() throws InvalidValueException, NotAggregatableRecordsExceptions { - SecurityTokenProvider.instance.reset(); - ScopeProvider.instance.reset(); ServiceUsageRecord serviceUsageRecord = TestUsageRecord.createTestServiceUsageRecord(); Assert.assertTrue(serviceUsageRecord.getScope()==null); serviceUsageRecord.setScope(TestUsageRecord.TEST_SCOPE); @@ -155,8 +147,6 @@ public class AggregatedServiceUsageRecordTest extends ContextTest { @Test public void aggregationStressTest() throws InvalidValueException, NotAggregatableRecordsExceptions, JsonProcessingException { - SecurityTokenProvider.instance.reset(); - ScopeProvider.instance.reset(); ServiceUsageRecord serviceUsageRecord = TestUsageRecord.createTestServiceUsageRecord(); Assert.assertTrue(serviceUsageRecord.getScope()==null); serviceUsageRecord.setScope(TestUsageRecord.TEST_SCOPE); diff --git a/src/test/java/org/gcube/accounting/datamodel/aggregation/AggregatedStorageStatusRecordTest.java b/src/test/java/org/gcube/accounting/datamodel/aggregation/AggregatedStorageStatusRecordTest.java index bae6d05..b352638 100644 --- a/src/test/java/org/gcube/accounting/datamodel/aggregation/AggregatedStorageStatusRecordTest.java +++ b/src/test/java/org/gcube/accounting/datamodel/aggregation/AggregatedStorageStatusRecordTest.java @@ -7,8 +7,6 @@ import java.util.Set; import org.gcube.accounting.datamodel.usagerecords.StorageStatusRecord; import org.gcube.accounting.datamodel.usagerecords.StorageStatusRecordTest; -import org.gcube.common.authorization.library.provider.SecurityTokenProvider; -import org.gcube.common.scope.api.ScopeProvider; import org.gcube.documentstore.exception.InvalidValueException; import org.gcube.documentstore.exception.NotAggregatableRecordsExceptions; import org.gcube.testutility.ContextTest; @@ -28,8 +26,6 @@ public class AggregatedStorageStatusRecordTest extends ContextTest { @Test public void testRequiredFields() throws InvalidValueException { - SecurityTokenProvider.instance.reset(); - ScopeProvider.instance.reset(); StorageStatusRecord storageVolumeUsageRecord = TestUsageRecord.createTestStorageVolumeUsageRecord(); Assert.assertTrue(storageVolumeUsageRecord.getScope()==null); storageVolumeUsageRecord.setScope(TestUsageRecord.TEST_SCOPE); @@ -52,8 +48,6 @@ public class AggregatedStorageStatusRecordTest extends ContextTest { @Test public void secondAsNotAggregated() throws InvalidValueException, NotAggregatableRecordsExceptions { - SecurityTokenProvider.instance.reset(); - ScopeProvider.instance.reset(); StorageStatusRecord storageStatusUsageRecord = TestUsageRecord.createTestStorageVolumeUsageRecord(); Assert.assertTrue(storageStatusUsageRecord.getScope()==null); storageStatusUsageRecord.setScope(TestUsageRecord.TEST_SCOPE); @@ -90,8 +84,6 @@ public class AggregatedStorageStatusRecordTest extends ContextTest { @SuppressWarnings("deprecation") @Test public void secondAsAggregated() throws InvalidValueException, NotAggregatableRecordsExceptions { - SecurityTokenProvider.instance.reset(); - ScopeProvider.instance.reset(); StorageStatusRecord storageStatusUsageRecord = TestUsageRecord.createTestStorageVolumeUsageRecord(); storageStatusUsageRecord.setDataServiceClass("DataServiceClass1"); storageStatusUsageRecord.setDataServiceName("DataServiceName1"); @@ -138,8 +130,6 @@ public class AggregatedStorageStatusRecordTest extends ContextTest { @Test public void aggregationStressTest() throws InvalidValueException, NotAggregatableRecordsExceptions { - SecurityTokenProvider.instance.reset(); - ScopeProvider.instance.reset(); StorageStatusRecord storageVolumeUsageRecord = TestUsageRecord.createTestStorageVolumeUsageRecord(); Assert.assertTrue(storageVolumeUsageRecord.getScope()==null); storageVolumeUsageRecord.setScope(TestUsageRecord.TEST_SCOPE); diff --git a/src/test/java/org/gcube/accounting/datamodel/aggregation/AggregatedStorageUsageRecordTest.java b/src/test/java/org/gcube/accounting/datamodel/aggregation/AggregatedStorageUsageRecordTest.java index 3d20c6d..609bf42 100644 --- a/src/test/java/org/gcube/accounting/datamodel/aggregation/AggregatedStorageUsageRecordTest.java +++ b/src/test/java/org/gcube/accounting/datamodel/aggregation/AggregatedStorageUsageRecordTest.java @@ -8,8 +8,6 @@ import java.util.Set; import org.gcube.accounting.datamodel.usagerecords.StorageUsageRecord; import org.gcube.accounting.datamodel.usagerecords.StorageUsageRecordTest; -import org.gcube.common.authorization.library.provider.SecurityTokenProvider; -import org.gcube.common.scope.api.ScopeProvider; import org.gcube.documentstore.exception.InvalidValueException; import org.gcube.documentstore.exception.NotAggregatableRecordsExceptions; import org.gcube.testutility.ContextTest; @@ -29,8 +27,6 @@ public class AggregatedStorageUsageRecordTest extends ContextTest { @Test public void testRequiredFields() throws InvalidValueException { - SecurityTokenProvider.instance.reset(); - ScopeProvider.instance.reset(); StorageUsageRecord storageUsageRecord = TestUsageRecord.createTestStorageUsageRecord(); Assert.assertTrue(storageUsageRecord.getScope()==null); storageUsageRecord.setScope(TestUsageRecord.TEST_SCOPE); @@ -53,8 +49,6 @@ public class AggregatedStorageUsageRecordTest extends ContextTest { @Test public void secondAsNotAggregated() throws InvalidValueException, NotAggregatableRecordsExceptions { - SecurityTokenProvider.instance.reset(); - ScopeProvider.instance.reset(); StorageUsageRecord storageUsageRecord = TestUsageRecord.createTestStorageUsageRecord(); Assert.assertTrue(storageUsageRecord.getScope()==null); storageUsageRecord.setScope(TestUsageRecord.TEST_SCOPE); @@ -88,8 +82,6 @@ public class AggregatedStorageUsageRecordTest extends ContextTest { @SuppressWarnings("deprecation") @Test public void secondAsAggregated() throws Exception { - SecurityTokenProvider.instance.reset(); - ScopeProvider.instance.reset(); StorageUsageRecord storageUsageRecord = TestUsageRecord.createTestStorageUsageRecord(); storageUsageRecord.setResourceScope("/gcube"); storageUsageRecord.setResourceURI(new URI("resourceURI")); @@ -130,8 +122,6 @@ public class AggregatedStorageUsageRecordTest extends ContextTest { @Test public void aggregationStressTest() throws InvalidValueException, NotAggregatableRecordsExceptions { - SecurityTokenProvider.instance.reset(); - ScopeProvider.instance.reset(); StorageUsageRecord storageUsageRecord = TestUsageRecord.createTestStorageUsageRecord(); Assert.assertTrue(storageUsageRecord.getScope()==null); storageUsageRecord.setScope(TestUsageRecord.TEST_SCOPE); diff --git a/src/test/java/org/gcube/accounting/datamodel/usagerecords/JobUsageRecordTest.java b/src/test/java/org/gcube/accounting/datamodel/usagerecords/JobUsageRecordTest.java index 074ad4a..73325e2 100644 --- a/src/test/java/org/gcube/accounting/datamodel/usagerecords/JobUsageRecordTest.java +++ b/src/test/java/org/gcube/accounting/datamodel/usagerecords/JobUsageRecordTest.java @@ -8,8 +8,6 @@ import java.util.Set; import org.gcube.accounting.datamodel.UsageRecord; import org.gcube.accounting.datamodel.basetypes.AbstractJobUsageRecord; -import org.gcube.common.authorization.library.provider.SecurityTokenProvider; -import org.gcube.common.scope.api.ScopeProvider; import org.gcube.documentstore.exception.InvalidValueException; import org.gcube.documentstore.records.Record; import org.gcube.testutility.ContextTest; @@ -46,8 +44,6 @@ public class JobUsageRecordTest extends ContextTest { @Test(expected=InvalidValueException.class) public void scopeNotSetValidationError() throws InvalidValueException { - SecurityTokenProvider.instance.reset(); - ScopeProvider.instance.reset(); JobUsageRecord usageRecord = TestUsageRecord.createTestJobUsageRecord(); usageRecord.validate(); logger.debug("{}", usageRecord); @@ -55,8 +51,6 @@ public class JobUsageRecordTest extends ContextTest { @Test public void testRequiredFields() throws InvalidValueException{ - SecurityTokenProvider.instance.reset(); - ScopeProvider.instance.reset(); JobUsageRecord usageRecord = TestUsageRecord.createTestJobUsageRecord(); Assert.assertTrue(usageRecord.getScope()==null); usageRecord.setScope(TestUsageRecord.TEST_SCOPE); 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 15ddf0d..fa8acd1 100644 --- a/src/test/java/org/gcube/accounting/datamodel/usagerecords/ServiceUsageRecordTest.java +++ b/src/test/java/org/gcube/accounting/datamodel/usagerecords/ServiceUsageRecordTest.java @@ -13,8 +13,6 @@ import org.gcube.accounting.datamodel.UsageRecord; import org.gcube.accounting.datamodel.aggregation.AggregatedServiceUsageRecord; import org.gcube.accounting.datamodel.basetypes.AbstractServiceUsageRecord; import org.gcube.accounting.datamodel.validations.validators.MatcherReplace; -import org.gcube.common.authorization.library.provider.SecurityTokenProvider; -import org.gcube.common.scope.api.ScopeProvider; import org.gcube.documentstore.exception.InvalidValueException; import org.gcube.documentstore.records.DSMapper; import org.gcube.documentstore.records.Record; @@ -53,8 +51,6 @@ public class ServiceUsageRecordTest extends ContextTest { @Test(expected=InvalidValueException.class) public void scopeNotSetValidationError() throws InvalidValueException { - SecurityTokenProvider.instance.reset(); - ScopeProvider.instance.reset(); ServiceUsageRecord usageRecord = TestUsageRecord.createTestServiceUsageRecord(); usageRecord.validate(); logger.debug("{}", usageRecord); @@ -62,8 +58,6 @@ public class ServiceUsageRecordTest extends ContextTest { @Test public void testRequiredFields() throws InvalidValueException{ - SecurityTokenProvider.instance.reset(); - ScopeProvider.instance.reset(); ServiceUsageRecord usageRecord = TestUsageRecord.createTestServiceUsageRecord(); Assert.assertTrue(usageRecord.getScope()==null); usageRecord.setScope(TestUsageRecord.TEST_SCOPE); diff --git a/src/test/java/org/gcube/accounting/datamodel/usagerecords/StorageStatusRecordTest.java b/src/test/java/org/gcube/accounting/datamodel/usagerecords/StorageStatusRecordTest.java index b1eba0e..d70bd42 100644 --- a/src/test/java/org/gcube/accounting/datamodel/usagerecords/StorageStatusRecordTest.java +++ b/src/test/java/org/gcube/accounting/datamodel/usagerecords/StorageStatusRecordTest.java @@ -8,8 +8,6 @@ import java.util.Set; import org.gcube.accounting.datamodel.UsageRecord; import org.gcube.accounting.datamodel.basetypes.AbstractStorageStatusRecord; -import org.gcube.common.authorization.library.provider.SecurityTokenProvider; -import org.gcube.common.scope.api.ScopeProvider; import org.gcube.documentstore.exception.InvalidValueException; import org.gcube.documentstore.records.Record; import org.gcube.testutility.ContextTest; @@ -44,8 +42,6 @@ public class StorageStatusRecordTest extends ContextTest { @Test(expected=InvalidValueException.class) public void scopeNotSetValidationError() throws InvalidValueException { - SecurityTokenProvider.instance.reset(); - ScopeProvider.instance.reset(); StorageStatusRecord usageRecord = TestUsageRecord.createTestStorageVolumeUsageRecord(); usageRecord.validate(); logger.debug("{}", usageRecord); @@ -53,8 +49,6 @@ public class StorageStatusRecordTest extends ContextTest { @Test public void testRequiredFields() throws InvalidValueException{ - SecurityTokenProvider.instance.reset(); - ScopeProvider.instance.reset(); StorageStatusRecord usageRecord = TestUsageRecord.createTestStorageVolumeUsageRecord(); Assert.assertTrue(usageRecord.getScope()==null); usageRecord.setScope(TestUsageRecord.TEST_SCOPE); diff --git a/src/test/java/org/gcube/accounting/datamodel/usagerecords/StorageUsageRecordTest.java b/src/test/java/org/gcube/accounting/datamodel/usagerecords/StorageUsageRecordTest.java index 8aaca98..ad3b3e0 100644 --- a/src/test/java/org/gcube/accounting/datamodel/usagerecords/StorageUsageRecordTest.java +++ b/src/test/java/org/gcube/accounting/datamodel/usagerecords/StorageUsageRecordTest.java @@ -8,8 +8,6 @@ import java.util.Set; import org.gcube.accounting.datamodel.UsageRecord; import org.gcube.accounting.datamodel.basetypes.AbstractStorageUsageRecord; -import org.gcube.common.authorization.library.provider.SecurityTokenProvider; -import org.gcube.common.scope.api.ScopeProvider; import org.gcube.documentstore.exception.InvalidValueException; import org.gcube.documentstore.records.Record; import org.gcube.testutility.ContextTest; @@ -45,8 +43,6 @@ public class StorageUsageRecordTest extends ContextTest { @Test(expected=InvalidValueException.class) public void scopeNotSetValidationError() throws InvalidValueException { - SecurityTokenProvider.instance.reset(); - ScopeProvider.instance.reset(); StorageUsageRecord usageRecord = TestUsageRecord.createTestStorageUsageRecord(); usageRecord.validate(); logger.debug("{}", usageRecord); @@ -54,8 +50,6 @@ public class StorageUsageRecordTest extends ContextTest { @Test public void testRequiredFields() throws InvalidValueException{ - SecurityTokenProvider.instance.reset(); - ScopeProvider.instance.reset(); StorageUsageRecord usageRecord = TestUsageRecord.createTestStorageUsageRecord(); Assert.assertTrue(usageRecord.getScope()==null); usageRecord.setScope(TestUsageRecord.TEST_SCOPE); diff --git a/src/test/java/org/gcube/testutility/ContextTest.java b/src/test/java/org/gcube/testutility/ContextTest.java index abcf237..c74ed8d 100644 --- a/src/test/java/org/gcube/testutility/ContextTest.java +++ b/src/test/java/org/gcube/testutility/ContextTest.java @@ -10,11 +10,8 @@ import java.util.Properties; import org.gcube.common.authorization.client.Constants; import org.gcube.common.authorization.client.exceptions.ObjectNotFound; import org.gcube.common.authorization.library.AuthorizationEntry; -import org.gcube.common.authorization.library.provider.AuthorizationProvider; import org.gcube.common.authorization.library.provider.ClientInfo; -import org.gcube.common.authorization.library.provider.SecurityTokenProvider; import org.gcube.common.authorization.library.utils.Caller; -import org.gcube.common.scope.api.ScopeProvider; import org.junit.AfterClass; import org.junit.BeforeClass; import org.slf4j.Logger; @@ -79,14 +76,11 @@ public class ContextTest { } private static void setContext(String token) throws ObjectNotFound, Exception { - SecurityTokenProvider.instance.set(token); AuthorizationEntry authorizationEntry = Constants.authorizationService().get(token); ClientInfo clientInfo = authorizationEntry.getClientInfo(); logger.debug("User : {} - Type : {}", clientInfo.getId(), clientInfo.getType().name()); String qualifier = authorizationEntry.getQualifier(); Caller caller = new Caller(clientInfo, qualifier); - AuthorizationProvider.instance.set(caller); - ScopeProvider.instance.set(getCurrentScope(token)); } @BeforeClass @@ -96,8 +90,6 @@ public class ContextTest { @AfterClass public static void afterClass() throws Exception { - SecurityTokenProvider.instance.reset(); - ScopeProvider.instance.reset(); } }