SpringCloud/spring-cloud-function
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Renamed deployer-new to deployer, removed old deployer

Browse Source
This commit is contained in:
Oleg Zhurakousky
2019-08-12 17:26:22 +02:00
parent 17ef359b60
commit ed2fa9bb7a
75 changed files with 462 additions and 463 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pom.xml
View File

@@ -60,7 +60,6 @@
<module>spring-cloud-starter-function-webflux</module> <module>spring-cloud-starter-function-webflux</module>
<module>spring-cloud-function-samples</module> <module>spring-cloud-function-samples</module>
<module>spring-cloud-function-deployer</module> <module>spring-cloud-function-deployer</module>
<module>spring-cloud-function-deployer-new</module>
<module>spring-cloud-function-adapters</module> <module>spring-cloud-function-adapters</module>
<module>spring-cloud-function-kotlin</module> <module>spring-cloud-function-kotlin</module>
<module>docs</module> <module>docs</module>

117
spring-cloud-function-deployer-new/pom.xml
View File

@@ -1,117 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-cloud-function-deployer-new</artifactId>
<packaging>jar</packaging>
<name>spring-cloud-function-deployer-new</name>
<description>Spring Cloud Function Web Support</description>
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-parent</artifactId>
<version>3.0.0.BUILD-SNAPSHOT</version>
</parent>
<properties>
<java.version>1.8</java.version>
</properties>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-loader</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-context</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
<optional>true</optional>
</dependency>
</dependencies>
<build>
<plugins>
<!-- <plugin> -->
<!-- <groupId>org.springframework.boot</groupId> -->
<!-- <artifactId>spring-boot-maven-plugin</artifactId> -->
<!-- <dependencies> -->
<!-- <dependency> -->
<!-- <groupId>org.springframework.boot.experimental</groupId> -->
<!-- <artifactId>spring-boot-thin-layout</artifactId> -->
<!-- <version>${wrapper.version}</version> -->
<!-- </dependency> -->
<!-- </dependencies> -->
<!-- </plugin> -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<version>3.0.1</version>
<configuration>
<localRepositoryPath>${project.build.directory}/local-repo
</localRepositoryPath>
</configuration>
<executions>
<execution>
<id>prepare-test</id>
<phase>test-compile</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<cloneProjectsTo>${project.build.directory}/it
</cloneProjectsTo>
<settingsFile>src/it/settings.xml</settingsFile>
<addTestClassPath>true</addTestClassPath>
<streamLogs>true</streamLogs>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<repositories>
<repository>
<id>spring-milestones</id>
<name>Spring Milestones</name>
<url>https://repo.spring.io/milestone</url>
</repository>
<repository>
<id>spring-snapshots</id>
<name>Spring Snapshots</name>
<url>https://repo.spring.io/snapshot</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>spring-milestones</id>
<name>Spring Milestones</name>
<url>https://repo.spring.io/milestone</url>
</pluginRepository>
<pluginRepository>
<id>spring-snapshots</id>
<name>Spring Snapshots</name>
<url>https://repo.spring.io/snapshot</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
</project>

95
spring-cloud-function-deployer-new/src/main/java/org/springframework/cloud/function/deployer/FunctionDeployerConfiguration.java
View File

@@ -1,95 +0,0 @@
/*
* Copyright 2017-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
*
* https://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.function.deployer;
import java.io.File;
import java.io.IOException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.boot.ApplicationArguments;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.loader.archive.Archive;
import org.springframework.boot.loader.archive.JarFileArchive;
import org.springframework.cloud.function.context.FunctionRegistry;
import org.springframework.context.SmartLifecycle;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
/**
*
* @author Oleg Zhurakousky
*
* @since 3.0
*
*/
@Configuration(proxyBeanMethods = false)
@EnableConfigurationProperties(FunctionProperties.class)
public class FunctionDeployerConfiguration {
private static Log logger = LogFactory.getLog(FunctionDeployerConfiguration.class);
@Bean
SmartLifecycle functionArchiveDeployer(FunctionProperties functionProperties,
FunctionRegistry functionRegistry, ApplicationArguments arguments) {
Archive archive = null;
try {
archive = new JarFileArchive(new File(functionProperties.getLocation()));
}
catch (IOException e) {
throw new IllegalStateException("Failed to create archive: " + functionProperties.getLocation(), e);
}
FunctionArchiveDeployer deployer = new FunctionArchiveDeployer(archive);
return new SmartLifecycle() {
private boolean running;
@Override
public void stop() {
if (logger.isInfoEnabled()) {
logger.info("Undeploying archive: " + functionProperties.getLocation());
}
deployer.undeploy();
if (logger.isInfoEnabled()) {
logger.info("Successfully undeployed archive: " + functionProperties.getLocation());
}
this.running = false;
}
@Override
public void start() {
if (logger.isInfoEnabled()) {
logger.info("Deploying archive: " + functionProperties.getLocation());
}
deployer.deploy(functionRegistry, functionProperties, arguments.getSourceArgs());
this.running = true;
if (logger.isInfoEnabled()) {
logger.info("Successfully deployed archive: " + functionProperties.getLocation());
}
}
@Override
public boolean isRunning() {
return this.running;
}
};
}
}

78
spring-cloud-function-deployer-new/src/main/java/org/springframework/cloud/function/deployer/FunctionProperties.java
View File

@@ -1,78 +0,0 @@
/*
* Copyright 2017-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
*
* https://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.function.deployer;
import javax.annotation.PostConstruct;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;
/**
* Configuration properties for deciding how to locate the functional class to execute.
*
* @author Eric Bottard
*/
@ConfigurationProperties("spring.cloud.function")
public class FunctionProperties {
/**
* Location of jar archive containing the supplier/function/consumer class or bean to run.
*/
private String location;
/**
* The name of the function to be looked up from the FunctionCatalog (e.g., bean name).
*/
private String functionName;
/**
* The name of the function class tyo be instantiated and loaded into FunctionCatalog. The name of the
* function will be decapitalized simple name of this class.
*/
private String functionClass;
public void setFunctionClass(String functionClass) {
this.functionClass = functionClass;
}
public String getFunctionClass() {
return this.functionClass;
}
public void setFunctionName(String functionName) {
this.functionName = StringUtils.hasText(functionName) ? functionName : "";
}
public String getFunctionName() {
return this.functionName;
}
public String getLocation() {
return this.location;
}
public void setLocation(String location) {
this.location = location;
}
@PostConstruct
public void init() {
Assert.notNull(this.location, "No archive location provided, please configure spring.cloud.function.location as a jar or directory.");
}
}

0
spring-cloud-function-deployer/.jdk8 → spring-cloud-function-deployer-old/.jdk8
View File

0
spring-cloud-function-deployer/README.md → spring-cloud-function-deployer-old/README.md
View File

155
spring-cloud-function-deployer-old/pom.xml Normal file
View File

@@ -0,0 +1,155 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-cloud-function-deployer-old</artifactId>
<packaging>jar</packaging>
<name>spring-cloud-function-deployer</name>
<description>Spring Cloud Function Web Support</description>
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-parent</artifactId>
<version>3.0.0.BUILD-SNAPSHOT</version>
</parent>
<properties>
<wrapper.version>1.0.10.RELEASE</wrapper.version>
<spring.cloud.deployer.version>2.0.2.BUILD-SNAPSHOT</spring.cloud.deployer.version>
</properties>
<dependencies>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-context</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-loader</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-deployer-resource-maven</artifactId>
<version>${spring.cloud.deployer.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-deployer-resource-support</artifactId>
<version>${spring.cloud.deployer.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<dependencies>
<dependency>
<groupId>org.springframework.boot.experimental</groupId>
<artifactId>spring-boot-thin-layout</artifactId>
<version>${wrapper.version}</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<version>3.0.1</version>
<configuration>
<localRepositoryPath>${project.build.directory}/local-repo
</localRepositoryPath>
</configuration>
<executions>
<execution>
<id>prepare-test</id>
<phase>test-compile</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<cloneProjectsTo>${project.build.directory}/it
</cloneProjectsTo>
<settingsFile>src/it/settings.xml</settingsFile>
<addTestClassPath>true</addTestClassPath>
<streamLogs>true</streamLogs>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
<pluginManagement>
<plugins>
<!--This plugin's configuration is used to store Eclipse m2e settings
only. It has no influence on the Maven build itself. -->
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>
org.apache.maven.plugins
</groupId>
<artifactId>
maven-invoker-plugin
</artifactId>
<versionRange>
[1.10,)
</versionRange>
<goals>
<goal>run</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore></ignore>
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
<profiles>
<profile>
<id>invoke</id>
<activation>
<file>
<missing>target/it/flux/pom.xml</missing>
</file>
</activation>
<properties>
<skip.invoke>false</skip.invoke>
</properties>
</profile>
</profiles>
</project>

0
spring-cloud-function-deployer/src/it/flux/pom.xml → spring-cloud-function-deployer-old/src/it/flux/pom.xml
View File

0
spring-cloud-function-deployer/src/it/flux/src/main/java/com/example/functions/FunctionApp.java → spring-cloud-function-deployer-old/src/it/flux/src/main/java/com/example/functions/FunctionApp.java
View File

0
spring-cloud-function-deployer-new/src/it/settings.xml → spring-cloud-function-deployer-old/src/it/settings.xml
View File

0
spring-cloud-function-deployer/src/it/support/pom.xml → spring-cloud-function-deployer-old/src/it/support/pom.xml
View File

0
spring-cloud-function-deployer/src/it/support/src/main/java/com/example/functions/DoubleLogger.java → spring-cloud-function-deployer-old/src/it/support/src/main/java/com/example/functions/DoubleLogger.java
View File

0
spring-cloud-function-deployer/src/it/support/src/main/java/com/example/functions/Emitter.java → spring-cloud-function-deployer-old/src/it/support/src/main/java/com/example/functions/Emitter.java
View File

0
spring-cloud-function-deployer/src/it/support/src/main/java/com/example/functions/FunctionApp.java → spring-cloud-function-deployer-old/src/it/support/src/main/java/com/example/functions/FunctionApp.java
View File

0
spring-cloud-function-deployer/src/it/support/src/main/java/com/example/functions/LengthCounter.java → spring-cloud-function-deployer-old/src/it/support/src/main/java/com/example/functions/LengthCounter.java
View File

0
spring-cloud-function-deployer/src/main/java/org/springframework/cloud/function/deployer/ApplicationBootstrap.java → spring-cloud-function-deployer-old/src/main/java/org/springframework/cloud/function/deployer/ApplicationBootstrap.java
View File

0
spring-cloud-function-deployer/src/main/java/org/springframework/cloud/function/deployer/ApplicationRunner.java → spring-cloud-function-deployer-old/src/main/java/org/springframework/cloud/function/deployer/ApplicationRunner.java
View File

0
spring-cloud-function-deployer/src/main/java/org/springframework/cloud/function/deployer/ContextRunner.java → spring-cloud-function-deployer-old/src/main/java/org/springframework/cloud/function/deployer/ContextRunner.java
View File

0
spring-cloud-function-deployer/src/main/java/org/springframework/cloud/function/deployer/EnableFunctionDeployer.java → spring-cloud-function-deployer-old/src/main/java/org/springframework/cloud/function/deployer/EnableFunctionDeployer.java
View File

0
spring-cloud-function-deployer/src/main/java/org/springframework/cloud/function/deployer/FunctionApplication.java → spring-cloud-function-deployer-old/src/main/java/org/springframework/cloud/function/deployer/FunctionApplication.java
View File

0
spring-cloud-function-deployer/src/main/java/org/springframework/cloud/function/deployer/FunctionCreatorConfiguration.java → spring-cloud-function-deployer-old/src/main/java/org/springframework/cloud/function/deployer/FunctionCreatorConfiguration.java
View File

66
spring-cloud-function-deployer-old/src/main/java/org/springframework/cloud/function/deployer/FunctionDeployerConfiguration.java Normal file
View File

@@ -0,0 +1,66 @@
/*
* Copyright 2012-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
*
* https://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.function.deployer;
import java.util.HashMap;
import java.util.Map;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.cloud.deployer.resource.maven.MavenProperties;
import org.springframework.cloud.deployer.resource.maven.MavenResource;
import org.springframework.cloud.deployer.resource.maven.MavenResourceLoader;
import org.springframework.cloud.deployer.resource.support.DelegatingResourceLoader;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.springframework.core.io.ResourceLoader;
/**
* @author Dave Syer
*
*/
@Configuration
@ConditionalOnProperty(prefix = "function.deployer", name = "enabled", matchIfMissing = true)
@EnableConfigurationProperties
@Import(FunctionCreatorConfiguration.class)
public class FunctionDeployerConfiguration {
@Bean
@ConfigurationProperties("maven")
public MavenProperties mavenProperties() {
return new MavenProperties();
}
@Bean
@ConfigurationProperties("function")
public FunctionProperties functionProperties() {
return new FunctionProperties();
}
@Bean
@ConditionalOnMissingBean(DelegatingResourceLoader.class)
public DelegatingResourceLoader delegatingResourceLoader(
MavenProperties mavenProperties) {
Map<String, ResourceLoader> loaders = new HashMap<>();
loaders.put(MavenResource.URI_SCHEME, new MavenResourceLoader(mavenProperties));
return new DelegatingResourceLoader(loaders);
}
}

100
spring-cloud-function-deployer-old/src/main/java/org/springframework/cloud/function/deployer/FunctionProperties.java Normal file
View File

@@ -0,0 +1,100 @@
/*
* Copyright 2012-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
*
* https://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.function.deployer;
import java.util.ArrayList;
import java.util.List;
import javax.annotation.PostConstruct;
import org.springframework.util.StringUtils;
/**
* Configuration properties for deciding how to locate the functional class to execute.
*
* @author Eric Bottard
*/
public class FunctionProperties {
/**
* Location(s) of jar archives containing the supplier/function/consumer class to run.
*/
private String[] location = new String[0];
/**
* The bean name or fully qualified class name of the supplier/function/consumer to
* run.
*/
private String[] bean = new String[0];
/**
* Optional main class from which to build a Spring application context.
*/
private String main;
public static String functionName(String name) {
if (!name.contains(",")) {
return "function0";
}
List<String> names = new ArrayList<>();
for (int i = 0; i <= StringUtils.countOccurrencesOf(name, ","); i++) {
names.add("function" + i);
}
return StringUtils.collectionToDelimitedString(names, "|");
}
public static String functionName(int value) {
return "function" + value;
}
public String getName() {
return functionName(StringUtils.arrayToDelimitedString(this.bean, ","));
}
public String[] getBean() {
return this.bean;
}
public void setBean(String[] bean) {
this.bean = bean;
}
public String[] getLocation() {
return this.location;
}
public void setLocation(String[] location) {
this.location = location;
}
public String getMain() {
return this.main;
}
public void setMain(String main) {
this.main = main;
}
@PostConstruct
public void init() {
if (this.location.length == 0) {
throw new IllegalStateException(
"No archive location provided, please configure function.location as a jar or directory.");
}
}
}

0
spring-cloud-function-deployer/src/main/java/org/springframework/cloud/function/deployer/SingleEntryFunctionRegistry.java → spring-cloud-function-deployer-old/src/main/java/org/springframework/cloud/function/deployer/SingleEntryFunctionRegistry.java
View File

0
spring-cloud-function-deployer/src/test/java/org/springframework/cloud/function/deployer/AdhocTestSuite.java → spring-cloud-function-deployer-old/src/test/java/org/springframework/cloud/function/deployer/AdhocTestSuite.java
View File

0
spring-cloud-function-deployer/src/test/java/org/springframework/cloud/function/deployer/ApplicationRunnerTests.java → spring-cloud-function-deployer-old/src/test/java/org/springframework/cloud/function/deployer/ApplicationRunnerTests.java
View File

0
spring-cloud-function-deployer/src/test/java/org/springframework/cloud/function/deployer/ContextRunnerTests.java → spring-cloud-function-deployer-old/src/test/java/org/springframework/cloud/function/deployer/ContextRunnerTests.java
View File

0
spring-cloud-function-deployer/src/test/java/org/springframework/cloud/function/deployer/FunctionCreatorConfigurationTests.java → spring-cloud-function-deployer-old/src/test/java/org/springframework/cloud/function/deployer/FunctionCreatorConfigurationTests.java
View File

0
spring-cloud-function-deployer/src/test/java/org/springframework/cloud/function/deployer/SingleEntryFunctionRegistryTests.java → spring-cloud-function-deployer-old/src/test/java/org/springframework/cloud/function/deployer/SingleEntryFunctionRegistryTests.java
View File

0
spring-cloud-function-deployer/src/test/java/org/springframework/cloud/function/deployer/SpringFunctionAppConfigurationTests.java → spring-cloud-function-deployer-old/src/test/java/org/springframework/cloud/function/deployer/SpringFunctionAppConfigurationTests.java
View File

0
spring-cloud-function-deployer/src/test/java/org/springframework/cloud/function/deployer/SpringFunctionAppExplodedConfigurationTests.java → spring-cloud-function-deployer-old/src/test/java/org/springframework/cloud/function/deployer/SpringFunctionAppExplodedConfigurationTests.java
View File

0
spring-cloud-function-deployer/src/test/java/org/springframework/cloud/function/deployer/SpringFunctionFluxConfigurationTests.java → spring-cloud-function-deployer-old/src/test/java/org/springframework/cloud/function/deployer/SpringFunctionFluxConfigurationTests.java
View File

0
spring-cloud-function-deployer/src/test/java/org/springframework/cloud/function/test/Doubler.java → spring-cloud-function-deployer-old/src/test/java/org/springframework/cloud/function/test/Doubler.java
View File

0
spring-cloud-function-deployer/src/test/java/org/springframework/cloud/function/test/Frenchizer.java → spring-cloud-function-deployer-old/src/test/java/org/springframework/cloud/function/test/Frenchizer.java
View File

0
spring-cloud-function-deployer/src/test/java/org/springframework/cloud/function/test/FunctionApp.java → spring-cloud-function-deployer-old/src/test/java/org/springframework/cloud/function/test/FunctionApp.java
View File

0
spring-cloud-function-deployer/src/test/java/org/springframework/cloud/function/test/FunctionInitializer.java → spring-cloud-function-deployer-old/src/test/java/org/springframework/cloud/function/test/FunctionInitializer.java
View File

0
spring-cloud-function-deployer/src/test/java/org/springframework/cloud/function/test/FunctionRegistrar.java → spring-cloud-function-deployer-old/src/test/java/org/springframework/cloud/function/test/FunctionRegistrar.java
View File

0
spring-cloud-function-deployer/src/test/java/org/springframework/cloud/function/test/NumberEmitter.java → spring-cloud-function-deployer-old/src/test/java/org/springframework/cloud/function/test/NumberEmitter.java
View File

0
spring-cloud-function-deployer/src/test/java/org/springframework/cloud/function/test/Printer.java → spring-cloud-function-deployer-old/src/test/java/org/springframework/cloud/function/test/Printer.java
View File

0
spring-cloud-function-deployer/src/test/java/org/springframework/cloud/function/test/SpringDoubler.java → spring-cloud-function-deployer-old/src/test/java/org/springframework/cloud/function/test/SpringDoubler.java
View File

0
spring-cloud-function-deployer/src/test/resources/app/META-INF/MANIFEST.MF → spring-cloud-function-deployer-old/src/test/resources/app/META-INF/MANIFEST.MF
View File

0
spring-cloud-function-deployer-new/.gitignore → spring-cloud-function-deployer/.gitignore vendored
View File

0
spring-cloud-function-deployer-new/.mvn/wrapper/MavenWrapperDownloader.java → spring-cloud-function-deployer/.mvn/wrapper/MavenWrapperDownloader.java vendored
View File

0
spring-cloud-function-deployer-new/.mvn/wrapper/maven-wrapper.jar → spring-cloud-function-deployer/.mvn/wrapper/maven-wrapper.jar vendored
View File

0
spring-cloud-function-deployer-new/.mvn/wrapper/maven-wrapper.properties → spring-cloud-function-deployer/.mvn/wrapper/maven-wrapper.properties vendored
View File

0
spring-cloud-function-deployer-new/mvnw → spring-cloud-function-deployer/mvnw vendored
View File

0
spring-cloud-function-deployer-new/mvnw.cmd → spring-cloud-function-deployer/mvnw.cmd vendored
View File

152
spring-cloud-function-deployer/pom.xml
View File

@@ -1,48 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>spring-cloud-function-deployer</artifactId> <artifactId>spring-cloud-function-deployer</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>spring-cloud-function-deployer</name> <name>spring-cloud-function-deployer-new</name>
<description>Spring Cloud Function Web Support</description> <description>Spring Cloud Function Web Support</description>
<parent> <parent>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-parent</artifactId> <artifactId>spring-cloud-function-parent</artifactId>
<version>3.0.0.BUILD-SNAPSHOT</version> <version>3.0.0.BUILD-SNAPSHOT</version>
</parent> </parent>
<properties> <properties>
<wrapper.version>1.0.10.RELEASE</wrapper.version> <java.version>1.8</java.version>
<spring.cloud.deployer.version>2.0.2.BUILD-SNAPSHOT</spring.cloud.deployer.version>
</properties> </properties>
<dependencies> <dependencies>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-context</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
<optional>true</optional>
</dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-loader</artifactId> <artifactId>spring-boot-loader</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-cloud-deployer-resource-maven</artifactId> <artifactId>spring-boot-starter</artifactId>
<version>${spring.cloud.deployer.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-deployer-resource-support</artifactId> <artifactId>spring-cloud-function-context</artifactId>
<version>${spring.cloud.deployer.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
@@ -51,29 +37,24 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId> <artifactId>spring-boot-configuration-processor</artifactId>
<scope>test</scope> <optional>true</optional>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
<plugin> <!-- <plugin> -->
<groupId>org.springframework.boot</groupId> <!-- <groupId>org.springframework.boot</groupId> -->
<artifactId>spring-boot-maven-plugin</artifactId> <!-- <artifactId>spring-boot-maven-plugin</artifactId> -->
<dependencies> <!-- <dependencies> -->
<dependency> <!-- <dependency> -->
<groupId>org.springframework.boot.experimental</groupId> <!-- <groupId>org.springframework.boot.experimental</groupId> -->
<artifactId>spring-boot-thin-layout</artifactId> <!-- <artifactId>spring-boot-thin-layout</artifactId> -->
<version>${wrapper.version}</version> <!-- <version>${wrapper.version}</version> -->
</dependency> <!-- </dependency> -->
</dependencies> <!-- </dependencies> -->
</plugin> <!-- </plugin> -->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId> <artifactId>maven-invoker-plugin</artifactId>
@@ -100,56 +81,37 @@
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
<pluginManagement>
<plugins>
<!--This plugin's configuration is used to store Eclipse m2e settings
only. It has no influence on the Maven build itself. -->
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>
org.apache.maven.plugins
</groupId>
<artifactId>
maven-invoker-plugin
</artifactId>
<versionRange>
[1.10,)
</versionRange>
<goals>
<goal>run</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore></ignore>
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build> </build>
<profiles> <repositories>
<profile> <repository>
<id>invoke</id> <id>spring-milestones</id>
<activation> <name>Spring Milestones</name>
<file> <url>https://repo.spring.io/milestone</url>
<missing>target/it/flux/pom.xml</missing> </repository>
</file> <repository>
</activation> <id>spring-snapshots</id>
<properties> <name>Spring Snapshots</name>
<skip.invoke>false</skip.invoke> <url>https://repo.spring.io/snapshot</url>
</properties> <snapshots>
</profile> <enabled>true</enabled>
</profiles> </snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>spring-milestones</id>
<name>Spring Milestones</name>
<url>https://repo.spring.io/milestone</url>
</pluginRepository>
<pluginRepository>
<id>spring-snapshots</id>
<name>Spring Snapshots</name>
<url>https://repo.spring.io/snapshot</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
</project> </project>

0
spring-cloud-function-deployer-new/src/it/bootapp-multi/pom.xml → spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml
View File

0
spring-cloud-function-deployer-new/src/it/bootapp-multi/src/main/java/function/example/MyFn.java → spring-cloud-function-deployer/src/it/bootapp-multi/src/main/java/function/example/MyFn.java
View File

0
spring-cloud-function-deployer-new/src/it/bootapp-multi/src/main/java/function/example/RepeaterApplication.java → spring-cloud-function-deployer/src/it/bootapp-multi/src/main/java/function/example/RepeaterApplication.java
View File

0
spring-cloud-function-deployer-new/src/it/bootapp-with-javax/pom.xml → spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml
View File

0
spring-cloud-function-deployer-new/src/it/bootapp-with-javax/src/main/java/function/example/SimpleFunctionAppApplication.java → spring-cloud-function-deployer/src/it/bootapp-with-javax/src/main/java/function/example/SimpleFunctionAppApplication.java
View File

0
spring-cloud-function-deployer-new/src/it/bootapp-with-javax/src/main/java/function/example/UpperCaseFunction.java → spring-cloud-function-deployer/src/it/bootapp-with-javax/src/main/java/function/example/UpperCaseFunction.java
View File

0
spring-cloud-function-deployer-new/src/it/bootapp-with-scf/pom.xml → spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml
View File

0
spring-cloud-function-deployer-new/src/it/bootapp-with-scf/src/main/java/function/example/SimpleFunctionAppApplication.java → spring-cloud-function-deployer/src/it/bootapp-with-scf/src/main/java/function/example/SimpleFunctionAppApplication.java
View File

0
spring-cloud-function-deployer-new/src/it/bootapp-with-scf/src/main/java/function/example/UpperCaseFunction.java → spring-cloud-function-deployer/src/it/bootapp-with-scf/src/main/java/function/example/UpperCaseFunction.java
View File

0
spring-cloud-function-deployer-new/src/it/bootapp/pom.xml → spring-cloud-function-deployer/src/it/bootapp/pom.xml
View File

0
spring-cloud-function-deployer-new/src/it/bootapp/src/main/java/function/example/SimpleFunctionAppApplication.java → spring-cloud-function-deployer/src/it/bootapp/src/main/java/function/example/SimpleFunctionAppApplication.java
View File

0
spring-cloud-function-deployer-new/src/it/bootapp/src/main/java/function/example/UpperCaseFunction.java → spring-cloud-function-deployer/src/it/bootapp/src/main/java/function/example/UpperCaseFunction.java
View File

0
spring-cloud-function-deployer-new/src/it/bootjar-multi/pom.xml → spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml
View File

0
spring-cloud-function-deployer-new/src/it/bootjar-multi/src/main/java/function/example/Repeater.java → spring-cloud-function-deployer/src/it/bootjar-multi/src/main/java/function/example/Repeater.java
View File

0
spring-cloud-function-deployer-new/src/it/bootjar/pom.xml → spring-cloud-function-deployer/src/it/bootjar/pom.xml
View File

0
spring-cloud-function-deployer-new/src/it/bootjar/src/main/java/function/example/SimpleFunctionAppApplication.java → spring-cloud-function-deployer/src/it/bootjar/src/main/java/function/example/SimpleFunctionAppApplication.java
View File

0
spring-cloud-function-deployer-new/src/it/bootjar/src/main/java/function/example/UpperCaseFunction.java → spring-cloud-function-deployer/src/it/bootjar/src/main/java/function/example/UpperCaseFunction.java
View File

0
spring-cloud-function-deployer-new/src/it/bootjarnostart/pom.xml → spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml
View File

0
spring-cloud-function-deployer-new/src/it/bootjarnostart/src/main/java/function/example/UpperCaseFunction.java → spring-cloud-function-deployer/src/it/bootjarnostart/src/main/java/function/example/UpperCaseFunction.java
View File

0
spring-cloud-function-deployer-new/src/it/simplestjar/pom.xml → spring-cloud-function-deployer/src/it/simplestjar/pom.xml
View File

0
spring-cloud-function-deployer-new/src/it/simplestjar/src/main/java/function/example/UpperCaseFunction.java → spring-cloud-function-deployer/src/it/simplestjar/src/main/java/function/example/UpperCaseFunction.java
View File

0
spring-cloud-function-deployer-new/src/main/java/org/springframework/cloud/function/deployer/DeployerContextUtils.java → spring-cloud-function-deployer/src/main/java/org/springframework/cloud/function/deployer/DeployerContextUtils.java
View File

0
spring-cloud-function-deployer-new/src/main/java/org/springframework/cloud/function/deployer/FunctionArchiveDeployer.java → spring-cloud-function-deployer/src/main/java/org/springframework/cloud/function/deployer/FunctionArchiveDeployer.java
View File

95
spring-cloud-function-deployer/src/main/java/org/springframework/cloud/function/deployer/FunctionDeployerConfiguration.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2019 the original author or authors. * Copyright 2017-2019 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -16,51 +16,80 @@
package org.springframework.cloud.function.deployer; package org.springframework.cloud.function.deployer;
import java.util.HashMap; import java.io.File;
import java.util.Map; import java.io.IOException;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.apache.commons.logging.Log;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.apache.commons.logging.LogFactory;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.ApplicationArguments;
import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.cloud.deployer.resource.maven.MavenProperties; import org.springframework.boot.loader.archive.Archive;
import org.springframework.cloud.deployer.resource.maven.MavenResource; import org.springframework.boot.loader.archive.JarFileArchive;
import org.springframework.cloud.deployer.resource.maven.MavenResourceLoader; import org.springframework.cloud.function.context.FunctionRegistry;
import org.springframework.cloud.deployer.resource.support.DelegatingResourceLoader; import org.springframework.context.SmartLifecycle;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.springframework.core.io.ResourceLoader;
/** /**
* @author Dave Syer *
* @author Oleg Zhurakousky
*
* @since 3.0
* *
*/ */
@Configuration @Configuration(proxyBeanMethods = false)
@ConditionalOnProperty(prefix = "function.deployer", name = "enabled", matchIfMissing = true) @EnableConfigurationProperties(FunctionProperties.class)
@EnableConfigurationProperties
@Import(FunctionCreatorConfiguration.class)
public class FunctionDeployerConfiguration { public class FunctionDeployerConfiguration {
@Bean private static Log logger = LogFactory.getLog(FunctionDeployerConfiguration.class);
@ConfigurationProperties("maven")
public MavenProperties mavenProperties() {
return new MavenProperties();
}
@Bean @Bean
@ConfigurationProperties("function") SmartLifecycle functionArchiveDeployer(FunctionProperties functionProperties,
public FunctionProperties functionProperties() { FunctionRegistry functionRegistry, ApplicationArguments arguments) {
return new FunctionProperties();
}
@Bean Archive archive = null;
@ConditionalOnMissingBean(DelegatingResourceLoader.class) try {
public DelegatingResourceLoader delegatingResourceLoader( archive = new JarFileArchive(new File(functionProperties.getLocation()));
MavenProperties mavenProperties) { }
Map<String, ResourceLoader> loaders = new HashMap<>(); catch (IOException e) {
loaders.put(MavenResource.URI_SCHEME, new MavenResourceLoader(mavenProperties)); throw new IllegalStateException("Failed to create archive: " + functionProperties.getLocation(), e);
return new DelegatingResourceLoader(loaders); }
FunctionArchiveDeployer deployer = new FunctionArchiveDeployer(archive);
return new SmartLifecycle() {
private boolean running;
@Override
public void stop() {
if (logger.isInfoEnabled()) {
logger.info("Undeploying archive: " + functionProperties.getLocation());
}
deployer.undeploy();
if (logger.isInfoEnabled()) {
logger.info("Successfully undeployed archive: " + functionProperties.getLocation());
}
this.running = false;
}
@Override
public void start() {
if (logger.isInfoEnabled()) {
logger.info("Deploying archive: " + functionProperties.getLocation());
}
deployer.deploy(functionRegistry, functionProperties, arguments.getSourceArgs());
this.running = true;
if (logger.isInfoEnabled()) {
logger.info("Successfully deployed archive: " + functionProperties.getLocation());
}
}
@Override
public boolean isRunning() {
return this.running;
}
};
} }
} }

66
spring-cloud-function-deployer/src/main/java/org/springframework/cloud/function/deployer/FunctionProperties.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2019 the original author or authors. * Copyright 2017-2019 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -16,11 +16,10 @@
package org.springframework.cloud.function.deployer; package org.springframework.cloud.function.deployer;
import java.util.ArrayList;
import java.util.List;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.util.Assert;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
/** /**
@@ -28,73 +27,52 @@ import org.springframework.util.StringUtils;
* *
* @author Eric Bottard * @author Eric Bottard
*/ */
@ConfigurationProperties("spring.cloud.function")
public class FunctionProperties { public class FunctionProperties {
/** /**
* Location(s) of jar archives containing the supplier/function/consumer class to run. * Location of jar archive containing the supplier/function/consumer class or bean to run.
*/ */
private String[] location = new String[0]; private String location;
/** /**
* The bean name or fully qualified class name of the supplier/function/consumer to * The name of the function to be looked up from the FunctionCatalog (e.g., bean name).
* run.
*/ */
private String[] bean = new String[0]; private String functionName;
/** /**
* Optional main class from which to build a Spring application context. * The name of the function class tyo be instantiated and loaded into FunctionCatalog. The name of the
* function will be decapitalized simple name of this class.
*/ */
private String main; private String functionClass;
public static String functionName(String name) { public void setFunctionClass(String functionClass) {
if (!name.contains(",")) { this.functionClass = functionClass;
return "function0";
}
List<String> names = new ArrayList<>();
for (int i = 0; i <= StringUtils.countOccurrencesOf(name, ","); i++) {
names.add("function" + i);
}
return StringUtils.collectionToDelimitedString(names, "|");
} }
public static String functionName(int value) { public String getFunctionClass() {
return "function" + value; return this.functionClass;
} }
public String getName() { public void setFunctionName(String functionName) {
return functionName(StringUtils.arrayToDelimitedString(this.bean, ",")); this.functionName = StringUtils.hasText(functionName) ? functionName : "";
} }
public String[] getBean() { public String getFunctionName() {
return this.bean; return this.functionName;
} }
public void setBean(String[] bean) { public String getLocation() {
this.bean = bean;
}
public String[] getLocation() {
return this.location; return this.location;
} }
public void setLocation(String[] location) { public void setLocation(String location) {
this.location = location; this.location = location;
} }
public String getMain() {
return this.main;
}
public void setMain(String main) {
this.main = main;
}
@PostConstruct @PostConstruct
public void init() { public void init() {
if (this.location.length == 0) { Assert.notNull(this.location, "No archive location provided, please configure spring.cloud.function.location as a jar or directory.");
throw new IllegalStateException(
"No archive location provided, please configure function.location as a jar or directory.");
}
} }
} }

0
spring-cloud-function-deployer-new/src/main/resources/META-INF/spring.factories → spring-cloud-function-deployer/src/main/resources/META-INF/spring.factories
View File

0
spring-cloud-function-deployer-new/src/test/java/org/springframework/cloud/function/deployer/FunctionDeployerTests.java → spring-cloud-function-deployer/src/test/java/org/springframework/cloud/function/deployer/FunctionDeployerTests.java
View File