You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by jd...@apache.org on 2010/03/13 20:38:36 UTC
svn commit: r922660 - in /wicket/branches/wicket-1.4.x/wicket-guice/src:
main/java/org/apache/wicket/guice/ test/java/org/apache/wicket/guice/
Author: jdonnerstag
Date: Sat Mar 13 19:38:36 2010
New Revision: 922660
URL: http://svn.apache.org/viewvc?rev=922660&view=rev
Log:
WICKET-2761 applied InjectorHolder.getInjector().inject(this) doesn't work with wicket-guice
Added:
wicket/branches/wicket-1.4.x/wicket-guice/src/test/java/org/apache/wicket/guice/TestNoComponent.java
Modified:
wicket/branches/wicket-1.4.x/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceComponentInjector.java
wicket/branches/wicket-1.4.x/wicket-guice/src/main/java/org/apache/wicket/guice/InjectionFlagCachingGuiceComponentInjector.java
wicket/branches/wicket-1.4.x/wicket-guice/src/test/java/org/apache/wicket/guice/GuiceInjectorTest.java
wicket/branches/wicket-1.4.x/wicket-guice/src/test/java/org/apache/wicket/guice/TestComponent.java
Modified: wicket/branches/wicket-1.4.x/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceComponentInjector.java
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceComponentInjector.java?rev=922660&r1=922659&r2=922660&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceComponentInjector.java (original)
+++ wicket/branches/wicket-1.4.x/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceComponentInjector.java Sat Mar 13 19:38:36 2010
@@ -28,6 +28,9 @@ import org.apache.wicket.Application;
import org.apache.wicket.Component;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.application.IComponentInstantiationListener;
+import org.apache.wicket.injection.ConfigurableInjector;
+import org.apache.wicket.injection.IFieldValueFactory;
+import org.apache.wicket.injection.web.InjectorHolder;
import org.apache.wicket.proxy.LazyInitProxyFactory;
import com.google.inject.BindingAnnotation;
@@ -53,7 +56,9 @@ import com.google.inject.Stage;
*
* @author Alastair Maw
*/
-public class GuiceComponentInjector implements IComponentInstantiationListener
+public class GuiceComponentInjector extends ConfigurableInjector
+ implements
+ IComponentInstantiationListener
{
/**
* Creates a new Wicket GuiceComponentInjector instance.
@@ -94,9 +99,16 @@ public class GuiceComponentInjector impl
public GuiceComponentInjector(Application app, Injector injector)
{
app.setMetaData(GuiceInjectorHolder.INJECTOR_KEY, new GuiceInjectorHolder(injector));
+ InjectorHolder.setInjector(this);
}
- public void inject(Object object)
+ /**
+ * @param object
+ * object to be injected
+ * @return Object that was injected - used for chaining
+ */
+ @Override
+ public Object inject(Object object)
{
Class< ? > current = object.getClass();
do
@@ -188,6 +200,8 @@ public class GuiceComponentInjector impl
}
// Do a null check in case Object isn't in the current classloader.
while (current != null && current != Object.class);
+
+ return object;
}
public void onInstantiation(Component component)
@@ -225,4 +239,14 @@ public class GuiceComponentInjector impl
{
private static final long serialVersionUID = 1L;
}
+
+ /**
+ * @see org.apache.wicket.injection.ConfigurableInjector#getFieldValueFactory()
+ */
+ @Override
+ protected IFieldValueFactory getFieldValueFactory()
+ {
+ // No need of {@link IFieldValueFactory}
+ return null;
+}
}
Modified: wicket/branches/wicket-1.4.x/wicket-guice/src/main/java/org/apache/wicket/guice/InjectionFlagCachingGuiceComponentInjector.java
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket-guice/src/main/java/org/apache/wicket/guice/InjectionFlagCachingGuiceComponentInjector.java?rev=922660&r1=922659&r2=922660&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/wicket-guice/src/main/java/org/apache/wicket/guice/InjectionFlagCachingGuiceComponentInjector.java (original)
+++ wicket/branches/wicket-1.4.x/wicket-guice/src/main/java/org/apache/wicket/guice/InjectionFlagCachingGuiceComponentInjector.java Sat Mar 13 19:38:36 2010
@@ -63,13 +63,13 @@ public class InjectionFlagCachingGuiceCo
* @see org.apache.wicket.guice.GuiceComponentInjector#inject(java.lang.Object)
*/
@Override
- public void inject(final Object object)
+ public Object inject(final Object object)
{
Class< ? > current = object.getClass();
Boolean doInject = classToDoInject.get(current);
if (doInject != null && !doInject.booleanValue())
{
- return;
+ return object;
}
boolean actualDoInject = false;
@@ -170,6 +170,8 @@ public class InjectionFlagCachingGuiceCo
{
classToDoInject.put(object.getClass(), new Boolean(actualDoInject));
}
+
+ return object;
}
/**
Modified: wicket/branches/wicket-1.4.x/wicket-guice/src/test/java/org/apache/wicket/guice/GuiceInjectorTest.java
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket-guice/src/test/java/org/apache/wicket/guice/GuiceInjectorTest.java?rev=922660&r1=922659&r2=922660&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/wicket-guice/src/test/java/org/apache/wicket/guice/GuiceInjectorTest.java (original)
+++ wicket/branches/wicket-1.4.x/wicket-guice/src/test/java/org/apache/wicket/guice/GuiceInjectorTest.java Sat Mar 13 19:38:36 2010
@@ -104,6 +104,7 @@ public class GuiceInjectorTest extends T
// Serialize and deserialize the object, and check it still works.
TestComponent clonedComponent = (TestComponent)Objects.cloneObject(testComponent);
doChecksForComponent(clonedComponent);
+ doChecksForNoComponent(clonedComponent);
}
finally
@@ -112,6 +113,11 @@ public class GuiceInjectorTest extends T
}
}
+ private void doChecksForNoComponent(TestComponent component)
+ {
+ assertEquals(ITestService.RESULT_RED, component.getNoComponentString());
+ }
+
private void doChecksForComponent(TestComponent component)
{
assertEquals(ITestService.RESULT, component.getInjectedField().getString());
Modified: wicket/branches/wicket-1.4.x/wicket-guice/src/test/java/org/apache/wicket/guice/TestComponent.java
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket-guice/src/test/java/org/apache/wicket/guice/TestComponent.java?rev=922660&r1=922659&r2=922660&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/wicket-guice/src/test/java/org/apache/wicket/guice/TestComponent.java (original)
+++ wicket/branches/wicket-1.4.x/wicket-guice/src/test/java/org/apache/wicket/guice/TestComponent.java Sat Mar 13 19:38:36 2010
@@ -56,9 +56,13 @@ public class TestComponent extends Compo
private Map<String, String> injectedTypeLiteralMethod;
+ private final TestNoComponent noComponent;
+
public TestComponent(String id)
{
super(id);
+
+ noComponent = new TestNoComponent();
}
public ITestService getInjectedField()
@@ -156,4 +160,9 @@ public class TestComponent extends Compo
{
// Do nothing.
}
+
+ public String getNoComponentString()
+ {
+ return noComponent.getString();
+}
}
Added: wicket/branches/wicket-1.4.x/wicket-guice/src/test/java/org/apache/wicket/guice/TestNoComponent.java
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket-guice/src/test/java/org/apache/wicket/guice/TestNoComponent.java?rev=922660&view=auto
==============================================================================
--- wicket/branches/wicket-1.4.x/wicket-guice/src/test/java/org/apache/wicket/guice/TestNoComponent.java (added)
+++ wicket/branches/wicket-1.4.x/wicket-guice/src/test/java/org/apache/wicket/guice/TestNoComponent.java Sat Mar 13 19:38:36 2010
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.wicket.guice;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.IClusterable;
+import org.apache.wicket.injection.web.InjectorHolder;
+
+import com.google.inject.Inject;
+
+/**
+ * Tests injection of services in classes which do not extend {@link Component}
+ */
+@SuppressWarnings("serial")
+public class TestNoComponent implements IClusterable
+{
+
+ @Inject
+ @Red
+ private ITestService testService;
+
+ /**
+ *
+ * Construct.
+ */
+ public TestNoComponent()
+ {
+ InjectorHolder.getInjector().inject(this);
+ }
+
+ /**
+ * @return if injection works should return {@link ITestService#RESULT_RED}
+ */
+ public String getString()
+ {
+ return testService.getString();
+ }
+}