Skip to content

Commit 49adab8

Browse files
muellercmuellerc
committed
[WIP]
1 parent 7709f54 commit 49adab8

File tree

20 files changed

+95
-210
lines changed

20 files changed

+95
-210
lines changed

‎labs/lab-1-replatform/serverless-java-container-springboot2/serverless-java-container-springboot2.iml‎

Lines changed: 0 additions & 127 deletions
This file was deleted.

‎labs/lab-1-replatform/serverless-java-container-springboot2/src/test/scala/SpringLambdaLoadTest.scala‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

labs/lab-1-replatform/serverless-java-container-springboot2/README.md renamed to labs/lab-1-replatform/springboot2-lambda/README.md

File renamed without changes.

labs/lab-1-replatform/serverless-java-container-springboot2/pom.xml renamed to labs/lab-1-replatform/springboot2-lambda/pom.xml

Lines changed: 76 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -106,31 +106,93 @@
106106
</plugin>
107107

108108
<!-- https://maven.apache.org/plugins/maven-assembly-plugin/descriptor-refs.html#jar-with-dependencies -->
109+
<!-- <plugin>-->
110+
<!-- <artifactId>maven-assembly-plugin</artifactId>-->
111+
<!-- <version>3.1.0</version>-->
112+
<!-- <configuration>-->
113+
<!-- <finalName>app</finalName>-->
114+
<!-- <appendAssemblyId>false</appendAssemblyId>-->
115+
<!-- <descriptorRefs>-->
116+
<!-- <descriptorRef>jar-with-dependencies</descriptorRef>-->
117+
<!-- </descriptorRefs>-->
118+
<!-- </configuration>-->
119+
<!-- <executions>-->
120+
<!-- <execution>-->
121+
<!-- <id>make-assembly</id>-->
122+
<!-- <phase>package</phase>-->
123+
<!-- <goals>-->
124+
<!-- <goal>single</goal>-->
125+
<!-- </goals>-->
126+
<!-- </execution>-->
127+
<!-- </executions>-->
128+
<!-- </plugin>-->
129+
109130
<plugin>
110-
<artifactId>maven-assembly-plugin</artifactId>
111-
<version>3.1.0</version>
112-
<configuration>
113-
<finalName>app</finalName>
114-
<appendAssemblyId>false</appendAssemblyId>
115-
<descriptorRefs>
116-
<descriptorRef>jar-with-dependencies</descriptorRef>
117-
</descriptorRefs>
118-
</configuration>
131+
<groupId>org.springframework.boot</groupId>
132+
<artifactId>spring-boot-maven-plugin</artifactId>
133+
<version>2.2.1.RELEASE</version>
119134
<executions>
120135
<execution>
121-
<id>make-assembly</id>
122-
<phase>package</phase>
136+
<id>repackage</id>
123137
<goals>
124-
<goal>single</goal>
138+
<goal>repackage</goal>
125139
</goals>
126140
</execution>
127141
</executions>
128142
</plugin>
129143

130144
<plugin>
131-
<groupId>org.springframework.boot</groupId>
132-
<artifactId>spring-boot-maven-plugin</artifactId>
145+
<groupId>org.apache.maven.plugins</groupId>
146+
<artifactId>maven-shade-plugin</artifactId>
147+
<version>3.1.1</version>
148+
<executions>
149+
<execution>
150+
<phase>package</phase>
151+
<goals>
152+
<goal>shade</goal>
153+
</goals>
154+
<configuration>
155+
<transformers>
156+
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
157+
<resource>META-INF/spring.handlers</resource>
158+
</transformer>
159+
<transformer implementation="org.springframework.boot.maven.PropertiesMergingResourceTransformer">
160+
<resource>META-INF/spring.factories</resource>
161+
</transformer>
162+
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
163+
<resource>META-INF/spring.schemas</resource>
164+
</transformer>
165+
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
166+
<!-- <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">-->
167+
<!-- <mainClass>${start-class}</mainClass>-->
168+
<!-- </transformer>-->
169+
</transformers>
170+
</configuration>
171+
</execution>
172+
</executions>
173+
<dependencies>
174+
<dependency>
175+
<groupId>org.springframework.boot</groupId>
176+
<artifactId>spring-boot-maven-plugin</artifactId>
177+
<version>2.2.1.RELEASE</version>
178+
</dependency>
179+
</dependencies>
180+
<configuration>
181+
<keepDependenciesWithProvidedScope>true</keepDependenciesWithProvidedScope>
182+
<createDependencyReducedPom>true</createDependencyReducedPom>
183+
<filters>
184+
<filter>
185+
<artifact>*:*</artifact>
186+
<excludes>
187+
<exclude>META-INF/*.SF</exclude>
188+
<exclude>META-INF/*.DSA</exclude>
189+
<exclude>META-INF/*.RSA</exclude>
190+
</excludes>
191+
</filter>
192+
</filters>
193+
</configuration>
133194
</plugin>
195+
134196
</plugins>
135197
</build>
136198
</project>

labs/lab-1-replatform/serverless-java-container-springboot2/src/main/java/com/aws/samples/petclinic/CreatePetLambdaStreamHandler.java renamed to labs/lab-1-replatform/springboot2-lambda/src/main/java/com/aws/samples/petclinic/CreatePetLambdaStreamHandler.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.aws.samples.petclinic;
22

3-
43
import com.amazonaws.serverless.exceptions.ContainerInitializationException;
54
import com.amazonaws.serverless.proxy.model.AwsProxyRequest;
65
import com.amazonaws.serverless.proxy.model.AwsProxyResponse;
@@ -37,4 +36,4 @@ public void handleRequest(InputStream inputStream, OutputStream outputStream, Co
3736
AWSXRay.endSubsegment();
3837
}
3938
}
40-
}
39+
}

labs/lab-1-replatform/serverless-java-container-springboot2/src/main/java/com/aws/samples/petclinic/PetClinicApplication.java renamed to labs/lab-1-replatform/springboot2-lambda/src/main/java/com/aws/samples/petclinic/PetClinicApplication.java

File renamed without changes.

labs/lab-1-replatform/serverless-java-container-springboot2/src/main/java/com/aws/samples/petclinic/config/AWSConfig.java renamed to labs/lab-1-replatform/springboot2-lambda/src/main/java/com/aws/samples/petclinic/config/AWSConfig.java

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,16 @@
1313
@Configuration
1414
public class AWSConfig {
1515

16+
@Bean(name = "petsTableName")
17+
public String petsTableName() {
18+
return System.getenv("TABLE_NAME");
19+
}
20+
21+
@Bean(name = "petsBucketName")
22+
public String petsBucketName() {
23+
return System.getenv("BUCKET_NAME");
24+
}
25+
1626
@Bean(name = "awsCredentialsProvider")
1727
public AWSCredentialsProvider amazonAWSCredentialsProvider() {
1828
return DefaultAWSCredentialsProviderChain.getInstance();
@@ -33,4 +43,4 @@ public AmazonS3 amazonS3(AWSCredentialsProvider credentialsProvider) {
3343
.withRegion(Regions.EU_CENTRAL_1)
3444
.build();
3545
}
36-
}
46+
}

labs/lab-1-replatform/serverless-java-container-springboot2/src/main/java/com/aws/samples/petclinic/pet/MedicalRecord.java renamed to labs/lab-1-replatform/springboot2-lambda/src/main/java/com/aws/samples/petclinic/pet/MedicalRecord.java

File renamed without changes.

labs/lab-1-replatform/serverless-java-container-springboot2/src/main/java/com/aws/samples/petclinic/pet/MedicalRecordStore.java renamed to labs/lab-1-replatform/springboot2-lambda/src/main/java/com/aws/samples/petclinic/pet/MedicalRecordStore.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,21 @@
44
import com.amazonaws.services.s3.model.PutObjectRequest;
55
import org.springframework.stereotype.Component;
66

7+
import javax.inject.Inject;
8+
import javax.inject.Named;
79
import java.io.ByteArrayInputStream;
810
import java.util.UUID;
911

1012
@Component
1113
public class MedicalRecordStore {
1214

1315
private AmazonS3 amazonS3;
16+
private String petsBucketName;
1417

15-
public MedicalRecordStore(AmazonS3 amazonS3) {
18+
@Inject
19+
public MedicalRecordStore(AmazonS3 amazonS3, @Named(value = "petsBucketName") String petsBucketName) {
1620
this.amazonS3 = amazonS3;
21+
this.petsBucketName = petsBucketName;
1722
}
1823

1924
public MedicalRecord save(MedicalRecord medicalRecord) {
@@ -27,4 +32,4 @@ public MedicalRecord save(MedicalRecord medicalRecord) {
2732

2833
return medicalRecord;
2934
}
30-
}
35+
}

labs/lab-1-replatform/serverless-java-container-springboot2/src/main/java/com/aws/samples/petclinic/pet/Pet.java renamed to labs/lab-1-replatform/springboot2-lambda/src/main/java/com/aws/samples/petclinic/pet/Pet.java

File renamed without changes.

0 commit comments

Comments
 (0)