From 2501d3e63acfa7239bd80df66f67e12d61b0e170 Mon Sep 17 00:00:00 2001 From: Alessandro Pieve Date: Wed, 3 May 2017 12:47:10 +0000 Subject: [PATCH] first release git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-service@148264 82a268e6-3cf1-43bd-a215-b396298e98cf --- .classpath | 37 ++ .project | 42 +++ .settings/.jsdtscope | 12 + .settings/org.eclipse.core.resources.prefs | 6 + .settings/org.eclipse.jdt.core.prefs | 8 + .settings/org.eclipse.wst.common.component | 16 + ...se.wst.common.project.facet.core.prefs.xml | 7 + ....eclipse.wst.common.project.facet.core.xml | 8 + ...rg.eclipse.wst.jsdt.ui.superType.container | 1 + .../org.eclipse.wst.jsdt.ui.superType.name | 1 + .settings/org.eclipse.wst.validation.prefs | 2 + distro/LICENSE | 4 + distro/README | 67 ++++ distro/changelog.xml | 6 + distro/descriptor.xml | 32 ++ distro/gcube-app.xml | 10 + distro/profile.xml | 26 ++ distro/web.xml | 19 ++ pom.xml | 263 +++++++++++++++ .../service/AccountingInitializer.java | 95 ++++++ .../service/AccountingResource.java | 17 + .../service/resources/ResourceInsert.java | 94 ++++++ .../service/resources/ResourceQuery.java | 50 +++ .../service/resources/ResourceStatus.java | 40 +++ .../accounting/service/utils/UtilRecord.java | 81 +++++ src/main/webapp/WEB-INF/LICENSE | 316 ++++++++++++++++++ src/main/webapp/WEB-INF/README | 80 +++++ src/main/webapp/WEB-INF/changelog.xml | 6 + src/main/webapp/WEB-INF/descriptor.xml | 32 ++ src/main/webapp/WEB-INF/gcube-app.xml | 10 + src/main/webapp/WEB-INF/profile.xml | 26 ++ src/main/webapp/WEB-INF/web.xml | 19 ++ .../accounting/service/JerseyClient.java | 54 +++ 33 files changed, 1487 insertions(+) create mode 100644 .classpath create mode 100644 .project create mode 100644 .settings/.jsdtscope create mode 100644 .settings/org.eclipse.core.resources.prefs create mode 100644 .settings/org.eclipse.jdt.core.prefs create mode 100644 .settings/org.eclipse.wst.common.component create mode 100644 .settings/org.eclipse.wst.common.project.facet.core.prefs.xml create mode 100644 .settings/org.eclipse.wst.common.project.facet.core.xml create mode 100644 .settings/org.eclipse.wst.jsdt.ui.superType.container create mode 100644 .settings/org.eclipse.wst.jsdt.ui.superType.name create mode 100644 .settings/org.eclipse.wst.validation.prefs create mode 100644 distro/LICENSE create mode 100644 distro/README create mode 100644 distro/changelog.xml create mode 100644 distro/descriptor.xml create mode 100644 distro/gcube-app.xml create mode 100644 distro/profile.xml create mode 100644 distro/web.xml create mode 100644 pom.xml create mode 100644 src/main/java/org/gcube/data/publishing/accounting/service/AccountingInitializer.java create mode 100644 src/main/java/org/gcube/data/publishing/accounting/service/AccountingResource.java create mode 100644 src/main/java/org/gcube/data/publishing/accounting/service/resources/ResourceInsert.java create mode 100644 src/main/java/org/gcube/data/publishing/accounting/service/resources/ResourceQuery.java create mode 100644 src/main/java/org/gcube/data/publishing/accounting/service/resources/ResourceStatus.java create mode 100644 src/main/java/org/gcube/data/publishing/accounting/service/utils/UtilRecord.java create mode 100644 src/main/webapp/WEB-INF/LICENSE create mode 100644 src/main/webapp/WEB-INF/README create mode 100644 src/main/webapp/WEB-INF/changelog.xml create mode 100644 src/main/webapp/WEB-INF/descriptor.xml create mode 100644 src/main/webapp/WEB-INF/gcube-app.xml create mode 100644 src/main/webapp/WEB-INF/profile.xml create mode 100644 src/main/webapp/WEB-INF/web.xml create mode 100644 src/test/java/org/gucbe/data/publishing/accounting/service/JerseyClient.java diff --git a/.classpath b/.classpath new file mode 100644 index 0000000..4591c00 --- /dev/null +++ b/.classpath @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.project b/.project new file mode 100644 index 0000000..237c8a5 --- /dev/null +++ b/.project @@ -0,0 +1,42 @@ + + + accunting-service + + + + + + org.eclipse.wst.jsdt.core.javascriptValidator + + + + + org.eclipse.wst.common.project.facet.core.builder + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.wst.validation.validationbuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jem.workbench.JavaEMFNature + org.eclipse.wst.common.modulecore.ModuleCoreNature + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + org.eclipse.wst.common.project.facet.core.nature + org.eclipse.wst.jsdt.core.jsNature + + diff --git a/.settings/.jsdtscope b/.settings/.jsdtscope new file mode 100644 index 0000000..b46b920 --- /dev/null +++ b/.settings/.jsdtscope @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..29abf99 --- /dev/null +++ b/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,6 @@ +eclipse.preferences.version=1 +encoding//src/main/java=UTF-8 +encoding//src/main/resources=UTF-8 +encoding//src/test/java=UTF-8 +encoding//src/test/resources=UTF-8 +encoding/=UTF-8 diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..443e085 --- /dev/null +++ b/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,8 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component new file mode 100644 index 0000000..b5ffb3f --- /dev/null +++ b/.settings/org.eclipse.wst.common.component @@ -0,0 +1,16 @@ + + + + + + + + uses + + + uses + + + + + diff --git a/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml b/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml new file mode 100644 index 0000000..cc81385 --- /dev/null +++ b/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml new file mode 100644 index 0000000..25d173a --- /dev/null +++ b/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/.settings/org.eclipse.wst.jsdt.ui.superType.container b/.settings/org.eclipse.wst.jsdt.ui.superType.container new file mode 100644 index 0000000..3bd5d0a --- /dev/null +++ b/.settings/org.eclipse.wst.jsdt.ui.superType.container @@ -0,0 +1 @@ +org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file diff --git a/.settings/org.eclipse.wst.jsdt.ui.superType.name b/.settings/org.eclipse.wst.jsdt.ui.superType.name new file mode 100644 index 0000000..05bd71b --- /dev/null +++ b/.settings/org.eclipse.wst.jsdt.ui.superType.name @@ -0,0 +1 @@ +Window \ No newline at end of file diff --git a/.settings/org.eclipse.wst.validation.prefs b/.settings/org.eclipse.wst.validation.prefs new file mode 100644 index 0000000..04cad8c --- /dev/null +++ b/.settings/org.eclipse.wst.validation.prefs @@ -0,0 +1,2 @@ +disabled=06target +eclipse.preferences.version=1 diff --git a/distro/LICENSE b/distro/LICENSE new file mode 100644 index 0000000..cdf50bd --- /dev/null +++ b/distro/LICENSE @@ -0,0 +1,4 @@ +gCube System - License +------------------------------------------------------------ + +${gcube.license} \ No newline at end of file diff --git a/distro/README b/distro/README new file mode 100644 index 0000000..1a6860b --- /dev/null +++ b/distro/README @@ -0,0 +1,67 @@ +The gCube System - ${name} +-------------------------------------------------- + +${description} + + +${gcube.description} + +${gcube.funding} + + +Version +-------------------------------------------------- + +${version} (${buildDate}) + +Please see the file named "changelog.xml" in this directory for the release notes. + + +Authors +-------------------------------------------------- + +* Alessandro Pieve (alessandro.pieve@isti.cnr.it), CNR, Italy + + +Maintainers +----------- + +* Alessandro Pieve (alessandro.pieve@isti.cnr.it), CNR, Italy +* Lucio Lelii (lucio.lelii@isti.cnr.it), CNR, Italy + + +Download information +-------------------------------------------------- + +Source code is available from SVN: + ${scm.url} + +Binaries can be downloaded from the gCube website: + ${gcube.website} + + +Installation +-------------------------------------------------- + +Installation documentation is available on-line in the gCube Wiki: + ${gcube.wikiRoot}/3MConnector + + +Documentation +-------------------------------------------------- + +Documentation is available on-line in the gCube Wiki: + ${gcube.wikiRoot}/3MConnector + + +Support +-------------------------------------------------- + +Bugs and support requests can be reported in the gCube issue tracking tool: + ${gcube.issueTracking} + + +Licensing +-------------------------------------------------- + +This software is licensed under the terms you may find in the file named "LICENSE" in this directory. \ No newline at end of file diff --git a/distro/changelog.xml b/distro/changelog.xml new file mode 100644 index 0000000..5aaf427 --- /dev/null +++ b/distro/changelog.xml @@ -0,0 +1,6 @@ + + + First Release + + \ No newline at end of file diff --git a/distro/descriptor.xml b/distro/descriptor.xml new file mode 100644 index 0000000..e395580 --- /dev/null +++ b/distro/descriptor.xml @@ -0,0 +1,32 @@ + + servicearchive + + tar.gz + + / + + + ${distroDirectory} + / + true + + README + LICENSE + changelog.xml + profile.xml + + 755 + true + + + + + target/${build.finalName}.${project.packaging} + /${artifactId} + + + + \ No newline at end of file diff --git a/distro/gcube-app.xml b/distro/gcube-app.xml new file mode 100644 index 0000000..0856145 --- /dev/null +++ b/distro/gcube-app.xml @@ -0,0 +1,10 @@ + + AccountService + DataPublishing + ${version} + AccountService webapp + + + /* + + diff --git a/distro/profile.xml b/distro/profile.xml new file mode 100644 index 0000000..e3c7f25 --- /dev/null +++ b/distro/profile.xml @@ -0,0 +1,26 @@ + + + + Service + + ${description} + DataPublishing + ${artifactId} + 1.0.0 + + + ${artifactId} + ${version} + + ${groupId} + ${artifactId} + ${version} + + + ${build.finalName}.jar + + + + + + diff --git a/distro/web.xml b/distro/web.xml new file mode 100644 index 0000000..926d165 --- /dev/null +++ b/distro/web.xml @@ -0,0 +1,19 @@ + + Accounting Service + Accounting service + + org.gcube.data.publishing.accounting.service.AccountingResource + + + com.sun.jersey.api.json.POJOMappingFeature + true + + + + + + org.gcube.data.publishing.accounting.service.AccountingResource + /gcube/service/* + + + diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..241972b --- /dev/null +++ b/pom.xml @@ -0,0 +1,263 @@ + + 4.0.0 + org.gcube.data.publishing + accounting-service + 1.0.0-SNAPSHOT + accounting-service + war + + ${project.basedir}/src/main/webapp/WEB-INF + ${project.basedir}/distro + + + org.gcube.tools + maven-parent + 1.0.0 + + Service Accounting Manger + + + + + org.gcube.distribution + maven-smartgears-bom + LATEST + pom + import + + + + + + + + + org.gcube.core + common-smartgears + + + + org.gcube.core + common-smartgears-app + + + + org.gcube.common + authorization-client + + + + org.gcube.common + common-authorization + + + + + org.slf4j + slf4j-api + + + + ch.qos.logback + logback-classic + 1.0.13 + + + + + org.projectlombok + lombok + 1.14.8 + + + + org.gcube.data.publishing + document-store-lib-couchbase + [1.0.0-SNAPSHOT,2.0.0-SNAPSHOT) + provided + + + + + + + + + + org.gcube.accounting + accounting-analytics + [2.0.0-SNAPSHOT,3.0.0-SNAPSHOT) + + + org.gcube.accounting + accounting-analytics-persistence-couchbase + [1.0.0-SNAPSHOT,2.0.0-SNAPSHOT) + + + + + + + javax.ws.rs + + javax.ws.rs-api + 2.0 + + + org.glassfish.jersey.containers + jersey-container-servlet + 2.24 + + + + + com.sun.jersey + jersey-json + 1.9 + + + + + + + + + + javax.servlet + javax.servlet-api + 3.0.1 + provided + + + + + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + 2.6.0 + + + + + + + + + + + + + ${artifactId} + + + maven-compiler-plugin + 2.3.2 + + 1.7 + 1.7 + + + + org.apache.maven.plugins + maven-resources-plugin + 2.6 + + + copy-profile + + copy-resources + + process-resources + + ${webappDirectory} + + + ${distroDirectory} + true + + + + + + + + org.apache.maven.plugins + maven-war-plugin + 2.4 + + accounting-service + false + + + + org.apache.maven.plugins + maven-assembly-plugin + + + ${distroDirectory}/descriptor.xml + + + + + servicearchive + install + + single + + + + + + + + \ No newline at end of file diff --git a/src/main/java/org/gcube/data/publishing/accounting/service/AccountingInitializer.java b/src/main/java/org/gcube/data/publishing/accounting/service/AccountingInitializer.java new file mode 100644 index 0000000..fa852b5 --- /dev/null +++ b/src/main/java/org/gcube/data/publishing/accounting/service/AccountingInitializer.java @@ -0,0 +1,95 @@ +package org.gcube.data.publishing.accounting.service; + + +import java.util.concurrent.TimeUnit; + +import org.gcube.accounting.analytics.persistence.AccountingPersistenceBackendQueryConfiguration; +import org.gcube.accounting.analytics.persistence.couchbase.AccountingPersistenceQueryCouchBase; +import org.gcube.accounting.persistence.AccountingPersistence; +import org.gcube.accounting.persistence.AccountingPersistenceFactory; +import org.gcube.smartgears.ApplicationManager; +import org.gcube.smartgears.ContextProvider; +import org.gcube.smartgears.context.application.ApplicationContext; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class AccountingInitializer implements ApplicationManager{ + + private static Logger logger = LoggerFactory.getLogger(AccountingInitializer.class); + + ApplicationContext ctx = ContextProvider.get(); + + //for insert + private AccountingPersistence accountingPersistence=null; + + //for query + protected AccountingPersistenceQueryCouchBase accountingPersistenceAnalytics; + + + + @Override + public void onInit() { + logger.info("AccountingInitializer on init"); + //init for service insert + accountingPersistence = AccountingPersistenceFactory.getPersistence(); + try { + accountingPersistence.flush(1, TimeUnit.SECONDS); + } catch (Exception e) { + logger.error("AccountingInitializer onInit error:",e); + // TODO Auto-generated catch block + e.printStackTrace(); + } + //init for service query + AccountingPersistenceBackendQueryConfiguration configuration; + try { + configuration = new + AccountingPersistenceBackendQueryConfiguration(AccountingPersistenceQueryCouchBase.class); + accountingPersistenceAnalytics = new AccountingPersistenceQueryCouchBase(); + accountingPersistenceAnalytics.prepareConnection(configuration); + } catch (Exception e1) { + e1.printStackTrace(); + } + + + + + + + } + + public void onShutdown() { + //stop timer thread discovering + logger.info("AccountingInitializer onShutdown"); + try { + //close a persistence for insert + accountingPersistence.flush(1, TimeUnit.SECONDS); + accountingPersistence .close(); + + //close a persistence for query + accountingPersistenceAnalytics.close(); + + } catch (Exception e) { + logger.error("AccountingInitializer shutdown error:",e); + e.printStackTrace(); + } + } + + + /** + * + * @return persistence for document store lib + */ + public AccountingPersistence getAccountingPersistence() { + return accountingPersistence; + } + + /** + * + * @return persistence for accounting analytics + */ + public AccountingPersistenceQueryCouchBase getAccountingPersistenceQuery() { + return accountingPersistenceAnalytics; + } + + +} diff --git a/src/main/java/org/gcube/data/publishing/accounting/service/AccountingResource.java b/src/main/java/org/gcube/data/publishing/accounting/service/AccountingResource.java new file mode 100644 index 0000000..4c06764 --- /dev/null +++ b/src/main/java/org/gcube/data/publishing/accounting/service/AccountingResource.java @@ -0,0 +1,17 @@ +package org.gcube.data.publishing.accounting.service; + +import javax.ws.rs.ApplicationPath; + +import org.glassfish.jersey.server.ResourceConfig; +/** + * @author Alessandro Pieve (alessandro.pieve@isti.cnr.it) + * + */ +@ApplicationPath("/gcube/service/") +public class AccountingResource extends ResourceConfig{ + public AccountingResource(){ + packages("org.gcube.data.publishing.accounting.service.resources"); + } + +} + diff --git a/src/main/java/org/gcube/data/publishing/accounting/service/resources/ResourceInsert.java b/src/main/java/org/gcube/data/publishing/accounting/service/resources/ResourceInsert.java new file mode 100644 index 0000000..42af52a --- /dev/null +++ b/src/main/java/org/gcube/data/publishing/accounting/service/resources/ResourceInsert.java @@ -0,0 +1,94 @@ +package org.gcube.data.publishing.accounting.service.resources; + + +import java.util.List; +import java.util.concurrent.TimeUnit; + +import javax.ws.rs.Consumes; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; + +import org.gcube.accounting.datamodel.BasicUsageRecord; +import org.gcube.accounting.persistence.AccountingPersistence; +import org.gcube.data.publishing.accounting.service.AccountingInitializer; +import org.gcube.documentstore.records.DSMapper; +import org.gcube.documentstore.records.Record; +import org.gcube.documentstore.records.SerializableList; +import org.gcube.smartgears.ApplicationManagerProvider; +import org.gcube.smartgears.annotations.ManagedBy; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +@ManagedBy(AccountingInitializer.class) +@Path("insert") +public class ResourceInsert { + + private static final Logger log = LoggerFactory.getLogger(ResourceInsert.class); + + private AccountingPersistence accountingPersistence; + private AccountingInitializer appManager = (AccountingInitializer)ApplicationManagerProvider.get(AccountingInitializer.class); + + + @POST + @Path("/record/") + @Consumes(MediaType.APPLICATION_JSON) + public Response consumeLine( String line ) throws Exception { + try{ + + log.debug("call consumeRecord:{}",line); + //String scope = BasicUsageRecord.getScopeFromToken(); + //log.debug("call with scope:{}",scope); + accountingPersistence=appManager.getAccountingPersistence(); + log.debug("get persistence"); + + Record r= DSMapper.unmarshal(Record.class, line); + //Record r = RecordUtility.getRecord( line); + log.debug("transform into record:{}",r); + + accountingPersistence.account(r); + accountingPersistence.flush(100, TimeUnit.MILLISECONDS); + String output = "RESPONSE:"+r.toString(); + return Response.status(200).entity(output).build(); + + } + catch(Exception e){ + log.error("Error",e); + return Response.status(500).entity("").build(); + } + } + + + @POST + @Consumes(MediaType.APPLICATION_XML) + @Path("records") + public Response consumeRecords(@PathParam("records") String id, SerializableList input) throws Exception { + try{ + log.trace("call consumeRecords:{}"); + List valueList=input.getValuesList(); + accountingPersistence=appManager.getAccountingPersistence(); + for(String value : valueList){ + Record r= DSMapper.unmarshal(Record.class, value); + accountingPersistence.account(r); + + } + //accountingPersistence.flush(1000, TimeUnit.MILLISECONDS); + String output = "Ok"; + return Response.status(200).entity(output).build(); + } + catch(Exception e){ + log.error("Error",e); + return Response.status(500).entity("").build(); + } + + + + } + + + + + +} diff --git a/src/main/java/org/gcube/data/publishing/accounting/service/resources/ResourceQuery.java b/src/main/java/org/gcube/data/publishing/accounting/service/resources/ResourceQuery.java new file mode 100644 index 0000000..3a99b5c --- /dev/null +++ b/src/main/java/org/gcube/data/publishing/accounting/service/resources/ResourceQuery.java @@ -0,0 +1,50 @@ +package org.gcube.data.publishing.accounting.service.resources; + + +import javax.validation.constraints.NotNull; +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.core.Response; + +import org.gcube.accounting.analytics.persistence.couchbase.AccountingPersistenceQueryCouchBase; +import org.gcube.data.publishing.accounting.service.AccountingInitializer; +import org.gcube.smartgears.ApplicationManagerProvider; +import org.gcube.smartgears.annotations.ManagedBy; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +@ManagedBy(AccountingInitializer.class) +@Path("query") +public class ResourceQuery { + + private static final Logger log = LoggerFactory.getLogger(ResourceQuery.class); + + private AccountingPersistenceQueryCouchBase accountingPersistenceQuery; + private AccountingInitializer appManager = (AccountingInitializer)ApplicationManagerProvider.get(AccountingInitializer.class); + + + @GET + @Path("/getRecord/{recordId}/{type}/") + public Response responseRecord(@NotNull @PathParam("recordId") String recordId,@NotNull @PathParam("type") String type) throws Exception { + log.debug("call responseRecord with recordID:{}, type:{}",recordId,type); + Response response = null; + String result=null; + try{ + accountingPersistenceQuery=appManager.getAccountingPersistenceQuery(); + result= accountingPersistenceQuery.getRecord(recordId,type); + return Response.status(200).entity(result).build(); + } + catch(Exception e){ + log.error("Error",e); + return Response.status(500).entity("").build(); + } + + } + + + + + + +} diff --git a/src/main/java/org/gcube/data/publishing/accounting/service/resources/ResourceStatus.java b/src/main/java/org/gcube/data/publishing/accounting/service/resources/ResourceStatus.java new file mode 100644 index 0000000..007daf3 --- /dev/null +++ b/src/main/java/org/gcube/data/publishing/accounting/service/resources/ResourceStatus.java @@ -0,0 +1,40 @@ +package org.gcube.data.publishing.accounting.service.resources; + + +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.core.Response; + +import org.gcube.accounting.persistence.AccountingPersistence; +import org.gcube.data.publishing.accounting.service.AccountingInitializer; +import org.gcube.smartgears.ApplicationManagerProvider; +import org.gcube.smartgears.annotations.ManagedBy; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +@ManagedBy(AccountingInitializer.class) +@Path("status") +public class ResourceStatus { + + private static final Logger log = LoggerFactory.getLogger(ResourceStatus.class); + + private AccountingPersistence accountingPersistence; + private AccountingInitializer appManager = (AccountingInitializer)ApplicationManagerProvider.get(AccountingInitializer.class); + + + @GET + @Path("/getStatus") + public Response getStatus() { + log.debug("call getStatus"); + String output = "Accounting Service is UP"; + return Response.status(200).entity(output).build(); + } + + + + + + + + +} diff --git a/src/main/java/org/gcube/data/publishing/accounting/service/utils/UtilRecord.java b/src/main/java/org/gcube/data/publishing/accounting/service/utils/UtilRecord.java new file mode 100644 index 0000000..fa7f57a --- /dev/null +++ b/src/main/java/org/gcube/data/publishing/accounting/service/utils/UtilRecord.java @@ -0,0 +1,81 @@ +package org.gcube.data.publishing.accounting.service.utils; + +import java.util.UUID; + +import org.gcube.accounting.datamodel.UsageRecord.OperationResult; +import org.gcube.accounting.datamodel.usagerecords.ServiceUsageRecord; +import org.gcube.documentstore.exception.InvalidValueException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class UtilRecord { + + private static Logger logger = LoggerFactory.getLogger(UtilRecord.class); + + public final static String TEST_CONSUMER_ID = "name.surname"; + public final static String TEST_SCOPE = "/infrastructure/vo"; + public final static String TEST_SCOPE_2 = "/infrastructure/vo/vre"; + public final static OperationResult TEST_OPERATION_RESULT = OperationResult.SUCCESS; + + public final static String TEST_SERVICE_CLASS = "TestServiceClass"; + public final static String TEST_SERVICE_NAME = "TestServiceName"; + public final static String TEST_CALLED_METHOD = "TestCalledMethod"; + public final static String TEST_CALLER_QUALIFIER = "TestCallerQualifier"; + + public final static String TEST_CALLER_HOST = "remotehost"; + public final static String TEST_HOST = "localhost"; + + public final static String TEST_PROPERTY_NAME = "TestPropertyName"; + public final static String TEST_PROPERTY_VALUE = "TestPropertyValue"; + + public final static String TEST_JOB_ID = UUID.randomUUID().toString(); + public final static String TEST_JOB_NAME = "TestJobName"; + public final static int TEST_VMS_USED = 2; + public final static String TEST_JOB_QUALIFIER = "TestJobQualifier"; + public final static long HALF_DURATION = 10 * 60 * 1000; // 10 min + + public final static String TEST_TASK_ID = UUID.randomUUID().toString(); + public final static String TEST_NESTED_MAP = "TestNestedMap"; + + public final static String TEST_PORTLET_ID = "TestPortlet"; + public final static String TEST_PORTLET_OPERATION_ID = "TestPortletOperationID"; + public final static String TEST_PORTLET_MESSAGE = "TestPortletMessage"; + + private final static long MIN_DURATION = 60; // millisec + private final static long MAX_DURATION = 1000; // millisec + /** + * Create a valid #ServiceUsageRecord with scope set automatically. + * @return the created #ServiceUsageRecord + */ + public static ServiceUsageRecord createTestServiceUsageRecord() { + ServiceUsageRecord usageRecord = new ServiceUsageRecord(); + try { + usageRecord.setConsumerId(TEST_CONSUMER_ID); + usageRecord.setOperationResult(TEST_OPERATION_RESULT); + + usageRecord.setCallerHost(TEST_CALLER_HOST); + usageRecord.setHost(TEST_HOST); + usageRecord.setCallerQualifier(TEST_CALLER_QUALIFIER); + usageRecord.setServiceClass(TEST_SERVICE_CLASS); + usageRecord.setServiceName(TEST_SERVICE_NAME); + usageRecord.setCalledMethod(TEST_CALLED_METHOD); + + usageRecord.setDuration(generateRandomLong(MIN_DURATION, MAX_DURATION)); + + } catch (InvalidValueException e) { + logger.error(" ------ You SHOULD NOT SEE THIS MESSAGE. Error Creating a test Usage Record", e); + throw new RuntimeException(e); + } + return usageRecord; + + } + + /** + * Generate A Random long in a range between min and max. + * This function is internally used to set random duration. + * @return the generated random long + */ + public static long generateRandomLong(long min, long max){ + return min + (int)(Math.random() * ((max - min) + 1)); + } +} diff --git a/src/main/webapp/WEB-INF/LICENSE b/src/main/webapp/WEB-INF/LICENSE new file mode 100644 index 0000000..9724bfe --- /dev/null +++ b/src/main/webapp/WEB-INF/LICENSE @@ -0,0 +1,316 @@ +gCube System - License +------------------------------------------------------------ + +European Union Public Licence V. 1.1 + + +EUPL © the European Community 2007 + + +This European Union Public Licence (the “EUPL”) applies to the Work or Software +(as defined below) which is provided under the terms of this Licence. Any use of +the Work, other than as authorised under this Licence is prohibited (to the +extent such use is covered by a right of the copyright holder of the Work). + +The Original Work is provided under the terms of this Licence when the Licensor +(as defined below) has placed the following notice immediately following the +copyright notice for the Original Work: + +Licensed under the EUPL V.1.1 + +or has expressed by any other mean his willingness to license under the EUPL. + + + +1. Definitions + +In this Licence, the following terms have the following meaning: + +- The Licence: this Licence. + +- The Original Work or the Software: the software distributed and/or + communicated by the Licensor under this Licence, available as Source Code and + also as Executable Code as the case may be. + +- Derivative Works: the works or software that could be created by the Licensee, + based upon the Original Work or modifications thereof. This Licence does not + define the extent of modification or dependence on the Original Work required + in order to classify a work as a Derivative Work; this extent is determined by + copyright law applicable in the country mentioned in Article 15. + +- The Work: the Original Work and/or its Derivative Works. + +- The Source Code: the human-readable form of the Work which is the most + convenient for people to study and modify. + +- The Executable Code: any code which has generally been compiled and which is + meant to be interpreted by a computer as a program. + +- The Licensor: the natural or legal person that distributes and/or communicates + the Work under the Licence. + +- Contributor(s): any natural or legal person who modifies the Work under the + Licence, or otherwise contributes to the creation of a Derivative Work. + +- The Licensee or “You”: any natural or legal person who makes any usage of the + Software under the terms of the Licence. + +- Distribution and/or Communication: any act of selling, giving, lending, + renting, distributing, communicating, transmitting, or otherwise making + available, on-line or off-line, copies of the Work or providing access to its + essential functionalities at the disposal of any other natural or legal + person. + + + +2. Scope of the rights granted by the Licence + +The Licensor hereby grants You a world-wide, royalty-free, non-exclusive, +sub-licensable licence to do the following, for the duration of copyright vested +in the Original Work: + +- use the Work in any circumstance and for all usage, reproduce the Work, modify +- the Original Work, and make Derivative Works based upon the Work, communicate +- to the public, including the right to make available or display the Work or +- copies thereof to the public and perform publicly, as the case may be, the +- Work, distribute the Work or copies thereof, lend and rent the Work or copies +- thereof, sub-license rights in the Work or copies thereof. + +Those rights can be exercised on any media, supports and formats, whether now +known or later invented, as far as the applicable law permits so. + +In the countries where moral rights apply, the Licensor waives his right to +exercise his moral right to the extent allowed by law in order to make effective +the licence of the economic rights here above listed. + +The Licensor grants to the Licensee royalty-free, non exclusive usage rights to +any patents held by the Licensor, to the extent necessary to make use of the +rights granted on the Work under this Licence. + + + +3. Communication of the Source Code + +The Licensor may provide the Work either in its Source Code form, or as +Executable Code. If the Work is provided as Executable Code, the Licensor +provides in addition a machine-readable copy of the Source Code of the Work +along with each copy of the Work that the Licensor distributes or indicates, in +a notice following the copyright notice attached to the Work, a repository where +the Source Code is easily and freely accessible for as long as the Licensor +continues to distribute and/or communicate the Work. + + + +4. Limitations on copyright + +Nothing in this Licence is intended to deprive the Licensee of the benefits from +any exception or limitation to the exclusive rights of the rights owners in the +Original Work or Software, of the exhaustion of those rights or of other +applicable limitations thereto. + + + +5. Obligations of the Licensee + +The grant of the rights mentioned above is subject to some restrictions and +obligations imposed on the Licensee. Those obligations are the following: + +Attribution right: the Licensee shall keep intact all copyright, patent or +trademarks notices and all notices that refer to the Licence and to the +disclaimer of warranties. The Licensee must include a copy of such notices and a +copy of the Licence with every copy of the Work he/she distributes and/or +communicates. The Licensee must cause any Derivative Work to carry prominent +notices stating that the Work has been modified and the date of modification. + +Copyleft clause: If the Licensee distributes and/or communicates copies of the +Original Works or Derivative Works based upon the Original Work, this +Distribution and/or Communication will be done under the terms of this Licence +or of a later version of this Licence unless the Original Work is expressly +distributed only under this version of the Licence. The Licensee (becoming +Licensor) cannot offer or impose any additional terms or conditions on the Work +or Derivative Work that alter or restrict the terms of the Licence. + +Compatibility clause: If the Licensee Distributes and/or Communicates Derivative +Works or copies thereof based upon both the Original Work and another work +licensed under a Compatible Licence, this Distribution and/or Communication can +be done under the terms of this Compatible Licence. For the sake of this clause, +“Compatible Licence” refers to the licences listed in the appendix attached to +this Licence. Should the Licensee’s obligations under the Compatible Licence +conflict with his/her obligations under this Licence, the obligations of the +Compatible Licence shall prevail. + +Provision of Source Code: When distributing and/or communicating copies of the +Work, the Licensee will provide a machine-readable copy of the Source Code or +indicate a repository where this Source will be easily and freely available for +as long as the Licensee continues to distribute and/or communicate the Work. + +Legal Protection: This Licence does not grant permission to use the trade names, +trademarks, service marks, or names of the Licensor, except as required for +reasonable and customary use in describing the origin of the Work and +reproducing the content of the copyright notice. + + + +6. Chain of Authorship + +The original Licensor warrants that the copyright in the Original Work granted +hereunder is owned by him/her or licensed to him/her and that he/she has the +power and authority to grant the Licence. + +Each Contributor warrants that the copyright in the modifications he/she brings +to the Work are owned by him/her or licensed to him/her and that he/she has the +power and authority to grant the Licence. + +Each time You accept the Licence, the original Licensor and subsequent +Contributors grant You a licence to their contributions to the Work, under the +terms of this Licence. + + + +7. Disclaimer of Warranty + +The Work is a work in progress, which is continuously improved by numerous +contributors. It is not a finished work and may therefore contain defects or +“bugs” inherent to this type of software development. + +For the above reason, the Work is provided under the Licence on an “as is” basis +and without warranties of any kind concerning the Work, including without +limitation merchantability, fitness for a particular purpose, absence of defects +or errors, accuracy, non-infringement of intellectual property rights other than +copyright as stated in Article 6 of this Licence. + +This disclaimer of warranty is an essential part of the Licence and a condition +for the grant of any rights to the Work. + + + +8. Disclaimer of Liability + +Except in the cases of wilful misconduct or damages directly caused to natural +persons, the Licensor will in no event be liable for any direct or indirect, +material or moral, damages of any kind, arising out of the Licence or of the use +of the Work, including without limitation, damages for loss of goodwill, work +stoppage, computer failure or malfunction, loss of data or any commercial +damage, even if the Licensor has been advised of the possibility of such +damage. However, the Licensor will be liable under statutory product liability +laws as far such laws apply to the Work. + + + +9. Additional agreements + +While distributing the Original Work or Derivative Works, You may choose to +conclude an additional agreement to offer, and charge a fee for, acceptance of +support, warranty, indemnity, or other liability obligations and/or services +consistent with this Licence. However, in accepting such obligations, You may +act only on your own behalf and on your sole responsibility, not on behalf of +the original Licensor or any other Contributor, and only if You agree to +indemnify, defend, and hold each Contributor harmless for any liability incurred +by, or claims asserted against such Contributor by the fact You have accepted +any such warranty or additional liability. + + + +10. Acceptance of the Licence + +The provisions of this Licence can be accepted by clicking on an icon “I agree” +placed under the bottom of a window displaying the text of this Licence or by +affirming consent in any other similar way, in accordance with the rules of +applicable law. Clicking on that icon indicates your clear and irrevocable +acceptance of this Licence and all of its terms and conditions. + +Similarly, you irrevocably accept this Licence and all of its terms and +conditions by exercising any rights granted to You by Article 2 of this Licence, +such as the use of the Work, the creation by You of a Derivative Work or the +Distribution and/or Communication by You of the Work or copies thereof. + + + +11. Information to the public + +In case of any Distribution and/or Communication of the Work by means of +electronic communication by You (for example, by offering to download the Work +from a remote location) the distribution channel or media (for example, a +website) must at least provide to the public the information requested by the +applicable law regarding the Licensor, the Licence and the way it may be +accessible, concluded, stored and reproduced by the Licensee. + + + +12. Termination of the Licence + +The Licence and the rights granted hereunder will terminate automatically upon +any breach by the Licensee of the terms of the Licence. + +Such a termination will not terminate the licences of any person who has +received the Work from the Licensee under the Licence, provided such persons +remain in full compliance with the Licence. + + + +13. Miscellaneous + +Without prejudice of Article 9 above, the Licence represents the complete +agreement between the Parties as to the Work licensed hereunder. + +If any provision of the Licence is invalid or unenforceable under applicable +law, this will not affect the validity or enforceability of the Licence as a +whole. Such provision will be construed and/or reformed so as necessary to make +it valid and enforceable. + +The European Commission may publish other linguistic versions and/or new +versions of this Licence, so far this is required and reasonable, without +reducing the scope of the rights granted by the Licence. New versions of the +Licence will be published with a unique version number. + +All linguistic versions of this Licence, approved by the European Commission, +have identical value. Parties can take advantage of the linguistic version of +their choice. + + + +14. Jurisdiction + +Any litigation resulting from the interpretation of this License, arising +between the European Commission, as a Licensor, and any Licensee, will be +subject to the jurisdiction of the Court of Justice of the European Communities, +as laid down in article 238 of the Treaty establishing the European Community. + +Any litigation arising between Parties, other than the European Commission, and +resulting from the interpretation of this License, will be subject to the +exclusive jurisdiction of the competent court where the Licensor resides or +conducts its primary business. + + + +15. Applicable Law + +This Licence shall be governed by the law of the European Union country where +the Licensor resides or has his registered office. + +This licence shall be governed by the Belgian law if: + +- a litigation arises between the European Commission, as a Licensor, and any +- Licensee; the Licensor, other than the European Commission, has no residence +- or registered office inside a European Union country. + + +=== + + +Appendix + + + +“Compatible Licences” according to article 5 EUPL are: + + +- GNU General Public License (GNU GPL) v. 2 + +- Open Software License (OSL) v. 2.1, v. 3.0 + +- Common Public License v. 1.0 + +- Eclipse Public License v. 1.0 + +- Cecill v. 2.0 \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/README b/src/main/webapp/WEB-INF/README new file mode 100644 index 0000000..b1dcfa9 --- /dev/null +++ b/src/main/webapp/WEB-INF/README @@ -0,0 +1,80 @@ +The gCube System - accounting-service +-------------------------------------------------- + +Service Accounting Manger + + +This software is part of the gCube Framework (https://www.gcube-system.org/): an +open-source software toolkit used for building and operating Hybrid Data +Infrastructures enabling the dynamic deployment of Virtual Research Environments +by favouring the realisation of reuse oriented policies. + +The projects leading to this software have received funding from a series of +European Union programmes including: +* the Sixth Framework Programme for Research and Technological Development - +DILIGENT (grant no. 004260); +* the Seventh Framework Programme for research, technological development and +demonstration - D4Science (grant no. 212488), D4Science-II (grant no. +239019),ENVRI (grant no. 283465), EUBrazilOpenBio (grant no. 288754), iMarine +(grant no. 283644); +* the H2020 research and innovation programme - BlueBRIDGE (grant no. 675680), +EGIEngage (grant no. 654142), ENVRIplus (grant no. 654182), Parthenos (grant +no. 654119), SoBigData (grant no. 654024); + + +Version +-------------------------------------------------- + +1.0.0-SNAPSHOT (2017-04-21) + +Please see the file named "changelog.xml" in this directory for the release notes. + + +Authors +-------------------------------------------------- + +* Alessandro Pieve (alessandro.pieve@isti.cnr.it), CNR, Italy + + +Maintainers +----------- + +* Alessandro Pieve (alessandro.pieve@isti.cnr.it), CNR, Italy +* Lucio Lelii (lucio.lelii@isti.cnr.it), CNR, Italy + + +Download information +-------------------------------------------------- + +Source code is available from SVN: + ${scm.url} + +Binaries can be downloaded from the gCube website: + https://www.gcube-system.org/ + + +Installation +-------------------------------------------------- + +Installation documentation is available on-line in the gCube Wiki: + https://wiki.gcube-system.org/gcube/index.php/3MConnector + + +Documentation +-------------------------------------------------- + +Documentation is available on-line in the gCube Wiki: + https://wiki.gcube-system.org/gcube/index.php/3MConnector + + +Support +-------------------------------------------------- + +Bugs and support requests can be reported in the gCube issue tracking tool: + https://support.d4science.org/projects/gcube/ + + +Licensing +-------------------------------------------------- + +This software is licensed under the terms you may find in the file named "LICENSE" in this directory. \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/changelog.xml b/src/main/webapp/WEB-INF/changelog.xml new file mode 100644 index 0000000..5aaf427 --- /dev/null +++ b/src/main/webapp/WEB-INF/changelog.xml @@ -0,0 +1,6 @@ + + + First Release + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/descriptor.xml b/src/main/webapp/WEB-INF/descriptor.xml new file mode 100644 index 0000000..0fe7cba --- /dev/null +++ b/src/main/webapp/WEB-INF/descriptor.xml @@ -0,0 +1,32 @@ + + servicearchive + + tar.gz + + / + + + /home/pieve/workspace/accounting-service/distro + / + true + + README + LICENSE + changelog.xml + profile.xml + + 755 + true + + + + + target/accounting-service.war + /accounting-service + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/gcube-app.xml b/src/main/webapp/WEB-INF/gcube-app.xml new file mode 100644 index 0000000..a848f1a --- /dev/null +++ b/src/main/webapp/WEB-INF/gcube-app.xml @@ -0,0 +1,10 @@ + + AccountService + DataPublishing + 1.0.0-SNAPSHOT + AccountService webapp + + + /* + + diff --git a/src/main/webapp/WEB-INF/profile.xml b/src/main/webapp/WEB-INF/profile.xml new file mode 100644 index 0000000..2280ec6 --- /dev/null +++ b/src/main/webapp/WEB-INF/profile.xml @@ -0,0 +1,26 @@ + + + + Service + + Service Accounting Manger + DataPublishing + accounting-service + 1.0.0 + + + accounting-service + 1.0.0-SNAPSHOT + + org.gcube.data.publishing + accounting-service + 1.0.0-SNAPSHOT + + + accounting-service.jar + + + + + + diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 0000000..926d165 --- /dev/null +++ b/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,19 @@ + + Accounting Service + Accounting service + + org.gcube.data.publishing.accounting.service.AccountingResource + + + com.sun.jersey.api.json.POJOMappingFeature + true + + + + + + org.gcube.data.publishing.accounting.service.AccountingResource + /gcube/service/* + + + diff --git a/src/test/java/org/gucbe/data/publishing/accounting/service/JerseyClient.java b/src/test/java/org/gucbe/data/publishing/accounting/service/JerseyClient.java new file mode 100644 index 0000000..55267e3 --- /dev/null +++ b/src/test/java/org/gucbe/data/publishing/accounting/service/JerseyClient.java @@ -0,0 +1,54 @@ +package org.gucbe.data.publishing.accounting.service; + +//import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class JerseyClient { + + private static Logger log = LoggerFactory.getLogger(JerseyClient.class); + + + + + //@Test + public void Insert() { + /* + try { + + Student st = new Student("Adriana", "Barrer", 12, 9); + + ClientConfig clientConfig = new DefaultClientConfig(); + + clientConfig.getFeatures().put( + JSONConfiguration.FEATURE_POJO_MAPPING, Boolean.TRUE); + + Client client = Client.create(clientConfig); + + WebResource webResource = client + .resource("http://localhost:8080/accounting-service/gcube/service/send?gcube-token=3acdde42-6883-4564-b3ba-69f6486f6fe0-98187548"); + + ClientResponse response = webResource.accept("application/json") + .type("application/json").post(ClientResponse.class, st); + + if (response.getStatus() != 200) { + throw new RuntimeException("Failed : HTTP error code : " + + response.getStatus()); + } + + String output = response.getEntity(String.class); + + System.out.println("Server response .... \n"); + System.out.println(output); + + } catch (Exception e) { + + e.printStackTrace(); + + } + +*/ + + } + +}