liblab SDK update for version v0.9.0-alpha.4

.manifest.json

@@ -1,10 +1,10 @@
 {
-  "liblabVersion": "2.4.0",
-  "date": "2024-09-17T04:36:05.118Z",
+  "liblabVersion": "2.5.1",
+  "date": "2024-10-05T04:00:45.117Z",
   "config": {
     "apiId": 1126,
     "sdkName": "salad-cloud-imds-sdk",
-    "sdkVersion": "0.9.0-alpha.3",
+    "sdkVersion": "0.9.0-alpha.4",
     "liblabVersion": "2",
     "deliveryMethods": ["zip"],
     "languages": ["java"],
@@ -33,7 +33,7 @@
         "githubRepoName": "salad-cloud-imds-sdk-go",
         "ignoreFiles": [".gitignore", "./LICENSE"],
         "liblabVersion": "2",
-        "sdkVersion": "0.9.0-alpha.3",
+        "sdkVersion": "0.9.0-alpha.4",
         "targetBranch": "main"
       },
       "java": {
@@ -57,11 +57,11 @@
         "homepage": "https://github.com/saladtechnologies/salad-cloud-imds-sdk-java",
         "ignoreFiles": [".gitignore", "./LICENSE"],
         "liblabVersion": "2",
-        "sdkVersion": "0.9.0-alpha.3",
+        "sdkVersion": "0.9.0-alpha.4",
         "targetBranch": "main"
       },
       "python": {
-        "alwaysInitializeOptionals": true,
+        "alwaysInitializeOptionals": false,
         "classifiers": [
           "Development Status :: 3 - Alpha",
           "Intended Audience :: Developers",
@@ -100,7 +100,7 @@
         "githubRepoName": "salad-cloud-imds-sdk-python",
         "ignoreFiles": [".gitignore", "./LICENSE"],
         "liblabVersion": "2",
-        "sdkVersion": "0.9.0-alpha.3",
+        "sdkVersion": "0.9.0-alpha.4",
         "targetBranch": "main"
       },
       "typescript": {
@@ -123,8 +123,9 @@
         "homepage": "https://github.com/saladtechnologies/salad-cloud-imds-sdk-javascript",
         "ignoreFiles": [".gitignore", "./LICENSE"],
         "liblabVersion": "2",
-        "sdkVersion": "0.9.0-alpha.3",
-        "targetBranch": "main"
+        "sdkVersion": "0.9.0-alpha.4",
+        "targetBranch": "main",
+        "generateEnumAs": "enum"
       }
     },
     "publishing": {
@@ -155,7 +156,7 @@
     },
     "multiTenant": true,
     "hooksLocation": {
-      "bucketKey": "7207/hooks.zip",
+      "bucketKey": "7538/hooks.zip",
       "bucketName": "prod-liblab-api-stack-hooks"
     },
     "includeWatermark": false,
@@ -192,7 +193,7 @@
     "httpLibrary": {
       "name": "axios",
       "packages": {
-        "axios": "^1.7.4"
+        "axios": "^1.7.7"
       },
       "languages": ["typescript"]
     },
@@ -212,12 +213,8 @@
     "src/main/java/com/salad/cloud/imdssdk/validation/validators/NumericValidator.java",
     "src/main/java/com/salad/cloud/imdssdk/validation/validators/StringValidator.java",
     "src/main/java/com/salad/cloud/imdssdk/validation/validators/Validator.java",
+    "src/main/java/com/salad/cloud/imdssdk/validation/validators/modelValidators/AbstractModelValidator.java",
     "src/main/java/com/salad/cloud/imdssdk/validation/exceptions/ValidationException.java",
-    "src/main/java/com/salad/cloud/imdssdk/validation/annotation/Length.java",
-    "src/main/java/com/salad/cloud/imdssdk/validation/annotation/Max.java",
-    "src/main/java/com/salad/cloud/imdssdk/validation/annotation/Min.java",
-    "src/main/java/com/salad/cloud/imdssdk/validation/annotation/Pattern.java",
-    "src/main/java/com/salad/cloud/imdssdk/validation/annotation/Valid.java",
     "src/main/java/com/salad/cloud/imdssdk/services/BaseService.java",
     "src/main/java/com/salad/cloud/imdssdk/http/HttpMethod.java",
     "src/main/java/com/salad/cloud/imdssdk/http/ModelConverter.java",
@@ -247,9 +244,11 @@
     "src/main/java/com/salad/cloud/imdssdk/json/TypeUtils.java",
     ".devcontainer/devcontainer.json",
     "example/pom.xml",
-    "example/setup.sh",
+    "example/run.sh",
     "example/src/main/java/com/example/Main.java",
     "example/.gitignore",
+    "src/main/java/com/salad/cloud/imdssdk/validation/validators/modelValidators/ReallocateContainerValidator.java",
+    "src/main/java/com/salad/cloud/imdssdk/validation/validators/modelValidators/ContainerTokenValidator.java",
     "src/main/java/com/salad/cloud/imdssdk/models/ReallocateContainer.java",
     "src/main/java/com/salad/cloud/imdssdk/models/ContainerToken.java",
     "src/main/java/com/salad/cloud/imdssdk/services/MetadataService.java",

README.md

@@ -1,11 +1,11 @@
-# SaladCloudImdsSdk Java SDK 0.9.0-alpha.3
+# SaladCloudImdsSdk Java SDK 0.9.0-alpha.4
 
 Welcome to the SaladCloudImdsSdk SDK documentation. This guide will help you get started with integrating and using the SaladCloudImdsSdk SDK in your project.
 
 ## Versions
 
 - API version: `0.9.0-alpha.1`
-- SDK version: `0.9.0-alpha.3`
+- SDK version: `0.9.0-alpha.4`
 
 ## About the API
 
@@ -36,14 +36,14 @@ If you use Maven, place the following within the _dependency_ tag in your `pom.x
 <dependency>
     <groupId>com.salad.cloud</groupId>
     <artifactId>imds-sdk</artifactId>
-    <version>0.9.0-alpha.3</version>
+    <version>0.9.0-alpha.4</version>
 </dependency>
 ```
 
 If you use Gradle, paste the next line inside the _dependencies_ block of your `build.gradle` file:
 
 ```Gradle
-implementation group: com.salad.cloud, name: imds-sdk, version: 0.9.0-alpha.3
+implementation group: com.salad.cloud, name: imds-sdk, version: 0.9.0-alpha.4
 ```
 
 If you use JAR files, package the SDK by running the following command:

example/pom.xml

@@ -22,7 +22,7 @@
         <dependency>
             <groupId>com.salad.cloud</groupId>
             <artifactId>imds-sdk</artifactId>
-            <version>0.9.0-alpha.3</version>
+            <version>0.9.0-alpha.4</version>
         </dependency>
     </dependencies>
 
@@ -73,6 +73,14 @@
                     <artifactId>maven-project-info-reports-plugin</artifactId>
                     <version>3.0.0</version>
                 </plugin>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>exec-maven-plugin</artifactId>
+                    <version>3.4.1</version>
+                    <configuration>
+                        <mainClass>com.example.Main</mainClass>
+                    </configuration>
+                </plugin>
             </plugins>
         </pluginManagement>
     </build>

example/setup.sh → example/run.sh

@@ -2,3 +2,4 @@ cd ../
 mvn clean install
 cd example
 mvn clean install
+mvn exec:java

pom.xml

@@ -8,7 +8,7 @@
 
     <groupId>com.salad.cloud</groupId>
     <artifactId>imds-sdk</artifactId>
-    <version>0.9.0-alpha.3</version>
+    <version>0.9.0-alpha.4</version>
 
     <!-- See https://central.sonatype.org/publish/requirements/#project-name-description-and-url -->
     <name>${project.groupId}:${project.artifactId}</name>

src/main/java/com/salad/cloud/imdssdk/models/ContainerStatus.java

@@ -5,13 +5,15 @@
 import lombok.EqualsAndHashCode;
 import lombok.NonNull;
 import lombok.ToString;
+import lombok.With;
 import lombok.extern.jackson.Jacksonized;
 
 /**
  * Represents the health statuses of the running container.
  */
 @Data
 @Builder
+@With
 @ToString
 @EqualsAndHashCode
 @Jacksonized

src/main/java/com/salad/cloud/imdssdk/models/ContainerToken.java

@@ -1,18 +1,19 @@
 package com.salad.cloud.imdssdk.models;
 
-import com.salad.cloud.imdssdk.validation.annotation.Length;
 import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NonNull;
 import lombok.ToString;
+import lombok.With;
 import lombok.extern.jackson.Jacksonized;
 
 /**
  * Represents the identity token of the running container.
  */
 @Data
 @Builder
+@With
 @ToString
 @EqualsAndHashCode
 @Jacksonized
@@ -22,6 +23,5 @@ public class ContainerToken {
    * The JSON Web Token (JWT) that may be used to identify the running container. The JWT may be verified using the JSON Web Key Set (JWKS) available at https://matrix-rest-api.salad.com/.well-known/stash-jwks.json.
    */
   @NonNull
-  @Length(min = 1, max = 1000)
   private String jwt;
 }

src/main/java/com/salad/cloud/imdssdk/models/ReallocateContainer.java

@@ -1,18 +1,19 @@
 package com.salad.cloud.imdssdk.models;
 
-import com.salad.cloud.imdssdk.validation.annotation.Length;
 import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NonNull;
 import lombok.ToString;
+import lombok.With;
 import lombok.extern.jackson.Jacksonized;
 
 /**
  * Represents a request to reallocate a container.
  */
 @Data
 @Builder
+@With
 @ToString
 @EqualsAndHashCode
 @Jacksonized
@@ -22,6 +23,5 @@ public class ReallocateContainer {
    * The reason for reallocating the container. This value is reported to SaladCloud support for quality assurance of Salad Nodes.
    */
   @NonNull
-  @Length(min = 1, max = 1000)
   private String reason;
 }

src/main/java/com/salad/cloud/imdssdk/services/BaseService.java

@@ -38,7 +38,7 @@ protected Response execute(Request request) throws ApiException {
     }
   }
 
-  protected CompletableFuture<Response> executeAsync(Request request) throws ApiException {
+  protected CompletableFuture<Response> executeAsync(Request request) {
     CompletableFuture<Response> future = new CompletableFuture<>();
     this.httpClient.newCall(request)
       .enqueue(

src/main/java/com/salad/cloud/imdssdk/services/MetadataService.java

@@ -8,6 +8,9 @@
 import com.salad.cloud.imdssdk.models.ContainerStatus;
 import com.salad.cloud.imdssdk.models.ContainerToken;
 import com.salad.cloud.imdssdk.models.ReallocateContainer;
+import com.salad.cloud.imdssdk.validation.ViolationAggregator;
+import com.salad.cloud.imdssdk.validation.exceptions.ValidationException;
+import com.salad.cloud.imdssdk.validation.validators.modelValidators.ReallocateContainerValidator;
 import java.util.concurrent.CompletableFuture;
 import lombok.NonNull;
 import okhttp3.OkHttpClient;
@@ -29,7 +32,8 @@ public MetadataService(@NonNull OkHttpClient httpClient, String serverUrl) {
    * @param reallocateContainer {@link ReallocateContainer} Request Body
    * @return response of {@code Void}
    */
-  public void reallocateContainer(@NonNull ReallocateContainer reallocateContainer) throws ApiException {
+  public void reallocateContainer(@NonNull ReallocateContainer reallocateContainer)
+    throws ApiException, ValidationException {
     Request request = this.buildReallocateContainerRequest(reallocateContainer);
     this.execute(request);
   }
@@ -41,14 +45,19 @@ public void reallocateContainer(@NonNull ReallocateContainer reallocateContainer
    * @return response of {@code Void}
    */
   public CompletableFuture<Void> reallocateContainerAsync(@NonNull ReallocateContainer reallocateContainer)
-    throws ApiException {
+    throws ApiException, ValidationException {
     Request request = this.buildReallocateContainerRequest(reallocateContainer);
     CompletableFuture<Response> response = this.executeAsync(request);
 
     return response.thenApplyAsync(res -> null);
   }
 
-  private Request buildReallocateContainerRequest(@NonNull ReallocateContainer reallocateContainer) {
+  private Request buildReallocateContainerRequest(@NonNull ReallocateContainer reallocateContainer)
+    throws ValidationException {
+    new ViolationAggregator()
+      .add(new ReallocateContainerValidator("reallocateContainer").validate(reallocateContainer))
+      .validateAll();
+
     return new RequestBuilder(HttpMethod.POST, this.serverUrl, "v1/reallocate")
       .setJsonContent(reallocateContainer)
       .build();

src/main/java/com/salad/cloud/imdssdk/validation/ViolationAggregator.java

@@ -10,11 +10,8 @@ public class ViolationAggregator {
 
   List<Violation> violations = new ArrayList<>();
 
-  public <T> ViolationAggregator add(AbstractValidator<T> validator, T value) {
-    Violation[] violations = validator.validate(value);
-    if (violations.length > 0) {
-      this.violations.addAll(Arrays.asList(violations));
-    }
+  public <T> ViolationAggregator add(Violation[] violations) {
+    this.violations.addAll(Arrays.asList(violations));
     return this;
   }