Commit 964a55fc authored by Brian Long's avatar Brian Long
Browse files

cxf v4.x

parents bedc424a b7ac0d25

pom.xml

+16 −11
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
	

	<groupId>com.inteligr8</groupId>

	<artifactId>common-rest-client</artifactId>

	<version>2.0-SNAPSHOT-cxf</version>

	<version>3.0-SNAPSHOT-cxf</version>

	<packaging>jar</packaging>



	<name>ReST API Client for Java</name>
@@ -40,16 +40,21 @@ 


	<properties>

		<project.build.sourceEncoding>utf-8</project.build.sourceEncoding>

		<maven.compiler.source>8</maven.compiler.source>

		<maven.compiler.target>8</maven.compiler.target>

		<maven.compiler.source>11</maven.compiler.source>

		<maven.compiler.target>11</maven.compiler.target>



		<junit.version>5.7.2</junit.version>

		<spring.version>5.3.27</spring.version>

		<jackson.version>2.15.1</jackson.version>

		<cxf.version>3.5.6</cxf.version>

		<junit.version>5.10.0</junit.version>

		<spring.version>6.0.19</spring.version>

		<jackson.version>2.17.2</jackson.version>

		<cxf.version>4.0.2</cxf.version>

	</properties>



	<dependencies>

		<dependency>

			<groupId>jakarta.annotation</groupId>

			<artifactId>jakarta.annotation-api</artifactId>

			<version>2.1.1</version>

		</dependency>

		<dependency>

			<groupId>org.springframework</groupId>

			<artifactId>spring-context</artifactId>
@@ -61,8 +66,8 @@ 
			<version>${jackson.version}</version>

		</dependency>

		<dependency>

			<groupId>com.fasterxml.jackson.jaxrs</groupId>

			<artifactId>jackson-jaxrs-json-provider</artifactId>

			<groupId>com.fasterxml.jackson.jakarta.rs</groupId>

			<artifactId>jackson-jakarta-rs-json-provider</artifactId>

			<version>${jackson.version}</version>

		</dependency>

		<dependency>
@@ -78,12 +83,12 @@ 
		<dependency>

			<groupId>org.slf4j</groupId>

			<artifactId>slf4j-api</artifactId>

			<version>1.7.36</version>

			<version>2.0.13</version>

		</dependency>

		<dependency>

			<groupId>jakarta.ws.rs</groupId>

			<artifactId>jakarta.ws.rs-api</artifactId>

			<version>2.1.6</version>

			<version>3.1.0</version>

		</dependency>

		<dependency>

			<groupId>org.junit.jupiter</groupId>

src/main/cxf/com/inteligr8/rs/ClientCxfImpl.java

+4 −4
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ package com.inteligr8.rs; 
import java.util.LinkedList;

import java.util.List;



import javax.annotation.PostConstruct;

import javax.ws.rs.ext.RuntimeDelegate;

import jakarta.annotation.PostConstruct;

import jakarta.ws.rs.ext.RuntimeDelegate;



import org.apache.cxf.BusFactory;

import org.apache.cxf.jaxrs.client.JAXRSClientFactory;
@@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory; 


import com.fasterxml.jackson.databind.ObjectMapper;

import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;

import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider;

import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider;



/**

 * A class that provides pre-configured JAX-RS Client &amp; WebTarget &amp;
@@ -108,7 +108,7 @@ public class ClientCxfImpl extends Client { 
        om.registerModules(new JavaTimeModule());

        this.getConfig().configureJacksonMapper(om);



        JacksonJaxbJsonProvider jacksonProvider = new JacksonJaxbJsonProvider(om, JacksonJaxbJsonProvider.DEFAULT_ANNOTATIONS);

        JacksonJsonProvider jacksonProvider = new JacksonJsonProvider(om, JacksonJsonProvider.BASIC_ANNOTATIONS);

        this.getConfig().configureJacksonProvider(jacksonProvider);

        

		List<Object> providersAndFilters = new LinkedList<Object>();

src/main/cxf/com/inteligr8/rs/CxfLoggingFilter.java

+2 −2
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ import java.io.IOException; 
import java.util.LinkedList;

import java.util.List;



import javax.ws.rs.client.ClientRequestContext;

import javax.ws.rs.core.MediaType;

import jakarta.ws.rs.client.ClientRequestContext;

import jakarta.ws.rs.core.MediaType;



import org.apache.cxf.jaxrs.ext.multipart.Attachment;

import org.apache.cxf.jaxrs.ext.multipart.MultipartBody;

src/main/cxf/com/inteligr8/rs/CxfMultipartProvider.java

+4 −4
Original line number Diff line number Diff line
@@ -17,10 +17,10 @@ package com.inteligr8.rs; 
import java.lang.annotation.Annotation;

import java.lang.reflect.Type;



import javax.ws.rs.Consumes;

import javax.ws.rs.Produces;

import javax.ws.rs.core.MediaType;

import javax.ws.rs.ext.Provider;

import jakarta.ws.rs.Consumes;

import jakarta.ws.rs.Produces;

import jakarta.ws.rs.core.MediaType;

import jakarta.ws.rs.ext.Provider;



import org.apache.cxf.jaxrs.ext.multipart.MultipartBody;

import org.apache.cxf.jaxrs.provider.MultipartProvider;

src/main/java/com/inteligr8/rs/AuthorizationFilter.java

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 */

package com.inteligr8.rs;



import javax.ws.rs.client.ClientRequestFilter;

import jakarta.ws.rs.client.ClientRequestFilter;



/**

 * This is a marker that allows the developer to segregate, restrict, or limit