Amazon Q Code transformation using CLI

.gitignore

@@ -5,9 +5,11 @@
 .classpath
 .project
 .settings/
+/movie-service-utils/jars/
 
 # Packaged files #
-*.jar
+#*.jar
 *.war
 *.ear
 *.iml
+

README.md

@@ -13,13 +13,26 @@ Refer to Getting Started guide and 3 ways how Amazon Q Developer agent for code
 
 ## **Installation Instructions**
 
+## Dependencies Setup
+
+Before building the application, you need to install the movie-service-utils dependency in your local Maven repository. This utility library is available in two versions to support different Java versions:
+
+### For Java 1.8 Version
+```bash
+mvn install:install-file \
+  -Dfile=./built-library/0_1_0/movie-service-utils-1.0-SNAPSHOT.jar \
+  -DgroupId=com.amazon.sample \
+  -DartifactId=movie-service-utils \
+  -Dversion=1.0-SNAPSHOT \
+  -Dpackaging=jar
+```
+
 ## **Local**
 
 1. Compile the application in Local IDE
-2. Open a new terminal and type `java -jar .\target\movie-service-0.1.0.jar`
-3. Follow the STEP 1 in AWS section below to set up AppConfig Configuration in your default AWS account profile
-4. Open a browser and go to  http://localhost:8080/movies/getMovies
-5. You should be able to see list of paid movies
+2. Follow the STEP 1 in AWS section below to set up AppConfig Configuration in your default AWS account profile
+3. Open a browser and go to  http://localhost:8080/movies/getMovies
+4. You should be able to see list of paid movies
 
 ## **AWS**
 
@@ -116,13 +129,22 @@ This application has a Caching layer built in to cache the responses from AWS Ap
 
 ## **Installation Instructions**
 
+### For Java 1.8 Version
+```bash
+mvn install:install-file \
+  -Dfile=./built-library/0_1_0/movie-service-utils-1.0-SNAPSHOT.jar \
+  -DgroupId=com.amazon.sample \
+  -DartifactId=movie-service-utils \
+  -Dversion=1.0-SNAPSHOT \
+  -Dpackaging=jar
+```
+
 ## **Local**
 
 1. Compile the application in Local IDE
-2. Open a new terminal and type `java -jar .\target\movie-service-0.1.0.jar`
-3. Follow the STEP 1 in AWS section below to set up AppConfig Configuration in your default AWS account profile
-4. Open a browser and go to  http://localhost:8080/movies/getMovies
-5. You should be able to see list of 5 Paid movies
+2. Follow the STEP 1 in AWS section below to set up AppConfig Configuration in your default AWS account profile
+3. Open a browser and go to  http://localhost:8080/movies/getMovies
+4. You should be able to see list of paid movies
 
 ## **AWS**
 

custom-transformation-post-qct.yaml

@@ -0,0 +1,35 @@
+id: sysout-to-logger
+language: java
+rule:
+    pattern: System.out.println($MATCH)
+fix: logger.info($MATCH)
+
+--- # this is YAML doc separator to have multiple rules in one file
+
+id: update-movie-service-util-java17
+language: html
+rule:
+    pattern: |-
+        <dependency>
+            <groupId>org.amazonaws.samples</groupId>
+            <artifactId>movie-service-utils</artifactId>
+            <version>$VERSION</version>
+        </dependency>
+constraints:
+    VERSION:
+        regex: "^0\\.1\\.0"
+fix: |-
+    <dependency>
+        <groupId>org.amazonaws.samples</groupId>
+        <artifactId>movie-service-utils</artifactId>
+        <version>0.2.0</version>
+    </dependency>
+
+--- # this is YAML doc separator to have multiple rules in one file
+id: update-movie-service-util-method
+language: java
+rule:
+    pattern: |-
+        MovieUtils.isValidMovieName($MOVIE_NAME)
+fix: |-
+    MovieUtils.isValidMovie($MOVIE_NAME, movieId)

custom-transformation-pre-qct.yaml

@@ -0,0 +1,43 @@
+id: no-unused-vars
+language: java
+rule:
+    kind: local_variable_declaration
+    all:
+        - has:
+              has:
+                  kind: identifier
+                  pattern: $IDENT
+        - not:
+              precedes:
+                  stopBy: end
+                  has:
+                      stopBy: end
+                      any:
+                          - { kind: identifier, pattern: $IDENT }
+                          - { has: {kind: identifier, pattern: $IDENT, stopBy: end}}
+fix: ''
+
+--- # this is YAML doc separator to have multiple rules in one file
+
+id: no-unused-imports
+language: java
+rule:
+    kind: import_declaration
+    all:
+        - not:
+              has:
+                  kind: asterisk
+        - has:
+              has:
+                  kind: identifier
+                  pattern: $IDENT
+        - not:
+              precedes:
+                  stopBy: end
+                  has:
+                      stopBy: end
+                      any:
+                          - { kind: identifier, pattern: $IDENT }
+                          - { kind: type_identifier, pattern: $IDENT }
+                          - { has: {kind: type_identifier, pattern: $IDENT, stopBy: end}}
+fix: ''

movie-service-utils/pom.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.amazonaws.samples</groupId>
+    <artifactId>movie-service-utils</artifactId>
+    <version>0.2.0</version>
+
+    <properties>
+        <java.version>17</java.version>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.release>17</maven.compiler.release>
+    </properties>
+
+    <dependencies>
+        <!-- Add any dependencies needed for the utils module -->
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.13.0</version>
+                <configuration>
+                    <release>${java.version}</release>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

movie-service-utils/src/main/java/com/amazonaws/samples/appconfig/utils/MovieUtils.java

@@ -0,0 +1,21 @@
+package com.amazonaws.samples.appconfig.utils;
+
+public class MovieUtils {
+
+    /**
+     * Validates if a movie name meets the required criteria
+     * @param movieName The name of the movie to validate
+     * @return true if the movie name is valid, false otherwise
+     */
+    public static boolean isValidMovie(String movieName, int movieId) {
+        if (movieName == null || movieName.trim().isEmpty()) {
+            return false;
+        }
+
+        if(movieId <= 0){
+            return false;
+        }
+        // Movie name should be between 1 and 200 characters
+        return movieName.trim().length() > 0 && movieName.trim().length() <= 200;
+    }
+}

movie-service-utils/target/maven-archiver/pom.properties

@@ -0,0 +1,3 @@
+artifactId=movie-service-utils
+groupId=org.springframework
+version=0.2.0

orchestrator_qct_cli.yaml

@@ -0,0 +1,12 @@
+name: orchestrator_qct_cli
+description: My collection of custom transformations to run before and after a transformation.
+
+pre_qct_actions:
+  ast-grep:
+    rules:
+      - custom-transformation-pre-qct.yaml
+
+post_qct_actions:
+  ast-grep:
+    rules:
+      - custom-transformation-post-qct.yaml

pom.xml

@@ -3,7 +3,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.springframework</groupId>
+    <groupId>org.amazonaws.samples</groupId>
     <artifactId>movie-service</artifactId>
     <version>0.1.0</version>
 
@@ -25,6 +25,11 @@
     </dependencyManagement>
 
     <dependencies>
+        <dependency>
+            <groupId>org.amazonaws.samples</groupId>
+            <artifactId>movie-service-utils</artifactId>
+            <version>0.1.0</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>

qct_tags.csv

@@ -0,0 +1,2 @@
+qct_cli,true
+qct_cli_language,java

src/main/java/com/amazonaws/samples/appconfig/cache/ConfigurationCache.java

@@ -5,6 +5,7 @@
 
 import java.util.Map;
 import java.util.Set;
+import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 
 public class ConfigurationCache {

src/main/java/com/amazonaws/samples/appconfig/cache/ConfigurationCacheItem.java

@@ -6,6 +6,9 @@
 import java.time.Clock;
 import java.time.Duration;
 import java.util.Objects;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
 
 public class ConfigurationCacheItem<T> {
     private final Duration ttl;

src/main/java/com/amazonaws/samples/appconfig/movies/MoviesController.java

@@ -1,5 +1,7 @@
 package com.amazonaws.samples.appconfig.movies;
 
+import com.amazonaws.samples.appconfig.utils.MovieUtils;
+
 import java.time.Duration;
 import java.util.Optional;
 import java.util.UUID;
@@ -109,6 +111,10 @@ public String movie() {
 
     @RequestMapping(value = "/movies/{movie}/edit", method = POST)
     public String processUpdateMovie(@Valid Movie movie, BindingResult result, @PathVariable("movieId") int movieId) {
+        if (!MovieUtils.isValidMovieName(movie.getMovieName())) {
+            result.rejectValue("name", "error.name", "Invalid movie name");
+            return "editMovieForm";
+        }
         final AppConfigUtility appConfigUtility = new AppConfigUtility(getOrDefault(this::getClient, this::getDefaultClient),
                 getOrDefault(this::getConfigurationCache, ConfigurationCache::new),
                 getOrDefault(this::getCacheItemTtl, () -> cacheItemTtl),

src/main/java/com/amazonaws/samples/appconfig/utils/Encoder.java

@@ -1,16 +1,31 @@
 // depreciation example - sun.misc.BASE64Encoder;
 package com.amazonaws.samples.appconfig.utils;
-import sun.misc.BASE64Encoder;
+//import sun.misc.BASE64Encoder;
 
+import java.util.Calendar;
 import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.logging.Logger;
 
 
 public class Encoder {
 
-    Date defaultDate = new Date(1999, 0, 1);
+    Logger logger = Logger.getLogger(Encoder.class.getName());
+
+    private String unUsedVariable;
+
+    Date defaultDate;
+
+    {
+        String unused = "ast-grep unused string example";
+        Calendar calendar = new GregorianCalendar(1999, Calendar.JANUARY, 1);
+        defaultDate = calendar.getTime();
+        System.out.println("test ast-grep "+defaultDate);
+    }
 
     byte[] bytes = new byte[57];
-    String enc1 = new sun.misc.BASE64Encoder().encode(bytes);
+//    String enc1 = new sun.misc.BASE64Encoder().encode(bytes);
+
 
 
-}
+}