From b4dc31ea2d22c37df47d72b99894ff91fc29049d Mon Sep 17 00:00:00 2001 From: Mohamed Kiswani Date: Tue, 27 Dec 2016 17:31:14 +0100 Subject: [PATCH 1/2] Merge branch 'master' of https://github.com/rhkiswani/JUtils into develop (#47) --- LICENSE-2.0.txt | 202 ++++++++++++++++++ .../javaff/detector/ApiDetectorUtil.java | 1 + .../javaff/httpclient/ApacheHttpClient.java | 21 +- .../javaff/httpclient/util/IOUtil.java | 52 +++++ .../javaff/reflection/ReflectionUtil.java | 11 + .../rhkiswani/javaff/http/HttpClientTest.java | 6 +- 6 files changed, 286 insertions(+), 7 deletions(-) create mode 100644 LICENSE-2.0.txt create mode 100644 src/main/java/io/github/rhkiswani/javaff/httpclient/util/IOUtil.java diff --git a/LICENSE-2.0.txt b/LICENSE-2.0.txt new file mode 100644 index 0000000..7a4a3ea --- /dev/null +++ b/LICENSE-2.0.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. \ No newline at end of file diff --git a/src/main/java/io/github/rhkiswani/javaff/detector/ApiDetectorUtil.java b/src/main/java/io/github/rhkiswani/javaff/detector/ApiDetectorUtil.java index 0ed9de6..1d583f4 100644 --- a/src/main/java/io/github/rhkiswani/javaff/detector/ApiDetectorUtil.java +++ b/src/main/java/io/github/rhkiswani/javaff/detector/ApiDetectorUtil.java @@ -54,4 +54,5 @@ public static Boolean isGsonAvailable() { public static Boolean isApacheHttpClientAvailable() { return isApacheHttpClientAvailable; } + } diff --git a/src/main/java/io/github/rhkiswani/javaff/httpclient/ApacheHttpClient.java b/src/main/java/io/github/rhkiswani/javaff/httpclient/ApacheHttpClient.java index a72c8f1..2f74e53 100644 --- a/src/main/java/io/github/rhkiswani/javaff/httpclient/ApacheHttpClient.java +++ b/src/main/java/io/github/rhkiswani/javaff/httpclient/ApacheHttpClient.java @@ -17,18 +17,20 @@ import io.github.rhkiswani.javaff.exceptions.SmartException; import io.github.rhkiswani.javaff.httpclient.exceptions.HttpClientException; +import io.github.rhkiswani.javaff.httpclient.util.IOUtil; +import io.github.rhkiswani.javaff.json.JsonHandlerFactory; +import io.github.rhkiswani.javaff.reflection.ReflectionUtil; import org.apache.http.Header; import org.apache.http.HttpResponse; +import org.apache.http.HttpStatus; import org.apache.http.NameValuePair; import org.apache.http.client.entity.UrlEncodedFormEntity; import org.apache.http.client.methods.*; import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.BasicResponseHandler; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClientBuilder; import org.apache.http.message.BasicNameValuePair; -import java.io.IOException; import java.io.UnsupportedEncodingException; import java.util.ArrayList; import java.util.HashMap; @@ -68,9 +70,18 @@ private String doJsonRequest(HttpRequestBase method, String json, Map hashMap = new HashMap<>(); + try { + HttpResponse response = c.execute(method); + hashMap.put("response", IOUtil.inputStreamToString(response.getEntity().getContent())); + hashMap.put("status", response.getStatusLine().getStatusCode()); + hashMap.put("headers", IOUtil.headersToMap(response.getAllHeaders())); + } catch (Exception ex) { + hashMap.put("status", HttpStatus.SC_BAD_REQUEST ); + hashMap.put("errors", ReflectionUtil.getErrorsAsArray(ex)); + } + return JsonHandlerFactory.getJsonHandler(HashMap.class).toJson(hashMap); } @Override diff --git a/src/main/java/io/github/rhkiswani/javaff/httpclient/util/IOUtil.java b/src/main/java/io/github/rhkiswani/javaff/httpclient/util/IOUtil.java new file mode 100644 index 0000000..99d4822 --- /dev/null +++ b/src/main/java/io/github/rhkiswani/javaff/httpclient/util/IOUtil.java @@ -0,0 +1,52 @@ +/* + * Copyright 2016 Mohamed Kiswani. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.github.rhkiswani.javaff.httpclient.util; + +import org.apache.http.Header; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.util.HashMap; +import java.util.Map; + +/** + * @author Mohamed Kiswani + * @since 0.0.25 + * + */ +public class IOUtil { + + public static String inputStreamToString(InputStream inputStream) throws IOException { + BufferedReader rd = new BufferedReader(new InputStreamReader(inputStream)); + StringBuilder result = new StringBuilder(); + String line = ""; + while ((line = rd.readLine()) != null) { + result.append(line); + } + return result.toString(); + } + + public static Map headersToMap(Header[] headers) { + HashMap map = new HashMap<>(); + for (Header header : headers) { + map.put(header.getName(), header.getValue()); + } + return map; + } +} diff --git a/src/main/java/io/github/rhkiswani/javaff/reflection/ReflectionUtil.java b/src/main/java/io/github/rhkiswani/javaff/reflection/ReflectionUtil.java index a22e130..9b47b74 100644 --- a/src/main/java/io/github/rhkiswani/javaff/reflection/ReflectionUtil.java +++ b/src/main/java/io/github/rhkiswani/javaff/reflection/ReflectionUtil.java @@ -19,6 +19,7 @@ import io.github.rhkiswani.javaff.lang.exceptions.IllegalParamException; import java.lang.reflect.Field; +import java.util.ArrayList; import java.util.List; /** @@ -73,4 +74,14 @@ public static void setStaticFieldValue(Class clazz, String fieldName, Object val public static List getFields(Class clazz) { return REFLECTION_HELPER.getFields(clazz); } + + public static String[] getErrorsAsArray(Throwable ex) { + ArrayList strings = new ArrayList<>(); + StackTraceElement[] st = ex.getStackTrace(); + strings.add(ex.getMessage()); + for (int i = 0; i < st.length; i++) { + strings.add(st[i].toString()); + } + return strings.toArray(new String[strings.size()]); + } } diff --git a/src/test/java/io/github/rhkiswani/javaff/http/HttpClientTest.java b/src/test/java/io/github/rhkiswani/javaff/http/HttpClientTest.java index b088422..dae5310 100644 --- a/src/test/java/io/github/rhkiswani/javaff/http/HttpClientTest.java +++ b/src/test/java/io/github/rhkiswani/javaff/http/HttpClientTest.java @@ -111,7 +111,8 @@ private void assertValues(String method, Map params, String post private void assertValues(String method, Map params, String post, String contentType) { JsonHandler handler = JsonHandlerFactory.getJsonHandler(HttpClientTest.class); - Response receivedRespond = handler.fromJson(post, Response.class); + Map map = handler.fromJson(post, Map.class); + Response receivedRespond = handler.fromJson(map.get("response").toString(), Response.class); assertThat(receivedRespond.requestHeaders).isNotNull(); assertThat(receivedRespond.params).isEqualTo(params); @@ -172,7 +173,8 @@ public void testOptions() throws Exception{ private void assertJsonResponse(String response, String method) { JsonHandler handler = JsonHandlerFactory.getJsonHandler(HttpClientTest.class); - Response receivedRespond = handler.fromJson(response, Response.class); + Map map = handler.fromJson(response, Map.class); + Response receivedRespond = handler.fromJson(map.get("response").toString(), Response.class); assertThat(receivedRespond.jsonParams).isEqualTo("{\"method\":\""+ method +"\"}"); assertThat(receivedRespond.method).isEqualTo(method); From 537422e56b9ce653cdef174a9f185cb4b4a4346c Mon Sep 17 00:00:00 2001 From: Mohamed Kiswani Date: Sun, 8 Jan 2017 23:36:29 +0100 Subject: [PATCH 2/2] fix-depdancies (#48) --- .travis.yml | 2 +- pom.xml | 70 ++++++++++++++++++++++++++++++++--------------------- 2 files changed, 43 insertions(+), 29 deletions(-) diff --git a/.travis.yml b/.travis.yml index d0d3286..10c8112 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ addons: packages: - oracle-java8-installer -script: mvn clean test -DisTest=true +script: mvn clean test -DisTest=true -Dcompile-to-commit=true after_success: - ./tools/update_version.sh diff --git a/pom.xml b/pom.xml index ca4f785..dc534c3 100644 --- a/pom.xml +++ b/pom.xml @@ -86,6 +86,7 @@ javax.validation validation-api ${javax.validation.api.version} + provided @@ -205,38 +206,51 @@ ${java.version} - - org.eluder.coveralls - coveralls-maven-plugin - ${mvn.plugin.coveralls.version} - - jGs4NG4X5ACkcCFw0LMw8sQNUWRRvsuJv - - - - org.codehaus.mojo - cobertura-maven-plugin - ${mvn.plugin.cobertura.version} - - xml - 256m - - true - - - - maven-surefire-plugin - - - ch.qos.logback:logback-classic - - - - + + compile-to-commit + + + compile-to-commit + true + + + + + + org.eluder.coveralls + coveralls-maven-plugin + ${mvn.plugin.coveralls.version} + + jGs4NG4X5ACkcCFw0LMw8sQNUWRRvsuJv + + + + org.codehaus.mojo + cobertura-maven-plugin + ${mvn.plugin.cobertura.version} + + xml + 256m + + true + + + + maven-surefire-plugin + + + ch.qos.logback:logback-classic + + + + + + + release