Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/function gcp #200

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions function/function-samples/sample-function-book-gcp/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?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">
<parent>
<groupId>io.americanexpress.synapse</groupId>
<artifactId>function-samples</artifactId>
<version>0.3.6-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
<artifactId>sample-function-book-gcp</artifactId>

<!--Dependencies-->
<dependencies>

</dependencies>
</project>
75 changes: 72 additions & 3 deletions function/function-samples/sample-function-greeter-gcp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>sample-function-greeter-gcp</artifactId>

<properties>
<kotlin.version>1.5.10</kotlin.version>
</properties>

<!--Dependencies-->
<dependencies>
<!--Synapse-->
Expand All @@ -31,21 +35,42 @@
</dependency>

<!--Third Party-->
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-jdk8</artifactId>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should it be jdk17?

<version>${kotlin.version}</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-test</artifactId>
<version>${kotlin.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-gcp-starter</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-function-web</artifactId>
<version>3.2.7</version>
</dependency>

<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-adapter-gcp</artifactId>
</dependency>

</dependencies>

<build>
<plugins>
<plugin>
<groupId>com.google.cloud.tools</groupId>
<artifactId>appengine-maven-plugin</artifactId>
<version>1.3.2</version>
</plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
Expand All @@ -63,6 +88,50 @@
<port>8080</port>
</configuration>
</plugin>
<plugin>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-maven-plugin</artifactId>
<version>${kotlin.version}</version>
<executions>
<execution>
<id>compile</id>
<phase>compile</phase>
<goals>
<goal>compile</goal>
</goals>
</execution>
<execution>
<id>test-compile</id>
<phase>test-compile</phase>
<goals>
<goal>test-compile</goal>
</goals>
</execution>
</executions>
<configuration>
<jvmTarget>1.8</jvmTarget>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<executions>
<execution>
<id>compile</id>
<phase>compile</phase>
<goals>
<goal>compile</goal>
</goals>
</execution>
<execution>
<id>testCompile</id>
<phase>test-compile</phase>
<goals>
<goal>testCompile</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
/*
* Copyright 2020 American Express Travel Related Services Company, Inc.
*
* 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.
*/
/*
* Copyright 2020 American Express Travel Related Services Company, Inc.
*
* 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 io.americanexpress.function.greeting

import org.springframework.boot.autoconfigure.SpringBootApplication
import java.lang.StringBuilder
import kotlin.jvm.JvmStatic
import org.springframework.boot.SpringApplication
import org.springframework.context.annotation.Bean
import java.util.*
import java.util.function.Function

/**
* `GreeterApplication` starts the Spring Boot Application
*/
@SpringBootApplication
open class GreeterApplication {

/**
* Uppercase function.
*
* @return the function
*/
@Bean
open fun uppercase(): Function<String, String> {
return Function { value: String -> value.uppercase(Locale.getDefault()) }
}

/**
* Reverse function.
*
* @return the function
*/
@Bean
open fun reverse(): Function<String, String> {
return Function { value: String? -> StringBuilder(value).reverse().toString() }
}

/**
* Greeter function.
*/
@Bean
open fun greeter(): Function<String, String> {
return Function { value: String? -> "Hello $value, and welcome to Spring Cloud Function!!!" }
}

companion object {
/**
* The entry point of application.
*
* @param args the input arguments
*/
@JvmStatic
fun main(args: Array<String>) {
SpringApplication.run(GreeterApplication::class.java, *args)
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
/*
* Copyright 2020 American Express Travel Related Services Company, Inc.
*
* 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 io.americanexpress.function.greeting.config

import org.springframework.context.annotation.Bean
import org.springframework.context.annotation.Configuration
import org.springframework.validation.Validator
import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean

/**
* `GreeterConfig` contains configurations for GreeterApplication.
*/
@Configuration
open class GreetingConfig {

/**
* Instantiates Spring validator bean.
*
* @return the validator
*/
@Bean
open fun springValidator(): Validator {
return LocalValidatorFactoryBean()
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,17 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
package io.americanexpress.function.greeting.rest;
package io.americanexpress.function.greeting.model

import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.Bean;
import javax.validation.constraints.NotBlank

import java.util.function.Function;

@SpringBootApplication
public class CloudFunctionMain {

public static void main(String[] args) {
SpringApplication.run(CloudFunctionMain.class, args);
}
/**
* `Greeter` contains greeter function.
*/
class Greeting {

@Bean
public Function<String, String> uppercase() {
return value -> value.toUpperCase();
}
/**
* The message.
*/
var message: @NotBlank String? = null
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1 +1 @@
Main-Class: io.americanexpress.function.book.rest.CloudFunctionMain
Main-Class: io.americanexpress.function.greeting.GreetingApplication
Original file line number Diff line number Diff line change
@@ -1 +1,14 @@
spring.cloud.function.scan.packages=io.americanexpress.function.greeting.rest.function
#
# Copyright 2020 American Express Travel Related Services Company, Inc.
#
# 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.
#
spring.cloud.function.definition=uppercase|reverse|greeter

This file was deleted.

This file was deleted.

1 change: 1 addition & 0 deletions function/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<modules>
<module>function-samples</module>
<module>synapse-function</module>
<module>function-samples/sample-function-book-gcp</module>
</modules>

</project>
16 changes: 15 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<maven.compiler.target>17</maven.compiler.target>

<!--Kotlin-->
<kotlin.version>1.7.20</kotlin.version>
<kotlin.version>1.5.10</kotlin.version>

<!--Spring Versions-->
<spring-framework.version>5.3.23</spring-framework.version>
Expand Down Expand Up @@ -930,6 +930,20 @@
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-jdk8</artifactId>
<version>${kotlin.version}</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-test</artifactId>
<version>${kotlin.version}</version>
<scope>test</scope>
</dependency>
</dependencies>

<!--Plugin Management-->
<build>
<pluginManagement>
Expand Down