Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revamp/954 all tests pass with latest sbm support rewrite #956

Open
wants to merge 5 commits into
base: version/revamp
Choose a base branch
from
Open

Revamp/954 all tests pass with latest sbm support rewrite #956

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
00bb1c2
Fix test JavaParser parses sources with compile error
fabapp2 Oct 9, 2023
b030a9b
Revert "Fix test JavaParser parses sources with compile error"
fabapp2 Oct 9, 2023
15e4231
Add missing bean
fabapp2 Oct 9, 2023
5368730
Implement empty method
fabapp2 Oct 9, 2023
62ab54e
Expect passing tests in build
fabapp2 Oct 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build-sbm-revamp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ jobs:
- name: sbm-openrewrite (build + test)
run: mvn --batch-mode install --projects :sbm-openrewrite

- name: sbm-core (build)
run: mvn -DskipTests --batch-mode install --projects :sbm-core
- name: sbm-core (build + test)
run: mvn --batch-mode install --projects :sbm-core

- name: recipe-test-support (build)
run: mvn -DskipTests --batch-mode install --projects :recipe-test-support
Expand Down
2 changes: 1 addition & 1 deletion components/sbm-core/src/test/java/org/springframework/sbm/project/TestDummyResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ private File getFile(TestDummyResource testDummyResource) {

@Override
public long contentLength() {
throw new UnsupportedOperationException();
return content.length();
}

@Override
Expand Down
10 changes: 6 additions & 4 deletions ...main/java/org/springframework/sbm/boot/autoconfigure/ProjectResourceSetConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,7 @@
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.context.annotation.Bean;
import org.springframework.sbm.project.RewriteSourceFileWrapper;
import org.springframework.sbm.project.resource.ProjectResourceSerializer;
import org.springframework.sbm.project.resource.ProjectResourceSetFactory;
import org.springframework.sbm.project.resource.ProjectResourceSetSerializer;
import org.springframework.sbm.project.resource.RewriteMigrationResultMerger;
import org.springframework.sbm.project.resource.*;

/**
* @author Fabian Krüger
Expand All @@ -49,6 +46,11 @@ ProjectResourceSetSerializer projectResourceSetSerializer(ProjectResourceSeriali
return new ProjectResourceSetSerializer(resourceSerializer);
}

@Bean
public ProjectResourceSetHolder projectResourceSetHolder(ExecutionContext executionContext, RewriteMigrationResultMerger rewriteMigrationResultMerger) {
return new ProjectResourceSetHolder(executionContext, rewriteMigrationResultMerger);
}

@Bean
ProjectResourceSetFactory projectResourceSetFactory(RewriteMigrationResultMerger rewriteMigrationResultMerger, RewriteSourceFileWrapper sourceFileWrapper, ExecutionContext executionContext) {
return new ProjectResourceSetFactory(rewriteMigrationResultMerger, sourceFileWrapper, executionContext);
Expand Down
Loading