Repository: incubator-apex-core
Updated Branches:
refs/heads/master 264a4f3a4 -> fbfa65b68
APEXCORE-350 clear content-type header for each request, otherwise there will
be two conflicting content-type headers for each response
Conflicts:
engine/src/main/java/com/datatorrent/stram/webapp/StramWebServices.java
Conflicts:
engine/src/main/java/com/datatorrent/stram/webapp/StramWebServices.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/d99314da
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/d99314da
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/d99314da
Branch: refs/heads/master
Commit: d99314da1be66e47b49595027052375e9888838a
Parents: b81468c
Author: David Yan <[email protected]>
Authored: Fri Feb 19 09:58:44 2016 -0800
Committer: David Yan <[email protected]>
Committed: Fri Feb 19 18:37:13 2016 -0800
----------------------------------------------------------------------
.../stram/webapp/StramWebServices.java | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/d99314da/engine/src/main/java/com/datatorrent/stram/webapp/StramWebServices.java
----------------------------------------------------------------------
diff --git
a/engine/src/main/java/com/datatorrent/stram/webapp/StramWebServices.java
b/engine/src/main/java/com/datatorrent/stram/webapp/StramWebServices.java
index f735253..f11741e 100644
--- a/engine/src/main/java/com/datatorrent/stram/webapp/StramWebServices.java
+++ b/engine/src/main/java/com/datatorrent/stram/webapp/StramWebServices.java
@@ -199,6 +199,7 @@ public class StramWebServices
@Produces(MediaType.APPLICATION_JSON)
public JSONObject getPhysicalPlan() throws Exception
{
+ init();
Map<String, Object> result = new HashMap<String, Object>();
result.put("operators", dagManager.getOperatorInfoList());
result.put("streams", dagManager.getStreamInfoList());
@@ -279,6 +280,7 @@ public class StramWebServices
@Produces(MediaType.APPLICATION_JSON)
public JSONObject getOperatorClasses(@QueryParam("q") String searchTerm,
@QueryParam("parent") String parent)
{
+ init();
JSONObject result = new JSONObject();
JSONArray classNames = new JSONArray();
@@ -316,6 +318,7 @@ public class StramWebServices
@SuppressWarnings("unchecked")
public JSONObject describeOperator(@PathParam("className") String className)
{
+ init();
if (className == null) {
throw new UnsupportedOperationException();
}
@@ -338,6 +341,7 @@ public class StramWebServices
@Produces(MediaType.APPLICATION_JSON)
public JSONObject shutdown()
{
+ init();
LOG.debug("Shutdown requested");
dagManager.shutdownAllContainers("Shutdown requested externally.");
return new JSONObject();
@@ -359,6 +363,7 @@ public class StramWebServices
@Produces(MediaType.APPLICATION_JSON)
public JSONObject startRecording(@PathParam("opId") int opId, String
content) throws JSONException
{
+ init();
LOG.debug("Start recording on {} requested", opId);
JSONObject response = new JSONObject();
long numWindows = 0;
@@ -377,6 +382,7 @@ public class StramWebServices
@Produces(MediaType.APPLICATION_JSON)
public JSONObject startRecording(@PathParam("opId") int opId,
@PathParam("portName") String portName, String content) throws JSONException
{
+ init();
LOG.debug("Start recording on {}.{} requested", opId, portName);
JSONObject response = new JSONObject();
long numWindows = 0;
@@ -395,6 +401,7 @@ public class StramWebServices
@Produces(MediaType.APPLICATION_JSON)
public JSONObject stopRecording(@PathParam("opId") int opId)
{
+ init();
LOG.debug("Start recording on {} requested", opId);
JSONObject response = new JSONObject();
dagManager.stopRecording(opId, null);
@@ -406,6 +413,7 @@ public class StramWebServices
@Produces(MediaType.APPLICATION_JSON)
public JSONObject stopRecording(@PathParam("opId") int opId,
@PathParam("portName") String portName)
{
+ init();
LOG.debug("Stop recording on {}.{} requested", opId, portName);
JSONObject response = new JSONObject();
dagManager.stopRecording(opId, portName);
@@ -478,6 +486,7 @@ public class StramWebServices
@Produces(MediaType.APPLICATION_JSON)
public JSONObject killContainer(@PathParam("containerId") String containerId)
{
+ init();
JSONObject response = new JSONObject();
if
(containerId.equals(System.getenv(ApplicationConstants.Environment.CONTAINER_ID.toString())))
{
LOG.info("Received a kill request on application master container.
Exiting.");
@@ -508,6 +517,7 @@ public class StramWebServices
@Produces(MediaType.APPLICATION_JSON)
public JSONObject getLogicalOperators() throws Exception
{
+ init();
LogicalOperatorsInfo nodeList = new LogicalOperatorsInfo();
nodeList.operators = dagManager.getLogicalOperatorInfoList();
return new JSONObject(objectMapper.writeValueAsString(nodeList));
@@ -518,6 +528,7 @@ public class StramWebServices
@Produces(MediaType.APPLICATION_JSON)
public JSONObject getLogicalOperator(@PathParam("operatorName") String
operatorName) throws Exception
{
+ init();
OperatorMeta logicalOperator =
dagManager.getLogicalPlan().getOperatorMeta(operatorName);
if (logicalOperator == null) {
throw new NotFoundException();
@@ -532,6 +543,7 @@ public class StramWebServices
@Produces(MediaType.APPLICATION_JSON)
public JSONObject getOperatorAggregation(@PathParam("operatorName") String
operatorName) throws Exception
{
+ init();
OperatorMeta logicalOperator =
dagManager.getLogicalPlan().getOperatorMeta(operatorName);
if (logicalOperator == null) {
throw new NotFoundException();
@@ -598,6 +610,7 @@ public class StramWebServices
@Produces(MediaType.APPLICATION_JSON)
public JSONObject getOperatorAttributes(@PathParam("operatorName") String
operatorName, @QueryParam("attributeName") String attributeName)
{
+ init();
OperatorMeta logicalOperator =
dagManager.getLogicalPlan().getOperatorMeta(operatorName);
if (logicalOperator == null) {
throw new NotFoundException();
@@ -617,6 +630,7 @@ public class StramWebServices
@Produces(MediaType.APPLICATION_JSON)
public JSONObject getApplicationAttributes(@QueryParam("attributeName")
String attributeName)
{
+ init();
HashMap<String, String> map = new HashMap<>();
for (Entry<Attribute<?>, Object> entry :
dagManager.getApplicationAttributes().entrySet()) {
if (attributeName == null ||
entry.getKey().getSimpleName().equals(attributeName)) {
@@ -632,6 +646,7 @@ public class StramWebServices
@Produces(MediaType.APPLICATION_JSON)
public JSONObject getPorts(@PathParam("operatorName") String operatorName)
{
+ init();
OperatorMeta logicalOperator =
dagManager.getLogicalPlan().getOperatorMeta(operatorName);
Set<LogicalPlan.InputPortMeta> inputPorts;
Set<LogicalPlan.OutputPortMeta> outputPorts;
@@ -703,6 +718,7 @@ public class StramWebServices
@Produces(MediaType.APPLICATION_JSON)
public JSONObject getPort(@PathParam("operatorName") String operatorName,
@PathParam("portName") String portName)
{
+ init();
OperatorMeta logicalOperator =
dagManager.getLogicalPlan().getOperatorMeta(operatorName);
Set<LogicalPlan.InputPortMeta> inputPorts;
Set<LogicalPlan.OutputPortMeta> outputPorts;
@@ -734,6 +750,7 @@ public class StramWebServices
@Produces(MediaType.APPLICATION_JSON)
public JSONObject getPortAttributes(@PathParam("operatorName") String
operatorName, @PathParam("portName") String portName,
@QueryParam("attributeName") String attributeName)
{
+ init();
OperatorMeta logicalOperator =
dagManager.getLogicalPlan().getOperatorMeta(operatorName);
if (logicalOperator == null) {
throw new NotFoundException();
@@ -797,6 +814,7 @@ public class StramWebServices
@Produces(MediaType.APPLICATION_JSON)
public JSONObject getPhysicalOperatorProperties(@PathParam("operatorId") int
operatorId, @QueryParam("propertyName") String propertyName,
@QueryParam("waitTime") long waitTime)
{
+ init();
if (waitTime == 0) {
waitTime = WAIT_TIME;
}
@@ -821,6 +839,7 @@ public class StramWebServices
@Produces(MediaType.APPLICATION_JSON)
public JSONObject getLogicalPlan(@QueryParam("includeModules") String
includeModules) throws JSONException, IOException
{
+ init();
return new
JSONObject(objectMapper.writeValueAsString(LogicalPlanSerializer.convertToMap(
dagManager.getLogicalPlan(), includeModules != null)));
}
@@ -831,6 +850,7 @@ public class StramWebServices
@Produces(MediaType.APPLICATION_JSON)
public JSONObject logicalPlanModification(JSONObject request)
{
+ init();
JSONObject response = new JSONObject();
try {
JSONArray jsonArray = request.getJSONArray("requests");
