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/05/13 17:15:54 UTC
[02/10] stratos git commit: Changes to the CLI commands
Changes to the CLI commands
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/a98b1504
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/a98b1504
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/a98b1504
Branch: refs/heads/master
Commit: a98b1504fc4f1559ff78805d014dc3c3aae3aa1b
Parents: 605bd70
Author: Dinithi <di...@wso2.com>
Authored: Tue May 12 13:34:33 2015 +0530
Committer: Dinithi <di...@wso2.com>
Committed: Tue May 12 13:34:33 2015 +0530
----------------------------------------------------------------------
.../account/mgt/beans/AccountInfoBean.java | 16 ++++-----
.../account/mgt/services/AccountMgtService.java | 20 +++++------
.../stratos/cli/RestCommandLineService.java | 24 +++++++-------
.../apache/stratos/cli/StratosApplication.java | 2 +-
.../DeleteAutoScalingPolicyCommand.java | 4 +--
.../commands/RemoveDomainMappingCommand.java | 4 +--
.../stratos/common/beans/TenantInfoBean.java | 8 ++---
.../rest/endpoint/api/StratosApiV41.java | 17 ++++------
.../rest/endpoint/api/StratosApiV41Utils.java | 35 +++++++++-----------
.../util/converter/ObjectConverter.java | 8 ++---
10 files changed, 64 insertions(+), 74 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/a98b1504/components/org.apache.stratos.account.mgt/src/main/java/org/apache/stratos/account/mgt/beans/AccountInfoBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.account.mgt/src/main/java/org/apache/stratos/account/mgt/beans/AccountInfoBean.java b/components/org.apache.stratos.account.mgt/src/main/java/org/apache/stratos/account/mgt/beans/AccountInfoBean.java
index ffcdb70..106fc7f 100644
--- a/components/org.apache.stratos.account.mgt/src/main/java/org/apache/stratos/account/mgt/beans/AccountInfoBean.java
+++ b/components/org.apache.stratos.account.mgt/src/main/java/org/apache/stratos/account/mgt/beans/AccountInfoBean.java
@@ -22,19 +22,19 @@ public class AccountInfoBean {
private String firstName;
private String lastName;
- public String getFirstname() {
- return firstName;
+ public String getLastName() {
+ return lastName;
}
- public void setFirstname(String firstName) {
- this.firstName = firstName;
+ public void setLastName(String lastName) {
+ this.lastName = lastName;
}
- public String getLastname() {
- return lastName;
+ public String getFirstName() {
+ return firstName;
}
- public void setLastname(String lastName) {
- this.lastName = lastName;
+ public void setFirstName(String firstName) {
+ this.firstName = firstName;
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/a98b1504/components/org.apache.stratos.account.mgt/src/main/java/org/apache/stratos/account/mgt/services/AccountMgtService.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.account.mgt/src/main/java/org/apache/stratos/account/mgt/services/AccountMgtService.java b/components/org.apache.stratos.account.mgt/src/main/java/org/apache/stratos/account/mgt/services/AccountMgtService.java
index 93e3fd1..11d5a91 100644
--- a/components/org.apache.stratos.account.mgt/src/main/java/org/apache/stratos/account/mgt/services/AccountMgtService.java
+++ b/components/org.apache.stratos.account.mgt/src/main/java/org/apache/stratos/account/mgt/services/AccountMgtService.java
@@ -171,32 +171,32 @@ public class AccountMgtService extends AbstractAdmin {
try {
Map<String, String> claimsMap = new HashMap<String, String>();
claimsMap.put(UserCoreConstants.ClaimTypeURIs.GIVEN_NAME,
- accountInfoBean.getFirstname());
- claimsMap.put(UserCoreConstants.ClaimTypeURIs.SURNAME, accountInfoBean.getLastname());
+ accountInfoBean.getFirstName());
+ claimsMap.put(UserCoreConstants.ClaimTypeURIs.SURNAME, accountInfoBean.getLastName());
UserStoreManager userStoreManager =
(UserStoreManager) realmService.getTenantUserRealm(tenantId)
.getUserStoreManager();
userStoreManager.setUserClaimValues(
ClaimsMgtUtil.getAdminUserNameFromTenantId(realmService, tenantId),
claimsMap, UserCoreConstants.DEFAULT_PROFILE);
- log.info("FirstName: " + accountInfoBean.getFirstname() +
+ log.info("FirstName: " + accountInfoBean.getFirstName() +
" has been updated to the tenant admin " +
ClaimsMgtUtil.getAdminUserNameFromTenantId(realmService, tenantId) + " of " +
tenant.getDomain());
-
+
//Notify tenant update to all listeners
TenantInfoBean tenantInfoBean = new TenantInfoBean();
tenantInfoBean.setTenantId(tenantId);
- tenantInfoBean.setFirstname(accountInfoBean.getFirstname());
- tenantInfoBean.setLastname(accountInfoBean.getLastname());
+ tenantInfoBean.setFirstName(accountInfoBean.getFirstName());
+ tenantInfoBean.setLastName(accountInfoBean.getLastName());
Util.alertTenantUpdate(tenantInfoBean);
-
+
return true;
} catch (Exception e) {
// this is expected, as many users haven't given their fullnames
// during their registration.
String msg =
- "Error in updating the firstname: " + accountInfoBean.getFirstname() +
+ "Error in updating the firstname: " + accountInfoBean.getFirstName() +
" for the tenant admin: " +
ClaimsMgtUtil.getAdminUserNameFromTenantId(realmService, tenantId);
log.info(msg);
@@ -254,8 +254,8 @@ public class AccountMgtService extends AbstractAdmin {
}
AccountInfoBean accountInfoBean = new AccountInfoBean();
- accountInfoBean.setFirstname(firstname);
- accountInfoBean.setLastname(lastname);
+ accountInfoBean.setFirstName(firstname);
+ accountInfoBean.setLastName(lastname);
return accountInfoBean;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/a98b1504/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 2e5127f..0e02b18 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
@@ -113,6 +113,8 @@ public class RestCommandLineService {
private static final String ENDPOINT_LIST_TENANTS_BY_PARTIAL_DOMAIN = API_CONTEXT + "/tenants/search/{tenantDomain}";
private static final String ENDPOINT_DOMAIN_MAPPINGS = API_CONTEXT + "/applications/{applicationId}/domainMappings";
+ private static final String ENDPOINT_REMOVE_DOMAIN_MAPPINGS = API_CONTEXT +
+ "/applications/{applicationId}/domainMappings/{domainName}";
private static final String ENDPOINT_GET_APPLICATION = API_CONTEXT + "/applications/{appId}";
private static final String ENDPOINT_GET_AUTOSCALING_POLICY = API_CONTEXT + "/autoscalingPolicies/{id}";
@@ -385,7 +387,7 @@ public class RestCommandLineService {
cartridgeGroups = cartridgeGroupList.toArray(cartridgeGroups);
System.out.println("Cartridge Groups found:");
- CliUtils.printTable(cartridgeGroups, cartridgeGroupMapper, "Name", "No. of cartridges", "No of groups", "Dependency scaling");
+ CliUtils.printTable(cartridgeGroups, cartridgeGroupMapper, "Name", "No. of cartridges", "No of groups");
} catch (Exception e) {
String message = "Error in listing cartridge groups";
printError(message, e);
@@ -485,8 +487,8 @@ public class RestCommandLineService {
try {
TenantInfoBean tenantInfo = new TenantInfoBean();
tenantInfo.setAdmin(admin);
- tenantInfo.setFirstname(firstName);
- tenantInfo.setLastname(lastName);
+ tenantInfo.setFirstName(firstName);
+ tenantInfo.setLastName(lastName);
tenantInfo.setAdminPassword(password);
tenantInfo.setTenantDomain(domain);
tenantInfo.setEmail(email);
@@ -612,8 +614,8 @@ public class RestCommandLineService {
try {
TenantInfoBean tenantInfo = new TenantInfoBean();
tenantInfo.setAdmin(admin);
- tenantInfo.setFirstname(firstName);
- tenantInfo.setLastname(lastName);
+ tenantInfo.setFirstName(firstName);
+ tenantInfo.setLastName(lastName);
tenantInfo.setAdminPassword(password);
tenantInfo.setTenantDomain(domain);
tenantInfo.setEmail(email);
@@ -1045,7 +1047,7 @@ public class RestCommandLineService {
List<AutoscalePolicyBean> list = (List<AutoscalePolicyBean>) restClient.listEntity(ENDPOINT_LIST_AUTOSCALING_POLICIES,
listType, "autoscaling policies");
- if ((list == null) || (list == null) || (list.size() == 0)) {
+ if ((list == null) || (list.size() == 0)) {
System.out.println("No autoscaling policies found");
return;
}
@@ -1207,7 +1209,7 @@ public class RestCommandLineService {
public void addKubernetesHost(String entityBody, String clusterId) throws CommandException {
DefaultHttpClient httpClient = new DefaultHttpClient();
try {
- HttpResponse response = restClient.doPut(httpClient, restClient.getBaseURL()
+ HttpResponse response = restClient.doPost(httpClient, restClient.getBaseURL()
+ ENDPOINT_DEPLOY_KUBERNETES_HOST.replace("{kubernetesClusterId}", clusterId), entityBody);
String responseCode = "" + response.getStatusLine().getStatusCode();
@@ -1382,8 +1384,9 @@ public class RestCommandLineService {
* @param applicationId application id
* @throws CommandException
*/
- public void removeDomainMappings(String applicationId) throws CommandException {
- String endpoint = ENDPOINT_DOMAIN_MAPPINGS.replace("{applicationId}", applicationId);
+ public void removeDomainMappings(String applicationId, String domainName) throws CommandException {
+ String endpoint = (ENDPOINT_REMOVE_DOMAIN_MAPPINGS.replace("{applicationId}",
+ applicationId)).replace("{domainName}", domainName);
restClient.undeployEntity(endpoint, "domain mappings", applicationId);
}
@@ -1406,7 +1409,6 @@ public class RestCommandLineService {
* @throws CommandException
*/
public void updateKubernetesMaster(String entityBody, String clusterId) throws CommandException {
- System.out.println(ENDPOINT_UPDATE_KUBERNETES_MASTER.replace("{kubernetesClusterId}", clusterId));
restClient.updateEntity(ENDPOINT_UPDATE_KUBERNETES_MASTER.replace("{kubernetesClusterId}", clusterId), entityBody, "kubernetes master");
}
@@ -1419,7 +1421,6 @@ public class RestCommandLineService {
* @throws CommandException
*/
public void updateKubernetesHost(String entityBody, String clusterId, String hostId) throws CommandException {
- System.out.println((ENDPOINT_UPDATE_KUBERNETES_HOST.replace("{kubernetesClusterId}", clusterId)).replace("{minionId}", hostId));
restClient.updateEntity((ENDPOINT_UPDATE_KUBERNETES_HOST.replace("{kubernetesClusterId}", clusterId)).replace("{minionId}", hostId), entityBody, "kubernetes host");
}
@@ -1767,7 +1768,6 @@ public class RestCommandLineService {
String[] data = new String[2];
data[0] = partition.getId();
data[1] = String.valueOf(partition.getPartitions().size());
- ;
return data;
}
};
http://git-wip-us.apache.org/repos/asf/stratos/blob/a98b1504/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 9472a5c..8874e15 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
@@ -198,7 +198,7 @@ public class StratosApplication extends CommandLineApplication<StratosCommandCon
command = new ListDomainMappingsCommand();
commands.put(command.getName(), command);
- command = new RemoveDomainMappingsCommand();
+ command = new RemoveDomainMappingCommand();
commands.put(command.getName(), command);
command = new DeleteAutoScalingPolicyCommand();
http://git-wip-us.apache.org/repos/asf/stratos/blob/a98b1504/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteAutoScalingPolicyCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteAutoScalingPolicyCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteAutoScalingPolicyCommand.java
index e79d861..4515cb7 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteAutoScalingPolicyCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteAutoScalingPolicyCommand.java
@@ -46,7 +46,7 @@ public class DeleteAutoScalingPolicyCommand implements Command<StratosCommandCon
@Override
public String getArgumentSyntax() {
- return "[application-id]";
+ return "[autoscaling-policy-id]";
}
@Override
@@ -62,7 +62,7 @@ public class DeleteAutoScalingPolicyCommand implements Command<StratosCommandCon
if (args != null && args.length == 1) {
String autoScalingPolicyId = args[0];
if (log.isDebugEnabled()) {
- log.debug("Getting delete application id {}", autoScalingPolicyId);
+ log.debug("Getting delete autoscaling policy id {}", autoScalingPolicyId);
}
RestCommandLineService.getInstance().deleteAutoSclaingPolicy(autoScalingPolicyId);
return CliConstants.COMMAND_SUCCESSFULL;
http://git-wip-us.apache.org/repos/asf/stratos/blob/a98b1504/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveDomainMappingCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveDomainMappingCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveDomainMappingCommand.java
index 6cd822c..8142b58 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveDomainMappingCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveDomainMappingCommand.java
@@ -54,12 +54,12 @@ public class RemoveDomainMappingCommand implements Command<StratosCommandContext
@Override
public String getName() {
- return "remove-domain-mappings";
+ return "remove-domain-mapping";
}
@Override
public String getDescription() {
- return "Remove domain mappings";
+ return "Remove domain mapping";
}
@Override
http://git-wip-us.apache.org/repos/asf/stratos/blob/a98b1504/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 a58d84a..9c3cc1d 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
@@ -60,19 +60,19 @@ public class TenantInfoBean {
this.usagePlan = tenantInfoBean.usagePlan;
}
- public String getFirstname() {
+ public String getFirstName() {
return firstName;
}
- public void setFirstname(String firstName) {
+ public void setFirstName(String firstName) {
this.firstName = firstName;
}
- public String getLastname() {
+ public String getLastName() {
return lastName;
}
- public void setLastname(String lastName) {
+ public void setLastName(String lastName) {
this.lastName = lastName;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/a98b1504/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 6493f0a..c7491d1 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
@@ -1030,35 +1030,30 @@ public class StratosApiV41 extends AbstractApi {
}
/**
- * Removes the domain mappings for an application.
+ * Removes a domain mapping for an application.
*
* @param applicationId the application id
- * @param domainMapppingsBean the domain mapppings bean
+ * @param domainName the domain name
* @return 200
* @throws RestAPIException the rest api exception
*/
@DELETE
- @Path("/applications/{applicationId}/domainMappings")
+ @Path("/applications/{applicationId}/domainMappings/{domainName}")
@Produces("application/json")
@Consumes("application/json")
@AuthorizationAction("/permission/protected/manage/removeDomainMappings")
public Response removeDomainMappings(
- @PathParam("applicationId") String applicationId, ApplicationDomainMappingsBean domainMapppingsBean)
+ @PathParam("applicationId") String applicationId, @PathParam("domainName") String domainName)
throws RestAPIException {
try {
- StratosApiV41Utils.removeApplicationDomainMappings(applicationId, domainMapppingsBean);
+ StratosApiV41Utils.removeApplicationDomainMapping(applicationId, domainName);
} catch (StratosManagerServiceDomainMappingExceptionException e) {
return Response.status(Response.Status.BAD_REQUEST).entity(new ResponseMessageBean(
ResponseMessageBean.ERROR, "Incorrect request to delete domain mapping of " +
"application")).build();
}
- List<DomainMappingBean> mappings = domainMapppingsBean.getDomainMappings();
- List<String> domainMappingList = new ArrayList<String>();
- for (DomainMappingBean domainMappingBean : mappings) {
- domainMappingList.add(domainMappingBean.getDomainName());
- }
return Response.ok().entity(new ResponseMessageBean(ResponseMessageBean.SUCCESS,
- String.format("Domain mappings deleted successfully: [domain-mappings] %s", domainMappingList))).build();
+ String.format("Domain mapping deleted successfully: [domain-mappings] %s", domainName))).build();
}
/**
http://git-wip-us.apache.org/repos/asf/stratos/blob/a98b1504/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 464271a..a4eee4c 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
@@ -2420,26 +2420,21 @@ public class StratosApiV41Utils {
* Remove Application Domain Mappings
*
* @param applicationId applicationId
- * @param domainMapppingsBean ApplicationDomainMappingsBean
+ * @param domainName the domain name
* @throws RestAPIException
*/
- public static void removeApplicationDomainMappings(String applicationId,
- ApplicationDomainMappingsBean domainMapppingsBean)
+ public static void removeApplicationDomainMapping(String applicationId, String domainName)
throws RestAPIException, StratosManagerServiceDomainMappingExceptionException {
try {
int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId();
StratosManagerServiceClient serviceClient = StratosManagerServiceClient.getInstance();
- if (domainMapppingsBean.getDomainMappings() != null) {
-
- for (DomainMappingBean domainMappingBean : domainMapppingsBean.getDomainMappings()) {
- serviceClient.removeDomainMapping(applicationId, tenantId, domainMappingBean.getDomainName());
+ if (domainName != null) {
+ serviceClient.removeDomainMapping(applicationId, tenantId, domainName);
- if (log.isInfoEnabled()) {
- log.info(String.format("Domain mapping removed: [application-id] %s [tenant-id] %d " +
- "[domain-name] %s", applicationId, tenantId,
- domainMappingBean.getDomainName()));
- }
+ if (log.isInfoEnabled()) {
+ log.info(String.format("Domain mapping removed: [application-id] %s [tenant-id] %d " +
+ "[domain-name] %s", applicationId, tenantId, domainName));
}
}
} catch (RemoteException e) {
@@ -2857,18 +2852,18 @@ public class StratosApiV41Utils {
}
// filling the first and last name values
- if (StringUtils.isBlank(tenantInfoBean.getFirstname())) {
+ if (StringUtils.isBlank(tenantInfoBean.getFirstName())) {
try {
- CommonUtil.validateName(tenantInfoBean.getFirstname(), "First Name");
+ CommonUtil.validateName(tenantInfoBean.getFirstName(), "First Name");
} catch (Exception e) {
String msg = "Invalid first name is provided.";
log.error(msg, e);
throw new RestAPIException(msg, e);
}
}
- if (StringUtils.isBlank(tenantInfoBean.getLastname())) {
+ if (StringUtils.isBlank(tenantInfoBean.getLastName())) {
try {
- CommonUtil.validateName(tenantInfoBean.getLastname(), "Last Name");
+ CommonUtil.validateName(tenantInfoBean.getLastName(), "Last Name");
} catch (Exception e) {
String msg = "Invalid last name is provided.";
log.error(msg, e);
@@ -2876,8 +2871,8 @@ public class StratosApiV41Utils {
}
}
- tenant.setAdminFirstName(tenantInfoBean.getFirstname());
- tenant.setAdminLastName(tenantInfoBean.getLastname());
+ tenant.setAdminFirstName(tenantInfoBean.getFirstName());
+ tenant.setAdminLastName(tenantInfoBean.getLastName());
try {
TenantMgtUtil.addClaimsToUserStoreManager(tenant);
} catch (Exception e) {
@@ -2994,8 +2989,8 @@ public class StratosApiV41Utils {
}
// retrieve first and last names from the UserStoreManager
- bean.setFirstname(ClaimsMgtUtil.getFirstNamefromUserStoreManager(ServiceHolder.getRealmService(), tenantId));
- bean.setLastname(ClaimsMgtUtil.getLastNamefromUserStoreManager(ServiceHolder.getRealmService(), tenantId));
+ bean.setFirstName(ClaimsMgtUtil.getFirstNamefromUserStoreManager(ServiceHolder.getRealmService(), tenantId));
+ bean.setLastName(ClaimsMgtUtil.getLastNamefromUserStoreManager(ServiceHolder.getRealmService(), tenantId));
return bean;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/a98b1504/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 48f48ec..71c63b6 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
@@ -1514,8 +1514,8 @@ public class ObjectConverter {
tenantInfoBean.setAdmin(carbonTenantInfoBean.getAdmin());
tenantInfoBean.setEmail(carbonTenantInfoBean.getEmail());
tenantInfoBean.setAdminPassword(carbonTenantInfoBean.getAdminPassword());
- tenantInfoBean.setFirstname(carbonTenantInfoBean.getFirstname());
- tenantInfoBean.setLastname(carbonTenantInfoBean.getLastname());
+ tenantInfoBean.setFirstName(carbonTenantInfoBean.getFirstname());
+ tenantInfoBean.setLastName(carbonTenantInfoBean.getLastname());
tenantInfoBean.setCreatedDate(carbonTenantInfoBean.getCreatedDate().getTimeInMillis());
return tenantInfoBean;
}
@@ -1534,8 +1534,8 @@ public class ObjectConverter {
carbonTenantInfoBean.setAdmin(tenantInfoBean.getAdmin());
carbonTenantInfoBean.setEmail(tenantInfoBean.getEmail());
carbonTenantInfoBean.setAdminPassword(tenantInfoBean.getAdminPassword());
- carbonTenantInfoBean.setFirstname(tenantInfoBean.getFirstname());
- carbonTenantInfoBean.setLastname(tenantInfoBean.getLastname());
+ carbonTenantInfoBean.setFirstname(tenantInfoBean.getFirstName());
+ carbonTenantInfoBean.setLastname(tenantInfoBean.getLastName());
if (tenantInfoBean.getCreatedDate() > 0) {
Calendar calendar = Calendar.getInstance();
calendar.setTimeInMillis(tenantInfoBean.getCreatedDate());