Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Spike/move to quarkus 3 #1682

Merged
merged 16 commits into from
Aug 10, 2023
Merged

Spike/move to quarkus 3 #1682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
e7e7318
WIP progress on moving to 3
dvince2 Jul 25, 2023
8eedd24
Merging main
dvince2 Aug 9, 2023
68bec41
Merging main
dvince2 Aug 9, 2023
0852ab4
Merging main
dvince2 Aug 9, 2023
7ed23a1
Merging main
dvince2 Aug 9, 2023
56aa632
Merging main
dvince2 Aug 9, 2023
3f6a103
Merging main
dvince2 Aug 9, 2023
cadff2a
Merging main
dvince2 Aug 9, 2023
697213f
Resolinvg double colon issue as secret handler.
dvince2 Aug 9, 2023
d22cba4
Restoring tests
dvince2 Aug 10, 2023
aaa0ed3
Restoring tests
dvince2 Aug 10, 2023
841d01e
Restoring tests
dvince2 Aug 10, 2023
b612335
Merge branch 'main' into spike/move_to_quarkus_3
dvince2 Aug 10, 2023
cfaffcb
Restoring lombok version
dvince2 Aug 10, 2023
cc505d8
Merge remote-tracking branch 'origin/spike/move_to_quarkus_3' into sp…
dvince2 Aug 10, 2023
5a65bdc
Merge branch 'main' into spike/move_to_quarkus_3
dvince2 Aug 10, 2023
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 gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
quarkusPluginId=io.quarkus
quarkusPlatformGroupId=io.quarkus.platform
quarkusPlatformArtifactId=quarkus-bom
quarkusVersion=2.16.6.Final
quarkusVersion=3.2.3.Final
lombokVersion=1.18.26
elasticsearchVersion=8.7.0
2 changes: 1 addition & 1 deletion packages/services/hmi-server/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
quarkusPluginId=io.quarkus
quarkusPlatformGroupId=io.quarkus.platform
quarkusPlatformArtifactId=quarkus-bom
quarkusVersion=2.16.8.Final
quarkusVersion=3.2.3.Final
lombokVersion=1.18.28
elasticsearchVersion=8.7.0
2 changes: 1 addition & 1 deletion ...er/src/main/java/software/uncharted/terarium/hmiserver/annotations/LogRestClientTime.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package software.uncharted.terarium.hmiserver.annotations;

import javax.interceptor.InterceptorBinding;
import jakarta.interceptor.InterceptorBinding;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
Expand Down
4 changes: 2 additions & 2 deletions ...server/src/main/java/software/uncharted/terarium/hmiserver/caching/CacheClearService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
import lombok.Getter;
import lombok.RequiredArgsConstructor;

import javax.enterprise.context.ApplicationScoped;
import javax.inject.Inject;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.Stream;
Expand Down
8 changes: 4 additions & 4 deletions ...java/software/uncharted/terarium/hmiserver/configuration/RequestLoggingRequestFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
import software.uncharted.terarium.hmiserver.annotations.IgnoreRequestLogging;
import software.uncharted.terarium.hmiserver.services.StructuredLog;

import javax.inject.Inject;
import javax.ws.rs.container.ContainerRequestContext;
import javax.ws.rs.container.ContainerRequestFilter;
import javax.ws.rs.ext.Provider;
import jakarta.inject.Inject;
import jakarta.ws.rs.container.ContainerRequestContext;
import jakarta.ws.rs.container.ContainerRequestFilter;
import jakarta.ws.rs.ext.Provider;
import java.io.IOException;
import java.time.Instant;

Expand Down
10 changes: 5 additions & 5 deletions ...ava/software/uncharted/terarium/hmiserver/configuration/RequestLoggingResponseFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
import lombok.extern.slf4j.Slf4j;
import software.uncharted.terarium.hmiserver.services.StructuredLog;

import javax.inject.Inject;
import javax.ws.rs.container.ContainerRequestContext;
import javax.ws.rs.container.ContainerResponseContext;
import javax.ws.rs.container.ContainerResponseFilter;
import javax.ws.rs.ext.Provider;
import jakarta.inject.Inject;
import jakarta.ws.rs.container.ContainerRequestContext;
import jakarta.ws.rs.container.ContainerResponseContext;
import jakarta.ws.rs.container.ContainerResponseFilter;
import jakarta.ws.rs.ext.Provider;
import java.io.IOException;
import java.time.Instant;

Expand Down
10 changes: 5 additions & 5 deletions ...s/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/entities/Annotation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
import lombok.experimental.Accessors;


import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Index;
import javax.persistence.Table;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.Id;
import jakarta.persistence.Index;
import jakarta.persistence.Table;
import java.io.Serializable;
import java.time.Instant;
import java.util.List;
Expand Down
10 changes: 5 additions & 5 deletions ...rvices/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/entities/Event.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
import software.uncharted.terarium.hmiserver.annotations.TSOptional;
import software.uncharted.terarium.hmiserver.models.EventType;

import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Index;
import javax.persistence.Table;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.Id;
import jakarta.persistence.Index;
import jakarta.persistence.Table;
import java.io.Serializable;
import java.time.Instant;
import java.util.List;
Expand Down
2 changes: 1 addition & 1 deletion ...ain/java/software/uncharted/terarium/hmiserver/exceptions/HmiResponseExceptionMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import lombok.EqualsAndHashCode;
import org.eclipse.microprofile.rest.client.ext.ResponseExceptionMapper;

import javax.ws.rs.core.Response;
import jakarta.ws.rs.core.Response;

public class HmiResponseExceptionMapper implements ResponseExceptionMapper<RuntimeException> {

Expand Down
32 changes: 16 additions & 16 deletions .../main/java/software/uncharted/terarium/hmiserver/proxies/RestClientTimingInterceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
import software.uncharted.terarium.hmiserver.services.EventService;
import software.uncharted.terarium.hmiserver.services.StructuredLog;

import javax.annotation.Priority;
import javax.inject.Inject;
import javax.interceptor.AroundInvoke;
import javax.interceptor.Interceptor;
import javax.interceptor.InvocationContext;
import jakarta.annotation.Priority;
import jakarta.inject.Inject;
import jakarta.interceptor.AroundInvoke;
import jakarta.interceptor.Interceptor;
import jakarta.interceptor.InvocationContext;
import java.lang.reflect.Method;
import java.util.UUID;

Expand Down Expand Up @@ -90,19 +90,19 @@ public Object measureInvocationTime(InvocationContext context) throws Exception
* @return The method type (GET, POST, etc)
*/
private String getType(InvocationContext context) {
if (context.getMethod().getAnnotation(javax.ws.rs.GET.class) != null) {
if (context.getMethod().getAnnotation(jakarta.ws.rs.GET.class) != null) {
return "GET";
} else if (context.getMethod().getAnnotation(javax.ws.rs.POST.class) != null) {
} else if (context.getMethod().getAnnotation(jakarta.ws.rs.POST.class) != null) {
return "POST";
} else if (context.getMethod().getAnnotation(javax.ws.rs.PUT.class) != null) {
} else if (context.getMethod().getAnnotation(jakarta.ws.rs.PUT.class) != null) {
return "PUT";
} else if (context.getMethod().getAnnotation(javax.ws.rs.DELETE.class) != null) {
} else if (context.getMethod().getAnnotation(jakarta.ws.rs.DELETE.class) != null) {
return "DELETE";
} else if (context.getMethod().getAnnotation(javax.ws.rs.HEAD.class) != null) {
} else if (context.getMethod().getAnnotation(jakarta.ws.rs.HEAD.class) != null) {
return "HEAD";
} else if (context.getMethod().getAnnotation(javax.ws.rs.OPTIONS.class) != null) {
} else if (context.getMethod().getAnnotation(jakarta.ws.rs.OPTIONS.class) != null) {
return "OPTIONS";
} else if (context.getMethod().getAnnotation(javax.ws.rs.PATCH.class) != null) {
} else if (context.getMethod().getAnnotation(jakarta.ws.rs.PATCH.class) != null) {
return "PATCH";
}
return null;
Expand All @@ -128,8 +128,8 @@ private String getPath(InvocationContext context) {
* @return The value of the annotation or an empty string if it doesn't exist
*/
private String getPath(Class<?> clazz) {
if (clazz.getAnnotation(javax.ws.rs.Path.class) != null) {
return clazz.getAnnotation(javax.ws.rs.Path.class).value();
if (clazz.getAnnotation(jakarta.ws.rs.Path.class) != null) {
return clazz.getAnnotation(jakarta.ws.rs.Path.class).value();
}
return "";
}
Expand All @@ -140,8 +140,8 @@ private String getPath(Class<?> clazz) {
* @return The value of the annotation or an empty string if it doesn't exist
*/
private String getPath(Method method) {
if (method.getAnnotation(javax.ws.rs.Path.class) != null) {
return method.getAnnotation(javax.ws.rs.Path.class).value();
if (method.getAnnotation(jakarta.ws.rs.Path.class) != null) {
return method.getAnnotation(jakarta.ws.rs.Path.class).value();
}
return "";
}
Expand Down
6 changes: 3 additions & 3 deletions ...rc/main/java/software/uncharted/terarium/hmiserver/proxies/dataservice/ArtifactProxy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
import software.uncharted.terarium.hmiserver.models.dataservice.Artifact;
import software.uncharted.terarium.hmiserver.models.dataservice.dataset.PresignedURL;

import javax.ws.rs.*;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import jakarta.ws.rs.*;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
import java.util.List;

/**
Expand Down
6 changes: 3 additions & 3 deletions ...src/main/java/software/uncharted/terarium/hmiserver/proxies/dataservice/ConceptProxy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@

import java.util.List;

import javax.ws.rs.*;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import jakarta.ws.rs.*;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;

@RegisterRestClient(configKey = "data-service")
@Path("/concepts")
Expand Down
6 changes: 3 additions & 3 deletions ...src/main/java/software/uncharted/terarium/hmiserver/proxies/dataservice/DatasetProxy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
import software.uncharted.terarium.hmiserver.models.dataservice.dataset.Dataset;
import software.uncharted.terarium.hmiserver.models.dataservice.dataset.PresignedURL;

import javax.ws.rs.*;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import jakarta.ws.rs.*;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
import java.util.List;

@RegisterRestClient(configKey = "data-service")
Expand Down
6 changes: 3 additions & 3 deletions ...rc/main/java/software/uncharted/terarium/hmiserver/proxies/dataservice/ExternalProxy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
import software.uncharted.terarium.hmiserver.models.dataservice.DocumentAsset;
import software.uncharted.terarium.hmiserver.models.dataservice.Software;

import javax.ws.rs.*;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import jakarta.ws.rs.*;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;

@RegisterRestClient(configKey = "data-service")
@Path("/external")
Expand Down
6 changes: 3 additions & 3 deletions ...va/software/uncharted/terarium/hmiserver/proxies/dataservice/ModelConfigurationProxy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
import software.uncharted.terarium.hmiserver.models.dataservice.Model;
import com.fasterxml.jackson.databind.JsonNode;

import javax.ws.rs.*;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import jakarta.ws.rs.*;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;

@RegisterRestClient(configKey = "data-service")
@Path("/model_configurations")
Expand Down
6 changes: 3 additions & 3 deletions ...r/src/main/java/software/uncharted/terarium/hmiserver/proxies/dataservice/ModelProxy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
import software.uncharted.terarium.hmiserver.models.dataservice.ModelOperationCopy;
import software.uncharted.terarium.hmiserver.models.dataservice.ModelConfiguration;

import javax.ws.rs.*;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import jakarta.ws.rs.*;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
import java.util.Map;
import java.util.List;

Expand Down
6 changes: 3 additions & 3 deletions .../src/main/java/software/uncharted/terarium/hmiserver/proxies/dataservice/PersonProxy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
import software.uncharted.terarium.hmiserver.models.dataservice.Association;
import software.uncharted.terarium.hmiserver.models.dataservice.Person;

import javax.ws.rs.*;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import jakarta.ws.rs.*;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;

@RegisterRestClient(configKey = "data-service")
@Path("/persons")
Expand Down
6 changes: 3 additions & 3 deletions ...src/main/java/software/uncharted/terarium/hmiserver/proxies/dataservice/ProjectProxy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
import software.uncharted.terarium.hmiserver.models.dataservice.Project;
import software.uncharted.terarium.hmiserver.models.dataservice.ResourceType;

import javax.ws.rs.*;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import jakarta.ws.rs.*;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
import java.util.*;


Expand Down
6 changes: 3 additions & 3 deletions .../main/java/software/uncharted/terarium/hmiserver/proxies/dataservice/ProvenanceProxy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
import software.uncharted.terarium.hmiserver.models.dataservice.Provenance;
import software.uncharted.terarium.hmiserver.models.dataservice.ProvenanceQueryParam;

import javax.ws.rs.*;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import jakarta.ws.rs.*;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;

@RegisterRestClient(configKey = "data-service")
@Path("/provenance")
Expand Down
4 changes: 2 additions & 2 deletions .../main/java/software/uncharted/terarium/hmiserver/proxies/dataservice/SimulationProxy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
import software.uncharted.terarium.hmiserver.models.dataservice.PresignedURL;
import software.uncharted.terarium.hmiserver.models.dataservice.dataset.Dataset;

import javax.ws.rs.*;
import javax.ws.rs.core.MediaType;
import jakarta.ws.rs.*;
import jakarta.ws.rs.core.MediaType;

@RegisterRestClient(configKey = "data-service")
@Path("/simulations")
Expand Down
6 changes: 3 additions & 3 deletions ...rc/main/java/software/uncharted/terarium/hmiserver/proxies/dataservice/WorkflowProxy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
import software.uncharted.terarium.hmiserver.exceptions.HmiResponseExceptionMapper;

import javax.ws.rs.*;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import jakarta.ws.rs.*;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
import java.util.*;

@RegisterRestClient(configKey = "data-service")
Expand Down
4 changes: 2 additions & 2 deletions ...ain/java/software/uncharted/terarium/hmiserver/proxies/documentservice/DocumentProxy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
import software.uncharted.terarium.hmiserver.exceptions.HmiResponseExceptionMapper;
import software.uncharted.terarium.hmiserver.resources.documentservice.responses.*;

import javax.ws.rs.*;
import javax.ws.rs.core.MediaType;
import jakarta.ws.rs.*;
import jakarta.ws.rs.core.MediaType;

@RegisterRestClient(configKey = "xdd-dev-service")
@Produces(MediaType.APPLICATION_JSON)
Expand Down
12 changes: 6 additions & 6 deletions ...ain/java/software/uncharted/terarium/hmiserver/proxies/documentservice/ESSearchProxy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
import software.uncharted.terarium.hmiserver.annotations.LogRestClientTime;
import software.uncharted.terarium.hmiserver.exceptions.HmiResponseExceptionMapper;

import javax.ws.rs.HeaderParam;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import jakarta.ws.rs.HeaderParam;
import jakarta.ws.rs.POST;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.Produces;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;

/**
* This is a temporary proxy as currently the ES endpoint is just on xDD's development
Expand Down
4 changes: 2 additions & 2 deletions ...n/java/software/uncharted/terarium/hmiserver/proxies/documentservice/ExtractionProxy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
import software.uncharted.terarium.hmiserver.resources.documentservice.responses.XDDExtractionsResponseOK;
import software.uncharted.terarium.hmiserver.resources.documentservice.responses.XDDResponse;

import javax.ws.rs.*;
import javax.ws.rs.core.MediaType;
import jakarta.ws.rs.*;
import jakarta.ws.rs.core.MediaType;

@RegisterRestClient(configKey = "xdd-document-service")
@Produces(MediaType.APPLICATION_JSON)
Expand Down
6 changes: 3 additions & 3 deletions ...ftware/uncharted/terarium/hmiserver/proxies/extractionservice/ExtractionServiceProxy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
import org.eclipse.microprofile.openapi.annotations.tags.Tag;
import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
import javax.ws.rs.core.MediaType;
import jakarta.ws.rs.core.MediaType;
import software.uncharted.terarium.hmiserver.exceptions.HmiResponseExceptionMapper;
import software.uncharted.terarium.hmiserver.models.extractionservice.ExtractionResponse;

import java.util.List;
import java.util.Map;

import javax.ws.rs.*;
import javax.ws.rs.core.Response;
import jakarta.ws.rs.*;
import jakarta.ws.rs.core.Response;

@RegisterRestClient(configKey = "extraction-service-api")
@Produces(MediaType.APPLICATION_JSON)
Expand Down
6 changes: 3 additions & 3 deletions ...erver/src/main/java/software/uncharted/terarium/hmiserver/proxies/github/GithubProxy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
import software.uncharted.terarium.hmiserver.annotations.LogRestClientTime;
import software.uncharted.terarium.hmiserver.models.code.GithubFile;

import javax.ws.rs.*;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import jakarta.ws.rs.*;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.Path;
import java.util.List;

@RegisterRestClient(configKey = "github")
Expand Down
Loading