Make properties private in JSON RPC classes

Accessors are now provided instead.

Fixes #429

(cherry picked from commit 57d4fff)

Author: acogoluegnes

src/main/java/com/rabbitmq/tools/jsonrpc/JsonRpcException.java

@@ -27,19 +27,19 @@ public class JsonRpcException extends Exception {
     /**
      * Usually the constant string, "JSONRPCError"
      */
-    public String name;
+    private String name;
     /**
      * Error code
      */
-    public int code;
+    private int code;
     /**
      * Error message
      */
-    public String message;
+    private String message;
     /**
      * Error detail object - may not always be present or meaningful
      */
-    public Object error;
+    private Object error;
 
     public JsonRpcException() {
         // no work needed in default no-arg constructor
@@ -52,4 +52,21 @@ public JsonRpcException(String detailMessage, String name, int code, String mess
         this.message = message;
         this.error = error;
     }
+
+    public String getName() {
+        return name;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    @Override
+    public String getMessage() {
+        return message;
+    }
+
+    public Object getError() {
+        return error;
+    }
 }

src/main/java/com/rabbitmq/tools/jsonrpc/JsonRpcServer.java

@@ -52,15 +52,11 @@ public class JsonRpcServer extends StringRpcServer {
     /**
      * Holds the JSON-RPC service description for this client.
      */
-    public ServiceDescription serviceDescription;
-    /**
-     * The interface this server implements.
-     */
-    public Class<?> interfaceClass;
+    private ServiceDescription serviceDescription;
     /**
      * The instance backing this server.
      */
-    public Object interfaceInstance;
+    private Object interfaceInstance;
 
     public JsonRpcServer(Channel channel,
         Class<?> interfaceClass,
@@ -119,7 +115,9 @@ public JsonRpcServer(Channel channel,
     }
 
     private void init(Class<?> interfaceClass, Object interfaceInstance) {
-        this.interfaceClass = interfaceClass;
+        /**
+         * The interface this server implements.
+         */
         this.interfaceInstance = interfaceInstance;
         this.serviceDescription = new ServiceDescription(interfaceClass);
     }

src/main/java/com/rabbitmq/tools/jsonrpc/ParameterDescription.java

@@ -26,12 +26,12 @@
  */
 public class ParameterDescription {
     /** The parameter name. */
-    public String name;
+    private String name;
     /**
      * The parameter type - one of "bit", "num", "str", "arr",
      * "obj", "any" or "nil".
      */
-    public String type;
+    private String type;
 
     public ParameterDescription() {
         // Nothing to do here.
@@ -57,4 +57,12 @@ public static String lookup(Class<?> c) {
         if (Collection.class.isAssignableFrom(c)) return "arr";
         return "any";
     }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getType() {
+        return type;
+    }
 }

src/main/java/com/rabbitmq/tools/jsonrpc/ProcedureDescription.java

@@ -27,13 +27,13 @@
  */
 public class ProcedureDescription {
     /** Procedure name */
-    public String name;
+    private String name;
     /** Human-readable procedure summary */
-    public String summary;
+    private String summary;
     /** Human-readable instructions for how to get information on the procedure's operation */
-    public String help;
+    private String help;
     /** True if this procedure is idempotent, that is, can be accessed via HTTP GET */
-    public boolean idempotent;
+    private boolean idempotent;
 
     /** Descriptions of parameters for this procedure */
     private ParameterDescription[] params;
@@ -139,4 +139,20 @@ public int arity() {
     public ParameterDescription[] getParams() {
         return params;
     }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getSummary() {
+        return summary;
+    }
+
+    public String getHelp() {
+        return help;
+    }
+
+    public boolean isIdempotent() {
+        return idempotent;
+    }
 }

src/main/java/com/rabbitmq/tools/jsonrpc/ServiceDescription.java

@@ -30,15 +30,15 @@ public class ServiceDescription {
     public static final String JSON_RPC_VERSION = "1.1";
 
     /** The service name */
-    public String name;
+    private String name;
     /** ID for the service */
-    public String id;
+    private String id;
     /** Version of the service */
-    public String version;
+    private String version;
     /** Human-readable summary for the service */
-    public String summary;
+    private String summary;
     /** Human-readable instructions for how to get information on the service's operation */
-    public String help;
+    private String help;
 
     /** Map from procedure name to {@link ProcedureDescription} */
     private Map<String, ProcedureDescription> procedures;
@@ -75,7 +75,7 @@ public void setProcs(Collection<Map<String, Object>> p) {
 
     /** Private API - used during initialization */
     private void addProcedure(ProcedureDescription proc) {
-        procedures.put(proc.name + "/" + proc.arity(), proc);
+        procedures.put(proc.getName() + "/" + proc.arity(), proc);
     }
 
     /**
@@ -91,4 +91,24 @@ public ProcedureDescription getProcedure(String newname, int arity) {
         }
         return proc;
     }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public String getVersion() {
+        return version;
+    }
+
+    public String getSummary() {
+        return summary;
+    }
+
+    public String getHelp() {
+        return help;
+    }
 }