Enable configuring different platform types without setting profiles

Fixes #3040

Author: David Turanski

spring-cloud-dataflow-classic-docs/src/test/resources/rest-docs-config.yml

@@ -9,8 +9,15 @@ spring:
         collector:
           uri: http://localhost:${fakeMetricsCollector.port}
   autoconfigure:
-    exclude: org.springframework.cloud.deployer.spi.cloudfoundry.CloudFoundryDeployerAutoConfiguration,org.springframework.cloud.deployer.spi.kubernetes.KubernetesAutoConfiguration,org.springframework.cloud.dataflow.rest.client.config.DataFlowClientAutoConfiguration,org.springframework.boot.autoconfigure.session.SessionAutoConfiguration,org.springframework.cloud.dataflow.shell.autoconfigure.BaseShellAutoConfiguration
+    exclude: >-
+      org.springframework.cloud.deployer.spi.cloudfoundry.CloudFoundryDeployerAutoConfiguration,
+      org.springframework.cloud.deployer.spi.kubernetes.KubernetesAutoConfiguration,
+      org.springframework.cloud.dataflow.rest.client.config.DataFlowClientAutoConfiguration,
+      org.springframework.boot.autoconfigure.session.SessionAutoConfiguration,
+      org.springframework.cloud.dataflow.shell.autoconfigure.BaseShellAutoConfiguration,
+      org.springframework.cloud.dataflow.server.config.cloudfoundry.CloudFoundryTaskPlatformAutoConfiguration,
+      org.springframework.cloud.dataflow.server.config.kubernetes.KubernetesTaskPlatformAutoConfiguration
 maven:
   remoteRepositories:
     springRepo:
-      url: https://repo.spring.io/libs-snapshot
+      url: https://repo.spring.io/libs-snapshot

spring-cloud-dataflow-core/src/main/java/org/springframework/cloud/dataflow/core/AbstractPlatformProperties.java

@@ -0,0 +1,44 @@
+/*
+ * Copyright 2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.dataflow.core;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+ * @author David Turanski
+ **/
+public abstract class AbstractPlatformProperties<P> {
+	private Map<String, P> accounts = new LinkedHashMap<>();
+
+	public Map<String, P> getAccounts() {
+		return accounts;
+	}
+
+	public void setAccounts(Map<String, P> accounts) {
+		this.accounts = accounts;
+	}
+
+	public P accountProperties(String account) {
+		P properties = this.getAccounts().get(account);
+		if (properties == null) {
+			throw new IllegalArgumentException("Account " + account + " does not exist");
+		}
+		return properties;
+	}
+
+}

spring-cloud-dataflow-core/src/main/java/org/springframework/cloud/dataflow/core/AbstractTaskPlatformFactory.java

@@ -0,0 +1,62 @@
+/*
+ * Copyright 2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.dataflow.core;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * @author David Turanski
+ **/
+public abstract class AbstractTaskPlatformFactory<P extends AbstractPlatformProperties<?>> implements TaskPlatformFactory {
+
+	protected Logger logger = LoggerFactory.getLogger(this.getClass());
+
+	protected final P platformProperties;
+
+	private final String platformType;
+
+	protected AbstractTaskPlatformFactory(P platformProperties, String platformType){
+		this.platformProperties = platformProperties;
+		this.platformType = platformType;
+	}
+
+	@Override
+	public TaskPlatform createTaskPlatform() {
+		return new TaskPlatform(platformType, createLaunchers());
+	}
+
+	protected List<Launcher> createLaunchers() {
+		List<Launcher> launchers = new ArrayList<>();
+
+		for (String account : platformProperties.getAccounts().keySet()) {
+			try {
+				launchers.add(createLauncher(account));
+			}
+			catch (Exception e) {
+				logger.error("{} platform account [{}] could not be registered: {}",
+					platformType, account, e);
+				throw new IllegalStateException(e.getMessage(), e);
+			}
+		}
+
+		return launchers;
+	}
+}

spring-cloud-dataflow-core/src/main/java/org/springframework/cloud/dataflow/core/TaskPlatformFactory.java

@@ -0,0 +1,25 @@
+/*
+ * Copyright 2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.dataflow.core;
+
+/**
+ * @author David Turanski
+ **/
+public interface TaskPlatformFactory {
+	TaskPlatform createTaskPlatform();
+	Launcher createLauncher(String account);
+}

spring-cloud-dataflow-platform-cloudfoundry/src/main/java/org/springframework/cloud/dataflow/server/config/cloudfoundry/CloudFoundryPlatformClientProvider.java

@@ -0,0 +1,54 @@
+/*
+ * Copyright 2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.dataflow.server.config.cloudfoundry;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.cloudfoundry.client.CloudFoundryClient;
+import org.cloudfoundry.reactor.client.ReactorCloudFoundryClient;
+
+/**
+ * @author David Turanski
+ **/
+public class CloudFoundryPlatformClientProvider {
+
+	private final CloudFoundryPlatformProperties platformProperties;
+
+	private final CloudFoundryPlatformConnectionContextProvider connectionContextProvider;
+
+	private final CloudFoundryPlatformTokenProvider platformTokenProvider;
+
+	private final Map<String, CloudFoundryClient> cloudFoundryClients = new HashMap<>();
+
+	CloudFoundryPlatformClientProvider(
+		CloudFoundryPlatformProperties platformProperties,
+		CloudFoundryPlatformConnectionContextProvider connectionContextProvider,
+		CloudFoundryPlatformTokenProvider platformTokenProvider) {
+		this.platformProperties = platformProperties;
+		this.connectionContextProvider = connectionContextProvider;
+		this.platformTokenProvider = platformTokenProvider;
+	}
+
+	public CloudFoundryClient cloudFoundryClient(String account){
+			cloudFoundryClients.putIfAbsent(account, ReactorCloudFoundryClient.builder()
+				.connectionContext(connectionContextProvider.connectionContext(account))
+				.tokenProvider(platformTokenProvider.tokenProvider(account))
+				.build());
+			return cloudFoundryClients.get(account);
+	}
+}

spring-cloud-dataflow-platform-cloudfoundry/src/main/java/org/springframework/cloud/dataflow/server/config/cloudfoundry/CloudFoundryPlatformConnectionContextProvider.java

@@ -0,0 +1,50 @@
+/*
+ * Copyright 2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.dataflow.server.config.cloudfoundry;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.cloudfoundry.reactor.ConnectionContext;
+import org.cloudfoundry.reactor.DefaultConnectionContext;
+
+import org.springframework.cloud.deployer.spi.cloudfoundry.CloudFoundryConnectionProperties;
+
+/**
+ * @author David Turanski
+ **/
+public class CloudFoundryPlatformConnectionContextProvider {
+
+	private Map<String, ConnectionContext> connectionContexts = new HashMap<>();
+
+	private final CloudFoundryPlatformProperties platformProperties;
+
+	public CloudFoundryPlatformConnectionContextProvider(
+		CloudFoundryPlatformProperties platformProperties) {
+		this.platformProperties = platformProperties;
+	}
+
+	public ConnectionContext connectionContext(String account) {
+		CloudFoundryConnectionProperties connectionProperties =
+			this.platformProperties.accountProperties(account).getConnection();
+		this.connectionContexts.putIfAbsent(account, DefaultConnectionContext.builder()
+			.apiHost(connectionProperties.getUrl().getHost())
+			.skipSslValidation(connectionProperties.isSkipSslValidation())
+			.build());
+		return connectionContexts.get(account);
+	}
+}

spring-cloud-dataflow-platform-cloudfoundry/src/main/java/org/springframework/cloud/dataflow/server/config/cloudfoundry/CloudFoundryPlatformProperties.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,32 +16,22 @@
 
 package org.springframework.cloud.dataflow.server.config.cloudfoundry;
 
-import java.util.LinkedHashMap;
-import java.util.Map;
-
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.cloud.dataflow.core.AbstractPlatformProperties;
+import org.springframework.cloud.dataflow.server.config.cloudfoundry.CloudFoundryPlatformProperties.CloudFoundryProperties;
 import org.springframework.cloud.deployer.spi.cloudfoundry.CloudFoundryConnectionProperties;
 import org.springframework.cloud.deployer.spi.cloudfoundry.CloudFoundryDeploymentProperties;
 
 /**
  * @author Mark Pollack
  * @author Ilayaperumal Gopinathan
  * @author Donovan Muller
+ * @author David Turanski
  *
  * @since 2.0
  */
 @ConfigurationProperties("spring.cloud.dataflow.task.platform.cloudfoundry")
-public class CloudFoundryPlatformProperties {
-
-	private Map<String, CloudFoundryProperties> accounts = new LinkedHashMap<>();
-
-	public Map<String, CloudFoundryProperties> getAccounts() {
-		return accounts;
-	}
-
-	public void setAccounts(Map<String, CloudFoundryProperties> accounts) {
-		this.accounts = accounts;
-	}
+public class CloudFoundryPlatformProperties extends AbstractPlatformProperties<CloudFoundryProperties> {
 
 	public static class CloudFoundryProperties {
 

spring-cloud-dataflow-platform-cloudfoundry/src/main/java/org/springframework/cloud/dataflow/server/config/cloudfoundry/CloudFoundryPlatformTokenProvider.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright 2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.dataflow.server.config.cloudfoundry;
+
+import org.cloudfoundry.reactor.TokenProvider;
+import org.cloudfoundry.reactor.tokenprovider.PasswordGrantTokenProvider;
+
+import org.springframework.cloud.deployer.spi.cloudfoundry.CloudFoundryConnectionProperties;
+
+/**
+ * @author David Turanski
+ **/
+public class CloudFoundryPlatformTokenProvider {
+
+	private final CloudFoundryPlatformProperties platformProperties;
+
+	public CloudFoundryPlatformTokenProvider(
+		CloudFoundryPlatformProperties platformProperties) {
+		this.platformProperties = platformProperties;
+	}
+
+	public TokenProvider tokenProvider(String account) {
+		CloudFoundryConnectionProperties connectionProperties = platformProperties.accountProperties(account).getConnection();
+		return PasswordGrantTokenProvider.builder()
+			.username(connectionProperties.getUsername())
+			.password(connectionProperties.getPassword()).build();
+	}
+}