refactored handler/test stubs

Author: ammokhov

python/rpdk/java/templates/init/default/HandlerWrapper.java

@@ -20,7 +20,7 @@ public class AbstractTestBase {
   }
   static ProxyClient<SdkClient> MOCK_PROXY(
     final AmazonWebServicesClientProxy proxy,
-    final ServiceSdkClient sdkClient) {
+    final SdkClient sdkClient) {
     return new ProxyClient<SdkClient>() {
       @Override
       public <RequestT extends AwsRequest, ResponseT extends AwsResponse> ResponseT
@@ -36,7 +36,7 @@ static ProxyClient<SdkClient> MOCK_PROXY(
       }
 
       @Override
-      public ServiceSdkClient client() {
+      public SdkClient client() {
         return sdkClient;
       }
     };

python/rpdk/java/templates/init/guided_aws/AbstractTestBase.java

@@ -1,5 +1,6 @@
 package {{ package_name }};
 
+import software.amazon.awssdk.core.SdkClient;
 import software.amazon.cloudformation.proxy.AmazonWebServicesClientProxy;
 import software.amazon.cloudformation.proxy.Logger;
 import software.amazon.cloudformation.proxy.ProgressEvent;
@@ -29,7 +30,5 @@ protected abstract ProgressEvent<ResourceModel, CallbackContext> handleRequest(
     final ProxyClient<SdkClient> proxyClient,
     final Logger logger);
 
-  /*
-   * Common or abstract methods and functions should be in this class
-   * */
+  // Placeholder for the functionality that could be shared across Create/Read/Update/Delete/List Handlers
 }

python/rpdk/java/templates/init/guided_aws/BaseHandlerStd.java

@@ -1,8 +1,26 @@
 package {{ package_name }};
 
+import software.amazon.awssdk.core.SdkClient;
+
 public class ClientBuilder {
-  // sample client builder - change ServiceSdkClient on the desired one
-  public static ServiceSdkClient getClient() {
-    return ServiceSdkClient.create();
+  /*
+  TODO: uncomment the following, replacing YourServiceAsyncClient with your service client name
+  It is recommended to use static HTTP client so less memory is consumed
+  e.g. https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-logs/blob/master/aws-logs-loggroup/src/main/java/software/amazon/logs/loggroup/ClientBuilder.java#L9
+
+  private static class LazyHolder {
+    static final YourServiceAsyncClient SERVICE_CLIENT = YourServiceAsyncClient.builder()
+              .httpClient(LambdaWrapper.HTTP_CLIENT)
+              .build();
+  }
+
+  public static YourServiceAsyncClient getClient() {
+    return LazyHolder.SERVICE_CLIENT;
+  }
+  */
+
+  // TODO: remove this implementation once you have uncommented the above
+  public static SdkClient getClient() {
+    return null;
   }
 }