Skip to content

Commit 1ff4d47

Browse files
author
Arjen Poutsma
committed
Reverted SOAPJMS_ fallback mechanism
Reverted the fallback mechanism introduced to fix SWS-798, as it reduced compatibility with 3rd party services. Issue: SWS-833
1 parent 7788210 commit 1ff4d47

File tree

2 files changed

+1
-46
lines changed

2 files changed

+1
-46
lines changed

support/src/main/java/org/springframework/ws/transport/jms/support/JmsTransportUtils.java

Lines changed: 1 addition & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -76,19 +76,8 @@ public static String headerToJmsProperty(String headerName) {
7676
return CONVERSION_TABLE[i + 1];
7777
}
7878
}
79-
// fall-back
80-
StringBuilder builder = new StringBuilder(JmsTransportConstants.PROPERTY_PREFIX);
81-
for (int i = 0; i < headerName.length(); i++) {
82-
char ch = headerName.charAt(i);
83-
if (i == 0) {
84-
builder.append(Character.toLowerCase(ch));
79+
return headerName;
8580
}
86-
else if (Character.isJavaIdentifierPart(ch)) {
87-
builder.append(ch);
88-
}
89-
}
90-
return builder.toString();
91-
}
9281

9382
/**
9483
* Converts the given JMS property name to a transport header name. Returns the given property name if no match is
@@ -103,27 +92,7 @@ public static String jmsPropertyToHeader(String propertyName) {
10392
return CONVERSION_TABLE[i - 1];
10493
}
10594
}
106-
// fall-back
107-
if (propertyName.startsWith(JmsTransportConstants.PROPERTY_PREFIX)) {
108-
StringBuilder builder = new StringBuilder(propertyName.length());
109-
int start = JmsTransportConstants.PROPERTY_PREFIX.length();
110-
for (int i = start; i < propertyName.length(); i++) {
111-
char ch = propertyName.charAt(i);
112-
if (i == start) {
113-
builder.append(Character.toUpperCase(ch));
114-
}
115-
else {
116-
if (Character.isUpperCase(ch)) {
117-
builder.append('-');
118-
}
119-
builder.append(ch);
120-
}
121-
}
122-
return builder.toString();
123-
}
124-
else {
12595
return propertyName;
126-
}
12796
}
12897

12998
/**

support/src/test/java/org/springframework/ws/transport/jms/support/JmsTransportUtilsTest.java

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -112,18 +112,4 @@ public void jndi() throws Exception {
112112
String replyTo = JmsTransportUtils.getReplyToName(uri);
113113
assertEquals("Invalid reply to name", "jms/REPLY_QUEUE", replyTo);
114114
}
115-
116-
@Test
117-
public void headerToJmsPropertyFallback() {
118-
String expected = "SOAPJMS_fooBarBaz";
119-
String result = JmsTransportUtils.headerToJmsProperty("Foo-Bar-Baz");
120-
assertEquals(expected, result);
121-
}
122-
123-
@Test
124-
public void jmsPropertyToHeader() {
125-
String expected = "Foo-Bar-Baz";
126-
String result = JmsTransportUtils.jmsPropertyToHeader("SOAPJMS_fooBarBaz");
127-
assertEquals(expected, result);
128-
}
129115
}

0 commit comments

Comments
 (0)