diff --git a/Makefile b/Makefile index 8979b5dc0..e45ff7797 100644 --- a/Makefile +++ b/Makefile @@ -174,14 +174,14 @@ wait-kubernetes-dependencies: ## Wait for dependencies to be ready --timeout=90s update-version: ## update release version - find . -type f | xargs sed -i 's/$(VERSION)/${RELEASE_VERSION}/g' + find . -type f | xargs sed -i 's/$(VERSION)/$(RELEASE_VERSION)/g' bump-version: ## update post-release version and update commit message - find . -type f | xargs sed -i 's/1.0.11-SNAPSHOT/1.0.11-SNAPSHOT/g' + find . -type f | xargs sed -i 's/$(RELEASE_VERSION)/$(NEXT_VERSION)/g' bump-git-commit: ## adds all files and bumps the version git add -u . - git commit -m 'Version bump to 1.0.11-SNAPSHOT' + git commit -m 'Version bump to 1.0.11' git-release: ## adds all release files and commits git add -u . @@ -192,7 +192,7 @@ git-tag: ## tag commit and prepare for image release git tag -a $(TAG) -m "$(TAG)" $(eval TAG=$(TAG)) -release-all: clean update-version release git-release git-tag build-images tag-images push-images bump-version install bump-git-commit +release-all: update-version release git-release git-tag build-images tag-images push-images bump-version install bump-git-commit ##@ Run .PHONY: docker-run docker-stop diff --git a/coverage/pom.xml b/coverage/pom.xml index baf235ad5..abf109803 100644 --- a/coverage/pom.xml +++ b/coverage/pom.xml @@ -12,7 +12,7 @@ Compute aggregated test code coverage true - 1.0.11-SNAPSHOT + 1.0.11 diff --git a/notification-service-sdk/README.md b/notification-service-sdk/README.md index 46850f659..7ea59ccbf 100644 --- a/notification-service-sdk/README.md +++ b/notification-service-sdk/README.md @@ -39,7 +39,7 @@ Add this dependency to your project's POM: dev.parodos notification-service-sdk - 1.0.11-SNAPSHOT + 1.0.11 compile ``` @@ -55,7 +55,7 @@ Add this dependency to your project's build file: } dependencies { - implementation "dev.parodos:notification-service-sdk:1.0.11-SNAPSHOT" + implementation "dev.parodos:notification-service-sdk:1.0.11" } ``` @@ -69,7 +69,7 @@ mvn clean package Then manually install the following JARs: -* `target/notification-service-sdk-1.0.11-SNAPSHOT.jar` +* `target/notification-service-sdk-1.0.11.jar` * `target/lib/*.jar` ## Getting Started diff --git a/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/api/ApiCallback.java b/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/api/ApiCallback.java index 6ed184dd0..98fa9ac0a 100644 --- a/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/api/ApiCallback.java +++ b/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/api/ApiCallback.java @@ -12,8 +12,10 @@ package com.redhat.parodos.notification.sdk.api; -import java.util.List; +import java.io.IOException; + import java.util.Map; +import java.util.List; /** * Callback for asynchronous API call. diff --git a/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/api/ApiClient.java b/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/api/ApiClient.java index 6d3906ce8..a2c23520f 100644 --- a/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/api/ApiClient.java +++ b/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/api/ApiClient.java @@ -12,6 +12,16 @@ package com.redhat.parodos.notification.sdk.api; +import okhttp3.*; +import okhttp3.internal.http.HttpMethod; +import okhttp3.internal.tls.OkHostnameVerifier; +import okhttp3.logging.HttpLoggingInterceptor; +import okhttp3.logging.HttpLoggingInterceptor.Level; +import okio.Buffer; +import okio.BufferedSink; +import okio.Okio; + +import javax.net.ssl.*; import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -30,25 +40,19 @@ import java.security.cert.CertificateFactory; import java.security.cert.X509Certificate; import java.text.DateFormat; +import java.time.LocalDate; +import java.time.OffsetDateTime; +import java.time.format.DateTimeFormatter; import java.util.*; import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.net.ssl.*; - -import com.redhat.parodos.notification.sdk.api.auth.ApiKeyAuth; import com.redhat.parodos.notification.sdk.api.auth.Authentication; import com.redhat.parodos.notification.sdk.api.auth.HttpBasicAuth; -import okhttp3.*; -import okhttp3.internal.http.HttpMethod; -import okhttp3.internal.tls.OkHostnameVerifier; -import okhttp3.logging.HttpLoggingInterceptor; -import okhttp3.logging.HttpLoggingInterceptor.Level; -import okio.Buffer; -import okio.BufferedSink; -import okio.Okio; +import com.redhat.parodos.notification.sdk.api.auth.HttpBearerAuth; +import com.redhat.parodos.notification.sdk.api.auth.ApiKeyAuth; /** *

@@ -143,7 +147,7 @@ private void init() { json = new JSON(); // Set default User-Agent. - setUserAgent("OpenAPI-Generator/1.0.11-SNAPSHOT/java"); + setUserAgent("OpenAPI-Generator/1.0.11/java"); authentications = new HashMap(); } diff --git a/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/api/ApiException.java b/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/api/ApiException.java index 997b7661c..6403fbc91 100644 --- a/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/api/ApiException.java +++ b/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/api/ApiException.java @@ -12,8 +12,10 @@ package com.redhat.parodos.notification.sdk.api; -import java.util.List; import java.util.Map; +import java.util.List; + +import javax.ws.rs.core.GenericType; /** *

diff --git a/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/api/GzipRequestInterceptor.java b/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/api/GzipRequestInterceptor.java index d4e689455..de51529c2 100644 --- a/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/api/GzipRequestInterceptor.java +++ b/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/api/GzipRequestInterceptor.java @@ -12,14 +12,14 @@ package com.redhat.parodos.notification.sdk.api; -import java.io.IOException; - import okhttp3.*; import okio.Buffer; import okio.BufferedSink; import okio.GzipSink; import okio.Okio; +import java.io.IOException; + /** * Encodes request bodies using gzip. * diff --git a/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/api/JSON.java b/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/api/JSON.java index 3def38561..8e80b6523 100644 --- a/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/api/JSON.java +++ b/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/api/JSON.java @@ -12,26 +12,33 @@ package com.redhat.parodos.notification.sdk.api; -import java.io.IOException; -import java.io.StringReader; -import java.lang.reflect.Type; -import java.text.DateFormat; -import java.text.ParseException; -import java.text.ParsePosition; -import java.util.Date; -import java.util.Map; - import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import com.google.gson.JsonElement; import com.google.gson.JsonParseException; import com.google.gson.TypeAdapter; import com.google.gson.internal.bind.util.ISO8601Utils; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; +import com.google.gson.JsonElement; import io.gsonfire.GsonFireBuilder; +import io.gsonfire.TypeSelector; + import okio.ByteString; +import java.io.IOException; +import java.io.StringReader; +import java.lang.reflect.Type; +import java.text.DateFormat; +import java.text.ParseException; +import java.text.ParsePosition; +import java.time.LocalDate; +import java.time.OffsetDateTime; +import java.time.format.DateTimeFormatter; +import java.util.Date; +import java.util.Locale; +import java.util.Map; +import java.util.HashMap; + /* * A JSON utility class * diff --git a/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/api/NotificationMessageApi.java b/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/api/NotificationMessageApi.java index 721a5a806..aedbe2670 100644 --- a/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/api/NotificationMessageApi.java +++ b/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/api/NotificationMessageApi.java @@ -12,12 +12,27 @@ package com.redhat.parodos.notification.sdk.api; +import com.redhat.parodos.notification.sdk.api.ApiCallback; +import com.redhat.parodos.notification.sdk.api.ApiClient; +import com.redhat.parodos.notification.sdk.api.ApiException; +import com.redhat.parodos.notification.sdk.api.ApiResponse; +import com.redhat.parodos.notification.sdk.api.Configuration; +import com.redhat.parodos.notification.sdk.api.Pair; +import com.redhat.parodos.notification.sdk.api.ProgressRequestBody; +import com.redhat.parodos.notification.sdk.api.ProgressResponseBody; + +import com.google.gson.reflect.TypeToken; + +import java.io.IOException; + +import com.redhat.parodos.notification.sdk.model.NotificationMessageCreateRequestDTO; + +import java.lang.reflect.Type; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; - -import com.redhat.parodos.notification.sdk.model.NotificationMessageCreateRequestDTO; +import javax.ws.rs.core.GenericType; public class NotificationMessageApi { diff --git a/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/api/NotificationRecordApi.java b/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/api/NotificationRecordApi.java index f028f20f4..319f973ef 100644 --- a/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/api/NotificationRecordApi.java +++ b/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/api/NotificationRecordApi.java @@ -12,17 +12,30 @@ package com.redhat.parodos.notification.sdk.api; -import java.lang.reflect.Type; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.UUID; +import com.redhat.parodos.notification.sdk.api.ApiCallback; +import com.redhat.parodos.notification.sdk.api.ApiClient; +import com.redhat.parodos.notification.sdk.api.ApiException; +import com.redhat.parodos.notification.sdk.api.ApiResponse; +import com.redhat.parodos.notification.sdk.api.Configuration; +import com.redhat.parodos.notification.sdk.api.Pair; +import com.redhat.parodos.notification.sdk.api.ProgressRequestBody; +import com.redhat.parodos.notification.sdk.api.ProgressResponseBody; import com.google.gson.reflect.TypeToken; + +import java.io.IOException; + import com.redhat.parodos.notification.sdk.model.NotificationRecordResponseDTO; import com.redhat.parodos.notification.sdk.model.PageNotificationRecordResponseDTO; import com.redhat.parodos.notification.sdk.model.Pageable; +import java.util.UUID; + +import java.lang.reflect.Type; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.ws.rs.core.GenericType; public class NotificationRecordApi { diff --git a/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/api/ProgressRequestBody.java b/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/api/ProgressRequestBody.java index a0faf1ecd..cbf59ad45 100644 --- a/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/api/ProgressRequestBody.java +++ b/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/api/ProgressRequestBody.java @@ -12,10 +12,11 @@ package com.redhat.parodos.notification.sdk.api; -import java.io.IOException; - import okhttp3.MediaType; import okhttp3.RequestBody; + +import java.io.IOException; + import okio.Buffer; import okio.BufferedSink; import okio.ForwardingSink; diff --git a/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/api/ProgressResponseBody.java b/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/api/ProgressResponseBody.java index ea58b037c..ed9da6ccf 100644 --- a/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/api/ProgressResponseBody.java +++ b/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/api/ProgressResponseBody.java @@ -12,10 +12,11 @@ package com.redhat.parodos.notification.sdk.api; -import java.io.IOException; - import okhttp3.MediaType; import okhttp3.ResponseBody; + +import java.io.IOException; + import okio.Buffer; import okio.BufferedSource; import okio.ForwardingSource; diff --git a/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/api/auth/ApiKeyAuth.java b/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/api/auth/ApiKeyAuth.java index 970e3254e..1336d44ae 100644 --- a/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/api/auth/ApiKeyAuth.java +++ b/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/api/auth/ApiKeyAuth.java @@ -12,13 +12,13 @@ package com.redhat.parodos.notification.sdk.api.auth; -import java.net.URI; -import java.util.List; -import java.util.Map; - import com.redhat.parodos.notification.sdk.api.ApiException; import com.redhat.parodos.notification.sdk.api.Pair; +import java.net.URI; +import java.util.Map; +import java.util.List; + @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ApiKeyAuth implements Authentication { diff --git a/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/api/auth/Authentication.java b/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/api/auth/Authentication.java index a2038229f..f2b0f4dbb 100644 --- a/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/api/auth/Authentication.java +++ b/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/api/auth/Authentication.java @@ -12,12 +12,12 @@ package com.redhat.parodos.notification.sdk.api.auth; +import com.redhat.parodos.notification.sdk.api.Pair; +import com.redhat.parodos.notification.sdk.api.ApiException; + import java.net.URI; -import java.util.List; import java.util.Map; - -import com.redhat.parodos.notification.sdk.api.ApiException; -import com.redhat.parodos.notification.sdk.api.Pair; +import java.util.List; public interface Authentication { diff --git a/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/api/auth/HttpBasicAuth.java b/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/api/auth/HttpBasicAuth.java index 41c8157bc..1678236cb 100644 --- a/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/api/auth/HttpBasicAuth.java +++ b/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/api/auth/HttpBasicAuth.java @@ -12,13 +12,16 @@ package com.redhat.parodos.notification.sdk.api.auth; +import com.redhat.parodos.notification.sdk.api.Pair; +import com.redhat.parodos.notification.sdk.api.ApiException; + +import okhttp3.Credentials; + import java.net.URI; -import java.util.List; import java.util.Map; +import java.util.List; -import com.redhat.parodos.notification.sdk.api.ApiException; -import com.redhat.parodos.notification.sdk.api.Pair; -import okhttp3.Credentials; +import java.io.UnsupportedEncodingException; public class HttpBasicAuth implements Authentication { diff --git a/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/api/auth/HttpBearerAuth.java b/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/api/auth/HttpBearerAuth.java index bb73fbfcf..35eb22137 100644 --- a/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/api/auth/HttpBearerAuth.java +++ b/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/api/auth/HttpBearerAuth.java @@ -12,13 +12,13 @@ package com.redhat.parodos.notification.sdk.api.auth; -import java.net.URI; -import java.util.List; -import java.util.Map; - import com.redhat.parodos.notification.sdk.api.ApiException; import com.redhat.parodos.notification.sdk.api.Pair; +import java.net.URI; +import java.util.Map; +import java.util.List; + @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class HttpBearerAuth implements Authentication { diff --git a/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/model/AbstractOpenApiSchema.java b/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/model/AbstractOpenApiSchema.java index a6d524517..4123a4f93 100644 --- a/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/model/AbstractOpenApiSchema.java +++ b/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/model/AbstractOpenApiSchema.java @@ -12,9 +12,10 @@ package com.redhat.parodos.notification.sdk.model; -import java.util.Map; +import com.redhat.parodos.notification.sdk.api.ApiException; import java.util.Objects; - +import java.lang.reflect.Type; +import java.util.Map; import javax.ws.rs.core.GenericType; //import com.fasterxml.jackson.annotation.JsonValue; diff --git a/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/model/Link.java b/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/model/Link.java index 33ed22c8d..fbcb38a41 100644 --- a/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/model/Link.java +++ b/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/model/Link.java @@ -12,21 +12,34 @@ package com.redhat.parodos.notification.sdk.model; -import java.io.IOException; -import java.util.HashSet; -import java.util.Map.Entry; import java.util.Objects; -import java.util.Set; +import java.util.Arrays; +import com.google.gson.TypeAdapter; +import com.google.gson.annotations.JsonAdapter; +import com.google.gson.annotations.SerializedName; +import com.google.gson.stream.JsonReader; +import com.google.gson.stream.JsonWriter; +import java.io.IOException; import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonArray; +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import com.google.gson.TypeAdapter; +import com.google.gson.JsonParseException; import com.google.gson.TypeAdapterFactory; -import com.google.gson.annotations.SerializedName; import com.google.gson.reflect.TypeToken; -import com.google.gson.stream.JsonReader; -import com.google.gson.stream.JsonWriter; + +import java.lang.reflect.Type; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; + import com.redhat.parodos.notification.sdk.api.JSON; /** diff --git a/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/model/NotificationMessageCreateRequestDTO.java b/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/model/NotificationMessageCreateRequestDTO.java index 7a6457bb3..cdc4ad6b5 100644 --- a/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/model/NotificationMessageCreateRequestDTO.java +++ b/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/model/NotificationMessageCreateRequestDTO.java @@ -12,23 +12,36 @@ package com.redhat.parodos.notification.sdk.model; +import java.util.Objects; +import java.util.Arrays; +import com.google.gson.TypeAdapter; +import com.google.gson.annotations.JsonAdapter; +import com.google.gson.annotations.SerializedName; +import com.google.gson.stream.JsonReader; +import com.google.gson.stream.JsonWriter; import java.io.IOException; import java.util.ArrayList; -import java.util.HashSet; import java.util.List; -import java.util.Map.Entry; -import java.util.Objects; -import java.util.Set; import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonArray; +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import com.google.gson.TypeAdapter; +import com.google.gson.JsonParseException; import com.google.gson.TypeAdapterFactory; -import com.google.gson.annotations.SerializedName; import com.google.gson.reflect.TypeToken; -import com.google.gson.stream.JsonReader; -import com.google.gson.stream.JsonWriter; + +import java.lang.reflect.Type; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; + import com.redhat.parodos.notification.sdk.api.JSON; /** diff --git a/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/model/NotificationRecordResponseDTO.java b/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/model/NotificationRecordResponseDTO.java index 1115524fa..a499a804a 100644 --- a/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/model/NotificationRecordResponseDTO.java +++ b/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/model/NotificationRecordResponseDTO.java @@ -12,26 +12,39 @@ package com.redhat.parodos.notification.sdk.model; +import java.util.Objects; +import java.util.Arrays; +import com.google.gson.TypeAdapter; +import com.google.gson.annotations.JsonAdapter; +import com.google.gson.annotations.SerializedName; +import com.google.gson.stream.JsonReader; +import com.google.gson.stream.JsonWriter; +import com.redhat.parodos.notification.sdk.model.Link; import java.io.IOException; import java.util.ArrayList; import java.util.Date; -import java.util.HashSet; import java.util.List; -import java.util.Map.Entry; -import java.util.Objects; -import java.util.Set; import java.util.UUID; import com.google.gson.Gson; +import com.google.gson.GsonBuilder; import com.google.gson.JsonArray; +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import com.google.gson.TypeAdapter; +import com.google.gson.JsonParseException; import com.google.gson.TypeAdapterFactory; -import com.google.gson.annotations.SerializedName; import com.google.gson.reflect.TypeToken; -import com.google.gson.stream.JsonReader; -import com.google.gson.stream.JsonWriter; + +import java.lang.reflect.Type; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; + import com.redhat.parodos.notification.sdk.api.JSON; /** diff --git a/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/model/PageNotificationRecordResponseDTO.java b/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/model/PageNotificationRecordResponseDTO.java index 24cf553d3..3e83419f5 100644 --- a/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/model/PageNotificationRecordResponseDTO.java +++ b/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/model/PageNotificationRecordResponseDTO.java @@ -12,24 +12,39 @@ package com.redhat.parodos.notification.sdk.model; +import java.util.Objects; +import java.util.Arrays; +import com.google.gson.TypeAdapter; +import com.google.gson.annotations.JsonAdapter; +import com.google.gson.annotations.SerializedName; +import com.google.gson.stream.JsonReader; +import com.google.gson.stream.JsonWriter; +import com.redhat.parodos.notification.sdk.model.NotificationRecordResponseDTO; +import com.redhat.parodos.notification.sdk.model.PageableObject; +import com.redhat.parodos.notification.sdk.model.Sort; import java.io.IOException; import java.util.ArrayList; -import java.util.HashSet; import java.util.List; -import java.util.Map.Entry; -import java.util.Objects; -import java.util.Set; import com.google.gson.Gson; +import com.google.gson.GsonBuilder; import com.google.gson.JsonArray; +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import com.google.gson.TypeAdapter; +import com.google.gson.JsonParseException; import com.google.gson.TypeAdapterFactory; -import com.google.gson.annotations.SerializedName; import com.google.gson.reflect.TypeToken; -import com.google.gson.stream.JsonReader; -import com.google.gson.stream.JsonWriter; + +import java.lang.reflect.Type; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; + import com.redhat.parodos.notification.sdk.api.JSON; /** diff --git a/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/model/Pageable.java b/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/model/Pageable.java index db959de74..9e0ab6016 100644 --- a/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/model/Pageable.java +++ b/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/model/Pageable.java @@ -12,23 +12,36 @@ package com.redhat.parodos.notification.sdk.model; +import java.util.Objects; +import java.util.Arrays; +import com.google.gson.TypeAdapter; +import com.google.gson.annotations.JsonAdapter; +import com.google.gson.annotations.SerializedName; +import com.google.gson.stream.JsonReader; +import com.google.gson.stream.JsonWriter; import java.io.IOException; import java.util.ArrayList; -import java.util.HashSet; import java.util.List; -import java.util.Map.Entry; -import java.util.Objects; -import java.util.Set; import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonArray; +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import com.google.gson.TypeAdapter; +import com.google.gson.JsonParseException; import com.google.gson.TypeAdapterFactory; -import com.google.gson.annotations.SerializedName; import com.google.gson.reflect.TypeToken; -import com.google.gson.stream.JsonReader; -import com.google.gson.stream.JsonWriter; + +import java.lang.reflect.Type; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; + import com.redhat.parodos.notification.sdk.api.JSON; /** diff --git a/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/model/PageableObject.java b/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/model/PageableObject.java index 1d5896202..362755b2b 100644 --- a/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/model/PageableObject.java +++ b/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/model/PageableObject.java @@ -12,21 +12,35 @@ package com.redhat.parodos.notification.sdk.model; -import java.io.IOException; -import java.util.HashSet; -import java.util.Map.Entry; import java.util.Objects; -import java.util.Set; +import java.util.Arrays; +import com.google.gson.TypeAdapter; +import com.google.gson.annotations.JsonAdapter; +import com.google.gson.annotations.SerializedName; +import com.google.gson.stream.JsonReader; +import com.google.gson.stream.JsonWriter; +import com.redhat.parodos.notification.sdk.model.Sort; +import java.io.IOException; import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonArray; +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import com.google.gson.TypeAdapter; +import com.google.gson.JsonParseException; import com.google.gson.TypeAdapterFactory; -import com.google.gson.annotations.SerializedName; import com.google.gson.reflect.TypeToken; -import com.google.gson.stream.JsonReader; -import com.google.gson.stream.JsonWriter; + +import java.lang.reflect.Type; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; + import com.redhat.parodos.notification.sdk.api.JSON; /** diff --git a/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/model/Sort.java b/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/model/Sort.java index c97a8d705..90bb5651b 100644 --- a/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/model/Sort.java +++ b/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/model/Sort.java @@ -12,21 +12,34 @@ package com.redhat.parodos.notification.sdk.model; -import java.io.IOException; -import java.util.HashSet; -import java.util.Map.Entry; import java.util.Objects; -import java.util.Set; +import java.util.Arrays; +import com.google.gson.TypeAdapter; +import com.google.gson.annotations.JsonAdapter; +import com.google.gson.annotations.SerializedName; +import com.google.gson.stream.JsonReader; +import com.google.gson.stream.JsonWriter; +import java.io.IOException; import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonArray; +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import com.google.gson.TypeAdapter; +import com.google.gson.JsonParseException; import com.google.gson.TypeAdapterFactory; -import com.google.gson.annotations.SerializedName; import com.google.gson.reflect.TypeToken; -import com.google.gson.stream.JsonReader; -import com.google.gson.stream.JsonWriter; + +import java.lang.reflect.Type; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; + import com.redhat.parodos.notification.sdk.api.JSON; /** diff --git a/notification-service/README.md b/notification-service/README.md index 82ceb393c..8a483462b 100644 --- a/notification-service/README.md +++ b/notification-service/README.md @@ -44,7 +44,7 @@ From the root of the 'notification-service' folder, the follow command will star ```shell -java -jar -Dspring.profiles.active=local -Dserver.port=8081 target/notification-service-1.0.11-SNAPSHOT.jar +java -jar -Dspring.profiles.active=local -Dserver.port=8081 target/notification-service-1.0.11.jar ``` diff --git a/notification-service/licenses/THIRD-PARTY.txt b/notification-service/licenses/THIRD-PARTY.txt index 68a0a6d95..523500eef 100644 --- a/notification-service/licenses/THIRD-PARTY.txt +++ b/notification-service/licenses/THIRD-PARTY.txt @@ -151,7 +151,7 @@ Lists of 158 third-party dependencies. (Apache License, Version 2.0) spring-security-oauth2-core (org.springframework.security:spring-security-oauth2-core:5.5.2 - https://spring.io/projects/spring-security) (Apache License, Version 2.0) spring-security-oauth2-jose (org.springframework.security:spring-security-oauth2-jose:5.5.2 - https://spring.io/projects/spring-security) (Apache License, Version 2.0) spring-security-oauth2-resource-server (org.springframework.security:spring-security-oauth2-resource-server:5.5.2 - https://spring.io/projects/spring-security) - (Apache 2.0) spring-security-rsa (org.springframework.security:spring-security-rsa:1.0.11-SNAPSHOT.RELEASE - http://github.com/spring-projects/spring-security-oauth) + (Apache 2.0) spring-security-rsa (org.springframework.security:spring-security-rsa:1.0.11.RELEASE - http://github.com/spring-projects/spring-security-oauth) (Apache License, Version 2.0) spring-security-test (org.springframework.security:spring-security-test:5.5.2 - https://spring.io/projects/spring-security) (Apache License, Version 2.0) spring-security-web (org.springframework.security:spring-security-web:5.5.2 - https://spring.io/projects/spring-security) (Apache 2.0) Swagger UI (org.webjars:swagger-ui:3.51.1 - http://webjars.org) diff --git a/pom.xml b/pom.xml index 1a18a08b0..384b20759 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,7 @@ - 1.0.11-SNAPSHOT + 1.0.11 1.3.0 17 UTF-8 diff --git a/workflow-service-sdk/README.md b/workflow-service-sdk/README.md index d33410f32..3066465b5 100644 --- a/workflow-service-sdk/README.md +++ b/workflow-service-sdk/README.md @@ -39,7 +39,7 @@ Add this dependency to your project's POM: dev.parodos workflow-service-sdk - 1.0.11-SNAPSHOT + 1.0.11 compile ``` @@ -55,7 +55,7 @@ Add this dependency to your project's build file: } dependencies { - implementation "dev.parodos:workflow-service-sdk:1.0.11-SNAPSHOT" + implementation "dev.parodos:workflow-service-sdk:1.0.11" } ``` @@ -69,7 +69,7 @@ mvn clean package Then manually install the following JARs: -* `target/workflow-service-sdk-1.0.11-SNAPSHOT.jar` +* `target/workflow-service-sdk-1.0.11.jar` * `target/lib/*.jar` ## Getting Started diff --git a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/api/LoginApi.java b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/api/LoginApi.java index 154ed8489..5808ef2f5 100644 --- a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/api/LoginApi.java +++ b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/api/LoginApi.java @@ -12,17 +12,25 @@ package com.redhat.parodos.sdk.api; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import com.redhat.parodos.sdk.invoker.ApiCallback; import com.redhat.parodos.sdk.invoker.ApiClient; import com.redhat.parodos.sdk.invoker.ApiException; import com.redhat.parodos.sdk.invoker.ApiResponse; import com.redhat.parodos.sdk.invoker.Configuration; import com.redhat.parodos.sdk.invoker.Pair; +import com.redhat.parodos.sdk.invoker.ProgressRequestBody; +import com.redhat.parodos.sdk.invoker.ProgressResponseBody; + +import com.google.gson.reflect.TypeToken; + +import java.io.IOException; + +import java.lang.reflect.Type; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.ws.rs.core.GenericType; public class LoginApi { diff --git a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/api/ProjectApi.java b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/api/ProjectApi.java index 453ce886b..863465d37 100644 --- a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/api/ProjectApi.java +++ b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/api/ProjectApi.java @@ -12,22 +12,29 @@ package com.redhat.parodos.sdk.api; -import java.lang.reflect.Type; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.UUID; - -import com.google.gson.reflect.TypeToken; import com.redhat.parodos.sdk.invoker.ApiCallback; import com.redhat.parodos.sdk.invoker.ApiClient; import com.redhat.parodos.sdk.invoker.ApiException; import com.redhat.parodos.sdk.invoker.ApiResponse; import com.redhat.parodos.sdk.invoker.Configuration; import com.redhat.parodos.sdk.invoker.Pair; +import com.redhat.parodos.sdk.invoker.ProgressRequestBody; +import com.redhat.parodos.sdk.invoker.ProgressResponseBody; + +import com.google.gson.reflect.TypeToken; + +import java.io.IOException; + import com.redhat.parodos.sdk.model.ProjectRequestDTO; import com.redhat.parodos.sdk.model.ProjectResponseDTO; +import java.util.UUID; + +import java.lang.reflect.Type; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.ws.rs.core.GenericType; public class ProjectApi { diff --git a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/api/WorkflowApi.java b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/api/WorkflowApi.java index 8b49a25f1..e4099eacc 100644 --- a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/api/WorkflowApi.java +++ b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/api/WorkflowApi.java @@ -12,27 +12,34 @@ package com.redhat.parodos.sdk.api; -import java.lang.reflect.Type; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.UUID; - -import com.google.gson.reflect.TypeToken; import com.redhat.parodos.sdk.invoker.ApiCallback; import com.redhat.parodos.sdk.invoker.ApiClient; import com.redhat.parodos.sdk.invoker.ApiException; import com.redhat.parodos.sdk.invoker.ApiResponse; import com.redhat.parodos.sdk.invoker.Configuration; import com.redhat.parodos.sdk.invoker.Pair; +import com.redhat.parodos.sdk.invoker.ProgressRequestBody; +import com.redhat.parodos.sdk.invoker.ProgressResponseBody; + +import com.google.gson.reflect.TypeToken; + +import java.io.IOException; + import com.redhat.parodos.sdk.model.GetStatusByProjectId200Response; +import java.util.UUID; import com.redhat.parodos.sdk.model.WorkFlowCheckerTaskRequestDTO; import com.redhat.parodos.sdk.model.WorkFlowContextResponseDTO; import com.redhat.parodos.sdk.model.WorkFlowRequestDTO; import com.redhat.parodos.sdk.model.WorkFlowResponseDTO; import com.redhat.parodos.sdk.model.WorkFlowStatusResponseDTO; +import java.lang.reflect.Type; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.ws.rs.core.GenericType; + public class WorkflowApi { private ApiClient localVarApiClient; diff --git a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/api/WorkflowDefinitionApi.java b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/api/WorkflowDefinitionApi.java index 2558fb249..6c5f168d9 100644 --- a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/api/WorkflowDefinitionApi.java +++ b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/api/WorkflowDefinitionApi.java @@ -12,24 +12,31 @@ package com.redhat.parodos.sdk.api; -import java.lang.reflect.Type; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.UUID; - -import com.google.gson.reflect.TypeToken; import com.redhat.parodos.sdk.invoker.ApiCallback; import com.redhat.parodos.sdk.invoker.ApiClient; import com.redhat.parodos.sdk.invoker.ApiException; import com.redhat.parodos.sdk.invoker.ApiResponse; import com.redhat.parodos.sdk.invoker.Configuration; import com.redhat.parodos.sdk.invoker.Pair; +import com.redhat.parodos.sdk.invoker.ProgressRequestBody; +import com.redhat.parodos.sdk.invoker.ProgressResponseBody; + +import com.google.gson.reflect.TypeToken; + +import java.io.IOException; + +import java.util.UUID; import com.redhat.parodos.sdk.model.UpdateParameter200Response; import com.redhat.parodos.sdk.model.WorkFlowDefinitionResponseDTO; import com.redhat.parodos.sdk.model.WorkParameterValueRequestDTO; +import java.lang.reflect.Type; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.ws.rs.core.GenericType; + public class WorkflowDefinitionApi { private ApiClient localVarApiClient; diff --git a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/invoker/ApiCallback.java b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/invoker/ApiCallback.java index f19068987..2826f65ed 100644 --- a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/invoker/ApiCallback.java +++ b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/invoker/ApiCallback.java @@ -12,8 +12,10 @@ package com.redhat.parodos.sdk.invoker; -import java.util.List; +import java.io.IOException; + import java.util.Map; +import java.util.List; /** * Callback for asynchronous API call. diff --git a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/invoker/ApiClient.java b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/invoker/ApiClient.java index 648410142..41b1c3d89 100644 --- a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/invoker/ApiClient.java +++ b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/invoker/ApiClient.java @@ -12,6 +12,16 @@ package com.redhat.parodos.sdk.invoker; +import okhttp3.*; +import okhttp3.internal.http.HttpMethod; +import okhttp3.internal.tls.OkHostnameVerifier; +import okhttp3.logging.HttpLoggingInterceptor; +import okhttp3.logging.HttpLoggingInterceptor.Level; +import okio.Buffer; +import okio.BufferedSink; +import okio.Okio; + +import javax.net.ssl.*; import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -30,25 +40,19 @@ import java.security.cert.CertificateFactory; import java.security.cert.X509Certificate; import java.text.DateFormat; +import java.time.LocalDate; +import java.time.OffsetDateTime; +import java.time.format.DateTimeFormatter; import java.util.*; import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.net.ssl.*; - -import com.redhat.parodos.sdk.invoker.auth.ApiKeyAuth; import com.redhat.parodos.sdk.invoker.auth.Authentication; import com.redhat.parodos.sdk.invoker.auth.HttpBasicAuth; -import okhttp3.*; -import okhttp3.internal.http.HttpMethod; -import okhttp3.internal.tls.OkHostnameVerifier; -import okhttp3.logging.HttpLoggingInterceptor; -import okhttp3.logging.HttpLoggingInterceptor.Level; -import okio.Buffer; -import okio.BufferedSink; -import okio.Okio; +import com.redhat.parodos.sdk.invoker.auth.HttpBearerAuth; +import com.redhat.parodos.sdk.invoker.auth.ApiKeyAuth; /** *

@@ -143,7 +147,7 @@ private void init() { json = new JSON(); // Set default User-Agent. - setUserAgent("OpenAPI-Generator/1.0.11-SNAPSHOT/java"); + setUserAgent("OpenAPI-Generator/1.0.11/java"); authentications = new HashMap(); } diff --git a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/invoker/ApiException.java b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/invoker/ApiException.java index 410431a48..4bc3af70f 100644 --- a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/invoker/ApiException.java +++ b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/invoker/ApiException.java @@ -12,8 +12,10 @@ package com.redhat.parodos.sdk.invoker; -import java.util.List; import java.util.Map; +import java.util.List; + +import javax.ws.rs.core.GenericType; /** *

diff --git a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/invoker/GzipRequestInterceptor.java b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/invoker/GzipRequestInterceptor.java index 3134322e3..b3cb0be6f 100644 --- a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/invoker/GzipRequestInterceptor.java +++ b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/invoker/GzipRequestInterceptor.java @@ -12,14 +12,14 @@ package com.redhat.parodos.sdk.invoker; -import java.io.IOException; - import okhttp3.*; import okio.Buffer; import okio.BufferedSink; import okio.GzipSink; import okio.Okio; +import java.io.IOException; + /** * Encodes request bodies using gzip. * diff --git a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/invoker/JSON.java b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/invoker/JSON.java index c97e4f034..49d0df317 100644 --- a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/invoker/JSON.java +++ b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/invoker/JSON.java @@ -12,26 +12,33 @@ package com.redhat.parodos.sdk.invoker; -import java.io.IOException; -import java.io.StringReader; -import java.lang.reflect.Type; -import java.text.DateFormat; -import java.text.ParseException; -import java.text.ParsePosition; -import java.util.Date; -import java.util.Map; - import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import com.google.gson.JsonElement; import com.google.gson.JsonParseException; import com.google.gson.TypeAdapter; import com.google.gson.internal.bind.util.ISO8601Utils; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; +import com.google.gson.JsonElement; import io.gsonfire.GsonFireBuilder; +import io.gsonfire.TypeSelector; + import okio.ByteString; +import java.io.IOException; +import java.io.StringReader; +import java.lang.reflect.Type; +import java.text.DateFormat; +import java.text.ParseException; +import java.text.ParsePosition; +import java.time.LocalDate; +import java.time.OffsetDateTime; +import java.time.format.DateTimeFormatter; +import java.util.Date; +import java.util.Locale; +import java.util.Map; +import java.util.HashMap; + /* * A JSON utility class * diff --git a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/invoker/ProgressRequestBody.java b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/invoker/ProgressRequestBody.java index 88ed111e8..83a962a5c 100644 --- a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/invoker/ProgressRequestBody.java +++ b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/invoker/ProgressRequestBody.java @@ -12,10 +12,11 @@ package com.redhat.parodos.sdk.invoker; -import java.io.IOException; - import okhttp3.MediaType; import okhttp3.RequestBody; + +import java.io.IOException; + import okio.Buffer; import okio.BufferedSink; import okio.ForwardingSink; diff --git a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/invoker/ProgressResponseBody.java b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/invoker/ProgressResponseBody.java index 3e3c51878..0179ba369 100644 --- a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/invoker/ProgressResponseBody.java +++ b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/invoker/ProgressResponseBody.java @@ -12,10 +12,11 @@ package com.redhat.parodos.sdk.invoker; -import java.io.IOException; - import okhttp3.MediaType; import okhttp3.ResponseBody; + +import java.io.IOException; + import okio.Buffer; import okio.BufferedSource; import okio.ForwardingSource; diff --git a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/invoker/auth/ApiKeyAuth.java b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/invoker/auth/ApiKeyAuth.java index 799a67321..1af2bacf0 100644 --- a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/invoker/auth/ApiKeyAuth.java +++ b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/invoker/auth/ApiKeyAuth.java @@ -12,13 +12,13 @@ package com.redhat.parodos.sdk.invoker.auth; -import java.net.URI; -import java.util.List; -import java.util.Map; - import com.redhat.parodos.sdk.invoker.ApiException; import com.redhat.parodos.sdk.invoker.Pair; +import java.net.URI; +import java.util.Map; +import java.util.List; + @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ApiKeyAuth implements Authentication { diff --git a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/invoker/auth/Authentication.java b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/invoker/auth/Authentication.java index 9641aa7ed..6869ba8d5 100644 --- a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/invoker/auth/Authentication.java +++ b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/invoker/auth/Authentication.java @@ -12,12 +12,12 @@ package com.redhat.parodos.sdk.invoker.auth; +import com.redhat.parodos.sdk.invoker.Pair; +import com.redhat.parodos.sdk.invoker.ApiException; + import java.net.URI; -import java.util.List; import java.util.Map; - -import com.redhat.parodos.sdk.invoker.ApiException; -import com.redhat.parodos.sdk.invoker.Pair; +import java.util.List; public interface Authentication { diff --git a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/invoker/auth/HttpBasicAuth.java b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/invoker/auth/HttpBasicAuth.java index 9fa441eb4..2e0faf580 100644 --- a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/invoker/auth/HttpBasicAuth.java +++ b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/invoker/auth/HttpBasicAuth.java @@ -12,13 +12,16 @@ package com.redhat.parodos.sdk.invoker.auth; +import com.redhat.parodos.sdk.invoker.Pair; +import com.redhat.parodos.sdk.invoker.ApiException; + +import okhttp3.Credentials; + import java.net.URI; -import java.util.List; import java.util.Map; +import java.util.List; -import com.redhat.parodos.sdk.invoker.ApiException; -import com.redhat.parodos.sdk.invoker.Pair; -import okhttp3.Credentials; +import java.io.UnsupportedEncodingException; public class HttpBasicAuth implements Authentication { diff --git a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/invoker/auth/HttpBearerAuth.java b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/invoker/auth/HttpBearerAuth.java index fee3fa69c..d756b2658 100644 --- a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/invoker/auth/HttpBearerAuth.java +++ b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/invoker/auth/HttpBearerAuth.java @@ -12,13 +12,13 @@ package com.redhat.parodos.sdk.invoker.auth; -import java.net.URI; -import java.util.List; -import java.util.Map; - import com.redhat.parodos.sdk.invoker.ApiException; import com.redhat.parodos.sdk.invoker.Pair; +import java.net.URI; +import java.util.Map; +import java.util.List; + @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class HttpBearerAuth implements Authentication { diff --git a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/AbstractOpenApiSchema.java b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/AbstractOpenApiSchema.java index b82f6a0e9..e3b20c31d 100644 --- a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/AbstractOpenApiSchema.java +++ b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/AbstractOpenApiSchema.java @@ -12,9 +12,10 @@ package com.redhat.parodos.sdk.model; -import java.util.Map; +import com.redhat.parodos.sdk.invoker.ApiException; import java.util.Objects; - +import java.lang.reflect.Type; +import java.util.Map; import javax.ws.rs.core.GenericType; //import com.fasterxml.jackson.annotation.JsonValue; diff --git a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/ArgumentRequestDTO.java b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/ArgumentRequestDTO.java index 1e845042b..cba18930c 100644 --- a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/ArgumentRequestDTO.java +++ b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/ArgumentRequestDTO.java @@ -12,21 +12,34 @@ package com.redhat.parodos.sdk.model; -import java.io.IOException; -import java.util.HashSet; -import java.util.Map.Entry; import java.util.Objects; -import java.util.Set; +import java.util.Arrays; +import com.google.gson.TypeAdapter; +import com.google.gson.annotations.JsonAdapter; +import com.google.gson.annotations.SerializedName; +import com.google.gson.stream.JsonReader; +import com.google.gson.stream.JsonWriter; +import java.io.IOException; import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonArray; +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import com.google.gson.TypeAdapter; +import com.google.gson.JsonParseException; import com.google.gson.TypeAdapterFactory; -import com.google.gson.annotations.SerializedName; import com.google.gson.reflect.TypeToken; -import com.google.gson.stream.JsonReader; -import com.google.gson.stream.JsonWriter; + +import java.lang.reflect.Type; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; + import com.redhat.parodos.sdk.invoker.JSON; /** diff --git a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/GetStatusByProjectId200Response.java b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/GetStatusByProjectId200Response.java index 5003351bf..aea17e15b 100644 --- a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/GetStatusByProjectId200Response.java +++ b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/GetStatusByProjectId200Response.java @@ -12,26 +12,38 @@ package com.redhat.parodos.sdk.model; +import java.util.Objects; +import java.util.Arrays; +import com.google.gson.TypeAdapter; +import com.google.gson.annotations.JsonAdapter; +import com.google.gson.annotations.SerializedName; +import com.google.gson.stream.JsonReader; +import com.google.gson.stream.JsonWriter; +import com.redhat.parodos.sdk.model.WorkStatusResponseDTO; import java.io.IOException; import java.util.ArrayList; -import java.util.HashSet; import java.util.List; -import java.util.Map.Entry; -import java.util.Objects; -import java.util.Set; import java.util.UUID; import com.google.gson.Gson; +import com.google.gson.GsonBuilder; import com.google.gson.JsonArray; +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import com.google.gson.TypeAdapter; +import com.google.gson.JsonParseException; import com.google.gson.TypeAdapterFactory; -import com.google.gson.annotations.JsonAdapter; -import com.google.gson.annotations.SerializedName; import com.google.gson.reflect.TypeToken; -import com.google.gson.stream.JsonReader; -import com.google.gson.stream.JsonWriter; + +import java.lang.reflect.Type; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; + import com.redhat.parodos.sdk.invoker.JSON; /** diff --git a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/ProjectRequestDTO.java b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/ProjectRequestDTO.java index c16d0cbf5..52062ce25 100644 --- a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/ProjectRequestDTO.java +++ b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/ProjectRequestDTO.java @@ -12,21 +12,34 @@ package com.redhat.parodos.sdk.model; -import java.io.IOException; -import java.util.HashSet; -import java.util.Map.Entry; import java.util.Objects; -import java.util.Set; +import java.util.Arrays; +import com.google.gson.TypeAdapter; +import com.google.gson.annotations.JsonAdapter; +import com.google.gson.annotations.SerializedName; +import com.google.gson.stream.JsonReader; +import com.google.gson.stream.JsonWriter; +import java.io.IOException; import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonArray; +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import com.google.gson.TypeAdapter; +import com.google.gson.JsonParseException; import com.google.gson.TypeAdapterFactory; -import com.google.gson.annotations.SerializedName; import com.google.gson.reflect.TypeToken; -import com.google.gson.stream.JsonReader; -import com.google.gson.stream.JsonWriter; + +import java.lang.reflect.Type; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; + import com.redhat.parodos.sdk.invoker.JSON; /** diff --git a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/ProjectResponseDTO.java b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/ProjectResponseDTO.java index fb0a118de..44f1cad68 100644 --- a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/ProjectResponseDTO.java +++ b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/ProjectResponseDTO.java @@ -12,23 +12,36 @@ package com.redhat.parodos.sdk.model; +import java.util.Objects; +import java.util.Arrays; +import com.google.gson.TypeAdapter; +import com.google.gson.annotations.JsonAdapter; +import com.google.gson.annotations.SerializedName; +import com.google.gson.stream.JsonReader; +import com.google.gson.stream.JsonWriter; import java.io.IOException; import java.util.Date; -import java.util.HashSet; -import java.util.Map.Entry; -import java.util.Objects; -import java.util.Set; import java.util.UUID; import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonArray; +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import com.google.gson.TypeAdapter; +import com.google.gson.JsonParseException; import com.google.gson.TypeAdapterFactory; -import com.google.gson.annotations.SerializedName; import com.google.gson.reflect.TypeToken; -import com.google.gson.stream.JsonReader; -import com.google.gson.stream.JsonWriter; + +import java.lang.reflect.Type; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; + import com.redhat.parodos.sdk.invoker.JSON; /** diff --git a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/UpdateParameter200Response.java b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/UpdateParameter200Response.java index 06e360cd9..2301f4f00 100644 --- a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/UpdateParameter200Response.java +++ b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/UpdateParameter200Response.java @@ -12,23 +12,36 @@ package com.redhat.parodos.sdk.model; +import java.util.Objects; +import java.util.Arrays; +import com.google.gson.TypeAdapter; +import com.google.gson.annotations.JsonAdapter; +import com.google.gson.annotations.SerializedName; +import com.google.gson.stream.JsonReader; +import com.google.gson.stream.JsonWriter; import java.io.IOException; import java.util.ArrayList; -import java.util.HashSet; import java.util.List; -import java.util.Map.Entry; -import java.util.Objects; -import java.util.Set; import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonArray; +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import com.google.gson.TypeAdapter; +import com.google.gson.JsonParseException; import com.google.gson.TypeAdapterFactory; -import com.google.gson.annotations.SerializedName; import com.google.gson.reflect.TypeToken; -import com.google.gson.stream.JsonReader; -import com.google.gson.stream.JsonWriter; + +import java.lang.reflect.Type; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; + import com.redhat.parodos.sdk.invoker.JSON; /** diff --git a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/WorkDefinitionResponseDTO.java b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/WorkDefinitionResponseDTO.java index f51e5365b..646b74e7d 100644 --- a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/WorkDefinitionResponseDTO.java +++ b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/WorkDefinitionResponseDTO.java @@ -12,28 +12,39 @@ package com.redhat.parodos.sdk.model; +import java.util.Objects; +import java.util.Arrays; +import com.google.gson.TypeAdapter; +import com.google.gson.annotations.JsonAdapter; +import com.google.gson.annotations.SerializedName; +import com.google.gson.stream.JsonReader; +import com.google.gson.stream.JsonWriter; import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; -import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; -import java.util.Objects; -import java.util.Set; import java.util.UUID; import com.google.gson.Gson; +import com.google.gson.GsonBuilder; import com.google.gson.JsonArray; +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import com.google.gson.TypeAdapter; +import com.google.gson.JsonParseException; import com.google.gson.TypeAdapterFactory; -import com.google.gson.annotations.JsonAdapter; -import com.google.gson.annotations.SerializedName; import com.google.gson.reflect.TypeToken; -import com.google.gson.stream.JsonReader; -import com.google.gson.stream.JsonWriter; + +import java.lang.reflect.Type; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; + import com.redhat.parodos.sdk.invoker.JSON; /** diff --git a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/WorkFlowCheckerTaskRequestDTO.java b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/WorkFlowCheckerTaskRequestDTO.java index 4d7d4a606..ed7a43e05 100644 --- a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/WorkFlowCheckerTaskRequestDTO.java +++ b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/WorkFlowCheckerTaskRequestDTO.java @@ -12,22 +12,34 @@ package com.redhat.parodos.sdk.model; -import java.io.IOException; -import java.util.HashSet; -import java.util.Map.Entry; import java.util.Objects; -import java.util.Set; +import java.util.Arrays; +import com.google.gson.TypeAdapter; +import com.google.gson.annotations.JsonAdapter; +import com.google.gson.annotations.SerializedName; +import com.google.gson.stream.JsonReader; +import com.google.gson.stream.JsonWriter; +import java.io.IOException; import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonArray; +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import com.google.gson.TypeAdapter; +import com.google.gson.JsonParseException; import com.google.gson.TypeAdapterFactory; -import com.google.gson.annotations.JsonAdapter; -import com.google.gson.annotations.SerializedName; import com.google.gson.reflect.TypeToken; -import com.google.gson.stream.JsonReader; -import com.google.gson.stream.JsonWriter; + +import java.lang.reflect.Type; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; + import com.redhat.parodos.sdk.invoker.JSON; /** diff --git a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/WorkFlowContextResponseDTO.java b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/WorkFlowContextResponseDTO.java index 49ef70033..5b0d8ce8a 100644 --- a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/WorkFlowContextResponseDTO.java +++ b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/WorkFlowContextResponseDTO.java @@ -12,22 +12,36 @@ package com.redhat.parodos.sdk.model; -import java.io.IOException; -import java.util.HashSet; -import java.util.Map.Entry; import java.util.Objects; -import java.util.Set; +import java.util.Arrays; +import com.google.gson.TypeAdapter; +import com.google.gson.annotations.JsonAdapter; +import com.google.gson.annotations.SerializedName; +import com.google.gson.stream.JsonReader; +import com.google.gson.stream.JsonWriter; +import com.redhat.parodos.sdk.model.WorkFlowOptionsResponseDTO; +import java.io.IOException; import java.util.UUID; import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonArray; +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import com.google.gson.TypeAdapter; +import com.google.gson.JsonParseException; import com.google.gson.TypeAdapterFactory; -import com.google.gson.annotations.SerializedName; import com.google.gson.reflect.TypeToken; -import com.google.gson.stream.JsonReader; -import com.google.gson.stream.JsonWriter; + +import java.lang.reflect.Type; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; + import com.redhat.parodos.sdk.invoker.JSON; /** diff --git a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/WorkFlowDefinitionResponseDTO.java b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/WorkFlowDefinitionResponseDTO.java index 592771c4b..e2deb571d 100644 --- a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/WorkFlowDefinitionResponseDTO.java +++ b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/WorkFlowDefinitionResponseDTO.java @@ -12,29 +12,42 @@ package com.redhat.parodos.sdk.model; +import java.util.Objects; +import java.util.Arrays; +import com.google.gson.TypeAdapter; +import com.google.gson.annotations.JsonAdapter; +import com.google.gson.annotations.SerializedName; +import com.google.gson.stream.JsonReader; +import com.google.gson.stream.JsonWriter; +import com.redhat.parodos.sdk.model.WorkDefinitionResponseDTO; +import com.redhat.parodos.sdk.model.WorkFlowPropertiesDefinitionDTO; import java.io.IOException; import java.util.ArrayList; import java.util.Date; import java.util.HashMap; -import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; -import java.util.Objects; -import java.util.Set; import java.util.UUID; import com.google.gson.Gson; +import com.google.gson.GsonBuilder; import com.google.gson.JsonArray; +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import com.google.gson.TypeAdapter; +import com.google.gson.JsonParseException; import com.google.gson.TypeAdapterFactory; -import com.google.gson.annotations.JsonAdapter; -import com.google.gson.annotations.SerializedName; import com.google.gson.reflect.TypeToken; -import com.google.gson.stream.JsonReader; -import com.google.gson.stream.JsonWriter; + +import java.lang.reflect.Type; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; + import com.redhat.parodos.sdk.invoker.JSON; /** diff --git a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/WorkFlowOption.java b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/WorkFlowOption.java index 58b79677e..617beba62 100644 --- a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/WorkFlowOption.java +++ b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/WorkFlowOption.java @@ -12,23 +12,36 @@ package com.redhat.parodos.sdk.model; +import java.util.Objects; +import java.util.Arrays; +import com.google.gson.TypeAdapter; +import com.google.gson.annotations.JsonAdapter; +import com.google.gson.annotations.SerializedName; +import com.google.gson.stream.JsonReader; +import com.google.gson.stream.JsonWriter; import java.io.IOException; import java.util.ArrayList; -import java.util.HashSet; import java.util.List; -import java.util.Map.Entry; -import java.util.Objects; -import java.util.Set; import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonArray; +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import com.google.gson.TypeAdapter; +import com.google.gson.JsonParseException; import com.google.gson.TypeAdapterFactory; -import com.google.gson.annotations.SerializedName; import com.google.gson.reflect.TypeToken; -import com.google.gson.stream.JsonReader; -import com.google.gson.stream.JsonWriter; + +import java.lang.reflect.Type; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; + import com.redhat.parodos.sdk.invoker.JSON; /** diff --git a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/WorkFlowOptionsResponseDTO.java b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/WorkFlowOptionsResponseDTO.java index bdeea3a02..8c83c17bb 100644 --- a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/WorkFlowOptionsResponseDTO.java +++ b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/WorkFlowOptionsResponseDTO.java @@ -12,24 +12,37 @@ package com.redhat.parodos.sdk.model; +import java.util.Objects; +import java.util.Arrays; +import com.google.gson.TypeAdapter; +import com.google.gson.annotations.JsonAdapter; +import com.google.gson.annotations.SerializedName; +import com.google.gson.stream.JsonReader; +import com.google.gson.stream.JsonWriter; +import com.redhat.parodos.sdk.model.WorkFlowOption; import java.io.IOException; import java.util.ArrayList; -import java.util.HashSet; import java.util.List; -import java.util.Map.Entry; -import java.util.Objects; -import java.util.Set; import com.google.gson.Gson; +import com.google.gson.GsonBuilder; import com.google.gson.JsonArray; +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import com.google.gson.TypeAdapter; +import com.google.gson.JsonParseException; import com.google.gson.TypeAdapterFactory; -import com.google.gson.annotations.SerializedName; import com.google.gson.reflect.TypeToken; -import com.google.gson.stream.JsonReader; -import com.google.gson.stream.JsonWriter; + +import java.lang.reflect.Type; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; + import com.redhat.parodos.sdk.invoker.JSON; /** diff --git a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/WorkFlowPropertiesDefinitionDTO.java b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/WorkFlowPropertiesDefinitionDTO.java index a68047ac5..5e7e57d3f 100644 --- a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/WorkFlowPropertiesDefinitionDTO.java +++ b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/WorkFlowPropertiesDefinitionDTO.java @@ -12,21 +12,34 @@ package com.redhat.parodos.sdk.model; -import java.io.IOException; -import java.util.HashSet; -import java.util.Map.Entry; import java.util.Objects; -import java.util.Set; +import java.util.Arrays; +import com.google.gson.TypeAdapter; +import com.google.gson.annotations.JsonAdapter; +import com.google.gson.annotations.SerializedName; +import com.google.gson.stream.JsonReader; +import com.google.gson.stream.JsonWriter; +import java.io.IOException; import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonArray; +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import com.google.gson.TypeAdapter; +import com.google.gson.JsonParseException; import com.google.gson.TypeAdapterFactory; -import com.google.gson.annotations.SerializedName; import com.google.gson.reflect.TypeToken; -import com.google.gson.stream.JsonReader; -import com.google.gson.stream.JsonWriter; + +import java.lang.reflect.Type; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; + import com.redhat.parodos.sdk.invoker.JSON; /** diff --git a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/WorkFlowRequestDTO.java b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/WorkFlowRequestDTO.java index ae6d04b29..a06d5a1c3 100644 --- a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/WorkFlowRequestDTO.java +++ b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/WorkFlowRequestDTO.java @@ -12,25 +12,39 @@ package com.redhat.parodos.sdk.model; +import java.util.Objects; +import java.util.Arrays; +import com.google.gson.TypeAdapter; +import com.google.gson.annotations.JsonAdapter; +import com.google.gson.annotations.SerializedName; +import com.google.gson.stream.JsonReader; +import com.google.gson.stream.JsonWriter; +import com.redhat.parodos.sdk.model.ArgumentRequestDTO; +import com.redhat.parodos.sdk.model.WorkRequestDTO; import java.io.IOException; import java.util.ArrayList; -import java.util.HashSet; import java.util.List; -import java.util.Map.Entry; -import java.util.Objects; -import java.util.Set; import java.util.UUID; import com.google.gson.Gson; +import com.google.gson.GsonBuilder; import com.google.gson.JsonArray; +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import com.google.gson.TypeAdapter; +import com.google.gson.JsonParseException; import com.google.gson.TypeAdapterFactory; -import com.google.gson.annotations.SerializedName; import com.google.gson.reflect.TypeToken; -import com.google.gson.stream.JsonReader; -import com.google.gson.stream.JsonWriter; + +import java.lang.reflect.Type; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; + import com.redhat.parodos.sdk.invoker.JSON; /** diff --git a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/WorkFlowResponseDTO.java b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/WorkFlowResponseDTO.java index 40bf2acc0..1fd4c55b2 100644 --- a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/WorkFlowResponseDTO.java +++ b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/WorkFlowResponseDTO.java @@ -12,23 +12,35 @@ package com.redhat.parodos.sdk.model; -import java.io.IOException; -import java.util.HashSet; -import java.util.Map.Entry; import java.util.Objects; -import java.util.Set; +import java.util.Arrays; +import com.google.gson.TypeAdapter; +import com.google.gson.annotations.JsonAdapter; +import com.google.gson.annotations.SerializedName; +import com.google.gson.stream.JsonReader; +import com.google.gson.stream.JsonWriter; +import java.io.IOException; import java.util.UUID; import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonArray; +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import com.google.gson.TypeAdapter; +import com.google.gson.JsonParseException; import com.google.gson.TypeAdapterFactory; -import com.google.gson.annotations.JsonAdapter; -import com.google.gson.annotations.SerializedName; import com.google.gson.reflect.TypeToken; -import com.google.gson.stream.JsonReader; -import com.google.gson.stream.JsonWriter; + +import java.lang.reflect.Type; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; + import com.redhat.parodos.sdk.invoker.JSON; /** diff --git a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/WorkFlowStatusResponseDTO.java b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/WorkFlowStatusResponseDTO.java index 034b253fe..9b4f5f654 100644 --- a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/WorkFlowStatusResponseDTO.java +++ b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/WorkFlowStatusResponseDTO.java @@ -12,26 +12,38 @@ package com.redhat.parodos.sdk.model; +import java.util.Objects; +import java.util.Arrays; +import com.google.gson.TypeAdapter; +import com.google.gson.annotations.JsonAdapter; +import com.google.gson.annotations.SerializedName; +import com.google.gson.stream.JsonReader; +import com.google.gson.stream.JsonWriter; +import com.redhat.parodos.sdk.model.WorkStatusResponseDTO; import java.io.IOException; import java.util.ArrayList; -import java.util.HashSet; import java.util.List; -import java.util.Map.Entry; -import java.util.Objects; -import java.util.Set; import java.util.UUID; import com.google.gson.Gson; +import com.google.gson.GsonBuilder; import com.google.gson.JsonArray; +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import com.google.gson.TypeAdapter; +import com.google.gson.JsonParseException; import com.google.gson.TypeAdapterFactory; -import com.google.gson.annotations.JsonAdapter; -import com.google.gson.annotations.SerializedName; import com.google.gson.reflect.TypeToken; -import com.google.gson.stream.JsonReader; -import com.google.gson.stream.JsonWriter; + +import java.lang.reflect.Type; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; + import com.redhat.parodos.sdk.invoker.JSON; /** diff --git a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/WorkParameterValueRequestDTO.java b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/WorkParameterValueRequestDTO.java index 9471a60d4..05a5206e2 100644 --- a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/WorkParameterValueRequestDTO.java +++ b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/WorkParameterValueRequestDTO.java @@ -12,21 +12,34 @@ package com.redhat.parodos.sdk.model; -import java.io.IOException; -import java.util.HashSet; -import java.util.Map.Entry; import java.util.Objects; -import java.util.Set; +import java.util.Arrays; +import com.google.gson.TypeAdapter; +import com.google.gson.annotations.JsonAdapter; +import com.google.gson.annotations.SerializedName; +import com.google.gson.stream.JsonReader; +import com.google.gson.stream.JsonWriter; +import java.io.IOException; import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonArray; +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import com.google.gson.TypeAdapter; +import com.google.gson.JsonParseException; import com.google.gson.TypeAdapterFactory; -import com.google.gson.annotations.SerializedName; import com.google.gson.reflect.TypeToken; -import com.google.gson.stream.JsonReader; -import com.google.gson.stream.JsonWriter; + +import java.lang.reflect.Type; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; + import com.redhat.parodos.sdk.invoker.JSON; /** diff --git a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/WorkParameterValueResponseDTO.java b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/WorkParameterValueResponseDTO.java index bdf5c2f1d..d6739b6b8 100644 --- a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/WorkParameterValueResponseDTO.java +++ b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/WorkParameterValueResponseDTO.java @@ -12,23 +12,36 @@ package com.redhat.parodos.sdk.model; +import java.util.Objects; +import java.util.Arrays; +import com.google.gson.TypeAdapter; +import com.google.gson.annotations.JsonAdapter; +import com.google.gson.annotations.SerializedName; +import com.google.gson.stream.JsonReader; +import com.google.gson.stream.JsonWriter; import java.io.IOException; import java.util.ArrayList; -import java.util.HashSet; import java.util.List; -import java.util.Map.Entry; -import java.util.Objects; -import java.util.Set; import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonArray; +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import com.google.gson.TypeAdapter; +import com.google.gson.JsonParseException; import com.google.gson.TypeAdapterFactory; -import com.google.gson.annotations.SerializedName; import com.google.gson.reflect.TypeToken; -import com.google.gson.stream.JsonReader; -import com.google.gson.stream.JsonWriter; + +import java.lang.reflect.Type; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; + import com.redhat.parodos.sdk.invoker.JSON; /** diff --git a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/WorkRequestDTO.java b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/WorkRequestDTO.java index fb72237a4..f24ca26a9 100644 --- a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/WorkRequestDTO.java +++ b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/WorkRequestDTO.java @@ -12,25 +12,37 @@ package com.redhat.parodos.sdk.model; +import java.util.Objects; +import java.util.Arrays; +import com.google.gson.TypeAdapter; +import com.google.gson.annotations.JsonAdapter; +import com.google.gson.annotations.SerializedName; +import com.google.gson.stream.JsonReader; +import com.google.gson.stream.JsonWriter; +import com.redhat.parodos.sdk.model.ArgumentRequestDTO; import java.io.IOException; import java.util.ArrayList; -import java.util.HashSet; import java.util.List; -import java.util.Map.Entry; -import java.util.Objects; -import java.util.Set; import com.google.gson.Gson; +import com.google.gson.GsonBuilder; import com.google.gson.JsonArray; +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import com.google.gson.TypeAdapter; +import com.google.gson.JsonParseException; import com.google.gson.TypeAdapterFactory; -import com.google.gson.annotations.JsonAdapter; -import com.google.gson.annotations.SerializedName; import com.google.gson.reflect.TypeToken; -import com.google.gson.stream.JsonReader; -import com.google.gson.stream.JsonWriter; + +import java.lang.reflect.Type; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; + import com.redhat.parodos.sdk.invoker.JSON; /** diff --git a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/WorkStatusResponseDTO.java b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/WorkStatusResponseDTO.java index 3b0001ff2..49eb5a3be 100644 --- a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/WorkStatusResponseDTO.java +++ b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/WorkStatusResponseDTO.java @@ -12,25 +12,36 @@ package com.redhat.parodos.sdk.model; +import java.util.Objects; +import java.util.Arrays; +import com.google.gson.TypeAdapter; +import com.google.gson.annotations.JsonAdapter; +import com.google.gson.annotations.SerializedName; +import com.google.gson.stream.JsonReader; +import com.google.gson.stream.JsonWriter; import java.io.IOException; import java.util.ArrayList; -import java.util.HashSet; import java.util.List; -import java.util.Map.Entry; -import java.util.Objects; -import java.util.Set; import com.google.gson.Gson; +import com.google.gson.GsonBuilder; import com.google.gson.JsonArray; +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import com.google.gson.TypeAdapter; +import com.google.gson.JsonParseException; import com.google.gson.TypeAdapterFactory; -import com.google.gson.annotations.JsonAdapter; -import com.google.gson.annotations.SerializedName; import com.google.gson.reflect.TypeToken; -import com.google.gson.stream.JsonReader; -import com.google.gson.stream.JsonWriter; + +import java.lang.reflect.Type; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; + import com.redhat.parodos.sdk.invoker.JSON; /** diff --git a/workflow-service/src/main/resources/application.yml b/workflow-service/src/main/resources/application.yml index c74372994..43f3966ae 100644 --- a/workflow-service/src/main/resources/application.yml +++ b/workflow-service/src/main/resources/application.yml @@ -2,7 +2,7 @@ spring: application: name: parodos-workflow-service title: Parodos Workflow Service - version: 1.0.11-SNAPSHOT + version: 1.0.11