Changing TenantInfoBean.createdDate property type to long
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/7295c88c Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/7295c88c Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/7295c88c Branch: refs/heads/4.1.0-test Commit: 7295c88cdebddd610ec3e840adb54c938213a2d8 Parents: cb57686 Author: Imesh Gunaratne <[email protected]> Authored: Wed Dec 17 16:03:17 2014 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Wed Dec 17 16:03:17 2014 +0530 ---------------------------------------------------------------------- .../stratos/common/beans/TenantInfoBean.java | 8 ++--- .../rest/endpoint/api/StratosApiV41.java | 2 +- .../util/converter/ObjectConverter.java | 33 +++++++++++--------- 3 files changed, 23 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/7295c88c/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/TenantInfoBean.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/TenantInfoBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/TenantInfoBean.java index 5b814f8..62923c0 100755 --- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/TenantInfoBean.java +++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/TenantInfoBean.java @@ -37,7 +37,7 @@ public class TenantInfoBean { private String email; private boolean active; private String successKey; - private Calendar createdDate; + private long createdDate; private String originatedService; private String usagePlan; @@ -56,7 +56,7 @@ public class TenantInfoBean { this.email = tenantInfoBean.email; this.active = tenantInfoBean.active; this.successKey = tenantInfoBean.successKey; - this.createdDate = (Calendar)tenantInfoBean.createdDate.clone(); + this.createdDate = tenantInfoBean.createdDate; this.originatedService = tenantInfoBean.originatedService; this.usagePlan = tenantInfoBean.usagePlan; } @@ -134,11 +134,11 @@ public class TenantInfoBean { this.successKey = successKey; } - public Calendar getCreatedDate() { + public long getCreatedDate() { return createdDate; } - public void setCreatedDate(Calendar createdDate) { + public void setCreatedDate(long createdDate) { this.createdDate = createdDate; } http://git-wip-us.apache.org/repos/asf/stratos/blob/7295c88c/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 2e1c7f3..7b3fa48 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 @@ -702,7 +702,7 @@ public class StratosApiV41 extends AbstractApi { tenantId = persistor.persistTenant(tenant, false, tenantInfoBean.getSuccessKey(), tenantInfoBean.getOriginatedService(), false); } catch (Exception e) { - String msg = "Error in persisting tenant " + tenantDomain; + String msg = "Could not add tenant: " + e.getMessage(); log.error(msg, e); throw new RestAPIException(msg); } http://git-wip-us.apache.org/repos/asf/stratos/blob/7295c88c/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 86bade3..2441715 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 @@ -58,10 +58,7 @@ 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; -import java.util.Enumeration; -import java.util.List; +import java.util.*; public class ObjectConverter { @@ -1499,17 +1496,18 @@ public class ObjectConverter { return null; } - org.apache.stratos.common.beans.TenantInfoBean stratosTenantInfoBean = + org.apache.stratos.common.beans.TenantInfoBean tenantInfoBean = new org.apache.stratos.common.beans.TenantInfoBean(); - stratosTenantInfoBean.setTenantId(carbonTenantInfoBean.getTenantId()); - stratosTenantInfoBean.setTenantDomain(carbonTenantInfoBean.getTenantDomain()); - stratosTenantInfoBean.setActive(carbonTenantInfoBean.isActive()); - stratosTenantInfoBean.setAdmin(carbonTenantInfoBean.getAdmin()); - stratosTenantInfoBean.setEmail(carbonTenantInfoBean.getEmail()); - stratosTenantInfoBean.setFirstname(carbonTenantInfoBean.getFirstname()); - stratosTenantInfoBean.setLastname(carbonTenantInfoBean.getLastname()); - stratosTenantInfoBean.setCreatedDate(carbonTenantInfoBean.getCreatedDate()); - return stratosTenantInfoBean; + tenantInfoBean.setTenantId(carbonTenantInfoBean.getTenantId()); + tenantInfoBean.setTenantDomain(carbonTenantInfoBean.getTenantDomain()); + tenantInfoBean.setActive(carbonTenantInfoBean.isActive()); + tenantInfoBean.setAdmin(carbonTenantInfoBean.getAdmin()); + tenantInfoBean.setEmail(carbonTenantInfoBean.getEmail()); + tenantInfoBean.setAdminPassword(carbonTenantInfoBean.getAdminPassword()); + tenantInfoBean.setFirstname(carbonTenantInfoBean.getFirstname()); + tenantInfoBean.setLastname(carbonTenantInfoBean.getLastname()); + tenantInfoBean.setCreatedDate(carbonTenantInfoBean.getCreatedDate().getTimeInMillis()); + return tenantInfoBean; } public static TenantInfoBean convertTenantInfoBeanToCarbonTenantInfoBean( @@ -1525,9 +1523,14 @@ public class ObjectConverter { carbonTenantInfoBean.setActive(tenantInfoBean.isActive()); carbonTenantInfoBean.setAdmin(tenantInfoBean.getAdmin()); carbonTenantInfoBean.setEmail(tenantInfoBean.getEmail()); + carbonTenantInfoBean.setAdminPassword(tenantInfoBean.getAdminPassword()); carbonTenantInfoBean.setFirstname(tenantInfoBean.getFirstname()); carbonTenantInfoBean.setLastname(tenantInfoBean.getLastname()); - carbonTenantInfoBean.setCreatedDate(tenantInfoBean.getCreatedDate()); + if(tenantInfoBean.getCreatedDate() > 0) { + Calendar calendar = Calendar.getInstance(); + calendar.setTimeInMillis(tenantInfoBean.getCreatedDate()); + carbonTenantInfoBean.setCreatedDate(calendar); + } return carbonTenantInfoBean; } }
