Skip to content

Commit a3fc4fd

Browse files
authored
Merge pull request #34032 from neenapj/thread-increase-issue
Resteasy ClientBuilder issue fix
2 parents bdad50c + d864727 commit a3fc4fd

File tree

6 files changed

+25
-7
lines changed

6 files changed

+25
-7
lines changed

dev/io.openliberty.jakarta.restfulWS.3.0/bnd.bnd

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#*******************************************************************************
2-
# Copyright (c) 2020, 2025 IBM Corporation and others.
2+
# Copyright (c) 2020, 2026 IBM Corporation and others.
33
# All rights reserved. This program and the accompanying materials
44
# are made available under the terms of the Eclipse Public License 2.0
55
# which accompanies this distribution, and is available at
@@ -18,6 +18,10 @@ Bundle-SymbolicName: io.openliberty.jakarta.restfulWS.3.0; singleton:=true
1818

1919
Export-Package: jakarta.ws.rs.*; version="3.0.0"
2020

21+
Import-Package: \
22+
io.openliberty.org.jboss.resteasy.common.client; resolution:=optional, \
23+
*
24+
2125
instrument.disabled: true
2226

2327
publish.wlp.jar.suffix: dev/api/spec

dev/io.openliberty.jakarta/restfulWS.3.1.bnd

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#*******************************************************************************
2-
# Copyright (c) 2022, 2025 IBM Corporation and others.
2+
# Copyright (c) 2022, 2026 IBM Corporation and others.
33
# All rights reserved. This program and the accompanying materials
44
# are made available under the terms of the Eclipse Public License 2.0
55
# which accompanies this distribution, and is available at
@@ -22,6 +22,10 @@ Bundle-SymbolicName: io.openliberty.jakarta.restfulWS.3.1; singleton:=true
2222

2323
Export-Package: jakarta.ws.rs.*; version="3.1.0"
2424

25+
Import-Package: \
26+
io.openliberty.org.jboss.resteasy.common.client; resolution:=optional, \
27+
*
28+
2529
-includeresource: \
2630
@\${repo;jakarta.ws.rs:jakarta.ws.rs-api;3.1.0;EXACT}!/!(META-INF/maven/*|module-info.class)
2731

dev/io.openliberty.jakarta/restfulWS.4.0.bnd

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#*******************************************************************************
2-
# Copyright (c) 2024, 2025 IBM Corporation and others.
2+
# Copyright (c) 2024, 2026 IBM Corporation and others.
33
# All rights reserved. This program and the accompanying materials
44
# are made available under the terms of the Eclipse Public License 2.0
55
# which accompanies this distribution, and is available at
@@ -19,6 +19,10 @@ Bundle-SymbolicName: io.openliberty.jakarta.restfulWS.4.0; singleton:=true
1919

2020
Export-Package: jakarta.ws.rs.*; version="4.0.0"
2121

22+
Import-Package: \
23+
io.openliberty.org.jboss.resteasy.common.client; resolution:=optional, \
24+
*
25+
2226
-includeresource: \
2327
@\${repo;jakarta.ws.rs:jakarta.ws.rs-api;4.0.0;EXACT}!/!(META-INF/maven/*|module-info.class)
2428

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
-Djavax.ws.rs.client.ClientBuilder=com.ibm.ws.jaxrs20.client.JAXRSClientBuilderImpl
2+
-Djakarta.ws.rs.client.ClientBuilder=io.openliberty.org.jboss.resteasy.common.client.LibertyResteasyClientBuilderImpl

dev/io.openliberty.jaxrs.global.handler.internal_fat/test-applications/MySimpleGlobalHandler/resources/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ Bundle-SymbolicName: MySimpleGlobalHandler
55
Bundle-Version: 1.0.0
66
Manifest-Version: 1.0
77
Export-Package: io.openliberty.jaxrs.fat.globalhandler.simple.userbundle
8-
Import-Package: com.ibm.wsspi.webservices.handler,org.osgi.framework
8+
Import-Package: com.ibm.wsspi.webservices.handler,org.osgi.framework,javax.ws.rs.client

dev/io.openliberty.jaxrs.global.handler.internal_fat/test-applications/MySimpleGlobalHandler/src/io/openliberty/jaxrs/fat/globalhandler/simple/userbundle/MySimpleHandlerActivitor.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
/*******************************************************************************
2-
* Copyright (c) 2022, 2023 IBM Corporation and others.
2+
* Copyright (c) 2022, 2026 IBM Corporation and others.
33
* All rights reserved. This program and the accompanying materials
44
* are made available under the terms of the Eclipse Public License 2.0
55
* which accompanies this distribution, and is available at
66
* http://www.eclipse.org/legal/epl-2.0/
7-
*
7+
*
88
* SPDX-License-Identifier: EPL-2.0
99
*******************************************************************************/
1010
package io.openliberty.jaxrs.fat.globalhandler.simple.userbundle;
1111

1212
import java.util.Hashtable;
1313

14+
import javax.ws.rs.client.ClientBuilder;
15+
1416
import org.osgi.framework.BundleActivator;
1517
import org.osgi.framework.BundleContext;
1618
import org.osgi.framework.ServiceRegistration;
@@ -23,8 +25,10 @@ public class MySimpleHandlerActivitor implements BundleActivator {
2325

2426
@Override
2527
public void start(BundleContext context) throws Exception {
26-
2728
System.out.println("in start method in bundle activator");
29+
// Test ClientBuilder.newBuilder() - Added to test for problem documented in #34019
30+
ClientBuilder builder = ClientBuilder.newBuilder();
31+
2832
final Hashtable<String, Object> handlerProps = new Hashtable<String, Object>();
2933

3034
handlerProps.put(HandlerConstants.ENGINE_TYPE, HandlerConstants.ENGINE_TYPE_JAXRS);

0 commit comments

Comments
 (0)