Skip to content

Commit 14f48ad

Browse files
author
Vincent Potucek
committed
fix
1 parent 709485f commit 14f48ad

File tree

22 files changed

+50
-140
lines changed

22 files changed

+50
-140
lines changed

‎core/deployment/src/main/java/io/quarkus/deployment/QuarkusAugmentor.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,17 +97,16 @@ public BuildResult run() throws Exception {
9797
long start = System.nanoTime();
9898
log.debug("Beginning Quarkus augmentation");
9999
ClassLoader originalClassLoader = Thread.currentThread().getContextClassLoader();
100-
QuarkusBuildCloseablesBuildItem buildCloseables = new QuarkusBuildCloseablesBuildItem();
101-
try {
100+
try (QuarkusBuildCloseablesBuildItem buildCloseables = new QuarkusBuildCloseablesBuildItem()) {
102101
Thread.currentThread().setContextClassLoader(deploymentClassLoader);
103102

104103
final BuildChainBuilder chainBuilder = BuildChain.builder();
105104
chainBuilder.setClassLoader(deploymentClassLoader);
106105

107106
ExtensionLoader.loadStepsFrom(deploymentClassLoader,
108-
buildSystemProperties == null ? new Properties() : buildSystemProperties,
109-
runtimeProperties == null ? new Properties() : runtimeProperties,
110-
effectiveModel, launchMode, devModeType)
107+
buildSystemProperties == null ? new Properties() : buildSystemProperties,
108+
runtimeProperties == null ? new Properties() : runtimeProperties,
109+
effectiveModel, launchMode, devModeType)
111110
.accept(chainBuilder);
112111

113112
Thread.currentThread().setContextClassLoader(classLoader);
@@ -184,7 +183,6 @@ public BuildResult run() throws Exception {
184183

185184
}
186185
Thread.currentThread().setContextClassLoader(originalClassLoader);
187-
buildCloseables.close();
188186
}
189187
}
190188

‎devtools/maven/src/main/java/io/quarkus/maven/components/Prompter.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,10 @@ public void collectInput() throws IOException {
4848
return;
4949
}
5050
final TerminalConnection connection = new TerminalConnection();
51-
connection.setSignalHandler(interruptionSignalHandler());
52-
try {
51+
try (connection) {
52+
connection.setSignalHandler(interruptionSignalHandler());
5353
read(connection, ReadlineBuilder.builder().enableHistory(false).build(), prompts.iterator());
5454
connection.openBlocking();
55-
} finally {
56-
connection.close();
5755
}
5856
}
5957

‎extensions/mailer/runtime/src/test/java/io/quarkus/mailer/runtime/SocketUtil.java

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,11 @@ private SocketUtil() {
99
}
1010

1111
static int findAvailablePort() {
12-
ServerSocket serverSocket = null;
13-
try {
14-
serverSocket = new ServerSocket(0);
12+
try (ServerSocket serverSocket = new ServerSocket(0)) {
1513
return serverSocket.getLocalPort();
1614
} catch (Exception e) {
1715
// return a default port
1816
return 25347;
19-
} finally {
20-
if (serverSocket != null) {
21-
try {
22-
serverSocket.close();
23-
} catch (IOException e) {
24-
}
25-
}
2617
}
2718
}
2819
}

‎extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/cdi/WithSpanInterceptor.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -147,18 +147,13 @@ public void accept(Object o, Throwable throwable) {
147147
});
148148
} else {
149149
final Context currentSpanContext = instrumenter.start(parentContext, methodRequest);
150-
final Scope currentScope = currentSpanContext.makeCurrent();
151-
try {
150+
try (Scope currentScope = currentSpanContext.makeCurrent()) {
152151
Object result = invocationContext.proceed();
153152
instrumenter.end(currentSpanContext, methodRequest, null, null);
154153
return result;
155154
} catch (Throwable t) {
156155
instrumenter.end(currentSpanContext, methodRequest, null, t);
157156
throw t;
158-
} finally {
159-
if (currentScope != null) {
160-
currentScope.close();
161-
}
162157
}
163158
}
164159
}

‎extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/intrumentation/restclient/OpenTelemetryClientFilter.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -122,20 +122,19 @@ private static io.vertx.core.Context getVertxContext(final ClientRequestContext
122122
@Override
123123
public void filter(final ClientRequestContext request, final ClientResponseContext response) {
124124
Scope scope = (Scope) request.getProperty(REST_CLIENT_OTEL_SPAN_CLIENT_SCOPE);
125-
if (scope == null) {
126-
return;
127-
}
128125

129-
Context spanContext = (Context) request.getProperty(REST_CLIENT_OTEL_SPAN_CLIENT_CONTEXT);
130-
try {
126+
try (scope) {
127+
if (scope == null) {
128+
return;
129+
}
130+
Context spanContext = (Context) request.getProperty(REST_CLIENT_OTEL_SPAN_CLIENT_CONTEXT);
131131
String pathTemplate = (String) request.getProperty(URL_PATH_TEMPLATE_KEY);
132132
if (pathTemplate != null && !pathTemplate.isEmpty()) {
133133
Span.fromContext(spanContext)
134134
.updateName(request.getMethod() + " " + pathTemplate);
135135
}
136136
instrumenter.end(spanContext, request, response, null);
137137
} finally {
138-
scope.close();
139138

140139
request.removeProperty(REST_CLIENT_OTEL_SPAN_CLIENT_CONTEXT);
141140
request.removeProperty(REST_CLIENT_OTEL_SPAN_CLIENT_PARENT_CONTEXT);

‎extensions/quartz/runtime/src/main/java/io/quarkus/quartz/runtime/jdbc/DBDelegateUtils.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,8 @@ static Object getObjectFromInput(InputStream binaryInput) throws ClassNotFoundEx
1616
}
1717
// use an instance of the QuarkusObjectInputStream class instead of the ObjectInputStream when deserializing
1818
// to workaround a CNFE in test and dev mode.
19-
ObjectInputStream in = new QuarkusObjectInputStream(binaryInput);
20-
try {
19+
try (ObjectInputStream in = new QuarkusObjectInputStream(binaryInput)) {
2120
return in.readObject();
22-
} finally {
23-
in.close();
2421
}
2522
}
2623
}

‎extensions/resteasy-reactive/rest/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/MediaTypeNegotiationClientQualityTest.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,14 +99,11 @@ private String generateURL() {
9999
public void testClientQuality() throws Exception {
100100
Invocation.Builder request = client.target(generateURL()).path("echo").request("application/x;q=0.7",
101101
"application/y;q=0.9");
102-
Response response = request.get();
103-
try {
102+
try (Response response = request.get()) {
104103
Assertions.assertEquals(Status.OK.getStatusCode(), response.getStatus());
105104
MediaType mediaType = response.getMediaType();
106105
Assertions.assertEquals(mediaType.getType(), "application");
107106
Assertions.assertEquals(mediaType.getSubtype(), "y");
108-
} finally {
109-
response.close();
110107
}
111108
}
112109
}

‎extensions/resteasy-reactive/rest/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/MediaTypeNegotiationServerQualityTest.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,14 +110,11 @@ private String generateURL() {
110110
@DisplayName("Test Server Quality")
111111
public void testServerQuality() throws Exception {
112112
Invocation.Builder request = client.target(generateURL()).path("foo/echo").request("application/x;", "text/y");
113-
Response response = request.get();
114-
try {
113+
try (Response response = request.get()) {
115114
Assertions.assertEquals(Status.NOT_FOUND.getStatusCode(), response.getStatus());
116115
MediaType mediaType = response.getMediaType();
117116
Assertions.assertEquals("text", mediaType.getType());
118117
Assertions.assertEquals("y", mediaType.getSubtype());
119-
} finally {
120-
response.close();
121118
}
122119
}
123120
}

‎extensions/resteasy-reactive/rest/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/UriInfoTest.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -151,11 +151,8 @@ public void testRelativize() throws Exception {
151151
}
152152

153153
private static void basicTest(String path, String testName) throws Exception {
154-
Response response = client.target(PortProviderUtil.generateURL("/" + testName + path)).request().get();
155-
try {
154+
try (Response response = client.target(PortProviderUtil.generateURL("/" + testName + path)).request().get()) {
156155
Assertions.assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
157-
} finally {
158-
response.close();
159156
}
160157
}
161158

‎extensions/websockets/server/deployment/src/test/java/io/quarkus/websockets/test/WebsocketRootPathTestCase.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ public void testHttpRootPath() throws Exception {
4343

4444
LinkedBlockingDeque<String> message = new LinkedBlockingDeque<>();
4545
LinkedBlockingDeque<String> pongMessages = new LinkedBlockingDeque<>();
46-
Session session = ContainerProvider.getWebSocketContainer().connectToServer(new Endpoint() {
46+
47+
try (Session session = ContainerProvider.getWebSocketContainer().connectToServer(new Endpoint() {
4748
@Override
4849
public void onOpen(Session session, EndpointConfig endpointConfig) {
4950
session.addMessageHandler(new MessageHandler.Whole<String>() {
@@ -68,14 +69,10 @@ public void onMessage(PongMessage s) {
6869
throw new RuntimeException(e);
6970
}
7071
}
71-
}, ClientEndpointConfig.Builder.create().build(), echoUri);
72-
73-
try {
72+
}, ClientEndpointConfig.Builder.create().build(), echoUri)) {
7473
Assertions.assertEquals("hello", message.poll(20, TimeUnit.SECONDS));
7574

7675
Assertions.assertEquals("PING", pongMessages.poll(20, TimeUnit.SECONDS));
77-
} finally {
78-
session.close();
7976
}
8077
}
8178
}

‎independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/runner/QuarkusEntryPoint.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,18 +84,15 @@ private static void doReaugment(Path appRoot) throws IOException, ClassNotFoundE
8484
Files.newInputStream(appRoot.resolve(LIB_DEPLOYMENT_DEPLOYMENT_CLASS_PATH_DAT)))) {
8585
List<String> paths = (List<String>) in.readObject();
8686
//yuck, should use runner class loader
87-
URLClassLoader loader = new URLClassLoader(paths.stream().map((s) -> {
87+
try (URLClassLoader loader = new URLClassLoader(paths.stream().map((s) -> {
8888
try {
8989
return appRoot.resolve(s).toUri().toURL();
9090
} catch (MalformedURLException e) {
9191
throw new RuntimeException(e);
9292
}
93-
}).toArray(URL[]::new));
94-
try {
93+
}).toArray(URL[]::new))) {
9594
loader.loadClass("io.quarkus.deployment.mutability.ReaugmentTask")
9695
.getDeclaredMethod("main", Path.class).invoke(null, appRoot);
97-
} finally {
98-
loader.close();
9996
}
10097
}
10198
}

‎independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/ReaderBodyHandler.java

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,13 @@ public boolean isWriteable(Class<?> type, Type genericType, Annotation[] annotat
2929

3030
public void writeTo(Reader inputStream, Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType,
3131
MultivaluedMap<String, Object> httpHeaders, OutputStream entityStream) throws IOException {
32-
try {
32+
try (inputStream) {
3333
int c;
3434
while ((c = inputStream.read()) != -1) {
3535
entityStream.write(c);
3636
}
37-
} finally {
38-
try {
39-
inputStream.close();
40-
} catch (IOException e) {
41-
// Drop the exception so we don't mask real IO errors
42-
}
37+
} catch (IOException e) {
38+
// Drop the exception so we don't mask real IO errors
4339
}
4440
}
4541
}

‎independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/MediaTypeNegotiationClientQualityTest.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,14 +98,11 @@ private String generateURL() {
9898
public void testClientQuality() throws Exception {
9999
Invocation.Builder request = client.target(generateURL()).path("echo").request("application/x;q=0.7",
100100
"application/y;q=0.9");
101-
Response response = request.get();
102-
try {
101+
try (Response response = request.get()) {
103102
Assertions.assertEquals(Status.OK.getStatusCode(), response.getStatus());
104103
MediaType mediaType = response.getMediaType();
105104
Assertions.assertEquals(mediaType.getType(), "application");
106105
Assertions.assertEquals(mediaType.getSubtype(), "y");
107-
} finally {
108-
response.close();
109106
}
110107
}
111108
}

‎independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/MediaTypeNegotiationServerQualityTest.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,14 +109,11 @@ private String generateURL() {
109109
@DisplayName("Test Server Quality")
110110
public void testServerQuality() throws Exception {
111111
Invocation.Builder request = client.target(generateURL()).path("foo/echo").request("application/x;", "text/y");
112-
Response response = request.get();
113-
try {
112+
try (Response response = request.get()) {
114113
Assertions.assertEquals(Status.NOT_FOUND.getStatusCode(), response.getStatus());
115114
MediaType mediaType = response.getMediaType();
116115
Assertions.assertEquals("text", mediaType.getType());
117116
Assertions.assertEquals("y", mediaType.getSubtype());
118-
} finally {
119-
response.close();
120117
}
121118
}
122119
}

‎independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/UriInfoTest.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -161,11 +161,8 @@ public void testResolve() throws Exception {
161161
}
162162

163163
private static void basicTest(String path, String testName) throws Exception {
164-
Response response = client.target(PortProviderUtil.generateURL("/" + testName + path)).request().get();
165-
try {
164+
try (Response response = client.target(PortProviderUtil.generateURL("/" + testName + path)).request().get()) {
166165
Assertions.assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
167-
} finally {
168-
response.close();
169166
}
170167
}
171168

‎integration-tests/kubernetes-client/src/test/java/io/quarkus/it/kubernetes/client/KubernetesClientTest.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,17 +56,12 @@ public void testInteractionWithAPIServer() {
5656

5757
@Test
5858
public void testEcKeyIsSupported() throws Exception {
59-
InputStream certInputStream = KubernetesClientTest.class.getResourceAsStream("/cert.pem");
60-
InputStream keyInputStream = KubernetesClientTest.class.getResourceAsStream("/private-key.pem");
6159

62-
try {
60+
try (InputStream certInputStream = KubernetesClientTest.class.getResourceAsStream("/cert.pem"); InputStream keyInputStream = KubernetesClientTest.class.getResourceAsStream("/private-key.pem")) {
6361
KeyStore keyStore = CertUtils.createKeyStore(certInputStream, keyInputStream, "EC", "eckey".toCharArray(),
6462
(String) null, "keystore".toCharArray());
6563
Key key = keyStore.getKey("CN=Client,OU=Test,O=Test", "eckey".toCharArray());
6664
assertTrue(key instanceof ECPrivateKey);
67-
} finally {
68-
certInputStream.close();
69-
keyInputStream.close();
7065
}
7166
}
7267

‎integration-tests/main/src/main/java/io/quarkus/it/rest/ServerSentEventResource.java

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public void setSse(final Sse sse) {
2626
@Produces(MediaType.SERVER_SENT_EVENTS)
2727
public void sendData(@Context SseEventSink sink) {
2828
// send a stream of few events
29-
try {
29+
try (sink) {
3030
for (int i = 0; i < 3; i++) {
3131
final OutboundSseEvent.Builder builder = this.sse.newEventBuilder();
3232
builder.id(String.valueOf(i)).mediaType(MediaType.TEXT_PLAIN_TYPE)
@@ -35,8 +35,6 @@ public void sendData(@Context SseEventSink sink) {
3535

3636
sink.send(builder.build());
3737
}
38-
} finally {
39-
sink.close();
4038
}
4139
}
4240

@@ -46,7 +44,7 @@ public void sendData(@Context SseEventSink sink) {
4644
@SseElementType("text/html")
4745
public void sendHtmlData(@Context SseEventSink sink) {
4846
// send a stream of few events
49-
try {
47+
try (sink) {
5048
for (int i = 0; i < 3; i++) {
5149
final OutboundSseEvent.Builder builder = this.sse.newEventBuilder();
5250
builder.id(String.valueOf(i)).mediaType(MediaType.TEXT_HTML_TYPE)
@@ -55,8 +53,6 @@ public void sendHtmlData(@Context SseEventSink sink) {
5553

5654
sink.send(builder.build());
5755
}
58-
} finally {
59-
sink.close();
6056
}
6157
}
6258

@@ -66,7 +62,7 @@ public void sendHtmlData(@Context SseEventSink sink) {
6662
@Produces(MediaType.SERVER_SENT_EVENTS)
6763
public void sendXmlData(@Context SseEventSink sink) {
6864
// send a stream of few events
69-
try {
65+
try (sink) {
7066
for (int i = 0; i < 3; i++) {
7167
final OutboundSseEvent.Builder builder = this.sse.newEventBuilder();
7268
builder.id(String.valueOf(i)).mediaType(MediaType.TEXT_XML_TYPE)
@@ -75,8 +71,6 @@ public void sendXmlData(@Context SseEventSink sink) {
7571

7672
sink.send(builder.build());
7773
}
78-
} finally {
79-
sink.close();
8074
}
8175
}
8276
}

‎integration-tests/main/src/main/java/io/quarkus/it/rest/TestResourceForConstructorProperties.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,16 +50,14 @@ public Response response() {
5050
@Produces(MediaType.SERVER_SENT_EVENTS)
5151
public void serverSentEvents(@Context SseEventSink sink) {
5252
VanillaJavaImmutableData data = new VanillaJavaImmutableData("sse", "ssevalue");
53-
try {
53+
try (sink) {
5454
OutboundSseEvent.Builder builder = sse.newEventBuilder();
5555
builder.id(String.valueOf(1))
5656
.mediaType(MediaType.APPLICATION_JSON_TYPE)
5757
.data(data)
5858
.name("stream of json data");
5959

6060
sink.send(builder.build());
61-
} finally {
62-
sink.close();
6361
}
6462
}
6563

0 commit comments

Comments
 (0)