Skip to content

Commit 3a6e7fa

Browse files
committed
Update to rewrite 2.0.0-rc.2 api
1 parent f0d382d commit 3a6e7fa

File tree

5 files changed

+16
-13
lines changed

5 files changed

+16
-13
lines changed

build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import nebula.plugin.info.InfoBrokerPlugin
55
import nebula.plugin.contacts.*
66
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
77
import org.jfrog.gradle.plugin.artifactory.dsl.*
8-
import org.w3c.dom.Element
98

109
buildscript {
1110
repositories {

gradle/licenseHeader.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright ${year} the original author or authors.
1+
Copyright 2020 the original author or authors.
22
<p>
33
Licensed under the Apache License, Version 2.0 (the "License");
44
you may not use this file except in compliance with the License.

src/main/java/org/openrewrite/spring/xml/MigrateSpringXmlConfigurationJava.java

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
*/
1616
package org.openrewrite.spring.xml;
1717

18+
import org.openrewrite.Refactor;
19+
import org.openrewrite.RefactorModule;
20+
import org.openrewrite.java.tree.J;
1821
import org.openrewrite.spring.xml.parse.RewriteBeanDefinition;
1922
import org.openrewrite.spring.xml.parse.RewriteBeanDefinitionRegistry;
2023
import org.openrewrite.spring.xml.parse.RewriteNamespaceHandler;
21-
import org.openrewrite.RefactorModule;
22-
import org.openrewrite.SourceVisitor;
23-
import org.openrewrite.java.tree.J;
2424
import org.springframework.beans.factory.BeanDefinitionStoreException;
2525
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
2626
import org.springframework.beans.factory.xml.DefaultNamespaceHandlerResolver;
@@ -37,7 +37,6 @@
3737
import java.util.List;
3838
import java.util.Map;
3939

40-
import static java.util.Arrays.asList;
4140
import static java.util.Collections.singletonList;
4241

4342
public class MigrateSpringXmlConfigurationJava implements RefactorModule<J.CompilationUnit, J> {
@@ -84,17 +83,15 @@ static void loadBeanDefinitions(List<Path> xmlConfigurations, BeanDefinitionRegi
8483
}
8584

8685
@Override
87-
public List<SourceVisitor<J>> getVisitors() {
88-
return asList(
89-
new MakeComponentScannable(beanDefinitionRegistry),
90-
new AddConfigurationClass(beanDefinitionRegistry, mainSourceSet)
91-
);
86+
public Refactor<J.CompilationUnit, J> apply(Refactor<J.CompilationUnit, J> refactor) {
87+
return refactor.visit(new MakeComponentScannable(beanDefinitionRegistry))
88+
.visit(new AddConfigurationClass(beanDefinitionRegistry, mainSourceSet));
9289
}
9390

9491
@Override
9592
public List<J.CompilationUnit> getDeclaredOutputs() {
9693
return singletonList(J.CompilationUnit
9794
.buildEmptyClass(mainSourceSet, configurationPackage, "MyConfiguration")
98-
.withMetadata(Map.of("spring.beans.fileType", "ConfigurationClass")));
95+
.withMetadata(Map.of(SpringMetadata.FILE_TYPE, "ConfigurationClass")));
9996
}
10097
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
package org.openrewrite.spring.xml;
2+
3+
import org.openrewrite.Metadata;
4+
5+
public enum SpringMetadata implements Metadata {
6+
FILE_TYPE
7+
}

src/main/java/org/openrewrite/spring/xml/bean/AddComponentScan.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
*/
1616
package org.openrewrite.spring.xml.bean;
1717

18+
import org.openrewrite.refactor.Formatter;
1819
import org.openrewrite.spring.xml.parse.RewriteBeanDefinition;
1920
import org.openrewrite.spring.xml.parse.RewriteBeanDefinitionRegistry;
2021
import org.openrewrite.java.refactor.AddAnnotation;
21-
import org.openrewrite.java.refactor.Formatter;
2222
import org.openrewrite.java.tree.Expression;
2323
import org.openrewrite.java.tree.J;
2424
import org.openrewrite.java.tree.JavaType;

0 commit comments

Comments
 (0)