Skip to content

Commit a2636fb

Browse files
authored
rewrite maven parser cleanup and refactorings (#850)
1 parent 7f3f6ff commit a2636fb

File tree

53 files changed

+1292
-1315
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+1292
-1315
lines changed
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
name: Build sbm-utils
2+
on:
3+
push:
4+
branches:
5+
- "**"
6+
paths:
7+
- "sbm-support-rewrite/**"
8+
jobs:
9+
build:
10+
runs-on: ubuntu-latest
11+
defaults:
12+
run:
13+
working-directory: sbm-support-rewrite
14+
steps:
15+
- name: build-sbm-support-rewrite
16+
uses: actions/checkout@v3
17+
- name: setup-java
18+
uses: actions/setup-java@v2
19+
with:
20+
distribution: zulu
21+
java-version: 17
22+
cache: maven
23+
- name: build-project
24+
run: mvn --batch-mode clean install

applications/spring-shell/src/test/java/org/springframework/sbm/BootUpgrade_27_30_IntegrationTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import org.openrewrite.maven.tree.Dependency;
2323
import org.openrewrite.maven.tree.MavenResolutionResult;
2424
import org.openrewrite.xml.tree.Xml;
25+
import org.springframework.sbm.helpers.DependencyVersionHelper;
2526

2627
import java.nio.file.Path;
2728
import java.util.List;
@@ -126,7 +127,8 @@ private void verifyJohnzonCoreDependencyIsUpgraded() {
126127

127128
assertThat(johnzonDependency.getClassifier()).isEqualTo("jakarta");
128129
assertThat(johnzonDependency.getArtifactId()).isEqualTo("johnzon-core");
129-
assertThat(johnzonDependency.getVersion()).isEqualTo("1.2.20");
130+
Optional<String> expectedJohnzonVersion = DependencyVersionHelper.getLatestReleaseVersion(johnzonDependency.getGroupId(), johnzonDependency.getArtifactId());
131+
assertThat(johnzonDependency.getVersion()).isEqualTo(expectedJohnzonVersion.get());
130132
}
131133

132134
@NotNull

components/sbm-core/src/main/java/org/springframework/sbm/common/util/OsAgnosticPathMatcher.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*/
1616
package org.springframework.sbm.common.util;
1717

18+
import org.springframework.sbm.utils.LinuxWindowsPathUnifier;
1819
import org.springframework.util.AntPathMatcher;
1920
import org.springframework.util.PathMatcher;
2021

components/sbm-core/src/main/java/org/springframework/sbm/engine/precondition/JavaSourceDirExistsPreconditionCheck.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
package org.springframework.sbm.engine.precondition;
1717

1818
import org.springframework.core.io.Resource;
19-
import org.springframework.sbm.common.util.LinuxWindowsPathUnifier;
19+
import org.springframework.sbm.utils.LinuxWindowsPathUnifier;
2020
import org.springframework.sbm.common.util.OsAgnosticPathMatcher;
2121
import org.springframework.stereotype.Component;
2222
import org.springframework.util.PathMatcher;

components/sbm-core/src/main/java/org/springframework/sbm/engine/precondition/MavenBuildFileExistsPreconditionCheck.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
import org.springframework.core.annotation.Order;
1919
import org.springframework.core.io.Resource;
20-
import org.springframework.sbm.common.util.LinuxWindowsPathUnifier;
2120
import org.springframework.stereotype.Component;
2221

2322
import java.nio.file.Path;

components/sbm-core/src/main/java/org/springframework/sbm/engine/recipe/OpenRewriteRecipeAdapterAction.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
package org.springframework.sbm.engine.recipe;
1818

1919
import com.fasterxml.jackson.annotation.JsonIgnore;
20+
import lombok.AllArgsConstructor;
21+
import lombok.experimental.SuperBuilder;
2022
import lombok.extern.slf4j.Slf4j;
2123
import org.openrewrite.Recipe;
2224
import org.openrewrite.Result;
@@ -27,6 +29,8 @@
2729
import java.util.List;
2830

2931
@Slf4j
32+
@AllArgsConstructor
33+
@SuperBuilder
3034
public class OpenRewriteRecipeAdapterAction extends AbstractAction {
3135

3236
private final Recipe recipe;

components/sbm-core/src/main/java/org/springframework/sbm/java/migration/conditions/HasAnyTypeReference.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,17 @@
1515
*/
1616
package org.springframework.sbm.java.migration.conditions;
1717

18+
import lombok.*;
1819
import org.springframework.sbm.engine.context.ProjectContext;
1920
import org.springframework.sbm.engine.recipe.Condition;
20-
import lombok.Getter;
21-
import lombok.Setter;
2221

2322
import java.util.List;
2423

2524
@Getter
2625
@Setter
26+
@Builder
27+
@AllArgsConstructor
28+
@NoArgsConstructor
2729
public class HasAnyTypeReference implements Condition {
2830

2931
private List<String> fqTypeNames;

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,10 @@ public List<SourceFile> parse(Path projectDirectory, List<Resource> resources) {
7373
projectMetadata.setMavenSettings(mavenSettings);
7474
MavenExecutionContextView mavenExecutionContext = MavenExecutionContextView.view(executionContext);
7575
mavenExecutionContext.setMavenSettings(mavenSettings);
76-
77-
76+
// if(mavenExecutionContext.getLocalRepository() == null) {
77+
MavenExecutionContextView.view(executionContext).setLocalRepository(new MavenRepository("local", "file://" + Path.of(System.getProperty("user.home")).resolve(".m2/repository"), null, null, false, null, null, null));
78+
// }
79+
// default local repo provided by MavenExecutionContextView misses two '/' in the path
7880
mavenConfigHandler.injectMavenConfigIntoSystemProperties(resources);
7981

8082
@Nullable BuildEnvironment buildEnvironment = null;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
import lombok.RequiredArgsConstructor;
1919
import org.springframework.core.io.Resource;
20-
import org.springframework.sbm.common.util.LinuxWindowsPathUnifier;
20+
import org.springframework.sbm.utils.LinuxWindowsPathUnifier;
2121
import org.springframework.sbm.common.util.OsAgnosticPathMatcher;
2222
import org.springframework.sbm.project.resource.SbmApplicationProperties;
2323
import org.springframework.sbm.project.resource.ResourceHelper;

components/sbm-recipes-spring-framework/src/main/java/org/springframework/sbm/actions/spring/xml/include/ImportSpringXmlConfigAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
package org.springframework.sbm.actions.spring.xml.include;
1717

1818
import com.fasterxml.jackson.annotation.JsonIgnore;
19-
import org.springframework.sbm.common.util.LinuxWindowsPathUnifier;
19+
import org.springframework.sbm.utils.LinuxWindowsPathUnifier;
2020
import org.springframework.sbm.engine.recipe.AbstractAction;
2121
import org.springframework.sbm.build.MultiModuleApplicationNotSupportedException;
2222
import org.springframework.sbm.engine.context.ProjectContext;

0 commit comments

Comments
 (0)