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 3 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
75 changes: 73 additions & 2 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,44 @@
</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>
<version>1.0.0.RELEASE</version>
Copy link
Contributor

Choose a reason for hiding this comment

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

should this be in main pom

</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 +90,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,74 @@
/*
* 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() }
}

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,35 @@
/*
* 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
@@ -0,0 +1,57 @@
/*
* 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.function

import io.americanexpress.function.greeting.model.Greeting
import org.springframework.http.HttpStatus
import org.springframework.validation.BeanPropertyBindingResult
import org.springframework.validation.Errors
import org.springframework.validation.Validator
import org.springframework.web.server.ResponseStatusException
import java.util.function.Function

/**
* `Greet` contains the Greet function.
*/
open class Greet(private val validator: Validator) : Function<Greeting, Greeting?> {

/**
* Applies this function to the given argument.
*
* @param greeting the function argument
* @return the function result
*/
override fun apply(greeting: Greeting): Greeting? {
var output: Greeting? = null
val errors: Errors = BeanPropertyBindingResult(greeting, Greeting::class.java.name)
validator.validate(greeting, errors)
if (errors.allErrors.isEmpty()) {
output = Greeting()
output.message = "Hello " + greeting.message
} else {
onValidationErrors(errors)
}
return output
}

/**
* Returns new ResponseStatusException when there are validation errors.
*
* @param errors the errors
* @return the response status exception
*/
protected fun onValidationErrors(errors: Errors): ResponseStatusException {
throw ResponseStatusException(HttpStatus.BAD_REQUEST, errors.allErrors[0].defaultMessage)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,15 @@
* 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.function

import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.Bean;
import java.util.function.Function

import java.util.function.Function;

@SpringBootApplication
public class CloudFunctionMain {

public static void main(String[] args) {
SpringApplication.run(CloudFunctionMain.class, args);
}

@Bean
public Function<String, String> uppercase() {
return value -> value.toUpperCase();
/**
* `Greeter` contains greeter function.
*/
class Greeter : Function<String, String> {
override fun apply(s: String): String {
return "Hello $s, and welcome to Spring Cloud Function!!!"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
/*
* 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.model

import javax.validation.constraints.NotBlank

/**
* `Greeter` contains greeter function.
*/
class Greeting {

/**
* 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,15 @@
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.scan.packages=io.americanexpress.function.greeting.function
spring.cloud.function.definition=uppercase|reverse|greeter

This file was deleted.

This file was deleted.

Loading