Merge branch 'main' into cassandra_properties

Author: fabapp2

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

@@ -263,35 +263,45 @@ public List<Dependency> getDeclaredDependencies(Scope... scopes) {
     @Override
     public List<Dependency> getRequestedDependencies() {
         List<org.openrewrite.maven.tree.Dependency> requestedDependencies = getPom().getPom().getRequestedDependencies();
+
         // FIXME: #7 use getPom().getDependencies() instead ?
         List<Dependency> declaredDependenciesWithEffectiveVersions = requestedDependencies.stream()
                 .map(d -> mapDependency(d))
                 .map(d -> {
                     if(d.getType() == null || d.getClassifier() == null || d.getVersion() == null) {
 
-                        String groupId = evaluate(d.getGroupId());
-                        String artifactId = evaluate(d.getArtifactId());
-                        String version = evaluate(d.getVersion());
+                        // resolve values for properties like ${my.artifactId} or ${dep.version}
+                        String resolvedGroupId = resolve(d.getGroupId());
+                        String resolvedArtifactId = resolve(d.getArtifactId());
+                        String resolvedVersion = resolve(d.getVersion());
 
                         List<ResolvedDependency> dependencies = getPom().findDependencies(
-                                groupId,
-                                artifactId,
+                                resolvedGroupId,
+                                resolvedArtifactId,
                                 d.getScope() != null ? Scope.fromName(d.getScope()) : null
                         );
                         if (dependencies.isEmpty()) {
                             // requested dependency from another module in this multi-module project won't be resolvable
-                            return d;
+                            d.setGroupId(resolvedGroupId);
+                            d.setArtifactId(resolvedArtifactId);
+                            d.setVersion(resolvedVersion);
+                        }
+                        else {
+                            ResolvedDependency resolvedDependency = dependencies.get(0);
+                            d.setGroupId(resolvedGroupId);
+                            d.setArtifactId(resolvedArtifactId);
+                            d.setVersion(resolvedDependency.getVersion());
+                            d.setClassifier(resolvedDependency.getClassifier());
+                            d.setType(resolvedDependency.getType());
                         }
-                        ResolvedDependency resolvedDependency = dependencies.get(0);
-                        d.setVersion(resolvedDependency.getVersion());
-                        d.setClassifier(resolvedDependency.getClassifier());
-                        d.setType(resolvedDependency.getType());
-                        d.setArtifactId(artifactId);
-                        d.setGroupId(groupId);
+
 
                         if(d.getScope() == null ) {
-                            String s = resolveScope(groupId, artifactId, d.getType(), d.getClassifier());
-                            d.setScope(s);
+                            String s = resolveScope(resolvedGroupId, resolvedArtifactId, d.getType(), d.getClassifier());
+                            if(s == null) {
+                                s = "compile";
+                            }
+                            d.setScope(s.toLowerCase());
                         }
                     }
                     return d;
@@ -302,8 +312,6 @@ public List<Dependency> getRequestedDependencies() {
 
     /**
      * {@inheritDoc}
-     *
-     * TODO: #497 Test with declared and transitive dependencies
      */
     @Override
     public Set<Dependency> getEffectiveDependencies(Scope scope) {
@@ -315,10 +323,28 @@ public Set<Dependency> getEffectiveDependencies(Scope scope) {
 
     @Override
     public Set<Dependency> getEffectiveDependencies() {
-        return getPom().getDependencies().entrySet()
+        Set<Dependency> collect = getPom()
+                .getDependencies()
+                .get(Scope.Compile)
                 .stream()
-                .flatMap(e -> e.getValue().stream().map(v -> mapDependency(e.getKey(), v)))
+                .map(d -> mapDependency(Scope.Compile, d))
                 .collect(Collectors.toSet());
+
+        getPom()
+                .getDependencies()
+                .get(Scope.Provided)
+                .stream()
+                .map(d -> mapDependency(Scope.Provided, d))
+                .forEach(d -> collect.add(d));
+
+        getPom()
+                .getDependencies()
+                .get(Scope.Test)
+                .stream()
+                .map(d -> mapDependency(Scope.Test, d))
+                .forEach(d -> collect.add(d));
+
+        return collect;
     }
 
     @Override
@@ -367,7 +393,7 @@ private org.springframework.sbm.build.api.Dependency mapDependency(org.openrewri
 
     private String resolveScope(String groupId, String artifactId, @Nullable String type, @Nullable String classifier) {
         Scope managedScope = getPom().getPom().getManagedScope(groupId, artifactId, type, classifier);
-        return managedScope != null ? managedScope.name().toLowerCase() : null;
+        return managedScope != null ? managedScope.name().toLowerCase() : "compile";
     }
 
     private org.springframework.sbm.build.api.Dependency mapDependency(Scope scope, ResolvedDependency d) {
@@ -376,12 +402,15 @@ private org.springframework.sbm.build.api.Dependency mapDependency(Scope scope,
                 d.getArtifactId(),
                 d.getVersion(),
                 d.getType(),
-                scope.name(),
+                scope.name().toLowerCase(),
                 d.getClassifier(),
-                d.getRequested().getExclusions()
-                        .stream()
-                        .map(e -> Dependency.builder().groupId(e.getGroupId()).artifactId(e.getArtifactId()).build())
-                        .collect(Collectors.toList())
+                d.getRequested().getExclusions() != null ?
+                    d.getRequested().getExclusions()
+                            .stream()
+                            .map(e -> Dependency.builder().groupId(e.getGroupId()).artifactId(e.getArtifactId()).build())
+                            .collect(Collectors.toList())
+                        :
+                        List.of()
         );
     }
 
@@ -623,7 +652,7 @@ public String getArtifactId() {
 
     @Override
     public String getVersion() {
-        return evaluate(getPom().getPom().getVersion());
+        return resolve(getPom().getPom().getVersion());
     }
     @Override
     public String getCoordinates() {
@@ -802,7 +831,7 @@ public void removePlugins(String... coordinates) {
     }
 
 
-    private String evaluate(String expression) {
+    private String resolve(String expression) {
         return getPom().getPom().getValue(expression);
     }
 }

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

@@ -67,7 +67,7 @@ private static Consumer<Throwable> createErrorHandler() {
     }
 
     public Set<Dependency> mapCoordinatesToDependencies(List<String> coordinates) {
-        Set<Dependency> dependencies = new HashSet<>();
+        Set<Dependency> dependencies = new LinkedHashSet<>();
         coordinates.forEach(c -> {
 
             String[] parts = c.split(":");

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

@@ -73,7 +73,7 @@ void multiModuleProject() {
 
         String module1Pom = PomBuilder
                 .buiildPom("com.example:parent:1.0", "module1")
-                .dependencies("com.example:module2:1.0")
+                .unscopedDependencies("com.example:module2:1.0")
                 .build();
 
         String module2Pom = PomBuilder.buiildPom("com.example:parent:1.0", "module2").build();