Release 5.0.6.RELEASE

Update to Spring Framework 5.0.7
Fixes: gh-5425
2026-09-05 00:41:22 +00:00 · 2018-06-12 21:23:02 -05:00 · 2018-06-12 16:51:01 -05:00 · 2018-06-12 16:50:52 -05:00 · 2018-06-12 16:50:48 -05:00 · 2018-06-12 16:50:42 -05:00
6153 changed files with 42638 additions and 283551 deletions
@@ -1,22 +1,17 @@
 # EditorConfig for Spring Security
 # see https://github.com/spring-projects/spring-security/blob/master/CONTRIBUTING.md#mind-the-whitespace

+# top-most EditorConfig file
 root = true

+# Unix-style newlines with a newline ending every file
 [*]
 end_of_line = lf
-trim_trailing_whitespace = true
 insert_final_newline = true
-max_line_length = 120
+charset = latin1

-[*.{java,xml}]
+# 4 tabs indentation
 indent_style = tab
-indent_size = 4
-charset = utf-8
-continuation_indent_size = 8
+tab_width = 4

-ij_smart_tabs = false
-ij_java_align_multiline_parameters = false
-
-[*.gradle]
-indent_style = tab
+trim_trailing_whitespace = true
@@ -1,10 +0,0 @@
-
-### Complete and Minimal Sample
-
-It would be very helpful if you could provide a complete and minimal sample that reproduces the issue and share it via a GitHub repository. This will allow us to efficiently troubleshoot and help resolve the issue. The sample should contain the minimum amount of code to reproduce the issue along with detailed steps on how to reproduce. Please see the following references for what a complete and minimal sample should consist of.
-
- https://stackoverflow.com/help/mcve
-
-### Post questions on StackOverflow not GitHub
-
-Thanks for getting in touch, but it feels like this is a question that would be better suited to [Stack Overflow](https://stackoverflow.com/). As mentioned in [the guidelines for contributing](https://github.com/spring-projects/spring-security/blob/master/CONTRIBUTING.md#using-github-issues), we prefer to use GitHub issues only for bugs and enhancements. Feel free to update this issue with a link to the re-posted question (so that other people can find it) or add some more details if you feel this is a genuine bug.
@@ -1,7 +1,3 @@
-<!--
-For Security Vulnerabilities, please use https://pivotal.io/security#reporting
-->
-
 ### Summary

 <!-- 
@@ -1,9 +1,3 @@
 <!--
-For Security Vulnerabilities, please use https://pivotal.io/security#reporting
-->
-
-<!--
-Before creating new features, we recommend creating an issue to discuss the feature. This ensures that everyone is on the same page before extensive work is done.
-
-Thanks for contributing to Spring Security. Please provide a brief description of your pull-request and reference any related issue numbers (prefix references with gh-).
+Thanks for contributing to Spring Security. Please provide a brief description of your pull-request and reference any related issue numbers (prefix references with #).
 -->
@@ -1,22 +0,0 @@
-name: PR Build
-
-on: pull_request
-
-jobs:
-  build:
-    name: Build
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK
-        uses: actions/setup-java@v1
-        with:
-          java-version: '8'
-      - name: Cache Gradle packages
-        uses: actions/cache@v2
-        with:
-          path: ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
-      - name: Build with Gradle
-        run: ./gradlew clean build --continue
@@ -8,7 +8,7 @@ target/
 .project
 .DS_Store
 .settings/
-.idea/*
+.idea/
 out/
 bin/
 intellij/
@@ -23,8 +23,3 @@ atlassian-ide-plugin.xml
 !etc/eclipse/.checkstyle
 .checkstyle
 s101plugin.state
-.attach_pid*
-.~lock.*#
-
-!.idea/checkstyle-idea.xml
-!.idea/externalDependencies.xml
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CheckStyle-IDEA">
-    <option name="configuration">
-      <map>
-        <entry key="active-configuration" value="PROJECT_RELATIVE:$PROJECT_DIR$/etc/checkstyle/checkstyle.xml:spring-security" />
-        <entry key="checkstyle-version" value="8.14" />
-        <entry key="copy-libs" value="false" />
-        <entry key="location-0" value="BUNDLED:(bundled):Sun Checks" />
-        <entry key="location-1" value="BUNDLED:(bundled):Google Checks" />
-        <entry key="location-2" value="PROJECT_RELATIVE:$PROJECT_DIR$/etc/checkstyle/checkstyle.xml:spring-security" />
-        <entry key="property-2.config_loc" value="$PROJECT_DIR$/etc/checkstyle" />
-        <entry key="scan-before-checkin" value="false" />
-        <entry key="scanscope" value="JavaOnlyWithTests" />
-        <entry key="suppress-errors" value="false" />
-      </map>
-    </option>
-  </component>
-</project>
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ExternalDependencies">
-    <plugin id="CheckStyle-IDEA" />
-    <plugin id="org.jetbrains.plugins.gradle" />
-  </component>
-</project>
@@ -0,0 +1,16 @@
+language: java
+
+jdk:
+  - oraclejdk8
+
+os:
+  - linux
+
+before_cache:
+  - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
+cache:
+  directories:
+    - $HOME/.gradle/caches/
+    - $HOME/.gradle/wrapper/
+
+script: ./gradlew build --refresh-dependencies --no-daemon --continue
@@ -40,5 +40,5 @@ appropriate to the circumstances. Maintainers are obligated to maintain confiden
 with regard to the reporter of an incident.

 This Code of Conduct is adapted from the
-https://contributor-covenant.org[Contributor Covenant], version 1.3.0, available at
-https://contributor-covenant.org/version/1/3/0/[contributor-covenant.org/version/1/3/0/]
+http://contributor-covenant.org[Contributor Covenant], version 1.3.0, available at
+http://contributor-covenant.org/version/1/3/0/[contributor-covenant.org/version/1/3/0/]
@@ -8,11 +8,11 @@ By participating, you  are expected to uphold this code. Please report unaccepta

 # Similar but different

-Each Spring module is slightly different than another in terms of team size, number of issues, etc. Therefore each project is managed slightly different. You will notice that this document is very similar to the [Spring Framework Contributor guidelines](https://github.com/spring-projects/spring-framework/wiki/Contributor-guidelines). However, there are some subtle differences between the two documents, so please be sure to read this document thoroughly.
+Each Spring module is slightly different than another in terms of team size, number of issues, etc. Therefore each project is managed slightly different. You will notice that this document is very similar to the [Spring Framework Contributor guidelines](https://github.com/SpringSource/spring-framework/wiki/Contributor-guidelines). However, there are some subtle differences between the two documents, so please be sure to read this document thoroughly.

 # Importing into IDE

-The following provides information on setting up a development environment that can run the sample in [Spring Tool Suite 3.6.0+](https://www.springsource.org/sts). Other IDE's should work using Gradle's IDE support, but have not been tested.
+The following provides information on setting up a development environment that can run the sample in [Spring Tool Suite 3.6.0+](http://www.springsource.org/sts). Other IDE's should work using Gradle's IDE support, but have not been tested.

 * IDE Setup
  * Install Spring Tool Suite 3.6.0+
@@ -25,7 +25,7 @@ The following provides information on setting up a development environment that
 As of new versions of Spring Tool Suite, you might need to install Groovy Eclipse pointing directly to the updates plugin location. To install Groovy Eclipse on Spring Tool Suite based on Eclipse Oxigen you must do the following steps:

 Help->Install New Software...->Add the following URL into _Work with_ field:
-https://dist.springsource.org/snapshot/GRECLIPSE/e4.7/
+http://dist.springsource.org/snapshot/GRECLIPSE/e4.7/

 # Understand the basics 
 Not sure what a pull request is, or how to submit one? Take a look at GitHub's excellent [help documentation first](https://help.github.com/articles/using-pull-requests).
@@ -33,18 +33,6 @@ Not sure what a pull request is, or how to submit one? Take a look at GitHub's e
 # Search GitHub issues; create an issue if necessary
 Is there already an issue that addresses your concern? Do a bit of searching in our [GitHub issues ](https://github.com/spring-projects/spring-security/issues) to see if you can find something similar. If not, please create a new issue before submitting a pull request unless the change is not a user facing issue.

-# Using GitHub Issues
-We use GitHub issues to track bugs and enhancements.
-If you have a general usage question please ask on [Stack Overflow](https://stackoverflow.com).
-The Spring Security team and the broader community monitor the [`spring-security`](https://stackoverflow.com/tags/spring-security) tag.
-
-If you are reporting a bug, please help to speed up problem diagnosis by providing as much
-information as possible. Ideally, that would include a small
-[sample project](https://github.com/spring-projects/spring-boot-issues) that reproduces the
-problem.
-
-
-
 # Discuss non-trivial contribution ideas with committers
 If you're considering anything more than correcting a typo or fixing a minor bug, please discuss it on the [Spring Security Gitter](https://gitter.im/spring-projects/spring-security) before submitting a pull request. We're happy to provide guidance but please spend an hour or two researching the subject on your own including searching the forums for prior discussions.

@@ -59,7 +47,7 @@ Create your topic branch to be submitted as a pull request from master. The Spri
 # Use short branch names
 Branches used when submitting pull requests should preferably be named according to GitHub issues, e.g. 'gh-1234' or 'gh-1234-fix-npe'. Otherwise, use succinct, lower-case, dash (-) delimited names, such as 'fix-warnings', 'fix-typo', etc. This is important, because branch names show up in the merge commits that result from accepting pull requests, and should be as expressive and concise as possible.

-# Keep commits focused
+#Keep commits focused

 Remember each ticket should be focused on a single item of interest since the tickets are used to produce the changelog. Since each commit should be tied to a single GitHub issue, ensure that your commits are focused. For example, do not include an update to a transitive library in your commit unless the GitHub is to update the library. Reviewing your commits is essential before sending a pull request.

@@ -72,12 +60,12 @@ Please carefully follow the whitespace and formatting conventions already presen
 1. Aim to wrap code at 120 characters, but favor readability over wrapping
 1. Preserve existing formatting; i.e. do not reformat code for its own sake
 1. Search the codebase using git grep and other tools to discover common naming conventions, etc.
-1. UTF-8 encoding for Java sources
+1. Latin-1 (ISO-8859-1) encoding for Java sources; use native2ascii to convert if necessary

 Whitespace management tips

-1. You can use the [AnyEdit Eclipse plugin](https://marketplace.eclipse.org/content/anyedit-tools) to ensure spaces are used and to clean up trailing whitespaces.
-1. Use git's pre-commit.sample hook to prevent invalid whitespace from being pushed out. You can enable it by moving ~/spring-security/.git/hooks/pre-commit.sample to ~/spring-security/.git/hooks/pre-commit and ensuring it is executable. For more information on hooks refer to [Pro Git's Pre-Commit Hook's section](https://git-scm.com/book/cs/ch7-3.html)
+1. You can use the [AnyEdit Eclipse plugin](http://marketplace.eclipse.org/content/anyedit-tools) to ensure spaces are used and to clean up trailing whitespaces.
+1. Use git's pre-commit.sample hook to prevent invalid whitespace from being pushed out. You can enable it by moving ~/spring-security/.git/hooks/pre-commit.sample to ~/spring-security/.git/hooks/pre-commit and ensuring it is executable. For more information on hooks refer to [Pro Git's Pre-Commit Hook's section](http://git-scm.com/book/cs/ch7-3.html)

 # Add Apache license header to all new classes

@@ -89,7 +77,7 @@ Whitespace management tips
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -128,7 +116,7 @@ Search the codebase to find related unit tests and add additional `@Test` method
 2. New test methods should not start with test. This is an old JUnit3 convention and is not necessary since the method is annotated with @Test.

 # Update spring-security-x.y.rnc for schema changes
-Update the [RELAX NG](https://relaxng.org/) schema `spring-security-x.y.rnc` instead of `spring-security-x.y.xsd` if you contribute changes to supported XML configuration. The XML schema file can be generated the following Gradle task:
+Update the [RELAX NG](http://www.relaxng.org) schema `spring-security-x.y.rnc` instead of `spring-security-x.y.xsd` if you contribute changes to supported XML configuration. The XML schema file can be generated the following Gradle task:

 <pre>
 ./gradlew spring-security-config:rncToXsd
@@ -137,7 +125,7 @@ Update the [RELAX NG](https://relaxng.org/) schema `spring-security-x.y.rnc` ins
 Changes to the XML schema will be overwritten by the Gradle build task.

 # Squash commits
-Use `git rebase --interactive`, `git add --patch` and other tools to "squash" multiple commits into atomic changes. In addition to the man pages for git, there are many resources online to help you understand how these tools work. Here from the [Git SCM Book](https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History).
+Use git rebase --interactive, git add --patch and other tools to "squash" multiple commits into atomic changes. In addition to the man pages for git, there are many resources online to help you understand how these tools work. Here is one: http://book.git-scm.com/4_interactive_rebasing.html.

 # Use real name in git commits
 Please configure git to use your real first and last name for any commits you intend to submit as pull requests. For example, this is not acceptable:
@@ -192,7 +180,6 @@ Fixes gh-123
 2. Do not end the subject line with a period
 3. In the body of the commit message, explain how things worked before this commit, what has changed, and how things work now
 3. Include Fixes gh-<issue-number> at the end if this fixes a GitHub issue  
-5. Avoid markdown, including back-ticks identifying code

 # Run all tests prior to submission

@@ -13,16 +13,13 @@ try {
 		stage('Check') {
 			node {
 				checkout scm
-				sh "git clean -dfx"
 				try {
-					withEnv(["JAVA_HOME=${ tool 'jdk8' }"]) {
-						sh "./gradlew clean check  --refresh-dependencies --no-daemon --stacktrace"
-					}
+					sh "./gradlew clean check  --refresh-dependencies --no-daemon --stacktrace"
 				} catch(Exception e) {
 					currentBuild.result = 'FAILED: check'
 					throw e
 				} finally {
-					junit '**/build/test-results/*/*.xml'
+					junit '**/build/*-results/*.xml'
 				}
 			}
 		}
@@ -31,16 +28,9 @@ try {
 		stage('Sonar') {
 			node {
 				checkout scm
-				sh "git clean -dfx"
 				withCredentials([string(credentialsId: 'spring-sonar.login', variable: 'SONAR_LOGIN')]) {
 					try {
-						withEnv(["JAVA_HOME=${ tool 'jdk8' }"]) {
-							if ("master" == env.BRANCH_NAME) {
-								sh "./gradlew sonarqube -PexcludeProjects='**/samples/**' -Dsonar.host.url=$SPRING_SONAR_HOST_URL -Dsonar.login=$SONAR_LOGIN --refresh-dependencies --no-daemon --stacktrace"
-							} else {
-								sh "./gradlew sonarqube -PexcludeProjects='**/samples/**' -Dsonar.projectKey='spring-security-${env.BRANCH_NAME}' -Dsonar.projectName='spring-security-${env.BRANCH_NAME}' -Dsonar.host.url=$SPRING_SONAR_HOST_URL -Dsonar.login=$SONAR_LOGIN --refresh-dependencies --no-daemon --stacktrace"
-							}
-						}
+						sh "./gradlew clean sonarqube -PexcludeProjects='**/samples/**' -Dsonar.host.url=$SPRING_SONAR_HOST_URL -Dsonar.login=$SONAR_LOGIN --refresh-dependencies --no-daemon --stacktrace"
 					} catch(Exception e) {
 						currentBuild.result = 'FAILED: sonar'
 						throw e
@@ -49,82 +39,17 @@ try {
 			}
 		}
 	},
-	snapshots: {
-		stage('Snapshot Tests') {
+	springio: {
+		stage('Spring IO') {
 			node {
 				checkout scm
-				sh "git clean -dfx"
 				try {
-					withEnv(["JAVA_HOME=${ tool 'jdk8' }"]) {
-						sh "./gradlew clean test -PforceMavenRepositories=snapshot -PspringVersion='5.2.+' -PreactorVersion=Dysprosium-BUILD-SNAPSHOT -PspringDataVersion=Lovelace-BUILD-SNAPSHOT -PlocksDisabled --refresh-dependencies --no-daemon --stacktrace"
-					}
+					sh "./gradlew clean springIoCheck -PplatformVersion=Cairo-BUILD-SNAPSHOT -PexcludeProjects='**/samples/**' --refresh-dependencies --no-daemon --stacktrace"
 				} catch(Exception e) {
-					currentBuild.result = 'FAILED: snapshots'
-					throw e
-				}
-			}
-		}
-	},
-	jdk9: {
-		stage('JDK 9') {
-			node {
-				checkout scm
-				sh "git clean -dfx"
-				try {
-					withEnv(["JAVA_HOME=${ tool 'jdk9' }"]) {
-						sh "./gradlew clean test --refresh-dependencies --no-daemon --stacktrace"
-					}
-				} catch(Exception e) {
-					currentBuild.result = 'FAILED: jdk9'
-					throw e
-				}
-			}
-		}
-	},
-	jdk10: {
-		stage('JDK 10') {
-			node {
-				checkout scm
-				sh "git clean -dfx"
-				try {
-					withEnv(["JAVA_HOME=${ tool 'jdk10' }"]) {
-						sh "./gradlew clean test --refresh-dependencies --no-daemon --stacktrace"
-					}
-				} catch(Exception e) {
-					currentBuild.result = 'FAILED: jdk10'
-					throw e
-				}
-			}
-		}
-	},
-	jdk11: {
-		stage('JDK 11') {
-			node {
-				checkout scm
-				sh "git clean -dfx"
-				try {
-					withEnv(["JAVA_HOME=${ tool 'jdk11' }"]) {
-						sh "./gradlew clean test --refresh-dependencies --no-daemon --stacktrace"
-					}
-				} catch(Exception e) {
-					currentBuild.result = 'FAILED: jdk11'
-					throw e
-				}
-			}
-		}
-	},
-	jdk12: {
-		stage('JDK 12') {
-			node {
-				checkout scm
-				sh "git clean -dfx"
-				try {
-					withEnv(["JAVA_HOME=${ tool 'openjdk12' }"]) {
-						sh "./gradlew clean test --refresh-dependencies --no-daemon --stacktrace"
-					}
-				} catch(Exception e) {
-					currentBuild.result = 'FAILED: jdk12'
+					currentBuild.result = 'FAILED: springio'
 					throw e
+				} finally {
+					junit '**/build/spring-io*-results/*.xml'
 				}
 			}
 		}
@@ -135,14 +60,11 @@ try {
 			stage('Deploy Artifacts') {
 				node {
 					checkout scm
-					sh "git clean -dfx"
 					withCredentials([file(credentialsId: 'spring-signing-secring.gpg', variable: 'SIGNING_KEYRING_FILE')]) {
 						withCredentials([string(credentialsId: 'spring-gpg-passphrase', variable: 'SIGNING_PASSWORD')]) {
 							withCredentials([usernamePassword(credentialsId: 'oss-token', passwordVariable: 'OSSRH_PASSWORD', usernameVariable: 'OSSRH_USERNAME')]) {
 								withCredentials([usernamePassword(credentialsId: '02bd1690-b54f-4c9f-819d-a77cb7a9822c', usernameVariable: 'ARTIFACTORY_USERNAME', passwordVariable: 'ARTIFACTORY_PASSWORD')]) {
-									withEnv(["JAVA_HOME=${ tool 'jdk8' }"]) {
-										sh "./gradlew deployArtifacts finalizeDeployArtifacts -Psigning.secretKeyRingFile=$SIGNING_KEYRING_FILE -Psigning.keyId=$SPRING_SIGNING_KEYID -Psigning.password='$SIGNING_PASSWORD' -PossrhUsername=$OSSRH_USERNAME -PossrhPassword=$OSSRH_PASSWORD -PartifactoryUsername=$ARTIFACTORY_USERNAME -PartifactoryPassword=$ARTIFACTORY_PASSWORD --refresh-dependencies --no-daemon --stacktrace"
-									}
+									sh "./gradlew deployArtifacts finalizeDeployArtifacts -Psigning.secretKeyRingFile=$SIGNING_KEYRING_FILE -Psigning.keyId=$SPRING_SIGNING_KEYID -Psigning.password='$SIGNING_PASSWORD' -PossrhUsername=$OSSRH_USERNAME -PossrhPassword=$OSSRH_PASSWORD -PartifactoryUsername=$ARTIFACTORY_USERNAME -PartifactoryPassword=$ARTIFACTORY_PASSWORD --refresh-dependencies --no-daemon --stacktrace"
 								}
 							}
 						}
@@ -154,11 +76,8 @@ try {
 			stage('Deploy Docs') {
 				node {
 					checkout scm
-					sh "git clean -dfx"
 					withCredentials([file(credentialsId: 'docs.spring.io-jenkins_private_ssh_key', variable: 'DEPLOY_SSH_KEY')]) {
-						withEnv(["JAVA_HOME=${ tool 'jdk8' }"]) {
-							sh "./gradlew deployDocs -PdeployDocsSshKeyPath=$DEPLOY_SSH_KEY -PdeployDocsSshUsername=$SPRING_DOCS_USERNAME --refresh-dependencies --no-daemon --stacktrace"
-						}
+						sh "./gradlew deployDocs -PdeployDocsSshKeyPath=$DEPLOY_SSH_KEY -PdeployDocsSshUsername=$SPRING_DOCS_USERNAME --refresh-dependencies --no-daemon --stacktrace"
 					}
 				}
 			}
@@ -167,19 +86,13 @@ try {
 			stage('Deploy Schema') {
 				node {
 					checkout scm
-					sh "git clean -dfx"
 					withCredentials([file(credentialsId: 'docs.spring.io-jenkins_private_ssh_key', variable: 'DEPLOY_SSH_KEY')]) {
-						withEnv(["JAVA_HOME=${ tool 'jdk8' }"]) {
-							sh "./gradlew deploySchema -PdeployDocsSshKeyPath=$DEPLOY_SSH_KEY -PdeployDocsSshUsername=$SPRING_DOCS_USERNAME --refresh-dependencies --no-daemon --stacktrace"
-						}
+						sh "./gradlew deploySchema -PdeployDocsSshKeyPath=$DEPLOY_SSH_KEY -PdeployDocsSshUsername=$SPRING_DOCS_USERNAME --refresh-dependencies --no-daemon --stacktrace"
 					}
 				}
 			}
 		}
 	}
-} catch(Exception e) {
-	currentBuild.result = 'FAILED: deploys'
-	throw e
 } finally {
 	def buildStatus = currentBuild.result
 	def buildNotSuccess =  !SUCCESS.equals(buildStatus)
@@ -1,11 +1,13 @@
 image::https://badges.gitter.im/Join%20Chat.svg[Gitter,link=https://gitter.im/spring-projects/spring-security?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge]

+image:https://travis-ci.org/spring-projects/spring-security.svg?branch=master["Build Status", link="https://travis-ci.org/spring-projects/spring-security"]
+
 = Spring Security

-Spring Security provides security services for the https://docs.spring.io[Spring IO Platform]. Spring Security 5.0 requires Spring 5.0 as
+Spring Security provides security services for the http://docs.spring.io[Spring IO Platform]. Spring Security 5.0 requires Spring 5.0 as
 a minimum and also requires Java 8.

-For a detailed list of features and access to the latest release, please visit https://spring.io/projects[Spring projects].
+For a detailed list of features and access to the latest release, please visit http://spring.io/projects[Spring projects].

 == Code of Conduct
 This project adheres to the Contributor Covenant link:CODE_OF_CONDUCT.adoc[code of conduct].
@@ -15,19 +17,19 @@ By participating, you  are expected to uphold this code. Please report unaccepta
 See https://github.com/spring-projects/spring-framework/wiki/Downloading-Spring-artifacts[downloading Spring artifacts] for Maven repository information.

 == Documentation
-Be sure to read the https://docs.spring.io/spring-security/site/docs/current/reference/htmlsingle/[Spring Security Reference].
-Extensive JavaDoc for the Spring Security code is also available in the https://docs.spring.io/spring-security/site/docs/current/api/[Spring Security API Documentation].
+Be sure to read the http://docs.spring.io/spring-security/site/docs/current/reference/htmlsingle/[Spring Security Reference].
+Extensive JavaDoc for the Spring Security code is also available in the http://docs.spring.io/spring-security/site/docs/current/apidocs/[Spring Security API Documentation].

 == Quick Start
-We recommend you visit https://docs.spring.io/spring-security/site/docs/current/reference/htmlsingle/[Spring Security Reference] and read the "Getting Started" page.
+We recommend you visit http://docs.spring.io/spring-security/site/docs/current/reference/htmlsingle/[Spring Security Reference] and read the "Getting Started" page.

 == Building from Source
-Spring Security uses a https://gradle.org[Gradle]-based build system.
-In the instructions below, https://vimeo.com/34436402[`./gradlew`] is invoked from the root of the source tree and serves as
+Spring Security uses a http://gradle.org[Gradle]-based build system.
+In the instructions below, http://vimeo.com/34436402[`./gradlew`] is invoked from the root of the source tree and serves as
 a cross-platform, self-contained bootstrap mechanism for the build.

 === Prerequisites
-https://help.github.com/set-up-git-redirect[Git] and the https://www.oracle.com/technetwork/java/javase/downloads[JDK8 build].
+http://help.github.com/set-up-git-redirect[Git] and the http://www.oracle.com/technetwork/java/javase/downloads[JDK8 build].

 Be sure that your `JAVA_HOME` environment variable points to the `jdk1.8.0` folder extracted from the JDK download.

@@ -53,12 +55,12 @@ Discover more commands with `./gradlew tasks`.
 See also the https://github.com/spring-projects/spring-framework/wiki/Gradle-build-and-release-FAQ[Gradle build and release FAQ].

 == Getting Support
-Check out the https://stackoverflow.com/questions/tagged/spring-security[Spring Security tags on Stack Overflow].
-https://spring.io/services[Commercial support] is available too.
+Check out the http://stackoverflow.com/questions/tagged/spring-security[Spring Security tags on Stack Overflow].
+http://spring.io/services[Commercial support] is available too.

 == Contributing
-https://help.github.com/articles/creating-a-pull-request[Pull requests] are welcome; see the https://github.com/spring-projects/spring-security/blob/master/CONTRIBUTING.md[contributor guidelines] for details.
+http://help.github.com/send-pull-requests[Pull requests] are welcome; see the https://github.com/spring-projects/spring-security/blob/master/CONTRIBUTING.md[contributor guidelines] for details.

 == License
 Spring Security is Open Source software released under the
-https://www.apache.org/licenses/LICENSE-2.0.html[Apache 2.0 license].
+http://www.apache.org/licenses/LICENSE-2.0.html[Apache 2.0 license].
@@ -1,7 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-io.projectreactor:reactor-bom:Dysprosium-SR12
-org.jetbrains.kotlin:kotlin-bom:1.3.72
-org.springframework.data:spring-data-releasetrain:Moore-SR10
-org.springframework:spring-framework-bom:5.2.9.RELEASE
@@ -1,7 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-io.projectreactor:reactor-bom:Dysprosium-SR12
-org.jetbrains.kotlin:kotlin-bom:1.3.72
-org.springframework.data:spring-data-releasetrain:Moore-SR10
-org.springframework:spring-framework-bom:5.2.9.RELEASE
@@ -1,27 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-antlr:antlr:2.7.7
-ch.qos.logback:logback-classic:1.2.3
-ch.qos.logback:logback-core:1.2.3
-com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.2.0
-com.google.guava:failureaccess:1.0.1
-com.google.guava:guava:27.1-jre
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
-com.google.j2objc:j2objc-annotations:1.1
-com.puppycrawl.tools:checkstyle:8.22
-commons-beanutils:commons-beanutils:1.9.3
-commons-collections:commons-collections:3.2.2
-info.picocli:picocli:3.9.6
-io.projectreactor:reactor-bom:Dysprosium-SR12
-io.spring.javaformat:spring-javaformat-checkstyle:0.0.15
-io.spring.nohttp:nohttp-checkstyle:0.0.3.RELEASE
-io.spring.nohttp:nohttp:0.0.3.RELEASE
-net.sf.saxon:Saxon-HE:9.9.1-3
-org.antlr:antlr4-runtime:4.7.2
-org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.17
-org.jetbrains.kotlin:kotlin-bom:1.3.72
-org.springframework.data:spring-data-releasetrain:Moore-SR10
-org.springframework:spring-framework-bom:5.2.9.RELEASE
@@ -1,15 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-io.projectreactor:reactor-bom:Dysprosium-SR12
-org.jetbrains.kotlin:kotlin-bom:1.3.72
-org.springframework.data:spring-data-releasetrain:Moore-SR10
-org.springframework:spring-aop:5.2.9.RELEASE
-org.springframework:spring-beans:5.2.9.RELEASE
-org.springframework:spring-context:5.2.9.RELEASE
-org.springframework:spring-core:5.2.9.RELEASE
-org.springframework:spring-expression:5.2.9.RELEASE
-org.springframework:spring-framework-bom:5.2.9.RELEASE
-org.springframework:spring-jcl:5.2.9.RELEASE
-org.springframework:spring-jdbc:5.2.9.RELEASE
-org.springframework:spring-tx:5.2.9.RELEASE
@@ -1,15 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-io.projectreactor:reactor-bom:Dysprosium-SR12
-org.jetbrains.kotlin:kotlin-bom:1.3.72
-org.springframework.data:spring-data-releasetrain:Moore-SR10
-org.springframework:spring-aop:5.2.9.RELEASE
-org.springframework:spring-beans:5.2.9.RELEASE
-org.springframework:spring-context:5.2.9.RELEASE
-org.springframework:spring-core:5.2.9.RELEASE
-org.springframework:spring-expression:5.2.9.RELEASE
-org.springframework:spring-framework-bom:5.2.9.RELEASE
-org.springframework:spring-jcl:5.2.9.RELEASE
-org.springframework:spring-jdbc:5.2.9.RELEASE
-org.springframework:spring-tx:5.2.9.RELEASE
@@ -1,7 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-io.projectreactor:reactor-bom:Dysprosium-SR12
-org.jetbrains.kotlin:kotlin-bom:1.3.72
-org.springframework.data:spring-data-releasetrain:Moore-SR10
-org.springframework:spring-framework-bom:5.2.9.RELEASE
@@ -1,15 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-io.projectreactor:reactor-bom:Dysprosium-SR12
-org.jetbrains.kotlin:kotlin-bom:1.3.72
-org.springframework.data:spring-data-releasetrain:Moore-SR10
-org.springframework:spring-aop:5.2.9.RELEASE
-org.springframework:spring-beans:5.2.9.RELEASE
-org.springframework:spring-context:5.2.9.RELEASE
-org.springframework:spring-core:5.2.9.RELEASE
-org.springframework:spring-expression:5.2.9.RELEASE
-org.springframework:spring-framework-bom:5.2.9.RELEASE
-org.springframework:spring-jcl:5.2.9.RELEASE
-org.springframework:spring-jdbc:5.2.9.RELEASE
-org.springframework:spring-tx:5.2.9.RELEASE
@@ -1,8 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-io.projectreactor:reactor-bom:Dysprosium-SR12
-org.jacoco:org.jacoco.agent:0.8.2
-org.jetbrains.kotlin:kotlin-bom:1.3.72
-org.springframework.data:spring-data-releasetrain:Moore-SR10
-org.springframework:spring-framework-bom:5.2.9.RELEASE
@@ -1,15 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-io.projectreactor:reactor-bom:Dysprosium-SR12
-org.jacoco:org.jacoco.agent:0.8.2
-org.jacoco:org.jacoco.ant:0.8.2
-org.jacoco:org.jacoco.core:0.8.2
-org.jacoco:org.jacoco.report:0.8.2
-org.jetbrains.kotlin:kotlin-bom:1.3.72
-org.ow2.asm:asm-analysis:6.2.1
-org.ow2.asm:asm-commons:6.2.1
-org.ow2.asm:asm-tree:6.2.1
-org.ow2.asm:asm:6.2.1
-org.springframework.data:spring-data-releasetrain:Moore-SR10
-org.springframework:spring-framework-bom:5.2.9.RELEASE
@@ -1,7 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-io.projectreactor:reactor-bom:Dysprosium-SR12
-org.jetbrains.kotlin:kotlin-bom:1.3.72
-org.springframework.data:spring-data-releasetrain:Moore-SR10
-org.springframework:spring-framework-bom:5.2.9.RELEASE
@@ -1,9 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-io.projectreactor:reactor-bom:Dysprosium-SR12
-net.sf.ehcache:ehcache:2.10.6
-org.jetbrains.kotlin:kotlin-bom:1.3.72
-org.slf4j:slf4j-api:1.7.30
-org.springframework.data:spring-data-releasetrain:Moore-SR10
-org.springframework:spring-framework-bom:5.2.9.RELEASE
@@ -1,7 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-io.projectreactor:reactor-bom:Dysprosium-SR12
-org.jetbrains.kotlin:kotlin-bom:1.3.72
-org.springframework.data:spring-data-releasetrain:Moore-SR10
-org.springframework:spring-framework-bom:5.2.9.RELEASE
@@ -1,15 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-io.projectreactor:reactor-bom:Dysprosium-SR12
-org.jetbrains.kotlin:kotlin-bom:1.3.72
-org.springframework.data:spring-data-releasetrain:Moore-SR10
-org.springframework:spring-aop:5.2.9.RELEASE
-org.springframework:spring-beans:5.2.9.RELEASE
-org.springframework:spring-context:5.2.9.RELEASE
-org.springframework:spring-core:5.2.9.RELEASE
-org.springframework:spring-expression:5.2.9.RELEASE
-org.springframework:spring-framework-bom:5.2.9.RELEASE
-org.springframework:spring-jcl:5.2.9.RELEASE
-org.springframework:spring-jdbc:5.2.9.RELEASE
-org.springframework:spring-tx:5.2.9.RELEASE
@@ -1,15 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-io.projectreactor:reactor-bom:Dysprosium-SR12
-org.jetbrains.kotlin:kotlin-bom:1.3.72
-org.springframework.data:spring-data-releasetrain:Moore-SR10
-org.springframework:spring-aop:5.2.9.RELEASE
-org.springframework:spring-beans:5.2.9.RELEASE
-org.springframework:spring-context:5.2.9.RELEASE
-org.springframework:spring-core:5.2.9.RELEASE
-org.springframework:spring-expression:5.2.9.RELEASE
-org.springframework:spring-framework-bom:5.2.9.RELEASE
-org.springframework:spring-jcl:5.2.9.RELEASE
-org.springframework:spring-jdbc:5.2.9.RELEASE
-org.springframework:spring-tx:5.2.9.RELEASE
@@ -1,7 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-io.projectreactor:reactor-bom:Dysprosium-SR12
-org.jetbrains.kotlin:kotlin-bom:1.3.72
-org.springframework.data:spring-data-releasetrain:Moore-SR10
-org.springframework:spring-framework-bom:5.2.9.RELEASE
@@ -1,7 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-io.projectreactor:reactor-bom:Dysprosium-SR12
-org.jetbrains.kotlin:kotlin-bom:1.3.72
-org.springframework.data:spring-data-releasetrain:Moore-SR10
-org.springframework:spring-framework-bom:5.2.9.RELEASE
@@ -1,7 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-io.projectreactor:reactor-bom:Dysprosium-SR12
-org.jetbrains.kotlin:kotlin-bom:1.3.72
-org.springframework.data:spring-data-releasetrain:Moore-SR10
-org.springframework:spring-framework-bom:5.2.9.RELEASE
@@ -1,24 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-io.projectreactor:reactor-bom:Dysprosium-SR12
-junit:junit:4.12
-net.bytebuddy:byte-buddy-agent:1.10.5
-net.bytebuddy:byte-buddy:1.10.5
-org.assertj:assertj-core:3.15.0
-org.hamcrest:hamcrest-core:1.3
-org.jetbrains.kotlin:kotlin-bom:1.3.72
-org.mockito:mockito-core:3.3.3
-org.objenesis:objenesis:2.6
-org.springframework.data:spring-data-releasetrain:Moore-SR10
-org.springframework:spring-aop:5.2.9.RELEASE
-org.springframework:spring-beans:5.2.9.RELEASE
-org.springframework:spring-context-support:5.2.9.RELEASE
-org.springframework:spring-context:5.2.9.RELEASE
-org.springframework:spring-core:5.2.9.RELEASE
-org.springframework:spring-expression:5.2.9.RELEASE
-org.springframework:spring-framework-bom:5.2.9.RELEASE
-org.springframework:spring-jcl:5.2.9.RELEASE
-org.springframework:spring-jdbc:5.2.9.RELEASE
-org.springframework:spring-test:5.2.9.RELEASE
-org.springframework:spring-tx:5.2.9.RELEASE
@@ -1,24 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-io.projectreactor:reactor-bom:Dysprosium-SR12
-junit:junit:4.12
-net.bytebuddy:byte-buddy-agent:1.10.5
-net.bytebuddy:byte-buddy:1.10.5
-org.assertj:assertj-core:3.15.0
-org.hamcrest:hamcrest-core:1.3
-org.jetbrains.kotlin:kotlin-bom:1.3.72
-org.mockito:mockito-core:3.3.3
-org.objenesis:objenesis:2.6
-org.springframework.data:spring-data-releasetrain:Moore-SR10
-org.springframework:spring-aop:5.2.9.RELEASE
-org.springframework:spring-beans:5.2.9.RELEASE
-org.springframework:spring-context-support:5.2.9.RELEASE
-org.springframework:spring-context:5.2.9.RELEASE
-org.springframework:spring-core:5.2.9.RELEASE
-org.springframework:spring-expression:5.2.9.RELEASE
-org.springframework:spring-framework-bom:5.2.9.RELEASE
-org.springframework:spring-jcl:5.2.9.RELEASE
-org.springframework:spring-jdbc:5.2.9.RELEASE
-org.springframework:spring-test:5.2.9.RELEASE
-org.springframework:spring-tx:5.2.9.RELEASE
@@ -1,7 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-io.projectreactor:reactor-bom:Dysprosium-SR12
-org.jetbrains.kotlin:kotlin-bom:1.3.72
-org.springframework.data:spring-data-releasetrain:Moore-SR10
-org.springframework:spring-framework-bom:5.2.9.RELEASE
@@ -1,25 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-io.projectreactor:reactor-bom:Dysprosium-SR12
-junit:junit:4.12
-net.bytebuddy:byte-buddy-agent:1.10.5
-net.bytebuddy:byte-buddy:1.10.5
-org.assertj:assertj-core:3.15.0
-org.hamcrest:hamcrest-core:1.3
-org.hsqldb:hsqldb:2.5.1
-org.jetbrains.kotlin:kotlin-bom:1.3.72
-org.mockito:mockito-core:3.3.3
-org.objenesis:objenesis:2.6
-org.springframework.data:spring-data-releasetrain:Moore-SR10
-org.springframework:spring-aop:5.2.9.RELEASE
-org.springframework:spring-beans:5.2.9.RELEASE
-org.springframework:spring-context-support:5.2.9.RELEASE
-org.springframework:spring-context:5.2.9.RELEASE
-org.springframework:spring-core:5.2.9.RELEASE
-org.springframework:spring-expression:5.2.9.RELEASE
-org.springframework:spring-framework-bom:5.2.9.RELEASE
-org.springframework:spring-jcl:5.2.9.RELEASE
-org.springframework:spring-jdbc:5.2.9.RELEASE
-org.springframework:spring-test:5.2.9.RELEASE
-org.springframework:spring-tx:5.2.9.RELEASE
@@ -1,25 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-io.projectreactor:reactor-bom:Dysprosium-SR12
-junit:junit:4.12
-net.bytebuddy:byte-buddy-agent:1.10.5
-net.bytebuddy:byte-buddy:1.10.5
-org.assertj:assertj-core:3.15.0
-org.hamcrest:hamcrest-core:1.3
-org.hsqldb:hsqldb:2.5.1
-org.jetbrains.kotlin:kotlin-bom:1.3.72
-org.mockito:mockito-core:3.3.3
-org.objenesis:objenesis:2.6
-org.springframework.data:spring-data-releasetrain:Moore-SR10
-org.springframework:spring-aop:5.2.9.RELEASE
-org.springframework:spring-beans:5.2.9.RELEASE
-org.springframework:spring-context-support:5.2.9.RELEASE
-org.springframework:spring-context:5.2.9.RELEASE
-org.springframework:spring-core:5.2.9.RELEASE
-org.springframework:spring-expression:5.2.9.RELEASE
-org.springframework:spring-framework-bom:5.2.9.RELEASE
-org.springframework:spring-jcl:5.2.9.RELEASE
-org.springframework:spring-jdbc:5.2.9.RELEASE
-org.springframework:spring-test:5.2.9.RELEASE
-org.springframework:spring-tx:5.2.9.RELEASE
@@ -1,25 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-io.projectreactor:reactor-bom:Dysprosium-SR12
-junit:junit:4.12
-net.bytebuddy:byte-buddy-agent:1.10.5
-net.bytebuddy:byte-buddy:1.10.5
-org.assertj:assertj-core:3.15.0
-org.hamcrest:hamcrest-core:1.3
-org.hsqldb:hsqldb:2.5.1
-org.jetbrains.kotlin:kotlin-bom:1.3.72
-org.mockito:mockito-core:3.3.3
-org.objenesis:objenesis:2.6
-org.springframework.data:spring-data-releasetrain:Moore-SR10
-org.springframework:spring-aop:5.2.9.RELEASE
-org.springframework:spring-beans:5.2.9.RELEASE
-org.springframework:spring-context-support:5.2.9.RELEASE
-org.springframework:spring-context:5.2.9.RELEASE
-org.springframework:spring-core:5.2.9.RELEASE
-org.springframework:spring-expression:5.2.9.RELEASE
-org.springframework:spring-framework-bom:5.2.9.RELEASE
-org.springframework:spring-jcl:5.2.9.RELEASE
-org.springframework:spring-jdbc:5.2.9.RELEASE
-org.springframework:spring-test:5.2.9.RELEASE
-org.springframework:spring-tx:5.2.9.RELEASE
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -127,7 +127,8 @@ public class AclPermissionEvaluator implements PermissionEvaluator {

 	List<Permission> resolvePermission(Object permission) {
 		if (permission instanceof Integer) {
-			return Arrays.asList(permissionFactory.buildFromMask((Integer) permission));
+			return Arrays.asList(permissionFactory.buildFromMask(((Integer) permission)
+					.intValue()));
 		}

 		if (permission instanceof Permission) {
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -1,11 +1,11 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
 *
 * Licensed 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
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -131,9 +131,10 @@ public class AccessControlEntryImpl implements AccessControlEntry,

 	@Override
 	public int hashCode() {
-		int result = this.permission.hashCode();
+		int result = this.acl.hashCode();
+		result = 31 * result + this.permission.hashCode();
 		result = 31 * result + (this.id != null ? this.id.hashCode() : 0);
-		result = 31 * result + (this.sid.hashCode());
+		result = 31 * result + this.sid.hashCode();
 		result = 31 * result + (this.auditFailure ? 1 : 0);
 		result = 31 * result + (this.auditSuccess ? 1 : 0);
 		result = 31 * result + (this.granting ? 1 : 0);
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -92,11 +92,11 @@ public abstract class AclFormattingUtils {
 	 */
 	public static String printBinary(int mask, char code) {
 		Assert.doesNotContain(Character.toString(code),
-				Character.toString(Permission.RESERVED_ON),
-				() -> Permission.RESERVED_ON + " is a reserved character code");
+				Character.toString(Permission.RESERVED_ON), Permission.RESERVED_ON
+						+ " is a reserved character code");
 		Assert.doesNotContain(Character.toString(code),
-				Character.toString(Permission.RESERVED_OFF),
-				() -> Permission.RESERVED_OFF + " is a reserved character code");
+				Character.toString(Permission.RESERVED_OFF), Permission.RESERVED_OFF
+						+ " is a reserved character code");

 		return printBinary(mask, Permission.RESERVED_ON, Permission.RESERVED_OFF)
 				.replace(Permission.RESERVED_ON, code);
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -1,11 +1,11 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2016 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.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -100,13 +100,13 @@ public class DefaultPermissionFactory implements PermissionFactory {
 		Assert.notNull(perm, "Permission required");
 		Assert.hasText(permissionName, "Permission name required");

-		Integer mask = perm.getMask();
+		Integer mask = Integer.valueOf(perm.getMask());

 		// Ensure no existing Permission uses this integer or code
 		Assert.isTrue(!registeredPermissionsByInteger.containsKey(mask),
-				() -> "An existing Permission already provides mask " + mask);
+				"An existing Permission already provides mask " + mask);
 		Assert.isTrue(!registeredPermissionsByName.containsKey(permissionName),
-				() -> "An existing Permission already provides name '" + permissionName + "'");
+				"An existing Permission already provides name '" + permissionName + "'");

 		// Register the new Permission
 		registeredPermissionsByInteger.put(mask, perm);
@@ -114,10 +114,10 @@ public class DefaultPermissionFactory implements PermissionFactory {
 	}

 	public Permission buildFromMask(int mask) {
-		if (registeredPermissionsByInteger.containsKey(mask)) {
+		if (registeredPermissionsByInteger.containsKey(Integer.valueOf(mask))) {
 			// The requested mask has an exact match against a statically-defined
 			// Permission, so return it
-			return registeredPermissionsByInteger.get(mask);
+			return registeredPermissionsByInteger.get(Integer.valueOf(mask));
 		}

 		// To get this far, we have to use a CumulativePermission
@@ -127,7 +127,8 @@ public class DefaultPermissionFactory implements PermissionFactory {
 			int permissionToCheck = 1 << i;

 			if ((mask & permissionToCheck) == permissionToCheck) {
-				Permission p = registeredPermissionsByInteger.get(permissionToCheck);
+				Permission p = registeredPermissionsByInteger.get(Integer
+						.valueOf(permissionToCheck));

 				if (p == null) {
 					throw new IllegalStateException("Mask '" + permissionToCheck
@@ -1,11 +1,11 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2016 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.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -87,7 +87,7 @@ public class DefaultPermissionGrantingStrategy implements PermissionGrantingStra

 				for (AccessControlEntry ace : aces) {

-					if (isGranted(ace, p)
+					if ((ace.getPermission().getMask() == p.getMask())
 							&& ace.getSid().equals(sid)) {
 						// Found a matching ACE, so its authorization decision will
 						// prevail
@@ -142,25 +142,4 @@ public class DefaultPermissionGrantingStrategy implements PermissionGrantingStra
 		}
 	}

-	/**
-	 * Compares an ACE Permission to the given Permission.
-	 * By default, we compare the Permission masks for exact match.
-	 * Subclasses of this strategy can override this behavior and implement
-	 * more sophisticated comparisons, e.g. a bitwise comparison for ACEs that grant access.
-	 * <pre>{@code
-	 * if (ace.isGranting() && p.getMask() != 0) {
-	 *    return (ace.getPermission().getMask() & p.getMask()) != 0;
-	 * } else {
-	 *    return ace.getPermission().getMask() == p.getMask();
-	 * }
-	 * }</pre>
-	 *
-	 * @param ace the ACE from the Acl holding the mask.
-	 * @param p the Permission we are checking against.
-	 * @return true, if the respective masks are considered to be equal.
-	 */
-	protected boolean isGranted(AccessControlEntry ace, Permission p) {
-		return ace.getPermission().getMask() == p.getMask();
-	}
-
 }
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -152,9 +152,11 @@ public class ObjectIdentityImpl implements ObjectIdentity {
 	 */
 	@Override
 	public int hashCode() {
-		int result = this.type.hashCode();
-		result = 31 * result + this.identifier.hashCode();
-		return result;
+		int code = 31;
+		code ^= this.type.hashCode();
+		code ^= this.identifier.hashCode();
+
+		return code;
 	}

 	@Override
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -17,6 +17,7 @@ package org.springframework.security.acls.domain;

 import org.springframework.security.acls.model.Sid;
 import org.springframework.security.core.Authentication;
+import org.springframework.security.core.userdetails.UserDetails;

 import org.springframework.util.Assert;

@@ -48,7 +49,12 @@ public class PrincipalSid implements Sid {
 		Assert.notNull(authentication, "Authentication required");
 		Assert.notNull(authentication.getPrincipal(), "Principal required");

-		this.principal = authentication.getName();
+		if (authentication.getPrincipal() instanceof UserDetails) {
+			this.principal = ((UserDetails) authentication.getPrincipal()).getUsername();
+		}
+		else {
+			this.principal = authentication.getPrincipal().toString();
+		}
 	}

 	// ~ Methods
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -1,11 +1,11 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2017 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.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -18,17 +18,11 @@ package org.springframework.security.acls.jdbc;
 import java.io.Serializable;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.util.UUID;

 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.core.convert.ConversionFailedException;
 import org.springframework.core.convert.ConversionService;
-import org.springframework.core.convert.TypeDescriptor;
-import org.springframework.core.convert.converter.Converter;
-import org.springframework.core.convert.support.GenericConversionService;
 import org.springframework.security.acls.model.ObjectIdentity;
-import org.springframework.util.Assert;

 /**
 * Utility class for helping convert database representations of {@link ObjectIdentity#getIdentifier()} into
@@ -41,16 +35,7 @@ class AclClassIdUtils {

 	private ConversionService conversionService;

-	AclClassIdUtils() {
-		GenericConversionService genericConversionService = new GenericConversionService();
-		genericConversionService.addConverter(String.class, Long.class, new StringToLongConverter());
-		genericConversionService.addConverter(String.class, UUID.class, new StringToUUIDConverter());
-		this.conversionService = genericConversionService;
-	}
-
-	AclClassIdUtils(ConversionService conversionService) {
-		Assert.notNull(conversionService, "conversionService must not be null");
-		this.conversionService = conversionService;
+	public AclClassIdUtils() {
 	}

 	/**
@@ -74,7 +59,7 @@ class AclClassIdUtils {
 		return identifier;
 	}

-	private boolean hasValidClassIdType(ResultSet resultSet) {
+	private boolean hasValidClassIdType(ResultSet resultSet) throws SQLException {
 		boolean hasClassIdType = false;
 		try {
 			hasClassIdType = classIdTypeFrom(resultSet) != null;
@@ -101,13 +86,17 @@ class AclClassIdUtils {
 	}

 	private <T> boolean canConvertFromStringTo(Class<T> targetType) {
-		return conversionService.canConvert(String.class, targetType);
+		return hasConversionService() && conversionService.canConvert(String.class, targetType);
 	}

 	private <T extends Serializable> T convertFromStringTo(String identifier, Class<T> targetType) {
 		return conversionService.convert(identifier, targetType);
 	}

+	private boolean hasConversionService() {
+		return conversionService != null;
+	}
+
 	/**
 	 * Converts to a {@link Long}, attempting to use the {@link ConversionService} if available.
 	 * @param identifier    The identifier
@@ -118,7 +107,7 @@ class AclClassIdUtils {
 	 */
 	private Long convertToLong(Serializable identifier) {
 		Long idAsLong;
-		if (conversionService.canConvert(identifier.getClass(), Long.class)) {
+		if (hasConversionService()) {
 			idAsLong = conversionService.convert(identifier, Long.class);
 		} else {
 			idAsLong = Long.valueOf(identifier.toString());
@@ -131,31 +120,6 @@ class AclClassIdUtils {
 	}

 	public void setConversionService(ConversionService conversionService) {
-		Assert.notNull(conversionService, "conversionService must not be null");
 		this.conversionService = conversionService;
 	}
-
-	private static class StringToLongConverter implements Converter<String, Long> {
-		@Override
-		public Long convert(String identifierAsString) {
-			if (identifierAsString == null) {
-				throw new ConversionFailedException(TypeDescriptor.valueOf(String.class),
-						TypeDescriptor.valueOf(Long.class), null, null);
-
-			}
-			return Long.parseLong(identifierAsString);
-		}
-	}
-
-	private static class StringToUUIDConverter implements Converter<String, UUID> {
-		@Override
-		public UUID convert(String identifierAsString) {
-			if (identifierAsString == null) {
-				throw new ConversionFailedException(TypeDescriptor.valueOf(String.class),
-						TypeDescriptor.valueOf(UUID.class), null, null);
-
-			}
-			return UUID.fromString(identifierAsString);
-		}
-	}
 }
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -17,6 +17,7 @@ package org.springframework.security.acls.jdbc;

 import java.io.Serializable;
 import java.lang.reflect.Field;
+import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
@@ -30,8 +31,8 @@ import java.util.Set;
 import javax.sql.DataSource;

 import org.springframework.core.convert.ConversionException;
-import org.springframework.core.convert.ConversionService;
 import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.PreparedStatementSetter;
 import org.springframework.jdbc.core.ResultSetExtractor;
 import org.springframework.security.acls.domain.AccessControlEntryImpl;
 import org.springframework.security.acls.domain.AclAuthorizationStrategy;
@@ -246,12 +247,14 @@ public class BasicLookupStrategy implements LookupStrategy {
 		String sql = computeRepeatingSql(lookupPrimaryKeysWhereClause, findNow.size());

 		Set<Long> parentsToLookup = jdbcTemplate.query(sql,
-				ps -> {
-					int i = 0;
+				new PreparedStatementSetter() {
+					public void setValues(PreparedStatement ps) throws SQLException {
+						int i = 0;

-					for (Long toFind : findNow) {
-						i++;
-						ps.setLong(i, toFind);
+						for (Long toFind : findNow) {
+							i++;
+							ps.setLong(i, toFind);
+						}
 					}
 				}, new ProcessResultSet(acls, sids));

@@ -379,20 +382,22 @@ public class BasicLookupStrategy implements LookupStrategy {
 				objectIdentities.size());

 		Set<Long> parentsToLookup = jdbcTemplate.query(sql,
-				ps -> {
-					int i = 0;
-					for (ObjectIdentity oid : objectIdentities) {
-						// Determine prepared statement values for this iteration
-						String type = oid.getType();
+				new PreparedStatementSetter() {
+					public void setValues(PreparedStatement ps) throws SQLException {
+						int i = 0;
+						for (ObjectIdentity oid : objectIdentities) {
+							// Determine prepared statement values for this iteration
+							String type = oid.getType();

-						// No need to check for nulls, as guaranteed non-null by
-						// ObjectIdentity.getIdentifier() interface contract
-						String identifier = oid.getIdentifier().toString();
+							// No need to check for nulls, as guaranteed non-null by
+							// ObjectIdentity.getIdentifier() interface contract
+							String identifier = oid.getIdentifier().toString();

-						// Inject values
-						ps.setString((2 * i) + 1, identifier);
-						ps.setString((2 * i) + 2, type);
-						i++;
+							// Inject values
+							ps.setString((2 * i) + 1, identifier);
+							ps.setString((2 * i) + 2, type);
+							i++;
+						}
 					}
 				}, new ProcessResultSet(acls, sids));

@@ -449,7 +454,7 @@ public class BasicLookupStrategy implements LookupStrategy {

 		// Now we have the parent (if there is one), create the true AclImpl
 		AclImpl result = new AclImpl(inputAcl.getObjectIdentity(),
-				inputAcl.getId(), aclAuthorizationStrategy, grantingStrategy,
+				(Long) inputAcl.getId(), aclAuthorizationStrategy, grantingStrategy,
 				parent, null, inputAcl.isEntriesInheriting(), inputAcl.getOwner());

 		// Copy the "aces" from the input to the destination
@@ -548,8 +553,8 @@ public class BasicLookupStrategy implements LookupStrategy {
 		}
 	}

-	public final void setConversionService(ConversionService conversionService) {
-		this.aclClassIdUtils = new AclClassIdUtils(conversionService);
+	public final void setAclClassIdUtils(AclClassIdUtils aclClassIdUtils) {
+		this.aclClassIdUtils = aclClassIdUtils;
 	}

 	// ~ Inner Classes
@@ -559,7 +564,7 @@ public class BasicLookupStrategy implements LookupStrategy {
 		private final Map<Serializable, Acl> acls;
 		private final List<Sid> sids;

-		ProcessResultSet(Map<Serializable, Acl> acls, List<Sid> sids) {
+		public ProcessResultSet(Map<Serializable, Acl> acls, List<Sid> sids) {
 			Assert.notNull(acls, "ACLs cannot be null");
 			this.acls = acls;
 			this.sids = sids; // can be null
@@ -587,15 +592,15 @@ public class BasicLookupStrategy implements LookupStrategy {

 				if (parentId != 0) {
 					// See if it's already in the "acls"
-					if (acls.containsKey(parentId)) {
+					if (acls.containsKey(new Long(parentId))) {
 						continue; // skip this while iteration
 					}

 					// Now try to find it in the cache
-					MutableAcl cached = aclCache.getFromCache(parentId);
+					MutableAcl cached = aclCache.getFromCache(new Long(parentId));

 					if ((cached == null) || !cached.isSidLoaded(sids)) {
-						parentIdsToLookup.add(parentId);
+						parentIdsToLookup.add(new Long(parentId));
 					}
 					else {
 						// Pop into the acls map, so our convert method doesn't
@@ -621,7 +626,7 @@ public class BasicLookupStrategy implements LookupStrategy {
 		 */
 		private void convertCurrentResultIntoObject(Map<Serializable, Acl> acls,
 				ResultSet rs) throws SQLException {
-			Long id = rs.getLong("acl_id");
+			Long id = new Long(rs.getLong("acl_id"));

 			// If we already have an ACL for this ID, just create the ACE
 			Acl acl = acls.get(id);
@@ -639,7 +644,7 @@ public class BasicLookupStrategy implements LookupStrategy {
 				long parentAclId = rs.getLong("parent_object");

 				if (parentAclId != 0) {
-					parentAcl = new StubAclParent(parentAclId);
+					parentAcl = new StubAclParent(Long.valueOf(parentAclId));
 				}

 				boolean entriesInheriting = rs.getBoolean("entries_inheriting");
@@ -656,7 +661,7 @@ public class BasicLookupStrategy implements LookupStrategy {
 			// It is permissible to have no ACEs in an ACL (which is detected by a null
 			// ACE_SID)
 			if (rs.getString("ace_sid") != null) {
-				Long aceId = rs.getLong("ace_id");
+				Long aceId = new Long(rs.getLong("ace_id"));
 				Sid recipient = createSid(rs.getBoolean("ace_principal"),
 						rs.getString("ace_sid"));

@@ -683,7 +688,7 @@ public class BasicLookupStrategy implements LookupStrategy {
 	private static class StubAclParent implements Acl {
 		private final Long id;

-		StubAclParent(Long id) {
+		public StubAclParent(Long id) {
 			this.id = id;
 		}

@@ -1,11 +1,11 @@
 /*
- * Copyright 2004, 2005, 2006, 2017, 2018 Acegi Technology Pty Limited
+ * Copyright 2004, 2005, 2006, 2017 Acegi Technology Pty Limited
 *
 * Licensed 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
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -16,6 +16,8 @@
 package org.springframework.security.acls.jdbc;

 import java.io.Serializable;
+import java.sql.ResultSet;
+import java.sql.SQLException;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -24,9 +26,8 @@ import javax.sql.DataSource;

 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.core.convert.ConversionService;
-import org.springframework.jdbc.core.JdbcOperations;
 import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.RowMapper;
 import org.springframework.security.acls.domain.ObjectIdentityImpl;
 import org.springframework.security.acls.model.Acl;
 import org.springframework.security.acls.model.AclService;
@@ -65,7 +66,7 @@ public class JdbcAclService implements AclService {
 	// ~ Instance fields
 	// ================================================================================================

-	protected final JdbcOperations jdbcOperations;
+	protected final JdbcTemplate jdbcTemplate;
 	private final LookupStrategy lookupStrategy;
 	private boolean aclClassIdSupported;
 	private String findChildrenSql = DEFAULT_SELECT_ACL_WITH_PARENT_SQL;
@@ -75,13 +76,9 @@ public class JdbcAclService implements AclService {
 	// ===================================================================================================

 	public JdbcAclService(DataSource dataSource, LookupStrategy lookupStrategy) {
-		this(new JdbcTemplate(dataSource), lookupStrategy);
-	}
-
-	public JdbcAclService(JdbcOperations jdbcOperations, LookupStrategy lookupStrategy) {
-		Assert.notNull(jdbcOperations, "JdbcOperations required");
+		Assert.notNull(dataSource, "DataSource required");
 		Assert.notNull(lookupStrategy, "LookupStrategy required");
-		this.jdbcOperations = jdbcOperations;
+		this.jdbcTemplate = new JdbcTemplate(dataSource);
 		this.lookupStrategy = lookupStrategy;
 		this.aclClassIdUtils = new AclClassIdUtils();
 	}
@@ -90,13 +87,17 @@ public class JdbcAclService implements AclService {
 	// ========================================================================================================

 	public List<ObjectIdentity> findChildren(ObjectIdentity parentIdentity) {
-		Object[] args = { parentIdentity.getIdentifier().toString(), parentIdentity.getType() };
-		List<ObjectIdentity> objects = jdbcOperations.query(findChildrenSql, args,
-				(rs, rowNum) -> {
-					String javaType = rs.getString("class");
-					Serializable identifier = (Serializable) rs.getObject("obj_id");
-					identifier = aclClassIdUtils.identifierFrom(identifier, rs);
-					return new ObjectIdentityImpl(javaType, identifier);
+		Object[] args = { parentIdentity.getIdentifier(), parentIdentity.getType() };
+		List<ObjectIdentity> objects = jdbcTemplate.query(findChildrenSql, args,
+				new RowMapper<ObjectIdentity>() {
+					public ObjectIdentity mapRow(ResultSet rs, int rowNum)
+							throws SQLException {
+						String javaType = rs.getString("class");
+						Serializable identifier = (Serializable) rs.getObject("obj_id");
+						identifier = aclClassIdUtils.identifierFrom(identifier, rs);
+
+						return new ObjectIdentityImpl(javaType, identifier);
+					}
 				});

 		if (objects.size() == 0) {
@@ -110,9 +111,9 @@ public class JdbcAclService implements AclService {
 			throws NotFoundException {
 		Map<ObjectIdentity, Acl> map = readAclsById(Arrays.asList(object), sids);
 		Assert.isTrue(map.containsKey(object),
-				() -> "There should have been an Acl entry for ObjectIdentity " + object);
+				"There should have been an Acl entry for ObjectIdentity " + object);

-		return map.get(object);
+		return (Acl) map.get(object);
 	}

 	public Acl readAclById(ObjectIdentity object) throws NotFoundException {
@@ -153,7 +154,7 @@ public class JdbcAclService implements AclService {
 	public void setAclClassIdSupported(boolean aclClassIdSupported) {
 		this.aclClassIdSupported = aclClassIdSupported;
 		if (aclClassIdSupported) {
-			// Change the default children select if it hasn't been overridden
+			// Change the default insert if it hasn't been overridden
 			if (this.findChildrenSql.equals(DEFAULT_SELECT_ACL_WITH_PARENT_SQL)) {
 				this.findChildrenSql = DEFAULT_SELECT_ACL_WITH_PARENT_SQL_WITH_CLASS_ID_TYPE;
 			} else {
@@ -162,8 +163,8 @@ public class JdbcAclService implements AclService {
 		}
 	}

-	public void setConversionService(ConversionService conversionService) {
-		this.aclClassIdUtils = new AclClassIdUtils(conversionService);
+	public void setAclClassIdUtils(AclClassIdUtils aclClassIdUtils) {
+		this.aclClassIdUtils = aclClassIdUtils;
 	}

 	protected boolean isAclClassIdSupported() {
@@ -1,11 +1,11 @@
 /*
- * Copyright 2004, 2005, 2006, 2017, 2018 Acegi Technology Pty Limited
+ * Copyright 2004, 2005, 2006, 2017 Acegi Technology Pty Limited
 *
 * Licensed 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
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -135,7 +135,7 @@ public class JdbcMutableAclService extends JdbcAclService implements MutableAclS
 		if (acl.getEntries().isEmpty()) {
 			return;
 		}
-		jdbcOperations.batchUpdate(insertEntry, new BatchPreparedStatementSetter() {
+		jdbcTemplate.batchUpdate(insertEntry, new BatchPreparedStatementSetter() {
 			public int getBatchSize() {
 				return acl.getEntries().size();
 			}
@@ -146,9 +146,10 @@ public class JdbcMutableAclService extends JdbcAclService implements MutableAclS
 						"Unknown ACE class");
 				AccessControlEntryImpl entry = (AccessControlEntryImpl) entry_;

-				stmt.setLong(1, (Long) acl.getId());
+				stmt.setLong(1, ((Long) acl.getId()).longValue());
 				stmt.setInt(2, i);
-				stmt.setLong(3, createOrRetrieveSidPrimaryKey(entry.getSid(), true));
+				stmt.setLong(3, createOrRetrieveSidPrimaryKey(entry.getSid(), true)
+						.longValue());
 				stmt.setInt(4, entry.getPermission().getMask());
 				stmt.setBoolean(5, entry.isGranting());
 				stmt.setBoolean(6, entry.isAuditSuccess());
@@ -169,7 +170,7 @@ public class JdbcMutableAclService extends JdbcAclService implements MutableAclS
 	protected void createObjectIdentity(ObjectIdentity object, Sid owner) {
 		Long sidId = createOrRetrieveSidPrimaryKey(owner, true);
 		Long classId = createOrRetrieveClassPrimaryKey(object.getType(), true, object.getIdentifier().getClass());
-		jdbcOperations.update(insertObjectIdentity, classId, object.getIdentifier().toString(), sidId,
+		jdbcTemplate.update(insertObjectIdentity, classId, object.getIdentifier(), sidId,
 				Boolean.TRUE);
 	}

@@ -183,7 +184,7 @@ public class JdbcMutableAclService extends JdbcAclService implements MutableAclS
 	 * @return the primary key or null if not found
 	 */
 	protected Long createOrRetrieveClassPrimaryKey(String type, boolean allowCreate, Class idType) {
-		List<Long> classIds = jdbcOperations.queryForList(selectClassPrimaryKey,
+		List<Long> classIds = jdbcTemplate.queryForList(selectClassPrimaryKey,
 				new Object[] { type }, Long.class);

 		if (!classIds.isEmpty()) {
@@ -192,13 +193,13 @@ public class JdbcMutableAclService extends JdbcAclService implements MutableAclS

 		if (allowCreate) {
 			if (!isAclClassIdSupported()) {
-				jdbcOperations.update(insertClass, type);
+				jdbcTemplate.update(insertClass, type);
 			} else {
-				jdbcOperations.update(insertClass, type, idType.getCanonicalName());
+				jdbcTemplate.update(insertClass, type, idType.getCanonicalName());
 			}
 			Assert.isTrue(TransactionSynchronizationManager.isSynchronizationActive(),
 					"Transaction must be running");
-			return jdbcOperations.queryForObject(classIdentityQuery, Long.class);
+			return jdbcTemplate.queryForObject(classIdentityQuery, Long.class);
 		}

 		return null;
@@ -247,18 +248,18 @@ public class JdbcMutableAclService extends JdbcAclService implements MutableAclS
 	protected Long createOrRetrieveSidPrimaryKey(String sidName, boolean sidIsPrincipal,
 			boolean allowCreate) {

-		List<Long> sidIds = jdbcOperations.queryForList(selectSidPrimaryKey, new Object[] {
-				sidIsPrincipal, sidName }, Long.class);
+		List<Long> sidIds = jdbcTemplate.queryForList(selectSidPrimaryKey, new Object[] {
+				Boolean.valueOf(sidIsPrincipal), sidName }, Long.class);

 		if (!sidIds.isEmpty()) {
 			return sidIds.get(0);
 		}

 		if (allowCreate) {
-			jdbcOperations.update(insertSid, sidIsPrincipal, sidName);
+			jdbcTemplate.update(insertSid, Boolean.valueOf(sidIsPrincipal), sidName);
 			Assert.isTrue(TransactionSynchronizationManager.isSynchronizationActive(),
 					"Transaction must be running");
-			return jdbcOperations.queryForObject(sidIdentityQuery, Long.class);
+			return jdbcTemplate.queryForObject(sidIdentityQuery, Long.class);
 		}

 		return null;
@@ -310,7 +311,7 @@ public class JdbcMutableAclService extends JdbcAclService implements MutableAclS
 	 * @param oidPrimaryKey the rows in acl_entry to delete
 	 */
 	protected void deleteEntries(Long oidPrimaryKey) {
-		jdbcOperations.update(deleteEntryByObjectIdentityForeignKey, oidPrimaryKey);
+		jdbcTemplate.update(deleteEntryByObjectIdentityForeignKey, oidPrimaryKey);
 	}

 	/**
@@ -324,7 +325,7 @@ public class JdbcMutableAclService extends JdbcAclService implements MutableAclS
 	 */
 	protected void deleteObjectIdentity(Long oidPrimaryKey) {
 		// Delete the acl_object_identity row
-		jdbcOperations.update(deleteObjectIdentityByPrimaryKey, oidPrimaryKey);
+		jdbcTemplate.update(deleteObjectIdentityByPrimaryKey, oidPrimaryKey);
 	}

 	/**
@@ -338,8 +339,8 @@ public class JdbcMutableAclService extends JdbcAclService implements MutableAclS
 	 */
 	protected Long retrieveObjectIdentityPrimaryKey(ObjectIdentity oid) {
 		try {
-			return jdbcOperations.queryForObject(selectObjectIdentityPrimaryKey, Long.class,
-					oid.getType(), oid.getIdentifier().toString());
+			return jdbcTemplate.queryForObject(selectObjectIdentityPrimaryKey, Long.class,
+					oid.getType(), oid.getIdentifier());
 		}
 		catch (DataAccessException notFound) {
 			return null;
@@ -408,8 +409,8 @@ public class JdbcMutableAclService extends JdbcAclService implements MutableAclS
 		Assert.notNull(acl.getOwner(), "Owner is required in this implementation");

 		Long ownerSid = createOrRetrieveSidPrimaryKey(acl.getOwner(), true);
-		int count = jdbcOperations.update(updateObjectIdentity, parentId, ownerSid,
-				acl.isEntriesInheriting(), acl.getId());
+		int count = jdbcTemplate.update(updateObjectIdentity, parentId, ownerSid,
+				Boolean.valueOf(acl.isEntriesInheriting()), acl.getId());

 		if (count != 1) {
 			throw new NotFoundException("Unable to locate ACL to update");
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -32,7 +32,7 @@ public class AclFormattingUtilsTests {
 	// ~ Methods
 	// ========================================================================================================
 	@Test
-	public final void testDemergePatternsParametersConstraints() {
+	public final void testDemergePatternsParametersConstraints() throws Exception {
 		try {
 			AclFormattingUtils.demergePatterns(null, "SOME STRING");
 			fail("It should have thrown IllegalArgumentException");
@@ -63,7 +63,7 @@ public class AclFormattingUtilsTests {
 	}

 	@Test
-	public final void testDemergePatterns() {
+	public final void testDemergePatterns() throws Exception {
 		String original = "...........................A...R";
 		String removeBits = "...............................R";
 		assertThat(AclFormattingUtils.demergePatterns(original, removeBits)).isEqualTo(
@@ -76,7 +76,7 @@ public class AclFormattingUtilsTests {
 	}

 	@Test
-	public final void testMergePatternsParametersConstraints() {
+	public final void testMergePatternsParametersConstraints() throws Exception {
 		try {
 			AclFormattingUtils.mergePatterns(null, "SOME STRING");
 			fail("It should have thrown IllegalArgumentException");
@@ -106,7 +106,7 @@ public class AclFormattingUtilsTests {
 	}

 	@Test
-	public final void testMergePatterns() {
+	public final void testMergePatterns() throws Exception {
 		String original = "...............................R";
 		String extraBits = "...........................A....";
 		assertThat(AclFormattingUtils.mergePatterns(original, extraBits)).isEqualTo(
@@ -119,7 +119,7 @@ public class AclFormattingUtilsTests {
 	}

 	@Test
-	public final void testBinaryPrints() {
+	public final void testBinaryPrints() throws Exception {
 		assertThat(AclFormattingUtils.printBinary(15)).isEqualTo(
 				"............................****");

@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -36,7 +36,7 @@ import java.util.List;
 public class AclPermissionCacheOptimizerTests {

 	@Test
-	public void eagerlyLoadsRequiredAcls() {
+	public void eagerlyLoadsRequiredAcls() throws Exception {
 		AclService service = mock(AclService.class);
 		AclPermissionCacheOptimizer pco = new AclPermissionCacheOptimizer(service);
 		ObjectIdentityRetrievalStrategy oidStrat = mock(ObjectIdentityRetrievalStrategy.class);
@@ -1,11 +1,11 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2016 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.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -26,6 +26,8 @@ import org.springframework.security.acls.model.Acl;
 import org.springframework.security.acls.model.AclService;
 import org.springframework.security.acls.model.ObjectIdentity;
 import org.springframework.security.acls.model.ObjectIdentityRetrievalStrategy;
+import org.springframework.security.acls.model.Permission;
+import org.springframework.security.acls.model.Sid;
 import org.springframework.security.acls.model.SidRetrievalStrategy;
 import org.springframework.security.core.Authentication;

@@ -37,18 +39,18 @@ import org.springframework.security.core.Authentication;
 public class AclPermissionEvaluatorTests {

 	@Test
-	public void hasPermissionReturnsTrueIfAclGrantsPermission() {
+	public void hasPermissionReturnsTrueIfAclGrantsPermission() throws Exception {
 		AclService service = mock(AclService.class);
 		AclPermissionEvaluator pe = new AclPermissionEvaluator(service);
 		ObjectIdentity oid = mock(ObjectIdentity.class);
 		ObjectIdentityRetrievalStrategy oidStrategy = mock(ObjectIdentityRetrievalStrategy.class);
-		when(oidStrategy.getObjectIdentity(any(Object.class))).thenReturn(oid);
+		when(oidStrategy.getObjectIdentity(anyObject())).thenReturn(oid);
 		pe.setObjectIdentityRetrievalStrategy(oidStrategy);
 		pe.setSidRetrievalStrategy(mock(SidRetrievalStrategy.class));
 		Acl acl = mock(Acl.class);

-		when(service.readAclById(any(ObjectIdentity.class), anyList())).thenReturn(acl);
-		when(acl.isGranted(anyList(), anyList(), eq(false))).thenReturn(true);
+		when(service.readAclById(any(ObjectIdentity.class), anyListOf(Sid.class))).thenReturn(acl);
+		when(acl.isGranted(anyListOf(Permission.class), anyListOf(Sid.class), eq(false))).thenReturn(true);

 		assertThat(pe.hasPermission(mock(Authentication.class), new Object(), "READ")).isTrue();
 	}
@@ -62,13 +64,13 @@ public class AclPermissionEvaluatorTests {
 		AclPermissionEvaluator pe = new AclPermissionEvaluator(service);
 		ObjectIdentity oid = mock(ObjectIdentity.class);
 		ObjectIdentityRetrievalStrategy oidStrategy = mock(ObjectIdentityRetrievalStrategy.class);
-		when(oidStrategy.getObjectIdentity(any(Object.class))).thenReturn(oid);
+		when(oidStrategy.getObjectIdentity(anyObject())).thenReturn(oid);
 		pe.setObjectIdentityRetrievalStrategy(oidStrategy);
 		pe.setSidRetrievalStrategy(mock(SidRetrievalStrategy.class));
 		Acl acl = mock(Acl.class);

-		when(service.readAclById(any(ObjectIdentity.class), anyList())).thenReturn(acl);
-		when(acl.isGranted(anyList(), anyList(), eq(false))).thenReturn(true);
+		when(service.readAclById(any(ObjectIdentity.class), anyListOf(Sid.class))).thenReturn(acl);
+		when(acl.isGranted(anyListOf(Permission.class), anyListOf(Sid.class), eq(false))).thenReturn(true);

 		assertThat(pe.hasPermission(mock(Authentication.class), new Object(), "write")).isTrue();

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Rob Winch	09429479fe	Release 5.0.6.RELEASE	2018-06-12 21:23:02 -05:00
Rob Winch	dc602c0840	Update to Spring Framework 5.0.7 Fixes: gh-5425	2018-06-12 16:51:01 -05:00
Rob Winch	fedc183b5b	Fix htmlunit Fixes: gh-5426	2018-06-12 16:50:52 -05:00
Rob Winch	d3f12f0ee7	Update to Selenium 3.12.0 Fixes: gh-5427	2018-06-12 16:50:48 -05:00
Rob Winch	2a723cf5c7	Update to htmlunit-driver:2.31.0 Fixes: gh-5428	2018-06-12 16:50:42 -05:00
Rob Winch	6f32303866	Update to hibernate-validator:6.0.10.Final Fixes: gh-5429	2018-06-12 16:50:34 -05:00
Rob Winch	400adaef1c	Update to Hibernate 5.2.17 Fixes: gh-5430	2018-06-12 16:50:29 -05:00
Rob Winch	9924d6e920	Update to hsqldb:2.4.1 Fixes: gh-5431	2018-06-12 16:50:23 -05:00
Rob Winch	6cfd30aee8	Update to assertj-core:3.10.0 Fixes: gh-5432	2018-06-12 16:50:15 -05:00
Rob Winch	1abdb69615	Update to htmlunit:2.31 Fixes: gh-5433	2018-06-12 16:49:23 -05:00
Rob Winch	b07f6b0178	Update to unboundid-ldapsdk:4.0.6 Fixes: gh-54234	2018-06-12 16:49:10 -05:00
Rob Winch	f0eec1b03b	Update to oauth2-oidc-sdk:5.62 Fixes: gh-5435	2018-06-12 16:48:57 -05:00
Rob Winch	6ca6d80184	Update to nimbus-jose-jwt:5.11 Fixes: gh-5436	2018-06-12 16:47:35 -05:00
Rob Winch	ce5eec8761	Update to Jackson 2.9.6 Fixes: gh-5424	2018-06-12 16:47:30 -05:00
Rob Winch	86e03b3fb4	Update to Spring Boot 2.0.2.RELEASE Fixes: gh-5423	2018-06-12 16:47:26 -05:00
Rob Winch	c909264b31	Update GAE to 1.9.64 Fixes: gh-5422	2018-06-12 16:47:21 -05:00
Rob Winch	f52ab9a146	Update to Reactor Bismuth SR10 Fixes: gh-5421	2018-06-12 16:47:06 -05:00
Rob Winch	ad2cb501b8	Add cross references to ReactorContextTestExecutionListener Fixes: gh-5418	2018-06-11 17:16:15 -05:00
Rob Winch	8659a4b555	Add UserDetailsRepositoryReactiveAuthenticationManager.setScheduler Fixes: gh-5417	2018-06-11 14:30:11 -05:00
Joe Grandja	e04b29426b	DefaultLoginPageGeneratingFilter escapes OAuth2 ClientRegistrations Fixes gh-5394	2018-05-29 09:53:31 -04:00
Josh Cummings	350d434e28	Next Development Version	2018-05-08 09:25:49 -06:00
Josh Cummings	bbfc3d2b4b	Release 5.0.5.RELEASE	2018-05-08 09:22:58 -06:00
Rob Winch	a7e4f36dbe	Update to Spring Data Kay SR7 Fixes: gh-5318	2018-05-08 09:04:23 -05:00
Rob Winch	e61aafe115	Update to Reactor Bismuth SR9 Fixes: gh-5319	2018-05-08 09:04:05 -05:00
Rob Winch	ff95388ce1	Update to Spring 5.0.6 Fixes: gh-5290	2018-05-08 08:34:35 -05:00
Rob Winch	545228cf8d	Documentation typo fixes Fixes: gh-5317	2018-05-07 16:48:03 -05:00
Denys Ivano	7b8fa90d96	Add accessDeniedHandler method to ExceptionHandlingSpec This allows to configure accessDeniedHandler in ExceptionTranslationWebFilter through ServerHttpSecurity. Issue: gh-5257	2018-05-07 16:23:32 -05:00
Alexander Münch	c30e218f1f	Avoid unnecessary grow of ArrayList Adapted ArrayList size in CacheControlHeadersWriter::createHeaders() Fixes: gh-5310	2018-05-04 14:43:17 -05:00
XYUU	70d284865f	DefaultLoginPageGeneratingFilter should calculate ContentLength using UTF-8 Fixes: gh-5309	2018-05-04 14:43:17 -05:00
Johnny Lim	a4b5523063	Fix 'attributes' deprecation warning in spring-security-docs-guides Fixes: gh-5308	2018-05-04 14:13:44 -05:00
Kazuki Shimizu	8883ec17e5	Fix JdbcDaoImpl Javadoc Fix incorrect explanation for customizing query on JdbcDaoImpl Issue: gh-5306	2018-05-04 10:48:55 -05:00
Joe Grandja	f524da3edc	Add test NimbusUserInfoResponseClient sets Accept header to JSON Issue gh-5294	2018-05-03 20:23:03 -04:00
Joe Grandja	e1e464387e	NimbusUserInfoResponseClient sets Accept header to JSON Fixes gh-5294	2018-05-03 20:22:47 -04:00
Rob Winch	a5dc48f9d9	Improve PasswordEncoder deprecated notices Fixes: gh-5296	2018-05-03 15:13:20 -05:00
Rob Winch	9b722a9c85	Update to Spring Framework 5.0.6.BUILD-SNAPSHOT Issue: gh-5290	2018-05-03 11:01:37 -05:00
Rob Winch	884a4e46df	Update to selenium 3.11.0 Fixes: gh-5289	2018-05-03 11:01:37 -05:00
Rob Winch	01c2d57d46	Update to mockito-core:2.18.3 Fixes: gh-5284	2018-05-03 11:01:37 -05:00
Rob Winch	c9e42ce756	Update to htmlunit:2.30 Fixes: gh-5283	2018-05-03 11:01:37 -05:00
Rob Winch	9b0b933736	Update to aspectj 1.9.1 Fixes: gh-5282	2018-05-03 11:01:37 -05:00
Rob Winch	0169b8746b	Update to javax.servlet-api:4.0.1 Fixes: gh-5281	2018-05-03 11:01:37 -05:00
Rob Winch	25a87051a6	Update to oauth2-oidc-sdk:5.61 Fixes: gh-5280	2018-05-03 11:01:37 -05:00
Rob Winch	7edf9fc6c8	Update to nimbus-jose-jwt:5.10 Fixes: gh-5279	2018-05-03 11:01:37 -05:00
Rob Winch	a06f1e3936	Update Spring Boot 2.0.1.RELEASE Fixes: gh-5278	2018-05-03 11:01:37 -05:00
Rob Winch	b296d2eaa5	Update GAE 1.9.63 Fixes: gh-5277	2018-05-03 11:01:37 -05:00
Rob Winch	11a8c76991	Add update-dependencies.sh Fixes: gh-5276	2018-05-03 11:01:37 -05:00
Rob Winch	2f441f18e6	Make MIN_SPRING_VERSION Dynamic Fixes: gh-5065 # Conflicts: # core/src/main/java/org/springframework/security/core/SpringSecurityCoreVersion.java	2018-05-03 11:01:27 -05:00
Joe Grandja	a7de1e363f	OAuth2LoginAuthenticationFilter should handle null ClientRegistration Fixes gh-5251	2018-05-02 20:31:59 -04:00
Rob Winch	32f5fb5eb2	ExceptionTranslationFilter does not handle committed responses Fixes: gh-5273	2018-04-30 16:50:02 -05:00
Rob Winch	f7f6798f71	DefaultWebSecurityExpressionHandler uses PermissionEvaluator Bean The default instance of DefaultWebSecurityExpressionHandler uses the PermissionEvaluator Bean by default. Fixes: gh-5272	2018-04-30 12:16:34 -05:00
Joe Grandja	0b72f93027	WebSecurityConfigurationTests groovy->java Issue: gh-4939	2018-04-30 11:43:30 -05:00
Rob Winch	5b751baf61	Fixes: gh-5190	2018-04-16 17:52:55 -05:00
Joe Grandja	ec9ab1965a	Next Development Version	2018-04-04 13:36:28 -04:00
Joe Grandja	30aede82da	Release 5.0.4.RELEASE	2018-04-04 13:03:55 -04:00
Joe Grandja	2686452b99	Update to aspectjtools:1.9.0 Fixes gh-5211	2018-04-04 13:00:46 -04:00
Joe Grandja	7e470ff5bd	Update to aspectjrt:1.9.0 Fixes gh-5210	2018-04-04 12:59:09 -04:00
Joe Grandja	df6a6e5991	Update to Reactor Bismuth SR8 Fixes gh-5209	2018-04-04 12:53:54 -04:00
Joe Grandja	1500a22439	Update to Spring Data Kay SR6 Fixes gh-5167	2018-04-04 10:31:04 -04:00
Joe Grandja	64cb256bb9	Update to Spring Framework 5.0.5 Fixes gh-5166	2018-04-04 10:27:43 -04:00
Joe Grandja	e6d68acfd6	Fix NPE with exp claim in NimbusJwtDecoderJwkSupport Fixes gh-5168	2018-04-04 09:02:05 -04:00
Joe Grandja	bc2a7ac394	ClaimAccessor.getClaimAsInstant() converts Long or Date Fixes gh-5191, Fixes gh-5192	2018-04-04 04:57:36 -04:00
Joe Grandja	55019b2f0b	Fix SecuredAnnotationSecurityMetadataSourceTests -> Related SPR-16677	2018-04-03 11:16:50 -04:00
Rob Winch	151b545ed0	Polish Javadoc Fixes: gh-5186	2018-03-29 15:33:31 -05:00
Rob Winch	c67ce144b9	Polish HeadersSpec Fixes: gh-5187	2018-03-29 15:33:31 -05:00
Rob Winch	6729c39905	Fix JDK 9 Issue: gh-5160	2018-03-28 15:00:41 -05:00
Rob Winch	197439f9e1	Update to mockito 2.17.0 Fixes: gh-5181	2018-03-28 14:42:43 -05:00
Rob Winch	70a11267fa	Update to hibernate-validator:6.0.9.Final Fixes: gh-5180	2018-03-28 14:42:35 -05:00
Rob Winch	4e0c165d47	Update to hibernate-entitymanager:5.2.16.Final Fixes: gh-5178	2018-03-28 14:42:09 -05:00
Rob Winch	93844b1823	Update to assertj 2.9.1 Fixes: gh-5177	2018-03-28 14:32:49 -05:00
Rob Winch	a30b3321c4	Update to thymeleaf-layout-dialect:2.3.0 Fixes: gh-5176	2018-03-28 14:32:30 -05:00
Rob Winch	ffb8c1978a	Update to unbounded 4.0.5 Fixes: gh-5175	2018-03-28 14:32:13 -05:00
Rob Winch	4722ab21bf	Update to oauth2-oidc-sdk:5.57 Fixes: gh-5179	2018-03-28 14:32:07 -05:00
Rob Winch	335735e227	Update to nimbus-jose-jwt:5.9 Fixes: gh-5174	2018-03-28 14:31:47 -05:00
Rob Winch	501269a51f	Update to appengine 1.9.63 Fixes: gh-5173	2018-03-28 14:30:57 -05:00
Rob Winch	6b58218256	Update to Jackson 2.9.5 Fixes: gh-5172	2018-03-28 14:30:48 -05:00
Rob Winch	de1137fc5e	Update mockwebserver 3.10.0 Fixes: gh-5171	2018-03-28 14:30:36 -05:00
Rob Winch	e68657216c	Fixes for SPR-16624 Fixes: gh-5165	2018-03-27 22:36:03 -05:00
Rob Winch	bfada59a1e	CookieClearingLogoutHandler adds uses contextPath + "/" Fixes: gh-5140	2018-03-19 16:50:48 -05:00
Rob Winch	bc17860cb6	Fix ReactorContextTestExecutionListener with custom SecurityContext Fixes: gh-5139	2018-03-19 09:33:34 -05:00
Oleh Dokuka	5e351a4f75	ReactorContextTestExecutionListener with multiple Threads Fixes: gh-5138	2018-03-19 09:32:36 -05:00
Rob Winch	0458ca88e6	Relax assertions in HeaderSpecTests Fixes: gh-5117	2018-03-15 08:31:21 -05:00
Rob Winch	a7a71d6cef	Fix @since on GlobalAuthenticationConfigurerAdapter Fixes: gh-5109	2018-03-13 14:25:40 -05:00
Josh Cummings	a7f180b2c7	Authorities authenticate TestingAuthenticationToken In other extensions of `AbstractAuthenticationToken`, the constructors that include `authorities` call `setAuthenticated(true)`. This includes `PreAuthenticated`-, `UsernamePassword`-, and `RememberMeAuthenticationToken`. This change brings `TestingAuthenticationToken` in line with that convention. Note that this was done once already to one of the constructors (`ee13be4`) in `TestingAuthenticationToken` that takes an arity of `authorities`. It was not propagated to the constructor that takes a collection, which is what this commit remedies. Fixes: gh-5098	2018-03-09 13:26:36 -06:00
Josh Cummings	87f266133b	Update to Spring Boot 2.0.0.RELEASE Fixes: gh-5091	2018-03-09 09:45:20 -06:00
Rob Winch	8f8deac0f4	Fix StrictHttpFirewall rules Fixes: gh-5092	2018-03-08 21:29:31 -06:00
Vedran Pavic	9830d01acc	Upgrade Nimbus JOSE + JWT to 5.6 Fixes: gh-5089	2018-03-08 16:43:05 -06:00
Vedran Pavic	d8fea5c6f1	Upgrade Nimbus OAuth + OIDC SDK to 5.56 Fixes: gh-5088	2018-03-08 16:42:54 -06:00
Rob Winch	4d410b0b61	Polish Javadoc HttpStatusServerAccessDeniedHandler	2018-03-07 12:34:15 -06:00
Rob Winch	24a4fbfe56	HttpStatusServerAccessDeniedHandler use injected HttpStatus Fixes: gh-5078	2018-03-07 12:28:45 -06:00
Josh Cummings	d5d1c30d1d	Update to Gradle 4.6 Only thing of interest really is that the Jacoco Gradle plugin was bumped to 0.8.0, which requires org.ow2.asm:asm:6.0. Fixes: gh-5077	2018-03-06 20:27:31 -06:00