Upgrade Gradle; Fix lambda JAR hack

Author: helloworldless

cdk/build.gradle

@@ -10,9 +10,13 @@ repositories {
     }
 }
 
+group = 'com.davidagood'
+version = '1.0.0'
+sourceCompatibility = JavaVersion.VERSION_11
+targetCompatibility = JavaVersion.VERSION_11
+
 application {
     mainClassName = 'com.davidagood.cdkjava.CdkJavaApp'
-    applicationDefaultJvmArgs = ['-Dgreeting.language=en', "-DlambdaJar=${project(':lambda').name}"] //"
 }
 
 dependencies {
@@ -23,9 +27,15 @@ dependencies {
     testImplementation 'junit:junit:4.12'
 }
 
-group = 'com.davidagood'
-version = '0.1'
-sourceCompatibility = '11'
+run {
+    project(':lambda').afterEvaluate {
+        def files = project(':lambda').tasks.findByName('jar').outputs.files
+        println "module=:lambda, task=jar has output files=${files.collect { it }}"
+        def firstFile = files[0]
+        println "Expecting first and only file to be executable JAR; path=${firstFile}"
+        systemProperty 'lambdaJarAbsolutePath', firstFile.path
+    }
+}
 
 tasks.withType(JavaCompile) {
     options.encoding = 'UTF-8'

cdk/src/main/java/com/davidagood/cdkjava/CdkJavaStack.java

@@ -10,11 +10,7 @@
 import software.amazon.awscdk.services.lambda.Function;
 import software.amazon.awscdk.services.lambda.Runtime;
 
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-
-import static java.util.Objects.isNull;
+import java.nio.file.Path;
 
 public class CdkJavaStack extends Stack {
     public CdkJavaStack(final Construct parent, final String id) {
@@ -29,29 +25,15 @@ public CdkJavaStack(final Construct parent, final String id, final StackProps pr
                 .sortKey(Attribute.builder().name("SK").type(AttributeType.STRING).build())
                 .build();
 
-        URI uri;
-
-        try {
-            URL url = getClass().getResource("/lib");
-
-            if (isNull(url)) {
-                throw new LambdaDeploymentPackageNotFoundException("Lambda deployment package not found in classpath" +
-                        " resources; Expected to find \"/lib\"");
-            }
+        String lambdaExecutableJarPath = System.getProperty("lambdaJarAbsolutePath");
 
-            uri = url.toURI();
-
-            System.out.println("Full URI for classpath resource \"/lib\": " + uri);
-        } catch (URISyntaxException e) {
-            throw new RuntimeException(e);
+        if (!Path.of(lambdaExecutableJarPath).toFile().exists()) {
+            throw new LambdaDeploymentPackageNotFoundException("Lambda deployment package not at path="
+                    + lambdaExecutableJarPath);
+        } else {
+            System.out.println("Found lambda executable JAR at paht=" + lambdaExecutableJarPath);
         }
 
-        // We expect the URI to be in this format
-        // jar:file:/home/dgood/IdeaProjects/cdk-java-starter/lambda/build_lambda/lambda.jar!/lib
-        // Not sure of a better way to get the absolute path of the JAR
-        String lambdaExecutableJarPath = uri.toString().split("jar:file:")[1].split("!")[0];
-        System.out.println("Lambda executable JAR path: " + lambdaExecutableJarPath);
-
         Function function = Function.Builder.create(this, "ExampleJavaLambda")
                 .code(Code.fromAsset(lambdaExecutableJarPath))
                 .handler("com.davidagood.cdkjava.ExampleHandler::handleRequest")

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Thu Sep 17 09:26:57 EDT 2020
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

lambda/build.gradle

@@ -6,8 +6,12 @@ repositories {
     jcenter()
 }
 
-dependencies {
+group = 'com.davidagood'
+version = '1.0.0'
+sourceCompatibility = JavaVersion.VERSION_11
+targetCompatibility = JavaVersion.VERSION_11
 
+dependencies {
     implementation 'com.amazonaws:aws-lambda-java-core:1.2.1'
     implementation 'com.google.code.gson:gson:2.8.6'
     testImplementation 'org.apache.logging.log4j:log4j-api:2.13.0'
@@ -28,7 +32,7 @@ jar {
         attributes 'Main-Class': 'com.davidagood.cdkjava.ExampleHandler'
     }
 
-    destinationDir file(buildLambdaPath)
+    destinationDirectory = file(buildLambdaPath)
 
     from compileJava
     from processResources
@@ -50,12 +54,9 @@ configurations.default.extendsFrom(configurations.lambdaResources)
 
 // expose the artifact created by the packaging task
 artifacts {
-    lambdaResources(jar.archivePath) {
-        builtBy jar
-        type 'jar'
-    }
+    lambdaResources(jar)
 }
 
 clean {
     delete buildLambdaPath
-}
+}