[jboss-cvs] JBossAS SVN: r107389 - in projects/jboss-jca/trunk: common/src/main/java/org/jboss/jca/common/annotations and 14 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Aug 4 11:32:45 EDT 2010
Author: maeste
Date: 2010-08-04 11:32:43 -0400 (Wed, 04 Aug 2010)
New Revision: 107389
Added:
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/JCAMetadata.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/MergeUtil.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/validator/
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/validator/ValidateException.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/validator/package.html
Removed:
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/JCAMetadata.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/MergeUtil.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/validator/
Modified:
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/JBossResourceException.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/annotations/Annotations.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/annotations/SecurityActions.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/jbossra/JbossRa.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ra/IdDecoratedMetadata.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ra/LicenseType.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ra/LocalizedMetadata.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ra/Path.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ra/ResourceAdapter1516.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ra/ValidatableMetadata.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ra/ra10/ResourceAdapter10.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/MetadataParser.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/jbossra/JbossRaAbstractImpl.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/jbossra/jbossra20/BeanValidationGroupImpl.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/jbossra/jbossra20/JbossRa20Impl.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/AdminObjectImpl.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/AuthenticationMechanismImpl.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/ConfigPropertyImpl.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/ConnectionDefinitionImpl.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/ConnectorAbstractmpl.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/MessageAdapterImpl.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/OutboundResourceAdapterImpl.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/RaConfigPropertyImpl.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/ResourceAdapter1516Impl.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/SecurityPermissionImpl.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra10/Connector10Impl.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra10/ResourceAdapter10Impl.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra15/Activationspec15Impl.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/Activationspec16Impl.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/Connector16Impl.java
projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/deployers/annotations/AnnotationsTestCase.java
Log:
JBJCA-385: removing findbugs bugs, checkstyle and ciclyc dep
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/JBossResourceException.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/JBossResourceException.java 2010-08-04 15:08:25 UTC (rev 107388)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/JBossResourceException.java 2010-08-04 15:32:43 UTC (rev 107389)
@@ -128,6 +128,7 @@
*
* @return Nested <tt>Throwable</tt>.
*/
+ @Override
@SuppressWarnings("deprecation")
public Throwable getNested()
{
@@ -141,6 +142,7 @@
*
* @return Nested <tt>Throwable</tt>.
*/
+ @Override
@SuppressWarnings("deprecation")
public Throwable getCause()
{
@@ -152,6 +154,7 @@
*
* @return The composite throwable message.
*/
+ @Override
@SuppressWarnings("deprecation")
public String getMessage()
{
@@ -164,6 +167,7 @@
*
* @param stream Stream to print to.
*/
+ @Override
@SuppressWarnings("deprecation")
public void printStackTrace(final PrintStream stream)
{
@@ -181,6 +185,7 @@
*
* @param writer Writer to print to.
*/
+ @Override
@SuppressWarnings("deprecation")
public void printStackTrace(final PrintWriter writer)
{
@@ -196,6 +201,7 @@
* Prints the composite message and the embedded stack trace to
* <tt>System.err</tt>.
*/
+ @Override
public void printStackTrace()
{
printStackTrace(System.err);
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/annotations/Annotations.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/annotations/Annotations.java 2010-08-04 15:08:25 UTC (rev 107388)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/annotations/Annotations.java 2010-08-04 15:32:43 UTC (rev 107389)
@@ -43,6 +43,7 @@
import org.jboss.jca.common.api.metadata.ra.ra16.Activationspec16;
import org.jboss.jca.common.api.metadata.ra.ra16.ConfigProperty16;
import org.jboss.jca.common.api.metadata.ra.ra16.Connector16;
+import org.jboss.jca.common.api.validator.ValidateException;
import org.jboss.jca.common.metadata.ra.common.AdminObjectImpl;
import org.jboss.jca.common.metadata.ra.common.AuthenticationMechanismImpl;
import org.jboss.jca.common.metadata.ra.common.ConnectionDefinitionImpl;
@@ -55,7 +56,6 @@
import org.jboss.jca.common.metadata.ra.ra16.Activationspec16Impl;
import org.jboss.jca.common.metadata.ra.ra16.ConfigProperty16Impl;
import org.jboss.jca.common.metadata.ra.ra16.Connector16Impl;
-import org.jboss.jca.common.validator.ValidateException;
import java.lang.reflect.Array;
import java.lang.reflect.Field;
@@ -89,7 +89,7 @@
private static boolean trace = log.isTraceEnabled();
- private enum metadatas
+ private enum Metadatas
{
RA, ACTIVATION_SPEC, MANAGED_CONN_FACTORY;
};
@@ -170,11 +170,11 @@
*/
// @ConfigProperty handle at last
- Map<metadatas, ArrayList<ConfigProperty16>> configPropertiesMap = processConfigProperty(annotationRepository);
+ Map<Metadatas, ArrayList<ConfigProperty16>> configPropertiesMap = processConfigProperty(annotationRepository);
// @ConnectionDefinitions
ArrayList<ConnectionDefinition> connectionDefinitions = processConnectionDefinitions(annotationRepository,
- configPropertiesMap == null ? null : configPropertiesMap.get(metadatas.MANAGED_CONN_FACTORY));
+ configPropertiesMap == null ? null : configPropertiesMap.get(Metadatas.MANAGED_CONN_FACTORY));
// @ConnectionDefinition (outside of @ConnectionDefinitions)
if (connectionDefinitions == null)
@@ -182,7 +182,7 @@
connectionDefinitions = new ArrayList<ConnectionDefinition>(1);
}
ArrayList<ConnectionDefinition> definitions = processConnectionDefinition(annotationRepository,
- configPropertiesMap == null ? null : configPropertiesMap.get(metadatas.MANAGED_CONN_FACTORY));
+ configPropertiesMap == null ? null : configPropertiesMap.get(Metadatas.MANAGED_CONN_FACTORY));
if (definitions != null)
connectionDefinitions.addAll(definitions);
@@ -190,7 +190,7 @@
// @Activation
InboundResourceAdapter inboundRA = processActivation(annotationRepository,
- configPropertiesMap == null ? null : configPropertiesMap.get(metadatas.ACTIVATION_SPEC));
+ configPropertiesMap == null ? null : configPropertiesMap.get(Metadatas.ACTIVATION_SPEC));
// @AuthenticationMechanism
//md = processAuthenticationMechanism(md, annotationRepository);
@@ -202,7 +202,7 @@
// @Connector
Connector conn = processConnector(annotationRepository, xmlResourceAdapterClass,
- connectionDefinitions, configPropertiesMap == null ? null : configPropertiesMap.get(metadatas.RA),
+ connectionDefinitions, configPropertiesMap == null ? null : configPropertiesMap.get(Metadatas.RA),
inboundRA, adminObjs);
return conn;
@@ -587,10 +587,9 @@
XsdString managedconnectionfactoryClass = new XsdString(mcf, null);
XsdString connectionImplClass = new XsdString(cd.connectionImpl().getName(), null);
XsdString connectionfactoryImplClass = new XsdString(cd.connectionFactoryImpl().getName(), null);
- String id = null;
XsdString connectionInterface = new XsdString(cd.connection().getName(), null);
return new ConnectionDefinitionImpl(managedconnectionfactoryClass, configProperties, connectionfactoryInterface,
- connectionfactoryImplClass, connectionInterface, connectionImplClass, id);
+ connectionfactoryImplClass, connectionInterface, connectionImplClass, null);
}
/**
@@ -600,14 +599,14 @@
* @return The updated metadata
* @exception Exception Thrown if an error occurs
*/
- private Map<metadatas, ArrayList<ConfigProperty16>> processConfigProperty(AnnotationRepository annotationRepository)
+ private Map<Metadatas, ArrayList<ConfigProperty16>> processConfigProperty(AnnotationRepository annotationRepository)
throws Exception
{
- Map<metadatas, ArrayList<ConfigProperty16>> valueMap = null;
+ Map<Metadatas, ArrayList<ConfigProperty16>> valueMap = null;
Collection<Annotation> values = annotationRepository.getAnnotation(javax.resource.spi.ConfigProperty.class);
if (values != null)
{
- valueMap = new HashMap<Annotations.metadatas, ArrayList<ConfigProperty16>>();
+ valueMap = new HashMap<Annotations.Metadatas, ArrayList<ConfigProperty16>>();
for (Annotation annotation : values)
{
javax.resource.spi.ConfigProperty configPropertyAnnotation = (javax.resource.spi.ConfigProperty) annotation
@@ -620,7 +619,7 @@
XsdString configPropertyName = new XsdString(getConfigPropertyName(annotation), null);
if (configPropertyAnnotation.defaultValue() != null && !configPropertyAnnotation.defaultValue().equals(""))
configPropertyValue = new XsdString(configPropertyAnnotation.defaultValue(), null);
- XsdString configPropertyType = XsdString.NULL_XSDSTRING;
+ XsdString configPropertyType;
if (!Object.class.equals(configPropertyAnnotation.type()))
{
configPropertyType = new XsdString(configPropertyAnnotation.type().getName(), null);
@@ -632,7 +631,6 @@
Boolean configPropertySupportsDynamicUpdates = false;
Boolean configPropertyConfidential = false;
- String id = null;
// Description
ArrayList<LocalizedXsdString> descriptions = null;
if (configPropertyAnnotation.description() != null && configPropertyAnnotation.description().length != 0)
@@ -655,43 +653,43 @@
ConfigProperty16 cfgMeta = new ConfigProperty16Impl(descriptions, configPropertyName,
configPropertyType,
configPropertyValue, configPropertyIgnore, configPropertySupportsDynamicUpdates,
- configPropertyConfidential, id);
- if (valueMap.get(metadatas.RA) == null)
+ configPropertyConfidential, null);
+ if (valueMap.get(Metadatas.RA) == null)
{
- valueMap.put(metadatas.RA, new ArrayList<ConfigProperty16>());
+ valueMap.put(Metadatas.RA, new ArrayList<ConfigProperty16>());
}
- valueMap.get(metadatas.RA).add(cfgMeta);
+ valueMap.get(Metadatas.RA).add(cfgMeta);
}
else
{
ConfigProperty16 cfgMeta = new ConfigProperty16Impl(descriptions, configPropertyName,
configPropertyType,
configPropertyValue, configPropertyIgnore, configPropertySupportsDynamicUpdates,
- configPropertyConfidential, id, attachedClassName);
+ configPropertyConfidential, null, attachedClassName);
if (hasInterface(attachedClass, "javax.resource.spi.ManagedConnectionFactory"))
{
- if (valueMap.get(metadatas.MANAGED_CONN_FACTORY) == null)
+ if (valueMap.get(Metadatas.MANAGED_CONN_FACTORY) == null)
{
- valueMap.put(metadatas.MANAGED_CONN_FACTORY, new ArrayList<ConfigProperty16>());
+ valueMap.put(Metadatas.MANAGED_CONN_FACTORY, new ArrayList<ConfigProperty16>());
}
- valueMap.get(metadatas.MANAGED_CONN_FACTORY).add(cfgMeta);
+ valueMap.get(Metadatas.MANAGED_CONN_FACTORY).add(cfgMeta);
}
else if (hasInterface(attachedClass, "javax.resource.spi.ActivationSpec"))
{
- if (valueMap.get(metadatas.ACTIVATION_SPEC) == null)
+ if (valueMap.get(Metadatas.ACTIVATION_SPEC) == null)
{
- valueMap.put(metadatas.ACTIVATION_SPEC, new ArrayList<ConfigProperty16>());
+ valueMap.put(Metadatas.ACTIVATION_SPEC, new ArrayList<ConfigProperty16>());
}
- valueMap.get(metadatas.ACTIVATION_SPEC).add(cfgMeta);
+ valueMap.get(Metadatas.ACTIVATION_SPEC).add(cfgMeta);
}
}
}
- if (valueMap.get(metadatas.RA) != null)
- valueMap.get(metadatas.RA).trimToSize();
- if (valueMap.get(metadatas.MANAGED_CONN_FACTORY) != null)
- valueMap.get(metadatas.MANAGED_CONN_FACTORY).trimToSize();
- if (valueMap.get(metadatas.ACTIVATION_SPEC) != null)
- valueMap.get(metadatas.ACTIVATION_SPEC).trimToSize();
+ if (valueMap.get(Metadatas.RA) != null)
+ valueMap.get(Metadatas.RA).trimToSize();
+ if (valueMap.get(Metadatas.MANAGED_CONN_FACTORY) != null)
+ valueMap.get(Metadatas.MANAGED_CONN_FACTORY).trimToSize();
+ if (valueMap.get(Metadatas.ACTIVATION_SPEC) != null)
+ valueMap.get(Metadatas.ACTIVATION_SPEC).trimToSize();
return valueMap;
}
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/annotations/SecurityActions.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/annotations/SecurityActions.java 2010-08-04 15:08:25 UTC (rev 107388)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/annotations/SecurityActions.java 2010-08-04 15:32:43 UTC (rev 107389)
@@ -48,6 +48,7 @@
{
return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>()
{
+ @Override
public ClassLoader run()
{
return Thread.currentThread().getContextClassLoader();
@@ -63,6 +64,7 @@
{
AccessController.doPrivileged(new PrivilegedAction<Object>()
{
+ @Override
public Object run()
{
Thread.currentThread().setContextClassLoader(cl);
@@ -80,6 +82,7 @@
{
return AccessController.doPrivileged(new PrivilegedAction<String>()
{
+ @Override
public String run()
{
return System.getProperty(name);
@@ -97,6 +100,7 @@
{
return AccessController.doPrivileged(new PrivilegedAction<URLClassLoader>()
{
+ @Override
public URLClassLoader run()
{
return new URLClassLoader(urls, parent);
Copied: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/JCAMetadata.java (from rev 107383, projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/JCAMetadata.java)
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/JCAMetadata.java (rev 0)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/JCAMetadata.java 2010-08-04 15:32:43 UTC (rev 107389)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.jca.common.api.metadata;
+
+import java.io.Serializable;
+
+/**
+ *
+ * A generic JCAMetadata.
+ *
+ * @author <a href="stefano.maestri at jboss.com">Stefano Maestri</a>
+ *
+ */
+public interface JCAMetadata extends Serializable
+{
+
+}
Copied: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/MergeUtil.java (from rev 107383, projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/MergeUtil.java)
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/MergeUtil.java (rev 0)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/MergeUtil.java 2010-08-04 15:32:43 UTC (rev 107389)
@@ -0,0 +1,111 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.jca.common.api.metadata;
+
+import org.jboss.jca.common.api.metadata.ra.ConfigProperty;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+/**
+ *
+ * A static class with Merge Utilities methods.
+ *
+ * @author <a href="stefano.maestri at jboss.com">Stefano Maestri</a>
+ *
+ */
+public class MergeUtil
+{
+ /**
+ *
+ * Merge to List. The results is the union of the two arrays. Element present in left and right List
+ * (letft.equals(right) = true) are present only one and left ones are selected
+ *
+ * @param <T> the type of List elements
+ * @param left left side List to merge
+ * @param right right side List to merge
+ * @return merged List
+ */
+ public static <T> List<T> mergeList(List<T> left, List<T> right)
+ {
+ Set<T> newSet = new HashSet<T>((left == null ? 0 : left.size())
+ + (right == null ? 0 : right.size()));
+ if (left != null)
+ newSet.addAll(left);
+ if (right != null)
+ newSet.addAll(right);
+ List<T> newList = new ArrayList<T>(newSet.size());
+ newList.addAll(newSet);
+ return newList;
+ }
+
+ /**
+ *
+ * F Merge to List of ConfigProperty. The results is the union of the two arrays.
+ * Element present in left and right List
+ * (letft.equals(right) = true) are present only one and left ones are selected
+ *
+ *
+ * @param left left side List to merge
+ * @param right right side List to merge
+ * @return merged List
+ */
+ public static List<? extends ConfigProperty> mergeConfigList(
+ List<? extends ConfigProperty> left, List<? extends ConfigProperty> right)
+ {
+ ArrayList<ConfigProperty> newList = new ArrayList<ConfigProperty>((left == null ? 0 : left.size())
+ + (right == null ? 0 : right.size()));
+ if (left == null)
+ {
+ if (right != null)
+ newList.addAll(right);
+ }
+ else
+ {
+ List<String> leftNames = new ArrayList<String>(left.size());
+
+ for (ConfigProperty l : left)
+ {
+ newList.add(l);
+ leftNames.add(l.getConfigPropertyName().getValue());
+ }
+ if (right != null)
+ {
+ for (ConfigProperty r : right)
+ {
+ boolean toAdd = true;
+ for (String name : leftNames)
+ {
+ if (name.equals(r.getConfigPropertyName().getValue()))
+ toAdd = false;
+ }
+ if (toAdd)
+ newList.add(r);
+ }
+ }
+ }
+ newList.trimToSize();
+ return newList;
+ }
+}
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/jbossra/JbossRa.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/jbossra/JbossRa.java 2010-08-04 15:08:25 UTC (rev 107388)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/jbossra/JbossRa.java 2010-08-04 15:32:43 UTC (rev 107389)
@@ -21,9 +21,9 @@
*/
package org.jboss.jca.common.api.metadata.jbossra;
+import org.jboss.jca.common.api.metadata.JCAMetadata;
import org.jboss.jca.common.api.metadata.ra.MergeableMetadata;
import org.jboss.jca.common.api.metadata.ra.RaConfigProperty;
-import org.jboss.jca.common.metadata.JCAMetadata;
import java.util.List;
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ra/IdDecoratedMetadata.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ra/IdDecoratedMetadata.java 2010-08-04 15:08:25 UTC (rev 107388)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ra/IdDecoratedMetadata.java 2010-08-04 15:32:43 UTC (rev 107389)
@@ -21,7 +21,7 @@
*/
package org.jboss.jca.common.api.metadata.ra;
-import org.jboss.jca.common.metadata.JCAMetadata;
+import org.jboss.jca.common.api.metadata.JCAMetadata;
/**
* @author <a href="mailto:stefano.maestri at jboss.org">Stefano Maestri</a>
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ra/LicenseType.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ra/LicenseType.java 2010-08-04 15:08:25 UTC (rev 107388)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ra/LicenseType.java 2010-08-04 15:32:43 UTC (rev 107389)
@@ -23,8 +23,9 @@
-import org.jboss.jca.common.metadata.MergeUtil;
+import org.jboss.jca.common.api.metadata.MergeUtil;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
@@ -41,7 +42,7 @@
*/
private static final long serialVersionUID = 1590514246054447090L;
- private final List<LocalizedXsdString> description;
+ private final ArrayList<LocalizedXsdString> description;
private final boolean licenseRequired;
@@ -55,7 +56,15 @@
public LicenseType(List<LocalizedXsdString> description, boolean licenseRequired, String id)
{
super();
- this.description = description;
+ if (description != null)
+ {
+ this.description = new ArrayList<LocalizedXsdString>(description.size());
+ this.description.addAll(description);
+ }
+ else
+ {
+ this.description = new ArrayList<LocalizedXsdString>(0);
+ }
this.licenseRequired = licenseRequired;
this.id = id;
}
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ra/LocalizedMetadata.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ra/LocalizedMetadata.java 2010-08-04 15:08:25 UTC (rev 107388)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ra/LocalizedMetadata.java 2010-08-04 15:32:43 UTC (rev 107389)
@@ -21,7 +21,7 @@
*/
package org.jboss.jca.common.api.metadata.ra;
-import org.jboss.jca.common.metadata.JCAMetadata;
+import org.jboss.jca.common.api.metadata.JCAMetadata;
/**
* @author <a href="mailto:stefano.maestri at jboss.org">Stefano Maestri</a>
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ra/Path.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ra/Path.java 2010-08-04 15:08:25 UTC (rev 107388)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ra/Path.java 2010-08-04 15:32:43 UTC (rev 107389)
@@ -21,7 +21,7 @@
*/
package org.jboss.jca.common.api.metadata.ra;
-import org.jboss.jca.common.metadata.JCAMetadata;
+import org.jboss.jca.common.api.metadata.JCAMetadata;
import java.security.InvalidParameterException;
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ra/ResourceAdapter1516.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ra/ResourceAdapter1516.java 2010-08-04 15:08:25 UTC (rev 107388)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ra/ResourceAdapter1516.java 2010-08-04 15:32:43 UTC (rev 107389)
@@ -21,7 +21,7 @@
*/
package org.jboss.jca.common.api.metadata.ra;
-import org.jboss.jca.common.validator.ValidateException;
+import org.jboss.jca.common.api.validator.ValidateException;
import java.util.HashMap;
import java.util.List;
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ra/ValidatableMetadata.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ra/ValidatableMetadata.java 2010-08-04 15:08:25 UTC (rev 107388)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ra/ValidatableMetadata.java 2010-08-04 15:32:43 UTC (rev 107389)
@@ -21,7 +21,7 @@
*/
package org.jboss.jca.common.api.metadata.ra;
-import org.jboss.jca.common.validator.ValidateException;
+import org.jboss.jca.common.api.validator.ValidateException;
/**
*
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ra/ra10/ResourceAdapter10.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ra/ra10/ResourceAdapter10.java 2010-08-04 15:08:25 UTC (rev 107388)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ra/ra10/ResourceAdapter10.java 2010-08-04 15:32:43 UTC (rev 107389)
@@ -27,7 +27,7 @@
import org.jboss.jca.common.api.metadata.ra.SecurityPermission;
import org.jboss.jca.common.api.metadata.ra.TransactionSupportEnum;
import org.jboss.jca.common.api.metadata.ra.XsdString;
-import org.jboss.jca.common.validator.ValidateException;
+import org.jboss.jca.common.api.validator.ValidateException;
import java.util.HashMap;
import java.util.List;
Copied: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/validator/ValidateException.java (from rev 107383, projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/validator/ValidateException.java)
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/validator/ValidateException.java (rev 0)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/validator/ValidateException.java 2010-08-04 15:32:43 UTC (rev 107389)
@@ -0,0 +1,52 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008-2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.jca.common.api.validator;
+
+/**
+ * The validate exception
+ * @author <a href="mailto:jesper.pedersen at jboss.org">Jesper Pedersen</a>
+ */
+public class ValidateException extends Exception
+{
+ /** Serial version UID */
+ static final long serialVersionUID = 3820032266224196804L;
+
+ /**
+ * Constructs a new exception with the specified detail message.
+ * @param message The message
+ */
+ public ValidateException(String message)
+ {
+ super(message);
+ }
+
+ /**
+ * Constructs a new exception with the specified detail message and cause.
+ * @param message The message
+ * @param cause The cause
+ */
+ public ValidateException(String message, Throwable cause)
+ {
+ super(message, cause);
+ }
+}
Copied: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/validator/package.html (from rev 107383, projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/validator/package.html)
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/validator/package.html (rev 0)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/validator/package.html 2010-08-04 15:32:43 UTC (rev 107389)
@@ -0,0 +1,3 @@
+<body>
+This package contains classes that handles common validator operations.
+</body>
Deleted: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/JCAMetadata.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/JCAMetadata.java 2010-08-04 15:08:25 UTC (rev 107388)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/JCAMetadata.java 2010-08-04 15:32:43 UTC (rev 107389)
@@ -1,36 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.jca.common.metadata;
-
-import java.io.Serializable;
-
-/**
- *
- * A generic JCAMetadata.
- *
- * @author <a href="stefano.maestri at jboss.com">Stefano Maestri</a>
- *
- */
-public interface JCAMetadata extends Serializable
-{
-
-}
Deleted: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/MergeUtil.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/MergeUtil.java 2010-08-04 15:08:25 UTC (rev 107388)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/MergeUtil.java 2010-08-04 15:32:43 UTC (rev 107389)
@@ -1,111 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.jca.common.metadata;
-
-import org.jboss.jca.common.api.metadata.ra.ConfigProperty;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-/**
- *
- * A static class with Merge Utilities methods.
- *
- * @author <a href="stefano.maestri at jboss.com">Stefano Maestri</a>
- *
- */
-public class MergeUtil
-{
- /**
- *
- * Merge to List. The results is the union of the two arrays. Element present in left and right List
- * (letft.equals(right) = true) are present only one and left ones are selected
- *
- * @param <T> the type of List elements
- * @param left left side List to merge
- * @param right right side List to merge
- * @return merged List
- */
- public static <T> List<T> mergeList(List<T> left, List<T> right)
- {
- Set<T> newSet = new HashSet<T>((left == null ? 0 : left.size())
- + (right == null ? 0 : right.size()));
- if (left != null)
- newSet.addAll(left);
- if (right != null)
- newSet.addAll(right);
- List<T> newList = new ArrayList<T>(newSet.size());
- newList.addAll(newSet);
- return newList;
- }
-
- /**
- *
- * F Merge to List of ConfigProperty. The results is the union of the two arrays.
- * Element present in left and right List
- * (letft.equals(right) = true) are present only one and left ones are selected
- *
- *
- * @param left left side List to merge
- * @param right right side List to merge
- * @return merged List
- */
- public static List<? extends ConfigProperty> mergeConfigList(
- List<? extends ConfigProperty> left, List<? extends ConfigProperty> right)
- {
- ArrayList<ConfigProperty> newList = new ArrayList<ConfigProperty>((left == null ? 0 : left.size())
- + (right == null ? 0 : right.size()));
- if (left == null)
- {
- if (right != null)
- newList.addAll(right);
- }
- else
- {
- List<String> leftNames = new ArrayList<String>(left.size());
-
- for (ConfigProperty l : left)
- {
- newList.add(l);
- leftNames.add(l.getConfigPropertyName().getValue());
- }
- if (right != null)
- {
- for (ConfigProperty r : right)
- {
- boolean toAdd = true;
- for (String name : leftNames)
- {
- if (name.equals(r.getConfigPropertyName().getValue()))
- toAdd = false;
- }
- if (toAdd)
- newList.add(r);
- }
- }
- }
- newList.trimToSize();
- return newList;
- }
-}
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/MetadataParser.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/MetadataParser.java 2010-08-04 15:08:25 UTC (rev 107388)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/MetadataParser.java 2010-08-04 15:32:43 UTC (rev 107389)
@@ -21,6 +21,8 @@
*/
package org.jboss.jca.common.metadata;
+import org.jboss.jca.common.api.metadata.JCAMetadata;
+
import java.io.InputStream;
/**
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/jbossra/JbossRaAbstractImpl.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/jbossra/JbossRaAbstractImpl.java 2010-08-04 15:08:25 UTC (rev 107388)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/jbossra/JbossRaAbstractImpl.java 2010-08-04 15:32:43 UTC (rev 107389)
@@ -25,7 +25,7 @@
import org.jboss.jca.common.api.metadata.jbossra.JbossRa;
import org.jboss.jca.common.api.metadata.ra.RaConfigProperty;
-import java.util.List;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -42,7 +42,7 @@
/** The serialVersionUID */
private static final long serialVersionUID = 1L;
- private final List<RaConfigProperty<?>> raConfigProperties;
+ private final ArrayList<RaConfigProperty<?>> raConfigProperties;
/**
*
@@ -52,7 +52,15 @@
*/
protected JbossRaAbstractImpl(List<RaConfigProperty<?>> raConfigProperties)
{
- this.raConfigProperties = raConfigProperties;
+ if (raConfigProperties != null)
+ {
+ this.raConfigProperties = new ArrayList<RaConfigProperty<?>>(raConfigProperties.size());
+ this.raConfigProperties.addAll(raConfigProperties);
+ }
+ else
+ {
+ this.raConfigProperties = new ArrayList<RaConfigProperty<?>>(0);
+ }
}
/**
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/jbossra/jbossra20/BeanValidationGroupImpl.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/jbossra/jbossra20/BeanValidationGroupImpl.java 2010-08-04 15:08:25 UTC (rev 107388)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/jbossra/jbossra20/BeanValidationGroupImpl.java 2010-08-04 15:32:43 UTC (rev 107389)
@@ -21,10 +21,10 @@
*/
package org.jboss.jca.common.metadata.jbossra.jbossra20;
+import org.jboss.jca.common.api.metadata.JCAMetadata;
import org.jboss.jca.common.api.metadata.jbossra.jbossra20.BeanValidationGroup;
-import org.jboss.jca.common.metadata.JCAMetadata;
-import java.util.List;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -39,7 +39,7 @@
*/
private static final long serialVersionUID = 6856138720550993874L;
- private final List<String> beanValidationGroup;
+ private final ArrayList<String> beanValidationGroup;
/**
* @param beanValidationGroup List of bean validation group
@@ -47,7 +47,13 @@
public BeanValidationGroupImpl(List<String> beanValidationGroup)
{
super();
- this.beanValidationGroup = beanValidationGroup;
+ if (beanValidationGroup != null) { this.beanValidationGroup = new ArrayList<String>(beanValidationGroup.size());
+ this.beanValidationGroup.addAll(beanValidationGroup);
+ }
+ else
+ {
+ this.beanValidationGroup = new ArrayList<String>(0);
+ }
}
/**
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/jbossra/jbossra20/JbossRa20Impl.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/jbossra/jbossra20/JbossRa20Impl.java 2010-08-04 15:08:25 UTC (rev 107388)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/jbossra/jbossra20/JbossRa20Impl.java 2010-08-04 15:32:43 UTC (rev 107389)
@@ -28,7 +28,7 @@
import org.jboss.jca.common.api.metadata.ra.RaConfigProperty;
import org.jboss.jca.common.metadata.jbossra.JbossRaAbstractImpl;
-import java.util.List;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -42,7 +42,7 @@
private final String bootstrapContext;
- private final List<BeanValidationGroup> beanValidationGroups;
+ private final ArrayList<BeanValidationGroup> beanValidationGroups;
/**
* @param raConfigProperties List of properties for configuration
@@ -54,7 +54,15 @@
{
super(raConfigProperties);
this.bootstrapContext = bootstrapContext;
- this.beanValidationGroups = beanValidationGroups;
+ if (beanValidationGroups != null)
+ {
+ this.beanValidationGroups = new ArrayList<BeanValidationGroup>(beanValidationGroups.size());
+ this.beanValidationGroups.addAll(beanValidationGroups);
+ }
+ else
+ {
+ this.beanValidationGroups = new ArrayList<BeanValidationGroup>(0);
+ }
}
/**
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/AdminObjectImpl.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/AdminObjectImpl.java 2010-08-04 15:08:25 UTC (rev 107388)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/AdminObjectImpl.java 2010-08-04 15:32:43 UTC (rev 107389)
@@ -26,7 +26,7 @@
import org.jboss.jca.common.api.metadata.ra.ConfigProperty;
import org.jboss.jca.common.api.metadata.ra.XsdString;
-import java.util.List;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -44,7 +44,7 @@
private final XsdString adminobjectClass;
- private final List<? extends ConfigProperty> configProperty;
+ private final ArrayList<ConfigProperty> configProperty;
private final String id;
@@ -60,7 +60,15 @@
super();
this.adminobjectInterface = adminobjectInterface;
this.adminobjectClass = adminobjectClass;
- this.configProperty = configProperty;
+ if (configProperty != null)
+ {
+ this.configProperty = new ArrayList<ConfigProperty>(configProperty.size());
+ this.configProperty.addAll(configProperty);
+ }
+ else
+ {
+ this.configProperty = new ArrayList<ConfigProperty>(0);
+ }
this.id = id;
}
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/AuthenticationMechanismImpl.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/AuthenticationMechanismImpl.java 2010-08-04 15:08:25 UTC (rev 107388)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/AuthenticationMechanismImpl.java 2010-08-04 15:32:43 UTC (rev 107389)
@@ -26,7 +26,7 @@
import org.jboss.jca.common.api.metadata.ra.LocalizedXsdString;
import org.jboss.jca.common.api.metadata.ra.XsdString;
-import java.util.List;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -40,7 +40,7 @@
*/
private static final long serialVersionUID = -1448136517857827148L;
- private final List<LocalizedXsdString> description;
+ private final ArrayList<LocalizedXsdString> description;
private final XsdString authenticationMechanismType;
@@ -68,7 +68,15 @@
CredentialInterfaceEnum credentialInterface, String id)
{
super();
- this.description = description;
+ if (description != null)
+ {
+ this.description = new ArrayList<LocalizedXsdString>(description.size());
+ this.description.addAll(description);
+ }
+ else
+ {
+ this.description = new ArrayList<LocalizedXsdString>(0);
+ }
this.authenticationMechanismType = authenticationMechanismType;
this.credentialInterface = credentialInterface;
this.id = id;
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/ConfigPropertyImpl.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/ConfigPropertyImpl.java 2010-08-04 15:08:25 UTC (rev 107388)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/ConfigPropertyImpl.java 2010-08-04 15:32:43 UTC (rev 107389)
@@ -27,7 +27,7 @@
import org.jboss.jca.common.api.metadata.ra.LocalizedXsdString;
import org.jboss.jca.common.api.metadata.ra.XsdString;
-import java.util.List;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -47,7 +47,7 @@
/**
* description
*/
- protected final List<LocalizedXsdString> description;
+ protected final ArrayList<LocalizedXsdString> description;
/**
* configPropertyName
@@ -82,7 +82,15 @@
XsdString configPropertyType, XsdString configPropertyValue, String id)
{
super();
- this.description = description;
+ if (description != null)
+ {
+ this.description = new ArrayList<LocalizedXsdString>(description.size());
+ this.description.addAll(description);
+ }
+ else
+ {
+ this.description = new ArrayList<LocalizedXsdString>(0);
+ }
this.configPropertyName = configPropertyName;
this.configPropertyType = configPropertyType;
this.configPropertyValue = configPropertyValue;
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/ConnectionDefinitionImpl.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/ConnectionDefinitionImpl.java 2010-08-04 15:08:25 UTC (rev 107388)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/ConnectionDefinitionImpl.java 2010-08-04 15:32:43 UTC (rev 107389)
@@ -22,12 +22,13 @@
package org.jboss.jca.common.metadata.ra.common;
+import org.jboss.jca.common.api.metadata.MergeUtil;
import org.jboss.jca.common.api.metadata.ra.ConfigProperty;
import org.jboss.jca.common.api.metadata.ra.ConnectionDefinition;
import org.jboss.jca.common.api.metadata.ra.MergeableMetadata;
import org.jboss.jca.common.api.metadata.ra.XsdString;
-import org.jboss.jca.common.metadata.MergeUtil;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -43,7 +44,7 @@
private final XsdString managedconnectionfactoryClass;
- private final List<? extends ConfigProperty> configProperty;
+ private final ArrayList<ConfigProperty> configProperty;
private final XsdString connectionfactoryInterface;
@@ -71,7 +72,16 @@
{
super();
this.managedconnectionfactoryClass = managedconnectionfactoryClass;
- this.configProperty = configProperty;
+
+ if (configProperty != null)
+ {
+ this.configProperty = new ArrayList<ConfigProperty>(configProperty.size());
+ this.configProperty.addAll(configProperty);
+ }
+ else
+ {
+ this.configProperty = new ArrayList<ConfigProperty>(0);
+ }
this.connectionfactoryInterface = connectionfactoryInterface;
this.connectionfactoryImplClass = connectionfactoryImplClass;
this.connectionInterface = connectionInterface;
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/ConnectorAbstractmpl.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/ConnectorAbstractmpl.java 2010-08-04 15:08:25 UTC (rev 107388)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/ConnectorAbstractmpl.java 2010-08-04 15:32:43 UTC (rev 107389)
@@ -34,7 +34,7 @@
import org.jboss.jca.common.api.metadata.ra.ra10.Connector10;
import org.jboss.jca.common.api.metadata.ra.ra16.Activationspec16;
import org.jboss.jca.common.api.metadata.ra.ra16.Connector16;
-import org.jboss.jca.common.validator.ValidateException;
+import org.jboss.jca.common.api.validator.ValidateException;
import java.util.ArrayList;
import java.util.Iterator;
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/MessageAdapterImpl.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/MessageAdapterImpl.java 2010-08-04 15:08:25 UTC (rev 107388)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/MessageAdapterImpl.java 2010-08-04 15:32:43 UTC (rev 107389)
@@ -22,11 +22,12 @@
package org.jboss.jca.common.metadata.ra.common;
+import org.jboss.jca.common.api.metadata.MergeUtil;
import org.jboss.jca.common.api.metadata.ra.MergeableMetadata;
import org.jboss.jca.common.api.metadata.ra.MessageListener;
import org.jboss.jca.common.api.metadata.ra.Messageadapter;
-import org.jboss.jca.common.metadata.MergeUtil;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -40,7 +41,7 @@
*/
private static final long serialVersionUID = 1731250340667920811L;
- private final List<MessageListener> messagelisteners;
+ private final ArrayList<MessageListener> messagelisteners;
private final String id;
@@ -55,7 +56,15 @@
public MessageAdapterImpl(List<MessageListener> messagelisteners, String id)
{
super();
- this.messagelisteners = messagelisteners;
+ if (messagelisteners != null)
+ {
+ this.messagelisteners = new ArrayList<MessageListener>(messagelisteners.size());
+ this.messagelisteners.addAll(messagelisteners);
+ }
+ else
+ {
+ this.messagelisteners = new ArrayList<MessageListener>(0);
+ }
this.id = id;
}
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/OutboundResourceAdapterImpl.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/OutboundResourceAdapterImpl.java 2010-08-04 15:08:25 UTC (rev 107388)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/OutboundResourceAdapterImpl.java 2010-08-04 15:32:43 UTC (rev 107389)
@@ -21,12 +21,12 @@
*/
package org.jboss.jca.common.metadata.ra.common;
+import org.jboss.jca.common.api.metadata.MergeUtil;
import org.jboss.jca.common.api.metadata.ra.AuthenticationMechanism;
import org.jboss.jca.common.api.metadata.ra.ConnectionDefinition;
import org.jboss.jca.common.api.metadata.ra.MergeableMetadata;
import org.jboss.jca.common.api.metadata.ra.OutboundResourceAdapter;
import org.jboss.jca.common.api.metadata.ra.TransactionSupportEnum;
-import org.jboss.jca.common.metadata.MergeUtil;
import java.util.ArrayList;
import java.util.Collections;
@@ -42,11 +42,11 @@
*/
private static final long serialVersionUID = 421345307326415666L;
- private final List<ConnectionDefinition> connectionDefinition;
+ private final ArrayList<ConnectionDefinition> connectionDefinition;
private final TransactionSupportEnum transactionSupport;
- private final List<AuthenticationMechanism> authenticationMechanism;
+ private final ArrayList<AuthenticationMechanism> authenticationMechanism;
private final boolean reauthenticationSupport;
@@ -64,9 +64,25 @@
boolean reauthenticationSupport, String id)
{
super();
- this.connectionDefinition = connectionDefinition;
+ if (connectionDefinition != null)
+ {
+ this.connectionDefinition = new ArrayList<ConnectionDefinition>(connectionDefinition.size());
+ this.connectionDefinition.addAll(connectionDefinition);
+ }
+ else
+ {
+ this.connectionDefinition = new ArrayList<ConnectionDefinition>(0);
+ }
this.transactionSupport = transactionSupport;
- this.authenticationMechanism = authenticationMechanism;
+ if (authenticationMechanism != null)
+ {
+ this.authenticationMechanism = new ArrayList<AuthenticationMechanism>(authenticationMechanism.size());
+ this.authenticationMechanism.addAll(authenticationMechanism);
+ }
+ else
+ {
+ this.authenticationMechanism = new ArrayList<AuthenticationMechanism>(0);
+ }
this.reauthenticationSupport = reauthenticationSupport;
this.id = id;
}
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/RaConfigPropertyImpl.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/RaConfigPropertyImpl.java 2010-08-04 15:08:25 UTC (rev 107388)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/RaConfigPropertyImpl.java 2010-08-04 15:32:43 UTC (rev 107389)
@@ -21,9 +21,9 @@
*/
package org.jboss.jca.common.metadata.ra.common;
+import org.jboss.jca.common.api.metadata.JCAMetadata;
import org.jboss.jca.common.api.metadata.ra.OverrideElementAttribute;
import org.jboss.jca.common.api.metadata.ra.RaConfigProperty;
-import org.jboss.jca.common.metadata.JCAMetadata;
/**
* @author <a href="mailto:stefano.maestri at jboss.org">Stefano Maestri</a>
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/ResourceAdapter1516Impl.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/ResourceAdapter1516Impl.java 2010-08-04 15:08:25 UTC (rev 107388)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/ResourceAdapter1516Impl.java 2010-08-04 15:32:43 UTC (rev 107389)
@@ -21,6 +21,7 @@
*/
package org.jboss.jca.common.metadata.ra.common;
+import org.jboss.jca.common.api.metadata.MergeUtil;
import org.jboss.jca.common.api.metadata.ra.AdminObject;
import org.jboss.jca.common.api.metadata.ra.ConfigProperty;
import org.jboss.jca.common.api.metadata.ra.InboundResourceAdapter;
@@ -28,9 +29,9 @@
import org.jboss.jca.common.api.metadata.ra.OutboundResourceAdapter;
import org.jboss.jca.common.api.metadata.ra.ResourceAdapter1516;
import org.jboss.jca.common.api.metadata.ra.SecurityPermission;
-import org.jboss.jca.common.metadata.MergeUtil;
-import org.jboss.jca.common.validator.ValidateException;
+import org.jboss.jca.common.api.validator.ValidateException;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -46,15 +47,15 @@
private final String resourceadapterClass;
- private final List<? extends ConfigProperty> configProperties;
+ private final ArrayList<ConfigProperty> configProperties;
private final OutboundResourceAdapter outboundResourceadapter;
private final InboundResourceAdapter inboundResourceadapter;
- private final List<AdminObject> adminobjects;
+ private final ArrayList<AdminObject> adminobjects;
- private final List<SecurityPermission> securityPermissions;
+ private final ArrayList<SecurityPermission> securityPermissions;
private final String id;
@@ -73,11 +74,35 @@
{
super();
this.resourceadapterClass = resourceadapterClass;
- this.configProperties = configProperties;
+ if (configProperties != null)
+ {
+ this.configProperties = new ArrayList<ConfigProperty>(configProperties.size());
+ this.configProperties.addAll(configProperties);
+ }
+ else
+ {
+ this.configProperties = new ArrayList<ConfigProperty>(0);
+ }
this.outboundResourceadapter = outboundResourceadapter;
this.inboundResourceadapter = inboundResourceadapter;
- this.adminobjects = adminobjects;
- this.securityPermissions = securityPermissions;
+ if (adminobjects != null)
+ {
+ this.adminobjects = new ArrayList<AdminObject>(adminobjects.size());
+ this.adminobjects.addAll(adminobjects);
+ }
+ else
+ {
+ this.adminobjects = new ArrayList<AdminObject>(0);
+ }
+ if (securityPermissions != null)
+ {
+ this.securityPermissions = new ArrayList<SecurityPermission>(securityPermissions.size());
+ this.securityPermissions.addAll(securityPermissions);
+ }
+ else
+ {
+ this.securityPermissions = new ArrayList<SecurityPermission>(0);
+ }
this.id = id;
}
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/SecurityPermissionImpl.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/SecurityPermissionImpl.java 2010-08-04 15:08:25 UTC (rev 107388)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/SecurityPermissionImpl.java 2010-08-04 15:32:43 UTC (rev 107389)
@@ -25,7 +25,7 @@
import org.jboss.jca.common.api.metadata.ra.SecurityPermission;
import org.jboss.jca.common.api.metadata.ra.XsdString;
-import java.util.List;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -39,7 +39,7 @@
*/
private static final long serialVersionUID = -7931009018498254330L;
- private final List<LocalizedXsdString> description;
+ private final ArrayList<LocalizedXsdString> description;
private final XsdString securityPermissionSpec;
@@ -53,7 +53,15 @@
public SecurityPermissionImpl(List<LocalizedXsdString> description, XsdString securityPermissionSpec, String id)
{
super();
- this.description = description;
+ if (description != null)
+ {
+ this.description = new ArrayList<LocalizedXsdString>(description.size());
+ this.description.addAll(description);
+ }
+ else
+ {
+ this.description = new ArrayList<LocalizedXsdString>(0);
+ }
this.securityPermissionSpec = securityPermissionSpec;
this.id = id;
}
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra10/Connector10Impl.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra10/Connector10Impl.java 2010-08-04 15:08:25 UTC (rev 107388)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra10/Connector10Impl.java 2010-08-04 15:32:43 UTC (rev 107389)
@@ -29,7 +29,7 @@
import org.jboss.jca.common.api.metadata.ra.ra10.Connector10;
import org.jboss.jca.common.metadata.ra.common.ConnectorAbstractmpl;
-import java.util.List;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -46,11 +46,11 @@
private final String moduleName;
- private final List<LocalizedXsdString> description;
+ private final ArrayList<LocalizedXsdString> description;
private final XsdString displayName;
- private final List<Icon> icon;
+ private final ArrayList<Icon> icon;
/**
* @param moduleName name of the module
@@ -70,9 +70,26 @@
{
super(vendorName, eisType, license, resourceadapter, id);
this.moduleName = moduleName;
- this.description = description;
+ if (description != null)
+ {
+ this.description = new ArrayList<LocalizedXsdString>(description.size());
+ this.description.addAll(description);
+ }
+ else
+ {
+ this.description = new ArrayList<LocalizedXsdString>(0);
+ }
this.displayName = displayName;
- this.icon = icon;
+ if (icon != null)
+ {
+ this.icon = new ArrayList<Icon>(icon.size());
+ this.icon.addAll(icon);
+ }
+ else
+ {
+ this.icon = new ArrayList<Icon>(0);
+ }
+
}
/**
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra10/ResourceAdapter10Impl.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra10/ResourceAdapter10Impl.java 2010-08-04 15:08:25 UTC (rev 107388)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra10/ResourceAdapter10Impl.java 2010-08-04 15:32:43 UTC (rev 107389)
@@ -27,9 +27,9 @@
import org.jboss.jca.common.api.metadata.ra.TransactionSupportEnum;
import org.jboss.jca.common.api.metadata.ra.XsdString;
import org.jboss.jca.common.api.metadata.ra.ra10.ResourceAdapter10;
-import org.jboss.jca.common.validator.ValidateException;
+import org.jboss.jca.common.api.validator.ValidateException;
-import java.util.List;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -55,13 +55,13 @@
private final TransactionSupportEnum transactionSupport;
- private final List<AuthenticationMechanism> authenticationMechanism;
+ private final ArrayList<AuthenticationMechanism> authenticationMechanism;
- private final List<ConfigProperty> configProperty;
+ private final ArrayList<ConfigProperty> configProperties;
private final Boolean reauthenticationSupport;
- private final List<SecurityPermission> securityPermission;
+ private final ArrayList<SecurityPermission> securityPermissions;
private final String id;
@@ -76,16 +76,16 @@
* @param connectionImplClass class name
* @param transactionSupport how transactions are supported
* @param authenticationMechanism how authentication is performed
- * @param configProperty list of configs
+ * @param configProperties list of configs
* @param reauthenticationSupport true if reautentication is supported
- * @param securityPermission what security permissions are supported
+ * @param securityPermissions what security permissions are supported
* @param id the id attribute in xml file
*/
public ResourceAdapter10Impl(XsdString managedConnectionFactoryClass, XsdString connectionFactoryInterface,
XsdString connectionFactoryImplClass, XsdString connectionInterface, XsdString connectionImplClass,
TransactionSupportEnum transactionSupport, List<AuthenticationMechanism> authenticationMechanism,
- List<ConfigProperty> configProperty, Boolean reauthenticationSupport,
- List<SecurityPermission> securityPermission, String id)
+ List<ConfigProperty> configProperties, Boolean reauthenticationSupport,
+ List<SecurityPermission> securityPermissions, String id)
{
super();
this.managedConnectionFactoryClass = managedConnectionFactoryClass;
@@ -94,10 +94,34 @@
this.connectionInterface = connectionInterface;
this.connectionImplClass = connectionImplClass;
this.transactionSupport = transactionSupport;
- this.authenticationMechanism = authenticationMechanism;
- this.configProperty = configProperty;
+ if (authenticationMechanism != null)
+ {
+ this.authenticationMechanism = new ArrayList<AuthenticationMechanism>(authenticationMechanism.size());
+ this.authenticationMechanism.addAll(authenticationMechanism);
+ }
+ else
+ {
+ this.authenticationMechanism = new ArrayList<AuthenticationMechanism>(0);
+ }
+ if (configProperties != null)
+ {
+ this.configProperties = new ArrayList<ConfigProperty>(configProperties.size());
+ this.configProperties.addAll(configProperties);
+ }
+ else
+ {
+ this.configProperties = new ArrayList<ConfigProperty>(0);
+ }
this.reauthenticationSupport = reauthenticationSupport;
- this.securityPermission = securityPermission;
+ if (securityPermissions != null)
+ {
+ this.securityPermissions = new ArrayList<SecurityPermission>(securityPermissions.size());
+ this.securityPermissions.addAll(securityPermissions);
+ }
+ else
+ {
+ this.securityPermissions = new ArrayList<SecurityPermission>(0);
+ }
this.id = id;
}
@@ -186,7 +210,7 @@
@Override
public List<ConfigProperty> getConfigProperties()
{
- return configProperty;
+ return configProperties;
}
/**
@@ -208,7 +232,7 @@
@Override
public List<SecurityPermission> getSecurityPermissions()
{
- return securityPermission == null ? null : Collections.unmodifiableList(securityPermission);
+ return securityPermissions == null ? null : Collections.unmodifiableList(securityPermissions);
}
/**
@@ -228,7 +252,7 @@
final int prime = 31;
int result = 1;
result = prime * result + ((authenticationMechanism == null) ? 0 : authenticationMechanism.hashCode());
- result = prime * result + ((configProperty == null) ? 0 : configProperty.hashCode());
+ result = prime * result + ((configProperties == null) ? 0 : configProperties.hashCode());
result = prime * result + ((connectionFactoryImplClass == null) ? 0 : connectionFactoryImplClass.hashCode());
result = prime * result + ((connectionFactoryInterface == null) ? 0 : connectionFactoryInterface.hashCode());
result = prime * result + ((connectionImplClass == null) ? 0 : connectionImplClass.hashCode());
@@ -237,7 +261,7 @@
result = prime * result
+ ((managedConnectionFactoryClass == null) ? 0 : managedConnectionFactoryClass.hashCode());
result = prime * result + ((reauthenticationSupport == null) ? 0 : reauthenticationSupport.hashCode());
- result = prime * result + ((securityPermission == null) ? 0 : securityPermission.hashCode());
+ result = prime * result + ((securityPermissions == null) ? 0 : securityPermissions.hashCode());
result = prime * result + ((transactionSupport == null) ? 0 : transactionSupport.hashCode());
return result;
}
@@ -259,12 +283,12 @@
}
else if (!authenticationMechanism.equals(other.authenticationMechanism))
return false;
- if (configProperty == null)
+ if (configProperties == null)
{
- if (other.configProperty != null)
+ if (other.configProperties != null)
return false;
}
- else if (!configProperty.equals(other.configProperty))
+ else if (!configProperties.equals(other.configProperties))
return false;
if (connectionFactoryImplClass == null)
{
@@ -315,12 +339,12 @@
}
else if (!reauthenticationSupport.equals(other.reauthenticationSupport))
return false;
- if (securityPermission == null)
+ if (securityPermissions == null)
{
- if (other.securityPermission != null)
+ if (other.securityPermissions != null)
return false;
}
- else if (!securityPermission.equals(other.securityPermission))
+ else if (!securityPermissions.equals(other.securityPermissions))
return false;
if (transactionSupport != other.transactionSupport)
return false;
@@ -334,8 +358,8 @@
+ ", connectionFactoryInterface=" + connectionFactoryInterface + ", connectionFactoryImplClass="
+ connectionFactoryImplClass + ", connectionInterface=" + connectionInterface + ", connectionImplClass="
+ connectionImplClass + ", transactionSupport=" + transactionSupport + ", authenticationMechanism="
- + authenticationMechanism + ", configProperties=" + configProperty + ", reauthenticationSupport="
- + reauthenticationSupport + ", securityPermission=" + securityPermission + ", id=" + id + "]";
+ + authenticationMechanism + ", configProperties=" + configProperties + ", reauthenticationSupport="
+ + reauthenticationSupport + ", securityPermissions=" + securityPermissions + ", id=" + id + "]";
}
@Override
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra15/Activationspec15Impl.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra15/Activationspec15Impl.java 2010-08-04 15:08:25 UTC (rev 107388)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra15/Activationspec15Impl.java 2010-08-04 15:32:43 UTC (rev 107389)
@@ -26,7 +26,7 @@
import org.jboss.jca.common.api.metadata.ra.XsdString;
import org.jboss.jca.common.api.metadata.ra.ra15.Activationspec15;
-import java.util.List;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -51,7 +51,7 @@
/**
* list of required properties
*/
- protected final List<RequiredConfigProperty> requiredConfigProperty;
+ protected final ArrayList<RequiredConfigProperty> requiredConfigProperty;
/**
* id attribute in xml file
@@ -71,7 +71,15 @@
{
super();
this.activationspecClass = activationspecClass;
- this.requiredConfigProperty = requiredConfigProperty;
+ if (requiredConfigProperty != null)
+ {
+ this.requiredConfigProperty = new ArrayList<RequiredConfigProperty>(requiredConfigProperty.size());
+ this.requiredConfigProperty.addAll(requiredConfigProperty);
+ }
+ else
+ {
+ this.requiredConfigProperty = new ArrayList<RequiredConfigProperty>(0);
+ }
this.id = id;
}
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/Activationspec16Impl.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/Activationspec16Impl.java 2010-08-04 15:08:25 UTC (rev 107388)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/Activationspec16Impl.java 2010-08-04 15:32:43 UTC (rev 107389)
@@ -27,7 +27,7 @@
import org.jboss.jca.common.api.metadata.ra.ra16.Activationspec16;
import org.jboss.jca.common.metadata.ra.ra15.Activationspec15Impl;
-import java.util.List;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -41,19 +41,27 @@
*/
private static final long serialVersionUID = -6951903183562100136L;
- private final List<? extends ConfigProperty> configProperty;
+ private final ArrayList<ConfigProperty> configProperties;
/**
* @param activationspecClass full qualified name of the class
* @param requiredConfigProperty a List of required config properties
- * @param configProperty a list of (optional) config property
+ * @param configProperties a list of (optional) config property
* @param id xmlID
*/
public Activationspec16Impl(XsdString activationspecClass, List<RequiredConfigProperty> requiredConfigProperty,
- List<? extends ConfigProperty> configProperty, String id)
+ List<? extends ConfigProperty> configProperties, String id)
{
super(activationspecClass, requiredConfigProperty, id);
- this.configProperty = configProperty;
+ if (configProperties != null)
+ {
+ this.configProperties = new ArrayList<ConfigProperty>(configProperties.size());
+ this.configProperties.addAll(configProperties);
+ }
+ else
+ {
+ this.configProperties = new ArrayList<ConfigProperty>(0);
+ }
}
/**
@@ -62,7 +70,7 @@
@Override
public List<? extends ConfigProperty> getConfigProperties()
{
- return configProperty == null ? null : Collections.unmodifiableList(configProperty);
+ return configProperties == null ? null : Collections.unmodifiableList(configProperties);
}
@Override
@@ -70,7 +78,7 @@
{
final int prime = 31;
int result = super.hashCode();
- result = prime * result + ((configProperty == null) ? 0 : configProperty.hashCode());
+ result = prime * result + ((configProperties == null) ? 0 : configProperties.hashCode());
return result;
}
@@ -84,12 +92,12 @@
if (!(obj instanceof Activationspec16Impl))
return false;
Activationspec16Impl other = (Activationspec16Impl) obj;
- if (configProperty == null)
+ if (configProperties == null)
{
- if (other.configProperty != null)
+ if (other.configProperties != null)
return false;
}
- else if (!configProperty.equals(other.configProperty))
+ else if (!configProperties.equals(other.configProperties))
return false;
return true;
}
@@ -97,7 +105,7 @@
@Override
public String toString()
{
- return "Activationspec [configProperty=" + configProperty + ", activationspecClass=" + activationspecClass
+ return "Activationspec [configProperty=" + configProperties + ", activationspecClass=" + activationspecClass
+ ", requiredConfigProperty=" + requiredConfigProperty + ", id=" + id + "]";
}
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/Connector16Impl.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/Connector16Impl.java 2010-08-04 15:08:25 UTC (rev 107388)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/Connector16Impl.java 2010-08-04 15:32:43 UTC (rev 107389)
@@ -21,6 +21,7 @@
*/
package org.jboss.jca.common.metadata.ra.ra16;
+import org.jboss.jca.common.api.metadata.MergeUtil;
import org.jboss.jca.common.api.metadata.jbossra.JbossRa;
import org.jboss.jca.common.api.metadata.ra.Connector;
import org.jboss.jca.common.api.metadata.ra.Icon;
@@ -30,9 +31,9 @@
import org.jboss.jca.common.api.metadata.ra.ResourceAdapter1516;
import org.jboss.jca.common.api.metadata.ra.XsdString;
import org.jboss.jca.common.api.metadata.ra.ra16.Connector16;
-import org.jboss.jca.common.metadata.MergeUtil;
import org.jboss.jca.common.metadata.ra.ra15.Connector15Impl;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -49,21 +50,19 @@
private final String moduleName;
- private final List<Icon> icons;
+ private final ArrayList<Icon> icons;
- private final List<String> requiredWorkContexts;
+ private final ArrayList<String> requiredWorkContexts;
- private final List<LocalizedXsdString> descriptions;
+ private final ArrayList<LocalizedXsdString> description;
- private final List<LocalizedXsdString> displayNames;
+ private final ArrayList<LocalizedXsdString> displayNames;
private final boolean metadataComplete;
-
-
/**
* @param moduleName name of the module
- * @param descriptions descriptions of this connector
+ * @param description descriptions of this connector
* @param displayNames name to display for this connecotro
* @param icons icon representing this connectore
* @param vendorName vendor name
@@ -75,7 +74,7 @@
* @param metadataComplete not mandatory boolean value
* @param id XML ID
*/
- public Connector16Impl(String moduleName, List<LocalizedXsdString> descriptions,
+ public Connector16Impl(String moduleName, List<LocalizedXsdString> description,
List<LocalizedXsdString> displayNames,
List<Icon> icons, XsdString vendorName, XsdString eisType, XsdString resourceadapterVersion,
LicenseType license, ResourceAdapter1516 resourceadapter, List<String> requiredWorkContexts,
@@ -83,10 +82,42 @@
{
super(vendorName, eisType, resourceadapterVersion, license, resourceadapter, id);
this.moduleName = moduleName;
- this.descriptions = descriptions;
- this.displayNames = displayNames;
- this.icons = icons;
- this.requiredWorkContexts = requiredWorkContexts;
+ if (description != null)
+ {
+ this.description = new ArrayList<LocalizedXsdString>(description.size());
+ this.description.addAll(description);
+ }
+ else
+ {
+ this.description = new ArrayList<LocalizedXsdString>(0);
+ }
+ if (displayNames != null)
+ {
+ this.displayNames = new ArrayList<LocalizedXsdString>(displayNames.size());
+ this.displayNames.addAll(displayNames);
+ }
+ else
+ {
+ this.displayNames = new ArrayList<LocalizedXsdString>(0);
+ }
+ if (icons != null)
+ {
+ this.icons = new ArrayList<Icon>(icons.size());
+ this.icons.addAll(icons);
+ }
+ else
+ {
+ this.icons = new ArrayList<Icon>(0);
+ }
+ if (requiredWorkContexts != null)
+ {
+ this.requiredWorkContexts = new ArrayList<String>(requiredWorkContexts.size());
+ this.requiredWorkContexts.addAll(requiredWorkContexts);
+ }
+ else
+ {
+ this.requiredWorkContexts = new ArrayList<String>(0);
+ }
this.metadataComplete = metadataComplete;
}
@@ -114,7 +145,7 @@
@Override
public List<LocalizedXsdString> getDescriptions()
{
- return descriptions == null ? null : Collections.unmodifiableList(descriptions);
+ return description == null ? null : Collections.unmodifiableList(description);
}
/**
@@ -160,7 +191,7 @@
{
final int prime = 31;
int result = 1;
- result = prime * result + ((descriptions == null) ? 0 : descriptions.hashCode());
+ result = prime * result + ((description == null) ? 0 : description.hashCode());
result = prime * result + ((displayNames == null) ? 0 : displayNames.hashCode());
result = prime * result + ((eisType == null) ? 0 : eisType.hashCode());
result = prime * result + ((icons == null) ? 0 : icons.hashCode());
@@ -195,14 +226,14 @@
return false;
}
Connector16Impl other = (Connector16Impl) obj;
- if (descriptions == null)
+ if (description == null)
{
- if (other.descriptions != null)
+ if (other.description != null)
{
return false;
}
}
- else if (!descriptions.equals(other.descriptions))
+ else if (!description.equals(other.description))
{
return false;
}
@@ -333,7 +364,7 @@
@Override
public String toString()
{
- return "Connector16 [moduleName=" + moduleName + ", descriptions=" + descriptions + ", displayNames="
+ return "Connector16 [moduleName=" + moduleName + ", description=" + description + ", displayNames="
+ displayNames
+ ", icons=" + icons + ", vendorName=" + vendorName + ", eisType=" + eisType + ", resourceadapterVersion="
+ resourceadapterVersion + ", license=" + license + ", resourceadapter=" + resourceadapter
@@ -362,8 +393,8 @@
List<Icon> newIcons = MergeUtil.mergeList(this.icons, input16.icons);
boolean newMetadataComplete = this.metadataComplete || input16.metadataComplete;
LicenseType newLicense = this.license == null ? input16.license : this.license.merge(input16.license);
- List<LocalizedXsdString> newDescriptions = MergeUtil.mergeList(this.descriptions,
- input16.descriptions);
+ List<LocalizedXsdString> newDescriptions = MergeUtil.mergeList(this.description,
+ input16.description);
List<LocalizedXsdString> newDisplayNames = MergeUtil.mergeList(this.displayNames,
input16.displayNames);
XsdString newVendorName = XsdString.isNull(this.vendorName)
Modified: projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/deployers/annotations/AnnotationsTestCase.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/deployers/annotations/AnnotationsTestCase.java 2010-08-04 15:08:25 UTC (rev 107388)
+++ projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/deployers/annotations/AnnotationsTestCase.java 2010-08-04 15:32:43 UTC (rev 107389)
@@ -23,7 +23,7 @@
package org.jboss.jca.deployers.annotations;
import org.jboss.jca.common.annotations.Annotations;
-import org.jboss.jca.common.validator.ValidateException;
+import org.jboss.jca.common.api.validator.ValidateException;
import org.jboss.jca.embedded.EmbeddedJCA;
import java.io.File;
More information about the jboss-cvs-commits
mailing list