DATAREST-1198 - Add Converter to convert String to javax.naming.ldap.LdapName.
We now provide and configure a converter for String to LdapName conversion so Spring Data LDAP can be used with Spring Data REST without further configuration. Original pull request: #290.
This commit is contained in:
committed by
Oliver Gierke
parent
843540b746
commit
65ad7cd3e1
@@ -0,0 +1,47 @@
|
||||
/*
|
||||
* Copyright 2018 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package org.springframework.data.rest.core;
|
||||
|
||||
import javax.naming.InvalidNameException;
|
||||
import javax.naming.Name;
|
||||
import javax.naming.ldap.LdapName;
|
||||
|
||||
import org.springframework.core.convert.converter.Converter;
|
||||
|
||||
/**
|
||||
* {@link Converter} to convert a {@link String} to a {@link LdapName}.
|
||||
*
|
||||
* @author Mark Paluch
|
||||
* @since 3.1
|
||||
*/
|
||||
public enum StringToLdapNameConverter implements Converter<String, Name> {
|
||||
|
||||
INSTANCE;
|
||||
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
* @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
|
||||
*/
|
||||
@Override
|
||||
public LdapName convert(String source) {
|
||||
|
||||
try {
|
||||
return new LdapName(source);
|
||||
} catch (InvalidNameException e) {
|
||||
throw new IllegalArgumentException(String.format("Cannot create LdapName for '%s'!", source), e);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,59 @@
|
||||
/*
|
||||
* Copyright 2018 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package org.springframework.data.rest.core;
|
||||
|
||||
import static org.assertj.core.api.Assertions.*;
|
||||
|
||||
import javax.naming.InvalidNameException;
|
||||
import javax.naming.Name;
|
||||
import javax.naming.ldap.LdapName;
|
||||
|
||||
import org.junit.Test;
|
||||
import org.springframework.core.convert.support.DefaultConversionService;
|
||||
|
||||
/**
|
||||
* Unit tests for {@link StringToLdapNameConverter}.
|
||||
*
|
||||
* @author Mark Paluch
|
||||
*/
|
||||
public class StringToLdapNameConverterUnitTests {
|
||||
|
||||
@Test // DATAREST-1198
|
||||
public void shouldCreateLdapName() throws InvalidNameException {
|
||||
|
||||
LdapName converted = StringToLdapNameConverter.INSTANCE.convert("dc=foo");
|
||||
|
||||
assertThat(converted).isEqualTo(new LdapName("dc=foo"));
|
||||
}
|
||||
|
||||
@Test // DATAREST-1198
|
||||
public void failedConversionShouldThrowIAE() {
|
||||
|
||||
assertThatThrownBy(() -> StringToLdapNameConverter.INSTANCE.convert("foo"))
|
||||
.isInstanceOf(IllegalArgumentException.class);
|
||||
}
|
||||
|
||||
@Test // DATAREST-1198
|
||||
public void shouldConvertStringInNameViaConversionService() {
|
||||
|
||||
DefaultConversionService conversionService = new DefaultConversionService();
|
||||
conversionService.addConverter(StringToLdapNameConverter.INSTANCE);
|
||||
|
||||
Name converted = conversionService.convert("dc=foo", Name.class);
|
||||
|
||||
assertThat(converted).isInstanceOf(LdapName.class);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user