Skip to content

Commit 8c8aab4

Browse files
ilgrossoilgrosso
authored
[SYNCOPE-1935] Removing cxf-rt-transports-http-hc (#1249)
1 parent 8a4efc7 commit 8c8aab4

File tree

21 files changed

+116
-166
lines changed

21 files changed

+116
-166
lines changed

‎client/am/console/src/main/java/org/apache/syncope/client/console/pages/WA.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import java.util.List;
3131
import org.apache.commons.lang3.StringUtils;
3232
import org.apache.commons.lang3.Strings;
33+
import org.apache.cxf.jaxrs.client.WebClient;
3334
import org.apache.syncope.client.console.BookmarkablePageLinkBuilder;
3435
import org.apache.syncope.client.console.SyncopeConsoleSession;
3536
import org.apache.syncope.client.console.SyncopeWebApplication;
@@ -52,7 +53,6 @@
5253
import org.apache.syncope.client.console.rest.WAConfigRestClient;
5354
import org.apache.syncope.client.console.rest.WASessionRestClient;
5455
import org.apache.syncope.client.console.wicket.markup.html.bootstrap.dialog.BaseModal;
55-
import org.apache.syncope.client.lib.WebClientBuilder;
5656
import org.apache.syncope.client.ui.commons.annotations.AMPage;
5757
import org.apache.syncope.common.keymaster.client.api.ServiceOps;
5858
import org.apache.syncope.common.keymaster.client.api.model.NetworkService;
@@ -140,10 +140,12 @@ public void onClick(final AjaxRequestTarget target) {
140140
String actuatorEndpoint = Strings.CS.appendIfMissing(
141141
instances.getFirst().getAddress(), "/") + "actuator/env";
142142
try {
143-
Response response = WebClientBuilder.build(actuatorEndpoint,
143+
Response response = WebClient.create(
144+
actuatorEndpoint,
145+
List.of(),
144146
SyncopeWebApplication.get().getAnonymousUser(),
145147
SyncopeWebApplication.get().getAnonymousKey(),
146-
List.of()).accept(MediaType.APPLICATION_JSON_TYPE).get();
148+
null).accept(MediaType.APPLICATION_JSON_TYPE).get();
147149
if (response.getStatus() == Response.Status.OK.getStatusCode()) {
148150
JsonNode env = MAPPER.readTree((InputStream) response.getEntity());
149151
if (env.has("propertySources")) {

‎client/am/console/src/main/java/org/apache/syncope/client/console/rest/AMSessionRestClient.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
import jakarta.ws.rs.core.MediaType;
2424
import jakarta.ws.rs.core.Response;
2525
import java.util.List;
26+
import org.apache.cxf.jaxrs.client.WebClient;
2627
import org.apache.syncope.client.console.SyncopeWebApplication;
27-
import org.apache.syncope.client.lib.WebClientBuilder;
2828
import org.apache.syncope.client.ui.commons.rest.RestClient;
2929
import org.apache.syncope.common.keymaster.client.api.model.NetworkService;
3030
import org.apache.syncope.common.lib.AMSession;
@@ -56,10 +56,12 @@ public void delete(final String key) {
5656
SyncopeClientException sce = SyncopeClientException.build(ClientExceptionType.Unknown);
5757

5858
try {
59-
Response response = WebClientBuilder.build(getActuatorEndpoint(),
59+
Response response = WebClient.create(
60+
getActuatorEndpoint(),
61+
List.of(),
6062
SyncopeWebApplication.get().getAnonymousUser(),
6163
SyncopeWebApplication.get().getAnonymousKey(),
62-
List.of()).
64+
null).
6365
accept(MediaType.APPLICATION_JSON_TYPE).
6466
type(MediaType.APPLICATION_JSON_TYPE).
6567
path(key).delete();

‎client/am/console/src/main/java/org/apache/syncope/client/console/rest/SRASessionRestClient.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
import jakarta.ws.rs.core.MediaType;
2323
import jakarta.ws.rs.core.Response;
2424
import java.util.List;
25+
import org.apache.cxf.jaxrs.client.WebClient;
2526
import org.apache.syncope.client.console.SyncopeWebApplication;
26-
import org.apache.syncope.client.lib.WebClientBuilder;
2727
import org.apache.syncope.common.keymaster.client.api.model.NetworkService;
2828
import org.apache.syncope.common.lib.AMSession;
2929

@@ -43,10 +43,12 @@ protected String getActuatorEndpoint() {
4343
@Override
4444
public List<AMSession> list() {
4545
try {
46-
Response response = WebClientBuilder.build(getActuatorEndpoint(),
46+
Response response = WebClient.create(
47+
getActuatorEndpoint(),
48+
JAX_RS_PROVIDERS,
4749
SyncopeWebApplication.get().getAnonymousUser(),
4850
SyncopeWebApplication.get().getAnonymousKey(),
49-
JAX_RS_PROVIDERS).accept(MediaType.APPLICATION_JSON_TYPE).get();
51+
null).accept(MediaType.APPLICATION_JSON_TYPE).get();
5052
if (response.getStatus() == Response.Status.OK.getStatusCode()) {
5153
return response.readEntity(new GenericType<>() {
5254
});

‎client/am/console/src/main/java/org/apache/syncope/client/console/rest/SRAStatisticsRestClient.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import org.apache.commons.lang3.tuple.Pair;
2727
import org.apache.cxf.jaxrs.client.WebClient;
2828
import org.apache.syncope.client.console.SyncopeWebApplication;
29-
import org.apache.syncope.client.lib.WebClientBuilder;
3029
import org.apache.syncope.common.keymaster.client.api.model.NetworkService;
3130
import org.slf4j.Logger;
3231
import org.slf4j.LoggerFactory;
@@ -44,10 +43,12 @@ protected String getActuatorEndpoint(final List<NetworkService> instances) {
4443

4544
public SRAStatistics get(final List<NetworkService> instances, final List<Pair<String, String>> selected) {
4645
try {
47-
WebClient client = WebClientBuilder.build(getActuatorEndpoint(instances),
46+
WebClient client = WebClient.create(
47+
getActuatorEndpoint(instances),
48+
JAX_RS_PROVIDERS,
4849
SyncopeWebApplication.get().getAnonymousUser(),
4950
SyncopeWebApplication.get().getAnonymousKey(),
50-
JAX_RS_PROVIDERS).accept(MediaType.APPLICATION_JSON_TYPE);
51+
null).accept(MediaType.APPLICATION_JSON_TYPE);
5152

5253
if (!selected.isEmpty()) {
5354
client.query("tag", selected.stream().map(s -> s.getLeft() + ":" + s.getRight()).toArray());

‎client/am/console/src/main/java/org/apache/syncope/client/console/rest/WASessionRestClient.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
import jakarta.ws.rs.core.Response;
2727
import java.io.InputStream;
2828
import java.util.List;
29+
import org.apache.cxf.jaxrs.client.WebClient;
2930
import org.apache.syncope.client.console.SyncopeWebApplication;
30-
import org.apache.syncope.client.lib.WebClientBuilder;
3131
import org.apache.syncope.common.keymaster.client.api.model.NetworkService;
3232
import org.apache.syncope.common.lib.AMSession;
3333

@@ -50,10 +50,12 @@ protected String getActuatorEndpoint() {
5050
@Override
5151
public List<AMSession> list() {
5252
try {
53-
Response response = WebClientBuilder.build(getActuatorEndpoint(),
53+
Response response = WebClient.create(
54+
getActuatorEndpoint(),
55+
List.of(),
5456
SyncopeWebApplication.get().getAnonymousUser(),
5557
SyncopeWebApplication.get().getAnonymousKey(),
56-
List.of()).accept(MediaType.APPLICATION_JSON_TYPE).get();
58+
null).accept(MediaType.APPLICATION_JSON_TYPE).get();
5759
if (response.getStatus() == Response.Status.OK.getStatusCode()) {
5860
JsonNode node = MAPPER.readTree((InputStream) response.getEntity());
5961
if (node.has("activeSsoSessions")) {

‎client/idm/console/src/main/java/org/apache/syncope/client/console/rest/ConnectorRestClient.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
import org.apache.commons.lang3.tuple.Pair;
3232
import org.apache.cxf.jaxrs.client.WebClient;
3333
import org.apache.syncope.client.console.SyncopeConsoleSession;
34-
import org.apache.syncope.client.lib.WebClientBuilder;
3534
import org.apache.syncope.common.lib.SyncopeClientException;
3635
import org.apache.syncope.common.lib.to.ConnIdBundle;
3736
import org.apache.syncope.common.lib.to.ConnIdObjectClass;
@@ -150,7 +149,7 @@ public List<ConnIdBundle> getAllBundles() {
150149
public boolean check(final String coreAddress, final String domain, final String jwt, final String key)
151150
throws IOException {
152151

153-
WebClient client = WebClientBuilder.build(coreAddress).
152+
WebClient client = WebClient.create(coreAddress).
154153
path("connectors").
155154
accept(MediaType.APPLICATION_JSON_TYPE).
156155
type(MediaType.APPLICATION_JSON_TYPE).

‎client/idm/console/src/main/java/org/apache/syncope/client/console/rest/ResourceRestClient.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import org.apache.commons.io.IOUtils;
3030
import org.apache.commons.lang3.tuple.Pair;
3131
import org.apache.cxf.jaxrs.client.WebClient;
32-
import org.apache.syncope.client.lib.WebClientBuilder;
3332
import org.apache.syncope.common.lib.to.ConnObject;
3433
import org.apache.syncope.common.lib.to.PagedConnObjectResult;
3534
import org.apache.syncope.common.lib.to.ResourceTO;
@@ -48,7 +47,7 @@ public class ResourceRestClient extends BaseRestClient {
4847
public boolean check(final String coreAddress, final String domain, final String jwt, final String key)
4948
throws IOException {
5049

51-
WebClient client = WebClientBuilder.build(coreAddress).
50+
WebClient client = WebClient.create(coreAddress).
5251
path("resources").
5352
accept(MediaType.APPLICATION_JSON_TYPE).
5453
type(MediaType.APPLICATION_JSON_TYPE).

‎client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/BaseSession.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public String message() {
6363

6464
<T> T getService(String etag, Class<T> serviceClass);
6565

66-
<T> void resetClient(Class<T> service);
66+
<T> void resetClient(Class<T> serviceClass);
6767

6868
DateOps.Format getDateFormat();
6969

‎client/idrepo/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleSession.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -456,20 +456,20 @@ public <T> T getService(final Class<T> serviceClass) {
456456

457457
@Override
458458
public <T> T getService(final String etag, final Class<T> serviceClass) {
459-
T serviceInstance = getCachedService(serviceClass);
460-
WebClient.client(serviceInstance).match(new EntityTag(etag), false);
459+
T service = getCachedService(serviceClass);
460+
WebClient.client(service).match(new EntityTag(etag), false);
461461

462-
return serviceInstance;
462+
return service;
463463
}
464464

465465
public BatchRequest batch() {
466466
return client.batch();
467467
}
468468

469469
@Override
470-
public <T> void resetClient(final Class<T> service) {
471-
T serviceInstance = getCachedService(service);
472-
WebClient.client(serviceInstance).reset();
470+
public <T> void resetClient(final Class<T> serviceClass) {
471+
T service = getCachedService(serviceClass);
472+
WebClient.client(service).reset();
473473
}
474474

475475
@Override

‎client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/LoggerConfRestClient.java‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
import java.util.Map;
3030
import java.util.stream.Collectors;
3131
import java.util.stream.Stream;
32+
import org.apache.cxf.jaxrs.client.WebClient;
3233
import org.apache.syncope.client.console.SyncopeWebApplication;
33-
import org.apache.syncope.client.lib.WebClientBuilder;
3434
import org.apache.syncope.client.ui.commons.rest.RestClient;
3535
import org.apache.syncope.common.keymaster.client.api.model.Domain;
3636
import org.apache.syncope.common.keymaster.client.api.model.NetworkService;
@@ -71,10 +71,12 @@ public List<LoggerConf> list() {
7171
List<LoggerConf> loggerConfs = new ArrayList<>();
7272

7373
try {
74-
Response response = WebClientBuilder.build(getActuatorEndpoint(instances.getFirst()),
74+
Response response = WebClient.create(
75+
getActuatorEndpoint(instances.getFirst()),
76+
List.of(),
7577
SyncopeWebApplication.get().getAnonymousUser(),
7678
SyncopeWebApplication.get().getAnonymousKey(),
77-
List.of()).accept(MediaType.APPLICATION_JSON_TYPE).get();
79+
null).accept(MediaType.APPLICATION_JSON_TYPE).get();
7880
if (response.getStatus() == Response.Status.OK.getStatusCode()) {
7981
JsonNode node = MAPPER.readTree((InputStream) response.getEntity());
8082
if (node.has("loggers")) {
@@ -104,10 +106,12 @@ public List<LoggerConf> list() {
104106

105107
@Override
106108
public void setLevel(final String key, final LogLevel level) {
107-
instances.forEach(i -> WebClientBuilder.build(getActuatorEndpoint(i),
109+
instances.forEach(instance -> WebClient.create(
110+
getActuatorEndpoint(instance),
111+
List.of(),
108112
SyncopeWebApplication.get().getAnonymousUser(),
109113
SyncopeWebApplication.get().getAnonymousKey(),
110-
List.of()).
114+
null).
111115
accept(MediaType.APPLICATION_JSON_TYPE).
112116
type(MediaType.APPLICATION_JSON_TYPE).
113117
path(key).

0 commit comments

Comments
 (0)