Skip to content

Commit cc3ac66

Browse files
committed
Using method references
1 parent 0969d84 commit cc3ac66

File tree

2 files changed

+7
-30
lines changed

2 files changed

+7
-30
lines changed

src/main/java/org/jboss/forge/addon/angularjs/JSONRestResourceFromEntityCommand.java

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import javax.inject.Inject;
1616
import javax.ws.rs.core.MediaType;
1717

18-
import org.jboss.forge.addon.convert.Converter;
1918
import org.jboss.forge.addon.javaee.jpa.JPAFacet;
2019
import org.jboss.forge.addon.javaee.rest.generation.RestGenerationConstants;
2120
import org.jboss.forge.addon.javaee.rest.generation.RestGenerationContext;
@@ -49,8 +48,8 @@
4948
import org.jboss.shrinkwrap.descriptor.api.persistence.PersistenceUnitCommon;
5049

5150
/**
52-
* A wizard step to perform creation of REST resources.
53-
* It re-uses services from the Java EE addon to create JAX-RS based REST resources.
51+
* A wizard step to perform creation of REST resources. It re-uses services from the Java EE addon to create JAX-RS
52+
* based REST resources.
5453
*/
5554
public class JSONRestResourceFromEntityCommand implements UIWizardStep
5655
{
@@ -124,25 +123,11 @@ public void initializeUI(UIBuilder builder) throws Exception
124123
generator.setDefaultValue(defaultResourceGenerator);
125124
if (context.getProvider().isGUI())
126125
{
127-
generator.setItemLabelConverter(new Converter<RestResourceGenerator, String>()
128-
{
129-
@Override
130-
public String convert(RestResourceGenerator source)
131-
{
132-
return source == null ? null : source.getDescription();
133-
}
134-
});
126+
generator.setItemLabelConverter(RestResourceGenerator::getDescription);
135127
}
136128
else
137129
{
138-
generator.setItemLabelConverter(new Converter<RestResourceGenerator, String>()
139-
{
140-
@Override
141-
public String convert(RestResourceGenerator source)
142-
{
143-
return source == null ? null : source.getName();
144-
}
145-
});
130+
generator.setItemLabelConverter(RestResourceGenerator::getName);
146131
}
147132
builder.add(generator)
148133
.add(packageName)

src/main/java/org/jboss/forge/addon/angularjs/ScaffoldableEntitySelectionWizard.java

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import javax.persistence.Id;
1616

1717
import org.jboss.forge.addon.angularjs.util.RestResourceTypeVisitor;
18-
import org.jboss.forge.addon.convert.Converter;
1918
import org.jboss.forge.addon.javaee.jpa.JPAFacet;
2019
import org.jboss.forge.addon.parser.java.facets.JavaSourceFacet;
2120
import org.jboss.forge.addon.projects.Project;
@@ -52,7 +51,7 @@ public class ScaffoldableEntitySelectionWizard implements UIWizardStep
5251
private UISelectMany<JavaClassSource> targets;
5352

5453
@Inject
55-
@WithAttributes(label = "Generate REST resources", required = false, description = "If enabled, REST resources for the selected JPA entities will be generated")
54+
@WithAttributes(label = "Generate REST resources", required = false, description = "If enabled, REST resources for the selected JPA entities will be generated", defaultValue = "true")
5655
private UIInput<Boolean> generateRestResources;
5756

5857
@Inject
@@ -112,7 +111,7 @@ public void initializeUI(UIBuilder builder) throws Exception
112111
JPAFacet<?> persistenceFacet = project.getFacet(JPAFacet.class);
113112
List<JavaClassSource> allEntities = persistenceFacet.getAllEntities();
114113
List<JavaClassSource> supportedEntities = new ArrayList<>();
115-
for (JavaClassSource entity: allEntities)
114+
for (JavaClassSource entity : allEntities)
116115
{
117116
for (Member<?> member : entity.getMembers())
118117
{
@@ -125,14 +124,7 @@ public void initializeUI(UIBuilder builder) throws Exception
125124
}
126125
}
127126
targets.setValueChoices(supportedEntities);
128-
targets.setItemLabelConverter(new Converter<JavaClassSource, String>()
129-
{
130-
@Override
131-
public String convert(JavaClassSource source)
132-
{
133-
return source == null ? null : source.getQualifiedName();
134-
}
135-
});
127+
targets.setItemLabelConverter(JavaClassSource::getQualifiedName);
136128
builder.add(targets).add(generateRestResources);
137129
}
138130

0 commit comments

Comments
 (0)