Refactor Batch (#2439)
This commit is contained in:
parent
dc9ecc143d
commit
bcc122b724
|
@ -1,143 +1,143 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<groupId>com.baeldung</groupId>
|
||||
<artifactId>spring-ldap</artifactId>
|
||||
<version>0.1-SNAPSHOT</version>
|
||||
<packaging>jar</packaging>
|
||||
<groupId>com.baeldung</groupId>
|
||||
<artifactId>spring-ldap</artifactId>
|
||||
<version>0.1-SNAPSHOT</version>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<parent>
|
||||
<groupId>com.baeldung</groupId>
|
||||
<artifactId>parent-modules</artifactId>
|
||||
<version>1.0.0-SNAPSHOT</version>
|
||||
</parent>
|
||||
<parent>
|
||||
<groupId>com.baeldung</groupId>
|
||||
<artifactId>parent-modules</artifactId>
|
||||
<version>1.0.0-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<properties>
|
||||
<spring-ldap.version>2.3.1.RELEASE</spring-ldap.version>
|
||||
<spring-context.version>4.3.6.RELEASE</spring-context.version>
|
||||
<apacheds.version>1.5.5</apacheds.version>
|
||||
<shared-ldap.version>0.9.15</shared-ldap.version>
|
||||
</properties>
|
||||
<properties>
|
||||
<spring-ldap.version>2.3.1.RELEASE</spring-ldap.version>
|
||||
<spring-context.version>4.3.6.RELEASE</spring-context.version>
|
||||
<apacheds.version>1.5.5</apacheds.version>
|
||||
<shared-ldap.version>0.9.15</shared-ldap.version>
|
||||
</properties>
|
||||
|
||||
<build>
|
||||
<finalName>spring-ldap</finalName>
|
||||
</build>
|
||||
<build>
|
||||
<finalName>spring-ldap</finalName>
|
||||
</build>
|
||||
|
||||
<dependencies>
|
||||
<dependencies>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.springframework.ldap</groupId>
|
||||
<artifactId>spring-ldap-core</artifactId>
|
||||
<version>${spring-ldap.version}</version>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>commons-logging</groupId>
|
||||
<artifactId>commons-logging</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.ldap</groupId>
|
||||
<artifactId>spring-ldap-core</artifactId>
|
||||
<version>${spring-ldap.version}</version>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>commons-logging</groupId>
|
||||
<artifactId>commons-logging</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>spring-context</artifactId>
|
||||
<version>${spring-context.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>spring-context</artifactId>
|
||||
<version>${spring-context.version}</version>
|
||||
</dependency>
|
||||
|
||||
<!-- spring ldap test -->
|
||||
<dependency>
|
||||
<groupId>org.springframework.ldap</groupId>
|
||||
<artifactId>spring-ldap-test</artifactId>
|
||||
<version>${spring-ldap.version}</version>
|
||||
<scope>test</scope>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<artifactId>commons-logging</artifactId>
|
||||
<groupId>commons-logging</groupId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
<!-- spring ldap test -->
|
||||
<dependency>
|
||||
<groupId>org.springframework.ldap</groupId>
|
||||
<artifactId>spring-ldap-test</artifactId>
|
||||
<version>${spring-ldap.version}</version>
|
||||
<scope>test</scope>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<artifactId>commons-logging</artifactId>
|
||||
<groupId>commons-logging</groupId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
|
||||
<!-- apacheds for test -->
|
||||
<dependency>
|
||||
<groupId>org.apache.directory.server</groupId>
|
||||
<artifactId>apacheds-core</artifactId>
|
||||
<version>${apacheds.version}</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.directory.server</groupId>
|
||||
<artifactId>apacheds-core-entry</artifactId>
|
||||
<version>${apacheds.version}</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.directory.server</groupId>
|
||||
<artifactId>apacheds-protocol-shared</artifactId>
|
||||
<version>${apacheds.version}</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.directory.server</groupId>
|
||||
<artifactId>apacheds-protocol-ldap</artifactId>
|
||||
<version>${apacheds.version}</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.directory.server</groupId>
|
||||
<artifactId>apacheds-server-jndi</artifactId>
|
||||
<version>${apacheds.version}</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.directory.shared</groupId>
|
||||
<artifactId>shared-ldap</artifactId>
|
||||
<version>${shared-ldap.version}</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<!-- apacheds for test -->
|
||||
<dependency>
|
||||
<groupId>org.apache.directory.server</groupId>
|
||||
<artifactId>apacheds-core</artifactId>
|
||||
<version>${apacheds.version}</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.directory.server</groupId>
|
||||
<artifactId>apacheds-core-entry</artifactId>
|
||||
<version>${apacheds.version}</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.directory.server</groupId>
|
||||
<artifactId>apacheds-protocol-shared</artifactId>
|
||||
<version>${apacheds.version}</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.directory.server</groupId>
|
||||
<artifactId>apacheds-protocol-ldap</artifactId>
|
||||
<version>${apacheds.version}</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.directory.server</groupId>
|
||||
<artifactId>apacheds-server-jndi</artifactId>
|
||||
<version>${apacheds.version}</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.directory.shared</groupId>
|
||||
<artifactId>shared-ldap</artifactId>
|
||||
<version>${shared-ldap.version}</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
|
||||
|
||||
<!-- Spring Data LDAP -->
|
||||
<dependency>
|
||||
<groupId>org.springframework.data</groupId>
|
||||
<artifactId>spring-data-ldap</artifactId>
|
||||
<version>1.0.6.RELEASE</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.data</groupId>
|
||||
<artifactId>spring-data-jpa</artifactId>
|
||||
<version>1.11.6.RELEASE</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<!-- Spring Data LDAP -->
|
||||
<dependency>
|
||||
<groupId>org.springframework.data</groupId>
|
||||
<artifactId>spring-data-ldap</artifactId>
|
||||
<version>1.0.6.RELEASE</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.data</groupId>
|
||||
<artifactId>spring-data-jpa</artifactId>
|
||||
<version>1.11.6.RELEASE</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<profiles>
|
||||
<profile>
|
||||
<id>live</id>
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-surefire-plugin</artifactId>
|
||||
<executions>
|
||||
<execution>
|
||||
<phase>integration-test</phase>
|
||||
<goals>
|
||||
<goal>test</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<excludes>
|
||||
<exclude>**/*IntegrationTest.java</exclude>
|
||||
</excludes>
|
||||
<includes>
|
||||
<include>**/*LiveTest.java</include>
|
||||
</includes>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</profile>
|
||||
</profiles>
|
||||
<profiles>
|
||||
<profile>
|
||||
<id>live</id>
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-surefire-plugin</artifactId>
|
||||
<executions>
|
||||
<execution>
|
||||
<phase>integration-test</phase>
|
||||
<goals>
|
||||
<goal>test</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<excludes>
|
||||
<exclude>**/*IntegrationTest.java</exclude>
|
||||
</excludes>
|
||||
<includes>
|
||||
<include>**/*LiveTest.java</include>
|
||||
</includes>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</profile>
|
||||
</profiles>
|
||||
</project>
|
|
@ -8,10 +8,10 @@ import org.springframework.stereotype.Repository;
|
|||
@Repository
|
||||
public interface UserRepository extends LdapRepository<User> {
|
||||
|
||||
public User findByUsername(String username);
|
||||
User findByUsername(String username);
|
||||
|
||||
public User findByUsernameAndPassword(String username, String password);
|
||||
User findByUsernameAndPassword(String username, String password);
|
||||
|
||||
public List<User> findByUsernameLikeIgnoreCase(String username);
|
||||
List<User> findByUsernameLikeIgnoreCase(String username);
|
||||
|
||||
}
|
||||
|
|
|
@ -2,7 +2,11 @@ package com.baeldung.ldap.data.service;
|
|||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.core.env.Environment;
|
||||
import org.springframework.ldap.core.*;
|
||||
import org.springframework.ldap.core.AttributesMapper;
|
||||
import org.springframework.ldap.core.ContextSource;
|
||||
import org.springframework.ldap.core.DirContextAdapter;
|
||||
import org.springframework.ldap.core.DirContextOperations;
|
||||
import org.springframework.ldap.core.LdapTemplate;
|
||||
import org.springframework.ldap.support.LdapNameBuilder;
|
||||
|
||||
import javax.naming.Name;
|
||||
|
@ -31,8 +35,8 @@ public class LdapClient {
|
|||
"ou=users",
|
||||
"cn=" + username,
|
||||
(AttributesMapper<String>) attrs -> (String) attrs
|
||||
.get("cn")
|
||||
.get());
|
||||
.get("cn")
|
||||
.get());
|
||||
}
|
||||
|
||||
public void create(final String username, final String password) {
|
||||
|
@ -43,7 +47,7 @@ public class LdapClient {
|
|||
.build();
|
||||
DirContextAdapter context = new DirContextAdapter(dn);
|
||||
|
||||
context.setAttributeValues("objectclass", new String[] { "top", "person", "organizationalPerson", "inetOrgPerson" });
|
||||
context.setAttributeValues("objectclass", new String[]{"top", "person", "organizationalPerson", "inetOrgPerson"});
|
||||
context.setAttributeValue("cn", username);
|
||||
context.setAttributeValue("sn", username);
|
||||
context.setAttributeValue("userPassword", digestSHA(password));
|
||||
|
@ -59,7 +63,7 @@ public class LdapClient {
|
|||
.build();
|
||||
DirContextOperations context = ldapTemplate.lookupContext(dn);
|
||||
|
||||
context.setAttributeValues("objectclass", new String[] { "top", "person", "organizationalPerson", "inetOrgPerson" });
|
||||
context.setAttributeValues("objectclass", new String[]{"top", "person", "organizationalPerson", "inetOrgPerson"});
|
||||
context.setAttributeValue("cn", username);
|
||||
context.setAttributeValue("sn", username);
|
||||
context.setAttributeValue("userPassword", digestSHA(password));
|
||||
|
|
|
@ -1,17 +1,17 @@
|
|||
package com.baeldung.ldap.data.service;
|
||||
|
||||
import java.security.MessageDigest;
|
||||
import java.security.NoSuchAlgorithmException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Base64;
|
||||
import java.util.List;
|
||||
|
||||
import com.baeldung.ldap.data.repository.User;
|
||||
import com.baeldung.ldap.data.repository.UserRepository;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.ldap.support.LdapUtils;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import com.baeldung.ldap.data.repository.User;
|
||||
import com.baeldung.ldap.data.repository.UserRepository;
|
||||
import java.security.MessageDigest;
|
||||
import java.security.NoSuchAlgorithmException;
|
||||
import java.util.Base64;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@Service
|
||||
public class UserService {
|
||||
|
@ -21,20 +21,18 @@ public class UserService {
|
|||
|
||||
public Boolean authenticate(final String username, final String password) {
|
||||
User user = userRepository.findByUsernameAndPassword(username, password);
|
||||
return user != null ? true : false;
|
||||
return user != null;
|
||||
}
|
||||
|
||||
public List<String> search(final String username) {
|
||||
List<User> userList = userRepository.findByUsernameLikeIgnoreCase(username);
|
||||
List<String> users = null;
|
||||
if (null != userList) {
|
||||
users = new ArrayList<String>();
|
||||
for (User user : userList) {
|
||||
users.add(user.getUsername());
|
||||
}
|
||||
if (userList == null) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
return users;
|
||||
|
||||
return userList.stream()
|
||||
.map(User::getUsername)
|
||||
.collect(Collectors.toList());
|
||||
}
|
||||
|
||||
public void create(final String username, final String password) {
|
||||
|
@ -48,7 +46,6 @@ public class UserService {
|
|||
User user = userRepository.findByUsername(username);
|
||||
user.setPassword(password);
|
||||
userRepository.save(user);
|
||||
|
||||
}
|
||||
|
||||
private String digestSHA(final String password) {
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
package com.baeldung.ldap.javaconfig;
|
||||
|
||||
import com.baeldung.ldap.client.LdapClient;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.ComponentScan;
|
||||
|
@ -11,13 +12,11 @@ import org.springframework.data.ldap.repository.config.EnableLdapRepositories;
|
|||
import org.springframework.ldap.core.LdapTemplate;
|
||||
import org.springframework.ldap.core.support.LdapContextSource;
|
||||
|
||||
import com.baeldung.ldap.client.LdapClient;
|
||||
|
||||
@Configuration
|
||||
@PropertySource("classpath:application.properties")
|
||||
@ComponentScan(basePackages = { "com.baeldung.ldap.*" })
|
||||
@ComponentScan(basePackages = {"com.baeldung.ldap.*"})
|
||||
@Profile("default")
|
||||
@EnableLdapRepositories(basePackages="com.baeldung.ldap.**")
|
||||
@EnableLdapRepositories(basePackages = "com.baeldung.ldap.**")
|
||||
public class AppConfig {
|
||||
|
||||
@Autowired
|
||||
|
|
|
@ -7,13 +7,13 @@
|
|||
</encoder>
|
||||
</appender>
|
||||
|
||||
<logger name="org.springframework" level="WARN" />
|
||||
<logger name="org.springframework.transaction" level="WARN" />
|
||||
<logger name="org.springframework" level="WARN"/>
|
||||
<logger name="org.springframework.transaction" level="WARN"/>
|
||||
|
||||
<!-- in order to debug some marshalling issues, this needs to be TRACE -->
|
||||
<logger name="org.springframework.web.servlet.mvc" level="WARN" />
|
||||
<logger name="org.springframework.web.servlet.mvc" level="WARN"/>
|
||||
|
||||
<root level="INFO">
|
||||
<appender-ref ref="STDOUT" />
|
||||
<appender-ref ref="STDOUT"/>
|
||||
</root>
|
||||
</configuration>
|
|
@ -1,7 +1,6 @@
|
|||
package com.baeldung.ldap.client;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import com.baeldung.ldap.javaconfig.TestConfig;
|
||||
import org.hamcrest.Matchers;
|
||||
import org.junit.Assert;
|
||||
import org.junit.Test;
|
||||
|
@ -13,11 +12,11 @@ import org.springframework.test.context.ContextConfiguration;
|
|||
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
|
||||
import org.springframework.test.context.support.AnnotationConfigContextLoader;
|
||||
|
||||
import com.baeldung.ldap.javaconfig.TestConfig;
|
||||
import java.util.List;
|
||||
|
||||
@RunWith(SpringJUnit4ClassRunner.class)
|
||||
@ActiveProfiles("testlive")
|
||||
@ContextConfiguration(classes = { TestConfig.class }, loader = AnnotationConfigContextLoader.class)
|
||||
@ContextConfiguration(classes = {TestConfig.class}, loader = AnnotationConfigContextLoader.class)
|
||||
public class LdapClientLiveTest {
|
||||
|
||||
private static final String USER2 = "TEST02";
|
||||
|
|
|
@ -1,10 +1,7 @@
|
|||
package com.baeldung.ldap.client;
|
||||
|
||||
import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assert.assertThat;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import com.baeldung.ldap.data.service.UserService;
|
||||
import com.baeldung.ldap.javaconfig.TestConfig;
|
||||
import org.hamcrest.Matchers;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
|
@ -14,12 +11,14 @@ import org.springframework.test.context.ContextConfiguration;
|
|||
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
|
||||
import org.springframework.test.context.support.AnnotationConfigContextLoader;
|
||||
|
||||
import com.baeldung.ldap.data.service.UserService;
|
||||
import com.baeldung.ldap.javaconfig.TestConfig;
|
||||
import java.util.List;
|
||||
|
||||
import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assert.assertThat;
|
||||
|
||||
@RunWith(SpringJUnit4ClassRunner.class)
|
||||
@ActiveProfiles("testlive")
|
||||
@ContextConfiguration(classes = { TestConfig.class }, loader = AnnotationConfigContextLoader.class)
|
||||
@ContextConfiguration(classes = {TestConfig.class}, loader = AnnotationConfigContextLoader.class)
|
||||
public class LdapDataRepositoryTest {
|
||||
|
||||
private static final String USER2 = "TEST02";
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
package com.baeldung.ldap.javaconfig;
|
||||
|
||||
import com.baeldung.ldap.client.LdapClient;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.ComponentScan;
|
||||
|
@ -13,12 +14,10 @@ import org.springframework.ldap.core.LdapTemplate;
|
|||
import org.springframework.ldap.core.support.LdapContextSource;
|
||||
import org.springframework.ldap.test.TestContextSourceFactoryBean;
|
||||
|
||||
import com.baeldung.ldap.client.LdapClient;
|
||||
|
||||
@Configuration
|
||||
@PropertySource("classpath:test_application.properties")
|
||||
@ComponentScan(basePackages = { "com.baeldung.ldap.*" })
|
||||
@EnableLdapRepositories(basePackages="com.baeldung.ldap.**")
|
||||
@ComponentScan(basePackages = {"com.baeldung.ldap.*"})
|
||||
@EnableLdapRepositories(basePackages = "com.baeldung.ldap.**")
|
||||
@Profile("testlive")
|
||||
public class TestConfig {
|
||||
@Autowired
|
||||
|
|
Loading…
Reference in New Issue