Skip to content

Commit 2ea2754

Browse files
authored
refactor: Rename Filter to Finder (#807)
1 parent 0457ef5 commit 2ea2754

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

components/sbm-recipes-jee-to-boot/src/main/java/org/springframework/sbm/jee/ejb/actions/MigrateEjbDeploymentDescriptor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import org.springframework.sbm.jee.ejb.api.DescriptionType;
2323
import org.springframework.sbm.jee.ejb.api.SessionBeanType;
2424
import org.springframework.sbm.jee.ejb.api.EjbJarXml;
25-
import org.springframework.sbm.jee.ejb.filter.EjbJarXmlResourceFilter;
25+
import org.springframework.sbm.jee.ejb.filter.EjbJarXmlResourceFinder;
2626
import lombok.NoArgsConstructor;
2727
import lombok.experimental.SuperBuilder;
2828

@@ -35,7 +35,7 @@
3535
public class MigrateEjbDeploymentDescriptor extends AbstractAction {
3636
@Override
3737
public void apply(ProjectContext context) {
38-
Optional<EjbJarXml> ejbJarXml = context.search(new EjbJarXmlResourceFilter());
38+
Optional<EjbJarXml> ejbJarXml = context.search(new EjbJarXmlResourceFinder());
3939
if (ejbJarXml.isPresent()) {
4040
migrateEjbDeploymentDescriptor(context, ejbJarXml.get());
4141
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
import java.util.Optional;
2323

24-
public class EjbJarXmlResourceFilter implements ProjectResourceFinder<Optional<EjbJarXml>> {
24+
public class EjbJarXmlResourceFinder implements ProjectResourceFinder<Optional<EjbJarXml>> {
2525

2626
private static final String EJB_JAR_XML = "ejb-jar.xml";
2727

components/sbm-support-jee/src/test/java/org/springframework/sbm/jee/ejb/api/EjbJarXmlTest.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import org.openrewrite.xml.XmlParser;
2222
import org.openrewrite.xml.tree.Xml;
2323
import org.springframework.sbm.engine.context.ProjectContext;
24-
import org.springframework.sbm.jee.ejb.filter.EjbJarXmlResourceFilter;
24+
import org.springframework.sbm.jee.ejb.filter.EjbJarXmlResourceFinder;
2525
import org.springframework.sbm.jee.ejb.resource.JeeEjbJarXmlProjectResourceRegistrar;
2626
import org.springframework.sbm.project.resource.TestProjectContext;
2727

@@ -69,7 +69,7 @@ void unmarshal_21_ejb_jarXml() {
6969
.addProjectResource("src/main/resources/ejb-jar.xml", ejbJarXmlContent)
7070
.build();
7171

72-
Optional<EjbJarXml> ejbJarXmlOptional = projectContext.search(new EjbJarXmlResourceFilter());
72+
Optional<EjbJarXml> ejbJarXmlOptional = projectContext.search(new EjbJarXmlResourceFinder());
7373
EjbJarType ejbJarXml = ejbJarXmlOptional.get().getEjbJarXml();
7474
assertThat(ejbJarXml.getEnterpriseBeans().getSessionOrEntityOrMessageDriven()).hasSize(1);
7575
assertThat(ejbJarXml.getEnterpriseBeans().getSessionOrEntityOrMessageDriven().get(0)).isInstanceOf(SessionBeanType.class);
@@ -107,7 +107,7 @@ void unmarshal_jcp_3_2_schema() throws JAXBException {
107107
.addProjectResource("src/main/resources/ejb-jar.xml", ejbJarXmlContent)
108108
.build();
109109

110-
Optional<EjbJarXml> ejbJarXmlOptional = projectContext.search(new EjbJarXmlResourceFilter());
110+
Optional<EjbJarXml> ejbJarXmlOptional = projectContext.search(new EjbJarXmlResourceFinder());
111111

112112
EjbJarType ejbJarType = ejbJarXmlOptional.get().unmarshal(ejbJarXmlContent);
113113

@@ -162,6 +162,7 @@ void unmarshal_no_schema() throws JAXBException {
162162

163163
@Test
164164
void createEjbJarXmlwithOneEjb_removeEjb_shouldResultInEmpty() {
165+
165166
String ejbJarXmlContent =
166167
"<ejb-jar xmlns=\"http://xmlns.jcp.org/xml/ns/javaee\"\n" +
167168
" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
@@ -186,7 +187,7 @@ void createEjbJarXmlwithOneEjb_removeEjb_shouldResultInEmpty() {
186187
.build();
187188

188189

189-
Optional<EjbJarXml> ejbJarXmlOptional = projectContext.search(new EjbJarXmlResourceFilter());
190+
Optional<EjbJarXml> ejbJarXmlOptional = projectContext.search(new EjbJarXmlResourceFinder());
190191

191192
assertThat(ejbJarXmlOptional).isNotEmpty();
192193
EjbJarXml ejbJarXml = ejbJarXmlOptional.get();

0 commit comments

Comments
 (0)