Merge pull request aws-samples#8 from pdineshbalaaji/change-branch

pdineshbalaaji · web-flow · commit 1f9799688149 · 2025-04-02T11:00:05.000-04:00
Change branch
diff --git a/.gitignore b/.gitignore
@@ -5,9 +5,11 @@
 .classpath
 .project
 .settings/
+/movie-service-utils/jars/
 
 # Packaged files #
-*.jar
+#*.jar
 *.war
 *.ear
 *.iml
+
diff --git a/custom-transformation-post-qct.yaml b/custom-transformation-post-qct.yaml
@@ -1,18 +1,35 @@
-id: no-unused-vars
+id: sysout-to-logger
 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: ''
+    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)
diff --git a/custom-transformation-pre-qct.yaml b/custom-transformation-pre-qct.yaml
@@ -1,21 +1,43 @@
-id: sysout-to-logger
+id: no-unused-vars
 language: java
 rule:
-    pattern: System.out.println($MATCH)
-fix: logger.info($MATCH)
-#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: ''vi
+    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: ''
diff --git a/movie-service-utils/built-library/0_1_0/movie-service-utils-0.1.0.jar b/movie-service-utils/built-library/0_1_0/movie-service-utils-0.1.0.jar
diff --git a/movie-service-utils/built-library/0_2_0/movie-service-utils-0.2.0.jar b/movie-service-utils/built-library/0_2_0/movie-service-utils-0.2.0.jar
diff --git a/movie-service-utils/pom.xml b/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>
diff --git a/movie-service-utils/src/main/java/com/amazonaws/samples/appconfig/utils/MovieUtils.java b/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;
+    }
+}
diff --git a/movie-service-utils/target/classes/com/amazonaws/samples/appconfig/utils/MovieUtils.class b/movie-service-utils/target/classes/com/amazonaws/samples/appconfig/utils/MovieUtils.class
diff --git a/movie-service-utils/target/maven-archiver/pom.properties b/movie-service-utils/target/maven-archiver/pom.properties
@@ -0,0 +1,3 @@
+artifactId=movie-service-utils
+groupId=org.springframework
+version=0.2.0
diff --git a/pom.xml b/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>
diff --git a/src/main/java/com/amazonaws/samples/appconfig/cache/ConfigurationCache.java b/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 {
diff --git a/src/main/java/com/amazonaws/samples/appconfig/cache/ConfigurationCacheItem.java b/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;
diff --git a/src/main/java/com/amazonaws/samples/appconfig/movies/MoviesController.java b/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),

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+artifactId=movie-service-utils`
	`2`	`+groupId=org.springframework`
	`3`	`+version=0.2.0`