You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@labs.apache.org by jo...@apache.org on 2010/08/09 10:10:50 UTC
svn commit: r983550 [1/2] - in /labs/jaxmas/trunk/JaxMas: ./ .settings/
src/main/java/org/apache/labs/jaxmas/registry/
src/main/java/org/apache/labs/jaxmas/registry/accessor/
src/main/java/org/apache/labs/jaxmas/registry/infomodel/
src/main/java/org/ap...
Author: jochen
Date: Mon Aug 9 08:10:48 2010
New Revision: 983550
URL: http://svn.apache.org/viewvc?rev=983550&view=rev
Log:
- Prepared query generator for integration into CSQL query generator.
Added:
labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/sql/FilterPredicate.java (with props)
labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/sql/TableHandler.java (with props)
Modified:
labs/jaxmas/trunk/JaxMas/.settings/org.eclipse.jdt.core.prefs
labs/jaxmas/trunk/JaxMas/pom.xml
labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/ConnectionFactoryImpl.java
labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/AbstractROAccessor.java
labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/AssociationAccessor.java
labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/AuditableEventAccessor.java
labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/ClassificationAccessor.java
labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/ClassificationSchemeAccessor.java
labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/ConceptAccessor.java
labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/ExternalIdentifierAccessor.java
labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/ExternalLinkAccessor.java
labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/ExtrinsicObjectAccessor.java
labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/OrganizationAccessor.java
labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/RegistryEntryAccessor.java
labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/RegistryPackageAccessor.java
labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/ServiceAccessor.java
labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/ServiceBindingAccessor.java
labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/SpecificationLinkAccessor.java
labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/UserAccessor.java
labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/BulkResponseImpl.java
labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/BusinessLifeCycleManagerImpl.java
labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/BusinessQueryManagerImpl.java
labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/ClassificationSchemeImpl.java
labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/ConceptChildrenController.java
labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/ConceptImpl.java
labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/ConnectionImpl.java
labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/ExtensibleObjectImpl.java
labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/InternationalStringImpl.java
labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/LifeCycleManagerImpl.java
labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/OrganizationImpl.java
labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/QueryManagerImpl.java
labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/RegistryObjectImpl.java
labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/RegistryPackageImpl.java
labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/ServiceBindingImpl.java
labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/ServiceImpl.java
labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/SlotImpl.java
labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/SpecificationLinkImpl.java
labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/UserImpl.java
labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/sql/AbstractDbDriver.java
labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/sql/AssociationTargetPredicate.java
labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/sql/AssociationTypePredicate.java
labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/sql/CustomObjectTypePredicate.java
labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/sql/HsqlDbDriver.java
labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/sql/KeyPredicate.java
labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/sql/NamePredicate.java
labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/sql/OwnerPredicate.java
labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/sql/RegistryObjectLoader.java
labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/sql/RegistryObjectTypePredicate.java
labs/jaxmas/trunk/JaxMas/src/test/java/org/apache/labs/jaxmas/registry/AbstractInitializedJaxMasTestCase.java
labs/jaxmas/trunk/JaxMas/src/test/java/org/apache/labs/jaxmas/registry/AbstractJaxMasTestCase.java
labs/jaxmas/trunk/JaxMas/src/test/java/org/apache/labs/jaxmas/registry/CustomTypeTest.java
labs/jaxmas/trunk/JaxMas/src/test/java/org/apache/labs/jaxmas/registry/DbInitializationTest.java
labs/jaxmas/trunk/JaxMas/src/test/java/org/apache/labs/jaxmas/registry/TaxonomiesTestCase.java
Modified: labs/jaxmas/trunk/JaxMas/.settings/org.eclipse.jdt.core.prefs
URL: http://svn.apache.org/viewvc/labs/jaxmas/trunk/JaxMas/.settings/org.eclipse.jdt.core.prefs?rev=983550&r1=983549&r2=983550&view=diff
==============================================================================
--- labs/jaxmas/trunk/JaxMas/.settings/org.eclipse.jdt.core.prefs (original)
+++ labs/jaxmas/trunk/JaxMas/.settings/org.eclipse.jdt.core.prefs Mon Aug 9 08:10:48 2010
@@ -1,4 +1,4 @@
-#Fri Jul 23 22:16:23 CEST 2010
+#Wed Aug 04 17:39:24 CEST 2010
eclipse.preferences.version=1
org.eclipse.jdt.core.codeComplete.argumentPrefixes=p
org.eclipse.jdt.core.codeComplete.argumentSuffixes=
@@ -18,6 +18,8 @@ org.eclipse.jdt.core.compiler.debug.sour
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.autoboxing=warning
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
org.eclipse.jdt.core.compiler.problem.deprecation=warning
org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
@@ -37,11 +39,14 @@ org.eclipse.jdt.core.compiler.problem.in
org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
org.eclipse.jdt.core.compiler.problem.nullReference=warning
org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
org.eclipse.jdt.core.compiler.problem.parameterAssignment=warning
@@ -49,8 +54,10 @@ org.eclipse.jdt.core.compiler.problem.po
org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
@@ -61,11 +68,13 @@ org.eclipse.jdt.core.compiler.problem.un
org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
org.eclipse.jdt.core.compiler.problem.unusedImport=warning
org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
org.eclipse.jdt.core.compiler.problem.unusedParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
Modified: labs/jaxmas/trunk/JaxMas/pom.xml
URL: http://svn.apache.org/viewvc/labs/jaxmas/trunk/JaxMas/pom.xml?rev=983550&r1=983549&r2=983550&view=diff
==============================================================================
--- labs/jaxmas/trunk/JaxMas/pom.xml (original)
+++ labs/jaxmas/trunk/JaxMas/pom.xml Mon Aug 9 08:10:48 2010
@@ -63,9 +63,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>1.8.0.10</version>
+ <groupId>org.hsqldb</groupId>
+ <artifactId>hsqldb-j5</artifactId>
+ <version>2.0.0</version>
</dependency>
</dependencies>
Modified: labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/ConnectionFactoryImpl.java
URL: http://svn.apache.org/viewvc/labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/ConnectionFactoryImpl.java?rev=983550&r1=983549&r2=983550&view=diff
==============================================================================
--- labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/ConnectionFactoryImpl.java (original)
+++ labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/ConnectionFactoryImpl.java Mon Aug 9 08:10:48 2010
@@ -115,9 +115,8 @@ public class ConnectionFactoryImpl exten
return bundle;
}
- @SuppressWarnings("unchecked")
@Override
- public FederatedConnection createFederatedConnection(Collection pConnections) throws JAXRException {
+ public FederatedConnection createFederatedConnection(@SuppressWarnings("rawtypes") Collection pConnections) throws JAXRException {
final NLSStrings bundle = getBundle();
throw new JAXRException(bundle.get(NLSStrings.OPERATION_NOT_IMPLEMENTED));
}
Modified: labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/AbstractROAccessor.java
URL: http://svn.apache.org/viewvc/labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/AbstractROAccessor.java?rev=983550&r1=983549&r2=983550&view=diff
==============================================================================
--- labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/AbstractROAccessor.java (original)
+++ labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/AbstractROAccessor.java Mon Aug 9 08:10:48 2010
@@ -51,7 +51,8 @@ public abstract class AbstractROAccessor
return ((RegistryServiceImpl) pRegistryService).getDbDriver();
}
- public Key newKey(RegistryService pRegistryService) throws JAXRException {
+ @Override
+ public Key newKey(RegistryService pRegistryService) throws JAXRException {
final long id = getDbDriver(pRegistryService).newId("keys"); //$NON-NLS-1$
final String s = String.valueOf(id);
final String key = "00000000000000000000000000000000".substring(s.length()) + s; //$NON-NLS-1$
@@ -61,12 +62,14 @@ public abstract class AbstractROAccessor
/**
* Creates a new instance.
*/
- public RO create(RegistryService pRegistryService) throws JAXRException {
+ @Override
+ public RO create(RegistryService pRegistryService) throws JAXRException {
final RO ro = newInstance((RegistryServiceImpl) pRegistryService, null);
ro.setKey(newKey(pRegistryService));
return ro;
}
+ @Override
public RO create(RegistryService pRegistryService, Key pKey) throws JAXRException {
return newInstance((RegistryServiceImpl) pRegistryService, pKey);
}
Modified: labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/AssociationAccessor.java
URL: http://svn.apache.org/viewvc/labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/AssociationAccessor.java?rev=983550&r1=983549&r2=983550&view=diff
==============================================================================
--- labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/AssociationAccessor.java (original)
+++ labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/AssociationAccessor.java Mon Aug 9 08:10:48 2010
@@ -37,7 +37,7 @@ public class AssociationAccessor extends
private static final RegistryObjectLoader rol;
static {
try {
- rol = new RegistryObjectLoader(ROAccessors.ObjectTypes.ASSOCIATION, null);
+ rol = new RegistryObjectLoader(ROAccessors.ObjectTypes.ASSOCIATION, null, null);
} catch (JAXRException e) {
throw new UndeclaredThrowableException(e);
} catch (SQLException e) {
Modified: labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/AuditableEventAccessor.java
URL: http://svn.apache.org/viewvc/labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/AuditableEventAccessor.java?rev=983550&r1=983549&r2=983550&view=diff
==============================================================================
--- labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/AuditableEventAccessor.java (original)
+++ labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/AuditableEventAccessor.java Mon Aug 9 08:10:48 2010
@@ -38,7 +38,7 @@ public class AuditableEventAccessor exte
private static final RegistryObjectLoader rol;
static {
try {
- rol = new RegistryObjectLoader(ROAccessors.ObjectTypes.AUDITABLE_EVENT, null);
+ rol = new RegistryObjectLoader(ROAccessors.ObjectTypes.AUDITABLE_EVENT, null, null);
} catch (JAXRException e) {
throw new UndeclaredThrowableException(e);
} catch (SQLException e) {
Modified: labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/ClassificationAccessor.java
URL: http://svn.apache.org/viewvc/labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/ClassificationAccessor.java?rev=983550&r1=983549&r2=983550&view=diff
==============================================================================
--- labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/ClassificationAccessor.java (original)
+++ labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/ClassificationAccessor.java Mon Aug 9 08:10:48 2010
@@ -39,7 +39,7 @@ public class ClassificationAccessor exte
private static final RegistryObjectLoader rol;
static {
try {
- rol = new RegistryObjectLoader(ROAccessors.ObjectTypes.CLASSIFICATION, null);
+ rol = new RegistryObjectLoader(ROAccessors.ObjectTypes.CLASSIFICATION, null, null);
} catch (JAXRException e) {
throw new UndeclaredThrowableException(e);
} catch (SQLException e) {
Modified: labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/ClassificationSchemeAccessor.java
URL: http://svn.apache.org/viewvc/labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/ClassificationSchemeAccessor.java?rev=983550&r1=983549&r2=983550&view=diff
==============================================================================
--- labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/ClassificationSchemeAccessor.java (original)
+++ labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/ClassificationSchemeAccessor.java Mon Aug 9 08:10:48 2010
@@ -34,8 +34,8 @@ import javax.xml.registry.infomodel.Key;
import org.apache.labs.jaxmas.registry.infomodel.ClassificationSchemeImpl;
import org.apache.labs.jaxmas.registry.infomodel.NLSStrings;
import org.apache.labs.jaxmas.registry.infomodel.RegistryServiceImpl;
+import org.apache.labs.jaxmas.registry.sql.FilterPredicate;
import org.apache.labs.jaxmas.registry.sql.NamePredicate;
-import org.apache.labs.jaxmas.registry.sql.Predicate;
import org.apache.labs.jaxmas.registry.sql.RegistryObjectLoader;
@@ -47,7 +47,7 @@ public class ClassificationSchemeAccesso
private static final RegistryObjectLoader rol;
static {
try {
- rol = new RegistryObjectLoader(ROAccessors.ObjectTypes.CLASSIFICATION_SCHEME, null);
+ rol = new RegistryObjectLoader(ROAccessors.ObjectTypes.CLASSIFICATION_SCHEME, null, null);
} catch (JAXRException e) {
throw new UndeclaredThrowableException(e);
} catch (SQLException e) {
@@ -91,7 +91,7 @@ public class ClassificationSchemeAccesso
final RegistryService pRegistryService, Collection<?> pFindQualifiers,
Collection<?> pNamePatterns, Collection<?> pClassifications,
Collection<?> pExternalLinks) throws JAXRException {
- final List<Predicate> predicates = new ArrayList<Predicate>();
+ final List<FilterPredicate> predicates = new ArrayList<FilterPredicate>();
if (pFindQualifiers != null && !pFindQualifiers.isEmpty()) {
for (Object o : pFindQualifiers) {
if (!FindQualifier.EXACT_NAME_MATCH.equals(o)) {
@@ -108,7 +108,7 @@ public class ClassificationSchemeAccesso
if (pExternalLinks != null && !pExternalLinks.isEmpty()) {
throw new JAXRException(RegistryServiceImpl.getNLSStrings(pRegistryService).format(NLSStrings.UNSUPPORTED_PARAMETER, "pExternalLinks")); //$NON-NLS-1$
}
- return asClassificationSchemeList(rol.getResultList(pRegistryService, predicates));
+ return asClassificationSchemeList(rol.getResultList(pRegistryService, predicates, null));
}
@Override
Modified: labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/ConceptAccessor.java
URL: http://svn.apache.org/viewvc/labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/ConceptAccessor.java?rev=983550&r1=983549&r2=983550&view=diff
==============================================================================
--- labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/ConceptAccessor.java (original)
+++ labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/ConceptAccessor.java Mon Aug 9 08:10:48 2010
@@ -37,7 +37,7 @@ public class ConceptAccessor extends Abs
private static final RegistryObjectLoader rol;
static {
try {
- rol = new RegistryObjectLoader(ROAccessors.ObjectTypes.CONCEPT, null);
+ rol = new RegistryObjectLoader(ROAccessors.ObjectTypes.CONCEPT, null, null);
} catch (JAXRException e) {
throw new UndeclaredThrowableException(e);
} catch (SQLException e) {
Modified: labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/ExternalIdentifierAccessor.java
URL: http://svn.apache.org/viewvc/labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/ExternalIdentifierAccessor.java?rev=983550&r1=983549&r2=983550&view=diff
==============================================================================
--- labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/ExternalIdentifierAccessor.java (original)
+++ labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/ExternalIdentifierAccessor.java Mon Aug 9 08:10:48 2010
@@ -38,7 +38,7 @@ public class ExternalIdentifierAccessor
private static final RegistryObjectLoader rol;
static {
try {
- rol = new RegistryObjectLoader(ROAccessors.ObjectTypes.EXTERNAL_IDENTIFIER, null);
+ rol = new RegistryObjectLoader(ROAccessors.ObjectTypes.EXTERNAL_IDENTIFIER, null, null);
} catch (JAXRException e) {
throw new UndeclaredThrowableException(e);
} catch (SQLException e) {
Modified: labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/ExternalLinkAccessor.java
URL: http://svn.apache.org/viewvc/labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/ExternalLinkAccessor.java?rev=983550&r1=983549&r2=983550&view=diff
==============================================================================
--- labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/ExternalLinkAccessor.java (original)
+++ labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/ExternalLinkAccessor.java Mon Aug 9 08:10:48 2010
@@ -38,7 +38,7 @@ public class ExternalLinkAccessor extend
private static final RegistryObjectLoader rol;
static {
try {
- rol = new RegistryObjectLoader(ROAccessors.ObjectTypes.EXTERNAL_LINK, null);
+ rol = new RegistryObjectLoader(ROAccessors.ObjectTypes.EXTERNAL_LINK, null, null);
} catch (JAXRException e) {
throw new UndeclaredThrowableException(e);
} catch (SQLException e) {
Modified: labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/ExtrinsicObjectAccessor.java
URL: http://svn.apache.org/viewvc/labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/ExtrinsicObjectAccessor.java?rev=983550&r1=983549&r2=983550&view=diff
==============================================================================
--- labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/ExtrinsicObjectAccessor.java (original)
+++ labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/ExtrinsicObjectAccessor.java Mon Aug 9 08:10:48 2010
@@ -38,7 +38,7 @@ public class ExtrinsicObjectAccessor ext
private static final RegistryObjectLoader rol;
static {
try {
- rol = new RegistryObjectLoader(ROAccessors.ObjectTypes.EXTRINSIC_OBJECT, null);
+ rol = new RegistryObjectLoader(ROAccessors.ObjectTypes.EXTRINSIC_OBJECT, null, null);
} catch (JAXRException e) {
throw new UndeclaredThrowableException(e);
} catch (SQLException e) {
Modified: labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/OrganizationAccessor.java
URL: http://svn.apache.org/viewvc/labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/OrganizationAccessor.java?rev=983550&r1=983549&r2=983550&view=diff
==============================================================================
--- labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/OrganizationAccessor.java (original)
+++ labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/OrganizationAccessor.java Mon Aug 9 08:10:48 2010
@@ -35,8 +35,8 @@ import org.apache.labs.jaxmas.registry.a
import org.apache.labs.jaxmas.registry.infomodel.NLSStrings;
import org.apache.labs.jaxmas.registry.infomodel.OrganizationImpl;
import org.apache.labs.jaxmas.registry.infomodel.RegistryServiceImpl;
+import org.apache.labs.jaxmas.registry.sql.FilterPredicate;
import org.apache.labs.jaxmas.registry.sql.NamePredicate;
-import org.apache.labs.jaxmas.registry.sql.Predicate;
import org.apache.labs.jaxmas.registry.sql.RegistryObjectLoader;
import org.apache.labs.jaxmas.registry.sql.RegistryObjectTypePredicate;
@@ -48,7 +48,7 @@ public class OrganizationAccessor extend
private static final RegistryObjectLoader rol;
static {
try {
- rol = new RegistryObjectLoader(ROAccessors.ObjectTypes.ORGANIZATION, null);
+ rol = new RegistryObjectLoader(ROAccessors.ObjectTypes.ORGANIZATION, null, null);
} catch (JAXRException e) {
throw new UndeclaredThrowableException(e);
} catch (SQLException e) {
@@ -105,7 +105,7 @@ public class OrganizationAccessor extend
Collection<?> pNamePatterns, Collection<?> pClassifications,
Collection<?> pSpecifications, Collection<?> pExternalIdentifiers,
Collection<?> pExternalLinks) throws JAXRException {
- final List<Predicate> predicates = new ArrayList<Predicate>();
+ final List<FilterPredicate> predicates = new ArrayList<FilterPredicate>();
predicates.add(new RegistryObjectTypePredicate(ObjectTypes.ORGANIZATION));
if (pFindQualifiers != null && !pFindQualifiers.isEmpty()) {
for (Object o : pFindQualifiers) {
@@ -129,6 +129,6 @@ public class OrganizationAccessor extend
if (pExternalLinks != null && !pExternalLinks.isEmpty()) {
throw new JAXRException(RegistryServiceImpl.getNLSStrings(pRegistryService).format(NLSStrings.UNSUPPORTED_PARAMETER, "pExternalLinks")); //$NON-NLS-1$
}
- return asOrganizationList(rol.getResultList(pRegistryService, predicates));
+ return asOrganizationList(rol.getResultList(pRegistryService, predicates, null));
}
}
Modified: labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/RegistryEntryAccessor.java
URL: http://svn.apache.org/viewvc/labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/RegistryEntryAccessor.java?rev=983550&r1=983549&r2=983550&view=diff
==============================================================================
--- labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/RegistryEntryAccessor.java (original)
+++ labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/RegistryEntryAccessor.java Mon Aug 9 08:10:48 2010
@@ -35,8 +35,8 @@ import org.apache.labs.jaxmas.registry.i
import org.apache.labs.jaxmas.registry.infomodel.RegistryEntryImpl;
import org.apache.labs.jaxmas.registry.infomodel.RegistryServiceImpl;
import org.apache.labs.jaxmas.registry.sql.CustomObjectTypePredicate;
+import org.apache.labs.jaxmas.registry.sql.FilterPredicate;
import org.apache.labs.jaxmas.registry.sql.NamePredicate;
-import org.apache.labs.jaxmas.registry.sql.Predicate;
import org.apache.labs.jaxmas.registry.sql.RegistryObjectLoader;
import org.apache.labs.jaxmas.registry.sql.RegistryObjectTypePredicate;
@@ -48,7 +48,7 @@ public class RegistryEntryAccessor exten
private static final RegistryObjectLoader rol;
static {
try {
- rol = new RegistryObjectLoader(ROAccessors.ObjectTypes.REGISTRY_ENTRY, null);
+ rol = new RegistryObjectLoader(ROAccessors.ObjectTypes.REGISTRY_ENTRY, null, null);
} catch (JAXRException e) {
throw new UndeclaredThrowableException(e);
} catch (SQLException e) {
@@ -98,8 +98,12 @@ public class RegistryEntryAccessor exten
Collection<String> pDescriptionPatterns,
Collection<?> pClassifications, Collection<?> pExternalIdentifiers,
Collection<?> pExternalLinks) throws JAXRException {
- final List<Predicate> predicates = new ArrayList<Predicate>();
- predicates.add(new RegistryObjectTypePredicate(ObjectTypes.REGISTRY_ENTRY));
+ final List<FilterPredicate> predicates = new ArrayList<FilterPredicate>();
+ if (pObjectTypes == null || pObjectTypes.isEmpty()) {
+ predicates.add(new RegistryObjectTypePredicate(ObjectTypes.REGISTRY_ENTRY));
+ } else {
+ predicates.add(new CustomObjectTypePredicate(pObjectTypes));
+ }
if (pFindQualifiers != null && !pFindQualifiers.isEmpty()) {
for (Object o : pFindQualifiers) {
if (!FindQualifier.EXACT_NAME_MATCH.equals(o)) {
@@ -107,9 +111,6 @@ public class RegistryEntryAccessor exten
}
}
}
- if (pObjectTypes != null && !pObjectTypes.isEmpty()) {
- predicates.add(new CustomObjectTypePredicate(pObjectTypes));
- }
if (pNamePatterns != null && !pNamePatterns.isEmpty()) {
predicates.add(new NamePredicate(pNamePatterns));
}
@@ -125,6 +126,6 @@ public class RegistryEntryAccessor exten
if (pExternalLinks != null && !pExternalLinks.isEmpty()) {
throw new JAXRException(RegistryServiceImpl.getNLSStrings(pRegistryService).format(NLSStrings.UNSUPPORTED_PARAMETER, "pExternalLinks")); //$NON-NLS-1$
}
- return asRegistryEntryList(rol.getResultList(pRegistryService, predicates));
+ return asRegistryEntryList(rol.getResultList(pRegistryService, predicates, null));
}
}
Modified: labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/RegistryPackageAccessor.java
URL: http://svn.apache.org/viewvc/labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/RegistryPackageAccessor.java?rev=983550&r1=983549&r2=983550&view=diff
==============================================================================
--- labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/RegistryPackageAccessor.java (original)
+++ labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/RegistryPackageAccessor.java Mon Aug 9 08:10:48 2010
@@ -38,7 +38,7 @@ public class RegistryPackageAccessor ext
private static final RegistryObjectLoader rol;
static {
try {
- rol = new RegistryObjectLoader(ROAccessors.ObjectTypes.REGISTRY_PACKAGE, null);
+ rol = new RegistryObjectLoader(ROAccessors.ObjectTypes.REGISTRY_PACKAGE, null, null);
} catch (JAXRException e) {
throw new UndeclaredThrowableException(e);
} catch (SQLException e) {
Modified: labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/ServiceAccessor.java
URL: http://svn.apache.org/viewvc/labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/ServiceAccessor.java?rev=983550&r1=983549&r2=983550&view=diff
==============================================================================
--- labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/ServiceAccessor.java (original)
+++ labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/ServiceAccessor.java Mon Aug 9 08:10:48 2010
@@ -38,7 +38,7 @@ public class ServiceAccessor extends Abs
private static final RegistryObjectLoader rol;
static {
try {
- rol = new RegistryObjectLoader(ROAccessors.ObjectTypes.SERVICE, null);
+ rol = new RegistryObjectLoader(ROAccessors.ObjectTypes.SERVICE, null, null);
} catch (JAXRException e) {
throw new UndeclaredThrowableException(e);
} catch (SQLException e) {
Modified: labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/ServiceBindingAccessor.java
URL: http://svn.apache.org/viewvc/labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/ServiceBindingAccessor.java?rev=983550&r1=983549&r2=983550&view=diff
==============================================================================
--- labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/ServiceBindingAccessor.java (original)
+++ labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/ServiceBindingAccessor.java Mon Aug 9 08:10:48 2010
@@ -38,7 +38,7 @@ public class ServiceBindingAccessor exte
private static final RegistryObjectLoader rol;
static {
try {
- rol = new RegistryObjectLoader(ROAccessors.ObjectTypes.SERVICE_BINDING, null);
+ rol = new RegistryObjectLoader(ROAccessors.ObjectTypes.SERVICE_BINDING, null, null);
} catch (JAXRException e) {
throw new UndeclaredThrowableException(e);
} catch (SQLException e) {
Modified: labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/SpecificationLinkAccessor.java
URL: http://svn.apache.org/viewvc/labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/SpecificationLinkAccessor.java?rev=983550&r1=983549&r2=983550&view=diff
==============================================================================
--- labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/SpecificationLinkAccessor.java (original)
+++ labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/SpecificationLinkAccessor.java Mon Aug 9 08:10:48 2010
@@ -38,7 +38,7 @@ public class SpecificationLinkAccessor e
private static final RegistryObjectLoader rol;
static {
try {
- rol = new RegistryObjectLoader(ROAccessors.ObjectTypes.SPECIFICATION_LINK, null);
+ rol = new RegistryObjectLoader(ROAccessors.ObjectTypes.SPECIFICATION_LINK, null, null);
} catch (JAXRException e) {
throw new UndeclaredThrowableException(e);
} catch (SQLException e) {
Modified: labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/UserAccessor.java
URL: http://svn.apache.org/viewvc/labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/UserAccessor.java?rev=983550&r1=983549&r2=983550&view=diff
==============================================================================
--- labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/UserAccessor.java (original)
+++ labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/accessor/UserAccessor.java Mon Aug 9 08:10:48 2010
@@ -37,7 +37,7 @@ public class UserAccessor extends Abstra
private static final RegistryObjectLoader rol;
static {
try {
- rol = new RegistryObjectLoader(ROAccessors.ObjectTypes.USER, null);
+ rol = new RegistryObjectLoader(ROAccessors.ObjectTypes.USER, null, null);
} catch (JAXRException e) {
throw new UndeclaredThrowableException(e);
} catch (SQLException e) {
Modified: labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/BulkResponseImpl.java
URL: http://svn.apache.org/viewvc/labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/BulkResponseImpl.java?rev=983550&r1=983549&r2=983550&view=diff
==============================================================================
--- labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/BulkResponseImpl.java (original)
+++ labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/BulkResponseImpl.java Mon Aug 9 08:10:48 2010
@@ -39,14 +39,14 @@ public class BulkResponseImpl implements
collection = pCollection;
}
- @SuppressWarnings("unchecked")
- @Override
+ @SuppressWarnings("rawtypes")
+ @Override
public Collection getCollection() throws JAXRException {
return collection;
}
- @SuppressWarnings("unchecked")
- @Override
+ @SuppressWarnings("rawtypes")
+ @Override
public Collection getExceptions() throws JAXRException {
return exceptions;
}
Modified: labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/BusinessLifeCycleManagerImpl.java
URL: http://svn.apache.org/viewvc/labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/BusinessLifeCycleManagerImpl.java?rev=983550&r1=983549&r2=983550&view=diff
==============================================================================
--- labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/BusinessLifeCycleManagerImpl.java (original)
+++ labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/BusinessLifeCycleManagerImpl.java Mon Aug 9 08:10:48 2010
@@ -51,15 +51,13 @@ public class BusinessLifeCycleManagerImp
throw new JAXRException(NLSStrings.OPERATION_NOT_IMPLEMENTED);
}
- @SuppressWarnings("unchecked")
@Override
- public BulkResponse deleteAssociations(Collection pAssociationKeys) throws JAXRException {
+ public BulkResponse deleteAssociations(@SuppressWarnings("rawtypes") Collection pAssociationKeys) throws JAXRException {
return deleteObjects(pAssociationKeys);
}
- @SuppressWarnings("unchecked")
@Override
- public BulkResponse deleteClassificationSchemes(Collection pSchemeKeys)
+ public BulkResponse deleteClassificationSchemes(@SuppressWarnings("rawtypes") Collection pSchemeKeys)
throws JAXRException {
final List<Key> list = new ArrayList<Key>();
final RegistryService rs = getRegistryService();
@@ -78,63 +76,53 @@ public class BusinessLifeCycleManagerImp
return new BulkResponseImpl(list);
}
- @SuppressWarnings("unchecked")
@Override
- public BulkResponse deleteConcepts(Collection pConceptKeys) throws JAXRException {
+ public BulkResponse deleteConcepts(@SuppressWarnings("rawtypes") Collection pConceptKeys) throws JAXRException {
return deleteObjects(pConceptKeys);
}
- @SuppressWarnings("unchecked")
@Override
- public BulkResponse deleteOrganizations(Collection pOrganizationKeys) throws JAXRException {
+ public BulkResponse deleteOrganizations(@SuppressWarnings("rawtypes") Collection pOrganizationKeys) throws JAXRException {
return deleteObjects(pOrganizationKeys);
}
- @SuppressWarnings("unchecked")
@Override
- public BulkResponse deleteServiceBindings(Collection pBindingKeys)throws JAXRException {
+ public BulkResponse deleteServiceBindings(@SuppressWarnings("rawtypes") Collection pBindingKeys)throws JAXRException {
throw new JAXRException(NLSStrings.OPERATION_NOT_IMPLEMENTED);
}
- @SuppressWarnings("unchecked")
@Override
- public BulkResponse deleteServices(Collection pServiceKeys) throws JAXRException {
+ public BulkResponse deleteServices(@SuppressWarnings("rawtypes") Collection pServiceKeys) throws JAXRException {
throw new JAXRException(NLSStrings.OPERATION_NOT_IMPLEMENTED);
}
- @SuppressWarnings("unchecked")
@Override
- public BulkResponse saveAssociations(Collection pAssociations, boolean pReplace) throws JAXRException {
+ public BulkResponse saveAssociations(@SuppressWarnings("rawtypes") Collection pAssociations, boolean pReplace) throws JAXRException {
throw new JAXRException(NLSStrings.OPERATION_NOT_IMPLEMENTED);
}
- @SuppressWarnings({ "unchecked" })
@Override
- public BulkResponse saveClassificationSchemes(Collection pClassificationSchemes) throws JAXRException {
+ public BulkResponse saveClassificationSchemes(@SuppressWarnings("rawtypes") Collection pClassificationSchemes) throws JAXRException {
return saveObjects(pClassificationSchemes);
}
- @SuppressWarnings("unchecked")
@Override
- public BulkResponse saveConcepts(Collection pConcepts) throws JAXRException {
+ public BulkResponse saveConcepts(@SuppressWarnings("rawtypes") Collection pConcepts) throws JAXRException {
return saveObjects(pConcepts);
}
- @SuppressWarnings("unchecked")
@Override
- public BulkResponse saveOrganizations(Collection pOrganizations) throws JAXRException {
+ public BulkResponse saveOrganizations(@SuppressWarnings("rawtypes") Collection pOrganizations) throws JAXRException {
return saveObjects(pOrganizations);
}
- @SuppressWarnings("unchecked")
@Override
- public BulkResponse saveServiceBindings(Collection pBindings) throws JAXRException {
+ public BulkResponse saveServiceBindings(@SuppressWarnings("rawtypes") Collection pBindings) throws JAXRException {
return saveServiceBindings(pBindings);
}
- @SuppressWarnings("unchecked")
@Override
- public BulkResponse saveServices(Collection pServices) throws JAXRException {
+ public BulkResponse saveServices(@SuppressWarnings("rawtypes") Collection pServices) throws JAXRException {
return saveObjects(pServices);
}
Modified: labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/BusinessQueryManagerImpl.java
URL: http://svn.apache.org/viewvc/labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/BusinessQueryManagerImpl.java?rev=983550&r1=983549&r2=983550&view=diff
==============================================================================
--- labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/BusinessQueryManagerImpl.java (original)
+++ labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/BusinessQueryManagerImpl.java Mon Aug 9 08:10:48 2010
@@ -40,7 +40,7 @@ import org.apache.labs.jaxmas.registry.a
import org.apache.labs.jaxmas.registry.sql.AssociationSourcePredicate;
import org.apache.labs.jaxmas.registry.sql.AssociationTargetPredicate;
import org.apache.labs.jaxmas.registry.sql.AssociationTypePredicate;
-import org.apache.labs.jaxmas.registry.sql.Predicate;
+import org.apache.labs.jaxmas.registry.sql.FilterPredicate;
/**
@@ -54,12 +54,11 @@ public class BusinessQueryManagerImpl ex
super(pRegistryService);
}
- @SuppressWarnings("unchecked")
@Override
- public BulkResponse findAssociations(Collection pFindQualifiers,
+ public BulkResponse findAssociations(@SuppressWarnings("rawtypes") Collection pFindQualifiers,
String pSourceObjectId, String pTargetObjectId,
- Collection pAssociationTypes) throws JAXRException {
- final List<Predicate> predicates = new ArrayList<Predicate>();
+ @SuppressWarnings("rawtypes") Collection pAssociationTypes) throws JAXRException {
+ final List<FilterPredicate> predicates = new ArrayList<FilterPredicate>();
if (pFindQualifiers != null && pFindQualifiers.size() > 0) {
throw new JAXRException(NLSStrings.UNSUPPORTED_PARAMETER);
}
@@ -72,21 +71,19 @@ public class BusinessQueryManagerImpl ex
if (pAssociationTypes != null && pAssociationTypes.size() > 0) {
predicates.add(new AssociationTypePredicate(pAssociationTypes));
}
- final Collection<?> assocs = AssociationAccessor.getInstance().getRegistryObjectLoader().getResultList(getRegistryService(), predicates);
+ final Collection<?> assocs = AssociationAccessor.getInstance().getRegistryObjectLoader().getResultList(getRegistryService(), predicates, null);
return new BulkResponseImpl(assocs);
}
- @SuppressWarnings("unchecked")
@Override
- public BulkResponse findCallerAssociations(Collection pFindQualifiers,
+ public BulkResponse findCallerAssociations(@SuppressWarnings("rawtypes") Collection pFindQualifiers,
Boolean pConfirmedByCaller, Boolean pConfirmedByOtherParty,
- Collection pAssociationTypes) throws JAXRException {
+ @SuppressWarnings("rawtypes") Collection pAssociationTypes) throws JAXRException {
throw new JAXRException(NLSStrings.OPERATION_NOT_IMPLEMENTED);
}
- @SuppressWarnings("unchecked")
@Override
- public ClassificationScheme findClassificationSchemeByName(Collection pFindQualifiers, String pNamePatterns)
+ public ClassificationScheme findClassificationSchemeByName(@SuppressWarnings("rawtypes") Collection pFindQualifiers, String pNamePatterns)
throws JAXRException {
final List<ClassificationScheme> result = ClassificationSchemeAccessor.getInstance().findClassificationSchemes(getRegistryService(), pFindQualifiers, Collections.singleton(pNamePatterns), null, null);
if (result == null || result.isEmpty()) {
@@ -98,11 +95,10 @@ public class BusinessQueryManagerImpl ex
return result.get(0);
}
- @SuppressWarnings("unchecked")
@Override
- public BulkResponse findClassificationSchemes(Collection pFindQualifiers,
- Collection pNamePatterns, Collection pClassifications,
- Collection pExternalLinks) throws JAXRException {
+ public BulkResponse findClassificationSchemes(@SuppressWarnings("rawtypes") Collection pFindQualifiers,
+ @SuppressWarnings("rawtypes") Collection pNamePatterns, @SuppressWarnings("rawtypes") Collection pClassifications,
+ @SuppressWarnings("rawtypes") Collection pExternalLinks) throws JAXRException {
final Collection<ClassificationScheme> list =
ClassificationSchemeAccessor.getInstance().findClassificationSchemes(getRegistryService(),
pFindQualifiers, pNamePatterns, pClassifications, pExternalLinks);
@@ -152,21 +148,19 @@ public class BusinessQueryManagerImpl ex
return concept;
}
- @SuppressWarnings("unchecked")
@Override
- public BulkResponse findConcepts(Collection pFindQualifiers,
- Collection pNamePatterns, Collection pClassifications,
- Collection pExternalIdentifiers, Collection pExternalLinks)
+ public BulkResponse findConcepts(@SuppressWarnings("rawtypes") Collection pFindQualifiers,
+ @SuppressWarnings("rawtypes") Collection pNamePatterns, @SuppressWarnings("rawtypes") Collection pClassifications,
+ @SuppressWarnings("rawtypes") Collection pExternalIdentifiers, @SuppressWarnings("rawtypes") Collection pExternalLinks)
throws JAXRException {
throw new JAXRException(NLSStrings.OPERATION_NOT_IMPLEMENTED);
}
- @SuppressWarnings("unchecked")
@Override
- public BulkResponse findOrganizations(Collection pFindQualifiers,
- Collection pNamePatterns, Collection pClassifications,
- Collection pSpecifications, Collection pExternalIdentifiers,
- Collection pExternalLinks) throws JAXRException {
+ public BulkResponse findOrganizations(@SuppressWarnings("rawtypes") Collection pFindQualifiers,
+ @SuppressWarnings("rawtypes") Collection pNamePatterns, @SuppressWarnings("rawtypes") Collection pClassifications,
+ @SuppressWarnings("rawtypes") Collection pSpecifications, @SuppressWarnings("rawtypes") Collection pExternalIdentifiers,
+ @SuppressWarnings("rawtypes") Collection pExternalLinks) throws JAXRException {
final List<Organization> list = OrganizationAccessor.getInstance().findOrganizations(getRegistryService(),
pFindQualifiers, pNamePatterns, pClassifications,
pSpecifications, pExternalIdentifiers,
@@ -174,27 +168,24 @@ public class BusinessQueryManagerImpl ex
return new BulkResponseImpl(list);
}
- @SuppressWarnings("unchecked")
@Override
- public BulkResponse findRegistryPackages(Collection pFindQualifiers,
- Collection pNamePatterns, Collection pClassifications,
- Collection pExternalLinks) throws JAXRException {
+ public BulkResponse findRegistryPackages(@SuppressWarnings("rawtypes") Collection pFindQualifiers,
+ @SuppressWarnings("rawtypes") Collection pNamePatterns, @SuppressWarnings("rawtypes") Collection pClassifications,
+ @SuppressWarnings("rawtypes") Collection pExternalLinks) throws JAXRException {
throw new JAXRException(NLSStrings.OPERATION_NOT_IMPLEMENTED);
}
- @SuppressWarnings("unchecked")
@Override
public BulkResponse findServiceBindings(Key pServiceKey,
- Collection pFindQualifiers, Collection pClassifications,
- Collection pSpecificationa) throws JAXRException {
+ @SuppressWarnings("rawtypes") Collection pFindQualifiers, @SuppressWarnings("rawtypes") Collection pClassifications,
+ @SuppressWarnings("rawtypes") Collection pSpecificationa) throws JAXRException {
throw new JAXRException(NLSStrings.OPERATION_NOT_IMPLEMENTED);
}
- @SuppressWarnings("unchecked")
@Override
- public BulkResponse findServices(Key pOrgKey, Collection pFindQualifiers,
- Collection pNamePattersn, Collection pClassifications,
- Collection pSpecificationa) throws JAXRException {
+ public BulkResponse findServices(Key pOrgKey, @SuppressWarnings("rawtypes") Collection pFindQualifiers,
+ @SuppressWarnings("rawtypes") Collection pNamePattersn, @SuppressWarnings("rawtypes") Collection pClassifications,
+ @SuppressWarnings("rawtypes") Collection pSpecificationa) throws JAXRException {
throw new JAXRException(NLSStrings.OPERATION_NOT_IMPLEMENTED);
}
Modified: labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/ClassificationSchemeImpl.java
URL: http://svn.apache.org/viewvc/labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/ClassificationSchemeImpl.java?rev=983550&r1=983549&r2=983550&view=diff
==============================================================================
--- labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/ClassificationSchemeImpl.java (original)
+++ labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/ClassificationSchemeImpl.java Mon Aug 9 08:10:48 2010
@@ -73,7 +73,7 @@ public class ClassificationSchemeImpl ex
@SuppressWarnings("unchecked")
@Override
- public void addChildConcepts(Collection pConcepts) throws JAXRException {
+ public void addChildConcepts(@SuppressWarnings("rawtypes") Collection pConcepts) throws JAXRException {
children.addChildConcepts(pConcepts);
}
@@ -84,14 +84,14 @@ public class ClassificationSchemeImpl ex
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
@Override
public Collection getChildrenConcepts() throws JAXRException {
return children.getChildrenConcepts();
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
@Override
public Collection getDescendantConcepts() throws JAXRException {
return children.getDescendantConcepts();
@@ -106,7 +106,7 @@ public class ClassificationSchemeImpl ex
@SuppressWarnings("unchecked")
@Override
- public void removeChildConcepts(Collection pConcepts) throws JAXRException {
+ public void removeChildConcepts(@SuppressWarnings("rawtypes") Collection pConcepts) throws JAXRException {
children.removeChildConcepts(pConcepts);
}
}
Modified: labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/ConceptChildrenController.java
URL: http://svn.apache.org/viewvc/labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/ConceptChildrenController.java?rev=983550&r1=983549&r2=983550&view=diff
==============================================================================
--- labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/ConceptChildrenController.java (original)
+++ labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/ConceptChildrenController.java Mon Aug 9 08:10:48 2010
@@ -32,8 +32,8 @@ import javax.xml.registry.infomodel.Conc
import org.apache.labs.jaxmas.registry.accessor.ConceptAccessor;
import org.apache.labs.jaxmas.registry.accessor.ROAccessors;
+import org.apache.labs.jaxmas.registry.sql.FilterPredicate;
import org.apache.labs.jaxmas.registry.sql.OwnerPredicate;
-import org.apache.labs.jaxmas.registry.sql.Predicate;
import org.apache.labs.jaxmas.registry.sql.RegistryObjectLoader;
@@ -45,7 +45,7 @@ class ConceptChildrenController {
private static final RegistryObjectLoader rol;
static {
try {
- rol = new RegistryObjectLoader(ROAccessors.ObjectTypes.CONCEPT, null);
+ rol = new RegistryObjectLoader(ROAccessors.ObjectTypes.CONCEPT, null, null);
} catch (SQLException e) {
throw new UndeclaredThrowableException(e);
} catch (JAXRException e) {
@@ -70,8 +70,8 @@ class ConceptChildrenController {
private Collection<Concept> getChildren() throws JAXRException {
if (children == null) {
- final Predicate predicate = new OwnerPredicate(registryObject.getKey(), true);
- children = asConceptCollection(rol.getResultList(registryObject.getRegistryService(), Collections.singleton(predicate)));
+ final FilterPredicate predicate = new OwnerPredicate(registryObject.getKey(), true);
+ children = asConceptCollection(rol.getResultList(registryObject.getRegistryService(), Collections.singleton(predicate), null));
initStoredChildren();
}
return children;
Modified: labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/ConceptImpl.java
URL: http://svn.apache.org/viewvc/labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/ConceptImpl.java?rev=983550&r1=983549&r2=983550&view=diff
==============================================================================
--- labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/ConceptImpl.java (original)
+++ labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/ConceptImpl.java Mon Aug 9 08:10:48 2010
@@ -95,9 +95,8 @@ public class ConceptImpl extends OwnedRe
return (Collection<Concept>) pConcepts;
}
- @SuppressWarnings("unchecked")
@Override
- public void addChildConcepts(Collection pConcepts) throws JAXRException {
+ public void addChildConcepts(@SuppressWarnings("rawtypes") Collection pConcepts) throws JAXRException {
childrenConceptList.addChildConcepts(asConceptCollection(pConcepts));
}
@@ -106,13 +105,13 @@ public class ConceptImpl extends OwnedRe
return childrenConceptList.getChildConceptCount();
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
@Override
public Collection getChildrenConcepts() throws JAXRException {
return childrenConceptList.getChildrenConcepts();
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
@Override
public Collection getDescendantConcepts() throws JAXRException {
return childrenConceptList.getDescendantConcepts();
@@ -123,7 +122,7 @@ public class ConceptImpl extends OwnedRe
childrenConceptList.removeChildConcept(pConcept);
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
@Override
public void removeChildConcepts(Collection pConcepts) throws JAXRException {
childrenConceptList.removeChildConcepts(asConceptCollection(pConcepts));
Modified: labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/ConnectionImpl.java
URL: http://svn.apache.org/viewvc/labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/ConnectionImpl.java?rev=983550&r1=983549&r2=983550&view=diff
==============================================================================
--- labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/ConnectionImpl.java (original)
+++ labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/ConnectionImpl.java Mon Aug 9 08:10:48 2010
@@ -59,7 +59,7 @@ public class ConnectionImpl implements C
}
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
@Override
public Set getCredentials() throws JAXRException {
return credentials;
@@ -80,7 +80,7 @@ public class ConnectionImpl implements C
return synchronous;
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
@Override
public void setCredentials(Set pCredentials) throws JAXRException {
credentials = pCredentials;
Modified: labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/ExtensibleObjectImpl.java
URL: http://svn.apache.org/viewvc/labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/ExtensibleObjectImpl.java?rev=983550&r1=983549&r2=983550&view=diff
==============================================================================
--- labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/ExtensibleObjectImpl.java (original)
+++ labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/ExtensibleObjectImpl.java Mon Aug 9 08:10:48 2010
@@ -64,7 +64,7 @@ public abstract class ExtensibleObjectIm
slots().put(pSlot.getName(), pSlot);
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
@Override
public void addSlots(Collection pSlots) throws JAXRException {
for (Object o : pSlots) {
@@ -87,7 +87,7 @@ public abstract class ExtensibleObjectIm
slots().remove(pSlotName);
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
@Override
public void removeSlots(Collection pSlotNames) throws JAXRException {
for (Object o : pSlotNames) {
Modified: labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/InternationalStringImpl.java
URL: http://svn.apache.org/viewvc/labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/InternationalStringImpl.java?rev=983550&r1=983549&r2=983550&view=diff
==============================================================================
--- labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/InternationalStringImpl.java (original)
+++ labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/InternationalStringImpl.java Mon Aug 9 08:10:48 2010
@@ -65,7 +65,7 @@ public class InternationalStringImpl imp
localizedStrings.put(makeKey(pLocalizedString), pLocalizedString);
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
@Override
public void addLocalizedStrings(Collection pLocalizedStrings) throws JAXRException {
for (Object o : pLocalizedStrings) {
@@ -78,7 +78,7 @@ public class InternationalStringImpl imp
return localizedStrings.get(makeKey(locale, charsetName));
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
@Override
public Collection getLocalizedStrings() throws JAXRException {
return localizedStrings.values();
@@ -100,7 +100,7 @@ public class InternationalStringImpl imp
localizedStrings.remove(makeKey(pLocalizedString));
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
@Override
public void removeLocalizedStrings(Collection pLocalizedStrings) throws JAXRException {
for (Object o : pLocalizedStrings) {
Modified: labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/LifeCycleManagerImpl.java
URL: http://svn.apache.org/viewvc/labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/LifeCycleManagerImpl.java?rev=983550&r1=983549&r2=983550&view=diff
==============================================================================
--- labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/LifeCycleManagerImpl.java (original)
+++ labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/LifeCycleManagerImpl.java Mon Aug 9 08:10:48 2010
@@ -343,7 +343,7 @@ public abstract class LifeCycleManagerIm
throw new JAXRException(NLSStrings.OPERATION_NOT_IMPLEMENTED);
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
@Override
public Slot createSlot(String pName, Collection pValues, String pSlotType) throws JAXRException {
final Slot slot = new SlotImpl();
@@ -373,13 +373,13 @@ public abstract class LifeCycleManagerIm
return new UserImpl(registryService, null);
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
@Override
public BulkResponse deleteObjects(Collection pKeys, String pObjectType) throws JAXRException {
throw new JAXRException(NLSStrings.OPERATION_NOT_IMPLEMENTED);
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({ "rawtypes", "unchecked" })
@Override
public BulkResponse deleteObjects(Collection pKeys) throws JAXRException {
for (Object o : pKeys) {
@@ -390,7 +390,7 @@ public abstract class LifeCycleManagerIm
return new BulkResponseImpl(pKeys);
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
@Override
public BulkResponse deprecateObjects(Collection pKeys) throws JAXRException {
throw new JAXRException(NLSStrings.OPERATION_NOT_IMPLEMENTED);
@@ -411,7 +411,7 @@ public abstract class LifeCycleManagerIm
((RegistryObjectImpl<?>) pObject).getROLoader().save(getRegistryService(), pObject);
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
@Override
public BulkResponse saveObjects(Collection pObjects) throws JAXRException {
if (pObjects == null) {
@@ -424,7 +424,7 @@ public abstract class LifeCycleManagerIm
return new BulkResponseImpl(keys);
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
@Override
public BulkResponse unDeprecateObjects(Collection pKeys) throws JAXRException {
throw new JAXRException(NLSStrings.OPERATION_NOT_IMPLEMENTED);
Modified: labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/OrganizationImpl.java
URL: http://svn.apache.org/viewvc/labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/OrganizationImpl.java?rev=983550&r1=983549&r2=983550&view=diff
==============================================================================
--- labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/OrganizationImpl.java (original)
+++ labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/OrganizationImpl.java Mon Aug 9 08:10:48 2010
@@ -50,7 +50,7 @@ public class OrganizationImpl extends Re
childOrganizations.add(pOrganization);
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
@Override
public void addChildOrganizations(Collection pOrganizations) throws JAXRException {
if (pOrganizations != null) {
@@ -66,7 +66,7 @@ public class OrganizationImpl extends Re
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
@Override
public void addServices(Collection pServices) throws JAXRException {
throw new JAXRException(NLSStrings.OPERATION_NOT_IMPLEMENTED);
@@ -77,7 +77,7 @@ public class OrganizationImpl extends Re
throw new JAXRException(NLSStrings.OPERATION_NOT_IMPLEMENTED);
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
@Override
public void addUsers(Collection pUsers) throws JAXRException {
throw new JAXRException(NLSStrings.OPERATION_NOT_IMPLEMENTED);
@@ -88,13 +88,13 @@ public class OrganizationImpl extends Re
return childOrganizations.size();
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
@Override
public Collection getChildOrganizations() throws JAXRException {
return childOrganizations;
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
@Override
public Collection getDescendantOrganizations() throws JAXRException {
throw new JAXRException(NLSStrings.OPERATION_NOT_IMPLEMENTED);
@@ -120,19 +120,19 @@ public class OrganizationImpl extends Re
throw new JAXRException(NLSStrings.OPERATION_NOT_IMPLEMENTED);
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
@Override
public Collection getServices() throws JAXRException {
throw new JAXRException(NLSStrings.OPERATION_NOT_IMPLEMENTED);
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
@Override
public Collection getTelephoneNumbers(String pPhoneType) throws JAXRException {
throw new JAXRException(NLSStrings.OPERATION_NOT_IMPLEMENTED);
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
@Override
public Collection getUsers() throws JAXRException {
throw new JAXRException(NLSStrings.OPERATION_NOT_IMPLEMENTED);
@@ -143,7 +143,7 @@ public class OrganizationImpl extends Re
childOrganizations.remove(pOrganization);
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
@Override
public void removeChildOrganizations(Collection pOrganizations) throws JAXRException {
if (pOrganizations != null) {
@@ -158,7 +158,7 @@ public class OrganizationImpl extends Re
throw new JAXRException(NLSStrings.OPERATION_NOT_IMPLEMENTED);
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
@Override
public void removeServices(Collection pServices) throws JAXRException {
throw new JAXRException(NLSStrings.OPERATION_NOT_IMPLEMENTED);
@@ -169,7 +169,7 @@ public class OrganizationImpl extends Re
throw new JAXRException(NLSStrings.OPERATION_NOT_IMPLEMENTED);
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
@Override
public void removeUsers(Collection pUsers) throws JAXRException {
throw new JAXRException(NLSStrings.OPERATION_NOT_IMPLEMENTED);
@@ -185,7 +185,7 @@ public class OrganizationImpl extends Re
throw new JAXRException(NLSStrings.OPERATION_NOT_IMPLEMENTED);
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
@Override
public void setTelephoneNumbers(Collection pPhoneNumbers) throws JAXRException {
throw new JAXRException(NLSStrings.OPERATION_NOT_IMPLEMENTED);
Modified: labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/QueryManagerImpl.java
URL: http://svn.apache.org/viewvc/labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/QueryManagerImpl.java?rev=983550&r1=983549&r2=983550&view=diff
==============================================================================
--- labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/QueryManagerImpl.java (original)
+++ labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/QueryManagerImpl.java Mon Aug 9 08:10:48 2010
@@ -30,8 +30,8 @@ import javax.xml.registry.QueryManager;
import javax.xml.registry.RegistryService;
import javax.xml.registry.infomodel.RegistryObject;
+import org.apache.labs.jaxmas.registry.sql.FilterPredicate;
import org.apache.labs.jaxmas.registry.sql.KeyPredicate;
-import org.apache.labs.jaxmas.registry.sql.Predicate;
import org.apache.labs.jaxmas.registry.sql.RegistryObjectLoader;
@@ -42,7 +42,7 @@ public abstract class QueryManagerImpl i
private static final RegistryObjectLoader rol;
static {
try {
- rol = new RegistryObjectLoader(null);
+ rol = new RegistryObjectLoader(null, null, null);
} catch (JAXRException e) {
throw new UndeclaredThrowableException(e);
} catch (SQLException e) {
@@ -61,7 +61,7 @@ public abstract class QueryManagerImpl i
@Override
public RegistryObject getRegistryObject(String pId) throws JAXRException {
- final Predicate predicate = new KeyPredicate(Collections.singleton(new KeyImpl(pId)));
+ final FilterPredicate predicate = new KeyPredicate(Collections.singleton(new KeyImpl(pId)));
return rol.getResultObject(getRegistryService(), Collections.singleton(predicate));
}
@@ -75,11 +75,10 @@ public abstract class QueryManagerImpl i
throw new JAXRException(NLSStrings.OPERATION_NOT_IMPLEMENTED);
}
- @SuppressWarnings("unchecked")
@Override
- public BulkResponse getRegistryObjects(Collection pObjectKeys) throws JAXRException {
- final Predicate predicate = new KeyPredicate(pObjectKeys);
- final List<RegistryObject> list = rol.getResultList(getRegistryService(), Collections.singleton(predicate));
+ public BulkResponse getRegistryObjects(@SuppressWarnings("rawtypes") Collection pObjectKeys) throws JAXRException {
+ final FilterPredicate predicate = new KeyPredicate(pObjectKeys);
+ final List<RegistryObject> list = rol.getResultList(getRegistryService(), Collections.singleton(predicate), null);
return new BulkResponseImpl(list);
}
@@ -88,9 +87,8 @@ public abstract class QueryManagerImpl i
throw new JAXRException(NLSStrings.OPERATION_NOT_IMPLEMENTED);
}
- @SuppressWarnings("unchecked")
@Override
- public BulkResponse getRegistryObjects(Collection pObjectKeys, String pObjectTypes) throws JAXRException {
+ public BulkResponse getRegistryObjects(@SuppressWarnings("rawtypes") Collection pObjectKeys, String pObjectTypes) throws JAXRException {
throw new JAXRException(NLSStrings.OPERATION_NOT_IMPLEMENTED);
}
Modified: labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/RegistryObjectImpl.java
URL: http://svn.apache.org/viewvc/labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/RegistryObjectImpl.java?rev=983550&r1=983549&r2=983550&view=diff
==============================================================================
--- labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/RegistryObjectImpl.java (original)
+++ labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/RegistryObjectImpl.java Mon Aug 9 08:10:48 2010
@@ -20,7 +20,6 @@ package org.apache.labs.jaxmas.registry.
import java.lang.reflect.UndeclaredThrowableException;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
@@ -49,8 +48,9 @@ import org.apache.labs.jaxmas.registry.a
import org.apache.labs.jaxmas.registry.accessor.ROAccessors;
import org.apache.labs.jaxmas.registry.sql.AssociationNumOrderPredicate;
import org.apache.labs.jaxmas.registry.sql.ClassificationNumOrderPredicate;
+import org.apache.labs.jaxmas.registry.sql.FilterPredicate;
+import org.apache.labs.jaxmas.registry.sql.OrderPredicate;
import org.apache.labs.jaxmas.registry.sql.OwnerPredicate;
-import org.apache.labs.jaxmas.registry.sql.Predicate;
import org.apache.labs.jaxmas.registry.sql.RegistryObjectLoader;
@@ -168,7 +168,7 @@ public abstract class RegistryObjectImpl
associations.add(pAssociation);
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
@Override
public void addAssociations(Collection pAssociations) throws JAXRException {
for (Object o : pAssociations) {
@@ -185,12 +185,11 @@ public abstract class RegistryObjectImpl
break;
case referenced:
case loaded:
- final List<Predicate> predicates = new ArrayList<Predicate>(2);
- predicates.add(new OwnerPredicate(getKey(), false));
- predicates.add(ClassificationNumOrderPredicate.getInstance());
+ final Set<FilterPredicate> predicates = Collections.singleton((FilterPredicate) new OwnerPredicate(getKey(), false));
+ final Set<OrderPredicate> orderPredicates = Collections.singleton((OrderPredicate) ClassificationNumOrderPredicate.getInstance());
final RegistryObjectLoader rol = ClassificationAccessor.getInstance().getRegistryObjectLoader();
loadedClassificationKeys = new HashSet<Key>();
- final Collection<RegistryObject> storedClassifications = rol.getResultList(getRegistryService(), predicates);
+ final Collection<RegistryObject> storedClassifications = rol.getResultList(getRegistryService(), predicates, orderPredicates);
for (RegistryObject ro : storedClassifications) {
loadedClassificationKeys.add(ro.getKey());
}
@@ -215,12 +214,11 @@ public abstract class RegistryObjectImpl
break;
case referenced:
case loaded:
- final List<Predicate> list = new ArrayList<Predicate>(2);
- list.add(new OwnerPredicate(getKey(), false));
- list.add(AssociationNumOrderPredicate.getInstance());
+ final Set<FilterPredicate> filterPredicates = Collections.singleton((FilterPredicate) new OwnerPredicate(getKey(), false));
+ final Set<OrderPredicate> orderPredicates = Collections.singleton((OrderPredicate) AssociationNumOrderPredicate.getInstance());
final RegistryObjectLoader rol = AssociationAccessor.getInstance().getRegistryObjectLoader();
loadedAssociationKeys = new HashSet<Key>();
- final Collection<RegistryObject> storedAssociations = rol.getResultList(getRegistryService(), list);
+ final Collection<RegistryObject> storedAssociations = rol.getResultList(getRegistryService(), filterPredicates, orderPredicates);
for (RegistryObject ro : storedAssociations) {
loadedAssociationKeys.add(ro.getKey());
}
@@ -244,7 +242,7 @@ public abstract class RegistryObjectImpl
classifications.add(pClassification);
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
@Override
public void addClassifications(Collection pClassifications) throws JAXRException {
for (Object o : pClassifications) {
@@ -257,7 +255,7 @@ public abstract class RegistryObjectImpl
externalIdentifiers.add(pExternalIdentifier);
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
@Override
public void addExternalIdentifiers(Collection pExternalIdentifiers) throws JAXRException {
for (Object o : pExternalIdentifiers) {
@@ -270,7 +268,7 @@ public abstract class RegistryObjectImpl
externalLinks.add(pExternalLink);
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
@Override
public void addExternalLinks(Collection pExternalLinks) throws JAXRException {
for (Object o : pExternalLinks) {
@@ -278,7 +276,7 @@ public abstract class RegistryObjectImpl
}
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
@Override
public Collection getAssociatedObjects() throws JAXRException {
final Set<Object> targets = new HashSet<Object>();
@@ -288,20 +286,20 @@ public abstract class RegistryObjectImpl
return targets;
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
@Override
public Collection getAssociations() throws JAXRException {
ensureAssociationsLoaded();
return associations;
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
@Override
public Collection getAuditTrail() throws JAXRException {
throw new JAXRException(NLSStrings.OPERATION_NOT_IMPLEMENTED);
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
@Override
public Collection getClassifications() throws JAXRException {
ensureClassificationsLoaded();
@@ -313,13 +311,13 @@ public abstract class RegistryObjectImpl
return description.getString();
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
@Override
public Collection getExternalIdentifiers() throws JAXRException {
return externalIdentifiers;
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
@Override
public Collection getExternalLinks() throws JAXRException {
return externalLinks;
@@ -335,7 +333,7 @@ public abstract class RegistryObjectImpl
return name.getString();
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
@Override
public Collection getRegistryPackages() throws JAXRException {
throw new JAXRException(NLSStrings.OPERATION_NOT_IMPLEMENTED);
@@ -352,7 +350,7 @@ public abstract class RegistryObjectImpl
associations.remove(pAssociation);
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
@Override
public void removeAssociations(Collection pAssociations) throws JAXRException {
for (Object o : pAssociations) {
@@ -366,7 +364,7 @@ public abstract class RegistryObjectImpl
classifications.remove(classification);
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
@Override
public void removeClassifications(Collection pClassifications) throws JAXRException {
for (Object o : pClassifications) {
@@ -379,7 +377,7 @@ public abstract class RegistryObjectImpl
externalIdentifiers.remove(pExternalIdentifier);
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
@Override
public void removeExternalIdentifiers(Collection pExternalIdentifiers) throws JAXRException {
for (Object o : pExternalIdentifiers) {
@@ -392,7 +390,7 @@ public abstract class RegistryObjectImpl
externalLinks.remove(pExternalLink);
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
@Override
public void removeExternalLinks(Collection pExternalLinks) throws JAXRException {
for (Object o : pExternalLinks) {
@@ -400,7 +398,7 @@ public abstract class RegistryObjectImpl
}
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
@Override
public void setAssociations(Collection pAssociations) throws JAXRException {
ensureAssociationsLoaded();
@@ -413,7 +411,7 @@ public abstract class RegistryObjectImpl
}
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
@Override
public void setClassifications(Collection pClassifications) throws JAXRException {
ensureClassificationsLoaded();
@@ -431,23 +429,23 @@ public abstract class RegistryObjectImpl
description.setString(pDescription);
}
- @SuppressWarnings({"unchecked", "cast"})
+ @SuppressWarnings({ "rawtypes", "unchecked" })
@Override
public void setExternalIdentifiers(Collection pExternalIdentifiers) throws JAXRException {
if (pExternalIdentifiers == null) {
externalIdentifiers.clear();
} else {
- externalIdentifiers = (Collection<ExternalIdentifier>) pExternalIdentifiers;
+ externalIdentifiers = pExternalIdentifiers;
}
}
- @SuppressWarnings({"unchecked", "cast"})
+ @SuppressWarnings({"rawtypes", "unchecked"})
@Override
public void setExternalLinks(Collection pExternalLinks) throws JAXRException {
if (pExternalLinks == null) {
externalLinks.clear();
} else {
- externalLinks = (Collection<ExternalLink>) pExternalLinks;
+ externalLinks = pExternalLinks;
}
}
Modified: labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/RegistryPackageImpl.java
URL: http://svn.apache.org/viewvc/labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/RegistryPackageImpl.java?rev=983550&r1=983549&r2=983550&view=diff
==============================================================================
--- labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/RegistryPackageImpl.java (original)
+++ labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/RegistryPackageImpl.java Mon Aug 9 08:10:48 2010
@@ -58,7 +58,7 @@ public class RegistryPackageImpl extends
registryObjects.add(pRegistryObject);
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
@Override
public void addRegistryObjects(Collection pRegistryObjects) throws JAXRException {
if (pRegistryObjects == null) {
@@ -69,7 +69,7 @@ public class RegistryPackageImpl extends
}
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
@Override
public Set getRegistryObjects() throws JAXRException {
return Collections.unmodifiableSet((Set<?>) registryObjects);
@@ -83,7 +83,7 @@ public class RegistryPackageImpl extends
registryObjects.remove(pRegistryObject);
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
@Override
public void removeRegistryObjects(Collection pRegistryObjects) throws JAXRException {
if (pRegistryObjects == null) {
Modified: labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/ServiceBindingImpl.java
URL: http://svn.apache.org/viewvc/labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/ServiceBindingImpl.java?rev=983550&r1=983549&r2=983550&view=diff
==============================================================================
--- labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/ServiceBindingImpl.java (original)
+++ labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/ServiceBindingImpl.java Mon Aug 9 08:10:48 2010
@@ -53,7 +53,7 @@ public class ServiceBindingImpl extends
throw new JAXRException(NLSStrings.OPERATION_NOT_IMPLEMENTED);
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
@Override
public void addSpecificationLinks(Collection pSpecificationLinks)
throws JAXRException {
@@ -70,7 +70,7 @@ public class ServiceBindingImpl extends
throw new JAXRException(NLSStrings.OPERATION_NOT_IMPLEMENTED);
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
@Override
public Collection getSpecificationLinks() throws JAXRException {
throw new JAXRException(NLSStrings.OPERATION_NOT_IMPLEMENTED);
@@ -87,7 +87,7 @@ public class ServiceBindingImpl extends
throw new JAXRException(NLSStrings.OPERATION_NOT_IMPLEMENTED);
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
@Override
public void removeSpecificationLinks(Collection pSpecificationLinks)
throws JAXRException {
Modified: labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/ServiceImpl.java
URL: http://svn.apache.org/viewvc/labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/ServiceImpl.java?rev=983550&r1=983549&r2=983550&view=diff
==============================================================================
--- labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/ServiceImpl.java (original)
+++ labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/ServiceImpl.java Mon Aug 9 08:10:48 2010
@@ -48,7 +48,7 @@ public class ServiceImpl extends Registr
throw new JAXRException(NLSStrings.OPERATION_NOT_IMPLEMENTED);
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
@Override
public void addServiceBindings(Collection pServiceBindings)
throws JAXRException {
@@ -60,7 +60,7 @@ public class ServiceImpl extends Registr
throw new JAXRException(NLSStrings.OPERATION_NOT_IMPLEMENTED);
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
@Override
public Collection getServiceBindings() throws JAXRException {
throw new JAXRException(NLSStrings.OPERATION_NOT_IMPLEMENTED);
@@ -72,7 +72,7 @@ public class ServiceImpl extends Registr
throw new JAXRException(NLSStrings.OPERATION_NOT_IMPLEMENTED);
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
@Override
public void removeServiceBindings(Collection pServiceBindings)
throws JAXRException {
Modified: labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/SlotImpl.java
URL: http://svn.apache.org/viewvc/labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/SlotImpl.java?rev=983550&r1=983549&r2=983550&view=diff
==============================================================================
--- labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/SlotImpl.java (original)
+++ labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/SlotImpl.java Mon Aug 9 08:10:48 2010
@@ -57,7 +57,7 @@ public class SlotImpl implements Slot {
return values;
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
@Override
public void setValues(Collection pValues) throws JAXRException {
values = pValues;
Modified: labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/SpecificationLinkImpl.java
URL: http://svn.apache.org/viewvc/labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/SpecificationLinkImpl.java?rev=983550&r1=983549&r2=983550&view=diff
==============================================================================
--- labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/SpecificationLinkImpl.java (original)
+++ labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/SpecificationLinkImpl.java Mon Aug 9 08:10:48 2010
@@ -62,7 +62,7 @@ public class SpecificationLinkImpl exten
throw new JAXRException(NLSStrings.OPERATION_NOT_IMPLEMENTED);
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
@Override
public Collection getUsageParameters() throws JAXRException {
throw new JAXRException(NLSStrings.OPERATION_NOT_IMPLEMENTED);
@@ -80,7 +80,7 @@ public class SpecificationLinkImpl exten
throw new JAXRException(NLSStrings.OPERATION_NOT_IMPLEMENTED);
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
@Override
public void setUsageParameters(Collection pUsageParameters)
throws JAXRException {
Modified: labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/UserImpl.java
URL: http://svn.apache.org/viewvc/labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/UserImpl.java?rev=983550&r1=983549&r2=983550&view=diff
==============================================================================
--- labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/UserImpl.java (original)
+++ labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/infomodel/UserImpl.java Mon Aug 9 08:10:48 2010
@@ -54,7 +54,7 @@ public class UserImpl extends RegistryOb
super(pRegistryService, pKey);
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
@Override
public Collection getEmailAddresses() throws JAXRException {
return emailAddresses;
@@ -70,13 +70,13 @@ public class UserImpl extends RegistryOb
return personName;
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
@Override
public Collection getPostalAddresses() throws JAXRException {
return postalAddresses;
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
@Override
public Collection getTelephoneNumbers(String pPhoneType) throws JAXRException {
return telephoneNumbers;
@@ -92,13 +92,13 @@ public class UserImpl extends RegistryOb
return url;
}
- @SuppressWarnings({"unchecked", "cast"})
+ @SuppressWarnings({"rawtypes", "unchecked"})
@Override
public void setEmailAddresses(Collection pAddresses) throws JAXRException {
if (pAddresses == null) {
emailAddresses.clear();
} else {
- emailAddresses = (Collection<EmailAddress>) pAddresses;
+ emailAddresses = pAddresses;
}
}
@@ -107,17 +107,17 @@ public class UserImpl extends RegistryOb
personName = pPersonName;
}
- @SuppressWarnings({"unchecked", "cast"})
+ @SuppressWarnings({"rawtypes", "unchecked"})
@Override
public void setPostalAddresses(Collection pAddresses) throws JAXRException {
if (pAddresses == null) {
postalAddresses.clear();
} else {
- postalAddresses = (Collection<PostalAddress>) pAddresses;
+ postalAddresses = pAddresses;
}
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({ "rawtypes", "unchecked" })
@Override
public void setTelephoneNumbers(Collection pPhoneNumbers) throws JAXRException {
if (pPhoneNumbers == null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org