Sonarqube fixes

Author: jearley-captech

elementfactory/src/main/java/io/github/xmljim/json/elementfactory/AbstractJsonElement.java

@@ -7,7 +7,7 @@ abstract class AbstractJsonElement {
     private final NodeType type;
     private final JsonElement parent;
 
-    public AbstractJsonElement(NodeType type, JsonElement parent) {
+    protected AbstractJsonElement(NodeType type, JsonElement parent) {
         this.type = type;
         this.parent = parent;
     }

elementfactory/src/main/java/io/github/xmljim/json/elementfactory/AbstractJsonValue.java

@@ -40,8 +40,8 @@ public int hashCode() {
     @Override
     @SuppressWarnings("unchecked")
     public boolean isEquivalent(JsonElement other) {
-        if (other instanceof JsonValue<?> value) {
-            return compareTo((JsonValue<T>) value) == 0;
+        if (other instanceof JsonValue<?> val) {
+            return compareTo((JsonValue<T>) val) == 0;
         }
 
         return false;

elementfactory/src/main/java/io/github/xmljim/json/elementfactory/NumberValue.java

@@ -12,6 +12,7 @@ public NumberValue(JsonElement parent, Number value) {
 
     }
 
+    @Override
     public Number get() {
         return switch (type()) {
             case INTEGER -> super.get().intValue();

jsonfactory/src/main/java/io/github/xmljim/json/service/Version.java

@@ -48,13 +48,13 @@ public Version(String versionString) {
 
         if (matcher.matches()) {
 
-            int major = Integer.parseInt(matcher.group(VersionPatterns.MAJOR));
-            int minor = matcher.group(VersionPatterns.MINOR) != null ? Integer.parseInt(matcher.group(VersionPatterns.MINOR)) : 0;
-            int patch = matcher.group(VersionPatterns.PATCH) != null ? Integer.parseInt(matcher.group(VersionPatterns.PATCH)) : 0;
+            int maj = Integer.parseInt(matcher.group(VersionPatterns.MAJOR));
+            int min = matcher.group(VersionPatterns.MINOR) != null ? Integer.parseInt(matcher.group(VersionPatterns.MINOR)) : 0;
+            int pat = matcher.group(VersionPatterns.PATCH) != null ? Integer.parseInt(matcher.group(VersionPatterns.PATCH)) : 0;
 
-            setMajor(major);
-            setMinor(minor);
-            setPatch(patch);
+            setMajor(maj);
+            setMinor(min);
+            setPatch(pat);
             setPreRelease(matcher.group(VersionPatterns.PRERELEASE));
             setBuildMetadata(matcher.group(VersionPatterns.BUILDMETADATA));
         } else {
@@ -290,8 +290,7 @@ public Version nextPatch() {
     @Override
     public String toString() {
 
-        //noinspection StringBufferReplaceableByString,StringBufferMayBeStringBuilder
-        StringBuffer builder = new StringBuffer();
+        StringBuilder builder = new StringBuilder();
 
         builder.append(getMajor()).append(".")
             .append(getMinor()).append(".")

jsonpath/src/main/java/io/github/xmljim/json/jsonpath/context/Context.java

@@ -125,15 +125,13 @@ public void setVariable(String key, Context context) {
         root.variables.put(key, context);
     }
 
-    public void getVariable(String key) {
-        root.variables.get(key);
+    public Context getVariable(String key) {
+        return root.variables.get(key);
     }
 
     @Override
     public boolean equals(Object other) {
         if (other instanceof Context o) {
-//            System.out.printf("equals: %1$d <=> %2$d", get().hashCode(), o.get().hashCode());
-//            System.out.println();
             return Objects.equals(get(), o.get());
         } else {
             return false;

jsonpath/src/main/java/io/github/xmljim/json/jsonpath/function/FunctionFactory.java

@@ -1,18 +1,13 @@
 package io.github.xmljim.json.jsonpath.function;
 
-import io.github.xmljim.json.jsonpath.function.info.FunctionInfo;
 import io.github.xmljim.json.jsonpath.JsonPathException;
 import io.github.xmljim.json.jsonpath.compiler.JsonPathExpressionException;
+import io.github.xmljim.json.jsonpath.function.info.FunctionInfo;
 import io.github.xmljim.json.jsonpath.util.Global;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayDeque;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Deque;
-import java.util.List;
+import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -29,8 +24,8 @@ public static JsonPathFunction createFunction(String expression, Global global)
             String fxName = matcher.group("function");
 
             FunctionInfo functionInfo = global.getFunctionRegistry()
-                    .getFunctionInfo(fxName)
-                    .orElseThrow(() -> new JsonPathException("Function not found: " + fxName));
+                .getFunctionInfo(fxName)
+                .orElseThrow(() -> new JsonPathException("Function not found: " + fxName));
 
             String argsString = matcher.group("args");
 
@@ -55,8 +50,8 @@ public static JsonPathFunction createFunction(String expression, Global global)
         while (matcher.find()) {
             if (matcher.group() != null && !"".equals(matcher.group())) {
                 argExpressions.add(matcher.group().strip().endsWith(",") ?
-                        matcher.group().strip().substring(0, matcher.group().strip().length() - 1) :
-                        matcher.group().strip());
+                    matcher.group().strip().substring(0, matcher.group().strip().length() - 1) :
+                    matcher.group().strip());
             }
         }
         if (functionInfo.arguments().length != 0) {
@@ -108,9 +103,7 @@ private static JsonPathFunction newInstance(Class<? extends JsonPathFunction> fu
             }
         } catch (NoSuchMethodException | InvocationTargetException | InstantiationException |
                  IllegalAccessException e) {
-            e.printStackTrace();
+            throw new JsonPathException(e);
         }
-
-        return null;
     }
 }

mapper/src/main/java/io/github/xmljim/json/mapper/MemberHandler.java

@@ -83,7 +83,7 @@ public void setMemberValue(JsonValue<?> value) {
                 method.ifPresent(method1 -> setMethodValue(method1, value));
             }
         } catch (NoSuchFieldException e) {
-            e.printStackTrace();
+            throw new JsonMapperException(e);
         }
     }
 

parser/src/main/java/io/github/xmljim/json/parser/util/ResizableByteBuffer.java

@@ -96,7 +96,7 @@ public static ResizableByteBuffer fromStream(InputStream inputStream, int alloca
             }
         } catch (final IOException e) {
             // TODO Auto-generated catch block
-            e.printStackTrace();
+            throw new JsonParserException(e);
         }
 
         return buffer;