Made AbstractKubernetesDeployer methods protected for extension. Adde…

…d configureExternalPort method to aid reuse.

pom.xml

@@ -20,7 +20,7 @@
 		<java.version>1.8</java.version>
 		<kubernetes-client.version>1.3.83</kubernetes-client.version>
 		<kubernetes-assertions.version>2.2.110</kubernetes-assertions.version>
-		<spring-cloud-deployer-spi.version>1.0.2.RELEASE</spring-cloud-deployer-spi.version>
+		<spring-cloud-deployer-spi.version>1.0.3.BUILD-SNAPSHOT</spring-cloud-deployer-spi.version>
 	</properties>
 
 	<dependencies>

src/main/java/org/springframework/cloud/deployer/spi/kubernetes/AbstractKubernetesDeployer.java

@@ -51,7 +51,7 @@ public class AbstractKubernetesDeployer {
 	 * Creates a map of labels for a given ID. This will allow Kubernetes services
 	 * to "select" the right ReplicationControllers.
 	 */
-	Map<String, String> createIdMap(String appId, AppDeploymentRequest request, Integer instanceIndex) {
+	protected Map<String, String> createIdMap(String appId, AppDeploymentRequest request, Integer instanceIndex) {
 		//TODO: handling of app and group ids
 		Map<String, String> map = new HashMap<>();
 		map.put(SPRING_APP_KEY, appId);
@@ -64,7 +64,7 @@ Map<String, String> createIdMap(String appId, AppDeploymentRequest request, Inte
 		return map;
 	}
 
-	String createDeploymentId(AppDeploymentRequest request) {
+	protected String createDeploymentId(AppDeploymentRequest request) {
 		String groupId = request.getDeploymentProperties().get(AppDeployer.GROUP_PROPERTY_KEY);
 		String deploymentId;
 		if (groupId == null) {
@@ -77,7 +77,7 @@ String createDeploymentId(AppDeploymentRequest request) {
 		return deploymentId.replace('.', '-');
 	}
 
-	AppStatus buildAppStatus(KubernetesDeployerProperties properties, String id, PodList list) {
+	protected AppStatus buildAppStatus(KubernetesDeployerProperties properties, String id, PodList list) {
 		AppStatus.Builder statusBuilder = AppStatus.of(id);
 		if (list == null) {
 			statusBuilder.with(new KubernetesAppInstanceStatus(id, null, properties));
@@ -89,7 +89,7 @@ AppStatus buildAppStatus(KubernetesDeployerProperties properties, String id, Pod
 		return statusBuilder.build();
 	}
 
-	Map<String, Quantity> deduceResourceLimits(KubernetesDeployerProperties properties, AppDeploymentRequest request) {
+	protected Map<String, Quantity> deduceResourceLimits(KubernetesDeployerProperties properties, AppDeploymentRequest request) {
 		String memOverride = request.getDeploymentProperties().get("spring.cloud.deployer.kubernetes.memory");
 		if (memOverride == null)
 			memOverride = properties.getMemory();

src/main/java/org/springframework/cloud/deployer/spi/kubernetes/KubernetesAppDeployer.java

@@ -81,11 +81,7 @@ public String deploy(AppDeploymentRequest request) {
 				throw new IllegalStateException(String.format("App '%s' is already deployed", appId));
 			}
 
-			int externalPort = 8080;
-			Map<String, String> parameters = request.getDefinition().getProperties();
-			if (parameters.containsKey(SERVER_PORT_KEY)) {
-				externalPort = Integer.valueOf(parameters.get(SERVER_PORT_KEY));
-			}
+			int externalPort = configureExternalPort(request);
 
 			String countProperty = request.getDeploymentProperties().get(COUNT_PROPERTY_KEY);
 			int count = (countProperty != null) ? Integer.parseInt(countProperty) : 1;
@@ -118,7 +114,6 @@ public String deploy(AppDeploymentRequest request) {
 		}
 	}
 
-
 	@Override
 	public void undeploy(String appId) {
 		logger.debug("Undeploying app: {}", appId);
@@ -186,6 +181,16 @@ public AppStatus status(String appId) {
 		return status;
 	}
 
+	protected int configureExternalPort(final AppDeploymentRequest request) {
+		int externalPort = 8080;
+		Map<String, String> parameters = request.getDefinition().getProperties();
+		if (parameters.containsKey(SERVER_PORT_KEY)) {
+			externalPort = Integer.valueOf(parameters.get(SERVER_PORT_KEY));
+		}
+
+		return externalPort;
+	}
+
 	private ReplicationController createReplicationController(
 			String appId, AppDeploymentRequest request,
 			Map<String, String> idMap, int externalPort, int replicas, Integer instanceIndex) {