Fix Module search by dependency GAV

Author: fabapp2

components/sbm-core/src/main/java/org/springframework/sbm/build/api/ApplicationModules.java

@@ -177,11 +177,11 @@ public boolean isSingleModuleApplication() {
     public Map<Scope, List<Module>> findModulesWithDeclaredDependencyTo(String gav) {
         Map<Scope, List<Module>> dependantModules = new HashMap<>();
         for (Module m : this.modules) {
-            Optional<Dependency> declaredDependency = m.getBuildFile().findDeclaredDependency(gav);
+            Optional<Dependency> declaredDependency = m.getBuildFile().findRequestedDependency(gav);
             if (declaredDependency.isPresent()) {
                 Dependency dependency = declaredDependency.get();
                 String scopeStr = dependency.getScope();
-                Scope scope = scopeStr != null ? Scope.valueOf(scopeStr) : Scope.Compile;
+                Scope scope = scopeStr != null ? Scope.valueOf(uppercaseFirstChar(scopeStr)) : Scope.Compile;
                 if(dependantModules.containsKey(scope)) {
                     dependantModules.get(scope).add(m);
                 } else {
@@ -193,4 +193,10 @@ public Map<Scope, List<Module>> findModulesWithDeclaredDependencyTo(String gav)
         }
         return dependantModules;
     }
+
+    // TODO: provide in common util class
+    String uppercaseFirstChar(String name) {
+        if (name.isEmpty()) return name;
+        return Character.toUpperCase(name.charAt(0)) + name.substring(1);
+    }
 }

components/sbm-core/src/main/java/org/springframework/sbm/build/api/BuildFile.java

@@ -42,6 +42,11 @@ public interface BuildFile extends ProjectResource {
      */
     List<Dependency> getRequestedDependencies();
 
+    /**
+     * Searches for a requested dependency matching the given GAV.
+     */
+    Optional<Dependency> findRequestedDependency(String gav);
+
     /**
      * Returns any available dependency (declared or transitive) with given scope.
      */
@@ -201,4 +206,5 @@ default String getGav() {
      * @throws IllegalStateException when no dependency with given gav exists.
      */
     Dependency getDeclaredDependency(String gav);
+
 }

components/sbm-core/src/main/java/org/springframework/sbm/build/impl/OpenRewriteMavenBuildFile.java

@@ -346,6 +346,13 @@ public List<Dependency> getRequestedDependencies() {
                 .collect(Collectors.toList());
     }
 
+    @Override
+    public Optional<Dependency> findRequestedDependency(String gav) {
+        return getRequestedDependencies().stream()
+                .filter(d -> d.getGav().equals(gav))
+                .findFirst();
+    }
+
     /**
      * {@inheritDoc}
      *

components/sbm-core/src/main/java/org/springframework/sbm/project/parser/MavenProjectParser.java

@@ -38,6 +38,7 @@
 import org.springframework.sbm.build.impl.MavenBuildFileUtil;
 import org.springframework.sbm.build.impl.RewriteMavenParser;
 import org.springframework.sbm.engine.events.*;
+import org.springframework.sbm.parsers.RewriteMavenProjectParser;
 import org.springframework.sbm.parsers.RewriteProjectParser;
 import org.springframework.sbm.scopes.ProjectMetadata;
 import org.springframework.stereotype.Component;
@@ -71,10 +72,10 @@ public class MavenProjectParser {
     private final MavenConfigHandler mavenConfigHandler;
     private final ProjectMetadata projectMetadata;
     private final ExecutionContext executionContext;
-    private final RewriteProjectParser parser;
+    private final RewriteMavenProjectParser parser;
 
     public List<SourceFile> parse(Path projectDirectory, List<Resource> resources) {
-        return parser.parse(projectDirectory, resources, executionContext).sourceFiles();
+        return parser.parse(projectDirectory).sourceFiles();
     }
 
 

components/sbm-core/src/test/java/org/springframework/sbm/build/api/ApplicationModulesTest.java

@@ -170,7 +170,7 @@ void componentModule() {
     @Test
     @DisplayName("should return depending modules")
     void shouldReturnDependingModules() {
-        Map<Scope, List<Module>> modulesWithDeclaredDependencyTo = sut.findModulesWithDeclaredDependencyTo("com.example:module2:1.0-SNAPSHOT");
+        Map<Scope, List<Module>> modulesWithDeclaredDependencyTo = sut.findModulesWithDeclaredDependencyTo("org.example:module2:1.0-SNAPSHOT");
         assertThat(modulesWithDeclaredDependencyTo.containsKey(Scope.Compile)).isTrue();
     }