diff --git a/coverage/pom.xml b/coverage/pom.xml index d375551f4..a7e5628c4 100644 --- a/coverage/pom.xml +++ b/coverage/pom.xml @@ -12,7 +12,7 @@ Compute aggregated test code coverage true - 1.0.18-SNAPSHOT + 1.0.18 diff --git a/notification-service-sdk/README.md b/notification-service-sdk/README.md index 6f739c58d..356ad3e28 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.18-SNAPSHOT + 1.0.18 compile ``` @@ -55,7 +55,7 @@ Add this dependency to your project's build file: } dependencies { - implementation "dev.parodos:notification-service-sdk:1.0.18-SNAPSHOT" + implementation "dev.parodos:notification-service-sdk:1.0.18" } ``` @@ -69,7 +69,7 @@ mvn clean package Then manually install the following JARs: -* `target/notification-service-sdk-1.0.18-SNAPSHOT.jar` +* `target/notification-service-sdk-1.0.18.jar` * `target/lib/*.jar` ## Getting Started diff --git a/notification-service-sdk/docs/SortObject.md b/notification-service-sdk/docs/SortObject.md new file mode 100644 index 000000000..0fdd5e014 --- /dev/null +++ b/notification-service-sdk/docs/SortObject.md @@ -0,0 +1,15 @@ + + +# SortObject + + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| +|**empty** | **Boolean** | | [optional] | +|**sorted** | **Boolean** | | [optional] | +|**unsorted** | **Boolean** | | [optional] | + + + 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 2b0338e1a..1ccb13113 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 @@ -143,7 +143,7 @@ private void init() { json = new JSON(); // Set default User-Agent. - setUserAgent("OpenAPI-Generator/1.0.18-SNAPSHOT/java"); + setUserAgent("OpenAPI-Generator/1.0.18/java"); authentications = new HashMap(); } diff --git a/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/api/Configuration.java b/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/api/Configuration.java index dc2e7ea3a..2d9ec5bf8 100644 --- a/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/api/Configuration.java +++ b/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/api/Configuration.java @@ -15,7 +15,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class Configuration { - public static final String VERSION = "1.0.18-SNAPSHOT"; + public static final String VERSION = "1.0.18"; private static ApiClient defaultApiClient = new ApiClient(); diff --git a/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/model/SortObject.java b/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/model/SortObject.java new file mode 100644 index 000000000..9d88d7413 --- /dev/null +++ b/notification-service-sdk/src/main/java/com/redhat/parodos/notification/sdk/model/SortObject.java @@ -0,0 +1,242 @@ +/* + * Parodos Notification Service API + * This is the API documentation for the Parodos Notification Service. It provides operations to send out and check notification. The endpoints are secured with oAuth2/OpenID and cannot be accessed without a valid token. + * + * The version of the OpenAPI document: v1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +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 com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.TypeAdapter; +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 com.redhat.parodos.notification.sdk.api.JSON; + +/** + * SortObject + */ +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +public class SortObject { + + public static final String SERIALIZED_NAME_EMPTY = "empty"; + + @SerializedName(SERIALIZED_NAME_EMPTY) + private Boolean empty; + + public static final String SERIALIZED_NAME_SORTED = "sorted"; + + @SerializedName(SERIALIZED_NAME_SORTED) + private Boolean sorted; + + public static final String SERIALIZED_NAME_UNSORTED = "unsorted"; + + @SerializedName(SERIALIZED_NAME_UNSORTED) + private Boolean unsorted; + + public SortObject() { + } + + public SortObject empty(Boolean empty) { + + this.empty = empty; + return this; + } + + /** + * Get empty + * @return empty + **/ + @javax.annotation.Nullable + public Boolean getEmpty() { + return empty; + } + + public void setEmpty(Boolean empty) { + this.empty = empty; + } + + public SortObject sorted(Boolean sorted) { + + this.sorted = sorted; + return this; + } + + /** + * Get sorted + * @return sorted + **/ + @javax.annotation.Nullable + public Boolean getSorted() { + return sorted; + } + + public void setSorted(Boolean sorted) { + this.sorted = sorted; + } + + public SortObject unsorted(Boolean unsorted) { + + this.unsorted = unsorted; + return this; + } + + /** + * Get unsorted + * @return unsorted + **/ + @javax.annotation.Nullable + public Boolean getUnsorted() { + return unsorted; + } + + public void setUnsorted(Boolean unsorted) { + this.unsorted = unsorted; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + SortObject sortObject = (SortObject) o; + return Objects.equals(this.empty, sortObject.empty) && Objects.equals(this.sorted, sortObject.sorted) + && Objects.equals(this.unsorted, sortObject.unsorted); + } + + @Override + public int hashCode() { + return Objects.hash(empty, sorted, unsorted); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class SortObject {\n"); + sb.append(" empty: ").append(toIndentedString(empty)).append("\n"); + sb.append(" sorted: ").append(toIndentedString(sorted)).append("\n"); + sb.append(" unsorted: ").append(toIndentedString(unsorted)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces (except the + * first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + + public static HashSet openapiFields; + + public static HashSet openapiRequiredFields; + + static { + // a set of all properties/fields (JSON key names) + openapiFields = new HashSet(); + openapiFields.add("empty"); + openapiFields.add("sorted"); + openapiFields.add("unsorted"); + + // a set of required properties/fields (JSON key names) + openapiRequiredFields = new HashSet(); + } + + /** + * Validates the JSON Object and throws an exception if issues found + * @param jsonObj JSON Object + * @throws IOException if the JSON Object is invalid with respect to SortObject + */ + public static void validateJsonObject(JsonObject jsonObj) throws IOException { + if (jsonObj == null) { + if (!SortObject.openapiRequiredFields.isEmpty()) { // has required fields but + // JSON object is null + throw new IllegalArgumentException( + String.format("The required field(s) %s in SortObject is not found in the empty JSON string", + SortObject.openapiRequiredFields.toString())); + } + } + + Set> entries = jsonObj.entrySet(); + // check to see if the JSON string contains additional fields + for (Entry entry : entries) { + if (!SortObject.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format( + "The field `%s` in the JSON string is not defined in the `SortObject` properties. JSON: %s", + entry.getKey(), jsonObj.toString())); + } + } + } + + public static class CustomTypeAdapterFactory implements TypeAdapterFactory { + + @SuppressWarnings("unchecked") + @Override + public TypeAdapter create(Gson gson, TypeToken type) { + if (!SortObject.class.isAssignableFrom(type.getRawType())) { + return null; // this class only serializes 'SortObject' and its subtypes + } + final TypeAdapter elementAdapter = gson.getAdapter(JsonElement.class); + final TypeAdapter thisAdapter = gson.getDelegateAdapter(this, TypeToken.get(SortObject.class)); + + return (TypeAdapter) new TypeAdapter() { + @Override + public void write(JsonWriter out, SortObject value) throws IOException { + JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); + elementAdapter.write(out, obj); + } + + @Override + public SortObject read(JsonReader in) throws IOException { + JsonObject jsonObj = elementAdapter.read(in).getAsJsonObject(); + validateJsonObject(jsonObj); + return thisAdapter.fromJsonTree(jsonObj); + } + + }.nullSafe(); + } + + } + + /** + * Create an instance of SortObject given an JSON string + * @param jsonString JSON string + * @return An instance of SortObject + * @throws IOException if the JSON string is invalid with respect to SortObject + */ + public static SortObject fromJson(String jsonString) throws IOException { + return JSON.getGson().fromJson(jsonString, SortObject.class); + } + + /** + * Convert an instance of SortObject to an JSON string + * @return JSON string + */ + public String toJson() { + return JSON.getGson().toJson(this); + } + +} diff --git a/notification-service/README.md b/notification-service/README.md index 66816f742..2af07bd85 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.18-SNAPSHOT.jar +java -jar -Dspring.profiles.active=local -Dserver.port=8081 target/notification-service-1.0.18.jar ``` diff --git a/notification-service/licenses/THIRD-PARTY.txt b/notification-service/licenses/THIRD-PARTY.txt index a40ad591c..5df9a81c9 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.18-SNAPSHOT.RELEASE - http://github.com/spring-projects/spring-security-oauth) + (Apache 2.0) spring-security-rsa (org.springframework.security:spring-security-rsa:1.0.18.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/notification-service/pom.xml b/notification-service/pom.xml index c674681a2..3d1f8b3cc 100644 --- a/notification-service/pom.xml +++ b/notification-service/pom.xml @@ -23,8 +23,6 @@ http://github.com/parodos-dev/parodos/tree/main - 2020.0.6 - 1.6.4 1.8.5 1.6.3 0.2.2 diff --git a/notification-service/src/main/resources/application.yml b/notification-service/src/main/resources/application.yml index 94935d1a4..1cbbdc04e 100644 --- a/notification-service/src/main/resources/application.yml +++ b/notification-service/src/main/resources/application.yml @@ -2,7 +2,7 @@ spring: application: name: parodos-notification-service title: Parodos Notification Service - version: 1.0.18-SNAPSHOT + version: 1.0.18 jackson: default-property-inclusion: non_null main: diff --git a/pom.xml b/pom.xml index 7d2ab7593..fa6b0f890 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,7 @@ - 1.0.18-SNAPSHOT + 1.0.18 1.3.0 17 UTF-8 @@ -61,6 +61,8 @@ 3.17.2 4.9.2 6.6.0 + 1.6.5 + 2020.0.6 1.8.5 1.28 diff --git a/workflow-service-sdk/README.md b/workflow-service-sdk/README.md index 101a41c48..27883ca6e 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.18-SNAPSHOT + 1.0.18 compile ``` @@ -55,7 +55,7 @@ Add this dependency to your project's build file: } dependencies { - implementation "dev.parodos:workflow-service-sdk:1.0.18-SNAPSHOT" + implementation "dev.parodos:workflow-service-sdk:1.0.18" } ``` @@ -69,7 +69,7 @@ mvn clean package Then manually install the following JARs: -* `target/workflow-service-sdk-1.0.18-SNAPSHOT.jar` +* `target/workflow-service-sdk-1.0.18.jar` * `target/lib/*.jar` ## Getting Started 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 35bf16673..e4da101dd 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 @@ -143,7 +143,7 @@ private void init() { json = new JSON(); // Set default User-Agent. - setUserAgent("OpenAPI-Generator/1.0.18-SNAPSHOT/java"); + setUserAgent("OpenAPI-Generator/1.0.18/java"); authentications = new HashMap(); } diff --git a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/invoker/Configuration.java b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/invoker/Configuration.java index 613c8dbe2..fcde26242 100644 --- a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/invoker/Configuration.java +++ b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/invoker/Configuration.java @@ -15,7 +15,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class Configuration { - public static final String VERSION = "1.0.18-SNAPSHOT"; + public static final String VERSION = "1.0.18"; private static ApiClient defaultApiClient = new ApiClient(); diff --git a/workflow-service/pom.xml b/workflow-service/pom.xml index e275adce4..1d2f60d90 100644 --- a/workflow-service/pom.xml +++ b/workflow-service/pom.xml @@ -31,8 +31,6 @@ 6.5.0.202303070854-r 2.11.0 3.1.1 - 2020.0.6 - 1.6.4 3.1.0 diff --git a/workflow-service/src/main/resources/application.yml b/workflow-service/src/main/resources/application.yml index 97c1b75bc..2509296a9 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.18-SNAPSHOT + version: 1.0.18