Removing getProperty method from OCCIAplication and ManagerController

classes

Author: giovannifs

src/main/java/org/fogbowcloud/manager/core/ManagerController.java

@@ -1644,10 +1644,6 @@ protected FailedBatch getFailedBatches() {
 		return failedBatch;
 	}
 
-	public String getProperty(String property) {
-		return properties.getProperty(property);
-	}
-	
 	protected class FailedBatch {
 		private Map<String, FailedBatchType> failedBatches = new HashMap<String, FailedBatchType>();
 

src/main/java/org/fogbowcloud/manager/occi/OCCIApplication.java

@@ -196,10 +196,6 @@ public ResourcesInfo getLocalUserQuota(String localAccessToken) {
 		return managerFacade.getLocalUserQuota(localAccessToken);
 	}
 
-	public String getProperty(String property) {
-		return managerFacade.getProperty(property);
-	}
-
 	public String getUser(String authToken) {
 		return managerFacade.getUser(authToken);
 	}

src/main/java/org/fogbowcloud/manager/occi/instance/ComputeServerResource.java

@@ -62,7 +62,8 @@ public class ComputeServerResource extends ServerResource {
 
 	protected void doInit() throws ResourceException {
 
-		String instanceDSUrl = ((OCCIApplication) getApplication())
+		Properties properties = ((OCCIApplication) getApplication()).getProperties();
+		String instanceDSUrl = properties
 				.getProperty(ConfigurationConstants.INSTANCE_DATA_STORE_URL);
 		instanceDB = new InstanceDataStore(instanceDSUrl);
 
@@ -325,7 +326,7 @@ public StringRepresentation post() {
 			throw new OCCIException(ErrorType.BAD_REQUEST, ResponseConstants.IRREGULAR_SYNTAX);
 		}
 
-		String imageName = application.getProperty(
+		String imageName = properties.getProperty(
 				ConfigurationConstants.OCCI_EXTRA_RESOURCES_PREFIX + osTplResources.get(0).getCategory().getTerm());
 		if (imageName == null || imageName.isEmpty()) {
 			throw new OCCIException(ErrorType.BAD_REQUEST,
@@ -338,7 +339,7 @@ public StringRepresentation post() {
 		// resource tpl
 		List<Resource> resourceTplResources = filterByRelProperty(RequestConstants.RESOURCE_TPL_OCCI_SCHEME,
 				resources);
-		String fogbowRequirements = getRequirements(application, resourceTplResources);		
+		String fogbowRequirements = getRequirements(properties, resourceTplResources);		
 		requestXOCCIAtt.put(RequestAttribute.REQUIREMENTS.getValue(), fogbowRequirements);
 		requestXOCCIAtt.put(RequestAttribute.INSTANCE_COUNT.getValue(), DEFAULT_INSTANCE_COUNT);
 
@@ -375,10 +376,10 @@ public StringRepresentation post() {
 		return new StringRepresentation(ResponseConstants.OK);
 	}
 
-	private String getRequirements(OCCIApplication application, List<Resource> resourceTplResources) {
+	private String getRequirements(Properties properties, List<Resource> resourceTplResources) {
 		StringBuilder requirements = new StringBuilder();
 		for (int i = 0; i < resourceTplResources.size(); i++) {
-			String currentRequirement = application.getProperty(ConfigurationConstants.OCCI_EXTRA_RESOURCES_PREFIX
+			String currentRequirement = properties.getProperty(ConfigurationConstants.OCCI_EXTRA_RESOURCES_PREFIX
 					+ resourceTplResources.get(i).getCategory().getTerm());
 
 			if (currentRequirement == null || currentRequirement.isEmpty()) {