Make private methods static where possible

gaul · gaul · commit f63d21fd13cd · 2019-07-26T15:24:05.000-07:00
This avoids an unneeded object reference.  Found via error-prone.
diff --git a/JSONObject.java b/JSONObject.java
@@ -1496,11 +1496,11 @@ && isValidMethodName(method.getName())) {
         }
     }
 
-    private boolean isValidMethodName(String name) {
+    private static boolean isValidMethodName(String name) {
         return !"getClass".equals(name) && !"getDeclaringClass".equals(name);
     }
 
-    private String getKeyNameFromMethod(Method method) {
+    private static String getKeyNameFromMethod(Method method) {
         final int ignoreDepth = getAnnotationDepth(method, JSONPropertyIgnore.class);
         if (ignoreDepth > 0) {
             final int forcedNameDepth = getAnnotationDepth(method, JSONPropertyName.class);
diff --git a/JSONPointer.java b/JSONPointer.java
@@ -186,7 +186,7 @@ public JSONPointer(List<String> refTokens) {
         this.refTokens = new ArrayList<String>(refTokens);
     }
 
-    private String unescape(String token) {
+    private static String unescape(String token) {
         return token.replace("~1", "/").replace("~0", "~")
                 .replace("\\\"", "\"")
                 .replace("\\\\", "\\");
@@ -228,7 +228,7 @@ public Object queryFrom(Object document) throws JSONPointerException {
      * @return the matched object. If no matching item is found a
      * @throws JSONPointerException is thrown if the index is out of bounds
      */
-    private Object readByIndexToken(Object current, String indexToken) throws JSONPointerException {
+    private static Object readByIndexToken(Object current, String indexToken) throws JSONPointerException {
         try {
             int index = Integer.parseInt(indexToken);
             JSONArray currentArr = (JSONArray) current;
@@ -267,7 +267,7 @@ public String toString() {
      * @param token the JSONPointer segment value to be escaped
      * @return the escaped value for the token
      */
-    private String escape(String token) {
+    private static String escape(String token) {
         return token.replace("~", "~0")
                 .replace("/", "~1")
                 .replace("\\", "\\\\")

Original file line number	Diff line number	Diff line change
`@@ -1496,11 +1496,11 @@ && isValidMethodName(method.getName())) {`
`1496`	`1496`	`}`
`1497`	`1497`	`}`
`1498`	`1498`
`1499`		`- private boolean isValidMethodName(String name) {`
	`1499`	`+ private static boolean isValidMethodName(String name) {`
`1500`	`1500`	`return !"getClass".equals(name) && !"getDeclaringClass".equals(name);`
`1501`	`1501`	`}`
`1502`	`1502`
`1503`		`- private String getKeyNameFromMethod(Method method) {`
	`1503`	`+ private static String getKeyNameFromMethod(Method method) {`
`1504`	`1504`	`final int ignoreDepth = getAnnotationDepth(method, JSONPropertyIgnore.class);`
`1505`	`1505`	`if (ignoreDepth > 0) {`
`1506`	`1506`	`final int forcedNameDepth = getAnnotationDepth(method, JSONPropertyName.class);`