modernizing carts app

udbc · Oct 11, 2024 · 427bc8f · 427bc8f
1 parent 096944f
commit 427bc8f
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ Checkout the API Spec [here](http://microservices-demo.github.io/api/index?url=h
 
 # Creating a dev environment
 
-Platform : Ubuntu 16.04  
+Platform : Ubuntu 24.04
 
 Setup Mongo DB
 ```
@@ -72,6 +72,8 @@ java -jar target/carts.jar
 
 ## Docker
 
+Base Image for Docker Builds =>  maven:3.8-eclipse-temurin-21-alpine  
+
 `GROUP=weaveworksdemos COMMIT=test ./scripts/build.sh`
 
 # Test

diff --git a/docker/carts/Dockerfile b/docker/carts/Dockerfile
@@ -6,4 +6,5 @@ COPY *.jar ./app.jar
 RUN chown -R root:root ./app.jar
 
 USER root
+EXPOSE 8080
 ENTRYPOINT ["java","-jar","./app.jar", "--port=8080"]
diff --git a/src/main/java/works/weave/socks/cart/middleware/HTTPMonitoringInterceptor.java b/src/main/java/works/weave/socks/cart/middleware/HTTPMonitoringInterceptor.java
@@ -72,7 +72,7 @@ public void afterCompletion(HttpServletRequest httpServletRequest, HttpServletRe
     private String getMatchingURLPattern(HttpServletRequest httpServletRequest) {
         String res = "";
         for (PatternsRequestCondition pattern : getUrlPatterns()) {
-            if (pattern.getMatchingCondition(httpServletRequest) != null &&
+            if (pattern != null && pattern.getMatchingCondition(httpServletRequest) != null &&
                     !httpServletRequest.getServletPath().equals("/error")) {
                 res = pattern.getMatchingCondition(httpServletRequest).getPatterns().iterator()
                         .next();
@@ -85,15 +85,23 @@ private String getMatchingURLPattern(HttpServletRequest httpServletRequest) {
     private Set<PatternsRequestCondition> getUrlPatterns() {
         if (this.urlPatterns == null) {
             this.urlPatterns = new HashSet<>();
-            requestMappingHandlerMapping.getHandlerMethods().forEach((mapping, handlerMethod) ->
-                    urlPatterns.add(mapping.getPatternsCondition()));
-            RepositoryRestHandlerMapping repositoryRestHandlerMapping = new
-                    RepositoryRestHandlerMapping(mappings, repositoryConfiguration);
+            requestMappingHandlerMapping.getHandlerMethods().forEach((mapping, handlerMethod) -> {
+                PatternsRequestCondition condition = mapping.getPatternsCondition();
+                if (condition != null) {
+                    urlPatterns.add(condition);
+                }
+            });
+
+            RepositoryRestHandlerMapping repositoryRestHandlerMapping = new RepositoryRestHandlerMapping(mappings, repositoryConfiguration);
             repositoryRestHandlerMapping.setJpaHelper(jpaHelper);
             repositoryRestHandlerMapping.setApplicationContext(applicationContext);
             repositoryRestHandlerMapping.afterPropertiesSet();
-            repositoryRestHandlerMapping.getHandlerMethods().forEach((mapping, handlerMethod) ->
-                    urlPatterns.add(mapping.getPatternsCondition()));
+            repositoryRestHandlerMapping.getHandlerMethods().forEach((mapping, handlerMethod) -> {
+                PatternsRequestCondition condition = mapping.getPatternsCondition();
+                if (condition != null) {
+                    urlPatterns.add(condition);
+                }
+            });
         }
         return this.urlPatterns;
     }