Renaming PojoConverter to ObjectConverter
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/a03e2bf6 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/a03e2bf6 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/a03e2bf6 Branch: refs/heads/master Commit: a03e2bf6047df8bb032835d5ff158ce3eae0429c Parents: 117d702 Author: Imesh Gunaratne <[email protected]> Authored: Wed Dec 17 14:30:37 2014 +0530 Committer: Udara Liyanage <[email protected]> Committed: Thu Dec 18 12:06:58 2014 +0530 ---------------------------------------------------------------------- .../rest/endpoint/api/StratosApiV40Utils.java | 40 +- .../rest/endpoint/api/StratosApiV41Utils.java | 58 +- .../stratos/rest/endpoint/mock/MockContext.java | 6 +- .../util/converter/ObjectConverter.java | 1493 ++++++++++++++++++ .../endpoint/util/converter/PojoConverter.java | 1493 ------------------ 5 files changed, 1545 insertions(+), 1545 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/a03e2bf6/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java index d129da0..a837514 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java @@ -56,7 +56,7 @@ import org.apache.stratos.common.beans.cartridge.definition.CartridgeDefinitionB import org.apache.stratos.common.beans.cartridge.definition.ServiceDefinitionBean; import org.apache.stratos.common.beans.repositoryNotificationInfoBean.Payload; import org.apache.stratos.common.beans.subscription.domain.SubscriptionDomainBean; -import org.apache.stratos.rest.endpoint.util.converter.PojoConverter; +import org.apache.stratos.rest.endpoint.util.converter.ObjectConverter; import org.apache.stratos.rest.endpoint.exception.RestAPIException; import javax.ws.rs.core.Response; @@ -91,7 +91,7 @@ public class StratosApiV40Utils { if (cloudControllerServiceClient != null) { - CartridgeConfig cartridgeConfig = PojoConverter.populateCartridgeConfigPojo(cartridgeDefinitionBean); + CartridgeConfig cartridgeConfig = ObjectConverter.populateCartridgeConfigPojo(cartridgeDefinitionBean); if(cartridgeConfig == null) { throw new RestAPIException("Populated CartridgeConfig instance is null, cartridge deployment aborted"); @@ -202,7 +202,7 @@ public class StratosApiV40Utils { AutoscalerServiceClient autoscalerServiceClient = getAutoscalerServiceClient(); if (autoscalerServiceClient != null) { - org.apache.stratos.autoscaler.stub.autoscale.policy.AutoscalePolicy autoscalePolicy = PojoConverter. + org.apache.stratos.autoscaler.stub.autoscale.policy.AutoscalePolicy autoscalePolicy = ObjectConverter. convertToCCAutoscalerPojo(autoscalePolicyBean); try { @@ -253,7 +253,7 @@ public class StratosApiV40Utils { // } } - return PojoConverter.populatePartitionPojos(partitions); + return ObjectConverter.populatePartitionPojos(partitions); } public static Partition[] getPartitionsOfDeploymentPolicy(String deploymentPolicyId) @@ -274,7 +274,7 @@ public class StratosApiV40Utils { // } // } - return PojoConverter.populatePartitionPojos(partitions); + return ObjectConverter.populatePartitionPojos(partitions); } public static Partition[] @@ -295,7 +295,7 @@ public class StratosApiV40Utils { // } // } - return PojoConverter.populatePartitionPojos(partitions); + return ObjectConverter.populatePartitionPojos(partitions); } public static Partition getPartition (String partitionId) throws RestAPIException { @@ -313,7 +313,7 @@ public class StratosApiV40Utils { // } // } - return PojoConverter.populatePartitionPojo(partition); + return ObjectConverter.populatePartitionPojo(partition); } private static AutoscalerServiceClient getAutoscalerServiceClient () throws RestAPIException { @@ -343,7 +343,7 @@ public class StratosApiV40Utils { throw new RestAPIException(errorMsg, e); } } - return PojoConverter.populateAutoscalePojos(autoscalePolicies); + return ObjectConverter.populateAutoscalePojos(autoscalePolicies); } public static AutoscalePolicy getAutoScalePolicy (String autoscalePolicyId) throws RestAPIException { @@ -362,7 +362,7 @@ public class StratosApiV40Utils { } } - return PojoConverter.populateAutoscalePojo(autoscalePolicy); + return ObjectConverter.populateAutoscalePojo(autoscalePolicy); } public static org.apache.stratos.common.beans.autoscaler.policy.deployment.DeploymentPolicy @@ -388,7 +388,7 @@ public class StratosApiV40Utils { throw new RestAPIException(errorMsg); } - return PojoConverter.populateDeploymentPolicyPojo(deploymentPolicy); + return ObjectConverter.populateDeploymentPolicyPojo(deploymentPolicy); } public static ApplicationLevelNetworkPartition[] getPartitionGroups (String deploymentPolicyId) @@ -408,7 +408,7 @@ public class StratosApiV40Utils { } } - return PojoConverter.populatePartitionGroupPojos(applicationLevelNetworkPartitions); + return ObjectConverter.populatePartitionGroupPojos(applicationLevelNetworkPartitions); } static Cartridge getAvailableCartridgeInfo(String cartridgeType, Boolean multiTenant, ConfigurationContext configurationContext) throws RestAPIException { @@ -572,7 +572,7 @@ public class StratosApiV40Utils { } if (services != null && !services.isEmpty()) { - return PojoConverter.convertToServiceDefinitionBeans(services); + return ObjectConverter.convertToServiceDefinitionBeans(services); } return null; @@ -592,7 +592,7 @@ public class StratosApiV40Utils { } if (service != null) { - return PojoConverter.convertToServiceDefinitionBean(service); + return ObjectConverter.convertToServiceDefinitionBean(service); } return new ServiceDefinitionBean(); @@ -901,7 +901,7 @@ public class StratosApiV40Utils { if(cluster == null) { throw new RestAPIException("No matching cluster found for [cartridge type]: "+cartridgeType+ " [alias] "+subscriptionAlias); } else{ - return PojoConverter.populateClusterPojos(cluster, null); + return ObjectConverter.populateClusterPojos(cluster, null); } } @@ -912,7 +912,7 @@ public class StratosApiV40Utils { ArrayList<org.apache.stratos.common.beans.topology.Cluster> clusters = new ArrayList<org.apache.stratos.common.beans.topology.Cluster>(); for(Cluster cluster : clusterSet) { - clusters.add(PojoConverter.populateClusterPojos(cluster, null)); + clusters.add(ObjectConverter.populateClusterPojos(cluster, null)); } org.apache.stratos.common.beans.topology.Cluster[] arrCluster = new org.apache.stratos.common.beans.topology.Cluster[clusters.size()]; @@ -929,7 +929,7 @@ public class StratosApiV40Utils { List<org.apache.stratos.common.beans.topology.Cluster> clusters = new ArrayList<org.apache.stratos.common.beans.topology.Cluster>(); for(Cluster cluster : clusterSet) { - clusters.add(PojoConverter.populateClusterPojos(cluster, null)); + clusters.add(ObjectConverter.populateClusterPojos(cluster, null)); } org.apache.stratos.common.beans.topology.Cluster[] arrCluster = new org.apache.stratos.common.beans.topology.Cluster[clusters.size()]; @@ -945,7 +945,7 @@ public class StratosApiV40Utils { .getClusters(cartridgeType); List<org.apache.stratos.common.beans.topology.Cluster> clusters = new ArrayList<org.apache.stratos.common.beans.topology.Cluster>(); for (Cluster cluster : clusterSet) { - clusters.add(PojoConverter.populateClusterPojos(cluster, null)); + clusters.add(ObjectConverter.populateClusterPojos(cluster, null)); } org.apache.stratos.common.beans.topology.Cluster[] arrCluster = new org.apache.stratos.common.beans.topology.Cluster[clusters .size()]; @@ -1117,7 +1117,7 @@ public class StratosApiV40Utils { String subscriptionAlias, String domain) throws RestAPIException { try { int tenantId = ApplicationManagementUtil.getTenantId(configurationContext); - SubscriptionDomainBean subscriptionDomain = PojoConverter.populateSubscriptionDomainPojo(cartridgeSubsciptionManager.getSubscriptionDomain(tenantId, + SubscriptionDomainBean subscriptionDomain = ObjectConverter.populateSubscriptionDomainPojo(cartridgeSubsciptionManager.getSubscriptionDomain(tenantId, subscriptionAlias, domain)); if (subscriptionDomain.getDomainName() != null) { @@ -1136,7 +1136,7 @@ public class StratosApiV40Utils { String subscriptionAlias) throws RestAPIException { try { int tenantId = ApplicationManagementUtil.getTenantId(configurationContext); - return PojoConverter.populateSubscriptionDomainPojos(cartridgeSubsciptionManager.getSubscriptionDomains(tenantId, subscriptionAlias)); + return ObjectConverter.populateSubscriptionDomainPojos(cartridgeSubsciptionManager.getSubscriptionDomains(tenantId, subscriptionAlias)); } catch (Exception e) { log.error(e.getMessage(), e); throw new RestAPIException(e.getMessage(), e); @@ -1148,7 +1148,7 @@ public class StratosApiV40Utils { try { int tenantId = ApplicationManagementUtil .getTenantId(configurationContext); - SubscriptionDomainBean subscriptionDomain = PojoConverter.populateSubscriptionDomainPojo(cartridgeSubsciptionManager.getSubscriptionDomain(tenantId, + SubscriptionDomainBean subscriptionDomain = ObjectConverter.populateSubscriptionDomainPojo(cartridgeSubsciptionManager.getSubscriptionDomain(tenantId, subscriptionAlias, domain)); if (subscriptionDomain == null) { http://git-wip-us.apache.org/repos/asf/stratos/blob/a03e2bf6/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java index 66c5af4..09aaa60 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java @@ -68,7 +68,7 @@ import org.apache.stratos.common.beans.kubernetes.KubernetesGroup; import org.apache.stratos.common.beans.kubernetes.KubernetesHost; import org.apache.stratos.common.beans.kubernetes.KubernetesMaster; import org.apache.stratos.common.beans.repositoryNotificationInfoBean.Payload; -import org.apache.stratos.rest.endpoint.util.converter.PojoConverter; +import org.apache.stratos.rest.endpoint.util.converter.ObjectConverter; import org.apache.stratos.rest.endpoint.exception.RestAPIException; import java.rmi.RemoteException; @@ -95,7 +95,7 @@ public class StratosApiV41Utils { log.info("Starting to deploy a cartridge: [type] " + cartridgeDefinitionBean.getType()); - CartridgeConfig cartridgeConfig = PojoConverter.populateCartridgeConfigPojo(cartridgeDefinitionBean); + CartridgeConfig cartridgeConfig = ObjectConverter.populateCartridgeConfigPojo(cartridgeDefinitionBean); if (cartridgeConfig == null) { throw new RestAPIException("Could not read cartridge definition, cartridge deployment failed"); } @@ -528,7 +528,7 @@ public class StratosApiV41Utils { AutoscalerServiceClient autoscalerServiceClient = getAutoscalerServiceClient(); if (autoscalerServiceClient != null) { - org.apache.stratos.autoscaler.stub.autoscale.policy.AutoscalePolicy autoscalePolicy = PojoConverter. + org.apache.stratos.autoscaler.stub.autoscale.policy.AutoscalePolicy autoscalePolicy = ObjectConverter. convertToCCAutoscalerPojo(autoscalePolicyBean); try { @@ -553,7 +553,7 @@ public class StratosApiV41Utils { AutoscalerServiceClient autoscalerServiceClient = getAutoscalerServiceClient(); if (autoscalerServiceClient != null) { - org.apache.stratos.autoscaler.stub.autoscale.policy.AutoscalePolicy autoscalePolicy = PojoConverter. + org.apache.stratos.autoscaler.stub.autoscale.policy.AutoscalePolicy autoscalePolicy = ObjectConverter. convertToCCAutoscalerPojo(autoscalePolicyBean); try { @@ -583,7 +583,7 @@ public class StratosApiV41Utils { throw new RestAPIException(errorMsg, e); } } - return PojoConverter.populateAutoscalePojos(autoscalePolicies); + return ObjectConverter.populateAutoscalePojos(autoscalePolicies); } public static AutoscalePolicy getAutoScalePolicy(String autoscalePolicyId) throws RestAPIException { @@ -602,7 +602,7 @@ public class StratosApiV41Utils { } } - return PojoConverter.populateAutoscalePojo(autoscalePolicy); + return ObjectConverter.populateAutoscalePojo(autoscalePolicy); } public static org.apache.stratos.common.beans.autoscaler.policy.deployment.DeploymentPolicy @@ -611,7 +611,7 @@ public class StratosApiV41Utils { try { AutoscalerServiceClient autoscalerServiceClient = getAutoscalerServiceClient(); DeploymentPolicy deploymentPolicy = autoscalerServiceClient.getDeploymentPolicy(applicationId); - return PojoConverter.convertStubDeploymentPolicyToDeploymentPolicy(deploymentPolicy); + return ObjectConverter.convertStubDeploymentPolicyToDeploymentPolicy(deploymentPolicy); } catch (RemoteException e) { String errorMsg = "Could not read deployment policy: [application-id] " + applicationId; log.error(errorMsg, e); @@ -636,7 +636,7 @@ public class StratosApiV41Utils { } } - return PojoConverter.populatePartitionGroupPojos(partitionGroups); + return ObjectConverter.populatePartitionGroupPojos(partitionGroups); } // Util methods for services and subscriptions @@ -795,7 +795,7 @@ public class StratosApiV41Utils { ArrayList<org.apache.stratos.common.beans.topology.Cluster> clusters = new ArrayList<org.apache.stratos.common.beans.topology.Cluster>(); for (Cluster cluster : clusterSet) { - clusters.add(PojoConverter.populateClusterPojos(cluster, null)); + clusters.add(ObjectConverter.populateClusterPojos(cluster, null)); } org.apache.stratos.common.beans.topology.Cluster[] arrCluster = new org.apache.stratos.common.beans.topology.Cluster[clusters.size()]; @@ -812,7 +812,7 @@ public class StratosApiV41Utils { List<org.apache.stratos.common.beans.topology.Cluster> clusters = new ArrayList<org.apache.stratos.common.beans.topology.Cluster>(); for (Cluster cluster : clusterSet) { - clusters.add(PojoConverter.populateClusterPojos(cluster, null)); + clusters.add(ObjectConverter.populateClusterPojos(cluster, null)); } org.apache.stratos.common.beans.topology.Cluster[] arrCluster = new org.apache.stratos.common.beans.topology.Cluster[clusters.size()]; @@ -927,7 +927,7 @@ public class StratosApiV41Utils { throw new RestAPIException("Could not read application", e); } - ApplicationContext applicationContext = PojoConverter.convertApplicationDefinitionToApplicationContext(appDefinition); + ApplicationContext applicationContext = ObjectConverter.convertApplicationDefinitionToApplicationContext(appDefinition); applicationContext.setTenantId(ApplicationManagementUtil.getTenantId(ctxt)); applicationContext.setTenantDomain(tenantDomain); applicationContext.setTeantAdminUsername(userName); @@ -990,7 +990,7 @@ public class StratosApiV41Utils { } org.apache.stratos.autoscaler.stub.deployment.policy.DeploymentPolicy stubDeploymentPolicy = - PojoConverter.convetToASDeploymentPolicyPojo(deploymentPolicy); + ObjectConverter.convetToASDeploymentPolicyPojo(deploymentPolicy); autoscalerServiceClient.deployApplication(applicationId, stubDeploymentPolicy); if (log.isInfoEnabled()) { @@ -1032,7 +1032,7 @@ public class StratosApiV41Utils { public static ApplicationDefinition getApplication(String applicationId) throws RestAPIException { try { - return PojoConverter.convertApplicationContextToApplicationDefinition( + return ObjectConverter.convertApplicationContextToApplicationDefinition( AutoscalerServiceClient.getServiceClient().getApplication(applicationId)); } catch (RemoteException e) { String message = "Could not read application: [application-id] " + applicationId; @@ -1049,7 +1049,7 @@ public class StratosApiV41Utils { for (ApplicationContext applicationContext : applicationContexts) { if(applicationContext != null) { ApplicationDefinition applicationDefinition = - PojoConverter.convertApplicationContextToApplicationDefinition(applicationContext); + ObjectConverter.convertApplicationContextToApplicationDefinition(applicationContext); applicationDefinitions.add(applicationDefinition); } } @@ -1085,7 +1085,7 @@ public class StratosApiV41Utils { ApplicationManager.acquireReadLockForApplications(); ApplicationBean applicationBean; for (Application application : ApplicationManager.getApplications().getApplications().values()) { - applicationBean = PojoConverter.applicationToBean(application); + applicationBean = ObjectConverter.applicationToBean(application); addClustersToApplicationBean(applicationBean, application); addGroupsToApplicationBean(applicationBean, application); applicationBeanList.add(applicationBean); @@ -1105,7 +1105,7 @@ public class StratosApiV41Utils { if (application == null) { return null; } - applicationBean = PojoConverter.applicationToBean(application); + applicationBean = ObjectConverter.applicationToBean(application); addClustersToApplicationBean(applicationBean, application); addGroupsToApplicationBean(applicationBean, application); } finally { @@ -1117,7 +1117,7 @@ public class StratosApiV41Utils { private static void addGroupsToApplicationBean(ApplicationBean applicationBean, Application application) { Collection<Group> groups = application.getGroups(); for (Group group : groups) { - GroupBean groupBean = PojoConverter.toGroupBean(group); + GroupBean groupBean = ObjectConverter.toGroupBean(group); setSubGroups(group, groupBean); applicationBean.addGroup(groupBean); } @@ -1131,7 +1131,7 @@ public class StratosApiV41Utils { String serviceType = clusterDataHolder.getServiceType(); TopologyManager.acquireReadLockForCluster(serviceType, clusterId); Cluster topLevelCluster = TopologyManager.getTopology().getService(serviceType).getCluster(clusterId); - applicationBean.getClusters().add(PojoConverter.populateClusterPojos(topLevelCluster, entry.getKey())); + applicationBean.getClusters().add(ObjectConverter.populateClusterPojos(topLevelCluster, entry.getKey())); } } @@ -1139,7 +1139,7 @@ public class StratosApiV41Utils { Collection<Group> subgroups = group.getGroups(); addClustersToGroupBean(group, groupBean); for (Group subGroup : subgroups) { - GroupBean subGroupBean = PojoConverter.toGroupBean(subGroup); + GroupBean subGroupBean = ObjectConverter.toGroupBean(subGroup); setSubGroups(subGroup, subGroupBean); groupBean.addGroup(subGroupBean); @@ -1151,7 +1151,7 @@ public class StratosApiV41Utils { for (Map.Entry<String, ClusterDataHolder> x : clustersDatamap.entrySet()) { ClusterDataHolder clusterHolder = x.getValue(); Cluster topLevelCluster = TopologyManager.getTopology().getService(clusterHolder.getServiceType()).getCluster(clusterHolder.getClusterId()); - groupBean.addCluster(PojoConverter.populateClusterPojos(topLevelCluster, null)); + groupBean.addCluster(ObjectConverter.populateClusterPojos(topLevelCluster, null)); } } @@ -1162,7 +1162,7 @@ public class StratosApiV41Utils { CloudControllerServiceClient cloudControllerServiceClient = getCloudControllerServiceClient(); if (cloudControllerServiceClient != null) { org.apache.stratos.cloud.controller.stub.kubernetes.KubernetesGroup kubernetesGroup = - PojoConverter.convertToCCKubernetesGroupPojo(kubernetesGroupBean); + ObjectConverter.convertToCCKubernetesGroupPojo(kubernetesGroupBean); try { return cloudControllerServiceClient.deployKubernetesGroup(kubernetesGroup); @@ -1184,7 +1184,7 @@ public class StratosApiV41Utils { CloudControllerServiceClient cloudControllerServiceClient = getCloudControllerServiceClient(); if (cloudControllerServiceClient != null) { org.apache.stratos.cloud.controller.stub.kubernetes.KubernetesHost kubernetesHost = - PojoConverter.convertToCCKubernetesHostPojo(kubernetesHostBean); + ObjectConverter.convertToCCKubernetesHostPojo(kubernetesHostBean); try { return cloudControllerServiceClient.deployKubernetesHost(kubernetesGroupId, kubernetesHost); @@ -1209,7 +1209,7 @@ public class StratosApiV41Utils { CloudControllerServiceClient cloudControllerServiceClient = getCloudControllerServiceClient(); if (cloudControllerServiceClient != null) { org.apache.stratos.cloud.controller.stub.kubernetes.KubernetesMaster kubernetesMaster = - PojoConverter.convertToCCKubernetesMasterPojo(kubernetesMasterBean); + ObjectConverter.convertToCCKubernetesMasterPojo(kubernetesMasterBean); try { return cloudControllerServiceClient.updateKubernetesMaster(kubernetesMaster); @@ -1236,7 +1236,7 @@ public class StratosApiV41Utils { try { org.apache.stratos.cloud.controller.stub.kubernetes.KubernetesGroup[] kubernetesGroups = cloudControllerServiceClient.getAvailableKubernetesGroups(); - return PojoConverter.populateKubernetesGroupsPojo(kubernetesGroups); + return ObjectConverter.populateKubernetesGroupsPojo(kubernetesGroups); } catch (RemoteException e) { log.error(e.getMessage(), e); @@ -1253,7 +1253,7 @@ public class StratosApiV41Utils { try { org.apache.stratos.cloud.controller.stub.kubernetes.KubernetesGroup kubernetesGroup = cloudControllerServiceClient.getKubernetesGroup(kubernetesGroupId); - return PojoConverter.populateKubernetesGroupPojo(kubernetesGroup); + return ObjectConverter.populateKubernetesGroupPojo(kubernetesGroup); } catch (RemoteException e) { log.error(e.getMessage(), e); @@ -1313,7 +1313,7 @@ public class StratosApiV41Utils { org.apache.stratos.cloud.controller.stub.kubernetes.KubernetesHost[] kubernetesHosts = cloudControllerServiceClient.getKubernetesHosts(kubernetesGroupId); - List<KubernetesHost> arrayList = PojoConverter.populateKubernetesHostsPojo(kubernetesHosts); + List<KubernetesHost> arrayList = ObjectConverter.populateKubernetesHostsPojo(kubernetesHosts); KubernetesHost[] array = new KubernetesHost[arrayList.size()]; array = arrayList.toArray(array); return array; @@ -1335,7 +1335,7 @@ public class StratosApiV41Utils { try { org.apache.stratos.cloud.controller.stub.kubernetes.KubernetesMaster kubernetesMaster = cloudControllerServiceClient.getKubernetesMaster(kubernetesGroupId); - return PojoConverter.populateKubernetesMasterPojo(kubernetesMaster); + return ObjectConverter.populateKubernetesMasterPojo(kubernetesMaster); } catch (RemoteException e) { log.error(e.getMessage(), e); @@ -1353,7 +1353,7 @@ public class StratosApiV41Utils { CloudControllerServiceClient cloudControllerServiceClient = getCloudControllerServiceClient(); if (cloudControllerServiceClient != null) { org.apache.stratos.cloud.controller.stub.kubernetes.KubernetesHost kubernetesHost = - PojoConverter.convertToCCKubernetesHostPojo(kubernetesHostBean); + ObjectConverter.convertToCCKubernetesHostPojo(kubernetesHostBean); try { return cloudControllerServiceClient.updateKubernetesHost(kubernetesHost); } catch (RemoteException e) { @@ -1382,7 +1382,7 @@ public class StratosApiV41Utils { throw new RestAPIException("No matching cluster found for [alias] " + alias); } if (property != null) { - autoscalerServiceClient.updateClusterMonitor(cluster.getClusterId(), PojoConverter.getProperties(property)); + autoscalerServiceClient.updateClusterMonitor(cluster.getClusterId(), ObjectConverter.getProperties(property)); } } catch (AutoScalerServiceInvalidArgumentExceptionException e) { String message = e.getFaultMessage().getInvalidArgumentException().getMessage(); http://git-wip-us.apache.org/repos/asf/stratos/blob/a03e2bf6/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java index cbf4bb7..dfa6aa2 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java @@ -34,7 +34,7 @@ import org.apache.stratos.common.beans.cartridge.definition.CartridgeDefinitionB import org.apache.stratos.common.beans.cartridge.definition.ServiceDefinitionBean; import org.apache.stratos.common.beans.subscription.domain.SubscriptionDomainBean; import org.apache.stratos.common.beans.topology.Cluster; -import org.apache.stratos.rest.endpoint.util.converter.PojoConverter; +import org.apache.stratos.rest.endpoint.util.converter.ObjectConverter; import org.apache.stratos.rest.endpoint.exception.RestAPIException; import org.wso2.carbon.context.CarbonContext; import java.util.*; @@ -878,7 +878,7 @@ public class MockContext { List<String> tenantAliases = tenantIdToAliasesMap.get(tenantId); if(tenantAliases != null && tenantAliases.contains(alias)) { - return PojoConverter.populateSubscriptionDomainPojos(subscriptionAliasToDomainMap.get(alias)); + return ObjectConverter.populateSubscriptionDomainPojos(subscriptionAliasToDomainMap.get(alias)); } return new ArrayList<SubscriptionDomainBean>(); } @@ -890,7 +890,7 @@ public class MockContext { for (SubscriptionDomain subscriptionDomain : subscriptionAliasToDomainMap.get(subscriptionAlias)) { if(subscriptionDomain.getDomainName().equals(domainName)) { - return PojoConverter.populateSubscriptionDomainPojo(subscriptionDomain); + return ObjectConverter.populateSubscriptionDomainPojo(subscriptionDomain); } } }
