Develop (#38)

OyaAIProd · web-flow · commit 45ad9f1b4587 · 2016-11-27T11:33:24.000+01:00
* #26 #25 * code style fixed (#28) * Feature/http client tests code quilty (#30) * code style fixed * #29 #26 * code-quilty * code-quilty (#32) * code style fixs * release 0.0.23 updated * release 0.0.23 updated * #23 * #25 * #25 (#35) * improve coverage * improve coverage * improve coverage * improve coverage * Feature/imporve coverage (#37) * #25 * improve coverage * improve coverage * improve coverage * improve coverage
diff --git a/.travis.yml b/.travis.yml
@@ -9,7 +9,7 @@ addons:
     packages:
       - oracle-java8-installer
 
-script: mvn clean test
+script: mvn clean test -DisTest=true
 
 after_success:
   - ./tools/update_version.sh
diff --git a/src/main/java/io/github/rhkiswani/javaff/exceptions/DefaultExceptionHandler.java b/src/main/java/io/github/rhkiswani/javaff/exceptions/DefaultExceptionHandler.java
@@ -15,15 +15,21 @@
  */
 package io.github.rhkiswani.javaff.exceptions;
 
+import io.github.rhkiswani.javaff.log.Log;
+import io.github.rhkiswani.javaff.log.LogFactory;
+
 /**
  * @author Mohamed Kiswani
  * @since 0.0.1
  * @see io.github.rhkiswani.javaff.exceptions.ExceptionHandler
  *
  */
 class DefaultExceptionHandler implements ExceptionHandler{
+    private static final Log LOGGER = LogFactory.getLogger(DefaultExceptionHandler.class);
 
     public void handle(Throwable t){
-        t.printStackTrace();
+        if (!Boolean.valueOf(System.getProperty("isTest", "false"))) {
+            LOGGER.error(t.getMessage(), t);
+        }
     }
 }
diff --git a/src/main/java/io/github/rhkiswani/javaff/httpclient/ApacheHttpClient.java b/src/main/java/io/github/rhkiswani/javaff/httpclient/ApacheHttpClient.java
@@ -15,6 +15,7 @@
  */
 package io.github.rhkiswani.javaff.httpclient;
 
+import io.github.rhkiswani.javaff.exceptions.SmartException;
 import io.github.rhkiswani.javaff.httpclient.exceptions.HttpClientException;
 import org.apache.http.Header;
 import org.apache.http.HttpResponse;
@@ -53,14 +54,17 @@ public String putJson(String url, String json, Map<String, String> headers) thro
 
     private String doJsonRequest(HttpRequestBase method, String json, Map<String, String> headers) {
         try {
+            if (json == null){
+                throw new HttpClientException(SmartException.NULL_VAL, "Json Object");
+            }
             CloseableHttpClient c =  HttpClientBuilder.create().build();
             ((HttpEntityEnclosingRequestBase) method).setEntity(new StringEntity(json));
             method.setHeader("Accept", "application/json");
             method.setHeader("Content-type", "application/json");
             setHeaders(method, headers);
             return handleResponse(method, c);
         } catch (Exception e) {
-            throw new HttpClientException(e);
+            throw new HttpClientException(e.getMessage());
         }
     }
 
@@ -85,7 +89,7 @@ private String doRequest(HttpRequestBase method, Map<String, String> params, Map
             setHeaders(method, headers);
             return handleResponse(method, c);
         } catch (Exception e) {
-            throw new HttpClientException(e);
+            throw new HttpClientException(e.getMessage());
         }
     }
 
@@ -114,14 +118,19 @@ private void setHeaders(HttpRequestBase method, Map<String, String> headers) {
 
     @Override
     public String get(String url, Map<String, String> params, Map<String, String> headers) throws HttpClientException {
+        String urlWithParams = paramsToString(url, params);
+        return doRequest(new HttpGet(urlWithParams), params, headers);
+    }
+
+    private String paramsToString(String url, Map<String, String> params) {
         String urlWithParams = url;
         if(params != null){
             urlWithParams += "?";
             for (String key : params.keySet()) {
                 urlWithParams += key + "=" + params.get(key) +"&";
             }
         }
-        return doRequest(new HttpGet(urlWithParams), params, headers);
+        return urlWithParams;
     }
 
     @Override
@@ -138,13 +147,14 @@ public Map<String, String> head(String url, Map<String, String> params, Map<Stri
             }
             return returnedHeaders;
         } catch (Exception e) {
-            throw new HttpClientException(e);
+            throw new HttpClientException(e.getMessage());
         }
     }
 
     @Override
     public String delete(String url, Map<String, String> params, Map<String, String> headers) throws HttpClientException {
-        return doRequest(new HttpDelete(url), params, headers);
+        String urlWithParams = paramsToString(url, params);
+        return doRequest(new HttpDelete(urlWithParams), params, headers);
     }
 
     @Override
diff --git a/src/main/java/io/github/rhkiswani/javaff/httpclient/exceptions/HttpClientException.java b/src/main/java/io/github/rhkiswani/javaff/httpclient/exceptions/HttpClientException.java
@@ -23,11 +23,9 @@
  * @see SmartException
  */
 public class HttpClientException extends SmartException{
+
     public HttpClientException(String errorMsg, Object... errorMsgParams) {
         super(errorMsg, errorMsgParams);
     }
 
-    public HttpClientException(Throwable e) {
-        super(e);
-    }
 }
diff --git a/src/main/java/io/github/rhkiswani/javaff/json/JacksonHandler.java b/src/main/java/io/github/rhkiswani/javaff/json/JacksonHandler.java
@@ -34,7 +34,7 @@ class JacksonHandler implements JsonHandler {
     public <T> T fromJson(String json, Class clazz) {
         try {
             return (T) mapper.readValue(json, clazz);
-        } catch (IOException e) {
+        } catch (Throwable e) {
             throw new JsonException(e.getMessage());
         }
     }
@@ -43,7 +43,7 @@ public <T> T fromJson(String json, Class clazz) {
     public String toJson(Object object) {
         try {
             return mapper.writeValueAsString(object);
-        } catch (JsonProcessingException e) {
+        } catch (Throwable e) {
             throw new JsonException(e.getMessage());
         }
     }
diff --git a/src/main/java/io/github/rhkiswani/javaff/locale/LocaleWorkersFactory.java b/src/main/java/io/github/rhkiswani/javaff/locale/LocaleWorkersFactory.java
@@ -35,11 +35,6 @@ public static LocaleWorkersFactory instance(){
         return instance;
     }
 
-    @Override
-    protected LocaleWorker getDefault(Class targetClazz) {
-        return new LocaleWorkerBuilder().path("app/").build();
-    }
-
     public static LocaleWorker getLocalWorker(Class clazz){
         return instance.create(clazz);
     }
diff --git a/src/main/java/io/github/rhkiswani/javaff/log/DefaultLog.java b/src/main/java/io/github/rhkiswani/javaff/log/DefaultLog.java
@@ -23,7 +23,7 @@
  * @since 0.0.1
  * @see io.github.rhkiswani.javaff.log.Log
  */
-class DefaultLog implements Log {
+public class DefaultLog implements Log {
     private Logger logger = null ;
 
     public DefaultLog(Class clazz){
diff --git a/src/main/java/io/github/rhkiswani/javaff/reflection/DefaultReflectionHelper.java b/src/main/java/io/github/rhkiswani/javaff/reflection/DefaultReflectionHelper.java
@@ -20,6 +20,7 @@
 import io.github.rhkiswani.javaff.reflection.exception.ReflectionException;
 
 import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
@@ -79,6 +80,19 @@ public void setFieldValue(T obj, String fieldName, Object value) throws Reflecti
         }
     }
 
+    @Override
+    public void setStaticFieldValue(Class clazz, String fieldName, Object value) throws ReflectionException {
+        Field field = getField(clazz, fieldName);
+        try {
+            Field modifiersField = Field.class.getDeclaredField("modifiers");
+            modifiersField.setAccessible(true);
+            modifiersField.setInt(field, field.getModifiers() & ~Modifier.FINAL);
+            field.set(null, value);
+        }catch (Exception e){
+            throw new ReflectionException(e.getMessage());
+        }
+    }
+
     @Override
     public Field getField(Class clazz, String fieldName) throws ReflectionException {
         if (clazz == null){
diff --git a/src/main/java/io/github/rhkiswani/javaff/reflection/ReflectionHelper.java b/src/main/java/io/github/rhkiswani/javaff/reflection/ReflectionHelper.java
@@ -31,6 +31,8 @@ public interface ReflectionHelper<T> {
 
     void setFieldValue(T obj,String fieldName, Object value) throws ReflectionException;
 
+    void setStaticFieldValue(Class clazz,String fieldName, Object value) throws ReflectionException;
+
     Field getField(Class clazz, String fieldName) throws ReflectionException;
 
     <V> V getFieldValue(T obj, String fieldName) throws ReflectionException;
diff --git a/src/test/java/io/github/rhkiswani/javaff/exceptions/ExceptionHandlersFactoryTest.java b/src/test/java/io/github/rhkiswani/javaff/exceptions/ExceptionHandlersFactoryTest.java
@@ -185,10 +185,6 @@ private static class SubMailException extends MailException {
 
     }
 
-    private class TestExceptionHandler implements ExceptionHandler {
-        @Override
-        public void handle(Throwable t) {
-            t.printStackTrace();
-        }
+    private class TestExceptionHandler extends DefaultExceptionHandler {
     };
 }
diff --git a/src/test/java/io/github/rhkiswani/javaff/http/HttpClientTest.java b/src/test/java/io/github/rhkiswani/javaff/http/HttpClientTest.java
@@ -1,9 +1,11 @@
 package io.github.rhkiswani.javaff.http;
 
+import io.github.rhkiswani.javaff.exceptions.ExceptionUtil;
 import io.github.rhkiswani.javaff.factory.exceptions.NoImplementationFoundException;
 import io.github.rhkiswani.javaff.httpclient.ApacheHttpClient;
 import io.github.rhkiswani.javaff.httpclient.HttpClient;
 import io.github.rhkiswani.javaff.httpclient.HttpClientFactory;
+import io.github.rhkiswani.javaff.httpclient.exceptions.HttpClientException;
 import io.github.rhkiswani.javaff.json.JsonHandler;
 import io.github.rhkiswani.javaff.json.JsonHandlerFactory;
 import org.junit.Test;
@@ -30,6 +32,35 @@ public void testFactory() throws Exception {
         HttpClientFactory.instance().add(Object.class, new ApacheHttpClient());
     }
 
+    @Test
+    public void testExceptions() throws Exception{
+        HttpClient httpClient = HttpClientFactory.getHttpClient(HttpClientTest.class);
+        try {
+            httpClient.post("http://xyaaaaaxzcsdrwerwefv.com", null, null);
+        }catch (Exception e){
+            assertThat(e).isInstanceOf(HttpClientException.class);
+            ExceptionUtil.handle(e);
+        }
+        try {
+            httpClient.postJson("http://xyaaaaaxzcsdrwerwefv.com", null, null);
+        }catch (Exception e){
+            assertThat(e).isInstanceOf(HttpClientException.class).hasMessage("Json Object cant be null");
+        }
+        try {
+            httpClient.postJson("http://asdadasdasdasdasasd.com", "{}", null);
+        }catch (Exception e){
+            assertThat(e).isInstanceOf(HttpClientException.class);
+            ExceptionUtil.handle(e);
+        }
+        try {
+            httpClient.postJson("http://asdasd.com", "{}", null);
+        }catch (Exception e){
+            assertThat(e).isInstanceOf(HttpClientException.class);
+            ExceptionUtil.handle(e);
+        }
+    }
+
+
     @Test
     public void testPost() throws Exception{
         HttpClient httpClient = HttpClientFactory.getHttpClient(HttpClientTest.class);
@@ -45,6 +76,13 @@ public void testPostJson() throws Exception{
         assertJsonResponse(post, "POST");
     }
 
+    @Test
+    public void testPatchJson() throws Exception{
+        HttpClient httpClient = HttpClientFactory.getHttpClient(HttpClientTest.class);
+        String post = httpClient.patchJson(BASE_URL,"{\"method\":\"PATCH\"}", null);
+        assertJsonResponse(post, "PATCH");
+    }
+
     @Test
     public void testPut() throws Exception{
         String method = "PUT";
@@ -61,12 +99,16 @@ private Map<String, String> prepareParams() {
     }
 
     private void assertValues(String method, Map<String, String> params, String post) {
+        assertValues(method, params, post, "application/x-www-form-urlencoded");
+    }
+
+    private void assertValues(String method, Map<String, String> params, String post, String contentType) {
         JsonHandler handler = JsonHandlerFactory.getJsonHandler(HttpClientTest.class);
         Response receivedRespond = handler.fromJson(post, Response.class);
 
         assertThat(receivedRespond.params).isEqualTo(params);
         assertThat(receivedRespond.method).isEqualTo(method);
-        assertThat(receivedRespond.contentType).isEqualTo("application/x-www-form-urlencoded");
+        assertThat(receivedRespond.contentType).isEqualTo(contentType);
     }
 
     @Test
@@ -76,6 +118,40 @@ public void testPutJson() throws Exception{
         assertJsonResponse(put, "PUT");
     }
 
+    @Test
+    public void testGet() throws Exception{
+        String method = "GET";
+        HttpClient httpClient = HttpClientFactory.getHttpClient(HttpClientTest.class);
+        Map<String, String> params = prepareParams();
+        String get = httpClient.get(BASE_URL, params, null);
+        assertValues(method, params, get, null);
+    }
+
+    @Test
+    public void testDelete() throws Exception{
+        String method = "DELETE";
+        HttpClient httpClient = HttpClientFactory.getHttpClient(HttpClientTest.class);
+        Map<String, String> params = prepareParams();
+        String get = httpClient.delete(BASE_URL, params, null);
+        assertValues(method, params, get, null);
+    }
+
+    @Test
+    public void testHead() throws Exception{
+        HttpClient httpClient = HttpClientFactory.getHttpClient(HttpClientTest.class);
+        Map<String, String> params = prepareParams();
+        Map<String, String> head = httpClient.head(BASE_URL, params, null);
+        assertThat(head.get("Server")).isEqualTo("Jetty(9.4.0.RC2)");
+    }
+
+    @Test
+    public void testOptions() throws Exception{
+        HttpClient httpClient = HttpClientFactory.getHttpClient(HttpClientTest.class);
+        Map<String, String> params = prepareParams();
+        Map<String, String> head = httpClient.options(BASE_URL, params, null);
+        assertThat(head.get("Server")).isEqualTo("Jetty(9.4.0.RC2)");
+    }
+
     private void assertJsonResponse(String response, String method) {
         JsonHandler handler = JsonHandlerFactory.getJsonHandler(HttpClientTest.class);
         Response receivedRespond = handler.fromJson(response, Response.class);
diff --git a/src/test/java/io/github/rhkiswani/javaff/http/WebTester.java b/src/test/java/io/github/rhkiswani/javaff/http/WebTester.java
@@ -72,7 +72,7 @@ private void sendWhatReceived(HttpServletRequest req, HttpServletResponse resp)
                 String headerName = headerNames.nextElement();
                 r.requestHeaders.put(headerName, req.getHeader(headerName));
             }
-            if (r.contentType.equalsIgnoreCase("application/json")){
+            if (r.contentType != null && r.contentType.equalsIgnoreCase("application/json")){
                 BufferedReader br = req.getReader();
                 String str;
                 while( (str = br.readLine()) != null ){
diff --git a/src/test/java/io/github/rhkiswani/javaff/json/JsonHandlerFactoryTest.java b/src/test/java/io/github/rhkiswani/javaff/json/JsonHandlerFactoryTest.java
@@ -11,6 +11,8 @@
 import org.junit.Before;
 import org.junit.Test;
 
+import java.awt.*;
+
 import static org.assertj.core.api.Assertions.assertThat;
 public class JsonHandlerFactoryTest {
 
@@ -79,6 +81,16 @@ public void testJsonException() {
             assertThat(e).isInstanceOf(JsonException.class).hasMessage("Can not deserialize instance of java.lang.Integer out of START_OBJECT token\n" +
                     " at [Source: {\"empId\":1000,\"id\":10,\"name; line: 1, column: 1]");
         }
+        try {
+            JsonHandlerFactory.getJsonHandler(JacksonBeanX.class).toJson(new BorderLayout());
+        } catch (Exception e) {
+            assertThat(e).isInstanceOf(JsonException.class);
+        }
+        try {
+            JsonHandlerFactory.getJsonHandler(GsonBeanX.class).toJson(new BorderLayout());
+        } catch (Exception e){
+            assertThat(e).isInstanceOf(JsonException.class);
+        }
     }
 
     @GsonBean
diff --git a/src/test/java/io/github/rhkiswani/javaff/logging/DefaultLoggersTest.java b/src/test/java/io/github/rhkiswani/javaff/logging/DefaultLoggersTest.java
diff --git a/src/test/java/io/github/rhkiswani/javaff/logging/Slf4jLoggersTest.java b/src/test/java/io/github/rhkiswani/javaff/logging/Slf4jLoggersTest.java
diff --git a/src/test/java/io/github/rhkiswani/javaff/reflection/ReflectionTest.java b/src/test/java/io/github/rhkiswani/javaff/reflection/ReflectionTest.java

Original file line number	Diff line number	Diff line change
`@@ -23,11 +23,9 @@`
`23`	`23`	`* @see SmartException`
`24`	`24`	`*/`
`25`	`25`	`public class HttpClientException extends SmartException{`
	`26`	`+`
`26`	`27`	`public HttpClientException(String errorMsg, Object... errorMsgParams) {`
`27`	`28`	`super(errorMsg, errorMsgParams);`
`28`	`29`	`}`
`29`	`30`
`30`		`- public HttpClientException(Throwable e) {`
`31`		`- super(e);`
`32`		`- }`
`33`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ class JacksonHandler implements JsonHandler {`
`34`	`34`	`public <T> T fromJson(String json, Class clazz) {`
`35`	`35`	`try {`
`36`	`36`	`return (T) mapper.readValue(json, clazz);`
`37`		`- } catch (IOException e) {`
	`37`	`+ } catch (Throwable e) {`
`38`	`38`	`throw new JsonException(e.getMessage());`
`39`	`39`	`}`
`40`	`40`	`}`
`@@ -43,7 +43,7 @@ public <T> T fromJson(String json, Class clazz) {`
`43`	`43`	`public String toJson(Object object) {`
`44`	`44`	`try {`
`45`	`45`	`return mapper.writeValueAsString(object);`
`46`		`- } catch (JsonProcessingException e) {`
	`46`	`+ } catch (Throwable e) {`
`47`	`47`	`throw new JsonException(e.getMessage());`
`48`	`48`	`}`
`49`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,11 +35,6 @@ public static LocaleWorkersFactory instance(){`
`35`	`35`	`return instance;`
`36`	`36`	`}`
`37`	`37`
`38`		`- @Override`
`39`		`- protected LocaleWorker getDefault(Class targetClazz) {`
`40`		`- return new LocaleWorkerBuilder().path("app/").build();`
`41`		`- }`
`42`		`-`
`43`	`38`	`public static LocaleWorker getLocalWorker(Class clazz){`
`44`	`39`	`return instance.create(clazz);`
`45`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -185,10 +185,6 @@ private static class SubMailException extends MailException {`
`185`	`185`
`186`	`186`	`}`
`187`	`187`
`188`		`- private class TestExceptionHandler implements ExceptionHandler {`
`189`		`- @Override`
`190`		`- public void handle(Throwable t) {`
`191`		`- t.printStackTrace();`
`192`		`- }`
	`188`	`+ private class TestExceptionHandler extends DefaultExceptionHandler {`
`193`	`189`	`};`
`194`	`190`	`}`