Merge branch 'develop' into stable

pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.inteligr8</groupId>
 	<artifactId>common-rest-api</artifactId>
-	<version>1.0.0</version>
+	<version>1.1.0</version>
 	<name>ReST API Client for Java</name>
 
 	<properties>
@@ -50,18 +50,18 @@
 			<version>${jersey.version}</version>
 			<scope>provided</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.glassfish.jersey.core</groupId>
+			<artifactId>jersey-client</artifactId>
+			<version>${jersey.version}</version>
+			<scope>provided</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-rt-rs-client</artifactId>
 			<version>${cxf.version}</version>
 			<scope>provided</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.glassfish.jersey.core</groupId>
-			<artifactId>jersey-client</artifactId>
-			<version>${jersey.version}</version>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.glassfish.jersey.inject</groupId>
 			<artifactId>jersey-hk2</artifactId>

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

@@ -4,31 +4,31 @@ import java.net.URI;
 
 import javax.ws.rs.client.ClientRequestFilter;
 
-public abstract class ClientConfiguration {
+public interface ClientConfiguration {
 	
-	public abstract String getBaseUrl();
+	String getBaseUrl();
 	
-	public abstract String getBasicAuthUsername();
+	String getBasicAuthUsername();
 	
-	public abstract String getBasicAuthPassword();
+	String getBasicAuthPassword();
 	
-	public abstract String getAccessToken();
+	String getAccessToken();
 	
-	public abstract String getOAuthTokenUrl();
+	String getOAuthTokenUrl();
 	
-	public abstract String getOAuthClientId();
+	String getOAuthClientId();
 	
-	public abstract String getOAuthClientSecret();
+	String getOAuthClientSecret();
 	
-	public abstract String getOAuthAuthCode();
+	String getOAuthAuthCode();
 	
-	public abstract String getOAuthAuthRedirectUri();
+	String getOAuthAuthRedirectUri();
 	
-	public abstract String getOAuthUsername();
+	String getOAuthUsername();
 	
-	public abstract String getOAuthPassword();
+	String getOAuthPassword();
 
-	public ClientRequestFilter getAuthorizationFilter() {
+	default ClientRequestFilter getAuthorizationFilter() {
 		if (this.getAccessToken() != null) {
 			return new AccessTokenRequestFilter(this.getAccessToken());
 		} else if (this.getOAuthTokenUrl() != null) {

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

@@ -0,0 +1,9 @@
+package com.inteligr8.rs;
+
+public interface ClientCxfConfiguration extends ClientConfiguration {
+	
+	default boolean isDefaultBusEnabled() {
+		return true;
+	}
+
+}

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

@@ -6,6 +6,7 @@ import java.util.List;
 import javax.ws.rs.client.ClientRequestFilter;
 import javax.ws.rs.ext.RuntimeDelegate;
 
+import org.apache.cxf.BusFactory;
 import org.apache.cxf.jaxrs.client.JAXRSClientFactory;
 import org.apache.cxf.jaxrs.client.WebClient;
 import org.apache.cxf.jaxrs.impl.RuntimeDelegateImpl;
@@ -22,6 +23,9 @@ public abstract class ClientCxfImpl extends Client implements InitializingBean {
 	
 	private final Logger logger = LoggerFactory.getLogger(ClientCxfImpl.class);
 	
+	@Override
+	protected abstract ClientCxfConfiguration getConfig();
+	
 	@Override
 	public void afterPropertiesSet() {
 		if (RuntimeDelegate.getInstance() == null) {
@@ -49,6 +53,14 @@ public abstract class ClientCxfImpl extends Client implements InitializingBean {
 		// we can't use JAXRSClientFactory with a JAXRS client (duh!)
 		// so we need to create a CXF client
 		WebClient client = WebClient.create(this.getConfig().getBaseUrl(), providersAndFilters);
+
+		if (!this.getConfig().isDefaultBusEnabled()) {
+			// Some applications (like ACS) add interceptors to the default bus
+			// those interceptors may treat all messages as SOAP messages (like ACS), resulting in ClassCastExceptions
+			// we need to ignore the default bus
+			org.apache.cxf.jaxrs.client.ClientConfiguration config = WebClient.getConfig(client);
+			config.setBus(BusFactory.newInstance().createBus());
+		}
 		
 		return client;
 	}

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

@@ -0,0 +1,9 @@
+package com.inteligr8.rs;
+
+public interface ClientJerseyConfiguration extends ClientConfiguration {
+	
+	default boolean isPutBodyRequired() {
+		return true;
+	}
+
+}

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

@@ -2,6 +2,7 @@ package com.inteligr8.rs;
 
 import javax.ws.rs.ext.RuntimeDelegate;
 
+import org.glassfish.jersey.client.ClientProperties;
 import org.glassfish.jersey.client.proxy.WebResourceFactory;
 import org.glassfish.jersey.internal.RuntimeDelegateImpl;
 import org.slf4j.Logger;
@@ -15,6 +16,9 @@ public abstract class ClientJerseyImpl extends Client implements InitializingBea
 	
 	private final Logger logger = LoggerFactory.getLogger(ClientJerseyImpl.class);
 	
+	@Override
+	protected abstract ClientJerseyConfiguration getConfig();
+	
 	@Override
 	public void afterPropertiesSet() {
 		if (RuntimeDelegate.getInstance() == null) {
@@ -31,6 +35,18 @@ public abstract class ClientJerseyImpl extends Client implements InitializingBea
 			this.logger.info("API Base URL: " + this.getConfig().getBaseUrl());
 	}
 	
+	@Override
+	public javax.ws.rs.client.Client getClient() {
+		javax.ws.rs.client.Client client = super.getClient();
+		
+		if (!this.getConfig().isPutBodyRequired()) {
+			// allow PUT operations without body data
+			client.property(ClientProperties.SUPPRESS_HTTP_COMPLIANCE_VALIDATION, true);
+		}
+		
+		return client;
+	}
+	
 	@Override
 	public <T> T getApi(Class<T> apiClass) {
 		return WebResourceFactory.newResource(apiClass, this.getTarget());

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

@@ -56,9 +56,9 @@ public abstract class OAuthRequestFilter implements ClientRequestFilter {
 			form = this.createForm();
 		}
 
-		form.param("clientId", this.clientId);
+		form.param("client_id", this.clientId);
 		if (this.clientSecret != null)
-			form.param("clientSecret", this.clientSecret);
+			form.param("client_secret", this.clientSecret);
 		if (this.scope != null)
 			form.param("scope", this.scope);