Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/fit_Elasticsearch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,5 @@ jobs:
maven-version: 3.9.6
- name: Build
run: mvn -U -T 1C -P 'skipTests,all'
- name: 'Elasticsearch / PostgreSQL / JSON'
- name: 'Elasticsearch / PostgreSQL'
run: mvn -f fit/core-reference/pom.xml -P elasticsearch-it -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true
2 changes: 1 addition & 1 deletion .github/workflows/fit_OpenSearch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,5 @@ jobs:
maven-version: 3.9.6
- name: Build
run: mvn -U -T 1C -P 'skipTests,all'
- name: 'OpenSearch / PostgreSQL / JSON'
- name: 'OpenSearch / PostgreSQL'
run: mvn -f fit/core-reference/pom.xml -P opensearch-it -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true
2 changes: 1 addition & 1 deletion .github/workflows/fit_Payara.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,5 @@ jobs:
maven-version: 3.9.6
- name: Build
run: mvn -U -T 1C -P 'skipTests,all'
- name: 'Payara / PostgreSQL / JSON'
- name: 'Payara / PostgreSQL'
run: mvn -f fit/core-reference/pom.xml -P payara-it -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License
name: "FIT Tomcat PostgreSQL JSON"
name: "FIT Tomcat PostgreSQL"

on:
push:
Expand All @@ -24,7 +24,7 @@ on:
branches: [master]

jobs:
fit_Tomcat_PostgreSQL_JSON:
fit_Tomcat_PostgreSQL:
runs-on: ubuntu-latest

steps:
Expand All @@ -41,5 +41,5 @@ jobs:
maven-version: 3.9.6
- name: Build
run: mvn -U -T 1C -P 'skipTests,all'
- name: 'Tomcat / PostgreSQL / JSON'
- name: 'Tomcat / PostgreSQL'
run: mvn -f fit/core-reference/pom.xml verify -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true
45 changes: 0 additions & 45 deletions .github/workflows/fit_Tomcat_PostgreSQL_XML.yml

This file was deleted.

45 changes: 0 additions & 45 deletions .github/workflows/fit_Tomcat_PostgreSQL_YAML.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/fit_Wildfly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,5 @@ jobs:
maven-version: 3.9.6
- name: Build
run: mvn -U -T 1C -P 'skipTests,all'
- name: 'Wildfly / PostgreSQL / JSON'
- name: 'Wildfly / PostgreSQL'
run: mvn -f fit/core-reference/pom.xml -P wildfly-it -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true
2 changes: 1 addition & 1 deletion .github/workflows/fit_Zookeeper.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,5 @@ jobs:
maven-version: 3.9.6
- name: Build
run: mvn -U -T 1C -P 'skipTests,all'
- name: 'Zookeeper / PostgreSQL / JSON'
- name: 'Zookeeper / PostgreSQL'
run: mvn -f fit/core-reference/pom.xml -P zookeeper-it -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import java.io.IOException;
import java.io.InputStream;
import org.apache.syncope.client.ui.commons.annotations.BinaryPreview;
import org.apache.syncope.common.rest.api.RESTHeaders;
import org.apache.wicket.Component;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.OnLoadHeaderItem;
Expand All @@ -34,7 +33,7 @@
import org.apache.wicket.util.io.IOUtils;

@BinaryPreview(mimeTypes = { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML,
RESTHeaders.APPLICATION_YAML, "application/x-yaml", "text/x-yaml", "text/yaml" })
"application/yaml", "application/x-yaml", "text/x-yaml", "text/yaml" })
public class BinaryTextPreviewer extends BinaryPreviewer {

private static final long serialVersionUID = 3808379310090668773L;
Expand Down Expand Up @@ -81,7 +80,7 @@ public void renderHead(final IHeaderResponse response) {
options = "autoCloseTags: true, mode: 'text/html',";
break;

case RESTHeaders.APPLICATION_YAML:
case "application/yaml":
case "application/x-yaml":
case "text/x-yaml":
case "text/yaml":
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -166,10 +166,6 @@ public void onException(final Exception e) {
error(message.replace("\n", "<br/>"));
}

public MediaType getMediaType() {
return clientFactory.getContentType().getMediaType();
}

public void execute(final Runnable command) {
try {
executor.execute(command);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@
*/
package org.apache.syncope.client.console.commons;

import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
Expand All @@ -45,8 +43,6 @@ public void setSchema(final String schema) {
this.schema = schema;
}

@JacksonXmlElementWrapper(localName = "values")
@JacksonXmlProperty(localName = "value")
public List<String> getValues() {
return values;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
package org.apache.syncope.client.console.rest;

import jakarta.ws.rs.core.HttpHeaders;
import jakarta.ws.rs.core.MediaType;
import java.net.URI;
import java.util.Optional;
import org.apache.cxf.jaxrs.client.WebClient;
Expand Down Expand Up @@ -78,7 +79,7 @@ protected <E extends JAXRSService, T> T getObject(
final E service, final URI location, final Class<T> resultClass) {

WebClient webClient = WebClient.fromClient(WebClient.client(service));
webClient.accept(SyncopeConsoleSession.get().getMediaType()).to(location.toASCIIString(), false);
webClient.accept(MediaType.APPLICATION_JSON).to(location.toASCIIString(), false);
return webClient.
header(RESTHeaders.DOMAIN, SyncopeConsoleSession.get().getDomain()).
header(HttpHeaders.AUTHORIZATION, "Bearer " + SyncopeConsoleSession.get().getJWT()).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -177,10 +177,6 @@ public void onException(final Exception e) {
error(message);
}

public MediaType getMediaType() {
return clientFactory.getContentType().getMediaType();
}

@Override
public <T> Future<T> execute(final Callable<T> command) {
try {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
package org.apache.syncope.client.enduser.rest;

import jakarta.ws.rs.core.HttpHeaders;
import jakarta.ws.rs.core.MediaType;
import java.net.URI;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.syncope.client.enduser.SyncopeEnduserSession;
Expand Down Expand Up @@ -77,7 +78,7 @@ protected <E extends JAXRSService, T> T getObject(
final E service, final URI location, final Class<T> resultClass) {

WebClient webClient = WebClient.fromClient(WebClient.client(service));
webClient.accept(SyncopeEnduserSession.get().getMediaType()).to(location.toASCIIString(), false);
webClient.accept(MediaType.APPLICATION_JSON).to(location.toASCIIString(), false);
return webClient.
header(RESTHeaders.DOMAIN, SyncopeEnduserSession.get().getDomain()).
header(HttpHeaders.AUTHORIZATION, "Bearer " + SyncopeEnduserSession.get().getJWT()).
Expand Down
8 changes: 0 additions & 8 deletions client/idrepo/lib/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,6 @@ under the License.
<groupId>com.fasterxml.jackson.jakarta.rs</groupId>
<artifactId>jackson-jakarta-rs-json-provider</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jakarta.rs</groupId>
<artifactId>jackson-jakarta-rs-xml-provider</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jakarta.rs</groupId>
<artifactId>jackson-jakarta-rs-yaml-provider</artifactId>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ public class SyncopeAnonymousClient extends SyncopeClient {
protected final AnonymousAuthenticationHandler anonymousAuthHandler;

public SyncopeAnonymousClient(
final MediaType mediaType,
final JAXRSClientFactoryBean restClientFactory,
final RestClientExceptionMapper exceptionMapper,
final AnonymousAuthenticationHandler anonymousAuthHandler,
Expand All @@ -50,7 +49,6 @@ public SyncopeAnonymousClient(
final TLSClientParameters tlsClientParameters) {

super(
mediaType,
restClientFactory,
exceptionMapper,
anonymousAuthHandler,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -216,8 +216,6 @@ public static <T> EntityTag getLatestEntityTag(final T service) {

protected static final JsonMapper MAPPER = JsonMapper.builder().findAndAddModules().build();

protected final MediaType mediaType;

protected final JAXRSClientFactoryBean restClientFactory;

protected final RestClientExceptionMapper exceptionMapper;
Expand All @@ -229,15 +227,13 @@ public static <T> EntityTag getLatestEntityTag(final T service) {
protected final TLSClientParameters tlsClientParameters;

public SyncopeClient(
final MediaType mediaType,
final JAXRSClientFactoryBean restClientFactory,
final RestClientExceptionMapper exceptionMapper,
final AuthenticationHandler authHandler,
final boolean useCompression,
final HTTPClientPolicy httpClientPolicy,
final TLSClientParameters tlsClientParameters) {

this.mediaType = mediaType;
this.restClientFactory = restClientFactory;
if (this.restClientFactory.getHeaders() == null) {
this.restClientFactory.setHeaders(new HashMap<>());
Expand Down Expand Up @@ -404,7 +400,7 @@ public <T> T getService(final Class<T> serviceClass) {
}

Client client = WebClient.client(serviceInstance);
client.type(mediaType).accept(mediaType);
client.type(MediaType.APPLICATION_JSON).accept(MediaType.APPLICATION_JSON);
if (serviceInstance instanceof AnyService || serviceInstance instanceof ExecutableService) {
client.accept(RESTHeaders.MULTIPART_MIXED);
}
Expand Down Expand Up @@ -470,7 +466,6 @@ public Self self() {
*/
public BatchRequest batch() {
return new BatchRequest(
mediaType,
restClientFactory.getAddress(),
restClientFactory.getProviders(),
jwtInfo().map(JwtInfo::value).orElse(null),
Expand Down
Loading
Loading