fix typo in property name

zzg · Jan 15, 2018 · 4dc2fc4 · 4dc2fc4
1 parent 65ca39b
commit 4dc2fc4
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 16 deletions.
diff --git a/...ain/java/org/apereo/cas/configuration/model/core/authentication/HttpClientProperties.java b/...ain/java/org/apereo/cas/configuration/model/core/authentication/HttpClientProperties.java
@@ -56,7 +56,7 @@ public class HttpClientProperties implements Serializable {
      * Whether the regular expression specified with {@code authorityValidationRegEx} should be handled as case-sensitive
      * ({@code true}) or case-insensitive ({@code false}). If no {@code authorityValidationRegEx} is set, this value does not have any effect.
      */
-    private boolean authorityValidationRegExCaseSensitiv = true;
+    private boolean authorityValidationRegExCaseSensitive = true;
 
     public String getHostNameVerifier() {
         return hostNameVerifier;
@@ -114,12 +114,12 @@ public void setAuthorityValidationRegEx(final String authorityValidationRegEx) {
         this.authorityValidationRegEx = authorityValidationRegEx;
     }
 
-    public boolean isAuthorityValidationRegExCaseSensitiv() {
-        return this.authorityValidationRegExCaseSensitiv;
+    public boolean isAuthorityValidationRegExCaseSensitive() {
+        return this.authorityValidationRegExCaseSensitive;
     }
 
-    public void setAuthorityValidationRegExCaseSensitiv(final boolean authorityValidationRegExCaseSensitiv) {
-        this.authorityValidationRegExCaseSensitiv = authorityValidationRegExCaseSensitiv;
+    public void setAuthorityValidationRegExCaseSensitive(final boolean authorityValidationRegExCaseSensitive) {
+        this.authorityValidationRegExCaseSensitive = authorityValidationRegExCaseSensitive;
     }
 
     public static class Truststore implements Serializable {

diff --git a/build.gradle b/build.gradle
@@ -42,6 +42,7 @@ buildscript {
     dependencies {
         classpath "org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion"
         classpath "com.netflix.nebula:gradle-lint-plugin:8.3.1"
+        classpath "io.franzbecker:gradle-lombok:1.11"
         classpath 'com.github.ben-manes:gradle-versions-plugin:0.17.0'
         classpath "io.spring.gradle:propdeps-plugin:0.0.10.RELEASE"
         classpath "org.ajoberstar:grgit:2.1.0"
@@ -118,6 +119,7 @@ subprojects {
         apply plugin: "net.ltgt.errorprone"
     }
     apply plugin: "checkstyle"
+    apply plugin: "io.franzbecker.gradle-lombok"
     apply plugin: "findbugs"
     apply plugin: "propdeps"
     apply plugin: "propdeps-maven"
@@ -226,6 +228,11 @@ subprojects {
         project.buildDate != null || !project.buildJarFile.exists()
     }
 
+    lombok {
+        version = "$lombokVersion"
+        sha256 = ""
+    }
+
     jar {
         manifest {
             attributes("Implementation-Title": project.name,

diff --git a/.../src/test/java/org/apereo/cas/logout/DefaultSingleLogoutServiceLogoutUrlBuilderTests.java b/.../src/test/java/org/apereo/cas/logout/DefaultSingleLogoutServiceLogoutUrlBuilderTests.java
@@ -103,9 +103,9 @@ private DefaultSingleLogoutServiceLogoutUrlBuilder createDefaultSingleLogoutServ
     }
 
     private DefaultSingleLogoutServiceLogoutUrlBuilder createDefaultSingleLogoutServiceLogoutUrlBuilder(final boolean allowLocalLogoutUrls, 
-            final String authorityValidationRegEx, final boolean authorityValidationRegExCaseSensitiv) throws Exception{
+            final String authorityValidationRegEx, final boolean authorityValidationRegExCaseSensitive) throws Exception{
         final UrlValidator validator = new SimpleUrlValidatorFactoryBean(allowLocalLogoutUrls, authorityValidationRegEx, 
-            authorityValidationRegExCaseSensitiv).getObject();
+            authorityValidationRegExCaseSensitive).getObject();
         return new DefaultSingleLogoutServiceLogoutUrlBuilder(validator);
     }
 

diff --git a/...s-server-core-web-api/src/main/java/org/apereo/cas/web/SimpleUrlValidatorFactoryBean.java b/...s-server-core-web-api/src/main/java/org/apereo/cas/web/SimpleUrlValidatorFactoryBean.java
@@ -26,18 +26,18 @@ public SimpleUrlValidatorFactoryBean(final boolean allowLocalUrls) {
     }
 
     public SimpleUrlValidatorFactoryBean(final boolean allowLocalUrls, final String authorityValidationRegEx, 
-        final boolean authorityValidationRegExCaseSensitiv) {
+        final boolean authorityValidationRegExCaseSensitive) {
         this.allowLocalUrls = allowLocalUrls;
-        this.urlValidatorWithRegex = createUrlValidatorWithRegex(allowLocalUrls, authorityValidationRegEx, authorityValidationRegExCaseSensitiv);
+        this.urlValidatorWithRegex = createUrlValidatorWithRegex(allowLocalUrls, authorityValidationRegEx, authorityValidationRegExCaseSensitive);
     }
 
     private UrlValidator createUrlValidatorWithRegex(final boolean allowLocalUrls, final String authorityValidationRegEx, 
-        final boolean authorityValidationRegExCaseSensitiv) {
+        final boolean authorityValidationRegExCaseSensitive) {
         if (StringUtils.isEmpty(authorityValidationRegEx)) {
             return null;
         }
 
-        final RegexValidator authorityValidator = new RegexValidator(authorityValidationRegEx, authorityValidationRegExCaseSensitiv);
+        final RegexValidator authorityValidator = new RegexValidator(authorityValidationRegEx, authorityValidationRegExCaseSensitive);
         final long options = allowLocalUrls ? UrlValidator.ALLOW_LOCAL_URLS : 0;
         return new UrlValidator(authorityValidator, options);
     }

diff --git a/core/cas-server-core-web/src/main/java/org/apereo/cas/config/CasCoreWebConfiguration.java b/core/cas-server-core-web/src/main/java/org/apereo/cas/config/CasCoreWebConfiguration.java
@@ -4,6 +4,7 @@
 import org.apereo.cas.authentication.principal.ServiceFactoryConfigurer;
 import org.apereo.cas.authentication.principal.WebApplicationService;
 import org.apereo.cas.configuration.CasConfigurationProperties;
+import org.apereo.cas.configuration.model.core.authentication.HttpClientProperties;
 import org.apereo.cas.configuration.model.core.web.MessageBundleProperties;
 import org.apereo.cas.web.SimpleUrlValidatorFactoryBean;
 import org.apereo.cas.web.UrlValidator;
@@ -89,9 +90,10 @@ public ArgumentExtractor argumentExtractor(final List<ServiceFactoryConfigurer>
 
     @Bean
     public FactoryBean<UrlValidator> urlValidator() {
-        final boolean allowLocalLogoutUrls = this.casProperties.getHttpClient().isAllowLocalLogoutUrls();
-        final String authorityValidationRegEx = this.casProperties.getHttpClient().getAuthorityValidationRegEx();
-        final boolean authorityValidationRegExCaseSensitiv = this.casProperties.getHttpClient().isAuthorityValidationRegExCaseSensitiv();
-        return new SimpleUrlValidatorFactoryBean(allowLocalLogoutUrls, authorityValidationRegEx, authorityValidationRegExCaseSensitiv);
+        final HttpClientProperties httpClient = this.casProperties.getHttpClient();
+        final boolean allowLocalLogoutUrls = httpClient.isAllowLocalLogoutUrls();
+        final String authorityValidationRegEx = httpClient.getAuthorityValidationRegEx();
+        final boolean authorityValidationRegExCaseSensitive = httpClient.isAuthorityValidationRegExCaseSensitive();
+        return new SimpleUrlValidatorFactoryBean(allowLocalLogoutUrls, authorityValidationRegEx, authorityValidationRegExCaseSensitive);
     }
 }
diff --git a/docs/cas-server-documentation/installation/Configuration-Properties.md b/docs/cas-server-documentation/installation/Configuration-Properties.md
@@ -2909,7 +2909,7 @@ a local truststore is provided by CAS to improve portability of configuration ac
 # cas.httpClient.hostnameVerifier=NONE|DEFAULT
 # cas.httpClient.allowLocalLogoutUrls=false
 # cas.httpClient.authorityValidationRegEx=
-# cas.httpClient.authorityValidationRegExCaseSensitiv=true
+# cas.httpClient.authorityValidationRegExCaseSensitive=true
 
 # cas.httpClient.truststore.psw=changeit
 # cas.httpClient.truststore.file=classpath:/truststore.jks

diff --git a/gradle.properties b/gradle.properties
@@ -33,6 +33,7 @@ sourceCompatibility=1.8
 targetCompatibility=1.8
 kotlinVersion=1.2.10
 kotlin.incremental=true
+lombokVersion=1.16.20
 
 #################################################################################
 # A number of dependency versions are defined in gradle/overrides.gradle file

diff --git a/lombok.config b/lombok.config
@@ -0,0 +1,2 @@
+lombok.log.fieldName=LOGGER
+config.stopBubbling=true
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		lombok.log.fieldName=LOGGER
		config.stopBubbling=true