[OSJC-238] Make IResourceFactory pluggable

src/main/java/com/openshift/internal/restclient/DefaultClient.java

@@ -79,17 +79,18 @@ public class DefaultClient implements IClient, IHttpConstants{
 	private IAuthorizationStrategy strategy;
 	private IAuthorizationClient authClient;
 
+	@Deprecated
 	public DefaultClient(URL baseUrl, ISSLCertificateCallback sslCertCallback){
-		this(baseUrl, null, sslCertCallback);
+		this(baseUrl, null, sslCertCallback, null);
 	}
 
-	/*
-	 * Testing constructor
-	 */
-	DefaultClient(URL baseUrl,  IHttpClient httpClient,  ISSLCertificateCallback sslCertCallback){
+	public DefaultClient(URL baseUrl,  IHttpClient httpClient,  ISSLCertificateCallback sslCertCallback, IResourceFactory factory){
 		this.baseUrl = baseUrl;
 		client = httpClient != null ? httpClient : newIHttpClient(sslCertCallback);
-		factory = new ResourceFactory(this);
+		this.factory = factory;
+		if(this.factory != null) {
+			this.factory.setClient(this);
+		}
 		openShiftVersion = System.getProperty(SYSTEM_PROP_OPENSHIFT_API_VERSION, null);
 		kubernetesVersion = System.getProperty(SYSTEM_PROP_K8E_API_VERSION, null);
 		authClient = new AuthorizationClientFactory().create(this);	

src/main/java/com/openshift/internal/restclient/ResourceFactory.java

@@ -231,6 +231,11 @@ public <T extends IResource> T stub(String kind, String name) {
 		return stub(kind, name, null);
 	}
 
+	@Override
+	public void setClient(IClient client) {
+		this.client = client;
+	}
+
 
 
 }

src/main/java/com/openshift/restclient/ClientBuilder.java

@@ -0,0 +1,59 @@
+/*******************************************************************************
+ * Copyright (c) 2016 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package com.openshift.restclient;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import com.openshift.internal.restclient.DefaultClient;
+import com.openshift.internal.restclient.ResourceFactory;
+
+/**
+ * Builder to create IClient instances.
+ * @author jeff.cantrill
+ *
+ */
+public class ClientBuilder {
+
+	private String baseUrl;
+	private ISSLCertificateCallback sslCertificateCallback;
+	private IResourceFactory resourceFactory;
+
+	public ClientBuilder(String baseUrl) {
+		this.baseUrl = baseUrl;
+	}
+
+	public ClientBuilder sslCertificateCallback(ISSLCertificateCallback callback) {
+		this.sslCertificateCallback = callback;
+		return this;
+	}
+
+	public ClientBuilder resourceFactory(IResourceFactory factory) {
+		this.resourceFactory = factory;
+		return this;
+	}
+
+	public IClient build() {
+		try {
+			ISSLCertificateCallback sslCallback = defaultIfNull(this.sslCertificateCallback, new NoopSSLCertificateCallback());
+			IResourceFactory factory = defaultIfNull(resourceFactory, new ResourceFactory(null));
+			return new DefaultClient(new URL(this.baseUrl), null, sslCallback, factory);
+		} catch (MalformedURLException e) {
+			throw new OpenShiftException(e, "");
+		}
+	}
+
+	private <T> T defaultIfNull(T value, T aDefault) {
+		if(value != null)
+			return value;
+		return aDefault;
+	}
+}

src/main/java/com/openshift/restclient/ClientFactory.java

@@ -8,16 +8,13 @@
  ******************************************************************************/
 package com.openshift.restclient;
 
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import com.openshift.internal.restclient.DefaultClient;
 
 /**
  * Factory class for creating clients to an OpenShift server
  * 
  * @author Jeff Cantrill
  */
+@Deprecated
 public final class ClientFactory {
 
 	/**
@@ -32,10 +29,8 @@ public final class ClientFactory {
 	 *             if the baseURL is malformed
 	 */
 	public final IClient create(String baseUrl, ISSLCertificateCallback sslCertCallback){
-		try {
-			return new DefaultClient(new URL(baseUrl), sslCertCallback);
-		} catch (MalformedURLException e) {
-			throw new OpenShiftException(e, "Malformed URL '%s'", baseUrl);
-		}
+		return new ClientBuilder(baseUrl)
+				.sslCertificateCallback(sslCertCallback)
+				.build();
 	}
 }

src/main/java/com/openshift/restclient/IResourceFactory.java

@@ -39,6 +39,7 @@ public interface IResourceFactory {
 	 */
 	<T extends IResource> T create(String response) ;
 
+	@Deprecated
 	IResource create(String response, boolean strict) ;
 
 	/**
@@ -50,6 +51,7 @@ public interface IResourceFactory {
 	 */
 	<T extends IResource> T create(InputStream input) ;
 
+	@Deprecated
 	IResource create(InputStream input, boolean strict) ;
 
 	/**
@@ -60,6 +62,7 @@ public interface IResourceFactory {
 	 */
 	<T extends IResource> T create(String version, String kind);
 
+	@Deprecated
 	IResource create(String version, String kind, boolean strict);
 
 	/**
@@ -70,6 +73,19 @@ public interface IResourceFactory {
 	 */
 	<T extends IResource> T stub(String kind, String name);
 
+	/**
+	 * Stub out the given resource kind using a version determined by the factory
+	 * @param kind
+	 * @param name
+	 * @param namespace
+	 * @return
+	 */
 	<T extends IResource> T stub(String kind, String name, String namespace);
 
+	/**
+	 * The client given to resources when they are created 
+	 * @param client
+	 */
+	void setClient(IClient client);
+
 }

src/test/java/com/openshift/internal/restclient/DefaultClientTest.java

@@ -72,8 +72,8 @@ public void setUp() throws Exception{
 
 	private void givenAClient() throws MalformedURLException{
 		httpClient = mock(IHttpClient.class);
-		client = new DefaultClient(baseUrl, httpClient, null);
-		factory = new ResourceFactory(client);
+		factory = new ResourceFactory(null);
+		client = new DefaultClient(baseUrl, httpClient, null, factory);
 	}
 
 	private void givenAPodList(){