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

Polish "Add Docker Compose service connection support for OpenLDAP"

Browse Source 
See gh-39258
This commit is contained in:
Scott Frederick
2024-01-22 16:33:59 -06:00
parent eb940c3907
commit bee6fe899c
13 changed files with 56 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ldap/LdapAutoConfiguration.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2023 the original author or authors.
* Copyright 2012-2024 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.

10
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ldap/LdapConnectionDetails.java
View File

@@ -19,7 +19,7 @@ package org.springframework.boot.autoconfigure.ldap;
import org.springframework.boot.autoconfigure.service.connection.ConnectionDetails;
/**
* Details required to establish a connection to a Ldap service.
* Details required to establish a connection to an LDAP service.
*
* @author Philipp Kessler
* @since 3.3.0
@@ -28,13 +28,13 @@ public interface LdapConnectionDetails extends ConnectionDetails {
/**
* LDAP URLs of the server.
* @return list of the LDAP urls to use
* @return the LDAP URLs to use
*/
String[] getUrls();
/**
* Base suffix from which all operations should originate.
* @return base suffix from which all operations should originate or null.
* @return base suffix
*/
default String getBase() {
return null;
@@ -42,7 +42,7 @@ public interface LdapConnectionDetails extends ConnectionDetails {
/**
* Login username of the server.
* @return login username of the server or null.
* @return login username
*/
default String getUsername() {
return null;
@@ -50,7 +50,7 @@ public interface LdapConnectionDetails extends ConnectionDetails {
/**
* Login password of the server.
* @return login password of the server or null.
* @return login password
*/
default String getPassword() {
return null;

4
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ldap/LdapAutoConfigurationTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2023 the original author or authors.
* Copyright 2012-2024 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.
@@ -119,7 +119,7 @@ class LdapAutoConfigurationTests {
}
@Test
void shouldUseCustomConnectionDetailsWhenDefined() {
void usesCustomConnectionDetailsWhenDefined() {
this.contextRunner.withUserConfiguration(ConnectionDetailsConfiguration.class).run((context) -> {
assertThat(context).hasSingleBean(LdapContextSource.class)
.hasSingleBean(LdapConnectionDetails.class)