Merge branch 'develop'

Norconex · Oct 8, 2016 · 6a77ac3 · 6a77ac3
2 parents 2477308 + 8aaedac
commit 6a77ac3
Show file tree

Hide file tree

Showing 6 changed files with 61 additions and 15 deletions.
diff --git a/norconex-commons-lang/pom.xml b/norconex-commons-lang/pom.xml
@@ -19,15 +19,15 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.norconex.commons</groupId>
   <artifactId>norconex-commons-lang</artifactId>
-  <version>1.12.1</version>
+  <version>1.12.2</version>
   <packaging>jar</packaging>
   <name>Norconex Commons Lang</name>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <site.baseurl/>
-    <currentStableVersion>1.12.1</currentStableVersion>
+    <currentStableVersion>1.12.2</currentStableVersion>
   </properties>
   <inceptionYear>2008</inceptionYear>
 

diff --git a/norconex-commons-lang/src/changes/changes.xml b/norconex-commons-lang/src/changes/changes.xml
@@ -7,6 +7,12 @@
   </properties>
   <body>
 
+    <release version="1.12.2" date="2016-10-07" description="Bugfix release">
+      <action dev="essiembre" type="fix">
+        Fixed QueryString removing parameters without equal sign.
+      </action>
+    </release>
+
     <release version="1.12.1" date="2016-09-17" description="Bugfix release">
       <action dev="essiembre" type="fix">
         Fixed URLNormalizer#sortQueryParameters() not handling #fragments 

diff --git a/norconex-commons-lang/src/main/java/com/norconex/commons/lang/jar/JarDuplicates.java b/norconex-commons-lang/src/main/java/com/norconex/commons/lang/jar/JarDuplicates.java
@@ -53,7 +53,7 @@ public JarFile[] getJarFiles() {
      * The best attempt is made to detect more recent version based
      * on version provided. Given version patterns may vary, there
      * is no guarantee of 100% accuracy, so use with caution.
-     * @return
+     * @return latest jar file
      */
     public JarFile getLatestVersion() {
         return jarFiles[0];

diff --git a/norconex-commons-lang/src/main/java/com/norconex/commons/lang/url/QueryString.java b/norconex-commons-lang/src/main/java/com/norconex/commons/lang/url/QueryString.java
@@ -100,17 +100,22 @@ public QueryString(String urlWithQueryString, String encoding) {
         String[] paramParts = paramString.split("\\&");
         for (int i = 0; i < paramParts.length; i++) {
             String paramPart = paramParts[i];
+            String key;
+            String value;
             if (StringUtils.contains(paramPart, "=")) {
-                String key = StringUtils.substringBefore(paramPart, "=");
-                String value = StringUtils.substringAfter(paramPart, "=");
-                try {
-                    addString(URLDecoder.decode(key, this.encoding),
-                              URLDecoder.decode(value, this.encoding));
-                } catch (UnsupportedEncodingException e) {
-                    throw new URLException(
-                            "Cannot URL-decode query string (key=" 
-                                    + key + "; value=" + value + ").", e);
-                }
+                key = StringUtils.substringBefore(paramPart, "=");
+                value = StringUtils.substringAfter(paramPart, "=");
+            } else {
+                key = paramPart;
+                value = StringUtils.EMPTY;
+            }
+            try {
+                addString(URLDecoder.decode(key, this.encoding),
+                          URLDecoder.decode(value, this.encoding));
+            } catch (UnsupportedEncodingException e) {
+                throw new URLException(
+                        "Cannot URL-decode query string (key=" 
+                                + key + "; value=" + value + ").", e);
             }
         }
     }

diff --git a/norconex-commons-lang/src/site/markdown/download.md.vm b/norconex-commons-lang/src/site/markdown/download.md.vm
@@ -1,5 +1,5 @@
 #*
-   Copyright 2010-2014 Norconex Inc.
+   Copyright 2010-2016 Norconex Inc.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -30,6 +30,10 @@ $h2 Binaries
 
 **Older Releases**
 
+  * [1.12.1]($nexusPath/1.12.1/norconex-commons-lang-1.12.1.zip)<small>
+    [[Release Notes](changes-report.html#a1.12.1)]</small>
+  * [1.12.0]($nexusPath/1.12.0/norconex-commons-lang-1.12.0.zip)<small>
+    [[Release Notes](changes-report.html#a1.12.0)]</small>
   * [1.11.0]($nexusPath/1.11.0/norconex-commons-lang-1.11.0.zip)<small>
     [[Release Notes](changes-report.html#a1.11.0)]</small>
   * [1.10.0]($nexusPath/1.10.0/norconex-commons-lang-1.10.0.zip)<small>
@@ -69,7 +73,7 @@ $h2 Binaries
 
 $h2 Source
 
-Source code can be obtained on GitHub: (https://github.com/Norconex/commons-lang).
+Source code can be obtained on GitHub: ([https://github.com/Norconex/commons-lang](https://github.com/Norconex/commons-lang)).
 
 Maven users can add the following to their pom.xml:
 

diff --git a/norconex-commons-lang/src/test/java/com/norconex/commons/lang/url/QueryStringTest.java b/norconex-commons-lang/src/test/java/com/norconex/commons/lang/url/QueryStringTest.java
@@ -0,0 +1,31 @@
+/* Copyright 2016 Norconex Inc.
+ *
+ * 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 com.norconex.commons.lang.url;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class QueryStringTest {
+
+    // This tests issue: https://github.com/Norconex/collector-http/issues/304
+    @Test
+    public void testKeepProtocolUpperCase() {
+        QueryString qs = new QueryString(
+                "http://site.com/page?NoEquals&WithEquals=EqualsValue");
+
+        Assert.assertTrue("Argument without equal sign was not found.", 
+                qs.toString().contains("NoEquals"));
+    }
+}