ws-scout-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ks...@apache.org
Subject svn commit: r588759 - /webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/util/ScoutJaxrUddiHelper.java
Date Fri, 26 Oct 2007 19:32:29 GMT
Author: kstam
Date: Fri Oct 26 12:32:28 2007
New Revision: 588759

URL: http://svn.apache.org/viewvc?rev=588759&view=rev
Log:
SCOUT-51, more conditional logic to not set empty collections.

Modified:
    webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/util/ScoutJaxrUddiHelper.java

Modified: webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/util/ScoutJaxrUddiHelper.java
URL: http://svn.apache.org/viewvc/webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/util/ScoutJaxrUddiHelper.java?rev=588759&r1=588758&r2=588759&view=diff
==============================================================================
--- webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/util/ScoutJaxrUddiHelper.java
(original)
+++ webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/util/ScoutJaxrUddiHelper.java
Fri Oct 26 12:32:28 2007
@@ -162,8 +162,11 @@
 			if (sb != null) {
 				HostingRedirector red = HostingRedirector.Factory.newInstance();
                 Key key = sb.getKey();
-				if (key != null && key.getId() != null)
+				if (key != null && key.getId() != null) {
 					red.setBindingKey(key.getId());
+                } else {
+                    red.setBindingKey("");
+                }
                 bt.setHostingRedirector(red);
             }
 			// TODO:Need to look further at the mapping b/w BindingTemplate and
@@ -316,7 +319,8 @@
 
 				if (k != null && k.getId() != null) {
                     bs.setBusinessKey(k.getId());
-                }
+                } 
+                    
 			} else {
                 /*
                  * gmj - I *think* this is the right thing to do
@@ -327,9 +331,14 @@
 
 			if (serve.getKey() != null && serve.getKey().getId() != null) {
                 bs.setServiceKey(serve.getKey().getId());
+            } else {
+                bs.setServiceKey("");
             }
 
-			bs.setCategoryBag(getCategoryBagFromClassifications(serve.getClassifications()));
+            CategoryBag catBag = getCategoryBagFromClassifications(serve.getClassifications());
+            if (catBag!=null) {
+                bs.setCategoryBag(catBag);
+            }
 
             //Add the ServiceBinding information
             BindingTemplates bt = getBindingTemplates(serve.getServiceBindings());
@@ -393,8 +402,14 @@
 	            }
 			}
 
-			tm.setIdentifierBag(getIdentifierBagFromExternalIdentifiers(scheme.getExternalIdentifiers()));
-			tm.setCategoryBag(getCategoryBagFromClassifications(scheme.getClassifications()));
+            IdentifierBag idBag = getIdentifierBagFromExternalIdentifiers(scheme.getExternalIdentifiers());
+            if (idBag!=null) {
+                tm.setIdentifierBag(idBag);
+            }
+            CategoryBag catBag = getCategoryBagFromClassifications(scheme.getClassifications());
+            if (catBag!=null) {
+                tm.setCategoryBag(catBag);
+            }
 			
 			// ToDO: overviewDoc
 		} catch (Exception ud) {
@@ -438,8 +453,14 @@
                 }
             }
 
-			tm.setIdentifierBag(getIdentifierBagFromExternalIdentifiers(scheme.getExternalIdentifiers()));
-			tm.setCategoryBag(getCategoryBagFromClassifications(scheme.getClassifications()));
+            IdentifierBag idBag = getIdentifierBagFromExternalIdentifiers(scheme.getExternalIdentifiers());
+            if (idBag!=null) {
+                tm.setIdentifierBag(idBag);
+            }
+            CategoryBag catBag = getCategoryBagFromClassifications(scheme.getClassifications());
+            if (catBag!=null) {
+                tm.setCategoryBag(catBag);
+            }
 
 			// ToDO: overviewDoc
 
@@ -458,8 +479,11 @@
 		try {
 			// It may just be an update
             Key key = org.getKey();
-			if (key != null && key.getId() != null)
+			if (key != null && key.getId() != null) {
 				biz.setBusinessKey(key.getId());
+            } else {
+                biz.setBusinessKey("");
+            }
 			// Lets get the Organization attributes at the top level
 			
 			InternationalString iname = org.getName();
@@ -561,9 +585,10 @@
             }
 
 			bss.setBusinessServiceArray(barr);
-			cts.setContactArray(carr);
-            biz.setContacts(cts);
-
+            if (carr.length>0) {
+                cts.setContactArray(carr);
+                biz.setContacts(cts);
+            }
             biz.setBusinessServices(bss);
 
             // External Links
@@ -585,8 +610,14 @@
                 }
             }
 			
-		  biz.setIdentifierBag(getIdentifierBagFromExternalIdentifiers(org.getExternalIdentifiers()));
-		  biz.setCategoryBag(getCategoryBagFromClassifications(org.getClassifications()));
+          IdentifierBag idBag = getIdentifierBagFromExternalIdentifiers(org.getExternalIdentifiers());
+          if (idBag!=null) {
+              biz.setIdentifierBag(idBag);
+          }
+          CategoryBag catBag = getCategoryBagFromClassifications(org.getClassifications());
+          if (catBag!=null) {
+              biz.setCategoryBag(catBag);
+          }
 			
 		} catch (Exception ud) {
             throw new JAXRException("Apache JAXR Impl:", ud);
@@ -595,8 +626,6 @@
     }
 
     /**
-	 * TODO - should we really return new Contact() rather than null on null
-	 * input?
      *
      * Convert JAXR User Object to UDDI  Contact
      */
@@ -605,7 +634,7 @@
 		Contact ct = Contact.Factory.newInstance();
 
         if (user == null) {
-            return ct;
+            return null;
         }
 
 		Address[] addarr = new Address[0];
@@ -727,7 +756,7 @@
      */
 	public static CategoryBag getCategoryBagFromClassifications(Collection classifications)
throws JAXRException {
     	try {
-			if (classifications == null)
+			if (classifications == null || classifications.size()==0)
 				return null;
     		
     		// Classifications
@@ -784,7 +813,7 @@
      */
 	public static IdentifierBag getIdentifierBagFromExternalIdentifiers(Collection identifiers)
throws JAXRException {
     	try {
-			if (identifiers == null)
+			if (identifiers == null || identifiers.size()==0)
 				return null;
     		
     		// Identifiers
@@ -821,8 +850,9 @@
 
     private static BindingTemplates getBindingTemplates(Collection serviceBindings)
         throws JAXRException {
-        BindingTemplates bt = BindingTemplates.Factory.newInstance();
-        if(serviceBindings != null) {
+        BindingTemplates bt = null;
+        if(serviceBindings != null && serviceBindings.size() > 0) {
+            bt = BindingTemplates.Factory.newInstance();
             Iterator iter = serviceBindings.iterator();
             int currLoc = 0;
             BindingTemplate[] bindingTemplateArray = new BindingTemplate[serviceBindings.size()];



---------------------------------------------------------------------
To unsubscribe, e-mail: scout-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: scout-dev-help@ws.apache.org


Mime
View raw message