Skip to content
This repository has been archived by the owner on Jul 23, 2024. It is now read-only.

NO-ISSUE: Version bump #465

Merged
merged 2 commits into from
Jul 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion coverage/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<description>Compute aggregated test code coverage</description>
<properties>
<maven.deploy.skip>true</maven.deploy.skip>
<revision>1.0.18-SNAPSHOT</revision>
<revision>1.0.19-SNAPSHOT</revision>
</properties>

<dependencies>
Expand Down
6 changes: 3 additions & 3 deletions notification-service-sdk/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Add this dependency to your project's POM:
<dependency>
<groupId>dev.parodos</groupId>
<artifactId>notification-service-sdk</artifactId>
<version>1.0.18-SNAPSHOT</version>
<version>1.0.19-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
```
Expand All @@ -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.19-SNAPSHOT"
}
```

Expand All @@ -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.19-SNAPSHOT.jar`
* `target/lib/*.jar`

## Getting Started
Expand Down
15 changes: 15 additions & 0 deletions notification-service-sdk/docs/SortObject.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@


# SortObject


## Properties

| Name | Type | Description | Notes |
|------------ | ------------- | ------------- | -------------|
|**empty** | **Boolean** | | [optional] |
|**sorted** | **Boolean** | | [optional] |
|**unsorted** | **Boolean** | | [optional] |



Original file line number Diff line number Diff line change
Expand Up @@ -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.19-SNAPSHOT/java");

authentications = new HashMap<String, Authentication>();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.19-SNAPSHOT";

private static ApiClient defaultApiClient = new ApiClient();

Expand Down
Original file line number Diff line number Diff line change
@@ -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<String> openapiFields;

public static HashSet<String> openapiRequiredFields;

static {
// a set of all properties/fields (JSON key names)
openapiFields = new HashSet<String>();
openapiFields.add("empty");
openapiFields.add("sorted");
openapiFields.add("unsorted");

// a set of required properties/fields (JSON key names)
openapiRequiredFields = new HashSet<String>();
}

/**
* 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<Entry<String, JsonElement>> entries = jsonObj.entrySet();
// check to see if the JSON string contains additional fields
for (Entry<String, JsonElement> 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 <T> TypeAdapter<T> create(Gson gson, TypeToken<T> type) {
if (!SortObject.class.isAssignableFrom(type.getRawType())) {
return null; // this class only serializes 'SortObject' and its subtypes
}
final TypeAdapter<JsonElement> elementAdapter = gson.getAdapter(JsonElement.class);
final TypeAdapter<SortObject> thisAdapter = gson.getDelegateAdapter(this, TypeToken.get(SortObject.class));

return (TypeAdapter<T>) new TypeAdapter<SortObject>() {
@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);
}

}
2 changes: 1 addition & 1 deletion notification-service/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.19-SNAPSHOT.jar

```

Expand Down
2 changes: 1 addition & 1 deletion notification-service/licenses/THIRD-PARTY.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.19-SNAPSHOT.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)
Expand Down
2 changes: 0 additions & 2 deletions notification-service/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@
<url>http://github.com/parodos-dev/parodos/tree/main</url>
</scm>
<properties>
<spring-cloud.version>2020.0.6</spring-cloud.version>
<springdoc-openapi-ui.version>1.6.4</springdoc-openapi-ui.version>
<gson-fire-version>1.8.5</gson-fire-version>
<swagger-core-version>1.6.3</swagger-core-version>
<jackson-databind-nullable-version>0.2.2</jackson-databind-nullable-version>
Expand Down
2 changes: 1 addition & 1 deletion notification-service/src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ spring:
application:
name: parodos-notification-service
title: Parodos Notification Service
version: 1.0.18-SNAPSHOT
version: 1.0.19-SNAPSHOT
jackson:
default-property-inclusion: non_null
main:
Expand Down
4 changes: 3 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
</developer>
</developers>
<properties>
<revision>1.0.18-SNAPSHOT</revision>
<revision>1.0.19-SNAPSHOT</revision>
<flatten.version>1.3.0</flatten.version>
<java.version>17</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand All @@ -61,6 +61,8 @@
<assertj.version>3.17.2</assertj.version>
<okhttp-version>4.9.2</okhttp-version>
<openapi.generator.version>6.6.0</openapi.generator.version>
<springdoc-openapi-ui.version>1.6.5</springdoc-openapi-ui.version>
<spring-cloud.version>2020.0.6</spring-cloud.version>
<gson-fire-version>1.8.5</gson-fire-version>
<snakeyaml-version>1.28</snakeyaml-version>
</properties>
Expand Down
6 changes: 3 additions & 3 deletions workflow-service-sdk/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Add this dependency to your project's POM:
<dependency>
<groupId>dev.parodos</groupId>
<artifactId>workflow-service-sdk</artifactId>
<version>1.0.18-SNAPSHOT</version>
<version>1.0.19-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
```
Expand All @@ -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.19-SNAPSHOT"
}
```

Expand All @@ -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.19-SNAPSHOT.jar`
* `target/lib/*.jar`

## Getting Started
Expand Down
Loading