Skip to content

Commit 89c21ee

Browse files
AlexeySoshinAlexeySoshin
committed
Don't include version number in the HelloWorld jar
1 parent 686448a commit 89c21ee

File tree

5 files changed

+92
-89
lines changed

5 files changed

+92
-89
lines changed

‎examples/powertools-examples-core/cdk/app/pom.xml

+70-69
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44

55
<groupId>software.amazon.lambda.examples</groupId>
66
<version>1.16.1</version>
77
<artifactId>powertools-examples-core-cdk</artifactId>
88
<packaging>jar</packaging>
9-
9+
1010
<name>Powertools for AWS Lambda (Java) library Examples - Core</name>
1111

1212
<properties>
@@ -38,9 +38,9 @@
3838
<version>1.2.2</version>
3939
</dependency>
4040
<dependency>
41-
<groupId>com.amazonaws</groupId>
42-
<artifactId>aws-lambda-java-events</artifactId>
43-
<version>3.11.2</version>
41+
<groupId>com.amazonaws</groupId>
42+
<artifactId>aws-lambda-java-events</artifactId>
43+
<version>3.11.2</version>
4444
</dependency>
4545
<dependency>
4646
<groupId>org.apache.logging.log4j</groupId>
@@ -54,74 +54,75 @@
5454
</dependency>
5555

5656
<dependency>
57-
<groupId>junit</groupId>
58-
<artifactId>junit</artifactId>
59-
<version>4.13.2</version>
60-
<scope>test</scope>
57+
<groupId>junit</groupId>
58+
<artifactId>junit</artifactId>
59+
<version>4.13.2</version>
60+
<scope>test</scope>
6161
</dependency>
6262
</dependencies>
6363

6464
<build>
65-
<plugins>
66-
<plugin>
67-
<groupId>dev.aspectj</groupId>
68-
<artifactId>aspectj-maven-plugin</artifactId>
69-
<version>1.13.1</version>
70-
<configuration>
71-
<source>${maven.compiler.source}</source>
72-
<target>${maven.compiler.target}</target>
73-
<complianceLevel>${maven.compiler.target}</complianceLevel>
74-
<aspectLibraries>
75-
<aspectLibrary>
76-
<groupId>software.amazon.lambda</groupId>
77-
<artifactId>powertools-tracing</artifactId>
78-
</aspectLibrary>
79-
<aspectLibrary>
80-
<groupId>software.amazon.lambda</groupId>
81-
<artifactId>powertools-logging</artifactId>
82-
</aspectLibrary>
83-
<aspectLibrary>
84-
<groupId>software.amazon.lambda</groupId>
85-
<artifactId>powertools-metrics</artifactId>
86-
</aspectLibrary>
87-
</aspectLibraries>
88-
</configuration>
89-
<executions>
90-
<execution>
91-
<goals>
92-
<goal>compile</goal>
93-
</goals>
94-
</execution>
95-
</executions>
96-
</plugin>
97-
<plugin>
98-
<groupId>org.apache.maven.plugins</groupId>
99-
<artifactId>maven-shade-plugin</artifactId>
100-
<version>3.5.0</version>
101-
<executions>
102-
<execution>
103-
<phase>package</phase>
104-
<goals>
105-
<goal>shade</goal>
106-
</goals>
107-
<configuration>
108-
<transformers>
109-
<transformer
110-
implementation="com.github.edwgiz.maven_shade_plugin.log4j2_cache_transformer.PluginsCacheFileTransformer">
111-
</transformer>
112-
</transformers>
113-
</configuration>
114-
</execution>
115-
</executions>
116-
<dependencies>
117-
<dependency>
118-
<groupId>com.github.edwgiz</groupId>
119-
<artifactId>maven-shade-plugin.log4j2-cachefile-transformer</artifactId>
120-
<version>2.15</version>
121-
</dependency>
122-
</dependencies>
123-
</plugin>
124-
</plugins>
65+
<finalName>helloworld-lambda</finalName>
66+
<plugins>
67+
<plugin>
68+
<groupId>dev.aspectj</groupId>
69+
<artifactId>aspectj-maven-plugin</artifactId>
70+
<version>1.13.1</version>
71+
<configuration>
72+
<source>${maven.compiler.source}</source>
73+
<target>${maven.compiler.target}</target>
74+
<complianceLevel>${maven.compiler.target}</complianceLevel>
75+
<aspectLibraries>
76+
<aspectLibrary>
77+
<groupId>software.amazon.lambda</groupId>
78+
<artifactId>powertools-tracing</artifactId>
79+
</aspectLibrary>
80+
<aspectLibrary>
81+
<groupId>software.amazon.lambda</groupId>
82+
<artifactId>powertools-logging</artifactId>
83+
</aspectLibrary>
84+
<aspectLibrary>
85+
<groupId>software.amazon.lambda</groupId>
86+
<artifactId>powertools-metrics</artifactId>
87+
</aspectLibrary>
88+
</aspectLibraries>
89+
</configuration>
90+
<executions>
91+
<execution>
92+
<goals>
93+
<goal>compile</goal>
94+
</goals>
95+
</execution>
96+
</executions>
97+
</plugin>
98+
<plugin>
99+
<groupId>org.apache.maven.plugins</groupId>
100+
<artifactId>maven-shade-plugin</artifactId>
101+
<version>3.5.0</version>
102+
<executions>
103+
<execution>
104+
<phase>package</phase>
105+
<goals>
106+
<goal>shade</goal>
107+
</goals>
108+
<configuration>
109+
<transformers>
110+
<transformer
111+
implementation="com.github.edwgiz.maven_shade_plugin.log4j2_cache_transformer.PluginsCacheFileTransformer">
112+
</transformer>
113+
</transformers>
114+
</configuration>
115+
</execution>
116+
</executions>
117+
<dependencies>
118+
<dependency>
119+
<groupId>com.github.edwgiz</groupId>
120+
<artifactId>maven-shade-plugin.log4j2-cachefile-transformer</artifactId>
121+
<version>2.15</version>
122+
</dependency>
123+
</dependencies>
124+
</plugin>
125+
</plugins>
125126
</build>
126127
<profiles>
127128
<!-- Use a profile to enforce AspectJ version 1.9.7 if we are Java 1.8 otherwise we'll get class

‎examples/powertools-examples-core/cdk/infra/src/main/java/cdk/CdkApp.java

-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
package cdk;
22

33
import software.amazon.awscdk.App;
4-
import software.amazon.awscdk.Environment;
54
import software.amazon.awscdk.StackProps;
65

7-
import java.util.Arrays;
8-
96
public class CdkApp {
107
public static void main(final String[] args) {
118
App app = new App();

‎examples/powertools-examples-core/cdk/infra/src/main/java/cdk/CdkStack.java

+19-15
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
package cdk;
22

3-
import software.amazon.awscdk.*;
3+
import java.util.List;
4+
import java.util.Map;
5+
import software.amazon.awscdk.BundlingOptions;
6+
import software.amazon.awscdk.CfnOutput;
7+
import software.amazon.awscdk.Duration;
8+
import software.amazon.awscdk.Stack;
9+
import software.amazon.awscdk.StackProps;
410
import software.amazon.awscdk.services.apigateway.LambdaIntegration;
511
import software.amazon.awscdk.services.apigateway.RestApi;
612
import software.amazon.awscdk.services.lambda.Code;
@@ -10,16 +16,13 @@
1016
import software.amazon.awscdk.services.s3.assets.AssetOptions;
1117
import software.constructs.Construct;
1218

13-
import java.util.List;
14-
import java.util.Map;
15-
1619
/**
1720
* Defines a stack that consists of a single Java Lambda function and an API Gateway
1821
*/
1922
public class CdkStack extends Stack {
2023
private static final String SHELL_COMMAND = "/bin/sh";
2124
private static final String MAVEN_PACKAGE = "mvn package";
22-
private static final String COPY_OUTPUT = "cp /asset-input/target/powertools-examples-core-cdk-1.16.1.jar /asset-output/";
25+
private static final String COPY_OUTPUT = "cp /asset-input/target/helloworld-lambda.jar /asset-output/";
2326

2427
public CdkStack(final Construct scope, final String id) {
2528
this(scope, id, null);
@@ -38,8 +41,19 @@ public CdkStack(final Construct scope, final String id, final StackProps props)
3841
outputApiUrl(restApi);
3942
}
4043

44+
private static List<String> createFunctionPackageInstructions() {
45+
// CDK will use this command to package your Java Lambda
46+
return List.of(
47+
SHELL_COMMAND,
48+
"-c",
49+
MAVEN_PACKAGE + " && " +
50+
COPY_OUTPUT
51+
);
52+
}
53+
4154
/**
4255
* Adds URL to the lambda to the outputs
56+
*
4357
* @param restApi
4458
*/
4559
private void outputApiUrl(RestApi restApi) {
@@ -78,14 +92,4 @@ private RestApi createHelloWorldApi() {
7892
.description("API Gateway endpoint URL for Prod stage for Hello World function")
7993
.build();
8094
}
81-
82-
private static List<String> createFunctionPackageInstructions() {
83-
// CDK will use this command to package your Java Lambda
84-
return List.of(
85-
SHELL_COMMAND,
86-
"-c",
87-
MAVEN_PACKAGE + " && " +
88-
COPY_OUTPUT
89-
);
90-
}
9195
}

‎examples/powertools-examples-core/cdk/infra/src/test/java/cdk/InfraStackTest.java renamed to ‎examples/powertools-examples-core/cdk/infra/src/test/java/cdk/CdkStackTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import java.io.IOException;
88
import java.util.Map;
99

10-
public class InfraStackTest {
10+
public class CdkStackTest {
1111

1212
@Test
1313
public void testStack() throws IOException {

‎examples/powertools-examples-idempotency/src/main/java/helloworld/App.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import java.io.IOException;
2323
import java.io.InputStreamReader;
2424
import java.net.URL;
25+
import java.nio.charset.StandardCharsets;
2526
import java.util.HashMap;
2627
import java.util.Map;
2728
import java.util.stream.Collectors;
@@ -113,7 +114,7 @@ public APIGatewayProxyResponseEvent handleRequest(final APIGatewayProxyRequestEv
113114
*/
114115
private String getPageContents(String address) throws IOException {
115116
URL url = new URL(address);
116-
try (BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream(), "UTF-8"))) {
117+
try (BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream(), StandardCharsets.UTF_8))) {
117118
return br.lines().collect(Collectors.joining(System.lineSeparator()));
118119
}
119120
}

0 commit comments

Comments
 (0)