[jboss-svn-commits] JBL Code SVN: r15734 - in labs/jbossesb/trunk/product/rosetta: tests/src/org/jboss/internal/soa/esb/services/registry and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: kurt.stam at jboss.com
Date: 2007-10-10 17:28:15 -0400 (Wed, 10 Oct 2007)
New Revision: 15734

Modified:
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryImpl.java
   labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryUnitTest.java
Log:
JBESB-1137, removing the UrlDecoding of the EPRs

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryImpl.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryImpl.java	2007-10-10 20:49:50 UTC (rev 15733)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryImpl.java	2007-10-10 21:28:15 UTC (rev 15734)
@@ -21,10 +21,7 @@
 */
 package org.jboss.internal.soa.esb.services.registry;
 
-import java.io.UnsupportedEncodingException;
 import java.net.PasswordAuthentication;
-import java.net.URLDecoder;
-import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
@@ -201,7 +198,7 @@
 			ServiceBinding serviceBinding = blm.createServiceBinding();
 			serviceBinding.setDescription(blm.createInternationalString(eprDescription));
 			String xml = EPRHelper.toXMLString(epr);
-			serviceBinding.setAccessURI(URLEncoder.encode(xml,"UTF-8"));
+			serviceBinding.setAccessURI(xml);
 		
 		    ArrayList<ServiceBinding> serviceBindings = new ArrayList<ServiceBinding>();
 		    serviceBindings.add(serviceBinding);
@@ -216,8 +213,6 @@
 			saveRegistryObject(serviceBinding);
 		} catch (JAXRException je) {
 			throw new RegistryException(je.getLocalizedMessage(), je);
-        } catch (UnsupportedEncodingException uee) {
-            throw new RegistryException(uee.getLocalizedMessage(), uee);
         } catch (MarshalException me) {
             throw new RegistryException(me.getLocalizedMessage(), me);
 		} finally {
@@ -242,8 +237,9 @@
 			service.addServiceBindings(serviceBindings);
 			for (Iterator i=serviceBindings.iterator();i.hasNext();){
 				ServiceBinding serviceBinding = (ServiceBinding) i.next();
-				String xml = URLDecoder.decode(serviceBinding.getAccessURI(), "UTF-8");
-				if (xml.equals(EPRHelper.toXMLString(toBeDeletedEPR))) {
+				String xml = serviceBinding.getAccessURI().trim();
+                String toBeDeletedEPRXml = EPRHelper.toXMLString(toBeDeletedEPR).trim();
+				if (xml.equals(toBeDeletedEPRXml)) {
                     RegistryService rs = connection.getRegistryService();
                     BusinessLifeCycleManager blm = rs.getBusinessLifeCycleManager();
                     Collection<Key> serviceBindingKeys = new ArrayList<Key>();
@@ -256,8 +252,6 @@
                     + serviceName + " and EPR=" + toBeDeletedEPR);
 		} catch (JAXRException je) {
 			throw new RegistryException(je.getLocalizedMessage(), je);
-        } catch (UnsupportedEncodingException uee) {
-            throw new RegistryException(uee.getLocalizedMessage(), uee);
         } catch (MarshalException me) {
             throw new RegistryException(me.getLocalizedMessage(), me);
 		} finally {
@@ -323,14 +317,12 @@
 			for (Iterator i=serviceBindings.iterator();i.hasNext();) {
 				ServiceBinding serviceBinding = (ServiceBinding) i.next();
 				@SuppressWarnings("unused")
-				String eprXML = URLDecoder.decode(serviceBinding.getAccessURI(),"UTF-8");
+				String eprXML = serviceBinding.getAccessURI();
 				EPR epr = EPRHelper.fromXMLString(eprXML);
 				eprs.add(epr);
 			}
 		} catch (JAXRException je) {
 			throw new RegistryException(je.getLocalizedMessage(), je);
-        } catch (UnsupportedEncodingException uee) {
-            throw new RegistryException(uee.getLocalizedMessage(), uee);
         } catch (UnmarshalException me) {
             throw new RegistryException(me.getLocalizedMessage(), me);
 		} finally {
@@ -356,13 +348,11 @@
 			Collection<ServiceBinding> serviceBindings = findServiceBindings(service);
 			if (serviceBindings.iterator().hasNext()) {
 				ServiceBinding serviceBinding = (ServiceBinding) serviceBindings.iterator().next();
-				String eprXML = URLDecoder.decode(serviceBinding.getAccessURI(),"UTF-8");
+				String eprXML = serviceBinding.getAccessURI();
 				epr = EPRHelper.fromXMLString(eprXML);
 			}
 		} catch (JAXRException je) {
 			throw new RegistryException(je.getLocalizedMessage(), je);
-        } catch (UnsupportedEncodingException uee) {
-            throw new RegistryException(uee.getLocalizedMessage(), uee);
         } catch (UnmarshalException me) {
             throw new RegistryException(me.getLocalizedMessage(), me);
 		} finally {

Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryUnitTest.java	2007-10-10 20:49:50 UTC (rev 15733)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryUnitTest.java	2007-10-10 21:28:15 UTC (rev 15734)
@@ -26,7 +26,6 @@
 
 import java.io.File;
 import java.io.InputStream;
-import java.net.URLDecoder;
 import java.sql.DriverManager;
 import java.sql.Statement;
 import java.util.ArrayList;
@@ -170,9 +169,9 @@
 				for (Iterator serviceBindingIter = serviceBindings.iterator();serviceBindingIter.hasNext();){
 					ServiceBinding serviceBinding = (ServiceBinding) serviceBindingIter.next();
 					logger.debug("  ServiceBinding Description: " + serviceBinding.getDescription().getValue());
-					String xml = URLDecoder.decode(serviceBinding.getAccessURI(),"UTF-8");
+					String xml = serviceBinding.getAccessURI();
 					logger.debug("  ServiceBinding URI: " + xml);
-					assertEquals(EPRHelper.toXMLString(new EPR()),xml);
+					assertEquals(EPRHelper.toXMLString(new EPR()).trim(),xml.trim());
 				}
 			}
 			logger.debug("-------------------------------------------------");