diff --git a/src/main/Main.java b/src/main/Main.java index e3d7e02..801ae90 100644 --- a/src/main/Main.java +++ b/src/main/Main.java @@ -2,7 +2,9 @@ import java.util.ArrayList; -import main.RestApi.Method; +import restfulchecker.RestApi; +import restfulchecker.RestParam; +import restfulchecker.RestApi.Method; public class Main { static RestApi api = new RestApi(); diff --git a/src/main/RestAccount.java b/src/main/RestAccount.java deleted file mode 100644 index 3cc824c..0000000 --- a/src/main/RestAccount.java +++ /dev/null @@ -1,12 +0,0 @@ -package main; - -import org.ntlab.radishforandroidstudio.framework.network.HttpAsyncConnection; - -public class RestAccount extends HttpAsyncConnection { - - public RestAccount(String url) { - super(url); - // TODO Auto-generated constructor stub - } - -} diff --git a/src/main/RestApi.java b/src/main/RestApi.java deleted file mode 100644 index aea0008..0000000 --- a/src/main/RestApi.java +++ /dev/null @@ -1,109 +0,0 @@ -package main; - -import java.util.ArrayList; -import java.util.Iterator; - -public class RestApi { - private ArrayList accounts = new ArrayList<>(); - private ArrayList results = new ArrayList<>(); - private ArrayList responses = new ArrayList<>(); - private Method type; - private ArrayList queryParam; - private ArrayList formParam; - private ArrayList pathParam; - private String judgeResult; - public static final int ACCOUNT_NUM = 5; - - public void setAccount(String url) { - for (int i = 0; i < ACCOUNT_NUM; i++) - accounts.add(new RestAccount(url)); - } - - public ArrayList getAccounts() { - return accounts; - } - - public ArrayList getResults() { - return results; - } - - public String getJudgeResult() { - return judgeResult; - } - - public void setupRestTest(Method method, ArrayList queryParam, ArrayList formParam, - ArrayList pathParam) { - this.type = method; - this.queryParam = queryParam; - this.formParam = formParam; - this.pathParam = pathParam; - } - - public void doRestTest() { - if (type == null) - return; - for (RestAccount account : accounts) { - switch (type) { - case GET: - account.doGet(); - break; - case POST: - account.doPost(); - break; - case PUT: - account.doPut(); - break; - case DELETE: - account.doDelete(); - break; - } - addParam(account); - account.doAnything(); - responses.add(account.getResponseCode()); - results.add(account.doReceive()); - } - if (listAllEquals()) { - judgeResult = "GET"; - } else { - judgeMethod(); - } - } - - private void addParam(RestAccount account) { - if (queryParam != null) - for (RestParam param : queryParam) { - account.addQueryParam(param.key, param.value); - } - if (formParam != null && type != Method.GET) - for (RestParam param : formParam) { - account.addFormParam(param.key, param.value); - } - if (pathParam != null) - for (String param : pathParam) { - account.addPathParam(param); - } - } - - private boolean listAllEquals() { - String first = results.get(0); - int firstres = responses.get(0); - Iterator res = responses.iterator(); - for (String s : results) { - if(firstres != 200) - return false; - if (!s.equals(first)) - return false; - firstres = (int)res.next(); - } - return true; - } - - private void judgeMethod() { - - } - - public enum Method { - GET, POST, PUT, DELETE - }; - -} diff --git a/src/main/RestParam.java b/src/main/RestParam.java deleted file mode 100644 index 2f10b51..0000000 --- a/src/main/RestParam.java +++ /dev/null @@ -1,11 +0,0 @@ -package main; - -public class RestParam { - public String key; - public String value; - - public RestParam(String key, String value) { - this.key = key; - this.value = value; - } -} diff --git a/src/restfulchecker/RestAccount.java b/src/restfulchecker/RestAccount.java new file mode 100644 index 0000000..300dd58 --- /dev/null +++ b/src/restfulchecker/RestAccount.java @@ -0,0 +1,12 @@ +package restfulchecker; + +import org.ntlab.radishforandroidstudio.framework.network.HttpAsyncConnection; + +public class RestAccount extends HttpAsyncConnection { + + public RestAccount(String url) { + super(url); + // TODO Auto-generated constructor stub + } + +} diff --git a/src/restfulchecker/RestApi.java b/src/restfulchecker/RestApi.java new file mode 100644 index 0000000..079d531 --- /dev/null +++ b/src/restfulchecker/RestApi.java @@ -0,0 +1,109 @@ +package restfulchecker; + +import java.util.ArrayList; +import java.util.Iterator; + +public class RestApi { + private ArrayList accounts = new ArrayList<>(); + private ArrayList results = new ArrayList<>(); + private ArrayList responses = new ArrayList<>(); + private Method type; + private ArrayList queryParam; + private ArrayList formParam; + private ArrayList pathParam; + private String judgeResult; + public static final int ACCOUNT_NUM = 5; + + public void setAccount(String url) { + for (int i = 0; i < ACCOUNT_NUM; i++) + accounts.add(new RestAccount(url)); + } + + public ArrayList getAccounts() { + return accounts; + } + + public ArrayList getResults() { + return results; + } + + public String getJudgeResult() { + return judgeResult; + } + + public void setupRestTest(Method method, ArrayList queryParam, ArrayList formParam, + ArrayList pathParam) { + this.type = method; + this.queryParam = queryParam; + this.formParam = formParam; + this.pathParam = pathParam; + } + + public void doRestTest() { + if (type == null) + return; + for (RestAccount account : accounts) { + switch (type) { + case GET: + account.doGet(); + break; + case POST: + account.doPost(); + break; + case PUT: + account.doPut(); + break; + case DELETE: + account.doDelete(); + break; + } + addParam(account); + account.doAnything(); + responses.add(account.getResponseCode()); + results.add(account.doReceive()); + } + if (listAllEquals()) { + judgeResult = "GET"; + } else { + judgeMethod(); + } + } + + private void addParam(RestAccount account) { + if (queryParam != null) + for (RestParam param : queryParam) { + account.addQueryParam(param.key, param.value); + } + if (formParam != null && type != Method.GET) + for (RestParam param : formParam) { + account.addFormParam(param.key, param.value); + } + if (pathParam != null) + for (String param : pathParam) { + account.addPathParam(param); + } + } + + private boolean listAllEquals() { + String first = results.get(0); + int firstres = responses.get(0); + Iterator res = responses.iterator(); + for (String s : results) { + if(firstres != 200) + return false; + if (!s.equals(first)) + return false; + firstres = (int)res.next(); + } + return true; + } + + private void judgeMethod() { + + } + + public enum Method { + GET, POST, PUT, DELETE + }; + +} diff --git a/src/restfulchecker/RestParam.java b/src/restfulchecker/RestParam.java new file mode 100644 index 0000000..9428dea --- /dev/null +++ b/src/restfulchecker/RestParam.java @@ -0,0 +1,11 @@ +package restfulchecker; + +public class RestParam { + public String key; + public String value; + + public RestParam(String key, String value) { + this.key = key; + this.value = value; + } +}