[jboss-cvs] JBossAS SVN: r75223 - in projects/microcontainer/trunk: kernel/src/main/org/jboss/kernel/plugins/annotations and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Jun 30 13:28:57 EDT 2008
Author: alesj
Date: 2008-06-30 13:28:56 -0400 (Mon, 30 Jun 2008)
New Revision: 75223
Modified:
projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractController.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/AliasesAnnotationPlugin.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/PlainAliasAnnotationTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/PlainAliasTestCase.java
Log:
[JBMICROCONT-309]; better controller identification.
Modified: projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractController.java
===================================================================
--- projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractController.java 2008-06-30 17:15:58 UTC (rev 75222)
+++ projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractController.java 2008-06-30 17:28:56 UTC (rev 75223)
@@ -470,6 +470,20 @@
return uninstall(name, 0);
}
+ /**
+ * Get controller id - impl detail.
+ * It should be unique.
+ *
+ * @return controller's id
+ */
+ protected String getId()
+ {
+ StringBuffer buffer = new StringBuffer();
+ buffer.append(getClass().getSimpleName());
+ buffer.append("[").append(System.identityHashCode(this)).append("]");
+ return buffer.toString();
+ }
+
public void addAlias(Object alias, Object original) throws Throwable
{
Map<ControllerState, ControllerContextAction> map = createAliasActions();
@@ -500,7 +514,7 @@
public void removeAlias(Object alias)
{
- uninstall(alias + "_Alias_" + toString());
+ uninstall(alias + "_Alias_" + getId());
}
/**
@@ -1654,7 +1668,7 @@
public AliasControllerContext(Object alias, Object original, ControllerContextActions actions)
{
- super(alias + "_Alias_" + AbstractController.this.toString(), actions);
+ super(alias + "_Alias_" + getId(), actions);
this.alias = alias;
this.original = original;
DependencyInfo info = getDependencyInfo();
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/AliasesAnnotationPlugin.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/AliasesAnnotationPlugin.java 2008-06-30 17:15:58 UTC (rev 75222)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/AliasesAnnotationPlugin.java 2008-06-30 17:28:56 UTC (rev 75223)
@@ -48,6 +48,20 @@
super(Aliases.class);
}
+ /**
+ * Get controller id - impl detail.
+ *
+ * @param controller the controller
+ * @return controller's id
+ */
+ protected String getId(Controller controller)
+ {
+ StringBuffer buffer = new StringBuffer();
+ buffer.append(controller.getClass().getSimpleName());
+ buffer.append("[").append(System.identityHashCode(controller)).append("]");
+ return buffer.toString();
+ }
+
protected List<? extends MetaDataVisitorNode> internalApplyAnnotation(ClassInfo info, MetaData retrieval, Aliases annotation, KernelControllerContext context) throws Throwable
{
BeanMetaData beanMetaData = context.getBeanMetaData();
@@ -62,7 +76,7 @@
if (aliases == null || aliases.contains(alias) == false)
{
// impl detail (_Alias_<Controller>)
- if (controller.getContext(alias + "_Alias_" + controller, null) == null)
+ if (controller.getContext(alias + "_Alias_" + getId(controller), null) == null)
{
controller.addAlias(alias, beanMetaData.getName());
}
@@ -92,7 +106,7 @@
if (aliases == null || aliases.contains(alias) == false)
{
// impl detail (_Alias_<Controller>)
- if (controller.getContext(alias + "_Alias_" + controller, null) != null)
+ if (controller.getContext(alias + "_Alias_" + getId(controller), null) != null)
{
controller.removeAlias(alias);
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/PlainAliasAnnotationTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/PlainAliasAnnotationTestCase.java 2008-06-30 17:15:58 UTC (rev 75222)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/PlainAliasAnnotationTestCase.java 2008-06-30 17:28:56 UTC (rev 75223)
@@ -24,7 +24,6 @@
import junit.framework.Test;
import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
import org.jboss.beans.metadata.spi.BeanMetaData;
-import org.jboss.dependency.spi.Controller;
import org.jboss.dependency.spi.ControllerContext;
import org.jboss.dependency.spi.ControllerState;
import org.jboss.test.kernel.dependency.support.AliasSimpleBeanImpl;
@@ -57,7 +56,7 @@
setBeanMetaDatas(new BeanMetaData[]{new AbstractBeanMetaData("OriginalBean", AliasSimpleBeanImpl.class.getName())});
}
- protected void checkDirectAlias(Controller controller) throws Throwable
+ protected void checkDirectAlias() throws Throwable
{
// not yet registered
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/PlainAliasTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/PlainAliasTestCase.java 2008-06-30 17:15:58 UTC (rev 75222)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/PlainAliasTestCase.java 2008-06-30 17:28:56 UTC (rev 75223)
@@ -64,9 +64,13 @@
return getUtil().getContext(name);
}
- protected Controller getController()
+ protected String getControllerId()
{
- return getUtil().getKernel().getController();
+ Controller controller = getUtil().getKernel().getController();
+ StringBuffer buffer = new StringBuffer();
+ buffer.append(controller.getClass().getSimpleName());
+ buffer.append("[").append(System.identityHashCode(controller)).append("]");
+ return buffer.toString();
}
public void testPlainAliasCorrectOrder() throws Throwable
@@ -75,7 +79,7 @@
ControllerContext context1 = assertInstall(0, "OriginalBean");
ControllerContext context2 = getAlias("MyAlias");
- assertContext("MyAlias_Alias_" + getController());
+ assertContext("MyAlias_Alias_" + getControllerId());
SimpleBean bean1 = (SimpleBean) context1.getTarget();
assertNotNull(bean1);
@@ -93,12 +97,12 @@
ControllerContext context1 = getAlias("MyAlias");
assertNull(context1);
- checkDirectAlias(getController());
+ checkDirectAlias();
ControllerContext context2 = assertInstall(0, "OriginalBean");
context1 = assertContext("MyAlias");
assertEquals(ControllerState.INSTALLED, context1.getState());
- getDirectAlias(ControllerState.INSTALLED, getController());
+ getDirectAlias(ControllerState.INSTALLED);
SimpleBean bean1 = (SimpleBean) context2.getTarget();
assertNotNull(bean1);
@@ -108,14 +112,14 @@
assertEquals(alias, context1);
}
- protected void checkDirectAlias(Controller controller) throws Throwable
+ protected void checkDirectAlias() throws Throwable
{
- getDirectAlias(ControllerState.START, controller).getState();
+ getDirectAlias(ControllerState.START).getState();
}
- protected ControllerContext getDirectAlias(ControllerState state, Controller controller) throws Throwable
+ protected ControllerContext getDirectAlias(ControllerState state) throws Throwable
{
- return assertContext("MyAlias_Alias_" + controller, state);
+ return assertContext("MyAlias_Alias_" + getControllerId(), state);
}
public void testPlainAliasReinstall() throws Throwable
@@ -133,7 +137,7 @@
ControllerContext alias = assertContext("MyAlias");
assertEquals(alias, context1);
- ControllerContext directAlias = assertContext("MyAlias_Alias_" + getController());
+ ControllerContext directAlias = assertContext("MyAlias_Alias_" + getControllerId());
assertEquals(ControllerState.INSTALLED, directAlias.getState());
assertUninstall("OriginalBean");
@@ -144,11 +148,11 @@
assertNull(getUtil().getContext("MyAlias"));
context1 = assertInstall(0, "OriginalBean");
- directAlias = assertContext("MyAlias_Alias_" + getController());
+ directAlias = assertContext("MyAlias_Alias_" + getControllerId());
assertEquals(ControllerState.INSTALLED, directAlias.getState());
assertEquals(context1, assertContext("MyAlias"));
- assertUninstall("MyAlias_Alias_" + getController());
+ assertUninstall("MyAlias_Alias_" + getControllerId());
assertEquals(ControllerState.ERROR, directAlias.getState());
assertEquals(ControllerState.INSTALLED, context1.getState());
assertNull(getUtil().getContext("MyAlias"));
More information about the jboss-cvs-commits
mailing list