Added incomplete REST client

src/zutil/net/http/HttpClient.java

@@ -56,7 +56,6 @@ public class HttpClient implements AutoCloseable{
     private InputStream rspStream;
 
 
-
     public HttpClient(HttpRequestType type) {
         this.type = type;
         headers = new HashMap<>();
@@ -65,7 +64,11 @@ public class HttpClient implements AutoCloseable{
 
 
     public void setURL(URL url) {
-        this.url = new HttpURL( url );
+        setURL(new HttpURL(url));
+    }
+
+    public void setURL(HttpURL url) {
+        this.url = url;
     }
 
     /**
@@ -120,8 +123,7 @@ public class HttpClient implements AutoCloseable{
             request.setHeader("Content-Length", "" + postData.length());
             request.println();
             request.print(postData);
-        }
+        } else
-        else
             request.println();
         request.close();
 
@@ -137,6 +139,7 @@ public class HttpClient implements AutoCloseable{
     public HttpHeaderParser getResponseHeader() {
         return rspHeader;
     }
+
     public InputStream getResponseInputStream() {
         return rspStream;
     }

src/zutil/net/ws/rest/RESTClientFactory.java

@@ -0,0 +1,59 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2018 Ziver Koc
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package zutil.net.ws.rest;
+
+import zutil.log.LogUtil;
+import zutil.net.ws.WSClientFactory;
+import zutil.net.ws.WSInterface;
+import zutil.net.ws.WebServiceDef;
+import zutil.net.ws.soap.SOAPClientInvocationHandler;
+
+import java.net.URL;
+import java.util.logging.Logger;
+
+/**
+ * This is an factory that generates clients for web services
+ *
+ * @author Ziver
+ */
+public class RESTClientFactory {
+    private static Logger logger = LogUtil.getLogger();
+
+
+    /**
+     * Generates a Client Object for the web service.
+     *
+     * @param 	<T> 	is the class of the web service definition
+     * @param 	url 	is the target service serviceUrl
+     * @param 	intf 	is the class of the web service definition
+     * @return a client Object
+     */
+    public static <T extends WSInterface> T createClient(URL url, Class<T> intf){
+        T obj = WSClientFactory.createClient( intf,
+                new RESTClientInvocationHandler(url, new WebServiceDef(intf)));
+        return obj;
+    }
+
+}

src/zutil/net/ws/rest/RESTClientInvocationHandler.java

@@ -0,0 +1,112 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2018 Ziver Koc
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package zutil.net.ws.rest;
+
+import zutil.io.IOUtil;
+import zutil.log.LogUtil;
+import zutil.net.http.HttpClient;
+import zutil.net.http.HttpHeaderParser;
+import zutil.net.http.HttpURL;
+import zutil.net.ws.WSInterface;
+import zutil.net.ws.WSMethodDef;
+import zutil.net.ws.WSParameterDef;
+import zutil.net.ws.WebServiceDef;
+import zutil.net.ws.soap.SOAPHttpPage;
+
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * This is an abstract client that will do generic requests to a
+ * REST Web service using JSON response.
+ */
+public class RESTClientInvocationHandler implements InvocationHandler {
+    private static Logger logger = LogUtil.getLogger();
+
+    private WebServiceDef wsDef;
+    /**
+     * Web address of the web service
+     */
+    protected URL serviceUrl;
+
+    public RESTClientInvocationHandler(URL url, WebServiceDef webServiceDef) {
+        this.serviceUrl = url;
+        this.wsDef = webServiceDef;
+    }
+
+
+    /**
+     * Makes a request to the target web service
+     */
+    @Override
+    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+        // Generate XML
+        HttpURL url = generateRESTRequest(method.getName(), args);
+
+        // Send request
+        HttpClient request = new HttpClient(HttpClient.HttpRequestType.POST);
+        request.setURL(url);
+        HttpHeaderParser response = request.send();
+        String rspJson = IOUtil.readContentAsString(request.getResponseInputStream());
+        request.close();
+
+        // DEBUG
+        if (logger.isLoggable(Level.FINEST)) {
+            System.out.println("********** Request");
+            System.out.println(url);
+            System.out.println("********** Response");
+            System.out.println(rspJson);
+        }
+
+        return parseRESTResponse(rspJson);
+    }
+
+
+    private HttpURL generateRESTRequest(String targetMethod, Object[] args) {
+        logger.fine("Sending request for " + targetMethod);
+        HttpURL url = new HttpURL(serviceUrl);
+
+        WSMethodDef methodDef = wsDef.getMethod(targetMethod);
+        url.setPath(serviceUrl.getPath()
+                + (serviceUrl.getPath().endsWith("/") ? "" : "/")
+                + methodDef.getName());
+
+        for (int i = 0; i < methodDef.getOutputCount(); i++) {
+            WSParameterDef param = methodDef.getOutput(i);
+            url.setParameter(param.getName(), args[i].toString());
+        }
+
+        return url;
+    }
+
+    private Object parseRESTResponse(String json) {
+
+        return null;
+    }
+}

src/zutil/net/ws/soap/SOAPClientFactory.java

@@ -45,7 +45,7 @@ public class SOAPClientFactory {
      * Generates a Client Object for the web service.
      *
      * @param 	<T> 	is the class of the web service definition
-     * @param 	url 	is the target service url
+     * @param 	url 	is the target service serviceUrl
      * @param 	intf 	is the class of the web service definition
      * @return a client Object
      */

src/zutil/net/ws/soap/SOAPClientInvocationHandler.java

@@ -53,7 +53,9 @@ public class SOAPClientInvocationHandler implements InvocationHandler {
     private static Logger logger = LogUtil.getLogger();
 
     private WebServiceDef wsDef;
-    /** Web address of the web service */
+    /**
+     * Web address of the web service
+     */
     protected URL url;
 
 
@@ -72,7 +74,6 @@ public class SOAPClientInvocationHandler implements InvocationHandler {
         Document document = genSOAPRequest((WSInterface) proxy, method.getName(), args);
         String reqXml = document.asXML();
 
-
         // Send request
         HttpClient request = new HttpClient(HttpClient.HttpRequestType.POST);
         request.setURL(url);