removed settings to disable injection
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/15930182 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/15930182 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/15930182 Branch: refs/heads/wicket-6.x Commit: 15930182aa83f7e2cef9d6127e2a5d5a1ebeeb4d Parents: 9def8e3 Author: Emond Papegaaij <[email protected]> Authored: Tue Nov 19 17:53:03 2013 +0100 Committer: Emond Papegaaij <[email protected]> Committed: Tue Nov 19 17:58:11 2013 +0100 ---------------------------------------------------------------------- .../org/apache/wicket/cdi/CdiConfiguration.java | 112 +------------------ .../apache/wicket/cdi/CdiShutdownCleaner.java | 11 +- .../wicket/cdi/ConversationPropagator.java | 21 +--- .../apache/wicket/cdi/CdiConfigurationTest.java | 20 ---- .../wicket/cdi/ConversationPropagatorTest.java | 8 +- 5 files changed, 15 insertions(+), 157 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/15930182/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/CdiConfiguration.java ---------------------------------------------------------------------- diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/CdiConfiguration.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/CdiConfiguration.java index 3ac4abf..93675f7 100644 --- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/CdiConfiguration.java +++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/CdiConfiguration.java @@ -35,12 +35,6 @@ public class CdiConfiguration private IConversationPropagation propagation = ConversationPropagation.ALL; - private boolean injectComponents = true; - private boolean injectApplication = true; - private boolean injectSession = true; - private boolean injectBehaviors = true; - private boolean autoConversationManagement = false; - /** * Constructor */ @@ -53,38 +47,6 @@ public class CdiConfiguration return propagation; } - /** - * Checks if auto conversation management is enabled. See - * {@link #setAutoConversationManagement(boolean)} for details. - */ - public boolean isAutoConversationManagement() - { - return autoConversationManagement; - } - - /** - * Toggles automatic conversation management feature. - * - * Automatic conversation management controls the lifecycle of the - * conversation based on presence of components implementing the - * {@link ConversationalComponent} interface. If such components are found - * in the page a conversation is marked persistent, and if they are not the - * conversation is marked transient. This greatly simplifies the management - * of conversation lifecycle. - * - * Sometimes it is necessary to manually control the application. For these - * cases, once a conversation is started {@link AutoConversation} bean can - * be used to mark the conversation as manually-managed. - * - * @param enabled - * - * @return {@code this} for easy chaining - */ - public CdiConfiguration setAutoConversationManagement(boolean enabled) - { - autoConversationManagement = enabled; - return this; - } public CdiConfiguration setPropagation(IConversationPropagation propagation) { @@ -92,49 +54,6 @@ public class CdiConfiguration return this; } - public boolean isInjectComponents() - { - return injectComponents; - } - - public CdiConfiguration setInjectComponents(boolean injectComponents) - { - this.injectComponents = injectComponents; - return this; - } - - public boolean isInjectApplication() - { - return injectApplication; - } - - public CdiConfiguration setInjectApplication(boolean injectApplication) - { - this.injectApplication = injectApplication; - return this; - } - - public boolean isInjectSession() - { - return injectSession; - } - - public CdiConfiguration setInjectSession(boolean injectSession) - { - this.injectSession = injectSession; - return this; - } - - public boolean isInjectBehaviors() - { - return injectBehaviors; - } - - public CdiConfiguration setInjectBehaviors(boolean injectBehaviors) - { - this.injectBehaviors = injectBehaviors; - return this; - } /** * Configures the specified application @@ -156,8 +75,7 @@ public class CdiConfiguration // enable conversation propagation if (getPropagation() != ConversationPropagation.NONE) { - listeners.add(new ConversationPropagator(application, getPropagation(), - autoConversationManagement)); + listeners.add(new ConversationPropagator(application, getPropagation())); application.getComponentPreOnBeforeRenderListeners().add( new ConversationExpiryChecker()); } @@ -165,33 +83,15 @@ public class CdiConfiguration // enable detach event listeners.add(new DetachEventEmitter()); - - // inject application instance - if (isInjectApplication()) - { - NonContextual.of(application.getClass()).postConstruct(application); - } + NonContextual.of(application.getClass()).postConstruct(application); // enable injection of various framework components - - if (isInjectSession()) - { - application.getSessionListeners().add(new SessionInjector()); - } - - if (isInjectComponents()) - { - application.getComponentInstantiationListeners().add(new ComponentInjector()); - } - - if (isInjectBehaviors()) - { - application.getBehaviorInstantiationListeners().add(new BehaviorInjector()); - } + application.getSessionListeners().add(new SessionInjector()); + application.getComponentInstantiationListeners().add(new ComponentInjector()); + application.getBehaviorInstantiationListeners().add(new BehaviorInjector()); // enable cleanup - - application.getApplicationListeners().add(new CdiShutdownCleaner(isInjectApplication())); + application.getApplicationListeners().add(new CdiShutdownCleaner()); } public static CdiConfiguration get(Application application) http://git-wip-us.apache.org/repos/asf/wicket/blob/15930182/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/CdiShutdownCleaner.java ---------------------------------------------------------------------- diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/CdiShutdownCleaner.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/CdiShutdownCleaner.java index 625a016..8d2c97c 100644 --- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/CdiShutdownCleaner.java +++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/CdiShutdownCleaner.java @@ -26,11 +26,8 @@ import org.apache.wicket.IApplicationListener; */ class CdiShutdownCleaner implements IApplicationListener { - private final boolean preDestroyApplication; - - public CdiShutdownCleaner(boolean preDestroyApplication) + public CdiShutdownCleaner() { - this.preDestroyApplication = preDestroyApplication; } @Override @@ -42,11 +39,7 @@ class CdiShutdownCleaner implements IApplicationListener @Override public void onBeforeDestroyed(Application application) { - if (preDestroyApplication) - { - NonContextual.of(application.getClass()).preDestroy(application); - } + NonContextual.of(application.getClass()).preDestroy(application); NonContextual.undeploy(); } - } http://git-wip-us.apache.org/repos/asf/wicket/blob/15930182/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConversationPropagator.java ---------------------------------------------------------------------- diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConversationPropagator.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConversationPropagator.java index 2f43931..690710b 100644 --- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConversationPropagator.java +++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConversationPropagator.java @@ -72,8 +72,6 @@ public class ConversationPropagator extends AbstractRequestCycleListener private final Application application; - private final boolean auto; - @Inject private Conversation conversation; @@ -88,18 +86,6 @@ public class ConversationPropagator extends AbstractRequestCycleListener */ public ConversationPropagator(Application application, IConversationPropagation propagation) { - this(application, propagation, false); - } - - /** - * Constructor - * - * @param container - * @param propagation - */ - public ConversationPropagator(Application application, IConversationPropagation propagation, - boolean auto) - { Args.notNull(application, "application"); Args.notNull(propagation, "propagation"); @@ -111,11 +97,10 @@ public class ConversationPropagator extends AbstractRequestCycleListener this.application = application; this.propagation = propagation; - this.auto = auto; NonContextual.of(ConversationPropagator.class).postConstruct(this); } - + public IConversationPropagation getPropagation() { return propagation; @@ -255,7 +240,7 @@ public class ConversationPropagator extends AbstractRequestCycleListener protected void autoBeginIfNecessary(Page page, IRequestHandler handler, Conversation conversation) { - if (!auto || conversation == null || !conversation.isTransient() || page == null + if (conversation == null || !conversation.isTransient() || page == null || !hasConversationalComponent(page)) { return; @@ -271,7 +256,7 @@ public class ConversationPropagator extends AbstractRequestCycleListener protected void autoEndIfNecessary(Page page, IRequestHandler handler, Conversation conversation) { - if (!auto || conversation == null || conversation.isTransient() || page == null + if (conversation == null || conversation.isTransient() || page == null || hasConversationalComponent(page) || autoConversation.isAutomatic() == false) { return; http://git-wip-us.apache.org/repos/asf/wicket/blob/15930182/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/CdiConfigurationTest.java ---------------------------------------------------------------------- diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/CdiConfigurationTest.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/CdiConfigurationTest.java index 0c30f70..7e89c10 100644 --- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/CdiConfigurationTest.java +++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/CdiConfigurationTest.java @@ -58,26 +58,6 @@ public class CdiConfigurationTest extends WicketCdiTestCase { WicketTester tester = new WicketTester(); CdiConfiguration config = new CdiConfiguration(); - config.setAutoConversationManagement(true); - assertTrue(config.isAutoConversationManagement()); - config.setAutoConversationManagement(false); - assertFalse(config.isAutoConversationManagement()); - config.setInjectApplication(false); - assertFalse(config.isInjectApplication()); - config.setInjectApplication(true); - assertTrue(config.isInjectApplication()); - config.setInjectBehaviors(false); - assertFalse(config.isInjectBehaviors()); - config.setInjectBehaviors(true); - assertTrue(config.isInjectBehaviors()); - config.setInjectComponents(false); - assertFalse(config.isInjectComponents()); - config.setInjectComponents(true); - assertTrue(config.isInjectComponents()); - config.setInjectSession(false); - assertFalse(config.isInjectSession()); - config.setInjectSession(true); - assertTrue(config.isInjectSession()); for (ConversationPropagation cp : ConversationPropagation.values()) { config.setPropagation(cp); http://git-wip-us.apache.org/repos/asf/wicket/blob/15930182/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/ConversationPropagatorTest.java ---------------------------------------------------------------------- diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/ConversationPropagatorTest.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/ConversationPropagatorTest.java index b385344..d827b11 100644 --- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/ConversationPropagatorTest.java +++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/ConversationPropagatorTest.java @@ -31,7 +31,7 @@ public class ConversationPropagatorTest extends WicketCdiTestCase @Ignore("Testcase and auto conversations do not match") public void testAutoConversationNonBookmarkable() { - configure(new CdiConfiguration().setAutoConversationManagement(true)); + configure(new CdiConfiguration()); tester.startPage(TestConversationalPage.class); int i; @@ -67,7 +67,7 @@ public class ConversationPropagatorTest extends WicketCdiTestCase @Ignore("Testcase and auto conversations do not match") public void testAutoConversationBookmarkable() { - configure(new CdiConfiguration().setAutoConversationManagement(true)); + configure(new CdiConfiguration()); tester.startPage(TestConversationalPage.class, new PageParameters().add("pageType", "bookmarkable")); @@ -158,7 +158,7 @@ public class ConversationPropagatorTest extends WicketCdiTestCase @Ignore("Testcase and auto conversations do not match") public void testGlobalAutoSettingNonBookmarkable() { - configure(new CdiConfiguration().setAutoConversationManagement(true)); + configure(new CdiConfiguration()); tester.startPage(TestConversationPage.class, new PageParameters().add("auto", true)); int i; @@ -179,7 +179,7 @@ public class ConversationPropagatorTest extends WicketCdiTestCase @Ignore("Testcase and auto conversations do not match") public void testGlobalAutoSettingBookmarkable() { - configure(new CdiConfiguration().setAutoConversationManagement(true)); + configure(new CdiConfiguration()); tester.startPage(TestConversationPage.class, new PageParameters().add("auto", true).add("pageType", "bookmarkable"));
