gCubeSystem
/
accounting-aggregator-se-plugin
15
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixing code

This commit is contained in:
Luca Frosini 2024-02-14 18:18:05 +01:00
parent 9ff6bdc135
commit e9eed9f889
5 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/org/gcube/accounting/aggregator/persistence/PostgreSQLConnector.java
View File

@ -23,7 +23,6 @@ import org.gcube.accounting.aggregator.status.AggregationStateEvent;
import org.gcube.accounting.aggregator.status.AggregationStatus; import org.gcube.accounting.aggregator.status.AggregationStatus;
import org.gcube.accounting.aggregator.utility.Constant; import org.gcube.accounting.aggregator.utility.Constant;
import org.gcube.accounting.aggregator.utility.Utility; import org.gcube.accounting.aggregator.utility.Utility;
import org.gcube.accounting.analytics.persistence.postgresql.AccountingPersistenceQueryPostgreSQL;
import org.gcube.accounting.datamodel.AggregatedUsageRecord; import org.gcube.accounting.datamodel.AggregatedUsageRecord;
import org.gcube.accounting.persistence.AccountingPersistenceConfiguration; import org.gcube.accounting.persistence.AccountingPersistenceConfiguration;
import org.gcube.accounting.utility.postgresql.RecordToDBFields; import org.gcube.accounting.utility.postgresql.RecordToDBFields;
@ -64,7 +63,7 @@ public class PostgreSQLConnector extends PersistencePostgreSQL implements Aggreg
protected Connection getConnection() throws Exception { protected Connection getConnection() throws Exception {
if(connection==null || connection.isClosed()) { if(connection==null || connection.isClosed()) {
String url = configuration.getProperty(AccountingPersistenceQueryPostgreSQL.URL_PROPERTY_KEY); String url = configuration.getProperty(AccountingPersistenceConfiguration.URL_PROPERTY_KEY);
if(connection!=null && connection.isClosed()) { if(connection!=null && connection.isClosed()) {
logger.warn("The connection was closed. We should investigate why. Going to reconnect to {}.", url); logger.warn("The connection was closed. We should investigate why. Going to reconnect to {}.", url);

5
src/main/java/org/gcube/accounting/aggregator/persistence/PostgreSQLConnectorDst.java
View File

@ -1,15 +1,12 @@
package org.gcube.accounting.aggregator.persistence; package org.gcube.accounting.aggregator.persistence;
import org.gcube.documentstore.persistence.PersistencePostgreSQL;
/** /**
* @author Luca Frosini (ISTI-CNR) * @author Luca Frosini (ISTI-CNR)
*/ */
public class PostgreSQLConnectorDst extends PostgreSQLConnector implements AggregatorPersistenceDst { public class PostgreSQLConnectorDst extends PostgreSQLConnector implements AggregatorPersistenceDst {
protected PostgreSQLConnectorDst() throws Exception { protected PostgreSQLConnectorDst() throws Exception {
// super(PostgreSQLConnectorDst.class); super(AggregatorPersistenceDst.class);
super(PersistencePostgreSQL.class);
} }
} }

5
src/main/java/org/gcube/accounting/aggregator/persistence/PostgreSQLConnectorSrc.java
View File

@ -1,15 +1,12 @@
package org.gcube.accounting.aggregator.persistence; package org.gcube.accounting.aggregator.persistence;
import org.gcube.accounting.analytics.persistence.postgresql.AccountingPersistenceQueryPostgreSQL;
/** /**
* @author Luca Frosini (ISTI-CNR) * @author Luca Frosini (ISTI-CNR)
*/ */
public class PostgreSQLConnectorSrc extends PostgreSQLConnector implements AggregatorPersistenceSrc { public class PostgreSQLConnectorSrc extends PostgreSQLConnector implements AggregatorPersistenceSrc {
protected PostgreSQLConnectorSrc() throws Exception { protected PostgreSQLConnectorSrc() throws Exception {
// super(PostgreSQLConnectorSrc.class); super(AggregatorPersistenceSrc.class);
super(AccountingPersistenceQueryPostgreSQL.class);
} }
} }

4
src/main/java/org/gcube/accounting/aggregator/persistence/PostgreSQLConnectorStatusDst.java
View File

@ -1,14 +1,12 @@
package org.gcube.accounting.aggregator.persistence; package org.gcube.accounting.aggregator.persistence;
import org.gcube.documentstore.persistence.PersistencePostgreSQL;
/** /**
* @author Luca Frosini (ISTI-CNR) * @author Luca Frosini (ISTI-CNR)
*/ */
class PostgreSQLConnectorStatusDst extends PostgreSQLConnectorStatus implements AggregatorPersistenceStatusDst { class PostgreSQLConnectorStatusDst extends PostgreSQLConnectorStatus implements AggregatorPersistenceStatusDst {
protected PostgreSQLConnectorStatusDst() throws Exception { protected PostgreSQLConnectorStatusDst() throws Exception {
super(PersistencePostgreSQL.class); super(AggregatorPersistenceSrc.class);
} }

4
src/main/java/org/gcube/accounting/aggregator/persistence/PostgreSQLConnectorStatusSrc.java
View File

@ -1,14 +1,12 @@
package org.gcube.accounting.aggregator.persistence; package org.gcube.accounting.aggregator.persistence;
import org.gcube.accounting.analytics.persistence.postgresql.AccountingPersistenceQueryPostgreSQL;
/** /**
* @author Luca Frosini (ISTI-CNR) * @author Luca Frosini (ISTI-CNR)
*/ */
class PostgreSQLConnectorStatusSrc extends PostgreSQLConnectorStatus implements AggregatorPersistenceStatusSrc { class PostgreSQLConnectorStatusSrc extends PostgreSQLConnectorStatus implements AggregatorPersistenceStatusSrc {
protected PostgreSQLConnectorStatusSrc() throws Exception { protected PostgreSQLConnectorStatusSrc() throws Exception {
super(AccountingPersistenceQueryPostgreSQL.class); super(AggregatorPersistenceSrc.class);
} }
} }