diff --git a/src/main/Main.java b/src/main/Main.java index 566c487..c9e0d45 100644 --- a/src/main/Main.java +++ b/src/main/Main.java @@ -22,20 +22,17 @@ api.jsonAcquisition("src/main/you.json"); api.doRestTest(); System.out.println(api.getResults()); - // System.out.println(api.getBeforeResults()); - // System.out.println(api.getJudgeResult()); } static private void init() { api.setAccount("https://www.googleapis.com/youtube/v3"); - // queryParam.add(new RestParam("key", - // "AIzaSyD5EI71SqPZhgdpwzlV0XTisGuKKtH5p6I")); - // queryParam.add(new RestParam("id", "7lCDEYXw3mM")); - queryParam.add(new RestParam("part", "snippet")); - queryParam.add(new RestParam("access_token", - "ya29.GltqBt15-zkpMQ_Moqbt1ccsFh-KFFKcWHNB9LiDYlAOBdOW-gqHCexRJUfJN-G2j_2W2GfNT1HrRC5b0N9sl7RYcmXb28-lHjbtu0mWP7PHU0FhzJ-MnymdbnVJ")); + queryParam.add(new RestParam("id", "PLZcOpFipzeuFmuPLYyijcN0l4S0skwuiR")); + queryParam.add(new RestParam("part", "id")); + api.setToken("access_token", + "ya29.GltqBnBr5rboUfJ8ODUnj3vtdV54kjLRXbbntDt1M_4f_HGfXj-NL5ODfDkS7tn4nzP93L3w26KvtB27EZAg3Z7Q_NJZGNDy4KtKTTla1TNOA8URDNsKDEqHEV4D"); pathParam.add("playlists"); - api.setupRestTest(Method.POST, queryParam, formParam, pathParam); + api.setProperty("Content-type", "application/json"); + api.setupRestTest(Method.GET, queryParam, formParam, pathParam); } } diff --git a/src/org/ntlab/radishforandroidstudio/framework/network/HttpAsyncConnection.java b/src/org/ntlab/radishforandroidstudio/framework/network/HttpAsyncConnection.java index dfc6898..3604fc7 100644 --- a/src/org/ntlab/radishforandroidstudio/framework/network/HttpAsyncConnection.java +++ b/src/org/ntlab/radishforandroidstudio/framework/network/HttpAsyncConnection.java @@ -122,6 +122,7 @@ InputStream in = null; try { System.out.println(responseCode); + System.out.println(method); in = conn.getInputStream(); reader = new BufferedReader(new InputStreamReader(in)); String line; diff --git a/src/restfulchecker/NecessaryParam.java b/src/restfulchecker/NecessaryParam.java new file mode 100644 index 0000000..de58e1d --- /dev/null +++ b/src/restfulchecker/NecessaryParam.java @@ -0,0 +1,34 @@ +package restfulchecker; + +import java.util.ArrayList; + +public class NecessaryParam { + private ArrayList queryParams = new ArrayList<>(); + private ArrayList formParams = new ArrayList<>(); + private ArrayList pathParams = new ArrayList<>(); + + public ArrayList getQueryParams() { + return queryParams; + } + + public void setQueryParams(RestParam queryParam) { + queryParams.add(queryParam); + } + + public ArrayList getFormParams() { + return formParams; + } + + public void setFormParams(RestParam formParam) { + formParams.add(formParam); + } + + public ArrayList getPathParams() { + return pathParams; + } + + public void setPathParams(String pathParam) { + pathParams.add(pathParam); + } + +} diff --git a/src/restfulchecker/RestChecker.java b/src/restfulchecker/RestChecker.java index d6d8fad..ba18394 100644 --- a/src/restfulchecker/RestChecker.java +++ b/src/restfulchecker/RestChecker.java @@ -25,23 +25,19 @@ private String method; private String token, token_name; private String jstr; + private ArrayList keys = new ArrayList<>(); + private ArrayList values = new ArrayList<>(); public static final int ACCOUNT_NUM = 5; - public String getToken() { - return token; - } - - public void setToken(String token) { + public void setToken(String token_name, String token) { + this.token_name = token_name; this.token = token; } - public String getToken_name() { - return token_name; - } - - public void setToken_name(String token_name) { - this.token_name = token_name; + public void setProperty(String key, String value) { + keys.add(key); + values.add(value); } public void setAccount(String url) { @@ -78,6 +74,7 @@ System.out.println("not Selected Method"); return; } + queryParam.add(new RestParam(token_name, token)); ReadResource(beforeResults); for (RestAccount account : accounts) { switch (type) { @@ -100,6 +97,9 @@ } addParam(account); account.setJson(jstr); + for (int i = 0; i < keys.size(); i++) { + account.setRequestPropertie(keys.get(i), values.get(i)); + } account.doAnything(); responses.add(account.getResponseCode()); receives.add(account.doReceive()); @@ -151,24 +151,28 @@ System.out.println("WARNING!! Perhaps:" + judgeResult); } } - + private void ReadResource(ArrayList results) { RestAccount account = new RestAccount(accounts.get(0).getUrl()); account.doGet(); + for(String path : pathParam) { + account.addPathParam(path); + } + account.addQueryParam(token_name, token); account.doAnything(); results.add(account.doReceive()); } - + public void jsonAcquisition(String path) { ObjectMapper mapper = new ObjectMapper(); try { BufferedReader reader = new BufferedReader(new FileReader(new File(path))); - String line = null; - StringBuilder builder = new StringBuilder(); - while ((line = reader.readLine()) != null) { - builder.append(line); - } - jstr = builder.toString(); + String line = null; + StringBuilder builder = new StringBuilder(); + while ((line = reader.readLine()) != null) { + builder.append(line); + } + jstr = builder.toString(); } catch (JsonProcessingException e) { // TODO Auto-generated catch block e.printStackTrace(); @@ -176,7 +180,7 @@ // TODO Auto-generated catch block e.printStackTrace(); } - + } public enum Method {