Skip to content

Simplify SimpleNamespaceContext using modern Map APIs. #1308

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Simplify SimpleNamespaceContext using modern Map APIs. #1308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 4 additions & 10 deletions spring-xml/src/main/java/org/springframework/xml/namespace/SimpleNamespaceContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@
*/
public class SimpleNamespaceContext implements NamespaceContext {

private Map<String, String> prefixToNamespaceUri = new LinkedHashMap<String, String>();
private final Map<String, String> prefixToNamespaceUri = new LinkedHashMap<>();

private Map<String, Set<String>> namespaceUriToPrefixes = new LinkedHashMap<String, Set<String>>();
private final Map<String, Set<String>> namespaceUriToPrefixes = new LinkedHashMap<>();

@Override
public String getNamespaceURI(String prefix) {
Expand Down Expand Up @@ -122,7 +122,7 @@ public void clear() {
* @return the declared prefixes
*/
public Iterator<String> getBoundPrefixes() {
Set<String> prefixes = new HashSet<String>(prefixToNamespaceUri.keySet());
Set<String> prefixes = new HashSet<>(prefixToNamespaceUri.keySet());
prefixes.remove(XMLConstants.DEFAULT_NS_PREFIX);
prefixes = Collections.unmodifiableSet(prefixes);
return prefixes.iterator();
Expand All @@ -133,14 +133,8 @@ private Set<String> getPrefixesInternal(String namespaceUri) {
return Collections.singleton(XMLConstants.XML_NS_PREFIX);
} else if (XMLConstants.XMLNS_ATTRIBUTE_NS_URI.equals(namespaceUri)) {
return Collections.singleton(XMLConstants.XMLNS_ATTRIBUTE);
} else {
Set<String> set = namespaceUriToPrefixes.get(namespaceUri);
if (set == null) {
set = new LinkedHashSet<String>();
namespaceUriToPrefixes.put(namespaceUri, set);
}
return set;
}
return namespaceUriToPrefixes.computeIfAbsent(namespaceUri, k -> new LinkedHashSet<>());
}

/**
Expand Down
45 changes: 20 additions & 25 deletions spring-xml/src/test/java/org/springframework/xml/namespace/SimpleNamespaceContextTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,34 +27,33 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

public class SimpleNamespaceContextTest {
class SimpleNamespaceContextTest {

private SimpleNamespaceContext context;

@BeforeEach
public void setUp() throws Exception {

void setUp() {
context = new SimpleNamespaceContext();
context.bindNamespaceUri("prefix", "namespaceURI");
}

@Test
public void testGetNamespaceURI() {
void testGetNamespaceURI() {

assertThat(context.getNamespaceURI(XMLConstants.DEFAULT_NS_PREFIX)).isEqualTo("");
assertThat(context.getNamespaceURI(XMLConstants.DEFAULT_NS_PREFIX)).isEmpty();

String defaultNamespaceUri = "defaultNamespace";
context.bindNamespaceUri(XMLConstants.DEFAULT_NS_PREFIX, defaultNamespaceUri);

assertThat(context.getNamespaceURI(XMLConstants.DEFAULT_NS_PREFIX)).isEqualTo(defaultNamespaceUri);
assertThat(context.getNamespaceURI("prefix")).isEqualTo("namespaceURI");
assertThat(context.getNamespaceURI("unbound")).isEqualTo("");
assertThat(context.getNamespaceURI("unbound")).isEmpty();
assertThat(context.getNamespaceURI(XMLConstants.XML_NS_PREFIX)).isEqualTo(XMLConstants.XML_NS_URI);
assertThat(context.getNamespaceURI(XMLConstants.XMLNS_ATTRIBUTE)).isEqualTo(XMLConstants.XMLNS_ATTRIBUTE_NS_URI);
}

@Test
public void testGetPrefix() {
void testGetPrefix() {

context.bindDefaultNamespaceUri("defaultNamespaceURI");

Expand All @@ -66,7 +65,7 @@ public void testGetPrefix() {
}

@Test
public void testGetPrefixes() {
void testGetPrefixes() {

context.bindDefaultNamespaceUri("defaultNamespaceURI");

Expand All @@ -78,22 +77,18 @@ public void testGetPrefixes() {
}

@Test
public void unmodifiableGetPrefixes() {

assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> {

String namespaceUri = "namespaceUri";
context.bindNamespaceUri("prefix1", namespaceUri);
context.bindNamespaceUri("prefix2", namespaceUri);
void unmodifiableGetPrefixes() {
String namespaceUri = "namespaceUri";
context.bindNamespaceUri("prefix1", namespaceUri);
context.bindNamespaceUri("prefix2", namespaceUri);

Iterator<String> prefixes = context.getPrefixes(namespaceUri);
prefixes.next();
prefixes.remove();
});
Iterator<String> prefixes = context.getPrefixes(namespaceUri);
prefixes.next();
assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(prefixes::remove);
}

@Test
public void testMultiplePrefixes() {
void testMultiplePrefixes() {

context.bindNamespaceUri("prefix1", "namespace");
context.bindNamespaceUri("prefix2", "namespace");
Expand Down Expand Up @@ -130,7 +125,7 @@ private void assertPrefixes(String namespaceUri, String prefix) {
}

@Test
public void testGetBoundPrefixes() {
void testGetBoundPrefixes() {

Iterator<String> iterator = context.getBoundPrefixes();

Expand All @@ -144,15 +139,15 @@ public void testGetBoundPrefixes() {
}

@Test
public void testSetBindings() {
void testSetBindings() {

context.setBindings(Collections.singletonMap("prefix", "namespace"));

assertThat(context.getNamespaceURI("prefix")).isEqualTo("namespace");
}

@Test
public void testRemoveBinding() {
void testRemoveBinding() {

context.clear();

Expand All @@ -175,7 +170,7 @@ public void testRemoveBinding() {
}

@Test
public void testHasBinding() {
void testHasBinding() {

context.clear();

Expand All @@ -190,7 +185,7 @@ public void testHasBinding() {
}

@Test
public void testDefaultNamespaceMultiplePrefixes() {
void testDefaultNamespaceMultiplePrefixes() {

String defaultNamespace = "http://springframework.org/spring-ws";

Expand Down