[jboss-cvs] JBossAS SVN: r98909 - in projects/kernel/trunk/kernel/src: test/java/org/jboss/test/kernel/deployment/xml/test and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Dec 23 10:17:50 EST 2009
Author: kabir.khan at jboss.com
Date: 2009-12-23 10:17:50 -0500 (Wed, 23 Dec 2009)
New Revision: 98909
Modified:
projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/api/model/QualifierContent.java
projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/api/model/QualifierContentValueAdapter.java
projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/QualifierTestCase.java
projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/qualifiers/support/TestMatcherAndParser.java
projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/qualifiers/test/BeanQualifiersTestCase.java
projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/qualifiers/test/InjectionPointQualifiersTestCase.java
Log:
[JBKERNEL-70] Tidy up a bit
Modified: projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/api/model/QualifierContent.java
===================================================================
--- projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/api/model/QualifierContent.java 2009-12-23 15:02:22 UTC (rev 98908)
+++ projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/api/model/QualifierContent.java 2009-12-23 15:17:50 UTC (rev 98909)
@@ -50,7 +50,8 @@
/** The qualifier is an annotation */
public static QualifierContent ANNOTATION = new QualifierContent("ANNOTATION");
- private static ConcurrentMap<String, QualifierContent> values = new ConcurrentHashMap<String, QualifierContent>();
+ //Not likely to be more than one thread at any time
+ private static ConcurrentMap<String, QualifierContent> values = new ConcurrentHashMap<String, QualifierContent>(3, .75f, 1);
static
{
@@ -117,7 +118,15 @@
return contentString.trim().toUpperCase();
}
- public static QualifierContent getOrCreateContent(String contentString)
+ /**
+ * Get the correct content type for the passed in string. If the content type
+ * has already been created return the existing instance. Otherwise create it
+ * and store it for future reference.
+ *
+ * @param the content type string
+ * @return the content type instance
+ */
+ public static QualifierContent getContent(String contentString)
{
String str = checkString(contentString);
QualifierContent content = values.get(str);
Modified: projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/api/model/QualifierContentValueAdapter.java
===================================================================
--- projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/api/model/QualifierContentValueAdapter.java 2009-12-23 15:02:22 UTC (rev 98908)
+++ projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/api/model/QualifierContentValueAdapter.java 2009-12-23 15:17:50 UTC (rev 98909)
@@ -33,6 +33,6 @@
@SuppressWarnings("unchecked")
public Object cast(Object o, Class c)
{
- return QualifierContent.getOrCreateContent((String)o);
+ return QualifierContent.getContent((String)o);
}
}
\ No newline at end of file
Modified: projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/QualifierTestCase.java
===================================================================
--- projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/QualifierTestCase.java 2009-12-23 15:02:22 UTC (rev 98908)
+++ projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/QualifierTestCase.java 2009-12-23 15:17:50 UTC (rev 98909)
@@ -326,7 +326,7 @@
RelatedClassMetaData related = getRelated("QualifierBeanNonStandardContent.xml");
assertEquals(QualifiersMdrUtil.SUPPLIED_QUALIFIER_KEY, related.getClassName());
assertInstanceOf(related, AbstractQualifierMetaData.class);
- assertSame(QualifierContent.getOrCreateContent("Rubbish"), ((AbstractQualifierMetaData)related).getContent());
+ assertSame(QualifierContent.getContent("Rubbish"), ((AbstractQualifierMetaData)related).getContent());
Set<Object> enabled = null;
try
{
@@ -368,7 +368,7 @@
RelatedClassMetaData related = checkRelated(((AbstractInjectionValueMetaData)valueMetaData).getQualifiers());
assertEquals(QualifiersMdrUtil.REQUIRED_QUALIFIER_KEY, related.getClassName());
assertInstanceOf(related, AbstractQualifierMetaData.class);
- assertSame(QualifierContent.getOrCreateContent("Rubbish"), ((AbstractQualifierMetaData)related).getContent());
+ assertSame(QualifierContent.getContent("Rubbish"), ((AbstractQualifierMetaData)related).getContent());
Set<Object> enabled = null;
try
{
@@ -411,7 +411,7 @@
public QualifierContent getHandledContent()
{
- return QualifierContent.getOrCreateContent("Rubbish");
+ return QualifierContent.getContent("Rubbish");
}
public Object parseSupplied(ClassLoader cl, Object rawQualifier)
Modified: projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/qualifiers/support/TestMatcherAndParser.java
===================================================================
--- projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/qualifiers/support/TestMatcherAndParser.java 2009-12-23 15:02:22 UTC (rev 98908)
+++ projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/qualifiers/support/TestMatcherAndParser.java 2009-12-23 15:17:50 UTC (rev 98909)
@@ -43,7 +43,7 @@
public QualifierContent getHandledContent()
{
- return QualifierContent.getOrCreateContent("Test");
+ return QualifierContent.getContent("Test");
}
public Class<?> getHandledType()
Modified: projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/qualifiers/test/BeanQualifiersTestCase.java
===================================================================
--- projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/qualifiers/test/BeanQualifiersTestCase.java 2009-12-23 15:02:22 UTC (rev 98908)
+++ projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/qualifiers/test/BeanQualifiersTestCase.java 2009-12-23 15:17:50 UTC (rev 98909)
@@ -969,7 +969,7 @@
{
BeanMetaDataBuilder bean1Builder = BeanMetaDataBuilder.createBuilder("bean1", Bean.class.getName());
bean1Builder.addQualifiers(QualifierType.SUPPLIED, "test");
- bean1Builder.addQualifiers(QualifierType.SUPPLIED, QualifierContent.getOrCreateContent("Test"), null, "Hello-xxx");
+ bean1Builder.addQualifiers(QualifierType.SUPPLIED, QualifierContent.getContent("Test"), null, "Hello-xxx");
KernelControllerContext bean1Context = deploy(bean1Builder.getBeanMetaData());
BeanMetaDataBuilder bean2Builder = BeanMetaDataBuilder.createBuilder("bean2", Bean.class.getName());
@@ -978,13 +978,13 @@
BeanMetaDataBuilder bean3Builder = BeanMetaDataBuilder.createBuilder("bean3", Bean.class.getName());
bean3Builder.addQualifiers(QualifierType.SUPPLIED, "test");
- bean3Builder.addQualifiers(QualifierType.SUPPLIED, QualifierContent.getOrCreateContent("Test"), null, "Hola-xxx");
+ bean3Builder.addQualifiers(QualifierType.SUPPLIED, QualifierContent.getContent("Test"), null, "Hola-xxx");
KernelControllerContext bean3Context = deploy(bean3Builder.getBeanMetaData());
BeanMetaDataBuilder targetBuilder = BeanMetaDataBuilder.createBuilder("target", TargetBean.class.getName());
targetBuilder.setAutowireType(AutowireType.BY_CLASS);
targetBuilder.addQualifiers(QualifierType.REQUIRED, "test");
- targetBuilder.addQualifiers(QualifierType.REQUIRED, QualifierContent.getOrCreateContent("Test"), null, "xxx-Hola");
+ targetBuilder.addQualifiers(QualifierType.REQUIRED, QualifierContent.getContent("Test"), null, "xxx-Hola");
KernelControllerContext targetContext = deploy(targetBuilder.getBeanMetaData());
try
Modified: projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/qualifiers/test/InjectionPointQualifiersTestCase.java
===================================================================
--- projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/qualifiers/test/InjectionPointQualifiersTestCase.java 2009-12-23 15:02:22 UTC (rev 98908)
+++ projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/qualifiers/test/InjectionPointQualifiersTestCase.java 2009-12-23 15:17:50 UTC (rev 98909)
@@ -810,17 +810,17 @@
{
BeanMetaDataBuilder bean1Builder = BeanMetaDataBuilder.createBuilder("bean1", Bean.class.getName());
bean1Builder.addQualifiers(QualifierType.SUPPLIED, "test");
- bean1Builder.addQualifiers(QualifierType.SUPPLIED, QualifierContent.getOrCreateContent("Test"), null, "Hello-xxx");
+ bean1Builder.addQualifiers(QualifierType.SUPPLIED, QualifierContent.getContent("Test"), null, "Hello-xxx");
KernelControllerContext bean1Context = deploy(bean1Builder.getBeanMetaData());
BeanMetaDataBuilder bean2Builder = BeanMetaDataBuilder.createBuilder("bean2", Bean.class.getName());
bean2Builder.addQualifiers(QualifierType.SUPPLIED, "test");
- bean2Builder.addQualifiers(QualifierType.SUPPLIED, QualifierContent.getOrCreateContent("Test"), null, "Bonjour-xxx");
+ bean2Builder.addQualifiers(QualifierType.SUPPLIED, QualifierContent.getContent("Test"), null, "Bonjour-xxx");
KernelControllerContext bean2Context = deploy(bean2Builder.getBeanMetaData());
BeanMetaDataBuilder bean3Builder = BeanMetaDataBuilder.createBuilder("bean3", Bean.class.getName());
bean3Builder.addQualifiers(QualifierType.SUPPLIED, "test");
- bean3Builder.addQualifiers(QualifierType.SUPPLIED, QualifierContent.getOrCreateContent("Test"), null, "Hola-xxx");
+ bean3Builder.addQualifiers(QualifierType.SUPPLIED, QualifierContent.getContent("Test"), null, "Hola-xxx");
KernelControllerContext bean3Context = deploy(bean3Builder.getBeanMetaData());
@@ -828,15 +828,15 @@
BeanMetaDataBuilder targetBuilder = BeanMetaDataBuilder.createBuilder("target", TargetAllBean.class.getName());
ValueMetaData inject = targetBuilder.addQualifiersToContextualInject(targetBuilder.createContextualInject(), "test");
- inject = targetBuilder.addQualifiersToContextualInject(inject, QualifierContent.getOrCreateContent("Test"), false, "xxx-Hola");
+ inject = targetBuilder.addQualifiersToContextualInject(inject, QualifierContent.getContent("Test"), false, "xxx-Hola");
targetBuilder.addPropertyMetaData("fieldBean", inject);
inject = targetBuilder.addQualifiersToContextualInject(targetBuilder.createContextualInject(), "test");
- inject = targetBuilder.addQualifiersToContextualInject(inject, QualifierContent.getOrCreateContent("Test"), false, "xxx-Hello");
+ inject = targetBuilder.addQualifiersToContextualInject(inject, QualifierContent.getContent("Test"), false, "xxx-Hello");
targetBuilder.addConstructorParameter(Bean.class.getName(), inject);
inject = targetBuilder.addQualifiersToContextualInject(targetBuilder.createContextualInject(), "test");
- inject = targetBuilder.addQualifiersToContextualInject(inject, QualifierContent.getOrCreateContent("Test"), false, "xxx-Bonjour");
+ inject = targetBuilder.addQualifiersToContextualInject(inject, QualifierContent.getContent("Test"), false, "xxx-Bonjour");
targetBuilder.addInstall("installBean", Bean.class.getName(), inject);
targetBuilder.addQualifiers(QualifierType.OPTIONAL, "all");
More information about the jboss-cvs-commits
mailing list