Skip to content

Commit 8ac6ab4

Browse files
committed
Address @msailes, @mwunderl comments
1 parent 89c31dd commit 8ac6ab4

File tree

9 files changed

+8
-26
lines changed

9 files changed

+8
-26
lines changed

sample-apps/blank-java/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ The project source includes function code and supporting resources:
1414
Use the following instructions to deploy the sample application.
1515

1616
# Requirements
17+
- An AWS account.
1718
- [Java 8 runtime environment (SE JRE)](https://www.oracle.com/java/technologies/javase-downloads.html)
1819
- [Gradle 5](https://gradle.org/releases/) or [Maven 3](https://maven.apache.org/docs/history.html)
1920
- The Bash shell. For Linux and macOS, this is included by default. In Windows 10, you can install the [Windows Subsystem for Linux](https://docs.microsoft.com/en-us/windows/wsl/install-win10) to get a Windows-integrated version of Ubuntu and Bash.

sample-apps/blank-java/src/main/java/example/Handler.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
import org.slf4j.Logger;
99
import org.slf4j.LoggerFactory;
1010

11-
import software.amazon.awssdk.core.SdkSystemSetting;
12-
import software.amazon.awssdk.regions.Region;
1311
import software.amazon.awssdk.services.lambda.LambdaClient;
1412
import software.amazon.awssdk.services.lambda.model.GetAccountSettingsResponse;
1513
import software.amazon.awssdk.services.lambda.model.LambdaException;
@@ -18,18 +16,14 @@
1816
public class Handler implements RequestHandler<Map<String,String>, String> {
1917

2018
private static final Logger logger = LoggerFactory.getLogger(Handler.class);
21-
private static final LambdaClient lambdaClient = LambdaClient.builder()
22-
.region(Region.of(System.getenv(SdkSystemSetting.AWS_REGION.environmentVariable())))
23-
.build();
19+
private static final LambdaClient lambdaClient = LambdaClient.builder().build();
2420

2521
@Override
2622
public String handleRequest(Map<String,String> event, Context context) {
27-
28-
// log execution details
23+
2924
logger.info("ENVIRONMENT VARIABLES: " + System.getenv());
3025
logger.info("EVENT: " + event);
3126

32-
// process event
3327
GetAccountSettingsResponse response = null;
3428
try {
3529
response = lambdaClient.getAccountSettings();

sample-apps/java-basic/src/main/java/example/Handler.java

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,15 @@
77
import java.util.Map;
88

99
// Handler value: example.Handler
10-
public class Handler implements RequestHandler<Map<String,String>, String>{
10+
public class Handler implements RequestHandler<Map<String,String>, Void>{
1111

1212
@Override
13-
public String handleRequest(Map<String,String> event, Context context)
13+
public Void handleRequest(Map<String,String> event, Context context)
1414
{
1515
LambdaLogger logger = context.getLogger();
16-
String response = "200 OK";
17-
// log execution details
1816
logger.log("ENVIRONMENT VARIABLES: " + System.getenv());
19-
20-
// process event
2117
logger.log("EVENT: " + event);
2218
logger.log("EVENT TYPE: " + event.getClass());
23-
return response;
19+
return null;
2420
}
2521
}

sample-apps/java-basic/src/main/java/example/HandlerDivide.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,14 @@ public class HandlerDivide implements RequestHandler<List<Integer>, Integer>{
1313
public Integer handleRequest(List<Integer> event, Context context)
1414
{
1515
LambdaLogger logger = context.getLogger();
16-
// process event
1716
if ( event.size() != 2 )
1817
{
1918
throw new InputLengthException("Input must be an array that contains 2 numbers.");
2019
}
2120
int numerator = event.get(0);
2221
int denominator = event.get(1);
23-
logger.log("EVENT: " + event);
24-
logger.log("EVENT TYPE: " + event.getClass().toString());
22+
logger.log("EVENT: Numerator is " + event.get(0).toString() +
23+
"; Denominator is " + event.get(1).toString());
2524
return numerator/denominator;
2625
}
2726
}

sample-apps/java-basic/src/main/java/example/HandlerInteger.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,8 @@ public class HandlerInteger implements RequestHandler<Integer, Integer>{
1111
public Integer handleRequest(Integer event, Context context)
1212
{
1313
LambdaLogger logger = context.getLogger();
14-
// process event
1514
logger.log("EVENT: " + event);
1615
logger.log("EVENT TYPE: " + event.getClass().toString());
17-
// return amount of time remaining before timeout
1816
return context.getRemainingTimeInMillis();
1917
}
2018
}

sample-apps/java-basic/src/main/java/example/HandlerList.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ public class HandlerList implements RequestHandler<List<Integer>, Integer>{
1313
public Integer handleRequest(List<Integer> event, Context context)
1414
{
1515
LambdaLogger logger = context.getLogger();
16-
// process event
1716
logger.log("EVENT: " + event);
1817
logger.log("EVENT TYPE: " + event.getClass().toString());
1918
return context.getRemainingTimeInMillis() ;

sample-apps/java-basic/src/main/java/example/HandlerString.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ public class HandlerString implements RequestHandler<String, Integer>{
1111
public Integer handleRequest(String event, Context context)
1212
{
1313
LambdaLogger logger = context.getLogger();
14-
// process event
1514
logger.log("EVENT: " + event);
1615
logger.log("EVENT TYPE: " + event.getClass().toString());
1716
return context.getRemainingTimeInMillis();

sample-apps/java-basic/src/main/java/example/HandlerWeatherData.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,8 @@ public class HandlerWeatherData implements RequestHandler<WeatherData, WeatherDa
1111
public WeatherData handleRequest(WeatherData event, Context context)
1212
{
1313
LambdaLogger logger = context.getLogger();
14-
// log execution details
1514
logger.log("EVENT: " + event);
1615
logger.log("EVENT TYPE: " + event.getClass().toString());
17-
18-
// // process event
1916
return event;
2017
}
2118
}

sample-apps/java-events/src/main/java/example/HandlerSQS.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ public class HandlerSQS implements RequestHandler<SQSEvent, Void>{
1414
@Override
1515
public Void handleRequest(SQSEvent event, Context context)
1616
{
17-
// process event
1817
for(SQSMessage msg : event.getRecords()){
1918
logger.info(msg.getBody());
2019
}

0 commit comments

Comments
 (0)