Release 5.1.7.RELEASE

Fixes gh-7617

.editorconfig

@@ -9,14 +9,14 @@ trim_trailing_whitespace = true
 insert_final_newline = true
 max_line_length = 120
 
-[*.{java,xml}]
+[*.java]
 indent_style = tab
 indent_size = 4
-charset = utf-8
+charset = latin1
 continuation_indent_size = 8
 
-ij_smart_tabs = false
-ij_java_align_multiline_parameters = false
-
-[*.gradle]
+[*.xml]
 indent_style = tab
+indent_size = 4
+charset = latin1
+continuation_indent_size = 8

.github/ISSUE_TEMPLATE/bug.md

@@ -1,24 +0,0 @@
----
-name: Bug
-about: Create a bug report to help us improve
-title: ''
-labels: 'status: waiting-for-triage, type: bug'
-assignees: ''
-
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior.
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Sample**
-
-A link to a GitHub repository with a [minimal, reproducible sample](https://stackoverflow.com/help/minimal-reproducible-example).
-
-Reports that include a sample will take priority over reports that do not.
-At times, we may require a sample, so it is good to try and include a sample up front.

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: Community Support
-    url: https://stackoverflow.com/questions/tagged/spring-security
-    about: Please ask and answer questions on StackOverflow with the tag `spring-security`.

.github/ISSUE_TEMPLATE/enhancement.md

@@ -1,25 +0,0 @@
----
-name: Enhancement
-about: Suggest an enhancement for this project
-title: ''
-labels: 'status: waiting-for-triage, type: enhancement'
-assignees: ''
-
----
-
-**Expected Behavior**
-
-<!--- Tell us how it should work -->
-
-**Current Behavior**
-
-<!--- Explain the difference from current behavior -->
-
-**Context**
-
-<!--- 
-How has this issue affected you?
-What are you trying to accomplish?
-What other alternatives have you considered?
-Are you aware of any workarounds?
--->

.github/PULL_REQUEST_TEMPLATE.md

@@ -3,7 +3,5 @@ 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 #).
 -->

.gitignore

@@ -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

.idea/checkstyle-idea.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>

.idea/externalDependencies.xml

@@ -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>

.travis.yml

@@ -1,7 +1,7 @@
 language: java
 
 jdk:
-  - openjdk8
+  - oraclejdk8
 
 os:
   - linux
@@ -13,4 +13,4 @@ cache:
     - $HOME/.gradle/caches/
     - $HOME/.gradle/wrapper/
 
-script: ./gradlew build --continue
+script: ./gradlew build --refresh-dependencies --no-daemon --continue

CODE_OF_CONDUCT.adoc

@@ -0,0 +1,44 @@
+= Contributor Code of Conduct
+
+As contributors and maintainers of this project, and in the interest of fostering an open
+and welcoming community, we pledge to respect all people who contribute through reporting
+issues, posting feature requests, updating documentation, submitting pull requests or
+patches, and other activities.
+
+We are committed to making participation in this project a harassment-free experience for
+everyone, regardless of level of experience, gender, gender identity and expression,
+sexual orientation, disability, personal appearance, body size, race, ethnicity, age,
+religion, or nationality.
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery
+* Personal attacks
+* Trolling or insulting/derogatory comments
+* Public or private harassment
+* Publishing other's private information, such as physical or electronic addresses,
+  without explicit permission
+* Other unethical or unprofessional conduct
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments,
+commits, code, wiki edits, issues, and other contributions that are not aligned to this
+Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors
+that they deem inappropriate, threatening, offensive, or harmful.
+
+By adopting this Code of Conduct, project maintainers commit themselves to fairly and
+consistently applying these principles to every aspect of managing this project. Project
+maintainers who do not follow or enforce the Code of Conduct may be permanently removed
+from the project team.
+
+This Code of Conduct applies both within project spaces and in public spaces when an
+individual is representing the project or its community.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by
+contacting a project maintainer at spring-code-of-conduct@pivotal.io . All complaints will
+be reviewed and investigated and will result in a response that is deemed necessary and
+appropriate to the circumstances. Maintainers are obligated to maintain confidentiality
+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/]

CONTRIBUTING.adoc

@@ -1,170 +0,0 @@
-_Have something you'd like to contribute to the framework? We welcome pull requests, but ask that you carefully read this document first to understand how best to submit them; what kind of changes are likely to be accepted; and what to expect from the Spring Security team when evaluating your submission._
-
-_Please refer back to this document as a checklist before issuing any pull request; this will save time for everyone!_
-
-= Code of Conduct
-
-Please see our https://github.com/spring-projects/.github/blob/master/CODE_OF_CONDUCT.md[code of conduct]
-
-= 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 https://github.com/spring-projects/spring-framework/wiki/Contributor-guidelines[Spring Framework 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 https://www.springsource.org/sts[Spring Tool Suite 3.6.0+]. Other IDE's should work using Gradle's IDE support, but have not been tested.
-
-* IDE Setup
-* Install Spring Tool Suite 3.6.0+
-* You will need the following plugins installed (can be found on the Extensions Page)
- * Gradle Eclipse
- * Groovy Eclipse
-* Importing the project into Spring Tool Suite
-* File->Import…->Gradle Project
-
-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/[https://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 https://help.github.com/articles/using-pull-requests[help documentation first].
-
-= Search GitHub issues; create an issue if necessary
-
-Is there already an issue that addresses your concern? Do a bit of searching in our https://github.com/spring-projects/spring-security/issues[GitHub 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.
-
-= 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 https://gitter.im/spring-projects/spring-security[Spring Security Gitter] 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.
-
-= Sign the Contributor License Agreement
-
-If you have not previously done so, please fill out and
-submit the https://cla.pivotal.io/sign/spring[Contributor License Agreement].
-
-= Create your branch from master
-
-Create your topic branch to be submitted as a pull request from master. The Spring team will consider your pull request for backporting on a case-by-case basis; you don't need to worry about submitting anything for backporting.
-
-= 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
-
-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.
-
-= Mind the whitespace
-
-Please carefully follow the whitespace and formatting conventions already present in the framework. 
-
-. Tabs, not spaces
-. Unix (LF), not dos (CRLF) line endings
-. Eliminate all trailing whitespace
-. Aim to wrap code at 120 characters, but favor readability over wrapping
-. Preserve existing formatting; i.e. do not reformat code for its own sake
-. Search the codebase using git grep and other tools to discover common naming conventions, etc.
-. UTF-8 encoding for Java sources and XML files
-
-Whitespace management tips
-
-. You can use the https://marketplace.eclipse.org/content/anyedit-tools[AnyEdit Eclipse plugin] to ensure spaces are used and to clean up trailing whitespaces.
-. 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 https://git-scm.com/book/cs/ch7-3.html[Pro Git's Pre-Commit Hook's section]
-
-= Add Apache license header to all new classes
-
-= Update Apache license header to modified files as necessary
-
-Always check the date range in the license header. For example, if you've modified a file in 2012 whose header still reads
-<pre>
- * Copyright 2002-2011 the original author or authors.
-</pre>
-then be sure to update it to 2012 appropriately
-<pre>
- * Copyright 2002-2012 the original author or authors.
-</pre>
-
-= Use @since tags for newly-added public API types and methods
-
-e.g.
-<pre>
-/**
- * …
- *
- * @author First Last
- * @since 3.2
- * @see …
- */
-</pre>
-
-= Submit JUnit test cases for all behavior changes
-
-Search the codebase to find related unit tests and add additional `@Test` methods within. 
-
-. Any new tests should end in the name Tests (note this is plural). For example, a valid name would be `FilterChainProxyTests`. An invalid name would be `FilterChainProxyTest`.
-. 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 https://www.relaxng.org[RELAX NG] 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:
-
-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 is one: https://book.git-scm.com/4_interactive_rebasing.html[https://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:
-
-Rather, please include your first and last name, properly capitalized, as submitted against the SpringSource contributor license agreement:
-<pre>
-Author: First Last &lt;link:mailto:&#x75;&#115;&#101;&#114;&#64;&#109;&#x61;&#x69;&#108;&#46;&#99;&#111;&#x6d;&#38;&#103;&#116;[&#x75;&#115;&#101;&#114;&#64;&#109;&#x61;&#x69;&#108;&#46;&#99;&#111;&#x6d;&#38;&#103;&#116;];
-</pre>
-This helps ensure traceability against the CLA, and also goes a long way to ensuring useful output from tools like git shortlog and others.
-
-You can configure this globally via the account admin area GitHub (useful for fork-and-edit cases); globally with
-
-or locally for the spring-security repository only by omitting the '–global' flag:
-<pre>
-cd spring-security
-git config user.name "First Last"
-git config user.email link:mailto:&#x75;&#115;&#101;&#x72;&#64;&#x6d;&#x61;&#x69;&#x6c;&#46;&#x63;&#111;&#109;[&#x75;&#115;&#101;&#x72;&#64;&#x6d;&#x61;&#x69;&#x6c;&#46;&#x63;&#111;&#109;]
-</pre>
-
-= Format commit messages
-
-. Keep the subject line to 50 characters or less if possible
-. Do not end the subject line with a period
-. In the body of the commit message, explain how things worked before this commit, what has changed, and how things work now
-. Include Fixes gh-<issue-number> at the end if this fixes a GitHub issue
-. Avoid markdown, including back-ticks identifying code
-
-= Run all tests prior to submission
-
-= Submit your pull request
-
-Subject line:
-
-Follow the same conventions for pull request subject lines as mentioned above for commit message subject lines.
-
-In the body:
-
-. Explain your use case. What led you to submit this change? Why were existing mechanisms in the framework insufficient? Make a case that this is a general-purpose problem and that yours is a general-purpose solution, etc
-. Add any additional information and ask questions; start a conversation, or continue one from GitHub Issues
-. Mention any GitHub Issues
-. Also mention that you have submitted the CLA as described above
-Note that for pull requests containing a single commit, GitHub will default the subject line and body of the pull request to match the subject line and body of the commit message. This is fine, but please also include the items above in the body of the request.
-
-= Mention your pull request on the associated GitHub issue
-
-Add a comment to the associated GitHub issue(s) linking to your new pull request.
-
-= Expect discussion and rework
-
-The Spring team takes a very conservative approach to accepting contributions to the framework. This is to keep code quality and stability as high as possible, and to keep complexity at a minimum. Your changes, if accepted, may be heavily modified prior to merging. You will retain "Author:" attribution for your Git commits granted that the bulk of your changes remain intact. You may be asked to rework the submission for style (as explained above) and/or substance. Again, we strongly recommend discussing any serious submissions with the Spring Framework team prior to engaging in serious development work.
-
-Note that you can always force push (git push -f) reworked / rebased commits against the branch used to submit your pull request. i.e. you do not need to issue a new pull request when asked to make changes.

CONTRIBUTING.md

@@ -0,0 +1,211 @@
+_Have something you'd like to contribute to the framework? We welcome pull requests, but ask that you carefully read this document first to understand how best to submit them; what kind of changes are likely to be accepted; and what to expect from the Spring Security team when evaluating your submission._
+
+_Please refer back to this document as a checklist before issuing any pull request; this will save time for everyone!_
+
+# Code of Conduct
+This project adheres to the Contributor Covenant [code of conduct](CODE_OF_CONDUCT.adoc).
+By participating, you  are expected to uphold this code. Please report unacceptable behavior to spring-code-of-conduct@pivotal.io.
+
+# 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.
+
+# 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.
+
+* IDE Setup
+  * Install Spring Tool Suite 3.6.0+
+  * You will need the following plugins installed (can be found on the Extensions Page)
+   	* Gradle Eclipse
+   	* Groovy Eclipse
+* Importing the project into Spring Tool Suite
+  * File->Import...->Gradle Project
+
+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/
+
+# 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).
+
+# 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.
+
+# 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.
+
+# Sign the Contributor License Agreement
+
+If you have not previously done so, please fill out and
+submit the [Contributor License Agreement](https://cla.pivotal.io/sign/spring).
+
+# Create your branch from master
+Create your topic branch to be submitted as a pull request from master. The Spring team will consider your pull request for backporting on a case-by-case basis; you don't need to worry about submitting anything for backporting.
+
+# 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
+
+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.
+
+# Mind the whitespace
+Please carefully follow the whitespace and formatting conventions already present in the framework. 
+
+1. Tabs, not spaces
+1. Unix (LF), not dos (CRLF) line endings
+1. Eliminate all trailing whitespace
+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. 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)
+
+# Add Apache license header to all new classes
+
+<pre>
+/*
+ * Copyright 2002-2012 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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ...;
+</pre>
+# Update Apache license header to modified files as necessary
+Always check the date range in the license header. For example, if you've modified a file in 2012 whose header still reads
+<pre>
+ * Copyright 2002-2011 the original author or authors.
+</pre>
+then be sure to update it to 2012 appropriately
+<pre>
+ * Copyright 2002-2012 the original author or authors.
+</pre>
+# Use @since tags for newly-added public API types and methods
+e.g.
+<pre>
+/**
+ * ...
+ *
+ * @author First Last
+ * @since 3.2
+ * @see ...
+ */
+</pre>
+
+# Submit JUnit test cases for all behavior changes
+Search the codebase to find related unit tests and add additional `@Test` methods within. 
+
+1. Any new tests should end in the name Tests (note this is plural). For example, a valid name would be `FilterChainProxyTests`. An invalid name would be `FilterChainProxyTest`.
+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:
+
+<pre>
+./gradlew spring-security-config:rncToXsd
+</pre>
+
+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 is one: https://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:
+
+<pre>
+Author: Nickname &lt;user@mail.com&gt;
+</pre>
+Rather, please include your first and last name, properly capitalized, as submitted against the SpringSource contributor license agreement:
+<pre>
+Author: First Last &lt;user@mail.com&gt;
+</pre>
+This helps ensure traceability against the CLA, and also goes a long way to ensuring useful output from tools like git shortlog and others.
+
+You can configure this globally via the account admin area GitHub (useful for fork-and-edit cases); globally with
+
+<pre>
+git config --global user.name "First Last"
+git config --global user.email user@mail.com
+</pre>
+
+or locally for the spring-security repository only by omitting the '--global' flag:
+<pre>
+cd spring-security
+git config user.name "First Last"
+git config user.email user@mail.com
+</pre>
+
+# Format commit messages
+
+<pre>
+Short (50 chars or less) summary of changes
+
+More detailed explanatory text, if necessary.  Wrap it to about 72
+characters or so.  In some contexts, the first line is treated as the
+subject of an email and the rest of the text as the body.  The blank
+line separating the summary from the body is critical (unless you omit
+the body entirely); tools like rebase can get confused if you run the
+two together.
+
+Further paragraphs come after blank lines.
+
+ - Bullet points are okay, too
+
+ - Typically a hyphen or asterisk is used for the bullet, preceded by a
+   single space, with blank lines in between, but conventions vary here
+
+Fixes gh-123
+</pre>
+
+
+1. Keep the subject line to 50 characters or less if possible
+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
+
+<pre>
+cd spring-security
+./gradlew clean build integrationTest
+</pre>
+
+# Submit your pull request
+Subject line:
+
+Follow the same conventions for pull request subject lines as mentioned above for commit message subject lines.
+
+In the body:
+
+1. Explain your use case. What led you to submit this change? Why were existing mechanisms in the framework insufficient? Make a case that this is a general-purpose problem and that yours is a general-purpose solution, etc
+2. Add any additional information and ask questions; start a conversation, or continue one from GitHub Issues
+3. Mention any GitHub Issues
+4. Also mention that you have submitted the CLA as described above
+Note that for pull requests containing a single commit, GitHub will default the subject line and body of the pull request to match the subject line and body of the commit message. This is fine, but please also include the items above in the body of the request.
+
+# Mention your pull request on the associated GitHub issue
+Add a comment to the associated GitHub issue(s) linking to your new pull request.
+
+# Expect discussion and rework
+The Spring team takes a very conservative approach to accepting contributions to the framework. This is to keep code quality and stability as high as possible, and to keep complexity at a minimum. Your changes, if accepted, may be heavily modified prior to merging. You will retain "Author:" attribution for your Git commits granted that the bulk of your changes remain intact. You may be asked to rework the submission for style (as explained above) and/or substance. Again, we strongly recommend discussing any serious submissions with the Spring Framework team prior to engaging in serious development work.
+
+Note that you can always force push (git push -f) reworked / rebased commits against the branch used to submit your pull request. i.e. you do not need to issue a new pull request when asked to make changes.

Jenkinsfile

@@ -8,38 +8,14 @@ properties(projectProperties)
 def SUCCESS = hudson.model.Result.SUCCESS.toString()
 currentBuild.result = SUCCESS
 
-def GRADLE_ENTERPRISE_CACHE_USER = usernamePassword(credentialsId: 'gradle_enterprise_cache_user',
-		passwordVariable: 'GRADLE_ENTERPRISE_CACHE_PASSWORD',
-		usernameVariable: 'GRADLE_ENTERPRISE_CACHE_USERNAME')
-def GRADLE_ENTERPRISE_SECRET_ACCESS_KEY = string(credentialsId: 'gradle_enterprise_secret_access_key',
-		variable: 'GRADLE_ENTERPRISE_ACCESS_KEY')
-def SPRING_SIGNING_SECRING = file(credentialsId: 'spring-signing-secring.gpg', variable: 'SIGNING_KEYRING_FILE')
-def SPRING_GPG_PASSPHRASE = string(credentialsId: 'spring-gpg-passphrase', variable: 'SIGNING_PASSWORD')
-def OSSRH_CREDENTIALS = usernamePassword(credentialsId: 'oss-token', passwordVariable: 'OSSRH_PASSWORD', usernameVariable: 'OSSRH_USERNAME')
-def ARTIFACTORY_CREDENTIALS = usernamePassword(credentialsId: '02bd1690-b54f-4c9f-819d-a77cb7a9822c', usernameVariable: 'ARTIFACTORY_USERNAME', passwordVariable: 'ARTIFACTORY_PASSWORD')
-def JENKINS_PRIVATE_SSH_KEY = file(credentialsId: 'docs.spring.io-jenkins_private_ssh_key', variable: 'DEPLOY_SSH_KEY')
-def SONAR_LOGIN_CREDENTIALS = string(credentialsId: 'spring-sonar.login', variable: 'SONAR_LOGIN')
-
-def jdkEnv(String jdk = 'jdk8') {
-	def jdkTool = tool(jdk)
-	return "JAVA_HOME=${ jdkTool }"
-}
-
 try {
 	parallel check: {
 		stage('Check') {
 			node {
 				checkout scm
-				sh "git clean -dfx"
 				try {
-					withCredentials([GRADLE_ENTERPRISE_CACHE_USER,
-						 GRADLE_ENTERPRISE_SECRET_ACCESS_KEY]) {
-						withEnv([jdkEnv(),
-							 "GRADLE_ENTERPRISE_CACHE_USERNAME=${GRADLE_ENTERPRISE_CACHE_USERNAME}",
-							 "GRADLE_ENTERPRISE_CACHE_PASSWORD=${GRADLE_ENTERPRISE_CACHE_PASSWORD}",
-							 "GRADLE_ENTERPRISE_ACCESS_KEY=${GRADLE_ENTERPRISE_ACCESS_KEY}"]) {
-							sh "./gradlew check --stacktrace"
-						}
+					withEnv(["JAVA_HOME=${ tool 'jdk8' }"]) {
+						sh "./gradlew clean check  --refresh-dependencies --no-daemon --stacktrace"
 					}
 				} catch(Exception e) {
 					currentBuild.result = 'FAILED: check'
@@ -54,19 +30,13 @@ try {
 		stage('Sonar') {
 			node {
 				checkout scm
-				sh "git clean -dfx"
-				withCredentials([SONAR_LOGIN_CREDENTIALS,
-					GRADLE_ENTERPRISE_CACHE_USER,
-					GRADLE_ENTERPRISE_SECRET_ACCESS_KEY]) {
+				withCredentials([string(credentialsId: 'spring-sonar.login', variable: 'SONAR_LOGIN')]) {
 					try {
-						withEnv([jdkEnv(),
-							 "GRADLE_ENTERPRISE_CACHE_USERNAME=${GRADLE_ENTERPRISE_CACHE_USERNAME}",
-							 "GRADLE_ENTERPRISE_CACHE_PASSWORD=${GRADLE_ENTERPRISE_CACHE_PASSWORD}",
-							 "GRADLE_ENTERPRISE_ACCESS_KEY=${GRADLE_ENTERPRISE_ACCESS_KEY}"]) {
+						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 --stacktrace"
+								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 --stacktrace"
+								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"
 							}
 						}
 					} catch(Exception e) {
@@ -81,16 +51,9 @@ try {
 		stage('Snapshot Tests') {
 			node {
 				checkout scm
-				sh "git clean -dfx"
 				try {
-					withCredentials([GRADLE_ENTERPRISE_CACHE_USER,
-						 GRADLE_ENTERPRISE_SECRET_ACCESS_KEY]) {
-						withEnv([jdkEnv(),
-							 "GRADLE_ENTERPRISE_CACHE_USERNAME=${GRADLE_ENTERPRISE_CACHE_USERNAME}",
-							 "GRADLE_ENTERPRISE_CACHE_PASSWORD=${GRADLE_ENTERPRISE_CACHE_PASSWORD}",
-							 "GRADLE_ENTERPRISE_ACCESS_KEY=${GRADLE_ENTERPRISE_ACCESS_KEY}"]) {
-							sh "./gradlew test -PforceMavenRepositories=snapshot -PspringVersion='5.2.+' -PreactorVersion=Dysprosium-BUILD-SNAPSHOT -PspringDataVersion=Lovelace-BUILD-SNAPSHOT -PlocksDisabled --stacktrace"
-						}
+					withEnv(["JAVA_HOME=${ tool 'jdk8' }"]) {
+						sh "./gradlew clean test -PforceMavenRepositories=snapshot -PspringVersion='5.1.+' -PreactorVersion=Californium-BUILD-SNAPSHOT -PspringDataVersion=Lovelace-BUILD-SNAPSHOT --refresh-dependencies --no-daemon --stacktrace"
 					}
 				} catch(Exception e) {
 					currentBuild.result = 'FAILED: snapshots'
@@ -99,21 +62,43 @@ try {
 			}
 		}
 	},
+	jdk9: {
+		stage('JDK 9') {
+			node {
+				checkout scm
+				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
+				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 {
-
-					withCredentials([GRADLE_ENTERPRISE_CACHE_USER,
-						 GRADLE_ENTERPRISE_SECRET_ACCESS_KEY]) {
-						withEnv([jdkEnv("jdk11"),
-						 "GRADLE_ENTERPRISE_CACHE_USERNAME=${GRADLE_ENTERPRISE_CACHE_USERNAME}",
-						 "GRADLE_ENTERPRISE_CACHE_PASSWORD=${GRADLE_ENTERPRISE_CACHE_PASSWORD}",
-						 "GRADLE_ENTERPRISE_ACCESS_KEY=${GRADLE_ENTERPRISE_ACCESS_KEY}"]) {
-							sh "./gradlew test --stacktrace"
-						}
+					withEnv(["JAVA_HOME=${ tool 'jdk11' }"]) {
+						sh "./gradlew clean test --refresh-dependencies --no-daemon --stacktrace"
 					}
 				} catch(Exception e) {
 					currentBuild.result = 'FAILED: jdk11'
@@ -121,28 +106,6 @@ try {
 				}
 			}
 		}
-	},
-	jdk12: {
-		stage('JDK 12') {
-			node {
-				checkout scm
-				sh "git clean -dfx"
-				try {
-					withCredentials([GRADLE_ENTERPRISE_CACHE_USER,
-						 GRADLE_ENTERPRISE_SECRET_ACCESS_KEY]) {
-						withEnv([jdkEnv("openjdk12"),
-						 "GRADLE_ENTERPRISE_CACHE_USERNAME=${GRADLE_ENTERPRISE_CACHE_USERNAME}",
-						 "GRADLE_ENTERPRISE_CACHE_PASSWORD=${GRADLE_ENTERPRISE_CACHE_PASSWORD}",
-						 "GRADLE_ENTERPRISE_ACCESS_KEY=${GRADLE_ENTERPRISE_ACCESS_KEY}"]) {
-							sh "./gradlew test --stacktrace"
-						}
-					}
-				} catch(Exception e) {
-					currentBuild.result = 'FAILED: jdk12'
-					throw e
-				}
-			}
-		}
 	}
 
 	if(currentBuild.result == 'SUCCESS') {
@@ -150,18 +113,15 @@ try {
 			stage('Deploy Artifacts') {
 				node {
 					checkout scm
-					sh "git clean -dfx"
-					withCredentials([SPRING_SIGNING_SECRING,
-						 SPRING_GPG_PASSPHRASE,
-						 OSSRH_CREDENTIALS,
-						 ARTIFACTORY_CREDENTIALS,
-						 GRADLE_ENTERPRISE_CACHE_USER,
-						 GRADLE_ENTERPRISE_SECRET_ACCESS_KEY]) {
-						withEnv([jdkEnv(),
-							 "GRADLE_ENTERPRISE_CACHE_USERNAME=${GRADLE_ENTERPRISE_CACHE_USERNAME}",
-							 "GRADLE_ENTERPRISE_CACHE_PASSWORD=${GRADLE_ENTERPRISE_CACHE_PASSWORD}",
-							 "GRADLE_ENTERPRISE_ACCESS_KEY=${GRADLE_ENTERPRISE_ACCESS_KEY}"]) {
-							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 --stacktrace"
+					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"
+									}
+								}
+							}
 						}
 					}
 				}
@@ -171,18 +131,9 @@ try {
 			stage('Deploy Docs') {
 				node {
 					checkout scm
-					sh "git clean -dfx"
-					withCredentials([JENKINS_PRIVATE_SSH_KEY,
-						 SPRING_GPG_PASSPHRASE,
-						 OSSRH_CREDENTIALS,
-						 ARTIFACTORY_CREDENTIALS,
-						 GRADLE_ENTERPRISE_CACHE_USER,
-						 GRADLE_ENTERPRISE_SECRET_ACCESS_KEY]) {
-						withEnv([jdkEnv(),
-							 "GRADLE_ENTERPRISE_CACHE_USERNAME=${GRADLE_ENTERPRISE_CACHE_USERNAME}",
-							 "GRADLE_ENTERPRISE_CACHE_PASSWORD=${GRADLE_ENTERPRISE_CACHE_PASSWORD}",
-							 "GRADLE_ENTERPRISE_ACCESS_KEY=${GRADLE_ENTERPRISE_ACCESS_KEY}"]) {
-							sh "./gradlew deployDocs -PdeployDocsSshKeyPath=$DEPLOY_SSH_KEY -PdeployDocsSshUsername=$SPRING_DOCS_USERNAME --stacktrace"
+					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"
 						}
 					}
 				}
@@ -192,18 +143,9 @@ try {
 			stage('Deploy Schema') {
 				node {
 					checkout scm
-					sh "git clean -dfx"
-					withCredentials([JENKINS_PRIVATE_SSH_KEY,
-						 SPRING_GPG_PASSPHRASE,
-						 OSSRH_CREDENTIALS,
-						 ARTIFACTORY_CREDENTIALS,
-						 GRADLE_ENTERPRISE_CACHE_USER,
-						 GRADLE_ENTERPRISE_SECRET_ACCESS_KEY]) {
-						withEnv([jdkEnv(),
-							 "GRADLE_ENTERPRISE_CACHE_USERNAME=${GRADLE_ENTERPRISE_CACHE_USERNAME}",
-							 "GRADLE_ENTERPRISE_CACHE_PASSWORD=${GRADLE_ENTERPRISE_CACHE_PASSWORD}",
-							 "GRADLE_ENTERPRISE_ACCESS_KEY=${GRADLE_ENTERPRISE_ACCESS_KEY}"]) {
-							sh "./gradlew deploySchema -PdeployDocsSshKeyPath=$DEPLOY_SSH_KEY -PdeployDocsSshUsername=$SPRING_DOCS_USERNAME --stacktrace"
+					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"
 						}
 					}
 				}
@@ -227,12 +169,12 @@ try {
 				def subject = "${buildStatus}: Build ${env.JOB_NAME} ${env.BUILD_NUMBER} status is now ${buildStatus}"
 				def details = """The build status changed to ${buildStatus}. For details see ${env.BUILD_URL}"""
 
-// 				emailext (
-// 					subject: subject,
-// 					body: details,
-// 					recipientProviders: RECIPIENTS,
-// 					to: "$SPRING_SECURITY_TEAM_EMAILS"
-// 				)
+				emailext (
+					subject: subject,
+					body: details,
+					recipientProviders: RECIPIENTS,
+					to: "$SPRING_SECURITY_TEAM_EMAILS"
+				)
 			}
 		}
 	}

README.adoc

@@ -10,14 +10,15 @@ 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].
 
 == Code of Conduct
-Please see our https://github.com/spring-projects/.github/blob/master/CODE_OF_CONDUCT.md[code of conduct]
+This project adheres to the Contributor Covenant link:CODE_OF_CONDUCT.adoc[code of conduct].
+By participating, you  are expected to uphold this code. Please report unacceptable behavior to spring-code-of-conduct@pivotal.io.
 
 == Downloading Artifacts
 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].
+Extensive JavaDoc for the Spring Security code is also available in the https://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.
@@ -58,7 +59,7 @@ Check out the https://stackoverflow.com/questions/tagged/spring-security[Spring
 https://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.adoc[contributor guidelines] for details.
+https://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

acl/gradle/dependency-locks/annotationProcessor.lockfile

@@ -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-SR7
-org.jetbrains.kotlin:kotlin-bom:1.3.70
-org.springframework.data:spring-data-releasetrain:Moore-SR7
-org.springframework:spring-framework-bom:5.2.6.RELEASE

acl/gradle/dependency-locks/archives.lockfile

@@ -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-SR7
-org.jetbrains.kotlin:kotlin-bom:1.3.70
-org.springframework.data:spring-data-releasetrain:Moore-SR7
-org.springframework:spring-framework-bom:5.2.6.RELEASE

acl/gradle/dependency-locks/checkstyle.lockfile

@@ -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-SR7
-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.70
-org.springframework.data:spring-data-releasetrain:Moore-SR7
-org.springframework:spring-framework-bom:5.2.6.RELEASE

acl/gradle/dependency-locks/compile.lockfile

@@ -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-SR7
-org.jetbrains.kotlin:kotlin-bom:1.3.70
-org.springframework.data:spring-data-releasetrain:Moore-SR7
-org.springframework:spring-aop:5.2.6.RELEASE
-org.springframework:spring-beans:5.2.6.RELEASE
-org.springframework:spring-context:5.2.6.RELEASE
-org.springframework:spring-core:5.2.6.RELEASE
-org.springframework:spring-expression:5.2.6.RELEASE
-org.springframework:spring-framework-bom:5.2.6.RELEASE
-org.springframework:spring-jcl:5.2.6.RELEASE
-org.springframework:spring-jdbc:5.2.6.RELEASE
-org.springframework:spring-tx:5.2.6.RELEASE

acl/gradle/dependency-locks/compileClasspath.lockfile

@@ -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-SR7
-org.jetbrains.kotlin:kotlin-bom:1.3.70
-org.springframework.data:spring-data-releasetrain:Moore-SR7
-org.springframework:spring-aop:5.2.6.RELEASE
-org.springframework:spring-beans:5.2.6.RELEASE
-org.springframework:spring-context:5.2.6.RELEASE
-org.springframework:spring-core:5.2.6.RELEASE
-org.springframework:spring-expression:5.2.6.RELEASE
-org.springframework:spring-framework-bom:5.2.6.RELEASE
-org.springframework:spring-jcl:5.2.6.RELEASE
-org.springframework:spring-jdbc:5.2.6.RELEASE
-org.springframework:spring-tx:5.2.6.RELEASE

acl/gradle/dependency-locks/compileOnly.lockfile

@@ -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-SR7
-org.jetbrains.kotlin:kotlin-bom:1.3.70
-org.springframework.data:spring-data-releasetrain:Moore-SR7
-org.springframework:spring-framework-bom:5.2.6.RELEASE

acl/gradle/dependency-locks/default.lockfile

@@ -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-SR7
-org.jetbrains.kotlin:kotlin-bom:1.3.70
-org.springframework.data:spring-data-releasetrain:Moore-SR7
-org.springframework:spring-aop:5.2.6.RELEASE
-org.springframework:spring-beans:5.2.6.RELEASE
-org.springframework:spring-context:5.2.6.RELEASE
-org.springframework:spring-core:5.2.6.RELEASE
-org.springframework:spring-expression:5.2.6.RELEASE
-org.springframework:spring-framework-bom:5.2.6.RELEASE
-org.springframework:spring-jcl:5.2.6.RELEASE
-org.springframework:spring-jdbc:5.2.6.RELEASE
-org.springframework:spring-tx:5.2.6.RELEASE

acl/gradle/dependency-locks/jacocoAgent.lockfile

@@ -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-SR7
-org.jacoco:org.jacoco.agent:0.8.2
-org.jetbrains.kotlin:kotlin-bom:1.3.70
-org.springframework.data:spring-data-releasetrain:Moore-SR7
-org.springframework:spring-framework-bom:5.2.6.RELEASE

acl/gradle/dependency-locks/jacocoAnt.lockfile

@@ -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-SR7
-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.70
-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-SR7
-org.springframework:spring-framework-bom:5.2.6.RELEASE

acl/gradle/dependency-locks/merging.lockfile

@@ -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-SR7
-org.jetbrains.kotlin:kotlin-bom:1.3.70
-org.springframework.data:spring-data-releasetrain:Moore-SR7
-org.springframework:spring-framework-bom:5.2.6.RELEASE

acl/gradle/dependency-locks/optional.lockfile

@@ -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-SR7
-net.sf.ehcache:ehcache:2.10.6
-org.jetbrains.kotlin:kotlin-bom:1.3.70
-org.slf4j:slf4j-api:1.7.30
-org.springframework.data:spring-data-releasetrain:Moore-SR7
-org.springframework:spring-framework-bom:5.2.6.RELEASE

acl/gradle/dependency-locks/provided.lockfile

@@ -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-SR7
-org.jetbrains.kotlin:kotlin-bom:1.3.70
-org.springframework.data:spring-data-releasetrain:Moore-SR7
-org.springframework:spring-framework-bom:5.2.6.RELEASE

acl/gradle/dependency-locks/runtime.lockfile

@@ -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-SR7
-org.jetbrains.kotlin:kotlin-bom:1.3.70
-org.springframework.data:spring-data-releasetrain:Moore-SR7
-org.springframework:spring-aop:5.2.6.RELEASE
-org.springframework:spring-beans:5.2.6.RELEASE
-org.springframework:spring-context:5.2.6.RELEASE
-org.springframework:spring-core:5.2.6.RELEASE
-org.springframework:spring-expression:5.2.6.RELEASE
-org.springframework:spring-framework-bom:5.2.6.RELEASE
-org.springframework:spring-jcl:5.2.6.RELEASE
-org.springframework:spring-jdbc:5.2.6.RELEASE
-org.springframework:spring-tx:5.2.6.RELEASE

acl/gradle/dependency-locks/runtimeClasspath.lockfile

@@ -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-SR7
-org.jetbrains.kotlin:kotlin-bom:1.3.70
-org.springframework.data:spring-data-releasetrain:Moore-SR7
-org.springframework:spring-aop:5.2.6.RELEASE
-org.springframework:spring-beans:5.2.6.RELEASE
-org.springframework:spring-context:5.2.6.RELEASE
-org.springframework:spring-core:5.2.6.RELEASE
-org.springframework:spring-expression:5.2.6.RELEASE
-org.springframework:spring-framework-bom:5.2.6.RELEASE
-org.springframework:spring-jcl:5.2.6.RELEASE
-org.springframework:spring-jdbc:5.2.6.RELEASE
-org.springframework:spring-tx:5.2.6.RELEASE

acl/gradle/dependency-locks/runtimeMerge.lockfile

@@ -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-SR7
-org.jetbrains.kotlin:kotlin-bom:1.3.70
-org.springframework.data:spring-data-releasetrain:Moore-SR7
-org.springframework:spring-framework-bom:5.2.6.RELEASE

acl/gradle/dependency-locks/signatures.lockfile

@@ -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-SR7
-org.jetbrains.kotlin:kotlin-bom:1.3.70
-org.springframework.data:spring-data-releasetrain:Moore-SR7
-org.springframework:spring-framework-bom:5.2.6.RELEASE

acl/gradle/dependency-locks/testAnnotationProcessor.lockfile

@@ -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-SR7
-org.jetbrains.kotlin:kotlin-bom:1.3.70
-org.springframework.data:spring-data-releasetrain:Moore-SR7
-org.springframework:spring-framework-bom:5.2.6.RELEASE

acl/gradle/dependency-locks/testCompile.lockfile

@@ -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-SR7
-junit:junit:4.12
-net.bytebuddy:byte-buddy-agent:1.10.5
-net.bytebuddy:byte-buddy:1.10.5
-org.assertj:assertj-core:3.16.0
-org.hamcrest:hamcrest-core:1.3
-org.jetbrains.kotlin:kotlin-bom:1.3.70
-org.mockito:mockito-core:3.3.3
-org.objenesis:objenesis:2.6
-org.springframework.data:spring-data-releasetrain:Moore-SR7
-org.springframework:spring-aop:5.2.6.RELEASE
-org.springframework:spring-beans:5.2.6.RELEASE
-org.springframework:spring-context-support:5.2.6.RELEASE
-org.springframework:spring-context:5.2.6.RELEASE
-org.springframework:spring-core:5.2.6.RELEASE
-org.springframework:spring-expression:5.2.6.RELEASE
-org.springframework:spring-framework-bom:5.2.6.RELEASE
-org.springframework:spring-jcl:5.2.6.RELEASE
-org.springframework:spring-jdbc:5.2.6.RELEASE
-org.springframework:spring-test:5.2.6.RELEASE
-org.springframework:spring-tx:5.2.6.RELEASE

acl/gradle/dependency-locks/testCompileClasspath.lockfile

@@ -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-SR7
-junit:junit:4.12
-net.bytebuddy:byte-buddy-agent:1.10.5
-net.bytebuddy:byte-buddy:1.10.5
-org.assertj:assertj-core:3.16.0
-org.hamcrest:hamcrest-core:1.3
-org.jetbrains.kotlin:kotlin-bom:1.3.70
-org.mockito:mockito-core:3.3.3
-org.objenesis:objenesis:2.6
-org.springframework.data:spring-data-releasetrain:Moore-SR7
-org.springframework:spring-aop:5.2.6.RELEASE
-org.springframework:spring-beans:5.2.6.RELEASE
-org.springframework:spring-context-support:5.2.6.RELEASE
-org.springframework:spring-context:5.2.6.RELEASE
-org.springframework:spring-core:5.2.6.RELEASE
-org.springframework:spring-expression:5.2.6.RELEASE
-org.springframework:spring-framework-bom:5.2.6.RELEASE
-org.springframework:spring-jcl:5.2.6.RELEASE
-org.springframework:spring-jdbc:5.2.6.RELEASE
-org.springframework:spring-test:5.2.6.RELEASE
-org.springframework:spring-tx:5.2.6.RELEASE

acl/gradle/dependency-locks/testCompileOnly.lockfile

@@ -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-SR7
-org.jetbrains.kotlin:kotlin-bom:1.3.70
-org.springframework.data:spring-data-releasetrain:Moore-SR7
-org.springframework:spring-framework-bom:5.2.6.RELEASE

acl/gradle/dependency-locks/testRuntime.lockfile

@@ -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-SR7
-junit:junit:4.12
-net.bytebuddy:byte-buddy-agent:1.10.5
-net.bytebuddy:byte-buddy:1.10.5
-org.assertj:assertj-core:3.16.0
-org.hamcrest:hamcrest-core:1.3
-org.hsqldb:hsqldb:2.5.0
-org.jetbrains.kotlin:kotlin-bom:1.3.70
-org.mockito:mockito-core:3.3.3
-org.objenesis:objenesis:2.6
-org.springframework.data:spring-data-releasetrain:Moore-SR7
-org.springframework:spring-aop:5.2.6.RELEASE
-org.springframework:spring-beans:5.2.6.RELEASE
-org.springframework:spring-context-support:5.2.6.RELEASE
-org.springframework:spring-context:5.2.6.RELEASE
-org.springframework:spring-core:5.2.6.RELEASE
-org.springframework:spring-expression:5.2.6.RELEASE
-org.springframework:spring-framework-bom:5.2.6.RELEASE
-org.springframework:spring-jcl:5.2.6.RELEASE
-org.springframework:spring-jdbc:5.2.6.RELEASE
-org.springframework:spring-test:5.2.6.RELEASE
-org.springframework:spring-tx:5.2.6.RELEASE

acl/gradle/dependency-locks/testRuntimeClasspath.lockfile

@@ -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-SR7
-junit:junit:4.12
-net.bytebuddy:byte-buddy-agent:1.10.5
-net.bytebuddy:byte-buddy:1.10.5
-org.assertj:assertj-core:3.16.0
-org.hamcrest:hamcrest-core:1.3
-org.hsqldb:hsqldb:2.5.0
-org.jetbrains.kotlin:kotlin-bom:1.3.70
-org.mockito:mockito-core:3.3.3
-org.objenesis:objenesis:2.6
-org.springframework.data:spring-data-releasetrain:Moore-SR7
-org.springframework:spring-aop:5.2.6.RELEASE
-org.springframework:spring-beans:5.2.6.RELEASE
-org.springframework:spring-context-support:5.2.6.RELEASE
-org.springframework:spring-context:5.2.6.RELEASE
-org.springframework:spring-core:5.2.6.RELEASE
-org.springframework:spring-expression:5.2.6.RELEASE
-org.springframework:spring-framework-bom:5.2.6.RELEASE
-org.springframework:spring-jcl:5.2.6.RELEASE
-org.springframework:spring-jdbc:5.2.6.RELEASE
-org.springframework:spring-test:5.2.6.RELEASE
-org.springframework:spring-tx:5.2.6.RELEASE

acl/gradle/dependency-locks/tests.lockfile

@@ -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-SR7
-junit:junit:4.12
-net.bytebuddy:byte-buddy-agent:1.10.5
-net.bytebuddy:byte-buddy:1.10.5
-org.assertj:assertj-core:3.16.0
-org.hamcrest:hamcrest-core:1.3
-org.hsqldb:hsqldb:2.5.0
-org.jetbrains.kotlin:kotlin-bom:1.3.70
-org.mockito:mockito-core:3.3.3
-org.objenesis:objenesis:2.6
-org.springframework.data:spring-data-releasetrain:Moore-SR7
-org.springframework:spring-aop:5.2.6.RELEASE
-org.springframework:spring-beans:5.2.6.RELEASE
-org.springframework:spring-context-support:5.2.6.RELEASE
-org.springframework:spring-context:5.2.6.RELEASE
-org.springframework:spring-core:5.2.6.RELEASE
-org.springframework:spring-expression:5.2.6.RELEASE
-org.springframework:spring-framework-bom:5.2.6.RELEASE
-org.springframework:spring-jcl:5.2.6.RELEASE
-org.springframework:spring-jdbc:5.2.6.RELEASE
-org.springframework:spring-test:5.2.6.RELEASE
-org.springframework:spring-tx:5.2.6.RELEASE

acl/src/main/java/org/springframework/security/acls/AclPermissionEvaluator.java

@@ -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) {

acl/src/main/java/org/springframework/security/acls/domain/DefaultPermissionFactory.java

@@ -100,7 +100,7 @@ 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),
@@ -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

acl/src/main/java/org/springframework/security/acls/domain/DefaultPermissionGrantingStrategy.java

@@ -1,5 +1,5 @@
 /*
- * 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.
@@ -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();
-	}
-
 }

acl/src/main/java/org/springframework/security/acls/domain/ObjectIdentityImpl.java

@@ -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

acl/src/main/java/org/springframework/security/acls/domain/PrincipalSid.java

@@ -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

acl/src/main/java/org/springframework/security/acls/jdbc/AclClassIdUtils.java

@@ -1,5 +1,5 @@
 /*
- * 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.
@@ -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 (canConvertFromStringTo(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);
-		}
-	}
 }

acl/src/main/java/org/springframework/security/acls/jdbc/BasicLookupStrategy.java

@@ -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;
 		}
 

acl/src/main/java/org/springframework/security/acls/jdbc/JdbcAclService.java

@@ -1,5 +1,5 @@
 /*
- * 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.
@@ -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) {
@@ -112,7 +113,7 @@ public class JdbcAclService implements AclService {
 		Assert.isTrue(map.containsKey(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() {

acl/src/main/java/org/springframework/security/acls/jdbc/JdbcMutableAclService.java

@@ -1,5 +1,5 @@
 /*
- * 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.
@@ -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");

acl/src/test/java/org/springframework/security/acls/AclFormattingUtilsTests.java

@@ -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(
 				"............................****");
 

acl/src/test/java/org/springframework/security/acls/AclPermissionCacheOptimizerTests.java

@@ -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);

acl/src/test/java/org/springframework/security/acls/AclPermissionEvaluatorTests.java

@@ -1,5 +1,5 @@
 /*
- * 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.
@@ -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();
 

acl/src/test/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationCollectionFilteringProviderTests.java

@@ -37,7 +37,7 @@ import java.util.List;
 @SuppressWarnings({ "unchecked" })
 public class AclEntryAfterInvocationCollectionFilteringProviderTests {
 	@Test
-	public void objectsAreRemovedIfPermissionDenied() {
+	public void objectsAreRemovedIfPermissionDenied() throws Exception {
 		AclService service = mock(AclService.class);
 		Acl acl = mock(Acl.class);
 		when(acl.isGranted(any(), any(), anyBoolean())).thenReturn(
@@ -63,7 +63,7 @@ public class AclEntryAfterInvocationCollectionFilteringProviderTests {
 	}
 
 	@Test
-	public void accessIsGrantedIfNoAttributesDefined() {
+	public void accessIsGrantedIfNoAttributesDefined() throws Exception {
 		AclEntryAfterInvocationCollectionFilteringProvider provider = new AclEntryAfterInvocationCollectionFilteringProvider(
 				mock(AclService.class), Arrays.asList(mock(Permission.class)));
 		Object returned = new Object();
@@ -75,7 +75,7 @@ public class AclEntryAfterInvocationCollectionFilteringProviderTests {
 	}
 
 	@Test
-	public void nullReturnObjectIsIgnored() {
+	public void nullReturnObjectIsIgnored() throws Exception {
 		AclService service = mock(AclService.class);
 		AclEntryAfterInvocationCollectionFilteringProvider provider = new AclEntryAfterInvocationCollectionFilteringProvider(
 				service, Arrays.asList(mock(Permission.class)));

acl/src/test/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationProviderTests.java

@@ -37,7 +37,7 @@ import java.util.List;
 public class AclEntryAfterInvocationProviderTests {
 
 	@Test(expected = IllegalArgumentException.class)
-	public void rejectsMissingPermissions() {
+	public void rejectsMissingPermissions() throws Exception {
 		try {
 			new AclEntryAfterInvocationProvider(mock(AclService.class), null);
 			fail("Exception expected");
@@ -72,7 +72,7 @@ public class AclEntryAfterInvocationProviderTests {
 	}
 
 	@Test
-	public void accessIsGrantedIfNoAttributesDefined() {
+	public void accessIsGrantedIfNoAttributesDefined() throws Exception {
 		AclEntryAfterInvocationProvider provider = new AclEntryAfterInvocationProvider(
 				mock(AclService.class), Arrays.asList(mock(Permission.class)));
 		Object returned = new Object();
@@ -85,7 +85,7 @@ public class AclEntryAfterInvocationProviderTests {
 	}
 
 	@Test
-	public void accessIsGrantedIfObjectTypeNotSupported() {
+	public void accessIsGrantedIfObjectTypeNotSupported() throws Exception {
 		AclEntryAfterInvocationProvider provider = new AclEntryAfterInvocationProvider(
 				mock(AclService.class), Arrays.asList(mock(Permission.class)));
 		provider.setProcessDomainObjectClass(String.class);
@@ -131,7 +131,7 @@ public class AclEntryAfterInvocationProviderTests {
 	}
 
 	@Test
-	public void nullReturnObjectIsIgnored() {
+	public void nullReturnObjectIsIgnored() throws Exception {
 		AclService service = mock(AclService.class);
 		AclEntryAfterInvocationProvider provider = new AclEntryAfterInvocationProvider(
 				service, Arrays.asList(mock(Permission.class)));

acl/src/test/java/org/springframework/security/acls/domain/AccessControlImplEntryTests.java

@@ -71,11 +71,11 @@ public class AccessControlImplEntryTests {
 		Sid sid = new PrincipalSid("johndoe");
 
 		// Create a sample entry
-		AccessControlEntry ace = new AccessControlEntryImpl(1L, mockAcl,
+		AccessControlEntry ace = new AccessControlEntryImpl(Long.valueOf(1), mockAcl,
 				sid, BasePermission.ADMINISTRATION, true, true, true);
 
 		// and check every get() method
-		assertThat(ace.getId()).isEqualTo(1L);
+		assertThat(ace.getId()).isEqualTo(new Long(1));
 		assertThat(ace.getAcl()).isEqualTo(mockAcl);
 		assertThat(ace.getSid()).isEqualTo(sid);
 		assertThat(ace.isGranting()).isTrue();
@@ -92,26 +92,26 @@ public class AccessControlImplEntryTests {
 		when(mockAcl.getObjectIdentity()).thenReturn(oid);
 		Sid sid = new PrincipalSid("johndoe");
 
-		AccessControlEntry ace = new AccessControlEntryImpl(1L, mockAcl,
+		AccessControlEntry ace = new AccessControlEntryImpl(Long.valueOf(1), mockAcl,
 				sid, BasePermission.ADMINISTRATION, true, true, true);
 
 		assertThat(ace).isNotNull();
-		assertThat(ace).isNotEqualTo(100L);
+		assertThat(ace).isNotEqualTo(Long.valueOf(100));
 		assertThat(ace).isEqualTo(ace);
-		assertThat(ace).isEqualTo(new AccessControlEntryImpl(1L, mockAcl, sid,
+		assertThat(ace).isEqualTo(new AccessControlEntryImpl(Long.valueOf(1), mockAcl, sid,
 				BasePermission.ADMINISTRATION, true, true, true));
-		assertThat(ace).isNotEqualTo(new AccessControlEntryImpl(2L, mockAcl, sid,
+		assertThat(ace).isNotEqualTo(new AccessControlEntryImpl(Long.valueOf(2), mockAcl, sid,
 				BasePermission.ADMINISTRATION, true, true, true));
-		assertThat(ace).isNotEqualTo(new AccessControlEntryImpl(1L, mockAcl,
+		assertThat(ace).isNotEqualTo(new AccessControlEntryImpl(Long.valueOf(1), mockAcl,
 				new PrincipalSid("scott"), BasePermission.ADMINISTRATION, true, true,
 				true));
-		assertThat(ace).isNotEqualTo(new AccessControlEntryImpl(1L, mockAcl, sid,
+		assertThat(ace).isNotEqualTo(new AccessControlEntryImpl(Long.valueOf(1), mockAcl, sid,
 				BasePermission.WRITE, true, true, true));
-		assertThat(ace).isNotEqualTo(new AccessControlEntryImpl(1L, mockAcl, sid,
+		assertThat(ace).isNotEqualTo(new AccessControlEntryImpl(Long.valueOf(1), mockAcl, sid,
 				BasePermission.ADMINISTRATION, false, true, true));
-		assertThat(ace).isNotEqualTo(new AccessControlEntryImpl(1L, mockAcl, sid,
+		assertThat(ace).isNotEqualTo(new AccessControlEntryImpl(Long.valueOf(1), mockAcl, sid,
 				BasePermission.ADMINISTRATION, true, false, true));
-		assertThat(ace).isNotEqualTo(new AccessControlEntryImpl(1L, mockAcl, sid,
+		assertThat(ace).isNotEqualTo(new AccessControlEntryImpl(Long.valueOf(1), mockAcl, sid,
 				BasePermission.ADMINISTRATION, true, true, false));
 	}
 }

acl/src/test/java/org/springframework/security/acls/domain/AclImplTests.java

@@ -49,28 +49,26 @@ public class AclImplTests {
 	PermissionGrantingStrategy pgs;
 	AuditLogger mockAuditLogger;
 	ObjectIdentity objectIdentity = new ObjectIdentityImpl(TARGET_CLASS, 100);
-	private DefaultPermissionFactory permissionFactory;
 
 	// ~ Methods
 	// ========================================================================================================
 
 	@Before
-	public void setUp() {
+	public void setUp() throws Exception {
 		SecurityContextHolder.getContext().setAuthentication(auth);
 		authzStrategy = mock(AclAuthorizationStrategy.class);
 		mockAuditLogger = mock(AuditLogger.class);
 		pgs = new DefaultPermissionGrantingStrategy(mockAuditLogger);
 		auth.setAuthenticated(true);
-		permissionFactory = new DefaultPermissionFactory();
 	}
 
 	@After
-	public void tearDown() {
+	public void tearDown() throws Exception {
 		SecurityContextHolder.clearContext();
 	}
 
 	@Test(expected = IllegalArgumentException.class)
-	public void constructorsRejectNullObjectIdentity() {
+	public void constructorsRejectNullObjectIdentity() throws Exception {
 		try {
 			new AclImpl(null, 1, authzStrategy, pgs, null, null, true, new PrincipalSid(
 					"joe"));
@@ -82,7 +80,7 @@ public class AclImplTests {
 	}
 
 	@Test(expected = IllegalArgumentException.class)
-	public void constructorsRejectNullId() {
+	public void constructorsRejectNullId() throws Exception {
 		try {
 			new AclImpl(objectIdentity, null, authzStrategy, pgs, null, null, true,
 					new PrincipalSid("joe"));
@@ -95,7 +93,7 @@ public class AclImplTests {
 
 	@SuppressWarnings("deprecation")
 	@Test(expected = IllegalArgumentException.class)
-	public void constructorsRejectNullAclAuthzStrategy() {
+	public void constructorsRejectNullAclAuthzStrategy() throws Exception {
 		try {
 			new AclImpl(objectIdentity, 1, null, new DefaultPermissionGrantingStrategy(
 					mockAuditLogger), null, null, true, new PrincipalSid("joe"));
@@ -107,7 +105,7 @@ public class AclImplTests {
 	}
 
 	@Test
-	public void insertAceRejectsNullParameters() {
+	public void insertAceRejectsNullParameters() throws Exception {
 		MutableAcl acl = new AclImpl(objectIdentity, 1, authzStrategy, pgs, null, null,
 				true, new PrincipalSid("joe"));
 		try {
@@ -125,7 +123,7 @@ public class AclImplTests {
 	}
 
 	@Test
-	public void insertAceAddsElementAtCorrectIndex() {
+	public void insertAceAddsElementAtCorrectIndex() throws Exception {
 		MutableAcl acl = new AclImpl(objectIdentity, 1, authzStrategy, pgs, null, null,
 				true, new PrincipalSid("joe"));
 		MockAclService service = new MockAclService();
@@ -168,7 +166,7 @@ public class AclImplTests {
 	}
 
 	@Test(expected = NotFoundException.class)
-	public void insertAceFailsForNonExistentElement() {
+	public void insertAceFailsForNonExistentElement() throws Exception {
 		MutableAcl acl = new AclImpl(objectIdentity, 1, authzStrategy, pgs, null, null,
 				true, new PrincipalSid("joe"));
 		MockAclService service = new MockAclService();
@@ -182,7 +180,7 @@ public class AclImplTests {
 	}
 
 	@Test
-	public void deleteAceKeepsInitialOrdering() {
+	public void deleteAceKeepsInitialOrdering() throws Exception {
 		MutableAcl acl = new AclImpl(objectIdentity, 1, authzStrategy, pgs, null, null,
 				true, new PrincipalSid("joe"));
 		MockAclService service = new MockAclService();
@@ -219,7 +217,7 @@ public class AclImplTests {
 	}
 
 	@Test
-	public void deleteAceFailsForNonExistentElement() {
+	public void deleteAceFailsForNonExistentElement() throws Exception {
 		AclAuthorizationStrategyImpl strategy = new AclAuthorizationStrategyImpl(
 				new SimpleGrantedAuthority("ROLE_OWNERSHIP"), new SimpleGrantedAuthority(
 						"ROLE_AUDITING"), new SimpleGrantedAuthority("ROLE_GENERAL"));
@@ -234,7 +232,7 @@ public class AclImplTests {
 	}
 
 	@Test
-	public void isGrantingRejectsEmptyParameters() {
+	public void isGrantingRejectsEmptyParameters() throws Exception {
 		MutableAcl acl = new AclImpl(objectIdentity, 1, authzStrategy, pgs, null, null,
 				true, new PrincipalSid("joe"));
 		Sid ben = new PrincipalSid("ben");
@@ -253,7 +251,7 @@ public class AclImplTests {
 	}
 
 	@Test
-	public void isGrantingGrantsAccessForAclWithNoParent() {
+	public void isGrantingGrantsAccessForAclWithNoParent() throws Exception {
 		Authentication auth = new TestingAuthenticationToken("ben", "ignored",
 				"ROLE_GENERAL", "ROLE_GUEST");
 		auth.setAuthenticated(true);
@@ -299,7 +297,7 @@ public class AclImplTests {
 	}
 
 	@Test
-	public void isGrantingGrantsAccessForInheritableAcls() {
+	public void isGrantingGrantsAccessForInheritableAcls() throws Exception {
 		Authentication auth = new TestingAuthenticationToken("ben", "ignored",
 				"ROLE_GENERAL");
 		auth.setAuthenticated(true);
@@ -381,7 +379,7 @@ public class AclImplTests {
 	}
 
 	@Test
-	public void updatedAceValuesAreCorrectlyReflectedInAcl() {
+	public void updatedAceValuesAreCorrectlyReflectedInAcl() throws Exception {
 		Authentication auth = new TestingAuthenticationToken("ben", "ignored",
 				"ROLE_GENERAL");
 		auth.setAuthenticated(true);
@@ -413,7 +411,7 @@ public class AclImplTests {
 	}
 
 	@Test
-	public void auditableEntryFlagsAreUpdatedCorrectly() {
+	public void auditableEntryFlagsAreUpdatedCorrectly() throws Exception {
 		Authentication auth = new TestingAuthenticationToken("ben", "ignored",
 				"ROLE_AUDITING", "ROLE_GENERAL");
 		auth.setAuthenticated(true);
@@ -451,7 +449,7 @@ public class AclImplTests {
 	}
 
 	@Test
-	public void gettersAndSettersAreConsistent() {
+	public void gettersAndSettersAreConsistent() throws Exception {
 		Authentication auth = new TestingAuthenticationToken("ben", "ignored",
 				"ROLE_GENERAL");
 		auth.setAuthenticated(true);
@@ -487,7 +485,7 @@ public class AclImplTests {
 	}
 
 	@Test
-	public void isSidLoadedBehavesAsExpected() {
+	public void isSidLoadedBehavesAsExpected() throws Exception {
 		List<Sid> loadedSids = Arrays.asList(new PrincipalSid("ben"),
 				new GrantedAuthoritySid("ROLE_IGNORED"));
 		MutableAcl acl = new AclImpl(objectIdentity, 1, authzStrategy, pgs, null,
@@ -503,33 +501,34 @@ public class AclImplTests {
 		assertThat(acl.isSidLoaded(BEN)).isTrue();
 		assertThat(acl.isSidLoaded(null)).isTrue();
 		assertThat(acl.isSidLoaded(new ArrayList<>(0))).isTrue();
-		assertThat(acl.isSidLoaded(Arrays.asList(new GrantedAuthoritySid(
+		assertThat(acl.isSidLoaded(Arrays.asList((Sid) new GrantedAuthoritySid(
 				"ROLE_IGNORED"), new GrantedAuthoritySid("ROLE_IGNORED"))))
 			.isTrue();
-		assertThat(acl.isSidLoaded(Arrays.asList(new GrantedAuthoritySid(
+		assertThat(acl.isSidLoaded(Arrays.asList((Sid) new GrantedAuthoritySid(
 				"ROLE_GENERAL"), new GrantedAuthoritySid("ROLE_IGNORED"))))
 			.isFalse();
-		assertThat(acl.isSidLoaded(Arrays.asList(new GrantedAuthoritySid(
+		assertThat(acl.isSidLoaded(Arrays.asList((Sid) new GrantedAuthoritySid(
 				"ROLE_IGNORED"), new GrantedAuthoritySid("ROLE_GENERAL"))))
 			.isFalse();
 	}
 
 	@Test(expected = NotFoundException.class)
-	public void insertAceRaisesNotFoundExceptionForIndexLessThanZero() {
+	public void insertAceRaisesNotFoundExceptionForIndexLessThanZero() throws Exception {
 		AclImpl acl = new AclImpl(objectIdentity, 1, authzStrategy, pgs, null, null,
 				true, new PrincipalSid("joe"));
 		acl.insertAce(-1, mock(Permission.class), mock(Sid.class), true);
 	}
 
 	@Test(expected = NotFoundException.class)
-	public void deleteAceRaisesNotFoundExceptionForIndexLessThanZero() {
+	public void deleteAceRaisesNotFoundExceptionForIndexLessThanZero() throws Exception {
 		AclImpl acl = new AclImpl(objectIdentity, 1, authzStrategy, pgs, null, null,
 				true, new PrincipalSid("joe"));
 		acl.deleteAce(-1);
 	}
 
 	@Test(expected = NotFoundException.class)
-	public void insertAceRaisesNotFoundExceptionForIndexGreaterThanSize() {
+	public void insertAceRaisesNotFoundExceptionForIndexGreaterThanSize()
+			throws Exception {
 		AclImpl acl = new AclImpl(objectIdentity, 1, authzStrategy, pgs, null, null,
 				true, new PrincipalSid("joe"));
 		// Insert at zero, OK.
@@ -540,7 +539,7 @@ public class AclImplTests {
 
 	// SEC-1151
 	@Test(expected = NotFoundException.class)
-	public void deleteAceRaisesNotFoundExceptionForIndexEqualToSize() {
+	public void deleteAceRaisesNotFoundExceptionForIndexEqualToSize() throws Exception {
 		AclImpl acl = new AclImpl(objectIdentity, 1, authzStrategy, pgs, null, null,
 				true, new PrincipalSid("joe"));
 		acl.insertAce(0, mock(Permission.class), mock(Sid.class), true);
@@ -550,7 +549,7 @@ public class AclImplTests {
 
 	// SEC-1795
 	@Test
-	public void changingParentIsSuccessful() {
+	public void changingParentIsSuccessful() throws Exception {
 		AclImpl parentAcl = new AclImpl(objectIdentity, 1L, authzStrategy,
 				mockAuditLogger);
 		AclImpl childAcl = new AclImpl(objectIdentity, 2L, authzStrategy, mockAuditLogger);
@@ -561,39 +560,9 @@ public class AclImplTests {
 		childAcl.setParent(changeParentAcl);
 	}
 
-	// SEC-2342
-	@Test
-	public void maskPermissionGrantingStrategy() {
-		DefaultPermissionGrantingStrategy maskPgs = new MaskPermissionGrantingStrategy(mockAuditLogger);
-		MockAclService service = new MockAclService();
-		AclImpl acl = new AclImpl(objectIdentity, 1, authzStrategy, maskPgs, null, null,
-				true, new PrincipalSid("joe"));
-		Permission permission = permissionFactory.buildFromMask(BasePermission.READ.getMask() | BasePermission.WRITE.getMask());
-		Sid sid = new PrincipalSid("ben");
-		acl.insertAce(0, permission, sid, true);
-		service.updateAcl(acl);
-		List<Permission> permissions = Arrays.asList(BasePermission.READ);
-		List<Sid> sids = Arrays.asList(sid);
-		assertThat(acl.isGranted(permissions, sids, false)).isTrue();
-	}
-
 	// ~ Inner Classes
 	// ==================================================================================================
 
-	private static class MaskPermissionGrantingStrategy extends DefaultPermissionGrantingStrategy {
-		MaskPermissionGrantingStrategy(AuditLogger auditLogger) {
-			super(auditLogger);
-		}
-
-		@Override
-		protected boolean isGranted(AccessControlEntry ace, Permission p) {
-			if (p.getMask() != 0) {
-				return (p.getMask() & ace.getPermission().getMask()) != 0;
-			}
-			return super.isGranted(ace, p);
-		}
-	}
-
 	private class MockAclService implements MutableAclService {
 		public MutableAcl createAcl(ObjectIdentity objectIdentity)
 				throws AlreadyExistsException {

acl/src/test/java/org/springframework/security/acls/domain/AclImplementationSecurityCheckTests.java

@@ -41,28 +41,28 @@ public class AclImplementationSecurityCheckTests {
 	// ========================================================================================================
 
 	@Before
-	public void setUp() {
+	public void setUp() throws Exception {
 		SecurityContextHolder.clearContext();
 	}
 
 	@After
-	public void tearDown() {
+	public void tearDown() throws Exception {
 		SecurityContextHolder.clearContext();
 	}
 
 	@Test
-	public void testSecurityCheckNoACEs() {
+	public void testSecurityCheckNoACEs() throws Exception {
 		Authentication auth = new TestingAuthenticationToken("user", "password",
 				"ROLE_GENERAL", "ROLE_AUDITING", "ROLE_OWNERSHIP");
 		auth.setAuthenticated(true);
 		SecurityContextHolder.getContext().setAuthentication(auth);
 
-		ObjectIdentity identity = new ObjectIdentityImpl(TARGET_CLASS, 100L);
+		ObjectIdentity identity = new ObjectIdentityImpl(TARGET_CLASS, new Long(100));
 		AclAuthorizationStrategy aclAuthorizationStrategy = new AclAuthorizationStrategyImpl(
 				new SimpleGrantedAuthority("ROLE_OWNERSHIP"), new SimpleGrantedAuthority(
 						"ROLE_AUDITING"), new SimpleGrantedAuthority("ROLE_GENERAL"));
 
-		Acl acl = new AclImpl(identity, 1L, aclAuthorizationStrategy,
+		Acl acl = new AclImpl(identity, new Long(1), aclAuthorizationStrategy,
 				new ConsoleAuditLogger());
 
 		aclAuthorizationStrategy.securityCheck(acl,
@@ -76,7 +76,7 @@ public class AclImplementationSecurityCheckTests {
 		AclAuthorizationStrategy aclAuthorizationStrategy2 = new AclAuthorizationStrategyImpl(
 				new SimpleGrantedAuthority("ROLE_ONE"), new SimpleGrantedAuthority(
 						"ROLE_TWO"), new SimpleGrantedAuthority("ROLE_THREE"));
-		Acl acl2 = new AclImpl(identity, 1L, aclAuthorizationStrategy2,
+		Acl acl2 = new AclImpl(identity, new Long(1), aclAuthorizationStrategy2,
 				new ConsoleAuditLogger());
 		// Check access in case the principal has no authorization rights
 		try {
@@ -103,14 +103,14 @@ public class AclImplementationSecurityCheckTests {
 	}
 
 	@Test
-	public void testSecurityCheckWithMultipleACEs() {
+	public void testSecurityCheckWithMultipleACEs() throws Exception {
 		// Create a simple authentication with ROLE_GENERAL
 		Authentication auth = new TestingAuthenticationToken("user", "password",
 				"ROLE_GENERAL");
 		auth.setAuthenticated(true);
 		SecurityContextHolder.getContext().setAuthentication(auth);
 
-		ObjectIdentity identity = new ObjectIdentityImpl(TARGET_CLASS, 100L);
+		ObjectIdentity identity = new ObjectIdentityImpl(TARGET_CLASS, new Long(100));
 		// Authorization strategy will require a different role for each access
 		AclAuthorizationStrategy aclAuthorizationStrategy = new AclAuthorizationStrategyImpl(
 				new SimpleGrantedAuthority("ROLE_OWNERSHIP"), new SimpleGrantedAuthority(
@@ -118,7 +118,7 @@ public class AclImplementationSecurityCheckTests {
 
 		// Let's give the principal the ADMINISTRATION permission, without
 		// granting access
-		MutableAcl aclFirstDeny = new AclImpl(identity, 1L,
+		MutableAcl aclFirstDeny = new AclImpl(identity, new Long(1),
 				aclAuthorizationStrategy, new ConsoleAuditLogger());
 		aclFirstDeny.insertAce(0, BasePermission.ADMINISTRATION, new PrincipalSid(auth),
 				false);
@@ -160,7 +160,7 @@ public class AclImplementationSecurityCheckTests {
 
 		// Create another ACL and give the principal the ADMINISTRATION
 		// permission, with granting access
-		MutableAcl aclFirstAllow = new AclImpl(identity, 1L,
+		MutableAcl aclFirstAllow = new AclImpl(identity, new Long(1),
 				aclAuthorizationStrategy, new ConsoleAuditLogger());
 		aclFirstAllow.insertAce(0, BasePermission.ADMINISTRATION, new PrincipalSid(auth),
 				true);
@@ -184,7 +184,7 @@ public class AclImplementationSecurityCheckTests {
 		}
 
 		// Create an ACL with no ACE
-		MutableAcl aclNoACE = new AclImpl(identity, 1L,
+		MutableAcl aclNoACE = new AclImpl(identity, new Long(1),
 				aclAuthorizationStrategy, new ConsoleAuditLogger());
 		try {
 			aclAuthorizationStrategy.securityCheck(aclNoACE,
@@ -206,7 +206,7 @@ public class AclImplementationSecurityCheckTests {
 	}
 
 	@Test
-	public void testSecurityCheckWithInheritableACEs() {
+	public void testSecurityCheckWithInheritableACEs() throws Exception {
 		// Create a simple authentication with ROLE_GENERAL
 		Authentication auth = new TestingAuthenticationToken("user", "password",
 				"ROLE_GENERAL");
@@ -273,7 +273,7 @@ public class AclImplementationSecurityCheckTests {
 	}
 
 	@Test
-	public void testSecurityCheckPrincipalOwner() {
+	public void testSecurityCheckPrincipalOwner() throws Exception {
 		Authentication auth = new TestingAuthenticationToken("user", "password",
 				"ROLE_ONE");
 		auth.setAuthenticated(true);

acl/src/test/java/org/springframework/security/acls/domain/AuditLoggerTests.java

@@ -44,7 +44,7 @@ public class AuditLoggerTests {
 	// ========================================================================================================
 
 	@Before
-	public void setUp() {
+	public void setUp() throws Exception {
 		logger = new ConsoleAuditLogger();
 		ace = mock(AuditableAccessControlEntry.class);
 		console = System.out;
@@ -52,7 +52,7 @@ public class AuditLoggerTests {
 	}
 
 	@After
-	public void tearDown() {
+	public void tearDown() throws Exception {
 		System.setOut(console);
 		bytes.reset();
 	}
@@ -65,14 +65,14 @@ public class AuditLoggerTests {
 	}
 
 	@Test
-	public void successIsNotLoggedIfAceDoesntRequireSuccessAudit() {
+	public void successIsNotLoggedIfAceDoesntRequireSuccessAudit() throws Exception {
 		when(ace.isAuditSuccess()).thenReturn(false);
 		logger.logIfNeeded(true, ace);
 		assertThat(bytes.size()).isZero();
 	}
 
 	@Test
-	public void successIsLoggedIfAceRequiresSuccessAudit() {
+	public void successIsLoggedIfAceRequiresSuccessAudit() throws Exception {
 		when(ace.isAuditSuccess()).thenReturn(true);
 
 		logger.logIfNeeded(true, ace);
@@ -80,14 +80,14 @@ public class AuditLoggerTests {
 	}
 
 	@Test
-	public void failureIsntLoggedIfAceDoesntRequireFailureAudit() {
+	public void failureIsntLoggedIfAceDoesntRequireFailureAudit() throws Exception {
 		when(ace.isAuditFailure()).thenReturn(false);
 		logger.logIfNeeded(false, ace);
 		assertThat(bytes.size()).isZero();
 	}
 
 	@Test
-	public void failureIsLoggedIfAceRequiresFailureAudit() {
+	public void failureIsLoggedIfAceRequiresFailureAudit() throws Exception {
 		when(ace.isAuditFailure()).thenReturn(true);
 		logger.logIfNeeded(false, ace);
 		assertThat(bytes.toString()).startsWith("DENIED due to ACE");

acl/src/test/java/org/springframework/security/acls/domain/ObjectIdentityImplTests.java

@@ -36,7 +36,7 @@ public class ObjectIdentityImplTests {
 	// ========================================================================================================
 
 	@Test
-	public void constructorsRespectRequiredFields() {
+	public void constructorsRespectRequiredFields() throws Exception {
 		// Check one-argument constructor required field
 		try {
 			new ObjectIdentityImpl(null);
@@ -47,7 +47,7 @@ public class ObjectIdentityImplTests {
 
 		// Check String-Serializable constructor required field
 		try {
-			new ObjectIdentityImpl("", 1L);
+			new ObjectIdentityImpl("", Long.valueOf(1));
 			fail("It should have thrown IllegalArgumentException");
 		}
 		catch (IllegalArgumentException expected) {
@@ -63,7 +63,7 @@ public class ObjectIdentityImplTests {
 
 		// The correct way of using String-Serializable constructor
 		try {
-			new ObjectIdentityImpl(DOMAIN_CLASS, 1L);
+			new ObjectIdentityImpl(DOMAIN_CLASS, Long.valueOf(1));
 		}
 		catch (IllegalArgumentException notExpected) {
 			fail("It shouldn't have thrown IllegalArgumentException");
@@ -79,14 +79,14 @@ public class ObjectIdentityImplTests {
 	}
 
 	@Test
-	public void gettersReturnExpectedValues() {
-		ObjectIdentity obj = new ObjectIdentityImpl(DOMAIN_CLASS, 1L);
-		assertThat(obj.getIdentifier()).isEqualTo(1L);
+	public void gettersReturnExpectedValues() throws Exception {
+		ObjectIdentity obj = new ObjectIdentityImpl(DOMAIN_CLASS, Long.valueOf(1));
+		assertThat(obj.getIdentifier()).isEqualTo(Long.valueOf(1));
 		assertThat(obj.getType()).isEqualTo(MockIdDomainObject.class.getName());
 	}
 
 	@Test
-	public void testGetIdMethodConstraints() {
+	public void testGetIdMethodConstraints() throws Exception {
 		// Check the getId() method is present
 		try {
 			new ObjectIdentityImpl("A_STRING_OBJECT");
@@ -116,7 +116,7 @@ public class ObjectIdentityImplTests {
 		}
 
 		// getId() should return a Serializable object
-		mockId.setId(100L);
+		mockId.setId(new Long(100));
 		try {
 			new ObjectIdentityImpl(mockId);
 		}
@@ -125,46 +125,46 @@ public class ObjectIdentityImplTests {
 	}
 
 	@Test(expected = IllegalArgumentException.class)
-	public void constructorRejectsInvalidTypeParameter() {
-		new ObjectIdentityImpl("", 1L);
+	public void constructorRejectsInvalidTypeParameter() throws Exception {
+		new ObjectIdentityImpl("", Long.valueOf(1));
 	}
 
 	@Test
-	public void testEquals() {
-		ObjectIdentity obj = new ObjectIdentityImpl(DOMAIN_CLASS, 1L);
+	public void testEquals() throws Exception {
+		ObjectIdentity obj = new ObjectIdentityImpl(DOMAIN_CLASS, Long.valueOf(1));
 		MockIdDomainObject mockObj = new MockIdDomainObject();
-		mockObj.setId(1L);
+		mockObj.setId(Long.valueOf(1));
 
 		String string = "SOME_STRING";
 		assertThat(string).isNotSameAs(obj);
 		assertThat(obj).isNotNull();
 		assertThat(obj).isNotEqualTo("DIFFERENT_OBJECT_TYPE");
-		assertThat(obj).isNotEqualTo(new ObjectIdentityImpl(DOMAIN_CLASS, 2L));
+		assertThat(obj).isNotEqualTo(new ObjectIdentityImpl(DOMAIN_CLASS, Long.valueOf(2)));
 		assertThat(obj).isNotEqualTo(new ObjectIdentityImpl(
 						"org.springframework.security.acls.domain.ObjectIdentityImplTests$MockOtherIdDomainObject",
-				1L));
+						Long.valueOf(1)));
 		assertThat(new ObjectIdentityImpl(DOMAIN_CLASS, 1L)).isEqualTo(obj);
 		assertThat(new ObjectIdentityImpl(mockObj)).isEqualTo(obj);
 	}
 
 	@Test
-	public void hashcodeIsDifferentForDifferentJavaTypes() {
-		ObjectIdentity obj = new ObjectIdentityImpl(Object.class, 1L);
-		ObjectIdentity obj2 = new ObjectIdentityImpl(String.class, 1L);
+	public void hashcodeIsDifferentForDifferentJavaTypes() throws Exception {
+		ObjectIdentity obj = new ObjectIdentityImpl(Object.class, Long.valueOf(1));
+		ObjectIdentity obj2 = new ObjectIdentityImpl(String.class, Long.valueOf(1));
 		assertThat(obj.hashCode()).isNotEqualTo(obj2.hashCode());
 	}
 
 	@Test
 	public void longAndIntegerIdsWithSameValueAreEqualAndHaveSameHashcode() {
-		ObjectIdentity obj = new ObjectIdentityImpl(Object.class, 5L);
-		ObjectIdentity obj2 = new ObjectIdentityImpl(Object.class, 5);
+		ObjectIdentity obj = new ObjectIdentityImpl(Object.class, new Long(5));
+		ObjectIdentity obj2 = new ObjectIdentityImpl(Object.class, Integer.valueOf(5));
 
 		assertThat(obj2).isEqualTo(obj);
 		assertThat(obj2.hashCode()).isEqualTo(obj.hashCode());
 	}
 
 	@Test
-	public void equalStringIdsAreEqualAndHaveSameHashcode() {
+	public void equalStringIdsAreEqualAndHaveSameHashcode() throws Exception {
 		ObjectIdentity obj = new ObjectIdentityImpl(Object.class, "1000");
 		ObjectIdentity obj2 = new ObjectIdentityImpl(Object.class, "1000");
 		assertThat(obj2).isEqualTo(obj);
@@ -172,9 +172,9 @@ public class ObjectIdentityImplTests {
 	}
 
 	@Test
-	public void stringAndNumericIdsAreNotEqual() {
+	public void stringAndNumericIdsAreNotEqual() throws Exception {
 		ObjectIdentity obj = new ObjectIdentityImpl(Object.class, "1000");
-		ObjectIdentity obj2 = new ObjectIdentityImpl(Object.class, 1000L);
+		ObjectIdentity obj2 = new ObjectIdentityImpl(Object.class, Long.valueOf(1000));
 		assertThat(obj).isNotEqualTo(obj2);
 	}
 

acl/src/test/java/org/springframework/security/acls/domain/ObjectIdentityRetrievalStrategyImplTests.java

@@ -31,9 +31,9 @@ public class ObjectIdentityRetrievalStrategyImplTests {
 	// ~ Methods
 	// ========================================================================================================
 	@Test
-	public void testObjectIdentityCreation() {
+	public void testObjectIdentityCreation() throws Exception {
 		MockIdDomainObject domain = new MockIdDomainObject();
-		domain.setId(1);
+		domain.setId(Integer.valueOf(1));
 
 		ObjectIdentityRetrievalStrategy retStrategy = new ObjectIdentityRetrievalStrategyImpl();
 		ObjectIdentity identity = retStrategy.getObjectIdentity(domain);

acl/src/test/java/org/springframework/security/acls/jdbc/AbstractBasicLookupStrategyTests.java

@@ -129,10 +129,10 @@ public abstract class AbstractBasicLookupStrategyTests {
 
 	@Test
 	public void testAclsRetrievalWithDefaultBatchSize() throws Exception {
-		ObjectIdentity topParentOid = new ObjectIdentityImpl(TARGET_CLASS, 100L);
-		ObjectIdentity middleParentOid = new ObjectIdentityImpl(TARGET_CLASS, 101L);
+		ObjectIdentity topParentOid = new ObjectIdentityImpl(TARGET_CLASS, new Long(100));
+		ObjectIdentity middleParentOid = new ObjectIdentityImpl(TARGET_CLASS, new Long(101));
 		// Deliberately use an integer for the child, to reproduce bug report in SEC-819
-		ObjectIdentity childOid = new ObjectIdentityImpl(TARGET_CLASS, 102);
+		ObjectIdentity childOid = new ObjectIdentityImpl(TARGET_CLASS, Integer.valueOf(102));
 
 		Map<ObjectIdentity, Acl> map = this.strategy
 			.readAclsById(Arrays.asList(topParentOid, middleParentOid, childOid), null);
@@ -141,9 +141,9 @@ public abstract class AbstractBasicLookupStrategyTests {
 
 	@Test
 	public void testAclsRetrievalFromCacheOnly() throws Exception {
-		ObjectIdentity topParentOid = new ObjectIdentityImpl(TARGET_CLASS, 100);
-		ObjectIdentity middleParentOid = new ObjectIdentityImpl(TARGET_CLASS, 101L);
-		ObjectIdentity childOid = new ObjectIdentityImpl(TARGET_CLASS, 102L);
+		ObjectIdentity topParentOid = new ObjectIdentityImpl(TARGET_CLASS, Integer.valueOf(100));
+		ObjectIdentity middleParentOid = new ObjectIdentityImpl(TARGET_CLASS, new Long(101));
+		ObjectIdentity childOid = new ObjectIdentityImpl(TARGET_CLASS, new Long(102));
 
 		// Objects were put in cache
 		strategy.readAclsById(Arrays.asList(topParentOid, middleParentOid, childOid), null);
@@ -158,9 +158,9 @@ public abstract class AbstractBasicLookupStrategyTests {
 
 	@Test
 	public void testAclsRetrievalWithCustomBatchSize() throws Exception {
-		ObjectIdentity topParentOid = new ObjectIdentityImpl(TARGET_CLASS, 100L);
-		ObjectIdentity middleParentOid = new ObjectIdentityImpl(TARGET_CLASS, 101);
-		ObjectIdentity childOid = new ObjectIdentityImpl(TARGET_CLASS, 102L);
+		ObjectIdentity topParentOid = new ObjectIdentityImpl(TARGET_CLASS, new Long(100));
+		ObjectIdentity middleParentOid = new ObjectIdentityImpl(TARGET_CLASS, Integer.valueOf(101));
+		ObjectIdentity childOid = new ObjectIdentityImpl(TARGET_CLASS, new Long(102));
 
 		// Set a batch size to allow multiple database queries in order to retrieve all
 		// acls
@@ -171,7 +171,7 @@ public abstract class AbstractBasicLookupStrategyTests {
 	}
 
 	private void checkEntries(ObjectIdentity topParentOid, ObjectIdentity middleParentOid, ObjectIdentity childOid,
-		Map<ObjectIdentity, Acl> map) {
+		Map<ObjectIdentity, Acl> map) throws Exception {
 		assertThat(map).hasSize(3);
 
 		MutableAcl topParent = (MutableAcl) map.get(topParentOid);
@@ -238,14 +238,14 @@ public abstract class AbstractBasicLookupStrategyTests {
 	}
 
 	@Test
-	public void testAllParentsAreRetrievedWhenChildIsLoaded() {
+	public void testAllParentsAreRetrievedWhenChildIsLoaded() throws Exception {
 		String query = "INSERT INTO acl_object_identity(ID,OBJECT_ID_CLASS,OBJECT_ID_IDENTITY,PARENT_OBJECT,OWNER_SID,ENTRIES_INHERITING) VALUES (6,2,103,1,1,1);";
 		getJdbcTemplate().execute(query);
 
-		ObjectIdentity topParentOid = new ObjectIdentityImpl(TARGET_CLASS, 100L);
-		ObjectIdentity middleParentOid = new ObjectIdentityImpl(TARGET_CLASS, 101L);
-		ObjectIdentity childOid = new ObjectIdentityImpl(TARGET_CLASS, 102L);
-		ObjectIdentity middleParent2Oid = new ObjectIdentityImpl(TARGET_CLASS, 103L);
+		ObjectIdentity topParentOid = new ObjectIdentityImpl(TARGET_CLASS, Long.valueOf(100));
+		ObjectIdentity middleParentOid = new ObjectIdentityImpl(TARGET_CLASS, Long.valueOf(101));
+		ObjectIdentity childOid = new ObjectIdentityImpl(TARGET_CLASS, Long.valueOf(102));
+		ObjectIdentity middleParent2Oid = new ObjectIdentityImpl(TARGET_CLASS, Long.valueOf(103));
 
 		// Retrieve the child
 		Map<ObjectIdentity, Acl> map = this.strategy.readAclsById(Arrays.asList(childOid), null);
@@ -266,7 +266,7 @@ public abstract class AbstractBasicLookupStrategyTests {
 	 * Test created from SEC-590.
 	 */
 	@Test
-	public void testReadAllObjectIdentitiesWhenLastElementIsAlreadyCached() {
+	public void testReadAllObjectIdentitiesWhenLastElementIsAlreadyCached() throws Exception {
 		String query = "INSERT INTO acl_object_identity(ID,OBJECT_ID_CLASS,OBJECT_ID_IDENTITY,PARENT_OBJECT,OWNER_SID,ENTRIES_INHERITING) VALUES (6,2,105,null,1,1);"
 			+ "INSERT INTO acl_object_identity(ID,OBJECT_ID_CLASS,OBJECT_ID_IDENTITY,PARENT_OBJECT,OWNER_SID,ENTRIES_INHERITING) VALUES (7,2,106,6,1,1);"
 			+ "INSERT INTO acl_object_identity(ID,OBJECT_ID_CLASS,OBJECT_ID_IDENTITY,PARENT_OBJECT,OWNER_SID,ENTRIES_INHERITING) VALUES (8,2,107,6,1,1);"
@@ -274,10 +274,10 @@ public abstract class AbstractBasicLookupStrategyTests {
 			+ "INSERT INTO acl_entry(ID,ACL_OBJECT_IDENTITY,ACE_ORDER,SID,MASK,GRANTING,AUDIT_SUCCESS,AUDIT_FAILURE) VALUES (7,6,0,1,1,1,0,0)";
 		getJdbcTemplate().execute(query);
 
-		ObjectIdentity grandParentOid = new ObjectIdentityImpl(TARGET_CLASS, 104L);
-		ObjectIdentity parent1Oid = new ObjectIdentityImpl(TARGET_CLASS, 105L);
-		ObjectIdentity parent2Oid = new ObjectIdentityImpl(TARGET_CLASS, 106);
-		ObjectIdentity childOid = new ObjectIdentityImpl(TARGET_CLASS, 107);
+		ObjectIdentity grandParentOid = new ObjectIdentityImpl(TARGET_CLASS, new Long(104));
+		ObjectIdentity parent1Oid = new ObjectIdentityImpl(TARGET_CLASS, new Long(105));
+		ObjectIdentity parent2Oid = new ObjectIdentityImpl(TARGET_CLASS, Integer.valueOf(106));
+		ObjectIdentity childOid = new ObjectIdentityImpl(TARGET_CLASS, Integer.valueOf(107));
 
 		// First lookup only child, thus populating the cache with grandParent,
 		// parent1
@@ -317,7 +317,7 @@ public abstract class AbstractBasicLookupStrategyTests {
 
 		getJdbcTemplate().execute(query);
 
-		ObjectIdentity oid = new ObjectIdentityImpl(TARGET_CLASS, 104L);
+		ObjectIdentity oid = new ObjectIdentityImpl(TARGET_CLASS, new Long(104));
 
 		strategy.readAclsById(Arrays.asList(oid), Arrays.asList(BEN_SID));
 	}

acl/src/test/java/org/springframework/security/acls/jdbc/AclClassIdUtilsTest.java

@@ -1,5 +1,5 @@
 /*
- * 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.
@@ -16,20 +16,21 @@
 package org.springframework.security.acls.jdbc;
 
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-import org.springframework.core.convert.ConversionService;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.BDDMockito.given;
 
 import java.io.Serializable;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.UUID;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.BDDMockito.given;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+import org.springframework.core.convert.ConversionService;
 
 /**
  * Tests for {@link AclClassIdUtils}.
@@ -45,23 +46,40 @@ public class AclClassIdUtilsTest {
 	private ResultSet resultSet;
 	@Mock
 	private ConversionService conversionService;
-
+	@InjectMocks
 	private AclClassIdUtils aclClassIdUtils;
 
 	@Before
-	public void setUp() {
-		aclClassIdUtils = new AclClassIdUtils();
+	public void setUp() throws Exception {
+		given(conversionService.canConvert(String.class, Long.class)).willReturn(true);
+		given(conversionService.convert(DEFAULT_IDENTIFIER, Long.class)).willReturn(new Long(DEFAULT_IDENTIFIER));
+		given(conversionService.convert(DEFAULT_IDENTIFIER_AS_STRING, Long.class)).willReturn(new Long(DEFAULT_IDENTIFIER));
 	}
 
 	@Test
-	public void shouldReturnLongIfIdentifierIsLong() throws SQLException {
+	public void shouldReturnLongIfIdentifierIsNotStringAndNoConversionService() throws SQLException {
+		// given
+		AclClassIdUtils aclClassIdUtilsWithoutConversionSvc = new AclClassIdUtils();
+
 		// when
-		Serializable newIdentifier = aclClassIdUtils.identifierFrom(DEFAULT_IDENTIFIER, resultSet);
+		Serializable newIdentifier = aclClassIdUtilsWithoutConversionSvc.identifierFrom(DEFAULT_IDENTIFIER, resultSet);
 
 		// then
 		assertThat(newIdentifier).isEqualTo(DEFAULT_IDENTIFIER);
 	}
 
+	@Test
+	public void shouldReturnLongIfIdentifierIsNotString() throws SQLException {
+		// given
+		Long prevIdentifier = 999L;
+
+		// when
+		Serializable newIdentifier = aclClassIdUtils.identifierFrom(prevIdentifier, resultSet);
+
+		// then
+		assertThat(newIdentifier).isEqualTo(prevIdentifier);
+	}
+
 	@Test
 	public void shouldReturnLongIfClassIdTypeIsNull() throws SQLException {
 		// given
@@ -99,11 +117,10 @@ public class AclClassIdUtilsTest {
 	}
 
 	@Test
-	public void shouldReturnLongEvenIfCustomConversionServiceDoesNotSupportLongConversion() throws SQLException {
+	public void shouldReturnLongIfTypeClassCannotBeConverted() throws SQLException {
 		// given
 		given(resultSet.getString("class_id_type")).willReturn("java.lang.Long");
 		given(conversionService.canConvert(String.class, Long.class)).willReturn(false);
-		aclClassIdUtils.setConversionService(conversionService);
 
 		// when
 		Serializable newIdentifier = aclClassIdUtils.identifierFrom(DEFAULT_IDENTIFIER_AS_STRING, resultSet);
@@ -128,7 +145,10 @@ public class AclClassIdUtilsTest {
 	public void shouldReturnUUIDWhenUUIDClassIdType() throws SQLException {
 		// given
 		UUID identifier = UUID.randomUUID();
+		String identifierAsString = identifier.toString();
 		given(resultSet.getString("class_id_type")).willReturn("java.util.UUID");
+		given(conversionService.canConvert(String.class, UUID.class)).willReturn(true);
+		given(conversionService.convert(identifierAsString, UUID.class)).willReturn(UUID.fromString(identifierAsString));
 
 		// when
 		Serializable newIdentifier = aclClassIdUtils.identifierFrom(identifier.toString(), resultSet);
@@ -137,28 +157,4 @@ public class AclClassIdUtilsTest {
 		assertThat(newIdentifier).isEqualTo(identifier);
 	}
 
-	@Test
-	public void shouldReturnStringWhenStringClassIdType() throws SQLException {
-		// given
-		String identifier = "MY_STRING_IDENTIFIER";
-		given(resultSet.getString("class_id_type")).willReturn("java.lang.String");
-
-		// when
-		Serializable newIdentifier = aclClassIdUtils.identifierFrom(identifier, resultSet);
-
-		// then
-		assertThat(newIdentifier).isEqualTo(identifier);
-	}
-
-	@Test(expected = IllegalArgumentException.class)
-	public void shouldNotAcceptNullConversionServiceInConstruction() {
-		// when
-		new AclClassIdUtils(null);
-	}
-
-	@Test(expected = IllegalArgumentException.class)
-	public void shouldNotAcceptNullConversionServiceInSetter() {
-		// when
-		aclClassIdUtils.setConversionService(null);
-	}
 }

acl/src/test/java/org/springframework/security/acls/jdbc/BasicLookupStrategyTests.java

@@ -37,7 +37,7 @@ public class BasicLookupStrategyTests extends AbstractBasicLookupStrategyTests {
 	}
 
 	@AfterClass
-	public static void dropDatabase() {
+	public static void dropDatabase() throws Exception {
 		DATABASE_HELPER.getDataSource().destroy();
 	}
 

acl/src/test/java/org/springframework/security/acls/jdbc/BasicLookupStrategyWithAclClassTypeTests.java

@@ -63,18 +63,20 @@ public class BasicLookupStrategyWithAclClassTypeTests extends AbstractBasicLooku
 	}
 
 	@AfterClass
-	public static void dropDatabase() {
+	public static void dropDatabase() throws Exception {
 		DATABASE_HELPER.getDataSource().destroy();
 	}
 
 	@Before
 	public void initializeBeans() {
 		super.initializeBeans();
+		AclClassIdUtils aclClassIdUtils = new AclClassIdUtils();
+		aclClassIdUtils.setConversionService(new DefaultConversionService());
 		uuidEnabledStrategy = new BasicLookupStrategy(getDataSource(), aclCache(), aclAuthStrategy(),
 			new DefaultPermissionGrantingStrategy(new ConsoleAuditLogger()));
 		uuidEnabledStrategy.setPermissionFactory(new DefaultPermissionFactory());
 		uuidEnabledStrategy.setAclClassIdSupported(true);
-		uuidEnabledStrategy.setConversionService(new DefaultConversionService());
+		uuidEnabledStrategy.setAclClassIdUtils(aclClassIdUtils);
 	}
 
 	@Before
@@ -101,7 +103,7 @@ public class BasicLookupStrategyWithAclClassTypeTests extends AbstractBasicLooku
 
 	@Test
 	public void testReadObjectIdentityUsingLongTypeWithConversionServiceEnabled() {
-		ObjectIdentity oid = new ObjectIdentityImpl(TARGET_CLASS, 100L);
+		ObjectIdentity oid = new ObjectIdentityImpl(TARGET_CLASS, new Long(100));
 		Map<ObjectIdentity, Acl> foundAcls = uuidEnabledStrategy.readAclsById(Arrays.asList(oid), Arrays.asList(BEN_SID));
 		Assert.assertEquals(1, foundAcls.size());
 		Assert.assertNotNull(foundAcls.get(oid));

acl/src/test/java/org/springframework/security/acls/jdbc/EhCacheBasedAclCacheTests.java

@@ -71,12 +71,12 @@ public class EhCacheBasedAclCacheTests {
 				new ConsoleAuditLogger()), new AclAuthorizationStrategyImpl(
 				new SimpleGrantedAuthority("ROLE_USER")));
 
-		ObjectIdentity identity = new ObjectIdentityImpl(TARGET_CLASS, 100L);
+		ObjectIdentity identity = new ObjectIdentityImpl(TARGET_CLASS, Long.valueOf(100));
 		AclAuthorizationStrategy aclAuthorizationStrategy = new AclAuthorizationStrategyImpl(
 				new SimpleGrantedAuthority("ROLE_OWNERSHIP"), new SimpleGrantedAuthority(
 						"ROLE_AUDITING"), new SimpleGrantedAuthority("ROLE_GENERAL"));
 
-		acl = new AclImpl(identity, 1L, aclAuthorizationStrategy,
+		acl = new AclImpl(identity, Long.valueOf(1), aclAuthorizationStrategy,
 				new ConsoleAuditLogger());
 	}
 
@@ -86,14 +86,14 @@ public class EhCacheBasedAclCacheTests {
 	}
 
 	@Test(expected = IllegalArgumentException.class)
-	public void constructorRejectsNullParameters() {
+	public void constructorRejectsNullParameters() throws Exception {
 		new EhCacheBasedAclCache(null, new DefaultPermissionGrantingStrategy(
 				new ConsoleAuditLogger()), new AclAuthorizationStrategyImpl(
 				new SimpleGrantedAuthority("ROLE_USER")));
 	}
 
 	@Test
-	public void methodsRejectNullParameters() {
+	public void methodsRejectNullParameters() throws Exception {
 		try {
 			Serializable id = null;
 			myCache.evictFromCache(id);
@@ -162,14 +162,14 @@ public class EhCacheBasedAclCacheTests {
 	}
 
 	@Test
-	public void clearCache() {
+	public void clearCache() throws Exception {
 		myCache.clearCache();
 
 		verify(cache).removeAll();
 	}
 
 	@Test
-	public void putInCache() {
+	public void putInCache() throws Exception {
 		myCache.putInCache(acl);
 
 		verify(cache, times(2)).put(element.capture());
@@ -181,18 +181,18 @@ public class EhCacheBasedAclCacheTests {
 	}
 
 	@Test
-	public void putInCacheAclWithParent() {
+	public void putInCacheAclWithParent() throws Exception {
 		Authentication auth = new TestingAuthenticationToken("user", "password",
 				"ROLE_GENERAL");
 		auth.setAuthenticated(true);
 		SecurityContextHolder.getContext().setAuthentication(auth);
 
 		ObjectIdentity identityParent = new ObjectIdentityImpl(TARGET_CLASS,
-				2L);
+				Long.valueOf(2));
 		AclAuthorizationStrategy aclAuthorizationStrategy = new AclAuthorizationStrategyImpl(
 				new SimpleGrantedAuthority("ROLE_OWNERSHIP"), new SimpleGrantedAuthority(
 						"ROLE_AUDITING"), new SimpleGrantedAuthority("ROLE_GENERAL"));
-		MutableAcl parentAcl = new AclImpl(identityParent, 2L,
+		MutableAcl parentAcl = new AclImpl(identityParent, Long.valueOf(2),
 				aclAuthorizationStrategy, new ConsoleAuditLogger());
 		acl.setParent(parentAcl);
 
@@ -216,14 +216,14 @@ public class EhCacheBasedAclCacheTests {
 	}
 
 	@Test
-	public void getFromCacheSerializable() {
+	public void getFromCacheSerializable() throws Exception {
 		when(cache.get(acl.getId())).thenReturn(new Element(acl.getId(), acl));
 
 		assertThat(myCache.getFromCache(acl.getId())).isEqualTo(acl);
 	}
 
 	@Test
-	public void getFromCacheSerializablePopulatesTransient() {
+	public void getFromCacheSerializablePopulatesTransient() throws Exception {
 		when(cache.get(acl.getId())).thenReturn(new Element(acl.getId(), acl));
 
 		myCache.putInCache(acl);
@@ -240,14 +240,14 @@ public class EhCacheBasedAclCacheTests {
 	}
 
 	@Test
-	public void getFromCacheObjectIdentity() {
+	public void getFromCacheObjectIdentity() throws Exception {
 		when(cache.get(acl.getId())).thenReturn(new Element(acl.getId(), acl));
 
 		assertThat(myCache.getFromCache(acl.getId())).isEqualTo(acl);
 	}
 
 	@Test
-	public void getFromCacheObjectIdentityPopulatesTransient() {
+	public void getFromCacheObjectIdentityPopulatesTransient() throws Exception {
 		when(cache.get(acl.getObjectIdentity()))
 				.thenReturn(new Element(acl.getId(), acl));
 
@@ -265,7 +265,7 @@ public class EhCacheBasedAclCacheTests {
 	}
 
 	@Test
-	public void evictCacheSerializable() {
+	public void evictCacheSerializable() throws Exception {
 		when(cache.get(acl.getObjectIdentity()))
 				.thenReturn(new Element(acl.getId(), acl));
 
@@ -276,7 +276,7 @@ public class EhCacheBasedAclCacheTests {
 	}
 
 	@Test
-	public void evictCacheObjectIdentity() {
+	public void evictCacheObjectIdentity() throws Exception {
 		when(cache.get(acl.getId())).thenReturn(new Element(acl.getId(), acl));
 
 		myCache.evictFromCache(acl.getId());

acl/src/test/java/org/springframework/security/acls/jdbc/JdbcAclServiceTests.java

@@ -1,5 +1,5 @@
 /*
- * 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.
@@ -15,16 +15,21 @@
  */
 package org.springframework.security.acls.jdbc;
 
-import org.junit.After;
+import static org.mockito.Matchers.anyListOf;
+import static org.mockito.Mockito.when;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.sql.DataSource;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
-import org.springframework.jdbc.core.JdbcOperations;
-import org.springframework.jdbc.core.RowMapper;
-import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase;
-import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
 import org.springframework.security.acls.domain.ObjectIdentityImpl;
 import org.springframework.security.acls.domain.PrincipalSid;
 import org.springframework.security.acls.model.Acl;
@@ -32,54 +37,19 @@ import org.springframework.security.acls.model.NotFoundException;
 import org.springframework.security.acls.model.ObjectIdentity;
 import org.springframework.security.acls.model.Sid;
 
-import javax.sql.DataSource;
-import java.util.*;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.AdditionalMatchers.aryEq;
-import static org.mockito.ArgumentMatchers.*;
-import static org.mockito.Mockito.when;
-
-/**
- * Unit and Integration tests the ACL JdbcAclService using an
- * in-memory database.
- *
- * @author Nena Raab
- */
 @RunWith(MockitoJUnitRunner.class)
 public class JdbcAclServiceTests {
-
-	private EmbeddedDatabase embeddedDatabase;
-
 	@Mock
 	private DataSource dataSource;
 
 	@Mock
 	private LookupStrategy lookupStrategy;
 
-	@Mock
-	JdbcOperations jdbcOperations;
-
-	private JdbcAclService aclServiceIntegration;
 	private JdbcAclService aclService;
 
 	@Before
 	public void setUp() {
-		aclService = new JdbcAclService(jdbcOperations, lookupStrategy);
-		aclServiceIntegration = new JdbcAclService(embeddedDatabase, lookupStrategy);
-	}
-
-	@Before
-	public void setUpEmbeddedDatabase() {
-		embeddedDatabase = new EmbeddedDatabaseBuilder()//
-				.addScript("createAclSchemaWithAclClassIdType.sql")
-				.addScript("db/sql/test_data_hierarchy.sql")
-				.build();
-	}
-
-	@After
-	public void tearDownEmbeddedDatabase() {
-		embeddedDatabase.shutdown();
+		aclService = new JdbcAclService(dataSource, lookupStrategy);
 	}
 
 	// SEC-1898
@@ -87,113 +57,11 @@ public class JdbcAclServiceTests {
 	public void readAclByIdMissingAcl() {
 		Map<ObjectIdentity, Acl> result = new HashMap<>();
 		when(
-				lookupStrategy.readAclsById(anyList(),
-						anyList())).thenReturn(result);
+				lookupStrategy.readAclsById(anyListOf(ObjectIdentity.class),
+						anyListOf(Sid.class))).thenReturn(result);
 		ObjectIdentity objectIdentity = new ObjectIdentityImpl(Object.class, 1);
-		List<Sid> sids = Arrays.<Sid>asList(new PrincipalSid("user"));
+		List<Sid> sids = Arrays.<Sid> asList(new PrincipalSid("user"));
 
 		aclService.readAclById(objectIdentity, sids);
 	}
-
-	@Test
-	public void findOneChildren() {
-		List<ObjectIdentity> result = new ArrayList<>();
-		result.add(new ObjectIdentityImpl(Object.class, "5577"));
-		Object[] args = {"1", "org.springframework.security.acls.jdbc.JdbcAclServiceTests$MockLongIdDomainObject"};
-		when(
-				jdbcOperations.query(anyString(),
-						aryEq(args), any(RowMapper.class))).thenReturn(result);
-		ObjectIdentity objectIdentity = new ObjectIdentityImpl(MockLongIdDomainObject.class, 1L);
-
-		List<ObjectIdentity> objectIdentities = aclService.findChildren(objectIdentity);
-		assertThat(objectIdentities.size()).isEqualTo(1);
-		assertThat(objectIdentities.get(0).getIdentifier()).isEqualTo("5577");
-	}
-
-	@Test
-	public void findNoChildren() {
-		ObjectIdentity objectIdentity = new ObjectIdentityImpl(MockLongIdDomainObject.class, 1L);
-
-		List<ObjectIdentity> objectIdentities = aclService.findChildren(objectIdentity);
-		assertThat(objectIdentities).isNull();
-	}
-
-	// ~ Some integration tests
-	// ========================================================================================================
-
-	@Test
-	public void findChildrenWithoutIdType() {
-		ObjectIdentity objectIdentity = new ObjectIdentityImpl(MockLongIdDomainObject.class, 4711L);
-
-		List<ObjectIdentity> objectIdentities = aclServiceIntegration.findChildren(objectIdentity);
-		assertThat(objectIdentities.size()).isEqualTo(1);
-		assertThat(objectIdentities.get(0).getType()).isEqualTo(MockUntypedIdDomainObject.class.getName());
-		assertThat(objectIdentities.get(0).getIdentifier()).isEqualTo(5000L);
-	}
-
-	@Test
-	public void findChildrenForUnknownObject() {
-		ObjectIdentity objectIdentity = new ObjectIdentityImpl(Object.class, 33);
-
-		List<ObjectIdentity> objectIdentities = aclServiceIntegration.findChildren(objectIdentity);
-		assertThat(objectIdentities).isNull();
-	}
-
-	@Test
-	public void findChildrenOfIdTypeLong() {
-		ObjectIdentity objectIdentity = new ObjectIdentityImpl("location", "US-PAL");
-
-		List<ObjectIdentity> objectIdentities = aclServiceIntegration.findChildren(objectIdentity);
-		assertThat(objectIdentities.size()).isEqualTo(2);
-		assertThat(objectIdentities.get(0).getType()).isEqualTo(MockLongIdDomainObject.class.getName());
-		assertThat(objectIdentities.get(0).getIdentifier()).isEqualTo(4711L);
-		assertThat(objectIdentities.get(1).getType()).isEqualTo(MockLongIdDomainObject.class.getName());
-		assertThat(objectIdentities.get(1).getIdentifier()).isEqualTo(4712L);
-	}
-
-	@Test
-	public void findChildrenOfIdTypeString() {
-		ObjectIdentity objectIdentity = new ObjectIdentityImpl("location", "US");
-
-		aclServiceIntegration.setAclClassIdSupported(true);
-		List<ObjectIdentity> objectIdentities = aclServiceIntegration.findChildren(objectIdentity);
-		assertThat(objectIdentities.size()).isEqualTo(1);
-		assertThat(objectIdentities.get(0).getType()).isEqualTo("location");
-		assertThat(objectIdentities.get(0).getIdentifier()).isEqualTo("US-PAL");
-	}
-
-	@Test
-	public void findChildrenOfIdTypeUUID() {
-		ObjectIdentity objectIdentity = new ObjectIdentityImpl(MockUntypedIdDomainObject.class, 5000L);
-
-		aclServiceIntegration.setAclClassIdSupported(true);
-		List<ObjectIdentity> objectIdentities = aclServiceIntegration.findChildren(objectIdentity);
-		assertThat(objectIdentities.size()).isEqualTo(1);
-		assertThat(objectIdentities.get(0).getType()).isEqualTo("costcenter");
-		assertThat(objectIdentities.get(0).getIdentifier()).isEqualTo(UUID.fromString("25d93b3f-c3aa-4814-9d5e-c7c96ced7762"));
-	}
-
-	private class MockLongIdDomainObject {
-		private Object id;
-
-		public Object getId() {
-			return id;
-		}
-
-		public void setId(Object id) {
-			this.id = id;
-		}
-	}
-
-	private class MockUntypedIdDomainObject {
-		private Object id;
-
-		public Object getId() {
-			return id;
-		}
-
-		public void setId(Object id) {
-			this.id = id;
-		}
-	}
 }

acl/src/test/java/org/springframework/security/acls/jdbc/JdbcMutableAclServiceTests.java

@@ -78,11 +78,11 @@ public class JdbcMutableAclServiceTests extends
 	// ================================================================================================
 
 	private final ObjectIdentity topParentOid = new ObjectIdentityImpl(TARGET_CLASS,
-			100L);
+			Long.valueOf(100));
 	private final ObjectIdentity middleParentOid = new ObjectIdentityImpl(TARGET_CLASS,
-			101L);
+			Long.valueOf(101));
 	private final ObjectIdentity childOid = new ObjectIdentityImpl(TARGET_CLASS,
-			102L);
+			Long.valueOf(102));
 
 	@Autowired
 	private JdbcMutableAclService jdbcMutableAclService;
@@ -132,7 +132,7 @@ public class JdbcMutableAclServiceTests extends
 	}
 
 	@AfterTransaction
-	public void clearContextAndData() {
+	public void clearContextAndData() throws Exception {
 		SecurityContextHolder.clearContext();
 		jdbcTemplate.execute("drop table acl_entry");
 		jdbcTemplate.execute("drop table acl_object_identity");
@@ -285,7 +285,7 @@ public class JdbcMutableAclServiceTests extends
 	 */
 	@Test
 	@Transactional
-	public void deleteAclAlsoDeletesChildren() {
+	public void deleteAclAlsoDeletesChildren() throws Exception {
 		SecurityContextHolder.getContext().setAuthentication(auth);
 
 		jdbcMutableAclService.createAcl(getTopParentOid());
@@ -319,11 +319,11 @@ public class JdbcMutableAclServiceTests extends
 
 		Acl acl = jdbcMutableAclService.readAclById(getTopParentOid());
 		assertThat(acl).isNotNull();
-		assertThat(getTopParentOid()).isEqualTo(acl.getObjectIdentity());
+		assertThat(getTopParentOid()).isEqualTo(((MutableAcl) acl).getObjectIdentity());
 	}
 
 	@Test
-	public void constructorRejectsNullParameters() {
+	public void constructorRejectsNullParameters() throws Exception {
 		try {
 			new JdbcMutableAclService(null, lookupStrategy, aclCache);
 			fail("It should have thrown IllegalArgumentException");
@@ -347,7 +347,7 @@ public class JdbcMutableAclServiceTests extends
 	}
 
 	@Test
-	public void createAclRejectsNullParameter() {
+	public void createAclRejectsNullParameter() throws Exception {
 		try {
 			jdbcMutableAclService.createAcl(null);
 			fail("It should have thrown IllegalArgumentException");
@@ -358,10 +358,10 @@ public class JdbcMutableAclServiceTests extends
 
 	@Test
 	@Transactional
-	public void createAclForADuplicateDomainObject() {
+	public void createAclForADuplicateDomainObject() throws Exception {
 		SecurityContextHolder.getContext().setAuthentication(auth);
 		ObjectIdentity duplicateOid = new ObjectIdentityImpl(TARGET_CLASS,
-				100L);
+				Long.valueOf(100));
 		jdbcMutableAclService.createAcl(duplicateOid);
 		// Try to add the same object second time
 		try {
@@ -374,7 +374,7 @@ public class JdbcMutableAclServiceTests extends
 
 	@Test
 	@Transactional
-	public void deleteAclRejectsNullParameters() {
+	public void deleteAclRejectsNullParameters() throws Exception {
 		try {
 			jdbcMutableAclService.deleteAcl(null, true);
 			fail("It should have thrown IllegalArgumentException");
@@ -385,7 +385,7 @@ public class JdbcMutableAclServiceTests extends
 
 	@Test
 	@Transactional
-	public void deleteAclWithChildrenThrowsException() {
+	public void deleteAclWithChildrenThrowsException() throws Exception {
 		SecurityContextHolder.getContext().setAuthentication(auth);
 		MutableAcl parent = jdbcMutableAclService.createAcl(getTopParentOid());
 		MutableAcl child = jdbcMutableAclService.createAcl(getMiddleParentOid());
@@ -411,7 +411,7 @@ public class JdbcMutableAclServiceTests extends
 
 	@Test
 	@Transactional
-	public void deleteAclRemovesRowsFromDatabase() {
+	public void deleteAclRemovesRowsFromDatabase() throws Exception {
 		SecurityContextHolder.getContext().setAuthentication(auth);
 		MutableAcl child = jdbcMutableAclService.createAcl(getChildOid());
 		child.insertAce(0, BasePermission.DELETE, new PrincipalSid(auth), false);
@@ -428,19 +428,19 @@ public class JdbcMutableAclServiceTests extends
 
 		// Check the cache
 		assertThat(aclCache.getFromCache(getChildOid())).isNull();
-		assertThat(aclCache.getFromCache(102L)).isNull();
+		assertThat(aclCache.getFromCache(Long.valueOf(102))).isNull();
 	}
 
 	/** SEC-1107 */
 	@Test
 	@Transactional
-	public void identityWithIntegerIdIsSupportedByCreateAcl() {
+	public void identityWithIntegerIdIsSupportedByCreateAcl() throws Exception {
 		SecurityContextHolder.getContext().setAuthentication(auth);
-		ObjectIdentity oid = new ObjectIdentityImpl(TARGET_CLASS, 101);
+		ObjectIdentity oid = new ObjectIdentityImpl(TARGET_CLASS, Integer.valueOf(101));
 		jdbcMutableAclService.createAcl(oid);
 
 		assertThat(jdbcMutableAclService.readAclById(new ObjectIdentityImpl(
-				TARGET_CLASS, 101L))).isNotNull();
+				TARGET_CLASS, Long.valueOf(101)))).isNotNull();
 	}
 
 	/**
@@ -448,14 +448,14 @@ public class JdbcMutableAclServiceTests extends
 	 */
 	@Test
 	@Transactional
-	public void childrenAreClearedFromCacheWhenParentIsUpdated() {
+	public void childrenAreClearedFromCacheWhenParentIsUpdated() throws Exception {
 		Authentication auth = new TestingAuthenticationToken("ben", "ignored",
 				"ROLE_ADMINISTRATOR");
 		auth.setAuthenticated(true);
 		SecurityContextHolder.getContext().setAuthentication(auth);
 
-		ObjectIdentity parentOid = new ObjectIdentityImpl(TARGET_CLASS, 104L);
-		ObjectIdentity childOid = new ObjectIdentityImpl(TARGET_CLASS, 105L);
+		ObjectIdentity parentOid = new ObjectIdentityImpl(TARGET_CLASS, Long.valueOf(104));
+		ObjectIdentity childOid = new ObjectIdentityImpl(TARGET_CLASS, Long.valueOf(105));
 
 		MutableAcl parent = jdbcMutableAclService.createAcl(parentOid);
 		MutableAcl child = jdbcMutableAclService.createAcl(childOid);
@@ -486,16 +486,16 @@ public class JdbcMutableAclServiceTests extends
 	 */
 	@Test
 	@Transactional
-	public void childrenAreClearedFromCacheWhenParentisUpdated2() {
+	public void childrenAreClearedFromCacheWhenParentisUpdated2() throws Exception {
 		Authentication auth = new TestingAuthenticationToken("system", "secret",
 				"ROLE_IGNORED");
 		SecurityContextHolder.getContext().setAuthentication(auth);
 		ObjectIdentityImpl rootObject = new ObjectIdentityImpl(TARGET_CLASS,
-				1L);
+				Long.valueOf(1));
 
 		MutableAcl parent = jdbcMutableAclService.createAcl(rootObject);
 		MutableAcl child = jdbcMutableAclService.createAcl(new ObjectIdentityImpl(
-				TARGET_CLASS, 2L));
+				TARGET_CLASS, Long.valueOf(2)));
 		child.setParent(parent);
 		jdbcMutableAclService.updateAcl(child);
 
@@ -507,7 +507,7 @@ public class JdbcMutableAclServiceTests extends
 		jdbcMutableAclService.updateAcl(parent);
 
 		child = (MutableAcl) jdbcMutableAclService.readAclById(new ObjectIdentityImpl(
-				TARGET_CLASS, 2L));
+				TARGET_CLASS, Long.valueOf(2)));
 
 		parent = (MutableAcl) child.getParentAcl();
 
@@ -528,7 +528,7 @@ public class JdbcMutableAclServiceTests extends
 		SecurityContextHolder.getContext().setAuthentication(auth);
 
 		ObjectIdentity topParentOid = new ObjectIdentityImpl(TARGET_CLASS,
-				110L);
+				Long.valueOf(110));
 		MutableAcl topParent = jdbcMutableAclService.createAcl(topParentOid);
 
 		// Add an ACE permission entry

acl/src/test/java/org/springframework/security/acls/jdbc/JdbcMutableAclServiceTestsWithAclClassId.java

@@ -70,7 +70,7 @@ public class JdbcMutableAclServiceTestsWithAclClassId extends JdbcMutableAclServ
 
 	@Test
 	@Transactional
-	public void identityWithUuidIdIsSupportedByCreateAcl() {
+	public void identityWithUuidIdIsSupportedByCreateAcl() throws Exception {
 		SecurityContextHolder.getContext().setAuthentication(getAuth());
 
 		UUID id = UUID.randomUUID();

acl/src/test/java/org/springframework/security/acls/jdbc/SpringCacheBasedAclCacheTests.java

@@ -65,16 +65,16 @@ public class SpringCacheBasedAclCacheTests {
 	}
 
 	@Test(expected = IllegalArgumentException.class)
-	public void constructorRejectsNullParameters() {
+	public void constructorRejectsNullParameters() throws Exception {
 		new SpringCacheBasedAclCache(null, null, null);
 	}
 
 	@SuppressWarnings("rawtypes")
 	@Test
-	public void cacheOperationsAclWithoutParent() {
+	public void cacheOperationsAclWithoutParent() throws Exception {
 		Cache cache = getCache();
 		Map realCache = (Map) cache.getNativeCache();
-		ObjectIdentity identity = new ObjectIdentityImpl(TARGET_CLASS, 100L);
+		ObjectIdentity identity = new ObjectIdentityImpl(TARGET_CLASS, Long.valueOf(100));
 		AclAuthorizationStrategy aclAuthorizationStrategy = new AclAuthorizationStrategyImpl(
 				new SimpleGrantedAuthority("ROLE_OWNERSHIP"), new SimpleGrantedAuthority(
 						"ROLE_AUDITING"), new SimpleGrantedAuthority("ROLE_GENERAL"));
@@ -84,33 +84,33 @@ public class SpringCacheBasedAclCacheTests {
 				auditLogger);
 		SpringCacheBasedAclCache myCache = new SpringCacheBasedAclCache(cache,
 				permissionGrantingStrategy, aclAuthorizationStrategy);
-		MutableAcl acl = new AclImpl(identity, 1L, aclAuthorizationStrategy,
+		MutableAcl acl = new AclImpl(identity, Long.valueOf(1), aclAuthorizationStrategy,
 				auditLogger);
 
 		assertThat(realCache).isEmpty();
 		myCache.putInCache(acl);
 
 		// Check we can get from cache the same objects we put in
-		assertThat(acl).isEqualTo(myCache.getFromCache(1L));
+		assertThat(acl).isEqualTo(myCache.getFromCache(Long.valueOf(1)));
 		assertThat(acl).isEqualTo(myCache.getFromCache(identity));
 
 		// Put another object in cache
-		ObjectIdentity identity2 = new ObjectIdentityImpl(TARGET_CLASS, 101L);
-		MutableAcl acl2 = new AclImpl(identity2, 2L,
+		ObjectIdentity identity2 = new ObjectIdentityImpl(TARGET_CLASS, Long.valueOf(101));
+		MutableAcl acl2 = new AclImpl(identity2, Long.valueOf(2),
 				aclAuthorizationStrategy, new ConsoleAuditLogger());
 
 		myCache.putInCache(acl2);
 
 		// Try to evict an entry that doesn't exist
-		myCache.evictFromCache(3L);
-		myCache.evictFromCache(new ObjectIdentityImpl(TARGET_CLASS, 102L));
+		myCache.evictFromCache(Long.valueOf(3));
+		myCache.evictFromCache(new ObjectIdentityImpl(TARGET_CLASS, Long.valueOf(102)));
 		assertThat(realCache).hasSize(4);
 
-		myCache.evictFromCache(1L);
+		myCache.evictFromCache(Long.valueOf(1));
 		assertThat(realCache).hasSize(2);
 
 		// Check the second object inserted
-		assertThat(acl2).isEqualTo(myCache.getFromCache(2L));
+		assertThat(acl2).isEqualTo(myCache.getFromCache(Long.valueOf(2)));
 		assertThat(acl2).isEqualTo(myCache.getFromCache(identity2));
 
 		myCache.evictFromCache(identity2);
@@ -128,9 +128,9 @@ public class SpringCacheBasedAclCacheTests {
 		auth.setAuthenticated(true);
 		SecurityContextHolder.getContext().setAuthentication(auth);
 
-		ObjectIdentity identity = new ObjectIdentityImpl(TARGET_CLASS, 1L);
+		ObjectIdentity identity = new ObjectIdentityImpl(TARGET_CLASS, Long.valueOf(1));
 		ObjectIdentity identityParent = new ObjectIdentityImpl(TARGET_CLASS,
-				2L);
+				Long.valueOf(2));
 		AclAuthorizationStrategy aclAuthorizationStrategy = new AclAuthorizationStrategyImpl(
 				new SimpleGrantedAuthority("ROLE_OWNERSHIP"), new SimpleGrantedAuthority(
 						"ROLE_AUDITING"), new SimpleGrantedAuthority("ROLE_GENERAL"));
@@ -141,9 +141,9 @@ public class SpringCacheBasedAclCacheTests {
 		SpringCacheBasedAclCache myCache = new SpringCacheBasedAclCache(cache,
 				permissionGrantingStrategy, aclAuthorizationStrategy);
 
-		MutableAcl acl = new AclImpl(identity, 1L, aclAuthorizationStrategy,
+		MutableAcl acl = new AclImpl(identity, Long.valueOf(1), aclAuthorizationStrategy,
 				auditLogger);
-		MutableAcl parentAcl = new AclImpl(identityParent, 2L,
+		MutableAcl parentAcl = new AclImpl(identityParent, Long.valueOf(2),
 				aclAuthorizationStrategy, auditLogger);
 
 		acl.setParent(parentAcl);
@@ -153,7 +153,7 @@ public class SpringCacheBasedAclCacheTests {
 		assertThat(4).isEqualTo(realCache.size());
 
 		// Check we can get from cache the same objects we put in
-		AclImpl aclFromCache = (AclImpl) myCache.getFromCache(1L);
+		AclImpl aclFromCache = (AclImpl) myCache.getFromCache(Long.valueOf(1));
 		assertThat(aclFromCache).isEqualTo(acl);
 		// SEC-951 check transient fields are set on parent
 		assertThat(FieldUtils.getFieldValue(aclFromCache.getParentAcl(),
@@ -162,7 +162,7 @@ public class SpringCacheBasedAclCacheTests {
 				"permissionGrantingStrategy")).isNotNull();
 		assertThat(myCache.getFromCache(identity)).isEqualTo(acl);
 		assertThat(FieldUtils.getFieldValue(aclFromCache, "aclAuthorizationStrategy")).isNotNull();
-		AclImpl parentAclFromCache = (AclImpl) myCache.getFromCache(2L);
+		AclImpl parentAclFromCache = (AclImpl) myCache.getFromCache(Long.valueOf(2));
 		assertThat(parentAclFromCache).isEqualTo(parentAcl);
 		assertThat(FieldUtils.getFieldValue(parentAclFromCache,
 				"aclAuthorizationStrategy")).isNotNull();

acl/src/test/java/org/springframework/security/acls/sid/SidRetrievalStrategyTests.java

@@ -46,7 +46,7 @@ public class SidRetrievalStrategyTests {
 	// ========================================================================================================
 
 	@Test
-	public void correctSidsAreRetrieved() {
+	public void correctSidsAreRetrieved() throws Exception {
 		SidRetrievalStrategy retrStrategy = new SidRetrievalStrategyImpl();
 		List<Sid> sids = retrStrategy.getSids(authentication);
 
@@ -66,7 +66,7 @@ public class SidRetrievalStrategyTests {
 	}
 
 	@Test
-	public void roleHierarchyIsUsedWhenSet() {
+	public void roleHierarchyIsUsedWhenSet() throws Exception {
 		RoleHierarchy rh = mock(RoleHierarchy.class);
 		List rhAuthorities = AuthorityUtils.createAuthorityList("D");
 		when(rh.getReachableGrantedAuthorities(anyCollection()))

acl/src/test/java/org/springframework/security/acls/sid/SidTests.java

@@ -22,22 +22,17 @@ import org.junit.Test;
 import org.springframework.security.acls.domain.GrantedAuthoritySid;
 import org.springframework.security.acls.domain.PrincipalSid;
 import org.springframework.security.acls.model.Sid;
-import org.springframework.security.authentication.AbstractAuthenticationToken;
 import org.springframework.security.authentication.TestingAuthenticationToken;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.security.core.userdetails.User;
-
-import java.util.Collection;
-import java.util.Collections;
 
 public class SidTests {
 
 	// ~ Methods
 	// ========================================================================================================
 	@Test
-	public void testPrincipalSidConstructorsRequiredFields() {
+	public void testPrincipalSidConstructorsRequiredFields() throws Exception {
 		// Check one String-argument constructor
 		try {
 			String string = null;
@@ -82,7 +77,7 @@ public class SidTests {
 	}
 
 	@Test
-	public void testGrantedAuthoritySidConstructorsRequiredFields() {
+	public void testGrantedAuthoritySidConstructorsRequiredFields() throws Exception {
 		// Check one String-argument constructor
 		try {
 			String string = null;
@@ -139,7 +134,7 @@ public class SidTests {
 	}
 
 	@Test
-	public void testPrincipalSidEquals() {
+	public void testPrincipalSidEquals() throws Exception {
 		Authentication authentication = new TestingAuthenticationToken("johndoe",
 				"password");
 		Sid principalSid = new PrincipalSid(authentication);
@@ -157,7 +152,7 @@ public class SidTests {
 	}
 
 	@Test
-	public void testGrantedAuthoritySidEquals() {
+	public void testGrantedAuthoritySidEquals() throws Exception {
 		GrantedAuthority ga = new SimpleGrantedAuthority("ROLE_TEST");
 		Sid gaSid = new GrantedAuthoritySid(ga);
 
@@ -174,7 +169,7 @@ public class SidTests {
 	}
 
 	@Test
-	public void testPrincipalSidHashCode() {
+	public void testPrincipalSidHashCode() throws Exception {
 		Authentication authentication = new TestingAuthenticationToken("johndoe",
 				"password");
 		Sid principalSid = new PrincipalSid(authentication);
@@ -189,7 +184,7 @@ public class SidTests {
 	}
 
 	@Test
-	public void testGrantedAuthoritySidHashCode() {
+	public void testGrantedAuthoritySidHashCode() throws Exception {
 		GrantedAuthority ga = new SimpleGrantedAuthority("ROLE_TEST");
 		Sid gaSid = new GrantedAuthoritySid(ga);
 
@@ -203,7 +198,7 @@ public class SidTests {
 	}
 
 	@Test
-	public void testGetters() {
+	public void testGetters() throws Exception {
 		Authentication authentication = new TestingAuthenticationToken("johndoe",
 				"password");
 		PrincipalSid principalSid = new PrincipalSid(authentication);
@@ -216,65 +211,4 @@ public class SidTests {
 		assertThat("ROLE_TEST".equals(gaSid.getGrantedAuthority())).isTrue();
 		assertThat("ROLE_TEST2".equals(gaSid.getGrantedAuthority())).isFalse();
 	}
-
-	@Test
-	public void getPrincipalWhenPrincipalInstanceOfUserDetailsThenReturnsUsername() {
-		User user = new User("user", "password", Collections.singletonList(new SimpleGrantedAuthority("ROLE_TEST")));
-		Authentication authentication = new TestingAuthenticationToken(user, "password");
-		PrincipalSid principalSid = new PrincipalSid(authentication);
-
-		assertThat("user").isEqualTo(principalSid.getPrincipal());
-	}
-
-	@Test
-	public void getPrincipalWhenPrincipalNotInstanceOfUserDetailsThenReturnsPrincipalName() {
-		Authentication authentication = new TestingAuthenticationToken("token", "password");
-		PrincipalSid principalSid = new PrincipalSid(authentication);
-
-		assertThat("token").isEqualTo(principalSid.getPrincipal());
-	}
-
-	@Test
-	public void getPrincipalWhenCustomAuthenticationPrincipalThenReturnsPrincipalName() {
-		Authentication authentication = new CustomAuthenticationToken(new CustomToken("token"), null);
-		PrincipalSid principalSid = new PrincipalSid(authentication);
-
-		assertThat("token").isEqualTo(principalSid.getPrincipal());
-	}
-
-	static class CustomAuthenticationToken extends AbstractAuthenticationToken {
-		private CustomToken principal;
-
-		CustomAuthenticationToken(CustomToken principal, Collection<GrantedAuthority> authorities) {
-			super(authorities);
-			this.principal = principal;
-		}
-
-		@Override
-		public Object getCredentials() {
-			return null;
-		}
-
-		@Override
-		public CustomToken getPrincipal() {
-			return this.principal;
-		}
-
-		@Override
-		public String getName() {
-			return principal.getName();
-		}
-	}
-
-	static class CustomToken {
-		private String name;
-
-		CustomToken(String name) {
-			this.name = name;
-		}
-
-		String getName() {
-			return name;
-		}
-	}
 }

acl/src/test/resources/db/sql/test_data_hierarchy.sql

@@ -1,17 +0,0 @@
---- insert ACL data
-INSERT INTO ACL_SID (ID, PRINCIPAL, SID) VALUES
-    (10, true, 'user');
-
-INSERT INTO acl_class (id, class, class_id_type) VALUES
-    (20,'location','java.lang.String'),
-    (21,'org.springframework.security.acls.jdbc.JdbcAclServiceTests$MockLongIdDomainObject','java.lang.Long'),
-    (22,'org.springframework.security.acls.jdbc.JdbcAclServiceTests$MockUntypedIdDomainObject',''),
-    (23,'costcenter','java.util.UUID');
-
-INSERT INTO acl_object_identity (id, object_id_class, object_id_identity, parent_object, owner_sid, entries_inheriting) VALUES
-    (1,20,'US',NULL,10,false),
-    (2,20,'US-PAL',1,10,true),
-    (3,21,'4711',2,10,true),
-    (4,21,'4712',2,10,true),
-	(5,22,'5000',3,10,true),
-    (6,23,'25d93b3f-c3aa-4814-9d5e-c7c96ced7762',5,10,true);

acl/src/test/resources/jdbcMutableAclServiceTestsWithAclClass-context.xml

@@ -5,8 +5,11 @@
 
   <import resource="jdbcMutableAclServiceTests-context.xml"/>
 
-  <bean id="conversionService" class="org.springframework.core.convert.support.DefaultConversionService"/>
-
+  <bean id="aclClassIdUtils" class="org.springframework.security.acls.jdbc.AclClassIdUtils">
+    <property name="conversionService">
+      <bean class="org.springframework.core.convert.support.DefaultConversionService"/>
+    </property>
+  </bean>
   <!-- Overridden bean definitions -->
 
   <bean id="aclService" class="org.springframework.security.acls.jdbc.JdbcMutableAclService">
@@ -14,7 +17,7 @@
     <constructor-arg ref="lookupStrategy"/>
     <constructor-arg ref="aclCache"/>
     <property name="aclClassIdSupported" value="true"/>
-    <property name="conversionService" ref="conversionService"/>
+    <property name="aclClassIdUtils" ref="aclClassIdUtils"/>
   </bean>
 
   <bean id="lookupStrategy" class="org.springframework.security.acls.jdbc.BasicLookupStrategy">
@@ -25,6 +28,6 @@
       <bean class="org.springframework.security.acls.domain.ConsoleAuditLogger"/>
     </constructor-arg>
     <property name="aclClassIdSupported" value="true"/>
-    <property name="conversionService" ref="conversionService"/>
+    <property name="aclClassIdUtils" ref="aclClassIdUtils"/>
   </bean>
 </beans>

aspects/gradle/dependency-locks/annotationProcessor.lockfile

@@ -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-SR7
-org.jetbrains.kotlin:kotlin-bom:1.3.70
-org.springframework.data:spring-data-releasetrain:Moore-SR7
-org.springframework:spring-framework-bom:5.2.6.RELEASE

aspects/gradle/dependency-locks/archives.lockfile

@@ -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-SR7
-org.jetbrains.kotlin:kotlin-bom:1.3.70
-org.springframework.data:spring-data-releasetrain:Moore-SR7
-org.springframework:spring-framework-bom:5.2.6.RELEASE

aspects/gradle/dependency-locks/aspect.lockfile

@@ -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-SR7
-org.jetbrains.kotlin:kotlin-bom:1.3.70
-org.springframework.data:spring-data-releasetrain:Moore-SR7
-org.springframework:spring-framework-bom:5.2.6.RELEASE

aspects/gradle/dependency-locks/aspectj.lockfile

@@ -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-SR7
-org.aspectj:aspectjtools:1.9.3
-org.jetbrains.kotlin:kotlin-bom:1.3.70
-org.springframework.data:spring-data-releasetrain:Moore-SR7
-org.springframework:spring-framework-bom:5.2.6.RELEASE

aspects/gradle/dependency-locks/checkstyle.lockfile

@@ -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-SR7
-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.70
-org.springframework.data:spring-data-releasetrain:Moore-SR7
-org.springframework:spring-framework-bom:5.2.6.RELEASE

aspects/gradle/dependency-locks/compile.lockfile

@@ -1,14 +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-SR7
-org.aspectj:aspectjrt:1.9.3
-org.jetbrains.kotlin:kotlin-bom:1.3.70
-org.springframework.data:spring-data-releasetrain:Moore-SR7
-org.springframework:spring-aop:5.2.6.RELEASE
-org.springframework:spring-beans:5.2.6.RELEASE
-org.springframework:spring-context:5.2.6.RELEASE
-org.springframework:spring-core:5.2.6.RELEASE
-org.springframework:spring-expression:5.2.6.RELEASE
-org.springframework:spring-framework-bom:5.2.6.RELEASE
-org.springframework:spring-jcl:5.2.6.RELEASE

aspects/gradle/dependency-locks/compileClasspath.lockfile

@@ -1,14 +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-SR7
-org.aspectj:aspectjrt:1.9.3
-org.jetbrains.kotlin:kotlin-bom:1.3.70
-org.springframework.data:spring-data-releasetrain:Moore-SR7
-org.springframework:spring-aop:5.2.6.RELEASE
-org.springframework:spring-beans:5.2.6.RELEASE
-org.springframework:spring-context:5.2.6.RELEASE
-org.springframework:spring-core:5.2.6.RELEASE
-org.springframework:spring-expression:5.2.6.RELEASE
-org.springframework:spring-framework-bom:5.2.6.RELEASE
-org.springframework:spring-jcl:5.2.6.RELEASE

aspects/gradle/dependency-locks/compileOnly.lockfile

@@ -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-SR7
-org.jetbrains.kotlin:kotlin-bom:1.3.70
-org.springframework.data:spring-data-releasetrain:Moore-SR7
-org.springframework:spring-framework-bom:5.2.6.RELEASE

aspects/gradle/dependency-locks/default.lockfile

@@ -1,14 +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-SR7
-org.aspectj:aspectjrt:1.9.3
-org.jetbrains.kotlin:kotlin-bom:1.3.70
-org.springframework.data:spring-data-releasetrain:Moore-SR7
-org.springframework:spring-aop:5.2.6.RELEASE
-org.springframework:spring-beans:5.2.6.RELEASE
-org.springframework:spring-context:5.2.6.RELEASE
-org.springframework:spring-core:5.2.6.RELEASE
-org.springframework:spring-expression:5.2.6.RELEASE
-org.springframework:spring-framework-bom:5.2.6.RELEASE
-org.springframework:spring-jcl:5.2.6.RELEASE

aspects/gradle/dependency-locks/inpath.lockfile

@@ -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-SR7
-org.jetbrains.kotlin:kotlin-bom:1.3.70
-org.springframework.data:spring-data-releasetrain:Moore-SR7
-org.springframework:spring-framework-bom:5.2.6.RELEASE

aspects/gradle/dependency-locks/jacocoAgent.lockfile

@@ -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-SR7
-org.jacoco:org.jacoco.agent:0.8.2
-org.jetbrains.kotlin:kotlin-bom:1.3.70
-org.springframework.data:spring-data-releasetrain:Moore-SR7
-org.springframework:spring-framework-bom:5.2.6.RELEASE

aspects/gradle/dependency-locks/jacocoAnt.lockfile

@@ -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-SR7
-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.70
-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-SR7
-org.springframework:spring-framework-bom:5.2.6.RELEASE

aspects/gradle/dependency-locks/merging.lockfile

@@ -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-SR7
-org.jetbrains.kotlin:kotlin-bom:1.3.70
-org.springframework.data:spring-data-releasetrain:Moore-SR7
-org.springframework:spring-framework-bom:5.2.6.RELEASE

aspects/gradle/dependency-locks/optional.lockfile

@@ -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-SR7
-org.jetbrains.kotlin:kotlin-bom:1.3.70
-org.springframework.data:spring-data-releasetrain:Moore-SR7
-org.springframework:spring-framework-bom:5.2.6.RELEASE

aspects/gradle/dependency-locks/provided.lockfile

@@ -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-SR7
-org.jetbrains.kotlin:kotlin-bom:1.3.70
-org.springframework.data:spring-data-releasetrain:Moore-SR7
-org.springframework:spring-framework-bom:5.2.6.RELEASE

aspects/gradle/dependency-locks/runtime.lockfile

@@ -1,14 +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-SR7
-org.aspectj:aspectjrt:1.9.3
-org.jetbrains.kotlin:kotlin-bom:1.3.70
-org.springframework.data:spring-data-releasetrain:Moore-SR7
-org.springframework:spring-aop:5.2.6.RELEASE
-org.springframework:spring-beans:5.2.6.RELEASE
-org.springframework:spring-context:5.2.6.RELEASE
-org.springframework:spring-core:5.2.6.RELEASE
-org.springframework:spring-expression:5.2.6.RELEASE
-org.springframework:spring-framework-bom:5.2.6.RELEASE
-org.springframework:spring-jcl:5.2.6.RELEASE

aspects/gradle/dependency-locks/runtimeClasspath.lockfile

@@ -1,14 +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-SR7
-org.aspectj:aspectjrt:1.9.3
-org.jetbrains.kotlin:kotlin-bom:1.3.70
-org.springframework.data:spring-data-releasetrain:Moore-SR7
-org.springframework:spring-aop:5.2.6.RELEASE
-org.springframework:spring-beans:5.2.6.RELEASE
-org.springframework:spring-context:5.2.6.RELEASE
-org.springframework:spring-core:5.2.6.RELEASE
-org.springframework:spring-expression:5.2.6.RELEASE
-org.springframework:spring-framework-bom:5.2.6.RELEASE
-org.springframework:spring-jcl:5.2.6.RELEASE

aspects/gradle/dependency-locks/runtimeMerge.lockfile

@@ -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-SR7
-org.jetbrains.kotlin:kotlin-bom:1.3.70
-org.springframework.data:spring-data-releasetrain:Moore-SR7
-org.springframework:spring-framework-bom:5.2.6.RELEASE

aspects/gradle/dependency-locks/signatures.lockfile

@@ -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-SR7
-org.jetbrains.kotlin:kotlin-bom:1.3.70
-org.springframework.data:spring-data-releasetrain:Moore-SR7
-org.springframework:spring-framework-bom:5.2.6.RELEASE

aspects/gradle/dependency-locks/testAnnotationProcessor.lockfile

@@ -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-SR7
-org.jetbrains.kotlin:kotlin-bom:1.3.70
-org.springframework.data:spring-data-releasetrain:Moore-SR7
-org.springframework:spring-framework-bom:5.2.6.RELEASE

aspects/gradle/dependency-locks/testAspect.lockfile

@@ -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-SR7
-org.jetbrains.kotlin:kotlin-bom:1.3.70
-org.springframework.data:spring-data-releasetrain:Moore-SR7
-org.springframework:spring-framework-bom:5.2.6.RELEASE

aspects/gradle/dependency-locks/testCompile.lockfile

@@ -1,22 +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-SR7
-junit:junit:4.12
-net.bytebuddy:byte-buddy-agent:1.10.5
-net.bytebuddy:byte-buddy:1.10.5
-org.aspectj:aspectjrt:1.9.3
-org.assertj:assertj-core:3.16.0
-org.hamcrest:hamcrest-core:1.3
-org.jetbrains.kotlin:kotlin-bom:1.3.70
-org.mockito:mockito-core:3.3.3
-org.objenesis:objenesis:2.6
-org.springframework.data:spring-data-releasetrain:Moore-SR7
-org.springframework:spring-aop:5.2.6.RELEASE
-org.springframework:spring-beans:5.2.6.RELEASE
-org.springframework:spring-context:5.2.6.RELEASE
-org.springframework:spring-core:5.2.6.RELEASE
-org.springframework:spring-expression:5.2.6.RELEASE
-org.springframework:spring-framework-bom:5.2.6.RELEASE
-org.springframework:spring-jcl:5.2.6.RELEASE
-org.springframework:spring-test:5.2.6.RELEASE

aspects/gradle/dependency-locks/testCompileClasspath.lockfile

@@ -1,22 +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-SR7
-junit:junit:4.12
-net.bytebuddy:byte-buddy-agent:1.10.5
-net.bytebuddy:byte-buddy:1.10.5
-org.aspectj:aspectjrt:1.9.3
-org.assertj:assertj-core:3.16.0
-org.hamcrest:hamcrest-core:1.3
-org.jetbrains.kotlin:kotlin-bom:1.3.70
-org.mockito:mockito-core:3.3.3
-org.objenesis:objenesis:2.6
-org.springframework.data:spring-data-releasetrain:Moore-SR7
-org.springframework:spring-aop:5.2.6.RELEASE
-org.springframework:spring-beans:5.2.6.RELEASE
-org.springframework:spring-context:5.2.6.RELEASE
-org.springframework:spring-core:5.2.6.RELEASE
-org.springframework:spring-expression:5.2.6.RELEASE
-org.springframework:spring-framework-bom:5.2.6.RELEASE
-org.springframework:spring-jcl:5.2.6.RELEASE
-org.springframework:spring-test:5.2.6.RELEASE

aspects/gradle/dependency-locks/testCompileOnly.lockfile

@@ -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-SR7
-org.jetbrains.kotlin:kotlin-bom:1.3.70
-org.springframework.data:spring-data-releasetrain:Moore-SR7
-org.springframework:spring-framework-bom:5.2.6.RELEASE

aspects/gradle/dependency-locks/testInpath.lockfile

@@ -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-SR7
-org.jetbrains.kotlin:kotlin-bom:1.3.70
-org.springframework.data:spring-data-releasetrain:Moore-SR7
-org.springframework:spring-framework-bom:5.2.6.RELEASE

aspects/gradle/dependency-locks/testRuntime.lockfile

@@ -1,22 +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-SR7
-junit:junit:4.12
-net.bytebuddy:byte-buddy-agent:1.10.5
-net.bytebuddy:byte-buddy:1.10.5
-org.aspectj:aspectjrt:1.9.3
-org.assertj:assertj-core:3.16.0
-org.hamcrest:hamcrest-core:1.3
-org.jetbrains.kotlin:kotlin-bom:1.3.70
-org.mockito:mockito-core:3.3.3
-org.objenesis:objenesis:2.6
-org.springframework.data:spring-data-releasetrain:Moore-SR7
-org.springframework:spring-aop:5.2.6.RELEASE
-org.springframework:spring-beans:5.2.6.RELEASE
-org.springframework:spring-context:5.2.6.RELEASE
-org.springframework:spring-core:5.2.6.RELEASE
-org.springframework:spring-expression:5.2.6.RELEASE
-org.springframework:spring-framework-bom:5.2.6.RELEASE
-org.springframework:spring-jcl:5.2.6.RELEASE
-org.springframework:spring-test:5.2.6.RELEASE

aspects/gradle/dependency-locks/testRuntimeClasspath.lockfile

@@ -1,22 +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-SR7
-junit:junit:4.12
-net.bytebuddy:byte-buddy-agent:1.10.5
-net.bytebuddy:byte-buddy:1.10.5
-org.aspectj:aspectjrt:1.9.3
-org.assertj:assertj-core:3.16.0
-org.hamcrest:hamcrest-core:1.3
-org.jetbrains.kotlin:kotlin-bom:1.3.70
-org.mockito:mockito-core:3.3.3
-org.objenesis:objenesis:2.6
-org.springframework.data:spring-data-releasetrain:Moore-SR7
-org.springframework:spring-aop:5.2.6.RELEASE
-org.springframework:spring-beans:5.2.6.RELEASE
-org.springframework:spring-context:5.2.6.RELEASE
-org.springframework:spring-core:5.2.6.RELEASE
-org.springframework:spring-expression:5.2.6.RELEASE
-org.springframework:spring-framework-bom:5.2.6.RELEASE
-org.springframework:spring-jcl:5.2.6.RELEASE
-org.springframework:spring-test:5.2.6.RELEASE

aspects/gradle/dependency-locks/tests.lockfile

@@ -1,22 +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-SR7
-junit:junit:4.12
-net.bytebuddy:byte-buddy-agent:1.10.5
-net.bytebuddy:byte-buddy:1.10.5
-org.aspectj:aspectjrt:1.9.3
-org.assertj:assertj-core:3.16.0
-org.hamcrest:hamcrest-core:1.3
-org.jetbrains.kotlin:kotlin-bom:1.3.70
-org.mockito:mockito-core:3.3.3
-org.objenesis:objenesis:2.6
-org.springframework.data:spring-data-releasetrain:Moore-SR7
-org.springframework:spring-aop:5.2.6.RELEASE
-org.springframework:spring-beans:5.2.6.RELEASE
-org.springframework:spring-context:5.2.6.RELEASE
-org.springframework:spring-core:5.2.6.RELEASE
-org.springframework:spring-expression:5.2.6.RELEASE
-org.springframework:spring-framework-bom:5.2.6.RELEASE
-org.springframework:spring-jcl:5.2.6.RELEASE
-org.springframework:spring-test:5.2.6.RELEASE

aspects/spring-security-aspects.gradle

@@ -1,25 +1,11 @@
 apply plugin: 'io.spring.convention.spring-module'
-apply plugin: 'io.freefair.aspectj'
+apply plugin: 'aspectj'
 
 dependencies {
-	compile "org.aspectj:aspectjrt"
 	compile project(':spring-security-core')
 	compile 'org.springframework:spring-beans'
 	compile 'org.springframework:spring-context'
 	compile 'org.springframework:spring-core'
 
 	testCompile 'org.springframework:spring-aop'
-	testAspect sourceSets.main.output
-}
-
-sourceSets.main.aspectj.srcDir "src/main/java"
-sourceSets.main.java.srcDirs = files()
-
-sourceSets.test.aspectj.srcDir "src/test/java"
-sourceSets.test.java.srcDirs = files()
-
-compileAspectj.ajcOptions.outxmlfile = "META-INF/aop.xml"
-
-aspectj {
-	version = aspectjVersion
 }

aspects/src/main/java/org/springframework/security/access/intercept/aspectj/aspect/AnnotationSecurityAspect.aj

@@ -72,7 +72,11 @@ public aspect AnnotationSecurityAspect implements InitializingBean {
 						return proceed();
 				}
 
-				AspectJCallback callback = () -> proceed();
+				AspectJCallback callback = new AspectJCallback() {
+						public Object proceedWithObject() {
+								return proceed();
+						}
+				};
 
 				return this.securityInterceptor.invoke(thisJoinPoint, callback);
 		}
@@ -81,7 +85,7 @@ public aspect AnnotationSecurityAspect implements InitializingBean {
 				this.securityInterceptor = securityInterceptor;
 		}
 
-		public void afterPropertiesSet() {
+		public void afterPropertiesSet() throws Exception {
 				if (this.securityInterceptor == null) {
 						throw new IllegalArgumentException("securityInterceptor required");
 				}