Removed deprecated methods from Java. Fixed indentation.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>

Author: kc284

ocaml/sdk-gen/java/autogen/xen-api/src/main/java/com/xensource/xenapi/Connection.java

@@ -68,29 +68,6 @@ public Connection(JsonRpcClient jsonRpcClient) {
         this.client = jsonRpcClient;
     }
 
-    /**
-     * Creates a connection to a particular server using a given url. This object can then be passed
-     * in to any other API calls.
-     * <p>
-     * Note this constructor does NOT call Session.loginWithPassword; the programmer is responsible for calling it,
-     * passing the Connection as a parameter. No attempt to connect to the server is made until login is called.
-     * <p>
-     * When this constructor is used, a call to dispose() will do nothing. The programmer is responsible for manually
-     * logging out the Session.
-     *
-     * @param httpClient     The HttpClient used to make calls, this will be used by the underlying {@link #client} for handling requests
-     * @param url            The URL of the server to connect to. Should be of the form http(s)://host-url/jsonrpc or http(s)://host-url.
-     * @param requestTimeout The reply timeout for JSON-RPC calls in seconds
-     * @deprecated           This constructor is deprecated. To set the {@code requestTimeout} please {@link #setRequestTimeout(int)}. You may also use the {@link com.xensource.xenapi.JsonRpcClient#setRequestTimeout(int)}
-     *                       method of this object's {@link #client}. This option is only advisable if you are managing your own {@link com.xensource.xenapi.JsonRpcClient} as the underlying
-     *                       {@link #client} for this object.
-     */
-    @Deprecated
-    public Connection(CloseableHttpClient httpClient, URL url, int requestTimeout) {
-        this.client = new JsonRpcClient(httpClient, url);
-        this.client.setRequestTimeout(requestTimeout);
-    }
-
     /**
      * Creates a connection to a particular server using a given url. This object can then be passed
      * in to any other API calls.
@@ -110,31 +87,6 @@ public Connection(URL url) {
         this.client = new JsonRpcClient(url);
     }
 
-    /**
-     * Creates a connection to a particular server using a given url. This object can then be passed
-     * in to any other API calls.
-     * <p>
-     * Note this constructor does NOT call Session.loginWithPassword; the programmer is responsible for calling it,
-     * passing the Connection as a parameter. No attempt to connect to the server is made until login is called.
-     * <p>
-     * When this constructor is used, a call to dispose() will do nothing. The programmer is responsible for manually
-     * logging out the Session.
-     *
-     * @param url               The URL of the server to connect to. Should be of the form http(s)://host-url/jsonrpc or http(s)://host-url.
-     * @param requestTimeout    The reply timeout for JSON-RPC calls in seconds
-     * @param connectionTimeout The connection timeout for JSON-RPC calls in seconds
-     * @deprecated              This constructor is deprecated. To set {@code requestTimeout} or {@code connectionTimeout} please use {@link #setRequestTimeout(int)} or {@link #setConnectionTimeout(int)} respectively.
-     *                          You may also use the {@link com.xensource.xenapi.JsonRpcClient#setRequestTimeout(int)} method of this object's {@link #client}.
-     *                          This option is only advisable if you are managing your own {@link com.xensource.xenapi.JsonRpcClient} as the underlying
-     *                          {@link #client} for this object.
-     */
-    @Deprecated
-    public Connection(URL url, int requestTimeout, int connectionTimeout) {
-        this.client = new JsonRpcClient(url);
-        this.client.setRequestTimeout(requestTimeout);
-        this.client.setConnectionTimeout(connectionTimeout);
-    }
-
     /**
      * Creates a connection to a particular server using a given url. This object can then be passed
      * in to any other API calls.
@@ -159,36 +111,6 @@ public Connection(URL url, String sessionReference) {
         this.sessionReference = sessionReference;
     }
 
-    /**
-     * Creates a connection to a particular server using a given url. This object can then be passed
-     * in to any other API calls.
-     * <p>
-     * Note this constructor does NOT call Session.loginWithPassword; the programmer is responsible for calling it,
-     * passing the Connection as a parameter. No attempt to connect to the server is made until login is called.
-     * <p>
-     * When this constructor is used, a call to dispose() will do nothing. The programmer is responsible for manually
-     * logging out the Session.
-     *
-     * @param url               The URL of the server to connect to. Should be of the form http(s)://host-url/jsonrpc or http(s)://host-url.
-     * @param sessionReference  A reference to a logged-in Session. Any method calls on this Connection will use it.
-     *                          This constructor does not call Session.loginWithPassword, and dispose() on the resulting
-     *                          Connection object does not call Session.logout. The programmer is responsible for
-     *                          ensuring the Session is logged in and out correctly.
-     * @param requestTimeout    The reply timeout for JSON-RPC calls in seconds
-     * @param connectionTimeout The connection timeout for JSON-RPC calls in seconds
-     * @deprecated              This constructor is deprecated. To set {@code requestTimeout} or {@code connectionTimeout} please use {@link #setRequestTimeout(int)} or {@link #setConnectionTimeout(int)} respectively.
-     *                          You may also use the {@link com.xensource.xenapi.JsonRpcClient#setRequestTimeout(int)} method of this object's {@link #client}.
-     *                          This option is only advisable if you are managing your own {@link com.xensource.xenapi.JsonRpcClient} as the underlying
-     *                          {@link #client} for this object.
-     */
-    @Deprecated
-    public Connection(URL url, String sessionReference, int requestTimeout, int connectionTimeout) {
-        this.client = new JsonRpcClient(url);
-        this.client.setRequestTimeout(requestTimeout);
-        this.client.setConnectionTimeout(connectionTimeout);
-        this.sessionReference = sessionReference;
-    }
-
     /**
      * Set the timeout in seconds for every request made by this object's {@link #client}.
      * If not set the value defaults to {@value JsonRpcClient#DEFAULT_REQUEST_TIMEOUT}.

ocaml/sdk-gen/java/autogen/xen-api/src/main/java/com/xensource/xenapi/CustomDateDeserializer.java

@@ -49,7 +49,7 @@ public class CustomDateDeserializer extends StdDeserializer<Date> {
     /**
      * Array of {@link SimpleDateFormat} objects representing the date formats
      * used in xen-api responses.
-     * <br />
+     * <br>
      * RFC-3339 date formats can be returned in either Zulu or time zone agnostic.
      * This list is not an exhaustive list of formats supported by RFC-3339, rather
      * a set of formats that will enable the deserialization of xen-api dates.

ocaml/sdk-gen/java/autogen/xen-api/src/main/java/com/xensource/xenapi/JsonRpcClient.java

@@ -53,15 +53,14 @@
 
 /**
  * Provides a JSON-RPC v2.0 client for making remote procedure calls to xapi's backend URL.
- * <br />
+ * <br>
  * This class enables the communication to the JSON-RPC backend. The client utilizes the HttpClient class for
  * sending HTTP POST requests with JSON payloads and the ObjectMapper class from the Jackson library for
  * serialization and deserialization of JSON data.
- * <br />
+ * <br>
  * The client can be customised by passing it as a parameter to corresponding constructor, enabling custom
  * handling of requests.
- * <br />
- * <br />
+ * <br>
  * By default, the timeout for requests is set to {@value #DEFAULT_REQUEST_TIMEOUT}. The default timeout for connecting to the
  * JSON-RPC backend is set to {@value #DEFAULT_CONNECTION_TIMEOUT} seconds. The maximum number of concurrent connections handled
  * by the underlying {@link PoolingHttpClientConnectionManager} is {@value #MAX_CONCURRENT_CONNECTIONS}.

ocaml/sdk-gen/java/main.ml

@@ -501,15 +501,6 @@ let get_types_json types =
           ("name", `String type_string)
         ; ("class_name", `String class_name)
         ; ("method_name", `String method_name)
-        ; ( "suppress_unchecked_warning"
-          , `Bool
-              ( match t with
-              | Map _ | Record _ | Option (Record _) | Option (Map _) ->
-                  true
-              | _ ->
-                  false
-              )
-          )
         ; ( "generate_reference_task_result_func"
           , `Bool generate_reference_task_result_func
           )

ocaml/sdk-gen/java/templates/Class.mustache

@@ -61,9 +61,10 @@ public class {{class_name}} extends XenAPIObject {
     protected final String ref;
 
     /**
-     * For internal use only.
+     * Creates an object from a given XenAPI reference (OpaqueRef)
+     * @param ref The OpaqueRef from which to create the object.
      */
-    {{{class_name}}}(String ref) {
+    public {{{class_name}}}(String ref) {
         this.ref = ref;
     }
 
@@ -79,21 +80,17 @@ public class {{class_name}} extends XenAPIObject {
      * If obj is a {{{class_name}}}, compares XenAPI references for equality.
      */
     @Override
-    public boolean equals(Object obj)
-    {
-        if (obj instanceof {{{class_name}}})
-        {
+    public boolean equals(Object obj) {
+        if (obj instanceof {{{class_name}}}) {
             {{{class_name}}} other = ({{{class_name}}}) obj;
             return other.ref.equals(this.ref);
-        } else
-        {
+        } else {
             return false;
         }
     }
 
     @Override
-    public int hashCode()
-    {
+    public int hashCode() {
         return ref.hashCode();
     }
 

ocaml/sdk-gen/java/templates/Types.mustache

@@ -40,84 +40,77 @@ import java.util.regex.Pattern;
  */
 public class Types
 {
-   /**
-    * Interface for all Record classes
-    */
-   public interface Record
-   {
-       /**
-        * Convert a Record to a Map
-        */
-       Map<String, Object> toMap();
-   }
-   /**
-    * Base class for all XenAPI Exceptions
-    */
-   public static class XenAPIException extends IOException {
-       public final String shortDescription;
-       public final String[] errorDescription;
-       XenAPIException(String shortDescription)
-       {
-           this.shortDescription = shortDescription;
-           this.errorDescription = null;
-       }
-       XenAPIException(String[] errorDescription)
-       {
-           this.errorDescription = errorDescription;
-           if (errorDescription.length > 0)
-           {
-               shortDescription = errorDescription[0];
-           } else
-           {
-               shortDescription = "";
-           }
-       }
-       public String toString()
-       {
-           if (errorDescription == null)
-           {
-               return shortDescription;
-           } else if (errorDescription.length == 0)
-           {
-               return "";
-           }
+    /**
+     * Interface for all Record classes
+     */
+    public interface Record
+    {
+        /**
+         * Convert a Record to a Map
+         */
+        Map<String, Object> toMap();
+    }
+    /**
+     * Base class for all XenAPI Exceptions
+     */
+    public static class XenAPIException extends IOException {
+        public final String shortDescription;
+        public final String[] errorDescription;
+
+        XenAPIException(String shortDescription) {
+            this.shortDescription = shortDescription;
+            this.errorDescription = null;
+        }
+
+        XenAPIException(String[] errorDescription) {
+            this.errorDescription = errorDescription;
+            if (errorDescription.length > 0) {
+                shortDescription = errorDescription[0];
+            } else {
+                shortDescription = "";
+            }
+        }
+
+        public String toString() {
+            if (errorDescription == null) {
+                return shortDescription;
+            } else if (errorDescription.length == 0) {
+                return "";
+            }
+
            StringBuilder sb = new StringBuilder();
-           for (int i = 0; i < errorDescription.length - 1; i++)
-           {
+           for (int i = 0; i < errorDescription.length - 1; i++) {
                sb.append(errorDescription[i]);
            }
            sb.append(errorDescription[errorDescription.length - 1]);
            return sb.toString();
        }
    }
 
-   /**
-    * Thrown if the response from the server contains an invalid status.
-    */
-   public static class BadServerResponse extends XenAPIException
-   {
-       public BadServerResponse(JsonRpcResponseError responseError)
-       {
-           super(String.valueOf(responseError));
-       }
-   }
+    /**
+     * Thrown if the response from the server contains an invalid status.
+     */
+    public static class BadServerResponse extends XenAPIException {
+        public BadServerResponse(JsonRpcResponseError responseError) {
+            super(String.valueOf(responseError));
+        }
+    }
 
-   /**
-   * Checks the provided server response was successful. If the call
-   * failed, throws a XenAPIException. If the server
-   * returned an invalid response, throws a BadServerResponse.
-   * Otherwise, returns the server response as passed in.
-   */
-   public static void checkError(JsonRpcResponseError response) throws XenAPIException, BadServerResponse
-   {
+    /**
+     * Checks the provided server response was successful. If the call
+     * failed, throws a XenAPIException. If the server
+     * returned an invalid response, throws a BadServerResponse.
+     * Otherwise, returns the server response as passed in.
+     */
+    public static void checkError(JsonRpcResponseError response) throws XenAPIException, BadServerResponse {
         var errorData = response.data;
-        if(errorData.length == 0){
+        if(errorData.length == 0) {
             throw new BadServerResponse(response);
         }
         var errorName = response.message;
 
         {{#errors}}
-        if (errorName.equals("{{{name}}}")){
+        if (errorName.equals("{{{name}}}")) {
             {{#err_params}}
             String p{{{index}}} = errorData.length > {{{index}}} ? errorData[{{{index}}}] : "";
             {{/err_params}}
@@ -180,50 +173,26 @@ public class Types
         /**
          * Create a new BadAsyncResult
          */
-        public BadAsyncResult(String result)
-        {
+        public BadAsyncResult(String result) {
             super(result);
             this.result = result;
         }
     }
 
-    {{#types}}
-    /**
-    * Converts an {@link Object} to a {@link {{{name}}}} object.
-    * <br />
-    * This method takes an {@link Object} as input and attempts to convert it into a {@link {{{name}}}} object.
-    * If the input object is null, the method returns null. Otherwise, it creates a new {@link {{{name}}}}
-    * object using the input object's {@link String} representation.
-    * <br />
-    * @param object The {@link Object} to be converted to a {@link {{{name}}}} object.
-    * @return A {@link {{{name}}}} object created from the input {@link Object}'s {@link String} representation,
-    *         or null if the input object is null.
-    * @deprecated this method will not be publicly exposed in future releases of this package.
-    */
-    @Deprecated{{#suppress_unchecked_warning}}
-    @SuppressWarnings("unchecked"){{/suppress_unchecked_warning}}
-    public static {{{name}}} {{{method_name}}}(Object object) {
-        if (object == null) {
-            return null;
-        }
-        {{{method_body}}}
-    }
-
-    {{/types}}
-
     {{#types}}{{#generate_reference_task_result_func}}
     /**
      * Attempt to convert the {@link Task}'s result to a {@link {{{name}}}} object.
      * Will return null if the method cannot fetch a valid value from the {@link Task} object.
      * @param task The task from which to fetch the result.
      * @param connection The connection
      * @return the instantiated object if a valid value was found, null otherwise.
-     * @throws BadServerResponse Thrown if the response from the server contains an invalid status.
+     * @throws BadServerResponse if the response from the server contains an invalid status.
      * @throws XenAPIException if the call failed.
-     * @throws IOException if an error occurs during a send or receive. This includes cases where a payload is invalid JSON.
+     * @throws IOException if an error occurs during send or receive. This includes cases where a payload is invalid JSON.
      */
     public static {{class_name}} to{{class_name}}(Task task, Connection connection) throws IOException {
-        return Types.to{{class_name}}(parseResult(task.getResult(connection)));
+        String result = parseResult(task.getResult(connection));
+        return result == null || result.isEmpty() ? null : new {{class_name}}(result);
     }
 
     {{/generate_reference_task_result_func}}
@@ -238,16 +207,4 @@ public class Types
 
         return matcher.group(1);
     }
-
-    public static EventBatch toEventBatch(Object object) {
-      if (object == null) {
-          return null;
-      }
-      Map map = (Map) object;
-      EventBatch batch = new EventBatch();
-      batch.token = toString(map.get("token"));
-      batch.validRefCounts = map.get("valid_ref_counts");
-      batch.events = toSetOfEventRecord(map.get("events"));
-      return batch;
-    }
 }