Added feature that non required vars will also be processed

.travis.yml

@@ -7,7 +7,7 @@ deploy:
   provider: releases
   api_key:
     secure: IP25v/puP1qgGfCRWG+/7EKDU6pyyaU54WRqqNICi8qcubmXxTmfY6/QJeF2bS+MLFZBfttUjdnHWxOMTWBUAP8HFIRkgGHsFIHxiFYbUaKdRXJOZPElpP08mm7HU1Lz/Tz0rU99ry9TVG28RfmGvpsIM6+OdlG8SDdcESqHacg=
-  file: build/libs/xlr-xlrelease-plugin-1.6.2.jar
+  file: build/libs/xlr-xlrelease-plugin-1.6.3.jar
   skip_cleanup: true
   on:
     all_branches: true

build.gradle

@@ -2,7 +2,7 @@ plugins {
     id "com.github.hierynomus.license" version "0.11.0"
 }
 
-version="1.6.2"
+version="1.6.3"
 
 apply plugin: 'java'
 apply plugin: 'idea'

src/main/resources/httputil/HttpRequest.py

@@ -0,0 +1,206 @@
+#
+# THIS CODE AND INFORMATION ARE PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS
+# FOR A PARTICULAR PURPOSE. THIS CODE AND INFORMATION ARE NOT SUPPORTED BY XEBIALABS.
+#
+
+import re
+import urllib
+
+from java.lang import String
+
+from org.apache.commons.codec.binary import Base64
+from org.apache.http import HttpHost
+from org.apache.http.client.config import RequestConfig
+from org.apache.http.client.methods import HttpGet, HttpPost, HttpPut, HttpDelete
+from org.apache.http.util import EntityUtils
+from org.apache.http.entity import StringEntity
+from org.apache.http.impl.client import HttpClients
+
+from com.xebialabs.xlrelease.domain.configuration import HttpConnection
+from httputil.HttpResponse import HttpResponse
+
+class HttpRequest:
+    def __init__(self, params, username = None, password = None):
+        """
+        Builds an HttpRequest
+
+        :param params: an HttpConnection
+        :param username: the username
+            (optional, it will override the credentials defined on the HttpConnection object)
+        :param password: an password
+            (optional, it will override the credentials defined on the HttpConnection object)
+        """
+        self.params = HttpConnection(params)
+        self.username = username
+        self.password = password
+
+    def doRequest(self, **options):
+        """
+        Performs an HTTP Request
+
+        :param options: A keyword arguments object with the following properties :
+            method: the HTTP method : 'GET', 'PUT', 'POST', 'DELETE'
+                (optional: GET will be used if empty)
+            context: the context url
+                (optional: the url on HttpConnection will be used if empty)
+            body: the body of the HTTP request for PUT & POST calls
+                (optional: an empty body will be used if empty)
+            contentType: the content type to use
+                (optional, no content type will be used if empty)
+            headers: a dictionary of headers key/values
+                (optional, no headers will be used if empty)
+        :return: an HttpResponse instance
+        """
+        request = self.buildRequest(
+            options.get('method', 'GET'),
+            options.get('context', ''),
+            options.get('body', ''),
+            options.get('contentType', None),
+            options.get('headers', None))
+        return self.executeRequest(request)
+
+
+    def get(self, context, **options):
+        """
+        Performs an Http GET Request
+
+        :param context: the context url
+        :param options: the options keyword argument described in doRequest()
+        :return: an HttpResponse instance
+        """
+        options['method'] = 'GET'
+        options['context'] = context
+        return self.doRequest(**options)
+
+
+    def put(self, context, body, **options):
+        """
+        Performs an Http PUT Request
+
+        :param context: the context url
+        :param body: the body of the HTTP request
+        :param options: the options keyword argument described in doRequest()
+        :return: an HttpResponse instance
+        """
+        options['method'] = 'PUT'
+        options['context'] = context
+        options['body'] = body
+        return self.doRequest(**options)
+
+
+    def post(self, context, body, **options):
+        """
+        Performs an Http POST Request
+
+        :param context: the context url
+        :param body: the body of the HTTP request
+        :param options: the options keyword argument described in doRequest()
+        :return: an HttpResponse instance
+        """
+        options['method'] = 'POST'
+        options['context'] = context
+        options['body'] = body
+        return self.doRequest(**options)
+
+
+    def delete(self, context, **options):
+        """
+        Performs an Http DELETE Request
+
+        :param context: the context url
+        :param options: the options keyword argument described in doRequest()
+        :return: an HttpResponse instance
+        """
+        options['method'] = 'DELETE'
+        options['context'] = context
+        return self.doRequest(**options)
+
+
+    def buildRequest(self, method, context, body, contentType, headers):
+        url = self.quote(self.createPath(self.params.getUrl(), context))
+
+        method = method.upper()
+
+        if method == 'GET':
+            request = HttpGet(url)
+        elif method == 'POST':
+            request = HttpPost(url)
+            request.setEntity(StringEntity(body))
+        elif method == 'PUT':
+            request = HttpPut(url)
+            request.setEntity(StringEntity(body))
+        elif method == 'DELETE':
+            request = HttpDelete(url)
+        else:
+            raise Exception('Unsupported method: ' + method)
+
+        request.addHeader('Content-Type', contentType)
+        request.addHeader('Accept', contentType)
+        self.setCredentials(request)
+        self.setProxy(request)
+        self.setHeaders(request, headers)
+
+        return request
+
+
+    def createPath(self, url, context):
+        url = re.sub('/*$', '', url)
+        if context is None:
+            return url
+        elif context.startswith('/'):
+            return url + context
+        else:
+            return url + '/' + context
+
+    def quote(self, url):
+        return urllib.quote(url, ':/?&=%')
+
+
+    def setCredentials(self, request):
+        if self.username:
+            username = self.username
+            password = self.password
+        elif self.params.getUsername():
+            username = self.params.getUsername()
+            password = self.params.getPassword()
+        else:
+            return
+
+        encoding = Base64.encodeBase64String(String(username + ':' + password).getBytes())
+        request.addHeader('Authorization', 'Basic ' + encoding)
+
+
+    def setProxy(self, request):
+        if not self.params.getProxyHost():
+            return
+
+        proxy = HttpHost(self.params.getProxyHost(), int(self.params.getProxyPort()))
+        config = RequestConfig.custom().setProxy(proxy).build()
+        request.setConfig(config)
+
+
+    def setHeaders(self, request, headers):
+        if headers:
+            for key in headers:
+                request.setHeader(key, headers[key])
+
+
+    def executeRequest(self, request):
+        client = None
+        response = None
+        try:
+            client = HttpClients.createDefault()
+            response = client.execute(request)
+            status = response.getStatusLine().getStatusCode()
+            entity = response.getEntity()
+            result = EntityUtils.toString(entity, "UTF-8") if entity else None
+            headers = response.getAllHeaders()
+            EntityUtils.consume(entity)
+
+            return HttpResponse(status, result, headers)
+        finally:
+            if response:
+                response.close()
+            if client:
+                client.close()

src/main/resources/httputil/HttpResponse.py

@@ -0,0 +1,49 @@
+#
+# THIS CODE AND INFORMATION ARE PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS
+# FOR A PARTICULAR PURPOSE. THIS CODE AND INFORMATION ARE NOT SUPPORTED BY XEBIALABS.
+#
+
+class HttpResponse:
+    def getStatus(self):
+        """
+        Gets the status code
+        :return: the http status code
+        """
+        return self.status
+
+    def getResponse(self):
+        """
+        Gets the response content
+        :return: the reponse as text
+        """
+        return self.response
+
+    def isSuccessful(self):
+        """
+        Checks if request successful
+        :return: true if successful, false otherwise
+        """
+        return 200 <= self.status < 400
+
+    def getHeaders(self):
+        """
+        Returns the response headers
+        :return: a dictionary of all response headers
+        """
+        return self.headers
+
+    def errorDump(self):
+        """
+        Dumps the whole response
+        """
+        print 'Status: ', self.status, '\n'
+        print 'Response: ', self.response, '\n'
+        print 'Response headers: ', self.headers, '\n'
+
+    def __init__(self, status, response, headers):
+        self.status = status
+        self.response = response
+        self.headers = {}
+        for header in headers:
+            self.headers[str(header.getName())] = str(header.getValue())

src/main/resources/httputil/__init__.py

@@ -0,0 +1,6 @@
+#
+# THIS CODE AND INFORMATION ARE PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS
+# FOR A PARTICULAR PURPOSE. THIS CODE AND INFORMATION ARE NOT SUPPORTED BY XEBIALABS.
+#
+