Improving code

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@117218 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Luca Frosini 2015-07-14 12:44:40 +00:00
parent 80101b5b7c
commit 8872c8a9e5
1 changed files with 6 additions and 6 deletions

View File

@ -23,8 +23,8 @@ import org.gcube.resources.discovery.icclient.ICFactory;
*/ */
public class AccountingPersistenceConfiguration { public class AccountingPersistenceConfiguration {
protected final String SERVICE_ENDPOINT_CATEGORY = "Accounting"; public final String SERVICE_ENDPOINT_CATEGORY = "Accounting";
protected final String SERVICE_ENDPOINT_NAME = "Persistence"; public final String SERVICE_ENDPOINT_NAME = "Persistence";
protected static final String PERSISTENCE_CLASS_NAME = "persistenceClassName"; protected static final String PERSISTENCE_CLASS_NAME = "persistenceClassName";
@ -51,7 +51,7 @@ public class AccountingPersistenceConfiguration {
public AccountingPersistenceConfiguration(String persistenceClassName) throws Exception { public AccountingPersistenceConfiguration(String persistenceClassName) throws Exception {
init(); init();
ServiceEndpoint serviceEndpoint = getServiceEndpoint(persistenceClassName); ServiceEndpoint serviceEndpoint = getServiceEndpoint(SERVICE_ENDPOINT_CATEGORY, SERVICE_ENDPOINT_NAME, persistenceClassName);
setValues(serviceEndpoint); setValues(serviceEndpoint);
} }
@ -110,10 +110,10 @@ public class AccountingPersistenceConfiguration {
return value; return value;
} }
protected ServiceEndpoint getServiceEndpoint(String persistenceClassName){ protected ServiceEndpoint getServiceEndpoint(String serviceEndpointCategory, String serviceEndpointName, String persistenceClassName){
SimpleQuery query = ICFactory.queryFor(ServiceEndpoint.class); SimpleQuery query = ICFactory.queryFor(ServiceEndpoint.class);
query.addCondition(String.format("$resource/Profile/Category/text() eq '%s'", SERVICE_ENDPOINT_CATEGORY)); query.addCondition(String.format("$resource/Profile/Category/text() eq '%s'", serviceEndpointCategory));
query.addCondition(String.format("$resource/Profile/Name/text() eq '%s'", SERVICE_ENDPOINT_NAME)); query.addCondition(String.format("$resource/Profile/Name/text() eq '%s'", serviceEndpointName));
query.addCondition(String.format("$resource/Profile/AccessPoint/Properties/Property/Name/text() eq '%s'", PERSISTENCE_CLASS_NAME)); query.addCondition(String.format("$resource/Profile/AccessPoint/Properties/Property/Name/text() eq '%s'", PERSISTENCE_CLASS_NAME));
query.addCondition(String.format("$resource/Profile/AccessPoint/Properties/Property/Value/text() eq '%s'", persistenceClassName)); query.addCondition(String.format("$resource/Profile/AccessPoint/Properties/Property/Value/text() eq '%s'", persistenceClassName));
query.setResult("$resource"); query.setResult("$resource");