You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scout-dev@ws.apache.org by ks...@apache.org on 2007/06/30 04:36:19 UTC
svn commit: r552080 - in /webservices/scout/trunk:
jaxr-api/src/main/java/javax/xml/registry/
jaxr-api/src/main/java/javax/xml/registry/infomodel/
scout/src/main/java/org/apache/ws/scout/registry/
scout/src/main/java/org/apache/ws/scout/registry/infomo...
Author: kstam
Date: Fri Jun 29 19:36:18 2007
New Revision: 552080
URL: http://svn.apache.org/viewvc?view=rev&rev=552080
Log:
SCOUT-37 cleaning up warnings
Modified:
webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/BulkResponse.java
webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/BusinessLifeCycleManager.java
webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/LifeCycleManager.java
webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/QueryManager.java
webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/Organization.java
webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/ServiceBinding.java
webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/User.java
webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/BulkResponseImpl.java
webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerImpl.java
webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/BusinessQueryManagerImpl.java
webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/LifeCycleManagerImpl.java
webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/infomodel/ExternalLinkImpl.java
webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/infomodel/OrganizationImpl.java
webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/infomodel/ServiceBindingImpl.java
webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/infomodel/ServiceImpl.java
webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/transport/LocalTransport.java
webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/transport/RMITransport.java
webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/util/ScoutUddiJaxrHelper.java
webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/registry/LifeCycleManagerTest.java
Modified: webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/BulkResponse.java
URL: http://svn.apache.org/viewvc/webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/BulkResponse.java?view=diff&rev=552080&r1=552079&r2=552080
==============================================================================
--- webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/BulkResponse.java (original)
+++ webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/BulkResponse.java Fri Jun 29 19:36:18 2007
@@ -28,9 +28,9 @@
* @version $Revision$ $Date$
*/
public interface BulkResponse extends JAXRResponse {
- Collection getCollection() throws JAXRException;
+ Collection<? extends Object> getCollection() throws JAXRException;
- Collection getExceptions() throws JAXRException;
+ Collection<Exception> getExceptions() throws JAXRException;
boolean isPartialResponse() throws JAXRException;
}
Modified: webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/BusinessLifeCycleManager.java
URL: http://svn.apache.org/viewvc/webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/BusinessLifeCycleManager.java?view=diff&rev=552080&r1=552079&r2=552080
==============================================================================
--- webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/BusinessLifeCycleManager.java (original)
+++ webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/BusinessLifeCycleManager.java Fri Jun 29 19:36:18 2007
@@ -25,6 +25,12 @@
import java.util.Collection;
import javax.xml.registry.infomodel.Association;
+import javax.xml.registry.infomodel.ClassificationScheme;
+import javax.xml.registry.infomodel.Concept;
+import javax.xml.registry.infomodel.Key;
+import javax.xml.registry.infomodel.Organization;
+import javax.xml.registry.infomodel.Service;
+import javax.xml.registry.infomodel.ServiceBinding;
/**
* @version $Revision$ $Date$
@@ -32,29 +38,29 @@
public interface BusinessLifeCycleManager extends LifeCycleManager {
void confirmAssociation(Association assoc) throws JAXRException, InvalidRequestException;
- BulkResponse deleteAssociations(Collection associationKeys) throws JAXRException;
+ BulkResponse deleteAssociations(Collection<Key> associationKeys) throws JAXRException;
- BulkResponse deleteClassificationSchemes(Collection schemeKeys) throws JAXRException;
+ BulkResponse deleteClassificationSchemes(Collection<Key> schemeKeys) throws JAXRException;
- BulkResponse deleteConcepts(Collection conceptKeys) throws JAXRException;
+ BulkResponse deleteConcepts(Collection<Key> conceptKeys) throws JAXRException;
- BulkResponse deleteOrganizations(Collection organizationKeys) throws JAXRException;
+ BulkResponse deleteOrganizations(Collection<Key> organizationKeys) throws JAXRException;
- BulkResponse deleteServiceBindings(Collection bindingKeys) throws JAXRException;
+ BulkResponse deleteServiceBindings(Collection<Key> bindingKeys) throws JAXRException;
- BulkResponse deleteServices(Collection serviceKeys) throws JAXRException;
+ BulkResponse deleteServices(Collection<Key> serviceKeys) throws JAXRException;
- BulkResponse saveAssociations(Collection associationKeys, boolean replace) throws JAXRException;
+ BulkResponse saveAssociations(Collection<Association> associations, boolean replace) throws JAXRException;
- BulkResponse saveClassificationSchemes(Collection schemeKeys) throws JAXRException;
+ BulkResponse saveClassificationSchemes(Collection<ClassificationScheme> schemes) throws JAXRException;
- BulkResponse saveConcepts(Collection conceptKeys) throws JAXRException;
+ BulkResponse saveConcepts(Collection<Concept> concepts) throws JAXRException;
- BulkResponse saveOrganizations(Collection organizationKeys) throws JAXRException;
+ BulkResponse saveOrganizations(Collection<Organization> organizations) throws JAXRException;
- BulkResponse saveServiceBindings(Collection bindingKeys) throws JAXRException;
+ BulkResponse saveServiceBindings(Collection<ServiceBinding> bindings) throws JAXRException;
- BulkResponse saveServices(Collection serviceKeys) throws JAXRException;
+ BulkResponse saveServices(Collection<Service> services) throws JAXRException;
void unConfirmAssociation(Association assoc) throws JAXRException, InvalidRequestException;
}
Modified: webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/LifeCycleManager.java
URL: http://svn.apache.org/viewvc/webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/LifeCycleManager.java?view=diff&rev=552080&r1=552079&r2=552080
==============================================================================
--- webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/LifeCycleManager.java (original)
+++ webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/LifeCycleManager.java Fri Jun 29 19:36:18 2007
@@ -154,15 +154,15 @@
User createUser() throws JAXRException;
- BulkResponse deleteObjects(Collection keys) throws JAXRException;
+ BulkResponse deleteObjects(Collection<Key> keys) throws JAXRException;
- BulkResponse deleteObjects(Collection keys, String objectType) throws JAXRException;
+ BulkResponse deleteObjects(Collection<Key> keys, String objectType) throws JAXRException;
- BulkResponse deprecateObjects(Collection keys) throws JAXRException;
+ BulkResponse deprecateObjects(Collection<Key> keys) throws JAXRException;
RegistryService getRegistryService() throws JAXRException;
BulkResponse saveObjects(Collection objects) throws JAXRException;
- BulkResponse unDeprecateObjects(Collection keys) throws JAXRException;
+ BulkResponse unDeprecateObjects(Collection<Key> keys) throws JAXRException;
}
Modified: webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/QueryManager.java
URL: http://svn.apache.org/viewvc/webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/QueryManager.java?view=diff&rev=552080&r1=552079&r2=552080
==============================================================================
--- webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/QueryManager.java (original)
+++ webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/QueryManager.java Fri Jun 29 19:36:18 2007
@@ -24,6 +24,7 @@
import java.util.Collection;
+import javax.xml.registry.infomodel.Key;
import javax.xml.registry.infomodel.RegistryObject;
/**
@@ -36,9 +37,9 @@
BulkResponse getRegistryObjects() throws JAXRException;
- BulkResponse getRegistryObjects(Collection objectKeys) throws JAXRException;
+ BulkResponse getRegistryObjects(Collection<Key> objectKeys) throws JAXRException;
- BulkResponse getRegistryObjects(Collection objectKeys, String objectTypes) throws JAXRException;
+ BulkResponse getRegistryObjects(Collection<Key> objectKeys, String objectTypes) throws JAXRException;
BulkResponse getRegistryObjects(String objectTypes) throws JAXRException;
Modified: webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/Organization.java
URL: http://svn.apache.org/viewvc/webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/Organization.java?view=diff&rev=552080&r1=552079&r2=552080
==============================================================================
--- webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/Organization.java (original)
+++ webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/Organization.java Fri Jun 29 19:36:18 2007
@@ -44,9 +44,9 @@
int getChildOrganizationCount() throws JAXRException;
- Collection getChildOrganizations() throws JAXRException;
+ Collection<Organization> getChildOrganizations() throws JAXRException;
- Collection getDescendantOrganizations() throws JAXRException;
+ Collection<Organization> getDescendantOrganizations() throws JAXRException;
Organization getParentOrganization() throws JAXRException;
@@ -56,11 +56,11 @@
Organization getRootOrganization() throws JAXRException;
- Collection getServices() throws JAXRException;
+ Collection<Service> getServices() throws JAXRException;
- Collection getTelephoneNumbers(String phoneType) throws JAXRException;
+ Collection<TelephoneNumber> getTelephoneNumbers(String phoneType) throws JAXRException;
- Collection getUsers() throws JAXRException;
+ Collection<User> getUsers() throws JAXRException;
void removeChildOrganization(Organization organization) throws JAXRException;
@@ -68,15 +68,15 @@
void removeService(Service service) throws JAXRException;
- void removeServices(Collection services) throws JAXRException;
+ void removeServices(Collection<Service> services) throws JAXRException;
void removeUser(User user) throws JAXRException;
- void removeUsers(Collection users) throws JAXRException;
+ void removeUsers(Collection<User> users) throws JAXRException;
void setPostalAddress(PostalAddress address) throws JAXRException;
void setPrimaryContact(User primaryContact) throws JAXRException;
- void setTelephoneNumbers(Collection phoneNumbers) throws JAXRException;
+ void setTelephoneNumbers(Collection<TelephoneNumber> phoneNumbers) throws JAXRException;
}
Modified: webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/ServiceBinding.java
URL: http://svn.apache.org/viewvc/webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/ServiceBinding.java?view=diff&rev=552080&r1=552079&r2=552080
==============================================================================
--- webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/ServiceBinding.java (original)
+++ webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/ServiceBinding.java Fri Jun 29 19:36:18 2007
@@ -44,7 +44,7 @@
void removeSpecificationLink(SpecificationLink specificationLink) throws JAXRException;
- void removeSpecificationLinks(Collection specificationLinks) throws JAXRException;
+ void removeSpecificationLinks(Collection<SpecificationLink> specificationLinks) throws JAXRException;
void setAccessURI(String uri) throws JAXRException;
Modified: webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/User.java
URL: http://svn.apache.org/viewvc/webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/User.java?view=diff&rev=552080&r1=552079&r2=552080
==============================================================================
--- webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/User.java (original)
+++ webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/User.java Fri Jun 29 19:36:18 2007
@@ -51,7 +51,7 @@
void setPostalAddresses(Collection addresses) throws JAXRException;
- void setTelephoneNumbers(Collection phoneNumbers) throws JAXRException;
+ void setTelephoneNumbers(Collection<TelephoneNumber> phoneNumbers) throws JAXRException;
void setType(String type) throws JAXRException;
Modified: webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/BulkResponseImpl.java
URL: http://svn.apache.org/viewvc/webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/BulkResponseImpl.java?view=diff&rev=552080&r1=552079&r2=552080
==============================================================================
--- webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/BulkResponseImpl.java (original)
+++ webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/BulkResponseImpl.java Fri Jun 29 19:36:18 2007
@@ -34,8 +34,8 @@
{
private boolean partialResponse = false;
- private Collection exceptions = new ArrayList();
- private HashSet collection = new HashSet();
+ private Collection<Exception> exceptions = new ArrayList<Exception>();
+ private HashSet<? extends Object> collection = new HashSet<Object>();
/**
* Creates a new instance of BulkResponseImpl
*/
@@ -43,7 +43,7 @@
{
}
- BulkResponseImpl(HashSet collection)
+ BulkResponseImpl(HashSet<? extends Object> collection)
{
this.collection = collection;
}
@@ -51,7 +51,7 @@
/**
* Get Collection of RegistryObjects *
*/
- public Collection getCollection() throws JAXRException
+ public Collection<? extends Object> getCollection() throws JAXRException
{
return this.collection;
}
@@ -69,7 +69,7 @@
* @return
* @throws JAXRException
*/
- public Collection getExceptions() throws JAXRException
+ public Collection<Exception> getExceptions() throws JAXRException
{
return (this.exceptions.size() == 0 ? null : exceptions);
}
@@ -87,7 +87,7 @@
this.partialResponse = b;
}
- public void setCollection(HashSet coll) throws JAXRException
+ public void setCollection(HashSet<? extends Object> coll) throws JAXRException
{
this.collection = coll;
}
@@ -97,7 +97,7 @@
*
* @param exceptions New value of property exceptions.
*/
- public void setExceptions(Collection exceptions)
+ public void setExceptions(Collection<Exception> exceptions)
{
this.exceptions = exceptions;
}
Modified: webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerImpl.java
URL: http://svn.apache.org/viewvc/webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerImpl.java?view=diff&rev=552080&r1=552079&r2=552080
==============================================================================
--- webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerImpl.java (original)
+++ webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerImpl.java Fri Jun 29 19:36:18 2007
@@ -94,7 +94,7 @@
* @return
* @throws JAXRException
*/
- public BulkResponse deleteObjects(Collection keys, String objectType) throws JAXRException {
+ public BulkResponse deleteObjects(Collection<Key> keys, String objectType) throws JAXRException {
BulkResponse bulk = null;
if (objectType == LifeCycleManager.ASSOCIATION) {
@@ -122,27 +122,27 @@
return bulk;
}
- public BulkResponse deleteAssociations(Collection associationKeys) throws JAXRException {
+ public BulkResponse deleteAssociations(Collection<Key> associationKeys) throws JAXRException {
return this.deleteOperation(associationKeys, "DELETE_ASSOCIATION");
}
- public BulkResponse deleteClassificationSchemes(Collection schemeKeys) throws JAXRException {
+ public BulkResponse deleteClassificationSchemes(Collection<Key> schemeKeys) throws JAXRException {
return this.deleteOperation(schemeKeys, "DELETE_CLASSIFICATIONSCHEME");
}
- public BulkResponse deleteConcepts(Collection conceptKeys) throws JAXRException {
+ public BulkResponse deleteConcepts(Collection<Key> conceptKeys) throws JAXRException {
return this.deleteOperation(conceptKeys, "DELETE_CONCEPT");
}
- public BulkResponse deleteOrganizations(Collection orgkeys) throws JAXRException {
+ public BulkResponse deleteOrganizations(Collection<Key> orgkeys) throws JAXRException {
return this.deleteOperation(orgkeys, "DELETE_ORG");
}
- public BulkResponse deleteServiceBindings(Collection bindingKeys) throws JAXRException {
+ public BulkResponse deleteServiceBindings(Collection<Key> bindingKeys) throws JAXRException {
return this.deleteOperation(bindingKeys, "DELETE_SERVICEBINDING");
}
- public BulkResponse deleteServices(Collection serviceKeys) throws JAXRException {
+ public BulkResponse deleteServices(Collection<Key> serviceKeys) throws JAXRException {
return this.deleteOperation(serviceKeys, "DELETE_SERVICE");
}
@@ -170,15 +170,15 @@
Iterator iter = col.iterator();
- HashSet suc = new HashSet();
- Collection exc = new ArrayList();
+ HashSet<Object> suc = new HashSet<Object>();
+ Collection<Exception> exc = new ArrayList<Exception>();
while (iter.hasNext()) {
RegistryObject reg = (RegistryObject) iter.next();
BulkResponse br = null;
- Collection c = new ArrayList();
+ Collection<RegistryObject> c = new ArrayList<RegistryObject>();
c.add(reg);
if (reg instanceof javax.xml.registry.infomodel.Association) {
@@ -209,7 +209,7 @@
}
if (br.getExceptions() != null) {
- suc.addAll(br.getExceptions());
+ exc.addAll(br.getExceptions());
}
}
@@ -231,8 +231,8 @@
BulkResponseImpl bulk = new BulkResponseImpl();
PublisherAssertion[] sarr = new PublisherAssertion[asso.size()];
- HashSet coll = new HashSet();
- Collection exceptions = new ArrayList();
+ HashSet<String> coll = new HashSet<String>();
+ Collection<Exception> exceptions = new ArrayList<Exception>();
Iterator iter = asso.iterator();
int currLoc = 0;
@@ -278,8 +278,8 @@
BulkResponseImpl bulk = new BulkResponseImpl();
TModel[] entityarr = new TModel[schemes.size()];
- HashSet coll = new HashSet();
- Collection exceptions = new ArrayList();
+ HashSet<Key> coll = new HashSet<Key>();
+ Collection<Exception> exceptions = new ArrayList<Exception>();
Iterator iter = schemes.iterator();
int currLoc = 0;
@@ -324,8 +324,8 @@
BulkResponseImpl bulk = new BulkResponseImpl();
TModel[] entityarr = new TModel[concepts.size()];
- HashSet coll = new HashSet();
- Collection exceptions = new ArrayList();
+ HashSet<Key> coll = new HashSet<Key>();
+ Collection<Exception> exceptions = new ArrayList<Exception>();
Iterator iter = concepts.iterator();
int currLoc = 0;
@@ -370,8 +370,8 @@
BulkResponseImpl bulk = new BulkResponseImpl();
BusinessEntity[] entityarr = new BusinessEntity[organizations.size()];
- HashSet coll = new HashSet();
- Collection exceptions = new ArrayList();
+ HashSet<Key> coll = new HashSet<Key>();
+ Collection<Exception> exceptions = new ArrayList<Exception>();
Iterator iter = organizations.iterator();
int currLoc = 0;
@@ -415,8 +415,8 @@
BulkResponseImpl bulk = new BulkResponseImpl();
BindingTemplate[] sbarr = new BindingTemplate[bindings.size()];
- HashSet coll = new HashSet();
- Collection exceptions = new ArrayList();
+ HashSet<Key> coll = new HashSet<Key>();
+ Collection<Exception> exceptions = new ArrayList<Exception>();
Iterator iter = bindings.iterator();
int currLoc = 0;
@@ -456,8 +456,8 @@
BulkResponseImpl bulk = new BulkResponseImpl();
BusinessService[] sarr = new BusinessService[services.size()];
- HashSet coll = new HashSet();
- Collection exceptions = new ArrayList();
+ HashSet<Key> coll = new HashSet<Key>();
+ Collection<Exception> exceptions = new ArrayList<Exception>();
Iterator iter = services.iterator();
@@ -496,7 +496,7 @@
public void confirmAssociation(Association assoc) throws JAXRException, InvalidRequestException {
//Store it in the UDDI registry
- HashSet col = new HashSet();
+ HashSet<Association> col = new HashSet<Association>();
col.add(assoc);
BulkResponse br = this.saveAssociations(col, true);
if(br.getExceptions()!= null)
@@ -506,7 +506,7 @@
public void unConfirmAssociation(Association assoc) throws JAXRException, InvalidRequestException {
//TODO
//Delete it from the UDDI registry
- Collection col = new ArrayList();
+ Collection<Key> col = new ArrayList<Key>();
col.add(assoc.getKey());
BulkResponse br = this.deleteAssociations(col);
if(br.getExceptions()!= null)
@@ -580,7 +580,7 @@
private void clearPublisherAssertions( String authinfo,String[] orgkeys,IRegistry ireg)
{
- Vector pasvect = null;
+ Vector<PublisherAssertion> pasvect = null;
PublisherAssertion[] pasarr = null;
try
{
@@ -603,7 +603,7 @@
pa.setKeyValue(keyr.getKeyValue());
if(pasvect == null) pasvect = new Vector(len);
pasvect.add(pa);*/
- if(pasvect == null) pasvect = new Vector(len);
+ if(pasvect == null) pasvect = new Vector<PublisherAssertion>(len);
pasvect.add(this.getPublisherAssertion(asi));
}
report = ireg.getAssertionStatusReport(authinfo,"status:toKey_incomplete");
@@ -613,7 +613,7 @@
for (int i = 0; i < len; i++)
{
AssertionStatusItem asi = (AssertionStatusItem) a[i];
- if(pasvect == null) pasvect = new Vector(len);
+ if(pasvect == null) pasvect = new Vector<PublisherAssertion>(len);
pasvect.add(this.getPublisherAssertion(asi));
}
@@ -624,7 +624,7 @@
for (int i = 0; i < len; i++)
{
AssertionStatusItem asi = (AssertionStatusItem) a[i];
- if(pasvect == null) pasvect = new Vector(len);
+ if(pasvect == null) pasvect = new Vector<PublisherAssertion>(len);
pasvect.add(this.getPublisherAssertion(asi));
}
@@ -657,7 +657,7 @@
- protected BulkResponse deleteOperation(Collection keys, String op)
+ protected BulkResponse deleteOperation(Collection<Key> keys, String op)
throws JAXRException {
if(keys == null)
throw new JAXRException("Keys provided to "+op+" are null");
@@ -667,8 +667,8 @@
String[] keyarr = new String[keys.size()];
Result[] keyResultArr;
- HashSet coll = new HashSet();
- Collection exceptions = new ArrayList();
+ HashSet<Key> coll = new HashSet<Key>();
+ Collection<Exception> exceptions = new ArrayList<Exception>();
try {
Iterator iter = keys.iterator();
Modified: webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/BusinessQueryManagerImpl.java
URL: http://svn.apache.org/viewvc/webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/BusinessQueryManagerImpl.java?view=diff&rev=552080&r1=552079&r2=552080
==============================================================================
--- webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/BusinessQueryManagerImpl.java (original)
+++ webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/BusinessQueryManagerImpl.java Fri Jun 29 19:36:18 2007
@@ -131,12 +131,12 @@
registryService.getMaxRows());
BusinessInfo[] a = result.getBusinessInfos() != null ? result.getBusinessInfos().getBusinessInfoArray() : null;
- HashSet orgs = null;
+ HashSet<Organization> orgs = null;
int len = 0;
if (a != null)
{
len = a.length;
- orgs = new HashSet();
+ orgs = new HashSet<Organization>();
}
for (int i = 0; i < len; i++)
{
@@ -168,19 +168,19 @@
registry.getPublisherAssertions(auth.getAuthInfo());
PublisherAssertion[] a = result.getPublisherAssertionArray();
- HashSet col = null;
+ HashSet<Association> col = null;
int len = 0;
if (a != null)
{
len = a.length;
- col = new HashSet();
+ col = new HashSet<Association>();
}
for (int i = 0; i < len; i++)
{
PublisherAssertion pas = a[i];
String sourceKey = pas.getFromKey();
String targetKey = pas.getToKey();
- Collection orgcol = new ArrayList();
+ Collection<Key> orgcol = new ArrayList<Key>();
orgcol.add(new KeyImpl(sourceKey));
orgcol.add(new KeyImpl(targetKey));
BulkResponse bl = getRegistryObjects(orgcol, LifeCycleManager.ORGANIZATION);
@@ -229,19 +229,19 @@
report = registry.getAssertionStatusReport(auth.getAuthInfo(),confirm);
AssertionStatusItem[] a = report.getAssertionStatusItemArray();
- HashSet col = null;
+ HashSet<Association> col = null;
int len = 0;
if (a != null)
{
len = a.length;
- col = new HashSet();
+ col = new HashSet<Association>();
}
for (int i = 0; i < len; i++)
{
AssertionStatusItem asi = a[i];
String sourceKey = asi.getFromKey();
String targetKey = asi.getToKey();
- Collection orgcol = new ArrayList();
+ Collection<Key> orgcol = new ArrayList<Key>();
orgcol.add(new KeyImpl(sourceKey));
orgcol.add(new KeyImpl(targetKey));
BulkResponse bl = getRegistryObjects(orgcol, LifeCycleManager.ORGANIZATION);
@@ -486,7 +486,7 @@
Collection externalLinks) throws JAXRException
{
//TODO: Handle this better
- HashSet col = new HashSet();
+ HashSet<ClassificationScheme> col = new HashSet<ClassificationScheme>();
Iterator iter = namePatterns.iterator();
String name = "";
while(iter.hasNext())
@@ -515,7 +515,7 @@
Collection externalIdentifiers,
Collection externalLinks) throws JAXRException
{
- HashSet col = new HashSet();
+ HashSet<Concept> col = new HashSet<Concept>();
//Lets ask the uddi registry if it has the TModels
IRegistry registry = registryService.getRegistry();
@@ -583,7 +583,7 @@
if (l != null) {
BindingTemplate[] bindarr= l.getBindingTemplateArray();
- HashSet col = new HashSet();
+ HashSet<ServiceBinding> col = new HashSet<ServiceBinding>();
for (int i=0; bindarr != null && i < bindarr.length; i++) {
BindingTemplate si = bindarr[i];
@@ -660,7 +660,7 @@
ServiceInfo[] a = (serviceInfos != null ? serviceInfos.getServiceInfoArray() : null);
- HashSet col = new HashSet();
+ HashSet<Service> col = new HashSet<Service>();
for (int i=0; a != null && i < a.length; i++) {
ServiceInfo si = (ServiceInfo) a[i];
@@ -809,7 +809,7 @@
LifeCycleManager.ORGANIZATION,
LifeCycleManager.SERVICE};
- HashSet c = new HashSet();
+ HashSet<Object> c = new HashSet<Object>();
for (int i = 0; i < types.length; i++) {
try {
@@ -827,12 +827,12 @@
return new BulkResponseImpl(c);
}
- public BulkResponse getRegistryObjects(Collection objectKeys) throws JAXRException
+ public BulkResponse getRegistryObjects(Collection<Key> objectKeys) throws JAXRException
{
throw new UnsupportedCapabilityException();
}
- public BulkResponse getRegistryObjects(Collection objectKeys, String objectType) throws JAXRException
+ public BulkResponse getRegistryObjects(Collection<Key> objectKeys, String objectType) throws JAXRException
{
IRegistry registry = registryService.getRegistry();
//Convert into a vector of strings
@@ -845,7 +845,7 @@
keys[currLoc] = key.getId();
currLoc++;
}
- HashSet col = new HashSet();
+ HashSet<RegistryObject> col = new HashSet<RegistryObject>();
LifeCycleManager lcm = registryService.getLifeCycleManagerImpl();
if (LifeCycleManager.CLASSIFICATION_SCHEME.equalsIgnoreCase(objectType))
@@ -931,7 +931,7 @@
public BulkResponse getRegistryObjects(String id) throws JAXRException
{
if (LifeCycleManager.ORGANIZATION.equalsIgnoreCase(id)) {
- List a = new ArrayList();
+ List<String> a = new ArrayList<String>();
a.add("%");
BulkResponse br = findOrganizations(null, a, null, null, null, null);
@@ -939,7 +939,7 @@
return br;
}
else if (LifeCycleManager.SERVICE.equalsIgnoreCase(id)) {
- List a = new ArrayList();
+ List<String> a = new ArrayList<String>();
a.add("%");
BulkResponse br = this.findServices(null,null, a, null, null);
Modified: webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/LifeCycleManagerImpl.java
URL: http://svn.apache.org/viewvc/webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/LifeCycleManagerImpl.java?view=diff&rev=552080&r1=552079&r2=552080
==============================================================================
--- webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/LifeCycleManagerImpl.java (original)
+++ webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/LifeCycleManagerImpl.java Fri Jun 29 19:36:18 2007
@@ -409,7 +409,7 @@
* @return
* @throws JAXRException
*/
- public abstract BulkResponse deleteObjects(Collection keys, String objectType) throws JAXRException;
+ public abstract BulkResponse deleteObjects(Collection<Key> keys, String objectType) throws JAXRException;
/*************************************************************************
@@ -437,15 +437,15 @@
throw new UnsupportedCapabilityException();
}
- public BulkResponse deprecateObjects(Collection keys) throws JAXRException {
+ public BulkResponse deprecateObjects(Collection<Key> keys) throws JAXRException {
throw new UnsupportedCapabilityException();
}
- public BulkResponse unDeprecateObjects(Collection keys) throws JAXRException {
+ public BulkResponse unDeprecateObjects(Collection<Key> keys) throws JAXRException {
throw new UnsupportedCapabilityException();
}
- public BulkResponse deleteObjects(Collection keys) throws JAXRException {
+ public BulkResponse deleteObjects(Collection<Key> keys) throws JAXRException {
throw new UnsupportedCapabilityException();
}
Modified: webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/infomodel/ExternalLinkImpl.java
URL: http://svn.apache.org/viewvc/webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/infomodel/ExternalLinkImpl.java?view=diff&rev=552080&r1=552079&r2=552080
==============================================================================
--- webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/infomodel/ExternalLinkImpl.java (original)
+++ webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/infomodel/ExternalLinkImpl.java Fri Jun 29 19:36:18 2007
@@ -34,7 +34,7 @@
{
private String uri = new String();
private boolean validateuri = false;
- private Collection linkedObj = new ArrayList();
+ private Collection<RegistryObject> linkedObj = new ArrayList<RegistryObject>();
/**
* Creates a new instance of ExternalLinkImpl
Modified: webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/infomodel/OrganizationImpl.java
URL: http://svn.apache.org/viewvc/webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/infomodel/OrganizationImpl.java?view=diff&rev=552080&r1=552079&r2=552080
==============================================================================
--- webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/infomodel/OrganizationImpl.java (original)
+++ webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/infomodel/OrganizationImpl.java Fri Jun 29 19:36:18 2007
@@ -42,9 +42,9 @@
public class OrganizationImpl extends RegistryObjectImpl implements Organization
{
private User primaryContact;
- private Set users = new HashSet();
- private Set telephoneNumbers = new HashSet();
- private Collection services = new ArrayList();
+ private Set<User> users = new HashSet<User>();
+ private Set<TelephoneNumber> telephoneNumbers = new HashSet<TelephoneNumber>();
+ private Collection<Service> services = new ArrayList<Service>();
public OrganizationImpl(LifeCycleManager lifeCycleManager)
{
@@ -113,7 +113,7 @@
}
}
- public Collection getUsers() throws JAXRException
+ public Collection<User> getUsers() throws JAXRException
{
return users;
}
@@ -151,15 +151,15 @@
}
- public Collection getTelephoneNumbers(String phoneType) throws JAXRException
+ public Collection<TelephoneNumber> getTelephoneNumbers(String phoneType) throws JAXRException
{
- Set filteredNumbers;
+ Set<TelephoneNumber> filteredNumbers;
if (phoneType == null)
{
filteredNumbers = telephoneNumbers;
} else
{
- filteredNumbers = new HashSet(telephoneNumbers.size());
+ filteredNumbers = new HashSet<TelephoneNumber>(telephoneNumbers.size());
for (Iterator i = telephoneNumbers.iterator(); i.hasNext();)
{
TelephoneNumber number = (TelephoneNumber) i.next();
@@ -172,10 +172,10 @@
return filteredNumbers;
}
- public void setTelephoneNumbers(Collection collection) throws JAXRException
+ public void setTelephoneNumbers(Collection<TelephoneNumber> collection) throws JAXRException
{
// do this by hand to ensure all members are actually instances of TelephoneNumber
- Set numbers = new HashSet(collection.size());
+ Set<TelephoneNumber> numbers = new HashSet<TelephoneNumber>(collection.size());
for (Iterator i = collection.iterator(); i.hasNext();)
{
TelephoneNumber number = (TelephoneNumber) i.next();
@@ -207,7 +207,7 @@
}
}
- public Collection getServices() throws JAXRException
+ public Collection<Service> getServices() throws JAXRException
{
return services;
}
@@ -231,7 +231,7 @@
throw new UnsupportedCapabilityException("Level 1 feature");
}
- public Collection getDescendantOrganizations() throws JAXRException
+ public Collection<Organization> getDescendantOrganizations() throws JAXRException
{
throw new UnsupportedCapabilityException("Level 1 feature");
}
@@ -256,7 +256,7 @@
throw new UnsupportedCapabilityException("Level 1 feature");
}
- public Collection getChildOrganizations() throws JAXRException
+ public Collection<Organization> getChildOrganizations() throws JAXRException
{
throw new UnsupportedCapabilityException("Level 1 feature");
}
Modified: webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/infomodel/ServiceBindingImpl.java
URL: http://svn.apache.org/viewvc/webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/infomodel/ServiceBindingImpl.java?view=diff&rev=552080&r1=552079&r2=552080
==============================================================================
--- webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/infomodel/ServiceBindingImpl.java (original)
+++ webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/infomodel/ServiceBindingImpl.java Fri Jun 29 19:36:18 2007
@@ -36,7 +36,7 @@
*/
public class ServiceBindingImpl extends RegistryObjectImpl implements ServiceBinding
{
- private Collection links = null;
+ private Collection<SpecificationLink> links = null;
private String accessuri = null;
private Service service = null;
private ServiceBinding targetbinding = null;
@@ -54,7 +54,7 @@
public void addSpecificationLink(SpecificationLink sl) throws JAXRException
{
- if(links == null) links = new ArrayList();
+ if(links == null) links = new ArrayList<SpecificationLink>();
links.add(sl);
((SpecificationLinkImpl)sl).setServiceBinding(this);
}
@@ -63,7 +63,7 @@
{
try
{
- if(links == null) links = new ArrayList();
+ if(links == null) links = new ArrayList<SpecificationLink>();
Iterator iter = col.iterator();
while(iter.hasNext())
{
@@ -97,13 +97,13 @@
public void removeSpecificationLink(SpecificationLink link) throws JAXRException
{
- if(links == null) links = new ArrayList();
+ if(links == null) links = new ArrayList<SpecificationLink>();
links.remove(link);
}
- public void removeSpecificationLinks(Collection col) throws JAXRException
+ public void removeSpecificationLinks(Collection<SpecificationLink> col) throws JAXRException
{
- if(links == null) links = new ArrayList();
+ if(links == null) links = new ArrayList<SpecificationLink>();
links.removeAll(col);
}
Modified: webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/infomodel/ServiceImpl.java
URL: http://svn.apache.org/viewvc/webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/infomodel/ServiceImpl.java?view=diff&rev=552080&r1=552079&r2=552080
==============================================================================
--- webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/infomodel/ServiceImpl.java (original)
+++ webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/infomodel/ServiceImpl.java Fri Jun 29 19:36:18 2007
@@ -37,7 +37,7 @@
{
private Organization org = null;
- private Collection serviceBindings = new ArrayList();
+ private Collection<ServiceBinding> serviceBindings = new ArrayList<ServiceBinding>();
/**
* Creates a new instance of ServiceImpl
Modified: webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/transport/LocalTransport.java
URL: http://svn.apache.org/viewvc/webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/transport/LocalTransport.java?view=diff&rev=552080&r1=552079&r2=552080
==============================================================================
--- webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/transport/LocalTransport.java (original)
+++ webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/transport/LocalTransport.java Fri Jun 29 19:36:18 2007
@@ -57,9 +57,9 @@
String methodName = endpointURI.getFragment();
log.debug("Calling class=" + className);
log.debug("Method=" + methodName);
- Class clazz = Class.forName(className);
- Object requestHandler = clazz.newInstance();
- Method method = clazz.getMethod(methodName, new Class[]{Element.class});
+ Class<?> c = Class.forName(className);
+ Object requestHandler = c.newInstance();
+ Method method = c.getMethod(methodName, Element.class);
Node node = (Node) method.invoke(requestHandler, request);
response = (Element) node.getFirstChild();
}
Modified: webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/transport/RMITransport.java
URL: http://svn.apache.org/viewvc/webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/transport/RMITransport.java?view=diff&rev=552080&r1=552079&r2=552080
==============================================================================
--- webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/transport/RMITransport.java (original)
+++ webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/transport/RMITransport.java Fri Jun 29 19:36:18 2007
@@ -79,9 +79,9 @@
//Looking up the object (i.e. Publish)
Object requestHandler = context.lookup(service);
//Loading up the stub
- Class clazz = Class.forName(className);
+ Class<?> c = Class.forName(className);
//Getting a handle to method we want to call (i.e. publish.publish(Element element))
- Method method = clazz.getMethod(methodName, new Class[]{Element.class});
+ Method method = c.getMethod(methodName, Element.class);
//Calling that method
Node node = (Node) method.invoke(requestHandler, request);
//The result is in the first element
Modified: webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/util/ScoutUddiJaxrHelper.java
URL: http://svn.apache.org/viewvc/webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/util/ScoutUddiJaxrHelper.java?view=diff&rev=552080&r1=552079&r2=552080
==============================================================================
--- webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/util/ScoutUddiJaxrHelper.java (original)
+++ webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/util/ScoutUddiJaxrHelper.java Fri Jun 29 19:36:18 2007
@@ -433,7 +433,7 @@
* @param lcm
* @throws JAXRException
*/
- public static Collection getExternalIdentifiers(IdentifierBag ibag, LifeCycleManager lcm) throws JAXRException {
+ public static Collection<ExternalIdentifier> getExternalIdentifiers(IdentifierBag ibag, LifeCycleManager lcm) throws JAXRException {
Collection<ExternalIdentifier> extidentifiers = null;
if (ibag != null) {
extidentifiers = new ArrayList<ExternalIdentifier>();
Modified: webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/registry/LifeCycleManagerTest.java
URL: http://svn.apache.org/viewvc/webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/registry/LifeCycleManagerTest.java?view=diff&rev=552080&r1=552079&r2=552080
==============================================================================
--- webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/registry/LifeCycleManagerTest.java (original)
+++ webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/registry/LifeCycleManagerTest.java Fri Jun 29 19:36:18 2007
@@ -32,6 +32,7 @@
import javax.xml.registry.infomodel.EmailAddress;
import javax.xml.registry.infomodel.ExternalIdentifier;
import javax.xml.registry.infomodel.ExternalLink;
+import javax.xml.registry.infomodel.Key;
import javax.xml.registry.infomodel.Organization;
import javax.xml.registry.infomodel.PersonName;
import javax.xml.registry.infomodel.Service;
@@ -227,7 +228,7 @@
public void testDeprecateObjects() throws JAXRException {
try {
- manager.deprecateObjects(new ArrayList());
+ manager.deprecateObjects(new ArrayList<Key>());
fail();
} catch (UnsupportedCapabilityException e) {
// OK
@@ -236,7 +237,7 @@
public void testUnDeprecateObjects() throws JAXRException {
try {
- manager.unDeprecateObjects(new ArrayList());
+ manager.unDeprecateObjects(new ArrayList<Key>());
fail();
} catch (UnsupportedCapabilityException e) {
// OK
---------------------------------------------------------------------
To unsubscribe, e-mail: scout-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: scout-dev-help@ws.apache.org