You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ud...@apache.org on 2014/12/18 07:38:37 UTC
[35/50] [abbrv] stratos git commit: Fixing GET /tenants rest api
method
Fixing GET /tenants rest api method
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/4fa699b8
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/4fa699b8
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/4fa699b8
Branch: refs/heads/master
Commit: 4fa699b8bd96a6b40e080315816e56ad873b0b9f
Parents: 548e260
Author: Imesh Gunaratne <im...@apache.org>
Authored: Wed Dec 17 15:05:18 2014 +0530
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Thu Dec 18 12:06:58 2014 +0530
----------------------------------------------------------------------
.../stratos/rest/endpoint/api/StratosApiV41.java | 10 ++++++----
.../endpoint/util/converter/ObjectConverter.java | 15 +++++++++++++++
2 files changed, 21 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/4fa699b8/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
index a336ea1..f9d19b4 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
@@ -46,6 +46,7 @@ import org.apache.stratos.rest.endpoint.annotation.AuthorizationAction;
import org.apache.stratos.rest.endpoint.annotation.SuperTenantService;
import org.apache.stratos.rest.endpoint.exception.RestAPIException;
import org.apache.stratos.rest.endpoint.exception.TenantNotFoundException;
+import org.apache.stratos.rest.endpoint.util.converter.ObjectConverter;
import org.wso2.carbon.context.CarbonContext;
import org.wso2.carbon.context.PrivilegedCarbonContext;
import org.wso2.carbon.context.RegistryType;
@@ -1012,7 +1013,7 @@ public class StratosApiV41 extends AbstractApi {
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
@SuperTenantService(true)
public TenantInfoBean[] getTenants() throws RestAPIException {
- List<TenantInfoBean> tenantList = null;
+ List<org.apache.stratos.common.beans.TenantInfoBean> tenantList = null;
try {
tenantList = getAllTenants();
} catch (Exception e) {
@@ -1023,7 +1024,7 @@ public class StratosApiV41 extends AbstractApi {
return tenantList.toArray(new TenantInfoBean[tenantList.size()]);
}
- private List<TenantInfoBean> getAllTenants() throws RestAPIException {
+ private List<org.apache.stratos.common.beans.TenantInfoBean> getAllTenants() throws RestAPIException {
TenantManager tenantManager = ServiceHolder.getTenantManager();
Tenant[] tenants;
try {
@@ -1034,9 +1035,10 @@ public class StratosApiV41 extends AbstractApi {
throw new RestAPIException(msg);
}
- List<TenantInfoBean> tenantList = new ArrayList<TenantInfoBean>();
+ List<org.apache.stratos.common.beans.TenantInfoBean> tenantList = new ArrayList<org.apache.stratos.common.beans.TenantInfoBean>();
for (Tenant tenant : tenants) {
- TenantInfoBean bean = TenantMgtUtil.getTenantInfoBeanfromTenant(tenant.getId(), tenant);
+ org.apache.stratos.common.beans.TenantInfoBean bean = ObjectConverter.convertTenantInfoBean(
+ TenantMgtUtil.getTenantInfoBeanfromTenant(tenant.getId(), tenant));
tenantList.add(bean);
}
return tenantList;
http://git-wip-us.apache.org/repos/asf/stratos/blob/4fa699b8/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
index 9b0b5d5..c1ed810 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
@@ -56,6 +56,7 @@ import org.apache.stratos.messaging.domain.instance.ApplicationInstance;
import org.apache.stratos.messaging.domain.instance.ClusterInstance;
import org.apache.stratos.messaging.domain.instance.GroupInstance;
import org.apache.stratos.messaging.domain.topology.Cluster;
+import org.wso2.carbon.stratos.common.beans.TenantInfoBean;
import java.util.ArrayList;
import java.util.Collection;
@@ -1490,4 +1491,18 @@ public class ObjectConverter {
}
return instanceList;
}
+
+ public static org.apache.stratos.common.beans.TenantInfoBean convertTenantInfoBean(TenantInfoBean tenantInfoBean) {
+ org.apache.stratos.common.beans.TenantInfoBean stratosTenantInfoBean =
+ new org.apache.stratos.common.beans.TenantInfoBean();
+ stratosTenantInfoBean.setTenantId(tenantInfoBean.getTenantId());
+ stratosTenantInfoBean.setTenantDomain(tenantInfoBean.getTenantDomain());
+ stratosTenantInfoBean.setActive(tenantInfoBean.isActive());
+ stratosTenantInfoBean.setAdmin(tenantInfoBean.getAdmin());
+ stratosTenantInfoBean.setEmail(tenantInfoBean.getEmail());
+ stratosTenantInfoBean.setFirstname(tenantInfoBean.getFirstname());
+ stratosTenantInfoBean.setLastname(tenantInfoBean.getLastname());
+ stratosTenantInfoBean.setCreatedDate(tenantInfoBean.getCreatedDate());
+ return stratosTenantInfoBean;
+ }
}