You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2014/02/02 10:07:02 UTC
[1/4] git commit: Remove obsolete comment
Updated Branches:
refs/heads/master 288eae00e -> 0a271d8a9
Remove obsolete comment
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/517dfb04
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/517dfb04
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/517dfb04
Branch: refs/heads/master
Commit: 517dfb04a4a8337796f80d530215fab849b0a223
Parents: 45024ce
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Sun Feb 2 09:37:58 2014 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Sun Feb 2 10:06:42 2014 +0100
----------------------------------------------------------------------
.../src/test/java/org/apache/wicket/examples/StartExamples.java | 4 ----
1 file changed, 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/517dfb04/wicket-examples/src/test/java/org/apache/wicket/examples/StartExamples.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/StartExamples.java b/wicket-examples/src/test/java/org/apache/wicket/examples/StartExamples.java
index b507a77..ee88d6d 100644
--- a/wicket-examples/src/test/java/org/apache/wicket/examples/StartExamples.java
+++ b/wicket-examples/src/test/java/org/apache/wicket/examples/StartExamples.java
@@ -37,10 +37,6 @@ import org.eclipse.jetty.webapp.WebAppContext;
public class StartExamples
{
/**
- * Used for logging.
- */
-
- /**
* Main function, starts the jetty server.
*
* @param args
[3/4] git commit: Use Args#notNull()
Posted by mg...@apache.org.
Use Args#notNull()
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/25a34cc0
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/25a34cc0
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/25a34cc0
Branch: refs/heads/master
Commit: 25a34cc03c7b5e86f964a97c9d3b043b8a8ff71e
Parents: 288eae0
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Jan 31 14:07:54 2014 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Sun Feb 2 10:06:42 2014 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/wicket/MarkupContainer.java | 10 ++--------
.../main/java/org/apache/wicket/markup/ComponentTag.java | 6 ++----
2 files changed, 4 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/25a34cc0/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java b/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
index 6e0c3c2..1855262 100644
--- a/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
+++ b/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
@@ -193,10 +193,7 @@ public abstract class MarkupContainer extends Component implements Iterable<Comp
{
for (Component child : childs)
{
- if (child == null)
- {
- throw new IllegalArgumentException("argument child must be not null");
- }
+ Args.notNull(child, "child");
checkHierarchyChange(child);
@@ -269,10 +266,7 @@ public abstract class MarkupContainer extends Component implements Iterable<Comp
*/
public boolean contains(final Component component, final boolean recurse)
{
- if (component == null)
- {
- throw new IllegalArgumentException("argument component may not be null");
- }
+ Args.notNull(component, "component");
if (recurse)
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/25a34cc0/wicket-core/src/main/java/org/apache/wicket/markup/ComponentTag.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/ComponentTag.java b/wicket-core/src/main/java/org/apache/wicket/markup/ComponentTag.java
index d387368..d9158f0 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/ComponentTag.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/ComponentTag.java
@@ -30,6 +30,7 @@ import org.apache.wicket.markup.parser.XmlTag;
import org.apache.wicket.markup.parser.XmlTag.TagType;
import org.apache.wicket.markup.parser.filter.HtmlHandler;
import org.apache.wicket.request.Response;
+import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.lang.Generics;
import org.apache.wicket.util.string.AppendingStringBuffer;
import org.apache.wicket.util.string.StringValue;
@@ -178,10 +179,7 @@ public class ComponentTag extends MarkupElement
*/
public final void addBehavior(final Behavior behavior)
{
- if (behavior == null)
- {
- throw new IllegalArgumentException("Argument [behavior] cannot be null");
- }
+ Args.notNull(behavior, "behavior");
if (behaviors == null)
{
[4/4] git commit: WICKET-5482 Wicket-guice doesn't support
@javax.inject.Named annotations
Posted by mg...@apache.org.
WICKET-5482 Wicket-guice doesn't support @javax.inject.Named annotations
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/0a271d8a
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/0a271d8a
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/0a271d8a
Branch: refs/heads/master
Commit: 0a271d8a9a843358cc23ae7afa3d8baaa62e5c2b
Parents: 517dfb0
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Sun Feb 2 10:05:32 2014 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Sun Feb 2 10:06:43 2014 +0100
----------------------------------------------------------------------
.../wicket/guice/GuiceFieldValueFactory.java | 5 ++-
.../apache/wicket/guice/GuiceInjectorTest.java | 39 ++++++++++++++++++++
.../wicket/guice/JavaxInjectTestComponent.java | 21 +++++++++++
.../org/apache/wicket/guice/TestComponent.java | 20 ++++++++++
.../wicket/guice/TestComponentInterface.java | 4 ++
5 files changed, 88 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/0a271d8a/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceFieldValueFactory.java
----------------------------------------------------------------------
diff --git a/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceFieldValueFactory.java b/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceFieldValueFactory.java
index d2b68ac..ed137f5 100644
--- a/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceFieldValueFactory.java
+++ b/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceFieldValueFactory.java
@@ -20,6 +20,8 @@ import java.lang.annotation.Annotation;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
+import javax.inject.Qualifier;
+
import com.google.inject.BindingAnnotation;
import com.google.inject.Inject;
import org.apache.wicket.WicketRuntimeException;
@@ -120,7 +122,8 @@ public class GuiceFieldValueFactory implements IFieldValueFactory
// Work out if we have a BindingAnnotation on this parameter.
for (Annotation annotation : annotations)
{
- if (annotation.annotationType().getAnnotation(BindingAnnotation.class) != null)
+ if (annotation.annotationType().getAnnotation(BindingAnnotation.class) != null ||
+ annotation.annotationType().getAnnotation(Qualifier.class) != null)
{
if (bindingAnnotation != null)
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/0a271d8a/wicket-guice/src/test/java/org/apache/wicket/guice/GuiceInjectorTest.java
----------------------------------------------------------------------
diff --git a/wicket-guice/src/test/java/org/apache/wicket/guice/GuiceInjectorTest.java b/wicket-guice/src/test/java/org/apache/wicket/guice/GuiceInjectorTest.java
index f9b4f36..a55c25e 100644
--- a/wicket-guice/src/test/java/org/apache/wicket/guice/GuiceInjectorTest.java
+++ b/wicket-guice/src/test/java/org/apache/wicket/guice/GuiceInjectorTest.java
@@ -16,13 +16,17 @@
*/
package org.apache.wicket.guice;
+import java.lang.annotation.Annotation;
import java.util.HashMap;
import java.util.Map;
+import javax.inject.Named;
+
import com.google.inject.Binder;
import com.google.inject.Module;
import com.google.inject.Provider;
import com.google.inject.TypeLiteral;
+import com.google.inject.name.Names;
import org.apache.wicket.Session;
import org.apache.wicket.ThreadContext;
import org.apache.wicket.mock.MockApplication;
@@ -31,6 +35,7 @@ import org.apache.wicket.protocol.http.WebSession;
import org.apache.wicket.protocol.http.mock.MockServletContext;
import org.apache.wicket.request.Url;
import org.apache.wicket.core.util.lang.WicketObjects;
+import org.apache.wicket.util.lang.Args;
import org.junit.Assert;
import org.junit.Test;
@@ -83,6 +88,12 @@ public class GuiceInjectorTest extends Assert
return strings;
}
});
+
+ binder.bind(String.class).annotatedWith(Names.named("named1")).toInstance("NAMED_1");
+ binder.bind(String.class).annotatedWith(Names.named("named2")).toInstance("NAMED_2");
+
+ binder.bind(String.class).annotatedWith(new Jsr330Named("named1")).toInstance("NAMED_1");
+ binder.bind(String.class).annotatedWith(new Jsr330Named("named2")).toInstance("NAMED_2");
}
});
@@ -125,6 +136,9 @@ public class GuiceInjectorTest extends Assert
assertEquals(ITestService.RESULT,
component.getInjectedTypeLiteralField().get(ITestService.RESULT));
+
+ assertEquals("NAMED_1", component.getNamed1());
+ assertEquals("NAMED_2", component.getNamed2());
}
protected TestNoComponentInterface newTestNoComponent()
@@ -136,4 +150,29 @@ public class GuiceInjectorTest extends Assert
{
return new TestComponent(id);
}
+
+ /**
+ * Helper class to make binding of an instance of javax.inject.Named less verbose
+ */
+ private static class Jsr330Named implements Named
+ {
+ private final String name;
+
+ private Jsr330Named(String name)
+ {
+ this.name = name;
+ }
+
+ @Override
+ public String value()
+ {
+ return name;
+ }
+
+ @Override
+ public Class<? extends Annotation> annotationType()
+ {
+ return Named.class;
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/0a271d8a/wicket-guice/src/test/java/org/apache/wicket/guice/JavaxInjectTestComponent.java
----------------------------------------------------------------------
diff --git a/wicket-guice/src/test/java/org/apache/wicket/guice/JavaxInjectTestComponent.java b/wicket-guice/src/test/java/org/apache/wicket/guice/JavaxInjectTestComponent.java
index 7afd71e..5792be5 100644
--- a/wicket-guice/src/test/java/org/apache/wicket/guice/JavaxInjectTestComponent.java
+++ b/wicket-guice/src/test/java/org/apache/wicket/guice/JavaxInjectTestComponent.java
@@ -19,6 +19,7 @@ package org.apache.wicket.guice;
import java.util.Map;
import javax.inject.Inject;
+import javax.inject.Named;
import com.google.inject.Provider;
import org.apache.wicket.Component;
@@ -46,6 +47,14 @@ public class JavaxInjectTestComponent extends Component implements TestComponent
@Inject
private Map<String, String> injectedTypeLiteralField;
+ @Inject
+ @Named("named1")
+ private String named1;
+
+ @Inject
+ @Named("named2")
+ private String named2;
+
private final JavaxInjectTestNoComponent noComponent;
/**
@@ -107,6 +116,18 @@ public class JavaxInjectTestComponent extends Component implements TestComponent
return null;
}
+ @Override
+ public String getNamed1()
+ {
+ return named1;
+ }
+
+ @Override
+ public String getNamed2()
+ {
+ return named2;
+ }
+
/**
* @return injectedTypeLiteralField
*/
http://git-wip-us.apache.org/repos/asf/wicket/blob/0a271d8a/wicket-guice/src/test/java/org/apache/wicket/guice/TestComponent.java
----------------------------------------------------------------------
diff --git a/wicket-guice/src/test/java/org/apache/wicket/guice/TestComponent.java b/wicket-guice/src/test/java/org/apache/wicket/guice/TestComponent.java
index 6d065fc..01e5b70 100644
--- a/wicket-guice/src/test/java/org/apache/wicket/guice/TestComponent.java
+++ b/wicket-guice/src/test/java/org/apache/wicket/guice/TestComponent.java
@@ -50,6 +50,14 @@ public class TestComponent extends Component implements TestComponentInterface
@Inject
private Map<String, String> injectedTypeLiteralField;
+ @Inject()
+ @Named("named1")
+ private String named1;
+
+ @Inject()
+ @Named("named2")
+ private String named2;
+
private final TestNoComponent noComponent;
/**
@@ -111,6 +119,18 @@ public class TestComponent extends Component implements TestComponentInterface
return injectedOptionalField;
}
+ @Override
+ public String getNamed1()
+ {
+ return named1;
+ }
+
+ @Override
+ public String getNamed2()
+ {
+ return named2;
+ }
+
/**
* @return injectedTypeLiteralField
*/
http://git-wip-us.apache.org/repos/asf/wicket/blob/0a271d8a/wicket-guice/src/test/java/org/apache/wicket/guice/TestComponentInterface.java
----------------------------------------------------------------------
diff --git a/wicket-guice/src/test/java/org/apache/wicket/guice/TestComponentInterface.java b/wicket-guice/src/test/java/org/apache/wicket/guice/TestComponentInterface.java
index 5bc5be9..c7fb85b 100644
--- a/wicket-guice/src/test/java/org/apache/wicket/guice/TestComponentInterface.java
+++ b/wicket-guice/src/test/java/org/apache/wicket/guice/TestComponentInterface.java
@@ -27,6 +27,10 @@ public interface TestComponentInterface
String getInjectedOptionalField();
+ String getNamed1();
+
+ String getNamed2();
+
ITestService getInjectedFieldRed();
ITestService getInjectedFieldBlue();
[2/4] git commit: Print the current container's details when there is
a problem finding a child for a ComponentTag
Posted by mg...@apache.org.
Print the current container's details when there is a problem finding a child for a ComponentTag
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/45024cec
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/45024cec
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/45024cec
Branch: refs/heads/master
Commit: 45024cec5a01373b759f3c3f2a59af69855f5b42
Parents: 25a34cc
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Jan 31 14:08:28 2014 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Sun Feb 2 10:06:42 2014 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/wicket/MarkupContainer.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/45024cec/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java b/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
index 1855262..5cae9bb 100644
--- a/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
+++ b/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
@@ -1396,7 +1396,7 @@ public abstract class MarkupContainer extends Component implements Iterable<Comp
if (((WicketTag)tag).isChildTag())
{
markupStream.throwMarkupException("Found " + tag.toString() +
- " but no <wicket:extend>");
+ " but no <wicket:extend>. Container: " + toString());
}
else
{
@@ -1405,14 +1405,15 @@ public abstract class MarkupContainer extends Component implements Iterable<Comp
". It might be that no resolver has been registered to handle this special tag. " +
" But it also could be that you declared wicket:id=" + id +
" in your markup, but that you either did not add the " +
- "component to your page at all, or that the hierarchy does not match.");
+ "component to your page at all, or that the hierarchy does not match. " +
+ "Container: " + toString());
}
}
List<String> names = findSimilarComponents(id);
// No one was able to handle the component id
- StringBuffer msg = new StringBuffer(500);
+ StringBuilder msg = new StringBuilder(500);
msg.append("Unable to find component with id '");
msg.append(id);
msg.append("' in ");
@@ -1423,7 +1424,7 @@ public abstract class MarkupContainer extends Component implements Iterable<Comp
msg.append(id);
msg.append("'.\n\tFound with similar names: '");
msg.append(Strings.join("', ", names));
- msg.append("'");
+ msg.append('\'');
log.error(msg.toString());
markupStream.throwMarkupException(msg.toString());