Spring/spring-ws
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Using StringBuffer instead of resource-heavy java.net.URL to transform locations.

Browse Source
This commit is contained in:
Arjen Poutsma
2007-10-20 12:56:22 +00:00
parent 899c768a2d
commit 62cada56e1
2 changed files with 26 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
core/src/main/java/org/springframework/ws/transport/http/WsdlDefinitionHandlerAdapter.java
View File

@@ -16,8 +16,6 @@
package org.springframework.ws.transport.http;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Iterator;
import java.util.List;
import java.util.Properties;
@@ -160,25 +158,27 @@ public class WsdlDefinitionHandlerAdapter extends TransformerObjectSupport imple
* This method is only called when the <code>transformLocations</code> property is true.
*/
protected String transformLocation(String location, HttpServletRequest request) {
try {
if (location.startsWith("/")) {
// a relative path, prepend the context path
URL newLocation = new URL(request.getScheme(), request.getServerName(), request.getServerPort(),
request.getContextPath() + location);
return newLocation.toString();
}
else {
StringBuffer url = new StringBuffer(request.getScheme());
url.append("://").append(request.getServerName()).append(':').append(request.getServerPort());
if (location.startsWith("/")) {
// a relative path, prepend the context path
url.append(request.getContextPath()).append(location);
return url.toString();
}
else {
int idx = location.indexOf("://");
if (idx != -1) {
// a full url
URL oldLocation = new URL(location);
URL newLocation = new URL(request.getScheme(), request.getServerName(), request.getServerPort(),
oldLocation.getFile());
return newLocation.toString();
idx = location.indexOf('/', idx + 3);
if (idx != -1) {
String path = location.substring(idx);
url.append(path);
return url.toString();
}
}
}
catch (MalformedURLException e) {
return location;
// fall though to the default return value
}
// unknown location, return the original
return location;
}
/**
@@ -198,7 +198,9 @@ public class WsdlDefinitionHandlerAdapter extends TransformerObjectSupport imple
Attr location = (Attr) iterator.next();
if (location != null && StringUtils.hasLength(location.getValue())) {
String newLocation = transformLocation(location.getValue(), request);
logger.debug("Transforming [" + location.getValue() + "] to [" + newLocation + "]");
if (logger.isDebugEnabled()) {
logger.debug("Transforming [" + location.getValue() + "] to [" + newLocation + "]");
}
location.setValue(newLocation);
}
}

10
core/src/test/java/org/springframework/ws/transport/http/WsdlDefinitionHandlerAdapterTest.java
View File

@@ -16,7 +16,7 @@
package org.springframework.ws.transport.http;
import java.net.URL;
import java.net.URI;
import javax.servlet.ServletException;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -107,7 +107,7 @@ public class WsdlDefinitionHandlerAdapterTest extends XMLTestCase {
String result = adapter.transformLocation(oldLocation, request);
assertNotNull("No result", result);
assertEquals("Invalid result", new URL("http://example.com:8080/context/service"), new URL(result));
assertEquals("Invalid result", new URI("http://example.com:8080/context/service"), new URI(result));
}
public void testTransformLocationEmptyContextFullUrl() throws Exception {
@@ -120,7 +120,7 @@ public class WsdlDefinitionHandlerAdapterTest extends XMLTestCase {
String result = adapter.transformLocation(oldLocation, request);
assertNotNull("No result", result);
assertEquals("Invalid result", new URL("http://example.com:8080/service"), new URL(result));
assertEquals("Invalid result", new URI("http://example.com:8080/service"), new URI(result));
}
public void testTransformLocationRelativeUrl() throws Exception {
@@ -134,7 +134,7 @@ public class WsdlDefinitionHandlerAdapterTest extends XMLTestCase {
String result = adapter.transformLocation(oldLocation, request);
assertNotNull("No result", result);
assertEquals("Invalid result", new URL("http://example.com:8080/context/service"), new URL(result));
assertEquals("Invalid result", new URI("http://example.com:8080/context/service"), new URI(result));
}
public void testTransformLocationEmptyContextRelativeUrl() throws Exception {
@@ -147,6 +147,6 @@ public class WsdlDefinitionHandlerAdapterTest extends XMLTestCase {
String result = adapter.transformLocation(oldLocation, request);
assertNotNull("No result", result);
assertEquals("Invalid result", new URL("http://example.com:8080/service"), new URL(result));
assertEquals("Invalid result", new URI("http://example.com:8080/service"), new URI(result));
}
}