[jboss-cvs] JBossAS SVN: r69895 - in projects/microcontainer/trunk: kernel/src/main/org/jboss/beans/metadata/plugins and 40 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Feb 18 12:45:14 EST 2008
Author: adrian at jboss.org
Date: 2008-02-18 12:45:13 -0500 (Mon, 18 Feb 2008)
New Revision: 69895
Modified:
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/StringValue.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractCallbackMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractCollectionMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractInjectionValueMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractMapMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractPropertiesMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AutowireTypeValueAdapter.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/CallbackCreatorUtil.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/CardinalityValueAdapter.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/ControllerModeValueAdapter.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/ControllerStateValueAdapter.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/FromContext.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/FromContextValueAdapter.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/InjectionOptionValueAdapter.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/builder/LifecycleMetaDataBuilder.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/builder/StateMetaDataBuilder.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/factory/GenericBeanFactory.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/factory/GenericBeanFactoryMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/policy/MetaDataRepositoryInstaller.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/spi/LazyMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/api/dependency/ClassMatcher.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/AbstractAdaptersAnnotationPlugin.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/AbstractParameterAnnotationPlugin.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/BasicBeanAnnotationAdapter.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/ClassFactoryAnnotationPlugin.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/ConstructorParameterAnnotationPlugin.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/CreateLifecycleAnnotationPlugin.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/DestroyLifecycleAnnotationPlugin.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/ExternalInstallationAnnotationPlugin.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/FactoryMethodAnnotationPlugin.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/InstallMethodParameterAnnotationPlugin.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/InstallationParameterAnnotationPlugin.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/LifecycleParameterAnnotationPlugin.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/MethodInstallCallbackAnnotationPlugin.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/MethodUninstallCallbackAnnotationPlugin.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/PropertyInstallCallbackAnnotationPlugin.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/PropertyUninstallCallbackAnnotationPlugin.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/StartLifecycleAnnotationPlugin.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/StopLifecycleAnnotationPlugin.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/UninstallMethodParameterAnnotationPlugin.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/bootstrap/basic/BasicBootstrap.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/bootstrap/standalone/StandaloneBootstrap.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/config/AbstractKernelConfig.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/config/AbstractKernelConfigurator.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/config/Configurator.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/config/property/PropertyKernelConfig.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/AbstractConfigureAction.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/BasicCollectionCallbackItemFactory.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/ClassAttributeCallbackItem.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/ClassContextDependencyItem.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/ClassContextKernelRegistryPlugin.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/ClassDependencyItem.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/ClassSingleCallbackItem.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/CollectionCallbackItem.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/CollectionCallbackItemFactory.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/CollectionCreatorCallbackItem.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/JNDIKernelRegistryPlugin.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/ListCallbackItem.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/QueueCallbackItem.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/ScopedKernelController.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/SecurityActions.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/SetCallbackItem.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/AbstractKernelDeployment.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/BasicKernelDeployer.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/props/VertexFactory.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/props/vertex/BeanVertexFactory.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/props/vertex/ClassVertexFactory.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/props/vertex/DefaultVertexFactory.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/props/vertex/HolderVertexFactory.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/props/vertex/KeywordLevelVertexFactory.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/props/vertex/LevelVertexFactory.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/props/vertex/PropertyVertexFactory.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BasicXMLDeployer.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BeanSchemaBindingHelper.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/NamedAliasHandler.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/event/AbstractEventEmitter.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/lazy/AbstractLazyInitializer.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/lazy/JDKLazyInitializer.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/lazy/JavassistLazyInitializer.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/registry/AbstractKernelRegistry.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/spi/config/KernelConfig.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/spi/config/KernelConfigurator.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/spi/dependency/KernelControllerContext.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/spi/dependency/helpers/UnmodifiableKernelControllerContext.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/classloading/vfs/ClassLoaderUtil.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/classloading/vfs/VFSClassLoader.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/junit/test/JUnitTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/AbstractKernelTest.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/support/TestAnnotationPlugin.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/test/override/CallbackAnnotationOverrideTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/test/override/SetsAnnotationOverrideTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/bootstrap/test/BootstrapTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomArraySimpleBean.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomCollectionSimpleBean.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomListSimpleBean.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomMapSimpleBean.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomSetSimpleBean.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomSignatureArraySimpleBean.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomSignatureCollectionSimpleBean.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomSignatureListSimpleBean.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomSignatureMapSimpleBean.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomSignatureSetSimpleBean.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromFactorySimpleBean.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromFactoryWithIntParamSimpleBean.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromFactoryWithParamSimpleBean.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromObjectsArraySimpleBean.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromObjectsCollectionSimpleBean.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromObjectsListSimpleBean.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromObjectsMapSimpleBean.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromObjectsSetSimpleBean.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromPreinstArraySimpleBean.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromPreinstCollectionSimpleBean.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromPreinstListSimpleBean.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromPreinstMapSimpleBean.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromPreinstSetSimpleBean.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStaticFactorySimpleBean.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStaticFactoryWithIntParamSimpleBean.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStaticFactoryWithParamSimpleBean.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringSimpleBean.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsArraySimpleBean.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsArrayUnmodifiableObject.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsCollectionSimpleBean.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsCollectionUnmodifiableObject.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsListSimpleBean.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsListUnmodifiableObject.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsMapSimpleBean.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsMapUnmodifiableObject.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsSetSimpleBean.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsSetUnmodifiableObject.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/InterfaceArraySimpleBean.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/InterfaceCollectionSimpleBean.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/InterfaceListSimpleBean.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/InterfaceMapSimpleBean.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/InterfaceSetSimpleBean.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/KeyTypeOverrideMapSimpleBean.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/NotAArraySimpleBean.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/NotACollectionSimpleBean.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/NotAListSimpleBean.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/NotAMapSimpleBean.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/NotASetSimpleBean.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/OnObjectArraySimpleBean.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/OnObjectCollectionSimpleBean.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/OnObjectListSimpleBean.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/OnObjectMapSimpleBean.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/OnObjectSetSimpleBean.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ParamArrayConstructorAnnBean.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ParamCollectionConstructorAnnBean.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ParamCompConstructorAnnBean.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ParamConstructorAnnBean.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ParamIntConstructorAnnBean.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ParamListConstructorAnnBean.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ParamMapConstructorAnnBean.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ParamNullConstructorAnnBean.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ParamPropertiesConstructorAnnBean.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ParamSetConstructorAnnBean.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ProgressionSimpleBean.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/SimpleBean.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/SimpleConstructorAnnBean.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/TypeOverrideArraySimpleBean.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/TypeOverrideCollectionSimpleBean.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/TypeOverrideListSimpleBean.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/TypeOverrideSetSimpleBean.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/UnmodifiableGetterBean.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ValueTypeOverrideMapSimpleBean.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/AbstractKernelConfigTest.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/BeanMetaDataBuilderTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/CollectionTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/InstantiateTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/ListTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/MapTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/SetTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/controller/test/AbstractControllerTest.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/support/AnnotatedSimpleBeanWithKernelControllerContextAware.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/support/GenericBeanFactoryRepository.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/support/InstallSimpleBeanImpl.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/support/NestedBean.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/CallbackAnnotationTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/CallbackCollectionAnnotationTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/CallbackTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/NestedPropertyTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/NestedPropertyXMLTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/AbstractDeploymentTest.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/AbstractManualDeploymentTest.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/AbstractOnDemandDeploymentTest.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/InCallbackInstantiatedTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/ScopingDeploymentTest.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/ScopingShutdownTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/ScopingShutdownTestDelegate.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/ScopingTestDelegate.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/support/AnnotationWithAttribute.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/support/AnnotationWithAttributes.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AbstractMCTest.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AbstractXMLTest.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AliasJaxbTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AliasTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AnnotationJaxbTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AnnotationTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ArrayJaxbTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ArrayTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/CollectionJaxbTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/CollectionTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/DemandJaxbTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/DemandTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/DeploymentJaxbTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/DeploymentTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/InjectionJaxbTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/InjectionTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/InstallJaxbTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/InstallTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ListJaxbTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ListTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/MapJaxbTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/MapTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ParameterJaxbTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ParameterTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/PropertyJaxbTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/PropertyTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/SetJaxbTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/SetTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/SupplyJaxbTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/SupplyTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ValueFactoryJaxbTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ValueFactoryTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ValueJaxbTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ValueTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/XMLTestDelegate.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/inject/support/PropertyInjectTestObject.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/inject/test/AbstractManualInjectTest.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/inject/test/ContextualInjectionAdapter.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/lazy/test/LazyInstantiationTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/metadata/test/AbstractMetaDataTest.java
projects/microcontainer/trunk/spring-int/src/main/org/jboss/spring/deployment/xml/SpringSchemaBindingHelper.java
Log:
Source code tidyup in the kernel project
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/StringValue.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/StringValue.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/StringValue.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -59,7 +59,7 @@
/**
* Do we trim.
*
- * @return
+ * @return true to trim
*/
boolean trim() default true;
}
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractCallbackMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractCallbackMetaData.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractCallbackMetaData.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -179,14 +179,14 @@
* @param visitor the meta data visitor
* @param callback the callback item
*/
- protected abstract void addCallback(MetaDataVisitor visitor, CallbackItem callback);
+ protected abstract void addCallback(MetaDataVisitor visitor, CallbackItem<?> callback);
public void describeVisit(MetaDataVisitor vistor)
{
try
{
KernelControllerContext context = vistor.getControllerContext();
- CallbackItem callback;
+ CallbackItem<?> callback;
if (property != null)
{
if (propertyInfo == null)
@@ -211,7 +211,7 @@
// demand name is Class in this case
if (cardinality != null)
{
- vistor.addDependency(new CallbackDependencyItem(context.getName(), (Class)callback.getIDependOn(), whenRequired, dependentState, cardinality));
+ vistor.addDependency(new CallbackDependencyItem(context.getName(), (Class<?>)callback.getIDependOn(), whenRequired, dependentState, cardinality));
}
}
catch (Throwable t)
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractCollectionMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractCollectionMetaData.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractCollectionMetaData.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -146,7 +146,7 @@
return collection.contains(o);
}
- public boolean containsAll(Collection c)
+ public boolean containsAll(Collection<?> c)
{
return collection.containsAll(c);
}
@@ -166,12 +166,12 @@
return collection.remove(o);
}
- public boolean removeAll(Collection c)
+ public boolean removeAll(Collection<?> c)
{
return collection.removeAll(c);
}
- public boolean retainAll(Collection c)
+ public boolean retainAll(Collection<?> c)
{
return collection.retainAll(c);
}
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractInjectionValueMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractInjectionValueMetaData.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractInjectionValueMetaData.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -53,7 +53,7 @@
protected InjectionOption injectionOption = InjectionOption.STRICT;
- protected FromContext fromContext;
+ protected FromContext<? extends ControllerContext> fromContext;
/**
* Simplyifies things with AutowireType.BY_NAME
@@ -110,13 +110,13 @@
this.injectionOption = injectionOption;
}
- public FromContext getFromContext()
+ public FromContext<? extends ControllerContext> getFromContext()
{
return fromContext;
}
@XmlAttribute
- public void setFromContext(FromContext fromContext)
+ public void setFromContext(FromContext<? extends ControllerContext> fromContext)
{
this.fromContext = fromContext;
}
@@ -289,7 +289,7 @@
if (node instanceof TypeProvider)
{
TypeProvider typeProvider = (TypeProvider)node;
- Class injectionClass = typeProvider.getType(visitor, this).getType();
+ Class<?> injectionClass = typeProvider.getType(visitor, this).getType();
log.debug("Contextual injection usage (class -> classloader): " + injectionClass + " -> " + injectionClass.getClassLoader());
// set when required
ControllerState whenRequired = whenRequiredState;
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractMapMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractMapMetaData.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractMapMetaData.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -241,6 +241,7 @@
return new HashMap<Object, Object>();
}
+ @SuppressWarnings("unchecked")
protected Class<? extends Map> getExpectedClass()
{
return Map.class;
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractPropertiesMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractPropertiesMetaData.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractPropertiesMetaData.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -38,6 +38,7 @@
return new Properties();
}
+ @SuppressWarnings("unchecked")
protected Class<? extends Map> getExpectedClass()
{
return Properties.class;
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AutowireTypeValueAdapter.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AutowireTypeValueAdapter.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AutowireTypeValueAdapter.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -32,6 +32,7 @@
*/
public class AutowireTypeValueAdapter implements ValueAdapter
{
+ @SuppressWarnings("unchecked")
public Object cast(Object o, Class c)
{
return AutowireType.getInstance((String)o);
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/CallbackCreatorUtil.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/CallbackCreatorUtil.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/CallbackCreatorUtil.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -33,6 +33,7 @@
import org.jboss.kernel.plugins.dependency.BasicCollectionCallbackItemFactory;
import org.jboss.kernel.plugins.dependency.ClassAttributeCallbackItem;
import org.jboss.kernel.plugins.dependency.ClassSingleCallbackItem;
+import org.jboss.kernel.plugins.dependency.CollectionCallbackItem;
import org.jboss.kernel.plugins.dependency.CollectionCallbackItemFactory;
import org.jboss.kernel.plugins.dependency.MethodAttributeInfo;
import org.jboss.kernel.plugins.dependency.PropertyAttributeInfo;
@@ -73,7 +74,7 @@
* @return collection callback item
*/
@SuppressWarnings("unchecked")
- private static CallbackItem<Class> createCollectionCallback(
+ private static CallbackItem<Class<?>> createCollectionCallback(
TypeInfo info,
KernelControllerContext context,
AttributeInfo attribute,
@@ -87,10 +88,13 @@
TypeInfo componentType = ci.getComponentType();
if (componentType == null)
throw new IllegalArgumentException("Null component type: " + info);
- Class clazz = componentType.getType();
+ Class<?> clazz = componentType.getType();
if (Object.class.equals(clazz))
- throw new IllegalArgumentException("Component type too general - equals Object: " + info);
- return getCollectionFactory().createCollectionCallbackItem((Class<Collection<?>>) info.getType(), clazz, whenRequired, dependentState, cardinality, context, attribute);
+ throw new IllegalArgumentException("Component type too general - equals Object: " + info);
+ Class<? extends Collection<Object>> collectionType = (Class) info.getType();
+ CollectionCallbackItemFactory factory = getCollectionFactory();
+ CollectionCallbackItem collectionCallback = factory.createCollectionCallbackItem(collectionType, clazz, whenRequired, dependentState, cardinality, context, attribute);
+ return collectionCallback;
}
else
throw new IllegalArgumentException("Unable to determine collection element class type: " + info);
@@ -106,7 +110,8 @@
* @param cardinality cardinality
* @return callback item
*/
- public static CallbackItem<Class> createCallback(
+ @SuppressWarnings("unchecked")
+ public static CallbackItem<Class<?>> createCallback(
KernelControllerContext context,
AttributeInfo ai,
ControllerState whenRequired,
@@ -135,7 +140,7 @@
* @param cardinality cardinality
* @return callback item
*/
- public static CallbackItem<Class> createCallback(
+ public static CallbackItem<Class<?>> createCallback(
KernelControllerContext context,
PropertyInfo pi,
ControllerState whenRequired,
@@ -155,7 +160,7 @@
* @param cardinality cardinality
* @return callback item
*/
- public static CallbackItem<Class> createCallback(
+ public static CallbackItem<Class<?>> createCallback(
KernelControllerContext context,
MethodInfo mi,
ControllerState whenRequired,
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/CardinalityValueAdapter.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/CardinalityValueAdapter.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/CardinalityValueAdapter.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -33,6 +33,7 @@
*/
public class CardinalityValueAdapter implements ValueAdapter
{
+ @SuppressWarnings("unchecked")
public Object cast(Object o, Class c)
{
return Cardinality.toCardinality((String)o);
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/ControllerModeValueAdapter.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/ControllerModeValueAdapter.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/ControllerModeValueAdapter.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -33,6 +33,7 @@
*/
public class ControllerModeValueAdapter implements ValueAdapter
{
+ @SuppressWarnings("unchecked")
public Object cast(Object o, Class c)
{
return new ControllerMode((String)o);
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/ControllerStateValueAdapter.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/ControllerStateValueAdapter.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/ControllerStateValueAdapter.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -33,6 +33,7 @@
*/
public class ControllerStateValueAdapter implements ValueAdapter
{
+ @SuppressWarnings("unchecked")
public Object cast(Object o, Class c)
{
return new ControllerState((String)o);
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/FromContext.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/FromContext.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/FromContext.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -61,25 +61,25 @@
private static final long serialVersionUID = 1L;
/** name */
- public static final FromContext NAME = new NameFromContext("name");
+ public static final FromContext<? extends ControllerContext> NAME = new NameFromContext("name");
/** alias */
- public static final FromContext ALIASES = new AliasesFromContext("aliases");
+ public static final FromContext<? extends ControllerContext> ALIASES = new AliasesFromContext("aliases");
/** metadata */
- public static final FromContext METADATA = new MetaDataFromContext("metadata");
+ public static final FromContext<? extends ControllerContext> METADATA = new MetaDataFromContext("metadata");
/** beaninfo */
- public static final FromContext BEANINFO = new BeanInfoFromContext("beaninfo");
+ public static final FromContext<? extends ControllerContext> BEANINFO = new BeanInfoFromContext("beaninfo");
/** scope */
- public static final FromContext SCOPE = new ScopeFromContext("scope");
+ public static final FromContext<? extends ControllerContext> SCOPE = new ScopeFromContext("scope");
/** id */
- public static final FromContext ID = new IdFromContext("id");
+ public static final FromContext<? extends ControllerContext> ID = new IdFromContext("id");
/** context */
- public static final FromContext CONTEXT = new ThisContext("context");
+ public static final FromContext<? extends ControllerContext> CONTEXT = new ThisContext("context");
/** The type string */
protected final String fromString;
@@ -102,7 +102,7 @@
* @param fromString type
* @return FromContext instance
*/
- public static FromContext getInstance(String fromString)
+ public static FromContext<? extends ControllerContext> getInstance(String fromString)
{
if (NAME.getFromString().equalsIgnoreCase(fromString))
return NAME;
@@ -165,6 +165,7 @@
return fromString;
}
+ @SuppressWarnings("unchecked")
public boolean equals(Object object)
{
if (object == null || object instanceof FromContext == false)
@@ -199,7 +200,7 @@
}
}
- private static class NameFromContext extends FromContext
+ private static class NameFromContext extends FromContext<ControllerContext>
{
private static final long serialVersionUID = 1L;
@@ -214,7 +215,7 @@
}
}
- private static class AliasesFromContext extends FromContext
+ private static class AliasesFromContext extends FromContext<ControllerContext>
{
private static final long serialVersionUID = 1L;
@@ -276,7 +277,7 @@
}
}
- private static class IdFromContext extends FromContext
+ private static class IdFromContext extends FromContext<ControllerContext>
{
private static final long serialVersionUID = 1L;
@@ -292,7 +293,7 @@
}
}
- private static class ThisContext extends FromContext
+ private static class ThisContext extends FromContext<ControllerContext>
{
private static final long serialVersionUID = 1L;
@@ -309,7 +310,7 @@
}
}
- private static class DynamicFromContext extends FromContext
+ private static class DynamicFromContext extends FromContext<ControllerContext>
{
private static final long serialVersionUID = 1L;
@@ -318,7 +319,7 @@
super(fromString);
}
- protected Method findMethod(Class clazz)
+ protected Method findMethod(Class<?> clazz)
{
if (clazz == null || clazz == Object.class)
return null;
@@ -336,7 +337,7 @@
if (method != null)
return method;
- for(Class infc : clazz.getInterfaces())
+ for(Class<?> infc : clazz.getInterfaces())
{
Method m = findMethod(infc);
if (m != null)
@@ -345,11 +346,11 @@
return null;
}
- protected void getInterfaces(Class clazz, Set<Class> interfaces)
+ protected void getInterfaces(Class<?> clazz, Set<Class<?>> interfaces)
{
if (clazz == Object.class || clazz == null)
return;
- for (Class iface : clazz.getInterfaces())
+ for (Class<?> iface : clazz.getInterfaces())
interfaces.add(iface);
getInterfaces(clazz.getSuperclass(), interfaces);
}
@@ -362,7 +363,7 @@
Object result = ReflectionUtils.invoke(method, context, new Object[]{});
if (result != null)
{
- Set<Class> interfaces = new HashSet<Class>();
+ Set<Class<?>> interfaces = new HashSet<Class<?>>();
getInterfaces(result.getClass(), interfaces);
return Proxy.newProxyInstance(
ControllerContext.class.getClassLoader(),
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/FromContextValueAdapter.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/FromContextValueAdapter.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/FromContextValueAdapter.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -31,6 +31,7 @@
*/
public class FromContextValueAdapter implements ValueAdapter
{
+ @SuppressWarnings("unchecked")
public Object cast(Object o, Class c)
{
return FromContext.getInstance((String)o);
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/InjectionOptionValueAdapter.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/InjectionOptionValueAdapter.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/InjectionOptionValueAdapter.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -31,6 +31,7 @@
*/
public class InjectionOptionValueAdapter implements ValueAdapter
{
+ @SuppressWarnings("unchecked")
public Object cast(Object o, Class c)
{
return InjectionOption.getInstance((String)o);
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/builder/LifecycleMetaDataBuilder.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/builder/LifecycleMetaDataBuilder.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/builder/LifecycleMetaDataBuilder.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -25,11 +25,12 @@
import org.jboss.beans.metadata.plugins.AbstractLifecycleMetaData;
import org.jboss.beans.metadata.spi.LifecycleMetaData;
import org.jboss.beans.metadata.spi.ValueMetaData;
+import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
import org.jboss.beans.metadata.spi.builder.ParameterMetaDataBuilder;
/**
* Helper class.
- * @see BeanMetaDataBuilderImpl
+ * @see BeanMetaDataBuilder
* @see ParameterMetaDataBuilderImpl
*
* @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/builder/StateMetaDataBuilder.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/builder/StateMetaDataBuilder.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/builder/StateMetaDataBuilder.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -24,10 +24,11 @@
import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
import org.jboss.beans.metadata.plugins.AbstractLifecycleMetaData;
import org.jboss.beans.metadata.spi.LifecycleMetaData;
+import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
/**
* Helper class.
- * @see BeanMetaDataBuilderImpl
+ * @see BeanMetaDataBuilder
* @see org.jboss.beans.metadata.plugins.builder.ParameterMetaDataBuilderImpl
*
* @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/factory/GenericBeanFactory.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/factory/GenericBeanFactory.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/factory/GenericBeanFactory.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -59,7 +59,7 @@
protected ConstructorMetaData constructor;
/** The properties Map<propertyName, ValueMetaData> */
- protected Map properties;
+ protected Map<String, ValueMetaData> properties;
/** The create lifecycle method */
protected LifecycleMetaData create;
@@ -97,11 +97,10 @@
if (properties != null && properties.size() > 0)
{
- for (Object o : properties.entrySet())
+ for (Map.Entry<String, ValueMetaData> entry : properties.entrySet())
{
- Map.Entry entry = (Map.Entry)o;
- String property = (String)entry.getKey();
- ValueMetaData vmd = (ValueMetaData)entry.getValue();
+ String property = entry.getKey();
+ ValueMetaData vmd = entry.getValue();
TargettedJoinpoint jp = configurator.getPropertySetterJoinPoint(info, property, cl, vmd);
jp.setTarget(result);
jp.dispatch();
@@ -177,7 +176,7 @@
*
* @return the properties Map<propertyName, ValueMetaData>
*/
- public Map getProperties()
+ public Map<String, ValueMetaData> getProperties()
{
return properties;
}
@@ -187,7 +186,7 @@
*
* @param properties the properties Map<propertyName, ValueMetaData>
*/
- public void setProperties(Map properties)
+ public void setProperties(Map<String, ValueMetaData> properties)
{
this.properties = properties;
}
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/factory/GenericBeanFactoryMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/factory/GenericBeanFactoryMetaData.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/factory/GenericBeanFactoryMetaData.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -45,6 +45,7 @@
import org.jboss.beans.metadata.spi.ClassLoaderMetaData;
import org.jboss.beans.metadata.spi.ConstructorMetaData;
import org.jboss.beans.metadata.spi.LifecycleMetaData;
+import org.jboss.beans.metadata.spi.MetaDataVisitorNode;
import org.jboss.beans.metadata.spi.ParameterMetaData;
import org.jboss.beans.metadata.spi.PropertyMetaData;
import org.jboss.beans.metadata.spi.ValueMetaData;
@@ -166,9 +167,9 @@
if (properties == null)
return null;
AbstractMapMetaData map = (AbstractMapMetaData) properties.getValue();
- for (Iterator i = map.entrySet().iterator(); i.hasNext();)
+ for (Iterator<Map.Entry<MetaDataVisitorNode, MetaDataVisitorNode>> i = map.entrySet().iterator(); i.hasNext();)
{
- Map.Entry entry = (Map.Entry) i.next();
+ Map.Entry<MetaDataVisitorNode, MetaDataVisitorNode> entry = i.next();
ValueMetaData key = (ValueMetaData) entry.getKey();
if (key.getUnderlyingValue().equals(name))
{
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/policy/MetaDataRepositoryInstaller.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/policy/MetaDataRepositoryInstaller.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/policy/MetaDataRepositoryInstaller.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -21,7 +21,6 @@
*/
package org.jboss.beans.metadata.plugins.policy;
-import java.util.Map;
import java.util.Set;
import org.jboss.kernel.Kernel;
@@ -46,7 +45,7 @@
private Set<Scope> scopes;
/* TODO What is this for, it is unreferenced? */
- private Map<String, Object> bindings;
+ // private Map<String, Object> bindings;
public void setKernel(Kernel kernel)
{
@@ -58,10 +57,12 @@
this.scopes = scopes;
}
+ /* TODO What is this for?
public void setBindings(Map<String, Object> bindings)
{
this.bindings = bindings;
}
+ */
public void start()
{
@@ -88,7 +89,7 @@
kernel = item.getValue();
}
// Create a scoped kernel Kernel
- Kernel scopedKernel = null;//new ScopedKernel(kernel);
+ Kernel scopedKernel = kernel;// TODO new ScopedKernel(kernel);
mmd.addMetaData(scopedKernel, Kernel.class);
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/spi/LazyMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/spi/LazyMetaData.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/spi/LazyMetaData.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -47,7 +47,7 @@
/**
* Get the intefaces.
*
- * @return
+ * @return the interfaces
*/
Set<String> getInterfaces();
}
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/api/dependency/ClassMatcher.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/api/dependency/ClassMatcher.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/api/dependency/ClassMatcher.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -24,6 +24,7 @@
/**
* Match the class type.
*
+ * @param <T> the class to match
* @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
*/
public abstract class ClassMatcher<T> extends NonNullMatcher
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/AbstractAdaptersAnnotationPlugin.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/AbstractAdaptersAnnotationPlugin.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/AbstractAdaptersAnnotationPlugin.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -37,12 +37,12 @@
*/
public abstract class AbstractAdaptersAnnotationPlugin<T extends AnnotatedInfo, C extends Annotation> extends AbstractAnnotationPlugin<T, C>
{
- protected List<Annotation2ValueMetaDataAdapter> adapters;
+ protected List<Annotation2ValueMetaDataAdapter<? extends Annotation>> adapters;
- protected AbstractAdaptersAnnotationPlugin(Class<C> annotation, Annotation2ValueMetaDataAdapter... adapters)
+ protected AbstractAdaptersAnnotationPlugin(Class<C> annotation, Annotation2ValueMetaDataAdapter<? extends Annotation>... adapters)
{
super(annotation);
- this.adapters = new ArrayList<Annotation2ValueMetaDataAdapter>();
+ this.adapters = new ArrayList<Annotation2ValueMetaDataAdapter<? extends Annotation>>();
if (adapters == null || adapters.length == 0)
throw new IllegalArgumentException("Annotation adapters are empty!");
this.adapters.addAll(Arrays.asList(adapters));
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/AbstractParameterAnnotationPlugin.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/AbstractParameterAnnotationPlugin.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/AbstractParameterAnnotationPlugin.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -52,7 +52,7 @@
*/
public abstract class AbstractParameterAnnotationPlugin<T extends AnnotatedInfo, C extends Annotation, P extends MutableParameterizedMetaData> extends AbstractAdaptersAnnotationPlugin<T, C>
{
- protected AbstractParameterAnnotationPlugin(Class<C> annotation, Annotation2ValueMetaDataAdapter... adapters)
+ protected AbstractParameterAnnotationPlugin(Class<C> annotation, Annotation2ValueMetaDataAdapter<? extends Annotation>... adapters)
{
super(annotation, adapters);
}
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/BasicBeanAnnotationAdapter.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/BasicBeanAnnotationAdapter.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/BasicBeanAnnotationAdapter.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -21,6 +21,8 @@
*/
package org.jboss.kernel.plugins.annotations;
+import java.lang.annotation.Annotation;
+
/**
* Basic bean annotation handler.
*
@@ -31,7 +33,8 @@
public BasicBeanAnnotationAdapter()
{
// -- adapters
- Annotation2ValueMetaDataAdapter[] adapters = new Annotation2ValueMetaDataAdapter[]{
+ @SuppressWarnings("unchecked")
+ Annotation2ValueMetaDataAdapter<? extends Annotation>[] adapters = new Annotation2ValueMetaDataAdapter[]{
InjectAnnotationPlugin.INSTANCE,
StringValueAnnotationPlugin.INSTANCE,
ValueFactoryAnnotationPlugin.INSTANCE,
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/ClassFactoryAnnotationPlugin.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/ClassFactoryAnnotationPlugin.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/ClassFactoryAnnotationPlugin.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -21,6 +21,7 @@
*/
package org.jboss.kernel.plugins.annotations;
+import java.lang.annotation.Annotation;
import java.lang.annotation.ElementType;
import java.util.ArrayList;
import java.util.Collections;
@@ -44,7 +45,7 @@
*/
public class ClassFactoryAnnotationPlugin extends AbstractAdaptersAnnotationPlugin<ClassInfo, Factory>
{
- protected ClassFactoryAnnotationPlugin(Annotation2ValueMetaDataAdapter... adapters)
+ protected ClassFactoryAnnotationPlugin(Annotation2ValueMetaDataAdapter<? extends Annotation>... adapters)
{
super(Factory.class, adapters);
}
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/ConstructorParameterAnnotationPlugin.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/ConstructorParameterAnnotationPlugin.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/ConstructorParameterAnnotationPlugin.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -21,6 +21,7 @@
*/
package org.jboss.kernel.plugins.annotations;
+import java.lang.annotation.Annotation;
import java.lang.annotation.ElementType;
import java.util.List;
@@ -39,7 +40,7 @@
*/
public class ConstructorParameterAnnotationPlugin extends AbstractParameterAnnotationPlugin<ConstructorInfo, Constructor, AbstractConstructorMetaData>
{
- protected ConstructorParameterAnnotationPlugin(Annotation2ValueMetaDataAdapter... adapters)
+ protected ConstructorParameterAnnotationPlugin(Annotation2ValueMetaDataAdapter<? extends Annotation>... adapters)
{
super(Constructor.class, adapters);
}
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/CreateLifecycleAnnotationPlugin.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/CreateLifecycleAnnotationPlugin.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/CreateLifecycleAnnotationPlugin.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -21,6 +21,8 @@
*/
package org.jboss.kernel.plugins.annotations;
+import java.lang.annotation.Annotation;
+
import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
import org.jboss.beans.metadata.plugins.AbstractLifecycleMetaData;
import org.jboss.beans.metadata.spi.BeanMetaData;
@@ -33,7 +35,7 @@
*/
public class CreateLifecycleAnnotationPlugin extends LifecycleParameterAnnotationPlugin<Create>
{
- protected CreateLifecycleAnnotationPlugin(Annotation2ValueMetaDataAdapter... adapters)
+ protected CreateLifecycleAnnotationPlugin(Annotation2ValueMetaDataAdapter<? extends Annotation>... adapters)
{
super(Create.class, adapters);
}
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/DestroyLifecycleAnnotationPlugin.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/DestroyLifecycleAnnotationPlugin.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/DestroyLifecycleAnnotationPlugin.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -21,6 +21,8 @@
*/
package org.jboss.kernel.plugins.annotations;
+import java.lang.annotation.Annotation;
+
import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
import org.jboss.beans.metadata.plugins.AbstractLifecycleMetaData;
import org.jboss.beans.metadata.api.annotations.Destroy;
@@ -33,7 +35,7 @@
*/
public class DestroyLifecycleAnnotationPlugin extends LifecycleParameterAnnotationPlugin<Destroy>
{
- protected DestroyLifecycleAnnotationPlugin(Annotation2ValueMetaDataAdapter... adapters)
+ protected DestroyLifecycleAnnotationPlugin(Annotation2ValueMetaDataAdapter<? extends Annotation>... adapters)
{
super(Destroy.class, adapters);
}
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/ExternalInstallationAnnotationPlugin.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/ExternalInstallationAnnotationPlugin.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/ExternalInstallationAnnotationPlugin.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -177,8 +177,8 @@
// values
ValueMetaData fstValue = fstParameter.getValue();
ValueMetaData sndValue = sndParameter.getValue();
- Class fstClass = fstValue != null ? fstValue.getClass() : null;
- Class sndClass = sndValue != null ? sndValue.getClass() : null;
+ Class<?> fstClass = fstValue != null ? fstValue.getClass() : null;
+ Class<?> sndClass = sndValue != null ? sndValue.getClass() : null;
// class guess
if (notEqual(fstClass, sndClass))
return true;
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/FactoryMethodAnnotationPlugin.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/FactoryMethodAnnotationPlugin.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/FactoryMethodAnnotationPlugin.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -21,6 +21,7 @@
*/
package org.jboss.kernel.plugins.annotations;
+import java.lang.annotation.Annotation;
import java.lang.annotation.ElementType;
import java.util.List;
import java.util.Collections;
@@ -40,7 +41,7 @@
*/
public class FactoryMethodAnnotationPlugin extends AbstractParameterAnnotationPlugin<MethodInfo, FactoryMethod, AbstractConstructorMetaData>
{
- public FactoryMethodAnnotationPlugin(Annotation2ValueMetaDataAdapter... adapters)
+ public FactoryMethodAnnotationPlugin(Annotation2ValueMetaDataAdapter<? extends Annotation>... adapters)
{
super(FactoryMethod.class, adapters);
}
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/InstallMethodParameterAnnotationPlugin.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/InstallMethodParameterAnnotationPlugin.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/InstallMethodParameterAnnotationPlugin.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -21,6 +21,7 @@
*/
package org.jboss.kernel.plugins.annotations;
+import java.lang.annotation.Annotation;
import java.util.List;
import java.util.ArrayList;
@@ -39,7 +40,7 @@
*/
public class InstallMethodParameterAnnotationPlugin extends InstallationParameterAnnotationPlugin<InstallMethod>
{
- protected InstallMethodParameterAnnotationPlugin(Annotation2ValueMetaDataAdapter... adapters)
+ protected InstallMethodParameterAnnotationPlugin(Annotation2ValueMetaDataAdapter<? extends Annotation>... adapters)
{
super(InstallMethod.class, adapters);
}
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/InstallationParameterAnnotationPlugin.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/InstallationParameterAnnotationPlugin.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/InstallationParameterAnnotationPlugin.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -44,7 +44,7 @@
*/
public abstract class InstallationParameterAnnotationPlugin<C extends Annotation> extends AbstractParameterAnnotationPlugin<MethodInfo, C, AbstractInstallMetaData>
{
- protected InstallationParameterAnnotationPlugin(Class<C> annotation, Annotation2ValueMetaDataAdapter... adapters)
+ protected InstallationParameterAnnotationPlugin(Class<C> annotation, Annotation2ValueMetaDataAdapter<? extends Annotation>... adapters)
{
super(annotation, adapters);
}
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/LifecycleParameterAnnotationPlugin.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/LifecycleParameterAnnotationPlugin.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/LifecycleParameterAnnotationPlugin.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -41,7 +41,7 @@
*/
public abstract class LifecycleParameterAnnotationPlugin<C extends Annotation> extends AbstractParameterAnnotationPlugin<MethodInfo, C, AbstractLifecycleMetaData>
{
- protected LifecycleParameterAnnotationPlugin(Class<C> annotation, Annotation2ValueMetaDataAdapter... adapters)
+ protected LifecycleParameterAnnotationPlugin(Class<C> annotation, Annotation2ValueMetaDataAdapter<? extends Annotation>... adapters)
{
super(annotation, adapters);
}
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/MethodInstallCallbackAnnotationPlugin.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/MethodInstallCallbackAnnotationPlugin.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/MethodInstallCallbackAnnotationPlugin.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -37,7 +37,7 @@
super();
}
- protected boolean isEqual(MethodInfo info, CallbackItem ci)
+ protected boolean isEqual(MethodInfo info, CallbackItem<?> ci)
{
// todo - param matching
return info.getName().equals(ci.getAttributeName());
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/MethodUninstallCallbackAnnotationPlugin.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/MethodUninstallCallbackAnnotationPlugin.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/MethodUninstallCallbackAnnotationPlugin.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -37,7 +37,7 @@
super();
}
- protected boolean isEqual(MethodInfo info, CallbackItem ci)
+ protected boolean isEqual(MethodInfo info, CallbackItem<?> ci)
{
// todo - param matching
return info.getName().equals(ci.getAttributeName());
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/PropertyInstallCallbackAnnotationPlugin.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/PropertyInstallCallbackAnnotationPlugin.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/PropertyInstallCallbackAnnotationPlugin.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -37,7 +37,7 @@
super();
}
- protected boolean isEqual(PropertyInfo info, CallbackItem ci)
+ protected boolean isEqual(PropertyInfo info, CallbackItem<?> ci)
{
// todo - param matching
return info.getName().equals(ci.getAttributeName());
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/PropertyUninstallCallbackAnnotationPlugin.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/PropertyUninstallCallbackAnnotationPlugin.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/PropertyUninstallCallbackAnnotationPlugin.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -37,7 +37,7 @@
super();
}
- protected boolean isEqual(PropertyInfo info, CallbackItem ci)
+ protected boolean isEqual(PropertyInfo info, CallbackItem<?> ci)
{
// todo - param matching
return info.getName().equals(ci.getAttributeName());
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/StartLifecycleAnnotationPlugin.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/StartLifecycleAnnotationPlugin.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/StartLifecycleAnnotationPlugin.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -21,6 +21,8 @@
*/
package org.jboss.kernel.plugins.annotations;
+import java.lang.annotation.Annotation;
+
import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
import org.jboss.beans.metadata.plugins.AbstractLifecycleMetaData;
import org.jboss.beans.metadata.api.annotations.Start;
@@ -33,7 +35,7 @@
*/
public class StartLifecycleAnnotationPlugin extends LifecycleParameterAnnotationPlugin<Start>
{
- protected StartLifecycleAnnotationPlugin(Annotation2ValueMetaDataAdapter... adapters)
+ protected StartLifecycleAnnotationPlugin(Annotation2ValueMetaDataAdapter<? extends Annotation>... adapters)
{
super(Start.class, adapters);
}
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/StopLifecycleAnnotationPlugin.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/StopLifecycleAnnotationPlugin.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/StopLifecycleAnnotationPlugin.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -21,6 +21,8 @@
*/
package org.jboss.kernel.plugins.annotations;
+import java.lang.annotation.Annotation;
+
import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
import org.jboss.beans.metadata.plugins.AbstractLifecycleMetaData;
import org.jboss.beans.metadata.api.annotations.Stop;
@@ -33,7 +35,7 @@
*/
public class StopLifecycleAnnotationPlugin extends LifecycleParameterAnnotationPlugin<Stop>
{
- protected StopLifecycleAnnotationPlugin(Annotation2ValueMetaDataAdapter... adapters)
+ protected StopLifecycleAnnotationPlugin(Annotation2ValueMetaDataAdapter<? extends Annotation>... adapters)
{
super(Stop.class, adapters);
}
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/UninstallMethodParameterAnnotationPlugin.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/UninstallMethodParameterAnnotationPlugin.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/UninstallMethodParameterAnnotationPlugin.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -21,6 +21,7 @@
*/
package org.jboss.kernel.plugins.annotations;
+import java.lang.annotation.Annotation;
import java.util.ArrayList;
import java.util.List;
@@ -39,7 +40,7 @@
*/
public class UninstallMethodParameterAnnotationPlugin extends InstallationParameterAnnotationPlugin<UninstallMethod>
{
- protected UninstallMethodParameterAnnotationPlugin(Annotation2ValueMetaDataAdapter... adapters)
+ protected UninstallMethodParameterAnnotationPlugin(Annotation2ValueMetaDataAdapter<? extends Annotation>... adapters)
{
super(UninstallMethod.class, adapters);
}
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/bootstrap/basic/BasicBootstrap.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/bootstrap/basic/BasicBootstrap.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/bootstrap/basic/BasicBootstrap.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -60,7 +60,7 @@
if (props == null)
props = getSystemProperties();
final PropertyKernelConfig config = new PropertyKernelConfig(props);
- PrivilegedAction<?> action = new PrivilegedAction()
+ PrivilegedAction<Object> action = new PrivilegedAction<Object>()
{
public Object run()
{
@@ -79,7 +79,7 @@
*/
public BasicBootstrap(final KernelConfig config) throws Exception
{
- PrivilegedAction<?> action = new PrivilegedAction()
+ PrivilegedAction<Object> action = new PrivilegedAction<Object>()
{
public Object run()
{
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/bootstrap/standalone/StandaloneBootstrap.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/bootstrap/standalone/StandaloneBootstrap.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/bootstrap/standalone/StandaloneBootstrap.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -75,14 +75,14 @@
Runtime.getRuntime().addShutdownHook(new Shutdown());
ClassLoader cl = Thread.currentThread().getContextClassLoader();
- for (Enumeration e = cl.getResources(StandaloneKernelConstants.DEPLOYMENT_XML_NAME); e.hasMoreElements(); )
+ for (Enumeration<URL> e = cl.getResources(StandaloneKernelConstants.DEPLOYMENT_XML_NAME); e.hasMoreElements(); )
{
- URL url = (URL) e.nextElement();
+ URL url = e.nextElement();
deploy(url);
}
- for (Enumeration e = cl.getResources("META-INF/" + StandaloneKernelConstants.DEPLOYMENT_XML_NAME); e.hasMoreElements(); )
+ for (Enumeration<URL> e = cl.getResources("META-INF/" + StandaloneKernelConstants.DEPLOYMENT_XML_NAME); e.hasMoreElements(); )
{
- URL url = (URL) e.nextElement();
+ URL url = e.nextElement();
deploy(url);
}
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/config/AbstractKernelConfig.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/config/AbstractKernelConfig.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/config/AbstractKernelConfig.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -55,7 +55,7 @@
return configuration.getBeanInfo(className, cl);
}
- public BeanInfo getBeanInfo(Class clazz) throws Throwable
+ public BeanInfo getBeanInfo(Class<?> clazz) throws Throwable
{
return configuration.getBeanInfo(clazz);
}
@@ -70,7 +70,7 @@
return configuration.getClassInfo(className, cl);
}
- public ClassInfo getClassInfo(Class clazz) throws Throwable
+ public ClassInfo getClassInfo(Class<?> clazz) throws Throwable
{
return configuration.getClassInfo(clazz);
}
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/config/AbstractKernelConfigurator.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/config/AbstractKernelConfigurator.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/config/AbstractKernelConfigurator.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -28,6 +28,7 @@
import org.jboss.beans.info.spi.PropertyInfo;
import org.jboss.beans.metadata.spi.BeanMetaData;
import org.jboss.beans.metadata.spi.ConstructorMetaData;
+import org.jboss.beans.metadata.spi.ParameterMetaData;
import org.jboss.beans.metadata.spi.PropertyMetaData;
import org.jboss.beans.metadata.spi.ValueMetaData;
import org.jboss.joinpoint.spi.Joinpoint;
@@ -65,7 +66,7 @@
return config.getBeanInfo(className, cl);
}
- public BeanInfo getBeanInfo(Class clazz) throws Throwable
+ public BeanInfo getBeanInfo(Class<?> clazz) throws Throwable
{
return config.getBeanInfo(clazz);
}
@@ -89,7 +90,7 @@
return config.getClassInfo(className, cl);
}
- public ClassInfo getClassInfo(Class clazz) throws Throwable
+ public ClassInfo getClassInfo(Class<?> clazz) throws Throwable
{
return config.getClassInfo(clazz);
}
@@ -150,7 +151,7 @@
return Configurator.getPropertyNullerJoinPoint(info, metaData);
}
- public MethodJoinpoint getMethodJoinPoint(BeanInfo info, ClassLoader cl, String name, List parameters, boolean isStatic, boolean isPublic) throws Throwable
+ public MethodJoinpoint getMethodJoinPoint(BeanInfo info, ClassLoader cl, String name, List<ParameterMetaData> parameters, boolean isStatic, boolean isPublic) throws Throwable
{
return Configurator.findMethod(info, cl, name, parameters, isStatic, isPublic);
}
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/config/Configurator.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/config/Configurator.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/config/Configurator.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -133,7 +133,7 @@
Object factory = vmd.getValue(null, cl);
// Get the parameters
- List parameters = metaData.getParameters();
+ List<ParameterMetaData> parameters = metaData.getParameters();
// Describe the factory
BeanInfo factoryInfo = config.getBeanInfo(factory.getClass());
@@ -157,7 +157,7 @@
if (factoryClassName != null)
{
// Get the parameters
- List parameters = metaData.getParameters();
+ List<ParameterMetaData> parameters = metaData.getParameters();
BeanInfo factoryInfo = config.getBeanInfo(factoryClassName, cl);
@@ -236,16 +236,16 @@
if (info == null)
throw new IllegalArgumentException("Null bean info");
- List params = Collections.EMPTY_LIST;
+ List<ParameterMetaData> params = Collections.emptyList();
if (metaData != null && metaData.getParameters() != null)
params = metaData.getParameters();
String[] paramTypes = new String[params.size()];
if (params.isEmpty() == false)
{
int x = 0;
- for (Iterator i = params.iterator(); i.hasNext();)
+ for (Iterator<ParameterMetaData> i = params.iterator(); i.hasNext();)
{
- ParameterMetaData pdata = (ParameterMetaData) i.next();
+ ParameterMetaData pdata = i.next();
paramTypes[x++] = pdata.getType();
}
}
@@ -271,14 +271,14 @@
if (metaData == null)
throw new IllegalArgumentException("Null bean metadata");
- Set properties = metaData.getProperties();
+ Set<PropertyMetaData> properties = metaData.getProperties();
if (properties != null && properties.isEmpty() == false)
{
ClassLoader cl = getClassLoader(metaData);
- for (Iterator i = metaData.getProperties().iterator(); i.hasNext();)
+ for (Iterator<PropertyMetaData> i = metaData.getProperties().iterator(); i.hasNext();)
{
- PropertyMetaData property = (PropertyMetaData) i.next();
+ PropertyMetaData property = i.next();
configure(trace, object, info, cl, property);
}
}
@@ -415,9 +415,9 @@
{
ClassLoader cl = getClassLoader(metaData);
- for (Iterator i = metaData.getProperties().iterator(); i.hasNext();)
+ for (Iterator<PropertyMetaData> i = metaData.getProperties().iterator(); i.hasNext();)
{
- PropertyMetaData property = (PropertyMetaData) i.next();
+ PropertyMetaData property = i.next();
TargettedJoinpoint joinPoint = getPropertySetterJoinPoint(trace, info, cl, property);
result.add(joinPoint);
}
@@ -537,12 +537,12 @@
throw new IllegalArgumentException("Null bean metadata");
ClassLoader cl = getClassLoader(metaData);
- Set propertys = metaData.getProperties();
+ Set<PropertyMetaData> propertys = metaData.getProperties();
if (propertys != null && propertys.isEmpty() == false)
{
- for (Iterator i = metaData.getProperties().iterator(); i.hasNext();)
+ for (Iterator<PropertyMetaData> i = metaData.getProperties().iterator(); i.hasNext();)
{
- PropertyMetaData property = (PropertyMetaData) i.next();
+ PropertyMetaData property = i.next();
unconfigure(object, cl, info, property);
}
}
@@ -606,9 +606,9 @@
Set<PropertyMetaData> propertys = metaData.getProperties();
if (propertys != null && propertys.isEmpty() == false)
{
- for (Iterator i = metaData.getProperties().iterator(); i.hasNext();)
+ for (Iterator<PropertyMetaData> i = metaData.getProperties().iterator(); i.hasNext();)
{
- PropertyMetaData property = (PropertyMetaData) i.next();
+ PropertyMetaData property = i.next();
TargettedJoinpoint joinPoint = getPropertyNullerJoinPoint(info, property);
result.add(joinPoint);
}
@@ -748,7 +748,7 @@
* @return the method join point
* @throws Throwable for any error
*/
- public static MethodJoinpoint findMethod(BeanInfo info, ClassLoader cl, String name, List parameters, boolean isStatic, boolean isPublic) throws Throwable
+ public static MethodJoinpoint findMethod(BeanInfo info, ClassLoader cl, String name, List<ParameterMetaData> parameters, boolean isStatic, boolean isPublic) throws Throwable
{
boolean trace = log.isTraceEnabled();
return findMethod(trace, info, cl, name, parameters, isStatic, isPublic);
@@ -767,7 +767,7 @@
* @return the method join point
* @throws Throwable for any error
*/
- public static MethodJoinpoint findMethod(boolean trace, BeanInfo info, ClassLoader cl, String name, List parameters, boolean isStatic, boolean isPublic) throws Throwable
+ public static MethodJoinpoint findMethod(boolean trace, BeanInfo info, ClassLoader cl, String name, List<ParameterMetaData> parameters, boolean isStatic, boolean isPublic) throws Throwable
{
if (info == null)
throw new IllegalArgumentException("Null bean info");
@@ -798,16 +798,16 @@
* @return an array of parameter types
* @throws Throwable for any error
*/
- public static String[] getParameterTypes(boolean trace, List parameters) throws Throwable
+ public static String[] getParameterTypes(boolean trace, List<ParameterMetaData> parameters) throws Throwable
{
if (parameters == null)
return null;
String[] paramTypes = new String[parameters.size()];
int x = 0;
- for (Iterator i = parameters.iterator(); i.hasNext();)
+ for (Iterator<ParameterMetaData> i = parameters.iterator(); i.hasNext();)
{
- ParameterMetaData pmd = (ParameterMetaData) i.next();
+ ParameterMetaData pmd = i.next();
paramTypes[x++] = pmd.getType();
}
return paramTypes;
@@ -843,16 +843,16 @@
* @return an array of parameters
* @throws Throwable for any error
*/
- public static Object[] getParameters(boolean trace, ClassLoader cl, TypeInfo[] pinfos, List parameters) throws Throwable
+ public static Object[] getParameters(boolean trace, ClassLoader cl, TypeInfo[] pinfos, List<ParameterMetaData> parameters) throws Throwable
{
if (parameters == null)
return null;
Object[] params = new Object[parameters.size()];
int x = 0;
- for (Iterator i = parameters.iterator(); i.hasNext();)
+ for (Iterator<ParameterMetaData> i = parameters.iterator(); i.hasNext();)
{
- ParameterMetaData pdata = (ParameterMetaData) i.next();
+ ParameterMetaData pdata = i.next();
ValueMetaData vmd = pdata.getValue();
params[x] = vmd.getValue(pinfos[x], cl);
x++;
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/config/property/PropertyKernelConfig.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/config/property/PropertyKernelConfig.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/config/property/PropertyKernelConfig.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -73,7 +73,7 @@
{
log.trace("Dumping properties");
TreeSet<Object> names = new TreeSet<Object>(properties.keySet());
- for (Iterator i = names.iterator(); i.hasNext();)
+ for (Iterator<Object> i = names.iterator(); i.hasNext();)
{
String name = (String) i.next();
log.trace(name + "=" + properties.get(name));
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/AbstractConfigureAction.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/AbstractConfigureAction.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/AbstractConfigureAction.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -88,7 +88,7 @@
*/
protected boolean isExactlyKernelControllerContextAware(Object o)
{
- Class clazz = o.getClass();
+ Class<?> clazz = o.getClass();
return KernelControllerContextAware.class.isAssignableFrom(clazz) &&
(!ConfigureKernelControllerContextAware.class.isAssignableFrom(clazz) &&
!CreateKernelControllerContextAware.class.isAssignableFrom(clazz) &&
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/BasicCollectionCallbackItemFactory.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/BasicCollectionCallbackItemFactory.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/BasicCollectionCallbackItemFactory.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -37,18 +37,18 @@
*/
public class BasicCollectionCallbackItemFactory implements CollectionCallbackItemFactory
{
- public CollectionCallbackItem createCollectionCallbackItem(
- Class<? extends Collection> parameterClass,
- Class name,
+ public CollectionCallbackItem <? extends Collection<Object>>createCollectionCallbackItem(
+ Class<? extends Collection<Object>> parameterClass,
+ Class<?> name,
InvokeDispatchContext context,
AttributeInfo attribute)
{
return createCollectionCallbackItem(parameterClass, name, null, null, null, context, attribute);
}
- public CollectionCallbackItem createCollectionCallbackItem(
- Class<? extends Collection> parameterClass,
- Class name,
+ public CollectionCallbackItem<? extends Collection<Object>> createCollectionCallbackItem(
+ Class<? extends Collection<Object>> parameterClass,
+ Class<?> name,
ControllerState whenRequired,
ControllerState dependentState,
Cardinality cardinality,
@@ -81,9 +81,9 @@
* @param attribute the attribute
* @return new exact collection callback item
*/
- protected CollectionCallbackItem handleAdditionalCollectionClass(
- Class<? extends Collection> parameterClass,
- Class name,
+ protected CollectionCallbackItem<? extends Collection<Object>> handleAdditionalCollectionClass(
+ Class<? extends Collection<Object>> parameterClass,
+ Class<?> name,
ControllerState whenRequired,
ControllerState dependentState,
Cardinality cardinality,
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/ClassAttributeCallbackItem.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/ClassAttributeCallbackItem.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/ClassAttributeCallbackItem.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -36,16 +36,16 @@
*
* @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
*/
-public class ClassAttributeCallbackItem extends AttributeCallbackItem<Class>
+public class ClassAttributeCallbackItem extends AttributeCallbackItem<Class<?>>
{
protected Cardinality cardinality;
- public ClassAttributeCallbackItem(Class name, AttributeDispatchContext owner, String attribute)
+ public ClassAttributeCallbackItem(Class<?> name, AttributeDispatchContext owner, String attribute)
{
super(name, owner, attribute);
}
- public ClassAttributeCallbackItem(Class name, ControllerState whenRequired, ControllerState dependentState, Cardinality cardinality, AttributeDispatchContext owner, String attribute)
+ public ClassAttributeCallbackItem(Class<?> name, ControllerState whenRequired, ControllerState dependentState, Cardinality cardinality, AttributeDispatchContext owner, String attribute)
{
super(name, whenRequired, dependentState, owner, attribute);
this.cardinality = cardinality;
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/ClassContextDependencyItem.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/ClassContextDependencyItem.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/ClassContextDependencyItem.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -32,7 +32,7 @@
*/
public class ClassContextDependencyItem extends ClassDependencyItem
{
- public ClassContextDependencyItem(Object name, Class demandClass, ControllerState whenRequired, ControllerState dependentState)
+ public ClassContextDependencyItem(Object name, Class<?> demandClass, ControllerState whenRequired, ControllerState dependentState)
{
super(name, demandClass, whenRequired, dependentState);
}
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/ClassContextKernelRegistryPlugin.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/ClassContextKernelRegistryPlugin.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/ClassContextKernelRegistryPlugin.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -39,6 +39,7 @@
this.controller = controller;
}
+ @SuppressWarnings("unchecked")
public KernelRegistryEntry getEntry(Object name)
{
if (name instanceof Class)
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/ClassDependencyItem.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/ClassDependencyItem.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/ClassDependencyItem.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -33,12 +33,13 @@
*/
public abstract class ClassDependencyItem extends AbstractDependencyItem
{
- public ClassDependencyItem(Object name, Class demandClass, ControllerState whenRequired, ControllerState dependentState)
+ public ClassDependencyItem(Object name, Class<?> demandClass, ControllerState whenRequired, ControllerState dependentState)
{
super(name, demandClass, whenRequired, dependentState);
}
- protected Class getDemandClass()
+ @SuppressWarnings("unchecked")
+ protected Class<?> getDemandClass()
{
return (Class)getIDependOn();
}
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/ClassSingleCallbackItem.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/ClassSingleCallbackItem.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/ClassSingleCallbackItem.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -38,26 +38,26 @@
*
* @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
*/
-public class ClassSingleCallbackItem extends SingleCallbackItem<Class>
+public class ClassSingleCallbackItem extends SingleCallbackItem<Class<?>>
{
protected Cardinality cardinality;
- public ClassSingleCallbackItem(Class name, InvokeDispatchContext owner, String method)
+ public ClassSingleCallbackItem(Class<?> name, InvokeDispatchContext owner, String method)
{
super(name, owner, method);
}
- public ClassSingleCallbackItem(Class name, InvokeDispatchContext owner, String method, String signature)
+ public ClassSingleCallbackItem(Class<?> name, InvokeDispatchContext owner, String method, String signature)
{
super(name, owner, method, signature);
}
- public ClassSingleCallbackItem(Class name, ControllerState whenRequired, ControllerState dependentState, Cardinality cardinality, InvokeDispatchContext owner, String method)
+ public ClassSingleCallbackItem(Class<?> name, ControllerState whenRequired, ControllerState dependentState, Cardinality cardinality, InvokeDispatchContext owner, String method)
{
super(name, whenRequired, dependentState, owner, method);
}
- public ClassSingleCallbackItem(Class name, ControllerState whenRequired, ControllerState dependentState, Cardinality cardinality, InvokeDispatchContext owner, String method, String signature)
+ public ClassSingleCallbackItem(Class<?> name, ControllerState whenRequired, ControllerState dependentState, Cardinality cardinality, InvokeDispatchContext owner, String method, String signature)
{
super(name, whenRequired, dependentState, owner, method, signature);
this.cardinality = cardinality;
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/CollectionCallbackItem.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/CollectionCallbackItem.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/CollectionCallbackItem.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -40,17 +40,17 @@
* @param <T> expected collection type
* @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
*/
-public abstract class CollectionCallbackItem<T extends Collection<Object>> extends OwnerCallbackItem<Class, InvokeDispatchContext>
+public abstract class CollectionCallbackItem<T extends Collection<Object>> extends OwnerCallbackItem<Class<?>, InvokeDispatchContext>
{
protected Cardinality cardinality;
protected AttributeInfo attribute;
- public CollectionCallbackItem(Class name, InvokeDispatchContext owner, AttributeInfo attribute)
+ public CollectionCallbackItem(Class<?> name, InvokeDispatchContext owner, AttributeInfo attribute)
{
this(name, null, null, null, owner, attribute);
}
- public CollectionCallbackItem(Class name, ControllerState whenRequired, ControllerState dependentState, Cardinality cardinality, InvokeDispatchContext context, AttributeInfo attribute)
+ public CollectionCallbackItem(Class<?> name, ControllerState whenRequired, ControllerState dependentState, Cardinality cardinality, InvokeDispatchContext context, AttributeInfo attribute)
{
super(name, whenRequired, dependentState, attribute != null ? attribute.getName() : null, context);
this.attribute = attribute;
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/CollectionCallbackItemFactory.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/CollectionCallbackItemFactory.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/CollectionCallbackItemFactory.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -43,9 +43,9 @@
* @param attribute the attribute
* @return new exact collection callback item
*/
- CollectionCallbackItem createCollectionCallbackItem(
- Class<? extends Collection> parameterClass,
- Class name,
+ CollectionCallbackItem<? extends Collection<Object>> createCollectionCallbackItem(
+ Class<? extends Collection<Object>> parameterClass,
+ Class<?> name,
InvokeDispatchContext context,
AttributeInfo attribute);
@@ -61,9 +61,9 @@
* @param attribute the attribute
* @return new exact collection callback item
*/
- CollectionCallbackItem createCollectionCallbackItem(
- Class<? extends Collection> parameterClass,
- Class name,
+ CollectionCallbackItem<? extends Collection<Object>> createCollectionCallbackItem(
+ Class<? extends Collection<Object>> parameterClass,
+ Class<?> name,
ControllerState whenRequired,
ControllerState dependentState,
Cardinality cardinality,
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/CollectionCreatorCallbackItem.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/CollectionCreatorCallbackItem.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/CollectionCreatorCallbackItem.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -37,12 +37,12 @@
{
protected CollectionCreator<T> creator;
- public CollectionCreatorCallbackItem(CollectionCreator<T> creator, Class name, InvokeDispatchContext owner, AttributeInfo attribute)
+ public CollectionCreatorCallbackItem(CollectionCreator<T> creator, Class<?> name, InvokeDispatchContext owner, AttributeInfo attribute)
{
this(creator, name, null, null, null, owner, attribute);
}
- public CollectionCreatorCallbackItem(CollectionCreator<T> creator, Class name, ControllerState whenRequired, ControllerState dependentState, Cardinality cardinality, InvokeDispatchContext context, AttributeInfo attribute)
+ public CollectionCreatorCallbackItem(CollectionCreator<T> creator, Class<?> name, ControllerState whenRequired, ControllerState dependentState, Cardinality cardinality, InvokeDispatchContext context, AttributeInfo attribute)
{
super(name, whenRequired, dependentState, cardinality, context, attribute);
if (creator == null)
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/JNDIKernelRegistryPlugin.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/JNDIKernelRegistryPlugin.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/JNDIKernelRegistryPlugin.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -37,10 +37,10 @@
*/
public class JNDIKernelRegistryPlugin implements KernelRegistryPlugin
{
- private Hashtable properties;
+ private Hashtable<?,?> properties;
private Context context;
- public void setProperties(Hashtable properties)
+ public void setProperties(Hashtable<?,?> properties)
{
this.properties = properties;
}
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/ListCallbackItem.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/ListCallbackItem.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/ListCallbackItem.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -34,12 +34,12 @@
*/
public class ListCallbackItem extends CollectionCreatorCallbackItem<List<Object>>
{
- public ListCallbackItem(Class name, InvokeDispatchContext owner, AttributeInfo attribute)
+ public ListCallbackItem(Class<?> name, InvokeDispatchContext owner, AttributeInfo attribute)
{
super(CollectionCreator.LIST, name, owner, attribute);
}
- public ListCallbackItem(Class name, ControllerState whenRequired, ControllerState dependentState, Cardinality cardinality, InvokeDispatchContext context, AttributeInfo attribute)
+ public ListCallbackItem(Class<?> name, ControllerState whenRequired, ControllerState dependentState, Cardinality cardinality, InvokeDispatchContext context, AttributeInfo attribute)
{
super(CollectionCreator.LIST, name, whenRequired, dependentState, cardinality, context, attribute);
}
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/QueueCallbackItem.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/QueueCallbackItem.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/QueueCallbackItem.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -34,12 +34,12 @@
*/
public class QueueCallbackItem extends CollectionCreatorCallbackItem<Queue<Object>>
{
- public QueueCallbackItem(Class name, InvokeDispatchContext owner, AttributeInfo attribute)
+ public QueueCallbackItem(Class<?> name, InvokeDispatchContext owner, AttributeInfo attribute)
{
super(CollectionCreator.QUEUE, name, owner, attribute);
}
- public QueueCallbackItem(Class name, ControllerState whenRequired, ControllerState dependentState, Cardinality cardinality, InvokeDispatchContext context, AttributeInfo attribute)
+ public QueueCallbackItem(Class<?> name, ControllerState whenRequired, ControllerState dependentState, Cardinality cardinality, InvokeDispatchContext context, AttributeInfo attribute)
{
super(CollectionCreator.QUEUE, name, whenRequired, dependentState, cardinality, context, attribute);
}
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/ScopedKernelController.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/ScopedKernelController.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/ScopedKernelController.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -160,7 +160,7 @@
}
}
- public Set<KernelControllerContext> getInstantiatedContexts(Class clazz)
+ public Set<KernelControllerContext> getInstantiatedContexts(Class<?> clazz)
{
lockRead();
try
@@ -186,7 +186,7 @@
}
}
- public Set<KernelControllerContext> getContexts(Class clazz, ControllerState state)
+ public Set<KernelControllerContext> getContexts(Class<?> clazz, ControllerState state)
{
lockRead();
try
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/SecurityActions.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/SecurityActions.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/SecurityActions.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -26,8 +26,6 @@
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
-import org.jboss.dependency.spi.ControllerContext;
-import org.jboss.dependency.spi.dispatch.InvokeDispatchContext;
import org.jboss.kernel.spi.dependency.KernelControllerContext;
/**
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/SetCallbackItem.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/SetCallbackItem.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/SetCallbackItem.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -34,12 +34,12 @@
*/
public class SetCallbackItem extends CollectionCreatorCallbackItem<Set<Object>>
{
- public SetCallbackItem(Class name, InvokeDispatchContext owner, AttributeInfo attribute)
+ public SetCallbackItem(Class<?> name, InvokeDispatchContext owner, AttributeInfo attribute)
{
super(CollectionCreator.SET, name, owner, attribute);
}
- public SetCallbackItem(Class name, ControllerState whenRequired, ControllerState dependentState, Cardinality cardinality, InvokeDispatchContext context, AttributeInfo attribute)
+ public SetCallbackItem(Class<?> name, ControllerState whenRequired, ControllerState dependentState, Cardinality cardinality, InvokeDispatchContext context, AttributeInfo attribute)
{
super(CollectionCreator.SET, name, whenRequired, dependentState, cardinality, context, attribute);
}
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/AbstractKernelDeployment.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/AbstractKernelDeployment.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/AbstractKernelDeployment.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -28,6 +28,7 @@
import java.util.List;
import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
+
import javax.xml.bind.annotation.XmlAnyElement;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
@@ -43,7 +44,6 @@
import org.jboss.beans.metadata.plugins.AbstractLifecycleMetaData;
import org.jboss.beans.metadata.plugins.AbstractNamedAliasMetaData;
import org.jboss.beans.metadata.plugins.MutableLifecycleHolder;
-import org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData;
import org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData2;
import org.jboss.beans.metadata.spi.AnnotationMetaData;
import org.jboss.beans.metadata.spi.BeanMetaData;
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/BasicKernelDeployer.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/BasicKernelDeployer.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/BasicKernelDeployer.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -95,10 +95,10 @@
*/
public void shutdown()
{
- ListIterator iterator = deployments.listIterator(deployments.size());
+ ListIterator<KernelDeployment> iterator = deployments.listIterator(deployments.size());
while (iterator.hasPrevious())
{
- KernelDeployment deployment = (KernelDeployment) iterator.previous();
+ KernelDeployment deployment = iterator.previous();
undeploy(deployment);
}
}
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/props/VertexFactory.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/props/VertexFactory.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/props/VertexFactory.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -44,7 +44,7 @@
* @param name full name
* @return new tree vertex
*/
- TreeVertex createVertex(int level, String name);
+ TreeVertex<?> createVertex(int level, String name);
/**
* Create value vertext.
@@ -52,7 +52,7 @@
* @param value the text value
* @return new value vertex
*/
- TreeVertex valueVertex(String value);
+ TreeVertex<?> valueVertex(String value);
/**
* Get the visitor.
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/props/vertex/BeanVertexFactory.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/props/vertex/BeanVertexFactory.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/props/vertex/BeanVertexFactory.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -43,7 +43,7 @@
super(Integer.MAX_VALUE);
}
- public TreeVertex createVertex(String name)
+ public TreeVertex<?> createVertex(String name)
{
return new BeanVertex(name);
}
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/props/vertex/ClassVertexFactory.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/props/vertex/ClassVertexFactory.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/props/vertex/ClassVertexFactory.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -38,7 +38,7 @@
super("(class)");
}
- protected TreeVertex createVertex(String name, String keyword)
+ protected TreeVertex<?> createVertex(String name, String keyword)
{
return new ClassVertex(name);
}
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/props/vertex/DefaultVertexFactory.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/props/vertex/DefaultVertexFactory.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/props/vertex/DefaultVertexFactory.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -70,7 +70,7 @@
return new BaseDeploymentVertex();
}
- public TreeVertex createVertex(int level, String name)
+ public TreeVertex<?> createVertex(int level, String name)
{
Set<LevelVertexFactory> factories = levelFactories.get(level);
if (factories == null)
@@ -78,7 +78,7 @@
for(LevelVertexFactory factory : factories)
{
- TreeVertex vertex = factory.createVertex(name);
+ TreeVertex<?> vertex = factory.createVertex(name);
if (vertex != null)
return vertex;
}
@@ -90,14 +90,14 @@
* e.g. injection
*
* @param value
- * @return
+ * @return true when it is complex
*/
protected boolean isValueComplex(String value)
{
return value.contains(".");
}
- public TreeVertex valueVertex(String value)
+ public TreeVertex<? extends Vertex<String>> valueVertex(String value)
{
if (isValueComplex(value))
return new ComplexValueVertex(value);
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/props/vertex/HolderVertexFactory.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/props/vertex/HolderVertexFactory.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/props/vertex/HolderVertexFactory.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -38,7 +38,7 @@
super(Integer.MAX_VALUE);
}
- public TreeVertex createVertex(String name)
+ public TreeVertex<?> createVertex(String name)
{
return new HolderVertex(name);
}
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/props/vertex/KeywordLevelVertexFactory.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/props/vertex/KeywordLevelVertexFactory.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/props/vertex/KeywordLevelVertexFactory.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -39,7 +39,7 @@
this.keyword = keyword;
}
- public TreeVertex createVertex(String name)
+ public TreeVertex<?> createVertex(String name)
{
int p = name.lastIndexOf(".") + 1;
String keyword = name.substring(p);
@@ -57,5 +57,5 @@
* @param keyword the keyword
* @return new vertex instance
*/
- protected abstract TreeVertex createVertex(String name, String keyword);
+ protected abstract TreeVertex<?> createVertex(String name, String keyword);
}
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/props/vertex/LevelVertexFactory.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/props/vertex/LevelVertexFactory.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/props/vertex/LevelVertexFactory.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -39,7 +39,7 @@
* @param name the name
* @return new vertex instance or null if cannot create vertex from name
*/
- TreeVertex createVertex(String name);
+ TreeVertex<?> createVertex(String name);
/**
* Get the order.
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/props/vertex/PropertyVertexFactory.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/props/vertex/PropertyVertexFactory.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/props/vertex/PropertyVertexFactory.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -39,7 +39,7 @@
super(Integer.MAX_VALUE);
}
- public TreeVertex createVertex(String name)
+ public TreeVertex<?> createVertex(String name)
{
return new PropertyVertex(name);
}
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BasicXMLDeployer.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BasicXMLDeployer.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BasicXMLDeployer.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -78,7 +78,7 @@
super(kernel, mode);
}
- public Collection getDeploymentNames()
+ public Collection<String> getDeploymentNames()
{
return deploymentsByName.keySet();
}
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BeanSchemaBindingHelper.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BeanSchemaBindingHelper.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BeanSchemaBindingHelper.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -321,7 +321,7 @@
*/
public static void initNamedAliasHandlers(TypeBinding aliasType)
{
- aliasType.setHandler(NamedAliasHandler.HANDLER);
+ aliasType.setHandler(NamedAliasHandler.NAMED_ALIAS_HANDLER);
// alias can take characters
aliasType.setSimpleType(AliasCharactersHandler.HANDLER);
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/NamedAliasHandler.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/NamedAliasHandler.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/NamedAliasHandler.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -38,7 +38,7 @@
/**
* The alias handler
*/
- public static final NamedAliasHandler HANDLER = new NamedAliasHandler();
+ public static final NamedAliasHandler NAMED_ALIAS_HANDLER = new NamedAliasHandler();
public Object startElement(Object parent, QName name, ElementBinding element)
{
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/event/AbstractEventEmitter.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/event/AbstractEventEmitter.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/event/AbstractEventEmitter.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -139,11 +139,11 @@
log.trace("Firing event: " + event + " on object " + this);
if (eventListenerRegistry.isEmpty() == false)
{
- for (Iterator i = eventListenerRegistry.entrySet().iterator(); i.hasNext();)
+ for (Iterator<Map.Entry<KernelEventFilter, Map<Object, List<KernelEventListener>>>> i = eventListenerRegistry.entrySet().iterator(); i.hasNext();)
{
- Map.Entry registryEntry = (Map.Entry) i.next();
+ Map.Entry<KernelEventFilter, Map<Object, List<KernelEventListener>>> registryEntry = i.next();
- Map handbacks = (Map) registryEntry.getValue();
+ Map<Object, List<KernelEventListener>> handbacks = registryEntry.getValue();
if (handbacks != null)
{
KernelEventFilter filter = null;
@@ -151,19 +151,19 @@
if (filterObject != NULL_FILTER)
filter = (KernelEventFilter) filterObject;
- for (Iterator j = handbacks.entrySet().iterator(); j.hasNext();)
+ for (Iterator<Map.Entry<Object, List<KernelEventListener>>> j = handbacks.entrySet().iterator(); j.hasNext();)
{
- Map.Entry handbackEntry = (Map.Entry) j.next();
- List listeners = (List) handbackEntry.getValue();
+ Map.Entry<Object, List<KernelEventListener>> handbackEntry = j.next();
+ List<KernelEventListener> listeners = handbackEntry.getValue();
if (listeners != null)
{
Object handback = handbackEntry.getKey();
if (handback == NULL)
handback = null;
- for (ListIterator k = listeners.listIterator(); k.hasNext();)
+ for (ListIterator<KernelEventListener> k = listeners.listIterator(); k.hasNext();)
{
- KernelEventListener listener = (KernelEventListener) k.next();
+ KernelEventListener listener = k.next();
try
{
if (filter == null || filter.wantEvent(event, handback))
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/lazy/AbstractLazyInitializer.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/lazy/AbstractLazyInitializer.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/lazy/AbstractLazyInitializer.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -49,9 +49,9 @@
{
private String bean;
private KernelBus bus;
- private Class proxyClass;
+ private Class<?> proxyClass;
- protected AbstractInvokeHandler(String bean, KernelBus bus, Class proxyClass)
+ protected AbstractInvokeHandler(String bean, KernelBus bus, Class<?> proxyClass)
{
if (bean == null)
throw new IllegalArgumentException("Null bean name.");
@@ -110,8 +110,8 @@
protected static boolean isGetter(Method minfo)
{
String name = minfo.getName();
- Class returnType = minfo.getReturnType();
- Class[] parameters = minfo.getParameterTypes();
+ Class<?> returnType = minfo.getReturnType();
+ Class<?>[] parameters = minfo.getParameterTypes();
if ((name.length() > 3 && name.startsWith("get")) || (name.length() > 2 && name.startsWith("is")))
{
// isBoolean() is not a getter for java.lang.Boolean
@@ -132,8 +132,8 @@
protected static boolean isSetter(Method minfo)
{
String name = minfo.getName();
- Class returnType = minfo.getReturnType();
- Class[] parameters = minfo.getParameterTypes();
+ Class<?> returnType = minfo.getReturnType();
+ Class<?>[] parameters = minfo.getParameterTypes();
if ((name.length() > 3 && name.startsWith("set")))
{
if (parameters.length == 1 && Void.TYPE.equals(returnType))
@@ -209,10 +209,10 @@
* @return array of classes
* @throws Throwable for any error
*/
- protected static Class[] getClasses(KernelConfigurator configurator, Set<String> classNames, ClassLoader cl)
+ protected static Class<?>[] getClasses(KernelConfigurator configurator, Set<String> classNames, ClassLoader cl)
throws Throwable
{
- Class[] classes = new Class[classNames.size()];
+ Class<?>[] classes = new Class[classNames.size()];
int i = 0;
for (String className : classNames)
{
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/lazy/JDKLazyInitializer.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/lazy/JDKLazyInitializer.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/lazy/JDKLazyInitializer.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -60,7 +60,7 @@
*/
public class LazyHandler extends AbstractInvokeHandler implements InvocationHandler
{
- public LazyHandler(String bean, KernelBus bus, Class proxyClass)
+ public LazyHandler(String bean, KernelBus bus, Class<?> proxyClass)
{
super(bean, bus, proxyClass);
}
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/lazy/JavassistLazyInitializer.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/lazy/JavassistLazyInitializer.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/lazy/JavassistLazyInitializer.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -61,13 +61,13 @@
ClassLoader cl = Configurator.getClassLoader(context.getBeanMetaData());
factory.setInterfaces(getClasses(kernel.getConfigurator(), interfaces, cl));
}
- Class proxyClass = getProxyClass(factory);
+ Class<?> proxyClass = getProxyClass(factory);
ProxyObject proxy = (ProxyObject)proxyClass.newInstance();
proxy.setHandler(new LazyHandler(bean, kernel.getBus(), beanInfo.getClassInfo().getType()));
return proxy;
}
- protected Class getProxyClass(ProxyFactory factory)
+ protected Class<?> getProxyClass(ProxyFactory factory)
{
SecurityManager sm = System.getSecurityManager();
if (sm == null)
@@ -90,7 +90,7 @@
*/
public class LazyHandler extends AbstractInvokeHandler implements MethodHandler
{
- public LazyHandler(String bean, KernelBus bus, Class proxyClass)
+ public LazyHandler(String bean, KernelBus bus, Class<?> proxyClass)
{
super(bean, bus, proxyClass);
}
@@ -104,7 +104,7 @@
/**
* Privileged class creator.
*/
- protected class ClassCreator implements PrivilegedAction<Class>
+ protected class ClassCreator implements PrivilegedAction<Class<?>>
{
private ProxyFactory factory;
@@ -113,7 +113,7 @@
this.factory = factory;
}
- public Class run()
+ public Class<?> run()
{
return factory.createClass();
}
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/registry/AbstractKernelRegistry.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/registry/AbstractKernelRegistry.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/registry/AbstractKernelRegistry.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -79,9 +79,9 @@
public KernelRegistryEntry getEntry(Object name)
{
- for (ListIterator i = factories.listIterator(); i.hasNext();)
+ for (ListIterator<KernelRegistryPlugin> i = factories.listIterator(); i.hasNext();)
{
- KernelRegistryPlugin factory = (KernelRegistryPlugin) i.next();
+ KernelRegistryPlugin factory = i.next();
KernelRegistryEntry entry = factory.getEntry(name);
if (entry != null)
return entry;
@@ -91,10 +91,10 @@
public boolean containsEntry(Object name)
{
- Iterator i = factories.iterator();
+ Iterator<KernelRegistryPlugin> i = factories.iterator();
while (i.hasNext())
{
- KernelRegistryPlugin factory = (KernelRegistryPlugin) i.next();
+ KernelRegistryPlugin factory = i.next();
KernelRegistryEntry entry = factory.getEntry(name);
if (entry != null)
return true;
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/spi/config/KernelConfig.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/spi/config/KernelConfig.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/spi/config/KernelConfig.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -60,7 +60,7 @@
* @return the bean info
* @throws Throwable for any error
*/
- BeanInfo getBeanInfo(Class clazz) throws Throwable;
+ BeanInfo getBeanInfo(Class<?> clazz) throws Throwable;
/**
* Get the bean info
@@ -88,7 +88,7 @@
* @return the class info
* @throws Throwable for any error
*/
- ClassInfo getClassInfo(Class clazz) throws Throwable;
+ ClassInfo getClassInfo(Class<?> clazz) throws Throwable;
/**
* Create a kernel bus
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/spi/config/KernelConfigurator.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/spi/config/KernelConfigurator.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/spi/config/KernelConfigurator.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -66,7 +66,7 @@
* @return the bean info
* @throws Throwable for any error
*/
- BeanInfo getBeanInfo(Class clazz) throws Throwable;
+ BeanInfo getBeanInfo(Class<?> clazz) throws Throwable;
/**
* Get the BeanInfo
@@ -103,7 +103,7 @@
* @return the class info
* @throws Throwable for any error
*/
- ClassInfo getClassInfo(Class clazz) throws Throwable;
+ ClassInfo getClassInfo(Class<?> clazz) throws Throwable;
/**
* Get a constructor join point
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/spi/dependency/KernelControllerContext.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/spi/dependency/KernelControllerContext.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/spi/dependency/KernelControllerContext.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -26,7 +26,6 @@
import org.jboss.dependency.spi.dispatch.InvokeDispatchContext;
import org.jboss.kernel.Kernel;
import org.jboss.kernel.spi.registry.KernelRegistryEntry;
-import org.jboss.metadata.spi.MetaData;
/**
* Information about dependencies and state.
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/spi/dependency/helpers/UnmodifiableKernelControllerContext.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/spi/dependency/helpers/UnmodifiableKernelControllerContext.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/spi/dependency/helpers/UnmodifiableKernelControllerContext.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -27,7 +27,6 @@
import org.jboss.dependency.spi.helpers.UnmodifiableControllerContext;
import org.jboss.kernel.Kernel;
import org.jboss.kernel.spi.dependency.KernelControllerContext;
-import org.jboss.metadata.spi.MetaData;
/**
* Unmodifiable instance.
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/classloading/vfs/ClassLoaderUtil.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/classloading/vfs/ClassLoaderUtil.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/classloading/vfs/ClassLoaderUtil.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -42,7 +42,7 @@
*/
public static URL getLocation(String className) throws ClassNotFoundException
{
- Class clazz = Class.forName(className);
+ Class<?> clazz = Class.forName(className);
return clazz.getProtectionDomain().getCodeSource().getLocation();
}
@@ -52,7 +52,7 @@
* @param clazz the class
* @return the classloader
*/
- public static ClassLoader getClassLoader(final Class clazz)
+ public static ClassLoader getClassLoader(final Class<?> clazz)
{
if (clazz == null)
throw new IllegalArgumentException("Null clazz.");
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/classloading/vfs/VFSClassLoader.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/classloading/vfs/VFSClassLoader.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/classloading/vfs/VFSClassLoader.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -53,7 +53,7 @@
if (name.startsWith("org.jboss.test") == false)
return getClass().getClassLoader().loadClass(name);
- Class c;
+ Class<?> c;
try
{
c = super.loadClass(name, flag);
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/junit/test/JUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/junit/test/JUnitTestCase.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/junit/test/JUnitTestCase.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -51,7 +51,7 @@
* @return the delegate
* @throws Exception for any error
*/
- public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+ public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
{
AbstractTestDelegate delegate = MicrocontainerTest.getDelegate(clazz);
delegate.enableSecurity = true;
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/AbstractKernelTest.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/AbstractKernelTest.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/AbstractKernelTest.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -98,7 +98,7 @@
* @return the delegate
* @throws Exception for any error
*/
- public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+ public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
{
AbstractTestDelegate delegate = new AbstractTestDelegate(clazz);
delegate.enableSecurity = true;
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/support/TestAnnotationPlugin.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/support/TestAnnotationPlugin.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/support/TestAnnotationPlugin.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -32,6 +32,7 @@
import org.jboss.metadata.spi.MetaData;
/**
+ * @param <T> the annotation type
* @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
*/
public class TestAnnotationPlugin<T extends Annotation> extends AbstractAnnotationPlugin<MethodInfo, T>
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/test/override/CallbackAnnotationOverrideTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/test/override/CallbackAnnotationOverrideTestCase.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/test/override/CallbackAnnotationOverrideTestCase.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -21,20 +21,20 @@
*/
package org.jboss.test.kernel.annotations.test.override;
-import java.util.List;
import java.util.ArrayList;
+import java.util.List;
-import org.jboss.dependency.spi.Controller;
-import org.jboss.dependency.spi.ControllerContext;
+import junit.framework.Test;
+
import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
import org.jboss.beans.metadata.plugins.InstallCallbackMetaData;
import org.jboss.beans.metadata.plugins.UninstallCallbackMetaData;
import org.jboss.beans.metadata.spi.CallbackMetaData;
-import org.jboss.test.kernel.annotations.support.AnnotationTester;
-import org.jboss.test.kernel.annotations.support.MyDeployer;
+import org.jboss.dependency.spi.Controller;
import org.jboss.kernel.spi.dependency.KernelController;
import org.jboss.kernel.spi.dependency.KernelControllerContext;
-import junit.framework.Test;
+import org.jboss.test.kernel.annotations.support.AnnotationTester;
+import org.jboss.test.kernel.annotations.support.MyDeployer;
/**
* @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
@@ -42,7 +42,6 @@
public class CallbackAnnotationOverrideTestCase extends AbstractAnnotationOverrideTestCase
{
private Controller controller;
- private ControllerContext context;
public CallbackAnnotationOverrideTestCase(String name) throws Throwable
{
@@ -100,13 +99,11 @@
{
controller.install(new AbstractBeanMetaData("deployer", MyDeployer.class.getName()));
this.controller = controller;
- this.context = context;
}
protected void doUndeploy()
{
controller.uninstall("deployer");
controller = null;
- context = null;
}
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/test/override/SetsAnnotationOverrideTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/test/override/SetsAnnotationOverrideTestCase.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/test/override/SetsAnnotationOverrideTestCase.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -91,7 +91,7 @@
return context.getBeanMetaData();
}
- protected void assertSet(Set set)
+ protected void assertSet(Set<?> set)
{
assertNotNull(set);
assertEquals(1, set.size());
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/bootstrap/test/BootstrapTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/bootstrap/test/BootstrapTestCase.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/bootstrap/test/BootstrapTestCase.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -58,7 +58,7 @@
* @return the delegate
* @throws Exception for any error
*/
- public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+ public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
{
AbstractTestDelegate delegate = new AbstractTestDelegate(clazz);
delegate.enableSecurity = true;
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomArraySimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomArraySimpleBean.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomArraySimpleBean.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -32,6 +32,9 @@
*/
public class FromCustomArraySimpleBean extends SimpleBean
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
@ArrayValue(
value = {
@Value(string = @StringValue("string1")),
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomCollectionSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomCollectionSimpleBean.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomCollectionSimpleBean.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -34,6 +34,9 @@
*/
public class FromCustomCollectionSimpleBean extends SimpleBean
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
@CollectionValue(
value = {
@Value(string = @StringValue("string1")),
@@ -44,7 +47,7 @@
elementClass = "java.lang.String",
clazz = "org.jboss.test.kernel.config.support.CustomCollection"
)
- public void setCollection(Collection collection)
+ public void setCollection(Collection<?> collection)
{
super.setCollection(collection);
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomListSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomListSimpleBean.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomListSimpleBean.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -34,6 +34,9 @@
*/
public class FromCustomListSimpleBean extends SimpleBean
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
@ListValue(
value = {
@Value(string = @StringValue("string1")),
@@ -44,7 +47,7 @@
elementClass = "java.lang.String",
clazz = "org.jboss.test.kernel.config.support.CustomList"
)
- public void setList(List collection)
+ public void setList(List<?> collection)
{
super.setList(collection);
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomMapSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomMapSimpleBean.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomMapSimpleBean.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -35,6 +35,9 @@
*/
public class FromCustomMapSimpleBean extends SimpleBean
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
@MapValue(
value = {
@EntryValue(
@@ -49,7 +52,7 @@
keyClass = "java.lang.String", valueClass = "java.lang.String",
clazz = "org.jboss.test.kernel.config.support.CustomMap"
)
- public void setMap(Map collection)
+ public void setMap(Map<?,?> collection)
{
super.setMap(collection);
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomSetSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomSetSimpleBean.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomSetSimpleBean.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -34,6 +34,9 @@
*/
public class FromCustomSetSimpleBean extends SimpleBean
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
@SetValue(
value = {
@Value(string = @StringValue("string1")),
@@ -44,7 +47,7 @@
elementClass = "java.lang.String",
clazz = "org.jboss.test.kernel.config.support.CustomSet"
)
- public void setSet(Set collection)
+ public void setSet(Set<?> collection)
{
super.setSet(collection);
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomSignatureArraySimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomSignatureArraySimpleBean.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomSignatureArraySimpleBean.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -32,6 +32,9 @@
*/
public class FromCustomSignatureArraySimpleBean extends SimpleBean
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
@ArrayValue(
value = {
@Value(string = @StringValue("string1")),
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomSignatureCollectionSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomSignatureCollectionSimpleBean.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomSignatureCollectionSimpleBean.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -32,6 +32,9 @@
*/
public class FromCustomSignatureCollectionSimpleBean extends SimpleBean
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
@CollectionValue(
value = {
@Value(string = @StringValue("string1")),
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomSignatureListSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomSignatureListSimpleBean.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomSignatureListSimpleBean.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -32,6 +32,9 @@
*/
public class FromCustomSignatureListSimpleBean extends SimpleBean
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
@ListValue(
value = {
@Value(string = @StringValue("string1")),
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomSignatureMapSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomSignatureMapSimpleBean.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomSignatureMapSimpleBean.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -33,6 +33,9 @@
*/
public class FromCustomSignatureMapSimpleBean extends SimpleBean
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
@MapValue(
value = {
@EntryValue(
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomSignatureSetSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomSignatureSetSimpleBean.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomSignatureSetSimpleBean.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -32,6 +32,9 @@
*/
public class FromCustomSignatureSetSimpleBean extends SimpleBean
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
@SetValue(
value = {
@Value(string = @StringValue("string1")),
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromFactorySimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromFactorySimpleBean.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromFactorySimpleBean.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -42,6 +42,9 @@
)
public class FromFactorySimpleBean extends SimpleBean
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
public FromFactorySimpleBean()
{
}
@@ -61,22 +64,22 @@
super(integer);
}
- public FromFactorySimpleBean(Comparable comparable)
+ public FromFactorySimpleBean(Comparable<?> comparable)
{
super(comparable);
}
- public FromFactorySimpleBean(Collection collection)
+ public FromFactorySimpleBean(Collection<?> collection)
{
super(collection);
}
- public FromFactorySimpleBean(List list)
+ public FromFactorySimpleBean(List<?> list)
{
super(list);
}
- public FromFactorySimpleBean(Set set)
+ public FromFactorySimpleBean(Set<?> set)
{
super(set);
}
@@ -86,12 +89,12 @@
super(array);
}
- public FromFactorySimpleBean(Map map)
+ public FromFactorySimpleBean(Map<?,?> map)
{
super(map);
}
- public FromFactorySimpleBean(Hashtable hashtable)
+ public FromFactorySimpleBean(Hashtable<?,?> hashtable)
{
super(hashtable);
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromFactoryWithIntParamSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromFactoryWithIntParamSimpleBean.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromFactoryWithIntParamSimpleBean.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -44,6 +44,9 @@
)
public class FromFactoryWithIntParamSimpleBean extends SimpleBean
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
public FromFactoryWithIntParamSimpleBean()
{
}
@@ -63,22 +66,22 @@
super(integer);
}
- public FromFactoryWithIntParamSimpleBean(Comparable comparable)
+ public FromFactoryWithIntParamSimpleBean(Comparable<?> comparable)
{
super(comparable);
}
- public FromFactoryWithIntParamSimpleBean(Collection collection)
+ public FromFactoryWithIntParamSimpleBean(Collection<?> collection)
{
super(collection);
}
- public FromFactoryWithIntParamSimpleBean(List list)
+ public FromFactoryWithIntParamSimpleBean(List<?> list)
{
super(list);
}
- public FromFactoryWithIntParamSimpleBean(Set set)
+ public FromFactoryWithIntParamSimpleBean(Set<?> set)
{
super(set);
}
@@ -88,12 +91,12 @@
super(array);
}
- public FromFactoryWithIntParamSimpleBean(Map map)
+ public FromFactoryWithIntParamSimpleBean(Map<?,?> map)
{
super(map);
}
- public FromFactoryWithIntParamSimpleBean(Hashtable hashtable)
+ public FromFactoryWithIntParamSimpleBean(Hashtable<?,?> hashtable)
{
super(hashtable);
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromFactoryWithParamSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromFactoryWithParamSimpleBean.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromFactoryWithParamSimpleBean.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -44,6 +44,9 @@
)
public class FromFactoryWithParamSimpleBean extends SimpleBean
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
public FromFactoryWithParamSimpleBean()
{
}
@@ -63,22 +66,22 @@
super(integer);
}
- public FromFactoryWithParamSimpleBean(Comparable comparable)
+ public FromFactoryWithParamSimpleBean(Comparable<?> comparable)
{
super(comparable);
}
- public FromFactoryWithParamSimpleBean(Collection collection)
+ public FromFactoryWithParamSimpleBean(Collection<?> collection)
{
super(collection);
}
- public FromFactoryWithParamSimpleBean(List list)
+ public FromFactoryWithParamSimpleBean(List<?> list)
{
super(list);
}
- public FromFactoryWithParamSimpleBean(Set set)
+ public FromFactoryWithParamSimpleBean(Set<?> set)
{
super(set);
}
@@ -88,12 +91,12 @@
super(array);
}
- public FromFactoryWithParamSimpleBean(Map map)
+ public FromFactoryWithParamSimpleBean(Map<?, ?> map)
{
super(map);
}
- public FromFactoryWithParamSimpleBean(Hashtable hashtable)
+ public FromFactoryWithParamSimpleBean(Hashtable<?,?> hashtable)
{
super(hashtable);
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromObjectsArraySimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromObjectsArraySimpleBean.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromObjectsArraySimpleBean.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -32,6 +32,9 @@
*/
public class FromObjectsArraySimpleBean extends SimpleBean
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
@ArrayValue(
value = {
@Value(javabean = @JavaBeanValue("org.jboss.test.kernel.config.support.MyObject1")),
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromObjectsCollectionSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromObjectsCollectionSimpleBean.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromObjectsCollectionSimpleBean.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -34,6 +34,9 @@
*/
public class FromObjectsCollectionSimpleBean extends SimpleBean
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
@CollectionValue(
value = {
@Value(javabean = @JavaBeanValue("org.jboss.test.kernel.config.support.MyObject1")),
@@ -43,7 +46,7 @@
},
elementClass = "java.lang.Object"
)
- public void setCollection(Collection collection)
+ public void setCollection(Collection<?> collection)
{
super.setCollection(collection);
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromObjectsListSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromObjectsListSimpleBean.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromObjectsListSimpleBean.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -34,6 +34,9 @@
*/
public class FromObjectsListSimpleBean extends SimpleBean
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
@ListValue(
value = {
@Value(javabean = @JavaBeanValue("org.jboss.test.kernel.config.support.MyObject1")),
@@ -43,7 +46,7 @@
},
elementClass = "java.lang.Object"
)
- public void setList(List collection)
+ public void setList(List<?> collection)
{
super.setList(collection);
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromObjectsMapSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromObjectsMapSimpleBean.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromObjectsMapSimpleBean.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -35,6 +35,9 @@
*/
public class FromObjectsMapSimpleBean extends SimpleBean
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
@MapValue(
value = {
@EntryValue(
@@ -49,7 +52,7 @@
keyClass = "java.lang.Object",
valueClass = "java.lang.Object"
)
- public void setMap(Map collection)
+ public void setMap(Map<?,?> collection)
{
super.setMap(collection);
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromObjectsSetSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromObjectsSetSimpleBean.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromObjectsSetSimpleBean.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -34,6 +34,9 @@
*/
public class FromObjectsSetSimpleBean extends SimpleBean
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
@SetValue(
value = {
@Value(javabean = @JavaBeanValue("org.jboss.test.kernel.config.support.MyObject1")),
@@ -43,7 +46,7 @@
},
elementClass = "java.lang.Object"
)
- public void setSet(Set collection)
+ public void setSet(Set<?> collection)
{
super.setSet(collection);
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromPreinstArraySimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromPreinstArraySimpleBean.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromPreinstArraySimpleBean.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -33,6 +33,9 @@
*/
public class FromPreinstArraySimpleBean extends SimpleBean
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
@ArrayValue(
value = {
@Value(string = @StringValue("string1")),
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromPreinstCollectionSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromPreinstCollectionSimpleBean.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromPreinstCollectionSimpleBean.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -34,6 +34,9 @@
*/
public class FromPreinstCollectionSimpleBean extends SimpleBean
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
@CollectionValue(
value = {
@Value(string = @StringValue("string1")),
@@ -54,7 +57,7 @@
},
elementClass = "java.lang.String"
)
- public void setSetterCollection(Collection setterCollection)
+ public void setSetterCollection(Collection<?> setterCollection)
{
super.setSetterCollection(setterCollection);
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromPreinstListSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromPreinstListSimpleBean.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromPreinstListSimpleBean.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -34,6 +34,9 @@
*/
public class FromPreinstListSimpleBean extends SimpleBean
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
@ListValue(
value = {
@Value(string = @StringValue("string1")),
@@ -54,7 +57,7 @@
},
elementClass = "java.lang.String"
)
- public void setSetterList(List setterList)
+ public void setSetterList(List<?> setterList)
{
super.setSetterList(setterList);
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromPreinstMapSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromPreinstMapSimpleBean.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromPreinstMapSimpleBean.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -35,6 +35,9 @@
*/
public class FromPreinstMapSimpleBean extends SimpleBean
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
@MapValue(
value = {
@EntryValue(
@@ -64,7 +67,7 @@
keyClass = "java.lang.String",
valueClass = "java.lang.String"
)
- public void setSetterMap(Map setterMap)
+ public void setSetterMap(Map<?,?> setterMap)
{
super.setSetterMap(setterMap);
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromPreinstSetSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromPreinstSetSimpleBean.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromPreinstSetSimpleBean.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -34,6 +34,9 @@
*/
public class FromPreinstSetSimpleBean extends SimpleBean
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
@SetValue(
value = {
@Value(string = @StringValue("string1")),
@@ -54,7 +57,7 @@
},
elementClass = "java.lang.String"
)
- public void setSetterSet(Set setterSet)
+ public void setSetterSet(Set<?> setterSet)
{
super.setSetterSet(setterSet);
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStaticFactorySimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStaticFactorySimpleBean.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStaticFactorySimpleBean.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -40,6 +40,9 @@
)
public class FromStaticFactorySimpleBean extends SimpleBean
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
public FromStaticFactorySimpleBean()
{
}
@@ -59,22 +62,22 @@
super(integer);
}
- public FromStaticFactorySimpleBean(Comparable comparable)
+ public FromStaticFactorySimpleBean(Comparable<?> comparable)
{
super(comparable);
}
- public FromStaticFactorySimpleBean(Collection collection)
+ public FromStaticFactorySimpleBean(Collection<?> collection)
{
super(collection);
}
- public FromStaticFactorySimpleBean(List list)
+ public FromStaticFactorySimpleBean(List<?> list)
{
super(list);
}
- public FromStaticFactorySimpleBean(Set set)
+ public FromStaticFactorySimpleBean(Set<?> set)
{
super(set);
}
@@ -84,12 +87,12 @@
super(array);
}
- public FromStaticFactorySimpleBean(Map map)
+ public FromStaticFactorySimpleBean(Map<?, ?> map)
{
super(map);
}
- public FromStaticFactorySimpleBean(Hashtable hashtable)
+ public FromStaticFactorySimpleBean(Hashtable<?,?> hashtable)
{
super(hashtable);
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStaticFactoryWithIntParamSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStaticFactoryWithIntParamSimpleBean.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStaticFactoryWithIntParamSimpleBean.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -43,6 +43,9 @@
)
public class FromStaticFactoryWithIntParamSimpleBean extends SimpleBean
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
public FromStaticFactoryWithIntParamSimpleBean()
{
}
@@ -62,22 +65,22 @@
super(integer);
}
- public FromStaticFactoryWithIntParamSimpleBean(Comparable comparable)
+ public FromStaticFactoryWithIntParamSimpleBean(Comparable<?> comparable)
{
super(comparable);
}
- public FromStaticFactoryWithIntParamSimpleBean(Collection collection)
+ public FromStaticFactoryWithIntParamSimpleBean(Collection<?> collection)
{
super(collection);
}
- public FromStaticFactoryWithIntParamSimpleBean(List list)
+ public FromStaticFactoryWithIntParamSimpleBean(List<?> list)
{
super(list);
}
- public FromStaticFactoryWithIntParamSimpleBean(Set set)
+ public FromStaticFactoryWithIntParamSimpleBean(Set<?> set)
{
super(set);
}
@@ -87,12 +90,12 @@
super(array);
}
- public FromStaticFactoryWithIntParamSimpleBean(Map map)
+ public FromStaticFactoryWithIntParamSimpleBean(Map<?,?> map)
{
super(map);
}
- public FromStaticFactoryWithIntParamSimpleBean(Hashtable hashtable)
+ public FromStaticFactoryWithIntParamSimpleBean(Hashtable<?,?> hashtable)
{
super(hashtable);
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStaticFactoryWithParamSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStaticFactoryWithParamSimpleBean.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStaticFactoryWithParamSimpleBean.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -43,6 +43,9 @@
)
public class FromStaticFactoryWithParamSimpleBean extends SimpleBean
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
public FromStaticFactoryWithParamSimpleBean()
{
}
@@ -62,22 +65,22 @@
super(integer);
}
- public FromStaticFactoryWithParamSimpleBean(Comparable comparable)
+ public FromStaticFactoryWithParamSimpleBean(Comparable<?> comparable)
{
super(comparable);
}
- public FromStaticFactoryWithParamSimpleBean(Collection collection)
+ public FromStaticFactoryWithParamSimpleBean(Collection<?> collection)
{
super(collection);
}
- public FromStaticFactoryWithParamSimpleBean(List list)
+ public FromStaticFactoryWithParamSimpleBean(List<?> list)
{
super(list);
}
- public FromStaticFactoryWithParamSimpleBean(Set set)
+ public FromStaticFactoryWithParamSimpleBean(Set<?> set)
{
super(set);
}
@@ -87,12 +90,12 @@
super(array);
}
- public FromStaticFactoryWithParamSimpleBean(Map map)
+ public FromStaticFactoryWithParamSimpleBean(Map<?,?> map)
{
super(map);
}
- public FromStaticFactoryWithParamSimpleBean(Hashtable hashtable)
+ public FromStaticFactoryWithParamSimpleBean(Hashtable<?,?> hashtable)
{
super(hashtable);
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringSimpleBean.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringSimpleBean.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -34,6 +34,9 @@
*/
public class FromStringSimpleBean extends SimpleBean
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
public FromStringSimpleBean()
{
super();
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsArraySimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsArraySimpleBean.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsArraySimpleBean.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -33,6 +33,9 @@
*/
public class FromStringsArraySimpleBean extends SimpleBean
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
@ArrayValue(
value = {
@Value(string = @StringValue("string1")),
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsArrayUnmodifiableObject.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsArrayUnmodifiableObject.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsArrayUnmodifiableObject.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -34,6 +34,9 @@
*/
public class FromStringsArrayUnmodifiableObject extends UnmodifiableGetterBean
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
@ListValue(
value = {
@Value(string = @StringValue("string1")),
@@ -44,7 +47,7 @@
elementClass = "java.lang.String",
clazz = "java.util.ArrayList"
)
- public void setList(List list)
+ public void setList(List<?> list)
{
super.setList(list);
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsCollectionSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsCollectionSimpleBean.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsCollectionSimpleBean.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -34,6 +34,9 @@
*/
public class FromStringsCollectionSimpleBean extends SimpleBean
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
@CollectionValue(
value = {
@Value(string = @StringValue("string1")),
@@ -43,7 +46,7 @@
},
elementClass = "java.lang.String"
)
- public void setCollection(Collection collection)
+ public void setCollection(Collection<?> collection)
{
super.setCollection(collection);
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsCollectionUnmodifiableObject.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsCollectionUnmodifiableObject.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsCollectionUnmodifiableObject.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -34,6 +34,9 @@
*/
public class FromStringsCollectionUnmodifiableObject extends UnmodifiableGetterBean
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
@CollectionValue(
value = {
@Value(string = @StringValue("string1")),
@@ -44,7 +47,7 @@
elementClass = "java.lang.String",
clazz = "java.util.ArrayList"
)
- public void setCollection(Collection collection)
+ public void setCollection(Collection<?> collection)
{
super.setCollection(collection);
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsListSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsListSimpleBean.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsListSimpleBean.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -34,6 +34,9 @@
*/
public class FromStringsListSimpleBean extends SimpleBean
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
@ListValue(
value = {
@Value(string = @StringValue("string1")),
@@ -43,7 +46,7 @@
},
elementClass = "java.lang.String"
)
- public void setList(List collection)
+ public void setList(List<?> collection)
{
super.setList(collection);
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsListUnmodifiableObject.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsListUnmodifiableObject.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsListUnmodifiableObject.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -34,6 +34,9 @@
*/
public class FromStringsListUnmodifiableObject extends UnmodifiableGetterBean
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
@ListValue(
value = {
@Value(string = @StringValue("string1")),
@@ -44,7 +47,7 @@
elementClass = "java.lang.String",
clazz = "java.util.ArrayList"
)
- public void setList(List list)
+ public void setList(List<?> list)
{
super.setList(list);
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsMapSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsMapSimpleBean.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsMapSimpleBean.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -35,6 +35,9 @@
*/
public class FromStringsMapSimpleBean extends SimpleBean
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
@MapValue(
value = {
@EntryValue(
@@ -49,7 +52,7 @@
keyClass = "java.lang.String",
valueClass = "java.lang.String"
)
- public void setMap(Map collection)
+ public void setMap(Map<?,?> collection)
{
super.setMap(collection);
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsMapUnmodifiableObject.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsMapUnmodifiableObject.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsMapUnmodifiableObject.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -35,6 +35,9 @@
*/
public class FromStringsMapUnmodifiableObject extends UnmodifiableGetterBean
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
@MapValue(
value = {
@EntryValue(
@@ -50,7 +53,7 @@
valueClass = "java.lang.String",
clazz = "java.util.HashMap"
)
- public void setMap(Map map)
+ public void setMap(Map<?,?> map)
{
super.setMap(map);
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsSetSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsSetSimpleBean.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsSetSimpleBean.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -34,6 +34,9 @@
*/
public class FromStringsSetSimpleBean extends SimpleBean
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
@SetValue(
value = {
@Value(string = @StringValue("string1")),
@@ -43,7 +46,7 @@
},
elementClass = "java.lang.String"
)
- public void setSet(Set collection)
+ public void setSet(Set<?> collection)
{
super.setSet(collection);
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsSetUnmodifiableObject.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsSetUnmodifiableObject.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsSetUnmodifiableObject.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -21,6 +21,8 @@
*/
package org.jboss.test.kernel.config.support;
+import java.util.Set;
+
import org.jboss.beans.metadata.api.annotations.StringValue;
import org.jboss.beans.metadata.api.annotations.Value;
import org.jboss.beans.metadata.api.annotations.SetValue;
@@ -32,6 +34,9 @@
*/
public class FromStringsSetUnmodifiableObject extends UnmodifiableGetterBean
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
@SetValue(
value = {
@Value(string = @StringValue("string1")),
@@ -42,7 +47,7 @@
elementClass = "java.lang.String",
clazz = "java.util.HashSet"
)
- public void setSet(java.util.Set set)
+ public void setSet(Set<?> set)
{
super.setSet(set);
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/InterfaceArraySimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/InterfaceArraySimpleBean.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/InterfaceArraySimpleBean.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -33,6 +33,9 @@
*/
public class InterfaceArraySimpleBean extends SimpleBean
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
@ArrayValue(
value = {
@Value(string = @StringValue("string1")),
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/InterfaceCollectionSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/InterfaceCollectionSimpleBean.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/InterfaceCollectionSimpleBean.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -34,6 +34,9 @@
*/
public class InterfaceCollectionSimpleBean extends SimpleBean
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
@CollectionValue(
value = {
@Value(string = @StringValue("string1")),
@@ -44,7 +47,7 @@
elementClass = "java.lang.String",
clazz = "java.util.Collection"
)
- public void setCollection(Collection collection)
+ public void setCollection(Collection<?> collection)
{
super.setCollection(collection);
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/InterfaceListSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/InterfaceListSimpleBean.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/InterfaceListSimpleBean.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -34,6 +34,9 @@
*/
public class InterfaceListSimpleBean extends SimpleBean
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
@ListValue(
value = {
@Value(string = @StringValue("string1")),
@@ -44,7 +47,7 @@
elementClass = "java.lang.String",
clazz = "java.util.List"
)
- public void setList(List collection)
+ public void setList(List<?> collection)
{
super.setList(collection);
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/InterfaceMapSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/InterfaceMapSimpleBean.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/InterfaceMapSimpleBean.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -35,6 +35,9 @@
*/
public class InterfaceMapSimpleBean extends SimpleBean
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
@MapValue(
value = {
@EntryValue(
@@ -49,7 +52,7 @@
keyClass = "java.lang.String", valueClass = "java.lang.String",
clazz = "java.util.Map"
)
- public void setMap(Map collection)
+ public void setMap(Map<?,?> collection)
{
super.setMap(collection);
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/InterfaceSetSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/InterfaceSetSimpleBean.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/InterfaceSetSimpleBean.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -34,6 +34,9 @@
*/
public class InterfaceSetSimpleBean extends SimpleBean
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
@SetValue(
value = {
@Value(string = @StringValue("string1")),
@@ -44,7 +47,7 @@
elementClass = "java.lang.String",
clazz = "java.util.Set"
)
- public void setSet(Set collection)
+ public void setSet(Set<?> collection)
{
super.setSet(collection);
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/KeyTypeOverrideMapSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/KeyTypeOverrideMapSimpleBean.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/KeyTypeOverrideMapSimpleBean.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -35,6 +35,9 @@
*/
public class KeyTypeOverrideMapSimpleBean extends SimpleBean
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
@MapValue(
value = {
@EntryValue(
@@ -53,7 +56,7 @@
keyClass = "java.lang.String", valueClass = "java.lang.String",
clazz = "org.jboss.test.kernel.config.support.CustomMap"
)
- public void setMap(Map collection)
+ public void setMap(Map<?,?> collection)
{
super.setMap(collection);
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/NotAArraySimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/NotAArraySimpleBean.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/NotAArraySimpleBean.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -32,6 +32,9 @@
*/
public class NotAArraySimpleBean extends SimpleBean
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
@ArrayValue(
value = {
@Value(string = @StringValue("string1")),
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/NotACollectionSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/NotACollectionSimpleBean.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/NotACollectionSimpleBean.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -32,6 +32,9 @@
*/
public class NotACollectionSimpleBean extends SimpleBean
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
@CollectionValue(
value = {
@Value(string = @StringValue("string1")),
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/NotAListSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/NotAListSimpleBean.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/NotAListSimpleBean.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -32,6 +32,9 @@
*/
public class NotAListSimpleBean extends SimpleBean
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
@ListValue(
value = {
@Value(string = @StringValue("string1")),
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/NotAMapSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/NotAMapSimpleBean.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/NotAMapSimpleBean.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -33,6 +33,9 @@
*/
public class NotAMapSimpleBean extends SimpleBean
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
@MapValue(
value = {
@EntryValue(
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/NotASetSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/NotASetSimpleBean.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/NotASetSimpleBean.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -32,6 +32,9 @@
*/
public class NotASetSimpleBean extends SimpleBean
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
@SetValue(
value = {
@Value(string = @StringValue("string1")),
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/OnObjectArraySimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/OnObjectArraySimpleBean.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/OnObjectArraySimpleBean.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -32,6 +32,9 @@
*/
public class OnObjectArraySimpleBean extends SimpleBean
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
@ArrayValue(
value = {
@Value(string = @StringValue("string1")),
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/OnObjectCollectionSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/OnObjectCollectionSimpleBean.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/OnObjectCollectionSimpleBean.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -32,6 +32,9 @@
*/
public class OnObjectCollectionSimpleBean extends SimpleBean
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
@CollectionValue(
value = {
@Value(string = @StringValue("string1")),
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/OnObjectListSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/OnObjectListSimpleBean.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/OnObjectListSimpleBean.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -32,6 +32,9 @@
*/
public class OnObjectListSimpleBean extends SimpleBean
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
@ListValue(
value = {
@Value(string = @StringValue("string1")),
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/OnObjectMapSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/OnObjectMapSimpleBean.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/OnObjectMapSimpleBean.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -33,6 +33,9 @@
*/
public class OnObjectMapSimpleBean extends SimpleBean
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
@MapValue(
value = {
@EntryValue(
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/OnObjectSetSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/OnObjectSetSimpleBean.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/OnObjectSetSimpleBean.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -32,6 +32,9 @@
*/
public class OnObjectSetSimpleBean extends SimpleBean
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
@SetValue(
value = {
@Value(string = @StringValue("string1")),
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ParamArrayConstructorAnnBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ParamArrayConstructorAnnBean.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ParamArrayConstructorAnnBean.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -33,6 +33,9 @@
*/
public class ParamArrayConstructorAnnBean extends SimpleBean
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
public ParamArrayConstructorAnnBean()
{
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ParamCollectionConstructorAnnBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ParamCollectionConstructorAnnBean.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ParamCollectionConstructorAnnBean.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -35,6 +35,9 @@
*/
public class ParamCollectionConstructorAnnBean extends SimpleBean
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
public ParamCollectionConstructorAnnBean()
{
}
@@ -48,7 +51,7 @@
@Value(string = @StringValue("2"))
}
)
- Collection collection)
+ Collection<?> collection)
{
super(collection);
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ParamCompConstructorAnnBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ParamCompConstructorAnnBean.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ParamCompConstructorAnnBean.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -31,12 +31,15 @@
*/
public class ParamCompConstructorAnnBean extends SimpleBean
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
public ParamCompConstructorAnnBean()
{
}
@Constructor
- public ParamCompConstructorAnnBean(@StringValue(value = "12", type="java.lang.Integer") Comparable comparable)
+ public ParamCompConstructorAnnBean(@StringValue(value = "12", type="java.lang.Integer") Comparable<?> comparable)
{
super(comparable);
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ParamConstructorAnnBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ParamConstructorAnnBean.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ParamConstructorAnnBean.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -31,6 +31,9 @@
*/
public class ParamConstructorAnnBean extends SimpleBean
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
public ParamConstructorAnnBean()
{
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ParamIntConstructorAnnBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ParamIntConstructorAnnBean.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ParamIntConstructorAnnBean.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -31,6 +31,9 @@
*/
public class ParamIntConstructorAnnBean extends SimpleBean
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
public ParamIntConstructorAnnBean()
{
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ParamListConstructorAnnBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ParamListConstructorAnnBean.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ParamListConstructorAnnBean.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -35,6 +35,9 @@
*/
public class ParamListConstructorAnnBean extends SimpleBean
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
public ParamListConstructorAnnBean()
{
}
@@ -48,7 +51,7 @@
@Value(string = @StringValue("2"))
}
)
- List collection)
+ List<?> collection)
{
super(collection);
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ParamMapConstructorAnnBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ParamMapConstructorAnnBean.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ParamMapConstructorAnnBean.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -36,6 +36,9 @@
*/
public class ParamMapConstructorAnnBean extends SimpleBean
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
public ParamMapConstructorAnnBean()
{
}
@@ -52,7 +55,7 @@
)
}
)
- Map collection)
+ Map<?,?> collection)
{
super(collection);
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ParamNullConstructorAnnBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ParamNullConstructorAnnBean.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ParamNullConstructorAnnBean.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -31,6 +31,9 @@
*/
public class ParamNullConstructorAnnBean extends SimpleBean
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
public ParamNullConstructorAnnBean()
{
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ParamPropertiesConstructorAnnBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ParamPropertiesConstructorAnnBean.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ParamPropertiesConstructorAnnBean.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -36,6 +36,9 @@
*/
public class ParamPropertiesConstructorAnnBean extends SimpleBean
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
public ParamPropertiesConstructorAnnBean()
{
}
@@ -53,7 +56,7 @@
)
}
)
- Hashtable collection)
+ Hashtable<?,?> collection)
{
super(collection);
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ParamSetConstructorAnnBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ParamSetConstructorAnnBean.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ParamSetConstructorAnnBean.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -35,6 +35,9 @@
*/
public class ParamSetConstructorAnnBean extends SimpleBean
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
public ParamSetConstructorAnnBean()
{
}
@@ -47,7 +50,7 @@
@Value(string = @StringValue("1"))
}
)
- Set collection)
+ Set<?> collection)
{
super(collection);
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ProgressionSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ProgressionSimpleBean.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ProgressionSimpleBean.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -30,6 +30,9 @@
*/
public class ProgressionSimpleBean extends SimpleBean
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
@StringValue(value = "123.456", type="java.lang.Double")
public void setAnint(int anint)
{
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/SimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/SimpleBean.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/SimpleBean.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -118,19 +118,19 @@
private Number aNumber;
/** collection */
- private Collection collection;
+ private Collection<?> collection;
/** preInstantiated */
private CustomCollection preInstantiatedCollection = new CustomCollection(true);
/** set */
- private Set set;
+ private Set<?> set;
/** preInstantiated */
private CustomSet preInstantiatedSet = new CustomSet(true);
/** list */
- private List list;
+ private List<?> list;
/** preInstantiated */
private CustomList preInstantiatedList = new CustomList(true);
@@ -142,7 +142,7 @@
private Object[] preInstantiatedArray = new Object[]{"string1", "string2", "string2", "string1"};
/** map */
- private Map map;
+ private Map<?,?> map;
/** preInstantiated */
private CustomMap preInstantiatedMap = new CustomMap(true);
@@ -155,16 +155,16 @@
// public just for testing purpose
/** Just a setter for this collection */
- public Collection setterCollection;
+ public Collection<?> setterCollection;
/** Just a setter for this set */
- public Set setterSet;
+ public Set<?> setterSet;
/** Just a setter for this list */
- public List setterList;
+ public List<?> setterList;
/** Just a setter for this map */
- public Map setterMap;
+ public Map<?,?> setterMap;
// Static --------------------------------------------------------
@@ -196,25 +196,25 @@
anInt = integer;
}
- public SimpleBean(Comparable comparable)
+ public SimpleBean(Comparable<?> comparable)
{
constructorUsed = "java.lang.Comparable:" + comparable.getClass().getName() + ":" + comparable.toString();
anObject = comparable;
}
- public SimpleBean(Collection collection)
+ public SimpleBean(Collection<?> collection)
{
constructorUsed = "java.util.Collection:" + collection.getClass().getName() + ":" + collection.toString();
this.collection = collection;
}
- public SimpleBean(List list)
+ public SimpleBean(List<?> list)
{
constructorUsed = "java.util.List:" + list.getClass().getName() + ":" + list.toString();
this.list = list;
}
- public SimpleBean(Set set)
+ public SimpleBean(Set<?> set)
{
constructorUsed = "java.util.Set:" + set.getClass().getName() + ":" + set.toString();
this.set = set;
@@ -226,13 +226,13 @@
this.array = array;
}
- public SimpleBean(Map map)
+ public SimpleBean(Map<?, ?> map)
{
constructorUsed = "java.util.Map:" + map.getClass().getName() + ":" + map.toString();
this.map = map;
}
- public SimpleBean(Hashtable hashtable)
+ public SimpleBean(Hashtable<?, ?> hashtable)
{
constructorUsed = "java.util.Hashtable:" + hashtable.getClass().getName() + ":" + hashtable.toString();
this.map = hashtable;
@@ -465,12 +465,12 @@
aString = string;
}
- public Set getSet()
+ public Set<?> getSet()
{
return set;
}
- public void setSet(Set set)
+ public void setSet(Set<?> set)
{
this.set = set;
}
@@ -495,12 +495,12 @@
this.preInstantiatedSet = preInstantiatedSet;
}
- public Collection getCollection()
+ public Collection<?> getCollection()
{
return collection;
}
- public void setCollection(Collection collection)
+ public void setCollection(Collection<?> collection)
{
this.collection = collection;
}
@@ -525,12 +525,12 @@
this.preInstantiatedCollection = preInstantiatedCollection;
}
- public List getList()
+ public List<?> getList()
{
return list;
}
- public void setList(List list)
+ public void setList(List<?> list)
{
this.list = list;
}
@@ -585,12 +585,12 @@
this.array = array;
}
- public Map getMap()
+ public Map<?,?> getMap()
{
return map;
}
- public void setMap(Map map)
+ public void setMap(Map<?,?> map)
{
this.map = map;
}
@@ -645,22 +645,22 @@
this.enumProperty = enumProperty;
}
- public void setSetterCollection(Collection setterCollection)
+ public void setSetterCollection(Collection<?> setterCollection)
{
this.setterCollection = setterCollection;
}
- public void setSetterSet(Set setterSet)
+ public void setSetterSet(Set<?> setterSet)
{
this.setterSet = setterSet;
}
- public void setSetterList(List setterList)
+ public void setSetterList(List<?> setterList)
{
this.setterList = setterList;
}
- public void setSetterMap(Map setterMap)
+ public void setSetterMap(Map<?, ?> setterMap)
{
this.setterMap = setterMap;
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/SimpleConstructorAnnBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/SimpleConstructorAnnBean.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/SimpleConstructorAnnBean.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -30,6 +30,9 @@
*/
public class SimpleConstructorAnnBean extends SimpleBean
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
@Constructor
public SimpleConstructorAnnBean()
{
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/TypeOverrideArraySimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/TypeOverrideArraySimpleBean.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/TypeOverrideArraySimpleBean.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -32,6 +32,9 @@
*/
public class TypeOverrideArraySimpleBean extends SimpleBean
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
@ArrayValue(
value = {
@Value(string = @StringValue("string1")),
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/TypeOverrideCollectionSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/TypeOverrideCollectionSimpleBean.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/TypeOverrideCollectionSimpleBean.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -34,6 +34,9 @@
*/
public class TypeOverrideCollectionSimpleBean extends SimpleBean
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
@CollectionValue(
value = {
@Value(string = @StringValue("string1")),
@@ -45,7 +48,7 @@
elementClass = "java.lang.String",
clazz = "org.jboss.test.kernel.config.support.CustomCollection"
)
- public void setCollection(Collection collection)
+ public void setCollection(Collection<?> collection)
{
super.setCollection(collection);
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/TypeOverrideListSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/TypeOverrideListSimpleBean.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/TypeOverrideListSimpleBean.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -34,6 +34,9 @@
*/
public class TypeOverrideListSimpleBean extends SimpleBean
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
@ListValue(
value = {
@Value(string = @StringValue("string1")),
@@ -45,7 +48,7 @@
elementClass = "java.lang.String",
clazz = "org.jboss.test.kernel.config.support.CustomList"
)
- public void setList(List collection)
+ public void setList(List<?> collection)
{
super.setList(collection);
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/TypeOverrideSetSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/TypeOverrideSetSimpleBean.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/TypeOverrideSetSimpleBean.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -34,6 +34,9 @@
*/
public class TypeOverrideSetSimpleBean extends SimpleBean
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
@SetValue(
value = {
@Value(string = @StringValue("string1")),
@@ -45,7 +48,7 @@
elementClass = "java.lang.String",
clazz = "org.jboss.test.kernel.config.support.CustomSet"
)
- public void setSet(Set collection)
+ public void setSet(Set<?> collection)
{
super.setSet(collection);
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/UnmodifiableGetterBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/UnmodifiableGetterBean.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/UnmodifiableGetterBean.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -50,7 +50,7 @@
return Collections.unmodifiableCollection(collection);
}
- public void setCollection(Collection collection)
+ public void setCollection(Collection<?> collection)
{
this.collection = collection;
}
@@ -60,7 +60,7 @@
return Collections.unmodifiableList(list);
}
- public void setList(List list)
+ public void setList(List<?> list)
{
this.list = list;
}
@@ -70,7 +70,7 @@
return Collections.unmodifiableSet(set);
}
- public void setSet(Set set)
+ public void setSet(Set<?> set)
{
this.set = set;
}
@@ -80,7 +80,7 @@
return Collections.unmodifiableMap(map);
}
- public void setMap(Map map)
+ public void setMap(Map<?,?> map)
{
this.map = map;
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ValueTypeOverrideMapSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ValueTypeOverrideMapSimpleBean.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ValueTypeOverrideMapSimpleBean.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -35,6 +35,9 @@
*/
public class ValueTypeOverrideMapSimpleBean extends SimpleBean
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
@MapValue(
value = {
@EntryValue(
@@ -53,7 +56,7 @@
keyClass = "java.lang.String", valueClass = "java.lang.String",
clazz = "org.jboss.test.kernel.config.support.CustomMap"
)
- public void setMap(Map collection)
+ public void setMap(Map<?,?> collection)
{
super.setMap(collection);
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/AbstractKernelConfigTest.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/AbstractKernelConfigTest.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/AbstractKernelConfigTest.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -136,10 +136,10 @@
protected void configure(KernelConfigurator configurator, Object bean, BeanInfo info, BeanMetaData metaData) throws Throwable
{
- Set joinPoints = configurator.getPropertySetterJoinPoints(info, metaData);
- for (Iterator i = joinPoints.iterator(); i.hasNext();)
+ Set<TargettedJoinpoint> joinPoints = configurator.getPropertySetterJoinPoints(info, metaData);
+ for (Iterator<TargettedJoinpoint> i = joinPoints.iterator(); i.hasNext();)
{
- TargettedJoinpoint joinPoint = (TargettedJoinpoint) i.next();
+ TargettedJoinpoint joinPoint = i.next();
joinPoint.setTarget(bean);
joinPoint.dispatch();
}
@@ -155,10 +155,10 @@
protected void unconfigure(KernelConfigurator configurator, Object bean, BeanInfo info, BeanMetaData metaData) throws Throwable
{
- Set joinPoints = configurator.getPropertyNullerJoinPoints(info, metaData);
- for (Iterator i = joinPoints.iterator(); i.hasNext();)
+ Set<TargettedJoinpoint> joinPoints = configurator.getPropertyNullerJoinPoints(info, metaData);
+ for (Iterator<TargettedJoinpoint> i = joinPoints.iterator(); i.hasNext();)
{
- TargettedJoinpoint joinPoint = (TargettedJoinpoint) i.next();
+ TargettedJoinpoint joinPoint = i.next();
joinPoint.setTarget(bean);
try
{
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/BeanMetaDataBuilderTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/BeanMetaDataBuilderTestCase.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/BeanMetaDataBuilderTestCase.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -70,7 +70,7 @@
BeanMetaDataBuilder builder = BeanMetaDataBuilderFactory.createBuilder("PropBMD", SimpleBean.class.getName())
.addPropertyMetaData("adouble", 3.1459)
.addPropertyMetaData("anint", "123")
- .addPropertyMetaData("collection", new ArrayList());
+ .addPropertyMetaData("collection", new ArrayList<Object>());
BeanMetaData beanMetaData = builder.getBeanMetaData();
SimpleBean pbmd = (SimpleBean)instantiateAndConfigure(beanMetaData);
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/CollectionTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/CollectionTestCase.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/CollectionTestCase.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -71,7 +71,7 @@
SimpleBean bean = simpleCollectionFromObjects();
assertNotNull(bean);
- Collection result = bean.getCollection();
+ Collection<?> result = bean.getCollection();
assertNotNull("Should be a collection", result);
ArrayList<Object> expected = new ArrayList<Object>();
@@ -109,7 +109,7 @@
SimpleBean bean = simpleCollectionFromStrings();
assertNotNull(bean);
- Collection result = bean.getCollection();
+ Collection<?> result = bean.getCollection();
assertNotNull("Should be a collection", result);
ArrayList<Object> expected = new ArrayList<Object>();
@@ -152,7 +152,7 @@
SimpleBean bean = customCollectionExplicit();
assertNotNull(bean);
- Collection result = bean.getCollection();
+ Collection<?> result = bean.getCollection();
assertNotNull("Should be a collection", result);
assertTrue("Not a CustomCollection: " + result.getClass(), result instanceof CustomCollection);
@@ -197,7 +197,7 @@
SimpleBean bean = customCollectionFromSignature();
assertNotNull(bean);
- Collection result = bean.getCustomCollection();
+ Collection<?> result = bean.getCustomCollection();
assertNotNull("Should be a collection", result);
assertTrue("Not a CustomCollection: " + result.getClass(), result instanceof CustomCollection);
@@ -241,7 +241,7 @@
SimpleBean bean = customCollectionPreInstantiated();
assertNotNull(bean);
- Collection result = bean.getPreInstantiatedCollection();
+ Collection<?> result = bean.getPreInstantiatedCollection();
assertNotNull("Should be a collection", result);
assertTrue("Not a CustomCollection: " + result.getClass(), result instanceof CustomCollection);
assertTrue("Not preinstantiated", ((CustomCollection) result).getPreInstantiated());
@@ -253,7 +253,7 @@
expected.add(string1);
assertEquals(expected, result);
- Collection setter = bean.setterCollection;
+ Collection<?> setter = bean.setterCollection;
assertNotNull(setter);
assertFalse("Empty setterCollection", setter.isEmpty());
}
@@ -295,7 +295,7 @@
UnmodifiableGetterBean bean = unmodifiableCollectionPreInstantiated();
assertNotNull(bean);
- Collection result = bean.getCollection();
+ Collection<?> result = bean.getCollection();
assertNotNull("Should be a collection", result);
Collection<Object> expected = new ArrayList<Object>();
@@ -305,8 +305,8 @@
expected.add(string1);
assertEquals(expected.size(), result.size());
- Iterator i1 = expected.iterator();
- Iterator i2 = result.iterator();
+ Iterator<?> i1 = expected.iterator();
+ Iterator<?> i2 = result.iterator();
while(i1.hasNext() && i2.hasNext())
{
assertEquals(i1.next(), i2.next());
@@ -345,7 +345,7 @@
SimpleBean bean = collectionWithValueTypeOverride();
assertNotNull(bean);
- Collection result = bean.getCollection();
+ Collection<?> result = bean.getCollection();
assertNotNull("Should be a collection", result);
assertTrue("Not a CustomCollection: " + result.getClass(), result instanceof CustomCollection);
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/InstantiateTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/InstantiateTestCase.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/InstantiateTestCase.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -430,7 +430,7 @@
Object object = valueInstantiateFromCollection();
assertNotNull(object);
assertTrue(object instanceof Collection);
- assertEquals(new ArrayList(), object);
+ assertEquals(new ArrayList<Object>(), object);
}
protected Object valueInstantiateFromCollection() throws Throwable
@@ -452,7 +452,7 @@
Object object = valueInstantiateFromList();
assertNotNull(object);
assertTrue(object instanceof List);
- assertEquals(new ArrayList(), object);
+ assertEquals(new ArrayList<Object>(), object);
}
protected Object valueInstantiateFromList() throws Throwable
@@ -474,7 +474,7 @@
Object object = valueInstantiateFromSet();
assertNotNull(object);
assertTrue(object instanceof Set);
- assertEquals(new HashSet(), object);
+ assertEquals(new HashSet<Object>(), object);
}
protected Object valueInstantiateFromSet() throws Throwable
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/ListTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/ListTestCase.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/ListTestCase.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -70,7 +70,7 @@
SimpleBean bean = simpleListFromObjects();
assertNotNull(bean);
- List result = bean.getList();
+ List<?> result = bean.getList();
assertNotNull("Should be a list", result);
ArrayList<Object> expected = new ArrayList<Object>();
@@ -108,7 +108,7 @@
SimpleBean bean = simpleListFromStrings();
assertNotNull(bean);
- List result = bean.getList();
+ List<?> result = bean.getList();
assertNotNull("Should be a list", result);
ArrayList<Object> expected = new ArrayList<Object>();
@@ -151,7 +151,7 @@
SimpleBean bean = customListExplicit();
assertNotNull(bean);
- List result = bean.getList();
+ List<?> result = bean.getList();
assertNotNull("Should be a list", result);
assertTrue("Not a CustomList: " + result.getClass(), result instanceof CustomList);
@@ -196,7 +196,7 @@
SimpleBean bean = customListFromSignature();
assertNotNull(bean);
- List result = bean.getCustomList();
+ List<?> result = bean.getCustomList();
assertNotNull("Should be a list", result);
assertTrue("Not a CustomList: " + result.getClass(), result instanceof CustomList);
@@ -240,7 +240,7 @@
SimpleBean bean = customListPreInstantiated();
assertNotNull(bean);
- List result = bean.getPreInstantiatedList();
+ List<?> result = bean.getPreInstantiatedList();
assertNotNull("Should be a list", result);
assertTrue("Not a CustomList: " + result.getClass(), result instanceof CustomList);
assertTrue("Not preinstantiated", ((CustomList) result).getPreInstantiated());
@@ -252,7 +252,7 @@
expected.add(string1);
assertEquals(expected, result);
- List setter = bean.setterList;
+ List<?> setter = bean.setterList;
assertNotNull(setter);
assertFalse("Empty setterList", setter.isEmpty());
}
@@ -294,7 +294,7 @@
UnmodifiableGetterBean bean = unmodifiableListPreInstantiated();
assertNotNull(bean);
- List result = bean.getList();
+ List<?> result = bean.getList();
assertNotNull("Should be a list", result);
ArrayList<Object> expected = new ArrayList<Object>();
@@ -337,7 +337,7 @@
SimpleBean bean = listWithValueTypeOverride();
assertNotNull(bean);
- List result = bean.getList();
+ List<?> result = bean.getList();
assertNotNull("Should be a list", result);
assertTrue("Not a CustomList: " + result.getClass(), result instanceof CustomList);
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/MapTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/MapTestCase.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/MapTestCase.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -71,7 +71,7 @@
SimpleBean bean = simpleMapFromObjects();
assertNotNull(bean);
- Map result = bean.getMap();
+ Map<?,?> result = bean.getMap();
assertNotNull("Should be a map", result);
Map<Object, Object> expected = new HashMap<Object, Object>();
@@ -106,7 +106,7 @@
SimpleBean bean = simpleMapFromStrings();
assertNotNull(bean);
- Map result = bean.getMap();
+ Map<?,?> result = bean.getMap();
assertNotNull("Should be a map", result);
Map<Object, Object> expected = new HashMap<Object, Object>();
@@ -147,7 +147,7 @@
SimpleBean bean = customMapExplicit();
assertNotNull(bean);
- Map result = bean.getMap();
+ Map<?,?> result = bean.getMap();
assertNotNull("Should be a map", result);
assertTrue("Not a CustomMap: " + result.getClass(), result instanceof CustomMap);
@@ -190,7 +190,7 @@
SimpleBean bean = customMapFromSignature();
assertNotNull(bean);
- Map result = bean.getCustomMap();
+ Map<?,?> result = bean.getCustomMap();
assertNotNull("Should be a map", result);
assertTrue("Not a CustomMap: " + result.getClass(), result instanceof CustomMap);
@@ -232,7 +232,7 @@
SimpleBean bean = customMapPreInstantiated();
assertNotNull(bean);
- Map result = bean.getPreInstantiatedMap();
+ Map<?,?> result = bean.getPreInstantiatedMap();
assertNotNull("Should be a map", result);
assertTrue("Not a CustomMap: " + result.getClass(), result instanceof CustomMap);
assertTrue("Not preinstantiated", ((CustomMap) result).getPreInstantiated());
@@ -242,7 +242,7 @@
expected.put(string2, string1);
assertEquals(expected, result);
- Map setter = bean.setterMap;
+ Map<?,?> setter = bean.setterMap;
assertNotNull(setter);
assertFalse("Empty setterMap", setter.isEmpty());
}
@@ -285,7 +285,7 @@
UnmodifiableGetterBean bean = unmodifiableMapPreInstantiated();
assertNotNull(bean);
- Map result = bean.getMap();
+ Map<?,?> result = bean.getMap();
assertNotNull("Should be a map", result);
Map<Object, Object> expected = new HashMap<Object, Object>();
@@ -326,7 +326,7 @@
SimpleBean bean = mapWithKeyTypeOverride();
assertNotNull(bean);
- Map result = bean.getMap();
+ Map<?,?> result = bean.getMap();
assertNotNull("Should be a map", result);
assertTrue("Not a CustomMap: " + result.getClass(), result instanceof CustomMap);
@@ -375,7 +375,7 @@
SimpleBean bean = mapWithValueTypeOverride();
assertNotNull(bean);
- Map result = bean.getMap();
+ Map<?,?> result = bean.getMap();
assertNotNull("Should be a map", result);
assertTrue("Not a CustomMap: " + result.getClass(), result instanceof CustomMap);
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/SetTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/SetTestCase.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/SetTestCase.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -69,7 +69,7 @@
SimpleBean bean = simpleSetFromObjects();
assertNotNull(bean);
- Set result = bean.getSet();
+ Set<?> result = bean.getSet();
assertNotNull("Should be a set", result);
HashSet<Object> expected = new HashSet<Object>();
@@ -107,7 +107,7 @@
SimpleBean bean = simpleSetFromStrings();
assertNotNull(bean);
- Set result = bean.getSet();
+ Set<?> result = bean.getSet();
assertNotNull("Should be a set", result);
HashSet<Object> expected = new HashSet<Object>();
@@ -150,7 +150,7 @@
SimpleBean bean = customSetExplicit();
assertNotNull(bean);
- Set result = bean.getSet();
+ Set<?> result = bean.getSet();
assertNotNull("Should be a set", result);
assertTrue("Not a CustomSet: " + result.getClass(), result instanceof CustomSet);
@@ -195,7 +195,7 @@
SimpleBean bean = customSetFromSignature();
assertNotNull(bean);
- Set result = bean.getCustomSet();
+ Set<?> result = bean.getCustomSet();
assertNotNull("Should be a set", result);
assertTrue("Not a CustomSet: " + result.getClass(), result instanceof CustomSet);
@@ -239,7 +239,7 @@
SimpleBean bean = customSetPreInstantiated();
assertNotNull(bean);
- Set result = bean.getPreInstantiatedSet();
+ Set<?> result = bean.getPreInstantiatedSet();
assertNotNull("Should be a set", result);
assertTrue("Not a CustomSet: " + result.getClass(), result instanceof CustomSet);
assertTrue("Not preinstantiated", ((CustomSet) result).getPreInstantiated());
@@ -251,7 +251,7 @@
expected.add(string1);
assertEquals(expected, result);
- Set setter = bean.setterSet;
+ Set<?> setter = bean.setterSet;
assertNotNull(setter);
assertFalse("Empty setterSet", setter.isEmpty());
}
@@ -293,7 +293,7 @@
UnmodifiableGetterBean bean = unmodifiableSetPreInstantiated();
assertNotNull(bean);
- Set result = bean.getSet();
+ Set<?> result = bean.getSet();
assertNotNull("Should be a set", result);
HashSet<Object> expected = new HashSet<Object>();
@@ -336,7 +336,7 @@
SimpleBean bean = setWithValueTypeOverride();
assertNotNull(bean);
- Set result = bean.getSet();
+ Set<?> result = bean.getSet();
assertNotNull("Should be a set", result);
assertTrue("Not a CustomSet: " + result.getClass(), result instanceof CustomSet);
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/controller/test/AbstractControllerTest.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/controller/test/AbstractControllerTest.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/controller/test/AbstractControllerTest.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -44,7 +44,7 @@
* @return the delegate
* @throws Exception for any error
*/
- public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+ public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
{
AbstractTestDelegate delegate = MicrocontainerTest.getDelegate(clazz);
delegate.enableSecurity = true;
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/support/AnnotatedSimpleBeanWithKernelControllerContextAware.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/support/AnnotatedSimpleBeanWithKernelControllerContextAware.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/support/AnnotatedSimpleBeanWithKernelControllerContextAware.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -32,6 +32,9 @@
*/
public class AnnotatedSimpleBeanWithKernelControllerContextAware extends SimpleBeanWithKernelControllerContextAware
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
@Inject(fromContext = FromContext.CONTEXT)
public void setKernelControllerContext(KernelControllerContext context) throws Exception
{
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/support/GenericBeanFactoryRepository.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/support/GenericBeanFactoryRepository.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/support/GenericBeanFactoryRepository.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -36,7 +36,7 @@
{
List<GenericBeanFactory> beans = new ArrayList<GenericBeanFactory>();
- public List getBeans()
+ public List<GenericBeanFactory> getBeans()
{
return beans;
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/support/InstallSimpleBeanImpl.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/support/InstallSimpleBeanImpl.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/support/InstallSimpleBeanImpl.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -28,4 +28,7 @@
*/
public class InstallSimpleBeanImpl extends SimpleBeanImpl
{
+
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/support/NestedBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/support/NestedBean.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/support/NestedBean.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -26,7 +26,6 @@
*/
public class NestedBean
{
- private int limit;
private NestedBean bean;
private String string;
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/CallbackAnnotationTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/CallbackAnnotationTestCase.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/CallbackAnnotationTestCase.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -47,7 +47,7 @@
protected AbstractBeanMetaData buildRepository(Cardinality cardinality)
{
- Class clazz = cardinality != null ? CallbackCardinalitySimpleBeanRepository.class : CallbackSimpleBeanRepository.class;
+ Class<?> clazz = cardinality != null ? CallbackCardinalitySimpleBeanRepository.class : CallbackSimpleBeanRepository.class;
return new AbstractBeanMetaData("Name1", clazz.getName());
}
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/CallbackCollectionAnnotationTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/CallbackCollectionAnnotationTestCase.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/CallbackCollectionAnnotationTestCase.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -47,7 +47,7 @@
protected AbstractBeanMetaData buildRepository(Cardinality cardinality)
{
- Class clazz = cardinality != null ? CallbackCollectionCardinalitySimpleBeanRepository.class : CallbackCollectionSimpleBeanRepository.class;
+ Class<?> clazz = cardinality != null ? CallbackCollectionCardinalitySimpleBeanRepository.class : CallbackCollectionSimpleBeanRepository.class;
return new AbstractBeanMetaData("Name1", clazz.getName());
}
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/CallbackTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/CallbackTestCase.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/CallbackTestCase.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -95,7 +95,7 @@
ControllerContext context1 = assertInstall(0, "Name1");
SimpleBeanRepository repository = (SimpleBeanRepository)context1.getTarget();
assertNotNull(repository);
- List beans = repository.getBeans();
+ List<SimpleBean> beans = repository.getBeans();
assertFalse(beans.isEmpty());
assertEquals(1, beans.size());
assertTrue(bean == beans.get(0));
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/NestedPropertyTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/NestedPropertyTestCase.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/NestedPropertyTestCase.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -21,24 +21,21 @@
*/
package org.jboss.test.kernel.dependency.test;
-import java.util.HashSet;
import java.util.Collections;
+import java.util.HashSet;
import junit.framework.Test;
-import org.jboss.dependency.spi.ControllerContext;
-import org.jboss.dependency.spi.ControllerState;
-import org.jboss.dependency.spi.Controller;
-import org.jboss.test.kernel.dependency.support.SimpleBean;
-import org.jboss.test.kernel.dependency.support.SimpleBeanImpl;
-import org.jboss.test.kernel.dependency.support.NestedBean;
+
import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
-import org.jboss.beans.metadata.plugins.AbstractPropertyMetaData;
-import org.jboss.beans.metadata.plugins.AbstractDependencyValueMetaData;
import org.jboss.beans.metadata.plugins.AbstractConstructorMetaData;
+import org.jboss.beans.metadata.plugins.AbstractDependencyValueMetaData;
import org.jboss.beans.metadata.plugins.AbstractParameterMetaData;
-import org.jboss.beans.metadata.spi.PropertyMetaData;
+import org.jboss.beans.metadata.plugins.AbstractPropertyMetaData;
import org.jboss.beans.metadata.spi.BeanMetaData;
import org.jboss.beans.metadata.spi.ParameterMetaData;
+import org.jboss.beans.metadata.spi.PropertyMetaData;
+import org.jboss.dependency.spi.ControllerContext;
+import org.jboss.test.kernel.dependency.support.NestedBean;
/**
* Nested property tests.
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/NestedPropertyXMLTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/NestedPropertyXMLTestCase.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/NestedPropertyXMLTestCase.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -21,18 +21,7 @@
*/
package org.jboss.test.kernel.dependency.test;
-import java.util.HashSet;
-
import junit.framework.Test;
-import org.jboss.dependency.spi.ControllerContext;
-import org.jboss.dependency.spi.ControllerState;
-import org.jboss.dependency.spi.Controller;
-import org.jboss.test.kernel.dependency.support.SimpleBean;
-import org.jboss.test.kernel.dependency.support.SimpleBeanImpl;
-import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
-import org.jboss.beans.metadata.plugins.AbstractPropertyMetaData;
-import org.jboss.beans.metadata.spi.PropertyMetaData;
-import org.jboss.beans.metadata.spi.BeanMetaData;
/**
* Nested property xml tests.
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/AbstractDeploymentTest.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/AbstractDeploymentTest.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/AbstractDeploymentTest.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -44,7 +44,7 @@
* @return the delegate
* @throws Exception for any error
*/
- public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+ public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
{
AbstractTestDelegate delegate = MicrocontainerTest.getDelegate(clazz);
delegate.enableSecurity = true;
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/AbstractManualDeploymentTest.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/AbstractManualDeploymentTest.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/AbstractManualDeploymentTest.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -39,7 +39,7 @@
super(name);
}
- public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+ public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
{
MicrocontainerTestDelegate delegate = (MicrocontainerTestDelegate) MicrocontainerTest.getDelegate(clazz);
delegate.setDefaultMode(ControllerMode.MANUAL);
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/AbstractOnDemandDeploymentTest.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/AbstractOnDemandDeploymentTest.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/AbstractOnDemandDeploymentTest.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -38,7 +38,7 @@
super(name);
}
- public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+ public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
{
MicrocontainerTestDelegate delegate = (MicrocontainerTestDelegate) MicrocontainerTest.getDelegate(clazz);
delegate.setDefaultMode(ControllerMode.ON_DEMAND);
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/InCallbackInstantiatedTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/InCallbackInstantiatedTestCase.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/InCallbackInstantiatedTestCase.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -25,12 +25,9 @@
import junit.framework.Test;
-import org.jboss.beans.metadata.spi.ClassLoaderMetaData;
-import org.jboss.beans.metadata.spi.ValueMetaData;
import org.jboss.kernel.spi.deployment.KernelDeployment;
import org.jboss.test.kernel.deployment.support.InCallbackInstantiated;
import org.jboss.test.kernel.deployment.support.InCallbackInstantiatedRepository;
-import org.jboss.test.kernel.deployment.support.WildcardClassLoader;
/**
* Deployment ClassLoader Test Case.
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/ScopingDeploymentTest.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/ScopingDeploymentTest.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/ScopingDeploymentTest.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -42,7 +42,7 @@
* @return the delegate
* @throws Exception for any error
*/
- public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+ public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
{
AbstractTestDelegate delegate = new ScopingTestDelegate(clazz);
delegate.enableSecurity = true;
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/ScopingShutdownTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/ScopingShutdownTestCase.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/ScopingShutdownTestCase.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -52,7 +52,7 @@
* @return the delegate
* @throws Exception for any error
*/
- public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+ public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
{
AbstractTestDelegate delegate = new ScopingShutdownTestDelegate(clazz);
delegate.enableSecurity = true;
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/ScopingShutdownTestDelegate.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/ScopingShutdownTestDelegate.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/ScopingShutdownTestDelegate.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -33,7 +33,7 @@
*/
public class ScopingShutdownTestDelegate extends ScopingTestDelegate
{
- public ScopingShutdownTestDelegate(Class clazz) throws Exception
+ public ScopingShutdownTestDelegate(Class<?> clazz) throws Exception
{
super(clazz);
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/ScopingTestDelegate.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/ScopingTestDelegate.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/ScopingTestDelegate.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -35,7 +35,7 @@
*/
public class ScopingTestDelegate extends MicrocontainerTestDelegate
{
- public ScopingTestDelegate(Class clazz) throws Exception
+ public ScopingTestDelegate(Class<?> clazz) throws Exception
{
super(clazz);
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/support/AnnotationWithAttribute.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/support/AnnotationWithAttribute.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/support/AnnotationWithAttribute.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -28,5 +28,5 @@
*/
public @interface AnnotationWithAttribute
{
- Class attribute();
+ Class<?> attribute();
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/support/AnnotationWithAttributes.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/support/AnnotationWithAttributes.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/support/AnnotationWithAttributes.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -28,7 +28,7 @@
*/
public @interface AnnotationWithAttributes
{
- Class clazz();
+ Class<?> clazz();
int integer();
String str();
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AbstractMCTest.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AbstractMCTest.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AbstractMCTest.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -87,9 +87,9 @@
assertNotNull(annotations);
assertEquals(expected.size(), annotations.size());
HashSet<String> clonedExpected = new HashSet<String>(expected);
- for (Iterator i = annotations.iterator(); i.hasNext();)
+ for (Iterator<AnnotationMetaData> i = annotations.iterator(); i.hasNext();)
{
- AnnotationMetaData annotation = (AnnotationMetaData) i.next();
+ AnnotationMetaData annotation = i.next();
if (clonedExpected.remove(annotation.getAnnotationInstance().annotationType().getName()) == false)
fail("Did not expect " + annotation + " expected " + expected);
}
@@ -102,9 +102,9 @@
assertNotNull(properties);
assertEquals(expected.size(), properties.size());
HashSet<String> clonedExpected = new HashSet<String>(expected);
- for (Iterator i = properties.iterator(); i.hasNext();)
+ for (Iterator<PropertyMetaData> i = properties.iterator(); i.hasNext();)
{
- PropertyMetaData property = (PropertyMetaData) i.next();
+ PropertyMetaData property = i.next();
if (clonedExpected.remove(property.getName()) == false)
fail("Did not expect " + property + " expected " + expected);
}
@@ -145,9 +145,9 @@
assertNotNull(supplies);
assertEquals(expected.size(), supplies.size());
HashSet<String> clonedExpected = new HashSet<String>(expected);
- for (Iterator i = supplies.iterator(); i.hasNext();)
+ for (Iterator<SupplyMetaData> i = supplies.iterator(); i.hasNext();)
{
- SupplyMetaData supply = (SupplyMetaData) i.next();
+ SupplyMetaData supply = i.next();
if (clonedExpected.remove(supply.getSupply()) == false)
fail("Did not expect " + supply + " expected " + expected);
}
@@ -155,38 +155,38 @@
fail("Expected " + expected + " got " + supplies);
}
- protected void assertInstalls(List expected, List installs)
+ protected void assertInstalls(List<String> expected, List<InstallMetaData> installs)
{
assertNotNull(installs);
assertEquals(expected.size(), installs.size());
for (int i = 0; i < expected.size(); ++i)
{
- InstallMetaData install = (InstallMetaData) installs.get(i);
- String method = (String) expected.get(i);
+ InstallMetaData install = installs.get(i);
+ String method = expected.get(i);
assertEquals(method, install.getMethodName());
}
}
- protected void assertCallbacks(List expected, List callbacks)
+ protected void assertCallbacks(List<String> expected, List<CallbackMetaData> callbacks)
{
assertNotNull(callbacks);
assertEquals(expected.size(), callbacks.size());
for (int i = 0; i < expected.size(); ++i)
{
- CallbackMetaData callback = (CallbackMetaData) callbacks.get(i);
- String method = (String) expected.get(i);
+ CallbackMetaData callback = callbacks.get(i);
+ String method = expected.get(i);
assertEquals(method, callback.getMethodName());
}
}
- protected void assertParameters(List expected, List parameters)
+ protected void assertParameters(List<String> expected, List<ParameterMetaData> parameters)
{
assertNotNull(parameters);
assertEquals(expected.size(), parameters.size());
for (int i = 0; i < expected.size(); ++i)
{
- ParameterMetaData parameter = (ParameterMetaData) parameters.get(i);
- String method = (String) expected.get(i);
+ ParameterMetaData parameter = parameters.get(i);
+ String method = expected.get(i);
assertEquals(method, parameter.getType());
}
}
@@ -267,7 +267,7 @@
assertTrue(value instanceof BeanMetaData);
}
- protected void checkJBossXBException(Class expected, Throwable throwable)
+ protected void checkJBossXBException(Class<? extends Throwable> expected, Throwable throwable)
{
checkThrowable(JBossXBException.class, throwable);
JBossXBException e = (JBossXBException) throwable;
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AbstractXMLTest.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AbstractXMLTest.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AbstractXMLTest.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -154,9 +154,9 @@
assertNotNull(annotations);
assertEquals(expected.size(), annotations.size());
HashSet<String> clonedExpected = new HashSet<String>(expected);
- for (Iterator i = annotations.iterator(); i.hasNext();)
+ for (Iterator<AnnotationMetaData> i = annotations.iterator(); i.hasNext();)
{
- AnnotationMetaData annotation = (AnnotationMetaData) i.next();
+ AnnotationMetaData annotation = i.next();
if (clonedExpected.remove(annotation.getAnnotationInstance().annotationType().getName()) == false)
fail("Did not expect " + annotation + " expected " + expected);
}
@@ -169,9 +169,9 @@
assertNotNull(properties);
assertEquals(expected.size(), properties.size());
HashSet<String> clonedExpected = new HashSet<String>(expected);
- for (Iterator i = properties.iterator(); i.hasNext();)
+ for (Iterator<PropertyMetaData> i = properties.iterator(); i.hasNext();)
{
- PropertyMetaData property = (PropertyMetaData) i.next();
+ PropertyMetaData property = i.next();
if (clonedExpected.remove(property.getName()) == false)
fail("Did not expect " + property + " expected " + expected);
}
@@ -179,6 +179,7 @@
fail("Expected " + expected + " got " + properties);
}
+ @SuppressWarnings("unchecked")
protected void assertBeanFactoryProperties(Set<String> expected, GenericBeanFactoryMetaData factory)
{
assertNotNull(factory);
@@ -186,12 +187,12 @@
assertNotNull(propertiesProperty);
AbstractMapMetaData map = (AbstractMapMetaData) propertiesProperty.getValue();
assertNotNull(map);
- Set properties = map.keySet();
+ Set<AbstractValueMetaData> properties = (Set) map.keySet();
assertEquals(expected.size(), properties.size());
HashSet<String> clonedExpected = new HashSet<String>(expected);
- for (Iterator i = properties.iterator(); i.hasNext();)
+ for (Iterator<AbstractValueMetaData> i = properties.iterator(); i.hasNext();)
{
- AbstractValueMetaData property = (AbstractValueMetaData) i.next();
+ AbstractValueMetaData property = i.next();
if (clonedExpected.remove(property.getUnderlyingValue()) == false)
fail("Did not expect " + property + " expected " + expected);
}
@@ -232,9 +233,9 @@
assertNotNull(supplies);
assertEquals(expected.size(), supplies.size());
HashSet<String> clonedExpected = new HashSet<String>(expected);
- for (Iterator i = supplies.iterator(); i.hasNext();)
+ for (Iterator<SupplyMetaData> i = supplies.iterator(); i.hasNext();)
{
- SupplyMetaData supply = (SupplyMetaData) i.next();
+ SupplyMetaData supply = i.next();
if (clonedExpected.remove(supply.getSupply()) == false)
fail("Did not expect " + supply + " expected " + expected);
}
@@ -242,38 +243,38 @@
fail("Expected " + expected + " got " + supplies);
}
- protected void assertInstalls(List expected, List installs)
+ protected void assertInstalls(List<String> expected, List<InstallMetaData> installs)
{
assertNotNull(installs);
assertEquals(expected.size(), installs.size());
for (int i = 0; i < expected.size(); ++i)
{
- InstallMetaData install = (InstallMetaData) installs.get(i);
- String method = (String) expected.get(i);
+ InstallMetaData install = installs.get(i);
+ String method = expected.get(i);
assertEquals(method, install.getMethodName());
}
}
- protected void assertCallbacks(List expected, List callbacks)
+ protected void assertCallbacks(List<String> expected, List<CallbackMetaData> callbacks)
{
assertNotNull(callbacks);
assertEquals(expected.size(), callbacks.size());
for (int i = 0; i < expected.size(); ++i)
{
- CallbackMetaData callback = (CallbackMetaData) callbacks.get(i);
- String method = (String) expected.get(i);
+ CallbackMetaData callback = callbacks.get(i);
+ String method = expected.get(i);
assertEquals(method, callback.getMethodName());
}
}
- protected void assertParameters(List expected, List parameters)
+ protected void assertParameters(List<String> expected, List<ParameterMetaData> parameters)
{
assertNotNull(parameters);
assertEquals(expected.size(), parameters.size());
for (int i = 0; i < expected.size(); ++i)
{
- ParameterMetaData parameter = (ParameterMetaData) parameters.get(i);
- String method = (String) expected.get(i);
+ ParameterMetaData parameter = parameters.get(i);
+ String method = expected.get(i);
assertEquals(method, parameter.getType());
}
}
@@ -368,7 +369,7 @@
* @return the delegate
* @throws Exception for any error
*/
- public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+ public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
{
return new XMLTestDelegate(clazz);
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AliasJaxbTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AliasJaxbTestCase.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AliasJaxbTestCase.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -24,6 +24,7 @@
import java.util.Set;
import junit.framework.Test;
+
import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
import org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData2;
@@ -47,7 +48,7 @@
protected Object getAlias() throws Exception
{
AbstractBeanMetaData bean = unmarshalBean();
- Set aliases = bean.getAliases();
+ Set<Object> aliases = bean.getAliases();
assertNotNull(aliases);
assertEquals(1, aliases.size());
Object alias = aliases.iterator().next();
@@ -105,7 +106,7 @@
public void testMultipleAlias() throws Exception
{
AbstractBeanMetaData bean = unmarshalBean();
- Set aliases = bean.getAliases();
+ Set<Object> aliases = bean.getAliases();
assertNotNull(aliases);
int size = aliases.size();
assertTrue(size > 1);
@@ -116,7 +117,7 @@
public void testAliasWithBeanFactory() throws Exception
{
GenericBeanFactoryMetaData2 bean = unmarshalBeanFactory();
- Set aliases = bean.getAliases();
+ Set<Object> aliases = bean.getAliases();
assertNotNull(aliases);
assertFalse(aliases.isEmpty());
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AliasTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AliasTestCase.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AliasTestCase.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -48,7 +48,7 @@
protected Object getAlias(String name) throws Exception
{
AbstractBeanMetaData bean = unmarshalBean(name);
- Set aliases = bean.getAliases();
+ Set<Object> aliases = bean.getAliases();
assertNotNull(aliases);
assertEquals(1, aliases.size());
Object alias = aliases.iterator().next();
@@ -101,7 +101,7 @@
public void testMultipleAliases() throws Exception
{
AbstractBeanMetaData bean = unmarshalBean("MultipleAlias.xml");
- Set aliases = bean.getAliases();
+ Set<Object> aliases = bean.getAliases();
assertNotNull(aliases);
int size = aliases.size();
assertTrue(size > 1);
@@ -112,7 +112,7 @@
public void testAliasAndBeanFactory() throws Exception
{
AbstractBeanMetaData bean = unmarshalBean("AliasWithBeanFactory.xml");
- Set aliases = bean.getAliases();
+ Set<Object> aliases = bean.getAliases();
assertNotNull(aliases);
assertFalse(aliases.isEmpty());
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AnnotationJaxbTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AnnotationJaxbTestCase.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AnnotationJaxbTestCase.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -27,6 +27,7 @@
import junit.framework.Test;
import org.jboss.beans.metadata.plugins.AbstractAnnotationMetaData;
import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
+import org.jboss.beans.metadata.spi.AnnotationMetaData;
import org.jboss.beans.metadata.spi.ConstructorMetaData;
import org.jboss.test.kernel.deployment.xml.support.Annotation1;
import org.jboss.test.kernel.deployment.xml.support.AnnotationWithAttribute;
@@ -45,7 +46,7 @@
AbstractBeanMetaData bean = unmarshalBean();
ConstructorMetaData constructor = bean.getConstructor();
assertNotNull(constructor);
- Set annotations = constructor.getAnnotations();
+ Set<AnnotationMetaData> annotations = constructor.getAnnotations();
assertEquals(1, annotations.size());
AbstractAnnotationMetaData annotation = (AbstractAnnotationMetaData) annotations.iterator().next();
assertNotNull(annotation);
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AnnotationTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AnnotationTestCase.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AnnotationTestCase.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -28,6 +28,7 @@
import org.jboss.beans.metadata.plugins.AbstractAnnotationMetaData;
import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
+import org.jboss.beans.metadata.spi.AnnotationMetaData;
import org.jboss.beans.metadata.spi.ConstructorMetaData;
import org.jboss.test.kernel.deployment.xml.support.Annotation1;
import org.jboss.test.kernel.deployment.xml.support.AnnotationWithAttribute;
@@ -46,7 +47,7 @@
AbstractBeanMetaData bean = unmarshalBean(name);
ConstructorMetaData constructor = bean.getConstructor();
assertNotNull(constructor);
- Set annotations = constructor.getAnnotations();
+ Set<AnnotationMetaData> annotations = constructor.getAnnotations();
assertEquals(1, annotations.size());
AbstractAnnotationMetaData annotation = (AbstractAnnotationMetaData) annotations.iterator().next();
assertNotNull(annotation);
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ArrayJaxbTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ArrayJaxbTestCase.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ArrayJaxbTestCase.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -40,10 +40,10 @@
protected AbstractArrayMetaData getCollection() throws Exception
{
AbstractBeanMetaData bean = unmarshalBean();
- Set properties = bean.getProperties();
+ Set<PropertyMetaData> properties = bean.getProperties();
assertNotNull(properties);
assertEquals(1, properties.size());
- PropertyMetaData property = (PropertyMetaData) properties.iterator().next();
+ PropertyMetaData property = properties.iterator().next();
assertNotNull(property);
ValueMetaData value = property.getValue();
assertNotNull(property);
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ArrayTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ArrayTestCase.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ArrayTestCase.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -40,10 +40,10 @@
protected AbstractArrayMetaData getCollection(String name) throws Exception
{
AbstractBeanMetaData bean = unmarshalBean(name);
- Set properties = bean.getProperties();
+ Set<PropertyMetaData> properties = bean.getProperties();
assertNotNull(properties);
assertEquals(1, properties.size());
- PropertyMetaData property = (PropertyMetaData) properties.iterator().next();
+ PropertyMetaData property = properties.iterator().next();
assertNotNull(property);
ValueMetaData value = property.getValue();
assertNotNull(property);
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/CollectionJaxbTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/CollectionJaxbTestCase.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/CollectionJaxbTestCase.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -40,10 +40,10 @@
protected AbstractCollectionMetaData getCollection() throws Exception
{
AbstractBeanMetaData bean = unmarshalBean();
- Set properties = bean.getProperties();
+ Set<PropertyMetaData> properties = bean.getProperties();
assertNotNull(properties);
assertEquals(1, properties.size());
- PropertyMetaData property = (PropertyMetaData) properties.iterator().next();
+ PropertyMetaData property = properties.iterator().next();
assertNotNull(property);
ValueMetaData value = property.getValue();
assertNotNull(property);
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/CollectionTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/CollectionTestCase.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/CollectionTestCase.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -40,10 +40,10 @@
protected AbstractCollectionMetaData getCollection(String name) throws Exception
{
AbstractBeanMetaData bean = unmarshalBean(name);
- Set properties = bean.getProperties();
+ Set<PropertyMetaData> properties = bean.getProperties();
assertNotNull(properties);
assertEquals(1, properties.size());
- PropertyMetaData property = (PropertyMetaData) properties.iterator().next();
+ PropertyMetaData property = properties.iterator().next();
assertNotNull(property);
ValueMetaData value = property.getValue();
assertNotNull(property);
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/DemandJaxbTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/DemandJaxbTestCase.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/DemandJaxbTestCase.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -26,6 +26,7 @@
import junit.framework.Test;
import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
import org.jboss.beans.metadata.plugins.AbstractDemandMetaData;
+import org.jboss.beans.metadata.spi.DemandMetaData;
import org.jboss.dependency.spi.ControllerState;
/**
@@ -39,7 +40,7 @@
protected AbstractDemandMetaData getDemand() throws Exception
{
AbstractBeanMetaData bean = unmarshalBean();
- Set demands = bean.getDemands();
+ Set<DemandMetaData> demands = bean.getDemands();
assertNotNull(demands);
assertEquals(1, demands.size());
AbstractDemandMetaData demand = (AbstractDemandMetaData) demands.iterator().next();
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/DemandTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/DemandTestCase.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/DemandTestCase.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -27,6 +27,7 @@
import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
import org.jboss.beans.metadata.plugins.AbstractDemandMetaData;
+import org.jboss.beans.metadata.spi.DemandMetaData;
import org.jboss.dependency.spi.ControllerState;
/**
@@ -40,7 +41,7 @@
protected AbstractDemandMetaData getDemand(String name) throws Exception
{
AbstractBeanMetaData bean = unmarshalBean(name);
- Set demands = bean.getDemands();
+ Set<DemandMetaData> demands = bean.getDemands();
assertNotNull(demands);
assertEquals(1, demands.size());
AbstractDemandMetaData demand = (AbstractDemandMetaData) demands.iterator().next();
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/DeploymentJaxbTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/DeploymentJaxbTestCase.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/DeploymentJaxbTestCase.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -69,10 +69,10 @@
AbstractKernelDeployment deployment = unmarshalDeployment();
assertEquals("SimpleDeployment", deployment.getName());
assertNull(deployment.getClassLoader());
- List beans = deployment.getBeans();
+ List<BeanMetaData> beans = deployment.getBeans();
assertNotNull(beans);
assertEquals(1, beans.size());
- BeanMetaData bean = (BeanMetaData) beans.get(0);
+ BeanMetaData bean = beans.get(0);
assertNotNull(bean);
assertEquals("Bean1", bean.getName());
assertEquals(Object.class.getName(), bean.getBean());
@@ -83,18 +83,18 @@
AbstractKernelDeployment deployment = unmarshalDeployment();
assertEquals("SimpleDeployment", deployment.getName());
assertNull(deployment.getClassLoader());
- List beans = deployment.getBeans();
+ List<BeanMetaData> beans = deployment.getBeans();
assertNotNull(beans);
assertEquals(3, beans.size());
- BeanMetaData bean = (BeanMetaData) beans.get(0);
+ BeanMetaData bean = beans.get(0);
assertNotNull(bean);
assertEquals("Bean1", bean.getName());
assertEquals(Object.class.getName(), bean.getBean());
- bean = (BeanMetaData) beans.get(1);
+ bean = beans.get(1);
assertNotNull(bean);
assertEquals("Bean2", bean.getName());
assertEquals(Object.class.getName(), bean.getBean());
- bean = (BeanMetaData) beans.get(2);
+ bean = beans.get(2);
assertNotNull(bean);
assertEquals("Bean3", bean.getName());
assertEquals(Object.class.getName(), bean.getBean());
@@ -105,10 +105,10 @@
AbstractKernelDeployment deployment = unmarshalDeployment();
assertEquals("SimpleDeployment", deployment.getName());
assertNull(deployment.getClassLoader());
- List beans = deployment.getBeans();
+ List<BeanMetaData> beans = deployment.getBeans();
assertNotNull(beans);
assertEquals(1, beans.size());
- BeanMetaData bean = (BeanMetaData) beans.get(0);
+ BeanMetaData bean = beans.get(0);
assertNotNull(bean);
assertEquals("Bean1", bean.getName());
assertEquals(GenericBeanFactory.class.getName(), bean.getBean());
@@ -119,18 +119,18 @@
AbstractKernelDeployment deployment = unmarshalDeployment();
assertEquals("SimpleDeployment", deployment.getName());
assertNull(deployment.getClassLoader());
- List beans = deployment.getBeans();
+ List<BeanMetaData> beans = deployment.getBeans();
assertNotNull(beans);
assertEquals(3, beans.size());
- BeanMetaData bean = (BeanMetaData) beans.get(0);
+ BeanMetaData bean = beans.get(0);
assertNotNull(bean);
assertEquals("Bean1", bean.getName());
assertEquals(GenericBeanFactory.class.getName(), bean.getBean());
- bean = (BeanMetaData) beans.get(1);
+ bean = beans.get(1);
assertNotNull(bean);
assertEquals("Bean2", bean.getName());
assertEquals(GenericBeanFactory.class.getName(), bean.getBean());
- bean = (BeanMetaData) beans.get(2);
+ bean = beans.get(2);
assertNotNull(bean);
assertEquals("Bean3", bean.getName());
assertEquals(GenericBeanFactory.class.getName(), bean.getBean());
@@ -141,34 +141,34 @@
AbstractKernelDeployment deployment = unmarshalDeployment();
assertEquals("SimpleDeployment", deployment.getName());
assertNull(deployment.getClassLoader());
- List beanFactories = deployment.getBeanFactories();
+ List<BeanMetaDataFactory> beanFactories = deployment.getBeanFactories();
assertNotNull(beanFactories);
assertEquals(3, beanFactories.size());
- BeanMetaDataFactory factory = (BeanMetaDataFactory) beanFactories.get(0);
+ BeanMetaDataFactory factory = beanFactories.get(0);
assertEquals(TestBeanMetaDataFactory.class.getName(), factory.getClass().getName());
- factory = (BeanMetaDataFactory) beanFactories.get(1);
+ factory = beanFactories.get(1);
assertEquals(TestBeanMetaDataFactory1.class.getName(), factory.getClass().getName());
- factory = (BeanMetaDataFactory) beanFactories.get(2);
+ factory = beanFactories.get(2);
assertEquals(TestBeanMetaDataFactory2.class.getName(), factory.getClass().getName());
- List beans = deployment.getBeans();
+ List<BeanMetaData> beans = deployment.getBeans();
assertNotNull(beans);
assertEquals(6, beans.size());
- BeanMetaData bean = (BeanMetaData) beans.get(0);
+ BeanMetaData bean = beans.get(0);
assertNotNull(bean);
assertEquals("Bean1", bean.getBean());
- bean = (BeanMetaData) beans.get(1);
+ bean = beans.get(1);
assertNotNull(bean);
assertEquals("Bean2", bean.getBean());
- bean = (BeanMetaData) beans.get(2);
+ bean = beans.get(2);
assertNotNull(bean);
assertEquals("Bean3", bean.getBean());
- bean = (BeanMetaData) beans.get(3);
+ bean = beans.get(3);
assertNotNull(bean);
assertEquals("Bean4", bean.getBean());
- bean = (BeanMetaData) beans.get(4);
+ bean = beans.get(4);
assertNotNull(bean);
assertEquals("Bean5", bean.getBean());
- bean = (BeanMetaData) beans.get(5);
+ bean = beans.get(5);
assertNotNull(bean);
assertEquals("Bean6", bean.getBean());
}
@@ -178,18 +178,18 @@
AbstractKernelDeployment deployment = unmarshalDeployment();
assertEquals("SimpleDeployment", deployment.getName());
assertNull(deployment.getClassLoader());
- List beanFactories = deployment.getBeanFactories();
+ List<BeanMetaDataFactory> beanFactories = deployment.getBeanFactories();
assertNotNull(beanFactories);
assertEquals(1, beanFactories.size());
- BeanMetaDataFactory factory = (BeanMetaDataFactory) beanFactories.get(0);
+ BeanMetaDataFactory factory = beanFactories.get(0);
assertEquals(TestBeanMetaDataFactory.class.getName(), factory.getClass().getName());
- List beans = deployment.getBeans();
+ List<BeanMetaData> beans = deployment.getBeans();
assertNotNull(beans);
assertEquals(2, beans.size());
- BeanMetaData bean = (BeanMetaData) beans.get(0);
+ BeanMetaData bean = beans.get(0);
assertNotNull(bean);
assertEquals("Bean1", bean.getBean());
- bean = (BeanMetaData) beans.get(1);
+ bean = beans.get(1);
assertNotNull(bean);
assertEquals("Bean2", bean.getBean());
}
@@ -199,35 +199,35 @@
AbstractKernelDeployment deployment = unmarshalDeployment();
assertEquals("SimpleDeployment", deployment.getName());
assertNull(deployment.getClassLoader());
- List beans = deployment.getBeans();
+ List<BeanMetaData> beans = deployment.getBeans();
assertNotNull(beans);
assertEquals(8, beans.size());
- BeanMetaData bean = (BeanMetaData) beans.get(0);
+ BeanMetaData bean = beans.get(0);
assertNotNull(bean);
assertEquals("Bean1", bean.getName());
assertEquals(Object.class.getName(), bean.getBean());
- bean = (BeanMetaData) beans.get(1);
+ bean = beans.get(1);
assertNotNull(bean);
assertEquals("Bean2", bean.getName());
assertEquals(GenericBeanFactory.class.getName(), bean.getBean());
- bean = (BeanMetaData) beans.get(2);
+ bean = beans.get(2);
assertNotNull(bean);
assertEquals("Bean1", bean.getBean());
- bean = (BeanMetaData) beans.get(3);
+ bean = beans.get(3);
assertNotNull(bean);
assertEquals("Bean2", bean.getBean());
- bean = (BeanMetaData) beans.get(4);
+ bean = beans.get(4);
assertNotNull(bean);
assertEquals("Bean3", bean.getName());
assertEquals(Object.class.getName(), bean.getBean());
- bean = (BeanMetaData) beans.get(5);
+ bean = beans.get(5);
assertNotNull(bean);
assertEquals("Bean4", bean.getName());
assertEquals(GenericBeanFactory.class.getName(), bean.getBean());
- bean = (BeanMetaData) beans.get(6);
+ bean = beans.get(6);
assertNotNull(bean);
assertEquals("Bean3", bean.getBean());
- bean = (BeanMetaData) beans.get(7);
+ bean = beans.get(7);
assertNotNull(bean);
assertEquals("Bean4", bean.getBean());
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/DeploymentTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/DeploymentTestCase.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/DeploymentTestCase.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -80,10 +80,10 @@
AbstractKernelDeployment deployment = unmarshalDeployment("DeploymentWithBean.xml");
assertEquals("SimpleDeployment", deployment.getName());
assertNull(deployment.getClassLoader());
- List beans = deployment.getBeans();
+ List<BeanMetaData> beans = deployment.getBeans();
assertNotNull(beans);
assertEquals(1, beans.size());
- BeanMetaData bean = (BeanMetaData) beans.get(0);
+ BeanMetaData bean = beans.get(0);
assertNotNull(bean);
assertEquals("Bean1", bean.getName());
assertEquals(Object.class.getName(), bean.getBean());
@@ -94,18 +94,18 @@
AbstractKernelDeployment deployment = unmarshalDeployment("DeploymentWithMultipleBeans.xml");
assertEquals("SimpleDeployment", deployment.getName());
assertNull(deployment.getClassLoader());
- List beans = deployment.getBeans();
+ List<BeanMetaData> beans = deployment.getBeans();
assertNotNull(beans);
assertEquals(3, beans.size());
- BeanMetaData bean = (BeanMetaData) beans.get(0);
+ BeanMetaData bean = beans.get(0);
assertNotNull(bean);
assertEquals("Bean1", bean.getName());
assertEquals(Object.class.getName(), bean.getBean());
- bean = (BeanMetaData) beans.get(1);
+ bean = beans.get(1);
assertNotNull(bean);
assertEquals("Bean2", bean.getName());
assertEquals(Object.class.getName(), bean.getBean());
- bean = (BeanMetaData) beans.get(2);
+ bean = beans.get(2);
assertNotNull(bean);
assertEquals("Bean3", bean.getName());
assertEquals(Object.class.getName(), bean.getBean());
@@ -116,10 +116,10 @@
AbstractKernelDeployment deployment = unmarshalDeployment("DeploymentWithBeanFactory.xml");
assertEquals("SimpleDeployment", deployment.getName());
assertNull(deployment.getClassLoader());
- List beans = deployment.getBeans();
+ List<BeanMetaData> beans = deployment.getBeans();
assertNotNull(beans);
assertEquals(1, beans.size());
- BeanMetaData bean = (BeanMetaData) beans.get(0);
+ BeanMetaData bean = beans.get(0);
assertNotNull(bean);
assertEquals("Bean1", bean.getName());
assertEquals(GenericBeanFactory.class.getName(), bean.getBean());
@@ -130,18 +130,18 @@
AbstractKernelDeployment deployment = unmarshalDeployment("DeploymentWithMultipleBeanFactorys.xml");
assertEquals("SimpleDeployment", deployment.getName());
assertNull(deployment.getClassLoader());
- List beans = deployment.getBeans();
+ List<BeanMetaData> beans = deployment.getBeans();
assertNotNull(beans);
assertEquals(3, beans.size());
- BeanMetaData bean = (BeanMetaData) beans.get(0);
+ BeanMetaData bean = beans.get(0);
assertNotNull(bean);
assertEquals("Bean1", bean.getName());
assertEquals(GenericBeanFactory.class.getName(), bean.getBean());
- bean = (BeanMetaData) beans.get(1);
+ bean = beans.get(1);
assertNotNull(bean);
assertEquals("Bean2", bean.getName());
assertEquals(GenericBeanFactory.class.getName(), bean.getBean());
- bean = (BeanMetaData) beans.get(2);
+ bean = beans.get(2);
assertNotNull(bean);
assertEquals("Bean3", bean.getName());
assertEquals(GenericBeanFactory.class.getName(), bean.getBean());
@@ -152,34 +152,34 @@
AbstractKernelDeployment deployment = unmarshalDeployment("DeploymentWithMultipleBeanMetaDataFactorys.xml");
assertEquals("SimpleDeployment", deployment.getName());
assertNull(deployment.getClassLoader());
- List beanFactories = deployment.getBeanFactories();
+ List<BeanMetaDataFactory> beanFactories = deployment.getBeanFactories();
assertNotNull(beanFactories);
assertEquals(3, beanFactories.size());
- BeanMetaDataFactory factory = (BeanMetaDataFactory) beanFactories.get(0);
+ BeanMetaDataFactory factory = beanFactories.get(0);
assertEquals(TestBeanMetaDataFactory.class.getName(), factory.getClass().getName());
- factory = (BeanMetaDataFactory) beanFactories.get(1);
+ factory = beanFactories.get(1);
assertEquals(TestBeanMetaDataFactory1.class.getName(), factory.getClass().getName());
- factory = (BeanMetaDataFactory) beanFactories.get(2);
+ factory = beanFactories.get(2);
assertEquals(TestBeanMetaDataFactory2.class.getName(), factory.getClass().getName());
- List beans = deployment.getBeans();
+ List<BeanMetaData> beans = deployment.getBeans();
assertNotNull(beans);
assertEquals(6, beans.size());
- BeanMetaData bean = (BeanMetaData) beans.get(0);
+ BeanMetaData bean = beans.get(0);
assertNotNull(bean);
assertEquals("Bean1", bean.getBean());
- bean = (BeanMetaData) beans.get(1);
+ bean = beans.get(1);
assertNotNull(bean);
assertEquals("Bean2", bean.getBean());
- bean = (BeanMetaData) beans.get(2);
+ bean = beans.get(2);
assertNotNull(bean);
assertEquals("Bean3", bean.getBean());
- bean = (BeanMetaData) beans.get(3);
+ bean = beans.get(3);
assertNotNull(bean);
assertEquals("Bean4", bean.getBean());
- bean = (BeanMetaData) beans.get(4);
+ bean = beans.get(4);
assertNotNull(bean);
assertEquals("Bean5", bean.getBean());
- bean = (BeanMetaData) beans.get(5);
+ bean = beans.get(5);
assertNotNull(bean);
assertEquals("Bean6", bean.getBean());
}
@@ -189,18 +189,18 @@
AbstractKernelDeployment deployment = unmarshalDeployment("DeploymentWithBeanMetaDataFactory.xml");
assertEquals("SimpleDeployment", deployment.getName());
assertNull(deployment.getClassLoader());
- List beanFactories = deployment.getBeanFactories();
+ List<BeanMetaDataFactory> beanFactories = deployment.getBeanFactories();
assertNotNull(beanFactories);
assertEquals(1, beanFactories.size());
- BeanMetaDataFactory factory = (BeanMetaDataFactory) beanFactories.get(0);
+ BeanMetaDataFactory factory = beanFactories.get(0);
assertEquals(TestBeanMetaDataFactory.class.getName(), factory.getClass().getName());
- List beans = deployment.getBeans();
+ List<BeanMetaData> beans = deployment.getBeans();
assertNotNull(beans);
assertEquals(2, beans.size());
- BeanMetaData bean = (BeanMetaData) beans.get(0);
+ BeanMetaData bean = beans.get(0);
assertNotNull(bean);
assertEquals("Bean1", bean.getBean());
- bean = (BeanMetaData) beans.get(1);
+ bean = beans.get(1);
assertNotNull(bean);
assertEquals("Bean2", bean.getBean());
}
@@ -210,35 +210,35 @@
AbstractKernelDeployment deployment = unmarshalDeployment("DeploymentWithMixed.xml");
assertEquals("SimpleDeployment", deployment.getName());
assertNull(deployment.getClassLoader());
- List beans = deployment.getBeans();
+ List<BeanMetaData> beans = deployment.getBeans();
assertNotNull(beans);
assertEquals(8, beans.size());
- BeanMetaData bean = (BeanMetaData) beans.get(0);
+ BeanMetaData bean = beans.get(0);
assertNotNull(bean);
assertEquals("Bean1", bean.getName());
assertEquals(Object.class.getName(), bean.getBean());
- bean = (BeanMetaData) beans.get(1);
+ bean = beans.get(1);
assertNotNull(bean);
assertEquals("Bean2", bean.getName());
assertEquals(GenericBeanFactory.class.getName(), bean.getBean());
- bean = (BeanMetaData) beans.get(2);
+ bean = beans.get(2);
assertNotNull(bean);
assertEquals("Bean1", bean.getBean());
- bean = (BeanMetaData) beans.get(3);
+ bean = beans.get(3);
assertNotNull(bean);
assertEquals("Bean2", bean.getBean());
- bean = (BeanMetaData) beans.get(4);
+ bean = beans.get(4);
assertNotNull(bean);
assertEquals("Bean3", bean.getName());
assertEquals(Object.class.getName(), bean.getBean());
- bean = (BeanMetaData) beans.get(5);
+ bean = beans.get(5);
assertNotNull(bean);
assertEquals("Bean4", bean.getName());
assertEquals(GenericBeanFactory.class.getName(), bean.getBean());
- bean = (BeanMetaData) beans.get(6);
+ bean = beans.get(6);
assertNotNull(bean);
assertEquals("Bean3", bean.getBean());
- bean = (BeanMetaData) beans.get(7);
+ bean = beans.get(7);
assertNotNull(bean);
assertEquals("Bean4", bean.getBean());
}
@@ -256,10 +256,10 @@
LifecycleMetaData destroy = deployment.getDestroy();
assertNotNull(destroy);
- List beans = deployment.getBeans();
+ List<BeanMetaData> beans = deployment.getBeans();
assertNotNull(beans);
assertEquals(1, beans.size());
- BeanMetaData bean = (BeanMetaData)beans.iterator().next();
+ BeanMetaData bean = beans.iterator().next();
assertEquals(create, bean.getCreate());
assertEquals(start, bean.getStart());
@@ -275,10 +275,10 @@
assertNotNull(mode);
assertEquals(ControllerMode.ON_DEMAND, mode);
- List beans = deployment.getBeans();
+ List<BeanMetaData> beans = deployment.getBeans();
assertNotNull(beans);
assertEquals(1, beans.size());
- BeanMetaData bean = (BeanMetaData)beans.iterator().next();
+ BeanMetaData bean = beans.iterator().next();
assertEquals(mode, bean.getMode());
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/InjectionJaxbTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/InjectionJaxbTestCase.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/InjectionJaxbTestCase.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -41,10 +41,10 @@
protected AbstractDependencyValueMetaData getInjection() throws Exception
{
AbstractBeanMetaData bean = unmarshalBean();
- Set properties = bean.getProperties();
+ Set<PropertyMetaData> properties = bean.getProperties();
assertNotNull(properties);
assertEquals(1, properties.size());
- PropertyMetaData property = (PropertyMetaData) properties.iterator().next();
+ PropertyMetaData property = properties.iterator().next();
assertNotNull(property);
ValueMetaData value = property.getValue();
assertNotNull(property);
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/InjectionTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/InjectionTestCase.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/InjectionTestCase.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -44,10 +44,10 @@
protected AbstractInjectionValueMetaData getInjection(String name) throws Exception
{
AbstractBeanMetaData bean = unmarshalBean(name);
- Set properties = bean.getProperties();
+ Set<PropertyMetaData> properties = bean.getProperties();
assertNotNull(properties);
assertEquals(1, properties.size());
- PropertyMetaData property = (PropertyMetaData) properties.iterator().next();
+ PropertyMetaData property = properties.iterator().next();
assertNotNull(property);
ValueMetaData value = property.getValue();
assertNotNull(value);
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/InstallJaxbTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/InstallJaxbTestCase.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/InstallJaxbTestCase.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -44,10 +44,10 @@
protected InstallMetaData getInstall() throws Exception
{
AbstractBeanMetaData bean = unmarshalBean();
- List installs = bean.getInstalls();
+ List<InstallMetaData> installs = bean.getInstalls();
assertNotNull(installs);
assertEquals(1, installs.size());
- InstallMetaData install = (InstallMetaData) installs.get(0);
+ InstallMetaData install = installs.get(0);
assertNotNull(install);
return install;
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/InstallTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/InstallTestCase.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/InstallTestCase.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -42,10 +42,10 @@
protected InstallMetaData getInstall(String name) throws Exception
{
AbstractBeanMetaData bean = unmarshalBean(name);
- List installs = bean.getInstalls();
+ List<InstallMetaData> installs = bean.getInstalls();
assertNotNull(installs);
assertEquals(1, installs.size());
- InstallMetaData install = (InstallMetaData) installs.get(0);
+ InstallMetaData install = installs.get(0);
assertNotNull(install);
return install;
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ListJaxbTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ListJaxbTestCase.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ListJaxbTestCase.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -40,10 +40,10 @@
protected AbstractListMetaData getCollection() throws Exception
{
AbstractBeanMetaData bean = unmarshalBean();
- Set properties = bean.getProperties();
+ Set<PropertyMetaData> properties = bean.getProperties();
assertNotNull(properties);
assertEquals(1, properties.size());
- PropertyMetaData property = (PropertyMetaData) properties.iterator().next();
+ PropertyMetaData property = properties.iterator().next();
assertNotNull(property);
ValueMetaData value = property.getValue();
assertNotNull(property);
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ListTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ListTestCase.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ListTestCase.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -40,10 +40,10 @@
protected AbstractListMetaData getCollection(String name) throws Exception
{
AbstractBeanMetaData bean = unmarshalBean(name);
- Set properties = bean.getProperties();
+ Set<PropertyMetaData> properties = bean.getProperties();
assertNotNull(properties);
assertEquals(1, properties.size());
- PropertyMetaData property = (PropertyMetaData) properties.iterator().next();
+ PropertyMetaData property = properties.iterator().next();
assertNotNull(property);
ValueMetaData value = property.getValue();
assertNotNull(property);
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/MapJaxbTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/MapJaxbTestCase.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/MapJaxbTestCase.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -40,10 +40,10 @@
protected AbstractMapMetaData getMap() throws Exception
{
AbstractBeanMetaData bean = unmarshalBean();
- Set properties = bean.getProperties();
+ Set<PropertyMetaData> properties = bean.getProperties();
assertNotNull(properties);
assertEquals(1, properties.size());
- PropertyMetaData property = (PropertyMetaData) properties.iterator().next();
+ PropertyMetaData property = properties.iterator().next();
assertNotNull(property);
ValueMetaData value = property.getValue();
assertNotNull(property);
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/MapTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/MapTestCase.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/MapTestCase.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -40,10 +40,10 @@
protected AbstractMapMetaData getMap(String name) throws Exception
{
AbstractBeanMetaData bean = unmarshalBean(name);
- Set properties = bean.getProperties();
+ Set<PropertyMetaData> properties = bean.getProperties();
assertNotNull(properties);
assertEquals(1, properties.size());
- PropertyMetaData property = (PropertyMetaData) properties.iterator().next();
+ PropertyMetaData property = properties.iterator().next();
assertNotNull(property);
ValueMetaData value = property.getValue();
assertNotNull(property);
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ParameterJaxbTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ParameterJaxbTestCase.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ParameterJaxbTestCase.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -45,10 +45,10 @@
AbstractBeanMetaData bean = unmarshalBean();
ConstructorMetaData constructor = bean.getConstructor();
assertNotNull(constructor);
- List parameters = constructor.getParameters();
+ List<ParameterMetaData> parameters = constructor.getParameters();
assertNotNull(parameters);
assertEquals(1, parameters.size());
- ParameterMetaData parameter = (ParameterMetaData) parameters.get(0);
+ ParameterMetaData parameter = parameters.get(0);
assertNotNull(parameter);
return parameter;
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ParameterTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ParameterTestCase.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ParameterTestCase.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -42,10 +42,10 @@
AbstractBeanMetaData bean = unmarshalBean(name);
ConstructorMetaData constructor = bean.getConstructor();
assertNotNull(constructor);
- List parameters = constructor.getParameters();
+ List<ParameterMetaData> parameters = constructor.getParameters();
assertNotNull(parameters);
assertEquals(1, parameters.size());
- ParameterMetaData parameter = (ParameterMetaData) parameters.get(0);
+ ParameterMetaData parameter = parameters.get(0);
assertNotNull(parameter);
return parameter;
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/PropertyJaxbTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/PropertyJaxbTestCase.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/PropertyJaxbTestCase.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -44,10 +44,10 @@
protected PropertyMetaData getProperty() throws Exception
{
AbstractBeanMetaData bean = unmarshalBean();
- Set properties = bean.getProperties();
+ Set<PropertyMetaData> properties = bean.getProperties();
assertNotNull(properties);
assertEquals(1, properties.size());
- PropertyMetaData property = (PropertyMetaData) properties.iterator().next();
+ PropertyMetaData property = properties.iterator().next();
assertNotNull(property);
return property;
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/PropertyTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/PropertyTestCase.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/PropertyTestCase.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -41,10 +41,10 @@
protected PropertyMetaData getProperty(String name) throws Exception
{
AbstractBeanMetaData bean = unmarshalBean(name);
- Set properties = bean.getProperties();
+ Set<PropertyMetaData> properties = bean.getProperties();
assertNotNull(properties);
assertEquals(1, properties.size());
- PropertyMetaData property = (PropertyMetaData) properties.iterator().next();
+ PropertyMetaData property = properties.iterator().next();
assertNotNull(property);
return property;
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/SetJaxbTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/SetJaxbTestCase.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/SetJaxbTestCase.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -40,10 +40,10 @@
protected AbstractSetMetaData getCollection() throws Exception
{
AbstractBeanMetaData bean = unmarshalBean();
- Set properties = bean.getProperties();
+ Set<PropertyMetaData> properties = bean.getProperties();
assertNotNull(properties);
assertEquals(1, properties.size());
- PropertyMetaData property = (PropertyMetaData) properties.iterator().next();
+ PropertyMetaData property = properties.iterator().next();
assertNotNull(property);
ValueMetaData value = property.getValue();
assertNotNull(property);
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/SetTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/SetTestCase.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/SetTestCase.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -40,10 +40,10 @@
protected AbstractSetMetaData getCollection(String name) throws Exception
{
AbstractBeanMetaData bean = unmarshalBean(name);
- Set properties = bean.getProperties();
+ Set<PropertyMetaData> properties = bean.getProperties();
assertNotNull(properties);
assertEquals(1, properties.size());
- PropertyMetaData property = (PropertyMetaData) properties.iterator().next();
+ PropertyMetaData property = properties.iterator().next();
assertNotNull(property);
ValueMetaData value = property.getValue();
assertNotNull(property);
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/SupplyJaxbTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/SupplyJaxbTestCase.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/SupplyJaxbTestCase.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -26,6 +26,7 @@
import junit.framework.Test;
import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
import org.jboss.beans.metadata.plugins.AbstractSupplyMetaData;
+import org.jboss.beans.metadata.spi.SupplyMetaData;
/**
* SupplyJaxbTestCase.
@@ -38,7 +39,7 @@
protected AbstractSupplyMetaData getSupply() throws Exception
{
AbstractBeanMetaData bean = unmarshalBean();
- Set supplies = bean.getSupplies();
+ Set<SupplyMetaData> supplies = bean.getSupplies();
assertNotNull(supplies);
assertEquals(1, supplies.size());
AbstractSupplyMetaData supply = (AbstractSupplyMetaData) supplies.iterator().next();
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/SupplyTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/SupplyTestCase.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/SupplyTestCase.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -27,6 +27,7 @@
import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
import org.jboss.beans.metadata.plugins.AbstractSupplyMetaData;
+import org.jboss.beans.metadata.spi.SupplyMetaData;
/**
* SupplyTestCase.
@@ -39,7 +40,7 @@
protected AbstractSupplyMetaData getSupply(String name) throws Exception
{
AbstractBeanMetaData bean = unmarshalBean(name);
- Set supplies = bean.getSupplies();
+ Set<SupplyMetaData> supplies = bean.getSupplies();
assertNotNull(supplies);
assertEquals(1, supplies.size());
AbstractSupplyMetaData supply = (AbstractSupplyMetaData) supplies.iterator().next();
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ValueFactoryJaxbTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ValueFactoryJaxbTestCase.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ValueFactoryJaxbTestCase.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -42,10 +42,10 @@
protected AbstractValueFactoryMetaData getValueFactory(String name) throws Exception
{
AbstractBeanMetaData bean = unmarshalBean();
- Set properties = bean.getProperties();
+ Set<PropertyMetaData> properties = bean.getProperties();
assertNotNull(properties);
assertEquals(1, properties.size());
- PropertyMetaData property = (PropertyMetaData) properties.iterator().next();
+ PropertyMetaData property = properties.iterator().next();
assertNotNull(property);
ValueMetaData value = property.getValue();
assertNotNull(value);
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ValueFactoryTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ValueFactoryTestCase.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ValueFactoryTestCase.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -42,10 +42,10 @@
protected AbstractValueFactoryMetaData getValueFactory(String name) throws Exception
{
AbstractBeanMetaData bean = unmarshalBean(name);
- Set properties = bean.getProperties();
+ Set<PropertyMetaData> properties = bean.getProperties();
assertNotNull(properties);
assertEquals(1, properties.size());
- PropertyMetaData property = (PropertyMetaData) properties.iterator().next();
+ PropertyMetaData property = properties.iterator().next();
assertNotNull(property);
ValueMetaData value = property.getValue();
assertNotNull(value);
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ValueJaxbTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ValueJaxbTestCase.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ValueJaxbTestCase.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -40,10 +40,10 @@
protected StringValueMetaData getValue() throws Exception
{
AbstractBeanMetaData bean = unmarshalBean();
- Set properties = bean.getProperties();
+ Set<PropertyMetaData> properties = bean.getProperties();
assertNotNull(properties);
assertEquals(1, properties.size());
- PropertyMetaData property = (PropertyMetaData) properties.iterator().next();
+ PropertyMetaData property = properties.iterator().next();
assertNotNull(property);
ValueMetaData value = property.getValue();
assertNotNull(property);
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ValueTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ValueTestCase.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ValueTestCase.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -41,10 +41,10 @@
protected StringValueMetaData getValue(String name) throws Exception
{
AbstractBeanMetaData bean = unmarshalBean(name);
- Set properties = bean.getProperties();
+ Set<PropertyMetaData> properties = bean.getProperties();
assertNotNull(properties);
assertEquals(1, properties.size());
- PropertyMetaData property = (PropertyMetaData) properties.iterator().next();
+ PropertyMetaData property = properties.iterator().next();
assertNotNull(property);
ValueMetaData value = property.getValue();
assertNotNull(property);
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/XMLTestDelegate.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/XMLTestDelegate.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/XMLTestDelegate.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -46,7 +46,7 @@
*
* @param clazz the test class
*/
- public XMLTestDelegate(Class clazz)
+ public XMLTestDelegate(Class<?> clazz)
{
super(clazz);
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/inject/support/PropertyInjectTestObject.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/inject/support/PropertyInjectTestObject.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/inject/support/PropertyInjectTestObject.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -32,8 +32,8 @@
private TesterInterface testerInterface;
private DuplicateTester duplicateTester;
- private Collection collection;
- private Map map;
+ private Collection<?> collection;
+ private Map<?,?> map;
public TesterInterface getTesterInterface()
{
@@ -55,22 +55,22 @@
this.duplicateTester = duplicateTester;
}
- public Collection getCollection()
+ public Collection<?> getCollection()
{
return collection;
}
- public void setCollection(Collection collection)
+ public void setCollection(Collection<?> collection)
{
this.collection = collection;
}
- public Map getMap()
+ public Map<?,?> getMap()
{
return map;
}
- public void setMap(Map map)
+ public void setMap(Map<?,?> map)
{
this.map = map;
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/inject/test/AbstractManualInjectTest.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/inject/test/AbstractManualInjectTest.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/inject/test/AbstractManualInjectTest.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -39,7 +39,7 @@
super(name);
}
- public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+ public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
{
MicrocontainerTestDelegate delegate = (MicrocontainerTestDelegate) MicrocontainerTest.getDelegate(clazz);
delegate.setDefaultMode(ControllerMode.MANUAL);
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/inject/test/ContextualInjectionAdapter.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/inject/test/ContextualInjectionAdapter.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/inject/test/ContextualInjectionAdapter.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -44,7 +44,7 @@
* @return the delegate
* @throws Exception for any error
*/
- public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+ public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
{
AbstractTestDelegate delegate = MicrocontainerTest.getDelegate(clazz);
delegate.enableSecurity = true;
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/lazy/test/LazyInstantiationTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/lazy/test/LazyInstantiationTestCase.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/lazy/test/LazyInstantiationTestCase.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -52,7 +52,7 @@
* @return the delegate
* @throws Exception for any error
*/
- public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+ public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
{
return new AbstractTestDelegate(clazz);
}
@@ -105,6 +105,9 @@
private class ModifiedLazyMetaData extends AbstractLazyMetaData
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
public ModifiedLazyMetaData(String beanName, String factoryClassName)
{
super(beanName);
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/metadata/test/AbstractMetaDataTest.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/metadata/test/AbstractMetaDataTest.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/metadata/test/AbstractMetaDataTest.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -101,7 +101,7 @@
* @return the delegate
* @throws Exception for any error
*/
- public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+ public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
{
AbstractTestDelegate delegate = MicrocontainerTest.getDelegate(clazz);
//delegate.enableSecurity = true;
Modified: projects/microcontainer/trunk/spring-int/src/main/org/jboss/spring/deployment/xml/SpringSchemaBindingHelper.java
===================================================================
--- projects/microcontainer/trunk/spring-int/src/main/org/jboss/spring/deployment/xml/SpringSchemaBindingHelper.java 2008-02-18 17:43:49 UTC (rev 69894)
+++ projects/microcontainer/trunk/spring-int/src/main/org/jboss/spring/deployment/xml/SpringSchemaBindingHelper.java 2008-02-18 17:45:13 UTC (rev 69895)
@@ -62,7 +62,7 @@
public static void initAliasHandler(TypeBinding typeBinding)
{
- typeBinding.setHandler(NamedAliasHandler.HANDLER);
+ typeBinding.setHandler(NamedAliasHandler.NAMED_ALIAS_HANDLER);
}
public static void initImportHandler(TypeBinding typeBinding)
More information about the jboss-cvs-commits
mailing list