gCubeSystem
/
accounting-lib
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@131245 82a268e6-3cf1-43bd-a215-b396298e98cf

This commit is contained in:
Alessandro Pieve 2016-09-08 15:21:05 +00:00
parent c23b53df2f
commit f71a86ad74
6 changed files with 68 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.classpath
View File

@ -20,7 +20,6 @@
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="org.eclipse.jst.component.nondependency" value=""/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">

3
distro/README
View File

@ -21,11 +21,14 @@ Authors
--------------------------------------------------
* Luca Frosini (luca.frosini-AT-isti.cnr.it), Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" - CNR, Pisa (Italy).
* Alessandro Pieve (alessandro.pieve-AT-isti.cnr.it), Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" - CNR, Pisa (Italy).
Maintainers
-----------
* Luca Frosini (luca.frosini-AT-isti.cnr.it), Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" - CNR, Pisa (Italy).
* Alessandro Pieve (alessandro.pieve-AT-isti.cnr.it), Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" - CNR, Pisa (Italy).
Download information

1
pom.xml
View File

@ -56,7 +56,6 @@
<dependency>
<groupId>org.gcube.data.publishing</groupId>
<artifactId>document-store-lib</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.gcube.resources.discovery</groupId>

21
src/main/java/org/gcube/accounting/datamodel/BasicUsageRecord.java
View File

@ -12,6 +12,7 @@ import org.gcube.accounting.datamodel.validations.validators.ValidOperationResul
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.documentstore.exception.InvalidValueException;
import org.gcube.documentstore.records.Record;
import org.gcube.documentstore.records.implementation.AbstractRecord;
@ -20,6 +21,7 @@ import org.gcube.documentstore.records.implementation.validations.annotations.No
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/
*
@ -50,14 +52,19 @@ public abstract class BasicUsageRecord extends AbstractRecord implements UsageRe
public static final String OPERATION_RESULT = UsageRecord.OPERATION_RESULT;
public static String getScopeFromToken(){
String token = SecurityTokenProvider.instance.get();
AuthorizationEntry authorizationEntry;
try {
authorizationEntry = Constants.authorizationService().get(token);
} catch (Exception e) {
throw new RuntimeException(e);
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();
}
String scope = authorizationEntry.getContext();
return scope;
}

23
src/main/java/org/gcube/accounting/datamodel/basetypes/AbstractServiceUsageRecord.java
View File

@ -48,17 +48,27 @@ public abstract class AbstractServiceUsageRecord extends BasicUsageRecord {
public static final String SERVICE_NAME = "serviceName";
/**
* KEY for : Service Name
* KEY for : Called Method
*/
@RequiredField @NotEmpty
public static final String CALLED_METHOD = "calledMethod";
/**
* KEY for : Service Name
* KEY for : Duration
*/
@RequiredField @ValidLong
public static final String DURATION = "duration";
/**
* KEY for : callerQualifier
*
*/
@RequiredField @NotEmpty
public static final String CALLERQUALIFIER = "callerQualifier";
public AbstractServiceUsageRecord(){
super();
}
@ -124,4 +134,13 @@ public abstract class AbstractServiceUsageRecord extends BasicUsageRecord {
public void setDuration(Long duration) throws InvalidValueException {
setResourceProperty(DURATION, duration);
}
/*Add a new field*/
public String getCallerQualifier() {
return (String) this.resourceProperties.get(CALLERQUALIFIER);
}
public void setCallerQualifier(String callerQualifier) throws InvalidValueException {
setResourceProperty(CALLERQUALIFIER, callerQualifier);
}
}

18
src/main/java/org/gcube/accounting/datamodel/basetypes/AbstractStorageUsageRecord.java
View File

@ -85,6 +85,15 @@ public abstract class AbstractStorageUsageRecord extends BasicUsageRecord {
@NotEmptyIfNotNull
public static final String QUALIFIER = "qualifier";
/**
* KEY for : callerQualifier
*/
/*
@NotEmptyIfNotNull
public static final String CALLERQUALIFIER = "callerQualifier";
*/
public AbstractStorageUsageRecord() {
super();
}
@ -184,4 +193,13 @@ public abstract class AbstractStorageUsageRecord extends BasicUsageRecord {
setResourceProperty(QUALIFIER, qualifier);
}
/*Add a new field*/
/*
public String getCallerQualifier() {
return (String) this.resourceProperties.get(CALLERQUALIFIER);
}
public void setCallerQualifier(String callerQualifier) throws InvalidValueException {
setResourceProperty(CALLERQUALIFIER, callerQualifier);
}
*/
}