Skip to content

Commit

Permalink
FORGE-2600: Renamed --container and --provider to --jpa-container and…
Browse files Browse the repository at this point in the history 
… --jpa-provider
  • Loading branch information
@gastaldi
gastaldi committed Feb 17, 2016
1 parent de6f53e commit d473544
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 22 deletions.
24 changes: 12 additions & 12 deletions javaee/impl/src/main/java/org/jboss/forge/addon/javaee/jpa/ui/setup/JPASetupWizardImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,11 @@ public class JPASetupWizardImpl extends AbstractJavaEECommand implements JPASetu

@Inject
@WithAttributes(shortName = 'c', label = "Container", required = true)
private UISelectOne<PersistenceContainer> container;
private UISelectOne<PersistenceContainer> jpaContainer;

@Inject
@WithAttributes(shortName = 'p', label = "Provider", required = true)
private UISelectOne<PersistenceProvider> provider;
private UISelectOne<PersistenceProvider> jpaProvider;

@Inject
@WithAttributes(shortName = 'm', label = "Install a JPA 2 metamodel generator?")
Expand Down Expand Up @@ -96,7 +96,7 @@ public void initializeUI(UIBuilder builder) throws Exception
initContainers(project, uiContext);
initProviders();
initConfigureMetadata();
builder.add(container).add(provider).add(configureMetadata);
builder.add(jpaContainer).add(jpaProvider).add(configureMetadata);
}

private boolean initJpaVersion(Project project, UIContext context)
Expand All @@ -116,31 +116,31 @@ private boolean initJpaVersion(Project project, UIContext context)
private void initContainers(Project project, UIContext context)
{
final boolean isGUI = context.getProvider().isGUI();
container.setItemLabelConverter((source) -> source.getName(isGUI));
jpaContainer.setItemLabelConverter((source) -> source.getName(isGUI));
// Ordering items
TreeSet<PersistenceContainer> treeSet = new TreeSet<>(
(o1, o2) -> String.valueOf(o1.getName(isGUI)).compareTo(o2.getName(isGUI)));
Optional<Stack> stack = project.getStack();
for (PersistenceContainer persistenceContainer : container.getValueChoices())
for (PersistenceContainer persistenceContainer : jpaContainer.getValueChoices())
{
if (!stack.isPresent() || persistenceContainer.supports(stack.get()))
treeSet.add(persistenceContainer);
}
container.setValueChoices(treeSet);
jpaContainer.setValueChoices(treeSet);
if (treeSet.contains(defaultContainer))
{
container.setDefaultValue(defaultContainer);
jpaContainer.setDefaultValue(defaultContainer);
}
else if (treeSet.contains(wildFlyContainer))
{
container.setDefaultValue(wildFlyContainer);
jpaContainer.setDefaultValue(wildFlyContainer);
}
}

private void initProviders()
{
provider.setItemLabelConverter((source) -> source.getName());
provider.setDefaultValue(defaultProvider);
jpaProvider.setItemLabelConverter((source) -> source.getName());
jpaProvider.setDefaultValue(defaultProvider);
}

private void initConfigureMetadata()
Expand Down Expand Up @@ -185,8 +185,8 @@ private void applyUIValues(final UIContext context)
{
Map<Object, Object> attributeMap = context.getAttributeMap();
attributeMap.put(JPAFacet.class, jpaVersion.getValue());
attributeMap.put(PersistenceProvider.class, provider.getValue());
attributeMap.put(PersistenceContainer.class, container.getValue());
attributeMap.put(PersistenceProvider.class, jpaProvider.getValue());
attributeMap.put(PersistenceContainer.class, jpaContainer.getValue());
attributeMap.put("ConfigureMetadata", configureMetadata.getValue());
}

Expand Down
20 changes: 10 additions & 10 deletions javaee/tests/src/test/java/org/jboss/forge/addon/javaee/jpa/ui/setup/JPASetupWizardTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,8 @@ public void testSetup() throws Exception
Assert.assertFalse(controller.canMoveToPreviousStep());
// Setting UI values
controller.setValueFor("jpaVersion", "2.1");
controller.setValueFor("provider", defaultProvider);
controller.setValueFor("container", customJTAProvider);
controller.setValueFor("jpaProvider", defaultProvider);
controller.setValueFor("jpaContainer", customJTAProvider);
Assert.assertTrue(controller.canMoveToNextStep());

controller.next().initialize();
Expand Down Expand Up @@ -148,8 +148,8 @@ public void testSetupDuplicateUnitName() throws Exception

Assert.assertFalse(controller.canMoveToPreviousStep());
// Setting UI values
controller.setValueFor("provider", defaultProvider);
controller.setValueFor("container", eap6Container);
controller.setValueFor("jpaProvider", defaultProvider);
controller.setValueFor("jpaContainer", eap6Container);
Assert.assertTrue(controller.canMoveToNextStep());

controller.next().initialize();
Expand All @@ -173,8 +173,8 @@ public void testSetupDuplicateUnitName() throws Exception

Assert.assertFalse(tester2.canMoveToPreviousStep());
// Setting UI values
tester2.setValueFor("provider", defaultProvider);
tester2.setValueFor("container", eap6Container);
tester2.setValueFor("jpaProvider", defaultProvider);
tester2.setValueFor("jpaContainer", eap6Container);
Assert.assertTrue(tester2.canMoveToNextStep());

tester2.next().initialize();
Expand All @@ -197,8 +197,8 @@ public void testSetupDuplicateUnitName() throws Exception
tester3.initialize();
Assert.assertFalse(tester3.canMoveToPreviousStep());
// Setting UI values
tester3.setValueFor("provider", defaultProvider);
tester3.setValueFor("container", eap6Container);
tester3.setValueFor("jpaProvider", defaultProvider);
tester3.setValueFor("jpaContainer", eap6Container);

Assert.assertTrue(tester3.canMoveToNextStep());
tester3.next().initialize();
Expand Down Expand Up @@ -231,8 +231,8 @@ public void testSetupMetadata() throws Exception

Assert.assertFalse(controller.canMoveToPreviousStep());
// Setting UI values
controller.setValueFor("provider", defaultProvider);
controller.setValueFor("container", customJTAProvider);
controller.setValueFor("jpaProvider", defaultProvider);
controller.setValueFor("jpaContainer", customJTAProvider);
controller.setValueFor("configureMetadata", Boolean.TRUE);
Assert.assertTrue(controller.canMoveToNextStep());

Expand Down

0 comments on commit d473544

Please sign in to comment.