Quarkus3 upgrade

README.md

@@ -34,6 +34,25 @@ You can run it with the following command:
 
 `docker run --rm -d -p 8081:8081 kaotoio/backend`
 
+If you want to use it with Kaoto-ui, don't forget to set CORS origins via QUARKUS_HTTP_CORS_ORIGINS env, e.g.:
+
+`docker run --rm -d -p 8081:8081 -e QUARKUS_HTTP_CORS_ORIGINS='http://localhost:1337' kaotoio/backend`
+
+### Using OpenTelemetry tracing
+
+Kaoto-backend provides OpenTelemetry tracing. By default, OpenTelemetry SDK Autoconfigure is disabled.
+It can be enabled by `quarkus.otel.sdk.disabled=false` 
+Note that after that, the OTLP Exporter (e.g. Jaeger) is expected on `http://localhost:4317/` but the endpoint can be overridden via `quarkus.otel.exporter.otlp.traces.endpoint` configuration property.
+For more information and all configuration properties, see [Quarkus OpenTelemetry guide](https://quarkus.io/guides/opentelemetry)
+
+### CORS
+
+[CORS filter](https://quarkus.io/guides/http-reference#cors-filter) is enabled by default.
+For proper functionality with the Kaoto-ui, it is necessary to set `quarkus.http.cors.origins` configuration property with Kaoto-ui URL(s).
+For more information and all configuration properties, see [Quarkus HTTP Reference](https://quarkus.io/guides/http-reference#quarkus-vertx-http-config-group-cors-cors-config_configuration)
+
+Note: When you run Kaoto-backend in the dev mode, all origins are accepted.
+
 ## Developing Kaoto
 
 Developer documentation is on https://kaotoio.github.io/kaoto-backend/

api/src/main/docker/Dockerfile.native

@@ -1,9 +1,9 @@
 # First stage - install the dependencies in an intermediate container
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.5 as BUILD
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.6 as BUILD
 RUN microdnf install curl
 
 # Second stage - copy the dependencies
-FROM quay.io/quarkus/quarkus-micro-image:1.0
+FROM quay.io/quarkus/quarkus-micro-image:2.0
 ENV NAMESPACE='default'
 ENV CATALOG_NAMESPACE=''
 

api/src/main/java/io/kaoto/backend/api/resource/v1/CapabilitiesResource.java

@@ -9,14 +9,14 @@
 import org.jboss.logging.Logger;
 import org.jboss.resteasy.reactive.server.ServerExceptionMapper;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 
 /**
  * 🐱class CapabilitiesResource

api/src/main/java/io/kaoto/backend/api/resource/v1/DeploymentsResource.java

@@ -16,24 +16,25 @@
 import org.jboss.logging.Logger;
 import org.jboss.resteasy.reactive.NoCache;
 import org.jboss.resteasy.reactive.server.ServerExceptionMapper;
+import org.yaml.snakeyaml.LoaderOptions;
 import org.yaml.snakeyaml.Yaml;
 import org.yaml.snakeyaml.constructor.Constructor;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
-import javax.validation.constraints.NotNull;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.NotFoundException;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Instance;
+import jakarta.inject.Inject;
+import jakarta.validation.constraints.NotNull;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.NotFoundException;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 import java.util.List;
 
 /**
@@ -167,7 +168,8 @@ public String resource(
             for (Class<? extends CustomResource> c
                     : parser.supportedCustomResources()) {
                 try {
-                    Yaml yaml = new Yaml(new Constructor(c), new KameletRepresenter());
+                    Yaml yaml = new Yaml(new Constructor(c, new LoaderOptions()),
+                            new KameletRepresenter());
                     return yaml.dumpAsMap(cr);
                 } catch (Exception e) {
                     log.trace("We tried to parse with " + c.getName() + " and"

api/src/main/java/io/kaoto/backend/api/resource/v1/IntegrationsResource.java

@@ -11,16 +11,16 @@
 import org.jboss.logging.Logger;
 import org.jboss.resteasy.reactive.server.ServerExceptionMapper;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Instance;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 import java.util.ArrayList;
 import java.util.List;
 

api/src/main/java/io/kaoto/backend/api/resource/v1/StepResource.java

@@ -18,15 +18,15 @@
 import org.eclipse.microprofile.openapi.annotations.parameters.Parameter;
 import org.jboss.resteasy.reactive.server.ServerExceptionMapper;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Comparator;

api/src/main/java/io/kaoto/backend/api/resource/v1/ViewDefinitionResource.java

@@ -12,14 +12,14 @@
 import org.jboss.logging.Logger;
 import org.jboss.resteasy.reactive.server.ServerExceptionMapper;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import javax.ws.rs.Consumes;
-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.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.Consumes;
+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;
 import java.util.List;
 
 /**

api/src/main/java/io/kaoto/backend/api/resource/v2/IntegrationsResource.java

@@ -13,16 +13,16 @@
 import org.jboss.logging.Logger;
 import org.jboss.resteasy.reactive.server.ServerExceptionMapper;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Instance;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;

api/src/main/java/io/kaoto/backend/api/service/deployment/DeploymentService.java

@@ -4,12 +4,12 @@
 import io.kaoto.backend.api.service.dsl.DSLSpecification;
 import io.kaoto.backend.api.service.step.parser.StepParserService;
 import io.kaoto.backend.model.step.Step;
-import io.opentelemetry.extension.annotations.WithSpan;
+import io.opentelemetry.instrumentation.annotations.WithSpan;
 import org.jboss.logging.Logger;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Instance;
+import jakarta.inject.Inject;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;

api/src/main/java/io/kaoto/backend/api/service/language/LanguageService.java

@@ -1,12 +1,12 @@
 package io.kaoto.backend.api.service.language;
 
 import io.kaoto.backend.api.service.dsl.DSLSpecification;
-import io.opentelemetry.extension.annotations.WithSpan;
+import io.opentelemetry.instrumentation.annotations.WithSpan;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Instance;
+import jakarta.inject.Inject;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;

api/src/main/java/io/kaoto/backend/api/service/step/StepService.java

@@ -2,11 +2,11 @@
 
 import io.kaoto.backend.api.metadata.catalog.StepCatalog;
 import io.kaoto.backend.model.step.Step;
-import io.opentelemetry.extension.annotations.SpanAttribute;
-import io.opentelemetry.extension.annotations.WithSpan;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import io.opentelemetry.instrumentation.annotations.SpanAttribute;
+import io.opentelemetry.instrumentation.annotations.WithSpan;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 import java.util.Collection;
 /**
  *

api/src/main/java/io/kaoto/backend/api/service/viewdefinition/ViewDefinitionService.java

@@ -3,12 +3,12 @@
 import io.kaoto.backend.api.service.viewdefinition.parser.ViewDefinitionParserService;
 import io.kaoto.backend.model.step.Step;
 import io.kaoto.backend.model.view.ViewDefinition;
-import io.opentelemetry.extension.annotations.WithSpan;
+import io.opentelemetry.instrumentation.annotations.WithSpan;
 import org.jboss.logging.Logger;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Instance;
+import jakarta.inject.Inject;
 import java.util.ArrayList;
 import java.util.List;
 

api/src/main/java/io/kaoto/backend/api/service/viewdefinition/parser/GenericViewDefinitionParserService.java

@@ -6,8 +6,8 @@
 import io.kaoto.backend.model.view.ViewDefinition;
 import io.kaoto.backend.model.view.ViewDefinitionConstraint;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;

api/src/main/resources/application.yaml

@@ -1,4 +1,9 @@
 "%dev":
+  quarkus:
+    http:
+      cors:
+        # allows all origins during dev mode
+        origins: /.*/
   repository:
     step:
       jar:
@@ -53,3 +58,7 @@ quarkus:
         class: org.quartz.plugins.history.LoggingJobHistoryPlugin
         properties:
           jobSuccessMessage: "Job [{1}.{0}] execution complete and reports: {8}"
+  # disable OpenTelemetry SDK Autoconfigure by default
+  otel:
+    sdk:
+      disabled: true

api/src/test/java/io/kaoto/backend/api/metadata/catalog/CatalogSanityChecks.java

@@ -5,7 +5,7 @@
 
 import org.assertj.core.api.SoftAssertions;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import java.util.Collection;
 import java.util.Set;

api/src/test/java/io/kaoto/backend/api/metadata/catalog/CatalogWarmingUpExceptionTest.java

@@ -4,7 +4,7 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 @QuarkusTest
 class CatalogWarmingUpExceptionTest {

api/src/test/java/io/kaoto/backend/api/resource/v1/CapabilitiesResourceTest.java

@@ -10,8 +10,8 @@
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 import java.io.IOException;
 import java.util.Objects;
 import java.util.stream.Stream;

api/src/test/java/io/kaoto/backend/api/resource/v1/DeploymentsResourceTest.java

@@ -3,7 +3,7 @@
 import io.kaoto.backend.api.metadata.catalog.StepCatalog;
 import io.quarkus.test.junit.QuarkusTest;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 
 @QuarkusTest

api/src/test/java/io/kaoto/backend/api/resource/v1/DeploymentsResourceTestAbstract.java

@@ -12,7 +12,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.nio.file.Files;

api/src/test/java/io/kaoto/backend/api/resource/v1/IntegrationsResourceTest.java

@@ -3,7 +3,7 @@
 import io.kaoto.backend.api.metadata.catalog.StepCatalog;
 import io.quarkus.test.junit.QuarkusTest;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 @QuarkusTest
 public class IntegrationsResourceTest extends IntegrationsResourceTestAbstract {

api/src/test/java/io/kaoto/backend/api/resource/v1/IntegrationsResourceTestAbstract.java

@@ -8,10 +8,11 @@
 import io.quarkus.test.junit.QuarkusTest;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.yaml.snakeyaml.LoaderOptions;
 import org.yaml.snakeyaml.Yaml;
 import org.yaml.snakeyaml.constructor.Constructor;
 
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.net.URISyntaxException;
@@ -173,7 +174,7 @@ void newBranchStep() throws Exception {
                 .then()
                 .statusCode(Response.Status.OK.getStatusCode());
         Yaml yaml = new Yaml(
-                new Constructor(KameletBinding.class),
+                new Constructor(KameletBinding.class,new LoaderOptions()),
                 new KameletRepresenter());
         yaml.parse(new InputStreamReader(res.extract().body().asInputStream()));
     }