update: Resolve some codesmells

https://sonarcloud.io/project/issues?id=jsonurl_jsonurl-java&issues=AXFhj055RhxtzbnQIFCS&open=AXFhj055RhxtzbnQIFCS

https://sonarcloud.io/project/issues?id=jsonurl_jsonurl-java&issues=AXJYdgtsYcuZji4UbJ3a&open=AXJYdgtsYcuZji4UbJ3a

https://sonarcloud.io/project/issues?id=jsonurl_jsonurl-java&issues=AXJYdgtsYcuZji4UbJ3e&open=AXJYdgtsYcuZji4UbJ3e

https://sonarcloud.io/project/issues?id=jsonurl_jsonurl-java&issues=AXJYdgtsYcuZji4UbJ3f&open=AXJYdgtsYcuZji4UbJ3f

Author: dmaccormack

module/jsonurl-core/src/main/java/org/jsonurl/JsonUrl.java

@@ -393,20 +393,16 @@ private static final void encode(
                 int start,
                 int end) throws IOException {
 
-            for (int i = start;; i++) {
-                if (end <= i) {
-                    break;
-                }
-
+            for (int i = start; i < end; i++) {
                 char c = s.charAt(i);
                 int cp;
 
                 if (Character.isLowSurrogate(c)) {
                     throw new MalformedInputException(i);
                 }
                 if (Character.isHighSurrogate(c)) {
-                    if (end <= ++i) {
-                        break;
+                    if (++i == end) {
+                        throw new MalformedInputException(i);
                     }
 
                     char c2 = s.charAt(i);

module/jsonurl-core/src/main/java/org/jsonurl/ValueFactory.java

@@ -272,27 +272,27 @@ default V getTrueFalseNull(
             int start,
             int stop) {
 
-        keyword: switch (stop - start) {
+        switch (stop - start) {
         case 4:
             switch (s.charAt(start)) {
             case 't':
                 if (s.charAt(start + 1) != 'r'
                         || s.charAt(start + 2) != 'u'
                         || s.charAt(start + 3) != 'e') {
-                    break keyword;
+                    return null;
                 }
                 return getTrue();
 
             case 'n':
                 if (s.charAt(start + 1) != 'u'
                         || s.charAt(start + 2) != 'l'
                         || s.charAt(start + 3) != 'l') {
-                    break keyword;
+                    return null;
                 }
                 return getNull();
 
             default:
-                break keyword;
+                return null;
             }
             // this can never happen but checkstyle gets angry, so:
             // fall through
@@ -303,15 +303,13 @@ default V getTrueFalseNull(
                     || s.charAt(start + 2) != 'l'
                     || s.charAt(start + 3) != 's'
                     || s.charAt(start + 4) != 'e') {
-                break keyword;
+                return null;
             }
             return getFalse();
 
         default:
-            break;
+            return null;
         }
-
-        return null;
     }
 
 }

module/jsonurl-core/src/test/java/org/jsonurl/AbstractParseTest.java

@@ -439,9 +439,10 @@ void testSyntaxException(String s) throws ParseException {
     })
     void testSyntaxException2(String text, String type) throws ParseException {
         Parser<?, ?, ?, ?, ?, ?, ?, ?, ?, ?> p = newParser();
+        ValueType valueType = ValueType.valueOf(type);
         assertThrows(
             SyntaxException.class,
-            () -> p.parse(text, ValueType.valueOf(type)));
+            () -> p.parse(text, valueType));
     }
 
     @ParameterizedTest
@@ -570,9 +571,11 @@ void testObject(String text) throws ParseException {
             "(1)",
     })
     void testObjectException(String text) throws ParseException {
+        Parser<?,?,?,?,?,?,?,?,?,?> p = newParser();
+
         assertThrows(
             SyntaxException.class,
-            () -> newParser().parseObject(text));
+            () -> p.parseObject(text));
     }
 
     @ParameterizedTest
@@ -586,9 +589,11 @@ void testObjectException(String text) throws ParseException {
             "(a:b)",
     })
     void testArrayException(String text) throws ParseException {
+        Parser<?,?,?,?,?,?,?,?,?,?> p = newParser();
+
         assertThrows(
             SyntaxException.class,
-            () -> newParser().parseArray(text));
+            () -> p.parseArray(text));
     }
 
     // CHECKSTYLE:OFF