Merge pull request #4 from contentstack/development

URL encoding bug fix

Author: ishaileshmishra

CHANGELOG.md

@@ -1,6 +1,16 @@
 
 ## CHANGELOG  
-   
+
+
+## Version 1.3.1
+  ### Date: May-02-2019
+  Change: include reference bug fixed
+  added testcase report for v1.3.1
+
+
+------------------------------------------------
+
+
 ## Version 1.3.0  
   ### Date: Apr-12-2019  
   Change: Added support of below methods in SDK   

README.md

@@ -20,13 +20,13 @@ To use the Contentstack Java SDK to your existing project, perform the steps giv
 <dependency>
   <groupId>com.contentstack.sdk</groupId>
   <artifactId>java</artifactId>
-  <version>1.2.1</version>
+  <version>1.3.1</version>
 </dependency>
 ```
 
 2. **Gradle**
 ```
-implementation 'com.contentstack.sdk:java:1.2.1'
+implementation 'com.contentstack.sdk:java:1.3.1'
 ```
 
 ### Key Concepts for using Contentstack

pom.properties

@@ -1,4 +1,4 @@
 # Written manually.
-version=1.2.0
+version=1.3.1
 groupId=com.contentstack.sdk
 artifactId=java

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.contentstack.sdk</groupId>
     <artifactId>java</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.3.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>contentstack-java</name>
@@ -116,6 +116,9 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <version>2.9.1</version>
+                <configuration>
+                    <additionalparam>-Xdoclint:none</additionalparam>
+                </configuration>
                 <executions>
                     <execution>
                         <id>attach-javadocs</id>
@@ -152,15 +155,15 @@
             </plugin>
 
             <plugin>
-            <groupId>org.sonatype.plugins</groupId>
-            <artifactId>nexus-staging-maven-plugin</artifactId>
-            <version>1.6.7</version>
-            <extensions>true</extensions>
-            <configuration>
-                <serverId>ossrh</serverId>
-                <nexusUrl>https://oss.sonatype.org/</nexusUrl>
-                <autoReleaseAfterClose>true</autoReleaseAfterClose>
-            </configuration>
+                <groupId>org.sonatype.plugins</groupId>
+                <artifactId>nexus-staging-maven-plugin</artifactId>
+                <version>1.6.7</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <serverId>ossrh</serverId>
+                    <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+                    <autoReleaseAfterClose>true</autoReleaseAfterClose>
+                </configuration>
             </plugin>
 
             <plugin>

src/main/java/com/contentstack/sdk/CSHttpConnection.java

@@ -120,11 +120,16 @@ public JSONObject getResponse() {
     public String setFormParamsGET(HashMap<String, java.lang.Object> params){
         if(params != null && params.size() > 0){
             String urlParams = null;
-            for (Map.Entry<String, Object> e : params.entrySet()) {
-                if (urlParams == null) {
-                    urlParams = "?" + e.getKey() + "=" + e.getValue();
-                }else {
-                    urlParams += "&" + e.getKey() + "=" + e.getValue();
+
+            urlParams = info.equalsIgnoreCase(CSAppConstants.callController.QUERY.name()) || info.equalsIgnoreCase(CSAppConstants.callController.ENTRY.name()) ? getParams(params) : null;
+            if(urlParams==null) {
+                for (Map.Entry<String, Object> e : params.entrySet()) {
+
+                    if (urlParams == null) {
+                        urlParams = "?" + e.getKey() + "=" + e.getValue();
+                    } else {
+                        urlParams += "&" + e.getKey() + "=" + e.getValue();
+                    }
                 }
             }
             return urlParams;
@@ -136,6 +141,7 @@ public String setFormParamsGET(HashMap<String, java.lang.Object> params){
 
 
 
+
     private String getParams(HashMap<String, Object> params) {
         String urlParams = "?";
         for (Map.Entry<String, Object> e : params.entrySet()) {
@@ -234,6 +240,10 @@ public void send() {
             url = urlPath;
         }
 
+        if(url.contains(CSAppConstants.URLSCHEMA_HTTPS)){
+            httpsORhttp = CSAppConstants.URLSCHEMA_HTTPS;
+        }
+
         for (Map.Entry<String, Object> entry : this.headers.entrySet())
         {
             String key = entry.getKey();

src/main/java/com/contentstack/sdk/Config.java

@@ -23,7 +23,7 @@ public class Config {
     public Config(){}
 
     /**
-     * Sets host name of the Built.io Contentstack server.
+     * Sets host name of the Contentstack server.
      *
      * @param hostName
      * host name.
@@ -44,10 +44,10 @@ public void setHost(String hostName){
     }
 
 
+
     /**
-     * Get URL.
-     *
      *
+     * @return URL String
      * <br><br><b>Example :</b><br>
      * <pre class="prettyprint">
      * String url = config.getHost();
@@ -59,8 +59,8 @@ public String getHost(){
 
 
     /**
-     * Get version of the Built.io Contentstack server.
-     *
+     * Get version of the Contentstack server.
+     * @return VERSION String
      * <br><br><b>Example :</b><br>
      * <pre class="prettyprint">
      * String version = config.getVersion();
@@ -71,7 +71,7 @@ public String getVersion(){
     }
 
     /**
-     * Changes the Built.io Contentstack version to be used in the final URL.
+     * Changes the Contentstack version to be used in the final URL.
      *
      * @param version
      *                  version string.
@@ -92,8 +92,7 @@ private void setVersion(String version){
     /**
      * set environment.
      *
-     * @param environment
-     *                      environment uid/name
+     * @param environment uid/name
      *
      *  <br><br><b>Example :</b><br>
      *  <pre class="prettyprint">
@@ -109,6 +108,7 @@ protected void setEnvironment(String environment){
 
     /**
      * Get environment.
+     * @return param environment string
      *  <br><br><b>Example :</b><br>
      *  <pre class="prettyprint">
      *  String environment = config.getEnvironment();

src/main/java/com/contentstack/sdk/ContentType.java

@@ -145,7 +145,7 @@ public Query query(){
     /**
      *
      *
-     * @param callback ContentTypesCallback
+     * @return callback ContentTypesCallback
      * This call returns information of a specific content type. It returns the content type schema, but does not include its entries.
      *
      *  <br><br><b>Example :</b><br>

src/main/java/com/contentstack/sdk/Query.java

@@ -82,6 +82,7 @@ public void setHeader(String key, String value){
 
     /**
      * Remove header key @param key custom_header_key
+     * @return key string
      * <br><br><b>Example :</b><br>
      * <pre class="prettyprint">
      *  //'blt5d4sample2633b' is a dummy Stack API key

src/main/java/com/contentstack/sdk/utility/CSAppConstants.java

@@ -11,7 +11,7 @@ public class CSAppConstants {
     public static final boolean debug = false;
     public static final String REQUEST_URL = "";
     public static String URLSCHEMA_HTTPS = "https://";
-    public static final String SDK_VERSION = "1.3.0";
+    public static final String SDK_VERSION = "1.3.1";
     public final static int NONETWORKCONNECTION = 408;
 
     public static enum RequestMethod

src/main/java/resources/version.txt

@@ -1 +1 @@
-1.2.0
+1.3.1