From 1fb0b7b3aa83d0c4ef53bcb3b47cbf21da0806f6 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Wed, 1 Jul 2015 10:34:48 +0000 Subject: [PATCH] refs #200: Create accouting-lib library https://support.d4science.org/issues/200 Reorganizing library git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@115750 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../accounting/aggregation/scheduler/AggregationScheduler.java | 2 +- .../ServiceUsageRecordAggregationStrategy.java | 2 +- .../StorageUsageRecordAggregationStrategy.java | 2 +- .../ServiceUsageRecordAggregationStrategyTest.java | 1 + .../StorageUsageRecordAggregationStrategyTest.java | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) rename src/main/java/org/gcube/accounting/aggregation/{aggregationstrategy => strategy}/ServiceUsageRecordAggregationStrategy.java (95%) rename src/main/java/org/gcube/accounting/aggregation/{aggregationstrategy => strategy}/StorageUsageRecordAggregationStrategy.java (95%) diff --git a/src/main/java/org/gcube/accounting/aggregation/scheduler/AggregationScheduler.java b/src/main/java/org/gcube/accounting/aggregation/scheduler/AggregationScheduler.java index 3f9e042..73157ba 100644 --- a/src/main/java/org/gcube/accounting/aggregation/scheduler/AggregationScheduler.java +++ b/src/main/java/org/gcube/accounting/aggregation/scheduler/AggregationScheduler.java @@ -78,7 +78,7 @@ public abstract class AggregationScheduler { Class clz; String aggregationStrategyName; try { - Package aggregationStrategyPackage = org.gcube.accounting.aggregation.aggregationstrategy.ServiceUsageRecordAggregationStrategy.class.getPackage(); + Package aggregationStrategyPackage = org.gcube.accounting.aggregation.strategy.ServiceUsageRecordAggregationStrategy.class.getPackage(); aggregationStrategyName = String.format("%s.%s%s", aggregationStrategyPackage.getName(), usageRecordName, AggregationStrategy.class.getSimpleName()); clz = (Class) Class.forName(aggregationStrategyName); } catch (Exception e) { diff --git a/src/main/java/org/gcube/accounting/aggregation/aggregationstrategy/ServiceUsageRecordAggregationStrategy.java b/src/main/java/org/gcube/accounting/aggregation/strategy/ServiceUsageRecordAggregationStrategy.java similarity index 95% rename from src/main/java/org/gcube/accounting/aggregation/aggregationstrategy/ServiceUsageRecordAggregationStrategy.java rename to src/main/java/org/gcube/accounting/aggregation/strategy/ServiceUsageRecordAggregationStrategy.java index dd30dd6..4c1872f 100644 --- a/src/main/java/org/gcube/accounting/aggregation/aggregationstrategy/ServiceUsageRecordAggregationStrategy.java +++ b/src/main/java/org/gcube/accounting/aggregation/strategy/ServiceUsageRecordAggregationStrategy.java @@ -1,7 +1,7 @@ /** * */ -package org.gcube.accounting.aggregation.aggregationstrategy; +package org.gcube.accounting.aggregation.strategy; import org.gcube.accounting.aggregation.ServiceUsageRecord; import org.gcube.accounting.datamodel.AggregationStrategy; diff --git a/src/main/java/org/gcube/accounting/aggregation/aggregationstrategy/StorageUsageRecordAggregationStrategy.java b/src/main/java/org/gcube/accounting/aggregation/strategy/StorageUsageRecordAggregationStrategy.java similarity index 95% rename from src/main/java/org/gcube/accounting/aggregation/aggregationstrategy/StorageUsageRecordAggregationStrategy.java rename to src/main/java/org/gcube/accounting/aggregation/strategy/StorageUsageRecordAggregationStrategy.java index 679fd7a..140834f 100644 --- a/src/main/java/org/gcube/accounting/aggregation/aggregationstrategy/StorageUsageRecordAggregationStrategy.java +++ b/src/main/java/org/gcube/accounting/aggregation/strategy/StorageUsageRecordAggregationStrategy.java @@ -1,7 +1,7 @@ /** * */ -package org.gcube.accounting.aggregation.aggregationstrategy; +package org.gcube.accounting.aggregation.strategy; import org.gcube.accounting.aggregation.StorageUsageRecord; import org.gcube.accounting.datamodel.AggregationStrategy; diff --git a/src/test/java/org/gcube/accounting/aggregation/aggregationstrategy/ServiceUsageRecordAggregationStrategyTest.java b/src/test/java/org/gcube/accounting/aggregation/aggregationstrategy/ServiceUsageRecordAggregationStrategyTest.java index 7e92923..2cc2122 100644 --- a/src/test/java/org/gcube/accounting/aggregation/aggregationstrategy/ServiceUsageRecordAggregationStrategyTest.java +++ b/src/test/java/org/gcube/accounting/aggregation/aggregationstrategy/ServiceUsageRecordAggregationStrategyTest.java @@ -3,6 +3,7 @@ */ package org.gcube.accounting.aggregation.aggregationstrategy; +import org.gcube.accounting.aggregation.strategy.ServiceUsageRecordAggregationStrategy; import org.gcube.accounting.datamodel.TestUsageRecord; import org.gcube.accounting.datamodel.usagerecord.ServiceUsageRecord; import org.gcube.accounting.exception.InvalidValueException; diff --git a/src/test/java/org/gcube/accounting/aggregation/aggregationstrategy/StorageUsageRecordAggregationStrategyTest.java b/src/test/java/org/gcube/accounting/aggregation/aggregationstrategy/StorageUsageRecordAggregationStrategyTest.java index 54da675..f689819 100644 --- a/src/test/java/org/gcube/accounting/aggregation/aggregationstrategy/StorageUsageRecordAggregationStrategyTest.java +++ b/src/test/java/org/gcube/accounting/aggregation/aggregationstrategy/StorageUsageRecordAggregationStrategyTest.java @@ -3,7 +3,7 @@ */ package org.gcube.accounting.aggregation.aggregationstrategy; -import org.gcube.accounting.aggregation.aggregationstrategy.StorageUsageRecordAggregationStrategy; +import org.gcube.accounting.aggregation.strategy.StorageUsageRecordAggregationStrategy; import org.gcube.accounting.datamodel.TestUsageRecord; import org.gcube.accounting.datamodel.usagerecord.StorageUsageRecord; import org.gcube.accounting.exception.InvalidValueException;