diff --git a/aws-greengrass-core-sdk-java-master/samples/HelloWorld/src/main/java/com/amazonaws/greengrass/examples/HelloWorld.java b/aws-greengrass-core-sdk-java-master/samples/HelloWorld/src/main/java/com/amazonaws/greengrass/examples/HelloWorld.java index 5837b31f2..b07b616c3 100644 --- a/aws-greengrass-core-sdk-java-master/samples/HelloWorld/src/main/java/com/amazonaws/greengrass/examples/HelloWorld.java +++ b/aws-greengrass-core-sdk-java-master/samples/HelloWorld/src/main/java/com/amazonaws/greengrass/examples/HelloWorld.java @@ -33,6 +33,7 @@ public String handleRequest(Object input, Context context) { } } +// test PR class PublishHelloWorld extends TimerTask { private IotDataClient iotDataClient = new IotDataClient(); private String publishMessage = String.format("Hello world! Sent from Greengrass Core running on platform: %s-%s using Java", System.getProperty("os.name"), System.getProperty("os.version")); diff --git a/aws-sdk-java-v2-master/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/ApacheHttpClient.java b/aws-sdk-java-v2-master/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/ApacheHttpClient.java index 7855ba50b..f52b9db23 100644 --- a/aws-sdk-java-v2-master/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/ApacheHttpClient.java +++ b/aws-sdk-java-v2-master/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/ApacheHttpClient.java @@ -114,6 +114,7 @@ public final class ApacheHttpClient implements SdkHttpClient { private final ApacheHttpRequestConfig requestConfig; private final AttributeMap resolvedOptions; + // code change to fix the bug @SdkTestInternalApi ApacheHttpClient(ConnectionManagerAwareHttpClient httpClient, ApacheHttpRequestConfig requestConfig, diff --git a/aws-toolkit-eclipse-master/bundles/com.amazonaws.eclipse.sdk.ui/samples/AmazonEC2SpotInstances-GettingStarted/Requests.java b/aws-toolkit-eclipse-master/bundles/com.amazonaws.eclipse.sdk.ui/samples/AmazonEC2SpotInstances-GettingStarted/Requests.java index 9b9cc3180..c95d1ba96 100644 --- a/aws-toolkit-eclipse-master/bundles/com.amazonaws.eclipse.sdk.ui/samples/AmazonEC2SpotInstances-GettingStarted/Requests.java +++ b/aws-toolkit-eclipse-master/bundles/com.amazonaws.eclipse.sdk.ui/samples/AmazonEC2SpotInstances-GettingStarted/Requests.java @@ -77,7 +77,7 @@ private void init() throws Exception { ec2 = AmazonEC2ClientBuilder.standard() .withCredentials(new AWSStaticCredentialsProvider(credentials)) - .withRegion("us-west-2") + .withRegion(Regions.US-WEST-2) .build(); }