You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by pa...@apache.org on 2013/11/11 10:17:21 UTC
[1/2] git commit: Reformatted code
Updated Branches:
refs/heads/wicket-6.x 996313537 -> 1e912b771
Reformatted code
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/fbadd2bc
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/fbadd2bc
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/fbadd2bc
Branch: refs/heads/wicket-6.x
Commit: fbadd2bc5623dc16502e385451c33684a7a6c12b
Parents: 9963135
Author: Emond Papegaaij <em...@topicus.nl>
Authored: Mon Nov 11 10:14:39 2013 +0100
Committer: Emond Papegaaij <em...@topicus.nl>
Committed: Mon Nov 11 10:14:39 2013 +0100
----------------------------------------------------------------------
.../apache/wicket/cdi/AbstractCdiContainer.java | 30 +++---
.../apache/wicket/cdi/ApplicationQualifier.java | 7 +-
.../main/java/org/apache/wicket/cdi/Auto.java | 7 +-
.../apache/wicket/cdi/BeanManagerLookup.java | 3 +-
.../org/apache/wicket/cdi/BehaviorInjector.java | 6 +-
.../apache/wicket/cdi/CdiShutdownCleaner.java | 2 +-
.../org/apache/wicket/cdi/CdiWicketFilter.java | 7 +-
.../apache/wicket/cdi/ComponentInjector.java | 6 +-
.../wicket/cdi/ConfigurationParameters.java | 7 +-
.../cdi/ConversationExpiredException.java | 4 +-
.../wicket/cdi/ConversationExpiryChecker.java | 10 +-
.../wicket/cdi/ConversationIdMetaKey.java | 2 +-
.../apache/wicket/cdi/ConversationManager.java | 7 +-
.../wicket/cdi/ConversationPropagation.java | 86 ++++++++-------
.../wicket/cdi/ConversationPropagator.java | 106 ++++++++++++-------
.../org/apache/wicket/cdi/Conversational.java | 3 +-
.../wicket/cdi/ConversationalComponent.java | 12 ++-
.../java/org/apache/wicket/cdi/DetachEvent.java | 2 +-
.../apache/wicket/cdi/DetachEventEmitter.java | 4 +-
.../wicket/cdi/IConversationPropagation.java | 35 +++---
.../wicket/cdi/INonContextualManager.java | 14 +--
.../java/org/apache/wicket/cdi/IgnoreList.java | 7 +-
.../apache/wicket/cdi/NonContextualManager.java | 12 ++-
.../java/org/apache/wicket/cdi/Propagation.java | 7 +-
.../org/apache/wicket/cdi/SessionInjector.java | 2 +-
.../java/org/apache/wicket/cdi/WicketApp.java | 17 +--
.../wicket/cdi/ApacheLicenceHeaderTest.java | 7 +-
.../wicket/cdi/ConversationManagerTest.java | 17 +--
.../wicket/cdi/ConversationPropagatorTest.java | 33 +++---
.../org/apache/wicket/cdi/MockCdiContainer.java | 5 +-
.../apache/wicket/cdi/WicketCdiTestCase.java | 27 ++---
.../apache/wicket/cdi/testapp/TestAppScope.java | 3 +-
.../wicket/cdi/testapp/TestApplication.java | 13 +--
.../cdi/testapp/TestConversationBean.java | 2 +-
.../cdi/testapp/TestConversationalPage.java | 2 +-
.../org/apache/wicket/cdi/testapp/TestPage.java | 2 +-
.../wicket/cdi/testapp/TestQualifier.java | 5 +-
.../wicket/cdi/util/tester/CdiWicketTester.java | 27 +++--
.../cdi/util/tester/ConfigurationFilter.java | 7 +-
.../wicket/cdi/util/tester/ContextManager.java | 12 ++-
.../cdi/util/tester/TestBehaviorInjector.java | 7 +-
.../cdi/util/tester/TestCdiConfiguration.java | 19 ++--
.../cdi/util/tester/TestComponentInjector.java | 7 +-
.../wicket/cdi/weld/WeldCdiContainer.java | 12 ++-
.../cdi/weld/ApacheLicenceHeaderTest.java | 7 +-
45 files changed, 334 insertions(+), 285 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/fbadd2bc/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/AbstractCdiContainer.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/AbstractCdiContainer.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/AbstractCdiContainer.java
index 48f94bc..a795d0f 100644
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/AbstractCdiContainer.java
+++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/AbstractCdiContainer.java
@@ -25,15 +25,16 @@ import org.apache.wicket.util.lang.Args;
/**
* Provides access to CDI features from inside a Wicket request
- *
+ *
* @author igor
*/
public abstract class AbstractCdiContainer
{
/**
- * Activates the conversational context and starts the conversation with the specified cid
- *
+ * Activates the conversational context and starts the conversation with the
+ * specified cid
+ *
* @param cycle
* @param cid
*/
@@ -41,20 +42,23 @@ public abstract class AbstractCdiContainer
/**
* Retrieve the current conversation associated with the ConversationContext
- *
- * @return The current Conversation attached to the current Conversation Context
+ *
+ * @return The current Conversation attached to the current Conversation
+ * Context
*/
public abstract Conversation getCurrentConversation();
protected HttpServletRequest getRequest(RequestCycle cycle)
{
- return (HttpServletRequest) cycle.getRequest().getContainerRequest();
+ return (HttpServletRequest)cycle.getRequest().getContainerRequest();
}
/**
- * Retrieves a conversation id, if any, that is associated with a {@link Page} instance
- *
- * @param page page instance
+ * Retrieves a conversation id, if any, that is associated with a
+ * {@link Page} instance
+ *
+ * @param page
+ * page instance
* @return conversation id, if any
*/
public String getConversationMarker(Page page)
@@ -63,10 +67,10 @@ public abstract class AbstractCdiContainer
}
/**
- * Removes conversation marker from the page instance which prevents the conversation from
- * propagating to the page. This method should usually be called from page's {@code onDetach()}
- * method.
- *
+ * Removes conversation marker from the page instance which prevents the
+ * conversation from propagating to the page. This method should usually be
+ * called from page's {@code onDetach()} method.
+ *
* @param page
*/
public void removeConversationMarker(Page page)
http://git-wip-us.apache.org/repos/asf/wicket/blob/fbadd2bc/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ApplicationQualifier.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ApplicationQualifier.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ApplicationQualifier.java
index d62681f..5b95502 100644
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ApplicationQualifier.java
+++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ApplicationQualifier.java
@@ -19,14 +19,15 @@ package org.apache.wicket.cdi;
import javax.enterprise.util.AnnotationLiteral;
/**
- * Allows for Programmatic lookup of WebApplications based on the Named Annotation.
- *
+ * Allows for Programmatic lookup of WebApplications based on the Named
+ * Annotation.
+ *
* @author jsarman
*/
public class ApplicationQualifier extends AnnotationLiteral<WicketApp> implements WicketApp
{
private static final long serialVersionUID = 1L;
-
+
private String value;
public ApplicationQualifier(String value)
http://git-wip-us.apache.org/repos/asf/wicket/blob/fbadd2bc/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/Auto.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/Auto.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/Auto.java
index 384c775..0acc6cc 100644
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/Auto.java
+++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/Auto.java
@@ -26,13 +26,12 @@ import javax.inject.Qualifier;
/**
* Qualifier for injecting the Automatic Conversation begin boolean
- *
+ *
* @author jsarman
*/
@Qualifier
-@Target({ElementType.TYPE, ElementType.METHOD, ElementType.PARAMETER, ElementType.FIELD})
+@Target({ ElementType.TYPE, ElementType.METHOD, ElementType.PARAMETER, ElementType.FIELD })
@Retention(RetentionPolicy.RUNTIME)
-public @interface Auto
-{
+public @interface Auto {
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/fbadd2bc/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/BeanManagerLookup.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/BeanManagerLookup.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/BeanManagerLookup.java
index d9051ba..9220718 100644
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/BeanManagerLookup.java
+++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/BeanManagerLookup.java
@@ -27,7 +27,8 @@ public final class BeanManagerLookup
{
}
- public static BeanManager lookup() {
+ public static BeanManager lookup()
+ {
try
{
return InitialContext.doLookup("java:comp/BeanManager");
http://git-wip-us.apache.org/repos/asf/wicket/blob/fbadd2bc/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/BehaviorInjector.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/BehaviorInjector.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/BehaviorInjector.java
index f163c3a..61d473f 100644
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/BehaviorInjector.java
+++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/BehaviorInjector.java
@@ -23,11 +23,13 @@ import org.apache.wicket.behavior.Behavior;
/**
* Injects components with CDI dependencies
- *
+ *
* @author igor
*/
@ApplicationScoped
-public class BehaviorInjector extends AbstractInjector<Behavior> implements IBehaviorInstantiationListener
+public class BehaviorInjector extends AbstractInjector<Behavior>
+ implements
+ IBehaviorInstantiationListener
{
@Override
http://git-wip-us.apache.org/repos/asf/wicket/blob/fbadd2bc/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 676c346..fb8eb25 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
@@ -21,7 +21,7 @@ import org.apache.wicket.IApplicationListener;
/**
* Listens to application shutdown and cleans up
- *
+ *
* @author igor
*/
class CdiShutdownCleaner implements IApplicationListener
http://git-wip-us.apache.org/repos/asf/wicket/blob/fbadd2bc/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/CdiWicketFilter.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/CdiWicketFilter.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/CdiWicketFilter.java
index 5803865..aa0d5e5 100644
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/CdiWicketFilter.java
+++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/CdiWicketFilter.java
@@ -22,9 +22,10 @@ import org.apache.wicket.protocol.http.IWebApplicationFactory;
import org.apache.wicket.protocol.http.WicketFilter;
/**
- * CdiWicketFilter is a Cdi Enabled version of WicketFilter. It uses the Managed Version of
- * {@link CdiWebApplicationFactory} therefore the WebApplication is also Managed via the Cdi container.
- *
+ * CdiWicketFilter is a Cdi Enabled version of WicketFilter. It uses the Managed
+ * Version of {@link CdiWebApplicationFactory} therefore the WebApplication is
+ * also Managed via the Cdi container.
+ *
* @author jsarman
*/
http://git-wip-us.apache.org/repos/asf/wicket/blob/fbadd2bc/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ComponentInjector.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ComponentInjector.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ComponentInjector.java
index 79e4b78..dcf31bd 100644
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ComponentInjector.java
+++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ComponentInjector.java
@@ -23,11 +23,13 @@ import org.apache.wicket.application.IComponentInstantiationListener;
/**
* Injects components with CDI dependencies
- *
+ *
* @author igor
*/
@ApplicationScoped
-public class ComponentInjector extends AbstractInjector<Component> implements IComponentInstantiationListener
+public class ComponentInjector extends AbstractInjector<Component>
+ implements
+ IComponentInstantiationListener
{
@Override
http://git-wip-us.apache.org/repos/asf/wicket/blob/fbadd2bc/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConfigurationParameters.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConfigurationParameters.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConfigurationParameters.java
index 0165d2a..f26789b 100644
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConfigurationParameters.java
+++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConfigurationParameters.java
@@ -26,13 +26,13 @@ import org.apache.wicket.request.cycle.IRequestCycleListener;
/**
* Simple POJO bean for storing the initial configuration parameters as well as
* the state of the dynamic variables used by {@link CdiConfiguration}.
- *
+ *
* @author jsarman
*/
public class ConfigurationParameters implements Serializable
{
private static final long serialVersionUID = 1L;
-
+
private IConversationPropagation propagation = ConversationPropagation.NONBOOKMARKABLE;
private boolean injectComponents = true;
private boolean injectApplication = true;
@@ -143,7 +143,8 @@ public class ConfigurationParameters implements Serializable
return activeComponentOnBeforeRenderListener;
}
- void setActiveComponentOnBeforeRenderListener(IComponentOnBeforeRenderListener activeComponentOnBeforeRenderListener)
+ void setActiveComponentOnBeforeRenderListener(
+ IComponentOnBeforeRenderListener activeComponentOnBeforeRenderListener)
{
this.activeComponentOnBeforeRenderListener = activeComponentOnBeforeRenderListener;
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/fbadd2bc/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConversationExpiredException.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConversationExpiredException.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConversationExpiredException.java
index 2b3e696..347608b 100644
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConversationExpiredException.java
+++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConversationExpiredException.java
@@ -22,13 +22,13 @@ import org.apache.wicket.request.IRequestHandler;
public class ConversationExpiredException extends RuntimeException
{
private static final long serialVersionUID = 1L;
-
+
private final String cid;
private final Page page;
private final IRequestHandler handler;
public ConversationExpiredException(Throwable cause, String cid, Page page,
- IRequestHandler handler)
+ IRequestHandler handler)
{
super(cause);
this.cid = cid;
http://git-wip-us.apache.org/repos/asf/wicket/blob/fbadd2bc/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConversationExpiryChecker.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConversationExpiryChecker.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConversationExpiryChecker.java
index 989e344..02d5191 100644
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConversationExpiryChecker.java
+++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConversationExpiryChecker.java
@@ -33,11 +33,13 @@ import org.slf4j.LoggerFactory;
/**
* Checks for conversation expiration during page render and throws a
- * {@link ConversationExpiredException} when an expired conversation is detected.
+ * {@link ConversationExpiredException} when an expired conversation is
+ * detected.
* <p/>
- * For example a link that calls {@link Conversation#end()} but does not redirect to a
- * non-conversation-dependent page will be caught by this listener.
- *
+ * For example a link that calls {@link Conversation#end()} but does not
+ * redirect to a non-conversation-dependent page will be caught by this
+ * listener.
+ *
* @author igor
*/
@ApplicationScoped
http://git-wip-us.apache.org/repos/asf/wicket/blob/fbadd2bc/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConversationIdMetaKey.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConversationIdMetaKey.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConversationIdMetaKey.java
index f05aa3b..ca53292 100644
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConversationIdMetaKey.java
+++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConversationIdMetaKey.java
@@ -21,6 +21,6 @@ import org.apache.wicket.MetaDataKey;
final class ConversationIdMetaKey extends MetaDataKey<String>
{
private static final long serialVersionUID = 1L;
-
+
static final ConversationIdMetaKey INSTANCE = new ConversationIdMetaKey();
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/fbadd2bc/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConversationManager.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConversationManager.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConversationManager.java
index d7b2885..332ed9d 100644
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConversationManager.java
+++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConversationManager.java
@@ -58,7 +58,8 @@ public class ConversationManager implements Serializable
logger.debug("Starting new Conversation manager for id = {}", getConversation().getId());
propagation = globalPropagation;
manageConversation = globalAuto;
- logger.debug("Setting initial values to auto = {} prop = {}", manageConversation, propagation);
+ logger.debug("Setting initial values to auto = {} prop = {}", manageConversation,
+ propagation);
}
private Conversation getConversation()
@@ -82,8 +83,8 @@ public class ConversationManager implements Serializable
return;
}
- logger.debug("Changing conversation dependent propagation to {} for id = {}",
- propagation, getConversation().getId());
+ logger.debug("Changing conversation dependent propagation to {} for id = {}", propagation,
+ getConversation().getId());
this.propagation = propagation;
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/fbadd2bc/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConversationPropagation.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConversationPropagation.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConversationPropagation.java
index e59953d..e75b795 100644
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConversationPropagation.java
+++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConversationPropagation.java
@@ -22,60 +22,58 @@ import org.apache.wicket.request.IRequestHandler;
/**
* Various modes of propagating persistent conversations across requests.
- *
+ *
* @author igor
*/
-public enum ConversationPropagation implements IConversationPropagation
-{
+public enum ConversationPropagation implements IConversationPropagation {
/**
* No conversational propagation takes place
*/
- NONE
- {
- @Override
- public boolean propagatesViaPage(Page page, IRequestHandler handler)
- {
- return false;
- }
+ NONE {
+ @Override
+ public boolean propagatesViaPage(Page page, IRequestHandler handler)
+ {
+ return false;
+ }
- @Override
- public boolean propagatesViaParameters(IRequestHandler handler)
- {
- return false;
- }
- },
+ @Override
+ public boolean propagatesViaParameters(IRequestHandler handler)
+ {
+ return false;
+ }
+ },
/**
- * Persistent conversations are propagated between non-bookmarkable pages only
+ * Persistent conversations are propagated between non-bookmarkable pages
+ * only
*/
- NONBOOKMARKABLE
- {
- @Override
- public boolean propagatesViaPage(Page page, IRequestHandler handler)
- {
- return true;
- }
+ NONBOOKMARKABLE {
+ @Override
+ public boolean propagatesViaPage(Page page, IRequestHandler handler)
+ {
+ return true;
+ }
- @Override
- public boolean propagatesViaParameters(IRequestHandler handler)
- {
- return false;
- }
- },
+ @Override
+ public boolean propagatesViaParameters(IRequestHandler handler)
+ {
+ return false;
+ }
+ },
/**
- * Persistent conversations are propagated between bookmarkable and non-bookmarkable pages
+ * Persistent conversations are propagated between bookmarkable and
+ * non-bookmarkable pages
*/
- ALL
- {
- @Override
- public boolean propagatesViaPage(Page page, IRequestHandler handler)
- {
- return true;
- }
+ ALL {
+ @Override
+ public boolean propagatesViaPage(Page page, IRequestHandler handler)
+ {
+ return true;
+ }
- @Override
- public boolean propagatesViaParameters(IRequestHandler handler)
- {
- return true;
- }
- };
+ @Override
+ public boolean propagatesViaParameters(IRequestHandler handler)
+ {
+ return true;
+ }
+ };
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/fbadd2bc/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 7833cf7..f76df2d 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
@@ -46,8 +46,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * A request cycle listener that takes care of propagating persistent conversations.
- *
+ * A request cycle listener that takes care of propagating persistent
+ * conversations.
+ *
* @author igor
*/
@ApplicationScoped
@@ -80,7 +81,8 @@ public class ConversationPropagator extends AbstractRequestCycleListener
{
Conversation conversation = getConversation();
logger.debug("In onRequestHandlerResolved id = {}", conversation.getId());
- String cid = cycle.getRequest().getRequestParameters().getParameterValue(CID_ATTR).toString();
+ String cid = cycle.getRequest().getRequestParameters().getParameterValue(CID_ATTR)
+ .toString();
Page page = getPage(handler);
if (page == null)
@@ -94,7 +96,8 @@ public class ConversationPropagator extends AbstractRequestCycleListener
}
- if (cid != null && !conversation.isTransient() && !Objects.isEqual(conversation.getId(), cid))
+ if (cid != null && !conversation.isTransient()
+ && !Objects.isEqual(conversation.getId(), cid))
{
logger.info("Conversation {} has expired for {}", cid, page);
throw new ConversationExpiredException(null, cid, page, handler);
@@ -106,15 +109,16 @@ public class ConversationPropagator extends AbstractRequestCycleListener
@Override
public IRequestHandler onException(RequestCycle cycle, Exception ex)
{
- // if we are handling a stale page exception then use its conversation since we are most
+ // if we are handling a stale page exception then use its conversation
+ // since we are most
// likely about to rerender it.
if (ex instanceof StalePageException)
{
- IRequestablePage requestable = ((StalePageException) ex).getPage();
+ IRequestablePage requestable = ((StalePageException)ex).getPage();
if (requestable instanceof Page)
{
- Page page = (Page) requestable;
+ Page page = (Page)requestable;
String cid = container.getConversationMarker(page);
if (cid != null)
{
@@ -122,7 +126,8 @@ public class ConversationPropagator extends AbstractRequestCycleListener
{
activateConversationIfNeeded(page, cycle, null, cid);
return null;
- } catch (ConversationExpiredException e)
+ }
+ catch (ConversationExpiredException e)
{
// ignore, we will start a new one below
}
@@ -134,8 +139,8 @@ public class ConversationPropagator extends AbstractRequestCycleListener
return null;
}
- private void activateConversationIfNeeded(Page page, RequestCycle cycle, IRequestHandler handler,
- String cid)
+ private void activateConversationIfNeeded(Page page, RequestCycle cycle,
+ IRequestHandler handler, String cid)
{
if (!activateForHandler(handler))
{
@@ -152,7 +157,8 @@ public class ConversationPropagator extends AbstractRequestCycleListener
container.activateConversationalContext(cycle, cid);
}
- } catch (NonexistentConversationException e)
+ }
+ catch (NonexistentConversationException e)
{
logger.info("Unable to restore conversation with id {}", cid, e.getMessage());
logger.debug("Unable to restore conversation", e);
@@ -176,7 +182,8 @@ public class ConversationPropagator extends AbstractRequestCycleListener
if (autoEndIfNecessary(page, handler, conversation))
{
container.activateConversationalContext(cycle, null);
- } else
+ }
+ else
{
autoBeginIfNecessary(page, handler);
}
@@ -190,7 +197,8 @@ public class ConversationPropagator extends AbstractRequestCycleListener
@Override
public void onRequestHandlerScheduled(RequestCycle cycle, IRequestHandler handler)
{
- // propagate current non-transient conversation to the newly scheduled page
+ // propagate current non-transient conversation to the newly scheduled
+ // page
Conversation conversation = getConversation();
logger.debug("In onRequestHandlerScheduled id = {}", conversation.getId());
@@ -204,7 +212,8 @@ public class ConversationPropagator extends AbstractRequestCycleListener
{
if (getPropagation().propagatesViaPage(page, handler))
{
- // propagate a conversation across non-bookmarkable page instances
+ // propagate a conversation across non-bookmarkable page
+ // instances
setConversationOnPage(page);
propagated = true;
}
@@ -237,7 +246,8 @@ public class ConversationPropagator extends AbstractRequestCycleListener
if (conversation.isTransient())
{
clearConversationOnPage(page);
- } else
+ }
+ else
{
logger.debug("Propagating non-transient conversation {} via meta of page instance {}",
@@ -261,10 +271,11 @@ public class ConversationPropagator extends AbstractRequestCycleListener
{
Conversation conversation = getConversation();
logger.debug("In onUrlMapped id = {}", conversation.getId());
- // no need to propagate the conversation to packaged resources, they should never change
+ // no need to propagate the conversation to packaged resources, they
+ // should never change
if (handler instanceof ResourceReferenceRequestHandler)
{
- if (((ResourceReferenceRequestHandler) handler).getResourceReference() instanceof PackageResourceReference)
+ if (((ResourceReferenceRequestHandler)handler).getResourceReference() instanceof PackageResourceReference)
{
return;
}
@@ -283,19 +294,29 @@ public class ConversationPropagator extends AbstractRequestCycleListener
logger.debug("Propagating non-transient conversation {} via url", conversation.getId());
url.setQueryParameter(CID_ATTR, conversation.getId());
- } else
+ }
+ else
{
- //we did not propagate.
- //Cancel scheduled conversation end if page is auto.
+ // we did not propagate.
+ // Cancel scheduled conversation end if page is auto.
Page page = getPage(handler);
if (page != null)
{
Conversational annotation = page.getClass().getAnnotation(Conversational.class);
if (annotation != null)
{
- if (annotation.auto() && getConversationManager().isConversationScheduledForEnd())
+ if (annotation.auto()
+ && getConversationManager().isConversationScheduledForEnd())
{
- getConversationManager().cancelConversationEnd(); //was scheduled to end but next page is auto
+ getConversationManager().cancelConversationEnd(); // was
+ // scheduled
+ // to
+ // end
+ // but
+ // next
+ // page
+ // is
+ // auto
}
}
}
@@ -303,10 +324,11 @@ public class ConversationPropagator extends AbstractRequestCycleListener
}
/**
- * Determines whether or not a conversation should be activated for the specified handler. This
- * method is used to filter out conversation activation for utility handlers such as the
+ * Determines whether or not a conversation should be activated for the
+ * specified handler. This method is used to filter out conversation
+ * activation for utility handlers such as the
* {@link BufferedResponseRequestHandler}
- *
+ *
* @param handler
* @return {@code true} iff a conversation should be activated
*/
@@ -316,7 +338,8 @@ public class ConversationPropagator extends AbstractRequestCycleListener
{
if (handler instanceof BufferedResponseRequestHandler)
{
- // we do not care about pages that are being rendered from a buffer
+ // we do not care about pages that are being rendered from a
+ // buffer
return false;
}
}
@@ -347,7 +370,8 @@ public class ConversationPropagator extends AbstractRequestCycleListener
if (auto)
{
getConversation().begin();
- logger.debug("Auto-began conversation {} for page {}", getConversation().getId(), page);
+ logger.debug("Auto-began conversation {} for page {}", getConversation().getId(),
+ page);
}
}
ConversationPropagation prop = annotation != null ? annotation.prop() : getPropagation();
@@ -356,7 +380,8 @@ public class ConversationPropagator extends AbstractRequestCycleListener
{
getConversationManager().setPropagation(prop);
getConversationManager().setManageConversation(auto);
- } else
+ }
+ else
{
if (prop != getPropagation())
{
@@ -366,7 +391,8 @@ public class ConversationPropagator extends AbstractRequestCycleListener
}
}
- protected boolean autoEndIfNecessary(Page page, IRequestHandler handler, Conversation conversation)
+ protected boolean autoEndIfNecessary(Page page, IRequestHandler handler,
+ Conversation conversation)
{
if (page == null || conversation.isTransient())
{
@@ -404,8 +430,9 @@ public class ConversationPropagator extends AbstractRequestCycleListener
}
/**
- * Resolves a page instance from the request handler iff the page instance is already created
- *
+ * Resolves a page instance from the request handler iff the page instance
+ * is already created
+ *
* @param handler
* @return page or {@code null} if none
*/
@@ -413,15 +440,15 @@ public class ConversationPropagator extends AbstractRequestCycleListener
{
while (handler instanceof IRequestHandlerDelegate)
{
- handler = ((IRequestHandlerDelegate) handler).getDelegateHandler();
+ handler = ((IRequestHandlerDelegate)handler).getDelegateHandler();
}
if (handler instanceof IPageRequestHandler)
{
- IPageRequestHandler pageHandler = (IPageRequestHandler) handler;
+ IPageRequestHandler pageHandler = (IPageRequestHandler)handler;
if (pageHandler.isPageInstanceCreated())
{
- return (Page) pageHandler.getPage();
+ return (Page)pageHandler.getPage();
}
}
return null;
@@ -429,7 +456,7 @@ public class ConversationPropagator extends AbstractRequestCycleListener
/**
* Resolves page parameters from a request handler
- *
+ *
* @param handler
* @return page parameters or {@code null} if none
*/
@@ -437,7 +464,7 @@ public class ConversationPropagator extends AbstractRequestCycleListener
{
if (handler instanceof IPageClassRequestHandler)
{
- IPageClassRequestHandler pageHandler = (IPageClassRequestHandler) handler;
+ IPageClassRequestHandler pageHandler = (IPageClassRequestHandler)handler;
return pageHandler.getPageParameters();
}
return null;
@@ -468,10 +495,11 @@ public class ConversationPropagator extends AbstractRequestCycleListener
if (getConversation().isTransient())
{
logger.debug("Getting global Propagation {}.", cdiConfiguration.getPropagation());
- return (ConversationPropagation) cdiConfiguration.getPropagation();
+ return (ConversationPropagation)cdiConfiguration.getPropagation();
}
- logger.debug("Propagation is set to {} with id = {}", getConversationManager().getPropagation(), getConversation().getId());
- return (ConversationPropagation) getConversationManager().getPropagation();
+ logger.debug("Propagation is set to {} with id = {}", getConversationManager()
+ .getPropagation(), getConversation().getId());
+ return (ConversationPropagation)getConversationManager().getPropagation();
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/fbadd2bc/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/Conversational.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/Conversational.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/Conversational.java
index ec5e5e9..01cb046 100644
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/Conversational.java
+++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/Conversational.java
@@ -33,8 +33,7 @@ import org.apache.wicket.Page;
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
@Typed(Page.class)
-public @interface Conversational
-{
+public @interface Conversational {
ConversationPropagation prop() default ConversationPropagation.NONBOOKMARKABLE;
boolean auto() default true;
http://git-wip-us.apache.org/repos/asf/wicket/blob/fbadd2bc/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConversationalComponent.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConversationalComponent.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConversationalComponent.java
index 2230435..05190f1 100644
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConversationalComponent.java
+++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConversationalComponent.java
@@ -17,11 +17,13 @@
package org.apache.wicket.cdi;
/**
- * Marks a component that requires a conversation. This marker is used by the automatic conversation
- * management feature ({@link CdiConfiguration#setAutoConversationManagement(boolean)}) to
- * automatically begin and end conversations based on the presence of these components in the
- * component hierarchy of pages (can be applied to the page itself).
- *
+ * Marks a component that requires a conversation. This marker is used by the
+ * automatic conversation management feature (
+ * {@link CdiConfiguration#setAutoConversationManagement(boolean)}) to
+ * automatically begin and end conversations based on the presence of these
+ * components in the component hierarchy of pages (can be applied to the page
+ * itself).
+ *
* @author igor
*/
@Conversational
http://git-wip-us.apache.org/repos/asf/wicket/blob/fbadd2bc/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/DetachEvent.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/DetachEvent.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/DetachEvent.java
index 531e617..8f59642 100644
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/DetachEvent.java
+++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/DetachEvent.java
@@ -18,7 +18,7 @@ package org.apache.wicket.cdi;
/**
* Fired when request cycle is detached
- *
+ *
* @author igor
*/
public class DetachEvent
http://git-wip-us.apache.org/repos/asf/wicket/blob/fbadd2bc/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/DetachEventEmitter.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/DetachEventEmitter.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/DetachEventEmitter.java
index e832347..0259543 100644
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/DetachEventEmitter.java
+++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/DetachEventEmitter.java
@@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory;
/**
* Request cycle listener that fires the {@link DetachEvent} event
- *
+ *
* @author igor
*/
@SessionScoped
@@ -50,7 +50,7 @@ public class DetachEventEmitter extends AbstractRequestCycleListener implements
/**
* Constructor
- *
+ *
* @param container
*/
public DetachEventEmitter()
http://git-wip-us.apache.org/repos/asf/wicket/blob/fbadd2bc/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/IConversationPropagation.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/IConversationPropagation.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/IConversationPropagation.java
index 34077fc..757448d 100644
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/IConversationPropagation.java
+++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/IConversationPropagation.java
@@ -20,29 +20,36 @@ import org.apache.wicket.Page;
import org.apache.wicket.request.IRequestHandler;
/**
- * A strategy that specifies how conversations should be propagated between pages/resources.
- * {@link ConversationPropagation} provides sensible default implementations of this interface.
- *
+ * A strategy that specifies how conversations should be propagated between
+ * pages/resources. {@link ConversationPropagation} provides sensible default
+ * implementations of this interface.
+ *
* @author papegaaij
*/
public interface IConversationPropagation
{
/**
- * Indicates if the conversation should be propagated via page metadata (on an instance) for the
- * given page and request handler.
- *
- * @param page The page on which the tag will be set.
- * @param handler The current request handler
- * @return true if the conversation should be propagated to the given page instance.
+ * Indicates if the conversation should be propagated via page metadata (on
+ * an instance) for the given page and request handler.
+ *
+ * @param page
+ * The page on which the tag will be set.
+ * @param handler
+ * The current request handler
+ * @return true if the conversation should be propagated to the given page
+ * instance.
*/
public boolean propagatesViaPage(Page page, IRequestHandler handler);
/**
- * Indicates if the conversation should be propagated via url-parameters for the given request
- * handler. This can either be a get parameter in a rendered url, or via page parameters.
- *
- * @param handler The current request handler
- * @return true if the conversation should be propagated for the given request handler.
+ * Indicates if the conversation should be propagated via url-parameters for
+ * the given request handler. This can either be a get parameter in a
+ * rendered url, or via page parameters.
+ *
+ * @param handler
+ * The current request handler
+ * @return true if the conversation should be propagated for the given
+ * request handler.
*/
public boolean propagatesViaParameters(IRequestHandler handler);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/fbadd2bc/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/INonContextualManager.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/INonContextualManager.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/INonContextualManager.java
index 47898ec..606d060 100644
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/INonContextualManager.java
+++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/INonContextualManager.java
@@ -22,23 +22,25 @@ import javax.annotation.PreDestroy;
import org.apache.wicket.Component;
/**
- * Manages lifecycle of non-contextual objects like {@link Component} instances, etc
- *
+ * Manages lifecycle of non-contextual objects like {@link Component} instances,
+ * etc
+ *
* @author igor
*/
public interface INonContextualManager
{
/**
* Inject a noncontextual instance
- *
+ *
* @param <T>
* @param instance
*/
<T> void inject(T instance);
/**
- * Inject a noncontextual instance and invokes any {@link PostConstruct} callbacks
- *
+ * Inject a noncontextual instance and invokes any {@link PostConstruct}
+ * callbacks
+ *
* @param <T>
* @param instance
*/
@@ -46,7 +48,7 @@ public interface INonContextualManager
/**
* Invokes any {@link PreDestroy} callbacks and cleans up
- *
+ *
* @param <T>
* @param instance
*/
http://git-wip-us.apache.org/repos/asf/wicket/blob/fbadd2bc/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/IgnoreList.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/IgnoreList.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/IgnoreList.java
index becf3ee..35e577a 100644
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/IgnoreList.java
+++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/IgnoreList.java
@@ -26,13 +26,12 @@ import javax.inject.Qualifier;
/**
* Qualifier for injecting the Ignore Package List
- *
+ *
* @author jsarman
*/
@Qualifier
-@Target({ElementType.TYPE, ElementType.METHOD, ElementType.PARAMETER, ElementType.FIELD})
+@Target({ ElementType.TYPE, ElementType.METHOD, ElementType.PARAMETER, ElementType.FIELD })
@Retention(RetentionPolicy.RUNTIME)
-public @interface IgnoreList
-{
+public @interface IgnoreList {
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/fbadd2bc/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/NonContextualManager.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/NonContextualManager.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/NonContextualManager.java
index 1004feb..bd84344 100644
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/NonContextualManager.java
+++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/NonContextualManager.java
@@ -23,8 +23,9 @@ import javax.enterprise.context.ApplicationScoped;
import org.apache.wicket.util.lang.Args;
/**
- * Default implementation of {@link INonContextualManager} using {@link NonContextual} helper
- *
+ * Default implementation of {@link INonContextualManager} using
+ * {@link NonContextual} helper
+ *
* @author igor
*/
@ApplicationScoped
@@ -49,8 +50,8 @@ class NonContextualManager implements INonContextualManager
}
/**
- * Performs dependency injection on the noncontextual instance and invokes any
- * {@link PostConstruct} callbacks
+ * Performs dependency injection on the noncontextual instance and invokes
+ * any {@link PostConstruct} callbacks
*/
@Override
public <T> void postConstruct(T instance)
@@ -60,7 +61,8 @@ class NonContextualManager implements INonContextualManager
}
/**
- * Invokes any {@link PreDestroy} callbacks and cleans up any injected dependencies
+ * Invokes any {@link PreDestroy} callbacks and cleans up any injected
+ * dependencies
*/
@Override
public <T> void preDestroy(T instance)
http://git-wip-us.apache.org/repos/asf/wicket/blob/fbadd2bc/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/Propagation.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/Propagation.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/Propagation.java
index e752346..446e5f3 100644
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/Propagation.java
+++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/Propagation.java
@@ -25,13 +25,12 @@ import javax.inject.Qualifier;
/**
* Qualifier used to inject the Propagation Method
- *
+ *
* @author jsarman
*/
@Qualifier
-@Target({ElementType.TYPE, ElementType.METHOD, ElementType.PARAMETER, ElementType.FIELD})
+@Target({ ElementType.TYPE, ElementType.METHOD, ElementType.PARAMETER, ElementType.FIELD })
@Retention(RetentionPolicy.RUNTIME)
-public @interface Propagation
-{
+public @interface Propagation {
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/fbadd2bc/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/SessionInjector.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/SessionInjector.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/SessionInjector.java
index c2f0bf2..6b94111 100644
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/SessionInjector.java
+++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/SessionInjector.java
@@ -23,7 +23,7 @@ import org.apache.wicket.Session;
/**
* Injects components with CDI dependencies
- *
+ *
* @author igor
*/
@ApplicationScoped
http://git-wip-us.apache.org/repos/asf/wicket/blob/fbadd2bc/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/WicketApp.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/WicketApp.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/WicketApp.java
index 0d3ebb4..157833c 100644
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/WicketApp.java
+++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/WicketApp.java
@@ -30,20 +30,21 @@ import javax.inject.Qualifier;
import org.apache.wicket.protocol.http.WebApplication;
/**
- * Bean Qualifier for Cdi enable WebApplication. This Qualifier allows for the WebApplication
- * to be named so that the CdiApplicationFactory can select the WebApplication when multiple
- * WebApplication exist in the ClassLoader. This Annotation also marks the WebApplication as Dependent.
- * This prevents the WebApplication from being proxied, which will cause failures in an EE container.
- *
+ * Bean Qualifier for Cdi enable WebApplication. This Qualifier allows for the
+ * WebApplication to be named so that the CdiApplicationFactory can select the
+ * WebApplication when multiple WebApplication exist in the ClassLoader. This
+ * Annotation also marks the WebApplication as Dependent. This prevents the
+ * WebApplication from being proxied, which will cause failures in an EE
+ * container.
+ *
* @author jsarman
*/
@Qualifier
-@Target({ElementType.TYPE, ElementType.METHOD, ElementType.PARAMETER, ElementType.FIELD})
+@Target({ ElementType.TYPE, ElementType.METHOD, ElementType.PARAMETER, ElementType.FIELD })
@Retention(RUNTIME)
@Documented
@Dependent
@Typed(WebApplication.class)
-public @interface WicketApp
-{
+public @interface WicketApp {
String value() default "";
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/fbadd2bc/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/ApacheLicenceHeaderTest.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/ApacheLicenceHeaderTest.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/ApacheLicenceHeaderTest.java
index b0d574b..e612055 100644
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/ApacheLicenceHeaderTest.java
+++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/ApacheLicenceHeaderTest.java
@@ -21,9 +21,10 @@ import java.util.Arrays;
import org.apache.wicket.util.license.ApacheLicenseHeaderTestCase;
/**
- * Test that the license headers are in place in this project. The tests are run from
- * {@link ApacheLicenseHeaderTestCase}, but you can add project specific tests here if needed.
- *
+ * Test that the license headers are in place in this project. The tests are run
+ * from {@link ApacheLicenseHeaderTestCase}, but you can add project specific
+ * tests here if needed.
+ *
* @author Frank Bille Jensen (frankbille)
*/
public class ApacheLicenceHeaderTest extends ApacheLicenseHeaderTestCase
http://git-wip-us.apache.org/repos/asf/wicket/blob/fbadd2bc/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/ConversationManagerTest.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/ConversationManagerTest.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/ConversationManagerTest.java
index dc60f66..3a2bd9f 100644
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/ConversationManagerTest.java
+++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/ConversationManagerTest.java
@@ -39,8 +39,10 @@ public class ConversationManagerTest extends WicketCdiTestCase
{
conversation.begin();
- assertTrue(testConversationManagerConversationManagement(!cdiConfiguration.isAutoConversationManagement()));
- assertTrue(testConversationManagerConversationManagement(cdiConfiguration.isAutoConversationManagement()));
+ assertTrue(testConversationManagerConversationManagement(!cdiConfiguration
+ .isAutoConversationManagement()));
+ assertTrue(testConversationManagerConversationManagement(cdiConfiguration
+ .isAutoConversationManagement()));
for (ConversationPropagation cp : ConversationPropagation.values())
{
assertTrue(testConversationManagerPropagation(cp));
@@ -51,14 +53,17 @@ public class ConversationManagerTest extends WicketCdiTestCase
@Test
public void testConverationManagerWithoutConversation()
{
- // Transient conversation results in conversationManager using global so test should return false
- assertFalse(testConversationManagerConversationManagement(!cdiConfiguration.isAutoConversationManagement()));
+ // Transient conversation results in conversationManager using global so
+ // test should return false
+ assertFalse(testConversationManagerConversationManagement(!cdiConfiguration
+ .isAutoConversationManagement()));
for (ConversationPropagation cp : ConversationPropagation.values())
{
- //Skip no change test
+ // Skip no change test
if (cp != cdiConfiguration.getPropagation())
{
- // Transient conversation results in conversationManager using global is test returns false
+ // Transient conversation results in conversationManager using
+ // global is test returns false
assertFalse(testConversationManagerPropagation(cp));
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/fbadd2bc/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 1cfa80a..6bcfb85 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
@@ -39,7 +39,7 @@ public class ConversationPropagatorTest extends WicketCdiTestCase
@Override
public void init()
{
- //override so we do not initialize tester
+ // override so we do not initialize tester
}
@Test
@@ -77,9 +77,10 @@ public class ConversationPropagatorTest extends WicketCdiTestCase
tester.clickLink("increment");
}
tester.clickLink("next");
- //The conversation should auto end and not create another one
- //so the next page just keeps getting 1 because the conversationscoped bean
- //doesnt persist across requests.
+ // The conversation should auto end and not create another one
+ // so the next page just keeps getting 1 because the conversationscoped
+ // bean
+ // doesnt persist across requests.
for (i = 0; i < 3; i++)
{
tester.clickLink("increment");
@@ -91,9 +92,8 @@ public class ConversationPropagatorTest extends WicketCdiTestCase
public void testPropagationAllNonBookmarkable()
{
- Map<String, String> params =
- Collections.singletonMap(CdiWebApplicationFactory.PROPAGATION,
- ConversationPropagation.ALL.name());
+ Map<String, String> params = Collections.singletonMap(CdiWebApplicationFactory.PROPAGATION,
+ ConversationPropagation.ALL.name());
CdiWicketTester tester = getTester(params);
@@ -116,9 +116,8 @@ public class ConversationPropagatorTest extends WicketCdiTestCase
@Test
public void testPropagationAllBookmarkable()
{
- Map<String, String> params =
- Collections.singletonMap(CdiWebApplicationFactory.PROPAGATION,
- ConversationPropagation.ALL.name());
+ Map<String, String> params = Collections.singletonMap(CdiWebApplicationFactory.PROPAGATION,
+ ConversationPropagation.ALL.name());
CdiWicketTester tester = getTester(params);
@@ -142,9 +141,8 @@ public class ConversationPropagatorTest extends WicketCdiTestCase
@Test
public void testPropagationNone()
{
- Map<String, String> params =
- Collections.singletonMap(CdiWebApplicationFactory.PROPAGATION,
- ConversationPropagation.NONE.name());
+ Map<String, String> params = Collections.singletonMap(CdiWebApplicationFactory.PROPAGATION,
+ ConversationPropagation.NONE.name());
CdiWicketTester tester = getTester(params);
@@ -168,11 +166,11 @@ public class ConversationPropagatorTest extends WicketCdiTestCase
public void testGlobalAutoSettingNonBookmarkable()
{
- Map<String, String> params = Collections.singletonMap(CdiWebApplicationFactory.AUTO_CONVERSATION, "true");
+ Map<String, String> params = Collections.singletonMap(
+ CdiWebApplicationFactory.AUTO_CONVERSATION, "true");
CdiWicketTester tester = getTester(params);
- tester.startPage(TestConversationPage.class,
- new PageParameters().add("auto", true));
+ tester.startPage(TestConversationPage.class, new PageParameters().add("auto", true));
int i;
for (i = 0; i < 3; i++)
{
@@ -190,7 +188,8 @@ public class ConversationPropagatorTest extends WicketCdiTestCase
@Test
public void testGlobalAutoSettingBookmarkable()
{
- Map<String, String> params = Collections.singletonMap(CdiWebApplicationFactory.AUTO_CONVERSATION, "true");
+ Map<String, String> params = Collections.singletonMap(
+ CdiWebApplicationFactory.AUTO_CONVERSATION, "true");
CdiWicketTester tester = getTester(params);
tester.startPage(TestConversationPage.class,
http://git-wip-us.apache.org/repos/asf/wicket/blob/fbadd2bc/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/MockCdiContainer.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/MockCdiContainer.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/MockCdiContainer.java
index 6b31bf3..39db8b1 100644
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/MockCdiContainer.java
+++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/MockCdiContainer.java
@@ -39,7 +39,7 @@ public class MockCdiContainer extends AbstractCdiContainer
/**
* Activates the conversational context and starts the conversation with the
* specified cid
- *
+ *
* @param cycle
* @param cid
*/
@@ -52,7 +52,8 @@ public class MockCdiContainer extends AbstractCdiContainer
conversationContext.invalidate();
conversationContext.deactivate();
conversationContext.activate(cid);
- } else
+ }
+ else
{
conversationContext.activate(cid);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/fbadd2bc/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/WicketCdiTestCase.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/WicketCdiTestCase.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/WicketCdiTestCase.java
index c18292e..e113ec4 100644
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/WicketCdiTestCase.java
+++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/WicketCdiTestCase.java
@@ -42,25 +42,14 @@ import org.junit.runner.RunWith;
* @author jsarman
*/
@RunWith(CdiRunner.class)
-@ActivatedAlternatives({TestBehaviorInjector.class, TestComponentInjector.class, TestCdiConfiguration.class})
-@AdditionalClasses({
- CdiWicketTester.class,
- BehaviorInjector.class,
- CdiConfiguration.class,
- CdiShutdownCleaner.class,
- ComponentInjector.class,
- ConversationExpiryChecker.class,
- ConversationPropagator.class,
- ConversationManager.class,
- DetachEventEmitter.class,
- NonContextualManager.class,
- SessionInjector.class,
- MockCdiContainer.class,
- TestAppScope.class,
- TestConversationBean.class,
- FilterConfigProducer.class,
- TestCdiApplication.class,
- CdiWebApplicationFactory.class})
+@ActivatedAlternatives({ TestBehaviorInjector.class, TestComponentInjector.class,
+ TestCdiConfiguration.class })
+@AdditionalClasses({ CdiWicketTester.class, BehaviorInjector.class, CdiConfiguration.class,
+ CdiShutdownCleaner.class, ComponentInjector.class, ConversationExpiryChecker.class,
+ ConversationPropagator.class, ConversationManager.class, DetachEventEmitter.class,
+ NonContextualManager.class, SessionInjector.class, MockCdiContainer.class,
+ TestAppScope.class, TestConversationBean.class, FilterConfigProducer.class,
+ TestCdiApplication.class, CdiWebApplicationFactory.class })
public abstract class WicketCdiTestCase extends Assert
{
@Inject
http://git-wip-us.apache.org/repos/asf/wicket/blob/fbadd2bc/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/testapp/TestAppScope.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/testapp/TestAppScope.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/testapp/TestAppScope.java
index 2097f52..b36f8a7 100644
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/testapp/TestAppScope.java
+++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/testapp/TestAppScope.java
@@ -31,8 +31,7 @@ public class TestAppScope
return "Test ok";
}
- public
- @Produces
+ public @Produces
@TestQualifier
String testString()
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/fbadd2bc/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/testapp/TestApplication.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/testapp/TestApplication.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/testapp/TestApplication.java
index 7c92a1e..e78ec31 100644
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/testapp/TestApplication.java
+++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/testapp/TestApplication.java
@@ -37,15 +37,10 @@ public class TestApplication extends WebApplication
protected void init()
{
super.init();
- //Configure everything to default just to hit that code.
- CdiConfiguration.get()
- .setAutoConversationManagement(false)
- .setInjectApplication(true)
- .setInjectBehaviors(true)
- .setInjectComponents(true)
- .setInjectSession(true)
- .setPropagation(ConversationPropagation.NONBOOKMARKABLE)
- .configure(this);
+ // Configure everything to default just to hit that code.
+ CdiConfiguration.get().setAutoConversationManagement(false).setInjectApplication(true)
+ .setInjectBehaviors(true).setInjectComponents(true).setInjectSession(true)
+ .setPropagation(ConversationPropagation.NONBOOKMARKABLE).configure(this);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/fbadd2bc/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/testapp/TestConversationBean.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/testapp/TestConversationBean.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/testapp/TestConversationBean.java
index 4407efb..ef61441 100644
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/testapp/TestConversationBean.java
+++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/testapp/TestConversationBean.java
@@ -33,7 +33,7 @@ public class TestConversationBean implements Serializable
private static final long serialVersionUID = 1L;
private static final Logger logger = LoggerFactory.getLogger(TestConversationBean.class);
-
+
private AtomicInteger counter = new AtomicInteger();
public int getCount()
http://git-wip-us.apache.org/repos/asf/wicket/blob/fbadd2bc/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/testapp/TestConversationalPage.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/testapp/TestConversationalPage.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/testapp/TestConversationalPage.java
index e421cfc..b88a28a 100644
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/testapp/TestConversationalPage.java
+++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/testapp/TestConversationalPage.java
@@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory;
public class TestConversationalPage extends WebPage
{
private static final long serialVersionUID = 1L;
-
+
private static final Logger logger = LoggerFactory.getLogger(TestConversationPage.class);
@Inject
TestConversationBean counter;
http://git-wip-us.apache.org/repos/asf/wicket/blob/fbadd2bc/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/testapp/TestPage.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/testapp/TestPage.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/testapp/TestPage.java
index 704bf09..cf5108b 100644
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/testapp/TestPage.java
+++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/testapp/TestPage.java
@@ -27,7 +27,7 @@ import org.apache.wicket.markup.html.basic.Label;
public class TestPage extends WebPage
{
private static final long serialVersionUID = 1L;
-
+
@Inject
TestAppScope appScope;
http://git-wip-us.apache.org/repos/asf/wicket/blob/fbadd2bc/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/testapp/TestQualifier.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/testapp/TestQualifier.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/testapp/TestQualifier.java
index 3d9b361..dcd0289 100644
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/testapp/TestQualifier.java
+++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/testapp/TestQualifier.java
@@ -28,9 +28,8 @@ import javax.inject.Qualifier;
* @author jsarman
*/
@Qualifier
-@Target({ElementType.TYPE, ElementType.METHOD, ElementType.PARAMETER, ElementType.FIELD})
+@Target({ ElementType.TYPE, ElementType.METHOD, ElementType.PARAMETER, ElementType.FIELD })
@Retention(RetentionPolicy.RUNTIME)
-public @interface TestQualifier
-{
+public @interface TestQualifier {
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/fbadd2bc/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/util/tester/CdiWicketTester.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/util/tester/CdiWicketTester.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/util/tester/CdiWicketTester.java
index bd442e0..7ba82a5 100644
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/util/tester/CdiWicketTester.java
+++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/util/tester/CdiWicketTester.java
@@ -48,7 +48,8 @@ public class CdiWicketTester extends WicketTester
@Inject
- public CdiWicketTester(TestCdiConfiguration cdiConfiguration, CdiWebApplicationFactory factory, @ConfigurationFilter final FilterConfig filterConfig)
+ public CdiWicketTester(TestCdiConfiguration cdiConfiguration, CdiWebApplicationFactory factory,
+ @ConfigurationFilter final FilterConfig filterConfig)
{
super(factory.createApplication(new WicketFilter()
{
@@ -69,7 +70,9 @@ public class CdiWicketTester extends WicketTester
{
logger.debug("Initialized Cdi Wicket Tester");
cdiConfiguration.remapApplicationKey(filterConfig.getFilterName(), getApplication());
- contextManager.activateContexts(getRequest()); //Start up contexts in case no requests are performed
+ contextManager.activateContexts(getRequest()); // Start up contexts in
+ // case no requests are
+ // performed
}
@@ -85,9 +88,10 @@ public class CdiWicketTester extends WicketTester
/**
* Process the request by first activating the contexts on initial call.
- * This call is called recursively in the super class so keep track of
- * the topmost call and only activate and deactivate the contexts during that time.
- *
+ * This call is called recursively in the super class so keep track of the
+ * topmost call and only activate and deactivate the contexts during that
+ * time.
+ *
* @param forcedRequest
* @param forcedRequestHandler
* @param redirect
@@ -95,7 +99,7 @@ public class CdiWicketTester extends WicketTester
*/
@Override
protected boolean processRequest(final MockHttpServletRequest forcedRequest,
- final IRequestHandler forcedRequestHandler, final boolean redirect)
+ final IRequestHandler forcedRequestHandler, final boolean redirect)
{
if (count.getAndIncrement() == 0)
{
@@ -103,16 +107,18 @@ public class CdiWicketTester extends WicketTester
if (getLastRequest() != null)
{
contextManager.deactivateContexts(getLastRequest());
- } else
+ }
+ else
{
- configure();//make sure we are configured for cdi
+ configure();// make sure we are configured for cdi
}
contextManager.activateContexts(getRequest());
}
try
{
return super.processRequest(forcedRequest, forcedRequestHandler, redirect);
- } finally
+ }
+ finally
{
count.decrementAndGet();
}
@@ -130,7 +136,8 @@ public class CdiWicketTester extends WicketTester
}
contextManager.destroy(getHttpSession());
destroy();
- } catch (Throwable t)
+ }
+ catch (Throwable t)
{
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/fbadd2bc/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/util/tester/ConfigurationFilter.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/util/tester/ConfigurationFilter.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/util/tester/ConfigurationFilter.java
index d7113a8..b902d95 100644
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/util/tester/ConfigurationFilter.java
+++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/util/tester/ConfigurationFilter.java
@@ -26,13 +26,12 @@ import javax.inject.Qualifier;
/**
* Qualifier for injecting the FilterConfiguration for testing
- *
+ *
* @author jsarman
*/
@Qualifier
-@Target({ElementType.TYPE, ElementType.METHOD, ElementType.PARAMETER, ElementType.FIELD})
+@Target({ ElementType.TYPE, ElementType.METHOD, ElementType.PARAMETER, ElementType.FIELD })
@Retention(RetentionPolicy.RUNTIME)
-public @interface ConfigurationFilter
-{
+public @interface ConfigurationFilter {
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/fbadd2bc/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/util/tester/ContextManager.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/util/tester/ContextManager.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/util/tester/ContextManager.java
index 7eec3c4..d163da0 100644
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/util/tester/ContextManager.java
+++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/util/tester/ContextManager.java
@@ -86,13 +86,15 @@ public class ContextManager
public void destroy(HttpSession session)
{
- if(currentRequest != null) {
- currentSession = currentRequest.getSession(false);
+ if (currentRequest != null)
+ {
+ currentSession = currentRequest.getSession(false);
}
-
- if(currentSession != null) {
+
+ if (currentSession != null)
+ {
lifecycle.sessionDestroyed(currentSession);
- currentSession = null;
+ currentSession = null;
}
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/fbadd2bc/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/util/tester/TestBehaviorInjector.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/util/tester/TestBehaviorInjector.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/util/tester/TestBehaviorInjector.java
index 01ad94f..9f92eee 100644
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/util/tester/TestBehaviorInjector.java
+++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/util/tester/TestBehaviorInjector.java
@@ -27,7 +27,7 @@ import org.apache.wicket.cdi.BehaviorInjector;
/**
* Injects components with CDI dependencies
- *
+ *
* @author igor
*/
@ApplicationScoped
@@ -40,8 +40,9 @@ public class TestBehaviorInjector extends BehaviorInjector
public void onInstantiation(Behavior behavior)
{
Class instanceClass = behavior.getClass();
- if (instanceClass.isAnonymousClass() ||
- (instanceClass.isMemberClass() && Modifier.isStatic(instanceClass.getModifiers()) == false))
+ if (instanceClass.isAnonymousClass()
+ || (instanceClass.isMemberClass() && Modifier
+ .isStatic(instanceClass.getModifiers()) == false))
{
return;
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/fbadd2bc/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/util/tester/TestCdiConfiguration.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/util/tester/TestCdiConfiguration.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/util/tester/TestCdiConfiguration.java
index 0fd63f5..6dd7e8a 100644
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/util/tester/TestCdiConfiguration.java
+++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/util/tester/TestCdiConfiguration.java
@@ -32,11 +32,11 @@ import org.apache.wicket.cdi.Propagation;
/**
* Specializes the CdiConfigration to allow the ConfigurationParams key to be
- * remapped after the Application is used to construct the WicketTester.
- * This is needed because WicketTester generates the ApplicationKey during construction
- * and does not contain a mechanism to override the name. In the normal code the WicketFilter
- * sets the key to the filtername so remapping is not necessary.
- *
+ * remapped after the Application is used to construct the WicketTester. This is
+ * needed because WicketTester generates the ApplicationKey during construction
+ * and does not contain a mechanism to override the name. In the normal code the
+ * WicketFilter sets the key to the filtername so remapping is not necessary.
+ *
* @author jsarman
*/
@ApplicationScoped
@@ -52,8 +52,7 @@ public class TestCdiConfiguration extends CdiConfiguration
super.init();
}
- public
- @Produces
+ public @Produces
@Propagation
IConversationPropagation getPropagation()
{
@@ -61,8 +60,7 @@ public class TestCdiConfiguration extends CdiConfiguration
}
- public
- @Produces
+ public @Produces
@Auto
@Override
Boolean isAutoConversationManagement()
@@ -70,8 +68,7 @@ public class TestCdiConfiguration extends CdiConfiguration
return super.isAutoConversationManagement();
}
- public
- @Produces
+ public @Produces
@IgnoreList
@Override
String[] getPackagesToIgnore()
http://git-wip-us.apache.org/repos/asf/wicket/blob/fbadd2bc/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/util/tester/TestComponentInjector.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/util/tester/TestComponentInjector.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/util/tester/TestComponentInjector.java
index d43448e..6847ed9 100644
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/util/tester/TestComponentInjector.java
+++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/util/tester/TestComponentInjector.java
@@ -27,7 +27,7 @@ import org.apache.wicket.cdi.ComponentInjector;
/**
* Injects components with CDI dependencies
- *
+ *
* @author igor
*/
@ApplicationScoped
@@ -40,8 +40,9 @@ public class TestComponentInjector extends ComponentInjector
public void onInstantiation(Component component)
{
Class instanceClass = component.getClass();
- if (instanceClass.isAnonymousClass() ||
- (instanceClass.isMemberClass() && Modifier.isStatic(instanceClass.getModifiers()) == false))
+ if (instanceClass.isAnonymousClass()
+ || (instanceClass.isMemberClass() && Modifier
+ .isStatic(instanceClass.getModifiers()) == false))
{
return;
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/fbadd2bc/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-weld/src/main/java/org/apache/wicket/cdi/weld/WeldCdiContainer.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-weld/src/main/java/org/apache/wicket/cdi/weld/WeldCdiContainer.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-weld/src/main/java/org/apache/wicket/cdi/weld/WeldCdiContainer.java
index 6289074..b4e13db 100644
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-weld/src/main/java/org/apache/wicket/cdi/weld/WeldCdiContainer.java
+++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-weld/src/main/java/org/apache/wicket/cdi/weld/WeldCdiContainer.java
@@ -26,18 +26,19 @@ import org.jboss.weld.context.http.HttpConversationContext;
/**
* Provides access to CDI features from inside a Wicket request
- *
+ *
* @author jsarman
*/
@ApplicationScoped
public class WeldCdiContainer extends AbstractCdiContainer
-{
+{
@Inject
private HttpConversationContext conversationContext;
/**
- * Activates the conversational context and starts the conversation with the specified cid
- *
+ * Activates the conversational context and starts the conversation with the
+ * specified cid
+ *
* @param cycle
* @param cid
*/
@@ -50,7 +51,8 @@ public class WeldCdiContainer extends AbstractCdiContainer
conversationContext.invalidate();
conversationContext.deactivate();
conversationContext.activate(cid);
- } else
+ }
+ else
{
conversationContext.activate(cid);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/fbadd2bc/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-weld/src/test/java/org/apache/wicket/cdi/weld/ApacheLicenceHeaderTest.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-weld/src/test/java/org/apache/wicket/cdi/weld/ApacheLicenceHeaderTest.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-weld/src/test/java/org/apache/wicket/cdi/weld/ApacheLicenceHeaderTest.java
index 2c10f27..d2761ba 100644
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-weld/src/test/java/org/apache/wicket/cdi/weld/ApacheLicenceHeaderTest.java
+++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-weld/src/test/java/org/apache/wicket/cdi/weld/ApacheLicenceHeaderTest.java
@@ -21,9 +21,10 @@ import java.util.Arrays;
import org.apache.wicket.util.license.ApacheLicenseHeaderTestCase;
/**
- * Test that the license headers are in place in this project. The tests are run from
- * {@link ApacheLicenseHeaderTestCase}, but you can add project specific tests here if needed.
- *
+ * Test that the license headers are in place in this project. The tests are run
+ * from {@link ApacheLicenseHeaderTestCase}, but you can add project specific
+ * tests here if needed.
+ *
* @author Frank Bille Jensen (frankbille)
*/
public class ApacheLicenceHeaderTest extends ApacheLicenseHeaderTestCase
[2/2] git commit: Use IConversationPropagation interface
Posted by pa...@apache.org.
Use IConversationPropagation interface
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/1e912b77
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/1e912b77
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/1e912b77
Branch: refs/heads/wicket-6.x
Commit: 1e912b771a3512cc468c905edf45bb2f6c7b48a5
Parents: fbadd2b
Author: Emond Papegaaij <em...@topicus.nl>
Authored: Mon Nov 11 10:15:17 2013 +0100
Committer: Emond Papegaaij <em...@topicus.nl>
Committed: Mon Nov 11 10:15:17 2013 +0100
----------------------------------------------------------------------
.../java/org/apache/wicket/cdi/ConversationPropagator.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/1e912b77/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 f76df2d..d9d4e1c 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
@@ -374,7 +374,7 @@ public class ConversationPropagator extends AbstractRequestCycleListener
page);
}
}
- ConversationPropagation prop = annotation != null ? annotation.prop() : getPropagation();
+ IConversationPropagation prop = annotation != null ? annotation.prop() : getPropagation();
// The conversationManager is attached to a conversation so update
if (!getConversation().isTransient())
{
@@ -490,16 +490,16 @@ public class ConversationPropagator extends AbstractRequestCycleListener
return getConversationManager().getManageConversation();
}
- ConversationPropagation getPropagation()
+ IConversationPropagation getPropagation()
{
if (getConversation().isTransient())
{
logger.debug("Getting global Propagation {}.", cdiConfiguration.getPropagation());
- return (ConversationPropagation)cdiConfiguration.getPropagation();
+ return cdiConfiguration.getPropagation();
}
logger.debug("Propagation is set to {} with id = {}", getConversationManager()
.getPropagation(), getConversation().getId());
- return (ConversationPropagation)getConversationManager().getPropagation();
+ return getConversationManager().getPropagation();
}
}