You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2014/12/13 18:49:13 UTC
stratos git commit: Updating duplicated beans in the cli according to
changes done in the rest api
Repository: stratos
Updated Branches:
refs/heads/4.1.0-test 25be14335 -> b64a9c272
Updating duplicated beans in the cli according to changes done in the rest api
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/b64a9c27
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/b64a9c27
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/b64a9c27
Branch: refs/heads/4.1.0-test
Commit: b64a9c2722321639770941d80c8c3d377754ff64
Parents: 25be143
Author: Imesh Gunaratne <im...@apache.org>
Authored: Sat Dec 13 23:19:05 2014 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Sat Dec 13 23:19:05 2014 +0530
----------------------------------------------------------------------
.../stratos/cli/RestCommandLineService.java | 17 ++---
.../apache/stratos/cli/StratosApplication.java | 4 +-
.../grouping/applications/Application.java | 56 +++++++-------
.../grouping/applications/ApplicationBean.java | 34 ---------
.../beans/grouping/applications/Cluster.java | 65 +++++-----------
.../cli/beans/grouping/applications/Group.java | 78 +++++++++++---------
.../beans/grouping/applications/Instance.java | 26 +++++++
7 files changed, 127 insertions(+), 153 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/b64a9c27/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java
index d48b3b7..e757821 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java
@@ -40,18 +40,15 @@ import org.apache.axis2.description.TransportOutDescription;
import org.apache.axis2.transport.http.HttpTransportProperties;
import org.apache.http.HttpResponse;
import org.apache.http.impl.client.DefaultHttpClient;
-import org.apache.stratos.cli.beans.SubscriptionInfo;
import org.apache.stratos.cli.beans.TenantInfoBean;
import org.apache.stratos.cli.beans.UserInfoBean;
import org.apache.stratos.cli.beans.autoscaler.partition.Partition;
import org.apache.stratos.cli.beans.autoscaler.policy.autoscale.AutoscalePolicy;
import org.apache.stratos.cli.beans.autoscaler.policy.deployment.DeploymentPolicy;
import org.apache.stratos.cli.beans.cartridge.Cartridge;
-import org.apache.stratos.cli.beans.cartridge.CartridgeInfoBean;
import org.apache.stratos.cli.beans.cartridge.PortMapping;
import org.apache.stratos.cli.beans.cartridge.ServiceDefinitionBean;
import org.apache.stratos.cli.beans.grouping.applications.Application;
-import org.apache.stratos.cli.beans.grouping.applications.ApplicationBean;
import org.apache.stratos.cli.beans.grouping.serviceGroups.ServiceGroupBean;
import org.apache.stratos.cli.beans.kubernetes.KubernetesGroup;
import org.apache.stratos.cli.beans.kubernetes.KubernetesGroupList;
@@ -991,7 +988,7 @@ public class RestCommandLineService {
public void listApplications() throws CommandException {
try {
ApplicationList list = (ApplicationList) restClient.listEntity(ENDPOINT_LIST_APPLICATION,
- ApplicationList.class, "application");
+ ApplicationList.class, "applications");
if ((list == null) || (list.getApplications() == null) || (list.getApplications().size() == 0)) {
System.out.println("No applications found");
@@ -1369,16 +1366,16 @@ public class RestCommandLineService {
// This method helps to describe applications
public void describeApplication (String applicationID) {
try {
- ApplicationBean bean = (ApplicationBean) restClient.listEntity(ENDPOINT_GET_APPLICATION.replace("{appId}", applicationID),
- ApplicationBean.class, "applications");
+ ApplicationList applications = (ApplicationList) restClient.listEntity(ENDPOINT_GET_APPLICATION.replace("{appId}", applicationID),
+ ApplicationList.class, "applications");
- if ((bean == null) || (bean.getApplication() == null)) {
+ if (applications == null) {
System.out.println("Application not found: " + applicationID);
return;
}
- System.out.println("Application : " + applicationID);
- System.out.println(getGson().toJson(bean.getApplication()));
+ System.out.println("Application: " + applicationID);
+ System.out.println(getGson().toJson(applications));
} catch (Exception e) {
String message = "Error in describing application: " + applicationID;
System.out.println(message);
@@ -1427,7 +1424,7 @@ public class RestCommandLineService {
return applications;
}
- public void setDeploymentPolicy(ArrayList<Application> applications) {
+ public void setApplications(ArrayList<Application> applications) {
this.applications = applications;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/b64a9c27/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/StratosApplication.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/StratosApplication.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/StratosApplication.java
index eb2282d..1fa306f 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/StratosApplication.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/StratosApplication.java
@@ -147,8 +147,8 @@ public class StratosApplication extends CommandLineApplication<StratosCommandCon
command = new DeployDeploymentPolicyCommand();
commands.put(command.getName(), command);
- command = new ListPartitionCommand();
- commands.put(command.getName(), command);
+ //command = new ListPartitionCommand();
+ //commands.put(command.getName(), command);
command = new ListAutoscalePolicyCommand();
commands.put(command.getName(), command);
http://git-wip-us.apache.org/repos/asf/stratos/blob/b64a9c27/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/beans/grouping/applications/Application.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/beans/grouping/applications/Application.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/beans/grouping/applications/Application.java
index 73d3af6..e014eac 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/beans/grouping/applications/Application.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/beans/grouping/applications/Application.java
@@ -18,53 +18,53 @@
*/
package org.apache.stratos.cli.beans.grouping.applications;
+import java.util.ArrayList;
+import java.util.List;
+
public class Application
{
private String id;
-
- private String tenantAdminUsername;
-
private String tenantDomain;
+ private String tenantAdminUsername;
+ public List<Group> groups = null;
+ public List<Cluster> clusters = null;
+ private List<Instance> instances;
- private Group group;
-
- public String getId ()
- {
- return id;
+ public Application(){
+ this.groups = new ArrayList<Group>();
+ this.clusters = new ArrayList<Cluster>();
+ }
+ public void addGroup(Group groupBean) {
+ this.groups.add(groupBean);
}
- public void setId (String id)
- {
+ public void setId(String id) {
this.id = id;
}
- public String getTenantAdminUsername ()
- {
- return tenantAdminUsername;
+ public void setTenantDomain(String tenantDomain) {
+ this.tenantDomain = tenantDomain;
}
- public void setTenantAdminUsername (String tenantAdminUsername)
- {
+ public void setTenantAdminUsername(String tenantAdminUsername) {
this.tenantAdminUsername = tenantAdminUsername;
}
- public String getTenantDomain ()
- {
- return tenantDomain;
+ public String getId() {
+ return id;
}
- public void setTenantDomain (String tenantDomain)
- {
- this.tenantDomain = tenantDomain;
+ public String getTenantDomain() {
+ return tenantDomain;
}
- public Group getGroup()
- {
- return group;
+ public String getTenantAdminUsername() {
+ return tenantAdminUsername;
}
-
- public void setGroup(Group group)
- {
- this.group = group;
+ public List<Instance> getInstances() {
+ return instances;
+ }
+ public void setInstances(List<Instance> instances) {
+ this.instances = instances;
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/b64a9c27/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/beans/grouping/applications/ApplicationBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/beans/grouping/applications/ApplicationBean.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/beans/grouping/applications/ApplicationBean.java
deleted file mode 100644
index 9d44b0c..0000000
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/beans/grouping/applications/ApplicationBean.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * 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.
- */
-package org.apache.stratos.cli.beans.grouping.applications;
-
-public class ApplicationBean
-{
- private Application application;
-
- public Application getApplication()
- {
- return application;
- }
-
- public void setApplication(Application application)
- {
- this.application = application;
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/b64a9c27/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/beans/grouping/applications/Cluster.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/beans/grouping/applications/Cluster.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/beans/grouping/applications/Cluster.java
index b5da48a..eea8f08 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/beans/grouping/applications/Cluster.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/beans/grouping/applications/Cluster.java
@@ -18,64 +18,39 @@
*/
package org.apache.stratos.cli.beans.grouping.applications;
-public class Cluster {
- private Member[] member;
-
- private String isLbCluster;
-
- private String[] hostNames;
-
- private String tenantRange;
+import java.util.List;
- private String clusterId;
-
- private String serviceName;
-
- public Member[] getMember() {
- return member;
- }
+public class Cluster {
+ public String alias;
- public void setMember(Member[] member) {
- this.member = member;
- }
+ public String serviceName;
- public String getIsLbCluster() {
- return isLbCluster;
- }
+ public String clusterId;
- public void setIsLbCluster(String isLbCluster) {
- this.isLbCluster = isLbCluster;
- }
+ public List<Member> member;
- public String[] getHostNames() {
- return hostNames;
- }
+ public String tenantRange;
- public void setHostNames(String[] hostNames) {
- this.hostNames = hostNames;
- }
+ public List<String> hostNames;
- public String getTenantRange() {
- return tenantRange;
- }
+ public boolean isLbCluster;
- public void setTenantRange(String tenantRange) {
- this.tenantRange = tenantRange;
- }
+ public List<Property> property;
- public String getClusterId() {
- return clusterId;
- }
+ private List<Instance> instances;
- public void setClusterId(String clusterId) {
- this.clusterId = clusterId;
+ public List<Instance> getInstances() {
+ return instances;
}
- public String getServiceName() {
- return serviceName;
+ public void setInstances(List<Instance> instances) {
+ this.instances = instances;
}
- public void setServiceName(String serviceName) {
- this.serviceName = serviceName;
+ @Override
+ public String toString() {
+ return "Cluster [serviceName=" + serviceName + ", clusterId=" + clusterId + ", member=" + member
+ + ", tenantRange=" + tenantRange + ", hostNames=" + hostNames + ", isLbCluster=" + isLbCluster
+ + ", property=" + property + "]";
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/b64a9c27/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/beans/grouping/applications/Group.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/beans/grouping/applications/Group.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/beans/grouping/applications/Group.java
index f100391..bfc4615 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/beans/grouping/applications/Group.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/beans/grouping/applications/Group.java
@@ -18,65 +18,75 @@
*/
package org.apache.stratos.cli.beans.grouping.applications;
+import java.util.ArrayList;
+import java.util.List;
+
public class Group
{
- private String deploymentPolicy;
-
- private Cluster cluster;
-
+ private List<Group> subGroups = null;
+ private List<Cluster> clusters = null;
private String alias;
-
+ private String deploymentPolicy;
private String autoScalingPolicy;
+ private List<Instance> instances;
- private SubGroup[] subGroups;
+ public Group(){
+ this.setClusters(new ArrayList<Cluster>());
+ this.setSubGroups(new ArrayList<Group>());
+ }
- public String getDeploymentPolicy ()
- {
- return deploymentPolicy;
+ public void addGroup(Group groupBean){
+ getSubGroups().add(groupBean);
+ }
+ public void addCluster(Cluster cluster){
+ getClusters().add(cluster);
}
- public void setDeploymentPolicy (String deploymentPolicy)
- {
- this.deploymentPolicy = deploymentPolicy;
+ public List<Group> getSubGroups() {
+ return subGroups;
}
- public Cluster getCluster()
- {
- return cluster;
+ public void setSubGroups(List<Group> subGroups) {
+ this.subGroups = subGroups;
}
- public void setCluster(Cluster cluster)
- {
- this.cluster = cluster;
+ public List<Cluster> getClusters() {
+ return clusters;
}
- public String getAlias ()
- {
- return alias;
+ public void setClusters(List<Cluster> clusters) {
+ this.clusters = clusters;
}
- public void setAlias (String alias)
- {
+ public void setAlias(String alias) {
this.alias = alias;
}
- public String getAutoScalingPolicy ()
- {
- return autoScalingPolicy;
+ public void setDeploymentPolicy(String deploymentPolicy) {
+ this.deploymentPolicy = deploymentPolicy;
}
- public void setAutoScalingPolicy (String autoScalingPolicy)
- {
+ public void setAutoScalingPolicy(String autoScalingPolicy) {
this.autoScalingPolicy = autoScalingPolicy;
}
- public SubGroup[] getSubGroups ()
- {
- return subGroups;
+ public String getAlias() {
+ return alias;
}
- public void setSubGroups (SubGroup[] subGroups)
- {
- this.subGroups = subGroups;
+ public String getDeploymentPolicy() {
+ return deploymentPolicy;
+ }
+
+ public String getAutoScalingPolicy() {
+ return autoScalingPolicy;
+ }
+
+ public List<Instance> getInstances() {
+ return instances;
+ }
+
+ public void setInstances(List<Instance> instances) {
+ this.instances = instances;
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/b64a9c27/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/beans/grouping/applications/Instance.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/beans/grouping/applications/Instance.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/beans/grouping/applications/Instance.java
new file mode 100644
index 0000000..decea07
--- /dev/null
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/beans/grouping/applications/Instance.java
@@ -0,0 +1,26 @@
+/*
+ * 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.
+ */
+
+package org.apache.stratos.cli.beans.grouping.applications;
+
+public class Instance {
+ public String status;
+
+ public String instanceId;
+}