- * All fields in this class will be initialized by {@link com.google.gson.Gson#fromJson(String, Class)}, - * ignore the un-assign values warning. + * Ack span module
All fields in this class will be initialized by {@link
+ * com.google.gson.Gson#fromJson(String, Class)}, ignore the un-assign values warning.
*/
public class AckSpanModule {
private String traceId;
- private String parentLevelId = "";
- private int levelId = 0;
+ private String parentLevelId;
+ private int levelId = 0;
private long cost;
- private int routeKey;
+ private int routeKey;
private Map
- * All fields in this class will be initialized by {@link com.google.gson.Gson#fromJson(String, Class)},
- * ignore the un-assign values warning.
+ * request span module All fields in this class will be initialized by {@link
+ * com.google.gson.Gson#fromJson(String, Class)}, ignore the un-assign values warning.
*/
public class RequestSpanModule {
private String traceId;
- private String parentLevelId = "";
- private int levelId;
- private long startTime;
- private int routeKey;
+ private String parentLevelId;
+ private int levelId;
+ private long startTime;
+ private int routeKey;
private Map
@@ -11,19 +14,19 @@ public enum ResponseMessage {
/**
* Request span or Ack Span are received and parsed without any errors.
*/
- OK(200, "Store success"),
+ OK(NanoHTTPD.Response.Status.OK, "Store success"),
/**
* Request a no-supported service.
*/
- GET_NOT_SUPPORT(405, "Get method not support"),
+ GET_NOT_SUPPORT(NanoHTTPD.Response.Status.METHOD_NOT_ALLOWED, "Get method not support"),
/**
* An internal error occurs.
*/
- SERVER_ERROR(500, "Server error"),
+ SERVER_ERROR(NanoHTTPD.Response.Status.INTERNAL_ERROR, "Server error"),
/**
* No service found. Also mean not provide this service.
*/
- NOT_FOUND(404, "Not found");
+ NOT_FOUND(NanoHTTPD.Response.Status.NOT_FOUND, "Not found");
/**
* The {@link String} represents the return message of the http services.
@@ -31,13 +34,24 @@ public enum ResponseMessage {
*/
private String message;
- ResponseMessage(int code, String message) {
+
+ /**
+ *
+ */
+ private NanoHTTPD.Response.IStatus status;
+
+ ResponseMessage(NanoHTTPD.Response.Status status, String message) {
+ this.status = status;
JsonObject messageFormatter = new JsonObject();
- messageFormatter.addProperty("code", code);
+ messageFormatter.addProperty("code", status.getRequestStatus());
messageFormatter.addProperty("message", message);
this.message = messageFormatter.toString();
}
+ public NanoHTTPD.Response.IStatus getStatus() {
+ return status;
+ }
+
/**
* @return the return message of the http services.
*/
diff --git a/skywalking-storage-center/skywalking-routing/src/test/java/com/a/eye/skywalking/routing/http/ResponseResult.java b/skywalking-storage-center/skywalking-routing/src/test/java/com/a/eye/skywalking/routing/http/ResponseResult.java
index 4a7a026e8d41057168f9ef91a2061c766a30128f..70e4a8b30c017d5f15b77adb8378db1ee0f00e8c 100644
--- a/skywalking-storage-center/skywalking-routing/src/test/java/com/a/eye/skywalking/routing/http/ResponseResult.java
+++ b/skywalking-storage-center/skywalking-routing/src/test/java/com/a/eye/skywalking/routing/http/ResponseResult.java
@@ -1,8 +1,9 @@
package com.a.eye.skywalking.routing.http;
-import com.google.gson.Gson;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
-import com.a.eye.skywalking.routing.http.module.ResponseMessage;
/**
* Created by xin on 2017/1/10.
@@ -16,8 +17,9 @@ public class ResponseResult {
this.responseBody = responseBody;
}
- public ResponseMessage getResponseMessage() {
- return new Gson().fromJson(responseBody, ResponseMessage.class);
+ public JsonObject getResponseMessage() {
+ JsonParser jsonParser = new JsonParser();
+ return (JsonObject) jsonParser.parse(responseBody);
}
public int getStatusCode(){
diff --git a/skywalking-storage-center/skywalking-routing/src/test/java/com/a/eye/skywalking/routing/http/RestfulAPIServiceTest.java b/skywalking-storage-center/skywalking-routing/src/test/java/com/a/eye/skywalking/routing/http/RestfulAPIServiceTest.java
index 13515b5114c7763f068295e93a8c9120633161c8..2f7905242f6d99749370ebedc3d3573757998853 100644
--- a/skywalking-storage-center/skywalking-routing/src/test/java/com/a/eye/skywalking/routing/http/RestfulAPIServiceTest.java
+++ b/skywalking-storage-center/skywalking-routing/src/test/java/com/a/eye/skywalking/routing/http/RestfulAPIServiceTest.java
@@ -1,6 +1,9 @@
package com.a.eye.skywalking.routing.http;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+
import com.a.eye.skywalking.routing.http.module.ResponseMessage;
import org.junit.After;
@@ -28,17 +31,15 @@ public class RestfulAPIServiceTest {
@Test
public void testRequestMethodWithGet() throws IOException {
ResponseResult responseResult = HttpClientUtil.doGet(REST_URL_PREFIX);
- assertEquals(200, responseResult.getStatusCode());
- ResponseMessage responseMessage = responseResult.getResponseMessage();
- assertEquals(403, responseMessage.getCode());
+ assertEquals(405, responseResult.getStatusCode());
+ validateResponseCode(405, responseResult);
}
@Test
public void testRequestMethodWithWrongURL() throws IOException {
ResponseResult responseResult = HttpClientUtil.doPost(REST_URL_PREFIX, "{}");
- assertEquals(200, responseResult.getStatusCode());
- ResponseMessage responseMessage = responseResult.getResponseMessage();
- assertEquals(404, responseMessage.getCode());
+ assertEquals(404, responseResult.getStatusCode());
+ validateResponseCode(404, responseResult);
}
@Test
@@ -58,8 +59,7 @@ public class RestfulAPIServiceTest {
" }\n" +
"}]");
assertEquals(200, responseResult.getStatusCode());
- ResponseMessage responseMessage = responseResult.getResponseMessage();
- assertEquals(200, responseMessage.getCode());
+ validateResponseCode(200, responseResult);
}
@Test
@@ -84,11 +84,9 @@ public class RestfulAPIServiceTest {
"}]");
assertEquals(200, responseResult.getStatusCode());
- ResponseMessage responseMessage = responseResult.getResponseMessage();
- assertEquals(200, responseMessage.getCode());
+ validateResponseCode(200, responseResult);
}
-
@Test
public void testAddWithErrorRequestSpanJson() throws IOException {
ResponseResult responseResult = HttpClientUtil.doPost
@@ -110,9 +108,14 @@ public class RestfulAPIServiceTest {
" }\n" +
"}");
- assertEquals(200, responseResult.getStatusCode());
- ResponseMessage responseMessage = responseResult.getResponseMessage();
- assertEquals(500, responseMessage.getCode());
+ assertEquals(500, responseResult.getStatusCode());
+ validateResponseCode(500, responseResult);
+ }
+
+
+ private void validateResponseCode(int expectedCode, ResponseResult responseResult) {
+ JsonObject responseJson = responseResult.getResponseMessage();
+ assertEquals(expectedCode, responseJson.get("code").getAsInt());
}
@After