You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2015/04/13 08:13:55 UTC
[1/4] stratos git commit: Formatting mock iaas code
Repository: stratos
Updated Branches:
refs/heads/master c774dc036 -> ab7498bd7
Formatting mock iaas code
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/e8da60bb
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/e8da60bb
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/e8da60bb
Branch: refs/heads/master
Commit: e8da60bb77ff45aa93b4d09976e3c2d8c73e40a9
Parents: c774dc0
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Mon Apr 13 09:19:52 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Mon Apr 13 09:19:52 2015 +0530
----------------------------------------------------------------------
.../mock/iaas/config/MockIaasConfig.java | 2 +-
.../mock/iaas/config/MockIaasConfigParser.java | 21 ++++++++-----------
.../stratos/mock/iaas/domain/ErrorResponse.java | 2 +-
.../mock/iaas/domain/MockInstanceContext.java | 2 +-
.../iaas/internal/MockIaasServiceComponent.java | 7 +++----
.../iaas/internal/ServiceReferenceHolder.java | 2 +-
.../persistence/PersistenceManagerFactory.java | 5 ++---
.../mock/iaas/persistence/RegistryManager.java | 19 ++++++++++-------
.../mock/iaas/services/MockIaasService.java | 5 +++++
.../iaas/services/impl/MockIaasServiceImpl.java | 22 +++++++++++++-------
.../iaas/services/impl/MockIaasServiceUtil.java | 6 +++---
.../mock/iaas/services/impl/MockInstance.java | 10 ++++-----
.../iaas/statistics/MockHealthStatistics.java | 22 ++++++++++++--------
.../MockHealthStatisticsGenerator.java | 8 ++++---
.../generator/MockHealthStatisticsPattern.java | 14 ++++++++-----
.../mock/iaas/test/MockIaasServiceTest.java | 4 ++--
16 files changed, 85 insertions(+), 66 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/e8da60bb/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/config/MockIaasConfig.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/config/MockIaasConfig.java b/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/config/MockIaasConfig.java
index 55d32ff..aa1d565 100644
--- a/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/config/MockIaasConfig.java
+++ b/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/config/MockIaasConfig.java
@@ -34,7 +34,7 @@ public class MockIaasConfig {
private boolean enabled;
private MockHealthStatisticsConfig mockHealthStatisticsConfig;
-
+
public static MockIaasConfig getInstance() {
if (instance == null) {
synchronized (MockIaasConfig.class) {
http://git-wip-us.apache.org/repos/asf/stratos/blob/e8da60bb/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/config/MockIaasConfigParser.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/config/MockIaasConfigParser.java b/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/config/MockIaasConfigParser.java
index 371d5e1..3116ab3 100644
--- a/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/config/MockIaasConfigParser.java
+++ b/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/config/MockIaasConfigParser.java
@@ -48,6 +48,7 @@ public class MockIaasConfigParser {
/**
* Parse mock iaas configuration and return configuration object.
+ *
* @param filePath
* @return
*/
@@ -59,7 +60,7 @@ public class MockIaasConfigParser {
OMElement document = AxiomXpathParserUtil.parse(new File(filePath));
String enabledStr = document.getAttributeValue(ENABLED_ATTRIBUTE);
- if(StringUtils.isEmpty(enabledStr)) {
+ if (StringUtils.isEmpty(enabledStr)) {
throw new RuntimeException("Enabled attribute not found in mock-iaas element");
}
mockIaasConfig.setEnabled(Boolean.parseBoolean(enabledStr));
@@ -93,7 +94,7 @@ public class MockIaasConfigParser {
MockAutoscalingFactor autoscalingFactor = convertAutoscalingFactor(factorStr);
OMAttribute modeAttribute = patternElement.getAttribute(MODE_ATTRIBUTE);
- if(modeAttribute == null) {
+ if (modeAttribute == null) {
throw new RuntimeException("Mode attribute not found in pattern element: " +
"[cartridge-type] " + cartridgeType);
}
@@ -138,26 +139,22 @@ public class MockIaasConfigParser {
}
private static StatisticsPatternMode convertMode(String modeStr) {
- if("loop".equals(modeStr)) {
+ if ("loop".equals(modeStr)) {
return StatisticsPatternMode.Loop;
- }
- else if("continue".equals(modeStr)) {
+ } else if ("continue".equals(modeStr)) {
return StatisticsPatternMode.Continue;
- }
- else if("stop".equals(modeStr)) {
+ } else if ("stop".equals(modeStr)) {
return StatisticsPatternMode.Stop;
}
throw new RuntimeException("An unknown statistics pattern mode found: " + modeStr);
}
private static MockAutoscalingFactor convertAutoscalingFactor(String factorStr) {
- if("memory-consumption".equals(factorStr)) {
+ if ("memory-consumption".equals(factorStr)) {
return MockAutoscalingFactor.MemoryConsumption;
- }
- else if("load-average".equals(factorStr)) {
+ } else if ("load-average".equals(factorStr)) {
return MockAutoscalingFactor.LoadAverage;
- }
- else if("request-in-flight".equals(factorStr)) {
+ } else if ("request-in-flight".equals(factorStr)) {
return MockAutoscalingFactor.RequestInFlight;
}
throw new RuntimeException("An unknown autoscaling factor found: " + factorStr);
http://git-wip-us.apache.org/repos/asf/stratos/blob/e8da60bb/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/domain/ErrorResponse.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/domain/ErrorResponse.java b/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/domain/ErrorResponse.java
index 981fdc0..d4692e5 100644
--- a/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/domain/ErrorResponse.java
+++ b/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/domain/ErrorResponse.java
@@ -31,7 +31,7 @@ public class ErrorResponse implements Serializable {
private int errorCode;
private String errorMessage;
- public ErrorResponse(){
+ public ErrorResponse() {
}
public ErrorResponse(int errorCode, String errorMessage) {
http://git-wip-us.apache.org/repos/asf/stratos/blob/e8da60bb/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/domain/MockInstanceContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/domain/MockInstanceContext.java b/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/domain/MockInstanceContext.java
index 82bb606..582ea43 100644
--- a/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/domain/MockInstanceContext.java
+++ b/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/domain/MockInstanceContext.java
@@ -41,7 +41,7 @@ public class MockInstanceContext implements Serializable {
private String defaultPublicIP;
private String instanceId;
- public MockInstanceContext(){
+ public MockInstanceContext() {
}
public MockInstanceContext(String applicationId, String serviceName, String clusterId, String memberId,
http://git-wip-us.apache.org/repos/asf/stratos/blob/e8da60bb/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/internal/MockIaasServiceComponent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/internal/MockIaasServiceComponent.java b/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/internal/MockIaasServiceComponent.java
index e1828e8..d4d3879 100644
--- a/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/internal/MockIaasServiceComponent.java
+++ b/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/internal/MockIaasServiceComponent.java
@@ -36,12 +36,11 @@ import org.wso2.carbon.registry.core.service.RegistryService;
import org.wso2.carbon.registry.core.session.UserRegistry;
/**
- *
* @scr.component name="org.apache.stratos.mock.iaas.internal.MockIaasServiceComponent" immediate="true"
* @scr.reference name="registry.service" interface="org.wso2.carbon.registry.core.service.RegistryService"
- * cardinality="1..1" policy="dynamic" bind="setRegistryService" unbind="unsetRegistryService"
+ * cardinality="1..1" policy="dynamic" bind="setRegistryService" unbind="unsetRegistryService"
* @scr.reference name="componentStartUpSynchronizer" interface="org.apache.stratos.common.services.ComponentStartUpSynchronizer"
- * cardinality="1..1" policy="dynamic" bind="setComponentStartUpSynchronizer" unbind="unsetComponentStartUpSynchronizer"
+ * cardinality="1..1" policy="dynamic" bind="setComponentStartUpSynchronizer" unbind="unsetComponentStartUpSynchronizer"
*/
public class MockIaasServiceComponent {
@@ -52,7 +51,7 @@ public class MockIaasServiceComponent {
@Override
public void run() {
try {
- if(!MockIaasConfig.getInstance().isEnabled()) {
+ if (!MockIaasConfig.getInstance().isEnabled()) {
log.debug("Mock IaaS is disabled, Mock IaaS service component is not activated");
return;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/e8da60bb/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/internal/ServiceReferenceHolder.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/internal/ServiceReferenceHolder.java b/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/internal/ServiceReferenceHolder.java
index 1334d93..fecce03 100644
--- a/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/internal/ServiceReferenceHolder.java
+++ b/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/internal/ServiceReferenceHolder.java
@@ -37,7 +37,7 @@ public class ServiceReferenceHolder {
public static ServiceReferenceHolder getInstance() {
if (instance == null) {
synchronized (ServiceReferenceHolder.class) {
- if(instance == null) {
+ if (instance == null) {
instance = new ServiceReferenceHolder();
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/e8da60bb/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/persistence/PersistenceManagerFactory.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/persistence/PersistenceManagerFactory.java b/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/persistence/PersistenceManagerFactory.java
index 85c7d34..c6d86c9 100644
--- a/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/persistence/PersistenceManagerFactory.java
+++ b/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/persistence/PersistenceManagerFactory.java
@@ -25,10 +25,9 @@ package org.apache.stratos.mock.iaas.persistence;
public class PersistenceManagerFactory {
public static PersistenceManager getPersistenceManager(PersistenceManagerType persistenceManagerType) {
- if(persistenceManagerType == PersistenceManagerType.Registry) {
+ if (persistenceManagerType == PersistenceManagerType.Registry) {
return new RegistryManager();
- }
- else if(persistenceManagerType == PersistenceManagerType.Mock) {
+ } else if (persistenceManagerType == PersistenceManagerType.Mock) {
return new MockPersistenceManager();
}
throw new RuntimeException("Invalid persistence manager type");
http://git-wip-us.apache.org/repos/asf/stratos/blob/e8da60bb/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/persistence/RegistryManager.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/persistence/RegistryManager.java b/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/persistence/RegistryManager.java
index c566049..59e507e 100644
--- a/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/persistence/RegistryManager.java
+++ b/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/persistence/RegistryManager.java
@@ -38,7 +38,7 @@ import java.io.*;
public class RegistryManager implements PersistenceManager {
private final static Log log = LogFactory.getLog(RegistryManager.class);
-
+
RegistryManager() {
}
@@ -49,7 +49,7 @@ public class RegistryManager implements PersistenceManager {
*/
@Override
public synchronized void persist(String resourcePath, Serializable serializableObject) throws RegistryException {
- if(log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug(String.format("Persisting resource in registry: [resource-path] %s", resourcePath));
}
@@ -57,8 +57,8 @@ public class RegistryManager implements PersistenceManager {
try {
PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext();
- ctx.setTenantId(MultitenantConstants.SUPER_TENANT_ID);
- ctx.setTenantDomain(MultitenantConstants.SUPER_TENANT_DOMAIN_NAME);
+ ctx.setTenantId(MultitenantConstants.SUPER_TENANT_ID);
+ ctx.setTenantDomain(MultitenantConstants.SUPER_TENANT_DOMAIN_NAME);
registry.beginTransaction();
@@ -68,7 +68,7 @@ public class RegistryManager implements PersistenceManager {
registry.commitTransaction();
- if(log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug(String.format("Resource persisted successfully in registry: [resource-path] %s",
resourcePath));
}
@@ -82,6 +82,7 @@ public class RegistryManager implements PersistenceManager {
/**
* Returns an object stored in the given resource path.
+ *
* @param resourcePath
* @return
* @throws org.wso2.carbon.registry.core.exceptions.RegistryException
@@ -92,8 +93,8 @@ public class RegistryManager implements PersistenceManager {
Registry registry = getRegistry();
PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext();
- ctx.setTenantId(MultitenantConstants.SUPER_TENANT_ID);
- ctx.setTenantDomain(MultitenantConstants.SUPER_TENANT_DOMAIN_NAME);
+ ctx.setTenantId(MultitenantConstants.SUPER_TENANT_ID);
+ ctx.setTenantDomain(MultitenantConstants.SUPER_TENANT_DOMAIN_NAME);
Resource resource = registry.get(resourcePath);
Object content = resource.getContent();
if ((content != null) && (content instanceof byte[])) {
@@ -115,7 +116,7 @@ public class RegistryManager implements PersistenceManager {
}
@Override
- public synchronized void remove(String resourcePath) throws RegistryException{
+ public synchronized void remove(String resourcePath) throws RegistryException {
Registry registry = getRegistry();
try {
@@ -140,6 +141,7 @@ public class RegistryManager implements PersistenceManager {
/**
* Serialize an object to a byte array.
+ *
* @param serializableObject
* @return
* @throws java.io.IOException
@@ -163,6 +165,7 @@ public class RegistryManager implements PersistenceManager {
/**
* Deserialize a byte array and retrieve the object.
+ *
* @param bytes bytes to be deserialized
* @return the deserialized {@link Object}
* @throws Exception if the deserialization is failed.
http://git-wip-us.apache.org/repos/asf/stratos/blob/e8da60bb/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/services/MockIaasService.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/services/MockIaasService.java b/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/services/MockIaasService.java
index e4bbdf5..029b73e 100644
--- a/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/services/MockIaasService.java
+++ b/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/services/MockIaasService.java
@@ -32,6 +32,7 @@ public interface MockIaasService {
/**
* Start mock instance.
+ *
* @param mockInstanceContext
* @return
* @throws MockIaasException
@@ -40,18 +41,21 @@ public interface MockIaasService {
/**
* Terminate mock instance.
+ *
* @param instanceId
*/
void terminateInstance(String instanceId);
/**
* Get mock instances.
+ *
* @return
*/
List<MockInstanceMetadata> getInstances();
/**
* Get mock instance by instance id.
+ *
* @param instanceId
* @return
*/
@@ -59,6 +63,7 @@ public interface MockIaasService {
/**
* Allocate ip address to mock instance.
+ *
* @param instanceId
* @return
*/
http://git-wip-us.apache.org/repos/asf/stratos/blob/e8da60bb/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/services/impl/MockIaasServiceImpl.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/services/impl/MockIaasServiceImpl.java b/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/services/impl/MockIaasServiceImpl.java
index 995bbab..f023064 100644
--- a/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/services/impl/MockIaasServiceImpl.java
+++ b/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/services/impl/MockIaasServiceImpl.java
@@ -42,7 +42,7 @@ import java.util.concurrent.ExecutorService;
/**
* Mock IaaS service implementation. This is a singleton class that simulates a standard Infrastructure as a Service
* platform by creating mock instances and managing their lifecycle states.
- *
+ * <p/>
* How does this work:
* - Mock IaaS starts a Mock Member thread or each instance created
* - A sample private IP and a public IP will be assigned to the instance
@@ -77,7 +77,7 @@ public class MockIaasServiceImpl implements MockIaasService {
log.error(message, e);
throw new RuntimeException(message, e);
}
- if(instanceIdToMockInstanceMap == null) {
+ if (instanceIdToMockInstanceMap == null) {
// No instances found in registry, create a new map
instanceIdToMockInstanceMap = new ConcurrentHashMap<String, MockInstance>();
}
@@ -85,6 +85,7 @@ public class MockIaasServiceImpl implements MockIaasService {
/**
* Start mock instance.
+ *
* @param mockInstanceContext
* @return
* @throws MockIaasException
@@ -93,7 +94,7 @@ public class MockIaasServiceImpl implements MockIaasService {
public MockInstanceMetadata startInstance(MockInstanceContext mockInstanceContext) throws MockIaasException {
synchronized (MockIaasServiceImpl.class) {
- if(mockInstanceContext == null) {
+ if (mockInstanceContext == null) {
throw new MockIaasException("Mock instance context is null");
}
@@ -127,12 +128,13 @@ public class MockIaasServiceImpl implements MockIaasService {
/**
* Get mock instance contexts.
+ *
* @return
*/
@Override
public List<MockInstanceMetadata> getInstances() {
List<MockInstanceMetadata> mockInstanceMetadataList = new ArrayList<MockInstanceMetadata>();
- for(Map.Entry<String, MockInstance> entry : instanceIdToMockInstanceMap.entrySet()) {
+ for (Map.Entry<String, MockInstance> entry : instanceIdToMockInstanceMap.entrySet()) {
MockInstanceContext mockMemberContext = entry.getValue().getMockInstanceContext();
mockInstanceMetadataList.add(new MockInstanceMetadata(mockMemberContext));
}
@@ -141,12 +143,13 @@ public class MockIaasServiceImpl implements MockIaasService {
/**
* Get mock instance context by instance id.
+ *
* @param instanceId
* @return
*/
@Override
public MockInstanceMetadata getInstance(String instanceId) {
- if(instanceIdToMockInstanceMap.containsKey(instanceId)) {
+ if (instanceIdToMockInstanceMap.containsKey(instanceId)) {
MockInstanceContext mockInstanceContext = instanceIdToMockInstanceMap.get(instanceId).getMockInstanceContext();
return new MockInstanceMetadata(mockInstanceContext);
}
@@ -155,6 +158,7 @@ public class MockIaasServiceImpl implements MockIaasService {
/**
* Allocate ip address to mock instance.
+ *
* @param instanceId
* @return
* @throws MockIaasException
@@ -162,7 +166,7 @@ public class MockIaasServiceImpl implements MockIaasService {
@Override
public MockInstanceMetadata allocateIpAddress(String instanceId) throws MockIaasException {
MockInstance mockInstance = instanceIdToMockInstanceMap.get(instanceId);
- if(mockInstance == null) {
+ if (mockInstance == null) {
throw new MockIaasException(String.format("Mock instance not found: [instance-id] %s", instanceId));
}
@@ -176,6 +180,7 @@ public class MockIaasServiceImpl implements MockIaasService {
/**
* Terminate mock instance by instance id.
+ *
* @param instanceId
*/
@Override
@@ -204,13 +209,14 @@ public class MockIaasServiceImpl implements MockIaasService {
/**
* Find number of instances available for service type.
+ *
* @param serviceName
* @return
*/
private int getMemberCount(String serviceName) {
int count = 0;
- for(Map.Entry<String, MockInstance> entry : instanceIdToMockInstanceMap.entrySet()) {
- if(serviceName.equals(entry.getValue().getMockInstanceContext().getServiceName())) {
+ for (Map.Entry<String, MockInstance> entry : instanceIdToMockInstanceMap.entrySet()) {
+ if (serviceName.equals(entry.getValue().getMockInstanceContext().getServiceName())) {
count++;
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/e8da60bb/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/services/impl/MockIaasServiceUtil.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/services/impl/MockIaasServiceUtil.java b/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/services/impl/MockIaasServiceUtil.java
index 1d8d268..cbdc090 100644
--- a/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/services/impl/MockIaasServiceUtil.java
+++ b/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/services/impl/MockIaasServiceUtil.java
@@ -64,16 +64,16 @@ public class MockIaasServiceUtil {
StratosThreadPool.getExecutorService(MockConstants.MOCK_MEMBER_THREAD_POOL,
MockConstants.MOCK_MEMBER_THREAD_POOL_SIZE);
- if(instanceIdToMockMemberMap != null) {
+ if (instanceIdToMockMemberMap != null) {
log.info("Starting mock instances persisted...");
Set<String> serviceNameSet = new HashSet<String>();
- for(MockInstance mockInstance : instanceIdToMockMemberMap.values()) {
+ for (MockInstance mockInstance : instanceIdToMockMemberMap.values()) {
mockMemberExecutorService.submit(mockInstance);
// Schedule statistics updater tasks for service
String serviceName = mockInstance.getMockInstanceContext().getServiceName();
- if(!serviceNameSet.contains(serviceName)) {
+ if (!serviceNameSet.contains(serviceName)) {
MockHealthStatisticsGenerator.getInstance().scheduleStatisticsUpdaterTasks(serviceName);
serviceNameSet.add(serviceName);
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/e8da60bb/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/services/impl/MockInstance.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/services/impl/MockInstance.java b/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/services/impl/MockInstance.java
index d4f0a55..dcec2ea 100644
--- a/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/services/impl/MockInstance.java
+++ b/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/services/impl/MockInstance.java
@@ -77,7 +77,7 @@ public class MockInstance implements Runnable, Serializable {
while (!terminated) {
sleep(1000);
}
-
+
stopInstanceNotifierReceiver();
stopHealthStatisticsPublisher();
@@ -146,13 +146,13 @@ public class MockInstance implements Runnable, Serializable {
}
private void stopHealthStatisticsPublisher() {
- if(healthStatNotifierScheduledFuture != null) {
+ if (healthStatNotifierScheduledFuture != null) {
healthStatNotifierScheduledFuture.cancel(true);
}
- }
-
+ }
+
private void stopInstanceNotifierReceiver() {
- if(instanceNotifierEventReceiver != null) {
+ if (instanceNotifierEventReceiver != null) {
instanceNotifierEventReceiver.terminate();
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/e8da60bb/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/statistics/MockHealthStatistics.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/statistics/MockHealthStatistics.java b/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/statistics/MockHealthStatistics.java
index bb53059..bd20757 100644
--- a/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/statistics/MockHealthStatistics.java
+++ b/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/statistics/MockHealthStatistics.java
@@ -54,15 +54,16 @@ public class MockHealthStatistics {
/**
* Add statistics value for a cartridge type, autoscaling factor
+ *
* @param cartridgeType
* @param autoscalingFactor
* @param value
*/
public void addStatistics(String cartridgeType, MockAutoscalingFactor autoscalingFactor, Integer value) {
Map<String, Integer> factorValueMap = statisticsMap.get(cartridgeType);
- if(factorValueMap == null) {
+ if (factorValueMap == null) {
synchronized (MockHealthStatistics.class) {
- if(factorValueMap == null) {
+ if (factorValueMap == null) {
factorValueMap = new ConcurrentHashMap<String, Integer>();
statisticsMap.put(cartridgeType, factorValueMap);
}
@@ -73,14 +74,15 @@ public class MockHealthStatistics {
/**
* Returns current statistics of the given cartridge type, autoscaling factor
+ *
* @param cartridgeType
* @param autoscalingFactor
* @return
*/
public int getStatistics(String cartridgeType, MockAutoscalingFactor autoscalingFactor) throws NoStatisticsFoundException {
Map<String, Integer> factorValueMap = statisticsMap.get(cartridgeType);
- if(factorValueMap != null) {
- if(factorValueMap.containsKey(autoscalingFactor.toString())) {
+ if (factorValueMap != null) {
+ if (factorValueMap.containsKey(autoscalingFactor.toString())) {
return factorValueMap.get(autoscalingFactor.toString());
} else {
throw new NoStatisticsFoundException();
@@ -92,13 +94,14 @@ public class MockHealthStatistics {
/**
* Remove statistics found for the cartridge type, autoscaling factor
+ *
* @param cartridgeType
* @param autoscalingFactor
*/
public void removeStatistics(String cartridgeType, MockAutoscalingFactor autoscalingFactor) {
Map<String, Integer> factorValueMap = statisticsMap.get(cartridgeType);
- if(factorValueMap != null) {
- if(factorValueMap.containsKey(autoscalingFactor.toString())) {
+ if (factorValueMap != null) {
+ if (factorValueMap.containsKey(autoscalingFactor.toString())) {
factorValueMap.remove(autoscalingFactor.toString());
}
}
@@ -106,15 +109,16 @@ public class MockHealthStatistics {
/**
* Find default statistics value of the given autoscaling factor
+ *
* @param autoscalingFactor
* @return
*/
private int findDefault(MockAutoscalingFactor autoscalingFactor) {
- if(autoscalingFactor == MockAutoscalingFactor.MemoryConsumption) {
+ if (autoscalingFactor == MockAutoscalingFactor.MemoryConsumption) {
return DEFAULT_MEMORY_CONSUMPTION;
- } else if(autoscalingFactor == MockAutoscalingFactor.LoadAverage) {
+ } else if (autoscalingFactor == MockAutoscalingFactor.LoadAverage) {
return DEFAULT_LOAD_AVERAGE;
- } else if(autoscalingFactor == MockAutoscalingFactor.RequestInFlight) {
+ } else if (autoscalingFactor == MockAutoscalingFactor.RequestInFlight) {
return DEFAULT_REQUESTS_IN_FLIGHT;
}
throw new RuntimeException("An unknown autoscaling factor found: " + autoscalingFactor);
http://git-wip-us.apache.org/repos/asf/stratos/blob/e8da60bb/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/statistics/generator/MockHealthStatisticsGenerator.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/statistics/generator/MockHealthStatisticsGenerator.java b/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/statistics/generator/MockHealthStatisticsGenerator.java
index 208a12a..b8498fb 100644
--- a/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/statistics/generator/MockHealthStatisticsGenerator.java
+++ b/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/statistics/generator/MockHealthStatisticsGenerator.java
@@ -106,7 +106,7 @@ public class MockHealthStatisticsGenerator {
Map<String, ScheduledFuture> taskMap = serviceNameToTaskListMap.get(serviceName);
if ((taskMap != null) && (taskMap.size() > 0)) {
Iterator<String> factorIterator = taskMap.keySet().iterator();
- while(factorIterator.hasNext()) {
+ while (factorIterator.hasNext()) {
String factor = factorIterator.next();
stopStatisticsUpdaterTask(serviceName, factor);
}
@@ -116,14 +116,15 @@ public class MockHealthStatisticsGenerator {
/**
* Stop statistics updater task of a service/cartridge type, factor.
+ *
* @param serviceName
* @param factor
*/
public void stopStatisticsUpdaterTask(String serviceName, String factor) {
Map<String, ScheduledFuture> factorToTaskMap = serviceNameToTaskListMap.get(serviceName);
- if(factorToTaskMap != null) {
+ if (factorToTaskMap != null) {
ScheduledFuture task = factorToTaskMap.get(factor);
- if(task != null) {
+ if (task != null) {
task.cancel(true);
factorToTaskMap.remove(factor);
@@ -138,6 +139,7 @@ public class MockHealthStatisticsGenerator {
/**
* Returns true if there are statistics updater tasks scheduled for the given service/cartridge type
* else returns false.
+ *
* @param serviceName
* @return
*/
http://git-wip-us.apache.org/repos/asf/stratos/blob/e8da60bb/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/statistics/generator/MockHealthStatisticsPattern.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/statistics/generator/MockHealthStatisticsPattern.java b/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/statistics/generator/MockHealthStatisticsPattern.java
index ac14aa5..b88ec52 100644
--- a/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/statistics/generator/MockHealthStatisticsPattern.java
+++ b/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/statistics/generator/MockHealthStatisticsPattern.java
@@ -56,6 +56,7 @@ public class MockHealthStatisticsPattern {
/**
* Returns autoscaling factor
+ *
* @return
*/
public MockAutoscalingFactor getFactor() {
@@ -64,6 +65,7 @@ public class MockHealthStatisticsPattern {
/**
* Returns statistics pattern mode
+ *
* @return
*/
public StatisticsPatternMode getMode() {
@@ -72,25 +74,26 @@ public class MockHealthStatisticsPattern {
/**
* Returns next sample value
+ *
* @return
*/
public int getNextSample() throws NoSampleValuesFoundException, StopStatisticsPublishingException,
ContinueLastSampleValueException {
- if((sampleValues == null) || (sampleValues.size() < 1)) {
+ if ((sampleValues == null) || (sampleValues.size() < 1)) {
throw new NoSampleValuesFoundException();
}
- if(!sampleValuesIterator.hasNext()) {
+ if (!sampleValuesIterator.hasNext()) {
// Iterator has come to the end of the list
- if(getMode() == StatisticsPatternMode.Loop) {
+ if (getMode() == StatisticsPatternMode.Loop) {
// Looping: reset the iterator
sampleValuesIterator = sampleValues.iterator();
return Integer.parseInt(sampleValuesIterator.next().toString());
- } else if(getMode() == StatisticsPatternMode.Continue) {
+ } else if (getMode() == StatisticsPatternMode.Continue) {
// Continue: return the last value
int lastSampleValue = Integer.parseInt(sampleValues.get(sampleValues.size() - 1).toString());
throw new ContinueLastSampleValueException(lastSampleValue);
- } else if(getMode() == StatisticsPatternMode.Stop) {
+ } else if (getMode() == StatisticsPatternMode.Stop) {
throw new StopStatisticsPublishingException();
} else {
throw new RuntimeException("An unknown statistics pattern mode found");
@@ -102,6 +105,7 @@ public class MockHealthStatisticsPattern {
/**
* Returns sample duration in seconds
+ *
* @return
*/
public int getSampleDuration() {
http://git-wip-us.apache.org/repos/asf/stratos/blob/e8da60bb/components/org.apache.stratos.mock.iaas/src/test/java/org/apache/stratos/mock/iaas/test/MockIaasServiceTest.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.mock.iaas/src/test/java/org/apache/stratos/mock/iaas/test/MockIaasServiceTest.java b/components/org.apache.stratos.mock.iaas/src/test/java/org/apache/stratos/mock/iaas/test/MockIaasServiceTest.java
index 3fb6e0a..03efd91 100644
--- a/components/org.apache.stratos.mock.iaas/src/test/java/org/apache/stratos/mock/iaas/test/MockIaasServiceTest.java
+++ b/components/org.apache.stratos.mock.iaas/src/test/java/org/apache/stratos/mock/iaas/test/MockIaasServiceTest.java
@@ -94,8 +94,8 @@ public class MockIaasServiceTest {
}
private boolean instanceExist(List<MockInstanceMetadata> instances, String instanceId) {
- for(MockInstanceMetadata instance : instances) {
- if(instance.getInstanceId().equals(instanceId)) {
+ for (MockInstanceMetadata instance : instances) {
+ if (instance.getInstanceId().equals(instanceId)) {
return true;
}
}
[2/4] stratos git commit: Organize imports of mock iaas component
Posted by la...@apache.org.
Organize imports of mock iaas component
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/c67d3420
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/c67d3420
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/c67d3420
Branch: refs/heads/master
Commit: c67d34208976a647b9806081a878b5ab31ef4ce3
Parents: e8da60b
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Mon Apr 13 09:22:50 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Mon Apr 13 09:22:50 2015 +0530
----------------------------------------------------------------------
.../apache/stratos/mock/iaas/services/impl/MockInstance.java | 6 +++---
.../stratos/mock/iaas/statistics/MockHealthStatistics.java | 2 +-
.../statistics/generator/MockHealthStatisticsGenerator.java | 2 +-
.../iaas/statistics/generator/MockHealthStatisticsPattern.java | 2 +-
.../org/apache/stratos/mock/iaas/test/MockIaasServiceTest.java | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/c67d3420/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/services/impl/MockInstance.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/services/impl/MockInstance.java b/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/services/impl/MockInstance.java
index dcec2ea..a7aa17a 100644
--- a/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/services/impl/MockInstance.java
+++ b/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/services/impl/MockInstance.java
@@ -21,9 +21,6 @@ package org.apache.stratos.mock.iaas.services.impl;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.stratos.mock.iaas.domain.MockInstanceContext;
-import org.apache.stratos.mock.iaas.event.publisher.MockMemberEventPublisher;
-import org.apache.stratos.mock.iaas.statistics.publisher.MockHealthStatisticsNotifier;
import org.apache.stratos.common.threading.StratosThreadPool;
import org.apache.stratos.messaging.event.Event;
import org.apache.stratos.messaging.event.instance.notifier.InstanceCleanupClusterEvent;
@@ -31,6 +28,9 @@ import org.apache.stratos.messaging.event.instance.notifier.InstanceCleanupMembe
import org.apache.stratos.messaging.listener.instance.notifier.InstanceCleanupClusterEventListener;
import org.apache.stratos.messaging.listener.instance.notifier.InstanceCleanupMemberEventListener;
import org.apache.stratos.messaging.message.receiver.instance.notifier.InstanceNotifierEventReceiver;
+import org.apache.stratos.mock.iaas.domain.MockInstanceContext;
+import org.apache.stratos.mock.iaas.event.publisher.MockMemberEventPublisher;
+import org.apache.stratos.mock.iaas.statistics.publisher.MockHealthStatisticsNotifier;
import java.io.Serializable;
import java.util.concurrent.ExecutorService;
http://git-wip-us.apache.org/repos/asf/stratos/blob/c67d3420/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/statistics/MockHealthStatistics.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/statistics/MockHealthStatistics.java b/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/statistics/MockHealthStatistics.java
index bd20757..349644d 100644
--- a/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/statistics/MockHealthStatistics.java
+++ b/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/statistics/MockHealthStatistics.java
@@ -19,8 +19,8 @@
package org.apache.stratos.mock.iaas.statistics;
-import org.apache.stratos.mock.iaas.services.impl.MockAutoscalingFactor;
import org.apache.stratos.mock.iaas.exceptions.NoStatisticsFoundException;
+import org.apache.stratos.mock.iaas.services.impl.MockAutoscalingFactor;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
http://git-wip-us.apache.org/repos/asf/stratos/blob/c67d3420/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/statistics/generator/MockHealthStatisticsGenerator.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/statistics/generator/MockHealthStatisticsGenerator.java b/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/statistics/generator/MockHealthStatisticsGenerator.java
index b8498fb..ade7bf0 100644
--- a/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/statistics/generator/MockHealthStatisticsGenerator.java
+++ b/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/statistics/generator/MockHealthStatisticsGenerator.java
@@ -21,8 +21,8 @@ package org.apache.stratos.mock.iaas.statistics.generator;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.stratos.mock.iaas.config.MockIaasConfig;
import org.apache.stratos.common.threading.StratosThreadPool;
+import org.apache.stratos.mock.iaas.config.MockIaasConfig;
import java.util.Iterator;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/stratos/blob/c67d3420/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/statistics/generator/MockHealthStatisticsPattern.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/statistics/generator/MockHealthStatisticsPattern.java b/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/statistics/generator/MockHealthStatisticsPattern.java
index b88ec52..4adac3f 100644
--- a/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/statistics/generator/MockHealthStatisticsPattern.java
+++ b/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/statistics/generator/MockHealthStatisticsPattern.java
@@ -19,10 +19,10 @@
package org.apache.stratos.mock.iaas.statistics.generator;
-import org.apache.stratos.mock.iaas.services.impl.MockAutoscalingFactor;
import org.apache.stratos.mock.iaas.exceptions.ContinueLastSampleValueException;
import org.apache.stratos.mock.iaas.exceptions.NoSampleValuesFoundException;
import org.apache.stratos.mock.iaas.exceptions.StopStatisticsPublishingException;
+import org.apache.stratos.mock.iaas.services.impl.MockAutoscalingFactor;
import org.apache.stratos.mock.iaas.statistics.StatisticsPatternMode;
import java.util.Iterator;
http://git-wip-us.apache.org/repos/asf/stratos/blob/c67d3420/components/org.apache.stratos.mock.iaas/src/test/java/org/apache/stratos/mock/iaas/test/MockIaasServiceTest.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.mock.iaas/src/test/java/org/apache/stratos/mock/iaas/test/MockIaasServiceTest.java b/components/org.apache.stratos.mock.iaas/src/test/java/org/apache/stratos/mock/iaas/test/MockIaasServiceTest.java
index 03efd91..8b7aa1f 100644
--- a/components/org.apache.stratos.mock.iaas/src/test/java/org/apache/stratos/mock/iaas/test/MockIaasServiceTest.java
+++ b/components/org.apache.stratos.mock.iaas/src/test/java/org/apache/stratos/mock/iaas/test/MockIaasServiceTest.java
@@ -25,8 +25,8 @@ import org.apache.stratos.mock.iaas.config.MockIaasConfig;
import org.apache.stratos.mock.iaas.domain.MockInstanceContext;
import org.apache.stratos.mock.iaas.domain.MockInstanceMetadata;
import org.apache.stratos.mock.iaas.persistence.PersistenceManagerType;
-import org.apache.stratos.mock.iaas.services.impl.MockIaasServiceImpl;
import org.apache.stratos.mock.iaas.services.impl.MockConstants;
+import org.apache.stratos.mock.iaas.services.impl.MockIaasServiceImpl;
import org.junit.Test;
import java.net.URL;
[3/4] stratos git commit: Formatting mock iaas api code
Posted by la...@apache.org.
Formatting mock iaas api code
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/03a034e5
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/03a034e5
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/03a034e5
Branch: refs/heads/master
Commit: 03a034e5ac4a5ac0c024732d90998862d7bc3b2c
Parents: c67d342
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Mon Apr 13 11:42:30 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Mon Apr 13 11:42:30 2015 +0530
----------------------------------------------------------------------
components/org.apache.stratos.mock.iaas.api/pom.xml | 5 +++--
.../org/apache/stratos/mock/iaas/api/MockIaasApi.java | 13 +++++++------
.../iaas/api/handlers/BadRequestExceptionMapper.java | 2 +-
.../mock/iaas/api/handlers/CustomExceptionMapper.java | 12 ++++++------
.../api/handlers/CustomThrowableExceptionMapper.java | 2 +-
.../mock/iaas/api/handlers/GenericExceptionMapper.java | 6 +++---
.../main/webapp/mock-iaas-api/WEB-INF/cxf-servlet.xml | 5 +++--
7 files changed, 24 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/03a034e5/components/org.apache.stratos.mock.iaas.api/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.mock.iaas.api/pom.xml b/components/org.apache.stratos.mock.iaas.api/pom.xml
index ef30681..a9058c6 100644
--- a/components/org.apache.stratos.mock.iaas.api/pom.xml
+++ b/components/org.apache.stratos.mock.iaas.api/pom.xml
@@ -16,7 +16,8 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-components-parent</artifactId>
@@ -43,7 +44,7 @@
<build>
<plugins>
- <plugin>
+ <plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.5</source>
http://git-wip-us.apache.org/repos/asf/stratos/blob/03a034e5/components/org.apache.stratos.mock.iaas.api/src/main/java/org/apache/stratos/mock/iaas/api/MockIaasApi.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.mock.iaas.api/src/main/java/org/apache/stratos/mock/iaas/api/MockIaasApi.java b/components/org.apache.stratos.mock.iaas.api/src/main/java/org/apache/stratos/mock/iaas/api/MockIaasApi.java
index 8b7d4dc..51adad8 100644
--- a/components/org.apache.stratos.mock.iaas.api/src/main/java/org/apache/stratos/mock/iaas/api/MockIaasApi.java
+++ b/components/org.apache.stratos.mock.iaas.api/src/main/java/org/apache/stratos/mock/iaas/api/MockIaasApi.java
@@ -102,7 +102,7 @@ public class MockIaasApi {
log.debug(String.format("Get mock instance: [instance-id] %s", instanceId));
MockInstanceMetadata mockInstanceMetadata = getMockIaasService().getInstance(instanceId);
- if(mockInstanceMetadata == null) {
+ if (mockInstanceMetadata == null) {
return Response.status(Response.Status.NOT_FOUND).build();
}
@@ -126,12 +126,12 @@ public class MockIaasApi {
log.info(String.format("Allocating ip addresses: [instance-id] %s", instanceId));
MockInstanceMetadata mockInstanceMetadata = getMockIaasService().getInstance(instanceId);
- if(mockInstanceMetadata == null) {
+ if (mockInstanceMetadata == null) {
return Response.status(Response.Status.NOT_FOUND).build();
}
mockInstanceMetadata = getMockIaasService().allocateIpAddress(instanceId);
log.info(String.format("IP addresses allocated: [instance-id] %s [default-private-ip] %s " +
- "[default-public-ip] %s", instanceId, mockInstanceMetadata.getDefaultPrivateIp(),
+ "[default-public-ip] %s", instanceId, mockInstanceMetadata.getDefaultPrivateIp(),
mockInstanceMetadata.getDefaultPublicIp()));
return Response.ok(mockInstanceMetadata).build();
} catch (Exception e) {
@@ -161,12 +161,13 @@ public class MockIaasApi {
/**
* Get mock iaas service instance
+ *
* @return
*/
private MockIaasService getMockIaasService() {
- if(mockIaasService == null) {
+ if (mockIaasService == null) {
synchronized (MockIaasApi.class) {
- if(mockIaasService == null) {
+ if (mockIaasService == null) {
try {
try {
mockIaasService = (MockIaasService) PrivilegedCarbonContext.getThreadLocalCarbonContext().
@@ -189,7 +190,7 @@ public class MockIaasApi {
* Validate mock iaas service.
*/
private void validateMockIaasService() {
- if(getMockIaasService() == null) {
+ if (getMockIaasService() == null) {
throw new RuntimeException(String.format("Mock IaaS may have been disabled, please check %s file",
MockIaasConfig.MOCK_IAAS_CONFIG_FILE_NAME));
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/03a034e5/components/org.apache.stratos.mock.iaas.api/src/main/java/org/apache/stratos/mock/iaas/api/handlers/BadRequestExceptionMapper.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.mock.iaas.api/src/main/java/org/apache/stratos/mock/iaas/api/handlers/BadRequestExceptionMapper.java b/components/org.apache.stratos.mock.iaas.api/src/main/java/org/apache/stratos/mock/iaas/api/handlers/BadRequestExceptionMapper.java
index fd4f7a6..2fada31 100644
--- a/components/org.apache.stratos.mock.iaas.api/src/main/java/org/apache/stratos/mock/iaas/api/handlers/BadRequestExceptionMapper.java
+++ b/components/org.apache.stratos.mock.iaas.api/src/main/java/org/apache/stratos/mock/iaas/api/handlers/BadRequestExceptionMapper.java
@@ -53,7 +53,7 @@ public class BadRequestExceptionMapper implements ExceptionMapper<BadRequestExce
private static Log log = LogFactory.getLog(BadRequestExceptionMapper.class);
public Response toResponse(BadRequestException badRequestException) {
- if(log.isDebugEnabled()){
+ if (log.isDebugEnabled()) {
log.debug("Error in input format", badRequestException);
}
String errorMsg = badRequestException.getMessage() != null ? badRequestException.getMessage() : "please check" +
http://git-wip-us.apache.org/repos/asf/stratos/blob/03a034e5/components/org.apache.stratos.mock.iaas.api/src/main/java/org/apache/stratos/mock/iaas/api/handlers/CustomExceptionMapper.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.mock.iaas.api/src/main/java/org/apache/stratos/mock/iaas/api/handlers/CustomExceptionMapper.java b/components/org.apache.stratos.mock.iaas.api/src/main/java/org/apache/stratos/mock/iaas/api/handlers/CustomExceptionMapper.java
index af6d9f2..056bd11 100644
--- a/components/org.apache.stratos.mock.iaas.api/src/main/java/org/apache/stratos/mock/iaas/api/handlers/CustomExceptionMapper.java
+++ b/components/org.apache.stratos.mock.iaas.api/src/main/java/org/apache/stratos/mock/iaas/api/handlers/CustomExceptionMapper.java
@@ -35,16 +35,16 @@ public class CustomExceptionMapper implements ExceptionMapper<MockIaasApiExcepti
private static Log log = LogFactory.getLog(CustomExceptionMapper.class);
public Response toResponse(MockIaasApiException restAPIException) {
- if(log.isDebugEnabled()){
+ if (log.isDebugEnabled()) {
log.debug("Error while invoking the admin rest api", restAPIException);
}
// if no specific error message specified, spitting out a generaic error message
- String errorMessage = (restAPIException.getMessage() != null)?
- restAPIException.getMessage():"Error while fulfilling the request";
+ String errorMessage = (restAPIException.getMessage() != null) ?
+ restAPIException.getMessage() : "Error while fulfilling the request";
// if no specific error specified we are throwing the bad request http status code by default
- Response.Status httpStatus= (restAPIException.getHTTPStatusCode() != null)?
- restAPIException.getHTTPStatusCode():Response.Status.BAD_REQUEST;
-
+ Response.Status httpStatus = (restAPIException.getHTTPStatusCode() != null) ?
+ restAPIException.getHTTPStatusCode() : Response.Status.BAD_REQUEST;
+
log.error(errorMessage, restAPIException);
return Response.status(httpStatus.getStatusCode()).type(MediaType.APPLICATION_JSON).
entity(MockIaasApiUtils.buildMessage(httpStatus.getStatusCode(), errorMessage)).build();
http://git-wip-us.apache.org/repos/asf/stratos/blob/03a034e5/components/org.apache.stratos.mock.iaas.api/src/main/java/org/apache/stratos/mock/iaas/api/handlers/CustomThrowableExceptionMapper.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.mock.iaas.api/src/main/java/org/apache/stratos/mock/iaas/api/handlers/CustomThrowableExceptionMapper.java b/components/org.apache.stratos.mock.iaas.api/src/main/java/org/apache/stratos/mock/iaas/api/handlers/CustomThrowableExceptionMapper.java
index eb77540..f95203a 100644
--- a/components/org.apache.stratos.mock.iaas.api/src/main/java/org/apache/stratos/mock/iaas/api/handlers/CustomThrowableExceptionMapper.java
+++ b/components/org.apache.stratos.mock.iaas.api/src/main/java/org/apache/stratos/mock/iaas/api/handlers/CustomThrowableExceptionMapper.java
@@ -48,7 +48,7 @@ public class CustomThrowableExceptionMapper implements ExceptionMapper<Throwable
private static Log log = LogFactory.getLog(CustomThrowableExceptionMapper.class);
public Response toResponse(Throwable throwable) {
- if(log.isErrorEnabled()){
+ if (log.isErrorEnabled()) {
log.error("Internal server error", throwable);
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/03a034e5/components/org.apache.stratos.mock.iaas.api/src/main/java/org/apache/stratos/mock/iaas/api/handlers/GenericExceptionMapper.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.mock.iaas.api/src/main/java/org/apache/stratos/mock/iaas/api/handlers/GenericExceptionMapper.java b/components/org.apache.stratos.mock.iaas.api/src/main/java/org/apache/stratos/mock/iaas/api/handlers/GenericExceptionMapper.java
index 020101d..870c0a3 100644
--- a/components/org.apache.stratos.mock.iaas.api/src/main/java/org/apache/stratos/mock/iaas/api/handlers/GenericExceptionMapper.java
+++ b/components/org.apache.stratos.mock.iaas.api/src/main/java/org/apache/stratos/mock/iaas/api/handlers/GenericExceptionMapper.java
@@ -35,12 +35,12 @@ public class GenericExceptionMapper implements ExceptionMapper<WebApplicationExc
private static Log log = LogFactory.getLog(GenericExceptionMapper.class);
public Response toResponse(WebApplicationException webApplicationException) {
- if(log.isDebugEnabled()){
+ if (log.isDebugEnabled()) {
log.debug("Internal server error", webApplicationException);
}
// if no specific error message specified, spitting out a generic error message
- String errorMessage = (webApplicationException.getMessage() != null)?
- webApplicationException.getMessage():"Internal server error";
+ String errorMessage = (webApplicationException.getMessage() != null) ?
+ webApplicationException.getMessage() : "Internal server error";
return Response.status(Response.Status.INTERNAL_SERVER_ERROR).type(MediaType.APPLICATION_JSON).
entity(MockIaasApiUtils.buildMessage(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), errorMessage)).build();
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/03a034e5/components/org.apache.stratos.mock.iaas.api/src/main/webapp/mock-iaas-api/WEB-INF/cxf-servlet.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.mock.iaas.api/src/main/webapp/mock-iaas-api/WEB-INF/cxf-servlet.xml b/components/org.apache.stratos.mock.iaas.api/src/main/webapp/mock-iaas-api/WEB-INF/cxf-servlet.xml
index 8efb926..8a41548 100644
--- a/components/org.apache.stratos.mock.iaas.api/src/main/webapp/mock-iaas-api/WEB-INF/cxf-servlet.xml
+++ b/components/org.apache.stratos.mock.iaas.api/src/main/webapp/mock-iaas-api/WEB-INF/cxf-servlet.xml
@@ -45,12 +45,13 @@
<bean id="exceptionHandler" class="org.apache.stratos.mock.iaas.api.handlers.CustomExceptionMapper"/>
<bean id="badRequestExceptionHandler" class="org.apache.stratos.mock.iaas.api.handlers.BadRequestExceptionMapper"/>
<bean id="genericExceptionHandler" class="org.apache.stratos.mock.iaas.api.handlers.GenericExceptionMapper"/>
- <bean id="throwableExceptionHandler" class="org.apache.stratos.mock.iaas.api.handlers.CustomThrowableExceptionMapper"/>
+ <bean id="throwableExceptionHandler"
+ class="org.apache.stratos.mock.iaas.api.handlers.CustomThrowableExceptionMapper"/>
<bean id="jsonProvider" class="org.apache.cxf.jaxrs.provider.json.JSONProvider">
<property name="supportUnwrapped" value="true"/>
<property name="serializeAsArray" value="true"/>
- <property name="dropRootElement" value="true" />
+ <property name="dropRootElement" value="true"/>
<property name="dropCollectionWrapperElement" value="true"/>
<property name="arrayKeys">
<list>
[4/4] stratos git commit: Organize imports of mock iaas api component
Posted by la...@apache.org.
Organize imports of mock iaas api component
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/ab7498bd
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/ab7498bd
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/ab7498bd
Branch: refs/heads/master
Commit: ab7498bd799bd2899d93aad452d088845dba052c
Parents: 03a034e
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Mon Apr 13 11:43:30 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Mon Apr 13 11:43:30 2015 +0530
----------------------------------------------------------------------
.../stratos/mock/iaas/api/handlers/CustomExceptionMapper.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/ab7498bd/components/org.apache.stratos.mock.iaas.api/src/main/java/org/apache/stratos/mock/iaas/api/handlers/CustomExceptionMapper.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.mock.iaas.api/src/main/java/org/apache/stratos/mock/iaas/api/handlers/CustomExceptionMapper.java b/components/org.apache.stratos.mock.iaas.api/src/main/java/org/apache/stratos/mock/iaas/api/handlers/CustomExceptionMapper.java
index 056bd11..ec237c1 100644
--- a/components/org.apache.stratos.mock.iaas.api/src/main/java/org/apache/stratos/mock/iaas/api/handlers/CustomExceptionMapper.java
+++ b/components/org.apache.stratos.mock.iaas.api/src/main/java/org/apache/stratos/mock/iaas/api/handlers/CustomExceptionMapper.java
@@ -20,8 +20,8 @@ package org.apache.stratos.mock.iaas.api.handlers;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.stratos.mock.iaas.api.utils.MockIaasApiUtils;
import org.apache.stratos.mock.iaas.api.exception.MockIaasApiException;
+import org.apache.stratos.mock.iaas.api.utils.MockIaasApiUtils;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;