You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@helix.apache.org by zz...@apache.org on 2013/08/21 22:44:03 UTC
[50/51] [partial] [HELIX-198] Unify helix code style, rb=13710
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/f414aad4/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ConstraintResource.java
----------------------------------------------------------------------
diff --git a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ConstraintResource.java b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ConstraintResource.java
index 16131f4..4cb4a48 100644
--- a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ConstraintResource.java
+++ b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ConstraintResource.java
@@ -43,8 +43,7 @@ public class ConstraintResource extends Resource {
private final static Logger LOG = Logger.getLogger(ConstraintResource.class);
- public ConstraintResource(Context context, Request request, Response response)
- {
+ public ConstraintResource(Context context, Request request, Response response) {
super(context, request, response);
getVariants().add(new Variant(MediaType.TEXT_PLAIN));
getVariants().add(new Variant(MediaType.APPLICATION_JSON));
@@ -52,14 +51,12 @@ public class ConstraintResource extends Resource {
}
// TODO move to a util function
- String getValue(String key)
- {
+ String getValue(String key) {
return (String) getRequest().getAttributes().get(key);
}
@Override
- public Representation represent(Variant variant)
- {
+ public Representation represent(Variant variant) {
StringRepresentation representation = null;
String clusterName = getValue("clusterName");
String constraintTypeStr = getValue("constraintType").toUpperCase();
@@ -70,33 +67,34 @@ public class ConstraintResource extends Resource {
ZkClient zkClient =
(ZkClient) getContext().getAttributes().get(RestAdminApplication.ZKCLIENT);
// ClusterSetup setupTool = new ClusterSetup(zkClient);
- HelixAdmin admin = new ZKHelixAdmin(zkClient); // setupTool.getClusterManagementTool();
-
+ HelixAdmin admin = new ZKHelixAdmin(zkClient); // setupTool.getClusterManagementTool();
+
ZNRecord record = admin.getConstraints(clusterName, constraintType).getRecord();
if (constraintId == null) {
// get all message constraints
- representation = new StringRepresentation(ClusterRepresentationUtil.ZNRecordToJson(record),
- MediaType.APPLICATION_JSON);
+ representation =
+ new StringRepresentation(ClusterRepresentationUtil.ZNRecordToJson(record),
+ MediaType.APPLICATION_JSON);
} else {
// get a specific constraint
Map<String, String> constraint = record.getMapField(constraintId);
if (constraint == null) {
- representation = new StringRepresentation("No constraint of type: "
- + constraintType + " associated with id: " + constraintId, MediaType.APPLICATION_JSON);
+ representation =
+ new StringRepresentation("No constraint of type: " + constraintType
+ + " associated with id: " + constraintId, MediaType.APPLICATION_JSON);
} else {
ZNRecord subRecord = new ZNRecord(record.getId());
subRecord.setMapField(constraintId, constraint);
- representation = new StringRepresentation(ClusterRepresentationUtil.ZNRecordToJson(subRecord),
- MediaType.APPLICATION_JSON);
+ representation =
+ new StringRepresentation(ClusterRepresentationUtil.ZNRecordToJson(subRecord),
+ MediaType.APPLICATION_JSON);
}
}
- }
- catch (IllegalArgumentException e) {
- representation = new StringRepresentation("constraint-type: " + constraintTypeStr + " not recognized.",
- MediaType.APPLICATION_JSON);
- }
- catch (Exception e)
- {
+ } catch (IllegalArgumentException e) {
+ representation =
+ new StringRepresentation("constraint-type: " + constraintTypeStr + " not recognized.",
+ MediaType.APPLICATION_JSON);
+ } catch (Exception e) {
String error = ClusterRepresentationUtil.getErrorAsJsonStringFromException(e);
representation = new StringRepresentation(error, MediaType.APPLICATION_JSON);
LOG.error("", e);
@@ -104,10 +102,9 @@ public class ConstraintResource extends Resource {
return representation;
}
-
+
@Override
- public void acceptRepresentation(Representation entity)
- {
+ public void acceptRepresentation(Representation entity) {
String clusterName = getValue("clusterName");
String constraintTypeStr = getValue("constraintType").toUpperCase();
String constraintId = getValue("constraintId");
@@ -117,23 +114,20 @@ public class ConstraintResource extends Resource {
(ZkClient) getContext().getAttributes().get(RestAdminApplication.ZKCLIENT);
ClusterSetup setupTool = new ClusterSetup(zkClient);
JsonParameters jsonParameters = new JsonParameters(entity);
-
+
String constraintAttrStr = jsonParameters.getParameter(JsonParameters.CONSTRAINT_ATTRIBUTES);
setupTool.setConstraint(clusterName, constraintTypeStr, constraintId, constraintAttrStr);
- }
- catch (Exception e)
- {
+ } catch (Exception e) {
LOG.error("Error in posting " + entity, e);
getResponse().setEntity(ClusterRepresentationUtil.getErrorAsJsonStringFromException(e),
- MediaType.APPLICATION_JSON);
+ MediaType.APPLICATION_JSON);
getResponse().setStatus(Status.SUCCESS_OK);
}
}
-
+
@Override
- public void removeRepresentations()
- {
+ public void removeRepresentations() {
String clusterName = getValue("clusterName");
String constraintTypeStr = getValue("constraintType").toUpperCase();
String constraintId = getValue("constraintId");
@@ -142,17 +136,15 @@ public class ConstraintResource extends Resource {
ZkClient zkClient =
(ZkClient) getContext().getAttributes().get(RestAdminApplication.ZKCLIENT);
ClusterSetup setupTool = new ClusterSetup(zkClient);
-
+
setupTool.removeConstraint(clusterName, constraintTypeStr, constraintId);
- }
- catch (Exception e)
- {
+ } catch (Exception e) {
LOG.error("Error in deleting ", e);
getResponse().setEntity(ClusterRepresentationUtil.getErrorAsJsonStringFromException(e),
- MediaType.APPLICATION_JSON);
+ MediaType.APPLICATION_JSON);
getResponse().setStatus(Status.SUCCESS_OK);
}
-
+
}
}
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/f414aad4/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ControllerResource.java
----------------------------------------------------------------------
diff --git a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ControllerResource.java b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ControllerResource.java
index 588edc2..a6c7c29 100644
--- a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ControllerResource.java
+++ b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ControllerResource.java
@@ -50,8 +50,7 @@ import org.restlet.resource.Resource;
import org.restlet.resource.StringRepresentation;
import org.restlet.resource.Variant;
-public class ControllerResource extends Resource
-{
+public class ControllerResource extends Resource {
public ControllerResource(Context context, Request request, Response response)
@@ -62,48 +61,38 @@ public class ControllerResource extends Resource
}
@Override
- public boolean allowGet()
- {
+ public boolean allowGet() {
return true;
}
@Override
- public boolean allowPost()
- {
+ public boolean allowPost() {
return true;
}
@Override
- public boolean allowPut()
- {
+ public boolean allowPut() {
return false;
}
@Override
- public boolean allowDelete()
- {
+ public boolean allowDelete() {
return false;
}
- StringRepresentation getControllerRepresentation(String clusterName) throws JsonGenerationException,
- JsonMappingException,
- IOException
- {
+ StringRepresentation getControllerRepresentation(String clusterName)
+ throws JsonGenerationException, JsonMappingException, IOException {
Builder keyBuilder = new PropertyKey.Builder(clusterName);
- ZkClient zkClient =
- (ZkClient) getContext().getAttributes().get(RestAdminApplication.ZKCLIENT);
+ ZkClient zkClient = (ZkClient) getContext().getAttributes().get(RestAdminApplication.ZKCLIENT);
ZKHelixDataAccessor accessor =
new ZKHelixDataAccessor(clusterName, new ZkBaseDataAccessor<ZNRecord>(zkClient));
ZNRecord record = null;
LiveInstance leader = accessor.getProperty(keyBuilder.controllerLeader());
- if (leader != null)
- {
+ if (leader != null) {
record = leader.getRecord();
- }
- else
- {
+ } else {
record = new ZNRecord("");
DateFormat formatter = new SimpleDateFormat("yyyyMMdd-HHmmss.SSSSSS");
String time = formatter.format(new Date());
@@ -123,16 +112,12 @@ public class ControllerResource extends Resource
}
@Override
- public Representation represent(Variant variant)
- {
+ public Representation represent(Variant variant) {
StringRepresentation presentation = null;
- try
- {
+ try {
String clusterName = (String) getRequest().getAttributes().get("clusterName");
presentation = getControllerRepresentation(clusterName);
- }
- catch (Exception e)
- {
+ } catch (Exception e) {
String error = ClusterRepresentationUtil.getErrorAsJsonStringFromException(e);
presentation = new StringRepresentation(error, MediaType.APPLICATION_JSON);
e.printStackTrace();
@@ -141,10 +126,8 @@ public class ControllerResource extends Resource
}
@Override
- public void acceptRepresentation(Representation entity)
- {
- try
- {
+ public void acceptRepresentation(Representation entity) {
+ try {
String clusterName = (String) getRequest().getAttributes().get("clusterName");
ZkClient zkClient =
(ZkClient) getContext().getAttributes().get(RestAdminApplication.ZKCLIENT);
@@ -153,32 +136,24 @@ public class ControllerResource extends Resource
JsonParameters jsonParameters = new JsonParameters(entity);
String command = jsonParameters.getCommand();
- if (command == null)
- {
+ if (command == null) {
throw new HelixException("Could NOT find 'command' in parameterMap: "
+ jsonParameters._parameterMap);
- }
- else if (command.equalsIgnoreCase(ClusterSetup.enableCluster))
- {
- boolean enabled =
- Boolean.parseBoolean(jsonParameters.getParameter(JsonParameters.ENABLED));
+ } else if (command.equalsIgnoreCase(ClusterSetup.enableCluster)) {
+ boolean enabled = Boolean.parseBoolean(jsonParameters.getParameter(JsonParameters.ENABLED));
setupTool.getClusterManagementTool().enableCluster(clusterName, enabled);
- }
- else
- {
- throw new HelixException("Unsupported command: " + command
- + ". Should be one of [" + ClusterSetup.enableCluster + "]");
+ } else {
+ throw new HelixException("Unsupported command: " + command + ". Should be one of ["
+ + ClusterSetup.enableCluster + "]");
}
getResponse().setEntity(getControllerRepresentation(clusterName));
getResponse().setStatus(Status.SUCCESS_OK);
- }
- catch (Exception e)
- {
+ } catch (Exception e) {
getResponse().setEntity(ClusterRepresentationUtil.getErrorAsJsonStringFromException(e),
- MediaType.APPLICATION_JSON);
+ MediaType.APPLICATION_JSON);
getResponse().setStatus(Status.SUCCESS_OK);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/f414aad4/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ControllerStatusUpdateResource.java
----------------------------------------------------------------------
diff --git a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ControllerStatusUpdateResource.java b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ControllerStatusUpdateResource.java
index 6d83f3a..d95e581 100644
--- a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ControllerStatusUpdateResource.java
+++ b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ControllerStatusUpdateResource.java
@@ -37,85 +37,68 @@ import org.restlet.resource.Resource;
import org.restlet.resource.StringRepresentation;
import org.restlet.resource.Variant;
-
-public class ControllerStatusUpdateResource extends Resource
-{
+public class ControllerStatusUpdateResource extends Resource {
private final static Logger LOG = Logger.getLogger(ControllerStatusUpdateResource.class);
- public ControllerStatusUpdateResource(Context context, Request request,
- Response response)
- {
+ public ControllerStatusUpdateResource(Context context, Request request, Response response) {
super(context, request, response);
getVariants().add(new Variant(MediaType.TEXT_PLAIN));
getVariants().add(new Variant(MediaType.APPLICATION_JSON));
}
@Override
- public boolean allowGet()
- {
+ public boolean allowGet() {
return true;
}
@Override
- public boolean allowPost()
- {
+ public boolean allowPost() {
return false;
}
@Override
- public boolean allowPut()
- {
+ public boolean allowPut() {
return false;
}
@Override
- public boolean allowDelete()
- {
+ public boolean allowDelete() {
return false;
}
@Override
- public Representation represent(Variant variant)
- {
+ public Representation represent(Variant variant) {
StringRepresentation presentation = null;
- try
- {
- String zkServer = (String) getContext().getAttributes().get(
- RestAdminApplication.ZKSERVERADDRESS);
- String clusterName = (String) getRequest().getAttributes().get(
- "clusterName");
- String messageType = (String) getRequest().getAttributes().get(
- "MessageType");
+ try {
+ String zkServer =
+ (String) getContext().getAttributes().get(RestAdminApplication.ZKSERVERADDRESS);
+ String clusterName = (String) getRequest().getAttributes().get("clusterName");
+ String messageType = (String) getRequest().getAttributes().get("MessageType");
String messageId = (String) getRequest().getAttributes().get("MessageId");
// TODO: need pass sessionId to this represent()
String sessionId = (String) getRequest().getAttributes().get("SessionId");
- presentation = getControllerStatusUpdateRepresentation(zkServer,
- clusterName, sessionId, messageType, messageId);
- } catch (Exception e)
- {
- String error = ClusterRepresentationUtil
- .getErrorAsJsonStringFromException(e);
+ presentation =
+ getControllerStatusUpdateRepresentation(zkServer, clusterName, sessionId, messageType,
+ messageId);
+ } catch (Exception e) {
+ String error = ClusterRepresentationUtil.getErrorAsJsonStringFromException(e);
presentation = new StringRepresentation(error, MediaType.APPLICATION_JSON);
LOG.error("", e);
}
return presentation;
}
- StringRepresentation getControllerStatusUpdateRepresentation(
- String zkServerAddress, String clusterName, String sessionId,
- String messageType, String messageId) throws JsonGenerationException,
- JsonMappingException, IOException
- {
+ StringRepresentation getControllerStatusUpdateRepresentation(String zkServerAddress,
+ String clusterName, String sessionId, String messageType, String messageId)
+ throws JsonGenerationException, JsonMappingException, IOException {
Builder keyBuilder = new PropertyKey.Builder(clusterName);
- ZkClient zkClient = (ZkClient)getContext().getAttributes().get(RestAdminApplication.ZKCLIENT);
- String message = ClusterRepresentationUtil.getPropertyAsString(
- zkClient,
- clusterName,
- keyBuilder.controllerTaskStatus(messageType, messageId),
- MediaType.APPLICATION_JSON);
- StringRepresentation representation = new StringRepresentation(message,
- MediaType.APPLICATION_JSON);
+ ZkClient zkClient = (ZkClient) getContext().getAttributes().get(RestAdminApplication.ZKCLIENT);
+ String message =
+ ClusterRepresentationUtil.getPropertyAsString(zkClient, clusterName,
+ keyBuilder.controllerTaskStatus(messageType, messageId), MediaType.APPLICATION_JSON);
+ StringRepresentation representation =
+ new StringRepresentation(message, MediaType.APPLICATION_JSON);
return representation;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/f414aad4/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/CurrentStateResource.java
----------------------------------------------------------------------
diff --git a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/CurrentStateResource.java b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/CurrentStateResource.java
index ee0613f..797b663 100644
--- a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/CurrentStateResource.java
+++ b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/CurrentStateResource.java
@@ -37,60 +37,46 @@ import org.restlet.resource.Resource;
import org.restlet.resource.StringRepresentation;
import org.restlet.resource.Variant;
-
-public class CurrentStateResource extends Resource
-{
+public class CurrentStateResource extends Resource {
private final static Logger LOG = Logger.getLogger(CurrentStateResource.class);
- public CurrentStateResource(Context context, Request request, Response response)
- {
+ public CurrentStateResource(Context context, Request request, Response response) {
super(context, request, response);
getVariants().add(new Variant(MediaType.TEXT_PLAIN));
getVariants().add(new Variant(MediaType.APPLICATION_JSON));
}
@Override
- public boolean allowGet()
- {
+ public boolean allowGet() {
return true;
}
@Override
- public boolean allowPost()
- {
+ public boolean allowPost() {
return false;
}
@Override
- public boolean allowPut()
- {
+ public boolean allowPut() {
return false;
}
@Override
- public boolean allowDelete()
- {
+ public boolean allowDelete() {
return false;
}
@Override
- public Representation represent(Variant variant)
- {
+ public Representation represent(Variant variant) {
StringRepresentation presentation = null;
- try
- {
+ try {
String clusterName = (String) getRequest().getAttributes().get("clusterName");
String instanceName = (String) getRequest().getAttributes().get("instanceName");
String resourceGroup = (String) getRequest().getAttributes().get("resourceName");
presentation =
- getInstanceCurrentStateRepresentation(
- clusterName,
- instanceName,
- resourceGroup);
- }
- catch (Exception e)
- {
+ getInstanceCurrentStateRepresentation(clusterName, instanceName, resourceGroup);
+ } catch (Exception e) {
String error = ClusterRepresentationUtil.getErrorAsJsonStringFromException(e);
presentation = new StringRepresentation(error, MediaType.APPLICATION_JSON);
@@ -99,27 +85,18 @@ public class CurrentStateResource extends Resource
return presentation;
}
- StringRepresentation getInstanceCurrentStateRepresentation(
- String clusterName,
- String instanceName,
- String resourceGroup) throws JsonGenerationException,
- JsonMappingException,
- IOException
- {
- ZkClient zkClient = (ZkClient)getRequest().getAttributes().get(RestAdminApplication.ZKCLIENT);
+ StringRepresentation getInstanceCurrentStateRepresentation(String clusterName,
+ String instanceName, String resourceGroup) throws JsonGenerationException,
+ JsonMappingException, IOException {
+ ZkClient zkClient = (ZkClient) getRequest().getAttributes().get(RestAdminApplication.ZKCLIENT);
String instanceSessionId =
- ClusterRepresentationUtil.getInstanceSessionId(zkClient,
- clusterName,
- instanceName);
+ ClusterRepresentationUtil.getInstanceSessionId(zkClient, clusterName, instanceName);
Builder keyBuilder = new PropertyKey.Builder(clusterName);
String message =
- ClusterRepresentationUtil.getInstancePropertyAsString(zkClient,
- clusterName,
- keyBuilder.currentState(instanceName,
- instanceSessionId,
- resourceGroup),
- MediaType.APPLICATION_JSON);
+ ClusterRepresentationUtil.getInstancePropertyAsString(zkClient, clusterName,
+ keyBuilder.currentState(instanceName, instanceSessionId, resourceGroup),
+ MediaType.APPLICATION_JSON);
StringRepresentation representation =
new StringRepresentation(message, MediaType.APPLICATION_JSON);
return representation;
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/f414aad4/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/CurrentStatesResource.java
----------------------------------------------------------------------
diff --git a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/CurrentStatesResource.java b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/CurrentStatesResource.java
index 939b3e2..3b50e0c 100644
--- a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/CurrentStatesResource.java
+++ b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/CurrentStatesResource.java
@@ -36,49 +36,38 @@ import org.restlet.resource.Resource;
import org.restlet.resource.StringRepresentation;
import org.restlet.resource.Variant;
-
-public class CurrentStatesResource extends Resource
-{
+public class CurrentStatesResource extends Resource {
private final static Logger LOG = Logger.getLogger(CurrentStatesResource.class);
- public CurrentStatesResource(Context context, Request request, Response response)
- {
+ public CurrentStatesResource(Context context, Request request, Response response) {
super(context, request, response);
getVariants().add(new Variant(MediaType.TEXT_PLAIN));
getVariants().add(new Variant(MediaType.APPLICATION_JSON));
}
- public boolean allowGet()
- {
+ public boolean allowGet() {
return true;
}
- public boolean allowPost()
- {
+ public boolean allowPost() {
return false;
}
- public boolean allowPut()
- {
+ public boolean allowPut() {
return false;
}
- public boolean allowDelete()
- {
+ public boolean allowDelete() {
return false;
}
- public Representation represent(Variant variant)
- {
+ public Representation represent(Variant variant) {
StringRepresentation presentation = null;
- try
- {
+ try {
String clusterName = (String) getRequest().getAttributes().get("clusterName");
String instanceName = (String) getRequest().getAttributes().get("instanceName");
presentation = getInstanceCurrentStatesRepresentation(clusterName, instanceName);
- }
- catch (Exception e)
- {
+ } catch (Exception e) {
String error = ClusterRepresentationUtil.getErrorAsJsonStringFromException(e);
presentation = new StringRepresentation(error, MediaType.APPLICATION_JSON);
@@ -87,16 +76,22 @@ public class CurrentStatesResource extends Resource
return presentation;
}
- StringRepresentation getInstanceCurrentStatesRepresentation(String clusterName, String instanceName) throws JsonGenerationException, JsonMappingException, IOException
- {
- ZkClient zkClient = (ZkClient)getContext().getAttributes().get(RestAdminApplication.ZKCLIENT);;
- String instanceSessionId = ClusterRepresentationUtil.getInstanceSessionId(zkClient, clusterName, instanceName);
-
- String message = ClusterRepresentationUtil.getInstancePropertyNameListAsString(zkClient, clusterName, instanceName, PropertyType.CURRENTSTATES, instanceSessionId, MediaType.APPLICATION_JSON);
+ StringRepresentation getInstanceCurrentStatesRepresentation(String clusterName,
+ String instanceName) throws JsonGenerationException, JsonMappingException, IOException {
+ ZkClient zkClient = (ZkClient) getContext().getAttributes().get(RestAdminApplication.ZKCLIENT);
+ ;
+ String instanceSessionId =
+ ClusterRepresentationUtil.getInstanceSessionId(zkClient, clusterName, instanceName);
- StringRepresentation representation = new StringRepresentation(message, MediaType.APPLICATION_JSON);
+ String message =
+ ClusterRepresentationUtil
+ .getInstancePropertyNameListAsString(zkClient, clusterName, instanceName,
+ PropertyType.CURRENTSTATES, instanceSessionId, MediaType.APPLICATION_JSON);
+
+ StringRepresentation representation =
+ new StringRepresentation(message, MediaType.APPLICATION_JSON);
return representation;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/f414aad4/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ErrorResource.java
----------------------------------------------------------------------
diff --git a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ErrorResource.java b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ErrorResource.java
index 6d44141..f680e08 100644
--- a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ErrorResource.java
+++ b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ErrorResource.java
@@ -37,59 +37,45 @@ import org.restlet.resource.Resource;
import org.restlet.resource.StringRepresentation;
import org.restlet.resource.Variant;
-
-public class ErrorResource extends Resource
-{
+public class ErrorResource extends Resource {
private final static Logger LOG = Logger.getLogger(ErrorResource.class);
- public ErrorResource(Context context, Request request, Response response)
- {
+ public ErrorResource(Context context, Request request, Response response) {
super(context, request, response);
getVariants().add(new Variant(MediaType.TEXT_PLAIN));
getVariants().add(new Variant(MediaType.APPLICATION_JSON));
}
@Override
- public boolean allowGet()
- {
+ public boolean allowGet() {
return true;
}
@Override
- public boolean allowPost()
- {
+ public boolean allowPost() {
return false;
}
@Override
- public boolean allowPut()
- {
+ public boolean allowPut() {
return false;
}
@Override
- public boolean allowDelete()
- {
+ public boolean allowDelete() {
return false;
}
@Override
- public Representation represent(Variant variant)
- {
+ public Representation represent(Variant variant) {
StringRepresentation presentation = null;
- try
- {
+ try {
String clusterName = (String) getRequest().getAttributes().get("clusterName");
String instanceName = (String) getRequest().getAttributes().get("instanceName");
String resourceGroup = (String) getRequest().getAttributes().get("resourceName");
- presentation =
- getInstanceErrorsRepresentation(clusterName,
- instanceName,
- resourceGroup);
- }
- catch (Exception e)
- {
+ presentation = getInstanceErrorsRepresentation(clusterName, instanceName, resourceGroup);
+ } catch (Exception e) {
String error = ClusterRepresentationUtil.getErrorAsJsonStringFromException(e);
presentation = new StringRepresentation(error, MediaType.APPLICATION_JSON);
@@ -98,26 +84,19 @@ public class ErrorResource extends Resource
return presentation;
}
- StringRepresentation getInstanceErrorsRepresentation(String clusterName,
- String instanceName,
- String resourceGroup) throws JsonGenerationException,
- JsonMappingException,
- IOException
- {
- ZkClient zkClient = (ZkClient)getContext().getAttributes().get(RestAdminApplication.ZKCLIENT);
+ StringRepresentation getInstanceErrorsRepresentation(String clusterName, String instanceName,
+ String resourceGroup) throws JsonGenerationException, JsonMappingException, IOException {
+ ZkClient zkClient = (ZkClient) getContext().getAttributes().get(RestAdminApplication.ZKCLIENT);
String instanceSessionId =
- ClusterRepresentationUtil.getInstanceSessionId(zkClient, clusterName,
- instanceName);
+ ClusterRepresentationUtil.getInstanceSessionId(zkClient, clusterName, instanceName);
Builder keyBuilder = new PropertyKey.Builder(clusterName);
String message =
ClusterRepresentationUtil.getInstancePropertiesAsString(zkClient, clusterName,
- keyBuilder.stateTransitionErrors(instanceName,
- instanceSessionId,
- resourceGroup),
- // instanceSessionId
- // + "__"
- // + resourceGroup,
- MediaType.APPLICATION_JSON);
+ keyBuilder.stateTransitionErrors(instanceName, instanceSessionId, resourceGroup),
+ // instanceSessionId
+ // + "__"
+ // + resourceGroup,
+ MediaType.APPLICATION_JSON);
StringRepresentation representation =
new StringRepresentation(message, MediaType.APPLICATION_JSON);
return representation;
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/f414aad4/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ErrorsResource.java
----------------------------------------------------------------------
diff --git a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ErrorsResource.java b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ErrorsResource.java
index 8872d90..06cf64f 100644
--- a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ErrorsResource.java
+++ b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ErrorsResource.java
@@ -36,49 +36,38 @@ import org.restlet.resource.Resource;
import org.restlet.resource.StringRepresentation;
import org.restlet.resource.Variant;
-
-public class ErrorsResource extends Resource
-{
+public class ErrorsResource extends Resource {
private final static Logger LOG = Logger.getLogger(ErrorsResource.class);
- public ErrorsResource(Context context, Request request, Response response)
- {
+ public ErrorsResource(Context context, Request request, Response response) {
super(context, request, response);
getVariants().add(new Variant(MediaType.TEXT_PLAIN));
getVariants().add(new Variant(MediaType.APPLICATION_JSON));
}
- public boolean allowGet()
- {
+ public boolean allowGet() {
return true;
}
- public boolean allowPost()
- {
+ public boolean allowPost() {
return false;
}
- public boolean allowPut()
- {
+ public boolean allowPut() {
return false;
}
- public boolean allowDelete()
- {
+ public boolean allowDelete() {
return false;
}
- public Representation represent(Variant variant)
- {
+ public Representation represent(Variant variant) {
StringRepresentation presentation = null;
- try
- {
+ try {
String clusterName = (String) getRequest().getAttributes().get("clusterName");
String instanceName = (String) getRequest().getAttributes().get("instanceName");
- presentation = getInstanceErrorsRepresentation( clusterName, instanceName);
- }
- catch (Exception e)
- {
+ presentation = getInstanceErrorsRepresentation(clusterName, instanceName);
+ } catch (Exception e) {
String error = ClusterRepresentationUtil.getErrorAsJsonStringFromException(e);
presentation = new StringRepresentation(error, MediaType.APPLICATION_JSON);
@@ -87,17 +76,23 @@ public class ErrorsResource extends Resource
return presentation;
}
- StringRepresentation getInstanceErrorsRepresentation(String clusterName, String instanceName) throws JsonGenerationException, JsonMappingException, IOException
- {
- ZkClient zkClient = (ZkClient)getContext().getAttributes().get(RestAdminApplication.ZKCLIENT);;
-
- String instanceSessionId = ClusterRepresentationUtil.getInstanceSessionId(zkClient, clusterName, instanceName);
-
- String message = ClusterRepresentationUtil.getInstancePropertyNameListAsString(zkClient, clusterName, instanceName, PropertyType.CURRENTSTATES, instanceSessionId, MediaType.APPLICATION_JSON);
+ StringRepresentation getInstanceErrorsRepresentation(String clusterName, String instanceName)
+ throws JsonGenerationException, JsonMappingException, IOException {
+ ZkClient zkClient = (ZkClient) getContext().getAttributes().get(RestAdminApplication.ZKCLIENT);
+ ;
+
+ String instanceSessionId =
+ ClusterRepresentationUtil.getInstanceSessionId(zkClient, clusterName, instanceName);
- StringRepresentation representation = new StringRepresentation(message, MediaType.APPLICATION_JSON);
+ String message =
+ ClusterRepresentationUtil
+ .getInstancePropertyNameListAsString(zkClient, clusterName, instanceName,
+ PropertyType.CURRENTSTATES, instanceSessionId, MediaType.APPLICATION_JSON);
+
+ StringRepresentation representation =
+ new StringRepresentation(message, MediaType.APPLICATION_JSON);
return representation;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/f414aad4/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ExternalViewResource.java
----------------------------------------------------------------------
diff --git a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ExternalViewResource.java b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ExternalViewResource.java
index 0a4f9fc..68587d9 100644
--- a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ExternalViewResource.java
+++ b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ExternalViewResource.java
@@ -37,55 +37,45 @@ import org.restlet.resource.Resource;
import org.restlet.resource.StringRepresentation;
import org.restlet.resource.Variant;
-
-public class ExternalViewResource extends Resource
-{
+public class ExternalViewResource extends Resource {
private final static Logger LOG = Logger.getLogger(ExternalViewResource.class);
- public ExternalViewResource(Context context, Request request, Response response)
- {
+ public ExternalViewResource(Context context, Request request, Response response) {
super(context, request, response);
getVariants().add(new Variant(MediaType.TEXT_PLAIN));
getVariants().add(new Variant(MediaType.APPLICATION_JSON));
}
@Override
- public boolean allowGet()
- {
+ public boolean allowGet() {
return true;
}
@Override
- public boolean allowPost()
- {
+ public boolean allowPost() {
return false;
}
@Override
- public boolean allowPut()
- {
+ public boolean allowPut() {
return false;
}
@Override
- public boolean allowDelete()
- {
+ public boolean allowDelete() {
return false;
}
@Override
- public Representation represent(Variant variant)
- {
+ public Representation represent(Variant variant) {
StringRepresentation presentation = null;
- try
- {
+ try {
String clusterName = (String) getRequest().getAttributes().get("clusterName");
String resourceName = (String) getRequest().getAttributes().get("resourceName");
- presentation = getExternalViewRepresentation( clusterName, resourceName);
+ presentation = getExternalViewRepresentation(clusterName, resourceName);
}
- catch (Exception e)
- {
+ catch (Exception e) {
String error = ClusterRepresentationUtil.getErrorAsJsonStringFromException(e);
presentation = new StringRepresentation(error, MediaType.APPLICATION_JSON);
@@ -94,19 +84,15 @@ public class ExternalViewResource extends Resource
return presentation;
}
- StringRepresentation getExternalViewRepresentation(String clusterName,
- String resourceName) throws JsonGenerationException,
- JsonMappingException,
- IOException
- {
+ StringRepresentation getExternalViewRepresentation(String clusterName, String resourceName)
+ throws JsonGenerationException, JsonMappingException, IOException {
Builder keyBuilder = new PropertyKey.Builder(clusterName);
- ZkClient zkClient = (ZkClient)getContext().getAttributes().get(RestAdminApplication.ZKCLIENT);;
-
+ ZkClient zkClient = (ZkClient) getContext().getAttributes().get(RestAdminApplication.ZKCLIENT);
+ ;
+
String message =
- ClusterRepresentationUtil.getClusterPropertyAsString(zkClient,
- clusterName,
- keyBuilder.externalView(resourceName),
- MediaType.APPLICATION_JSON);
+ ClusterRepresentationUtil.getClusterPropertyAsString(zkClient, clusterName,
+ keyBuilder.externalView(resourceName), MediaType.APPLICATION_JSON);
StringRepresentation representation =
new StringRepresentation(message, MediaType.APPLICATION_JSON);
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/f414aad4/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/IdealStateResource.java
----------------------------------------------------------------------
diff --git a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/IdealStateResource.java b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/IdealStateResource.java
index 966dc14..87e6cd7 100644
--- a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/IdealStateResource.java
+++ b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/IdealStateResource.java
@@ -44,55 +44,45 @@ import org.restlet.resource.Resource;
import org.restlet.resource.StringRepresentation;
import org.restlet.resource.Variant;
-
-public class IdealStateResource extends Resource
-{
+public class IdealStateResource extends Resource {
private final static Logger LOG = Logger.getLogger(IdealStateResource.class);
- public IdealStateResource(Context context, Request request, Response response)
- {
+ public IdealStateResource(Context context, Request request, Response response) {
super(context, request, response);
getVariants().add(new Variant(MediaType.TEXT_PLAIN));
getVariants().add(new Variant(MediaType.APPLICATION_JSON));
}
@Override
- public boolean allowGet()
- {
+ public boolean allowGet() {
return true;
}
@Override
- public boolean allowPost()
- {
+ public boolean allowPost() {
return true;
}
@Override
- public boolean allowPut()
- {
+ public boolean allowPut() {
return false;
}
@Override
- public boolean allowDelete()
- {
+ public boolean allowDelete() {
return false;
}
@Override
- public Representation represent(Variant variant)
- {
+ public Representation represent(Variant variant) {
StringRepresentation presentation = null;
- try
- {
+ try {
String clusterName = (String) getRequest().getAttributes().get("clusterName");
String resourceName = (String) getRequest().getAttributes().get("resourceName");
presentation = getIdealStateRepresentation(clusterName, resourceName);
}
- catch (Exception e)
- {
+ catch (Exception e) {
String error = ClusterRepresentationUtil.getErrorAsJsonStringFromException(e);
presentation = new StringRepresentation(error, MediaType.APPLICATION_JSON);
@@ -101,19 +91,14 @@ public class IdealStateResource extends Resource
return presentation;
}
- StringRepresentation getIdealStateRepresentation(String clusterName, String resourceName) throws JsonGenerationException,
- JsonMappingException,
- IOException
- {
+ StringRepresentation getIdealStateRepresentation(String clusterName, String resourceName)
+ throws JsonGenerationException, JsonMappingException, IOException {
Builder keyBuilder = new PropertyKey.Builder(clusterName);
- ZkClient zkClient =
- (ZkClient) getContext().getAttributes().get(RestAdminApplication.ZKCLIENT);
+ ZkClient zkClient = (ZkClient) getContext().getAttributes().get(RestAdminApplication.ZKCLIENT);
String message =
- ClusterRepresentationUtil.getClusterPropertyAsString(zkClient,
- clusterName,
- keyBuilder.idealStates(resourceName),
- MediaType.APPLICATION_JSON);
+ ClusterRepresentationUtil.getClusterPropertyAsString(zkClient, clusterName,
+ keyBuilder.idealStates(resourceName), MediaType.APPLICATION_JSON);
StringRepresentation representation =
new StringRepresentation(message, MediaType.APPLICATION_JSON);
@@ -122,10 +107,8 @@ public class IdealStateResource extends Resource
}
@Override
- public void acceptRepresentation(Representation entity)
- {
- try
- {
+ public void acceptRepresentation(Representation entity) {
+ try {
String clusterName = (String) getRequest().getAttributes().get("clusterName");
String resourceName = (String) getRequest().getAttributes().get("resourceName");
ZkClient zkClient =
@@ -135,61 +118,40 @@ public class IdealStateResource extends Resource
JsonParameters jsonParameters = new JsonParameters(entity);
String command = jsonParameters.getCommand();
- if (command.equalsIgnoreCase(ClusterSetup.addIdealState))
- {
+ if (command.equalsIgnoreCase(ClusterSetup.addIdealState)) {
ZNRecord newIdealState = jsonParameters.getExtraParameter(JsonParameters.NEW_IDEAL_STATE);
HelixDataAccessor accessor =
ClusterRepresentationUtil.getClusterDataAccessor(zkClient, clusterName);
- accessor.setProperty(accessor.keyBuilder().idealStates(resourceName),
- new IdealState(newIdealState));
+ accessor.setProperty(accessor.keyBuilder().idealStates(resourceName), new IdealState(
+ newIdealState));
- }
- else if (command.equalsIgnoreCase(ClusterSetup.rebalance))
- {
- int replicas =
- Integer.parseInt(jsonParameters.getParameter(JsonParameters.REPLICAS));
+ } else if (command.equalsIgnoreCase(ClusterSetup.rebalance)) {
+ int replicas = Integer.parseInt(jsonParameters.getParameter(JsonParameters.REPLICAS));
String keyPrefix = jsonParameters.getParameter(JsonParameters.RESOURCE_KEY_PREFIX);
String groupTag = jsonParameters.getParameter(ClusterSetup.instanceGroupTag);
-
- setupTool.rebalanceCluster(clusterName,
- resourceName,
- replicas,
- keyPrefix,
- groupTag);
-
- }
- else if (command.equalsIgnoreCase(ClusterSetup.expandResource))
- {
+
+ setupTool.rebalanceCluster(clusterName, resourceName, replicas, keyPrefix, groupTag);
+
+ } else if (command.equalsIgnoreCase(ClusterSetup.expandResource)) {
setupTool.expandResource(clusterName, resourceName);
- }
- else if (command.equalsIgnoreCase(ClusterSetup.addResourceProperty))
- {
+ } else if (command.equalsIgnoreCase(ClusterSetup.addResourceProperty)) {
Map<String, String> parameterMap = jsonParameters.cloneParameterMap();
parameterMap.remove(JsonParameters.MANAGEMENT_COMMAND);
- for (String key : parameterMap.keySet())
- {
- setupTool.addResourceProperty(clusterName,
- resourceName,
- key,
- parameterMap.get(key));
+ for (String key : parameterMap.keySet()) {
+ setupTool.addResourceProperty(clusterName, resourceName, key, parameterMap.get(key));
}
- }
- else
- {
- throw new HelixException("Unsupported command: " + command
- + ". Should be one of [" + ClusterSetup.addIdealState + ", "
- + ClusterSetup.rebalance + ", " + ClusterSetup.expandResource + ", "
- + ClusterSetup.addResourceProperty + "]");
+ } else {
+ throw new HelixException("Unsupported command: " + command + ". Should be one of ["
+ + ClusterSetup.addIdealState + ", " + ClusterSetup.rebalance + ", "
+ + ClusterSetup.expandResource + ", " + ClusterSetup.addResourceProperty + "]");
}
getResponse().setEntity(getIdealStateRepresentation(clusterName, resourceName));
getResponse().setStatus(Status.SUCCESS_OK);
- }
- catch (Exception e)
- {
+ } catch (Exception e) {
getResponse().setEntity(ClusterRepresentationUtil.getErrorAsJsonStringFromException(e),
- MediaType.APPLICATION_JSON);
+ MediaType.APPLICATION_JSON);
getResponse().setStatus(Status.SUCCESS_OK);
LOG.error("Error in posting " + entity, e);
}
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/f414aad4/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/InstanceResource.java
----------------------------------------------------------------------
diff --git a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/InstanceResource.java b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/InstanceResource.java
index 7964dfc..8439cfb 100644
--- a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/InstanceResource.java
+++ b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/InstanceResource.java
@@ -41,52 +41,41 @@ import org.restlet.resource.Resource;
import org.restlet.resource.StringRepresentation;
import org.restlet.resource.Variant;
-
-public class InstanceResource extends Resource
-{
+public class InstanceResource extends Resource {
private final static Logger LOG = Logger.getLogger(InstanceResource.class);
- public InstanceResource(Context context, Request request, Response response)
- {
+ public InstanceResource(Context context, Request request, Response response) {
super(context, request, response);
getVariants().add(new Variant(MediaType.TEXT_PLAIN));
getVariants().add(new Variant(MediaType.APPLICATION_JSON));
}
@Override
- public boolean allowGet()
- {
+ public boolean allowGet() {
return true;
}
@Override
- public boolean allowPost()
- {
+ public boolean allowPost() {
return true;
}
@Override
- public boolean allowPut()
- {
+ public boolean allowPut() {
return false;
}
@Override
- public boolean allowDelete()
- {
+ public boolean allowDelete() {
return true;
}
@Override
- public Representation represent(Variant variant)
- {
+ public Representation represent(Variant variant) {
StringRepresentation presentation = null;
- try
- {
+ try {
presentation = getInstanceRepresentation();
- }
- catch (Exception e)
- {
+ } catch (Exception e) {
String error = ClusterRepresentationUtil.getErrorAsJsonStringFromException(e);
presentation = new StringRepresentation(error, MediaType.APPLICATION_JSON);
@@ -96,20 +85,15 @@ public class InstanceResource extends Resource
}
StringRepresentation getInstanceRepresentation() throws JsonGenerationException,
- JsonMappingException,
- IOException
- {
+ JsonMappingException, IOException {
String clusterName = (String) getRequest().getAttributes().get("clusterName");
String instanceName = (String) getRequest().getAttributes().get("instanceName");
Builder keyBuilder = new PropertyKey.Builder(clusterName);
- ZkClient zkClient =
- (ZkClient) getContext().getAttributes().get(RestAdminApplication.ZKCLIENT);
+ ZkClient zkClient = (ZkClient) getContext().getAttributes().get(RestAdminApplication.ZKCLIENT);
String message =
- ClusterRepresentationUtil.getClusterPropertyAsString(zkClient,
- clusterName,
- MediaType.APPLICATION_JSON,
- keyBuilder.instanceConfig(instanceName));
+ ClusterRepresentationUtil.getClusterPropertyAsString(zkClient, clusterName,
+ MediaType.APPLICATION_JSON, keyBuilder.instanceConfig(instanceName));
StringRepresentation representation =
new StringRepresentation(message, MediaType.APPLICATION_JSON);
@@ -118,122 +102,88 @@ public class InstanceResource extends Resource
}
@Override
- public void acceptRepresentation(Representation entity)
- {
- try
- {
+ public void acceptRepresentation(Representation entity) {
+ try {
String clusterName = (String) getRequest().getAttributes().get("clusterName");
String instanceName = (String) getRequest().getAttributes().get("instanceName");
JsonParameters jsonParameters = new JsonParameters(entity);
String command = jsonParameters.getCommand();
- if (command.equalsIgnoreCase(ClusterSetup.enableInstance))
- {
+ if (command.equalsIgnoreCase(ClusterSetup.enableInstance)) {
jsonParameters.verifyCommand(ClusterSetup.enableInstance);
- boolean enabled =
- Boolean.parseBoolean(jsonParameters.getParameter(JsonParameters.ENABLED));
+ boolean enabled = Boolean.parseBoolean(jsonParameters.getParameter(JsonParameters.ENABLED));
ZkClient zkClient =
(ZkClient) getContext().getAttributes().get(RestAdminApplication.ZKCLIENT);
ClusterSetup setupTool = new ClusterSetup(zkClient);
- setupTool.getClusterManagementTool().enableInstance(clusterName,
- instanceName,
- enabled);
- }
- else if (command.equalsIgnoreCase(ClusterSetup.enablePartition))
- {
+ setupTool.getClusterManagementTool().enableInstance(clusterName, instanceName, enabled);
+ } else if (command.equalsIgnoreCase(ClusterSetup.enablePartition)) {
jsonParameters.verifyCommand(ClusterSetup.enablePartition);
-
- boolean enabled =
- Boolean.parseBoolean(jsonParameters.getParameter(JsonParameters.ENABLED));
- String[] partitions =
- jsonParameters.getParameter(JsonParameters.PARTITION).split(";");
- String resource =
- jsonParameters.getParameter(JsonParameters.RESOURCE);
+ boolean enabled = Boolean.parseBoolean(jsonParameters.getParameter(JsonParameters.ENABLED));
+
+ String[] partitions = jsonParameters.getParameter(JsonParameters.PARTITION).split(";");
+ String resource = jsonParameters.getParameter(JsonParameters.RESOURCE);
ZkClient zkClient =
(ZkClient) getContext().getAttributes().get(RestAdminApplication.ZKCLIENT);
ClusterSetup setupTool = new ClusterSetup(zkClient);
- setupTool.getClusterManagementTool().enablePartition(enabled,
- clusterName,
- instanceName,
- resource,
- Arrays.asList(partitions));
- }
- else if (command.equalsIgnoreCase(ClusterSetup.resetPartition))
- {
+ setupTool.getClusterManagementTool().enablePartition(enabled, clusterName, instanceName,
+ resource, Arrays.asList(partitions));
+ } else if (command.equalsIgnoreCase(ClusterSetup.resetPartition)) {
jsonParameters.verifyCommand(ClusterSetup.resetPartition);
- String resource =
- jsonParameters.getParameter(JsonParameters.RESOURCE);
+ String resource = jsonParameters.getParameter(JsonParameters.RESOURCE);
ZkClient zkClient =
(ZkClient) getContext().getAttributes().get(RestAdminApplication.ZKCLIENT);
ClusterSetup setupTool = new ClusterSetup(zkClient);
- String[] partitionNames =
+ String[] partitionNames =
jsonParameters.getParameter(JsonParameters.PARTITION).split("\\s+");
- setupTool.getClusterManagementTool()
- .resetPartition(clusterName,
- instanceName,
- resource,
- Arrays.asList(partitionNames));
- }
- else if (command.equalsIgnoreCase(ClusterSetup.resetInstance))
- {
+ setupTool.getClusterManagementTool().resetPartition(clusterName, instanceName, resource,
+ Arrays.asList(partitionNames));
+ } else if (command.equalsIgnoreCase(ClusterSetup.resetInstance)) {
jsonParameters.verifyCommand(ClusterSetup.resetInstance);
ZkClient zkClient =
(ZkClient) getContext().getAttributes().get(RestAdminApplication.ZKCLIENT);
ClusterSetup setupTool = new ClusterSetup(zkClient);
- setupTool.getClusterManagementTool().resetInstance(clusterName,
- Arrays.asList(instanceName));
- }
- else if (command.equalsIgnoreCase(ClusterSetup.addInstanceTag))
- {
+ setupTool.getClusterManagementTool()
+ .resetInstance(clusterName, Arrays.asList(instanceName));
+ } else if (command.equalsIgnoreCase(ClusterSetup.addInstanceTag)) {
jsonParameters.verifyCommand(ClusterSetup.addInstanceTag);
- String tag =
- jsonParameters.getParameter(ClusterSetup.instanceGroupTag);
+ String tag = jsonParameters.getParameter(ClusterSetup.instanceGroupTag);
ZkClient zkClient =
(ZkClient) getContext().getAttributes().get(RestAdminApplication.ZKCLIENT);
ClusterSetup setupTool = new ClusterSetup(zkClient);
setupTool.getClusterManagementTool().addInstanceTag(clusterName, instanceName, tag);
- }
- else if (command.equalsIgnoreCase(ClusterSetup.removeInstanceTag))
- {
+ } else if (command.equalsIgnoreCase(ClusterSetup.removeInstanceTag)) {
jsonParameters.verifyCommand(ClusterSetup.removeInstanceTag);
- String tag =
- jsonParameters.getParameter(ClusterSetup.instanceGroupTag);
+ String tag = jsonParameters.getParameter(ClusterSetup.instanceGroupTag);
ZkClient zkClient =
(ZkClient) getContext().getAttributes().get(RestAdminApplication.ZKCLIENT);
ClusterSetup setupTool = new ClusterSetup(zkClient);
setupTool.getClusterManagementTool().removeInstanceTag(clusterName, instanceName, tag);
- }
- else
- {
- throw new HelixException("Unsupported command: " + command
- + ". Should be one of [" + ClusterSetup.enableInstance + ", "
- + ClusterSetup.enablePartition + ", " + ClusterSetup.resetInstance + "]");
+ } else {
+ throw new HelixException("Unsupported command: " + command + ". Should be one of ["
+ + ClusterSetup.enableInstance + ", " + ClusterSetup.enablePartition + ", "
+ + ClusterSetup.resetInstance + "]");
}
getResponse().setEntity(getInstanceRepresentation());
getResponse().setStatus(Status.SUCCESS_OK);
- }
- catch (Exception e)
- {
+ } catch (Exception e) {
getResponse().setEntity(ClusterRepresentationUtil.getErrorAsJsonStringFromException(e),
- MediaType.APPLICATION_JSON);
+ MediaType.APPLICATION_JSON);
getResponse().setStatus(Status.SUCCESS_OK);
LOG.error("", e);
}
}
@Override
- public void removeRepresentations()
- {
- try
- {
+ public void removeRepresentations() {
+ try {
String clusterName = (String) getRequest().getAttributes().get("clusterName");
String instanceName = (String) getRequest().getAttributes().get("instanceName");
ZkClient zkClient =
@@ -242,11 +192,9 @@ public class InstanceResource extends Resource
ClusterSetup setupTool = new ClusterSetup(zkClient);
setupTool.dropInstanceFromCluster(clusterName, instanceName);
getResponse().setStatus(Status.SUCCESS_OK);
- }
- catch (Exception e)
- {
+ } catch (Exception e) {
getResponse().setEntity(ClusterRepresentationUtil.getErrorAsJsonStringFromException(e),
- MediaType.APPLICATION_JSON);
+ MediaType.APPLICATION_JSON);
getResponse().setStatus(Status.SUCCESS_OK);
LOG.error("Error in remove", e);
}
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/f414aad4/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/InstancesResource.java
----------------------------------------------------------------------
diff --git a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/InstancesResource.java b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/InstancesResource.java
index 2042827..784a3e9 100644
--- a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/InstancesResource.java
+++ b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/InstancesResource.java
@@ -45,54 +45,44 @@ import org.restlet.resource.Resource;
import org.restlet.resource.StringRepresentation;
import org.restlet.resource.Variant;
-
-public class InstancesResource extends Resource
-{
+public class InstancesResource extends Resource {
private final static Logger LOG = Logger.getLogger(InstancesResource.class);
- public InstancesResource(Context context, Request request, Response response)
- {
+ public InstancesResource(Context context, Request request, Response response) {
super(context, request, response);
getVariants().add(new Variant(MediaType.TEXT_PLAIN));
getVariants().add(new Variant(MediaType.APPLICATION_JSON));
}
@Override
- public boolean allowGet()
- {
+ public boolean allowGet() {
return true;
}
@Override
- public boolean allowPost()
- {
+ public boolean allowPost() {
return true;
}
@Override
- public boolean allowPut()
- {
+ public boolean allowPut() {
return false;
}
@Override
- public boolean allowDelete()
- {
+ public boolean allowDelete() {
return false;
}
@Override
- public Representation represent(Variant variant)
- {
+ public Representation represent(Variant variant) {
StringRepresentation presentation = null;
- try
- {
+ try {
String clusterName = (String) getRequest().getAttributes().get("clusterName");
presentation = getInstancesRepresentation(clusterName);
}
- catch (Exception e)
- {
+ catch (Exception e) {
String error = ClusterRepresentationUtil.getErrorAsJsonStringFromException(e);
presentation = new StringRepresentation(error, MediaType.APPLICATION_JSON);
@@ -101,12 +91,9 @@ public class InstancesResource extends Resource
return presentation;
}
- StringRepresentation getInstancesRepresentation(String clusterName) throws JsonGenerationException,
- JsonMappingException,
- IOException
- {
- ZkClient zkClient =
- (ZkClient) getContext().getAttributes().get(RestAdminApplication.ZKCLIENT);
+ StringRepresentation getInstancesRepresentation(String clusterName)
+ throws JsonGenerationException, JsonMappingException, IOException {
+ ZkClient zkClient = (ZkClient) getContext().getAttributes().get(RestAdminApplication.ZKCLIENT);
HelixDataAccessor accessor =
ClusterRepresentationUtil.getClusterDataAccessor(zkClient, clusterName);
@@ -114,41 +101,35 @@ public class InstancesResource extends Resource
accessor.getChildValuesMap(accessor.keyBuilder().liveInstances());
Map<String, InstanceConfig> instanceConfigsMap =
accessor.getChildValuesMap(accessor.keyBuilder().instanceConfigs());
-
+
Map<String, List<String>> tagInstanceLists = new TreeMap<String, List<String>>();
-
- for (String instanceName : instanceConfigsMap.keySet())
- {
+
+ for (String instanceName : instanceConfigsMap.keySet()) {
boolean isAlive = liveInstancesMap.containsKey(instanceName);
- instanceConfigsMap.get(instanceName)
- .getRecord()
- .setSimpleField("Alive", isAlive + "");
+ instanceConfigsMap.get(instanceName).getRecord().setSimpleField("Alive", isAlive + "");
InstanceConfig config = instanceConfigsMap.get(instanceName);
- for(String tag : config.getTags())
- {
- if(!tagInstanceLists.containsKey(tag))
- {
+ for (String tag : config.getTags()) {
+ if (!tagInstanceLists.containsKey(tag)) {
tagInstanceLists.put(tag, new LinkedList<String>());
}
- if(!tagInstanceLists.get(tag).contains(instanceName))
- {
+ if (!tagInstanceLists.get(tag).contains(instanceName)) {
tagInstanceLists.get(tag).add(instanceName);
}
}
}
StringRepresentation representation =
- new StringRepresentation(ClusterRepresentationUtil.ObjectToJson(instanceConfigsMap.values()) + ClusterRepresentationUtil.ObjectToJson(tagInstanceLists),
- MediaType.APPLICATION_JSON);
+ new StringRepresentation(
+ ClusterRepresentationUtil.ObjectToJson(instanceConfigsMap.values())
+ + ClusterRepresentationUtil.ObjectToJson(tagInstanceLists),
+ MediaType.APPLICATION_JSON);
return representation;
}
@Override
- public void acceptRepresentation(Representation entity)
- {
- try
- {
+ public void acceptRepresentation(Representation entity) {
+ try {
String clusterName = (String) getRequest().getAttributes().get("clusterName");
JsonParameters jsonParameters = new JsonParameters(entity);
String command = jsonParameters.getCommand();
@@ -158,54 +139,37 @@ public class InstancesResource extends Resource
ClusterSetup setupTool = new ClusterSetup(zkClient);
if (command.equalsIgnoreCase(ClusterSetup.addInstance)
- || JsonParameters.CLUSTERSETUP_COMMAND_ALIASES.get(ClusterSetup.addInstance)
- .contains(command))
- {
- if (jsonParameters.getParameter(JsonParameters.INSTANCE_NAME) != null)
- {
+ || JsonParameters.CLUSTERSETUP_COMMAND_ALIASES.get(ClusterSetup.addInstance).contains(
+ command)) {
+ if (jsonParameters.getParameter(JsonParameters.INSTANCE_NAME) != null) {
setupTool.addInstanceToCluster(clusterName,
- jsonParameters.getParameter(JsonParameters.INSTANCE_NAME));
- }
- else if (jsonParameters.getParameter(JsonParameters.INSTANCE_NAMES) != null)
- {
+ jsonParameters.getParameter(JsonParameters.INSTANCE_NAME));
+ } else if (jsonParameters.getParameter(JsonParameters.INSTANCE_NAMES) != null) {
setupTool.addInstancesToCluster(clusterName,
- jsonParameters.getParameter(JsonParameters.INSTANCE_NAMES)
- .split(";"));
+ jsonParameters.getParameter(JsonParameters.INSTANCE_NAMES).split(";"));
+ } else {
+ throw new HelixException("Missing Json paramaters: '" + JsonParameters.INSTANCE_NAME
+ + "' or '" + JsonParameters.INSTANCE_NAMES + "' ");
}
- else
- {
- throw new HelixException("Missing Json paramaters: '"
- + JsonParameters.INSTANCE_NAME + "' or '" + JsonParameters.INSTANCE_NAMES
- + "' ");
- }
- }
- else if (command.equalsIgnoreCase(ClusterSetup.swapInstance))
- {
+ } else if (command.equalsIgnoreCase(ClusterSetup.swapInstance)) {
if (jsonParameters.getParameter(JsonParameters.NEW_INSTANCE) == null
- || jsonParameters.getParameter(JsonParameters.OLD_INSTANCE) == null)
- {
- throw new HelixException("Missing Json paramaters: '"
- + JsonParameters.NEW_INSTANCE + "' or '" + JsonParameters.OLD_INSTANCE
- + "' ");
+ || jsonParameters.getParameter(JsonParameters.OLD_INSTANCE) == null) {
+ throw new HelixException("Missing Json paramaters: '" + JsonParameters.NEW_INSTANCE
+ + "' or '" + JsonParameters.OLD_INSTANCE + "' ");
}
setupTool.swapInstance(clusterName,
- jsonParameters.getParameter(JsonParameters.OLD_INSTANCE),
- jsonParameters.getParameter(JsonParameters.NEW_INSTANCE));
- }
- else
- {
- throw new HelixException("Unsupported command: " + command
- + ". Should be one of [" + ClusterSetup.addInstance + ", "
- + ClusterSetup.swapInstance + "]");
+ jsonParameters.getParameter(JsonParameters.OLD_INSTANCE),
+ jsonParameters.getParameter(JsonParameters.NEW_INSTANCE));
+ } else {
+ throw new HelixException("Unsupported command: " + command + ". Should be one of ["
+ + ClusterSetup.addInstance + ", " + ClusterSetup.swapInstance + "]");
}
getResponse().setEntity(getInstancesRepresentation(clusterName));
getResponse().setStatus(Status.SUCCESS_OK);
- }
- catch (Exception e)
- {
+ } catch (Exception e) {
getResponse().setEntity(ClusterRepresentationUtil.getErrorAsJsonStringFromException(e),
- MediaType.APPLICATION_JSON);
+ MediaType.APPLICATION_JSON);
getResponse().setStatus(Status.SUCCESS_OK);
LOG.error("", e);
}
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/f414aad4/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/JsonParameters.java
----------------------------------------------------------------------
diff --git a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/JsonParameters.java b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/JsonParameters.java
index 345a55d..c8e8fc6 100644
--- a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/JsonParameters.java
+++ b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/JsonParameters.java
@@ -35,77 +35,74 @@ import org.codehaus.jackson.map.ObjectMapper;
import org.restlet.data.Form;
import org.restlet.resource.Representation;
-
-public class JsonParameters
-{
+public class JsonParameters {
// json parameter key
- public static final String JSON_PARAMETERS = "jsonParameters";
+ public static final String JSON_PARAMETERS = "jsonParameters";
// json parameter map keys
- public static final String PARTITION = "partition";
- public static final String RESOURCE = "resource";
- public static final String MANAGEMENT_COMMAND = "command";
- public static final String ENABLED = "enabled";
- public static final String GRAND_CLUSTER = "grandCluster";
- public static final String REPLICAS = "replicas";
- public static final String RESOURCE_KEY_PREFIX = "key";
- public static final String INSTANCE_NAME = "instanceName";
- public static final String INSTANCE_NAMES = "instanceNames";
- public static final String OLD_INSTANCE = "oldInstance";
- public static final String NEW_INSTANCE = "newInstance";
- public static final String CONFIGS = "configs";
- public static final String CONSTRAINT_ATTRIBUTES = "constraintAttributes";
-// public static final String CONSTRAINT_ID = "constraintId";
- public static final String CLUSTER_NAME = "clusterName";
- public static final String PARTITIONS = "partitions";
- public static final String RESOURCE_GROUP_NAME = "resourceGroupName";
- public static final String STATE_MODEL_DEF_REF = "stateModelDefRef";
- public static final String IDEAL_STATE_MODE = "mode";
- public static final String MAX_PARTITIONS_PER_NODE = "maxPartitionsPerNode";
- public static final String BUCKET_SIZE = "bucketSize";
-
+ public static final String PARTITION = "partition";
+ public static final String RESOURCE = "resource";
+ public static final String MANAGEMENT_COMMAND = "command";
+ public static final String ENABLED = "enabled";
+ public static final String GRAND_CLUSTER = "grandCluster";
+ public static final String REPLICAS = "replicas";
+ public static final String RESOURCE_KEY_PREFIX = "key";
+ public static final String INSTANCE_NAME = "instanceName";
+ public static final String INSTANCE_NAMES = "instanceNames";
+ public static final String OLD_INSTANCE = "oldInstance";
+ public static final String NEW_INSTANCE = "newInstance";
+ public static final String CONFIGS = "configs";
+ public static final String CONSTRAINT_ATTRIBUTES = "constraintAttributes";
+ // public static final String CONSTRAINT_ID = "constraintId";
+ public static final String CLUSTER_NAME = "clusterName";
+ public static final String PARTITIONS = "partitions";
+ public static final String RESOURCE_GROUP_NAME = "resourceGroupName";
+ public static final String STATE_MODEL_DEF_REF = "stateModelDefRef";
+ public static final String IDEAL_STATE_MODE = "mode";
+ public static final String MAX_PARTITIONS_PER_NODE = "maxPartitionsPerNode";
+ public static final String BUCKET_SIZE = "bucketSize";
// zk commands
- public static final String ZK_DELETE_CHILDREN = "zkDeleteChildren";
+ public static final String ZK_DELETE_CHILDREN = "zkDeleteChildren";
// extra json parameter map keys
- public static final String NEW_IDEAL_STATE = "newIdealState";
- public static final String NEW_STATE_MODEL_DEF = "newStateModelDef";
+ public static final String NEW_IDEAL_STATE = "newIdealState";
+ public static final String NEW_STATE_MODEL_DEF = "newStateModelDef";
public static final String TAG = "tag";
// aliases for ClusterSetup commands
public static Map<String, Set<String>> CLUSTERSETUP_COMMAND_ALIASES;
- static
- {
+ static {
CLUSTERSETUP_COMMAND_ALIASES = new HashMap<String, Set<String>>();
CLUSTERSETUP_COMMAND_ALIASES.put(ClusterSetup.addResource,
- new HashSet<String>(Arrays.asList(new String[] { "addResourceGroup" })));
+ new HashSet<String>(Arrays.asList(new String[] {
+ "addResourceGroup"
+ })));
CLUSTERSETUP_COMMAND_ALIASES.put(ClusterSetup.activateCluster,
- new HashSet<String>(Arrays.asList(new String[] { "enableStorageCluster" })));
+ new HashSet<String>(Arrays.asList(new String[] {
+ "enableStorageCluster"
+ })));
CLUSTERSETUP_COMMAND_ALIASES.put(ClusterSetup.addInstance,
- new HashSet<String>(Arrays.asList(new String[] { "addInstance" })));
+ new HashSet<String>(Arrays.asList(new String[] {
+ "addInstance"
+ })));
}
// parameter map
- final Map<String, String> _parameterMap;
+ final Map<String, String> _parameterMap;
// extra parameters map
- final Map<String, ZNRecord> _extraParameterMap =
- new HashMap<String, ZNRecord>();
+ final Map<String, ZNRecord> _extraParameterMap = new HashMap<String, ZNRecord>();
- public JsonParameters(Representation entity) throws Exception
- {
+ public JsonParameters(Representation entity) throws Exception {
Form form = new Form(entity);
// get parameters in String format
String jsonPayload = form.getFirstValue(JSON_PARAMETERS, true);
- if (jsonPayload == null || jsonPayload.isEmpty())
- {
+ if (jsonPayload == null || jsonPayload.isEmpty()) {
_parameterMap = Collections.emptyMap();
- }
- else
- {
+ } else {
_parameterMap = ClusterRepresentationUtil.JsonToMap(jsonPayload);
}
@@ -113,164 +110,117 @@ public class JsonParameters
ObjectMapper mapper = new ObjectMapper();
String newIdealStateString = form.getFirstValue(NEW_IDEAL_STATE, true);
- if (newIdealStateString != null)
- {
+ if (newIdealStateString != null) {
ZNRecord newIdealState =
mapper.readValue(new StringReader(newIdealStateString), ZNRecord.class);
_extraParameterMap.put(NEW_IDEAL_STATE, newIdealState);
}
String newStateModelString = form.getFirstValue(NEW_STATE_MODEL_DEF, true);
- if (newStateModelString != null)
- {
+ if (newStateModelString != null) {
ZNRecord newStateModel =
mapper.readValue(new StringReader(newStateModelString), ZNRecord.class);
_extraParameterMap.put(NEW_STATE_MODEL_DEF, newStateModel);
}
}
- public String getParameter(String key)
- {
+ public String getParameter(String key) {
return _parameterMap.get(key);
}
- public String getCommand()
- {
- String command = _parameterMap.get(MANAGEMENT_COMMAND);
+ public String getCommand() {
+ String command = _parameterMap.get(MANAGEMENT_COMMAND);
return command;
}
- public ZNRecord getExtraParameter(String key)
- {
+ public ZNRecord getExtraParameter(String key) {
return _extraParameterMap.get(key);
}
- public Map<String, String> cloneParameterMap()
- {
+ public Map<String, String> cloneParameterMap() {
Map<String, String> parameterMap = new TreeMap<String, String>();
parameterMap.putAll(_parameterMap);
return parameterMap;
}
- public void verifyCommand(String command)
- {
+ public void verifyCommand(String command) {
// verify command itself
- if (_parameterMap.isEmpty())
- {
+ if (_parameterMap.isEmpty()) {
throw new HelixException("'" + JSON_PARAMETERS + "' in the POST body is empty");
}
- if (!_parameterMap.containsKey(MANAGEMENT_COMMAND))
- {
- throw new HelixException("Missing management paramater '" + MANAGEMENT_COMMAND
- + "'");
+ if (!_parameterMap.containsKey(MANAGEMENT_COMMAND)) {
+ throw new HelixException("Missing management paramater '" + MANAGEMENT_COMMAND + "'");
}
if (!_parameterMap.get(MANAGEMENT_COMMAND).equalsIgnoreCase(command)
- && !(CLUSTERSETUP_COMMAND_ALIASES.get(command) != null && CLUSTERSETUP_COMMAND_ALIASES.get(command)
- .contains(_parameterMap.get(MANAGEMENT_COMMAND))))
- {
+ && !(CLUSTERSETUP_COMMAND_ALIASES.get(command) != null && CLUSTERSETUP_COMMAND_ALIASES.get(
+ command).contains(_parameterMap.get(MANAGEMENT_COMMAND)))) {
throw new HelixException(MANAGEMENT_COMMAND + " must be '" + command + "'");
}
// verify command parameters
- if (command.equalsIgnoreCase(ClusterSetup.enableInstance))
- {
- if (!_parameterMap.containsKey(ENABLED))
- {
+ if (command.equalsIgnoreCase(ClusterSetup.enableInstance)) {
+ if (!_parameterMap.containsKey(ENABLED)) {
throw new HelixException("Missing Json parameters: '" + ENABLED + "'");
}
- }
- else if (command.equalsIgnoreCase(ClusterSetup.enablePartition))
- {
- if (!_parameterMap.containsKey(ENABLED))
- {
+ } else if (command.equalsIgnoreCase(ClusterSetup.enablePartition)) {
+ if (!_parameterMap.containsKey(ENABLED)) {
throw new HelixException("Missing Json parameters: '" + ENABLED + "'");
}
- if (!_parameterMap.containsKey(PARTITION))
- {
+ if (!_parameterMap.containsKey(PARTITION)) {
throw new HelixException("Missing Json parameters: '" + PARTITION + "'");
}
- if (!_parameterMap.containsKey(RESOURCE))
- {
+ if (!_parameterMap.containsKey(RESOURCE)) {
throw new HelixException("Missing Json parameters: '" + RESOURCE + "'");
}
- }
- else if (command.equalsIgnoreCase(ClusterSetup.resetPartition))
- {
- if (!_parameterMap.containsKey(PARTITION))
- {
+ } else if (command.equalsIgnoreCase(ClusterSetup.resetPartition)) {
+ if (!_parameterMap.containsKey(PARTITION)) {
throw new HelixException("Missing Json parameters: '" + PARTITION + "'");
}
- if (!_parameterMap.containsKey(RESOURCE))
- {
+ if (!_parameterMap.containsKey(RESOURCE)) {
throw new HelixException("Missing Json parameters: '" + RESOURCE + "'");
}
- }
- else if (command.equalsIgnoreCase(ClusterSetup.resetInstance))
- {
+ } else if (command.equalsIgnoreCase(ClusterSetup.resetInstance)) {
// nothing
- }
- else if (command.equalsIgnoreCase(ClusterSetup.activateCluster))
- {
- if (!_parameterMap.containsKey(GRAND_CLUSTER))
- {
+ } else if (command.equalsIgnoreCase(ClusterSetup.activateCluster)) {
+ if (!_parameterMap.containsKey(GRAND_CLUSTER)) {
throw new HelixException("Missing Json parameters: '" + GRAND_CLUSTER + "'");
}
- }
- else if (command.equalsIgnoreCase(ClusterSetup.setConfig))
- {
- if (!_parameterMap.containsKey(CONFIGS))
- {
+ } else if (command.equalsIgnoreCase(ClusterSetup.setConfig)) {
+ if (!_parameterMap.containsKey(CONFIGS)) {
throw new HelixException("Missing Json parameters: '" + CONFIGS + "'");
}
- }
- else if (command.equalsIgnoreCase(ClusterSetup.removeConfig))
- {
- if (!_parameterMap.containsKey(CONFIGS))
- {
+ } else if (command.equalsIgnoreCase(ClusterSetup.removeConfig)) {
+ if (!_parameterMap.containsKey(CONFIGS)) {
throw new HelixException("Missing Json parameters: '" + CONFIGS + "'");
}
- }
- else if (command.equalsIgnoreCase(ClusterSetup.addInstanceTag))
- {
- if (!_parameterMap.containsKey(ClusterSetup.instanceGroupTag))
- {
+ } else if (command.equalsIgnoreCase(ClusterSetup.addInstanceTag)) {
+ if (!_parameterMap.containsKey(ClusterSetup.instanceGroupTag)) {
throw new HelixException("Missing Json parameters: '" + ClusterSetup.instanceGroupTag + "'");
}
- }
- else if (command.equalsIgnoreCase(ClusterSetup.removeInstanceTag))
- {
- if (!_parameterMap.containsKey(ClusterSetup.instanceGroupTag))
- {
+ } else if (command.equalsIgnoreCase(ClusterSetup.removeInstanceTag)) {
+ if (!_parameterMap.containsKey(ClusterSetup.instanceGroupTag)) {
throw new HelixException("Missing Json parameters: '" + ClusterSetup.instanceGroupTag + "'");
}
- }
- else if (command.equalsIgnoreCase(ClusterSetup.addCluster))
- {
- if (!_parameterMap.containsKey(CLUSTER_NAME))
- {
+ } else if (command.equalsIgnoreCase(ClusterSetup.addCluster)) {
+ if (!_parameterMap.containsKey(CLUSTER_NAME)) {
throw new HelixException("Missing Json parameters: '" + CLUSTER_NAME + "'");
}
- }
- else if (command.equalsIgnoreCase(ClusterSetup.addResource))
- {
- if (!_parameterMap.containsKey(RESOURCE_GROUP_NAME))
- {
+ } else if (command.equalsIgnoreCase(ClusterSetup.addResource)) {
+ if (!_parameterMap.containsKey(RESOURCE_GROUP_NAME)) {
throw new HelixException("Missing Json paramaters: '" + RESOURCE_GROUP_NAME + "'");
}
- if (!_parameterMap.containsKey(PARTITIONS))
- {
+ if (!_parameterMap.containsKey(PARTITIONS)) {
throw new HelixException("Missing Json paramaters: '" + PARTITIONS + "'");
}
- if (!_parameterMap.containsKey(STATE_MODEL_DEF_REF))
- {
+ if (!_parameterMap.containsKey(STATE_MODEL_DEF_REF)) {
throw new HelixException("Missing Json paramaters: '" + STATE_MODEL_DEF_REF + "'");
}
@@ -278,8 +228,7 @@ public class JsonParameters
}
// temp test
- public static void main(String[] args) throws Exception
- {
+ public static void main(String[] args) throws Exception {
String jsonPayload =
"{\"command\":\"resetPartition\",\"resource\": \"DB-1\",\"partition\":\"DB-1_22 DB-1_23\"}";
Map<String, String> map = ClusterRepresentationUtil.JsonToMap(jsonPayload);
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/f414aad4/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ResourceGroupResource.java
----------------------------------------------------------------------
diff --git a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ResourceGroupResource.java b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ResourceGroupResource.java
index e717d53..365b212 100644
--- a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ResourceGroupResource.java
+++ b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ResourceGroupResource.java
@@ -41,55 +41,45 @@ import org.restlet.resource.Resource;
import org.restlet.resource.StringRepresentation;
import org.restlet.resource.Variant;
-
-public class ResourceGroupResource extends Resource
-{
+public class ResourceGroupResource extends Resource {
private final static Logger LOG = Logger.getLogger(ResourceGroupResource.class);
- public ResourceGroupResource(Context context, Request request, Response response)
- {
+ public ResourceGroupResource(Context context, Request request, Response response) {
super(context, request, response);
getVariants().add(new Variant(MediaType.TEXT_PLAIN));
getVariants().add(new Variant(MediaType.APPLICATION_JSON));
}
@Override
- public boolean allowGet()
- {
+ public boolean allowGet() {
return true;
}
@Override
- public boolean allowPost()
- {
+ public boolean allowPost() {
return true;
}
@Override
- public boolean allowPut()
- {
+ public boolean allowPut() {
return false;
}
@Override
- public boolean allowDelete()
- {
+ public boolean allowDelete() {
return true;
}
@Override
- public Representation represent(Variant variant)
- {
+ public Representation represent(Variant variant) {
StringRepresentation presentation = null;
- try
- {
+ try {
String clusterName = (String) getRequest().getAttributes().get("clusterName");
String resourceName = (String) getRequest().getAttributes().get("resourceName");
presentation = getIdealStateRepresentation(clusterName, resourceName);
}
- catch (Exception e)
- {
+ catch (Exception e) {
String error = ClusterRepresentationUtil.getErrorAsJsonStringFromException(e);
presentation = new StringRepresentation(error, MediaType.APPLICATION_JSON);
@@ -98,19 +88,14 @@ public class ResourceGroupResource extends Resource
return presentation;
}
- StringRepresentation getIdealStateRepresentation(String clusterName, String resourceName) throws JsonGenerationException,
- JsonMappingException,
- IOException
- {
+ StringRepresentation getIdealStateRepresentation(String clusterName, String resourceName)
+ throws JsonGenerationException, JsonMappingException, IOException {
Builder keyBuilder = new PropertyKey.Builder(clusterName);
- ZkClient zkClient =
- (ZkClient) getContext().getAttributes().get(RestAdminApplication.ZKCLIENT);
+ ZkClient zkClient = (ZkClient) getContext().getAttributes().get(RestAdminApplication.ZKCLIENT);
String message =
- ClusterRepresentationUtil.getClusterPropertyAsString(zkClient,
- clusterName,
- keyBuilder.idealStates(resourceName),
- MediaType.APPLICATION_JSON);
+ ClusterRepresentationUtil.getClusterPropertyAsString(zkClient, clusterName,
+ keyBuilder.idealStates(resourceName), MediaType.APPLICATION_JSON);
StringRepresentation representation =
new StringRepresentation(message, MediaType.APPLICATION_JSON);
@@ -119,56 +104,45 @@ public class ResourceGroupResource extends Resource
}
@Override
- public void removeRepresentations()
- {
- try
- {
+ public void removeRepresentations() {
+ try {
String clusterName = (String) getRequest().getAttributes().get("clusterName");
- String resourceGroupName =
- (String) getRequest().getAttributes().get("resourceName");
+ String resourceGroupName = (String) getRequest().getAttributes().get("resourceName");
ZkClient zkClient =
(ZkClient) getContext().getAttributes().get(RestAdminApplication.ZKCLIENT);
-
+
ClusterSetup setupTool = new ClusterSetup(zkClient);
setupTool.dropResourceFromCluster(clusterName, resourceGroupName);
getResponse().setStatus(Status.SUCCESS_OK);
- }
- catch (Exception e)
- {
+ } catch (Exception e) {
getResponse().setEntity(ClusterRepresentationUtil.getErrorAsJsonStringFromException(e),
- MediaType.APPLICATION_JSON);
+ MediaType.APPLICATION_JSON);
getResponse().setStatus(Status.SUCCESS_OK);
LOG.error("", e);
}
}
@Override
- public void acceptRepresentation(Representation entity)
- {
- try
- {
+ public void acceptRepresentation(Representation entity) {
+ try {
String clusterName = (String) getRequest().getAttributes().get("clusterName");
String resourceName = (String) getRequest().getAttributes().get("resourceName");
JsonParameters jsonParameters = new JsonParameters(entity);
String command = jsonParameters.getCommand();
- if (command.equalsIgnoreCase(ClusterSetup.resetResource))
- {
+ if (command.equalsIgnoreCase(ClusterSetup.resetResource)) {
ZkClient zkClient =
(ZkClient) getContext().getAttributes().get(RestAdminApplication.ZKCLIENT);
ClusterSetup setupTool = new ClusterSetup(zkClient);
- setupTool.getClusterManagementTool().resetResource(clusterName, Arrays.asList(resourceName));
+ setupTool.getClusterManagementTool()
+ .resetResource(clusterName, Arrays.asList(resourceName));
+ } else {
+ throw new HelixException("Unsupported command: " + command + ". Should be one of ["
+ + ClusterSetup.resetResource + "]");
}
- else
- {
- throw new HelixException("Unsupported command: " + command
- + ". Should be one of [" + ClusterSetup.resetResource + "]");
- }
- }
- catch (Exception e)
- {
+ } catch (Exception e) {
getResponse().setEntity(ClusterRepresentationUtil.getErrorAsJsonStringFromException(e),
- MediaType.APPLICATION_JSON);
+ MediaType.APPLICATION_JSON);
getResponse().setStatus(Status.SUCCESS_OK);
LOG.error("", e);
}