This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit 08f3e38f41711e17855836287225842f101e8bd7 Author: Otavio Rodolfo Piske <[email protected]> AuthorDate: Tue Jun 15 14:54:26 2021 +0200 (chores) Avoid leaking resources during test execution --- .../quarkus/it/knative/source/KnativeSourceApplication.java | 13 ++++++++----- .../quarkus/it/knative/source/KnativeSourceApplication.java | 13 ++++++++----- .../quarkus/it/knative/source/KnativeSourceApplication.java | 13 ++++++++----- .../quarkus/it/knative/source/KnativeSourceApplication.java | 13 ++++++++----- .../quarkus/it/knative/source/KnativeSourceApplication.java | 13 ++++++++----- .../org/apache/camel/k/quarkus/it/webhook/Application.java | 4 +--- .../apache/camel/k/runtime/support/RuntimeInspector.java | 7 +++++-- 7 files changed, 46 insertions(+), 30 deletions(-) diff --git a/itests/camel-k-itests-knative-source-groovy/src/main/java/org/apache/camel/k/quarkus/it/knative/source/KnativeSourceApplication.java b/itests/camel-k-itests-knative-source-groovy/src/main/java/org/apache/camel/k/quarkus/it/knative/source/KnativeSourceApplication.java index 57bfa05..fce37ef 100644 --- a/itests/camel-k-itests-knative-source-groovy/src/main/java/org/apache/camel/k/quarkus/it/knative/source/KnativeSourceApplication.java +++ b/itests/camel-k-itests-knative-source-groovy/src/main/java/org/apache/camel/k/quarkus/it/knative/source/KnativeSourceApplication.java @@ -16,6 +16,7 @@ */ package org.apache.camel.k.quarkus.it.knative.source; +import java.io.IOException; import java.util.List; import java.util.Locale; import java.util.Objects; @@ -36,6 +37,7 @@ import javax.ws.rs.core.Response; import io.quarkus.arc.Unremovable; import org.apache.camel.CamelContext; +import org.apache.camel.FluentProducerTemplate; import org.apache.camel.component.knative.spi.Knative; import org.apache.camel.component.knative.spi.KnativeEnvironment; import org.apache.camel.model.ModelCamelContext; @@ -79,11 +81,12 @@ public class KnativeSourceApplication { @POST @Path("/send") @Produces(MediaType.TEXT_PLAIN) - public void send(String data) { - context.createFluentProducerTemplate() - .to("direct:start") - .withHeader("MyHeader", data) - .send(); + public void send(String data) throws IOException { + try (FluentProducerTemplate template = context.createFluentProducerTemplate()){ + template.to("direct:start") + .withHeader("MyHeader", data) + .send(); + } } @GET diff --git a/itests/camel-k-itests-knative-source-java/src/main/java/org/apache/camel/k/quarkus/it/knative/source/KnativeSourceApplication.java b/itests/camel-k-itests-knative-source-java/src/main/java/org/apache/camel/k/quarkus/it/knative/source/KnativeSourceApplication.java index 57bfa05..334cdbf 100644 --- a/itests/camel-k-itests-knative-source-java/src/main/java/org/apache/camel/k/quarkus/it/knative/source/KnativeSourceApplication.java +++ b/itests/camel-k-itests-knative-source-java/src/main/java/org/apache/camel/k/quarkus/it/knative/source/KnativeSourceApplication.java @@ -16,6 +16,7 @@ */ package org.apache.camel.k.quarkus.it.knative.source; +import java.io.IOException; import java.util.List; import java.util.Locale; import java.util.Objects; @@ -36,6 +37,7 @@ import javax.ws.rs.core.Response; import io.quarkus.arc.Unremovable; import org.apache.camel.CamelContext; +import org.apache.camel.FluentProducerTemplate; import org.apache.camel.component.knative.spi.Knative; import org.apache.camel.component.knative.spi.KnativeEnvironment; import org.apache.camel.model.ModelCamelContext; @@ -79,11 +81,12 @@ public class KnativeSourceApplication { @POST @Path("/send") @Produces(MediaType.TEXT_PLAIN) - public void send(String data) { - context.createFluentProducerTemplate() - .to("direct:start") - .withHeader("MyHeader", data) - .send(); + public void send(String data) throws IOException { + try (FluentProducerTemplate template = context.createFluentProducerTemplate()) { + template.to("direct:start") + .withHeader("MyHeader", data) + .send(); + } } @GET diff --git a/itests/camel-k-itests-knative-source-js/src/main/java/org/apache/camel/k/quarkus/it/knative/source/KnativeSourceApplication.java b/itests/camel-k-itests-knative-source-js/src/main/java/org/apache/camel/k/quarkus/it/knative/source/KnativeSourceApplication.java index 57bfa05..334cdbf 100644 --- a/itests/camel-k-itests-knative-source-js/src/main/java/org/apache/camel/k/quarkus/it/knative/source/KnativeSourceApplication.java +++ b/itests/camel-k-itests-knative-source-js/src/main/java/org/apache/camel/k/quarkus/it/knative/source/KnativeSourceApplication.java @@ -16,6 +16,7 @@ */ package org.apache.camel.k.quarkus.it.knative.source; +import java.io.IOException; import java.util.List; import java.util.Locale; import java.util.Objects; @@ -36,6 +37,7 @@ import javax.ws.rs.core.Response; import io.quarkus.arc.Unremovable; import org.apache.camel.CamelContext; +import org.apache.camel.FluentProducerTemplate; import org.apache.camel.component.knative.spi.Knative; import org.apache.camel.component.knative.spi.KnativeEnvironment; import org.apache.camel.model.ModelCamelContext; @@ -79,11 +81,12 @@ public class KnativeSourceApplication { @POST @Path("/send") @Produces(MediaType.TEXT_PLAIN) - public void send(String data) { - context.createFluentProducerTemplate() - .to("direct:start") - .withHeader("MyHeader", data) - .send(); + public void send(String data) throws IOException { + try (FluentProducerTemplate template = context.createFluentProducerTemplate()) { + template.to("direct:start") + .withHeader("MyHeader", data) + .send(); + } } @GET diff --git a/itests/camel-k-itests-knative-source-xml/src/main/java/org/apache/camel/k/quarkus/it/knative/source/KnativeSourceApplication.java b/itests/camel-k-itests-knative-source-xml/src/main/java/org/apache/camel/k/quarkus/it/knative/source/KnativeSourceApplication.java index 57bfa05..334cdbf 100644 --- a/itests/camel-k-itests-knative-source-xml/src/main/java/org/apache/camel/k/quarkus/it/knative/source/KnativeSourceApplication.java +++ b/itests/camel-k-itests-knative-source-xml/src/main/java/org/apache/camel/k/quarkus/it/knative/source/KnativeSourceApplication.java @@ -16,6 +16,7 @@ */ package org.apache.camel.k.quarkus.it.knative.source; +import java.io.IOException; import java.util.List; import java.util.Locale; import java.util.Objects; @@ -36,6 +37,7 @@ import javax.ws.rs.core.Response; import io.quarkus.arc.Unremovable; import org.apache.camel.CamelContext; +import org.apache.camel.FluentProducerTemplate; import org.apache.camel.component.knative.spi.Knative; import org.apache.camel.component.knative.spi.KnativeEnvironment; import org.apache.camel.model.ModelCamelContext; @@ -79,11 +81,12 @@ public class KnativeSourceApplication { @POST @Path("/send") @Produces(MediaType.TEXT_PLAIN) - public void send(String data) { - context.createFluentProducerTemplate() - .to("direct:start") - .withHeader("MyHeader", data) - .send(); + public void send(String data) throws IOException { + try (FluentProducerTemplate template = context.createFluentProducerTemplate()) { + template.to("direct:start") + .withHeader("MyHeader", data) + .send(); + } } @GET diff --git a/itests/camel-k-itests-knative-source-yaml/src/main/java/org/apache/camel/k/quarkus/it/knative/source/KnativeSourceApplication.java b/itests/camel-k-itests-knative-source-yaml/src/main/java/org/apache/camel/k/quarkus/it/knative/source/KnativeSourceApplication.java index 57bfa05..334cdbf 100644 --- a/itests/camel-k-itests-knative-source-yaml/src/main/java/org/apache/camel/k/quarkus/it/knative/source/KnativeSourceApplication.java +++ b/itests/camel-k-itests-knative-source-yaml/src/main/java/org/apache/camel/k/quarkus/it/knative/source/KnativeSourceApplication.java @@ -16,6 +16,7 @@ */ package org.apache.camel.k.quarkus.it.knative.source; +import java.io.IOException; import java.util.List; import java.util.Locale; import java.util.Objects; @@ -36,6 +37,7 @@ import javax.ws.rs.core.Response; import io.quarkus.arc.Unremovable; import org.apache.camel.CamelContext; +import org.apache.camel.FluentProducerTemplate; import org.apache.camel.component.knative.spi.Knative; import org.apache.camel.component.knative.spi.KnativeEnvironment; import org.apache.camel.model.ModelCamelContext; @@ -79,11 +81,12 @@ public class KnativeSourceApplication { @POST @Path("/send") @Produces(MediaType.TEXT_PLAIN) - public void send(String data) { - context.createFluentProducerTemplate() - .to("direct:start") - .withHeader("MyHeader", data) - .send(); + public void send(String data) throws IOException { + try (FluentProducerTemplate template = context.createFluentProducerTemplate()) { + template.to("direct:start") + .withHeader("MyHeader", data) + .send(); + } } @GET diff --git a/itests/camel-k-itests-webhook/src/main/java/org/apache/camel/k/quarkus/it/webhook/Application.java b/itests/camel-k-itests-webhook/src/main/java/org/apache/camel/k/quarkus/it/webhook/Application.java index b24e251..5d7fa44 100644 --- a/itests/camel-k-itests-webhook/src/main/java/org/apache/camel/k/quarkus/it/webhook/Application.java +++ b/itests/camel-k-itests-webhook/src/main/java/org/apache/camel/k/quarkus/it/webhook/Application.java @@ -63,9 +63,7 @@ public class Application { @POST @Path("/load") public Response load(String code) { - final YamlRoutesBuilderLoader loader = new YamlRoutesBuilderLoader(); - - try { + try (YamlRoutesBuilderLoader loader = new YamlRoutesBuilderLoader()) { runtime.getCamelContext().addRoutes( loader.loadRoutesBuilder(ResourceHelper.fromBytes("my-webhook.yaml", code.getBytes(StandardCharsets.UTF_8))) ); diff --git a/support/camel-k-itests-support/camel-k-itests-runtime-inspector/src/main/java/org/apache/camel/k/runtime/support/RuntimeInspector.java b/support/camel-k-itests-support/camel-k-itests-runtime-inspector/src/main/java/org/apache/camel/k/runtime/support/RuntimeInspector.java index 2022832..68af219 100644 --- a/support/camel-k-itests-support/camel-k-itests-runtime-inspector/src/main/java/org/apache/camel/k/runtime/support/RuntimeInspector.java +++ b/support/camel-k-itests-support/camel-k-itests-runtime-inspector/src/main/java/org/apache/camel/k/runtime/support/RuntimeInspector.java @@ -25,6 +25,7 @@ import javax.inject.Inject; import javax.json.Json; import javax.json.JsonArray; import javax.json.JsonObject; +import javax.json.bind.Jsonb; import javax.json.bind.JsonbBuilder; import javax.ws.rs.GET; import javax.ws.rs.Path; @@ -80,13 +81,15 @@ public class RuntimeInspector { @GET @Path("/registry/beans/{name}") @Produces(MediaType.APPLICATION_JSON) - public String bean(@PathParam("name") String name) { + public String bean(@PathParam("name") String name) throws Exception { Object bean = camelContext.getRegistry().lookupByName(name); if (bean == null) { throw new IllegalArgumentException("Bean with name: " + name + " not found"); } - return JsonbBuilder.create().toJson(bean); + try (Jsonb jsonb = JsonbBuilder.create()) { + return jsonb.toJson(bean); + } } @GET
