7.0.0-build

Author: ahmadiesa-abu

pom.xml

@@ -9,8 +9,8 @@
     <url>https://github.com/cloudify-cosmo/cloudify-java-rest-client</url>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <jersey.version>2.30</jersey.version>
-        <slf4j.version>1.7.30</slf4j.version>
+        <jersey.version>3.1.0</jersey.version>
+        <slf4j.version>2.0.6</slf4j.version>
     </properties>
     <licenses>
         <license>
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>jakarta.ws.rs</groupId>
             <artifactId>jakarta.ws.rs-api</artifactId>
-            <version>2.1.6</version>
+            <version>3.1.0</version>
         </dependency>
         <dependency>
             <groupId>javax.json</groupId>
@@ -54,7 +54,7 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.6</version>
+            <version>2.11.0</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -64,7 +64,7 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-compress</artifactId>
-            <version>1.20</version>
+            <version>1.22</version>
         </dependency>
         <!--
         Test-time dependencies.

src/main/java/co/cloudify/rest/client/AbstractCloudifyClient.java

@@ -2,16 +2,16 @@
 
 import java.util.Map;
 
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.Invocation.Builder;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.client.Client;
+import jakarta.ws.rs.client.Invocation.Builder;
+import jakarta.ws.rs.client.WebTarget;
+import jakarta.ws.rs.core.MediaType;
 
 import org.apache.commons.lang3.StringUtils;
 
 /**
  * Root class for all Cloudify clients.
- * 
+ *
  * @author Isaac Shabtay
  */
 public class AbstractCloudifyClient {

src/main/java/co/cloudify/rest/client/BlueprintsClient.java

@@ -13,14 +13,14 @@
 import java.nio.file.attribute.BasicFileAttributes;
 import java.util.Collections;
 
-import javax.ws.rs.NotFoundException;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.client.Invocation.Builder;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.GenericType;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.NotFoundException;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.client.Client;
+import jakarta.ws.rs.client.Entity;
+import jakarta.ws.rs.client.Invocation.Builder;
+import jakarta.ws.rs.client.WebTarget;
+import jakarta.ws.rs.core.GenericType;
+import jakarta.ws.rs.core.MediaType;
 
 import co.cloudify.rest.model.Deployment;
 import org.apache.commons.compress.archivers.ArchiveEntry;
@@ -36,7 +36,7 @@
 
 /**
  * REST client for blueprint-related operations.
- * 
+ *
  * @author Isaac Shabtay
  */
 public class BlueprintsClient extends AbstractCloudifyClient {
@@ -63,9 +63,9 @@ protected Builder getBuilder(final String id) {
 
     /**
      * Get a blueprint by ID.
-     * 
+     *
      * @param id ID of blueprint to get
-     * 
+     *
      * @return A {@link Blueprint} instance for that blueprint.
      */
     public Blueprint get(final String id) {
@@ -80,13 +80,13 @@ public Blueprint get(final String id) {
 
     /**
      * Uploads a blueprint archive.
-     * 
+     *
      * @param id      blueprint ID
      * @param archive archive file
      * @param main    main YAML filename
-     * 
+     *
      * @return A {@link Blueprint} instance for the uploaded blueprint.
-     * 
+     *
      * @throws IOException I/O issue encountered while reading archive.
      */
     public Blueprint uploadArchive(final String id, final File archive, final String main) throws IOException {
@@ -104,11 +104,11 @@ public Blueprint uploadArchive(final String id, final File archive, final String
      * Uploads a blueprint from the URL. This command doesn't download the URL
      * contents locally. The specified URL must be accessible from within Cloudify
      * Manager.
-     * 
+     *
      * @param id         blueprint ID
      * @param archiveUrl URL to archive
      * @param main       main YAML filename
-     * 
+     *
      * @return A {@link Blueprint} instance for the uploaded blueprint
      */
     public Blueprint upload(final String id, final URL archiveUrl, final String main) {
@@ -128,13 +128,13 @@ public Blueprint upload(final String id, final URL archiveUrl, final String main
 
     /**
      * Uploads a blueprint from a local directory.
-     * 
+     *
      * @param id            blueprint ID
      * @param rootDirectory root directory of the blueprint
      * @param main          main YAML filename
-     * 
+     *
      * @return A {@link Blueprint} instance for the uploaded blueprint
-     * 
+     *
      * @throws IOException A problem occured while creating the blueprint archive.
      */
     public Blueprint upload(final String id, final File rootDirectory, final String main) throws IOException {
@@ -180,9 +180,9 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IO
 
     /**
      * Deletes a blueprint.
-     * 
+     *
      * @param id ID of blueprint to delete
-     * 
+     *
      * @return The deleted blueprint.
      */
     public Blueprint delete(final String id) {
@@ -204,9 +204,9 @@ public ListResponse<Blueprint> list() {
 
     /**
      * Returns a list of all blueprints with ID's containing a string.
-     * 
+     *
      * @param searchString string to search for
-     * 
+     *
      * @return A list of matching blueprints.
      */
     public ListResponse<Blueprint> list(final String searchString) {
@@ -215,11 +215,11 @@ public ListResponse<Blueprint> list(final String searchString) {
 
     /**
      * Returns a list of all blueprints with ID's containing a string.
-     * 
+     *
      * @param searchString string to search for
      * @param sortKey      key to sort by
      * @param descending   <code>true</code> for a descending sorting order
-     * 
+     *
      * @return A list of matching blueprints.
      */
     public ListResponse<Blueprint> list(final String searchString, final String sortKey, final boolean descending) {

src/main/java/co/cloudify/rest/client/CloudifyClient.java

@@ -1,8 +1,8 @@
 package co.cloudify.rest.client;
 
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.WebTarget;
+import jakarta.ws.rs.client.Client;
+import jakarta.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.client.WebTarget;
 
 import co.cloudify.rest.client.filters.BasicAuthenticator;
 import co.cloudify.rest.client.filters.TenantFilter;
@@ -17,7 +17,7 @@
  * Use {@link #create(String, String, String, boolean, String)} to create a
  * {@link CloudifyClient} instance.
  * </p>
- * 
+ *
  * @author Isaac Shabtay
  */
 public class CloudifyClient extends AbstractCloudifyClient {

src/main/java/co/cloudify/rest/client/DeploymentsClient.java

@@ -3,13 +3,13 @@
 import java.util.Collections;
 import java.util.Map;
 
-import javax.ws.rs.NotFoundException;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.client.Invocation.Builder;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.GenericType;
+import jakarta.ws.rs.NotFoundException;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.client.Client;
+import jakarta.ws.rs.client.Entity;
+import jakarta.ws.rs.client.Invocation.Builder;
+import jakarta.ws.rs.client.WebTarget;
+import jakarta.ws.rs.core.GenericType;
 
 import co.cloudify.rest.client.exceptions.CloudifyClientException;
 import co.cloudify.rest.client.exceptions.DeploymentNotFoundException;
@@ -22,7 +22,7 @@
 
 /**
  * Client for deployment-related operations.
- * 
+ *
  * @author Isaac Shabtay
  */
 public class DeploymentsClient extends AbstractCloudifyClient {
@@ -78,9 +78,9 @@ public ListResponse<Deployment> list(final String blueprintId, final String sear
 
     /**
      * Returns a specific deployment.
-     * 
+     *
      * @param id deployment's ID
-     * 
+     *
      * @return A {@link Deployment} instance describing the deployment.
      */
     public Deployment get(final String id) {
@@ -95,11 +95,11 @@ public Deployment get(final String id) {
 
     /**
      * Creates a deployment.
-     * 
+     *
      * @param id        new deployment's ID
      * @param blueprint blueprint to associate deployment with
      * @param inputs    deployment inputs
-     * 
+     *
      * @return A {@link Deployment} instance for the new deployment.
      */
     public Deployment create(final String id, final Blueprint blueprint, final Map<String, Object> inputs) {
@@ -108,11 +108,11 @@ public Deployment create(final String id, final Blueprint blueprint, final Map<S
 
     /**
      * Creates a deployment. Note: this is an asynchronous operation.
-     * 
+     *
      * @param id          new deployment's ID
      * @param blueprintId blueprint to associate deployment with
      * @param inputs      deployment inputs
-     * 
+     *
      * @return A {@link Deployment} instance for the new deployment.
      */
     public Deployment create(final String id, final String blueprintId, final Map<String, Object> inputs) {
@@ -152,9 +152,9 @@ public Map<String, Object> getCapabilities(final Deployment deployment) {
 
     /**
      * Deletes a deployment. Note: this operation is asynchronous.
-     * 
+     *
      * @param id deployment to delete
-     * 
+     *
      * @return The deleted deployment.
      */
     public Deployment delete(final String id) {

src/main/java/co/cloudify/rest/client/EventsClient.java

@@ -1,9 +1,9 @@
 package co.cloudify.rest.client;
 
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.GenericType;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.client.Client;
+import jakarta.ws.rs.client.WebTarget;
+import jakarta.ws.rs.core.GenericType;
 
 import co.cloudify.rest.client.exceptions.CloudifyClientException;
 import co.cloudify.rest.client.params.EventsListParams;
@@ -14,7 +14,7 @@
 
 /**
  * Client for events and logs.
- * 
+ *
  * @author Isaac Shabtay
  */
 public class EventsClient extends AbstractCloudifyClient {
@@ -27,12 +27,12 @@ public EventsClient(Client restClient, WebTarget base) {
 
     /**
      * Lists events/logs for an execution.
-     * 
+     *
      * @param execution   the execution
      * @param fromEvent   sequential number of the event to start from
      * @param batchSize   how many events to fetch
      * @param includeLogs whether to include logs
-     * 
+     *
      * @return A {@link ListResponse} of {@link Event} instances.
      */
     public ListResponse<Event> list(final Execution execution, long fromEvent, long batchSize, boolean includeLogs) {
@@ -41,10 +41,10 @@ public ListResponse<Event> list(final Execution execution, long fromEvent, long
 
     /**
      * Lists all events/logs for an execution.
-     * 
+     *
      * @param execution   the execution
      * @param includeLogs whether to include logs
-     * 
+     *
      * @return A {@link ListResponse} of {@link Event} instances.
      */
     public ListResponse<Event> list(final Execution execution, boolean includeLogs) {
@@ -53,10 +53,10 @@ public ListResponse<Event> list(final Execution execution, boolean includeLogs)
 
     /**
      * Lists all events/logs for an execution.
-     * 
+     *
      * @param executionId the execution ID
      * @param includeLogs whether to include logs
-     * 
+     *
      * @return A {@link ListResponse} of {@link Event} instances.
      */
     public ListResponse<Event> list(final String executionId, boolean includeLogs) {
@@ -65,12 +65,12 @@ public ListResponse<Event> list(final String executionId, boolean includeLogs) {
 
     /**
      * Lists events and logs for a specific execution.
-     * 
+     *
      * @param executionId the execution ID
      * @param fromEvent   sequential number of the event to start from
      * @param batchSize   how many events to fetch
      * @param includeLogs whether to include logs
-     * 
+     *
      * @return A {@link ListResponse} of {@link Event} instances.
      */
     public ListResponse<Event> list(final String executionId, Long fromEvent, Long batchSize, boolean includeLogs) {