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/07 08:28:31 UTC
[1/3] stratos git commit: Format common module code
Repository: stratos
Updated Branches:
refs/heads/master cf78b4c80 -> 65e8f1673
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/InFlightRequestPublisher.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/InFlightRequestPublisher.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/InFlightRequestPublisher.java
index 561173f..75cfd4d 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/InFlightRequestPublisher.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/InFlightRequestPublisher.java
@@ -26,11 +26,12 @@ public interface InFlightRequestPublisher extends StatisticsPublisher {
/**
* Publish in-flight request count.
- * @param clusterId Cluster id
- * @param networkPartitionId Network partition id of the cluster
+ *
+ * @param clusterId Cluster id
+ * @param networkPartitionId Network partition id of the cluster
* @param activeInstancesCount Active member instance count of the cluster
* @param inFlightRequestCount In-flight request count of the cluster
- * @param servedRequestCount Served request count of the cluster
+ * @param servedRequestCount Served request count of the cluster
*/
void publish(String clusterId, String networkPartitionId, int activeInstancesCount, int inFlightRequestCount, int servedRequestCount);
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/InFlightRequestPublisherFactory.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/InFlightRequestPublisherFactory.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/InFlightRequestPublisherFactory.java
index 10b265a..c942bce 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/InFlightRequestPublisherFactory.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/InFlightRequestPublisherFactory.java
@@ -27,7 +27,7 @@ import org.apache.stratos.common.statistics.publisher.wso2.cep.WSO2CEPInFlightRe
public class InFlightRequestPublisherFactory {
public static InFlightRequestPublisher createInFlightRequestPublisher(StatisticsPublisherType type) {
- if(type == StatisticsPublisherType.WSO2CEP) {
+ if (type == StatisticsPublisherType.WSO2CEP) {
return new WSO2CEPInFlightRequestPublisher();
} else {
throw new RuntimeException("Unknown statistics publisher type");
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/StatisticsPublisher.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/StatisticsPublisher.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/StatisticsPublisher.java
index cac973f..75fd65a 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/StatisticsPublisher.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/StatisticsPublisher.java
@@ -20,7 +20,7 @@
package org.apache.stratos.common.statistics.publisher;
/**
- * Statistics publisher interface.
+ * Statistics publisher interface.
*/
public interface StatisticsPublisher {
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/wso2/cep/ThriftClientConfig.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/wso2/cep/ThriftClientConfig.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/wso2/cep/ThriftClientConfig.java
index 154d311..18232d6 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/wso2/cep/ThriftClientConfig.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/wso2/cep/ThriftClientConfig.java
@@ -34,7 +34,8 @@ public class ThriftClientConfig {
* A private Constructor prevents any other
* class from instantiating.
*/
- ThriftClientConfig(){}
+ ThriftClientConfig() {
+ }
public static ThriftClientConfig getInstance() {
if (instance == null) {
@@ -53,10 +54,10 @@ public class ThriftClientConfig {
* CEP credential information can be found under thrift-client-config.xml file
* These credential information then get parsed and assigned into ThriftClientInfo
* Object.
- * <p>
+ * <p/>
* This method is used to return the assigned values in ThriftClientInfo Object
*
- * @return ThriftClientInfo object which consists of username,password,ip and port values
+ * @return ThriftClientInfo object which consists of username,password,ip and port values
*/
public ThriftClientInfo getThriftClientInfo() {
return thriftClientInfo;
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/wso2/cep/ThriftClientConfigParser.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/wso2/cep/ThriftClientConfigParser.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/wso2/cep/ThriftClientConfigParser.java
index ca45863..ae3c692 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/wso2/cep/ThriftClientConfigParser.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/wso2/cep/ThriftClientConfigParser.java
@@ -48,15 +48,15 @@ public class ThriftClientConfigParser {
* This method reads thrift-client-config.xml file and assign necessary credential
* values into thriftClientInfo object. A singleton design has been implemented
* with the use of thriftClientIConfig class.
- * <p>
+ * <p/>
* The filePath argument is the path to thrift-client-config.xml file
*
* @param filePath the path to thrift-client-config.xml file
- * @return ThriftClientConfig object
+ * @return ThriftClientConfig object
*/
public static ThriftClientConfig parse(String filePath) {
try {
- if(log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug(String.format("Parsing thrift client config file: %s", filePath));
}
@@ -65,7 +65,7 @@ public class ThriftClientConfigParser {
thriftClientIConfig.setThriftClientInfo(thriftClientInfo);
File configFile = new File(filePath);
- if(!configFile.exists()) {
+ if (!configFile.exists()) {
throw new RuntimeException(String.format("Thrift client config file does not exist: %s", filePath));
}
OMElement document = AxiomXpathParserUtil.parse(configFile);
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/wso2/cep/WSO2CEPHealthStatisticsPublisher.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/wso2/cep/WSO2CEPHealthStatisticsPublisher.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/wso2/cep/WSO2CEPHealthStatisticsPublisher.java
index 85319d7..1dc4240 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/wso2/cep/WSO2CEPHealthStatisticsPublisher.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/wso2/cep/WSO2CEPHealthStatisticsPublisher.java
@@ -69,6 +69,7 @@ public class WSO2CEPHealthStatisticsPublisher extends WSO2CEPStatisticsPublisher
/**
* Publish health statistics to cep.
+ *
* @param clusterId
* @param clusterInstanceId
* @param networkPartitionId
@@ -79,7 +80,7 @@ public class WSO2CEPHealthStatisticsPublisher extends WSO2CEPStatisticsPublisher
*/
@Override
public void publish(String clusterId, String clusterInstanceId, String networkPartitionId, String memberId, String partitionId, String health, double value) {
- if(log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug(String.format("Publishing health statistics: [cluster] %s [network-partition] %s [partition] %s [member] %s [health] %s [value] %f",
clusterId, networkPartitionId, partitionId, memberId, health, value));
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/wso2/cep/WSO2CEPInFlightRequestPublisher.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/wso2/cep/WSO2CEPInFlightRequestPublisher.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/wso2/cep/WSO2CEPInFlightRequestPublisher.java
index 1a901df..d618592 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/wso2/cep/WSO2CEPInFlightRequestPublisher.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/wso2/cep/WSO2CEPInFlightRequestPublisher.java
@@ -77,9 +77,9 @@ public class WSO2CEPInFlightRequestPublisher extends WSO2CEPStatisticsPublisher
List<Object> payload = new ArrayList<Object>();
payload.add(clusterId);
payload.add(networkPartitionId);
- payload.add((double)activeInstancesCount);
- payload.add((double)inFlightRequestCount);
- payload.add((double)servedRequestCount);
+ payload.add((double) activeInstancesCount);
+ payload.add((double) inFlightRequestCount);
+ payload.add((double) servedRequestCount);
super.publish(payload.toArray());
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/test/TestLogAppender.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/test/TestLogAppender.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/test/TestLogAppender.java
index 4d74826..366cfe9 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/test/TestLogAppender.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/test/TestLogAppender.java
@@ -37,7 +37,8 @@ public class TestLogAppender extends AppenderSkeleton {
return new ArrayList<String>(messages);
}
- public void close() {}
+ public void close() {
+ }
public boolean requiresLayout() {
return false;
@@ -45,7 +46,7 @@ public class TestLogAppender extends AppenderSkeleton {
@Override
protected void append(LoggingEvent event) {
- if(event.getMessage() != null) {
+ if (event.getMessage() != null) {
messages.add(event.getMessage().toString());
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/threading/StratosThreadPool.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/threading/StratosThreadPool.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/threading/StratosThreadPool.java
index eace99b..c0ae8ae 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/threading/StratosThreadPool.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/threading/StratosThreadPool.java
@@ -38,32 +38,33 @@ public class StratosThreadPool {
private static Map<String, ExecutorService> executorServiceMap = new ConcurrentHashMap<String, ExecutorService>();
private static Map<String, ScheduledExecutorService> scheduledServiceMap = new ConcurrentHashMap<String, ScheduledExecutorService>();
- private static Object executorServiceMapLock = new Object();
+ private static Object executorServiceMapLock = new Object();
private static Object scheduledServiceMapLock = new Object();
- /**
- * Return the executor service based on the identifier and thread pool size
- *
- * @param identifier Thread pool identifier name
- * @param threadPoolSize Thread pool size
- * @return ExecutorService
- */
- public static ExecutorService getExecutorService(String identifier, int threadPoolSize) {
- ExecutorService executorService = executorServiceMap.get(identifier);
- if (executorService == null) {
- synchronized (executorServiceMapLock) {
- if (executorService == null) {
- executorService = Executors.newFixedThreadPool(threadPoolSize);
- executorServiceMap.put(identifier, executorService);
+ /**
+ * Return the executor service based on the identifier and thread pool size
+ *
+ * @param identifier Thread pool identifier name
+ * @param threadPoolSize Thread pool size
+ * @return ExecutorService
+ */
+ public static ExecutorService getExecutorService(String identifier, int threadPoolSize) {
+ ExecutorService executorService = executorServiceMap.get(identifier);
+ if (executorService == null) {
+ synchronized (executorServiceMapLock) {
+ if (executorService == null) {
+ executorService = Executors.newFixedThreadPool(threadPoolSize);
+ executorServiceMap.put(identifier, executorService);
log.info(String.format("Thread pool created: [type] Executor Service [id] %s [size] %d", identifier, threadPoolSize));
- }
- }
- }
- return executorService;
- }
+ }
+ }
+ }
+ return executorService;
+ }
/**
* Returns a scheduled executor for given thread pool size.
+ *
* @param identifier Thread pool identifier name
* @param threadPoolSize Thread pool size
* @return
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/util/AxiomXpathParserUtil.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/util/AxiomXpathParserUtil.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/util/AxiomXpathParserUtil.java
index d5f6bd1..c27f9b7 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/util/AxiomXpathParserUtil.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/util/AxiomXpathParserUtil.java
@@ -61,10 +61,11 @@ public class AxiomXpathParserUtil {
public static final String ALIAS_ATTRIBUTE_PREFIX = "svns";
public static final String ALIAS_NAMESPACE = "http://org.wso2.securevault/configuration";
- private AxiomXpathParserUtil(){}
-
+ private AxiomXpathParserUtil() {
+ }
+
public static OMElement parse(File xmlSource) throws MalformedConfigurationFileException,
- IllegalArgumentException {
+ IllegalArgumentException {
OMElement documentElement;
@@ -121,7 +122,7 @@ public class AxiomXpathParserUtil {
}
public static OMElement getElement(final String fileName, final OMElement rootElt,
- final String eltStr, final String xpath) {
+ final String eltStr, final String xpath) {
List<?> nodes = getMatchingNodes(xpath, rootElt);
neglectingWarn(fileName, eltStr, nodes.size());
OMElement element = getElement(nodes.get(0));
@@ -140,31 +141,29 @@ public class AxiomXpathParserUtil {
private static void neglectingWarn(final String fileName, final String elt, final int size) {
if (size > 1) {
LOG.warn(fileName + " contains more than one " + elt + " elements!" +
- " Elements other than the first will be neglected.");
+ " Elements other than the first will be neglected.");
}
}
public static void plainTextWarn(final String elt) {
LOG.warn("Unable to find a value for " + elt + " element from Secure Vault." +
- "Hence we will try to assign the plain text value (if specified).");
+ "Hence we will try to assign the plain text value (if specified).");
}
/**
- * @param xpath
- * XPATH expression to be read.
- * @param elt
- * OMElement to be used for the search.
+ * @param xpath XPATH expression to be read.
+ * @param elt OMElement to be used for the search.
* @return List matching OMNode list
*/
@SuppressWarnings("unchecked")
- public static OMNode getFirstMatchingNode(final String xpath, final OMElement elt) throws MalformedConfigurationFileException{
+ public static OMNode getFirstMatchingNode(final String xpath, final OMElement elt) throws MalformedConfigurationFileException {
AXIOMXPath axiomXpath;
List<OMNode> nodeList = null;
try {
axiomXpath = new AXIOMXPath(xpath);
nodeList = axiomXpath.selectNodes(elt);
- return nodeList.isEmpty() ? null : nodeList.get(0);
+ return nodeList.isEmpty() ? null : nodeList.get(0);
} catch (JaxenException e) {
String msg = "Error occurred while reading the Xpath (" + xpath + ")";
LOG.error(msg, e);
@@ -174,12 +173,11 @@ public class AxiomXpathParserUtil {
}
/**
- * @param xpath
- * XPATH expression to be read.
+ * @param xpath XPATH expression to be read.
* @return List matching list
*/
@SuppressWarnings("unchecked")
- public static List<OMNode> getMatchingNodes(OMElement elt, final String xpath) throws MalformedConfigurationFileException{
+ public static List<OMNode> getMatchingNodes(OMElement elt, final String xpath) throws MalformedConfigurationFileException {
AXIOMXPath axiomXpath;
List<OMNode> nodeList = null;
@@ -196,14 +194,12 @@ public class AxiomXpathParserUtil {
}
/**
- * @param xpath
- * XPATH expression to be read.
- * @param elt
- * OMElement to be used for the search.
+ * @param xpath XPATH expression to be read.
+ * @param elt OMElement to be used for the search.
* @return List matching OMNode list
*/
@SuppressWarnings("unchecked")
- public static List<OMNode> getMatchingNodes(final String xpath, final OMElement elt) throws MalformedConfigurationFileException{
+ public static List<OMNode> getMatchingNodes(final String xpath, final OMElement elt) throws MalformedConfigurationFileException {
AXIOMXPath axiomXpath;
List<OMNode> nodeList = null;
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/util/ClaimsMgtUtil.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/util/ClaimsMgtUtil.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/util/ClaimsMgtUtil.java
index 7a32348..d002feb 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/util/ClaimsMgtUtil.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/util/ClaimsMgtUtil.java
@@ -37,6 +37,7 @@ package org.apache.stratos.common.util;
* specific language governing permissions and limitations
* under the License.
*/
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.wso2.carbon.user.core.UserCoreConstants;
@@ -59,31 +60,27 @@ public class ClaimsMgtUtil {
private static final Log log = LogFactory.getLog(ClaimsMgtUtil.class);
/* Methods to get the first and last names from the getNames() */
+
/**
* gets first name
- *
+ *
* @param realmService realmService
- * @param tenantId
- * tenant id
+ * @param tenantId tenant id
* @return first name
- * @throws Exception
- * if error in getting the first name
+ * @throws Exception if error in getting the first name
*/
- public static String getFirstName(RealmService realmService, int tenantId)throws Exception {
+ public static String getFirstName(RealmService realmService, int tenantId) throws Exception {
String names[] = getNames(realmService, tenantId);
return names[0];
}
/**
* gets last name
- *
- * @param tenant
- * tenant
- * @param tenantId
- * tenant id
+ *
+ * @param tenant tenant
+ * @param tenantId tenant id
* @return last name
- * @throws Exception
- * if error in getting the last name
+ * @throws Exception if error in getting the last name
*/
public static String getLastName(RealmService realmService, int tenantId) throws Exception {
String names[] = getNames(realmService, tenantId);
@@ -93,14 +90,11 @@ public class ClaimsMgtUtil {
/**
* Gets the first name of a tenant admin to address him/her in the
* notifications
- *
- * @param tenant
- * tenant
- * @param tenantId
- * tenant Id
+ *
+ * @param tenant tenant
+ * @param tenantId tenant Id
* @return first name / calling name
- * @throws Exception
- * if unable to retrieve the admin name
+ * @throws Exception if unable to retrieve the admin name
*/
public static String[] getNames(RealmService realmService, int tenantId) throws Exception {
String[] names = new String[2];
@@ -123,7 +117,7 @@ public class ClaimsMgtUtil {
// no last name - fullname was considered givenname;
names = getNamesfromFullName(realmService, firstname);
}
- } else {
+ } else {
// Work around for old tenants - where even full name is not input.
if (log.isDebugEnabled()) {
log.debug("First name is not available");
@@ -143,26 +137,24 @@ public class ClaimsMgtUtil {
/**
* Method to get the name of the admin user given the tenant id
- *
- * @param tenantId
- * tenant id
+ *
+ * @param tenantId tenant id
* @return admin user name
- * @throws Exception
- * UserStoreException
+ * @throws Exception UserStoreException
*/
public static String getAdminUserNameFromTenantId(RealmService realmService, int tenantId)
- throws Exception {
+ throws Exception {
if (tenantId == MultitenantConstants.SUPER_TENANT_ID) {
return realmService.getBootstrapRealmConfiguration().getAdminUserName();
}
- String tenantAdminName ="";
+ String tenantAdminName = "";
try {
if (realmService.getTenantManager().getTenant(tenantId) != null) {
tenantAdminName = realmService.getTenantManager().getTenant(tenantId).getAdminName();
}
} catch (org.wso2.carbon.user.api.UserStoreException e) {
String msg = "Unable to retrieve the admin name for the tenant with the tenant Id: " +
- tenantId;
+ tenantId;
log.error(msg, e);
throw new Exception(msg, e);
}
@@ -171,9 +163,8 @@ public class ClaimsMgtUtil {
/**
* Let's split the givenname into two.
- *
- * @param fullName
- * full name of the tenant admin
+ *
+ * @param fullName full name of the tenant admin
* @return first name
*/
public static String[] getNamesfromFullName(RealmService realmService, String fullName) {
@@ -187,16 +178,12 @@ public class ClaimsMgtUtil {
/**
* Get the claims from the user store manager
- *
- * @param tenant
- * tenant information
- * @param tenantId
- * tenantId
- * @param claim
- * claim name
+ *
+ * @param tenant tenant information
+ * @param tenantId tenantId
+ * @param claim claim name
* @return claim value
- * @throws org.wso2.carbon.user.core.UserStoreException
- * exception in getting the user store manager
+ * @throws org.wso2.carbon.user.core.UserStoreException exception in getting the user store manager
*/
public static String getClaimfromUserStoreManager(RealmService realmService, int tenantId,
String claim) throws UserStoreException {
@@ -231,20 +218,17 @@ public class ClaimsMgtUtil {
/**
* Gets first name from the user store manager
- *
- * @param tenant
- * tenant
- * @param tenantId
- * tenant id
+ *
+ * @param tenant tenant
+ * @param tenantId tenant id
* @return first name
- * @throws UserStoreException
- * , if error in getting the claim GIVEN_NAME
+ * @throws UserStoreException , if error in getting the claim GIVEN_NAME
*/
public static String getFirstNamefromUserStoreManager(RealmService realmService,
int tenantId) throws UserStoreException {
try {
return getClaimfromUserStoreManager(realmService, tenantId,
- UserCoreConstants.ClaimTypeURIs.GIVEN_NAME);
+ UserCoreConstants.ClaimTypeURIs.GIVEN_NAME);
} catch (Exception e) {
String msg = "First Name not found for the tenant";
log.debug(msg, e);
@@ -254,27 +238,24 @@ public class ClaimsMgtUtil {
/**
* Gets last name from the user store manager
- *
- * @param tenant
- * tenant
- * @param tenantId
- * tenant id
+ *
+ * @param tenant tenant
+ * @param tenantId tenant id
* @return last name
- * @throws UserStoreException
- * , if error in getting the claim SURNAME
+ * @throws UserStoreException , if error in getting the claim SURNAME
*/
public static String getLastNamefromUserStoreManager(RealmService realmService,
int tenantId) throws UserStoreException {
String lastname = "";
try {
lastname = getClaimfromUserStoreManager(realmService, tenantId,
- UserCoreConstants.ClaimTypeURIs.SURNAME);
+ UserCoreConstants.ClaimTypeURIs.SURNAME);
} catch (Exception e) {
String msg = "Last Name not found for the tenant";
log.debug(msg, e);
}
return lastname; // returns empty string, if couldn't get last name from
- // userStore manager
+ // userStore manager
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/util/CloudServicesUtil.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/util/CloudServicesUtil.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/util/CloudServicesUtil.java
index dc51039..8756c0d 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/util/CloudServicesUtil.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/util/CloudServicesUtil.java
@@ -44,8 +44,8 @@ public class CloudServicesUtil {
public static void activateAllServices(CloudServicesDescConfig cloudServicesDesc, int tenantId) throws Exception {
java.util.Collection<CloudServiceConfig> cloudServiceConfigList =
- cloudServicesDesc.getCloudServiceConfigs().
- values();
+ cloudServicesDesc.getCloudServiceConfigs().
+ values();
if (cloudServiceConfigList != null) {
for (CloudServiceConfig cloudServiceConfig : cloudServiceConfigList) {
if (cloudServiceConfig.isDefaultActive()) {
@@ -53,21 +53,21 @@ public class CloudServicesUtil {
try {
if (!CloudServicesUtil.isCloudServiceActive(cloudServiceName, tenantId)) {
CloudServicesUtil.setCloudServiceActive(true,
- cloudServiceName,
- tenantId,
- cloudServicesDesc.getCloudServiceConfigs().
- get(cloudServiceName));
+ cloudServiceName,
+ tenantId,
+ cloudServicesDesc.getCloudServiceConfigs().
+ get(cloudServiceName));
}
} catch (Exception e) {
String msg = "Error in activating the cloud service at the tenant" +
- "creation. tenant id: " + tenantId + ", service name: " +
- cloudServiceName;
+ "creation. tenant id: " + tenantId + ", service name: " +
+ cloudServiceName;
log.error(msg, e);
throw new UserStoreException(msg, e);
}
}
}
- }
+ }
}
public static void activateOriginalAndCompulsoryServices(CloudServicesDescConfig cloudServicesDesc,
@@ -75,28 +75,28 @@ public class CloudServicesUtil {
int tenantId) throws Exception {
Map<String, CloudServiceConfig> cloudServiceConfigs =
- cloudServicesDesc.getCloudServiceConfigs();
+ cloudServicesDesc.getCloudServiceConfigs();
if (CloudServicesUtil.isServiceNameValid(cloudServicesDesc, originalService)) {
if (!CloudServicesUtil.isCloudServiceActive(originalService, tenantId)) {
CloudServicesUtil.setCloudServiceActive(true, originalService, tenantId,
- cloudServiceConfigs.get(originalService));
+ cloudServiceConfigs.get(originalService));
log.info("Successfully activated the " + originalService + " for the tenant " +
- tenantId);
+ tenantId);
}
// register the compulsory services
if (!CloudServicesUtil.isCloudServiceActive(StratosConstants.CLOUD_IDENTITY_SERVICE,
- tenantId)) {
+ tenantId)) {
CloudServicesUtil.setCloudServiceActive(true,
- StratosConstants.CLOUD_IDENTITY_SERVICE,
- tenantId,
- cloudServiceConfigs.get(StratosConstants.CLOUD_IDENTITY_SERVICE));
+ StratosConstants.CLOUD_IDENTITY_SERVICE,
+ tenantId,
+ cloudServiceConfigs.get(StratosConstants.CLOUD_IDENTITY_SERVICE));
}
if (!CloudServicesUtil.isCloudServiceActive(StratosConstants.CLOUD_GOVERNANCE_SERVICE,
- tenantId)) {
+ tenantId)) {
CloudServicesUtil.setCloudServiceActive(true,
- StratosConstants.CLOUD_GOVERNANCE_SERVICE,
- tenantId,
- cloudServiceConfigs.get(StratosConstants.CLOUD_GOVERNANCE_SERVICE));
+ StratosConstants.CLOUD_GOVERNANCE_SERVICE,
+ tenantId,
+ cloudServiceConfigs.get(StratosConstants.CLOUD_GOVERNANCE_SERVICE));
}
} else {
log.warn("Unable to activate the " + originalService + " for the tenant " + tenantId);
@@ -107,7 +107,7 @@ public class CloudServicesUtil {
public static void setCloudServiceActive(boolean active,
String cloudServiceName,
int tenantId, CloudServiceConfig cloudServiceConfig)
- throws Exception {
+ throws Exception {
if (cloudServiceConfig.getLabel() == null) {
// for the non-labled services, we are not setting/unsetting the
// service active
@@ -119,9 +119,9 @@ public class CloudServicesUtil {
MultitenantConstants.SUPER_TENANT_ID);
UserRegistry configRegistry = ServiceReferenceHolder.getInstance().getRegistryService().getConfigSystemRegistry(tenantId);
String cloudServiceInfoPath = StratosConstants.CLOUD_SERVICE_INFO_STORE_PATH +
- RegistryConstants.PATH_SEPARATOR + tenantId +
- RegistryConstants.PATH_SEPARATOR + cloudServiceName;
-
+ RegistryConstants.PATH_SEPARATOR + tenantId +
+ RegistryConstants.PATH_SEPARATOR + cloudServiceName;
+
Resource cloudServiceInfoResource;
if (govRegistry.resourceExists(cloudServiceInfoPath)) {
cloudServiceInfoResource = govRegistry.get(cloudServiceInfoPath);
@@ -129,7 +129,7 @@ public class CloudServicesUtil {
cloudServiceInfoResource = govRegistry.newCollection();
}
cloudServiceInfoResource.setProperty(StratosConstants.CLOUD_SERVICE_IS_ACTIVE_PROP_KEY,
- active ? "true" : "false");
+ active ? "true" : "false");
govRegistry.put(cloudServiceInfoPath, cloudServiceInfoResource);
// then we will copy the permissions
@@ -160,29 +160,29 @@ public class CloudServicesUtil {
public static boolean isCloudServiceActive(String cloudServiceName,
int tenantId, UserRegistry govRegistry)
- throws Exception {
+ throws Exception {
// The cloud manager is always active
if (StratosConstants.CLOUD_MANAGER_SERVICE.equals(cloudServiceName)) {
return true;
}
String cloudServiceInfoPath = StratosConstants.CLOUD_SERVICE_INFO_STORE_PATH +
- RegistryConstants.PATH_SEPARATOR + tenantId +
- RegistryConstants.PATH_SEPARATOR + cloudServiceName;
+ RegistryConstants.PATH_SEPARATOR + tenantId +
+ RegistryConstants.PATH_SEPARATOR + cloudServiceName;
Resource cloudServiceInfoResource;
if (govRegistry.resourceExists(cloudServiceInfoPath)) {
cloudServiceInfoResource = govRegistry.get(cloudServiceInfoPath);
String isActiveStr =
- cloudServiceInfoResource.getProperty(
- StratosConstants.CLOUD_SERVICE_IS_ACTIVE_PROP_KEY);
+ cloudServiceInfoResource.getProperty(
+ StratosConstants.CLOUD_SERVICE_IS_ACTIVE_PROP_KEY);
return "true".equals(isActiveStr);
}
return false;
}
public static boolean isServiceNameValid(CloudServicesDescConfig cloudServicesDesc,
- String cloudServiceName) {
- if(cloudServiceName == null) {
+ String cloudServiceName) {
+ if (cloudServiceName == null) {
return false;
}
java.util.Collection<CloudServiceConfig> cloudServiceConfigList =
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/util/CommonUtil.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/util/CommonUtil.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/util/CommonUtil.java
index b49c42d..38ef6af 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/util/CommonUtil.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/util/CommonUtil.java
@@ -127,7 +127,7 @@ public class CommonUtil {
public static String getAdminUserName() {
return stratosConfig.getAdminUserName();
}
-
+
public static String getAdminPassword() {
return stratosConfig.getAdminPassword();
}
@@ -167,9 +167,9 @@ public class CommonUtil {
} catch (Exception e) {
if (log.isWarnEnabled()) {
log.warn("Invalid Email Address provided for tenant creation notification. " +
- "Please check whether the parameter NotificationEmail" +
- " is set properly in " +
- StratosConstants.STRATOS_CONF_FILE, e);
+ "Please check whether the parameter NotificationEmail" +
+ " is set properly in " +
+ StratosConstants.STRATOS_CONF_FILE, e);
}
return "";
}
@@ -340,13 +340,13 @@ public class CommonUtil {
throws RegistryException {
String domainValidatorInfoPath =
StratosConstants.DOMAIN_VALIDATOR_INFO_PATH + RegistryConstants.PATH_SEPARATOR +
- domain + RegistryConstants.PATH_SEPARATOR +
- StratosConstants.VALIDATION_KEY_RESOURCE_NAME;
+ domain + RegistryConstants.PATH_SEPARATOR +
+ StratosConstants.VALIDATION_KEY_RESOURCE_NAME;
if (governanceSystemRegistry.resourceExists(domainValidatorInfoPath)) {
Resource resource = governanceSystemRegistry.get(domainValidatorInfoPath);
String actualSuccessKey = resource.getProperty("successKey");
if (actualSuccessKey != null && successKey != null &&
- actualSuccessKey.trim().equals(successKey.trim())) {
+ actualSuccessKey.trim().equals(successKey.trim())) {
// the domain is correct
return true;
}
@@ -361,7 +361,7 @@ public class CommonUtil {
*/
public static StratosConfiguration loadStratosConfiguration() {
// gets the configuration file name from the StratosConstants.
- String StratosConfigFileName = CarbonUtils.getCarbonConfigDirPath() + File.separator +
+ String StratosConfigFileName = CarbonUtils.getCarbonConfigDirPath() + File.separator +
StratosConstants.MULTITENANCY_CONFIG_FOLDER + File.separator +
StratosConstants.STRATOS_CONF_FILE;
return loadStratosConfiguration(StratosConfigFileName);
@@ -418,7 +418,7 @@ public class CommonUtil {
config.setNotificationEmail(element.getText());
} else if ("SuperAdminEmail".equals(element.getLocalName())) {
config.setSuperAdminEmail(element.getText());
- } else if ("TenantActivationModerated".equals(element.getLocalName())){
+ } else if ("TenantActivationModerated".equals(element.getLocalName())) {
String isTenantActivationModerated = element.getText();
boolean tenantActivationModerated = false;
if (isTenantActivationModerated.trim().equalsIgnoreCase("true")) {
@@ -446,38 +446,37 @@ public class CommonUtil {
skipSummaryGenerator = true;
}
config.setSkipSummaryGenerator(skipSummaryGenerator);
- }
- else if ("PaypalAPIUsername".equals(element.getLocalName())) {
+ } else if ("PaypalAPIUsername".equals(element.getLocalName())) {
config.setPaypalAPIUsername(element.getText());
} else if ("PaypalAPIPassword".equals(element.getLocalName())) {
config.setPaypalAPIPassword(element.getText());
} else if ("PaypalAPISignature".equals(element.getLocalName())) {
config.setPaypalAPISignature(element.getText());
- }else if ("PaypalEnvironment".equals(element.getLocalName())){
+ } else if ("PaypalEnvironment".equals(element.getLocalName())) {
config.setPaypalEnvironment(element.getText());
- }else if("FinanceNotificationEmail".equals(element.getLocalName())){
- config.setFinanceNotificationEmail(element.getText());
- }else if("UsagePlanUrl".equals(element.getLocalName())){
+ } else if ("FinanceNotificationEmail".equals(element.getLocalName())) {
+ config.setFinanceNotificationEmail(element.getText());
+ } else if ("UsagePlanUrl".equals(element.getLocalName())) {
config.setUsagePlanURL(element.getText());
- }else if("PaidJIRAUrl".equals(element.getLocalName())) {
+ } else if ("PaidJIRAUrl".equals(element.getLocalName())) {
config.setPaidJIRAUrl(element.getText());
- }else if("PaidJIRAProject".equals(element.getLocalName())) {
+ } else if ("PaidJIRAProject".equals(element.getLocalName())) {
config.setPaidJIRAProject(element.getText());
- }else if("ForumUrl".equals(element.getLocalName())) {
+ } else if ("ForumUrl".equals(element.getLocalName())) {
config.setForumUrl(element.getText());
- }else if("PaidUserGroup".equals(element.getLocalName())) {
+ } else if ("PaidUserGroup".equals(element.getLocalName())) {
config.setPaidUserGroup(element.getText());
- }else if("NonpaidUserGroup".equals(element.getLocalName())) {
+ } else if ("NonpaidUserGroup".equals(element.getLocalName())) {
config.setNonpaidUserGroup(element.getText());
- } else if("SupportInfoUrl".equals(element.getLocalName())) {
+ } else if ("SupportInfoUrl".equals(element.getLocalName())) {
config.setSupportInfoUrl(element.getText());
- }else if("IncidentCustomFieldId".equals(element.getLocalName())) {
+ } else if ("IncidentCustomFieldId".equals(element.getLocalName())) {
config.setIncidentCustomFieldId(element.getText());
- } else if("IncidentImpactCustomFieldId".equals(element.getLocalName())) {
+ } else if ("IncidentImpactCustomFieldId".equals(element.getLocalName())) {
config.setIncidentImpactCustomFieldId(element.getText());
} else if ("GoogleAnalyticsURL".equals(element.getLocalName())) {
config.setGoogleAnalyticsURL(element.getText());
- } else if("StratosEventListener".equals(element.getLocalName())) {
+ } else if ("StratosEventListener".equals(element.getLocalName())) {
populateEventListenerProperties(config, element);
} else if ("managerServiceUrl".equals(element.getLocalName())) {
config.setManagerServiceUrl(element.getText());
@@ -485,7 +484,7 @@ public class CommonUtil {
config.setAdminUserName(element.getText());
} else if ("adminPassword".equals(element.getLocalName())) {
config.setAdminPassword(element.getText());
- } else if("SSOLoadingMessage".equals(element.getLocalName())){
+ } else if ("SSOLoadingMessage".equals(element.getLocalName())) {
config.setSsoLoadingMessage(element.getText());
}
}
@@ -504,19 +503,19 @@ public class CommonUtil {
}
}
}
- if (log.isDebugEnabled()) {
- log.debug("Unable to locate the stratos configurations file. "
- + "Default Settings will be used.");
- }
+ if (log.isDebugEnabled()) {
+ log.debug("Unable to locate the stratos configurations file. "
+ + "Default Settings will be used.");
+ }
return config; // return the default configuration, if the file not found.
}
-
-
+
+
private static void populateEventListenerProperties(StratosConfiguration config,
OMElement element) throws RegistryException {
config.setStratosEventListenerName(element.getAttributeValue(new QName("class")));
Iterator<?> ite =
- element.getChildrenWithName(new QName("Property"));
+ element.getChildrenWithName(new QName("Property"));
while (ite.hasNext()) {
OMElement propElem = (OMElement) ite.next();
String propName = propElem.getAttributeValue(new QName("name"));
@@ -585,6 +584,7 @@ public class CommonUtil {
/**
* method to check whether a domain name is available to register given a domain name
+ *
* @param tenantDomain, domain name
* @return true, if the domain is available to register
* @throws Exception, if checking the existence of the tenant is failed.
@@ -592,37 +592,37 @@ public class CommonUtil {
public static boolean isDomainNameAvailable(String tenantDomain) throws Exception {
TenantManager tenantManager = ServiceReferenceHolder.getInstance().getRealmService().getTenantManager();
- // The registry reserved words are checked first.
- if (tenantDomain.equals("atom") || tenantDomain.equals("registry")
- || tenantDomain.equals("resource")) {
- String msg = "You can not use a registry reserved word:" + tenantDomain +
- ":as a tenant domain. Please choose a different one.";
- log.error(msg);
- throw new Exception(msg);
- }
-
- int tenantId;
- try {
- tenantId = tenantManager.getTenantId(tenantDomain);
- } catch (UserStoreException e) {
- String msg = "Error in getting the tenant id for the given domain " +
- tenantDomain + ".";
- log.error(msg);
- throw new Exception(msg, e);
- }
-
- // check a tenant with same domain exist.
- if ((tenantId != MultitenantConstants.INVALID_TENANT_ID && tenantId != MultitenantConstants.SUPER_TENANT_ID) ||
- tenantDomain.equals(MultitenantConstants.SUPER_TENANT_DOMAIN_NAME)) {
- String msg =
- "A tenant with same domain already exist. " +
- "Please use a different domain name. tenant domain: " +
- tenantDomain + ".";
- log.info(msg);
- return false;
- }
- return true;
- }
+ // The registry reserved words are checked first.
+ if (tenantDomain.equals("atom") || tenantDomain.equals("registry")
+ || tenantDomain.equals("resource")) {
+ String msg = "You can not use a registry reserved word:" + tenantDomain +
+ ":as a tenant domain. Please choose a different one.";
+ log.error(msg);
+ throw new Exception(msg);
+ }
+
+ int tenantId;
+ try {
+ tenantId = tenantManager.getTenantId(tenantDomain);
+ } catch (UserStoreException e) {
+ String msg = "Error in getting the tenant id for the given domain " +
+ tenantDomain + ".";
+ log.error(msg);
+ throw new Exception(msg, e);
+ }
+
+ // check a tenant with same domain exist.
+ if ((tenantId != MultitenantConstants.INVALID_TENANT_ID && tenantId != MultitenantConstants.SUPER_TENANT_ID) ||
+ tenantDomain.equals(MultitenantConstants.SUPER_TENANT_DOMAIN_NAME)) {
+ String msg =
+ "A tenant with same domain already exist. " +
+ "Please use a different domain name. tenant domain: " +
+ tenantDomain + ".";
+ log.info(msg);
+ return false;
+ }
+ return true;
+ }
public static boolean isEmptyArray(String[] array) {
return (array == null) || (array.length == 0) || ((array.length == 1) && (array[0] == null));
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/util/ConfUtil.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/util/ConfUtil.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/util/ConfUtil.java
index 7f9d665..e697c6c 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/util/ConfUtil.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/util/ConfUtil.java
@@ -33,8 +33,8 @@ import java.io.File;
*/
public class ConfUtil {
- private static final String CONFIG_FILE_NAME ="stratos-config" ;
- private static Log log = LogFactory.getLog(ConfUtil.class);
+ private static final String CONFIG_FILE_NAME = "stratos-config";
+ private static Log log = LogFactory.getLog(ConfUtil.class);
private XMLConfiguration config;
@@ -49,25 +49,25 @@ public class ConfUtil {
confFile = new File(configFilePath);
} else {
- confFile = new File(CarbonUtils.getCarbonConfigDirPath(),CONFIG_FILE_NAME);
+ confFile = new File(CarbonUtils.getCarbonConfigDirPath(), CONFIG_FILE_NAME);
}
config = new XMLConfiguration(confFile);
} catch (ConfigurationException e) {
- log.error("Unable to load autoscaler configuration file",e);
+ log.error("Unable to load autoscaler configuration file", e);
config = new XMLConfiguration(); // continue with default values
}
}
public static ConfUtil getInstance(String configFilePath) {
if (instance == null) {
- instance = new ConfUtil (configFilePath);
+ instance = new ConfUtil(configFilePath);
}
return instance;
}
- public XMLConfiguration getConfiguration(){
+ public XMLConfiguration getConfiguration() {
return config;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/util/MeteringAccessValidationUtils.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/util/MeteringAccessValidationUtils.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/util/MeteringAccessValidationUtils.java
index 4dc269e..5d6288c 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/util/MeteringAccessValidationUtils.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/util/MeteringAccessValidationUtils.java
@@ -24,30 +24,30 @@ import java.util.Set;
public class MeteringAccessValidationUtils {
- public static final String ERROR_MSG_PROPERTY_KEY_POST_FIX = "error_msg";
- public static final String IS_BLOCKED_PROPERTY_KEY_POST_FIX = "is_blocked";
+ public static final String ERROR_MSG_PROPERTY_KEY_POST_FIX = "error_msg";
+ public static final String IS_BLOCKED_PROPERTY_KEY_POST_FIX = "is_blocked";
- public static String generateIsBlockedPropertyKey(String action) {
- return action + "_" + IS_BLOCKED_PROPERTY_KEY_POST_FIX;
- }
+ public static String generateIsBlockedPropertyKey(String action) {
+ return action + "_" + IS_BLOCKED_PROPERTY_KEY_POST_FIX;
+ }
- public static String generateErrorMsgPropertyKey(String action) {
- return action + "_" + ERROR_MSG_PROPERTY_KEY_POST_FIX;
- }
+ public static String generateErrorMsgPropertyKey(String action) {
+ return action + "_" + ERROR_MSG_PROPERTY_KEY_POST_FIX;
+ }
- public static Set<String> getAvailableActions(Properties properties) {
- Set propertyKeys = properties.keySet();
- Set<String> actions = new HashSet<String>();
- for (Object propertyKeyObj : propertyKeys) {
- String propertyKey = (String) propertyKeyObj;
- if (propertyKey.endsWith(IS_BLOCKED_PROPERTY_KEY_POST_FIX)) {
- // -1 for the length of the '_'
- String action =
- propertyKey.substring(0, propertyKey.length() -
- IS_BLOCKED_PROPERTY_KEY_POST_FIX.length() - 1);
- actions.add(action);
- }
- }
- return actions;
- }
+ public static Set<String> getAvailableActions(Properties properties) {
+ Set propertyKeys = properties.keySet();
+ Set<String> actions = new HashSet<String>();
+ for (Object propertyKeyObj : propertyKeys) {
+ String propertyKey = (String) propertyKeyObj;
+ if (propertyKey.endsWith(IS_BLOCKED_PROPERTY_KEY_POST_FIX)) {
+ // -1 for the length of the '_'
+ String action =
+ propertyKey.substring(0, propertyKey.length() -
+ IS_BLOCKED_PROPERTY_KEY_POST_FIX.length() - 1);
+ actions.add(action);
+ }
+ }
+ return actions;
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/util/StratosConfiguration.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/util/StratosConfiguration.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/util/StratosConfiguration.java
index 370932c..934e237 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/util/StratosConfiguration.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/util/StratosConfiguration.java
@@ -38,7 +38,7 @@ public class StratosConfiguration {
private String paypalAPIUsername = "";
private String paypalAPIPassword = "";
private String paypalAPISignature = "";
- private String paypalEnvironment="";
+ private String paypalEnvironment = "";
private String usagePlanURL = "";
private String paidJIRAUrl = "";
private String paidJIRAProject = "";
@@ -48,13 +48,13 @@ public class StratosConfiguration {
private String supportInfoUrl = "";
private String incidentCustomFieldId = ""; // todo this is a custom field id of JIRA, this need to be dynamically get in jira reporting component
private String incidentImpactCustomFieldId = "";
- private String stratosEventListenerName ="";
+ private String stratosEventListenerName = "";
private Map<String, String> stratosEventProperties = new HashMap<String, String>();
private String googleAnalyticsURL;
private String managerServiceUrl = "";
private String adminUserName = "";
private String adminPassword = "";
- private String ssoLoadingMessage="";
+ private String ssoLoadingMessage = "";
/**
* @return Stratos Manager service url
@@ -90,7 +90,7 @@ public class StratosConfiguration {
}
//This parameter used to skip usage summary generator
- private boolean skipSummaryGenerator = false;
+ private boolean skipSummaryGenerator = false;
public boolean isSkipSummaryGenerator() {
return skipSummaryGenerator;
@@ -257,7 +257,7 @@ public class StratosConfiguration {
public void setIncidentImpactCustomFieldId(String incidentImpactCustomFieldId) {
this.incidentImpactCustomFieldId = incidentImpactCustomFieldId;
}
-
+
public String getStratosEventListenerName() {
return stratosEventListenerName;
}
@@ -313,6 +313,6 @@ public class StratosConfiguration {
public void setSsoLoadingMessage(String ssoLoadingMessage) {
this.ssoLoadingMessage = ssoLoadingMessage;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/test/java/org/apache/stratos/common/test/ThriftClientConfigParserTest.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/test/java/org/apache/stratos/common/test/ThriftClientConfigParserTest.java b/components/org.apache.stratos.common/src/test/java/org/apache/stratos/common/test/ThriftClientConfigParserTest.java
index 012f663..09d5b5e 100644
--- a/components/org.apache.stratos.common/src/test/java/org/apache/stratos/common/test/ThriftClientConfigParserTest.java
+++ b/components/org.apache.stratos.common/src/test/java/org/apache/stratos/common/test/ThriftClientConfigParserTest.java
@@ -43,9 +43,9 @@ public class ThriftClientConfigParserTest extends TestCase {
ThriftClientConfig thriftClientConfig = ThriftClientConfig.getInstance();
thriftClientConfig.getThriftClientInfo();
- assertEquals("Incorrect Password","admin",thriftClientConfig.getThriftClientInfo().getUsername());
- assertEquals("Incorrect Password","1234",thriftClientConfig.getThriftClientInfo().getPassword());
- assertEquals("Incorrect IP","192.168.10.10",thriftClientConfig.getThriftClientInfo().getIp());
- assertEquals("Incorrect Port","9300",thriftClientConfig.getThriftClientInfo().getPort());
+ assertEquals("Incorrect Password", "admin", thriftClientConfig.getThriftClientInfo().getUsername());
+ assertEquals("Incorrect Password", "1234", thriftClientConfig.getThriftClientInfo().getPassword());
+ assertEquals("Incorrect IP", "192.168.10.10", thriftClientConfig.getThriftClientInfo().getIp());
+ assertEquals("Incorrect Port", "9300", thriftClientConfig.getThriftClientInfo().getPort());
}
}
[2/3] stratos git commit: Format common module code
Posted by la...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/MemberBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/MemberBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/MemberBean.java
index ee4db66..4fd408a 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/MemberBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/MemberBean.java
@@ -1,20 +1,20 @@
/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
-
- * http://www.apache.org/licenses/LICENSE-2.0
-
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.stratos.common.beans.topology;
@@ -81,24 +81,24 @@ public class MemberBean {
public void setMemberId(String memberId) {
this.memberId = memberId;
}
-
+
public List<String> getMemberPrivateIPs() {
- return memberPrivateIPs;
- }
+ return memberPrivateIPs;
+ }
- public void setMemberPrivateIPs(List<String> memberPrivateIPs) {
- this.memberPrivateIPs = memberPrivateIPs;
- }
+ public void setMemberPrivateIPs(List<String> memberPrivateIPs) {
+ this.memberPrivateIPs = memberPrivateIPs;
+ }
- public List<String> getMemberPublicIPs() {
- return memberPublicIPs;
- }
+ public List<String> getMemberPublicIPs() {
+ return memberPublicIPs;
+ }
- public void setMemberPublicIPs(List<String> memberPublicIPs) {
- this.memberPublicIPs = memberPublicIPs;
- }
+ public void setMemberPublicIPs(List<String> memberPublicIPs) {
+ this.memberPublicIPs = memberPublicIPs;
+ }
- public String getStatus() {
+ public String getStatus() {
return status;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/AutoscalerServiceClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/AutoscalerServiceClient.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/AutoscalerServiceClient.java
index ca1fb12..5dc8ab0 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/AutoscalerServiceClient.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/AutoscalerServiceClient.java
@@ -104,37 +104,37 @@ public class AutoscalerServiceClient {
public boolean deployApplication(String applicationId, String applicationPolicyId) throws RemoteException,
AutoscalerServiceInvalidPolicyExceptionException, AutoscalerServiceApplicationDefinitionExceptionException {
- return stub.deployApplication(applicationId, applicationPolicyId);
+ return stub.deployApplication(applicationId, applicationPolicyId);
}
-
- public void addApplicationPolicy(ApplicationPolicy applicationPolicy)
- throws RemoteException, AutoscalerServiceInvalidPolicyExceptionException,
- AutoscalerServiceRemoteExceptionException, AutoscalerServiceInvalidApplicationPolicyExceptionException {
- stub.addApplicationPolicy(applicationPolicy);
+
+ public void addApplicationPolicy(ApplicationPolicy applicationPolicy)
+ throws RemoteException, AutoscalerServiceInvalidPolicyExceptionException,
+ AutoscalerServiceRemoteExceptionException, AutoscalerServiceInvalidApplicationPolicyExceptionException {
+ stub.addApplicationPolicy(applicationPolicy);
}
-
+
public ApplicationPolicy getApplicationPolicy(String applicationPolicyId) throws RemoteException {
- return stub.getApplicationPolicy(applicationPolicyId);
+ return stub.getApplicationPolicy(applicationPolicyId);
}
-
+
public ApplicationPolicy[] getApplicationPolicies() throws RemoteException {
- return stub.getApplicationPolicies();
+ return stub.getApplicationPolicies();
}
-
- public void updateApplicationPolicy(ApplicationPolicy applicationPolicy)
- throws RemoteException, AutoscalerServiceApplicatioinPolicyNotExistsExceptionException,
- AutoscalerServiceRemoteExceptionException, AutoscalerServiceInvalidApplicationPolicyExceptionException{
- stub.updateApplicationPolicy(applicationPolicy);
+
+ public void updateApplicationPolicy(ApplicationPolicy applicationPolicy)
+ throws RemoteException, AutoscalerServiceApplicatioinPolicyNotExistsExceptionException,
+ AutoscalerServiceRemoteExceptionException, AutoscalerServiceInvalidApplicationPolicyExceptionException {
+ stub.updateApplicationPolicy(applicationPolicy);
}
-
- public void removeApplicationPolicy(String applicationPolicyId)
- throws RemoteException, AutoscalerServiceInvalidPolicyExceptionException {
- stub.removeApplicationPolicy(applicationPolicyId);
+
+ public void removeApplicationPolicy(String applicationPolicyId)
+ throws RemoteException, AutoscalerServiceInvalidPolicyExceptionException {
+ stub.removeApplicationPolicy(applicationPolicyId);
}
-
- public String[] getApplicationNetworkPartitions(String applicationId) throws RemoteException,
- AutoscalerServiceAutoScalerExceptionException {
- return stub.getApplicationNetworkPartitions(applicationId);
+
+ public String[] getApplicationNetworkPartitions(String applicationId) throws RemoteException,
+ AutoscalerServiceAutoScalerExceptionException {
+ return stub.getApplicationNetworkPartitions(applicationId);
}
public void undeployApplication(String applicationId, boolean force) throws
@@ -156,10 +156,10 @@ public class AutoscalerServiceClient {
return stub.updateAutoScalingPolicy(autoScalePolicy);
}
- public boolean removeAutoscalingPolicy(String autoScalePolicyId) throws RemoteException,
+ public boolean removeAutoscalingPolicy(String autoScalePolicyId) throws RemoteException,
AutoscalerServiceInvalidPolicyExceptionException {
- return stub.removeAutoScalingPolicy(autoScalePolicyId);
- }
+ return stub.removeAutoScalingPolicy(autoScalePolicyId);
+ }
public ServiceGroup getServiceGroup(String serviceGroupDefinitionName) throws RemoteException {
return stub.getServiceGroup(serviceGroupDefinitionName);
@@ -208,7 +208,7 @@ public class AutoscalerServiceClient {
return stub.getDeploymentPolicy(deploymentPolicyID);
}
- public DeploymentPolicy[] getDeploymentPolicies() throws RemoteException{
+ public DeploymentPolicy[] getDeploymentPolicies() throws RemoteException {
return stub.getDeploymentPolicies();
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/CloudControllerServiceClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/CloudControllerServiceClient.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/CloudControllerServiceClient.java
index cdb92e0..313775f 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/CloudControllerServiceClient.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/CloudControllerServiceClient.java
@@ -35,39 +35,39 @@ import java.rmi.RemoteException;
public class CloudControllerServiceClient {
- private CloudControllerServiceStub stub;
+ private CloudControllerServiceStub stub;
- private static final Log log = LogFactory.getLog(CloudControllerServiceClient.class);
+ private static final Log log = LogFactory.getLog(CloudControllerServiceClient.class);
private static volatile CloudControllerServiceClient instance;
- private CloudControllerServiceClient(String epr) throws AxisFault {
+ private CloudControllerServiceClient(String epr) throws AxisFault {
- String ccSocketTimeout = System.getProperty(StratosConstants.CLOUD_CONTROLLER_CLIENT_SOCKET_TIMEOUT) == null ?
+ String ccSocketTimeout = System.getProperty(StratosConstants.CLOUD_CONTROLLER_CLIENT_SOCKET_TIMEOUT) == null ?
StratosConstants.DEFAULT_CLIENT_SOCKET_TIMEOUT :
System.getProperty(StratosConstants.CLOUD_CONTROLLER_CLIENT_SOCKET_TIMEOUT);
String ccConnectionTimeout = System.getProperty(StratosConstants.CLOUD_CONTROLLER_CLIENT_CONNECTION_TIMEOUT) == null ?
StratosConstants.DEFAULT_CLIENT_CONNECTION_TIMEOUT :
System.getProperty(StratosConstants.CLOUD_CONTROLLER_CLIENT_CONNECTION_TIMEOUT);
-
- try {
- stub = new CloudControllerServiceStub(epr);
- stub._getServiceClient().getOptions().setProperty(HTTPConstants.SO_TIMEOUT, new Integer(ccSocketTimeout));
- stub._getServiceClient().getOptions().setProperty(HTTPConstants.CONNECTION_TIMEOUT, new Integer(ccConnectionTimeout));
-
- } catch (AxisFault axisFault) {
- String msg = "Could not initialize cloud controller service client";
- log.error(msg, axisFault);
- throw new AxisFault(msg, axisFault);
- }
- }
+
+ try {
+ stub = new CloudControllerServiceStub(epr);
+ stub._getServiceClient().getOptions().setProperty(HTTPConstants.SO_TIMEOUT, new Integer(ccSocketTimeout));
+ stub._getServiceClient().getOptions().setProperty(HTTPConstants.CONNECTION_TIMEOUT, new Integer(ccConnectionTimeout));
+
+ } catch (AxisFault axisFault) {
+ String msg = "Could not initialize cloud controller service client";
+ log.error(msg, axisFault);
+ throw new AxisFault(msg, axisFault);
+ }
+ }
public static CloudControllerServiceClient getInstance() throws AxisFault {
if (instance == null) {
synchronized (CloudControllerServiceClient.class) {
if (instance == null) {
String cloudControllerServiceUrl = System.getProperty(StratosConstants.CLOUD_CONTROLLER_SERVICE_URL);
- if(StringUtils.isBlank(cloudControllerServiceUrl)) {
+ if (StringUtils.isBlank(cloudControllerServiceUrl)) {
throw new RuntimeException(String.format("System property not found: %s",
StratosConstants.CLOUD_CONTROLLER_SERVICE_URL));
}
@@ -82,46 +82,46 @@ public class CloudControllerServiceClient {
throws RemoteException, CloudControllerServiceCartridgeAlreadyExistsExceptionException,
CloudControllerServiceInvalidCartridgeDefinitionExceptionException,
CloudControllerServiceInvalidIaasProviderExceptionException {
- stub.addCartridge(cartridgeConfig);
- }
+ stub.addCartridge(cartridgeConfig);
+ }
- public void updateCartridge(Cartridge cartridgeConfig)
- throws RemoteException, CloudControllerServiceInvalidCartridgeDefinitionExceptionException,
- CloudControllerServiceInvalidIaasProviderExceptionException,
- CloudControllerServiceCartridgeDefinitionNotExistsExceptionException {
- stub.updateCartridge(cartridgeConfig);
- }
+ public void updateCartridge(Cartridge cartridgeConfig)
+ throws RemoteException, CloudControllerServiceInvalidCartridgeDefinitionExceptionException,
+ CloudControllerServiceInvalidIaasProviderExceptionException,
+ CloudControllerServiceCartridgeDefinitionNotExistsExceptionException {
+ stub.updateCartridge(cartridgeConfig);
+ }
public void removeCartridge(String cartridgeType) throws RemoteException, CloudControllerServiceInvalidCartridgeTypeExceptionException {
- stub.removeCartridge(cartridgeType);
- }
+ stub.removeCartridge(cartridgeType);
+ }
- public String [] getServiceGroupSubGroups(String name) throws RemoteException, CloudControllerServiceInvalidServiceGroupExceptionException {
- return stub.getServiceGroupSubGroups(name);
+ public String[] getServiceGroupSubGroups(String name) throws RemoteException, CloudControllerServiceInvalidServiceGroupExceptionException {
+ return stub.getServiceGroupSubGroups(name);
}
-
- public String [] getServiceGroupCartridges(String name) throws RemoteException, CloudControllerServiceInvalidServiceGroupExceptionException {
- return stub.getServiceGroupCartridges(name);
+
+ public String[] getServiceGroupCartridges(String name) throws RemoteException, CloudControllerServiceInvalidServiceGroupExceptionException {
+ return stub.getServiceGroupCartridges(name);
}
-
- public Dependencies getServiceGroupDependencies (String name)throws RemoteException, CloudControllerServiceInvalidServiceGroupExceptionException {
- return stub.getServiceGroupDependencies(name);
+
+ public Dependencies getServiceGroupDependencies(String name) throws RemoteException, CloudControllerServiceInvalidServiceGroupExceptionException {
+ return stub.getServiceGroupDependencies(name);
}
-
+
public ServiceGroup getServiceGroup(String name) throws RemoteException, CloudControllerServiceInvalidServiceGroupExceptionException {
- return stub.getServiceGroup(name);
+ return stub.getServiceGroup(name);
}
public void terminateInstance(String memberId) throws Exception {
- if (log.isInfoEnabled()) {
- log.info(String.format("Terminating instance via cloud controller: [member] %s", memberId));
- }
- long startTime = System.currentTimeMillis();
- stub.terminateInstance(memberId);
- if (log.isDebugEnabled()) {
- long endTime = System.currentTimeMillis();
- log.debug(String.format("Service call terminateInstance() returned in %dms", (endTime - startTime)));
- }
+ if (log.isInfoEnabled()) {
+ log.info(String.format("Terminating instance via cloud controller: [member] %s", memberId));
+ }
+ long startTime = System.currentTimeMillis();
+ stub.terminateInstance(memberId);
+ if (log.isDebugEnabled()) {
+ long endTime = System.currentTimeMillis();
+ log.debug(String.format("Service call terminateInstance() returned in %dms", (endTime - startTime)));
+ }
}
public void terminateInstanceForcefully(String memberId) throws Exception {
@@ -131,34 +131,34 @@ public class CloudControllerServiceClient {
stub.terminateInstanceForcefully(memberId);
}
- public void terminateAllInstances(String clusterId) throws RemoteException,
- CloudControllerServiceInvalidClusterExceptionException {
- if (log.isInfoEnabled()) {
+ public void terminateAllInstances(String clusterId) throws RemoteException,
+ CloudControllerServiceInvalidClusterExceptionException {
+ if (log.isInfoEnabled()) {
log.info(String.format("Terminating all instances of cluster via cloud controller: [cluster] %s", clusterId));
}
long startTime = System.currentTimeMillis();
stub.terminateInstances(clusterId);
-
+
if (log.isDebugEnabled()) {
long endTime = System.currentTimeMillis();
log.debug(String.format("Service call terminateInstances() returned in %dms", (endTime - startTime)));
}
- }
+ }
- public String[] getRegisteredCartridges() throws RemoteException {
- return stub.getCartridges();
- }
+ public String[] getRegisteredCartridges() throws RemoteException {
+ return stub.getCartridges();
+ }
- public Cartridge getCartridge(String cartridgeType) throws RemoteException,
- CloudControllerServiceCartridgeNotFoundExceptionException {
- return stub.getCartridge(cartridgeType);
- }
+ public Cartridge getCartridge(String cartridgeType) throws RemoteException,
+ CloudControllerServiceCartridgeNotFoundExceptionException {
+ return stub.getCartridge(cartridgeType);
+ }
- public ClusterContext getClusterContext (String clusterId) throws RemoteException {
+ public ClusterContext getClusterContext(String clusterId) throws RemoteException {
return stub.getClusterContext(clusterId);
}
-
+
public boolean deployKubernetesCluster(KubernetesCluster kubernetesCluster) throws RemoteException,
CloudControllerServiceInvalidKubernetesClusterExceptionException {
return stub.addKubernetesCluster(kubernetesCluster);
@@ -211,48 +211,48 @@ public class CloudControllerServiceClient {
CloudControllerServiceNonExistingKubernetesHostExceptionException {
return stub.updateKubernetesHost(kubernetesHost);
}
-
+
public void validateDeploymentPolicy(String cartridgeType, String networkPartitionId)
- throws RemoteException,
- CloudControllerServiceInvalidPartitionExceptionException,
- CloudControllerServiceInvalidCartridgeTypeExceptionException {
- stub.validateDeploymentPolicyNetworkPartition(cartridgeType, networkPartitionId);
+ throws RemoteException,
+ CloudControllerServiceInvalidPartitionExceptionException,
+ CloudControllerServiceInvalidCartridgeTypeExceptionException {
+ stub.validateDeploymentPolicyNetworkPartition(cartridgeType, networkPartitionId);
}
-
+
public void addNetworkPartition(NetworkPartition networkPartition) throws RemoteException,
- CloudControllerServiceNetworkPartitionAlreadyExistsExceptionException {
- stub.addNetworkPartition(networkPartition);
+ CloudControllerServiceNetworkPartitionAlreadyExistsExceptionException {
+ stub.addNetworkPartition(networkPartition);
}
- public void removeNetworkPartition(String networkPartitionId) throws RemoteException,
- CloudControllerServiceNetworkPartitionNotExistsExceptionException {
- stub.removeNetworkPartition(networkPartitionId);
+ public void removeNetworkPartition(String networkPartitionId) throws RemoteException,
+ CloudControllerServiceNetworkPartitionNotExistsExceptionException {
+ stub.removeNetworkPartition(networkPartitionId);
}
- public void updateNetworkPartition(NetworkPartition networkPartition) throws RemoteException,
- CloudControllerServiceNetworkPartitionNotExistsExceptionException {
- stub.updateNetworkPartition(networkPartition);
+ public void updateNetworkPartition(NetworkPartition networkPartition) throws RemoteException,
+ CloudControllerServiceNetworkPartitionNotExistsExceptionException {
+ stub.updateNetworkPartition(networkPartition);
}
- public NetworkPartition[] getNetworkPartitions() throws RemoteException{
- return stub.getNetworkPartitions();
+ public NetworkPartition[] getNetworkPartitions() throws RemoteException {
+ return stub.getNetworkPartitions();
}
public NetworkPartition getNetworkPartition(String networkPartitionId) throws RemoteException {
- return stub.getNetworkPartition(networkPartitionId);
- }
-
- public void createClusterInstance(String serviceType, String clusterId,
- String alias, String instanceId, String partitionId,
- String networkPartitionId) throws RemoteException {
- try {
- stub.createClusterInstance(serviceType, clusterId, alias,
- instanceId, partitionId, networkPartitionId);
-
- } catch (CloudControllerServiceClusterInstanceCreationExceptionException e) {
- String msg = e.getFaultMessage().getClusterInstanceCreationException().getMessage();
- log.error(msg, e);
- throw new RuntimeException(msg, e);
- }
- }
+ return stub.getNetworkPartition(networkPartitionId);
+ }
+
+ public void createClusterInstance(String serviceType, String clusterId,
+ String alias, String instanceId, String partitionId,
+ String networkPartitionId) throws RemoteException {
+ try {
+ stub.createClusterInstance(serviceType, clusterId, alias,
+ instanceId, partitionId, networkPartitionId);
+
+ } catch (CloudControllerServiceClusterInstanceCreationExceptionException e) {
+ String msg = e.getFaultMessage().getClusterInstanceCreationException().getMessage();
+ log.error(msg, e);
+ throw new RuntimeException(msg, e);
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/StratosManagerServiceClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/StratosManagerServiceClient.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/StratosManagerServiceClient.java
index a620843..f19b04d 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/StratosManagerServiceClient.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/StratosManagerServiceClient.java
@@ -156,51 +156,51 @@ public class StratosManagerServiceClient {
public DomainMapping[] getDomainMappings(String applicationId, int tenantId) throws RemoteException, StratosManagerServiceDomainMappingExceptionException {
return stub.getDomainMappings(applicationId, tenantId);
}
-
+
/**
* Adds the used cartridges in cartridge groups to cache.
*
* @param cartridgeGroupName the cartridge group name
- * @param cartridgeNames the cartridge names
+ * @param cartridgeNames the cartridge names
* @throws RemoteException the remote exception
*/
public void addUsedCartridgesInCartridgeGroups(String cartridgeGroupName, String[] cartridgeNames) throws RemoteException {
- stub.addUsedCartridgesInCartridgeGroups(cartridgeGroupName, cartridgeNames);
+ stub.addUsedCartridgesInCartridgeGroups(cartridgeGroupName, cartridgeNames);
}
-
+
/**
* Removes the used cartridges in cartridge groups from cache.
*
* @param cartridgeGroupName the cartridge group name
- * @param cartridgeNames the cartridge names
+ * @param cartridgeNames the cartridge names
* @throws RemoteException the remote exception
*/
public void removeUsedCartridgesInCartridgeGroups(String cartridgeGroupName, String[] cartridgeNames) throws RemoteException {
- stub.removeUsedCartridgesInCartridgeGroups(cartridgeGroupName, cartridgeNames);
+ stub.removeUsedCartridgesInCartridgeGroups(cartridgeGroupName, cartridgeNames);
}
-
+
/**
* Adds the used cartridges in applications to cache.
*
* @param applicationName the application name
- * @param cartridgeNames the cartridge names
+ * @param cartridgeNames the cartridge names
* @throws RemoteException the remote exception
*/
public void addUsedCartridgesInApplications(String applicationName, String[] cartridgeNames) throws RemoteException {
- stub.addUsedCartridgesInApplications(applicationName, cartridgeNames);
+ stub.addUsedCartridgesInApplications(applicationName, cartridgeNames);
}
-
+
/**
* Removes the used cartridges in applications from cache.
*
* @param applicationName the application name
- * @param cartridgeNames the cartridge names
+ * @param cartridgeNames the cartridge names
* @throws RemoteException the remote exception
*/
public void removeUsedCartridgesInApplications(String applicationName, String[] cartridgeNames) throws RemoteException {
- stub.removeUsedCartridgesInApplications(applicationName, cartridgeNames);
+ stub.removeUsedCartridgesInApplications(applicationName, cartridgeNames);
}
-
+
/**
* Validates whether a cartridge can be removed.
*
@@ -209,53 +209,53 @@ public class StratosManagerServiceClient {
* @throws RemoteException the remote exception
*/
public boolean canCartridgeBeRemoved(String cartridgeName) throws RemoteException {
- return stub.canCartridgeBeRemoved(cartridgeName);
+ return stub.canCartridgeBeRemoved(cartridgeName);
}
-
+
/**
* Adds the used cartridge groups in cartridge sub groups to cache.
*
* @param cartridgeSubGroupName the cartridge sub group name
- * @param cartridgeGroupNames the cartridge group names
+ * @param cartridgeGroupNames the cartridge group names
* @throws RemoteException the remote exception
*/
public void addUsedCartridgeGroupsInCartridgeSubGroups(String cartridgeSubGroupName, String[] cartridgeGroupNames) throws RemoteException {
- stub.addUsedCartridgeGroupsInCartridgeSubGroups(cartridgeSubGroupName, cartridgeGroupNames);
+ stub.addUsedCartridgeGroupsInCartridgeSubGroups(cartridgeSubGroupName, cartridgeGroupNames);
}
-
+
/**
* Removes the used cartridge groups in cartridge sub groups from cache.
*
* @param cartridgeSubGroupName the cartridge sub group name
- * @param cartridgeGroupNames the cartridge group names
+ * @param cartridgeGroupNames the cartridge group names
* @throws RemoteException the remote exception
*/
public void removeUsedCartridgeGroupsInCartridgeSubGroups(String cartridgeSubGroupName, String[] cartridgeGroupNames) throws RemoteException {
- stub.removeUsedCartridgeGroupsInCartridgeSubGroups(cartridgeSubGroupName, cartridgeGroupNames);
+ stub.removeUsedCartridgeGroupsInCartridgeSubGroups(cartridgeSubGroupName, cartridgeGroupNames);
}
-
+
/**
* Adds the used cartridge groups in applications to cache.
*
- * @param applicationName the application name
+ * @param applicationName the application name
* @param cartridgeGroupNames the cartridge group names
* @throws RemoteException the remote exception
*/
public void addUsedCartridgeGroupsInApplications(String applicationName, String[] cartridgeGroupNames) throws RemoteException {
- stub.addUsedCartridgeGroupsInApplications(applicationName, cartridgeGroupNames);
+ stub.addUsedCartridgeGroupsInApplications(applicationName, cartridgeGroupNames);
}
-
+
/**
* Removes the used cartridge groups in applications from cache.
*
- * @param applicationName the application name
+ * @param applicationName the application name
* @param cartridgeGroupNames the cartridge group names
* @throws RemoteException the remote exception
*/
public void removeUsedCartridgeGroupsInApplications(String applicationName, String[] cartridgeGroupNames) throws RemoteException {
- stub.removeUsedCartridgeGroupsInApplications(applicationName, cartridgeGroupNames);
+ stub.removeUsedCartridgeGroupsInApplications(applicationName, cartridgeGroupNames);
}
-
+
/**
* Validates whether a cartridge group can be removed.
*
@@ -264,6 +264,6 @@ public class StratosManagerServiceClient {
* @throws RemoteException the remote exception
*/
public boolean canCartirdgeGroupBeRemoved(String cartridgeGroupName) throws RemoteException {
- return stub.canCartirdgeGroupBeRemoved(cartridgeGroupName);
+ return stub.canCartirdgeGroupBeRemoved(cartridgeGroupName);
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/clustering/impl/HazelcastDistributedListProvider.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/clustering/impl/HazelcastDistributedListProvider.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/clustering/impl/HazelcastDistributedListProvider.java
index fcd9f70..c01ef80 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/clustering/impl/HazelcastDistributedListProvider.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/clustering/impl/HazelcastDistributedListProvider.java
@@ -44,9 +44,9 @@ public class HazelcastDistributedListProvider implements Serializable {
public List getList(String name, ListEntryListener listEntryListener) {
List list = listMap.get(name);
- if(list == null) {
+ if (list == null) {
synchronized (HazelcastDistributedListProvider.class) {
- if(list == null) {
+ if (list == null) {
list = new DistList(name, listEntryListener);
}
}
@@ -56,7 +56,7 @@ public class HazelcastDistributedListProvider implements Serializable {
public void removeList(String name) {
DistList list = listMap.get(name);
- if(list != null) {
+ if (list != null) {
IList ilist = (IList) list;
ilist.removeItemListener(list.getListenerId());
listMap.remove(list);
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/clustering/impl/HazelcastDistributedObjectProvider.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/clustering/impl/HazelcastDistributedObjectProvider.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/clustering/impl/HazelcastDistributedObjectProvider.java
index 14c1d08..e1c7ccf 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/clustering/impl/HazelcastDistributedObjectProvider.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/clustering/impl/HazelcastDistributedObjectProvider.java
@@ -63,21 +63,22 @@ public class HazelcastDistributedObjectProvider implements DistributedObjectProv
/**
* Returns a distributed map if clustering is enabled, else returns a local hash map.
+ *
* @param name
* @return
*/
@Override
public Map getMap(final String name) {
- if(mapsMap.containsKey(name)) {
+ if (mapsMap.containsKey(name)) {
return mapsMap.get(name);
}
Map map = null;
- if(isClustered()) {
+ if (isClustered()) {
map = mapProvider.getMap(name, new MapEntryListener() {
@Override
public <X> void entryAdded(X key) {
- if(log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug(String.format("Entry added to distributed map: [name] %s [key] %s",
name, key));
}
@@ -85,7 +86,7 @@ public class HazelcastDistributedObjectProvider implements DistributedObjectProv
@Override
public <X> void entryRemoved(X key) {
- if(log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug(String.format("Entry removed from distributed map: [name] %s [key] %s",
name, key));
}
@@ -93,7 +94,7 @@ public class HazelcastDistributedObjectProvider implements DistributedObjectProv
@Override
public <X> void entryUpdated(X key) {
- if(log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug(String.format("Entry updated in distributed map: [name] %s [key] %s",
name, key));
}
@@ -102,7 +103,7 @@ public class HazelcastDistributedObjectProvider implements DistributedObjectProv
} else {
map = new HashMap<Object, Object>();
}
- if(map != null) {
+ if (map != null) {
mapsMap.put(name, map);
}
return map;
@@ -110,11 +111,12 @@ public class HazelcastDistributedObjectProvider implements DistributedObjectProv
/**
* Remove map from provider
+ *
* @param name
*/
public void removeMap(String name) {
- if(mapsMap.containsKey(name)) {
- if(isClustered()) {
+ if (mapsMap.containsKey(name)) {
+ if (isClustered()) {
IMap map = (IMap) mapsMap.get(name);
mapProvider.removeMap(name);
map.destroy();
@@ -125,28 +127,29 @@ public class HazelcastDistributedObjectProvider implements DistributedObjectProv
/**
* Returns a distributed list if clustering is enabled, else returns a local array list.
+ *
* @param name
* @return
*/
@Override
public List getList(final String name) {
- if(listsMap.containsKey(name)) {
+ if (listsMap.containsKey(name)) {
return listsMap.get(name);
}
List list = null;
- if(isClustered()) {
+ if (isClustered()) {
list = listProvider.getList(name, new ListEntryListener() {
@Override
public void itemAdded(Object item) {
- if(log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug(String.format("Item added to distributed list: [list] %s [item] %s", name, item));
}
}
@Override
public void itemRemoved(Object item) {
- if(log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug(String.format("Item removed from distributed list: [list] %s [item] %s", name, item));
}
}
@@ -154,7 +157,7 @@ public class HazelcastDistributedObjectProvider implements DistributedObjectProv
} else {
list = new ArrayList();
}
- if(list != null) {
+ if (list != null) {
listsMap.put(name, list);
}
return list;
@@ -162,13 +165,14 @@ public class HazelcastDistributedObjectProvider implements DistributedObjectProv
/**
* Remove a list from the object provider.
+ *
* @param name
*/
@Override
public void removeList(String name) {
- if(listsMap.containsKey(name)) {
- if(isClustered()) {
- IList list = (IList)listsMap.get(name);
+ if (listsMap.containsKey(name)) {
+ if (isClustered()) {
+ IList list = (IList) listsMap.get(name);
listProvider.removeList(name);
list.destroy();
}
@@ -179,18 +183,19 @@ public class HazelcastDistributedObjectProvider implements DistributedObjectProv
/**
* Acquires a distributed lock if clustering is enabled, else acquires a local reentrant lock and
* returns the lock object.
+ *
* @param object
* @return
*/
@Override
public Lock acquireLock(Object object) {
- if(isClustered()) {
+ if (isClustered()) {
return acquireDistributedLock(object);
} else {
Lock lock = locksMap.get(object);
- if(lock == null) {
+ if (lock == null) {
synchronized (object) {
- if(lock == null) {
+ if (lock == null) {
lock = new ReentrantLock();
locksMap.put(object, lock);
}
@@ -203,15 +208,16 @@ public class HazelcastDistributedObjectProvider implements DistributedObjectProv
/**
* Releases a given distributed/local lock.
+ *
* @param lock
*/
@Override
public void releaseLock(Lock lock) {
- if(isClustered()) {
- releaseDistributedLock((ILock)lock);
- } else {
- lock.unlock();
- }
+ if (isClustered()) {
+ releaseDistributedLock((ILock) lock);
+ } else {
+ lock.unlock();
+ }
}
private boolean isClustered() {
@@ -225,8 +231,8 @@ public class HazelcastDistributedObjectProvider implements DistributedObjectProv
}
protected com.hazelcast.core.ILock acquireDistributedLock(Object object) {
- if(object == null) {
- if(log.isWarnEnabled()) {
+ if (object == null) {
+ if (log.isWarnEnabled()) {
log.warn("Could not acquire distributed lock, object is null");
}
return null;
@@ -243,8 +249,8 @@ public class HazelcastDistributedObjectProvider implements DistributedObjectProv
}
protected void releaseDistributedLock(ILock lock) {
- if(lock == null) {
- if(log.isWarnEnabled()) {
+ if (lock == null) {
+ if (log.isWarnEnabled()) {
log.warn("Could not release distributed lock, lock is null");
}
return;
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/clustering/impl/ListEntryListener.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/clustering/impl/ListEntryListener.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/clustering/impl/ListEntryListener.java
index 96f72dc..8aab912 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/clustering/impl/ListEntryListener.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/clustering/impl/ListEntryListener.java
@@ -25,12 +25,14 @@ package org.apache.stratos.common.clustering.impl;
public interface ListEntryListener {
/**
* Invoked when an item is added to the distributed list.
+ *
* @param item
*/
void itemAdded(Object item);
/**
* Invoked when an item is removed from the distributed list.
+ *
* @param item
*/
void itemRemoved(Object item);
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/concurrent/locks/ReadWriteLock.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/concurrent/locks/ReadWriteLock.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/concurrent/locks/ReadWriteLock.java
index e145921..6d91330 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/concurrent/locks/ReadWriteLock.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/concurrent/locks/ReadWriteLock.java
@@ -142,7 +142,7 @@ public class ReadWriteLock {
getName(), currentThread.getId(), currentThread.getName()));
}
- if(lock.writeLock().isHeldByCurrentThread()) {
+ if (lock.writeLock().isHeldByCurrentThread()) {
lock.writeLock().unlock();
if (readWriteLockMonitorEnabled) {
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/concurrent/locks/ReadWriteLockMonitor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/concurrent/locks/ReadWriteLockMonitor.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/concurrent/locks/ReadWriteLockMonitor.java
index 6190a33..7da9df7 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/concurrent/locks/ReadWriteLockMonitor.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/concurrent/locks/ReadWriteLockMonitor.java
@@ -43,7 +43,7 @@ class ReadWriteLockMonitor implements Runnable {
@Override
public void run() {
try {
- if(readWriteLock.getThreadToLockSetMap() != null) {
+ if (readWriteLock.getThreadToLockSetMap() != null) {
for (Map.Entry<Long, Map<LockType, LockMetadata>> entry : readWriteLock.getThreadToLockSetMap().entrySet()) {
Map<LockType, LockMetadata> lockTypeLongMap = entry.getValue();
LockMetadata lockMetadata = lockTypeLongMap.get(LockType.Read);
@@ -76,9 +76,9 @@ class ReadWriteLockMonitor implements Runnable {
private String stackTraceToString(StackTraceElement[] stackTraceElements) {
StringBuffer sb = new StringBuffer();
- if(stackTraceElements != null) {
- for(StackTraceElement element : stackTraceElements) {
- if(element != null) {
+ if (stackTraceElements != null) {
+ for (StackTraceElement element : stackTraceElements) {
+ if (element != null) {
sb.append(element.toString()).append("\n");
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/config/CloudServiceConfigParser.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/config/CloudServiceConfigParser.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/config/CloudServiceConfigParser.java
index 3cedeff..5e172b8 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/config/CloudServiceConfigParser.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/config/CloudServiceConfigParser.java
@@ -49,7 +49,7 @@ public class CloudServiceConfigParser {
synchronized (loadlock) {
if (cloudServicesDescConfig == null) {
try {
- String configFileName = CarbonUtils.getCarbonConfigDirPath() + File.separator +
+ String configFileName = CarbonUtils.getCarbonConfigDirPath() + File.separator +
StratosConstants.MULTITENANCY_CONFIG_FOLDER + File.separator + CONFIG_FILENAME;
OMElement configElement = CommonUtil.buildOMElement(new FileInputStream(configFileName));
cloudServicesDescConfig = new CloudServicesDescConfig(configElement);
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/config/CloudServicesDescConfig.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/config/CloudServicesDescConfig.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/config/CloudServicesDescConfig.java
index 1bbd7aa..a0799af 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/config/CloudServicesDescConfig.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/config/CloudServicesDescConfig.java
@@ -42,10 +42,10 @@ public class CloudServicesDescConfig {
Iterator configChildIt = configEle.getChildElements();
while (configChildIt.hasNext()) {
Object configChildObj = configChildIt.next();
- if (!( configChildObj instanceof OMElement)) {
+ if (!(configChildObj instanceof OMElement)) {
continue;
}
- OMElement configChildEle = (OMElement)configChildObj;
+ OMElement configChildEle = (OMElement) configChildObj;
if (new QName(CONFIG_NS, CLOUD_SERVICE_ELEMENT_NAME, "").
equals(configChildEle.getQName())) {
CloudServiceConfig cloudServiceConfig = new CloudServiceConfig(configChildEle);
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/config/PermissionConfig.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/config/PermissionConfig.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/config/PermissionConfig.java
index f4d4716..af5661a 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/config/PermissionConfig.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/config/PermissionConfig.java
@@ -39,10 +39,10 @@ public class PermissionConfig {
Iterator configChildIt = configEle.getChildElements();
while (configChildIt.hasNext()) {
Object configChildObj = configChildIt.next();
- if (!( configChildObj instanceof OMElement)) {
+ if (!(configChildObj instanceof OMElement)) {
continue;
}
- OMElement configChildEle = (OMElement)configChildObj;
+ OMElement configChildEle = (OMElement) configChildObj;
if (new QName(CONFIG_NS, NAME, "").
equals(configChildEle.getQName())) {
name = configChildEle.getText();
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/constants/StratosConstants.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/constants/StratosConstants.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/constants/StratosConstants.java
index 67f46cb..733f641 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/constants/StratosConstants.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/constants/StratosConstants.java
@@ -137,13 +137,13 @@ public class StratosConstants {
public static final String MULTITENANCY_SMALL_PLAN = "SMB";
public static final String MULTITENANCY_MEDIUM_PLAN = "Professional";
public static final String MULTITENANCY_LARGE_PLAN = "Enterprise";
- public static final String EMAIL_CONFIG= "email";
+ public static final String EMAIL_CONFIG = "email";
public static final String MULTITENANCY_CONFIG_FOLDER = "multitenancy";
-
+
// Cloud controller - payload
- public static final String MEMBER_ID= "MEMBER_ID";
- public static final String LB_CLUSTER_ID= "LB_CLUSTER_ID";
- public static final String NETWORK_PARTITION_ID= "NETWORK_PARTITION_ID";
+ public static final String MEMBER_ID = "MEMBER_ID";
+ public static final String LB_CLUSTER_ID = "LB_CLUSTER_ID";
+ public static final String NETWORK_PARTITION_ID = "NETWORK_PARTITION_ID";
// Kubernetes related constants
public static final String KUBERNETES_CLUSTER_ID = "KUBERNETES_CLUSTER_ID";
@@ -157,26 +157,26 @@ public class StratosConstants {
public static final String MIN_CHECK_DROOL_FILE = "mincheck.drl";
public static final String OBSOLETE_CHECK_DROOL_FILE = "obsoletecheck.drl";
public static final String MIN_COUNT = "MIN_COUNT";
-
+
// Policy and definition related constants
public static final int PUBLIC_DEFINITION = 0;
-
+
// member expiry timeout constants
public static final String PENDING_MEMBER_EXPIRY_TIMEOUT = "autoscaler.member.pendingMemberExpiryTimeout";
public static final String OBSOLETED_MEMBER_EXPIRY_TIMEOUT = "autoscaler.member.obsoletedMemberExpiryTimeout";
public static final String PENDING_TERMINATION_MEMBER_EXPIRY_TIMEOUT = "autoscaler.member.pendingTerminationMemberExpiryTimeout";
- public static final String FILTER_VALUE_SEPARATOR = ",";
- public static final String TOPOLOGY_SERVICE_FILTER = "stratos.topology.service.filter";
- public static final String TOPOLOGY_CLUSTER_FILTER = "stratos.topology.cluster.filter";
- public static final String TOPOLOGY_MEMBER_FILTER = "stratos.topology.member.filter";
+ public static final String FILTER_VALUE_SEPARATOR = ",";
+ public static final String TOPOLOGY_SERVICE_FILTER = "stratos.topology.service.filter";
+ public static final String TOPOLOGY_CLUSTER_FILTER = "stratos.topology.cluster.filter";
+ public static final String TOPOLOGY_MEMBER_FILTER = "stratos.topology.member.filter";
- // to identify a lb cluster
- public static final String LOAD_BALANCER_REF = "load.balancer.ref";
- public static final String SERVICE_AWARE_LOAD_BALANCER = "service.aware.load.balancer";
- public static final String DEFAULT_LOAD_BALANCER = "default.load.balancer";
- public static final String NO_LOAD_BALANCER = "no.load.balancer";
- public static final String EXISTING_LOAD_BALANCERS = "existing.load.balancers";
+ // to identify a lb cluster
+ public static final String LOAD_BALANCER_REF = "load.balancer.ref";
+ public static final String SERVICE_AWARE_LOAD_BALANCER = "service.aware.load.balancer";
+ public static final String DEFAULT_LOAD_BALANCER = "default.load.balancer";
+ public static final String NO_LOAD_BALANCER = "no.load.balancer";
+ public static final String EXISTING_LOAD_BALANCERS = "existing.load.balancers";
public static final long HAZELCAST_INSTANCE_INIT_TIMEOUT = 300000; // 5 min
@@ -193,16 +193,16 @@ public class StratosConstants {
public static final String DEFAULT_CLIENT_SOCKET_TIMEOUT = "300000";
public static final String DEFAULT_CLIENT_CONNECTION_TIMEOUT = "300000";
-
+
// partition algorithm id constants
- public static final String PARTITION_ROUND_ROBIN_ALGORITHM_ID = "round-robin";
- public static final String PARTITION_WEIGHTED_ROUND_ROBIN_ALGORITHM_ID = "weighted-round-robin";
- public static final String PARTITION_ONE_AFTER_ANOTHER_ALGORITHM_ID = "one-after-another";
- // network partition algorithm id constants
- public static final String NETWORK_PARTITION_ONE_AFTER_ANOTHER_ALGORITHM_ID = "one-after-another";
- public static final String NETWORK_PARTITION_ALL_AT_ONCE_ALGORITHM_ID = "all-at-once";
- public static final String APPLICATION_POLICY_NETWORK_PARTITION_GROUPS = "networkPartitionGroups";
- public static final String APPLICATION_POLICY_NETWORK_PARTITIONS_SPLITTER = "\\|";
- public static final String APPLICATION_POLICY_NETWORK_PARTITION_GROUPS_SPLITTER = ",";
+ public static final String PARTITION_ROUND_ROBIN_ALGORITHM_ID = "round-robin";
+ public static final String PARTITION_WEIGHTED_ROUND_ROBIN_ALGORITHM_ID = "weighted-round-robin";
+ public static final String PARTITION_ONE_AFTER_ANOTHER_ALGORITHM_ID = "one-after-another";
+ // network partition algorithm id constants
+ public static final String NETWORK_PARTITION_ONE_AFTER_ANOTHER_ALGORITHM_ID = "one-after-another";
+ public static final String NETWORK_PARTITION_ALL_AT_ONCE_ALGORITHM_ID = "all-at-once";
+ public static final String APPLICATION_POLICY_NETWORK_PARTITION_GROUPS = "networkPartitionGroups";
+ public static final String APPLICATION_POLICY_NETWORK_PARTITIONS_SPLITTER = "\\|";
+ public static final String APPLICATION_POLICY_NETWORK_PARTITION_GROUPS_SPLITTER = ",";
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/constants/UsageConstants.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/constants/UsageConstants.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/constants/UsageConstants.java
index 607aa27..a7aab86 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/constants/UsageConstants.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/constants/UsageConstants.java
@@ -25,15 +25,15 @@ public class UsageConstants {
"/repository/components/org.wso2.carbon.system-metering";
public static final String CUSTOM_METERING_PATH =
- "/repository/components/org.wso2.carbon.system-metering";
+ "/repository/components/org.wso2.carbon.system-metering";
// the measurements
final public static String CAPACITY_USAGE = "capacity-usage";
-
+
final public static String SERVICE_REQUEST_COUNT = "serviceRequestCount";
final public static String SERVICE_RESPONSE_COUNT = "serviceResponseCount";
final public static String SERVICE_FAULT_COUNT = "serviceFaultCount";
-
+
public static final String BANDWIDTH_KEY_PATTERN = "%Bandwidth%";
public static final String REGISTRY_BANDWIDTH = "RegistryBandwidth";
public static final String SERVICE_BANDWIDTH = "ServiceBandwidth";
@@ -41,7 +41,7 @@ public class UsageConstants {
public static final String IN_LABLE = "-In";
public static final String OUT_LABLE = "-Out";
public static final String REGISTRY_CONTENT_BANDWIDTH = "ContentBandwidth";
-
+
final public static String REGISTRY_INCOMING_BW = REGISTRY_BANDWIDTH + IN_LABLE;
final public static String REGISTRY_OUTGOING_BW = REGISTRY_BANDWIDTH + OUT_LABLE;
final public static String REGISTRY_TOTAL_BW = "registry-total-bw-usage";
@@ -50,7 +50,7 @@ public class UsageConstants {
final public static String SERVICE_INCOMING_BW = SERVICE_BANDWIDTH + IN_LABLE;
final public static String SERVICE_OUTGOING_BW = SERVICE_BANDWIDTH + OUT_LABLE;
final public static String SERVICE_TOTAL_BW = "serviceRequestTotalBw";
-
+
final public static String WEBAPP_INCOMING_BW = WEBAPP_BANDWIDTH + IN_LABLE;
final public static String WEBAPP_OUTGOING_BW = WEBAPP_BANDWIDTH + OUT_LABLE;
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/exception/ApacheStratosException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/exception/ApacheStratosException.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/exception/ApacheStratosException.java
index 8eaaa0f..91aff2a 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/exception/ApacheStratosException.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/exception/ApacheStratosException.java
@@ -23,7 +23,7 @@ package org.apache.stratos.common.exception;
* This class is defined as the general Exception implementation for Stratos. This can be used
* within Stratos components when handling exceptions.
*/
-public class ApacheStratosException extends Exception{
+public class ApacheStratosException extends Exception {
public ApacheStratosException() {
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/exception/LockNotReleasedException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/exception/LockNotReleasedException.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/exception/LockNotReleasedException.java
index 0a7176a..76117c8 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/exception/LockNotReleasedException.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/exception/LockNotReleasedException.java
@@ -20,11 +20,11 @@
package org.apache.stratos.common.exception;
/**
- * Lock not released exception.
+ * Lock not released exception.
*/
public class LockNotReleasedException extends RuntimeException {
- public LockNotReleasedException(){
+ public LockNotReleasedException() {
}
public LockNotReleasedException(String message) {
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/exception/MalformedConfigurationFileException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/exception/MalformedConfigurationFileException.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/exception/MalformedConfigurationFileException.java
index d6ad833..49abbec 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/exception/MalformedConfigurationFileException.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/exception/MalformedConfigurationFileException.java
@@ -21,23 +21,23 @@ package org.apache.stratos.common.exception;
public class MalformedConfigurationFileException extends RuntimeException {
private static final long serialVersionUID = -1662095377704279326L;
- private String message;
-
+ private String message;
+
public MalformedConfigurationFileException(String msg) {
super(msg);
this.setMessage(msg);
}
-
+
public MalformedConfigurationFileException(String msg, Exception ex) {
super(msg, ex);
this.setMessage(msg);
}
private void setMessage(String msg) {
- this.message = msg;
- }
+ this.message = msg;
+ }
- public String getMessage() {
+ public String getMessage() {
return this.message;
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/internal/CommonServiceComponent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/internal/CommonServiceComponent.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/internal/CommonServiceComponent.java
index ffef662..e2d6eed 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/internal/CommonServiceComponent.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/internal/CommonServiceComponent.java
@@ -38,20 +38,19 @@ import org.wso2.carbon.utils.ConfigurationContextService;
/**
* @scr.component name="apache.stratos.common" immediate="true"
* @scr.reference name="hazelcast.instance.service" interface="com.hazelcast.core.HazelcastInstance"
- * cardinality="0..1"policy="dynamic" bind="setHazelcastInstance" unbind="unsetHazelcastInstance"
+ * cardinality="0..1"policy="dynamic" bind="setHazelcastInstance" unbind="unsetHazelcastInstance"
* @scr.reference name="distributedMapProvider" interface="org.wso2.carbon.caching.impl.DistributedMapProvider"
- * cardinality="0..1" policy="dynamic" bind="setDistributedMapProvider" unbind="unsetDistributedMapProvider"
+ * cardinality="0..1" policy="dynamic" bind="setDistributedMapProvider" unbind="unsetDistributedMapProvider"
* @scr.reference name="registry.service"
- * interface="org.wso2.carbon.registry.core.service.RegistryService"
- * cardinality="1..1" policy="dynamic" bind="setRegistryService"
- * unbind="unsetRegistryService"
+ * interface="org.wso2.carbon.registry.core.service.RegistryService"
+ * cardinality="1..1" policy="dynamic" bind="setRegistryService"
+ * unbind="unsetRegistryService"
* @scr.reference name="user.realmservice.default"
- * interface="org.wso2.carbon.user.core.service.RealmService"
- * cardinality="1..1" policy="dynamic" bind="setRealmService"
- * unbind="unsetRealmService"
+ * interface="org.wso2.carbon.user.core.service.RealmService"
+ * cardinality="1..1" policy="dynamic" bind="setRealmService"
+ * unbind="unsetRealmService"
* @scr.reference name="configuration.context.service" interface="org.wso2.carbon.utils.ConfigurationContextService"
- * cardinality="1..1" policy="dynamic" bind="setConfigurationContextService" unbind="unsetConfigurationContextService"
- *
+ * cardinality="1..1" policy="dynamic" bind="setConfigurationContextService" unbind="unsetConfigurationContextService"
*/
public class CommonServiceComponent {
@@ -72,7 +71,7 @@ public class CommonServiceComponent {
}
AxisConfiguration axisConfig = ServiceReferenceHolder.getInstance().getAxisConfiguration();
- if((axisConfig != null) && (axisConfig.getClusteringAgent() != null)) {
+ if ((axisConfig != null) && (axisConfig.getClusteringAgent() != null)) {
Thread thread = new Thread() {
@Override
public void run() {
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/internal/ComponentStartUpSynchronizerImpl.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/internal/ComponentStartUpSynchronizerImpl.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/internal/ComponentStartUpSynchronizerImpl.java
index d27f47f..079c428 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/internal/ComponentStartUpSynchronizerImpl.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/internal/ComponentStartUpSynchronizerImpl.java
@@ -60,18 +60,18 @@ public class ComponentStartUpSynchronizerImpl implements ComponentStartUpSynchro
componentActivationCheckInterval = Long.getLong(COMPONENT_ACTIVATION_CHECK_INTERVAL,
DEFAULT_COMPONENT_ACTIVATION_CHECK_INTERVAL);
log.info(String.format("Component activation check interval: %s seconds",
- (componentActivationCheckInterval/1000)));
+ (componentActivationCheckInterval / 1000)));
componentActivationTimeout = Long.getLong(COMPONENT_ACTIVATION_TIMEOUT,
DEFAULT_COMPONENT_ACTIVATION_TIMEOUT);
- log.info(String.format("Component activation timeout: %s seconds", (componentActivationTimeout/1000)));
+ log.info(String.format("Component activation timeout: %s seconds", (componentActivationTimeout / 1000)));
}
@Override
public void setComponentStatus(Component component, boolean active) {
componentStatusMap.put(component, active);
- if(active) {
+ if (active) {
notifyComponentActivationEventListeners(component);
log.info(String.format("%s component became active", component));
} else {
@@ -80,8 +80,8 @@ public class ComponentStartUpSynchronizerImpl implements ComponentStartUpSynchro
}
private void notifyComponentActivationEventListeners(Component component) {
- for(ComponentStartUpEventListener eventListener : eventListeners) {
- if(eventListener instanceof ComponentActivationEventListener) {
+ for (ComponentStartUpEventListener eventListener : eventListeners) {
+ if (eventListener instanceof ComponentActivationEventListener) {
try {
ComponentActivationEventListener componentActivationEventListener =
(ComponentActivationEventListener) eventListener;
@@ -95,7 +95,7 @@ public class ComponentStartUpSynchronizerImpl implements ComponentStartUpSynchro
@Override
public boolean isComponentActive(Component component) {
- if(componentStatusMap.containsKey(component)) {
+ if (componentStatusMap.containsKey(component)) {
return componentStatusMap.get(component);
}
return false;
@@ -105,8 +105,8 @@ public class ComponentStartUpSynchronizerImpl implements ComponentStartUpSynchro
public void waitForComponentActivation(Component owner, Component component) {
long startTime = System.currentTimeMillis();
boolean logged = false;
- while(!isComponentActive(component)) {
- if(!logged) {
+ while (!isComponentActive(component)) {
+ if (!logged) {
log.info(String.format("%s component is waiting for %s component to become active...",
owner, component));
logged = true;
@@ -120,9 +120,9 @@ public class ComponentStartUpSynchronizerImpl implements ComponentStartUpSynchro
}
long currentTime = System.currentTimeMillis();
- if((currentTime - startTime) > componentActivationTimeout) {
+ if ((currentTime - startTime) > componentActivationTimeout) {
throw new RuntimeException(String.format("%s component did not become active within %d seconds ",
- component, (componentActivationTimeout/1000)));
+ component, (componentActivationTimeout / 1000)));
}
}
}
@@ -132,7 +132,7 @@ public class ComponentStartUpSynchronizerImpl implements ComponentStartUpSynchro
AxisConfiguration axisConfiguration = CarbonConfigurationContextFactory.getConfigurationContext()
.getAxisConfiguration();
AxisService cloudControllerService = axisConfiguration.getService(serviceName);
- if(!cloudControllerService.isActive()) {
+ if (!cloudControllerService.isActive()) {
while (!cloudControllerService.isActive()) {
log.info(String.format("Waiting for %s web service to become active...", serviceName));
try {
@@ -147,6 +147,6 @@ public class ComponentStartUpSynchronizerImpl implements ComponentStartUpSynchro
@Override
public void addEventListener(ComponentStartUpEventListener eventListener) {
- eventListeners.add(eventListener);
+ eventListeners.add(eventListener);
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/listeners/TenantMgtListener.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/listeners/TenantMgtListener.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/listeners/TenantMgtListener.java
index 4b747c8..093e5aa 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/listeners/TenantMgtListener.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/listeners/TenantMgtListener.java
@@ -29,17 +29,17 @@ public interface TenantMgtListener {
public void onTenantDelete(int tenantId);
- public void onTenantRename(int tenantId, String oldDomainName,
- String newDomainName)throws ApacheStratosException;
-
+ public void onTenantRename(int tenantId, String oldDomainName,
+ String newDomainName) throws ApacheStratosException;
+
public void onTenantInitialActivation(int tenantId) throws ApacheStratosException;
-
+
public void onTenantActivation(int tenantId) throws ApacheStratosException;
-
+
public void onTenantDeactivation(int tenantId) throws ApacheStratosException;
- public void onSubscriptionPlanChange(int tenentId, String oldPlan,
+ public void onSubscriptionPlanChange(int tenentId, String oldPlan,
String newPlan) throws ApacheStratosException;
-
+
public int getListenerOrder();
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/packages/PackageInfo.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/packages/PackageInfo.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/packages/PackageInfo.java
index f20a6cd..73ac373 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/packages/PackageInfo.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/packages/PackageInfo.java
@@ -41,71 +41,71 @@ package org.apache.stratos.common.packages;
</packages>
*/
public class PackageInfo {
-
- private String name;
- private int usersLimit;
- private int subscriptionCharge;
- private int chargePerUser;
- private int resourceVolumeLimit;
- private int bandwidthLimit;
- private int bandwidthOveruseCharge;
-
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public int getUsersLimit() {
- return usersLimit;
- }
-
- public void setUsersLimit(int usersLimit) {
- this.usersLimit = usersLimit;
- }
-
- public int getSubscriptionCharge() {
- return subscriptionCharge;
- }
-
- public void setSubscriptionCharge(int subscriptionCharge) {
- this.subscriptionCharge = subscriptionCharge;
- }
-
- public int getChargePerUser() {
- return chargePerUser;
- }
-
- public void setChargePerUser(int chargePerUser) {
- this.chargePerUser = chargePerUser;
- }
-
- public int getResourceVolumeLimit() {
- return resourceVolumeLimit;
- }
-
- public void setResourceVolumeLimit(int resourceVolumeLimit) {
- this.resourceVolumeLimit = resourceVolumeLimit;
- }
-
- public int getBandwidthLimit() {
- return bandwidthLimit;
- }
-
- public void setBandwidthLimit(int bandwidthLimit) {
- this.bandwidthLimit = bandwidthLimit;
- }
-
- public int getBandwidthOveruseCharge() {
- return bandwidthOveruseCharge;
- }
-
- public void setBandwidthOveruseCharge(int bandwidthOveruseCharge) {
- this.bandwidthOveruseCharge = bandwidthOveruseCharge;
- }
-
-
+
+ private String name;
+ private int usersLimit;
+ private int subscriptionCharge;
+ private int chargePerUser;
+ private int resourceVolumeLimit;
+ private int bandwidthLimit;
+ private int bandwidthOveruseCharge;
+
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public int getUsersLimit() {
+ return usersLimit;
+ }
+
+ public void setUsersLimit(int usersLimit) {
+ this.usersLimit = usersLimit;
+ }
+
+ public int getSubscriptionCharge() {
+ return subscriptionCharge;
+ }
+
+ public void setSubscriptionCharge(int subscriptionCharge) {
+ this.subscriptionCharge = subscriptionCharge;
+ }
+
+ public int getChargePerUser() {
+ return chargePerUser;
+ }
+
+ public void setChargePerUser(int chargePerUser) {
+ this.chargePerUser = chargePerUser;
+ }
+
+ public int getResourceVolumeLimit() {
+ return resourceVolumeLimit;
+ }
+
+ public void setResourceVolumeLimit(int resourceVolumeLimit) {
+ this.resourceVolumeLimit = resourceVolumeLimit;
+ }
+
+ public int getBandwidthLimit() {
+ return bandwidthLimit;
+ }
+
+ public void setBandwidthLimit(int bandwidthLimit) {
+ this.bandwidthLimit = bandwidthLimit;
+ }
+
+ public int getBandwidthOveruseCharge() {
+ return bandwidthOveruseCharge;
+ }
+
+ public void setBandwidthOveruseCharge(int bandwidthOveruseCharge) {
+ this.bandwidthOveruseCharge = bandwidthOveruseCharge;
+ }
+
+
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/packages/PackageInfoHolder.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/packages/PackageInfoHolder.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/packages/PackageInfoHolder.java
index ca1dc4b..03b7be9 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/packages/PackageInfoHolder.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/packages/PackageInfoHolder.java
@@ -40,7 +40,7 @@ public class PackageInfoHolder {
private static final String PACKAGE_DESCRIPTION_CONFIG = "multitenancy-packages.xml";
private static final String PACKAGE_DESCRIPTION_CONFIG_NS =
"http://wso2.com/carbon/multitenancy/billing/pacakges";
-
+
List<PackageInfo> multitenancyPackages = new ArrayList<PackageInfo>();
public PackageInfoHolder() throws ApacheStratosException {
@@ -77,7 +77,7 @@ public class PackageInfoHolder {
String configFilePath = CarbonUtils.getCarbonConfigDirPath() + File.separator +
StratosConstants.MULTITENANCY_CONFIG_FOLDER + File.separator +
PACKAGE_DESCRIPTION_CONFIG;
-
+
OMElement packageConfigs;
try {
packageConfigs = CommonUtil.buildOMElement(new FileInputStream(configFilePath));
@@ -95,7 +95,7 @@ public class PackageInfoHolder {
packageConfigEle.getQName())) {
continue;
}
-
+
PackageInfo multitenancyPackage = new PackageInfo();
String packageName = packageConfigEle.getAttributeValue(new QName("name"));
String subscriptionCharge = getPackageConfigValue("subscriptionCharge", packageConfigEle);
@@ -128,10 +128,10 @@ public class PackageInfoHolder {
//enters a float value to the conf file it will cause an exception here
multitenancyPackage.setSubscriptionCharge(Integer.parseInt(subscriptionCharge));
multitenancyPackage.setUsersLimit(usersLimitInt);
- // multitenancyPackage.setChargePerUser(Integer.parseInt(usersCharge));
+ // multitenancyPackage.setChargePerUser(Integer.parseInt(usersCharge));
multitenancyPackage.setResourceVolumeLimit(resourceVolumeLimitInt);
multitenancyPackage.setBandwidthLimit(bandwidthLimitInt);
- // multitenancyPackage.setBandwidthOveruseCharge(Integer.parseInt(bandwidthOveruseCharge));
+ // multitenancyPackage.setBandwidthOveruseCharge(Integer.parseInt(bandwidthOveruseCharge));
multitenancyPackages.add(multitenancyPackage);
}
@@ -147,7 +147,7 @@ public class PackageInfoHolder {
List valueNodes = xpathExpression.selectNodes(packageNode);
if (valueNodes.isEmpty()) {
if (log.isDebugEnabled()) {
- String msg = "No results found parsing package configuration for key: " +
+ String msg = "No results found parsing package configuration for key: " +
qualifiedKey + ".";
log.debug(msg);
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/partition/NetworkPartition.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/partition/NetworkPartition.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/partition/NetworkPartition.java
index a155a1a..b42b4bb 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/partition/NetworkPartition.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/partition/NetworkPartition.java
@@ -23,8 +23,8 @@ import java.io.Serializable;
import java.util.Arrays;
/**
-* The model class for NetworkPartition definition.
-*/
+ * The model class for NetworkPartition definition.
+ */
public class NetworkPartition implements Serializable {
private static final long serialVersionUID = -8043298009352097370L;
@@ -36,7 +36,7 @@ public class NetworkPartition implements Serializable {
private String partitionAlgo;
public void setPartitions(Partition[] partitions) {
- if(partitions == null) {
+ if (partitions == null) {
this.partitions = partitions;
} else {
this.partitions = Arrays.copyOf(partitions, partitions.length);
@@ -52,7 +52,7 @@ public class NetworkPartition implements Serializable {
}
return this.partitions;
}
-
+
/**
* Gets the value of the id.
*/
@@ -76,21 +76,21 @@ public class NetworkPartition implements Serializable {
}
public Partition getPartition(String partitionId) {
- for(Partition partition : partitions) {
- if(partition.getId().equals(partitionId)) {
+ for (Partition partition : partitions) {
+ if (partition.getId().equals(partitionId)) {
return partition;
}
}
return null;
}
- public String getProvider() {
- return provider;
- }
+ public String getProvider() {
+ return provider;
+ }
- public void setProvider(String provider) {
- this.provider = provider;
- }
+ public void setProvider(String provider) {
+ this.provider = provider;
+ }
public String getPartitionAlgo() {
return partitionAlgo;
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/partition/Partition.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/partition/Partition.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/partition/Partition.java
index ceadab4..110fdad 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/partition/Partition.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/partition/Partition.java
@@ -45,10 +45,8 @@ public class Partition implements Serializable {
/**
* Gets the value of the id property.
*
- * @return
- * possible object is
- * {@link String }
- *
+ * @return possible object is
+ * {@link String }
*/
public String getId() {
return id;
@@ -57,10 +55,8 @@ public class Partition implements Serializable {
/**
* Sets the value of the id property.
*
- * @param id
- * allowed object is
- * {@link String }
- *
+ * @param id allowed object is
+ * {@link String }
*/
public void setId(String id) {
this.id = id;
@@ -69,10 +65,8 @@ public class Partition implements Serializable {
/**
* Gets the value of the description property.
*
- * @return
- * possible object is
- * {@link String }
- *
+ * @return possible object is
+ * {@link String }
*/
public String getDescription() {
return description;
@@ -81,10 +75,8 @@ public class Partition implements Serializable {
/**
* Sets the value of the description property.
*
- * @param description
- * allowed object is
- * {@link String }
- *
+ * @param description allowed object is
+ * {@link String }
*/
public void setDescription(String description) {
this.description = description;
@@ -93,9 +85,7 @@ public class Partition implements Serializable {
/**
* Sets the value of the isPublic property.
*
- * @param isPublic
- * allowed object is boolean
- *
+ * @param isPublic allowed object is boolean
*/
public void setIsPublic(boolean isPublic) {
this.isPublic = isPublic;
@@ -103,7 +93,6 @@ public class Partition implements Serializable {
/**
* Gets the value of the isPublic property.
- *
*/
public boolean getIsPublic() {
return isPublic;
@@ -127,7 +116,7 @@ public class Partition implements Serializable {
public String getKubernetesClusterId() {
Property property = properties.getProperty(KUBERNETES_CLUSTER);
- if(property != null) {
+ if (property != null) {
return property.getValue();
}
return null;
@@ -140,7 +129,7 @@ public class Partition implements Serializable {
}
public boolean equals(Object obj) {
- if(obj != null && obj instanceof Partition) {
+ if (obj != null && obj instanceof Partition) {
return this.id.equals(((Partition) obj).getId());
}
return false;
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/services/DistributedObjectProvider.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/services/DistributedObjectProvider.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/services/DistributedObjectProvider.java
index 2c013bd..4eba73b 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/services/DistributedObjectProvider.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/services/DistributedObjectProvider.java
@@ -33,6 +33,7 @@ import java.util.concurrent.locks.Lock;
public interface DistributedObjectProvider extends Serializable {
/**
* Returns a distributed map if clustering is enabled, else returns a local hash map.
+ *
* @param name
* @return
*/
@@ -40,12 +41,14 @@ public interface DistributedObjectProvider extends Serializable {
/**
* Removes a map from the object provider.
+ *
* @param name
*/
void removeMap(String name);
/**
* Returns a distributed list if clustering is enabled, else returns a local array list.
+ *
* @param name
* @return
*/
@@ -53,6 +56,7 @@ public interface DistributedObjectProvider extends Serializable {
/**
* Remove a list from the object provider.
+ *
* @param name
*/
void removeList(String name);
@@ -60,6 +64,7 @@ public interface DistributedObjectProvider extends Serializable {
/**
* Acquires a distributed lock if clustering is enabled, else acquires a local reentrant lock and
* returns the lock object.
+ *
* @param object
* @return
*/
@@ -67,6 +72,7 @@ public interface DistributedObjectProvider extends Serializable {
/**
* Releases a given distributed/local lock.
+ *
* @param lock
*/
void releaseLock(Lock lock);
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/HealthStatisticsPublisher.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/HealthStatisticsPublisher.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/HealthStatisticsPublisher.java
index 41c98cb..dd7ddd4 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/HealthStatisticsPublisher.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/HealthStatisticsPublisher.java
@@ -26,13 +26,14 @@ public interface HealthStatisticsPublisher extends StatisticsPublisher {
/**
* Publish health statistics to complex event processor.
- * @param clusterId Cluster id of the member
- * @param clusterInstanceId Cluster instance id of the member
+ *
+ * @param clusterId Cluster id of the member
+ * @param clusterInstanceId Cluster instance id of the member
* @param networkPartitionId Network partition id of the member
- * @param memberId Member id
- * @param partitionId Partition id of the member
- * @param health Health type: memory_consumption | load_average
- * @param value Health type value
+ * @param memberId Member id
+ * @param partitionId Partition id of the member
+ * @param health Health type: memory_consumption | load_average
+ * @param value Health type value
*/
void publish(String clusterId, String clusterInstanceId, String networkPartitionId,
String memberId, String partitionId, String health, double value);
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/HealthStatisticsPublisherFactory.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/HealthStatisticsPublisherFactory.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/HealthStatisticsPublisherFactory.java
index c0795a7..e4047ab 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/HealthStatisticsPublisherFactory.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/HealthStatisticsPublisherFactory.java
@@ -27,7 +27,7 @@ import org.apache.stratos.common.statistics.publisher.wso2.cep.WSO2CEPHealthStat
public class HealthStatisticsPublisherFactory {
public static HealthStatisticsPublisher createHealthStatisticsPublisher(StatisticsPublisherType type) {
- if(type == StatisticsPublisherType.WSO2CEP) {
+ if (type == StatisticsPublisherType.WSO2CEP) {
return new WSO2CEPHealthStatisticsPublisher();
} else {
throw new RuntimeException("Unknown statistics publisher type");
[3/3] stratos git commit: Format common module code
Posted by la...@apache.org.
Format common module code
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/65e8f167
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/65e8f167
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/65e8f167
Branch: refs/heads/master
Commit: 65e8f1673308d15f7967ecaa84d15a495f711844
Parents: cf78b4c
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Tue Apr 7 11:57:18 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Tue Apr 7 11:57:18 2015 +0530
----------------------------------------------------------------------
components/org.apache.stratos.common/pom.xml | 13 +-
.../org/apache/stratos/common/Properties.java | 4 +-
.../stratos/common/TenantBillingService.java | 12 +-
.../stratos/common/beans/ErrorResponseBean.java | 57 +++---
.../stratos/common/beans/PropertyBean.java | 2 +-
.../common/beans/SuccessResponseBean.java | 44 ++---
.../stratos/common/beans/UserInfoBean.java | 3 +-
.../beans/application/ApplicationBean.java | 14 +-
.../ApplicationNetworkPartitionIdListBean.java | 12 +-
.../common/beans/application/ComponentBean.java | 28 +--
.../beans/application/DependencyBean.java | 28 +--
.../beans/application/GroupReferenceBean.java | 50 ++---
.../beans/application/SubscribableInfo.java | 4 +-
.../mapping/ApplicationDomainMappingsBean.java | 2 +-
.../domain/mapping/DomainMappingBean.java | 2 +-
.../signup/ApplicationSignUpBean.java | 2 +-
.../repository/ArtifactRepositoryBean.java | 2 +-
.../repository/GitNotificationPayloadBean.java | 32 ++--
.../artifact/repository/GitRepositoryBean.java | 32 ++--
.../common/beans/cartridge/CartridgeBean.java | 52 +++---
.../beans/cartridge/CartridgeReferenceBean.java | 58 +++---
.../common/beans/cartridge/DeploymentBean.java | 8 +-
.../beans/cartridge/FloatingNetworkBean.java | 80 ++++----
.../beans/cartridge/IaasProviderBean.java | 10 +-
.../beans/cartridge/NetworkInterfaceBean.java | 126 ++++++-------
.../common/beans/cartridge/PortMappingBean.java | 2 +-
.../common/beans/kubernetes/PropertiesBean.java | 4 +-
.../common/beans/kubernetes/PropertyBean.java | 14 +-
...tionPolicyNetworkPartitionReferenceBean.java | 38 ++--
.../beans/partition/NetworkPartitionBean.java | 12 +-
.../policy/autoscale/AutoscalePolicyBean.java | 2 +-
.../autoscale/LoadAverageThresholdsBean.java | 2 +-
.../policy/autoscale/LoadThresholdsBean.java | 42 ++---
.../MemoryConsumptionThresholdsBean.java | 2 +-
.../deployment/ApplicationPolicyBean.java | 72 ++++----
.../policy/deployment/DeploymentPolicyBean.java | 26 +--
.../beans/topology/ApplicationInfoBean.java | 1 +
.../beans/topology/ApplicationInstanceBean.java | 30 +--
.../common/beans/topology/ClusterBean.java | 51 ++---
.../beans/topology/ClusterInstanceBean.java | 42 ++---
.../beans/topology/GroupInstanceBean.java | 26 +--
.../common/beans/topology/InstanceBean.java | 28 +--
.../common/beans/topology/MemberBean.java | 58 +++---
.../common/client/AutoscalerServiceClient.java | 54 +++---
.../client/CloudControllerServiceClient.java | 184 +++++++++----------
.../client/StratosManagerServiceClient.java | 56 +++---
.../impl/HazelcastDistributedListProvider.java | 6 +-
.../HazelcastDistributedObjectProvider.java | 62 ++++---
.../clustering/impl/ListEntryListener.java | 2 +
.../common/concurrent/locks/ReadWriteLock.java | 2 +-
.../concurrent/locks/ReadWriteLockMonitor.java | 8 +-
.../common/config/CloudServiceConfigParser.java | 2 +-
.../common/config/CloudServicesDescConfig.java | 4 +-
.../stratos/common/config/PermissionConfig.java | 4 +-
.../common/constants/StratosConstants.java | 54 +++---
.../common/constants/UsageConstants.java | 10 +-
.../exception/ApacheStratosException.java | 2 +-
.../exception/LockNotReleasedException.java | 4 +-
.../MalformedConfigurationFileException.java | 12 +-
.../common/internal/CommonServiceComponent.java | 21 +--
.../ComponentStartUpSynchronizerImpl.java | 24 +--
.../common/listeners/TenantMgtListener.java | 14 +-
.../stratos/common/packages/PackageInfo.java | 134 +++++++-------
.../common/packages/PackageInfoHolder.java | 12 +-
.../common/partition/NetworkPartition.java | 24 +--
.../stratos/common/partition/Partition.java | 33 ++--
.../services/DistributedObjectProvider.java | 6 +
.../publisher/HealthStatisticsPublisher.java | 13 +-
.../HealthStatisticsPublisherFactory.java | 2 +-
.../publisher/InFlightRequestPublisher.java | 7 +-
.../InFlightRequestPublisherFactory.java | 2 +-
.../publisher/StatisticsPublisher.java | 2 +-
.../publisher/wso2/cep/ThriftClientConfig.java | 7 +-
.../wso2/cep/ThriftClientConfigParser.java | 8 +-
.../cep/WSO2CEPHealthStatisticsPublisher.java | 3 +-
.../cep/WSO2CEPInFlightRequestPublisher.java | 6 +-
.../stratos/common/test/TestLogAppender.java | 5 +-
.../common/threading/StratosThreadPool.java | 41 +++--
.../common/util/AxiomXpathParserUtil.java | 36 ++--
.../stratos/common/util/ClaimsMgtUtil.java | 97 ++++------
.../stratos/common/util/CloudServicesUtil.java | 64 +++----
.../apache/stratos/common/util/CommonUtil.java | 126 ++++++-------
.../apache/stratos/common/util/ConfUtil.java | 14 +-
.../util/MeteringAccessValidationUtils.java | 46 ++---
.../common/util/StratosConfiguration.java | 12 +-
.../test/ThriftClientConfigParserTest.java | 8 +-
86 files changed, 1177 insertions(+), 1185 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/pom.xml b/components/org.apache.stratos.common/pom.xml
index 74fc755..d43a39a 100644
--- a/components/org.apache.stratos.common/pom.xml
+++ b/components/org.apache.stratos.common/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>
@@ -38,7 +39,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
-
+
<extensions>true</extensions>
<configuration>
<instructions>
@@ -94,10 +95,10 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.databridge.commons</artifactId>
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/Properties.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/Properties.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/Properties.java
index 9dcf5b2..ac47395 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/Properties.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/Properties.java
@@ -55,8 +55,8 @@ public class Properties implements Serializable {
}
public Property getProperty(String name) {
- for(Property property : properties) {
- if(property.getName().equals(name)) {
+ for (Property property : properties) {
+ if (property.getName().equals(name)) {
return property;
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/TenantBillingService.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/TenantBillingService.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/TenantBillingService.java
index d8eca30..f693177 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/TenantBillingService.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/TenantBillingService.java
@@ -25,18 +25,18 @@ import org.wso2.carbon.user.api.Tenant;
* The OSGI service interface that enables tenant related billing actions.
*/
public interface TenantBillingService {
-
+
public void addUsagePlan(Tenant tenant, String usagePlan) throws ApacheStratosException;
-
+
public String getActiveUsagePlan(String tenantDomain) throws ApacheStratosException;
-
+
public void updateUsagePlan(String tenantDomain, String usagePlan) throws ApacheStratosException;
-
+
public void activateUsagePlan(String tenantDomain) throws ApacheStratosException;
-
+
public void deactivateActiveUsagePlan(String tenantDomain) throws ApacheStratosException;
public void deleteBillingData(int tenantId) throws ApacheStratosException;
-
+
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/ErrorResponseBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/ErrorResponseBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/ErrorResponseBean.java
index 693f1e8..02f643b 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/ErrorResponseBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/ErrorResponseBean.java
@@ -20,36 +20,39 @@ package org.apache.stratos.common.beans;
import javax.xml.bind.annotation.XmlRootElement;
-@XmlRootElement(name ="error")
+@XmlRootElement(name = "error")
public class ErrorResponseBean {
-
- private int errorCode;
- private String errorMessage;
-
- public ErrorResponseBean() {
-
+
+ private int errorCode;
+ private String errorMessage;
+
+ public ErrorResponseBean() {
+
}
-
- public ErrorResponseBean(String errorMessage) {
- this.errorMessage = errorMessage;
+
+ public ErrorResponseBean(String errorMessage) {
+ this.errorMessage = errorMessage;
}
- public ErrorResponseBean(int errorCode, String errorMessage) {
- this.errorCode = errorCode;
- this.errorMessage = errorMessage;
+ public ErrorResponseBean(int errorCode, String errorMessage) {
+ this.errorCode = errorCode;
+ this.errorMessage = errorMessage;
}
-
- public int getErrorCode() {
- return errorCode;
- }
- public void setErrorCode(int errorCode) {
- this.errorCode = errorCode;
- }
- public String getErrorMessage() {
- return errorMessage;
- }
- public void setErrorMessage(String errorMessage) {
- this.errorMessage = errorMessage;
- }
-
+
+ public int getErrorCode() {
+ return errorCode;
+ }
+
+ public void setErrorCode(int errorCode) {
+ this.errorCode = errorCode;
+ }
+
+ public String getErrorMessage() {
+ return errorMessage;
+ }
+
+ public void setErrorMessage(String errorMessage) {
+ this.errorMessage = errorMessage;
+ }
+
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/PropertyBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/PropertyBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/PropertyBean.java
index 9a572c1..9ccda19 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/PropertyBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/PropertyBean.java
@@ -27,7 +27,7 @@ public class PropertyBean implements Serializable {
private static final long serialVersionUID = 5756598782384376873L;
- private String name;
+ private String name;
private String value;
public String getName() {
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/SuccessResponseBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/SuccessResponseBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/SuccessResponseBean.java
index 1c674bd..3506f8a 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/SuccessResponseBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/SuccessResponseBean.java
@@ -20,35 +20,35 @@ package org.apache.stratos.common.beans;
import javax.xml.bind.annotation.XmlRootElement;
-@XmlRootElement(name ="success")
+@XmlRootElement(name = "success")
public class SuccessResponseBean {
- private int statusCode;
- private String successMessage;
-
- public SuccessResponseBean() {
+ private int statusCode;
+ private String successMessage;
+
+ public SuccessResponseBean() {
+ }
+
+ public SuccessResponseBean(int statusCode, String message) {
+ this.statusCode = statusCode;
+ this.successMessage = message;
}
- public SuccessResponseBean(int statusCode, String message) {
- this.statusCode = statusCode;
- this.successMessage = message;
+ public int getStatusCode() {
+ return statusCode;
}
-
- public int getStatusCode() {
- return statusCode;
- }
- public void setStatusCode(int statusCode) {
- this.statusCode = statusCode;
- }
+ public void setStatusCode(int statusCode) {
+ this.statusCode = statusCode;
+ }
- public String getSuccessMessage() {
- return successMessage;
- }
+ public String getSuccessMessage() {
+ return successMessage;
+ }
+
+ public void setSuccessMessage(String successMessage) {
+ this.successMessage = successMessage;
+ }
- public void setSuccessMessage(String successMessage) {
- this.successMessage = successMessage;
- }
-
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/UserInfoBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/UserInfoBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/UserInfoBean.java
index 68af2bd..88877ee 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/UserInfoBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/UserInfoBean.java
@@ -32,7 +32,8 @@ public class UserInfoBean {
private String email;
private String profileName;
- public UserInfoBean(){}
+ public UserInfoBean() {
+ }
public UserInfoBean(UserInfoBean userInfoBean) {
this.userName = userInfoBean.getUserName();
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/ApplicationBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/ApplicationBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/ApplicationBean.java
index 205e8a3..1fad1ad 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/ApplicationBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/ApplicationBean.java
@@ -31,7 +31,7 @@ public class ApplicationBean implements Serializable {
private static final long serialVersionUID = -2829206180707597651L;
- private String applicationId;
+ private String applicationId;
private boolean multiTenant;
private String name;
private String description;
@@ -96,11 +96,11 @@ public class ApplicationBean implements Serializable {
this.status = status;
}
- public List<PropertyBean> getProperty() {
- return property;
- }
+ public List<PropertyBean> getProperty() {
+ return property;
+ }
- public void setProperty(List<PropertyBean> property) {
- this.property = property;
- }
+ public void setProperty(List<PropertyBean> property) {
+ this.property = property;
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/ApplicationNetworkPartitionIdListBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/ApplicationNetworkPartitionIdListBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/ApplicationNetworkPartitionIdListBean.java
index 1782929..021d2dd 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/ApplicationNetworkPartitionIdListBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/ApplicationNetworkPartitionIdListBean.java
@@ -28,11 +28,11 @@ public class ApplicationNetworkPartitionIdListBean implements Serializable {
private List<String> networkPartitionIds;
- public List<String> getNetworkPartitionIds() {
- return networkPartitionIds;
- }
+ public List<String> getNetworkPartitionIds() {
+ return networkPartitionIds;
+ }
- public void setNetworkPartitionIds(List<String> networkPartitionIds) {
- this.networkPartitionIds = networkPartitionIds;
- }
+ public void setNetworkPartitionIds(List<String> networkPartitionIds) {
+ this.networkPartitionIds = networkPartitionIds;
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/ComponentBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/ComponentBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/ComponentBean.java
index 069d8fd..9a6a0ce 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/ComponentBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/ComponentBean.java
@@ -12,8 +12,8 @@ public class ComponentBean implements Serializable {
private static final long serialVersionUID = -5932265453191494386L;
- private List<GroupReferenceBean> groups;
- private DependencyBean dependencies;
+ private List<GroupReferenceBean> groups;
+ private DependencyBean dependencies;
private List<CartridgeReferenceBean> cartridges;
public List<GroupReferenceBean> getGroups() {
@@ -24,19 +24,19 @@ public class ComponentBean implements Serializable {
this.groups = groups;
}
- public DependencyBean getDependencies() {
- return dependencies;
- }
+ public DependencyBean getDependencies() {
+ return dependencies;
+ }
- public void setDependencies(DependencyBean dependencies) {
- this.dependencies = dependencies;
- }
+ public void setDependencies(DependencyBean dependencies) {
+ this.dependencies = dependencies;
+ }
- public List<CartridgeReferenceBean> getCartridges() {
- return cartridges;
- }
+ public List<CartridgeReferenceBean> getCartridges() {
+ return cartridges;
+ }
- public void setCartridges(List<CartridgeReferenceBean> cartridges) {
- this.cartridges = cartridges;
- }
+ public void setCartridges(List<CartridgeReferenceBean> cartridges) {
+ this.cartridges = cartridges;
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/DependencyBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/DependencyBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/DependencyBean.java
index b4b82d4..ef945b4 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/DependencyBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/DependencyBean.java
@@ -26,7 +26,7 @@ import java.util.List;
@XmlRootElement(name = "dependencies")
public class DependencyBean implements Serializable {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
private List<String> startupOrders;
private List<String> scalingDependants;
@@ -40,20 +40,20 @@ public class DependencyBean implements Serializable {
this.terminationBehaviour = terminationBehaviour;
}
- public List<String> getStartupOrders() {
- return startupOrders;
- }
+ public List<String> getStartupOrders() {
+ return startupOrders;
+ }
- public void setStartupOrders(List<String> startupOrders) {
- this.startupOrders = startupOrders;
- }
+ public void setStartupOrders(List<String> startupOrders) {
+ this.startupOrders = startupOrders;
+ }
- public List<String> getScalingDependants() {
- return scalingDependants;
- }
+ public List<String> getScalingDependants() {
+ return scalingDependants;
+ }
+
+ public void setScalingDependants(List<String> scalingDependants) {
+ this.scalingDependants = scalingDependants;
+ }
- public void setScalingDependants(List<String> scalingDependants) {
- this.scalingDependants = scalingDependants;
- }
-
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/GroupReferenceBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/GroupReferenceBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/GroupReferenceBean.java
index 16f5592..6804f4e 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/GroupReferenceBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/GroupReferenceBean.java
@@ -31,7 +31,7 @@ public class GroupReferenceBean implements Serializable {
private static final long serialVersionUID = 7261380706841894892L;
- private String name;
+ private String name;
private String alias;
private int groupMinInstances;
private int groupMaxInstances;
@@ -72,35 +72,35 @@ public class GroupReferenceBean implements Serializable {
this.groupMaxInstances = groupMaxInstances;
}
- public boolean isGroupScalingEnabled() {
- return isGroupScalingEnabled;
- }
+ public boolean isGroupScalingEnabled() {
+ return isGroupScalingEnabled;
+ }
- public void setGroupScalingEnabled(boolean isGroupScalingEnabled) {
- this.isGroupScalingEnabled = isGroupScalingEnabled;
- }
+ public void setGroupScalingEnabled(boolean isGroupScalingEnabled) {
+ this.isGroupScalingEnabled = isGroupScalingEnabled;
+ }
- public List<CartridgeReferenceBean> getCartridges() {
- return cartridges;
- }
+ public List<CartridgeReferenceBean> getCartridges() {
+ return cartridges;
+ }
- public void setCartridges(List<CartridgeReferenceBean> cartridges) {
- this.cartridges = cartridges;
- }
+ public void setCartridges(List<CartridgeReferenceBean> cartridges) {
+ this.cartridges = cartridges;
+ }
- public List<GroupReferenceBean> getGroups() {
- return groups;
- }
+ public List<GroupReferenceBean> getGroups() {
+ return groups;
+ }
- public void setGroups(List<GroupReferenceBean> groups) {
- this.groups = groups;
- }
+ public void setGroups(List<GroupReferenceBean> groups) {
+ this.groups = groups;
+ }
- public String getDeploymentPolicy() {
- return deploymentPolicy;
- }
+ public String getDeploymentPolicy() {
+ return deploymentPolicy;
+ }
- public void setDeploymentPolicy(String deploymentPolicy) {
- this.deploymentPolicy = deploymentPolicy;
- }
+ public void setDeploymentPolicy(String deploymentPolicy) {
+ this.deploymentPolicy = deploymentPolicy;
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/SubscribableInfo.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/SubscribableInfo.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/SubscribableInfo.java
index 95d5dc8..cbe107c 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/SubscribableInfo.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/SubscribableInfo.java
@@ -33,7 +33,7 @@ public class SubscribableInfo implements Serializable {
private static final long serialVersionUID = 8097432440778125606L;
- private String alias;
+ private String alias;
private String deploymentPolicy;
private String autoscalingPolicy;
private int maxMembers;
@@ -74,7 +74,7 @@ public class SubscribableInfo implements Serializable {
public void setDependencyAliases(String[] dependencyAliases) {
this.dependencyAliases = dependencyAliases;
}
-
+
public List<PropertyBean> getProperty() {
return property;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/domain/mapping/ApplicationDomainMappingsBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/domain/mapping/ApplicationDomainMappingsBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/domain/mapping/ApplicationDomainMappingsBean.java
index 6d44cec..f287f24 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/domain/mapping/ApplicationDomainMappingsBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/domain/mapping/ApplicationDomainMappingsBean.java
@@ -23,7 +23,7 @@ import javax.xml.bind.annotation.XmlRootElement;
import java.io.Serializable;
import java.util.List;
-@XmlRootElement(name="applicationDomainMappings")
+@XmlRootElement(name = "applicationDomainMappings")
public class ApplicationDomainMappingsBean implements Serializable {
private static final long serialVersionUID = 8896916017135654616L;
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/domain/mapping/DomainMappingBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/domain/mapping/DomainMappingBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/domain/mapping/DomainMappingBean.java
index 78039af..3ab7cd3 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/domain/mapping/DomainMappingBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/domain/mapping/DomainMappingBean.java
@@ -22,7 +22,7 @@ package org.apache.stratos.common.beans.application.domain.mapping;
import javax.xml.bind.annotation.XmlRootElement;
import java.io.Serializable;
-@XmlRootElement(name="domainMapping")
+@XmlRootElement(name = "domainMapping")
public class DomainMappingBean implements Serializable {
private static final long serialVersionUID = -9070100712931939993L;
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/signup/ApplicationSignUpBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/signup/ApplicationSignUpBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/signup/ApplicationSignUpBean.java
index c3b0d3b..74b7681 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/signup/ApplicationSignUpBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/signup/ApplicationSignUpBean.java
@@ -28,7 +28,7 @@ import java.util.List;
/**
* Application signup definition.
*/
-@XmlRootElement(name="applicationSignUp")
+@XmlRootElement(name = "applicationSignUp")
public class ApplicationSignUpBean implements Serializable {
private static final long serialVersionUID = -3055522170914869018L;
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/artifact/repository/ArtifactRepositoryBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/artifact/repository/ArtifactRepositoryBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/artifact/repository/ArtifactRepositoryBean.java
index 05c757d..f380806 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/artifact/repository/ArtifactRepositoryBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/artifact/repository/ArtifactRepositoryBean.java
@@ -21,7 +21,7 @@ package org.apache.stratos.common.beans.artifact.repository;
import javax.xml.bind.annotation.XmlRootElement;
-@XmlRootElement(name="artifactRepository")
+@XmlRootElement(name = "artifactRepository")
public class ArtifactRepositoryBean {
private String alias;
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/artifact/repository/GitNotificationPayloadBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/artifact/repository/GitNotificationPayloadBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/artifact/repository/GitNotificationPayloadBean.java
index 482ff32..04c2c08 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/artifact/repository/GitNotificationPayloadBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/artifact/repository/GitNotificationPayloadBean.java
@@ -1,20 +1,20 @@
/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
-
- * http://www.apache.org/licenses/LICENSE-2.0
-
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.stratos.common.beans.artifact.repository;
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/artifact/repository/GitRepositoryBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/artifact/repository/GitRepositoryBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/artifact/repository/GitRepositoryBean.java
index 9dc7b26..0c1ebb4 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/artifact/repository/GitRepositoryBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/artifact/repository/GitRepositoryBean.java
@@ -1,20 +1,20 @@
/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
-
- * http://www.apache.org/licenses/LICENSE-2.0
-
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.stratos.common.beans.artifact.repository;
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/CartridgeBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/CartridgeBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/CartridgeBean.java
index 71d8108..5cfaa32 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/CartridgeBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/CartridgeBean.java
@@ -25,18 +25,18 @@ import java.util.List;
@XmlRootElement(name = "cartridgeBean")
public class CartridgeBean {
- private String type;
- private String provider;
+ private String type;
+ private String provider;
/**
* Category: framework|data|load-balancer
*/
private String category;
private String host;
private String displayName;
- private String description;
- private String version;
- private boolean multiTenant;
- private boolean isPublic;
+ private String description;
+ private String version;
+ private boolean multiTenant;
+ private boolean isPublic;
private DeploymentBean deployment;
private List<PortMappingBean> portMapping;
private String tenantPartitions;
@@ -49,39 +49,39 @@ public class CartridgeBean {
private String[] metadataKeys;
private List<PropertyBean> property;
- private String getDeploymentDetails () {
- if(getDeployment() != null) {
+ private String getDeploymentDetails() {
+ if (getDeployment() != null) {
return getDeployment().toString();
}
return null;
}
- private String getPortMappings () {
+ private String getPortMappings() {
StringBuilder portMappingBuilder = new StringBuilder();
- if(getPortMapping() != null && !getPortMapping().isEmpty()) {
- for(PortMappingBean portMappingBean : getPortMapping()) {
+ if (getPortMapping() != null && !getPortMapping().isEmpty()) {
+ for (PortMappingBean portMappingBean : getPortMapping()) {
portMappingBuilder.append(portMappingBean.toString());
}
}
return portMappingBuilder.toString();
}
- private String getIaasProviders () {
+ private String getIaasProviders() {
StringBuilder iaasBuilder = new StringBuilder();
- if(getIaasProvider() != null && !getIaasProvider().isEmpty()) {
- for(IaasProviderBean iaasProviderBean : getIaasProvider()) {
+ if (getIaasProvider() != null && !getIaasProvider().isEmpty()) {
+ for (IaasProviderBean iaasProviderBean : getIaasProvider()) {
iaasBuilder.append(iaasProviderBean.toString());
}
}
return iaasBuilder.toString();
}
- private String getProperties () {
+ private String getProperties() {
StringBuilder propertyBuilder = new StringBuilder();
- if(getProperty() != null) {
- for(PropertyBean propertyBean : getProperty()) {
+ if (getProperty() != null) {
+ for (PropertyBean propertyBean : getProperty()) {
propertyBuilder.append(propertyBean.getName() + " : " + propertyBean.getValue() + " | ");
}
}
@@ -216,15 +216,15 @@ public class CartridgeBean {
this.loadBalancingIPType = loadBalancingIPType;
}
- public String[] getMetadataKeys() {
- return metadataKeys;
- }
+ public String[] getMetadataKeys() {
+ return metadataKeys;
+ }
- public void setMetadataKeys(String[] metadataKeys) {
- this.metadataKeys = metadataKeys;
- }
+ public void setMetadataKeys(String[] metadataKeys) {
+ this.metadataKeys = metadataKeys;
+ }
- public String toString () {
+ public String toString() {
return "Type: " + getType() +
", Provider: " + getProvider() +
@@ -237,9 +237,9 @@ public class CartridgeBean {
", Public " + isPublic() +
", Deployment" + getDeploymentDetails() +
", Port Mapping: " + getPortMappings() +
- ", Tenant Partitions: " + getTenantPartitions() +
+ ", Tenant Partitions: " + getTenantPartitions() +
", IaaS Providers: " + getIaasProviders() +
- ", Persistence "+ (getPersistence() == null ? "" : getPersistence().toString()) +
+ ", Persistence " + (getPersistence() == null ? "" : getPersistence().toString()) +
", Load Balancing IP Type: " + getLoadBalancingIPType() +
", Metadata Keys: " + getMetadataKeys() +
", Properties: " + getProperties();
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/CartridgeReferenceBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/CartridgeReferenceBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/CartridgeReferenceBean.java
index ec974c5..27fa37e 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/CartridgeReferenceBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/CartridgeReferenceBean.java
@@ -29,41 +29,41 @@ public class CartridgeReferenceBean implements Serializable {
private static final long serialVersionUID = 8968224678298479827L;
- private String type;
- private int cartridgeMin;
- private int cartridgeMax;
- private SubscribableInfo subscribableInfo;
+ private String type;
+ private int cartridgeMin;
+ private int cartridgeMax;
+ private SubscribableInfo subscribableInfo;
- public String getType() {
- return type;
- }
+ public String getType() {
+ return type;
+ }
- public void setType(String type) {
- this.type = type;
- }
+ public void setType(String type) {
+ this.type = type;
+ }
- public int getCartridgeMin() {
- return cartridgeMin;
- }
+ public int getCartridgeMin() {
+ return cartridgeMin;
+ }
- public void setCartridgeMin(int cartridgeMin) {
- this.cartridgeMin = cartridgeMin;
- }
+ public void setCartridgeMin(int cartridgeMin) {
+ this.cartridgeMin = cartridgeMin;
+ }
- public int getCartridgeMax() {
- return cartridgeMax;
- }
+ public int getCartridgeMax() {
+ return cartridgeMax;
+ }
- public void setCartridgeMax(int cartridgeMax) {
- this.cartridgeMax = cartridgeMax;
- }
+ public void setCartridgeMax(int cartridgeMax) {
+ this.cartridgeMax = cartridgeMax;
+ }
- public SubscribableInfo getSubscribableInfo() {
- return subscribableInfo;
- }
+ public SubscribableInfo getSubscribableInfo() {
+ return subscribableInfo;
+ }
+
+ public void setSubscribableInfo(SubscribableInfo subscribableInfo) {
+ this.subscribableInfo = subscribableInfo;
+ }
- public void setSubscribableInfo(SubscribableInfo subscribableInfo) {
- this.subscribableInfo = subscribableInfo;
- }
-
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/DeploymentBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/DeploymentBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/DeploymentBean.java
index f7436b1..58c8efe 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/DeploymentBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/DeploymentBean.java
@@ -28,11 +28,11 @@ public class DeploymentBean {
private String baseDir;
private List<String> dir;
- private String getDirectories () {
+ private String getDirectories() {
StringBuilder directoryBuilder = new StringBuilder();
- if(getDir() != null) {
- for(String directory : getDir()) {
+ if (getDir() != null) {
+ for (String directory : getDir()) {
directoryBuilder.append(directory + " | ");
}
}
@@ -55,7 +55,7 @@ public class DeploymentBean {
this.dir = dir;
}
- public String toString () {
+ public String toString() {
return " Base Directory: " + getBaseDir() + " Directories: " + getDirectories();
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/FloatingNetworkBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/FloatingNetworkBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/FloatingNetworkBean.java
index 8fdbf4a..2e20174 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/FloatingNetworkBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/FloatingNetworkBean.java
@@ -21,53 +21,53 @@ package org.apache.stratos.common.beans.cartridge;
import javax.xml.bind.annotation.XmlRootElement;
-@XmlRootElement (name = "floatingNetworks")
+@XmlRootElement(name = "floatingNetworks")
public class FloatingNetworkBean {
- private String name;
- private String networkUuid;
- private String floatingIP;
+ private String name;
+ private String networkUuid;
+ private String floatingIP;
- public String getName() {
- return name;
- }
+ public String getName() {
+ return name;
+ }
- public void setName(String name) {
- this.name = name;
- }
+ public void setName(String name) {
+ this.name = name;
+ }
- public String getNetworkUuid() {
- return networkUuid;
- }
+ public String getNetworkUuid() {
+ return networkUuid;
+ }
- public void setNetworkUuid(String networkUuid) {
- this.networkUuid = networkUuid;
- }
+ public void setNetworkUuid(String networkUuid) {
+ this.networkUuid = networkUuid;
+ }
- public String getFloatingIP() {
- return floatingIP;
- }
+ public String getFloatingIP() {
+ return floatingIP;
+ }
- public void setFloatingIP(String floatingIP) {
- this.floatingIP = floatingIP;
- }
+ public void setFloatingIP(String floatingIP) {
+ this.floatingIP = floatingIP;
+ }
- public String toString () {
- StringBuilder sb = new StringBuilder('{');
- String delimeter = "";
- if (getName() != null) {
- sb.append(delimeter).append("name : ").append(getName());
- delimeter = ", ";
- }
- if (getNetworkUuid() != null) {
- sb.append(delimeter).append("networkUuid : ").append(getNetworkUuid());
- delimeter = ", ";
- }
- if (getFloatingIP() != null) {
- sb.append(delimeter).append("floatingIP : ").append(getFloatingIP());
- delimeter = ", ";
- }
- sb.append('}');
- return sb.toString();
- }
+ public String toString() {
+ StringBuilder sb = new StringBuilder('{');
+ String delimeter = "";
+ if (getName() != null) {
+ sb.append(delimeter).append("name : ").append(getName());
+ delimeter = ", ";
+ }
+ if (getNetworkUuid() != null) {
+ sb.append(delimeter).append("networkUuid : ").append(getNetworkUuid());
+ delimeter = ", ";
+ }
+ if (getFloatingIP() != null) {
+ sb.append(delimeter).append("floatingIP : ").append(getFloatingIP());
+ delimeter = ", ";
+ }
+ sb.append('}');
+ return sb.toString();
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/IaasProviderBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/IaasProviderBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/IaasProviderBean.java
index 23f2c7e..7be7f9a 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/IaasProviderBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/IaasProviderBean.java
@@ -22,7 +22,7 @@ package org.apache.stratos.common.beans.cartridge;
import javax.xml.bind.annotation.XmlRootElement;
import java.util.List;
-@XmlRootElement (name = "iaasProvider")
+@XmlRootElement(name = "iaasProvider")
public class IaasProviderBean {
private String type;
@@ -107,9 +107,9 @@ public class IaasProviderBean {
this.networkInterfaces = networkInterfaces;
}
- private String getIaasPropertiesString () {
+ private String getIaasPropertiesString() {
StringBuilder iaasPropertyBuilder = new StringBuilder();
- if(getProperty() != null) {
+ if (getProperty() != null) {
for (PropertyBean propertyBean : getProperty()) {
iaasPropertyBuilder.append(propertyBean.getName() + " : " + propertyBean.getValue() + " | ");
}
@@ -122,7 +122,7 @@ public class IaasProviderBean {
if (getNetworkInterfaces() != null) {
sb.append('[');
String delimeter = "";
- for (NetworkInterfaceBean nib: getNetworkInterfaces()) {
+ for (NetworkInterfaceBean nib : getNetworkInterfaces()) {
sb.append(delimeter).append(nib);
delimeter = ", ";
}
@@ -131,7 +131,7 @@ public class IaasProviderBean {
return sb.toString();
}
- public String toString () {
+ public String toString() {
return " [ Type: " + getType() + ", Name: " + getName() + ", Class Name: " + getClassName() + ", Image Id: " + getImageId() +
", Provider: " + getProvider() + ", Identity: " + getIdentity() +
", Credentials: " + getCredential() + ", Properties: " + getIaasPropertiesString() + ", Network Interfaces: " +
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/NetworkInterfaceBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/NetworkInterfaceBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/NetworkInterfaceBean.java
index d3b6028..d34728a 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/NetworkInterfaceBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/NetworkInterfaceBean.java
@@ -23,80 +23,80 @@ import java.util.List;
import javax.xml.bind.annotation.XmlRootElement;
-@XmlRootElement (name = "networkInterfaces")
+@XmlRootElement(name = "networkInterfaces")
public class NetworkInterfaceBean {
- private String networkUuid;
- private String fixedIp;
- private String portUuid;
- private List<FloatingNetworkBean> floatingNetworks;
-
+ private String networkUuid;
+ private String fixedIp;
+ private String portUuid;
+ private List<FloatingNetworkBean> floatingNetworks;
+
private String getFloatingNetworksString() {
- StringBuilder sb = new StringBuilder();
- if (floatingNetworks != null) {
- sb.append('[');
- String delimeter = "";
- for (FloatingNetworkBean floatingNetworkBean:floatingNetworks) {
- sb.append(delimeter).append(floatingNetworkBean);
- delimeter = ", ";
- }
- sb.append(']');
- }
- return sb.toString();
+ StringBuilder sb = new StringBuilder();
+ if (floatingNetworks != null) {
+ sb.append('[');
+ String delimeter = "";
+ for (FloatingNetworkBean floatingNetworkBean : floatingNetworks) {
+ sb.append(delimeter).append(floatingNetworkBean);
+ delimeter = ", ";
+ }
+ sb.append(']');
+ }
+ return sb.toString();
}
- public String getNetworkUuid() {
- return networkUuid;
- }
+ public String getNetworkUuid() {
+ return networkUuid;
+ }
- public void setNetworkUuid(String networkUuid) {
- this.networkUuid = networkUuid;
- }
+ public void setNetworkUuid(String networkUuid) {
+ this.networkUuid = networkUuid;
+ }
- public String getFixedIp() {
- return fixedIp;
- }
+ public String getFixedIp() {
+ return fixedIp;
+ }
- public void setFixedIp(String fixedIp) {
- this.fixedIp = fixedIp;
- }
+ public void setFixedIp(String fixedIp) {
+ this.fixedIp = fixedIp;
+ }
- public String getPortUuid() {
- return portUuid;
- }
+ public String getPortUuid() {
+ return portUuid;
+ }
- public void setPortUuid(String portUuid) {
- this.portUuid = portUuid;
- }
+ public void setPortUuid(String portUuid) {
+ this.portUuid = portUuid;
+ }
- public void setFloatingNetworks(List<FloatingNetworkBean> floatingNetworks) {
- this.floatingNetworks = floatingNetworks;
- }
+ public void setFloatingNetworks(List<FloatingNetworkBean> floatingNetworks) {
+ this.floatingNetworks = floatingNetworks;
+ }
- public List<FloatingNetworkBean> getFloatingNetworks() {
- return floatingNetworks;
- }
+ public List<FloatingNetworkBean> getFloatingNetworks() {
+ return floatingNetworks;
+ }
- public String toString () {
- StringBuilder sb = new StringBuilder('{');
- String delimeter = "";
- if (getNetworkUuid() != null) {
- sb.append(delimeter).append("networkUuid : ").append(getNetworkUuid());
- delimeter = ", ";
- }
- if (getFixedIp() != null) {
- sb.append(delimeter).append("fixedIp : ").append(getFixedIp());
- delimeter = ", ";
- }
- if (getPortUuid() != null) {
- sb.append(delimeter).append("portUuid : ").append(getPortUuid());
- delimeter = ", ";
- }
- if (getFloatingNetworks() != null) {
- sb.append(delimeter).append("floatingNetworks : ").append(getFloatingNetworks());
- delimeter = ", ";
- }
- sb.append('}');
- return sb.toString();
- }
+ public String toString() {
+ StringBuilder sb = new StringBuilder('{');
+ String delimeter = "";
+ if (getNetworkUuid() != null) {
+ sb.append(delimeter).append("networkUuid : ").append(getNetworkUuid());
+ delimeter = ", ";
+ }
+ if (getFixedIp() != null) {
+ sb.append(delimeter).append("fixedIp : ").append(getFixedIp());
+ delimeter = ", ";
+ }
+ if (getPortUuid() != null) {
+ sb.append(delimeter).append("portUuid : ").append(getPortUuid());
+ delimeter = ", ";
+ }
+ if (getFloatingNetworks() != null) {
+ sb.append(delimeter).append("floatingNetworks : ").append(getFloatingNetworks());
+ delimeter = ", ";
+ }
+ sb.append('}');
+ return sb.toString();
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/PortMappingBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/PortMappingBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/PortMappingBean.java
index 3845077..def0405 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/PortMappingBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/PortMappingBean.java
@@ -28,7 +28,7 @@ public class PortMappingBean {
private int port;
private int proxyPort;
- public String toString () {
+ public String toString() {
return " [ Protocol: " + getProtocol() + ", Port: " + getPort() + ", Proxy port: " + getProxyPort() + "] ";
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/kubernetes/PropertiesBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/kubernetes/PropertiesBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/kubernetes/PropertiesBean.java
index 1add9b7..d8ebfcd 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/kubernetes/PropertiesBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/kubernetes/PropertiesBean.java
@@ -27,7 +27,7 @@ import java.util.List;
* stub generation.
*/
@XmlRootElement
-public class PropertiesBean implements Serializable{
+public class PropertiesBean implements Serializable {
private static final long serialVersionUID = 1986895299288322592L;
private List<PropertyBean> properties;
@@ -44,5 +44,5 @@ public class PropertiesBean implements Serializable{
public String toString() {
return "Properties [properties=" + properties + "]";
}
-
+
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/kubernetes/PropertyBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/kubernetes/PropertyBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/kubernetes/PropertyBean.java
index b15aaf4..1b41f78 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/kubernetes/PropertyBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/kubernetes/PropertyBean.java
@@ -22,21 +22,21 @@ import javax.xml.bind.annotation.XmlRootElement;
import java.io.Serializable;
/**
- * Holds a property
+ * Holds a property
*/
@XmlRootElement
public class PropertyBean implements Serializable {
-
+
private static final long serialVersionUID = -2191782657999410197L;
private String name;
private String value;
-
- public PropertyBean(){
-
+
+ public PropertyBean() {
+
}
-
- public PropertyBean(String name, String value){
+
+ public PropertyBean(String name, String value) {
this.setName(name);
this.setValue(value);
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/ApplicationPolicyNetworkPartitionReferenceBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/ApplicationPolicyNetworkPartitionReferenceBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/ApplicationPolicyNetworkPartitionReferenceBean.java
index 8c94d76..6dd13d2 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/ApplicationPolicyNetworkPartitionReferenceBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/ApplicationPolicyNetworkPartitionReferenceBean.java
@@ -23,23 +23,23 @@ import javax.xml.bind.annotation.XmlRootElement;
@XmlRootElement
public class ApplicationPolicyNetworkPartitionReferenceBean {
- private String id;
- private boolean activeByDefault;
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public boolean isActiveByDefault() {
- return activeByDefault;
- }
-
- public void setActiveByDefault(boolean activeByDefault) {
- this.activeByDefault = activeByDefault;
- }
-
+ private String id;
+ private boolean activeByDefault;
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public boolean isActiveByDefault() {
+ return activeByDefault;
+ }
+
+ public void setActiveByDefault(boolean activeByDefault) {
+ this.activeByDefault = activeByDefault;
+ }
+
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/NetworkPartitionBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/NetworkPartitionBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/NetworkPartitionBean.java
index b2bc015..fde2023 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/NetworkPartitionBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/NetworkPartitionBean.java
@@ -46,13 +46,13 @@ public class NetworkPartitionBean {
this.partitions = partitions;
}
- public String getProvider() {
- return provider;
- }
+ public String getProvider() {
+ return provider;
+ }
- public void setProvider(String provider) {
- this.provider = provider;
- }
+ public void setProvider(String provider) {
+ this.provider = provider;
+ }
public String getPartitionAlgo() {
return partitionAlgo;
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/policy/autoscale/AutoscalePolicyBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/policy/autoscale/AutoscalePolicyBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/policy/autoscale/AutoscalePolicyBean.java
index e18c34c..9ccc78f 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/policy/autoscale/AutoscalePolicyBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/policy/autoscale/AutoscalePolicyBean.java
@@ -63,7 +63,7 @@ public class AutoscalePolicyBean {
this.isPublic = isPublic;
}
-
+
public LoadThresholdsBean getLoadThresholds() {
return loadThresholds;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/policy/autoscale/LoadAverageThresholdsBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/policy/autoscale/LoadAverageThresholdsBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/policy/autoscale/LoadAverageThresholdsBean.java
index 8ea73e5..78f6a09 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/policy/autoscale/LoadAverageThresholdsBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/policy/autoscale/LoadAverageThresholdsBean.java
@@ -24,7 +24,7 @@ import javax.xml.bind.annotation.XmlRootElement;
@XmlRootElement
public class LoadAverageThresholdsBean {
- private float threshold;
+ private float threshold;
public float getThreshold() {
return threshold;
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/policy/autoscale/LoadThresholdsBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/policy/autoscale/LoadThresholdsBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/policy/autoscale/LoadThresholdsBean.java
index 903114d..ba86cb0 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/policy/autoscale/LoadThresholdsBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/policy/autoscale/LoadThresholdsBean.java
@@ -24,31 +24,31 @@ import javax.xml.bind.annotation.XmlRootElement;
@XmlRootElement
public class LoadThresholdsBean {
- private RequestsInFlightThresholdsBean requestsInFlight;
- private MemoryConsumptionThresholdsBean memoryConsumption;
- private LoadAverageThresholdsBean loadAverage;
+ private RequestsInFlightThresholdsBean requestsInFlight;
+ private MemoryConsumptionThresholdsBean memoryConsumption;
+ private LoadAverageThresholdsBean loadAverage;
- public RequestsInFlightThresholdsBean getRequestsInFlight() {
- return requestsInFlight;
- }
+ public RequestsInFlightThresholdsBean getRequestsInFlight() {
+ return requestsInFlight;
+ }
- public void setRequestsInFlight(RequestsInFlightThresholdsBean requestsInFlight) {
- this.requestsInFlight = requestsInFlight;
- }
+ public void setRequestsInFlight(RequestsInFlightThresholdsBean requestsInFlight) {
+ this.requestsInFlight = requestsInFlight;
+ }
- public MemoryConsumptionThresholdsBean getMemoryConsumption() {
- return memoryConsumption;
- }
+ public MemoryConsumptionThresholdsBean getMemoryConsumption() {
+ return memoryConsumption;
+ }
- public void setMemoryConsumption(MemoryConsumptionThresholdsBean memoryConsumption) {
- this.memoryConsumption = memoryConsumption;
- }
+ public void setMemoryConsumption(MemoryConsumptionThresholdsBean memoryConsumption) {
+ this.memoryConsumption = memoryConsumption;
+ }
- public LoadAverageThresholdsBean getLoadAverage() {
- return loadAverage;
- }
+ public LoadAverageThresholdsBean getLoadAverage() {
+ return loadAverage;
+ }
- public void setLoadAverage(LoadAverageThresholdsBean loadAverage) {
- this.loadAverage = loadAverage;
- }
+ public void setLoadAverage(LoadAverageThresholdsBean loadAverage) {
+ this.loadAverage = loadAverage;
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/policy/autoscale/MemoryConsumptionThresholdsBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/policy/autoscale/MemoryConsumptionThresholdsBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/policy/autoscale/MemoryConsumptionThresholdsBean.java
index d216854..b8e26ad 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/policy/autoscale/MemoryConsumptionThresholdsBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/policy/autoscale/MemoryConsumptionThresholdsBean.java
@@ -24,7 +24,7 @@ import javax.xml.bind.annotation.XmlRootElement;
@XmlRootElement
public class MemoryConsumptionThresholdsBean {
- private float threshold;
+ private float threshold;
public float getThreshold() {
return threshold;
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/policy/deployment/ApplicationPolicyBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/policy/deployment/ApplicationPolicyBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/policy/deployment/ApplicationPolicyBean.java
index 547ca95..50f2581 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/policy/deployment/ApplicationPolicyBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/policy/deployment/ApplicationPolicyBean.java
@@ -27,41 +27,41 @@ import org.apache.stratos.common.beans.PropertyBean;
@XmlRootElement
public class ApplicationPolicyBean {
-
- private String id;
- private String algorithm;
- String[] networkPartitions;
- List<PropertyBean> properties;
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getAlgorithm() {
- return algorithm;
- }
-
- public void setAlgorithm(String algorithm) {
- this.algorithm = algorithm;
- }
-
- public String[] getNetworkPartitions() {
- return networkPartitions;
- }
-
- public void setNetworkPartitions(String[] networkPartitions) {
- this.networkPartitions = networkPartitions;
- }
-
- public List<PropertyBean> getProperties() {
- return properties;
- }
-
- public void setProperties(List<PropertyBean> properties) {
- this.properties = properties;
- }
+ private String id;
+ private String algorithm;
+ String[] networkPartitions;
+ List<PropertyBean> properties;
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getAlgorithm() {
+ return algorithm;
+ }
+
+ public void setAlgorithm(String algorithm) {
+ this.algorithm = algorithm;
+ }
+
+ public String[] getNetworkPartitions() {
+ return networkPartitions;
+ }
+
+ public void setNetworkPartitions(String[] networkPartitions) {
+ this.networkPartitions = networkPartitions;
+ }
+
+ public List<PropertyBean> getProperties() {
+ return properties;
+ }
+
+ public void setProperties(List<PropertyBean> properties) {
+ this.properties = properties;
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/policy/deployment/DeploymentPolicyBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/policy/deployment/DeploymentPolicyBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/policy/deployment/DeploymentPolicyBean.java
index bf0513a..f07ee33 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/policy/deployment/DeploymentPolicyBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/policy/deployment/DeploymentPolicyBean.java
@@ -29,21 +29,21 @@ public class DeploymentPolicyBean {
private String id;
- private List<NetworkPartitionBean> networkPartitions;
+ private List<NetworkPartitionBean> networkPartitions;
- public String getId() {
- return id;
- }
+ public String getId() {
+ return id;
+ }
- public void setId(String id) {
- this.id = id;
- }
+ public void setId(String id) {
+ this.id = id;
+ }
- public List<NetworkPartitionBean> getNetworkPartitions() {
- return networkPartitions;
- }
+ public List<NetworkPartitionBean> getNetworkPartitions() {
+ return networkPartitions;
+ }
- public void setNetworkPartitions(List<NetworkPartitionBean> networkPartitions) {
- this.networkPartitions = networkPartitions;
- }
+ public void setNetworkPartitions(List<NetworkPartitionBean> networkPartitions) {
+ this.networkPartitions = networkPartitions;
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/ApplicationInfoBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/ApplicationInfoBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/ApplicationInfoBean.java
index e3afebe..9061297 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/ApplicationInfoBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/ApplicationInfoBean.java
@@ -66,6 +66,7 @@ public class ApplicationInfoBean {
public void setTenantAdminUsername(String tenantAdminUsername) {
this.tenantAdminUsername = tenantAdminUsername;
}
+
public List<ApplicationInstanceBean> getApplicationInstances() {
return applicationInstances;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/ApplicationInstanceBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/ApplicationInstanceBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/ApplicationInstanceBean.java
index 785d45e..d7f651d 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/ApplicationInstanceBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/ApplicationInstanceBean.java
@@ -23,11 +23,11 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
-@XmlRootElement(name="applicationInstances")
+@XmlRootElement(name = "applicationInstances")
public class ApplicationInstanceBean implements Serializable {
- private String status;
- private String instanceId;
+ private String status;
+ private String instanceId;
private String parentInstanceId;
private String applicationId;
private List<GroupInstanceBean> groupInstances;
@@ -38,21 +38,21 @@ public class ApplicationInstanceBean implements Serializable {
setClusterInstances(new ArrayList<ClusterInstanceBean>());
}
- public String getStatus() {
- return status;
- }
+ public String getStatus() {
+ return status;
+ }
- public void setStatus(String status) {
- this.status = status;
- }
+ public void setStatus(String status) {
+ this.status = status;
+ }
- public String getInstanceId() {
- return instanceId;
- }
+ public String getInstanceId() {
+ return instanceId;
+ }
- public void setInstanceId(String instanceId) {
- this.instanceId = instanceId;
- }
+ public void setInstanceId(String instanceId) {
+ this.instanceId = instanceId;
+ }
public String getParentInstanceId() {
return parentInstanceId;
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/ClusterBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/ClusterBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/ClusterBean.java
index e883c52..24d94c9 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/ClusterBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/ClusterBean.java
@@ -1,33 +1,34 @@
/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
-
- * http://www.apache.org/licenses/LICENSE-2.0
-
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.stratos.common.beans.topology;
import javax.xml.bind.annotation.XmlRootElement;
+
import org.apache.stratos.common.beans.cartridge.PropertyBean;
import java.util.List;
-@XmlRootElement(name="clusters")
+@XmlRootElement(name = "clusters")
public class ClusterBean {
private String alias;
- private String serviceName;
+ private String serviceName;
private String clusterId;
private List<MemberBean> member;
private String tenantRange;
@@ -35,16 +36,16 @@ public class ClusterBean {
private boolean isLbCluster;
private List<PropertyBean> property;
private List<InstanceBean> instances;
-
+
public List<InstanceBean> getInstances() {
- return instances;
- }
+ return instances;
+ }
- public void setInstances(List<InstanceBean> instances) {
- this.instances = instances;
- }
+ public void setInstances(List<InstanceBean> instances) {
+ this.instances = instances;
+ }
- @Override
+ @Override
public String toString() {
return "Cluster [serviceName=" + getServiceName() + ", clusterId=" + getClusterId() + ", member=" + getMember()
+ ", tenantRange=" + getTenantRange() + ", hostNames=" + getHostNames() + ", isLbCluster=" + isLbCluster()
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/ClusterInstanceBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/ClusterInstanceBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/ClusterInstanceBean.java
index a0e85b6..ec21b4d 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/ClusterInstanceBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/ClusterInstanceBean.java
@@ -24,11 +24,11 @@ import javax.xml.bind.annotation.XmlRootElement;
import java.io.Serializable;
import java.util.List;
-@XmlRootElement(name="clusterInstances")
+@XmlRootElement(name = "clusterInstances")
public class ClusterInstanceBean implements Serializable {
- private String status;
- private String instanceId;
+ private String status;
+ private String instanceId;
private String parentInstanceId;
private String alias;
private String serviceName;
@@ -36,24 +36,24 @@ public class ClusterInstanceBean implements Serializable {
private List<MemberBean> member;
private String tenantRange;
private List<String> hostNames;
- private List<String> accessUrls;
+ private List<String> accessUrls;
private List<KubernetesServiceBean> kubernetesServices;
public String getStatus() {
- return status;
- }
+ return status;
+ }
- public void setStatus(String status) {
- this.status = status;
- }
+ public void setStatus(String status) {
+ this.status = status;
+ }
- public String getInstanceId() {
- return instanceId;
- }
+ public String getInstanceId() {
+ return instanceId;
+ }
- public void setInstanceId(String instanceId) {
- this.instanceId = instanceId;
- }
+ public void setInstanceId(String instanceId) {
+ this.instanceId = instanceId;
+ }
public String getAlias() {
return alias;
@@ -118,13 +118,13 @@ public class ClusterInstanceBean implements Serializable {
this.parentInstanceId = parentInstanceId;
}
- public List<String> getAccessUrls() {
- return accessUrls;
- }
+ public List<String> getAccessUrls() {
+ return accessUrls;
+ }
- public void setAccessUrls(List<String> accessUrls) {
- this.accessUrls = accessUrls;
- }
+ public void setAccessUrls(List<String> accessUrls) {
+ this.accessUrls = accessUrls;
+ }
public void setKubernetesServices(List<KubernetesServiceBean> kubernetesServices) {
this.kubernetesServices = kubernetesServices;
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/GroupInstanceBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/GroupInstanceBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/GroupInstanceBean.java
index 59f6de4..5ab0f0f 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/GroupInstanceBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/GroupInstanceBean.java
@@ -23,7 +23,7 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
-@XmlRootElement(name="groupInstances")
+@XmlRootElement(name = "groupInstances")
public class GroupInstanceBean implements Serializable {
private String parentInstanceId;
@@ -38,21 +38,21 @@ public class GroupInstanceBean implements Serializable {
clusterInstances = new ArrayList<ClusterInstanceBean>();
}
- public String getStatus() {
- return status;
- }
+ public String getStatus() {
+ return status;
+ }
- public void setStatus(String status) {
- this.status = status;
- }
+ public void setStatus(String status) {
+ this.status = status;
+ }
- public String getInstanceId() {
- return instanceId;
- }
+ public String getInstanceId() {
+ return instanceId;
+ }
- public void setInstanceId(String instanceId) {
- this.instanceId = instanceId;
- }
+ public void setInstanceId(String instanceId) {
+ this.instanceId = instanceId;
+ }
public String getParentInstanceId() {
return parentInstanceId;
http://git-wip-us.apache.org/repos/asf/stratos/blob/65e8f167/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/InstanceBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/InstanceBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/InstanceBean.java
index dfc4a8d..3d2ccb4 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/InstanceBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/InstanceBean.java
@@ -23,22 +23,22 @@ import javax.xml.bind.annotation.XmlRootElement;
@XmlRootElement
public class InstanceBean {
- private String status;
- private String instanceId;
+ private String status;
+ private String instanceId;
- public String getStatus() {
- return status;
- }
+ public String getStatus() {
+ return status;
+ }
- public void setStatus(String status) {
- this.status = status;
- }
+ public void setStatus(String status) {
+ this.status = status;
+ }
- public String getInstanceId() {
- return instanceId;
- }
+ public String getInstanceId() {
+ return instanceId;
+ }
- public void setInstanceId(String instanceId) {
- this.instanceId = instanceId;
- }
+ public void setInstanceId(String instanceId) {
+ this.instanceId = instanceId;
+ }
}