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

Polish contribution

Browse Source 
Closes gh-8195
This commit is contained in:
Stephane Nicoll
2017-02-20 14:03:07 +01:00
parent fa8f0a6136
commit 43a534f4ca
4 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ldap/embedded/EmbeddedLdapAutoConfiguration.java
View File

@@ -113,15 +113,17 @@ public class EmbeddedLdapAutoConfiguration {
if (!this.embeddedProperties.getValidation().isEnabled()) {
config.setSchema(null);
}
else if (this.embeddedProperties.getValidation().getSchema() != null) {
Resource schemaLocation = this.embeddedProperties.getValidation().getSchema();
try {
config.setSchema(Schema.mergeSchemas(Schema.getDefaultStandardSchema(),
Schema.getSchema(schemaLocation.getFile())));
}
catch (Exception ex) {
throw new IllegalStateException(
"Unable to load schema " + schemaLocation.getDescription(), ex);
else {
Resource schema = this.embeddedProperties.getValidation().getSchema();
if (schema != null) {
try {
config.setSchema(Schema.mergeSchemas(Schema.getDefaultStandardSchema(),
Schema.getSchema(schema.getInputStream())));
}
catch (Exception ex) {
throw new IllegalStateException(
"Unable to load schema " + schema.getDescription(), ex);
}
}
}

10
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ldap/embedded/EmbeddedLdapProperties.java
View File

@@ -50,7 +50,7 @@ public class EmbeddedLdapProperties {
private String ldif = "classpath:schema.ldif";
/**
* Schema validation
* Schema validation.
*/
private Validation validation = new Validation();
@@ -90,7 +90,7 @@ public class EmbeddedLdapProperties {
return this.validation;
}
static class Credential {
public static class Credential {
/**
* Embedded LDAP username.
@@ -120,15 +120,15 @@ public class EmbeddedLdapProperties {
}
static class Validation {
public static class Validation {
/**
* Enable LDAP schema validation
* Enable LDAP schema validation.
*/
private boolean enabled = true;
/**
* Path to the custom schema file
* Path to the custom schema.
*/
private Resource schema;