Skip to content

Commit

Permalink
Merge pull request #263 from dngzs/hotfix/springboot_autoconfig
Browse files Browse the repository at this point in the history
[SHIRO-797] Shiro 1.7.0 is lower than using springboot version 2.0.7 dependency error
  • Loading branch information
fpapon authored Nov 10, 2020
2 parents 04a5eee + 9a2de16 commit c0ff831
Show file tree
Hide file tree
Showing 3 changed files with 85 additions and 1 deletion.
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you 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.apache.shiro.spring.boot.autoconfigure

import org.junit.Test

import static org.hamcrest.MatcherAssert.assertThat
import static org.hamcrest.Matchers.matchesPattern
import static org.hamcrest.Matchers.not

class SpringFactoriesTest {

@Test
void springFactoriesConfigContainsNoWhitespace() {
Properties props = new Properties()
props.load(new FileReader("src/main/resources/META-INF/spring.factories"))
assertNoWhitespaceInEntries(props)
}

static private assertNoWhitespaceInEntries(Properties props) {
props.each{ key, val ->
assertThat "Property [${key}] contains whitespace",
props.get("org.springframework.boot.autoconfigure.EnableAutoConfiguration"), not(matchesPattern(".*\\s.*"))
}
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration = \
org.apache.shiro.spring.config.web.autoconfigure.ShiroWebAutoConfiguration,\
org.apache.shiro.spring.config.web.autoconfigure.ShiroWebFilterConfiguration, \
org.apache.shiro.spring.config.web.autoconfigure.ShiroWebFilterConfiguration,\
org.apache.shiro.spring.config.web.autoconfigure.ShiroWebMvcAutoConfiguration
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you 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.apache.shiro.spring.boot.autoconfigure.web

import org.junit.Test

import static org.hamcrest.MatcherAssert.assertThat
import static org.hamcrest.Matchers.matchesPattern
import static org.hamcrest.Matchers.not

class WebSpringFactoriesTest {

@Test
void springFactoriesConfigContainsNoWhitespace() {
Properties props = new Properties()
props.load(new FileReader("src/main/resources/META-INF/spring.factories"))
assertNoWhitespaceInEntries(props)
}

static private assertNoWhitespaceInEntries(Properties props) {
props.each{ key, val ->
assertThat "Property [${key}] contains whitespace",
props.get("org.springframework.boot.autoconfigure.EnableAutoConfiguration"), not(matchesPattern(".*\\s.*"))
}
}
}

0 comments on commit c0ff831

Please sign in to comment.