Minor formatting improvements
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/a3e57603 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/a3e57603 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/a3e57603 Branch: refs/heads/master Commit: a3e57603fb41c55e143fd070332ef51e2fa4a196 Parents: 42d85ea Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Thu Jun 27 11:03:21 2013 +0300 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Thu Jun 27 11:03:21 2013 +0300 ---------------------------------------------------------------------- wicket-experimental/wicket-cdi-1.1/pom.xml | 2 +- .../wicket-cdi-1.1/wicket-cdi-1.1-core/pom.xml | 34 ++------------------ .../apache/wicket/cdi/AbstractCdiContainer.java | 5 ++- .../cdi/ConversationExpiredException.java | 6 ++-- .../wicket/cdi/ComponentInjectorTest.java | 9 ------ 5 files changed, 8 insertions(+), 48 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/a3e57603/wicket-experimental/wicket-cdi-1.1/pom.xml ---------------------------------------------------------------------- diff --git a/wicket-experimental/wicket-cdi-1.1/pom.xml b/wicket-experimental/wicket-cdi-1.1/pom.xml index c9f11c3..c0f9995 100644 --- a/wicket-experimental/wicket-cdi-1.1/pom.xml +++ b/wicket-experimental/wicket-cdi-1.1/pom.xml @@ -24,7 +24,7 @@ <relativePath>../pom.xml</relativePath> </parent> <artifactId>wicket-cdi-1.1</artifactId> - <version>0.1-SNAPSHOT</version> + <version>0.1-SNAPSHOT</version> <packaging>pom</packaging> <name>Wicket CDI 1.1</name> <description>Wicket CDI 1.1 Parent.</description> http://git-wip-us.apache.org/repos/asf/wicket/blob/a3e57603/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/pom.xml ---------------------------------------------------------------------- diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/pom.xml b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/pom.xml index 87b4265..d46b0ae 100644 --- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/pom.xml +++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/pom.xml @@ -25,7 +25,7 @@ </parent> <artifactId>wicket-cdi-1.1-core</artifactId> <packaging>jar</packaging> - <version>0.1-SNAPSHOT</version> + <version>0.1-SNAPSHOT</version> <name>Wicket CDI 1.1 Core</name> <description> Provides integration between Wicket and CDI containers. Enables injection of @@ -43,11 +43,10 @@ <artifactId>cdi-api</artifactId> <version>1.1</version> <scope>provided</scope> - </dependency> + </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <scope>test</scope> </dependency> <dependency> <groupId>javax.el</groupId> @@ -56,33 +55,4 @@ <scope>test</scope> </dependency> </dependencies> - <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>clirr-maven-plugin</artifactId> - <executions> - <execution> - <id>clirr-check</id> - <phase>compile</phase> - <goals> - <goal>check</goal> - </goals> - <configuration> - <comparisonVersion>6.1.0</comparisonVersion> - <failOnError>true</failOnError> - <logResults>true</logResults> - </configuration> - </execution> - </executions> - <configuration> - <comparisonVersion>6.1.0</comparisonVersion> - <failOnError>true</failOnError> - <logResults>true</logResults> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> </project> http://git-wip-us.apache.org/repos/asf/wicket/blob/a3e57603/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 da7ea5e..f30666c 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 @@ -28,8 +28,8 @@ import org.apache.wicket.util.lang.Args; * */ public abstract class AbstractCdiContainer -{ - +{ + /** * Deactivates conversational context * @@ -44,7 +44,6 @@ public abstract class AbstractCdiContainer * @param cid */ public abstract void activateConversationalContext(RequestCycle cycle, String cid); - protected HttpServletRequest getRequest(RequestCycle cycle) { http://git-wip-us.apache.org/repos/asf/wicket/blob/a3e57603/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 cee637c..d8324e3 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 @@ -21,9 +21,9 @@ import org.apache.wicket.request.IRequestHandler; public class ConversationExpiredException extends RuntimeException { - private String cid; - private Page page; - private IRequestHandler handler; + private final String cid; + private final Page page; + private final IRequestHandler handler; public ConversationExpiredException(Throwable cause, String cid, Page page, IRequestHandler handler) http://git-wip-us.apache.org/repos/asf/wicket/blob/a3e57603/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/ComponentInjectorTest.java ---------------------------------------------------------------------- diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/ComponentInjectorTest.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/ComponentInjectorTest.java index 5e002e3..c038614 100644 --- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/ComponentInjectorTest.java +++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/ComponentInjectorTest.java @@ -16,13 +16,6 @@ */ package org.apache.wicket.cdi; -import static org.mockito.Mockito.any; -import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.verify; - -import javax.enterprise.inject.spi.BeanManager; import javax.inject.Inject; import org.apache.wicket.markup.html.WebComponent; @@ -31,8 +24,6 @@ import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import org.mockito.invocation.InvocationOnMock; -import org.mockito.stubbing.Answer; /** * Tests for ComponentInjector
