Fix NoClassDefFoundError from Gradle upgradle

This is necessary to work with the latest Bamboo and Artifactory Gradle plugin

.editorconfig

@@ -1,22 +0,0 @@
-# EditorConfig for Spring Security
-# see https://github.com/spring-projects/spring-security/blob/master/CONTRIBUTING.adoc#mind-the-whitespace
-
-root = true
-
-[*]
-end_of_line = lf
-trim_trailing_whitespace = true
-insert_final_newline = true
-max_line_length = 120
-
-[*.{java,xml}]
-indent_style = tab
-indent_size = 4
-charset = utf-8
-continuation_indent_size = 8
-
-ij_smart_tabs = false
-ij_java_align_multiline_parameters = false
-
-[*.gradle]
-indent_style = tab

.gitattributes

@@ -1,17 +0,0 @@
-# Normalize line endings to auto.
-* text auto
-
-# Ensure that line endings for DOS batch files are not modified.
-*.bat -text
-
-# Ensure the following are treated as binary.
-*.cer      binary
-*.graffle  binary
-*.jar      binary
-*.jpeg     binary
-*.jpg      binary
-*.keystore binary
-*.odg      binary
-*.otg      binary
-*.png      binary
-*.hsx      binary

.github/ISSUE_TEMPLATE.md

@@ -1,40 +0,0 @@
-<!--
-For Security Vulnerabilities, please use https://spring.io/security-policy
--->
-
-### Summary
-
-<!-- 
-Please provide a high level summary of the issue you are having
--->
-
-### Actual Behavior
-
-<!-- 
-Please describe step by step the behavior you are observing
--->
-
-### Expected Behavior
-
-<!--
-Please describe step by step the behavior you expect
--->
-
-### Configuration
-
-<!--
-Please provide any configuration you have.
--->
-
-### Version
-
-<!--
-Please describe what version you are using. Does the problem occur in other versions?
--->
-
-### Sample
-
-<!--
-Providing a complete sample (i.e. link to a github repository) will give this issue higher
-priority than issues that do not have a complete sample
--->

.github/ISSUE_TEMPLATE/bug.md

@@ -1,28 +0,0 @@
----
-name: Bug
-about: Create a bug report to help us improve
-title: ''
-labels: 'status: waiting-for-triage, type: bug'
-assignees: ''
-
----
-
-<!--
-Do NOT report Security Vulnerabilities here. Please use https://github.com/spring-projects/spring-security/security/policy
--->
-
-**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

@@ -1,9 +0,0 @@
-<!--
-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-).
--->

.github/dependabot.yml

@@ -1,92 +0,0 @@
-version: 2
-
-registries:
-  spring-milestones:
-    type: maven-repository
-    url: https://repo.spring.io/milestone
-
-updates:
-
-  - package-ecosystem: "gradle"
-    target-branch: "main"
-    milestone: 319 # 6.2.x
-    directory: "/"
-    schedule:
-      interval: "daily"
-      time: "03:00"
-      timezone: "Etc/UTC"
-    labels: [ "type: dependency-upgrade" ]
-    registries:
-      - "spring-milestones"
-    ignore:
-      - dependency-name: "com.nimbusds:nimbus-jose-jwt" # nimbus-jose-jwt gets updated when oauth2-oidc-sdk is updated to ensure consistency
-      - dependency-name: "org.python:jython" # jython updates break integration tests
-      - dependency-name: "org.apache.directory.server:*" # ApacheDS version > 1.5.5 contains break changes
-      - dependency-name: "org.junit:junit-bom"
-        update-types: [ "version-update:semver-major" ]
-      - dependency-name: "org.mockito:mockito-bom"
-        update-types: [ "version-update:semver-major" ]
-      - dependency-name: "*"
-        update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
-
-  - package-ecosystem: "gradle"
-    target-branch: "6.1.x"
-    milestone: 318 # 6.1.x
-    directory: "/"
-    schedule:
-      interval: "daily"
-      time: "03:00"
-      timezone: "Etc/UTC"
-    labels: [ "type: dependency-upgrade" ]
-    ignore:
-      - dependency-name: "com.nimbusds:nimbus-jose-jwt" # nimbus-jose-jwt gets updated when oauth2-oidc-sdk is updated to ensure consistency
-      - dependency-name: "org.python:jython" # jython updates break integration tests
-      - dependency-name: "org.apache.directory.server:*" # ApacheDS version > 1.5.5 contains break changes
-      - dependency-name: "org.junit:junit-bom"
-        update-types: [ "version-update:semver-major" ]
-      - dependency-name: "org.mockito:mockito-bom"
-        update-types: [ "version-update:semver-major" ]
-      - dependency-name: "*"
-        update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
-
-  - package-ecosystem: "gradle"
-    target-branch: "6.0.x"
-    milestone: 143 # 6.0.x
-    directory: "/"
-    schedule:
-      interval: "daily"
-      time: "03:00"
-      timezone: "Etc/UTC"
-    labels: [ "type: dependency-upgrade" ]
-    ignore:
-      - dependency-name: "com.nimbusds:nimbus-jose-jwt" # nimbus-jose-jwt gets updated when oauth2-oidc-sdk is updated to ensure consistency
-      - dependency-name: "org.python:jython" # jython updates break integration tests
-      - dependency-name: "org.apache.directory.server:*" # ApacheDS version > 1.5.5 contains break changes
-      - dependency-name: "org.junit:junit-bom"
-        update-types: [ "version-update:semver-major" ]
-      - dependency-name: "org.mockito:mockito-bom"
-        update-types: [ "version-update:semver-major" ]
-      - dependency-name: "*"
-        update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
-
-  - package-ecosystem: "gradle"
-    target-branch: "5.8.x"
-    milestone: 246 # 5.8.x
-    directory: "/"
-    schedule:
-      interval: "daily"
-      time: "03:00"
-      timezone: "Etc/UTC"
-    labels: [ "type: dependency-upgrade" ]
-    ignore:
-      - dependency-name: "com.nimbusds:nimbus-jose-jwt" # nimbus-jose-jwt gets updated when oauth2-oidc-sdk is updated to ensure consistency
-      - dependency-name: "org.python:jython" # jython updates break integration tests
-      - dependency-name: "org.apache.directory.server:*" # ApacheDS version > 1.5.5 contains break changes
-      - dependency-name: "io.mockk:mockk" # mockk updates break tests
-      - dependency-name: "org.opensaml:*" # org.opensaml maintains two different versions, so it must be updated manually
-      - dependency-name: "org.junit:junit-bom"
-        update-types: [ "version-update:semver-major" ]
-      - dependency-name: "org.mockito:mockito-bom"
-        update-types: [ "version-update:semver-major" ]
-      - dependency-name: "*"
-        update-types: [ "version-update:semver-major", "version-update:semver-minor" ]

.github/workflows/clean_build_artifacts.yml

@@ -1,23 +0,0 @@
-name: Clean build artifacts
-on:
-  schedule:
-    - cron: '0 10 * * *' # Once per day at 10am UTC
-
-permissions:
-  contents: read
-
-jobs:
-  main:
-    runs-on: ubuntu-latest
-    if: ${{ github.repository == 'spring-projects/spring-security' }}
-    permissions:
-      contents: none
-    steps:
-      - name: Delete artifacts in cron job
-        env:
-          GH_ACTIONS_REPO_TOKEN: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}
-        run: |
-          echo "Running clean build artifacts logic"
-          output=$(curl -X GET -H "Authorization: token $GH_ACTIONS_REPO_TOKEN" https://api.github.com/repos/spring-projects/spring-security/actions/artifacts | grep '"id"' | cut -d : -f2 | sed 's/,*$//g')
-          echo Output is $output
-          for id in $output; do curl -X DELETE -H "Authorization: token $GH_ACTIONS_REPO_TOKEN" https://api.github.com/repos/spring-projects/spring-security/actions/artifacts/$id; done;

.github/workflows/continuous-integration-workflow.yml

@@ -1,325 +0,0 @@
-name: CI
-
-on:
-  push:
-    branches-ignore:
-      - "dependabot/**"
-  schedule:
-    - cron: '0 10 * * *' # Once per day at 10am UTC
-  workflow_dispatch: # Manual trigger
-
-env:
-  SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
-  GRADLE_ENTERPRISE_CACHE_USER: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }}
-  GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
-  GRADLE_ENTERPRISE_SECRET_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
-  COMMIT_OWNER: ${{ github.event.pusher.name }}
-  COMMIT_SHA: ${{ github.sha }}
-  STRUCTURE101_LICENSEID: ${{ secrets.STRUCTURE101_LICENSEID }}
-  ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
-  ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
-
-permissions:
-  contents: read
-
-jobs:
-  prerequisites:
-    name: Pre-requisites for building
-    runs-on: ubuntu-latest
-    if: ${{ github.repository == 'spring-projects/spring-security' }}
-    outputs:
-      runjobs: ${{ steps.continue.outputs.runjobs }}
-      project_version: ${{ steps.continue.outputs.project_version }}
-      samples_branch: ${{ steps.continue.outputs.samples_branch }}
-    steps:
-      - uses: actions/checkout@v3
-      - id: continue
-        name: Determine if should continue
-        run: |
-          # Run jobs if in upstream repository
-          echo "runjobs=true" >>$GITHUB_OUTPUT
-          # Extract version from gradle.properties
-          version=$(cat gradle.properties | grep "version=" | awk -F'=' '{print $2}')
-          echo "project_version=$version" >>$GITHUB_OUTPUT
-          samples_branch=$(cat gradle.properties | grep "samplesBranch=" | awk -F'=' '{print $2}')
-          echo "samples_branch=$samples_branch" >>$GITHUB_OUTPUT
-  build_jdk_17:
-    name: Build JDK 17
-    needs: [prerequisites]
-    strategy:
-      matrix:
-        os: [ubuntu-latest, windows-latest]
-    runs-on: ${{ matrix.os }}
-    if: needs.prerequisites.outputs.runjobs
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up JDK 17
-        uses: actions/setup-java@v3
-        with:
-          java-version: '17'
-          distribution: 'temurin'
-          cache: 'gradle'
-      - name: Set up Gradle
-        uses: gradle/gradle-build-action@v2
-      - name: Set up gradle user name
-        run: echo 'systemProp.user.name=spring-builds+github' >> gradle.properties
-      - name: Build with Gradle
-        env:
-          GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }}
-          GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
-          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
-        run: ./gradlew clean build --continue -PartifactoryUsername="$ARTIFACTORY_USERNAME" -PartifactoryPassword="$ARTIFACTORY_PASSWORD"
-  snapshot_tests:
-    name: Test against snapshots
-    needs: [prerequisites]
-    strategy:
-      matrix:
-        include:
-          - java-version: '21-ea'
-            toolchain: '21'
-          - java-version: '17'
-            toolchain: '17'
-    runs-on: ubuntu-latest
-    if: needs.prerequisites.outputs.runjobs
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up gradle
-        uses: spring-io/spring-gradle-build-action@v1
-        with:
-          java-version: ${{ matrix.java-version }}
-          distribution: 'temurin'
-      - name: Snapshot Tests
-        run: |
-          export GRADLE_ENTERPRISE_CACHE_USERNAME="$GRADLE_ENTERPRISE_CACHE_USER"
-          export GRADLE_ENTERPRISE_CACHE_PASSWORD="$GRADLE_ENTERPRISE_CACHE_PASSWORD"
-          export GRADLE_ENTERPRISE_ACCESS_KEY="$GRADLE_ENTERPRISE_SECRET_ACCESS_KEY"
-          ./gradlew test --refresh-dependencies -PartifactoryUsername="$ARTIFACTORY_USERNAME" -PartifactoryPassword="$ARTIFACTORY_PASSWORD" -PforceMavenRepositories=snapshot -PisOverrideVersionCatalog -PtestToolchain=${{ matrix.toolchain }} -PspringFrameworkVersion='6.1.+' -PreactorVersion='2023.0.+' -PspringDataVersion='2023.1.+' -PlocksDisabled --stacktrace
-  check_samples:
-    name: Check Samples project
-    needs: [prerequisites]
-    runs-on: ubuntu-latest
-    if: needs.prerequisites.outputs.runjobs
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up gradle
-        uses: spring-io/spring-gradle-build-action@v1
-        with:
-          java-version: '17'
-          distribution: 'temurin'
-      - name: Check samples project
-        env:
-          LOCAL_REPOSITORY_PATH: ${{ github.workspace }}/build/publications/repos
-          SAMPLES_DIR: ../spring-security-samples
-          VERSION: ${{ needs.prerequisites.outputs.project_version }}
-          SAMPLES_BRANCH: ${{ needs.prerequisites.outputs.samples_branch }}
-        run: |
-          export GRADLE_ENTERPRISE_CACHE_USERNAME="$GRADLE_ENTERPRISE_CACHE_USER"
-          export GRADLE_ENTERPRISE_CACHE_PASSWORD="$GRADLE_ENTERPRISE_CACHE_PASSWORD"
-          export GRADLE_ENTERPRISE_ACCESS_KEY="$GRADLE_ENTERPRISE_SECRET_ACCESS_KEY"
-          ./gradlew publishMavenJavaPublicationToLocalRepository
-          ./gradlew cloneRepository -PrepositoryName="spring-projects/spring-security-samples" -Pref="$SAMPLES_BRANCH" -PcloneOutputDirectory="$SAMPLES_DIR"
-          ./gradlew --project-dir "$SAMPLES_DIR" --init-script spring-security-ci.gradle -PlocalRepositoryPath="$LOCAL_REPOSITORY_PATH" -PspringSecurityVersion="$VERSION" :runAllTests
-  check_tangles:
-    name: Check for Package Tangles
-    needs: [ prerequisites ]
-    runs-on: ubuntu-latest
-    if: needs.prerequisites.outputs.runjobs
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up gradle
-        uses: spring-io/spring-gradle-build-action@v1
-        with:
-          java-version: '17'
-          distribution: 'temurin'
-      - name: Check for package tangles
-        run: |
-          export GRADLE_ENTERPRISE_CACHE_USERNAME="$GRADLE_ENTERPRISE_CACHE_USER"
-          export GRADLE_ENTERPRISE_CACHE_PASSWORD="$GRADLE_ENTERPRISE_CACHE_PASSWORD"
-          export GRADLE_ENTERPRISE_ACCESS_KEY="$GRADLE_ENTERPRISE_SECRET_ACCESS_KEY"
-          ./gradlew check s101 -Ps101.licenseId="$STRUCTURE101_LICENSEID" --stacktrace
-  deploy_artifacts:
-    name: Deploy Artifacts
-    needs: [build_jdk_17, snapshot_tests, check_samples, check_tangles]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up gradle
-        uses: spring-io/spring-gradle-build-action@v1
-        with:
-          java-version: '17'
-          distribution: 'temurin'
-      - name: Deploy artifacts
-        run: |
-          export GRADLE_ENTERPRISE_CACHE_USERNAME="$GRADLE_ENTERPRISE_CACHE_USER"
-          export GRADLE_ENTERPRISE_CACHE_PASSWORD="$GRADLE_ENTERPRISE_CACHE_PASSWORD"
-          export GRADLE_ENTERPRISE_ACCESS_KEY="$GRADLE_ENTERPRISE_SECRET_ACCESS_KEY"
-          ./gradlew publishArtifacts finalizeDeployArtifacts -PossrhUsername="$OSSRH_TOKEN_USERNAME" -PossrhPassword="$OSSRH_TOKEN_PASSWORD" -PartifactoryUsername="$ARTIFACTORY_USERNAME" -PartifactoryPassword="$ARTIFACTORY_PASSWORD" --stacktrace
-        env:
-          ORG_GRADLE_PROJECT_signingKey: ${{ secrets.GPG_PRIVATE_KEY }}
-          ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.GPG_PASSPHRASE }}
-          OSSRH_TOKEN_USERNAME: ${{ secrets.OSSRH_S01_TOKEN_USERNAME }}
-          OSSRH_TOKEN_PASSWORD: ${{ secrets.OSSRH_S01_TOKEN_PASSWORD }}
-          ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
-          ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
-  deploy_docs:
-    name: Deploy Docs
-    needs: [build_jdk_17, snapshot_tests, check_samples, check_tangles]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up gradle
-        uses: spring-io/spring-gradle-build-action@v1
-        with:
-          java-version: '17'
-          distribution: 'temurin'
-      - name: Deploy Docs
-        run: |
-          export GRADLE_ENTERPRISE_CACHE_USERNAME="$GRADLE_ENTERPRISE_CACHE_USER"
-          export GRADLE_ENTERPRISE_CACHE_PASSWORD="$GRADLE_ENTERPRISE_CACHE_PASSWORD"
-          export GRADLE_ENTERPRISE_ACCESS_KEY="$GRADLE_ENTERPRISE_SECRET_ACCESS_KEY"
-          ./gradlew deployDocs -PdeployDocsSshKey="$DOCS_SSH_KEY" -PdeployDocsSshUsername="$DOCS_USERNAME" -PdeployDocsHost="$DOCS_HOST" --stacktrace
-        env:
-          DOCS_USERNAME: ${{ secrets.DOCS_USERNAME }}
-          DOCS_SSH_KEY: ${{ secrets.DOCS_SSH_KEY }}
-          DOCS_HOST: ${{ secrets.DOCS_HOST }}
-  deploy_schema:
-    name: Deploy Schema
-    needs: [build_jdk_17, snapshot_tests, check_samples, check_tangles]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up gradle
-        uses: spring-io/spring-gradle-build-action@v1
-        with:
-          java-version: '17'
-          distribution: 'temurin'
-      - name: Deploy Schema
-        run: |
-          export GRADLE_ENTERPRISE_CACHE_USERNAME="$GRADLE_ENTERPRISE_CACHE_USER"
-          export GRADLE_ENTERPRISE_CACHE_PASSWORD="$GRADLE_ENTERPRISE_CACHE_PASSWORD"
-          export GRADLE_ENTERPRISE_ACCESS_KEY="$GRADLE_ENTERPRISE_SECRET_ACCESS_KEY"
-          ./gradlew deploySchema -PdeployDocsSshKey="$DOCS_SSH_KEY" -PdeployDocsSshUsername="$DOCS_USERNAME" -PdeployDocsHost="$DOCS_HOST" --stacktrace --info
-        env:
-          DOCS_USERNAME: ${{ secrets.DOCS_USERNAME }}
-          DOCS_SSH_KEY: ${{ secrets.DOCS_SSH_KEY }}
-          DOCS_HOST: ${{ secrets.DOCS_HOST }}
-  perform_release:
-    name: Perform release
-    needs: [prerequisites, deploy_artifacts, deploy_docs, deploy_schema]
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-    timeout-minutes: 90
-    if: ${{ !endsWith(needs.prerequisites.outputs.project_version, '-SNAPSHOT') }}
-    env:
-      REPO: ${{ github.repository }}
-      BRANCH: ${{ github.ref_name }}
-      TOKEN: ${{ github.token }}
-      VERSION: ${{ needs.prerequisites.outputs.project_version }}
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          token: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}
-      - name: Set up gradle
-        uses: spring-io/spring-gradle-build-action@v1
-        with:
-          java-version: '17'
-          distribution: 'temurin'
-      - name: Wait for Artifactory Artifacts
-        if: ${{ contains(needs.prerequisites.outputs.project_version, '-RC') || contains(needs.prerequisites.outputs.project_version, '-M') }}
-        run: |
-          echo "Wait for artifacts of $REPO@$VERSION to appear on Artifactory."
-          until curl -f -s https://repo.spring.io/artifactory/milestone/org/springframework/security/spring-security-core/$VERSION/ > /dev/null
-          do
-            sleep 30
-            echo "."
-          done
-          echo "Artifacts for $REPO@$VERSION have been released to Artifactory."
-      - name: Wait for Maven Central Artifacts
-        if: ${{ !contains(needs.prerequisites.outputs.project_version, '-RC') && !contains(needs.prerequisites.outputs.project_version, '-M') }}
-        run: |
-          echo "Wait for artifacts of $REPO@$VERSION to appear on Maven Central."
-          until curl -f -s https://repo1.maven.org/maven2/org/springframework/security/spring-security-core/$VERSION/ > /dev/null
-          do
-            sleep 30
-            echo "."
-          done
-          echo "Artifacts for $REPO@$VERSION have been released to Maven Central."
-      - name: Create GitHub Release
-        run: |
-          export GRADLE_ENTERPRISE_CACHE_USERNAME="$GRADLE_ENTERPRISE_CACHE_USER"
-          export GRADLE_ENTERPRISE_CACHE_PASSWORD="$GRADLE_ENTERPRISE_CACHE_PASSWORD"
-          export GRADLE_ENTERPRISE_ACCESS_KEY="$GRADLE_ENTERPRISE_SECRET_ACCESS_KEY"
-          echo "Tagging and publishing $REPO@$VERSION release on GitHub."
-          ./gradlew createGitHubRelease -PnextVersion=$VERSION -Pbranch=$BRANCH -PcreateRelease=true -PgitHubAccessToken=$TOKEN
-      - name: Announce Release on Slack
-        id: spring-security-announcing
-        uses: slackapi/slack-github-action@v1.19.0
-        with:
-          payload: |
-            {
-              "text": "spring-security-announcing `${{ env.VERSION }}` is available now",
-              "blocks": [
-                {
-                  "type": "section",
-                  "text": {
-                    "type": "mrkdwn",
-                    "text": "spring-security-announcing `${{ env.VERSION }}` is available now"
-                  }
-                }
-              ]
-            }
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.SPRING_RELEASE_SLACK_WEBHOOK_URL }}
-          SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
-      - name: Setup git config
-        run: |
-          git config user.name 'github-actions[bot]'
-          git config user.email 'github-actions[bot]@users.noreply.github.com'
-      - name: Update to next Snapshot Version
-        run: |
-          export GRADLE_ENTERPRISE_CACHE_USERNAME="$GRADLE_ENTERPRISE_CACHE_USER"
-          export GRADLE_ENTERPRISE_CACHE_PASSWORD="$GRADLE_ENTERPRISE_CACHE_PASSWORD"
-          export GRADLE_ENTERPRISE_ACCESS_KEY="$GRADLE_ENTERPRISE_SECRET_ACCESS_KEY"
-          echo "Updating $REPO@$VERSION to next snapshot version."
-          ./gradlew :updateToSnapshotVersion
-          git commit -am "Next development version"
-          git push
-  perform_post_release:
-    name: Perform post-release
-    needs: [prerequisites, deploy_artifacts, deploy_docs, deploy_schema]
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      issues: write
-    timeout-minutes: 90
-    if: ${{ endsWith(needs.prerequisites.outputs.project_version, '-SNAPSHOT') }}
-    env:
-      TOKEN: ${{ github.token }}
-      VERSION: ${{ needs.prerequisites.outputs.project_version }}
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up gradle
-        uses: spring-io/spring-gradle-build-action@v1
-        with:
-          java-version: '17'
-          distribution: 'temurin'
-      - name: Schedule next release (if not already scheduled)
-        run: ./gradlew scheduleNextRelease -PnextVersion=$VERSION -PgitHubAccessToken=$TOKEN
-  notify_result:
-    name: Check for failures
-    needs: [perform_release, perform_post_release]
-    if: failure()
-    runs-on: ubuntu-latest
-    permissions:
-      actions: read
-    steps:
-      - name: Send Slack message
-        # Workaround while waiting for Gamesight/slack-workflow-status#38 to be fixed
-        # See https://github.com/Gamesight/slack-workflow-status/issues/38
-        uses: sjohnr/slack-workflow-status@v1-beta
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          slack_webhook_url: ${{ secrets.SLACK_WEBHOOK_URL }}
-          channel: '#spring-security-ci'
-          name: 'CI Notifier'

.github/workflows/deploy-docs.yml

@@ -1,33 +0,0 @@
-name: Deploy Docs
-on:
-  push:
-    branches-ignore:
-      - "gh-pages"
-      - "dependabot/**"
-    tags: '**'
-  repository_dispatch:
-    types: request-build-reference # legacy
-  #schedule:
-  #- cron: '0 10 * * *' # Once per day at 10am UTC
-  workflow_dispatch:
-permissions: read-all
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    if: github.repository_owner == 'spring-projects'
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v3
-      with:
-        ref: docs-build
-        fetch-depth: 1
-    - name: Dispatch (partial build)
-      if: github.ref_type == 'branch'
-      env:
-        GH_TOKEN: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}
-      run: gh workflow run deploy-docs.yml -r $(git rev-parse --abbrev-ref HEAD) -f build-refname=${{ github.ref_name }}
-    - name: Dispatch (full build)
-      if: github.ref_type == 'tag'
-      env:
-        GH_TOKEN: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}
-      run: gh workflow run deploy-docs.yml -r $(git rev-parse --abbrev-ref HEAD)

.github/workflows/gradle-wrapper-upgrade-execution.yml

@@ -1,32 +0,0 @@
-name: Execute Gradle Wrapper Upgrade
-
-on:
-  schedule:
-    - cron:  '0 2 * * *' # 2am UTC
-  workflow_dispatch:
-
-jobs:
-  upgrade_wrapper:
-    name: Execution
-    runs-on: ubuntu-latest
-    steps:
-      - name: Set up Git configuration
-        env:
-          TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          git config --global url."https://unused-username:${TOKEN}@github.com/".insteadOf "https://github.com/"
-          git config --global user.name 'github-actions[bot]'
-          git config --global user.email 'github-actions[bot]@users.noreply.github.com'
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Set up JDK 17
-        uses: actions/setup-java@v3
-        with:
-          java-version: '17'
-          distribution: 'temurin'
-      - name: Set up Gradle
-        uses: gradle/gradle-build-action@v2
-      - name: Upgrade Wrappers
-        run: ./gradlew clean upgradeGradleWrapperAll --continue -Porg.gradle.java.installations.auto-download=false
-        env:
-          WRAPPER_UPGRADE_GIT_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/milestone-spring-releasetrain.yml

@@ -1,40 +0,0 @@
-name: Check Milestone
-on:
-  milestone:
-    types: [created, opened, edited]
-env:
-  DUE_ON: ${{ github.event.milestone.due_on }}
-  TITLE: ${{ github.event.milestone.title }}
-permissions:
-  contents: read
-jobs:
-  spring-releasetrain-checks:    
-    name: Check DueOn is on a Release Date
-    runs-on: ubuntu-latest
-    if: ${{ github.repository == 'spring-projects/spring-security' }}
-    permissions:
-      contents: none
-    steps:
-    - name: Print Milestone Being Checked
-      run: echo "Validating DueOn '$DUE_ON' for milestone '$TITLE'"
-    - name: Validate DueOn
-      if: env.DUE_ON != ''
-      run: |
-        export TOOL_VERSION=0.1.1
-        wget "https://repo.maven.apache.org/maven2/io/spring/releasetrain/spring-release-train-tools/$TOOL_VERSION/spring-release-train-tools-$TOOL_VERSION.jar"
-        java -cp "spring-release-train-tools-$TOOL_VERSION.jar" io.spring.releasetrain.CheckMilestoneDueOnMain --dueOn "$DUE_ON" --expectedDayOfWeek MONDAY --expectedMondayCount 3
-  notify_result:
-    name: Check for failures
-    needs: [spring-releasetrain-checks]
-    if: failure()
-    runs-on: ubuntu-latest
-    permissions:
-      actions: read
-    steps:
-      - name: Send Slack message
-        uses: Gamesight/slack-workflow-status@v1.0.1
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          slack_webhook_url: ${{ secrets.SLACK_WEBHOOK_URL }}
-          channel: '#spring-security-ci'
-          name: 'CI Notifier'

.github/workflows/pr-build-workflow.yml

@@ -1,21 +0,0 @@
-name: PR Build
-
-on: pull_request
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    name: Build
-    runs-on: ubuntu-latest
-    if: ${{ github.repository == 'spring-projects/spring-security' }}
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up gradle
-        uses: spring-io/spring-gradle-build-action@v1
-        with:
-          java-version: '17'
-          distribution: 'temurin'
-      - name: Build with Gradle
-        run: ./gradlew clean build --continue --scan

.github/workflows/release-scheduler.yml

@@ -1,24 +0,0 @@
-name: Release Scheduler
-on:
-  schedule:
-  - cron: '15 15 * * MON' # Every Monday at 3:15pm UTC
-  workflow_dispatch:
-permissions: read-all
-jobs:
-  dispatch_scheduled_releases:
-    name: Dispatch scheduled releases
-    if: github.repository_owner == 'spring-projects'
-    strategy:
-      matrix:
-        # List of active maintenance branches.
-        branch: [ main, 6.1.x, 6.0.x, 5.8.x ]
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 1
-    - name: Dispatch
-      env:
-        GH_TOKEN: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}
-      run: gh workflow run update-scheduled-release-version.yml -r ${{ matrix.branch }}

.github/workflows/update-scheduled-release-version.yml

@@ -1,80 +0,0 @@
-name: Update Scheduled Release Version
-
-on:
-  workflow_dispatch: # Manual trigger only. Triggered by release-scheduler.yml on main.
-
-env:
-  SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
-  GRADLE_ENTERPRISE_CACHE_USER: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }}
-  GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
-  GRADLE_ENTERPRISE_SECRET_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
-
-permissions:
-  contents: read
-
-jobs:
-  update_scheduled_release_version:
-    name: Initiate Release If Scheduled
-    if: ${{ github.repository == 'spring-projects/spring-security' }}
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      actions: read
-    steps:
-      - id: checkout-source
-        name: Checkout Source Code
-        uses: actions/checkout@v3
-        with:
-          token: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}
-      - name: Set up gradle
-        uses: spring-io/spring-gradle-build-action@v1
-        with:
-          java-version: '17'
-          distribution: 'temurin'
-      - id: check-release-due
-        name: Check Release Due
-        run: |
-          export GRADLE_ENTERPRISE_CACHE_USERNAME="$GRADLE_ENTERPRISE_CACHE_USER"
-          export GRADLE_ENTERPRISE_CACHE_PASSWORD="$GRADLE_ENTERPRISE_CACHE_PASSWORD"
-          export GRADLE_ENTERPRISE_ACCESS_KEY="$GRADLE_ENTERPRISE_SECRET_ACCESS_KEY"
-          ./gradlew gitHubCheckNextVersionDueToday
-          echo "is_due_today=$(cat build/github/milestones/is-due-today)" >>$GITHUB_OUTPUT
-      - id: check-open-issues
-        name: Check for open issues
-        if: steps.check-release-due.outputs.is_due_today == 'true'
-        run: |
-          export GRADLE_ENTERPRISE_CACHE_USERNAME="$GRADLE_ENTERPRISE_CACHE_USER"
-          export GRADLE_ENTERPRISE_CACHE_PASSWORD="$GRADLE_ENTERPRISE_CACHE_PASSWORD"
-          export GRADLE_ENTERPRISE_ACCESS_KEY="$GRADLE_ENTERPRISE_SECRET_ACCESS_KEY"
-          ./gradlew gitHubCheckMilestoneHasNoOpenIssues
-          echo "is_open_issues=$(cat build/github/milestones/is-open-issues)" >>$GITHUB_OUTPUT
-      - id: validate-release-state
-        name: Validate State of Release
-        if: steps.check-release-due.outputs.is_due_today == 'true' && steps.check-open-issues.outputs.is_open_issues == 'true'
-        run: |
-          echo "The release is due today but there are open issues"
-          exit 1
-      - id: update-version-and-push
-        name: Update version and push
-        if: steps.check-release-due.outputs.is_due_today == 'true' && steps.check-open-issues.outputs.is_open_issues == 'false'
-        run: |
-          export GRADLE_ENTERPRISE_CACHE_USERNAME="$GRADLE_ENTERPRISE_CACHE_USER"
-          export GRADLE_ENTERPRISE_CACHE_PASSWORD="$GRADLE_ENTERPRISE_CACHE_PASSWORD"
-          export GRADLE_ENTERPRISE_ACCESS_KEY="$GRADLE_ENTERPRISE_SECRET_ACCESS_KEY"
-          git config user.name 'github-actions[bot]'
-          git config user.email 'github-actions[bot]@users.noreply.github.com'
-          ./gradlew :updateProjectVersion
-          updatedVersion=$(cat gradle.properties | grep "version=" | awk -F'=' '{print $2}')
-          git commit -am "Release $updatedVersion"
-          git tag $updatedVersion
-          git push
-          git push origin $updatedVersion
-      - id: send-slack-notification
-        name: Send Slack message
-        if: failure()
-        uses: Gamesight/slack-workflow-status@v1.0.1
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          slack_webhook_url: ${{ secrets.SLACK_WEBHOOK_URL }}
-          channel: '#spring-security-ci'
-          name: 'CI Notifier'

.gitignore

@@ -1,4 +1,3 @@
-classes/
 target/
 */src/*/java/META-INF
 */src/META-INF/
@@ -8,7 +7,7 @@ target/
 .project
 .DS_Store
 .settings/
-.idea/*
+.idea/
 out/
 bin/
 intellij/
@@ -20,11 +19,3 @@ build/
 *.iws
 .gradle/
 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,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CheckStyle-IDEA">
-    <option name="configuration">
-      <map>
-        <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="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>

.sdkmanrc

@@ -1,6 +0,0 @@
-# Use sdkman to run "sdk env" to initialize with correct JDK version
-# Enable auto-env through the sdkman_auto_env config
-# See https://sdkman.io/usage#config
-# A summary is to add the following to ~/.sdkman/etc/config
-# sdkman_auto_env=true
-java=17.0.3-tem

.vscode/settings.json

@@ -1,3 +0,0 @@
-{
-	"java.import.gradle.enabled": false
-}

CONTRIBUTING.adoc

@@ -1,154 +0,0 @@
-= Contributing to Spring Security
-
-First off, thank you for taking the time to contribute! :+1: :tada:
-
-== Table of Contents
-
-* <<code-of-conduct>>
-* <<how-to-contribute>>
-* <<ask-questions>>
-* <<find-an-issue>>
-* <<create-an-issue>>
-* <<issue-lifecycle>>
-* <<submit-a-pull-request>>
-* <<build-from-source>>
-* <<code-style>>
-
-[[code-of-conduct]]
-== Code of Conduct
-
-This project is governed by the https://github.com/spring-projects/.github/blob/main/CODE_OF_CONDUCT.md[Spring code of conduct].
-By participating you are expected to uphold this code.
-Please report unacceptable behavior to spring-code-of-conduct@pivotal.io.
-
-[[how-to-contribute]]
-== How to Contribute
-
-[[ask-questions]]
-=== Ask Questions
-
-If you have a question, check Stack Overflow using
-https://stackoverflow.com/questions/tagged/spring-security+or+spring-ldap+or+spring-authorization-server+or+spring-session?tab=Newest[this list of tags].
-Find an existing discussion, or start a new one if necessary.
-
-If you believe there is an issue, search through https://github.com/spring-projects/spring-security/issues[existing issues] trying a  few different ways to find discussions, past or current, that are related to the issue.
-Reading those discussions helps you to learn about the issue, and helps us to make a decision.
-
-[[find-an-issue]]
-=== Find an Existing Issue
-
-There are many issues in Spring Security with the labels https://github.com/spring-projects/spring-security/issues?q=is%3Aissue+is%3Aopen+label%3A%22status%3A+ideal-for-contribution%22[`ideal-for-contribution`] or https://github.com/spring-projects/spring-security/issues?q=is%3Aissue+is%3Aopen+label%3A%22status%3A+first-timers-only%22[`first-timers-only`] that are a great way to contribute to a discussion or <<submit-a-pull-request,to a PR>>.
-You can volunteer by commenting on these tickets, and we will assign them to you.
-
-[[create-an-issue]]
-=== Create an Issue
-
-Reporting an issue or making a feature request is a great way to contribute.
-Your feedback and the conversations that result from it provide a continuous flow of ideas.
-However, before creating a ticket, please take the time to <<ask-questions,ask and research>> first.
-
-If you create an issue after a discussion on Stack Overflow, please provide a description in the issue instead of simply referring to Stack Overflow.
-The issue tracker is an important place of record for design discussions and should be self-sufficient.
-
-Once you're ready, create an issue on https://github.com/spring-projects/spring-security/issues[GitHub].
-
-Many issues are caused by subtle behavior, typos, and unintended configuration.
-Creating a https://stackoverflow.com/help/minimal-reproducible-example[Minimal Reproducible Example] (starting with https://start.spring.io for example) of the problem helps the team quickly triage your issue and get to the core of the problem.
-
-We love contributors, and we may ask you to <<submit-a-pull-request,submit a PR with a fix>>.
-
-[[issue-lifecycle]]
-=== Issue Lifecycle
-
-When an issue is first created, it is flagged `waiting-for-triage` waiting for a team member to triage it.
-Once the issue has been reviewed, the team may ask for further information if needed, and based on the findings, the issue is either assigned a target branch (or no branch if a feature) or is closed with a specific status.
-The target branch is https://spring.io/projects/spring-security#support[the earliest supported branch] where <<choose-a-branch,the change will be applied>>.
-
-When a fix is ready, the issue is closed and may still be re-opened until the fix is released.
-After that the issue will typically no longer be reopened.
-In rare cases if the issue was not at all fixed, the issue may be re-opened.
-In most cases however any follow-up reports will need to be created as new issues with a fresh description.
-
-[[build-from-source]]
-=== Build from Source
-
-See https://github.com/spring-projects/spring-security/tree/main#building-from-source[Build from Source] for instructions on how to check out, build, and import the Spring Security source code into your IDE.
-
-[[code-style]]
-=== Source Code Style
-
-The wiki pages https://github.com/spring-projects/spring-framework/wiki/Code-Style[Code Style] and https://github.com/spring-projects/spring-framework/wiki/IntelliJ-IDEA-Editor-Settings[IntelliJ IDEA Editor Settings] define the source file coding standards we use along with some IDEA editor settings we customize.
-
-To format the code as well as check the style, run `./gradle format check`.
-
-[[submit-a-pull-request]]
-=== Submit a Pull Request
-
-We are excited for your pull request! :heart:
-
-Please do your best to follow these steps.
-Don't worry if you don't get them all correct the first time, we will help you.
-
-[[sign-cla]]
-1. If you have not previously done so, please sign the https://cla.spring.io/sign/spring[Contributor License Agreement].
-You will be reminded automatically when you submit the PR.
-[[create-an-issue]]
-1. Must you https://github.com/spring-projects/spring-security/issues/new/choose[create an issue] first? No, but it is recommended for features and larger bug fixes. It's easier discuss with the team first to determine the right fix or enhancement.
-For typos and straightforward bug fixes, starting with a pull request is encouraged.
-Please include a description for context and motivation.
-Note that the team may close your pull request if it's not a fit for the project.
-[[choose-a-branch]]
-1. Always check out the branch indicated in the milestone and submit pull requests against it (for example, for milestone `5.8.3` use the `5.8.x` branch).
-If there is no milestone, choose `main`.
-Once merged, the fix will be forwarded-ported to applicable branches including `main`.
-[[create-a-local-branch]]
-1. Create a local branch
-If this is for an issue, consider a branch name with the issue number, like `gh-22276`.
-[[write-tests]]
-1. Add JUnit Tests for your changes
-[[update-copyright]]
-1. In all files you edited, if the copyright header is of the form 2002-20xx, update the final copyright year to the current year.
-[[add-since]]
-1. If on `main`, add `@since` JavaDoc attributes to new public APIs that your PR adds
-[[change-rnc]]
-1. If you are updating the XSD, please instead update the RNC file and then run `./gradlew :spring-security-config:rncToXsd`.
-[[format-code]]
-1. For each commit, build the code using `./gradlew format check`.
-This command ensures the code meets most of <<code-style,the style guide>>; a notable exception is import order.
-[[commit-atomically]]
-1. Choose the granularity of your commits consciously and squash commits that represent
-multiple edits or corrections of the same logical change.
-See https://git-scm.com/book/en/Git-Tools-Rewriting-History[Rewriting History section of Pro Git] for an overview of streamlining the commit history.
-[[format-commit-messages]]
-1. Format commit messages using 55 characters for the subject line, 72 characters per line
-for the description, followed by the issue fixed, for example, `Closes gh-22276`.
-See the https://git-scm.com/book/en/Distributed-Git-Contributing-to-a-Project#Commit-Guidelines[Commit Guidelines section of Pro Git] for best practices around commit messages, and use `git log` to see some examples.
-Present tense is preferred.
-+
-[indent=0]
-----
-Address NullPointerException
-
-Closes gh-22276
-----
-[[reference-issue]]
-1. If there is a prior issue, reference the GitHub issue number in the description of the pull request.
-+
-[indent=0]
-----
-Closes gh-22276
-----
-
-If accepted, your contribution may be heavily modified as needed prior to merging.
-You will likely retain author attribution for your Git commits granted that the bulk of your changes remain intact.
-You may also be asked to rework the submission.
-
-If asked to make corrections, simply push the changes against the same branch, and your pull request will be updated.
-In other words, you do not need to create a new pull request when asked to make changes.
-When it is time to merge, you'll be asked to squash your commits.
-
-==== Participate in Reviews
-
-Helping to review pull requests is another great way to contribute.
-Your feedback can help to shape the implementation of new features.
-When reviewing pull requests, however, please refrain from approving or rejecting a PR unless you are a core committer for Spring Security.

LICENSE.txt

@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        https://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright {yyyy} {name of copyright owner}
-
-   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.

README.adoc

@@ -1,78 +0,0 @@
-image::https://badges.gitter.im/Join%20Chat.svg[Gitter,link=https://gitter.im/spring-projects/spring-security?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge]
-
-image:https://github.com/spring-projects/spring-security/workflows/CI/badge.svg?branch=main["Build Status", link="https://github.com/spring-projects/spring-security/actions?query=workflow%3ACI"]
-
-image:https://img.shields.io/badge/Revved%20up%20by-Gradle%20Enterprise-06A0CE?logo=Gradle&labelColor=02303A["Revved up by Gradle Enterprise", link="https://ge.spring.io/scans?search.rootProjectNames=spring-security"]
-
-= Spring Security
-
-Spring Security provides security services for the https://docs.spring.io[Spring IO Platform]. Spring Security 6.0 requires Spring 6.0 as
-a minimum and also requires Java 17.
-
-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/main/CODE_OF_CONDUCT.md[code of conduct]
-
-== Downloading Artifacts
-See https://docs.spring.io/spring-security/site/docs/current/reference/html5/#getting[Getting Spring Security] for how to obtain Spring Security.
-
-== 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].
-
-== Quick Start
-See https://docs.spring.io/spring-security/site/docs/current/reference/html5/#servlet-hello[Hello Spring Security] to get started with a "Hello, World" application.
-
-== Building from Source
-Spring Security uses a https://gradle.org[Gradle]-based build system.
-In the instructions below, https://vimeo.com/34436402[`./gradlew`] is invoked from the root of the source tree and serves as
-a cross-platform, self-contained bootstrap mechanism for the build.
-
-=== Prerequisites
-https://docs.github.com/en/get-started/quickstart/set-up-git[Git] and the https://www.oracle.com/java/technologies/downloads/#java17[JDK17 build].
-
-Be sure that your `JAVA_HOME` environment variable points to the `jdk-17` folder extracted from the JDK download.
-
-=== Check out sources
-[indent=0]
-----
-git clone git@github.com:spring-projects/spring-security.git
-----
-
-=== Install all `spring-*.jar` into your local Maven repository.
-
-[indent=0]
-----
-./gradlew publishToMavenLocal
-----
-
-=== Compile and test; build all JARs, distribution zips, and docs
-
-[indent=0]
-----
-./gradlew build
-----
-
-The reference docs are not currently included in the distribution zip.
-You can build the reference docs for this branch by running the following command:
-
-----
-./gradlew :spring-security-docs:antora
-----
-
-That command publishes the docs site to the `_docs/build/site_` directory.
-The https://github.com/spring-projects/spring-security/tree/docs-build[playbook branch] describes how to build the reference docs in detail.
-
-Discover more commands with `./gradlew tasks`.
-
-== Getting Support
-Check out the https://stackoverflow.com/questions/tagged/spring-security[Spring Security tags on Stack Overflow].
-https://spring.io/support[Commercial support] is available too.
-
-== Contributing
-https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request[Pull requests] are welcome; see the https://github.com/spring-projects/spring-security/blob/main/CONTRIBUTING.adoc[contributor guidelines] for details.
-
-== License
-Spring Security is Open Source software released under the
-https://www.apache.org/licenses/LICENSE-2.0.html[Apache 2.0 license].

RELEASE.adoc

@@ -1,279 +0,0 @@
-= Release Process
-
-The release process for Spring Security is partially automated. The following table outlines which steps are automated and which are manual. Follow the links to read about each step.
-
-[cols="1,1"]
-|===
-| Step | Status
-
-| <<update-dependencies>>
-| :x: manual
-
-| <<check-all-issues-are-closed>>
-| :white_check_mark: automated (scheduled release will abort if any issues are open)
-
-| <<update-release-version>>
-| :white_check_mark: automated
-
-| <<update-antora-version>>
-| :white_check_mark: automated
-
-| <<build-locally>>
-| :x: manual (when updating dependencies)
-
-| <<push-release-commit>>
-| :white_check_mark: automated
-
-| <<announce-release-on-slack>>
-| :white_check_mark: automated
-
-| <<tag-release>>
-| :white_check_mark: automated
-
-| <<update-to-next-development-version>>
-| :white_check_mark: automated
-
-| <<update-version-on-project-page>>
-| :x: manual
-
-| <<update-release-notes-on-github>>
-| :white_check_mark: automated
-
-| <<close-create-milestone,Close milestone>>
-| :x: manual (move issues to new milestone before release)
-
-| <<close-create-milestone,Create milestone>>
-| :white_check_mark: automated (if not already created)
-
-| <<announce-release-on-other-channels>>
-| :x: manual
-|===
-
-*When should I update dependencies manually?* Dependencies should be updated at the latest the end of the week prior to the release. This is usually the Friday following the 2nd Monday of the month (counting from the first week with a Monday). When in doubt, check the https://github.com/spring-projects/spring-security/milestones[milestones] page for release due dates.
-
-*When do scheduled releases occur?* Automated releases are scheduled to occur at *3:15 PM UTC* on the *3rd Monday of the month* (counting from the first week with a Monday).
-
-[NOTE]
-The scheduled release process currently runs every Monday but only releases when a release is due. See the performed checks below for more information.
-
-The automated release process occurs on the following branches:
-
-* `main`
-* `6.0.x`
-* `5.8.x`
-* `5.7.x`
-
-For each of the above branches, the automated process performs the following checks before proceeding with the release:
-
-1. _Check if the milestone is due today._ This check compares the current (SNAPSHOT) version of the branch with available milestones and chooses the first match (sorted alphabetically). If the due date on the matched milestone is *not* today, the process stops.
-2. _Check if all issues are closed._ This check uses the milestone from the previous step and looks for open issues. If any open issues are found, the process stops.
-
-[IMPORTANT]
-You should ensure all issues are closed or moved to another milestone prior to a scheduled release.
-
-If the above checks pass, the version number is updated (in `gradle.properties` and `antora.yml`) and a commit is pushed to trigger the CI process.
-
-*How do I trigger a release manually?* You can trigger a release manually in two ways:
-
-1. Trigger a release for a particular branch via https://github.com/spring-projects/spring-security/actions/workflows/update-scheduled-release-version.yml[`update-scheduled-release-version.yml`] on the desired branch. The above checks are performed for that branch, and the release will proceed if all checks pass. _This is the recommended way to trigger a release that did not pass the above checks during a regularly scheduled release._
-2. Trigger releases for all branches via https://github.com/spring-projects/spring-security/actions/workflows/release-scheduler.yml[`release-scheduler.yml`] on the `main` branch. The above checks are performed for each branch, and only releases that pass all checks will proceed.
-
-*When should additional manual steps be performed?* All other automated steps listed above occur during the normal CI process. Additional manual steps can be performed at any time once the builds pass and releases are finished.
-
-*What if something goes wrong?* If the normal CI process fails, you can retry by re-running the failed jobs with the "Re-run failed jobs" option in GitHub Actions. If changes are required, you should revert the "Release x.y.z" commit, delete the tag, and proceed manually.
-
-[#update-dependencies]
-== Update dependencies
-
-Ensure you have no changes in your local repository.
-Change to a new branch.
-For example:
-
-[source,bash]
-----
-$ git checkout -b 5.5.0-RC1-dependencies
-----
-
-Review the rules in build.gradle to ensure the rules make sense.
-For example, we should not allow major version updates in a patch release.
-Also ensure that all of the exclusions still make sense.
-
-The following Gradle command will update your dependencies creating a commit for each dependency update.
-The first invocation of the command will take quite a while (~20 minutes depending on internet speed) to run because it is indexing all the versions of all the dependencies.
-
-[source,bash]
-----
-$ ./gradlew updateDependencies
-----
-
-Review the commits to ensure that the updated dependency versions make sense for this release. For example, we should not perform a major version update for a patch release.
-
-[source,bash]
-----
-$ git log
-----
-
-If any of the versions don’t make sense, update `build.gradle` to ensure that the version is excluded.
-
-Run all the checks:
-
-[source,bash]
-----
-$ ./gradlew check
-----
-
-If they don’t work, you can run a git bisect to discover what broke the build.
-Fix any commits that broke the build.
-
-Check out the original brach:
-
-[source,bash]
-----
-$ git checkout -
-----
-
-The following command will update the dependencies again but this time creating a ticket for each update and placing `Closes gh-<number>` in the commit. Replacing the following values:
-
-* <github-personal-access-token> - Replace with a https://github.com/settings/tokens[GitHub personal access token] that has a scope of `public_repo`
-* <next-version> - Replace with the title of the milestone you are releasing now (i.e. 5.5.0-RC1)
-
-[source,bash]
-----
-$ ./gradlew updateDependencies -PupdateMode=GITHUB_ISSUE -PgitHubAccessToken=<github-personal-access-token> -PnextVersion=<next-version>
-----
-
-Apply any fixes from your previous branch that were necessary.
-
-[#check-all-issues-are-closed]
-== Check all issues are closed
-
-The following command will check if there are any open issues for the ticket.
-Before running the command, replace the following values:
-
-* <github-personal-access-token> - Replace with a https://github.com/settings/tokens[GitHub personal access token] that has a scope of `public_repo`. This is optional since you are unlikely to reach the rate limit for such a simple check.
-* <next-version> - Replace with the title of the milestone you are releasing now (i.e. 5.5.0-RC1)
-
-[source,bash]
-----
-$ ./gradlew gitHubCheckMilestoneHasNoOpenIssues -PgitHubAccessToken=<github-personal-access-token> -PnextVersion=<next-version>
-----
-
-Alternatively, you can manually check using https://github.com/spring-projects/spring-security/milestones
-
-[#update-release-version]
-== Update release version
-
-Update the version number in `gradle.properties` for the release, for example `5.5.0-M1`, `5.5.0-RC1`, `5.5.0`
-
-[#update-antora-version]
-== Update antora version
-
-You will need to update the antora.yml version.
-If you are unsure of what the values should be, the following task will instruct you what the expected values are:
-
-[source,bash]
-----
-./gradlew :spring-security-docs:antoraCheckVersion
-----
-
-[#build-locally]
-== Build locally
-
-Run the build using
-
-[source,bash]
-----
-$ ./gradlew check
-----
-
-[#push-release-commit]
-== Push release commit
-
-Push the commit and GitHub actions will build and deploy the artifacts
-If you are pushing to Maven Central, then you can get notified when it’s uploaded by running the following:
-
-[source,bash]
-----
-$ ./scripts/release/wait-for-done.sh 5.5.0
-----
-
-[#announce-release-on-slack]
-== Announce release on Slack
-
-* Announce via Slack on
-https://pivotal.slack.com/messages/spring-release[#spring-release],
-including the keyword `+spring-security-announcing+` in the message.
-Something like:
-
-....
-spring-security-announcing 5.5.0 is available.
-....
-
-[#tag-release]
-== Tag release
-
-* Tag the release and then push the tag
-
-....
-git tag 5.4.0-RC1
-git push origin 5.4.0-RC1
-....
-
-[#update-to-next-development-version]
-== Update to next development version
-
-* Update `gradle.properties` version to next `+SNAPSHOT+` version, update antora.yml, and then push
-
-[#update-version-on-project-page]
-== Update version on project page
-
-The following command will update https://spring.io/projects/spring-security#learn with the new release version using the following parameters
-
-<github-personal-access-token> - Replace with a https://github.com/settings/tokens[GitHub personal access token] that has a scope of `read:org` as https://spring.io/restdocs/index.html#authentication[documented for spring.io api]
-<next-version> - Replace with the milestone you are releasing now (i.e. 5.5.0-RC1)
-<previous-version> - Replace with the previous release which will be removed from the listed versions (i.e. 5.5.0-M3)
-
-[source,bash]
-----
-$ ./gradlew saganCreateRelease saganDeleteRelease -PgitHubAccessToken=<github-personal-access-token> -PnextVersion=<next-version> -PpreviousVersion=<previous-version>
-----
-
-[#update-release-notes-on-github]
-== Update release notes on GitHub
-
-Generate the Release Notes replacing:
-
-* <next-version> - Replace with the milestone you are releasing now (i.e. 5.5.0-RC1)
-
-----
-$ ./gradlew generateChangelog -PnextVersion=<next-version>
-----
-
-* Copy the release notes to your clipboard (your mileage may vary with
-the following command)
-
-....
-cat build/changelog/release-notes.md | xclip -selection clipboard
-....
-
-* Create the
-https://github.com/spring-projects/spring-security/releases[release on
-GitHub], associate it with the tag, and paste the generated notes
-
-[#close-create-milestone]
-== Close / Create milestone
-
-* In
-https://github.com/spring-projects/spring-security/milestones[GitHub
-Milestones], create a new milestone for the next release version
-* Move any open issues from the existing milestone you just released to
-the new milestone
-* Close the milestone for the release.
-
-[#announce-release-on-other-channels]
-== Announce release on other channels
-
-* Create a https://spring.io/admin/blog[Blog]
-* Tweet from [@SpringSecurity](https://twitter.com/springsecurity)
-
-

acl/acl.gradle

@@ -0,0 +1,14 @@
+// Acl Module build file
+
+dependencies {
+    compile project(':spring-security-core'),
+            "net.sf.ehcache:ehcache:$ehcacheVersion",
+            "org.springframework:spring-aop:$springVersion",
+            "org.springframework:spring-context:$springVersion",
+            "org.springframework:spring-tx:$springVersion",
+            "org.springframework:spring-jdbc:$springVersion"
+
+    testCompile "org.springframework:spring-beans:$springVersion",
+                "org.springframework:spring-context-support:$springVersion",
+                "org.springframework:spring-test:$springVersion"
+}

acl/pom.xml

@@ -0,0 +1,68 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <parent>
+        <artifactId>spring-security-parent</artifactId>
+        <groupId>org.springframework.security</groupId>
+        <version>@pomVersion@</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.springframework.security</groupId>
+    <artifactId>spring-security-acl</artifactId>
+    <name>Spring Security - ACL module</name>
+    <packaging>jar</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-core</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-core</artifactId>
+            <version>${project.version}</version>
+            <classifier>tests</classifier>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context-support</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-jdbc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>net.sf.ehcache</groupId>
+            <artifactId>ehcache</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>hsqldb</groupId>
+            <artifactId>hsqldb</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+            <version>8.3-603.jdbc3</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.springsource.bundlor</groupId>
+                <artifactId>com.springsource.bundlor.maven</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

acl/spring-security-acl.gradle

@@ -1,23 +0,0 @@
-apply plugin: 'io.spring.convention.spring-module'
-
-dependencies {
-	management platform(project(":spring-security-dependencies"))
-	api project(':spring-security-core')
-	api 'org.springframework:spring-aop'
-	api 'org.springframework:spring-context'
-	api 'org.springframework:spring-core'
-	api 'org.springframework:spring-jdbc'
-	api 'org.springframework:spring-tx'
-
-	testImplementation "org.assertj:assertj-core"
-	testImplementation "org.junit.jupiter:junit-jupiter-api"
-	testImplementation "org.junit.jupiter:junit-jupiter-params"
-	testImplementation "org.junit.jupiter:junit-jupiter-engine"
-	testImplementation "org.mockito:mockito-core"
-	testImplementation "org.mockito:mockito-junit-jupiter"
-	testImplementation 'org.springframework:spring-beans'
-	testImplementation 'org.springframework:spring-context-support'
-	testImplementation "org.springframework:spring-test"
-
-	testRuntimeOnly 'org.hsqldb:hsqldb'
-}

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

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,7 +12,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.security.acls;
 
 import java.lang.reflect.InvocationTargetException;
@@ -22,10 +20,8 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 
-import org.aopalliance.intercept.MethodInvocation;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
 import org.springframework.security.access.AuthorizationServiceException;
 import org.springframework.security.access.ConfigAttribute;
 import org.springframework.security.access.vote.AbstractAclVoter;
@@ -41,201 +37,207 @@ import org.springframework.security.acls.model.Sid;
 import org.springframework.security.acls.model.SidRetrievalStrategy;
 import org.springframework.security.core.Authentication;
 import org.springframework.util.Assert;
-import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 
+
 /**
  * <p>
- * Given a domain object instance passed as a method argument, ensures the principal has
- * appropriate permission as indicated by the {@link AclService}.
+ * Given a domain object instance passed as a method argument, ensures the principal has appropriate permission
+ * as indicated by the {@link AclService}.
  * <p>
- * The <tt>AclService</tt> is used to retrieve the access control list (ACL) permissions
- * associated with a domain object instance for the current <tt>Authentication</tt>
- * object.
+ * The <tt>AclService</tt> is used to retrieve the access control list (ACL) permissions associated with a
+ * domain object instance for the current <tt>Authentication</tt> object.
  * <p>
- * The voter will vote if any {@link ConfigAttribute#getAttribute()} matches the
- * {@link #processConfigAttribute}. The provider will then locate the first method
- * argument of type {@link #processDomainObjectClass}. Assuming that method argument is
- * non-null, the provider will then lookup the ACLs from the <code>AclManager</code> and
- * ensure the principal is {@link Acl#isGranted(List, List, boolean)} when presenting the
- * {@link #requirePermission} array to that method.
+ * The voter will vote if any  {@link ConfigAttribute#getAttribute()} matches the {@link #processConfigAttribute}.
+ * The provider will then locate the first method argument of type {@link #processDomainObjectClass}. Assuming that
+ * method argument is non-null, the provider will then lookup the ACLs from the <code>AclManager</code> and ensure the
+ * principal is {@link Acl#isGranted(List,
+ * List, boolean)} when presenting the {@link #requirePermission} array to that
+ * method.
  * <p>
- * If the method argument is <tt>null</tt>, the voter will abstain from voting. If the
- * method argument could not be found, an {@link AuthorizationServiceException} will be
- * thrown.
+ * If the method argument is <tt>null</tt>, the voter will abstain from voting. If the method argument
+ * could not be found, an {@link AuthorizationServiceException} will be thrown.
  * <p>
- * In practical terms users will typically setup a number of <tt>AclEntryVoter</tt>s. Each
- * will have a different {@link #setProcessDomainObjectClass processDomainObjectClass},
- * {@link #processConfigAttribute} and {@link #requirePermission} combination. For
- * example, a small application might employ the following instances of
+ * In practical terms users will typically setup a number of <tt>AclEntryVoter</tt>s. Each will have a
+ * different {@link #setProcessDomainObjectClass processDomainObjectClass}, {@link #processConfigAttribute} and
+ * {@link #requirePermission} combination. For example, a small application might employ the following instances of
  * <tt>AclEntryVoter</tt>:
- * <ul>
- * <li>Process domain object class <code>BankAccount</code>, configuration attribute
- * <code>VOTE_ACL_BANK_ACCONT_READ</code>, require permission
- * <code>BasePermission.READ</code></li>
- * <li>Process domain object class <code>BankAccount</code>, configuration attribute
- * <code>VOTE_ACL_BANK_ACCOUNT_WRITE</code>, require permission list
- * <code>BasePermission.WRITE</code> and <code>BasePermission.CREATE</code> (allowing the
- * principal to have <b>either</b> of these two permissions)</li>
- * <li>Process domain object class <code>Customer</code>, configuration attribute
- * <code>VOTE_ACL_CUSTOMER_READ</code>, require permission
- * <code>BasePermission.READ</code></li>
- * <li>Process domain object class <code>Customer</code>, configuration attribute
- * <code>VOTE_ACL_CUSTOMER_WRITE</code>, require permission list
- * <code>BasePermission.WRITE</code> and <code>BasePermission.CREATE</code></li>
- * </ul>
- * Alternatively, you could have used a common superclass or interface for the
- * {@link #processDomainObjectClass} if both <code>BankAccount</code> and
- * <code>Customer</code> had common parents.
- *
- * <p>
- * If the principal does not have sufficient permissions, the voter will vote to deny
- * access.
- *
- * <p>
- * All comparisons and prefixes are case sensitive.
+ *  <ul>
+ *      <li>Process domain object class <code>BankAccount</code>, configuration attribute
+ *      <code>VOTE_ACL_BANK_ACCONT_READ</code>, require permission <code>BasePermission.READ</code></li>
+ *      <li>Process domain object class <code>BankAccount</code>, configuration attribute
+ *      <code>VOTE_ACL_BANK_ACCOUNT_WRITE</code>, require permission list <code>BasePermission.WRITE</code> and
+ *      <code>BasePermission.CREATE</code> (allowing the principal to have <b>either</b> of these two permissions)</li>
+ *      <li>Process domain object class <code>Customer</code>, configuration attribute
+ *      <code>VOTE_ACL_CUSTOMER_READ</code>, require permission <code>BasePermission.READ</code></li>
+ *      <li>Process domain object class <code>Customer</code>, configuration attribute
+ *      <code>VOTE_ACL_CUSTOMER_WRITE</code>, require permission list <code>BasePermission.WRITE</code> and
+ *      <code>BasePermission.CREATE</code></li>
+ *  </ul>
+ *  Alternatively, you could have used a common superclass or interface for the {@link #processDomainObjectClass}
+ * if both <code>BankAccount</code> and <code>Customer</code> had common parents.</p>
+ *  <p>If the principal does not have sufficient permissions, the voter will vote to deny access.</p>
+ *  <p>All comparisons and prefixes are case sensitive.</p>
  *
  * @author Ben Alex
  */
 public class AclEntryVoter extends AbstractAclVoter {
+    //~ Static fields/initializers =====================================================================================
 
-	private static final Log logger = LogFactory.getLog(AclEntryVoter.class);
+    private static final Log logger = LogFactory.getLog(AclEntryVoter.class);
 
-	private final AclService aclService;
+    //~ Instance fields ================================================================================================
 
-	private final String processConfigAttribute;
+    private AclService aclService;
+    private ObjectIdentityRetrievalStrategy objectIdentityRetrievalStrategy = new ObjectIdentityRetrievalStrategyImpl();
+    private SidRetrievalStrategy sidRetrievalStrategy = new SidRetrievalStrategyImpl();
+    private String internalMethod;
+    private String processConfigAttribute;
+    private List<Permission> requirePermission;
 
-	private final List<Permission> requirePermission;
+    //~ Constructors ===================================================================================================
 
-	private ObjectIdentityRetrievalStrategy objectIdentityRetrievalStrategy = new ObjectIdentityRetrievalStrategyImpl();
+    public AclEntryVoter(AclService aclService, String processConfigAttribute, Permission[] requirePermission) {
+        Assert.notNull(processConfigAttribute, "A processConfigAttribute is mandatory");
+        Assert.notNull(aclService, "An AclService is mandatory");
 
-	private SidRetrievalStrategy sidRetrievalStrategy = new SidRetrievalStrategyImpl();
+        if ((requirePermission == null) || (requirePermission.length == 0)) {
+            throw new IllegalArgumentException("One or more requirePermission entries is mandatory");
+        }
 
-	private String internalMethod;
+        this.aclService = aclService;
+        this.processConfigAttribute = processConfigAttribute;
+        this.requirePermission = Arrays.asList(requirePermission);
+    }
 
-	public AclEntryVoter(AclService aclService, String processConfigAttribute, Permission[] requirePermission) {
-		Assert.notNull(processConfigAttribute, "A processConfigAttribute is mandatory");
-		Assert.notNull(aclService, "An AclService is mandatory");
-		Assert.isTrue(!ObjectUtils.isEmpty(requirePermission), "One or more requirePermission entries is mandatory");
-		this.aclService = aclService;
-		this.processConfigAttribute = processConfigAttribute;
-		this.requirePermission = Arrays.asList(requirePermission);
-	}
+    //~ Methods ========================================================================================================
 
-	/**
-	 * Optionally specifies a method of the domain object that will be used to obtain a
-	 * contained domain object. That contained domain object will be used for the ACL
-	 * evaluation. This is useful if a domain object contains a parent that an ACL
-	 * evaluation should be targeted for, instead of the child domain object (which
-	 * perhaps is being created and as such does not yet have any ACL permissions)
-	 * @return <code>null</code> to use the domain object, or the name of a method (that
-	 * requires no arguments) that should be invoked to obtain an <code>Object</code>
-	 * which will be the domain object used for ACL evaluation
-	 */
-	protected String getInternalMethod() {
-		return this.internalMethod;
-	}
+    /**
+     * Optionally specifies a method of the domain object that will be used to obtain a contained domain
+     * object. That contained domain object will be used for the ACL evaluation. This is useful if a domain object
+     * contains a parent that an ACL evaluation should be targeted for, instead of the child domain object (which
+     * perhaps is being created and as such does not yet have any ACL permissions)
+     *
+     * @return <code>null</code> to use the domain object, or the name of a method (that requires no arguments) that
+     *         should be invoked to obtain an <code>Object</code> which will be the domain object used for ACL
+     *         evaluation
+     */
+    protected String getInternalMethod() {
+        return internalMethod;
+    }
 
-	public void setInternalMethod(String internalMethod) {
-		this.internalMethod = internalMethod;
-	}
+    public void setInternalMethod(String internalMethod) {
+        this.internalMethod = internalMethod;
+    }
 
-	protected String getProcessConfigAttribute() {
-		return this.processConfigAttribute;
-	}
+    protected String getProcessConfigAttribute() {
+        return processConfigAttribute;
+    }
 
-	public void setObjectIdentityRetrievalStrategy(ObjectIdentityRetrievalStrategy objectIdentityRetrievalStrategy) {
-		Assert.notNull(objectIdentityRetrievalStrategy, "ObjectIdentityRetrievalStrategy required");
-		this.objectIdentityRetrievalStrategy = objectIdentityRetrievalStrategy;
-	}
+    public void setObjectIdentityRetrievalStrategy(ObjectIdentityRetrievalStrategy objectIdentityRetrievalStrategy) {
+        Assert.notNull(objectIdentityRetrievalStrategy, "ObjectIdentityRetrievalStrategy required");
+        this.objectIdentityRetrievalStrategy = objectIdentityRetrievalStrategy;
+    }
 
-	public void setSidRetrievalStrategy(SidRetrievalStrategy sidRetrievalStrategy) {
-		Assert.notNull(sidRetrievalStrategy, "SidRetrievalStrategy required");
-		this.sidRetrievalStrategy = sidRetrievalStrategy;
-	}
+    public void setSidRetrievalStrategy(SidRetrievalStrategy sidRetrievalStrategy) {
+        Assert.notNull(sidRetrievalStrategy, "SidRetrievalStrategy required");
+        this.sidRetrievalStrategy = sidRetrievalStrategy;
+    }
 
-	@Override
-	public boolean supports(ConfigAttribute attribute) {
-		return (attribute.getAttribute() != null) && attribute.getAttribute().equals(getProcessConfigAttribute());
-	}
+    public boolean supports(ConfigAttribute attribute) {
+        if ((attribute.getAttribute() != null) && attribute.getAttribute().equals(getProcessConfigAttribute())) {
+            return true;
+        } else {
+            return false;
+        }
+    }
 
-	@Override
-	public int vote(Authentication authentication, MethodInvocation object, Collection<ConfigAttribute> attributes) {
-		for (ConfigAttribute attr : attributes) {
-			if (!supports(attr)) {
-				continue;
-			}
+    public int vote(Authentication authentication, Object object, Collection<ConfigAttribute> attributes) {
 
-			// Need to make an access decision on this invocation
-			// Attempt to locate the domain object instance to process
-			Object domainObject = getDomainObjectInstance(object);
+        for(ConfigAttribute attr : attributes) {
 
-			// If domain object is null, vote to abstain
-			if (domainObject == null) {
-				logger.debug("Voting to abstain - domainObject is null");
-				return ACCESS_ABSTAIN;
-			}
+            if (!this.supports(attr)) {
+                continue;
+            }
+            // Need to make an access decision on this invocation
+            // Attempt to locate the domain object instance to process
+            Object domainObject = getDomainObjectInstance(object);
 
-			// Evaluate if we are required to use an inner domain object
-			if (StringUtils.hasText(this.internalMethod)) {
-				domainObject = invokeInternalMethod(domainObject);
-			}
+            // If domain object is null, vote to abstain
+            if (domainObject == null) {
+                if (logger.isDebugEnabled()) {
+                    logger.debug("Voting to abstain - domainObject is null");
+                }
 
-			// Obtain the OID applicable to the domain object
-			ObjectIdentity objectIdentity = this.objectIdentityRetrievalStrategy.getObjectIdentity(domainObject);
+                return ACCESS_ABSTAIN;
+            }
 
-			// Obtain the SIDs applicable to the principal
-			List<Sid> sids = this.sidRetrievalStrategy.getSids(authentication);
+            // Evaluate if we are required to use an inner domain object
+            if (StringUtils.hasText(internalMethod)) {
+                try {
+                    Class<?> clazz = domainObject.getClass();
+                    Method method = clazz.getMethod(internalMethod, new Class[0]);
+                    domainObject = method.invoke(domainObject, new Object[0]);
+                } catch (NoSuchMethodException nsme) {
+                    throw new AuthorizationServiceException("Object of class '" + domainObject.getClass()
+                        + "' does not provide the requested internalMethod: " + internalMethod);
+                } catch (IllegalAccessException iae) {
+                    logger.debug("IllegalAccessException", iae);
 
-			Acl acl;
+                    throw new AuthorizationServiceException("Problem invoking internalMethod: " + internalMethod
+                        + " for object: " + domainObject);
+                } catch (InvocationTargetException ite) {
+                    logger.debug("InvocationTargetException", ite);
 
-			try {
-				// Lookup only ACLs for SIDs we're interested in
-				acl = this.aclService.readAclById(objectIdentity, sids);
-			}
-			catch (NotFoundException ex) {
-				logger.debug("Voting to deny access - no ACLs apply for this principal");
-				return ACCESS_DENIED;
-			}
+                    throw new AuthorizationServiceException("Problem invoking internalMethod: " + internalMethod
+                        + " for object: " + domainObject);
+                }
+            }
 
-			try {
-				if (acl.isGranted(this.requirePermission, sids, false)) {
-					logger.debug("Voting to grant access");
-					return ACCESS_GRANTED;
-				}
-				logger.debug("Voting to deny access - ACLs returned, but insufficient permissions for this principal");
-				return ACCESS_DENIED;
-			}
-			catch (NotFoundException ex) {
-				logger.debug("Voting to deny access - no ACLs apply for this principal");
-				return ACCESS_DENIED;
-			}
-		}
+            // Obtain the OID applicable to the domain object
+            ObjectIdentity objectIdentity = objectIdentityRetrievalStrategy.getObjectIdentity(domainObject);
 
-		// No configuration attribute matched, so abstain
-		return ACCESS_ABSTAIN;
-	}
+            // Obtain the SIDs applicable to the principal
+            List<Sid> sids = sidRetrievalStrategy.getSids(authentication);
 
-	private Object invokeInternalMethod(Object domainObject) {
-		try {
-			Class<?> domainObjectType = domainObject.getClass();
-			Method method = domainObjectType.getMethod(this.internalMethod, new Class[0]);
-			return method.invoke(domainObject);
-		}
-		catch (NoSuchMethodException ex) {
-			throw new AuthorizationServiceException("Object of class '" + domainObject.getClass()
-					+ "' does not provide the requested internalMethod: " + this.internalMethod);
-		}
-		catch (IllegalAccessException ex) {
-			logger.debug("IllegalAccessException", ex);
-			throw new AuthorizationServiceException(
-					"Problem invoking internalMethod: " + this.internalMethod + " for object: " + domainObject);
-		}
-		catch (InvocationTargetException ex) {
-			logger.debug("InvocationTargetException", ex);
-			throw new AuthorizationServiceException(
-					"Problem invoking internalMethod: " + this.internalMethod + " for object: " + domainObject);
-		}
-	}
+            Acl acl;
 
+            try {
+                // Lookup only ACLs for SIDs we're interested in
+                acl = aclService.readAclById(objectIdentity, sids);
+            } catch (NotFoundException nfe) {
+                if (logger.isDebugEnabled()) {
+                    logger.debug("Voting to deny access - no ACLs apply for this principal");
+                }
+
+                return ACCESS_DENIED;
+            }
+
+            try {
+                if (acl.isGranted(requirePermission, sids, false)) {
+                    if (logger.isDebugEnabled()) {
+                        logger.debug("Voting to grant access");
+                    }
+
+                    return ACCESS_GRANTED;
+                } else {
+                    if (logger.isDebugEnabled()) {
+                        logger.debug(
+                            "Voting to deny access - ACLs returned, but insufficient permissions for this principal");
+                    }
+
+                    return ACCESS_DENIED;
+                }
+            } catch (NotFoundException nfe) {
+                if (logger.isDebugEnabled()) {
+                    logger.debug("Voting to deny access - no ACLs apply for this principal");
+                }
+
+                return ACCESS_DENIED;
+            }
+        }
+
+        // No configuration attribute matched, so abstain
+        return ACCESS_ABSTAIN;
+    }
 }

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

@@ -1,82 +0,0 @@
-/*
- * Copyright 2002-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.security.acls;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.springframework.core.log.LogMessage;
-import org.springframework.security.access.PermissionCacheOptimizer;
-import org.springframework.security.acls.domain.ObjectIdentityRetrievalStrategyImpl;
-import org.springframework.security.acls.domain.SidRetrievalStrategyImpl;
-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.Sid;
-import org.springframework.security.acls.model.SidRetrievalStrategy;
-import org.springframework.security.core.Authentication;
-
-/**
- * Batch loads ACLs for collections of objects to allow optimised filtering.
- *
- * @author Luke Taylor
- * @since 3.1
- */
-public class AclPermissionCacheOptimizer implements PermissionCacheOptimizer {
-
-	private final Log logger = LogFactory.getLog(getClass());
-
-	private final AclService aclService;
-
-	private SidRetrievalStrategy sidRetrievalStrategy = new SidRetrievalStrategyImpl();
-
-	private ObjectIdentityRetrievalStrategy oidRetrievalStrategy = new ObjectIdentityRetrievalStrategyImpl();
-
-	public AclPermissionCacheOptimizer(AclService aclService) {
-		this.aclService = aclService;
-	}
-
-	@Override
-	public void cachePermissionsFor(Authentication authentication, Collection<?> objects) {
-		if (objects.isEmpty()) {
-			return;
-		}
-		List<ObjectIdentity> oidsToCache = new ArrayList<>(objects.size());
-		for (Object domainObject : objects) {
-			if (domainObject != null) {
-				ObjectIdentity oid = this.oidRetrievalStrategy.getObjectIdentity(domainObject);
-				oidsToCache.add(oid);
-			}
-		}
-		List<Sid> sids = this.sidRetrievalStrategy.getSids(authentication);
-		this.logger.debug(LogMessage.of(() -> "Eagerly loading Acls for " + oidsToCache.size() + " objects"));
-		this.aclService.readAclsById(oidsToCache, sids);
-	}
-
-	public void setObjectIdentityRetrievalStrategy(ObjectIdentityRetrievalStrategy objectIdentityRetrievalStrategy) {
-		this.oidRetrievalStrategy = objectIdentityRetrievalStrategy;
-	}
-
-	public void setSidRetrievalStrategy(SidRetrievalStrategy sidRetrievalStrategy) {
-		this.sidRetrievalStrategy = sidRetrievalStrategy;
-	}
-
-}

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

@@ -1,30 +1,11 @@
-/*
- * Copyright 2002-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 package org.springframework.security.acls;
 
 import java.io.Serializable;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Locale;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
-import org.springframework.core.log.LogMessage;
 import org.springframework.security.access.PermissionEvaluator;
 import org.springframework.security.acls.domain.DefaultPermissionFactory;
 import org.springframework.security.acls.domain.ObjectIdentityRetrievalStrategyImpl;
@@ -42,8 +23,8 @@ import org.springframework.security.acls.model.SidRetrievalStrategy;
 import org.springframework.security.core.Authentication;
 
 /**
- * Used by Spring Security's expression-based access control implementation to evaluate
- * permissions for a particular object using the ACL module. Similar in behaviour to
+ * Used by Spring Security's expression-based access control implementation to evaluate permissions for a particular
+ * object using the ACL module. Similar in behaviour to
  * {@link org.springframework.security.acls.AclEntryVoter AclEntryVoter}.
  *
  * @author Luke Taylor
@@ -51,105 +32,114 @@ import org.springframework.security.core.Authentication;
  */
 public class AclPermissionEvaluator implements PermissionEvaluator {
 
-	private final Log logger = LogFactory.getLog(getClass());
+    private final Log logger = LogFactory.getLog(getClass());
 
-	private final AclService aclService;
+    private AclService aclService;
+    private ObjectIdentityRetrievalStrategy objectIdentityRetrievalStrategy = new ObjectIdentityRetrievalStrategyImpl();
+    private ObjectIdentityGenerator objectIdentityGenerator = new ObjectIdentityRetrievalStrategyImpl();
+    private SidRetrievalStrategy sidRetrievalStrategy = new SidRetrievalStrategyImpl();
+    private PermissionFactory permissionFactory = new DefaultPermissionFactory();
 
-	private ObjectIdentityRetrievalStrategy objectIdentityRetrievalStrategy = new ObjectIdentityRetrievalStrategyImpl();
+    public AclPermissionEvaluator(AclService aclService) {
+        this.aclService = aclService;
+    }
 
-	private ObjectIdentityGenerator objectIdentityGenerator = new ObjectIdentityRetrievalStrategyImpl();
+    /**
+     * Determines whether the user has the given permission(s) on the domain object using the ACL
+     * configuration. If the domain object is null, returns false (this can always be overridden using a null
+     * check in the expression itself).
+     */
+    public boolean hasPermission(Authentication authentication, Object domainObject, Object permission) {
+        if (domainObject == null) {
+            return false;
+        }
 
-	private SidRetrievalStrategy sidRetrievalStrategy = new SidRetrievalStrategyImpl();
+        ObjectIdentity objectIdentity = objectIdentityRetrievalStrategy.getObjectIdentity(domainObject);
 
-	private PermissionFactory permissionFactory = new DefaultPermissionFactory();
+        return checkPermission(authentication, objectIdentity, permission);
+    }
 
-	public AclPermissionEvaluator(AclService aclService) {
-		this.aclService = aclService;
-	}
+    public boolean hasPermission(Authentication authentication, Serializable targetId, String targetType, Object permission) {
+        ObjectIdentity objectIdentity = objectIdentityGenerator.createObjectIdentity(targetId, targetType);
 
-	/**
-	 * Determines whether the user has the given permission(s) on the domain object using
-	 * the ACL configuration. If the domain object is null, returns false (this can always
-	 * be overridden using a null check in the expression itself).
-	 */
-	@Override
-	public boolean hasPermission(Authentication authentication, Object domainObject, Object permission) {
-		if (domainObject == null) {
-			return false;
-		}
-		ObjectIdentity objectIdentity = this.objectIdentityRetrievalStrategy.getObjectIdentity(domainObject);
-		return checkPermission(authentication, objectIdentity, permission);
-	}
+        return checkPermission(authentication, objectIdentity, permission);
+    }
 
-	@Override
-	public boolean hasPermission(Authentication authentication, Serializable targetId, String targetType,
-			Object permission) {
-		ObjectIdentity objectIdentity = this.objectIdentityGenerator.createObjectIdentity(targetId, targetType);
-		return checkPermission(authentication, objectIdentity, permission);
-	}
+    private boolean checkPermission(Authentication authentication, ObjectIdentity oid, Object permission) {
+        // Obtain the SIDs applicable to the principal
+        List<Sid> sids = sidRetrievalStrategy.getSids(authentication);
+        List<Permission> requiredPermission = resolvePermission(permission);
 
-	private boolean checkPermission(Authentication authentication, ObjectIdentity oid, Object permission) {
-		// Obtain the SIDs applicable to the principal
-		List<Sid> sids = this.sidRetrievalStrategy.getSids(authentication);
-		List<Permission> requiredPermission = resolvePermission(permission);
-		this.logger.debug(LogMessage.of(() -> "Checking permission '" + permission + "' for object '" + oid + "'"));
-		try {
-			// Lookup only ACLs for SIDs we're interested in
-			Acl acl = this.aclService.readAclById(oid, sids);
-			if (acl.isGranted(requiredPermission, sids, false)) {
-				this.logger.debug("Access is granted");
-				return true;
-			}
-			this.logger.debug("Returning false - ACLs returned, but insufficient permissions for this principal");
-		}
-		catch (NotFoundException nfe) {
-			this.logger.debug("Returning false - no ACLs apply for this principal");
-		}
-		return false;
-	}
+        try {
+            // Lookup only ACLs for SIDs we're interested in
+            Acl acl = aclService.readAclById(oid, sids);
 
-	List<Permission> resolvePermission(Object permission) {
-		if (permission instanceof Integer) {
-			return Arrays.asList(this.permissionFactory.buildFromMask((Integer) permission));
-		}
-		if (permission instanceof Permission) {
-			return Arrays.asList((Permission) permission);
-		}
-		if (permission instanceof Permission[]) {
-			return Arrays.asList((Permission[]) permission);
-		}
-		if (permission instanceof String permString) {
-			Permission p = buildPermission(permString);
-			if (p != null) {
-				return Arrays.asList(p);
-			}
-		}
-		throw new IllegalArgumentException("Unsupported permission: " + permission);
-	}
+            if (acl.isGranted(requiredPermission, sids, false)) {
+                if (logger.isDebugEnabled()) {
+                    logger.debug("Access is granted");
+                }
 
-	private Permission buildPermission(String permString) {
-		try {
-			return this.permissionFactory.buildFromName(permString);
-		}
-		catch (IllegalArgumentException notfound) {
-			return this.permissionFactory.buildFromName(permString.toUpperCase(Locale.ENGLISH));
-		}
-	}
+                return true;
+            }
 
-	public void setObjectIdentityRetrievalStrategy(ObjectIdentityRetrievalStrategy objectIdentityRetrievalStrategy) {
-		this.objectIdentityRetrievalStrategy = objectIdentityRetrievalStrategy;
-	}
+            if (logger.isDebugEnabled()) {
+                logger.debug("Returning false - ACLs returned, but insufficient permissions for this principal");
+            }
 
-	public void setObjectIdentityGenerator(ObjectIdentityGenerator objectIdentityGenerator) {
-		this.objectIdentityGenerator = objectIdentityGenerator;
-	}
+        } catch (NotFoundException nfe) {
+            if (logger.isDebugEnabled()) {
+                logger.debug("Returning false - no ACLs apply for this principal");
+            }
+        }
 
-	public void setSidRetrievalStrategy(SidRetrievalStrategy sidRetrievalStrategy) {
-		this.sidRetrievalStrategy = sidRetrievalStrategy;
-	}
+        return false;
 
-	public void setPermissionFactory(PermissionFactory permissionFactory) {
-		this.permissionFactory = permissionFactory;
-	}
+    }
 
+    List<Permission> resolvePermission(Object permission) {
+        if (permission instanceof Integer) {
+            return Arrays.asList(permissionFactory.buildFromMask(((Integer)permission).intValue()));
+        }
+
+        if (permission instanceof Permission) {
+            return Arrays.asList((Permission)permission);
+        }
+
+        if (permission instanceof Permission[]) {
+            return Arrays.asList((Permission[])permission);
+        }
+
+        if (permission instanceof String) {
+            String permString = (String)permission;
+            Permission p = null;
+
+            try {
+                p = permissionFactory.buildFromName(permString);
+            } catch(IllegalArgumentException notfound) {
+                p = permissionFactory.buildFromName(permString.toUpperCase());
+            }
+
+            if (p != null) {
+                return Arrays.asList(p);
+            }
+
+        }
+        throw new IllegalArgumentException("Unsupported permission: " + permission);
+    }
+
+    public void setObjectIdentityRetrievalStrategy(ObjectIdentityRetrievalStrategy objectIdentityRetrievalStrategy) {
+        this.objectIdentityRetrievalStrategy = objectIdentityRetrievalStrategy;
+    }
+
+    public void setObjectIdentityGenerator(ObjectIdentityGenerator objectIdentityGenerator) {
+        this.objectIdentityGenerator = objectIdentityGenerator;
+    }
+
+    public void setSidRetrievalStrategy(SidRetrievalStrategy sidRetrievalStrategy) {
+        this.sidRetrievalStrategy = sidRetrievalStrategy;
+    }
+
+    public void setPermissionFactory(PermissionFactory permissionFactory) {
+        this.permissionFactory = permissionFactory;
+    }
 }

acl/src/main/java/org/springframework/security/acls/afterinvocation/AbstractAclProvider.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,10 +15,12 @@
 
 package org.springframework.security.acls.afterinvocation;
 
+import java.util.Arrays;
 import java.util.List;
 
 import org.springframework.security.access.AfterInvocationProvider;
 import org.springframework.security.access.ConfigAttribute;
+import org.springframework.security.acls.domain.BasePermission;
 import org.springframework.security.acls.domain.ObjectIdentityRetrievalStrategyImpl;
 import org.springframework.security.acls.domain.SidRetrievalStrategyImpl;
 import org.springframework.security.acls.model.Acl;
@@ -32,93 +33,95 @@ import org.springframework.security.acls.model.Sid;
 import org.springframework.security.acls.model.SidRetrievalStrategy;
 import org.springframework.security.core.Authentication;
 import org.springframework.util.Assert;
-import org.springframework.util.ObjectUtils;
+
 
 /**
- * Abstract {@link AfterInvocationProvider} which provides commonly-used ACL-related
- * services.
+ * Abstract {@link AfterInvocationProvider} which provides commonly-used ACL-related services.
  *
  * @author Ben Alex
- */
+  */
 public abstract class AbstractAclProvider implements AfterInvocationProvider {
+    //~ Instance fields ================================================================================================
 
-	protected final AclService aclService;
+    protected AclService aclService;
+    protected Class<?> processDomainObjectClass = Object.class;
+    protected ObjectIdentityRetrievalStrategy objectIdentityRetrievalStrategy = new ObjectIdentityRetrievalStrategyImpl();
+    protected SidRetrievalStrategy sidRetrievalStrategy = new SidRetrievalStrategyImpl();
+    protected String processConfigAttribute;
+    protected List<Permission> requirePermission = Arrays.asList(BasePermission.READ);
 
-	protected String processConfigAttribute;
+    //~ Constructors ===================================================================================================
 
-	protected Class<?> processDomainObjectClass = Object.class;
+    public AbstractAclProvider(AclService aclService, String processConfigAttribute, List<Permission> requirePermission) {
+        Assert.hasText(processConfigAttribute, "A processConfigAttribute is mandatory");
+        Assert.notNull(aclService, "An AclService is mandatory");
 
-	protected ObjectIdentityRetrievalStrategy objectIdentityRetrievalStrategy = new ObjectIdentityRetrievalStrategyImpl();
+        if (requirePermission == null || requirePermission.isEmpty()) {
+            throw new IllegalArgumentException("One or more requirePermission entries is mandatory");
+        }
 
-	protected SidRetrievalStrategy sidRetrievalStrategy = new SidRetrievalStrategyImpl();
+        this.aclService = aclService;
+        this.processConfigAttribute = processConfigAttribute;
+        this.requirePermission = requirePermission;
+    }
 
-	protected final List<Permission> requirePermission;
+    //~ Methods ========================================================================================================
 
-	public AbstractAclProvider(AclService aclService, String processConfigAttribute,
-			List<Permission> requirePermission) {
-		Assert.hasText(processConfigAttribute, "A processConfigAttribute is mandatory");
-		Assert.notNull(aclService, "An AclService is mandatory");
-		Assert.isTrue(!ObjectUtils.isEmpty(requirePermission), "One or more requirePermission entries is mandatory");
-		this.aclService = aclService;
-		this.processConfigAttribute = processConfigAttribute;
-		this.requirePermission = requirePermission;
-	}
+    protected Class<?> getProcessDomainObjectClass() {
+        return processDomainObjectClass;
+    }
 
-	protected Class<?> getProcessDomainObjectClass() {
-		return this.processDomainObjectClass;
-	}
+    protected boolean hasPermission(Authentication authentication, Object domainObject) {
+        // Obtain the OID applicable to the domain object
+        ObjectIdentity objectIdentity = objectIdentityRetrievalStrategy.getObjectIdentity(domainObject);
 
-	protected boolean hasPermission(Authentication authentication, Object domainObject) {
-		// Obtain the OID applicable to the domain object
-		ObjectIdentity objectIdentity = this.objectIdentityRetrievalStrategy.getObjectIdentity(domainObject);
+        // Obtain the SIDs applicable to the principal
+        List<Sid> sids = sidRetrievalStrategy.getSids(authentication);
 
-		// Obtain the SIDs applicable to the principal
-		List<Sid> sids = this.sidRetrievalStrategy.getSids(authentication);
+        Acl acl = null;
 
-		try {
-			// Lookup only ACLs for SIDs we're interested in
-			Acl acl = this.aclService.readAclById(objectIdentity, sids);
-			return acl.isGranted(this.requirePermission, sids, false);
-		}
-		catch (NotFoundException ex) {
-			return false;
-		}
-	}
+        try {
+            // Lookup only ACLs for SIDs we're interested in
+            acl = aclService.readAclById(objectIdentity, sids);
 
-	public void setObjectIdentityRetrievalStrategy(ObjectIdentityRetrievalStrategy objectIdentityRetrievalStrategy) {
-		Assert.notNull(objectIdentityRetrievalStrategy, "ObjectIdentityRetrievalStrategy required");
-		this.objectIdentityRetrievalStrategy = objectIdentityRetrievalStrategy;
-	}
+            return acl.isGranted(requirePermission, sids, false);
+        } catch (NotFoundException ignore) {
+            return false;
+        }
+    }
 
-	protected void setProcessConfigAttribute(String processConfigAttribute) {
-		Assert.hasText(processConfigAttribute, "A processConfigAttribute is mandatory");
-		this.processConfigAttribute = processConfigAttribute;
-	}
+    public void setObjectIdentityRetrievalStrategy(ObjectIdentityRetrievalStrategy objectIdentityRetrievalStrategy) {
+        Assert.notNull(objectIdentityRetrievalStrategy, "ObjectIdentityRetrievalStrategy required");
+        this.objectIdentityRetrievalStrategy = objectIdentityRetrievalStrategy;
+    }
 
-	public void setProcessDomainObjectClass(Class<?> processDomainObjectClass) {
-		Assert.notNull(processDomainObjectClass, "processDomainObjectClass cannot be set to null");
-		this.processDomainObjectClass = processDomainObjectClass;
-	}
+    protected void setProcessConfigAttribute(String processConfigAttribute) {
+        Assert.hasText(processConfigAttribute, "A processConfigAttribute is mandatory");
+        this.processConfigAttribute = processConfigAttribute;
+    }
 
-	public void setSidRetrievalStrategy(SidRetrievalStrategy sidRetrievalStrategy) {
-		Assert.notNull(sidRetrievalStrategy, "SidRetrievalStrategy required");
-		this.sidRetrievalStrategy = sidRetrievalStrategy;
-	}
+    public void setProcessDomainObjectClass(Class<?> processDomainObjectClass) {
+        Assert.notNull(processDomainObjectClass, "processDomainObjectClass cannot be set to null");
+        this.processDomainObjectClass = processDomainObjectClass;
+    }
 
-	@Override
-	public boolean supports(ConfigAttribute attribute) {
-		return this.processConfigAttribute.equals(attribute.getAttribute());
-	}
+    public void setSidRetrievalStrategy(SidRetrievalStrategy sidRetrievalStrategy) {
+        Assert.notNull(sidRetrievalStrategy, "SidRetrievalStrategy required");
+        this.sidRetrievalStrategy = sidRetrievalStrategy;
+    }
 
-	/**
-	 * This implementation supports any type of class, because it does not query the
-	 * presented secure object.
-	 * @param clazz the secure object
-	 * @return always <code>true</code>
-	 */
-	@Override
-	public boolean supports(Class<?> clazz) {
-		return true;
-	}
+    public boolean supports(ConfigAttribute attribute) {
+        return processConfigAttribute.equals(attribute.getAttribute());
+    }
 
+    /**
+     * This implementation supports any type of class, because it does not query the presented secure object.
+     *
+     * @param clazz the secure object
+     *
+     * @return always <code>true</code>
+     */
+    public boolean supports(Class<?> clazz) {
+        return true;
+    }
 }

acl/src/main/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationCollectionFilteringProvider.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,7 +12,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.security.acls.afterinvocation;
 
 import java.util.Collection;
@@ -21,8 +19,6 @@ import java.util.List;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
-import org.springframework.core.log.LogMessage;
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.access.AuthorizationServiceException;
 import org.springframework.security.access.ConfigAttribute;
@@ -30,33 +26,31 @@ import org.springframework.security.acls.model.AclService;
 import org.springframework.security.acls.model.Permission;
 import org.springframework.security.core.Authentication;
 
+
 /**
  * <p>
- * Given a <code>Collection</code> of domain object instances returned from a secure
- * object invocation, remove any <code>Collection</code> elements the principal does not
- * have appropriate permission to access as defined by the {@link AclService}.
+ * Given a <code>Collection</code> of domain object instances returned from a secure object invocation, remove
+ * any <code>Collection</code> elements the principal does not have appropriate permission to access as defined by the
+ * {@link AclService}.
  * <p>
- * The <code>AclService</code> is used to retrieve the access control list (ACL)
- * permissions associated with each <code>Collection</code> domain object instance element
- * for the current <code>Authentication</code> object.
+ * The <code>AclService</code> is used to retrieve the access control list (ACL) permissions associated with
+ * each <code>Collection</code> domain object instance element for the current <code>Authentication</code> object.
  * <p>
- * This after invocation provider will fire if any {@link ConfigAttribute#getAttribute()}
- * matches the {@link #processConfigAttribute}. The provider will then lookup the ACLs
- * from the <code>AclService</code> and ensure the principal is
- * {@link org.springframework.security.acls.model.Acl#isGranted(List, List, boolean)
- * Acl.isGranted()} when presenting the {@link #requirePermission} array to that method.
+ * This after invocation provider will fire if any {@link ConfigAttribute#getAttribute()} matches the {@link
+ * #processConfigAttribute}. The provider will then lookup the ACLs from the <code>AclService</code> and ensure the
+ * principal is {@link org.springframework.security.acls.model.Acl#isGranted(List, List, boolean) Acl.isGranted()}
+ * when presenting the {@link #requirePermission} array to that method.
  * <p>
- * If the principal does not have permission, that element will not be included in the
- * returned <code>Collection</code>.
+ * If the principal does not have permission, that element will not be included in the returned
+ * <code>Collection</code>.
  * <p>
- * Often users will setup a <code>BasicAclEntryAfterInvocationProvider</code> with a
- * {@link #processConfigAttribute} of <code>AFTER_ACL_COLLECTION_READ</code> and a
- * {@link #requirePermission} of <code>BasePermission.READ</code>. These are also the
- * defaults.
+ * Often users will setup a <code>BasicAclEntryAfterInvocationProvider</code> with a {@link
+ * #processConfigAttribute} of <code>AFTER_ACL_COLLECTION_READ</code> and a {@link #requirePermission} of
+ * <code>BasePermission.READ</code>. These are also the defaults.
  * <p>
- * If the provided <code>returnObject</code> is <code>null</code>, a <code>null</code>
- * <code>Collection</code> will be returned. If the provided <code>returnObject</code> is
- * not a <code>Collection</code>, an {@link AuthorizationServiceException} will be thrown.
+ * If the provided <code>returnObject</code> is <code>null</code>, a <code>null</code><code>Collection</code>
+ * will be returned. If the provided <code>returnObject</code> is not a <code>Collection</code>, an {@link
+ * AuthorizationServiceException} will be thrown.
  * <p>
  * All comparisons and prefixes are case sensitive.
  *
@@ -64,57 +58,66 @@ import org.springframework.security.core.Authentication;
  * @author Paulo Neves
  */
 public class AclEntryAfterInvocationCollectionFilteringProvider extends AbstractAclProvider {
+    //~ Static fields/initializers =====================================================================================
 
-	protected static final Log logger = LogFactory.getLog(AclEntryAfterInvocationCollectionFilteringProvider.class);
+    protected static final Log logger = LogFactory.getLog(AclEntryAfterInvocationCollectionFilteringProvider.class);
 
-	public AclEntryAfterInvocationCollectionFilteringProvider(AclService aclService,
-			List<Permission> requirePermission) {
-		super(aclService, "AFTER_ACL_COLLECTION_READ", requirePermission);
-	}
+    //~ Constructors ===================================================================================================
 
-	@Override
-	@SuppressWarnings("unchecked")
-	public Object decide(Authentication authentication, Object object, Collection<ConfigAttribute> config,
-			Object returnedObject) throws AccessDeniedException {
-		if (returnedObject == null) {
-			logger.debug("Return object is null, skipping");
-			return null;
-		}
+    public AclEntryAfterInvocationCollectionFilteringProvider(AclService aclService, List<Permission> requirePermission) {
+        super(aclService, "AFTER_ACL_COLLECTION_READ", requirePermission);
+    }
 
-		for (ConfigAttribute attr : config) {
-			if (!this.supports(attr)) {
-				continue;
-			}
+    //~ Methods ========================================================================================================
 
-			// Need to process the Collection for this invocation
-			Filterer filterer = getFilterer(returnedObject);
+    @SuppressWarnings("unchecked")
+    public Object decide(Authentication authentication, Object object, Collection<ConfigAttribute> config,
+            Object returnedObject) throws AccessDeniedException {
 
-			// Locate unauthorised Collection elements
-			for (Object domainObject : filterer) {
-				// Ignore nulls or entries which aren't instances of the configured domain
-				// object class
-				if (domainObject == null || !getProcessDomainObjectClass().isAssignableFrom(domainObject.getClass())) {
-					continue;
-				}
-				if (!hasPermission(authentication, domainObject)) {
-					filterer.remove(domainObject);
-					logger.debug(LogMessage.of(() -> "Principal is NOT authorised for element: " + domainObject));
-				}
-			}
-			return filterer.getFilteredObject();
-		}
-		return returnedObject;
-	}
+        if (returnedObject == null) {
+            if (logger.isDebugEnabled()) {
+                logger.debug("Return object is null, skipping");
+            }
 
-	private Filterer getFilterer(Object returnedObject) {
-		if (returnedObject instanceof Collection) {
-			return new CollectionFilterer((Collection) returnedObject);
-		}
-		if (returnedObject.getClass().isArray()) {
-			return new ArrayFilterer((Object[]) returnedObject);
-		}
-		throw new AuthorizationServiceException("A Collection or an array (or null) was required as the "
-				+ "returnedObject, but the returnedObject was: " + returnedObject);
-	}
+            return null;
+        }
 
+        for (ConfigAttribute attr : config) {
+            if (!this.supports(attr)) {
+                continue;
+            }
+
+            // Need to process the Collection for this invocation
+            Filterer filterer;
+
+            if (returnedObject instanceof Collection) {
+                filterer = new CollectionFilterer((Collection) returnedObject);
+            } else if (returnedObject.getClass().isArray()) {
+                filterer = new ArrayFilterer((Object[]) returnedObject);
+            } else {
+                throw new AuthorizationServiceException("A Collection or an array (or null) was required as the "
+                        + "returnedObject, but the returnedObject was: " + returnedObject);
+            }
+
+            // Locate unauthorised Collection elements
+            for (Object domainObject : filterer) {
+                // Ignore nulls or entries which aren't instances of the configured domain object class
+                if (domainObject == null || !getProcessDomainObjectClass().isAssignableFrom(domainObject.getClass())) {
+                    continue;
+                }
+
+                if(!hasPermission(authentication, domainObject)) {
+                    filterer.remove(domainObject);
+
+                    if (logger.isDebugEnabled()) {
+                        logger.debug("Principal is NOT authorised for element: " + domainObject);
+                    }
+                }
+            }
+
+            return filterer.getFilteredObject();
+        }
+
+        return returnedObject;
+    }
 }

acl/src/main/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationProvider.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,7 +12,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.security.acls.afterinvocation;
 
 import java.util.Collection;
@@ -21,7 +19,6 @@ import java.util.List;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
 import org.springframework.context.MessageSource;
 import org.springframework.context.MessageSourceAware;
 import org.springframework.context.support.MessageSourceAccessor;
@@ -32,87 +29,94 @@ import org.springframework.security.acls.model.Permission;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.SpringSecurityMessageSource;
 
+
 /**
- * Given a domain object instance returned from a secure object invocation, ensures the
- * principal has appropriate permission as defined by the {@link AclService}.
+ * Given a domain object instance returned from a secure object invocation, ensures the principal has
+ * appropriate permission as defined by the {@link AclService}.
  * <p>
- * The <code>AclService</code> is used to retrieve the access control list (ACL)
- * permissions associated with a domain object instance for the current
- * <code>Authentication</code> object.
+ * The <code>AclService</code> is used to retrieve the access control list (ACL) permissions associated with a
+ * domain object instance for the current <code>Authentication</code> object.
  * <p>
- * This after invocation provider will fire if any {@link ConfigAttribute#getAttribute()}
- * matches the {@link #processConfigAttribute}. The provider will then lookup the ACLs
- * from the <tt>AclService</tt> and ensure the principal is
- * {@link org.springframework.security.acls.model.Acl#isGranted(List, List, boolean)
- * Acl.isGranted(List, List, boolean)} when presenting the {@link #requirePermission}
- * array to that method.
+ * This after invocation provider will fire if any  {@link ConfigAttribute#getAttribute()} matches the {@link
+ * #processConfigAttribute}. The provider will then lookup the ACLs from the <tt>AclService</tt> and ensure the
+ * principal is {@link org.springframework.security.acls.model.Acl#isGranted(List, List, boolean)
+ * Acl.isGranted(List, List, boolean)} when presenting the {@link #requirePermission} array to that method.
  * <p>
- * Often users will set up an <code>AclEntryAfterInvocationProvider</code> with a
- * {@link #processConfigAttribute} of <code>AFTER_ACL_READ</code> and a
- * {@link #requirePermission} of <code>BasePermission.READ</code>. These are also the
- * defaults.
+ * Often users will set up an <code>AclEntryAfterInvocationProvider</code> with a {@link
+ * #processConfigAttribute} of <code>AFTER_ACL_READ</code> and a {@link #requirePermission} of
+ * <code>BasePermission.READ</code>. These are also the defaults.
  * <p>
- * If the principal does not have sufficient permissions, an
- * <code>AccessDeniedException</code> will be thrown.
+ * If the principal does not have sufficient permissions, an <code>AccessDeniedException</code> will be thrown.
  * <p>
- * If the provided <tt>returnedObject</tt> is <code>null</code>, permission will always be
- * granted and <code>null</code> will be returned.
+ * If the provided <tt>returnedObject</tt> is <code>null</code>, permission will always be granted and
+ * <code>null</code> will be returned.
  * <p>
  * All comparisons and prefixes are case sensitive.
  */
 public class AclEntryAfterInvocationProvider extends AbstractAclProvider implements MessageSourceAware {
+    //~ Static fields/initializers =====================================================================================
 
-	protected static final Log logger = LogFactory.getLog(AclEntryAfterInvocationProvider.class);
+    protected static final Log logger = LogFactory.getLog(AclEntryAfterInvocationProvider.class);
 
-	protected MessageSourceAccessor messages = SpringSecurityMessageSource.getAccessor();
+    //~ Instance fields ================================================================================================
 
-	public AclEntryAfterInvocationProvider(AclService aclService, List<Permission> requirePermission) {
-		this(aclService, "AFTER_ACL_READ", requirePermission);
-	}
+    protected MessageSourceAccessor messages = SpringSecurityMessageSource.getAccessor();
 
-	public AclEntryAfterInvocationProvider(AclService aclService, String processConfigAttribute,
-			List<Permission> requirePermission) {
-		super(aclService, processConfigAttribute, requirePermission);
-	}
+    //~ Constructors ===================================================================================================
 
-	@Override
-	public Object decide(Authentication authentication, Object object, Collection<ConfigAttribute> config,
-			Object returnedObject) throws AccessDeniedException {
+    public AclEntryAfterInvocationProvider(AclService aclService, List<Permission> requirePermission) {
+        super(aclService, "AFTER_ACL_READ", requirePermission);
+    }
 
-		if (returnedObject == null) {
-			// AclManager interface contract prohibits nulls
-			// As they have permission to null/nothing, grant access
-			logger.debug("Return object is null, skipping");
-			return null;
-		}
+    public AclEntryAfterInvocationProvider(AclService aclService, String processConfigAttribute,
+            List<Permission> requirePermission) {
+        super(aclService, processConfigAttribute, requirePermission);
+    }
 
-		if (!getProcessDomainObjectClass().isAssignableFrom(returnedObject.getClass())) {
-			logger.debug("Return object is not applicable for this provider, skipping");
-			return returnedObject;
-		}
+    //~ Methods ========================================================================================================
 
-		for (ConfigAttribute attr : config) {
-			if (!this.supports(attr)) {
-				continue;
-			}
+    public Object decide(Authentication authentication, Object object, Collection<ConfigAttribute> config,
+            Object returnedObject) throws AccessDeniedException {
 
-			// Need to make an access decision on this invocation
-			if (hasPermission(authentication, returnedObject)) {
-				return returnedObject;
-			}
+        if (returnedObject == null) {
+            // AclManager interface contract prohibits nulls
+            // As they have permission to null/nothing, grant access
+            if (logger.isDebugEnabled()) {
+                logger.debug("Return object is null, skipping");
+            }
 
-			logger.debug("Denying access");
-			throw new AccessDeniedException(this.messages.getMessage("AclEntryAfterInvocationProvider.noPermission",
-					new Object[] { authentication.getName(), returnedObject },
-					"Authentication {0} has NO permissions to the domain object {1}"));
-		}
+            return null;
+        }
 
-		return returnedObject;
-	}
+        if (!getProcessDomainObjectClass().isAssignableFrom(returnedObject.getClass())) {
+            if (logger.isDebugEnabled()) {
+                logger.debug("Return object is not applicable for this provider, skipping");
+            }
 
-	@Override
-	public void setMessageSource(MessageSource messageSource) {
-		this.messages = new MessageSourceAccessor(messageSource);
-	}
+            return returnedObject;
+        }
 
+        for (ConfigAttribute attr : config) {
+            if (!this.supports(attr)) {
+                continue;
+            }
+            // Need to make an access decision on this invocation
+
+            if (hasPermission(authentication, returnedObject)) {
+                return returnedObject;
+            }
+
+            logger.debug("Denying access");
+
+            throw new AccessDeniedException(messages.getMessage("AclEntryAfterInvocationProvider.noPermission",
+                    new Object[] {authentication.getName(), returnedObject},
+                    "Authentication {0} has NO permissions to the domain object {1}"));
+        }
+
+        return returnedObject;
+    }
+
+    public void setMessageSource(MessageSource messageSource) {
+        this.messages = new MessageSourceAccessor(messageSource);
+    }
 }

acl/src/main/java/org/springframework/security/acls/afterinvocation/ArrayFilterer.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -25,7 +24,6 @@ import java.util.Set;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import org.springframework.core.log.LogMessage;
 
 /**
  * A filter used to filter arrays.
@@ -34,70 +32,86 @@ import org.springframework.core.log.LogMessage;
  * @author Paulo Neves
  */
 class ArrayFilterer<T> implements Filterer<T> {
+    //~ Static fields/initializers =====================================================================================
 
-	protected static final Log logger = LogFactory.getLog(ArrayFilterer.class);
+    protected static final Log logger = LogFactory.getLog(ArrayFilterer.class);
 
-	private final Set<T> removeList;
+    //~ Instance fields ================================================================================================
 
-	private final T[] list;
+    private final Set<T> removeList;
+    private final T[] list;
 
-	ArrayFilterer(T[] list) {
-		this.list = list;
-		// Collect the removed objects to a HashSet so that
-		// it is fast to lookup them when a filtered array
-		// is constructed.
-		this.removeList = new HashSet<>();
-	}
+    //~ Constructors ===================================================================================================
 
-	@Override
-	@SuppressWarnings("unchecked")
-	public T[] getFilteredObject() {
-		// Recreate an array of same type and filter the removed objects.
-		int originalSize = this.list.length;
-		int sizeOfResultingList = originalSize - this.removeList.size();
-		T[] filtered = (T[]) Array.newInstance(this.list.getClass().getComponentType(), sizeOfResultingList);
-		for (int i = 0, j = 0; i < this.list.length; i++) {
-			T object = this.list[i];
-			if (!this.removeList.contains(object)) {
-				filtered[j] = object;
-				j++;
-			}
-		}
-		logger.debug(LogMessage.of(() -> "Original array contained " + originalSize + " elements; now contains "
-				+ sizeOfResultingList + " elements"));
-		return filtered;
-	}
+    ArrayFilterer(T[] list) {
+        this.list = list;
 
-	@Override
-	public Iterator<T> iterator() {
-		return new ArrayFiltererIterator();
-	}
+        // Collect the removed objects to a HashSet so that
+        // it is fast to lookup them when a filtered array
+        // is constructed.
+        removeList = new HashSet<T>();
+    }
 
-	@Override
-	public void remove(T object) {
-		this.removeList.add(object);
-	}
+    //~ Methods ========================================================================================================
 
-	/**
-	 * Iterator for {@link ArrayFilterer} elements.
-	 */
-	private class ArrayFiltererIterator implements Iterator<T> {
+    /**
+     *
+     * @see org.springframework.security.acls.afterinvocation.Filterer#getFilteredObject()
+     */
+    @SuppressWarnings("unchecked")
+    public T[] getFilteredObject() {
+        // Recreate an array of same type and filter the removed objects.
+        int originalSize = list.length;
+        int sizeOfResultingList = originalSize - removeList.size();
+        T[] filtered = (T[]) Array.newInstance(list.getClass().getComponentType(), sizeOfResultingList);
 
-		private int index = 0;
+        for (int i = 0, j = 0; i < list.length; i++) {
+            T object = list[i];
 
-		@Override
-		public boolean hasNext() {
-			return this.index < ArrayFilterer.this.list.length;
-		}
+            if (!removeList.contains(object)) {
+                filtered[j] = object;
+                j++;
+            }
+        }
 
-		@Override
-		public T next() {
-			if (hasNext()) {
-				return ArrayFilterer.this.list[this.index++];
-			}
-			throw new NoSuchElementException();
-		}
+        if (logger.isDebugEnabled()) {
+            logger.debug("Original array contained " + originalSize + " elements; now contains " + sizeOfResultingList
+                + " elements");
+        }
 
-	}
+        return filtered;
+    }
 
+    /**
+     *
+     * @see org.springframework.security.acls.afterinvocation.Filterer#iterator()
+     */
+    public Iterator<T> iterator() {
+        return new Iterator<T>() {
+            private int index = 0;
+
+            public boolean hasNext() {
+                return index < list.length;
+            }
+
+            public T next() {
+                if (hasNext() == false) {
+                    throw new NoSuchElementException();
+                }
+                return list[index++];
+            }
+
+            public void remove() {
+                throw new UnsupportedOperationException();
+            }
+        };
+    }
+
+    /**
+     *
+     * @see org.springframework.security.acls.afterinvocation.Filterer#remove(java.lang.Object)
+     */
+    public void remove(T object) {
+        removeList.add(object);
+    }
 }

acl/src/main/java/org/springframework/security/acls/afterinvocation/CollectionFilterer.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,15 +15,14 @@
 
 package org.springframework.security.acls.afterinvocation;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.springframework.core.log.LogMessage;
 
 /**
  * A filter used to filter Collections.
@@ -33,46 +31,73 @@ import org.springframework.core.log.LogMessage;
  * @author Paulo Neves
  */
 class CollectionFilterer<T> implements Filterer<T> {
+    //~ Static fields/initializers =====================================================================================
 
-	protected static final Log logger = LogFactory.getLog(CollectionFilterer.class);
+    protected static final Log logger = LogFactory.getLog(CollectionFilterer.class);
 
-	private final Collection<T> collection;
+    //~ Instance fields ================================================================================================
 
-	private final Set<T> removeList;
+    private Collection<T> collection;
 
-	CollectionFilterer(Collection<T> collection) {
-		this.collection = collection;
-		// We create a Set of objects to be removed from the Collection,
-		// as ConcurrentModificationException prevents removal during
-		// iteration, and making a new Collection to be returned is
-		// problematic as the original Collection implementation passed
-		// to the method may not necessarily be re-constructable (as
-		// the Collection(collection) constructor is not guaranteed and
-		// manually adding may lose sort order or other capabilities)
-		this.removeList = new HashSet<>();
-	}
+    // collectionIter offers significant performance optimisations (as
+    // per security-developer mailing list conversation 19/5/05)
+    private Iterator<T> collectionIter;
+    private Set<T> removeList;
 
-	@Override
-	public Object getFilteredObject() {
-		// Now the Iterator has ended, remove Objects from Collection
-		Iterator<T> removeIter = this.removeList.iterator();
-		int originalSize = this.collection.size();
-		while (removeIter.hasNext()) {
-			this.collection.remove(removeIter.next());
-		}
-		logger.debug(LogMessage.of(() -> "Original collection contained " + originalSize + " elements; now contains "
-				+ this.collection.size() + " elements"));
-		return this.collection;
-	}
+    //~ Constructors ===================================================================================================
 
-	@Override
-	public Iterator<T> iterator() {
-		return this.collection.iterator();
-	}
+    CollectionFilterer(Collection<T> collection) {
+        this.collection = collection;
 
-	@Override
-	public void remove(T object) {
-		this.removeList.add(object);
-	}
+        // We create a Set of objects to be removed from the Collection,
+        // as ConcurrentModificationException prevents removal during
+        // iteration, and making a new Collection to be returned is
+        // problematic as the original Collection implementation passed
+        // to the method may not necessarily be re-constructable (as
+        // the Collection(collection) constructor is not guaranteed and
+        // manually adding may lose sort order or other capabilities)
+        removeList = new HashSet<T>();
+    }
 
+    //~ Methods ========================================================================================================
+
+    /**
+     *
+     * @see org.springframework.security.acls.afterinvocation.Filterer#getFilteredObject()
+     */
+    public Object getFilteredObject() {
+        // Now the Iterator has ended, remove Objects from Collection
+        Iterator<T> removeIter = removeList.iterator();
+
+        int originalSize = collection.size();
+
+        while (removeIter.hasNext()) {
+            collection.remove(removeIter.next());
+        }
+
+        if (logger.isDebugEnabled()) {
+            logger.debug("Original collection contained " + originalSize + " elements; now contains "
+                + collection.size() + " elements");
+        }
+
+        return collection;
+    }
+
+    /**
+     *
+     * @see org.springframework.security.acls.afterinvocation.Filterer#iterator()
+     */
+    public Iterator<T> iterator() {
+        collectionIter = collection.iterator();
+
+        return collectionIter;
+    }
+
+    /**
+     *
+     * @see org.springframework.security.acls.afterinvocation.Filterer#remove(java.lang.Object)
+     */
+    public void remove(T object) {
+        removeList.add(object);
+    }
 }

acl/src/main/java/org/springframework/security/acls/afterinvocation/Filterer.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -18,6 +17,7 @@ package org.springframework.security.acls.afterinvocation;
 
 import java.util.Iterator;
 
+
 /**
  * Filterer strategy interface.
  *
@@ -25,24 +25,26 @@ import java.util.Iterator;
  * @author Paulo Neves
  */
 interface Filterer<T> extends Iterable<T> {
+    //~ Methods ========================================================================================================
 
-	/**
-	 * Gets the filtered collection or array.
-	 * @return the filtered collection or array
-	 */
-	Object getFilteredObject();
+    /**
+     * Gets the filtered collection or array.
+     *
+     * @return the filtered collection or array
+     */
+    Object getFilteredObject();
 
-	/**
-	 * Returns an iterator over the filtered collection or array.
-	 * @return an Iterator
-	 */
-	@Override
-	Iterator<T> iterator();
-
-	/**
-	 * Removes the given object from the resulting list.
-	 * @param object the object to be removed
-	 */
-	void remove(T object);
+    /**
+     * Returns an iterator over the filtered collection or array.
+     *
+     * @return an Iterator
+     */
+    Iterator<T> iterator();
 
+    /**
+     * Removes the the given object from the resulting list.
+     *
+     * @param object the object to be removed
+     */
+    void remove(T object);
 }

acl/src/main/java/org/springframework/security/acls/afterinvocation/package-info.java

@@ -1,21 +1,6 @@
-/*
- * Copyright 2002-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * 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.
- */
-
 /**
- * After-invocation providers for collection and array filtering. Consider using a
- * {@code PostFilter} annotation in preference.
+ * After-invocation providers for collection and array filtering. Consider using a {@code PostFilter} annotation in
+ * preference.
  */
 package org.springframework.security.acls.afterinvocation;
+

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

@@ -1,19 +1,3 @@
-/*
- * Copyright 2002-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 package org.springframework.security.acls.domain;
 
 import org.springframework.security.acls.model.Permission;
@@ -26,60 +10,63 @@ import org.springframework.security.acls.model.Permission;
  */
 public abstract class AbstractPermission implements Permission {
 
-	protected final char code;
+    //~ Instance fields ================================================================================================
 
-	protected int mask;
+    protected char code;
+    protected int mask;
 
-	/**
-	 * Sets the permission mask and uses the '*' character to represent active bits when
-	 * represented as a bit pattern string.
-	 * @param mask the integer bit mask for the permission
-	 */
-	protected AbstractPermission(int mask) {
-		this.mask = mask;
-		this.code = '*';
-	}
+    //~ Constructors ===================================================================================================
+    /**
+     * Sets the permission mask and uses the '*' character to represent active bits when represented as a bit
+     * pattern string.
+     *
+     * @param mask the integer bit mask for the permission
+     */
+    protected AbstractPermission(int mask) {
+        this.mask = mask;
+        this.code = '*';
+    }
 
-	/**
-	 * Sets the permission mask and uses the specified character for active bits.
-	 * @param mask the integer bit mask for the permission
-	 * @param code the character to print for each active bit in the mask (see
-	 * {@link Permission#getPattern()})
-	 */
-	protected AbstractPermission(int mask, char code) {
-		this.mask = mask;
-		this.code = code;
-	}
+    /**
+     * Sets the permission mask and uses the specified character for active bits.
+     *
+     * @param mask the integer bit mask for the permission
+     * @param code the character to print for each active bit in the mask (see {@link Permission#getPattern()})
+     */
+    protected AbstractPermission(int mask, char code) {
+        this.mask = mask;
+        this.code = code;
+    }
 
-	@Override
-	public final boolean equals(Object obj) {
-		if (obj == null) {
-			return false;
-		}
-		if (!(obj instanceof Permission other)) {
-			return false;
-		}
-		return (this.mask == other.getMask());
-	}
+    //~ Methods ========================================================================================================
 
-	@Override
-	public final int hashCode() {
-		return this.mask;
-	}
+    public final boolean equals(Object arg0) {
+        if (arg0 == null) {
+            return false;
+        }
 
-	@Override
-	public final String toString() {
-		return this.getClass().getSimpleName() + "[" + getPattern() + "=" + this.mask + "]";
-	}
+        if (!(arg0 instanceof Permission)) {
+            return false;
+        }
 
-	@Override
-	public final int getMask() {
-		return this.mask;
-	}
+        Permission rhs = (Permission) arg0;
 
-	@Override
-	public String getPattern() {
-		return AclFormattingUtils.printBinary(this.mask, this.code);
-	}
+        return (this.mask == rhs.getMask());
+    }
 
+    public final int getMask() {
+        return mask;
+    }
+
+    public String getPattern() {
+        return AclFormattingUtils.printBinary(mask, code);
+    }
+
+    public final String toString() {
+        return this.getClass().getSimpleName() + "[" + getPattern() + "=" + mask + "]";
+    }
+
+    public final int hashCode() {
+        return this.mask;
+    }
 }

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

@@ -1,11 +1,10 @@
-/*
- * Copyright 2002-2016 the original author or authors.
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,180 +12,163 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.security.acls.domain;
 
-import java.io.Serializable;
-
 import org.springframework.security.acls.model.AccessControlEntry;
 import org.springframework.security.acls.model.Acl;
 import org.springframework.security.acls.model.AuditableAccessControlEntry;
 import org.springframework.security.acls.model.Permission;
 import org.springframework.security.acls.model.Sid;
+
 import org.springframework.util.Assert;
 
+import java.io.Serializable;
+
+
 /**
  * An immutable default implementation of <code>AccessControlEntry</code>.
  *
  * @author Ben Alex
  */
 public class AccessControlEntryImpl implements AccessControlEntry, AuditableAccessControlEntry {
+    //~ Instance fields ================================================================================================
 
-	private final Acl acl;
+    private Acl acl;
+    private Permission permission;
+    private Serializable id;
+    private Sid sid;
+    private boolean auditFailure = false;
+    private boolean auditSuccess = false;
+    private boolean granting;
 
-	private Permission permission;
+    //~ Constructors ===================================================================================================
 
-	private final Serializable id;
+    public AccessControlEntryImpl(Serializable id, Acl acl, Sid sid, Permission permission, boolean granting,
+        boolean auditSuccess, boolean auditFailure) {
+        Assert.notNull(acl, "Acl required");
+        Assert.notNull(sid, "Sid required");
+        Assert.notNull(permission, "Permission required");
+        this.id = id;
+        this.acl = acl; // can be null
+        this.sid = sid;
+        this.permission = permission;
+        this.granting = granting;
+        this.auditSuccess = auditSuccess;
+        this.auditFailure = auditFailure;
+    }
 
-	private final Sid sid;
+    //~ Methods ========================================================================================================
 
-	private boolean auditFailure = false;
+    public boolean equals(Object arg0) {
+        if (!(arg0 instanceof AccessControlEntryImpl)) {
+            return false;
+        }
 
-	private boolean auditSuccess = false;
+        AccessControlEntryImpl rhs = (AccessControlEntryImpl) arg0;
 
-	private final boolean granting;
+        if (this.acl == null) {
+            if (rhs.getAcl() != null) {
+                return false;
+            }
+            // Both this.acl and rhs.acl are null and thus equal
+        } else {
+            // this.acl is non-null
+            if (rhs.getAcl() == null) {
+                return false;
+            }
 
-	public AccessControlEntryImpl(Serializable id, Acl acl, Sid sid, Permission permission, boolean granting,
-			boolean auditSuccess, boolean auditFailure) {
-		Assert.notNull(acl, "Acl required");
-		Assert.notNull(sid, "Sid required");
-		Assert.notNull(permission, "Permission required");
-		this.id = id;
-		this.acl = acl; // can be null
-		this.sid = sid;
-		this.permission = permission;
-		this.granting = granting;
-		this.auditSuccess = auditSuccess;
-		this.auditFailure = auditFailure;
-	}
+            // Both this.acl and rhs.acl are non-null, so do a comparison
+            if (this.acl.getObjectIdentity() == null) {
+                if (rhs.acl.getObjectIdentity() != null) {
+                    return false;
+                }
+                // Both this.acl and rhs.acl are null and thus equal
+            } else {
+                // Both this.acl.objectIdentity and rhs.acl.objectIdentity are non-null
+                if (!this.acl.getObjectIdentity().equals(rhs.getAcl().getObjectIdentity())) {
+                    return false;
+                }
+            }
+        }
 
-	@Override
-	public boolean equals(Object arg0) {
-		if (!(arg0 instanceof AccessControlEntryImpl)) {
-			return false;
-		}
-		AccessControlEntryImpl other = (AccessControlEntryImpl) arg0;
-		if (this.acl == null) {
-			if (other.getAcl() != null) {
-				return false;
-			}
-			// Both this.acl and rhs.acl are null and thus equal
-		}
-		else {
-			// this.acl is non-null
-			if (other.getAcl() == null) {
-				return false;
-			}
+        if (this.id == null) {
+            if (rhs.id != null) {
+                return false;
+            }
+            // Both this.id and rhs.id are null and thus equal
+        } else {
+            // this.id is non-null
+            if (rhs.id == null) {
+                return false;
+            }
 
-			// Both this.acl and rhs.acl are non-null, so do a comparison
-			if (this.acl.getObjectIdentity() == null) {
-				if (other.acl.getObjectIdentity() != null) {
-					return false;
-				}
-				// Both this.acl and rhs.acl are null and thus equal
-			}
-			else {
-				// Both this.acl.objectIdentity and rhs.acl.objectIdentity are non-null
-				if (!this.acl.getObjectIdentity().equals(other.getAcl().getObjectIdentity())) {
-					return false;
-				}
-			}
-		}
-		if (this.id == null) {
-			if (other.id != null) {
-				return false;
-			}
-			// Both this.id and rhs.id are null and thus equal
-		}
-		else {
-			// this.id is non-null
-			if (other.id == null) {
-				return false;
-			}
-			// Both this.id and rhs.id are non-null
-			if (!this.id.equals(other.id)) {
-				return false;
-			}
-		}
-		if ((this.auditFailure != other.isAuditFailure()) || (this.auditSuccess != other.isAuditSuccess())
-				|| (this.granting != other.isGranting()) || !this.permission.equals(other.getPermission())
-				|| !this.sid.equals(other.getSid())) {
-			return false;
-		}
-		return true;
-	}
+            // Both this.id and rhs.id are non-null
+            if (!this.id.equals(rhs.id)) {
+                return false;
+            }
+        }
 
-	@Override
-	public int hashCode() {
-		int result = this.permission.hashCode();
-		result = 31 * result + ((this.id != null) ? this.id.hashCode() : 0);
-		result = 31 * result + (this.sid.hashCode());
-		result = 31 * result + (this.auditFailure ? 1 : 0);
-		result = 31 * result + (this.auditSuccess ? 1 : 0);
-		result = 31 * result + (this.granting ? 1 : 0);
-		return result;
-	}
+        if ((this.auditFailure != rhs.isAuditFailure()) || (this.auditSuccess != rhs.isAuditSuccess())
+            || (this.granting != rhs.isGranting())
+            || !this.permission.equals(rhs.getPermission()) || !this.sid.equals(rhs.getSid())) {
+            return false;
+        }
 
-	@Override
-	public Acl getAcl() {
-		return this.acl;
-	}
+        return true;
+    }
 
-	@Override
-	public Serializable getId() {
-		return this.id;
-	}
+    public Acl getAcl() {
+        return acl;
+    }
 
-	@Override
-	public Permission getPermission() {
-		return this.permission;
-	}
+    public Serializable getId() {
+        return id;
+    }
 
-	@Override
-	public Sid getSid() {
-		return this.sid;
-	}
+    public Permission getPermission() {
+        return permission;
+    }
 
-	@Override
-	public boolean isAuditFailure() {
-		return this.auditFailure;
-	}
+    public Sid getSid() {
+        return sid;
+    }
 
-	@Override
-	public boolean isAuditSuccess() {
-		return this.auditSuccess;
-	}
+    public boolean isAuditFailure() {
+        return auditFailure;
+    }
 
-	@Override
-	public boolean isGranting() {
-		return this.granting;
-	}
+    public boolean isAuditSuccess() {
+        return auditSuccess;
+    }
 
-	void setAuditFailure(boolean auditFailure) {
-		this.auditFailure = auditFailure;
-	}
+    public boolean isGranting() {
+        return granting;
+    }
 
-	void setAuditSuccess(boolean auditSuccess) {
-		this.auditSuccess = auditSuccess;
-	}
+    void setAuditFailure(boolean auditFailure) {
+        this.auditFailure = auditFailure;
+    }
 
-	void setPermission(Permission permission) {
-		Assert.notNull(permission, "Permission required");
-		this.permission = permission;
-	}
+    void setAuditSuccess(boolean auditSuccess) {
+        this.auditSuccess = auditSuccess;
+    }
 
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("AccessControlEntryImpl[");
-		sb.append("id: ").append(this.id).append("; ");
-		sb.append("granting: ").append(this.granting).append("; ");
-		sb.append("sid: ").append(this.sid).append("; ");
-		sb.append("permission: ").append(this.permission).append("; ");
-		sb.append("auditSuccess: ").append(this.auditSuccess).append("; ");
-		sb.append("auditFailure: ").append(this.auditFailure);
-		sb.append("]");
-		return sb.toString();
-	}
+    void setPermission(Permission permission) {
+        Assert.notNull(permission, "Permission required");
+        this.permission = permission;
+    }
 
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("AccessControlEntryImpl[");
+        sb.append("id: ").append(this.id).append("; ");
+        sb.append("granting: ").append(this.granting).append("; ");
+        sb.append("sid: ").append(this.sid).append("; ");
+        sb.append("permission: ").append(this.permission).append("; ");
+        sb.append("auditSuccess: ").append(this.auditSuccess).append("; ");
+        sb.append("auditFailure: ").append(this.auditFailure);
+        sb.append("]");
+
+        return sb.toString();
+    }
 }

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

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -18,6 +17,7 @@ package org.springframework.security.acls.domain;
 
 import org.springframework.security.acls.model.Acl;
 
+
 /**
  * Strategy used by {@link AclImpl} to determine whether a principal is permitted to call
  * adminstrative methods on the <code>AclImpl</code>.
@@ -25,13 +25,13 @@ import org.springframework.security.acls.model.Acl;
  * @author Ben Alex
  */
 public interface AclAuthorizationStrategy {
+    //~ Static fields/initializers =====================================================================================
 
-	int CHANGE_OWNERSHIP = 0;
+    int CHANGE_OWNERSHIP = 0;
+    int CHANGE_AUDITING = 1;
+    int CHANGE_GENERAL = 2;
 
-	int CHANGE_AUDITING = 1;
-
-	int CHANGE_GENERAL = 2;
-
-	void securityCheck(Acl acl, int changeType);
+    //~ Methods ========================================================================================================
 
+    void securityCheck(Acl acl, int changeType);
 }

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

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -18,7 +17,6 @@ package org.springframework.security.acls.domain;
 
 import java.util.Arrays;
 import java.util.List;
-import java.util.Set;
 
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.acls.model.Acl;
@@ -26,140 +24,96 @@ import org.springframework.security.acls.model.Sid;
 import org.springframework.security.acls.model.SidRetrievalStrategy;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.AuthorityUtils;
-import org.springframework.security.core.context.SecurityContext;
 import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.core.context.SecurityContextHolderStrategy;
 import org.springframework.util.Assert;
 
+
 /**
  * Default implementation of {@link AclAuthorizationStrategy}.
  * <p>
- * Permission will be granted if at least one of the following conditions is true for the
- * current principal.
- * <ul>
- * <li>is the owner (as defined by the ACL).</li>
- * <li>holds the relevant system-wide {@link GrantedAuthority} injected into the
- * constructor.</li>
- * <li>has {@link BasePermission#ADMINISTRATION} permission (as defined by the ACL).</li>
- * </ul>
+ * Permission will be granted provided the current principal is either the owner (as defined by the ACL), has
+ * {@link BasePermission#ADMINISTRATION} (as defined by the ACL and via a {@link Sid} retrieved for the current
+ * principal via {@link #sidRetrievalStrategy}), or if the current principal holds the relevant system-wide
+ * {@link GrantedAuthority} and injected into the constructor.
  *
  * @author Ben Alex
  */
 public class AclAuthorizationStrategyImpl implements AclAuthorizationStrategy {
+    //~ Instance fields ================================================================================================
 
-	private SecurityContextHolderStrategy securityContextHolderStrategy = SecurityContextHolder
-		.getContextHolderStrategy();
+    private GrantedAuthority gaGeneralChanges;
+    private GrantedAuthority gaModifyAuditing;
+    private GrantedAuthority gaTakeOwnership;
+    private SidRetrievalStrategy sidRetrievalStrategy = new SidRetrievalStrategyImpl();
 
-	private final GrantedAuthority gaGeneralChanges;
+    //~ Constructors ===================================================================================================
 
-	private final GrantedAuthority gaModifyAuditing;
+    /**
+     * Constructor. The only mandatory parameter relates to the system-wide {@link GrantedAuthority} instances that
+     * can be held to always permit ACL changes.
+     *
+     * @param auths an array of <code>GrantedAuthority</code>s that have
+     * special permissions (index 0 is the authority needed to change
+     * ownership, index 1 is the authority needed to modify auditing details,
+     * index 2 is the authority needed to change other ACL and ACE details) (required)
+     */
+    public AclAuthorizationStrategyImpl(GrantedAuthority[] auths) {
+        Assert.isTrue(auths != null && auths.length == 3, "GrantedAuthority[] with three elements required");
+        this.gaTakeOwnership = auths[0];
+        this.gaModifyAuditing = auths[1];
+        this.gaGeneralChanges = auths[2];
+    }
 
-	private final GrantedAuthority gaTakeOwnership;
+    //~ Methods ========================================================================================================
 
-	private SidRetrievalStrategy sidRetrievalStrategy = new SidRetrievalStrategyImpl();
+    public void securityCheck(Acl acl, int changeType) {
+        if ((SecurityContextHolder.getContext() == null)
+            || (SecurityContextHolder.getContext().getAuthentication() == null)
+            || !SecurityContextHolder.getContext().getAuthentication().isAuthenticated()) {
+            throw new AccessDeniedException("Authenticated principal required to operate with ACLs");
+        }
 
-	/**
-	 * Constructor. The only mandatory parameter relates to the system-wide
-	 * {@link GrantedAuthority} instances that can be held to always permit ACL changes.
-	 * @param auths the <code>GrantedAuthority</code>s that have special permissions
-	 * (index 0 is the authority needed to change ownership, index 1 is the authority
-	 * needed to modify auditing details, index 2 is the authority needed to change other
-	 * ACL and ACE details) (required)
-	 * <p>
-	 * Alternatively, a single value can be supplied for all three permissions.
-	 */
-	public AclAuthorizationStrategyImpl(GrantedAuthority... auths) {
-		Assert.isTrue(auths != null && (auths.length == 3 || auths.length == 1),
-				"One or three GrantedAuthority instances required");
-		if (auths.length == 3) {
-			this.gaTakeOwnership = auths[0];
-			this.gaModifyAuditing = auths[1];
-			this.gaGeneralChanges = auths[2];
-		}
-		else {
-			this.gaTakeOwnership = auths[0];
-			this.gaModifyAuditing = auths[0];
-			this.gaGeneralChanges = auths[0];
-		}
-	}
+        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
 
-	@Override
-	public void securityCheck(Acl acl, int changeType) {
-		SecurityContext context = this.securityContextHolderStrategy.getContext();
-		if ((context == null) || (context.getAuthentication() == null)
-				|| !context.getAuthentication().isAuthenticated()) {
-			throw new AccessDeniedException("Authenticated principal required to operate with ACLs");
-		}
-		Authentication authentication = context.getAuthentication();
-		// Check if authorized by virtue of ACL ownership
-		Sid currentUser = createCurrentUser(authentication);
-		if (currentUser.equals(acl.getOwner())
-				&& ((changeType == CHANGE_GENERAL) || (changeType == CHANGE_OWNERSHIP))) {
-			return;
-		}
+        // Check if authorized by virtue of ACL ownership
+        Sid currentUser = new PrincipalSid(authentication);
 
-		// Iterate this principal's authorities to determine right
-		Set<String> authorities = AuthorityUtils.authorityListToSet(authentication.getAuthorities());
-		if (acl.getOwner() instanceof GrantedAuthoritySid
-				&& authorities.contains(((GrantedAuthoritySid) acl.getOwner()).getGrantedAuthority())) {
-			return;
-		}
+        if (currentUser.equals(acl.getOwner())
+                && ((changeType == CHANGE_GENERAL) || (changeType == CHANGE_OWNERSHIP))) {
+            return;
+        }
 
-		// Not authorized by ACL ownership; try via adminstrative permissions
-		GrantedAuthority requiredAuthority = getRequiredAuthority(changeType);
+        // Not authorized by ACL ownership; try via adminstrative permissions
+        GrantedAuthority requiredAuthority = null;
 
-		if (authorities.contains(requiredAuthority.getAuthority())) {
-			return;
-		}
+        if (changeType == CHANGE_AUDITING) {
+            requiredAuthority = this.gaModifyAuditing;
+        } else if (changeType == CHANGE_GENERAL) {
+            requiredAuthority = this.gaGeneralChanges;
+        } else if (changeType == CHANGE_OWNERSHIP) {
+            requiredAuthority = this.gaTakeOwnership;
+        } else {
+            throw new IllegalArgumentException("Unknown change type");
+        }
 
-		// Try to get permission via ACEs within the ACL
-		List<Sid> sids = this.sidRetrievalStrategy.getSids(authentication);
-		if (acl.isGranted(Arrays.asList(BasePermission.ADMINISTRATION), sids, false)) {
-			return;
-		}
+        // Iterate this principal's authorities to determine right
+        if (authentication.getAuthorities().contains(requiredAuthority)) {
+            return;
+        }
 
-		throw new AccessDeniedException(
-				"Principal does not have required ACL permissions to perform requested operation");
-	}
+        // Try to get permission via ACEs within the ACL
+        List<Sid> sids = sidRetrievalStrategy.getSids(authentication);
 
-	private GrantedAuthority getRequiredAuthority(int changeType) {
-		if (changeType == CHANGE_AUDITING) {
-			return this.gaModifyAuditing;
-		}
-		if (changeType == CHANGE_GENERAL) {
-			return this.gaGeneralChanges;
-		}
-		if (changeType == CHANGE_OWNERSHIP) {
-			return this.gaTakeOwnership;
-		}
-		throw new IllegalArgumentException("Unknown change type");
-	}
+        if (acl.isGranted(Arrays.asList(BasePermission.ADMINISTRATION), sids, false)) {
+            return;
+        }
 
-	/**
-	 * Creates a principal-like sid from the authentication information.
-	 * @param authentication the authentication information that can provide principal and
-	 * thus the sid's id will be dependant on the value inside
-	 * @return a sid with the ID taken from the authentication information
-	 */
-	protected Sid createCurrentUser(Authentication authentication) {
-		return new PrincipalSid(authentication);
-	}
-
-	public void setSidRetrievalStrategy(SidRetrievalStrategy sidRetrievalStrategy) {
-		Assert.notNull(sidRetrievalStrategy, "SidRetrievalStrategy required");
-		this.sidRetrievalStrategy = sidRetrievalStrategy;
-	}
-
-	/**
-	 * Sets the {@link SecurityContextHolderStrategy} to use. The default action is to use
-	 * the {@link SecurityContextHolderStrategy} stored in {@link SecurityContextHolder}.
-	 *
-	 * @since 5.8
-	 */
-	public void setSecurityContextHolderStrategy(SecurityContextHolderStrategy securityContextHolderStrategy) {
-		Assert.notNull(securityContextHolderStrategy, "securityContextHolderStrategy cannot be null");
-		this.securityContextHolderStrategy = securityContextHolderStrategy;
-	}
+        throw new AccessDeniedException(
+                "Principal does not have required ACL permissions to perform requested operation");
+    }
 
+    public void setSidRetrievalStrategy(SidRetrievalStrategy sidRetrievalStrategy) {
+        Assert.notNull(sidRetrievalStrategy, "SidRetrievalStrategy required");
+        this.sidRetrievalStrategy = sidRetrievalStrategy;
+    }
 }

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

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,12 +12,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.security.acls.domain;
 
 import org.springframework.security.acls.model.Permission;
 import org.springframework.util.Assert;
 
+
 /**
  * Utility methods for displaying ACL information.
  *
@@ -26,74 +25,83 @@ import org.springframework.util.Assert;
  */
 public abstract class AclFormattingUtils {
 
-	public static String demergePatterns(String original, String removeBits) {
-		Assert.notNull(original, "Original string required");
-		Assert.notNull(removeBits, "Bits To Remove string required");
-		Assert.isTrue(original.length() == removeBits.length(),
-				"Original and Bits To Remove strings must be identical length");
-		char[] replacement = new char[original.length()];
-		for (int i = 0; i < original.length(); i++) {
-			if (removeBits.charAt(i) == Permission.RESERVED_OFF) {
-				replacement[i] = original.charAt(i);
-			}
-			else {
-				replacement[i] = Permission.RESERVED_OFF;
-			}
-		}
-		return new String(replacement);
-	}
+    public static String demergePatterns(String original, String removeBits) {
+        Assert.notNull(original, "Original string required");
+        Assert.notNull(removeBits, "Bits To Remove string required");
+        Assert.isTrue(original.length() == removeBits.length(),
+            "Original and Bits To Remove strings must be identical length");
 
-	public static String mergePatterns(String original, String extraBits) {
-		Assert.notNull(original, "Original string required");
-		Assert.notNull(extraBits, "Extra Bits string required");
-		Assert.isTrue(original.length() == extraBits.length(),
-				"Original and Extra Bits strings must be identical length");
-		char[] replacement = new char[extraBits.length()];
-		for (int i = 0; i < extraBits.length(); i++) {
-			if (extraBits.charAt(i) == Permission.RESERVED_OFF) {
-				replacement[i] = original.charAt(i);
-			}
-			else {
-				replacement[i] = extraBits.charAt(i);
-			}
-		}
-		return new String(replacement);
-	}
+        char[] replacement = new char[original.length()];
 
-	/**
-	 * Returns a representation of the active bits in the presented mask, with each active
-	 * bit being denoted by character '*'.
-	 * <p>
-	 * Inactive bits will be denoted by character {@link Permission#RESERVED_OFF}.
-	 * @param i the integer bit mask to print the active bits for
-	 * @return a 32-character representation of the bit mask
-	 */
-	public static String printBinary(int i) {
-		return printBinary(i, '*', Permission.RESERVED_OFF);
-	}
+        for (int i = 0; i < original.length(); i++) {
+            if (removeBits.charAt(i) == Permission.RESERVED_OFF) {
+                replacement[i] = original.charAt(i);
+            } else {
+                replacement[i] = Permission.RESERVED_OFF;
+            }
+        }
 
-	/**
-	 * Returns a representation of the active bits in the presented mask, with each active
-	 * bit being denoted by the passed character.
-	 * <p>
-	 * Inactive bits will be denoted by character {@link Permission#RESERVED_OFF}.
-	 * @param mask the integer bit mask to print the active bits for
-	 * @param code the character to print when an active bit is detected
-	 * @return a 32-character representation of the bit mask
-	 */
-	public static String printBinary(int mask, char code) {
-		Assert.doesNotContain(Character.toString(code), Character.toString(Permission.RESERVED_ON),
-				() -> Permission.RESERVED_ON + " is a reserved character code");
-		Assert.doesNotContain(Character.toString(code), Character.toString(Permission.RESERVED_OFF),
-				() -> Permission.RESERVED_OFF + " is a reserved character code");
-		return printBinary(mask, Permission.RESERVED_ON, Permission.RESERVED_OFF).replace(Permission.RESERVED_ON, code);
-	}
+        return new String(replacement);
+    }
 
-	private static String printBinary(int i, char on, char off) {
-		String s = Integer.toBinaryString(i);
-		String pattern = Permission.THIRTY_TWO_RESERVED_OFF;
-		String temp2 = pattern.substring(0, pattern.length() - s.length()) + s;
-		return temp2.replace('0', off).replace('1', on);
-	}
+    public static String mergePatterns(String original, String extraBits) {
+        Assert.notNull(original, "Original string required");
+        Assert.notNull(extraBits, "Extra Bits string required");
+        Assert.isTrue(original.length() == extraBits.length(),
+            "Original and Extra Bits strings must be identical length");
 
+        char[] replacement = new char[extraBits.length()];
+
+        for (int i = 0; i < extraBits.length(); i++) {
+            if (extraBits.charAt(i) == Permission.RESERVED_OFF) {
+                replacement[i] = original.charAt(i);
+            } else {
+                replacement[i] = extraBits.charAt(i);
+            }
+        }
+
+        return new String(replacement);
+    }
+
+    /**
+     * Returns a representation of the active bits in the presented mask, with each active bit being denoted by
+     * character '*'.
+     * <p>
+     * Inactive bits will be denoted by character {@link Permission#RESERVED_OFF}.
+     *
+     * @param i the integer bit mask to print the active bits for
+     *
+     * @return a 32-character representation of the bit mask
+     */
+    public static String printBinary(int i) {
+        return printBinary(i, '*', Permission.RESERVED_OFF);
+    }
+
+    /**
+     * Returns a representation of the active bits in the presented mask, with each active bit being denoted by
+     * the passed character.
+     * <p>
+     * Inactive bits will be denoted by character {@link Permission#RESERVED_OFF}.
+     *
+     * @param mask the integer bit mask to print the active bits for
+     * @param code the character to print when an active bit is detected
+     *
+     * @return a 32-character representation of the bit mask
+     */
+    public static String printBinary(int mask, char code) {
+        Assert.doesNotContain(Character.toString(code), Character.toString(Permission.RESERVED_ON),
+            Permission.RESERVED_ON + " is a reserved character code");
+        Assert.doesNotContain(Character.toString(code), Character.toString(Permission.RESERVED_OFF),
+            Permission.RESERVED_OFF + " is a reserved character code");
+
+        return printBinary(mask, Permission.RESERVED_ON, Permission.RESERVED_OFF).replace(Permission.RESERVED_ON, code);
+    }
+
+    private static String printBinary(int i, char on, char off) {
+        String s = Integer.toString(i, 2);
+        String pattern = Permission.THIRTY_TWO_RESERVED_OFF;
+        String temp2 = pattern.substring(0, pattern.length() - s.length()) + s;
+
+        return temp2.replace('0', off).replace('1', on);
+    }
 }

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

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,7 +12,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.security.acls.domain;
 
 import java.io.Serializable;
@@ -28,11 +26,10 @@ import org.springframework.security.acls.model.NotFoundException;
 import org.springframework.security.acls.model.ObjectIdentity;
 import org.springframework.security.acls.model.OwnershipAcl;
 import org.springframework.security.acls.model.Permission;
-import org.springframework.security.acls.model.PermissionGrantingStrategy;
 import org.springframework.security.acls.model.Sid;
 import org.springframework.security.acls.model.UnloadedSidException;
 import org.springframework.util.Assert;
-import org.springframework.util.ObjectUtils;
+
 
 /**
  * Base implementation of <code>Acl</code>.
@@ -40,301 +37,372 @@ import org.springframework.util.ObjectUtils;
  * @author Ben Alex
  */
 public class AclImpl implements Acl, MutableAcl, AuditableAcl, OwnershipAcl {
+    //~ Instance fields ================================================================================================
 
-	private Acl parentAcl;
+    private Acl parentAcl;
+    private transient AclAuthorizationStrategy aclAuthorizationStrategy;
+    private transient AuditLogger auditLogger;
+    private List<AccessControlEntry> aces = new ArrayList<AccessControlEntry>();
+    private ObjectIdentity objectIdentity;
+    private Serializable id;
+    private Sid owner; // OwnershipAcl
+    private List<Sid> loadedSids = null; // includes all SIDs the WHERE clause covered, even if there was no ACE for a SID
+    private boolean entriesInheriting = true;
 
-	private transient AclAuthorizationStrategy aclAuthorizationStrategy;
+    //~ Constructors ===================================================================================================
 
-	private transient PermissionGrantingStrategy permissionGrantingStrategy;
+    /**
+     * Minimal constructor, which should be used {@link
+     * org.springframework.security.acls.model.MutableAclService#createAcl(ObjectIdentity)}.
+     *
+     * @param objectIdentity the object identity this ACL relates to (required)
+     * @param id the primary key assigned to this ACL (required)
+     * @param aclAuthorizationStrategy authorization strategy (required)
+     * @param auditLogger audit logger (required)
+     */
+    public AclImpl(ObjectIdentity objectIdentity, Serializable id, AclAuthorizationStrategy aclAuthorizationStrategy,
+                    AuditLogger auditLogger) {
+        Assert.notNull(objectIdentity, "Object Identity required");
+        Assert.notNull(id, "Id required");
+        Assert.notNull(aclAuthorizationStrategy, "AclAuthorizationStrategy required");
+        Assert.notNull(auditLogger, "AuditLogger required");
+        this.objectIdentity = objectIdentity;
+        this.id = id;
+        this.aclAuthorizationStrategy = aclAuthorizationStrategy;
+        this.auditLogger = auditLogger;
+    }
 
-	private final List<AccessControlEntry> aces = new ArrayList<>();
+    /**
+     * Full constructor, which should be used by persistence tools that do not
+     * provide field-level access features.
+     *
+     * @param objectIdentity the object identity this ACL relates to (required)
+     * @param id the primary key assigned to this ACL (required)
+     * @param aclAuthorizationStrategy authorization strategy (required)
+     * @param auditLogger audit logger (required)
+     * @param parentAcl the parent (may be <code>null</code>)
+     * @param loadedSids the loaded SIDs if only a subset were loaded (may be
+     *        <code>null</code>)
+     * @param entriesInheriting if ACEs from the parent should inherit into
+     *        this ACL
+     * @param owner the owner (required)
+     */
+    public AclImpl(ObjectIdentity objectIdentity, Serializable id, AclAuthorizationStrategy aclAuthorizationStrategy,
+                    AuditLogger auditLogger, Acl parentAcl, List<Sid> loadedSids, boolean entriesInheriting, Sid owner) {
+        Assert.notNull(objectIdentity, "Object Identity required");
+        Assert.notNull(id, "Id required");
+        Assert.notNull(aclAuthorizationStrategy, "AclAuthorizationStrategy required");
+        Assert.notNull(owner, "Owner required");
+        Assert.notNull(auditLogger, "AuditLogger required");
+        this.objectIdentity = objectIdentity;
+        this.id = id;
+        this.aclAuthorizationStrategy = aclAuthorizationStrategy;
+        this.auditLogger = auditLogger;
+        this.parentAcl = parentAcl; // may be null
+        this.loadedSids = loadedSids; // may be null
+        this.entriesInheriting = entriesInheriting;
+        this.owner = owner;
+    }
 
-	private ObjectIdentity objectIdentity;
+    /**
+     * Private no-argument constructor for use by reflection-based persistence
+     * tools along with field-level access.
+     */
+    @SuppressWarnings("unused")
+    private AclImpl() {}
 
-	private Serializable id;
+    //~ Methods ========================================================================================================
 
-	// OwnershipAcl
-	private Sid owner;
+    public void deleteAce(int aceIndex) throws NotFoundException {
+        aclAuthorizationStrategy.securityCheck(this, AclAuthorizationStrategy.CHANGE_GENERAL);
+        verifyAceIndexExists(aceIndex);
 
-	// includes all SIDs the WHERE clause covered, even if there was no ACE for a SID
-	private List<Sid> loadedSids = null;
+        synchronized (aces) {
+            this.aces.remove(aceIndex);
+        }
+    }
 
-	private boolean entriesInheriting = true;
+    private void verifyAceIndexExists(int aceIndex) {
+        if (aceIndex < 0) {
+            throw new NotFoundException("aceIndex must be greater than or equal to zero");
+        }
+        if (aceIndex >= this.aces.size()) {
+            throw new NotFoundException("aceIndex must refer to an index of the AccessControlEntry list. " +
+                    "List size is " + aces.size() + ", index was " + aceIndex);
+        }
+    }
 
-	/**
-	 * Minimal constructor, which should be used
-	 * {@link org.springframework.security.acls.model.MutableAclService#createAcl(ObjectIdentity)}
-	 * .
-	 * @param objectIdentity the object identity this ACL relates to (required)
-	 * @param id the primary key assigned to this ACL (required)
-	 * @param aclAuthorizationStrategy authorization strategy (required)
-	 * @param auditLogger audit logger (required)
-	 */
-	public AclImpl(ObjectIdentity objectIdentity, Serializable id, AclAuthorizationStrategy aclAuthorizationStrategy,
-			AuditLogger auditLogger) {
-		Assert.notNull(objectIdentity, "Object Identity required");
-		Assert.notNull(id, "Id required");
-		Assert.notNull(aclAuthorizationStrategy, "AclAuthorizationStrategy required");
-		Assert.notNull(auditLogger, "AuditLogger required");
-		this.objectIdentity = objectIdentity;
-		this.id = id;
-		this.aclAuthorizationStrategy = aclAuthorizationStrategy;
-		this.permissionGrantingStrategy = new DefaultPermissionGrantingStrategy(auditLogger);
-	}
+    public void insertAce(int atIndexLocation, Permission permission, Sid sid, boolean granting) throws NotFoundException {
+        aclAuthorizationStrategy.securityCheck(this, AclAuthorizationStrategy.CHANGE_GENERAL);
+        Assert.notNull(permission, "Permission required");
+        Assert.notNull(sid, "Sid required");
+        if (atIndexLocation < 0) {
+            throw new NotFoundException("atIndexLocation must be greater than or equal to zero");
+        }
+        if (atIndexLocation > this.aces.size()) {
+            throw new NotFoundException("atIndexLocation must be less than or equal to the size of the AccessControlEntry collection");
+        }
 
-	/**
-	 * Full constructor, which should be used by persistence tools that do not provide
-	 * field-level access features.
-	 * @param objectIdentity the object identity this ACL relates to
-	 * @param id the primary key assigned to this ACL
-	 * @param aclAuthorizationStrategy authorization strategy
-	 * @param grantingStrategy the {@code PermissionGrantingStrategy} which will be used
-	 * by the {@code isGranted()} method
-	 * @param parentAcl the parent (may be may be {@code null})
-	 * @param loadedSids the loaded SIDs if only a subset were loaded (may be {@code null}
-	 * )
-	 * @param entriesInheriting if ACEs from the parent should inherit into this ACL
-	 * @param owner the owner (required)
-	 */
-	public AclImpl(ObjectIdentity objectIdentity, Serializable id, AclAuthorizationStrategy aclAuthorizationStrategy,
-			PermissionGrantingStrategy grantingStrategy, Acl parentAcl, List<Sid> loadedSids, boolean entriesInheriting,
-			Sid owner) {
-		Assert.notNull(objectIdentity, "Object Identity required");
-		Assert.notNull(id, "Id required");
-		Assert.notNull(aclAuthorizationStrategy, "AclAuthorizationStrategy required");
-		Assert.notNull(owner, "Owner required");
-		this.objectIdentity = objectIdentity;
-		this.id = id;
-		this.aclAuthorizationStrategy = aclAuthorizationStrategy;
-		this.parentAcl = parentAcl; // may be null
-		this.loadedSids = loadedSids; // may be null
-		this.entriesInheriting = entriesInheriting;
-		this.owner = owner;
-		this.permissionGrantingStrategy = grantingStrategy;
-	}
+        AccessControlEntryImpl ace = new AccessControlEntryImpl(null, this, sid, permission, granting, false, false);
 
-	/**
-	 * Private no-argument constructor for use by reflection-based persistence tools along
-	 * with field-level access.
-	 */
-	@SuppressWarnings("unused")
-	private AclImpl() {
-	}
+        synchronized (aces) {
+            this.aces.add(atIndexLocation, ace);
+        }
+    }
 
-	@Override
-	public void deleteAce(int aceIndex) throws NotFoundException {
-		this.aclAuthorizationStrategy.securityCheck(this, AclAuthorizationStrategy.CHANGE_GENERAL);
-		verifyAceIndexExists(aceIndex);
-		synchronized (this.aces) {
-			this.aces.remove(aceIndex);
-		}
-	}
+    public List<AccessControlEntry> getEntries() {
+        // Can safely return AccessControlEntry directly, as they're immutable outside the ACL package
+        return new ArrayList<AccessControlEntry>(aces);
+    }
 
-	private void verifyAceIndexExists(int aceIndex) {
-		if (aceIndex < 0) {
-			throw new NotFoundException("aceIndex must be greater than or equal to zero");
-		}
-		if (aceIndex >= this.aces.size()) {
-			throw new NotFoundException("aceIndex must refer to an index of the AccessControlEntry list. "
-					+ "List size is " + this.aces.size() + ", index was " + aceIndex);
-		}
-	}
+    public Serializable getId() {
+        return this.id;
+    }
 
-	@Override
-	public void insertAce(int atIndexLocation, Permission permission, Sid sid, boolean granting)
-			throws NotFoundException {
-		this.aclAuthorizationStrategy.securityCheck(this, AclAuthorizationStrategy.CHANGE_GENERAL);
-		Assert.notNull(permission, "Permission required");
-		Assert.notNull(sid, "Sid required");
-		if (atIndexLocation < 0) {
-			throw new NotFoundException("atIndexLocation must be greater than or equal to zero");
-		}
-		if (atIndexLocation > this.aces.size()) {
-			throw new NotFoundException(
-					"atIndexLocation must be less than or equal to the size of the AccessControlEntry collection");
-		}
-		AccessControlEntryImpl ace = new AccessControlEntryImpl(null, this, sid, permission, granting, false, false);
-		synchronized (this.aces) {
-			this.aces.add(atIndexLocation, ace);
-		}
-	}
+    public ObjectIdentity getObjectIdentity() {
+        return objectIdentity;
+    }
 
-	@Override
-	public List<AccessControlEntry> getEntries() {
-		// Can safely return AccessControlEntry directly, as they're immutable outside the
-		// ACL package
-		return new ArrayList<>(this.aces);
-	}
+    public boolean isEntriesInheriting() {
+        return entriesInheriting;
+    }
 
-	@Override
-	public Serializable getId() {
-		return this.id;
-	}
+    /**
+     * Determines authorization.  The order of the <code>permission</code> and <code>sid</code> arguments is
+     * <em>extremely important</em>! The method will iterate through each of the <code>permission</code>s in the order
+     * specified. For each iteration, all of the <code>sid</code>s will be considered, again in the order they are
+     * presented. A search will then be performed for the first {@link AccessControlEntry} object that directly
+     * matches that <code>permission:sid</code> combination. When the <em>first full match</em> is found (ie an ACE
+     * that has the SID currently being searched for and the exact permission bit mask being search for), the grant or
+     * deny flag for that ACE will prevail. If the ACE specifies to grant access, the method will return
+     * <code>true</code>. If the ACE specifies to deny access, the loop will stop and the next <code>permission</code>
+     * iteration will be performed. If each permission indicates to deny access, the first deny ACE found will be
+     * considered the reason for the failure (as it was the first match found, and is therefore the one most logically
+     * requiring changes - although not always). If absolutely no matching ACE was found at all for any permission,
+     * the parent ACL will be tried (provided that there is a parent and {@link #isEntriesInheriting()} is
+     * <code>true</code>. The parent ACL will also scan its parent and so on. If ultimately no matching ACE is found,
+     * a <code>NotFoundException</code> will be thrown and the caller will need to decide how to handle the permission
+     * check. Similarly, if any of the SID arguments presented to the method were not loaded by the ACL,
+     * <code>UnloadedSidException</code> will be thrown.
+     *
+     * @param permission the exact permissions to scan for (order is important)
+     * @param sids the exact SIDs to scan for (order is important)
+     * @param administrativeMode if <code>true</code> denotes the query is for administrative purposes and no auditing
+     *        will be undertaken
+     *
+     * @return <code>true</code> if one of the permissions has been granted, <code>false</code> if one of the
+     *         permissions has been specifically revoked
+     *
+     * @throws NotFoundException if an exact ACE for one of the permission bit masks and SID combination could not be
+     *         found
+     * @throws UnloadedSidException if the passed SIDs are unknown to this ACL because the ACL was only loaded for a
+     *         subset of SIDs
+     */
+    public boolean isGranted(List<Permission> permission, List<Sid> sids, boolean administrativeMode)
+            throws NotFoundException, UnloadedSidException {
+        Assert.notEmpty(permission, "Permissions required");
+        Assert.notEmpty(sids, "SIDs required");
 
-	@Override
-	public ObjectIdentity getObjectIdentity() {
-		return this.objectIdentity;
-	}
+        if (!this.isSidLoaded(sids)) {
+            throw new UnloadedSidException("ACL was not loaded for one or more SID");
+        }
 
-	@Override
-	public boolean isEntriesInheriting() {
-		return this.entriesInheriting;
-	}
+        AccessControlEntry firstRejection = null;
 
-	/**
-	 * Delegates to the {@link PermissionGrantingStrategy}.
-	 * @throws UnloadedSidException if the passed SIDs are unknown to this ACL because the
-	 * ACL was only loaded for a subset of SIDs
-	 * @see DefaultPermissionGrantingStrategy
-	 */
-	@Override
-	public boolean isGranted(List<Permission> permission, List<Sid> sids, boolean administrativeMode)
-			throws NotFoundException, UnloadedSidException {
-		Assert.notEmpty(permission, "Permissions required");
-		Assert.notEmpty(sids, "SIDs required");
-		if (!this.isSidLoaded(sids)) {
-			throw new UnloadedSidException("ACL was not loaded for one or more SID");
-		}
-		return this.permissionGrantingStrategy.isGranted(this, permission, sids, administrativeMode);
-	}
+        for (Permission p : permission) {
+            for (Sid sid: sids) {
+                // Attempt to find exact match for this permission mask and SID
+                boolean scanNextSid = true;
 
-	@Override
-	public boolean isSidLoaded(List<Sid> sids) {
-		// If loadedSides is null, this indicates all SIDs were loaded
-		// Also return true if the caller didn't specify a SID to find
-		if ((this.loadedSids == null) || (sids == null) || (sids.size() == 0)) {
-			return true;
-		}
+                for (AccessControlEntry ace : aces ) {
 
-		// This ACL applies to a SID subset only. Iterate to check it applies.
-		for (Sid sid : sids) {
-			boolean found = false;
-			for (Sid loadedSid : this.loadedSids) {
-				if (sid.equals(loadedSid)) {
-					// this SID is OK
-					found = true;
-					break; // out of loadedSids for loop
-				}
-			}
-			if (!found) {
-				return false;
-			}
-		}
+                    if ((ace.getPermission().getMask() == p.getMask()) && ace.getSid().equals(sid)) {
+                        // Found a matching ACE, so its authorization decision will prevail
+                        if (ace.isGranting()) {
+                            // Success
+                            if (!administrativeMode) {
+                                auditLogger.logIfNeeded(true, ace);
+                            }
 
-		return true;
-	}
+                            return true;
+                        }
 
-	@Override
-	public void setEntriesInheriting(boolean entriesInheriting) {
-		this.aclAuthorizationStrategy.securityCheck(this, AclAuthorizationStrategy.CHANGE_GENERAL);
-		this.entriesInheriting = entriesInheriting;
-	}
+                        // Failure for this permission, so stop search
+                        // We will see if they have a different permission
+                        // (this permission is 100% rejected for this SID)
+                        if (firstRejection == null) {
+                            // Store first rejection for auditing reasons
+                            firstRejection = ace;
+                        }
 
-	@Override
-	public void setOwner(Sid newOwner) {
-		this.aclAuthorizationStrategy.securityCheck(this, AclAuthorizationStrategy.CHANGE_OWNERSHIP);
-		Assert.notNull(newOwner, "Owner required");
-		this.owner = newOwner;
-	}
+                        scanNextSid = false; // helps break the loop
 
-	@Override
-	public Sid getOwner() {
-		return this.owner;
-	}
+                        break; // exit aces loop
+                    }
+                }
 
-	@Override
-	public void setParent(Acl newParent) {
-		this.aclAuthorizationStrategy.securityCheck(this, AclAuthorizationStrategy.CHANGE_GENERAL);
-		Assert.isTrue(newParent == null || !newParent.equals(this), "Cannot be the parent of yourself");
-		this.parentAcl = newParent;
-	}
+                if (!scanNextSid) {
+                    break; // exit SID for loop (now try next permission)
+                }
+            }
+        }
 
-	@Override
-	public Acl getParentAcl() {
-		return this.parentAcl;
-	}
+        if (firstRejection != null) {
+            // We found an ACE to reject the request at this point, as no
+            // other ACEs were found that granted a different permission
+            if (!administrativeMode) {
+                auditLogger.logIfNeeded(false, firstRejection);
+            }
 
-	@Override
-	public void updateAce(int aceIndex, Permission permission) throws NotFoundException {
-		this.aclAuthorizationStrategy.securityCheck(this, AclAuthorizationStrategy.CHANGE_GENERAL);
-		verifyAceIndexExists(aceIndex);
-		synchronized (this.aces) {
-			AccessControlEntryImpl ace = (AccessControlEntryImpl) this.aces.get(aceIndex);
-			ace.setPermission(permission);
-		}
-	}
+            return false;
+        }
 
-	@Override
-	public void updateAuditing(int aceIndex, boolean auditSuccess, boolean auditFailure) {
-		this.aclAuthorizationStrategy.securityCheck(this, AclAuthorizationStrategy.CHANGE_AUDITING);
-		verifyAceIndexExists(aceIndex);
-		synchronized (this.aces) {
-			AccessControlEntryImpl ace = (AccessControlEntryImpl) this.aces.get(aceIndex);
-			ace.setAuditSuccess(auditSuccess);
-			ace.setAuditFailure(auditFailure);
-		}
-	}
+        // No matches have been found so far
+        if (isEntriesInheriting() && (parentAcl != null)) {
+            // We have a parent, so let them try to find a matching ACE
+            return parentAcl.isGranted(permission, sids, false);
+        } else {
+            // We either have no parent, or we're the uppermost parent
+            throw new NotFoundException("Unable to locate a matching ACE for passed permissions and SIDs");
+        }
+    }
 
-	@Override
-	public boolean equals(Object obj) {
-		if (obj == this) {
-			return true;
-		}
-		if (obj == null || !(obj instanceof AclImpl)) {
-			return false;
-		}
-		AclImpl other = (AclImpl) obj;
-		boolean result = true;
-		result = result && this.aces.equals(other.aces);
-		result = result && ObjectUtils.nullSafeEquals(this.parentAcl, other.parentAcl);
-		result = result && ObjectUtils.nullSafeEquals(this.objectIdentity, other.objectIdentity);
-		result = result && ObjectUtils.nullSafeEquals(this.id, other.id);
-		result = result && ObjectUtils.nullSafeEquals(this.owner, other.owner);
-		result = result && this.entriesInheriting == other.entriesInheriting;
-		result = result && ObjectUtils.nullSafeEquals(this.loadedSids, other.loadedSids);
-		return result;
-	}
+    public boolean isSidLoaded(List<Sid> sids) {
+        // If loadedSides is null, this indicates all SIDs were loaded
+        // Also return true if the caller didn't specify a SID to find
+        if ((this.loadedSids == null) || (sids == null) || (sids.size() == 0)) {
+            return true;
+        }
 
-	@Override
-	public int hashCode() {
-		int result = (this.parentAcl != null) ? this.parentAcl.hashCode() : 0;
-		result = 31 * result + this.aclAuthorizationStrategy.hashCode();
-		result = 31 * result
-				+ ((this.permissionGrantingStrategy != null) ? this.permissionGrantingStrategy.hashCode() : 0);
-		result = 31 * result + ((this.aces != null) ? this.aces.hashCode() : 0);
-		result = 31 * result + this.objectIdentity.hashCode();
-		result = 31 * result + this.id.hashCode();
-		result = 31 * result + ((this.owner != null) ? this.owner.hashCode() : 0);
-		result = 31 * result + ((this.loadedSids != null) ? this.loadedSids.hashCode() : 0);
-		result = 31 * result + (this.entriesInheriting ? 1 : 0);
-		return result;
-	}
+        // This ACL applies to a SID subset only. Iterate to check it applies.
+        for (Sid sid: sids) {
+            boolean found = false;
 
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("AclImpl[");
-		sb.append("id: ").append(this.id).append("; ");
-		sb.append("objectIdentity: ").append(this.objectIdentity).append("; ");
-		sb.append("owner: ").append(this.owner).append("; ");
-		int count = 0;
-		for (AccessControlEntry ace : this.aces) {
-			count++;
-			if (count == 1) {
-				sb.append("\n");
-			}
-			sb.append(ace).append("\n");
-		}
-		if (count == 0) {
-			sb.append("no ACEs; ");
-		}
-		sb.append("inheriting: ").append(this.entriesInheriting).append("; ");
-		sb.append("parent: ").append((this.parentAcl == null) ? "Null" : this.parentAcl.getObjectIdentity().toString());
-		sb.append("; ");
-		sb.append("aclAuthorizationStrategy: ").append(this.aclAuthorizationStrategy).append("; ");
-		sb.append("permissionGrantingStrategy: ").append(this.permissionGrantingStrategy);
-		sb.append("]");
-		return sb.toString();
-	}
+            for (Sid loadedSid : loadedSids) {
+                if (sid.equals(loadedSid)) {
+                    // this SID is OK
+                    found = true;
+
+                    break; // out of loadedSids for loop
+                }
+            }
+
+            if (!found) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    public void setEntriesInheriting(boolean entriesInheriting) {
+        aclAuthorizationStrategy.securityCheck(this, AclAuthorizationStrategy.CHANGE_GENERAL);
+        this.entriesInheriting = entriesInheriting;
+    }
+
+    public void setOwner(Sid newOwner) {
+        aclAuthorizationStrategy.securityCheck(this, AclAuthorizationStrategy.CHANGE_OWNERSHIP);
+        Assert.notNull(newOwner, "Owner required");
+        this.owner = newOwner;
+    }
+
+    public Sid getOwner() {
+        return this.owner;
+    }
+
+    public void setParent(Acl newParent) {
+        aclAuthorizationStrategy.securityCheck(this, AclAuthorizationStrategy.CHANGE_GENERAL);
+        Assert.isTrue(newParent == null || !newParent.equals(this), "Cannot be the parent of yourself");
+        this.parentAcl = newParent;
+    }
+
+    public Acl getParentAcl() {
+        return parentAcl;
+    }
+
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("AclImpl[");
+        sb.append("id: ").append(this.id).append("; ");
+        sb.append("objectIdentity: ").append(this.objectIdentity).append("; ");
+        sb.append("owner: ").append(this.owner).append("; ");
+
+        int count = 0;
+
+        for (AccessControlEntry ace : aces) {
+            count++;
+
+            if (count == 1) {
+                sb.append("\r\n");
+            }
+
+            sb.append(ace).append("\r\n");
+        }
+
+        if (count == 0) {
+            sb.append("no ACEs; ");
+        }
+
+        sb.append("inheriting: ").append(this.entriesInheriting).append("; ");
+        sb.append("parent: ").append((this.parentAcl == null) ? "Null" : this.parentAcl.getObjectIdentity().toString());
+        sb.append("; ");
+        sb.append("aclAuthorizationStrategy: ").append(this.aclAuthorizationStrategy).append("; ");
+        sb.append("auditLogger: ").append(this.auditLogger);
+        sb.append("]");
+
+        return sb.toString();
+    }
+
+    public void updateAce(int aceIndex, Permission permission)
+        throws NotFoundException {
+        aclAuthorizationStrategy.securityCheck(this, AclAuthorizationStrategy.CHANGE_GENERAL);
+        verifyAceIndexExists(aceIndex);
+
+        synchronized (aces) {
+            AccessControlEntryImpl ace = (AccessControlEntryImpl) aces.get(aceIndex);
+            ace.setPermission(permission);
+        }
+    }
+
+    public void updateAuditing(int aceIndex, boolean auditSuccess, boolean auditFailure) {
+        aclAuthorizationStrategy.securityCheck(this, AclAuthorizationStrategy.CHANGE_AUDITING);
+        verifyAceIndexExists(aceIndex);
+
+        synchronized (aces) {
+            AccessControlEntryImpl ace = (AccessControlEntryImpl) aces.get(aceIndex);
+            ace.setAuditSuccess(auditSuccess);
+            ace.setAuditFailure(auditFailure);
+        }
+    }
+
+    public boolean equals(Object obj) {
+        if (obj instanceof AclImpl) {
+            AclImpl rhs = (AclImpl) obj;
+            if (this.aces.equals(rhs.aces)) {
+                if ((this.parentAcl == null && rhs.parentAcl == null) || (this.parentAcl !=null && this.parentAcl.equals(rhs.parentAcl))) {
+                    if ((this.objectIdentity == null && rhs.objectIdentity == null) || (this.objectIdentity != null && this.objectIdentity.equals(rhs.objectIdentity))) {
+                        if ((this.id == null && rhs.id == null) || (this.id != null && this.id.equals(rhs.id))) {
+                            if ((this.owner == null && rhs.owner == null) || (this.owner != null && this.owner.equals(rhs.owner))) {
+                                if (this.entriesInheriting == rhs.entriesInheriting) {
+                                    if ((this.loadedSids == null && rhs.loadedSids == null)) {
+                                        return true;
+                                    }
+                                    if (this.loadedSids != null && (this.loadedSids.size() == rhs.loadedSids.size())) {
+                                        for (int i = 0; i < this.loadedSids.size(); i++) {
+                                            if (!this.loadedSids.get(i).equals(rhs.loadedSids.get(i))) {
+                                                return false;
+                                            }
+                                        }
+                                        return true;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        return false;
+    }
 
 }

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

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,18 +12,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.security.acls.domain;
 
 import org.springframework.security.acls.model.AccessControlEntry;
 
+
 /**
  * Used by <code>AclImpl</code> to log audit events.
  *
  * @author Ben Alex
+ *
  */
 public interface AuditLogger {
+    //~ Methods ========================================================================================================
 
-	void logIfNeeded(boolean granted, AccessControlEntry ace);
-
+    void logIfNeeded(boolean granted, AccessControlEntry ace);
 }

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

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,11 +12,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.security.acls.domain;
 
 import org.springframework.security.acls.model.Permission;
 
+
 /**
  * A set of standard permissions.
  *
@@ -29,23 +28,17 @@ import org.springframework.security.acls.model.Permission;
  * @author Ben Alex
  */
 public class BasePermission extends AbstractPermission {
+    public static final Permission READ = new BasePermission(1 << 0, 'R'); // 1
+    public static final Permission WRITE = new BasePermission(1 << 1, 'W'); // 2
+    public static final Permission CREATE = new BasePermission(1 << 2, 'C'); // 4
+    public static final Permission DELETE = new BasePermission(1 << 3, 'D'); // 8
+    public static final Permission ADMINISTRATION = new BasePermission(1 << 4, 'A'); // 16
 
-	public static final Permission READ = new BasePermission(1 << 0, 'R'); // 1
-
-	public static final Permission WRITE = new BasePermission(1 << 1, 'W'); // 2
-
-	public static final Permission CREATE = new BasePermission(1 << 2, 'C'); // 4
-
-	public static final Permission DELETE = new BasePermission(1 << 3, 'D'); // 8
-
-	public static final Permission ADMINISTRATION = new BasePermission(1 << 4, 'A'); // 16
-
-	protected BasePermission(int mask) {
-		super(mask);
-	}
-
-	protected BasePermission(int mask, char code) {
-		super(mask, code);
-	}
+    protected BasePermission(int mask) {
+       super(mask);
+    }
 
+    protected BasePermission(int mask, char code) {
+        super(mask, code);
+    }
 }

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

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,32 +12,33 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.security.acls.domain;
 
 import org.springframework.security.acls.model.AccessControlEntry;
 import org.springframework.security.acls.model.AuditableAccessControlEntry;
+
 import org.springframework.util.Assert;
 
+
 /**
  * A basic implementation of {@link AuditLogger}.
  *
  * @author Ben Alex
  */
 public class ConsoleAuditLogger implements AuditLogger {
+    //~ Methods ========================================================================================================
 
-	@Override
-	public void logIfNeeded(boolean granted, AccessControlEntry ace) {
-		Assert.notNull(ace, "AccessControlEntry required");
-		if (ace instanceof AuditableAccessControlEntry) {
-			AuditableAccessControlEntry auditableAce = (AuditableAccessControlEntry) ace;
-			if (granted && auditableAce.isAuditSuccess()) {
-				System.out.println("GRANTED due to ACE: " + ace);
-			}
-			else if (!granted && auditableAce.isAuditFailure()) {
-				System.out.println("DENIED due to ACE: " + ace);
-			}
-		}
-	}
+    public void logIfNeeded(boolean granted, AccessControlEntry ace) {
+        Assert.notNull(ace, "AccessControlEntry required");
 
+        if (ace instanceof AuditableAccessControlEntry) {
+            AuditableAccessControlEntry auditableAce = (AuditableAccessControlEntry) ace;
+
+            if (granted && auditableAce.isAuditSuccess()) {
+                System.out.println("GRANTED due to ACE: " + ace);
+            } else if (!granted && auditableAce.isAuditFailure()) {
+                System.out.println("DENIED due to ACE: " + ace);
+            }
+        }
+    }
 }

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

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,50 +12,49 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.security.acls.domain;
 
 import org.springframework.security.acls.model.Permission;
 
+
 /**
- * Represents a <code>Permission</code> that is constructed at runtime from other
- * permissions.
+ * Represents a <code>Permission</code> that is constructed at runtime from other permissions.
  *
- * <p>
- * Methods return <code>this</code>, in order to facilitate method chaining.
- * </p>
+ * <p>Methods return <code>this</code>, in order to facilitate method chaining.</p>
  *
  * @author Ben Alex
  */
 public class CumulativePermission extends AbstractPermission {
 
-	private String pattern = THIRTY_TWO_RESERVED_OFF;
+    private String pattern = THIRTY_TWO_RESERVED_OFF;
 
-	public CumulativePermission() {
-		super(0, ' ');
-	}
+    public CumulativePermission() {
+        super(0, ' ');
+    }
 
-	public CumulativePermission clear(Permission permission) {
-		this.mask &= ~permission.getMask();
-		this.pattern = AclFormattingUtils.demergePatterns(this.pattern, permission.getPattern());
-		return this;
-	}
+    public CumulativePermission clear(Permission permission) {
+        this.mask &= ~permission.getMask();
+        this.pattern = AclFormattingUtils.demergePatterns(this.pattern, permission.getPattern());
 
-	public CumulativePermission clear() {
-		this.mask = 0;
-		this.pattern = THIRTY_TWO_RESERVED_OFF;
-		return this;
-	}
+        return this;
+    }
 
-	public CumulativePermission set(Permission permission) {
-		this.mask |= permission.getMask();
-		this.pattern = AclFormattingUtils.mergePatterns(this.pattern, permission.getPattern());
-		return this;
-	}
+    public CumulativePermission clear() {
+        this.mask = 0;
+        this.pattern = THIRTY_TWO_RESERVED_OFF;
 
-	@Override
-	public String getPattern() {
-		return this.pattern;
-	}
+        return this;
+    }
+
+    public CumulativePermission set(Permission permission) {
+        this.mask |= permission.getMask();
+        this.pattern = AclFormattingUtils.mergePatterns(this.pattern, permission.getPattern());
+
+        return this;
+    }
+
+    public String getPattern() {
+        return this.pattern;
+    }
 
 }

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

@@ -1,19 +1,3 @@
-/*
- * Copyright 2002-2018 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 org.springframework.security.acls.domain;
 
 import java.lang.reflect.Field;
@@ -29,8 +13,8 @@ import org.springframework.util.Assert;
 /**
  * Default implementation of {@link PermissionFactory}.
  * <p>
- * Used as a strategy by classes which wish to map integer masks and permission names to
- * <tt>Permission</tt> instances for use with the ACL implementation.
+ * Used as a strategy by classes which wish to map integer masks and permission names to <tt>Permission</tt>
+ * instances for use with the ACL implementation.
  * <p>
  * Maintains a registry of permission names and masks to <tt>Permission</tt> instances.
  *
@@ -39,115 +23,124 @@ import org.springframework.util.Assert;
  * @since 2.0.3
  */
 public class DefaultPermissionFactory implements PermissionFactory {
+    private final Map<Integer, Permission> registeredPermissionsByInteger = new HashMap<Integer, Permission>();
+    private final Map<String, Permission> registeredPermissionsByName = new HashMap<String, Permission>();
 
-	private final Map<Integer, Permission> registeredPermissionsByInteger = new HashMap<>();
+    /**
+     * Registers the <tt>Permission</tt> fields from the <tt>BasePermission</tt> class.
+     */
+    public DefaultPermissionFactory() {
+        registerPublicPermissions(BasePermission.class);
+    }
 
-	private final Map<String, Permission> registeredPermissionsByName = new HashMap<>();
+    /**
+     * Registers the <tt>Permission</tt> fields from the supplied class.
+     */
+    public DefaultPermissionFactory(Class<? extends Permission> permissionClass) {
+        registerPublicPermissions(permissionClass);
+    }
 
-	/**
-	 * Registers the <tt>Permission</tt> fields from the <tt>BasePermission</tt> class.
-	 */
-	public DefaultPermissionFactory() {
-		registerPublicPermissions(BasePermission.class);
-	}
+    /**
+     * Registers a map of named <tt>Permission</tt> instances.
+     *
+     * @param namedPermissions the map of <tt>Permission</tt>s, keyed by name.
+     */
+    public DefaultPermissionFactory(Map<String, ? extends Permission> namedPermissions) {
+        for (String name : namedPermissions.keySet()) {
+            registerPermission(namedPermissions.get(name), name);
+        }
+    }
 
-	/**
-	 * Registers the <tt>Permission</tt> fields from the supplied class.
-	 */
-	public DefaultPermissionFactory(Class<? extends Permission> permissionClass) {
-		registerPublicPermissions(permissionClass);
-	}
+    /**
+     * Registers the public static fields of type {@link Permission} for a give class.
+     * <p>
+     * These permissions will be registered under the name of the field. See {@link BasePermission}
+     * for an example.
+     *
+     * @param clazz a {@link Permission} class with public static fields to register
+     */
+    protected void registerPublicPermissions(Class<? extends Permission> clazz) {
+        Assert.notNull(clazz, "Class required");
 
-	/**
-	 * Registers a map of named <tt>Permission</tt> instances.
-	 * @param namedPermissions the map of <tt>Permission</tt>s, keyed by name.
-	 */
-	public DefaultPermissionFactory(Map<String, ? extends Permission> namedPermissions) {
-		for (String name : namedPermissions.keySet()) {
-			registerPermission(namedPermissions.get(name), name);
-		}
-	}
+        Field[] fields = clazz.getFields();
 
-	/**
-	 * Registers the public static fields of type {@link Permission} for a give class.
-	 * <p>
-	 * These permissions will be registered under the name of the field. See
-	 * {@link BasePermission} for an example.
-	 * @param clazz a {@link Permission} class with public static fields to register
-	 */
-	protected void registerPublicPermissions(Class<? extends Permission> clazz) {
-		Assert.notNull(clazz, "Class required");
-		Field[] fields = clazz.getFields();
-		for (Field field : fields) {
-			try {
-				Object fieldValue = field.get(null);
-				if (Permission.class.isAssignableFrom(fieldValue.getClass())) {
-					// Found a Permission static field
-					Permission perm = (Permission) fieldValue;
-					String permissionName = field.getName();
-					registerPermission(perm, permissionName);
-				}
-			}
-			catch (Exception ex) {
-			}
-		}
-	}
+        for (int i = 0; i < fields.length; i++) {
+            try {
+                Object fieldValue = fields[i].get(null);
 
-	protected void registerPermission(Permission perm, String permissionName) {
-		Assert.notNull(perm, "Permission required");
-		Assert.hasText(permissionName, "Permission name required");
-		Integer mask = perm.getMask();
+                if (Permission.class.isAssignableFrom(fieldValue.getClass())) {
+                    // Found a Permission static field
+                    Permission perm = (Permission) fieldValue;
+                    String permissionName = fields[i].getName();
 
-		// Ensure no existing Permission uses this integer or code
-		Assert.isTrue(!this.registeredPermissionsByInteger.containsKey(mask),
-				() -> "An existing Permission already provides mask " + mask);
-		Assert.isTrue(!this.registeredPermissionsByName.containsKey(permissionName),
-				() -> "An existing Permission already provides name '" + permissionName + "'");
+                    registerPermission(perm, permissionName);
+                }
+            } catch (Exception ignore) {}
+        }
+    }
 
-		// Register the new Permission
-		this.registeredPermissionsByInteger.put(mask, perm);
-		this.registeredPermissionsByName.put(permissionName, perm);
-	}
+    protected void registerPermission(Permission perm, String permissionName) {
+        Assert.notNull(perm, "Permission required");
+        Assert.hasText(permissionName, "Permission name required");
 
-	@Override
-	public Permission buildFromMask(int mask) {
-		if (this.registeredPermissionsByInteger.containsKey(mask)) {
-			// The requested mask has an exact match against a statically-defined
-			// Permission, so return it
-			return this.registeredPermissionsByInteger.get(mask);
-		}
+        Integer mask = new Integer(perm.getMask());
 
-		// To get this far, we have to use a CumulativePermission
-		CumulativePermission permission = new CumulativePermission();
-		for (int i = 0; i < 32; i++) {
-			int permissionToCheck = 1 << i;
-			if ((mask & permissionToCheck) == permissionToCheck) {
-				Permission p = this.registeredPermissionsByInteger.get(permissionToCheck);
-				Assert.state(p != null,
-						() -> "Mask '" + permissionToCheck + "' does not have a corresponding static Permission");
-				permission.set(p);
-			}
-		}
-		return permission;
-	}
+        // Ensure no existing Permission uses this integer or code
+        Assert.isTrue(!registeredPermissionsByInteger.containsKey(mask), "An existing Permission already provides mask " + mask);
+        Assert.isTrue(!registeredPermissionsByName.containsKey(permissionName), "An existing Permission already provides name '" + permissionName + "'");
 
-	@Override
-	public Permission buildFromName(String name) {
-		Permission p = this.registeredPermissionsByName.get(name);
-		Assert.notNull(p, "Unknown permission '" + name + "'");
-		return p;
-	}
+        // Register the new Permission
+        registeredPermissionsByInteger.put(mask, perm);
+        registeredPermissionsByName.put(permissionName, perm);
+    }
 
-	@Override
-	public List<Permission> buildFromNames(List<String> names) {
-		if ((names == null) || (names.size() == 0)) {
-			return Collections.emptyList();
-		}
-		List<Permission> permissions = new ArrayList<>(names.size());
-		for (String name : names) {
-			permissions.add(buildFromName(name));
-		}
-		return permissions;
-	}
+    public Permission buildFromMask(int 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(new Integer(mask));
+        }
+
+        // To get this far, we have to use a CumulativePermission
+        CumulativePermission permission = new CumulativePermission();
+
+        for (int i = 0; i < 32; i++) {
+            int permissionToCheck = 1 << i;
+
+            if ((mask & permissionToCheck) == permissionToCheck) {
+                Permission p = registeredPermissionsByInteger.get(Integer.valueOf(permissionToCheck));
+
+                if (p == null) {
+                    throw new IllegalStateException("Mask '" + permissionToCheck + "' does not have a corresponding static Permission");
+                }
+                permission.set(p);
+            }
+        }
+
+        return permission;
+    }
+
+    public Permission buildFromName(String name) {
+        Permission p = registeredPermissionsByName.get(name);
+
+        if (p == null) {
+            throw new IllegalArgumentException("Unknown permission '" + name + "'");
+        }
+
+        return p;
+    }
+
+    public List<Permission> buildFromNames(List<String> names) {
+        if ((names == null) || (names.size() == 0)) {
+            return Collections.emptyList();
+        }
+
+        List<Permission> permissions = new ArrayList<Permission>(names.size());
+
+        for (String name : names) {
+            permissions.add(buildFromName(name));
+        }
+
+        return permissions;
+    }
 
 }

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

@@ -1,151 +0,0 @@
-/*
- * Copyright 2002-2018 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 org.springframework.security.acls.domain;
-
-import java.util.List;
-
-import org.springframework.security.acls.model.AccessControlEntry;
-import org.springframework.security.acls.model.Acl;
-import org.springframework.security.acls.model.NotFoundException;
-import org.springframework.security.acls.model.Permission;
-import org.springframework.security.acls.model.PermissionGrantingStrategy;
-import org.springframework.security.acls.model.Sid;
-import org.springframework.util.Assert;
-
-public class DefaultPermissionGrantingStrategy implements PermissionGrantingStrategy {
-
-	private final transient AuditLogger auditLogger;
-
-	/**
-	 * Creates an instance with the logger which will be used to record granting and
-	 * denial of requested permissions.
-	 */
-	public DefaultPermissionGrantingStrategy(AuditLogger auditLogger) {
-		Assert.notNull(auditLogger, "auditLogger cannot be null");
-		this.auditLogger = auditLogger;
-	}
-
-	/**
-	 * Determines authorization. The order of the <code>permission</code> and
-	 * <code>sid</code> arguments is <em>extremely important</em>! The method will iterate
-	 * through each of the <code>permission</code>s in the order specified. For each
-	 * iteration, all of the <code>sid</code>s will be considered, again in the order they
-	 * are presented. A search will then be performed for the first
-	 * {@link AccessControlEntry} object that directly matches that
-	 * <code>permission:sid</code> combination. When the <em>first full match</em> is
-	 * found (ie an ACE that has the SID currently being searched for and the exact
-	 * permission bit mask being search for), the grant or deny flag for that ACE will
-	 * prevail. If the ACE specifies to grant access, the method will return
-	 * <code>true</code>. If the ACE specifies to deny access, the loop will stop and the
-	 * next <code>permission</code> iteration will be performed. If each permission
-	 * indicates to deny access, the first deny ACE found will be considered the reason
-	 * for the failure (as it was the first match found, and is therefore the one most
-	 * logically requiring changes - although not always). If absolutely no matching ACE
-	 * was found at all for any permission, the parent ACL will be tried (provided that
-	 * there is a parent and {@link Acl#isEntriesInheriting()} is <code>true</code>. The
-	 * parent ACL will also scan its parent and so on. If ultimately no matching ACE is
-	 * found, a <code>NotFoundException</code> will be thrown and the caller will need to
-	 * decide how to handle the permission check. Similarly, if any of the SID arguments
-	 * presented to the method were not loaded by the ACL,
-	 * <code>UnloadedSidException</code> will be thrown.
-	 * @param permission the exact permissions to scan for (order is important)
-	 * @param sids the exact SIDs to scan for (order is important)
-	 * @param administrativeMode if <code>true</code> denotes the query is for
-	 * administrative purposes and no auditing will be undertaken
-	 * @return <code>true</code> if one of the permissions has been granted,
-	 * <code>false</code> if one of the permissions has been specifically revoked
-	 * @throws NotFoundException if an exact ACE for one of the permission bit masks and
-	 * SID combination could not be found
-	 */
-	@Override
-	public boolean isGranted(Acl acl, List<Permission> permission, List<Sid> sids, boolean administrativeMode)
-			throws NotFoundException {
-		List<AccessControlEntry> aces = acl.getEntries();
-		AccessControlEntry firstRejection = null;
-		for (Permission p : permission) {
-			for (Sid sid : sids) {
-				// Attempt to find exact match for this permission mask and SID
-				boolean scanNextSid = true;
-				for (AccessControlEntry ace : aces) {
-					if (isGranted(ace, p) && ace.getSid().equals(sid)) {
-						// Found a matching ACE, so its authorization decision will
-						// prevail
-						if (ace.isGranting()) {
-							// Success
-							if (!administrativeMode) {
-								this.auditLogger.logIfNeeded(true, ace);
-							}
-							return true;
-						}
-
-						// Failure for this permission, so stop search
-						// We will see if they have a different permission
-						// (this permission is 100% rejected for this SID)
-						if (firstRejection == null) {
-							// Store first rejection for auditing reasons
-							firstRejection = ace;
-						}
-						scanNextSid = false; // helps break the loop
-
-						break; // exit aces loop
-					}
-				}
-				if (!scanNextSid) {
-					break; // exit SID for loop (now try next permission)
-				}
-			}
-		}
-
-		if (firstRejection != null) {
-			// We found an ACE to reject the request at this point, as no
-			// other ACEs were found that granted a different permission
-			if (!administrativeMode) {
-				this.auditLogger.logIfNeeded(false, firstRejection);
-			}
-			return false;
-		}
-
-		// No matches have been found so far
-		if (acl.isEntriesInheriting() && (acl.getParentAcl() != null)) {
-			// We have a parent, so let them try to find a matching ACE
-			return acl.getParentAcl().isGranted(permission, sids, false);
-		}
-
-		// We either have no parent, or we're the uppermost parent
-		throw new NotFoundException("Unable to locate a matching ACE for passed permissions and SIDs");
-	}
-
-	/**
-	 * 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/EhCacheBasedAclCache.java

@@ -0,0 +1,145 @@
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.security.acls.domain;
+
+import java.io.Serializable;
+
+import net.sf.ehcache.CacheException;
+import net.sf.ehcache.Ehcache;
+import net.sf.ehcache.Element;
+
+import org.springframework.security.acls.model.AclCache;
+import org.springframework.security.acls.model.MutableAcl;
+import org.springframework.security.acls.model.ObjectIdentity;
+import org.springframework.security.util.FieldUtils;
+import org.springframework.util.Assert;
+
+
+/**
+ * Simple implementation of {@link AclCache} that delegates to EH-CACHE.
+ *
+ * <p>
+ * Designed to handle the transient fields in {@link AclImpl}. Note that this implementation assumes all
+ * {@link AclImpl} instances share the same {@link AuditLogger} and {@link AclAuthorizationStrategy} instance.
+ * </p>
+ *
+ * @author Ben Alex
+ */
+public class EhCacheBasedAclCache implements AclCache {
+    //~ Instance fields ================================================================================================
+
+    private Ehcache cache;
+    private AuditLogger auditLogger;
+    private AclAuthorizationStrategy aclAuthorizationStrategy;
+
+    //~ Constructors ===================================================================================================
+
+    public EhCacheBasedAclCache(Ehcache cache) {
+        Assert.notNull(cache, "Cache required");
+        this.cache = cache;
+    }
+
+    //~ Methods ========================================================================================================
+
+    public void evictFromCache(Serializable pk) {
+        Assert.notNull(pk, "Primary key (identifier) required");
+
+        MutableAcl acl = getFromCache(pk);
+
+        if (acl != null) {
+            cache.remove(acl.getId());
+            cache.remove(acl.getObjectIdentity());
+        }
+    }
+
+    public void evictFromCache(ObjectIdentity objectIdentity) {
+        Assert.notNull(objectIdentity, "ObjectIdentity required");
+
+        MutableAcl acl = getFromCache(objectIdentity);
+
+        if (acl != null) {
+            cache.remove(acl.getId());
+            cache.remove(acl.getObjectIdentity());
+        }
+    }
+
+    public MutableAcl getFromCache(ObjectIdentity objectIdentity) {
+        Assert.notNull(objectIdentity, "ObjectIdentity required");
+
+        Element element = null;
+
+        try {
+            element = cache.get(objectIdentity);
+        } catch (CacheException ignored) {}
+
+        if (element == null) {
+            return null;
+        }
+
+        return initializeTransientFields((MutableAcl)element.getValue());
+    }
+
+    public MutableAcl getFromCache(Serializable pk) {
+        Assert.notNull(pk, "Primary key (identifier) required");
+
+        Element element = null;
+
+        try {
+            element = cache.get(pk);
+        } catch (CacheException ignored) {}
+
+        if (element == null) {
+            return null;
+        }
+
+        return initializeTransientFields((MutableAcl) element.getValue());
+    }
+
+    public void putInCache(MutableAcl acl) {
+        Assert.notNull(acl, "Acl required");
+        Assert.notNull(acl.getObjectIdentity(), "ObjectIdentity required");
+        Assert.notNull(acl.getId(), "ID required");
+
+        if (this.aclAuthorizationStrategy == null) {
+            if (acl instanceof AclImpl) {
+                this.aclAuthorizationStrategy = (AclAuthorizationStrategy) FieldUtils.getProtectedFieldValue("aclAuthorizationStrategy", acl);
+                this.auditLogger = (AuditLogger) FieldUtils.getProtectedFieldValue("auditLogger", acl);
+            }
+        }
+
+        if ((acl.getParentAcl() != null) && (acl.getParentAcl() instanceof MutableAcl)) {
+            putInCache((MutableAcl) acl.getParentAcl());
+        }
+
+        cache.put(new Element(acl.getObjectIdentity(), acl));
+        cache.put(new Element(acl.getId(), acl));
+    }
+
+    private MutableAcl initializeTransientFields(MutableAcl value) {
+        if (value instanceof AclImpl) {
+            FieldUtils.setProtectedFieldValue("aclAuthorizationStrategy", value, this.aclAuthorizationStrategy);
+            FieldUtils.setProtectedFieldValue("auditLogger", value, this.auditLogger);
+        }
+
+        if (value.getParentAcl() != null) {
+            initializeTransientFields((MutableAcl) value.getParentAcl());
+        }
+        return value;
+    }
+
+    public void clearCache() {
+        cache.removeAll();
+    }
+}

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

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,61 +12,60 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.security.acls.domain;
 
 import org.springframework.security.acls.model.Sid;
 import org.springframework.security.core.GrantedAuthority;
+
 import org.springframework.util.Assert;
 
+
 /**
- * Represents a <code>GrantedAuthority</code> as a <code>Sid</code>.
- * <p>
- * This is a basic implementation that simply uses the <code>String</code>-based principal
- * for <code>Sid</code> comparison. More complex principal objects may wish to provide an
- * alternative <code>Sid</code> implementation that uses some other identifier.
- * </p>
+ * Represents a <code>GrantedAuthority</code> as a <code>Sid</code>.<p>This is a basic implementation that simply
+ * uses the <code>String</code>-based principal for <code>Sid</code> comparison. More complex principal objects may
+ * wish to provide an alternative <code>Sid</code> implementation that uses some other identifier.</p>
  *
  * @author Ben Alex
  */
 public class GrantedAuthoritySid implements Sid {
+    //~ Instance fields ================================================================================================
 
-	private final String grantedAuthority;
+    private String grantedAuthority;
 
-	public GrantedAuthoritySid(String grantedAuthority) {
-		Assert.hasText(grantedAuthority, "GrantedAuthority required");
-		this.grantedAuthority = grantedAuthority;
-	}
+    //~ Constructors ===================================================================================================
 
-	public GrantedAuthoritySid(GrantedAuthority grantedAuthority) {
-		Assert.notNull(grantedAuthority, "GrantedAuthority required");
-		Assert.notNull(grantedAuthority.getAuthority(),
-				"This Sid is only compatible with GrantedAuthoritys that provide a non-null getAuthority()");
-		this.grantedAuthority = grantedAuthority.getAuthority();
-	}
+    public GrantedAuthoritySid(String grantedAuthority) {
+        Assert.hasText(grantedAuthority, "GrantedAuthority required");
+        this.grantedAuthority = grantedAuthority;
+    }
 
-	@Override
-	public boolean equals(Object object) {
-		if ((object == null) || !(object instanceof GrantedAuthoritySid)) {
-			return false;
-		}
-		// Delegate to getGrantedAuthority() to perform actual comparison (both should be
-		// identical)
-		return ((GrantedAuthoritySid) object).getGrantedAuthority().equals(this.getGrantedAuthority());
-	}
+    public GrantedAuthoritySid(GrantedAuthority grantedAuthority) {
+        Assert.notNull(grantedAuthority, "GrantedAuthority required");
+        Assert.notNull(grantedAuthority.getAuthority(),
+            "This Sid is only compatible with GrantedAuthoritys that provide a non-null getAuthority()");
+        this.grantedAuthority = grantedAuthority.getAuthority();
+    }
 
-	@Override
-	public int hashCode() {
-		return this.getGrantedAuthority().hashCode();
-	}
+    //~ Methods ========================================================================================================
 
-	public String getGrantedAuthority() {
-		return this.grantedAuthority;
-	}
+    public boolean equals(Object object) {
+        if ((object == null) || !(object instanceof GrantedAuthoritySid)) {
+            return false;
+        }
 
-	@Override
-	public String toString() {
-		return "GrantedAuthoritySid[" + this.grantedAuthority + "]";
-	}
+        // Delegate to getGrantedAuthority() to perform actual comparison (both should be identical)
+        return ((GrantedAuthoritySid) object).getGrantedAuthority().equals(this.getGrantedAuthority());
+    }
 
+    public int hashCode() {
+        return this.getGrantedAuthority().hashCode();
+    }
+
+    public String getGrantedAuthority() {
+        return grantedAuthority;
+    }
+
+    public String toString() {
+        return "GrantedAuthoritySid[" + this.grantedAuthority + "]";
+    }
 }

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

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,7 +12,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.security.acls.domain;
 
 /**
@@ -22,23 +20,25 @@ package org.springframework.security.acls.domain;
  * @author Ben Alex
  */
 public class IdentityUnavailableException extends RuntimeException {
+    //~ Constructors ===================================================================================================
 
-	/**
-	 * Constructs an <code>IdentityUnavailableException</code> with the specified message.
-	 * @param msg the detail message
-	 */
-	public IdentityUnavailableException(String msg) {
-		super(msg);
-	}
-
-	/**
-	 * Constructs an <code>IdentityUnavailableException</code> with the specified message
-	 * and root cause.
-	 * @param msg the detail message
-	 * @param cause root cause
-	 */
-	public IdentityUnavailableException(String msg, Throwable cause) {
-		super(msg, cause);
-	}
+    /**
+     * Constructs an <code>IdentityUnavailableException</code> with the specified message.
+     *
+     * @param msg the detail message
+     */
+    public IdentityUnavailableException(String msg) {
+        super(msg);
+    }
 
+    /**
+     * Constructs an <code>IdentityUnavailableException</code> with the specified message
+     * and root cause.
+     *
+     * @param msg the detail message
+     * @param t root cause
+     */
+    public IdentityUnavailableException(String msg, Throwable t) {
+        super(msg, t);
+    }
 }

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

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,7 +12,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.security.acls.domain;
 
 import java.io.Serializable;
@@ -23,128 +21,137 @@ import org.springframework.security.acls.model.ObjectIdentity;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 
+
 /**
  * Simple implementation of {@link ObjectIdentity}.
  * <p>
- * Uses <code>String</code>s to store the identity of the domain object instance. Also
- * offers a constructor that uses reflection to build the identity information.
+ * Uses <code>String</code>s to store the identity of the domain object instance. Also offers a constructor that uses
+ * reflection to build the identity information.
  *
  * @author Ben Alex
  */
 public class ObjectIdentityImpl implements ObjectIdentity {
+    //~ Instance fields ================================================================================================
 
-	private final String type;
+    private final String type;
+    private Serializable identifier;
 
-	private Serializable identifier;
+    //~ Constructors ===================================================================================================
 
-	public ObjectIdentityImpl(String type, Serializable identifier) {
-		Assert.hasText(type, "Type required");
-		Assert.notNull(identifier, "identifier required");
-		this.identifier = identifier;
-		this.type = type;
-	}
+    public ObjectIdentityImpl(String type, Serializable identifier) {
+        Assert.hasText(type, "Type required");
+        Assert.notNull(identifier, "identifier required");
 
-	/**
-	 * Constructor which uses the name of the supplied class as the <tt>type</tt>
-	 * property.
-	 */
-	public ObjectIdentityImpl(Class<?> javaType, Serializable identifier) {
-		Assert.notNull(javaType, "Java Type required");
-		Assert.notNull(identifier, "identifier required");
-		this.type = javaType.getName();
-		this.identifier = identifier;
-	}
+        this.identifier = identifier;
+        this.type = type;
+    }
 
-	/**
-	 * Creates the <code>ObjectIdentityImpl</code> based on the passed object instance.
-	 * The passed object must provide a <code>getId()</code> method, otherwise an
-	 * exception will be thrown.
-	 * <p>
-	 * The class name of the object passed will be considered the {@link #type}, so if
-	 * more control is required, a different constructor should be used.
-	 * @param object the domain object instance to create an identity for.
-	 * @throws IdentityUnavailableException if identity could not be extracted
-	 */
-	public ObjectIdentityImpl(Object object) throws IdentityUnavailableException {
-		Assert.notNull(object, "object cannot be null");
-		Class<?> typeClass = ClassUtils.getUserClass(object.getClass());
-		this.type = typeClass.getName();
-		Object result = invokeGetIdMethod(object, typeClass);
-		Assert.notNull(result, "getId() is required to return a non-null value");
-		Assert.isInstanceOf(Serializable.class, result, "Getter must provide a return value of type Serializable");
-		this.identifier = (Serializable) result;
-	}
+    /**
+     * Constructor which uses the name of the supplied class as the <tt>type</tt> property.
+     */
+    public ObjectIdentityImpl(Class<?> javaType, Serializable identifier) {
+        Assert.notNull(javaType, "Java Type required");
+        Assert.notNull(identifier, "identifier required");
+        this.type = javaType.getName();
+        this.identifier = identifier;
+    }
 
-	private Object invokeGetIdMethod(Object object, Class<?> typeClass) {
-		try {
-			Method method = typeClass.getMethod("getId", new Class[] {});
-			return method.invoke(object);
-		}
-		catch (Exception ex) {
-			throw new IdentityUnavailableException("Could not extract identity from object " + object, ex);
-		}
-	}
+    /**
+     * Creates the <code>ObjectIdentityImpl</code> based on the passed
+     * object instance. The passed object must provide a <code>getId()</code>
+     * method, otherwise an exception will be thrown.
+     * <p>
+     * The class name of the object passed will be considered the {@link #type}, so if more control is required,
+     * a different constructor should be used.
+     *
+     * @param object the domain object instance to create an identity for.
+     *
+     * @throws IdentityUnavailableException if identity could not be extracted
+     */
+    public ObjectIdentityImpl(Object object) throws IdentityUnavailableException {
+        Assert.notNull(object, "object cannot be null");
 
-	/**
-	 * Important so caching operates properly.
-	 * <p>
-	 * Considers an object of the same class equal if it has the same
-	 * <code>classname</code> and <code>id</code> properties.
-	 * <p>
-	 * Numeric identities (Integer and Long values) are considered equal if they are
-	 * numerically equal. Other serializable types are evaluated using a simple equality.
-	 * @param obj object to compare
-	 * @return <code>true</code> if the presented object matches this object
-	 */
-	@Override
-	public boolean equals(Object obj) {
-		if (obj == null || !(obj instanceof ObjectIdentityImpl)) {
-			return false;
-		}
-		ObjectIdentityImpl other = (ObjectIdentityImpl) obj;
-		if (this.identifier instanceof Number && other.identifier instanceof Number) {
-			// Integers and Longs with same value should be considered equal
-			if (((Number) this.identifier).longValue() != ((Number) other.identifier).longValue()) {
-				return false;
-			}
-		}
-		else {
-			// Use plain equality for other serializable types
-			if (!this.identifier.equals(other.identifier)) {
-				return false;
-			}
-		}
-		return this.type.equals(other.type);
-	}
+        Class<?> typeClass = ClassUtils.getUserClass(object.getClass());
+        type = typeClass.getName();
 
-	@Override
-	public Serializable getIdentifier() {
-		return this.identifier;
-	}
+        Object result;
 
-	@Override
-	public String getType() {
-		return this.type;
-	}
+        try {
+            Method method = typeClass.getMethod("getId", new Class[] {});
+            result = method.invoke(object, new Object[] {});
+        } catch (Exception e) {
+            throw new IdentityUnavailableException("Could not extract identity from object " + object, e);
+        }
 
-	/**
-	 * Important so caching operates properly.
-	 * @return the hash
-	 */
-	@Override
-	public int hashCode() {
-		int result = this.type.hashCode();
-		result = 31 * result + this.identifier.hashCode();
-		return result;
-	}
+        Assert.notNull(result, "getId() is required to return a non-null value");
+        Assert.isInstanceOf(Serializable.class, result, "Getter must provide a return value of type Serializable");
+        this.identifier = (Serializable) result;
+    }
 
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append(this.getClass().getName()).append("[");
-		sb.append("Type: ").append(this.type);
-		sb.append("; Identifier: ").append(this.identifier).append("]");
-		return sb.toString();
-	}
+    //~ Methods ========================================================================================================
 
+    /**
+     * Important so caching operates properly.
+     * <p>
+     * Considers an object of the same class equal if it has the same <code>classname</code> and
+     * <code>id</code> properties.
+     * <p>
+     * Numeric identities (Integer and Long values) are considered equal if they are numerically equal. Other
+     * serializable types are evaluated using a simple equality.
+     *
+     * @param arg0 object to compare
+     *
+     * @return <code>true</code> if the presented object matches this object
+     */
+    public boolean equals(Object arg0) {
+        if (arg0 == null || !(arg0 instanceof ObjectIdentityImpl)) {
+            return false;
+        }
+
+        ObjectIdentityImpl other = (ObjectIdentityImpl) arg0;
+
+        if (identifier instanceof Number && other.identifier instanceof Number) {
+            // Integers and Longs with same value should be considered equal
+            if (((Number)identifier).longValue() != ((Number)other.identifier).longValue()) {
+                return false;
+            }
+        } else {
+            // Use plain equality for other serializable types
+            if (!identifier.equals(other.identifier)) {
+                return false;
+            }
+        }
+
+        return type.equals(other.type);
+    }
+
+    public Serializable getIdentifier() {
+        return identifier;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    /**
+     * Important so caching operates properly.
+     *
+     * @return the hash
+     */
+    public int hashCode() {
+        int code = 31;
+        code ^= this.type.hashCode();
+        code ^= this.identifier.hashCode();
+
+        return code;
+    }
+
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(this.getClass().getName()).append("[");
+        sb.append("Type: ").append(this.type);
+        sb.append("; Identifier: ").append(this.identifier).append("]");
+
+        return sb.toString();
+    }
 }

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

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -23,22 +22,19 @@ import org.springframework.security.acls.model.ObjectIdentityGenerator;
 import org.springframework.security.acls.model.ObjectIdentityRetrievalStrategy;
 
 /**
- * Basic implementation of {@link ObjectIdentityRetrievalStrategy} and
- * <tt>ObjectIdentityGenerator</tt> that uses the constructors of
- * {@link ObjectIdentityImpl} to create the {@link ObjectIdentity}.
+ * Basic implementation of {@link ObjectIdentityRetrievalStrategy} and <tt>ObjectIdentityGenerator</tt>
+ * that uses the constructors of {@link ObjectIdentityImpl} to create the {@link ObjectIdentity}.
  *
  * @author Ben Alex
  */
 public class ObjectIdentityRetrievalStrategyImpl implements ObjectIdentityRetrievalStrategy, ObjectIdentityGenerator {
+    //~ Methods ========================================================================================================
 
-	@Override
-	public ObjectIdentity getObjectIdentity(Object domainObject) {
-		return new ObjectIdentityImpl(domainObject);
-	}
-
-	@Override
-	public ObjectIdentity createObjectIdentity(Serializable id, String type) {
-		return new ObjectIdentityImpl(type, id);
-	}
+    public ObjectIdentity getObjectIdentity(Object domainObject) {
+        return new ObjectIdentityImpl(domainObject);
+    }
 
+    public ObjectIdentity createObjectIdentity(Serializable id, String type) {
+        return new ObjectIdentityImpl(type, id);
+    }
 }

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

@@ -1,19 +1,3 @@
-/*
- * Copyright 2002-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 package org.springframework.security.acls.domain;
 
 import java.util.List;
@@ -21,24 +5,27 @@ import java.util.List;
 import org.springframework.security.acls.model.Permission;
 
 /**
- * Provides a simple mechanism to retrieve {@link Permission} instances from integer
- * masks.
+ * Provides a simple mechanism to retrieve {@link Permission} instances from integer masks.
  *
  * @author Ben Alex
  * @since 2.0.3
+ *
  */
 public interface PermissionFactory {
 
-	/**
-	 * Dynamically creates a <code>CumulativePermission</code> or
-	 * <code>BasePermission</code> representing the active bits in the passed mask.
-	 * @param mask to build
-	 * @return a Permission representing the requested object
-	 */
-	Permission buildFromMask(int mask);
+    /**
+     * Dynamically creates a <code>CumulativePermission</code> or <code>BasePermission</code> representing the
+     * active bits in the passed mask.
+     *
+     * @param mask to build
+     *
+     * @return a Permission representing the requested object
+     */
+    Permission buildFromMask(int mask);
 
-	Permission buildFromName(String name);
 
-	List<Permission> buildFromNames(List<String> names);
+    Permission buildFromName(String name);
 
+
+    List<Permission> buildFromNames(List<String> names);
 }

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

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,60 +12,66 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 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;
 
+
 /**
- * Represents an <code>Authentication.getPrincipal()</code> as a <code>Sid</code>.
- * <p>
- * This is a basic implementation that simply uses the <code>String</code>-based principal
- * for <code>Sid</code> comparison. More complex principal objects may wish to provide an
- * alternative <code>Sid</code> implementation that uses some other identifier.
- * </p>
+ * Represents an <code>Authentication.getPrincipal()</code> as a <code>Sid</code>.<p>This is a basic implementation
+ * that simply uses the <code>String</code>-based principal for <code>Sid</code> comparison. More complex principal
+ * objects may wish to provide an alternative <code>Sid</code> implementation that uses some other identifier.</p>
  *
  * @author Ben Alex
  */
 public class PrincipalSid implements Sid {
+    //~ Instance fields ================================================================================================
 
-	private final String principal;
+    private String principal;
 
-	public PrincipalSid(String principal) {
-		Assert.hasText(principal, "Principal required");
-		this.principal = principal;
-	}
+    //~ Constructors ===================================================================================================
 
-	public PrincipalSid(Authentication authentication) {
-		Assert.notNull(authentication, "Authentication required");
-		Assert.notNull(authentication.getPrincipal(), "Principal required");
-		this.principal = authentication.getName();
-	}
+    public PrincipalSid(String principal) {
+        Assert.hasText(principal, "Principal required");
+        this.principal = principal;
+    }
 
-	@Override
-	public boolean equals(Object object) {
-		if ((object == null) || !(object instanceof PrincipalSid)) {
-			return false;
-		}
-		// Delegate to getPrincipal() to perform actual comparison (both should be
-		// identical)
-		return ((PrincipalSid) object).getPrincipal().equals(this.getPrincipal());
-	}
+    public PrincipalSid(Authentication authentication) {
+        Assert.notNull(authentication, "Authentication required");
+        Assert.notNull(authentication.getPrincipal(), "Principal required");
 
-	@Override
-	public int hashCode() {
-		return this.getPrincipal().hashCode();
-	}
+        if (authentication.getPrincipal() instanceof UserDetails) {
+            this.principal = ((UserDetails) authentication.getPrincipal()).getUsername();
+        } else {
+            this.principal = authentication.getPrincipal().toString();
+        }
+    }
 
-	public String getPrincipal() {
-		return this.principal;
-	}
+    //~ Methods ========================================================================================================
 
-	@Override
-	public String toString() {
-		return "PrincipalSid[" + this.principal + "]";
-	}
+    public boolean equals(Object object) {
+        if ((object == null) || !(object instanceof PrincipalSid)) {
+            return false;
+        }
 
+        // Delegate to getPrincipal() to perform actual comparison (both should be identical)
+        return ((PrincipalSid) object).getPrincipal().equals(this.getPrincipal());
+    }
+
+    public int hashCode() {
+        return this.getPrincipal().hashCode();
+    }
+
+    public String getPrincipal() {
+        return principal;
+    }
+
+    public String toString() {
+        return "PrincipalSid[" + this.principal + "]";
+    }
 }

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

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -29,38 +28,38 @@ import org.springframework.security.core.GrantedAuthority;
 import org.springframework.util.Assert;
 
 /**
- * Basic implementation of {@link SidRetrievalStrategy} that creates a {@link Sid} for the
- * principal, as well as every granted authority the principal holds. Can optionally have
- * a <tt>RoleHierarchy</tt> injected in order to determine the extended list of
- * authorities that the principal is assigned.
+ * Basic implementation of {@link SidRetrievalStrategy} that creates a {@link Sid} for the principal, as well as
+ * every granted authority the principal holds. Can optionally have a <tt>RoleHierarchy</tt> injected in order to
+ * determine the extended list of authorities that the principal is assigned.
  * <p>
- * The returned array will always contain the {@link PrincipalSid} before any
- * {@link GrantedAuthoritySid} elements.
+ * The returned array will always contain the {@link PrincipalSid} before any {@link GrantedAuthoritySid} elements.
  *
  * @author Ben Alex
  */
 public class SidRetrievalStrategyImpl implements SidRetrievalStrategy {
 
-	private RoleHierarchy roleHierarchy = new NullRoleHierarchy();
+    private RoleHierarchy roleHierarchy = new NullRoleHierarchy();
 
-	public SidRetrievalStrategyImpl() {
-	}
+    public SidRetrievalStrategyImpl() {
+    }
 
-	public SidRetrievalStrategyImpl(RoleHierarchy roleHierarchy) {
-		Assert.notNull(roleHierarchy, "RoleHierarchy must not be null");
-		this.roleHierarchy = roleHierarchy;
-	}
+    public SidRetrievalStrategyImpl(RoleHierarchy roleHierarchy) {
+        Assert.notNull(roleHierarchy, "RoleHierarchy must not be null");
+        this.roleHierarchy = roleHierarchy;
+    }
 
-	@Override
-	public List<Sid> getSids(Authentication authentication) {
-		Collection<? extends GrantedAuthority> authorities = this.roleHierarchy
-			.getReachableGrantedAuthorities(authentication.getAuthorities());
-		List<Sid> sids = new ArrayList<>(authorities.size() + 1);
-		sids.add(new PrincipalSid(authentication));
-		for (GrantedAuthority authority : authorities) {
-			sids.add(new GrantedAuthoritySid(authority));
-		}
-		return sids;
-	}
+    //~ Methods ========================================================================================================
 
+    public List<Sid> getSids(Authentication authentication) {
+        Collection<GrantedAuthority> authorities = roleHierarchy.getReachableGrantedAuthorities(authentication.getAuthorities());
+        List<Sid> sids = new ArrayList<Sid>(authorities.size() + 1);
+
+        sids.add(new PrincipalSid(authentication));
+
+        for (GrantedAuthority authority : authorities) {
+            sids.add(new GrantedAuthoritySid(authority));
+        }
+
+        return sids;
+    }
 }

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

@@ -1,128 +0,0 @@
-/*
- * Copyright 2002-2013 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 org.springframework.security.acls.domain;
-
-import java.io.Serializable;
-
-import org.springframework.cache.Cache;
-import org.springframework.security.acls.model.AclCache;
-import org.springframework.security.acls.model.MutableAcl;
-import org.springframework.security.acls.model.ObjectIdentity;
-import org.springframework.security.acls.model.PermissionGrantingStrategy;
-import org.springframework.security.util.FieldUtils;
-import org.springframework.util.Assert;
-
-/**
- * Simple implementation of {@link org.springframework.security.acls.model.AclCache} that
- * delegates to {@link Cache} implementation.
- * <p>
- * Designed to handle the transient fields in
- * {@link org.springframework.security.acls.domain.AclImpl}. Note that this implementation
- * assumes all {@link org.springframework.security.acls.domain.AclImpl} instances share
- * the same {@link org.springframework.security.acls.model.PermissionGrantingStrategy} and
- * {@link org.springframework.security.acls.domain.AclAuthorizationStrategy} instances.
- *
- * @author Marten Deinum
- * @since 3.2
- */
-public class SpringCacheBasedAclCache implements AclCache {
-
-	private final Cache cache;
-
-	private PermissionGrantingStrategy permissionGrantingStrategy;
-
-	private AclAuthorizationStrategy aclAuthorizationStrategy;
-
-	public SpringCacheBasedAclCache(Cache cache, PermissionGrantingStrategy permissionGrantingStrategy,
-			AclAuthorizationStrategy aclAuthorizationStrategy) {
-		Assert.notNull(cache, "Cache required");
-		Assert.notNull(permissionGrantingStrategy, "PermissionGrantingStrategy required");
-		Assert.notNull(aclAuthorizationStrategy, "AclAuthorizationStrategy required");
-		this.cache = cache;
-		this.permissionGrantingStrategy = permissionGrantingStrategy;
-		this.aclAuthorizationStrategy = aclAuthorizationStrategy;
-	}
-
-	@Override
-	public void evictFromCache(Serializable pk) {
-		Assert.notNull(pk, "Primary key (identifier) required");
-		MutableAcl acl = getFromCache(pk);
-		if (acl != null) {
-			this.cache.evict(acl.getId());
-			this.cache.evict(acl.getObjectIdentity());
-		}
-	}
-
-	@Override
-	public void evictFromCache(ObjectIdentity objectIdentity) {
-		Assert.notNull(objectIdentity, "ObjectIdentity required");
-		MutableAcl acl = getFromCache(objectIdentity);
-		if (acl != null) {
-			this.cache.evict(acl.getId());
-			this.cache.evict(acl.getObjectIdentity());
-		}
-	}
-
-	@Override
-	public MutableAcl getFromCache(ObjectIdentity objectIdentity) {
-		Assert.notNull(objectIdentity, "ObjectIdentity required");
-		return getFromCache((Object) objectIdentity);
-	}
-
-	@Override
-	public MutableAcl getFromCache(Serializable pk) {
-		Assert.notNull(pk, "Primary key (identifier) required");
-		return getFromCache((Object) pk);
-	}
-
-	@Override
-	public void putInCache(MutableAcl acl) {
-		Assert.notNull(acl, "Acl required");
-		Assert.notNull(acl.getObjectIdentity(), "ObjectIdentity required");
-		Assert.notNull(acl.getId(), "ID required");
-		if ((acl.getParentAcl() != null) && (acl.getParentAcl() instanceof MutableAcl)) {
-			putInCache((MutableAcl) acl.getParentAcl());
-		}
-		this.cache.put(acl.getObjectIdentity(), acl);
-		this.cache.put(acl.getId(), acl);
-	}
-
-	private MutableAcl getFromCache(Object key) {
-		Cache.ValueWrapper element = this.cache.get(key);
-		if (element == null) {
-			return null;
-		}
-		return initializeTransientFields((MutableAcl) element.get());
-	}
-
-	private MutableAcl initializeTransientFields(MutableAcl value) {
-		if (value instanceof AclImpl) {
-			FieldUtils.setProtectedFieldValue("aclAuthorizationStrategy", value, this.aclAuthorizationStrategy);
-			FieldUtils.setProtectedFieldValue("permissionGrantingStrategy", value, this.permissionGrantingStrategy);
-		}
-		if (value.getParentAcl() != null) {
-			initializeTransientFields((MutableAcl) value.getParentAcl());
-		}
-		return value;
-	}
-
-	@Override
-	public void clearCache() {
-		this.cache.clear();
-	}
-
-}

acl/src/main/java/org/springframework/security/acls/domain/package-info.java

@@ -1,20 +1,5 @@
-/*
- * Copyright 2002-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * 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.
- */
-
 /**
  * Basic implementation of access control lists (ACLs) interfaces.
  */
 package org.springframework.security.acls.domain;
+

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

@@ -1,168 +0,0 @@
-/*
- * Copyright 2002-2018 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 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 the correct Java type as specified by
- * <code>acl_class.class_id_type</code>.
- *
- * @author paulwheeler
- */
-class AclClassIdUtils {
-
-	private static final String DEFAULT_CLASS_ID_TYPE_COLUMN_NAME = "class_id_type";
-
-	private static final Log log = LogFactory.getLog(AclClassIdUtils.class);
-
-	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;
-	}
-
-	/**
-	 * Converts the raw type from the database into the right Java type. For most
-	 * applications the 'raw type' will be Long, for some applications it could be String.
-	 * @param identifier The identifier from the database
-	 * @param resultSet Result set of the query
-	 * @return The identifier in the appropriate target Java type. Typically Long or UUID.
-	 * @throws SQLException
-	 */
-	Serializable identifierFrom(Serializable identifier, ResultSet resultSet) throws SQLException {
-		if (isString(identifier) && hasValidClassIdType(resultSet)
-				&& canConvertFromStringTo(classIdTypeFrom(resultSet))) {
-			return convertFromStringTo((String) identifier, classIdTypeFrom(resultSet));
-		}
-		// Assume it should be a Long type
-		return convertToLong(identifier);
-	}
-
-	private boolean hasValidClassIdType(ResultSet resultSet) {
-		try {
-			return classIdTypeFrom(resultSet) != null;
-		}
-		catch (SQLException ex) {
-			log.debug("Unable to obtain the class id type", ex);
-			return false;
-		}
-	}
-
-	private <T extends Serializable> Class<T> classIdTypeFrom(ResultSet resultSet) throws SQLException {
-		return classIdTypeFrom(resultSet.getString(DEFAULT_CLASS_ID_TYPE_COLUMN_NAME));
-	}
-
-	private <T extends Serializable> Class<T> classIdTypeFrom(String className) {
-		if (className == null) {
-			return null;
-		}
-		try {
-			return (Class) Class.forName(className);
-		}
-		catch (ClassNotFoundException ex) {
-			log.debug("Unable to find class id type on classpath", ex);
-			return null;
-		}
-	}
-
-	private <T> boolean canConvertFromStringTo(Class<T> targetType) {
-		return this.conversionService.canConvert(String.class, targetType);
-	}
-
-	private <T extends Serializable> T convertFromStringTo(String identifier, Class<T> targetType) {
-		return this.conversionService.convert(identifier, targetType);
-	}
-
-	/**
-	 * Converts to a {@link Long}, attempting to use the {@link ConversionService} if
-	 * available.
-	 * @param identifier The identifier
-	 * @return Long version of the identifier
-	 * @throws NumberFormatException if the string cannot be parsed to a long.
-	 * @throws org.springframework.core.convert.ConversionException if a conversion
-	 * exception occurred
-	 * @throws IllegalArgumentException if targetType is null
-	 */
-	private Long convertToLong(Serializable identifier) {
-		if (this.conversionService.canConvert(identifier.getClass(), Long.class)) {
-			return this.conversionService.convert(identifier, Long.class);
-		}
-		return Long.valueOf(identifier.toString());
-	}
-
-	private boolean isString(Serializable object) {
-		return object.getClass().isAssignableFrom(String.class);
-	}
-
-	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/JdbcAclService.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006, 2017, 2018 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,13 +12,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.security.acls.jdbc;
 
-import java.io.Serializable;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.util.Collections;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -27,155 +24,107 @@ 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.security.acls.domain.ObjectIdentityRetrievalStrategyImpl;
+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;
 import org.springframework.security.acls.model.NotFoundException;
 import org.springframework.security.acls.model.ObjectIdentity;
-import org.springframework.security.acls.model.ObjectIdentityGenerator;
 import org.springframework.security.acls.model.Sid;
 import org.springframework.util.Assert;
 
+
 /**
  * Simple JDBC-based implementation of <code>AclService</code>.
  * <p>
- * Requires the "dirty" flags in {@link org.springframework.security.acls.domain.AclImpl}
- * and {@link org.springframework.security.acls.domain.AccessControlEntryImpl} to be set,
- * so that the implementation can detect changed parameters easily.
+ * Requires the "dirty" flags in {@link org.springframework.security.acls.domain.AclImpl} and
+ * {@link org.springframework.security.acls.domain.AccessControlEntryImpl} to be set, so that the implementation can
+ * detect changed parameters easily.
  *
  * @author Ben Alex
  */
 public class JdbcAclService implements AclService {
+    //~ Static fields/initializers =====================================================================================
 
-	protected static final Log log = LogFactory.getLog(JdbcAclService.class);
+    protected static final Log log = LogFactory.getLog(JdbcAclService.class);
+    private static final String DEFAULT_SELECT_ACL_WITH_PARENT_SQL = "select obj.object_id_identity as obj_id, class.class as class "
+        + "from acl_object_identity obj, acl_object_identity parent, acl_class class "
+        + "where obj.parent_object = parent.id and obj.object_id_class = class.id "
+        + "and parent.object_id_identity = ? and parent.object_id_class = ("
+        + "select id FROM acl_class where acl_class.class = ?)";
 
-	private static final String DEFAULT_SELECT_ACL_CLASS_COLUMNS = "class.class as class";
+    //~ Instance fields ================================================================================================
 
-	private static final String DEFAULT_SELECT_ACL_CLASS_COLUMNS_WITH_ID_TYPE = DEFAULT_SELECT_ACL_CLASS_COLUMNS
-			+ ", class.class_id_type as class_id_type";
+    protected JdbcTemplate jdbcTemplate;
+    private LookupStrategy lookupStrategy;
+    private String findChildrenSql = DEFAULT_SELECT_ACL_WITH_PARENT_SQL;
 
-	private static final String DEFAULT_SELECT_ACL_WITH_PARENT_SQL = "select obj.object_id_identity as obj_id, "
-			+ DEFAULT_SELECT_ACL_CLASS_COLUMNS
-			+ " from acl_object_identity obj, acl_object_identity parent, acl_class class "
-			+ "where obj.parent_object = parent.id and obj.object_id_class = class.id "
-			+ "and parent.object_id_identity = ? and parent.object_id_class = ("
-			+ "select id FROM acl_class where acl_class.class = ?)";
+    //~ Constructors ===================================================================================================
 
-	private static final String DEFAULT_SELECT_ACL_WITH_PARENT_SQL_WITH_CLASS_ID_TYPE = "select obj.object_id_identity as obj_id, "
-			+ DEFAULT_SELECT_ACL_CLASS_COLUMNS_WITH_ID_TYPE
-			+ " from acl_object_identity obj, acl_object_identity parent, acl_class class "
-			+ "where obj.parent_object = parent.id and obj.object_id_class = class.id "
-			+ "and parent.object_id_identity = ? and parent.object_id_class = ("
-			+ "select id FROM acl_class where acl_class.class = ?)";
+    public JdbcAclService(DataSource dataSource, LookupStrategy lookupStrategy) {
+        Assert.notNull(dataSource, "DataSource required");
+        Assert.notNull(lookupStrategy, "LookupStrategy required");
+        this.jdbcTemplate = new JdbcTemplate(dataSource);
+        this.lookupStrategy = lookupStrategy;
+    }
 
-	protected final JdbcOperations jdbcOperations;
+    //~ Methods ========================================================================================================
 
-	private final LookupStrategy lookupStrategy;
+    public List<ObjectIdentity> findChildren(ObjectIdentity parentIdentity) {
+        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");
+                        Long identifier = new Long(rs.getLong("obj_id"));
 
-	private boolean aclClassIdSupported;
+                        return new ObjectIdentityImpl(javaType, identifier);
+                    }
+                });
 
-	private String findChildrenSql = DEFAULT_SELECT_ACL_WITH_PARENT_SQL;
+        if (objects.size() == 0) {
+            return null;
+        }
 
-	private AclClassIdUtils aclClassIdUtils;
+        return objects;
+    }
 
-	private ObjectIdentityGenerator objectIdentityGenerator;
+    public Acl readAclById(ObjectIdentity object, List<Sid> sids) throws NotFoundException {
+        Map<ObjectIdentity, Acl> map = readAclsById(Arrays.asList(object), sids);
+        Assert.isTrue(map.containsKey(object), "There should have been an Acl entry for ObjectIdentity " + object);
 
-	public JdbcAclService(DataSource dataSource, LookupStrategy lookupStrategy) {
-		this(new JdbcTemplate(dataSource), lookupStrategy);
-	}
+        return (Acl) map.get(object);
+    }
 
-	public JdbcAclService(JdbcOperations jdbcOperations, LookupStrategy lookupStrategy) {
-		Assert.notNull(jdbcOperations, "JdbcOperations required");
-		Assert.notNull(lookupStrategy, "LookupStrategy required");
-		this.jdbcOperations = jdbcOperations;
-		this.lookupStrategy = lookupStrategy;
-		this.aclClassIdUtils = new AclClassIdUtils();
-		this.objectIdentityGenerator = new ObjectIdentityRetrievalStrategyImpl();
-	}
+    public Acl readAclById(ObjectIdentity object) throws NotFoundException {
+        return readAclById(object, null);
+    }
 
-	@Override
-	public List<ObjectIdentity> findChildren(ObjectIdentity parentIdentity) {
-		Object[] args = { parentIdentity.getIdentifier().toString(), parentIdentity.getType() };
-		List<ObjectIdentity> objects = this.jdbcOperations.query(this.findChildrenSql, args,
-				(rs, rowNum) -> mapObjectIdentityRow(rs));
-		return (!objects.isEmpty()) ? objects : null;
-	}
+    public Map<ObjectIdentity, Acl> readAclsById(List<ObjectIdentity> objects) throws NotFoundException {
+        return readAclsById(objects, null);
+    }
 
-	private ObjectIdentity mapObjectIdentityRow(ResultSet rs) throws SQLException {
-		String javaType = rs.getString("class");
-		Serializable identifier = (Serializable) rs.getObject("obj_id");
-		identifier = this.aclClassIdUtils.identifierFrom(identifier, rs);
-		return this.objectIdentityGenerator.createObjectIdentity(identifier, javaType);
-	}
+    public Map<ObjectIdentity, Acl> readAclsById(List<ObjectIdentity> objects, List<Sid> sids) throws NotFoundException {
+        Map<ObjectIdentity, Acl> result = lookupStrategy.readAclsById(objects, sids);
 
-	@Override
-	public Acl readAclById(ObjectIdentity object, List<Sid> sids) throws NotFoundException {
-		Map<ObjectIdentity, Acl> map = readAclsById(Collections.singletonList(object), sids);
-		Assert.isTrue(map.containsKey(object),
-				() -> "There should have been an Acl entry for ObjectIdentity " + object);
-		return map.get(object);
-	}
+        // Check every requested object identity was found (throw NotFoundException if needed)
+        for (int i = 0; i < objects.size(); i++) {
+            if (!result.containsKey(objects.get(i))) {
+                throw new NotFoundException("Unable to find ACL information for object identity '"
+                    + objects.get(i) + "'");
+            }
+        }
 
-	@Override
-	public Acl readAclById(ObjectIdentity object) throws NotFoundException {
-		return readAclById(object, null);
-	}
-
-	@Override
-	public Map<ObjectIdentity, Acl> readAclsById(List<ObjectIdentity> objects) throws NotFoundException {
-		return readAclsById(objects, null);
-	}
-
-	@Override
-	public Map<ObjectIdentity, Acl> readAclsById(List<ObjectIdentity> objects, List<Sid> sids)
-			throws NotFoundException {
-		Map<ObjectIdentity, Acl> result = this.lookupStrategy.readAclsById(objects, sids);
-		// Check every requested object identity was found (throw NotFoundException if
-		// needed)
-		for (ObjectIdentity oid : objects) {
-			if (!result.containsKey(oid)) {
-				throw new NotFoundException("Unable to find ACL information for object identity '" + oid + "'");
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * Allows customization of the SQL query used to find child object identities.
-	 * @param findChildrenSql
-	 */
-	public void setFindChildrenQuery(String findChildrenSql) {
-		this.findChildrenSql = findChildrenSql;
-	}
-
-	public void setAclClassIdSupported(boolean aclClassIdSupported) {
-		this.aclClassIdSupported = aclClassIdSupported;
-		if (aclClassIdSupported) {
-			// Change the default children select 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 {
-				log.debug("Find children statement has already been overridden, so not overridding the default");
-			}
-		}
-	}
-
-	public void setConversionService(ConversionService conversionService) {
-		this.aclClassIdUtils = new AclClassIdUtils(conversionService);
-	}
-
-	public void setObjectIdentityGenerator(ObjectIdentityGenerator objectIdentityGenerator) {
-		Assert.notNull(objectIdentityGenerator, "objectIdentityGenerator cannot be null");
-		this.objectIdentityGenerator = objectIdentityGenerator;
-	}
-
-	protected boolean isAclClassIdSupported() {
-		return this.aclClassIdSupported;
-	}
+        return result;
+    }
 
+    /**
+     * Allows customization of the SQL query used to find child object identities.
+     *
+     * @param findChildrenSql
+     */
+    public void setFindChildrenQuery(String findChildrenSql) {
+        this.findChildrenSql = findChildrenSql;
+    }
 }

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

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006, 2017, 2018 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,7 +12,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.security.acls.jdbc;
 
 import java.sql.PreparedStatement;
@@ -40,452 +38,398 @@ import org.springframework.security.acls.model.ObjectIdentity;
 import org.springframework.security.acls.model.Sid;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.core.context.SecurityContextHolderStrategy;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 import org.springframework.util.Assert;
 
+
 /**
  * Provides a base JDBC implementation of {@link MutableAclService}.
  * <p>
- * The default settings are for HSQLDB. If you are using a different database you will
- * probably need to set the {@link #setSidIdentityQuery(String) sidIdentityQuery} and
- * {@link #setClassIdentityQuery(String) classIdentityQuery} properties appropriately. The
- * other queries, SQL inserts and updates can also be customized to accomodate schema
- * variations, but must produce results consistent with those expected by the defaults.
+ * The default settings are for HSQLDB. If you are using a different database you
+ * will probably need to set the {@link #setSidIdentityQuery(String) sidIdentityQuery} and
+ * {@link #setClassIdentityQuery(String) classIdentityQuery} properties appropriately. The other queries,
+ * SQL inserts and updates can also be customized to accomodate schema variations, but must produce results
+ * consistent with those expected by the defaults.
  * <p>
- * See the appendix of the Spring Security reference manual for more information on the
- * expected schema and how it is used. Information on using PostgreSQL is also included.
+ * See the appendix of the Spring Security reference manual for more information on the expected schema
+ * and how it is used. Information on using PostgreSQL is also included.
  *
  * @author Ben Alex
  * @author Johannes Zlattinger
  */
 public class JdbcMutableAclService extends JdbcAclService implements MutableAclService {
-
-	private static final String DEFAULT_INSERT_INTO_ACL_CLASS = "insert into acl_class (class) values (?)";
-
-	private static final String DEFAULT_INSERT_INTO_ACL_CLASS_WITH_ID = "insert into acl_class (class, class_id_type) values (?, ?)";
-
-	private SecurityContextHolderStrategy securityContextHolderStrategy = SecurityContextHolder
-		.getContextHolderStrategy();
-
-	private boolean foreignKeysInDatabase = true;
-
-	private final AclCache aclCache;
-
-	private String deleteEntryByObjectIdentityForeignKey = "delete from acl_entry where acl_object_identity=?";
-
-	private String deleteObjectIdentityByPrimaryKey = "delete from acl_object_identity where id=?";
-
-	private String classIdentityQuery = "call identity()";
-
-	private String sidIdentityQuery = "call identity()";
-
-	private String insertClass = DEFAULT_INSERT_INTO_ACL_CLASS;
-
-	private String insertEntry = "insert into acl_entry "
-			+ "(acl_object_identity, ace_order, sid, mask, granting, audit_success, audit_failure)"
-			+ "values (?, ?, ?, ?, ?, ?, ?)";
-
-	private String insertObjectIdentity = "insert into acl_object_identity "
-			+ "(object_id_class, object_id_identity, owner_sid, entries_inheriting) " + "values (?, ?, ?, ?)";
-
-	private String insertSid = "insert into acl_sid (principal, sid) values (?, ?)";
-
-	private String selectClassPrimaryKey = "select id from acl_class where class=?";
-
-	private String selectObjectIdentityPrimaryKey = "select acl_object_identity.id from acl_object_identity, acl_class "
-			+ "where acl_object_identity.object_id_class = acl_class.id and acl_class.class=? "
-			+ "and acl_object_identity.object_id_identity = ?";
-
-	private String selectSidPrimaryKey = "select id from acl_sid where principal=? and sid=?";
-
-	private String updateObjectIdentity = "update acl_object_identity set "
-			+ "parent_object = ?, owner_sid = ?, entries_inheriting = ?" + " where id = ?";
-
-	public JdbcMutableAclService(DataSource dataSource, LookupStrategy lookupStrategy, AclCache aclCache) {
-		super(dataSource, lookupStrategy);
-		Assert.notNull(aclCache, "AclCache required");
-		this.aclCache = aclCache;
-	}
-
-	@Override
-	public MutableAcl createAcl(ObjectIdentity objectIdentity) throws AlreadyExistsException {
-		Assert.notNull(objectIdentity, "Object Identity required");
-
-		// Check this object identity hasn't already been persisted
-		if (retrieveObjectIdentityPrimaryKey(objectIdentity) != null) {
-			throw new AlreadyExistsException("Object identity '" + objectIdentity + "' already exists");
-		}
-
-		// Need to retrieve the current principal, in order to know who "owns" this ACL
-		// (can be changed later on)
-		Authentication auth = this.securityContextHolderStrategy.getContext().getAuthentication();
-		PrincipalSid sid = new PrincipalSid(auth);
-
-		// Create the acl_object_identity row
-		createObjectIdentity(objectIdentity, sid);
-
-		// Retrieve the ACL via superclass (ensures cache registration, proper retrieval
-		// etc)
-		Acl acl = readAclById(objectIdentity);
-		Assert.isInstanceOf(MutableAcl.class, acl, "MutableAcl should be been returned");
-
-		return (MutableAcl) acl;
-	}
-
-	/**
-	 * Creates a new row in acl_entry for every ACE defined in the passed MutableAcl
-	 * object.
-	 * @param acl containing the ACEs to insert
-	 */
-	protected void createEntries(final MutableAcl acl) {
-		if (acl.getEntries().isEmpty()) {
-			return;
-		}
-		this.jdbcOperations.batchUpdate(this.insertEntry, new BatchPreparedStatementSetter() {
-
-			@Override
-			public int getBatchSize() {
-				return acl.getEntries().size();
-			}
-
-			@Override
-			public void setValues(PreparedStatement stmt, int i) throws SQLException {
-				AccessControlEntry entry_ = acl.getEntries().get(i);
-				Assert.isTrue(entry_ instanceof AccessControlEntryImpl, "Unknown ACE class");
-				AccessControlEntryImpl entry = (AccessControlEntryImpl) entry_;
-
-				stmt.setLong(1, (Long) acl.getId());
-				stmt.setInt(2, i);
-				stmt.setLong(3, createOrRetrieveSidPrimaryKey(entry.getSid(), true));
-				stmt.setInt(4, entry.getPermission().getMask());
-				stmt.setBoolean(5, entry.isGranting());
-				stmt.setBoolean(6, entry.isAuditSuccess());
-				stmt.setBoolean(7, entry.isAuditFailure());
-			}
-
-		});
-	}
-
-	/**
-	 * Creates an entry in the acl_object_identity table for the passed ObjectIdentity.
-	 * The Sid is also necessary, as acl_object_identity has defined the sid column as
-	 * non-null.
-	 * @param object to represent an acl_object_identity for
-	 * @param owner for the SID column (will be created if there is no acl_sid entry for
-	 * this particular Sid already)
-	 */
-	protected void createObjectIdentity(ObjectIdentity object, Sid owner) {
-		Long sidId = createOrRetrieveSidPrimaryKey(owner, true);
-		Long classId = createOrRetrieveClassPrimaryKey(object.getType(), true, object.getIdentifier().getClass());
-		this.jdbcOperations.update(this.insertObjectIdentity, classId, object.getIdentifier().toString(), sidId,
-				Boolean.TRUE);
-	}
-
-	/**
-	 * Retrieves the primary key from {@code acl_class}, creating a new row if needed and
-	 * the {@code allowCreate} property is {@code true}.
-	 * @param type to find or create an entry for (often the fully-qualified class name)
-	 * @param allowCreate true if creation is permitted if not found
-	 * @return the primary key or null if not found
-	 */
-	protected Long createOrRetrieveClassPrimaryKey(String type, boolean allowCreate, Class idType) {
-		List<Long> classIds = this.jdbcOperations.queryForList(this.selectClassPrimaryKey, new Object[] { type },
-				Long.class);
-
-		if (!classIds.isEmpty()) {
-			return classIds.get(0);
-		}
-
-		if (allowCreate) {
-			if (!isAclClassIdSupported()) {
-				this.jdbcOperations.update(this.insertClass, type);
-			}
-			else {
-				this.jdbcOperations.update(this.insertClass, type, idType.getCanonicalName());
-			}
-			Assert.isTrue(TransactionSynchronizationManager.isSynchronizationActive(), "Transaction must be running");
-			return this.jdbcOperations.queryForObject(this.classIdentityQuery, Long.class);
-		}
-
-		return null;
-	}
-
-	/**
-	 * Retrieves the primary key from acl_sid, creating a new row if needed and the
-	 * allowCreate property is true.
-	 * @param sid to find or create
-	 * @param allowCreate true if creation is permitted if not found
-	 * @return the primary key or null if not found
-	 * @throws IllegalArgumentException if the <tt>Sid</tt> is not a recognized
-	 * implementation.
-	 */
-	protected Long createOrRetrieveSidPrimaryKey(Sid sid, boolean allowCreate) {
-		Assert.notNull(sid, "Sid required");
-		if (sid instanceof PrincipalSid) {
-			String sidName = ((PrincipalSid) sid).getPrincipal();
-			return createOrRetrieveSidPrimaryKey(sidName, true, allowCreate);
-		}
-		if (sid instanceof GrantedAuthoritySid) {
-			String sidName = ((GrantedAuthoritySid) sid).getGrantedAuthority();
-			return createOrRetrieveSidPrimaryKey(sidName, false, allowCreate);
-		}
-		throw new IllegalArgumentException("Unsupported implementation of Sid");
-	}
-
-	/**
-	 * Retrieves the primary key from acl_sid, creating a new row if needed and the
-	 * allowCreate property is true.
-	 * @param sidName name of Sid to find or to create
-	 * @param sidIsPrincipal whether it's a user or granted authority like role
-	 * @param allowCreate true if creation is permitted if not found
-	 * @return the primary key or null if not found
-	 */
-	protected Long createOrRetrieveSidPrimaryKey(String sidName, boolean sidIsPrincipal, boolean allowCreate) {
-		List<Long> sidIds = this.jdbcOperations.queryForList(this.selectSidPrimaryKey,
-				new Object[] { sidIsPrincipal, sidName }, Long.class);
-		if (!sidIds.isEmpty()) {
-			return sidIds.get(0);
-		}
-		if (allowCreate) {
-			this.jdbcOperations.update(this.insertSid, sidIsPrincipal, sidName);
-			Assert.isTrue(TransactionSynchronizationManager.isSynchronizationActive(), "Transaction must be running");
-			return this.jdbcOperations.queryForObject(this.sidIdentityQuery, Long.class);
-		}
-		return null;
-	}
-
-	@Override
-	public void deleteAcl(ObjectIdentity objectIdentity, boolean deleteChildren) throws ChildrenExistException {
-		Assert.notNull(objectIdentity, "Object Identity required");
-		Assert.notNull(objectIdentity.getIdentifier(), "Object Identity doesn't provide an identifier");
-		if (deleteChildren) {
-			List<ObjectIdentity> children = findChildren(objectIdentity);
-			if (children != null) {
-				for (ObjectIdentity child : children) {
-					deleteAcl(child, true);
-				}
-			}
-		}
-		else {
-			if (!this.foreignKeysInDatabase) {
-				// We need to perform a manual verification for what a FK would normally
-				// do. We generally don't do this, in the interests of deadlock management
-				List<ObjectIdentity> children = findChildren(objectIdentity);
-				if (children != null) {
-					throw new ChildrenExistException(
-							"Cannot delete '" + objectIdentity + "' (has " + children.size() + " children)");
-				}
-			}
-		}
-
-		Long oidPrimaryKey = retrieveObjectIdentityPrimaryKey(objectIdentity);
-
-		// Delete this ACL's ACEs in the acl_entry table
-		deleteEntries(oidPrimaryKey);
-
-		// Delete this ACL's acl_object_identity row
-		deleteObjectIdentity(oidPrimaryKey);
-
-		// Clear the cache
-		this.aclCache.evictFromCache(objectIdentity);
-	}
-
-	/**
-	 * Deletes all ACEs defined in the acl_entry table belonging to the presented
-	 * ObjectIdentity primary key.
-	 * @param oidPrimaryKey the rows in acl_entry to delete
-	 */
-	protected void deleteEntries(Long oidPrimaryKey) {
-		this.jdbcOperations.update(this.deleteEntryByObjectIdentityForeignKey, oidPrimaryKey);
-	}
-
-	/**
-	 * Deletes a single row from acl_object_identity that is associated with the presented
-	 * ObjectIdentity primary key.
-	 * <p>
-	 * We do not delete any entries from acl_class, even if no classes are using that
-	 * class any longer. This is a deadlock avoidance approach.
-	 * @param oidPrimaryKey to delete the acl_object_identity
-	 */
-	protected void deleteObjectIdentity(Long oidPrimaryKey) {
-		// Delete the acl_object_identity row
-		this.jdbcOperations.update(this.deleteObjectIdentityByPrimaryKey, oidPrimaryKey);
-	}
-
-	/**
-	 * Retrieves the primary key from the acl_object_identity table for the passed
-	 * ObjectIdentity. Unlike some other methods in this implementation, this method will
-	 * NOT create a row (use {@link #createObjectIdentity(ObjectIdentity, Sid)} instead).
-	 * @param oid to find
-	 * @return the object identity or null if not found
-	 */
-	protected Long retrieveObjectIdentityPrimaryKey(ObjectIdentity oid) {
-		try {
-			return this.jdbcOperations.queryForObject(this.selectObjectIdentityPrimaryKey, Long.class, oid.getType(),
-					oid.getIdentifier().toString());
-		}
-		catch (DataAccessException notFound) {
-			return null;
-		}
-	}
-
-	/**
-	 * This implementation will simply delete all ACEs in the database and recreate them
-	 * on each invocation of this method. A more comprehensive implementation might use
-	 * dirty state checking, or more likely use ORM capabilities for create, update and
-	 * delete operations of {@link MutableAcl}.
-	 */
-	@Override
-	public MutableAcl updateAcl(MutableAcl acl) throws NotFoundException {
-		Assert.notNull(acl.getId(), "Object Identity doesn't provide an identifier");
-
-		// Delete this ACL's ACEs in the acl_entry table
-		deleteEntries(retrieveObjectIdentityPrimaryKey(acl.getObjectIdentity()));
-
-		// Create this ACL's ACEs in the acl_entry table
-		createEntries(acl);
-
-		// Change the mutable columns in acl_object_identity
-		updateObjectIdentity(acl);
-
-		// Clear the cache, including children
-		clearCacheIncludingChildren(acl.getObjectIdentity());
-
-		// Retrieve the ACL via superclass (ensures cache registration, proper retrieval
-		// etc)
-		return (MutableAcl) super.readAclById(acl.getObjectIdentity());
-	}
-
-	private void clearCacheIncludingChildren(ObjectIdentity objectIdentity) {
-		Assert.notNull(objectIdentity, "ObjectIdentity required");
-		List<ObjectIdentity> children = findChildren(objectIdentity);
-		if (children != null) {
-			for (ObjectIdentity child : children) {
-				clearCacheIncludingChildren(child);
-			}
-		}
-		this.aclCache.evictFromCache(objectIdentity);
-	}
-
-	/**
-	 * Updates an existing acl_object_identity row, with new information presented in the
-	 * passed MutableAcl object. Also will create an acl_sid entry if needed for the Sid
-	 * that owns the MutableAcl.
-	 * @param acl to modify (a row must already exist in acl_object_identity)
-	 * @throws NotFoundException if the ACL could not be found to update.
-	 */
-	protected void updateObjectIdentity(MutableAcl acl) {
-		Long parentId = null;
-		if (acl.getParentAcl() != null) {
-			Assert.isInstanceOf(ObjectIdentityImpl.class, acl.getParentAcl().getObjectIdentity(),
-					"Implementation only supports ObjectIdentityImpl");
-			ObjectIdentityImpl oii = (ObjectIdentityImpl) acl.getParentAcl().getObjectIdentity();
-			parentId = retrieveObjectIdentityPrimaryKey(oii);
-		}
-		Assert.notNull(acl.getOwner(), "Owner is required in this implementation");
-		Long ownerSid = createOrRetrieveSidPrimaryKey(acl.getOwner(), true);
-		int count = this.jdbcOperations.update(this.updateObjectIdentity, parentId, ownerSid, acl.isEntriesInheriting(),
-				acl.getId());
-		if (count != 1) {
-			throw new NotFoundException("Unable to locate ACL to update");
-		}
-	}
-
-	/**
-	 * Sets the query that will be used to retrieve the identity of a newly created row in
-	 * the <tt>acl_class</tt> table.
-	 * @param classIdentityQuery the query, which should return the identifier. Defaults
-	 * to <tt>call identity()</tt>
-	 */
-	public void setClassIdentityQuery(String classIdentityQuery) {
-		Assert.hasText(classIdentityQuery, "New classIdentityQuery query is required");
-		this.classIdentityQuery = classIdentityQuery;
-	}
-
-	/**
-	 * Sets the query that will be used to retrieve the identity of a newly created row in
-	 * the <tt>acl_sid</tt> table.
-	 * @param sidIdentityQuery the query, which should return the identifier. Defaults to
-	 * <tt>call identity()</tt>
-	 */
-	public void setSidIdentityQuery(String sidIdentityQuery) {
-		Assert.hasText(sidIdentityQuery, "New sidIdentityQuery query is required");
-		this.sidIdentityQuery = sidIdentityQuery;
-	}
-
-	public void setDeleteEntryByObjectIdentityForeignKeySql(String deleteEntryByObjectIdentityForeignKey) {
-		this.deleteEntryByObjectIdentityForeignKey = deleteEntryByObjectIdentityForeignKey;
-	}
-
-	public void setDeleteObjectIdentityByPrimaryKeySql(String deleteObjectIdentityByPrimaryKey) {
-		this.deleteObjectIdentityByPrimaryKey = deleteObjectIdentityByPrimaryKey;
-	}
-
-	public void setInsertClassSql(String insertClass) {
-		this.insertClass = insertClass;
-	}
-
-	public void setInsertEntrySql(String insertEntry) {
-		this.insertEntry = insertEntry;
-	}
-
-	public void setInsertObjectIdentitySql(String insertObjectIdentity) {
-		this.insertObjectIdentity = insertObjectIdentity;
-	}
-
-	public void setInsertSidSql(String insertSid) {
-		this.insertSid = insertSid;
-	}
-
-	public void setClassPrimaryKeyQuery(String selectClassPrimaryKey) {
-		this.selectClassPrimaryKey = selectClassPrimaryKey;
-	}
-
-	public void setObjectIdentityPrimaryKeyQuery(String selectObjectIdentityPrimaryKey) {
-		this.selectObjectIdentityPrimaryKey = selectObjectIdentityPrimaryKey;
-	}
-
-	public void setSidPrimaryKeyQuery(String selectSidPrimaryKey) {
-		this.selectSidPrimaryKey = selectSidPrimaryKey;
-	}
-
-	public void setUpdateObjectIdentity(String updateObjectIdentity) {
-		this.updateObjectIdentity = updateObjectIdentity;
-	}
-
-	/**
-	 * @param foreignKeysInDatabase if false this class will perform additional FK
-	 * constrain checking, which may cause deadlocks (the default is true, so deadlocks
-	 * are avoided but the database is expected to enforce FKs)
-	 */
-	public void setForeignKeysInDatabase(boolean foreignKeysInDatabase) {
-		this.foreignKeysInDatabase = foreignKeysInDatabase;
-	}
-
-	@Override
-	public void setAclClassIdSupported(boolean aclClassIdSupported) {
-		super.setAclClassIdSupported(aclClassIdSupported);
-		if (aclClassIdSupported) {
-			// Change the default insert if it hasn't been overridden
-			if (this.insertClass.equals(DEFAULT_INSERT_INTO_ACL_CLASS)) {
-				this.insertClass = DEFAULT_INSERT_INTO_ACL_CLASS_WITH_ID;
-			}
-			else {
-				log.debug("Insert class statement has already been overridden, so not overridding the default");
-			}
-		}
-	}
-
-	/**
-	 * Sets the {@link SecurityContextHolderStrategy} to use. The default action is to use
-	 * the {@link SecurityContextHolderStrategy} stored in {@link SecurityContextHolder}.
-	 *
-	 * @since 5.8
-	 */
-	public void setSecurityContextHolderStrategy(SecurityContextHolderStrategy securityContextHolderStrategy) {
-		Assert.notNull(securityContextHolderStrategy, "securityContextHolderStrategy cannot be null");
-		this.securityContextHolderStrategy = securityContextHolderStrategy;
-	}
-
+    //~ Instance fields ================================================================================================
+
+    private boolean foreignKeysInDatabase = true;
+    private AclCache aclCache;
+    private String deleteEntryByObjectIdentityForeignKey = "delete from acl_entry where acl_object_identity=?";
+    private String deleteObjectIdentityByPrimaryKey = "delete from acl_object_identity where id=?";
+    private String classIdentityQuery = "call identity()";
+    private String sidIdentityQuery = "call identity()";
+    private String insertClass = "insert into acl_class (class) values (?)";
+    private String insertEntry = "insert into acl_entry "
+        + "(acl_object_identity, ace_order, sid, mask, granting, audit_success, audit_failure)"
+        + "values (?, ?, ?, ?, ?, ?, ?)";
+    private String insertObjectIdentity = "insert into acl_object_identity "
+        + "(object_id_class, object_id_identity, owner_sid, entries_inheriting) " + "values (?, ?, ?, ?)";
+    private String insertSid = "insert into acl_sid (principal, sid) values (?, ?)";
+    private String selectClassPrimaryKey = "select id from acl_class where class=?";
+    private String selectObjectIdentityPrimaryKey = "select acl_object_identity.id from acl_object_identity, acl_class "
+        + "where acl_object_identity.object_id_class = acl_class.id and acl_class.class=? "
+        + "and acl_object_identity.object_id_identity = ?";
+    private String selectSidPrimaryKey = "select id from acl_sid where principal=? and sid=?";
+    private String updateObjectIdentity = "update acl_object_identity set "
+        + "parent_object = ?, owner_sid = ?, entries_inheriting = ?" + " where id = ?";
+
+    //~ Constructors ===================================================================================================
+
+    public JdbcMutableAclService(DataSource dataSource, LookupStrategy lookupStrategy, AclCache aclCache) {
+        super(dataSource, lookupStrategy);
+        Assert.notNull(aclCache, "AclCache required");
+        this.aclCache = aclCache;
+    }
+
+    //~ Methods ========================================================================================================
+
+    public MutableAcl createAcl(ObjectIdentity objectIdentity) throws AlreadyExistsException {
+        Assert.notNull(objectIdentity, "Object Identity required");
+
+        // Check this object identity hasn't already been persisted
+        if (retrieveObjectIdentityPrimaryKey(objectIdentity) != null) {
+            throw new AlreadyExistsException("Object identity '" + objectIdentity + "' already exists");
+        }
+
+        // Need to retrieve the current principal, in order to know who "owns" this ACL (can be changed later on)
+        Authentication auth = SecurityContextHolder.getContext().getAuthentication();
+        PrincipalSid sid = new PrincipalSid(auth);
+
+        // Create the acl_object_identity row
+        createObjectIdentity(objectIdentity, sid);
+
+        // Retrieve the ACL via superclass (ensures cache registration, proper retrieval etc)
+        Acl acl = readAclById(objectIdentity);
+        Assert.isInstanceOf(MutableAcl.class, acl, "MutableAcl should be been returned");
+
+        return (MutableAcl) acl;
+    }
+
+    /**
+     * Creates a new row in acl_entry for every ACE defined in the passed MutableAcl object.
+     *
+     * @param acl containing the ACEs to insert
+     */
+    protected void createEntries(final MutableAcl acl) {
+        jdbcTemplate.batchUpdate(insertEntry,
+            new BatchPreparedStatementSetter() {
+                public int getBatchSize() {
+                    return acl.getEntries().size();
+                }
+
+                public void setValues(PreparedStatement stmt, int i) throws SQLException {
+                    AccessControlEntry entry_ = acl.getEntries().get(i);
+                    Assert.isTrue(entry_ instanceof AccessControlEntryImpl, "Unknown ACE class");
+                    AccessControlEntryImpl entry = (AccessControlEntryImpl) entry_;
+
+                    stmt.setLong(1, ((Long) acl.getId()).longValue());
+                    stmt.setInt(2, i);
+                    stmt.setLong(3, createOrRetrieveSidPrimaryKey(entry.getSid(), true).longValue());
+                    stmt.setInt(4, entry.getPermission().getMask());
+                    stmt.setBoolean(5, entry.isGranting());
+                    stmt.setBoolean(6, entry.isAuditSuccess());
+                    stmt.setBoolean(7, entry.isAuditFailure());
+                }
+            });
+    }
+
+    /**
+     * Creates an entry in the acl_object_identity table for the passed ObjectIdentity. The Sid is also
+     * necessary, as acl_object_identity has defined the sid column as non-null.
+     *
+     * @param object to represent an acl_object_identity for
+     * @param owner for the SID column (will be created if there is no acl_sid entry for this particular Sid already)
+     */
+    protected void createObjectIdentity(ObjectIdentity object, Sid owner) {
+        Long sidId = createOrRetrieveSidPrimaryKey(owner, true);
+        Long classId = createOrRetrieveClassPrimaryKey(object.getType(), true);
+        jdbcTemplate.update(insertObjectIdentity, classId, object.getIdentifier(), sidId, Boolean.TRUE);
+    }
+
+    /**
+     * Retrieves the primary key from {@code acl_class}, creating a new row if needed and the
+     * {@code allowCreate} property is {@code true}.
+     *
+     * @param type to find or create an entry for (often the fully-qualified class name)
+     * @param allowCreate true if creation is permitted if not found
+     *
+     * @return the primary key or null if not found
+     */
+    protected Long createOrRetrieveClassPrimaryKey(String type, boolean allowCreate) {
+        List<Long> classIds = jdbcTemplate.queryForList(selectClassPrimaryKey, new Object[] {type}, Long.class);
+
+        if (!classIds.isEmpty()) {
+            return classIds.get(0);
+        }
+
+        if (allowCreate) {
+            jdbcTemplate.update(insertClass, type);
+            Assert.isTrue(TransactionSynchronizationManager.isSynchronizationActive(),
+                    "Transaction must be running");
+            return new Long(jdbcTemplate.queryForLong(classIdentityQuery));
+        }
+
+        return null;
+    }
+
+    /**
+     * Retrieves the primary key from acl_sid, creating a new row if needed and the allowCreate property is
+     * true.
+     *
+     * @param sid to find or create
+     * @param allowCreate true if creation is permitted if not found
+     *
+     * @return the primary key or null if not found
+     *
+     * @throws IllegalArgumentException if the <tt>Sid</tt> is not a recognized implementation.
+     */
+    protected Long createOrRetrieveSidPrimaryKey(Sid sid, boolean allowCreate) {
+        Assert.notNull(sid, "Sid required");
+
+        String sidName = null;
+        boolean sidIsPrincipal = true;
+
+        if (sid instanceof PrincipalSid) {
+            sidName = ((PrincipalSid) sid).getPrincipal();
+        } else if (sid instanceof GrantedAuthoritySid) {
+            sidName = ((GrantedAuthoritySid) sid).getGrantedAuthority();
+            sidIsPrincipal = false;
+        } else {
+            throw new IllegalArgumentException("Unsupported implementation of Sid");
+        }
+
+        List<Long> sidIds = jdbcTemplate.queryForList(selectSidPrimaryKey,
+                new Object[] {Boolean.valueOf(sidIsPrincipal), sidName},  Long.class);
+
+        if (!sidIds.isEmpty()) {
+            return sidIds.get(0);
+        }
+
+        if (allowCreate) {
+            jdbcTemplate.update(insertSid, new Object[] {Boolean.valueOf(sidIsPrincipal), sidName});
+            Assert.isTrue(TransactionSynchronizationManager.isSynchronizationActive(), "Transaction must be running");
+            return new Long(jdbcTemplate.queryForLong(sidIdentityQuery));
+        }
+
+        return null;
+    }
+
+    public void deleteAcl(ObjectIdentity objectIdentity, boolean deleteChildren) throws ChildrenExistException {
+        Assert.notNull(objectIdentity, "Object Identity required");
+        Assert.notNull(objectIdentity.getIdentifier(), "Object Identity doesn't provide an identifier");
+
+        if (deleteChildren) {
+            List<ObjectIdentity> children = findChildren(objectIdentity);
+            if (children != null) {
+                for (int i = 0; i < children.size(); i++) {
+                    deleteAcl(children.get(i), true);
+                }
+            }
+        } else {
+            if (!foreignKeysInDatabase) {
+                // We need to perform a manual verification for what a FK would normally do
+                // We generally don't do this, in the interests of deadlock management
+                List<ObjectIdentity> children = findChildren(objectIdentity);
+                if (children != null) {
+                    throw new ChildrenExistException("Cannot delete '" + objectIdentity + "' (has " + children.size()
+                            + " children)");
+                }
+            }
+        }
+
+        Long oidPrimaryKey = retrieveObjectIdentityPrimaryKey(objectIdentity);
+
+        // Delete this ACL's ACEs in the acl_entry table
+        deleteEntries(oidPrimaryKey);
+
+        // Delete this ACL's acl_object_identity row
+        deleteObjectIdentity(oidPrimaryKey);
+
+        // Clear the cache
+        aclCache.evictFromCache(objectIdentity);
+    }
+
+    /**
+     * Deletes all ACEs defined in the acl_entry table belonging to the presented ObjectIdentity primary key.
+     *
+     * @param oidPrimaryKey the rows in acl_entry to delete
+     */
+    protected void deleteEntries(Long oidPrimaryKey) {
+        jdbcTemplate.update(deleteEntryByObjectIdentityForeignKey,
+                new Object[] {oidPrimaryKey});
+    }
+
+    /**
+     * Deletes a single row from acl_object_identity that is associated with the presented ObjectIdentity primary key.
+     * <p>
+     * We do not delete any entries from acl_class, even if no classes are using that class any longer. This is a
+     * deadlock avoidance approach.
+     *
+     * @param oidPrimaryKey to delete the acl_object_identity
+     */
+    protected void deleteObjectIdentity(Long oidPrimaryKey) {
+        // Delete the acl_object_identity row
+        jdbcTemplate.update(deleteObjectIdentityByPrimaryKey, new Object[] {oidPrimaryKey});
+    }
+
+    /**
+     * Retrieves the primary key from the acl_object_identity table for the passed ObjectIdentity. Unlike some
+     * other methods in this implementation, this method will NOT create a row (use {@link
+     * #createObjectIdentity(ObjectIdentity, Sid)} instead).
+     *
+     * @param oid to find
+     *
+     * @return the object identity or null if not found
+     */
+    protected Long retrieveObjectIdentityPrimaryKey(ObjectIdentity oid) {
+        try {
+            return new Long(jdbcTemplate.queryForLong(selectObjectIdentityPrimaryKey,
+                    new Object[] {oid.getType(), oid.getIdentifier()}));
+        } catch (DataAccessException notFound) {
+            return null;
+        }
+    }
+
+    /**
+     * This implementation will simply delete all ACEs in the database and recreate them on each invocation of
+     * this method. A more comprehensive implementation might use dirty state checking, or more likely use ORM
+     * capabilities for create, update and delete operations of {@link MutableAcl}.
+     */
+    public MutableAcl updateAcl(MutableAcl acl) throws NotFoundException {
+        Assert.notNull(acl.getId(), "Object Identity doesn't provide an identifier");
+
+        // Delete this ACL's ACEs in the acl_entry table
+        deleteEntries(retrieveObjectIdentityPrimaryKey(acl.getObjectIdentity()));
+
+        // Create this ACL's ACEs in the acl_entry table
+        createEntries(acl);
+
+        // Change the mutable columns in acl_object_identity
+        updateObjectIdentity(acl);
+
+        // Clear the cache, including children
+        clearCacheIncludingChildren(acl.getObjectIdentity());
+
+        // Retrieve the ACL via superclass (ensures cache registration, proper retrieval etc)
+        return (MutableAcl) super.readAclById(acl.getObjectIdentity());
+    }
+
+    private void clearCacheIncludingChildren(ObjectIdentity objectIdentity) {
+        Assert.notNull(objectIdentity, "ObjectIdentity required");
+        List<ObjectIdentity> children = findChildren(objectIdentity);
+        if (children != null) {
+            for (int i = 0; i < children.size(); i++) {
+                clearCacheIncludingChildren(children.get(i));
+            }
+        }
+        aclCache.evictFromCache(objectIdentity);
+    }
+
+    /**
+     * Updates an existing acl_object_identity row, with new information presented in the passed MutableAcl
+     * object. Also will create an acl_sid entry if needed for the Sid that owns the MutableAcl.
+     *
+     * @param acl to modify (a row must already exist in acl_object_identity)
+     *
+     * @throws NotFoundException if the ACL could not be found to update.
+     */
+    protected void updateObjectIdentity(MutableAcl acl) {
+        Long parentId = null;
+
+        if (acl.getParentAcl() != null) {
+            Assert.isInstanceOf(ObjectIdentityImpl.class, acl.getParentAcl().getObjectIdentity(),
+                "Implementation only supports ObjectIdentityImpl");
+
+            ObjectIdentityImpl oii = (ObjectIdentityImpl) acl.getParentAcl().getObjectIdentity();
+            parentId = retrieveObjectIdentityPrimaryKey(oii);
+        }
+
+        Assert.notNull(acl.getOwner(), "Owner is required in this implementation");
+
+        Long ownerSid = createOrRetrieveSidPrimaryKey(acl.getOwner(), true);
+        int count = jdbcTemplate.update(updateObjectIdentity,
+                new Object[] {parentId, ownerSid, new Boolean(acl.isEntriesInheriting()), acl.getId()});
+
+        if (count != 1) {
+            throw new NotFoundException("Unable to locate ACL to update");
+        }
+    }
+
+    /**
+     * Sets the query that will be used to retrieve the identity of a newly created row in the <tt>acl_class</tt>
+     * table.
+     *
+     * @param classIdentityQuery the query, which should return the identifier. Defaults to <tt>call identity()</tt>
+     */
+    public void setClassIdentityQuery(String classIdentityQuery) {
+        Assert.hasText(classIdentityQuery, "New classIdentityQuery query is required");
+        this.classIdentityQuery = classIdentityQuery;
+    }
+
+    /**
+     * Sets the query that will be used to retrieve the identity of a newly created row in the <tt>acl_sid</tt>
+     * table.
+     *
+     * @param sidIdentityQuery the query, which should return the identifier. Defaults to <tt>call identity()</tt>
+     */
+    public void setSidIdentityQuery(String sidIdentityQuery) {
+        Assert.hasText(sidIdentityQuery, "New sidIdentityQuery query is required");
+        this.sidIdentityQuery = sidIdentityQuery;
+    }
+
+    public void setDeleteEntryByObjectIdentityForeignKeySql(String deleteEntryByObjectIdentityForeignKey) {
+        this.deleteEntryByObjectIdentityForeignKey = deleteEntryByObjectIdentityForeignKey;
+    }
+
+    public void setDeleteObjectIdentityByPrimaryKeySql(String deleteObjectIdentityByPrimaryKey) {
+        this.deleteObjectIdentityByPrimaryKey = deleteObjectIdentityByPrimaryKey;
+    }
+
+    public void setInsertClassSql(String insertClass) {
+        this.insertClass = insertClass;
+    }
+
+    public void setInsertEntrySql(String insertEntry) {
+        this.insertEntry = insertEntry;
+    }
+
+    public void setInsertObjectIdentitySql(String insertObjectIdentity) {
+        this.insertObjectIdentity = insertObjectIdentity;
+    }
+
+    public void setInsertSidSql(String insertSid) {
+        this.insertSid = insertSid;
+    }
+
+    public void setClassPrimaryKeyQuery(String selectClassPrimaryKey) {
+        this.selectClassPrimaryKey = selectClassPrimaryKey;
+    }
+
+    public void setObjectIdentityPrimaryKeyQuery(String selectObjectIdentityPrimaryKey) {
+        this.selectObjectIdentityPrimaryKey = selectObjectIdentityPrimaryKey;
+    }
+
+    public void setSidPrimaryKeyQuery(String selectSidPrimaryKey) {
+        this.selectSidPrimaryKey = selectSidPrimaryKey;
+    }
+
+    public void setUpdateObjectIdentity(String updateObjectIdentity) {
+        this.updateObjectIdentity = updateObjectIdentity;
+    }
+
+    /**
+     * @param foreignKeysInDatabase if false this class will perform additional FK constrain checking, which may
+     * cause deadlocks (the default is true, so deadlocks are avoided but the database is expected to enforce FKs)
+     */
+    public void setForeignKeysInDatabase(boolean foreignKeysInDatabase) {
+        this.foreignKeysInDatabase = foreignKeysInDatabase;
+    }
 }

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

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,35 +12,36 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.security.acls.jdbc;
 
-import java.util.List;
-import java.util.Map;
-
 import org.springframework.security.acls.model.Acl;
 import org.springframework.security.acls.model.NotFoundException;
 import org.springframework.security.acls.model.ObjectIdentity;
 import org.springframework.security.acls.model.Sid;
 
+import java.util.List;
+import java.util.Map;
+
+
 /**
  * Performs lookups for {@link org.springframework.security.acls.model.AclService}.
  *
  * @author Ben Alex
  */
 public interface LookupStrategy {
+    //~ Methods ========================================================================================================
 
-	/**
-	 * Perform database-specific optimized lookup.
-	 * @param objects the identities to lookup (required)
-	 * @param sids the SIDs for which identities are required (may be <tt>null</tt> -
-	 * implementations may elect not to provide SID optimisations)
-	 * @return a <tt>Map</tt> where keys represent the {@link ObjectIdentity} of the
-	 * located {@link Acl} and values are the located {@link Acl} (never <tt>null</tt>
-	 * although some entries may be missing; this method should not throw
-	 * {@link NotFoundException}, as a chain of {@link LookupStrategy}s may be used to
-	 * automatically create entries if required)
-	 */
-	Map<ObjectIdentity, Acl> readAclsById(List<ObjectIdentity> objects, List<Sid> sids);
-
+    /**
+     * Perform database-specific optimized lookup.
+     *
+     * @param objects the identities to lookup (required)
+     * @param sids the SIDs for which identities are required (may be <tt>null</tt> - implementations may elect not
+     *        to provide SID optimisations)
+     *
+     * @return a <tt>Map</tt> where keys represent the {@link ObjectIdentity} of the located {@link Acl} and values
+     *         are the located {@link Acl} (never <tt>null</tt> although some entries may be missing; this method
+     *         should not throw {@link NotFoundException}, as a chain of {@link LookupStrategy}s may be used
+     *         to automatically create entries if required)
+     */
+    Map<ObjectIdentity, Acl> readAclsById(List<ObjectIdentity> objects, List<Sid> sids);
 }

acl/src/main/java/org/springframework/security/acls/jdbc/package-info.java

@@ -1,20 +1,5 @@
-/*
- * Copyright 2002-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * 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.
- */
-
 /**
  * JDBC-based persistence of ACL information
  */
 package org.springframework.security.acls.jdbc;
+

acl/src/main/java/org/springframework/security/acls/model/AccessControlEntry.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,40 +12,44 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.security.acls.model;
 
+
 import java.io.Serializable;
 
+
 /**
  * Represents an individual permission assignment within an {@link Acl}.
  *
  * <p>
- * Instances MUST be immutable, as they are returned by <code>Acl</code> and should not
- * allow client modification.
+ * Instances MUST be immutable, as they are returned by <code>Acl</code>
+ * and should not allow client modification.
  * </p>
  *
  * @author Ben Alex
+ *
  */
 public interface AccessControlEntry extends Serializable {
+    //~ Methods ========================================================================================================
 
-	Acl getAcl();
+    Acl getAcl();
 
-	/**
-	 * Obtains an identifier that represents this ACE.
-	 * @return the identifier, or <code>null</code> if unsaved
-	 */
-	Serializable getId();
+    /**
+     * Obtains an identifier that represents this ACE.
+     *
+     * @return the identifier, or <code>null</code> if unsaved
+     */
+    Serializable getId();
 
-	Permission getPermission();
+    Permission getPermission();
 
-	Sid getSid();
-
-	/**
-	 * Indicates the permission is being granted to the relevant Sid. If false, indicates
-	 * the permission is being revoked/blocked.
-	 * @return true if being granted, false otherwise
-	 */
-	boolean isGranting();
+    Sid getSid();
 
+    /**
+     * Indicates the a Permission is being granted to the relevant Sid. If false, indicates the permission is
+     * being revoked/blocked.
+     *
+     * @return true if being granted, false otherwise
+     */
+    boolean isGranting();
 }

acl/src/main/java/org/springframework/security/acls/model/Acl.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,182 +12,157 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.security.acls.model;
 
+
 import java.io.Serializable;
 import java.util.List;
 
+
 /**
  * Represents an access control list (ACL) for a domain object.
  *
  * <p>
- * An <tt>Acl</tt> represents all ACL entries for a given domain object. In order to avoid
- * needing references to the domain object itself, this interface handles indirection
- * between a domain object and an ACL object identity via the
- * {@link org.springframework.security.acls.model.ObjectIdentity} interface.
+ * An <tt>Acl</tt> represents all ACL entries for a given domain object. In
+ * order to avoid needing references to the domain object itself, this
+ * interface handles indirection between a domain object and an ACL object
+ * identity via the {@link
+ * org.springframework.security.acls.model.ObjectIdentity} interface.
  * </p>
  *
  * <p>
  * Implementing classes may elect to return instances that represent
- * {@link org.springframework.security.acls.model.Permission} information for either some
- * OR all {@link org.springframework.security.acls.model.Sid} instances. Therefore, an
- * instance may NOT necessarily contain ALL <tt>Sid</tt>s for a given domain object.
+ * {@link org.springframework.security.acls.model.Permission} information for either
+ * some OR all {@link org.springframework.security.acls.model.Sid}
+ * instances. Therefore, an instance may NOT necessarily contain ALL <tt>Sid</tt>s
+ * for a given domain object.
  * </p>
  *
  * @author Ben Alex
  */
 public interface Acl extends Serializable {
 
-	/**
-	 * Returns all of the entries represented by the present <tt>Acl</tt>. Entries
-	 * associated with the <tt>Acl</tt> parents are not returned.
-	 *
-	 * <p>
-	 * This method is typically used for administrative purposes.
-	 * </p>
-	 *
-	 * <p>
-	 * The order that entries appear in the array is important for methods declared in the
-	 * {@link MutableAcl} interface. Furthermore, some implementations MAY use ordering as
-	 * part of advanced permission checking.
-	 * </p>
-	 *
-	 * <p>
-	 * Do <em>NOT</em> use this method for making authorization decisions. Instead use
-	 * {@link #isGranted(List, List, boolean)}.
-	 * </p>
-	 *
-	 * <p>
-	 * This method must operate correctly even if the <tt>Acl</tt> only represents a
-	 * subset of <tt>Sid</tt>s. The caller is responsible for correctly handling the
-	 * result if only a subset of <tt>Sid</tt>s is represented.
-	 * </p>
-	 * @return the list of entries represented by the <tt>Acl</tt>, or <tt>null</tt> if
-	 * there are no entries presently associated with this <tt>Acl</tt>.
-	 */
-	List<AccessControlEntry> getEntries();
+    /**
+     * Returns all of the entries represented by the present <tt>Acl</tt>. Entries associated with
+     * the <tt>Acl</tt> parents are not returned.
+     *
+     * <p>This method is typically used for administrative purposes.</p>
+     *
+     * <p>The order that entries appear in the array is important for methods declared in the
+     * {@link MutableAcl} interface. Furthermore, some implementations MAY use ordering as
+     * part of advanced permission checking.</p>
+     *
+     * <p>Do <em>NOT</em> use this method for making authorization decisions. Instead use {@link
+     * #isGranted(List, List, boolean)}.</p>
+     *
+     * <p>This method must operate correctly even if the <tt>Acl</tt> only represents a subset of
+     * <tt>Sid</tt>s. The caller is responsible for correctly handling the result if only a subset of
+     * <tt>Sid</tt>s is represented.</p>
+     *
+     * @return the list of entries represented by the <tt>Acl</tt>, or <tt>null</tt> if there are
+     * no entries presently associated with this <tt>Acl</tt>.
+     */
+    List<AccessControlEntry> getEntries();
 
-	/**
-	 * Obtains the domain object this <tt>Acl</tt> provides entries for. This is immutable
-	 * once an <tt>Acl</tt> is created.
-	 * @return the object identity (never <tt>null</tt>)
-	 */
-	ObjectIdentity getObjectIdentity();
+    /**
+     * Obtains the domain object this <tt>Acl</tt> provides entries for. This is immutable once an
+     * <tt>Acl</tt> is created.
+     *
+     * @return the object identity (never <tt>null</tt>)
+     */
+    ObjectIdentity getObjectIdentity();
 
-	/**
-	 * Determines the owner of the <tt>Acl</tt>. The meaning of ownership varies by
-	 * implementation and is unspecified.
-	 * @return the owner (may be <tt>null</tt> if the implementation does not use
-	 * ownership concepts)
-	 */
-	Sid getOwner();
+    /**
+     * Determines the owner of the <tt>Acl</tt>. The meaning of ownership varies by implementation and is
+     * unspecified.
+     *
+     * @return the owner (may be <tt>null</tt> if the implementation does not use ownership concepts)
+     */
+    Sid getOwner();
 
-	/**
-	 * A domain object may have a parent for the purpose of ACL inheritance. If there is a
-	 * parent, its ACL can be accessed via this method. In turn, the parent's parent
-	 * (grandparent) can be accessed and so on.
-	 *
-	 * <p>
-	 * This method solely represents the presence of a navigation hierarchy between the
-	 * parent <tt>Acl</tt> and this <tt>Acl</tt>. For actual inheritance to take place,
-	 * the {@link #isEntriesInheriting()} must also be <tt>true</tt>.
-	 * </p>
-	 *
-	 * <p>
-	 * This method must operate correctly even if the <tt>Acl</tt> only represents a
-	 * subset of <tt>Sid</tt>s. The caller is responsible for correctly handling the
-	 * result if only a subset of <tt>Sid</tt>s is represented.
-	 * </p>
-	 * @return the parent <tt>Acl</tt> (may be <tt>null</tt> if this <tt>Acl</tt> does not
-	 * have a parent)
-	 */
-	Acl getParentAcl();
+    /**
+     * A domain object may have a parent for the purpose of ACL inheritance. If there is a parent, its ACL can
+     * be accessed via this method. In turn, the parent's parent (grandparent) can be accessed and so on.
+     *
+     * <p>This method solely represents the presence of a navigation hierarchy between the parent <tt>Acl</tt> and this
+     * <tt>Acl</tt>. For actual inheritance to take place, the {@link #isEntriesInheriting()} must also be
+     * <tt>true</tt>.</p>
+     *
+     * <p>This method must operate correctly even if the <tt>Acl</tt> only represents a subset of
+     * <tt>Sid</tt>s. The caller is responsible for correctly handling the result if only a subset of
+     * <tt>Sid</tt>s is represented.</p>
+     *
+     * @return the parent <tt>Acl</tt> (may be <tt>null</tt> if this <tt>Acl</tt> does not have a parent)
+     */
+    Acl getParentAcl();
 
-	/**
-	 * Indicates whether the ACL entries from the {@link #getParentAcl()} should flow down
-	 * into the current <tt>Acl</tt>.
-	 * <p>
-	 * The mere link between an <tt>Acl</tt> and a parent <tt>Acl</tt> on its own is
-	 * insufficient to cause ACL entries to inherit down. This is because a domain object
-	 * may wish to have entirely independent entries, but maintain the link with the
-	 * parent for navigation purposes. Thus, this method denotes whether or not the
-	 * navigation relationship also extends to the actual inheritance of entries.
-	 * </p>
-	 * @return <tt>true</tt> if parent ACL entries inherit into the current <tt>Acl</tt>
-	 */
-	boolean isEntriesInheriting();
+    /**
+     * Indicates whether the ACL entries from the {@link #getParentAcl()} should flow down into the current
+     * <tt>Acl</tt>.<p>The mere link between an <tt>Acl</tt> and a parent <tt>Acl</tt> on its own
+     * is insufficient to cause ACL entries to inherit down. This is because a domain object may wish to have entirely
+     * independent entries, but maintain the link with the parent for navigation purposes. Thus, this method denotes
+     * whether or not the navigation relationship also extends to the actual inheritance of entries.</p>
+     *
+     * @return <tt>true</tt> if parent ACL entries inherit into the current <tt>Acl</tt>
+     */
+    boolean isEntriesInheriting();
 
-	/**
-	 * This is the actual authorization logic method, and must be used whenever ACL
-	 * authorization decisions are required.
-	 *
-	 * <p>
-	 * An array of <tt>Sid</tt>s are presented, representing security identifies of the
-	 * current principal. In addition, an array of <tt>Permission</tt>s is presented which
-	 * will have one or more bits set in order to indicate the permissions needed for an
-	 * affirmative authorization decision. An array is presented because holding
-	 * <em>any</em> of the <tt>Permission</tt>s inside the array will be sufficient for an
-	 * affirmative authorization.
-	 * </p>
-	 *
-	 * <p>
-	 * The actual approach used to make authorization decisions is left to the
-	 * implementation and is not specified by this interface. For example, an
-	 * implementation <em>MAY</em> search the current ACL in the order the ACL entries
-	 * have been stored. If a single entry is found that has the same active bits as are
-	 * shown in a passed <tt>Permission</tt>, that entry's grant or deny state may
-	 * determine the authorization decision. If the case of a deny state, the deny
-	 * decision will only be relevant if all other <tt>Permission</tt>s passed in the
-	 * array have also been unsuccessfully searched. If no entry is found that match the
-	 * bits in the current ACL, provided that {@link #isEntriesInheriting()} is
-	 * <tt>true</tt>, the authorization decision may be passed to the parent ACL. If there
-	 * is no matching entry, the implementation MAY throw an exception, or make a
-	 * predefined authorization decision.
-	 * </p>
-	 *
-	 * <p>
-	 * This method must operate correctly even if the <tt>Acl</tt> only represents a
-	 * subset of <tt>Sid</tt>s, although the implementation is permitted to throw one of
-	 * the signature-defined exceptions if the method is called requesting an
-	 * authorization decision for a {@link Sid} that was never loaded in this <tt>Acl</tt>
-	 * .
-	 * </p>
-	 * @param permission the permission or permissions required (at least one entry
-	 * required)
-	 * @param sids the security identities held by the principal (at least one entry
-	 * required)
-	 * @param administrativeMode if <tt>true</tt> denotes the query is for administrative
-	 * purposes and no logging or auditing (if supported by the implementation) should be
-	 * undertaken
-	 * @return <tt>true</tt> if authorization is granted
-	 * @throws NotFoundException MUST be thrown if an implementation cannot make an
-	 * authoritative authorization decision, usually because there is no ACL information
-	 * for this particular permission and/or SID
-	 * @throws UnloadedSidException thrown if the <tt>Acl</tt> does not have details for
-	 * one or more of the <tt>Sid</tt>s passed as arguments
-	 */
-	boolean isGranted(List<Permission> permission, List<Sid> sids, boolean administrativeMode)
-			throws NotFoundException, UnloadedSidException;
-
-	/**
-	 * For efficiency reasons an <tt>Acl</tt> may be loaded and <em>not</em> contain
-	 * entries for every <tt>Sid</tt> in the system. If an <tt>Acl</tt> has been loaded
-	 * and does not represent every <tt>Sid</tt>, all methods of the <tt>Acl</tt> can only
-	 * be used within the limited scope of the <tt>Sid</tt> instances it actually
-	 * represents.
-	 * <p>
-	 * It is normal to load an <tt>Acl</tt> for only particular <tt>Sid</tt>s if read-only
-	 * authorization decisions are being made. However, if user interface reporting or
-	 * modification of <tt>Acl</tt>s are desired, an <tt>Acl</tt> should be loaded with
-	 * all <tt>Sid</tt>s. This method denotes whether or not the specified <tt>Sid</tt>s
-	 * have been loaded or not.
-	 * </p>
-	 * @param sids one or more security identities the caller is interest in knowing
-	 * whether this <tt>Sid</tt> supports
-	 * @return <tt>true</tt> if every passed <tt>Sid</tt> is represented by this
-	 * <tt>Acl</tt> instance
-	 */
-	boolean isSidLoaded(List<Sid> sids);
+    /**
+     * This is the actual authorization logic method, and must be used whenever ACL authorization decisions are
+     * required.
+     *
+     * <p>An array of <tt>Sid</tt>s are presented, representing security identifies of the current
+     * principal. In addition, an array of <tt>Permission</tt>s is presented which will have one or more bits set
+     * in order to indicate the permissions needed for an affirmative authorization decision. An array is presented
+     * because holding <em>any</em> of the <tt>Permission</tt>s inside the array will be sufficient for an
+     * affirmative authorization.</p>
+     *
+     * <p>The actual approach used to make authorization decisions is left to the implementation and is not
+     * specified by this interface. For example, an implementation <em>MAY</em> search the current ACL in the order
+     * the ACL entries have been stored. If a single entry is found that has the same active bits as are shown in a
+     * passed <tt>Permission</tt>, that entry's grant or deny state may determine the authorization decision. If
+     * the case of a deny state, the deny decision will only be relevant if all other <tt>Permission</tt>s passed
+     * in the array have also been unsuccessfully searched. If no entry is found that match the bits in the current
+     * ACL, provided that {@link #isEntriesInheriting()} is <tt>true</tt>, the authorization decision may be
+     * passed to the parent ACL. If there is no matching entry, the implementation MAY throw an exception, or make a
+     * predefined authorization decision.</p>
+     *
+     * <p>This method must operate correctly even if the <tt>Acl</tt> only represents a subset of <tt>Sid</tt>s,
+     * although the implementation is permitted to throw one of the signature-defined exceptions if the method
+     * is called requesting an authorization decision for a {@link Sid} that was never loaded in this <tt>Acl</tt>.
+     * </p>
+     *
+     * @param permission the permission or permissions required (at least one entry required)
+     * @param sids the security identities held by the principal (at least one entry required)
+     * @param administrativeMode if <tt>true</tt> denotes the query is for administrative purposes and no logging
+     *        or auditing (if supported by the implementation) should be undertaken
+     *
+     * @return <tt>true</tt> if authorization is granted
+     *
+     * @throws NotFoundException MUST be thrown if an implementation cannot make an authoritative authorization
+     *         decision, usually because there is no ACL information for this particular permission and/or SID
+     * @throws UnloadedSidException thrown if the <tt>Acl</tt> does not have details for one or more of the
+     *         <tt>Sid</tt>s passed as arguments
+     */
+    boolean isGranted(List<Permission> permission, List<Sid> sids, boolean administrativeMode)
+        throws NotFoundException, UnloadedSidException;
 
+    /**
+     * For efficiency reasons an <tt>Acl</tt> may be loaded and <em>not</em> contain entries for every
+     * <tt>Sid</tt> in the system. If an <tt>Acl</tt> has been loaded and does not represent every
+     * <tt>Sid</tt>, all methods of the <tt>Acl</tt> can only be used within the limited scope of the
+     * <tt>Sid</tt> instances it actually represents.
+     * <p>
+     * It is normal to load an <tt>Acl</tt> for only particular <tt>Sid</tt>s if read-only authorization
+     * decisions are being made. However, if user interface reporting or modification of <tt>Acl</tt>s are
+     * desired, an <tt>Acl</tt> should be loaded with all <tt>Sid</tt>s. This method denotes whether or
+     * not the specified <tt>Sid</tt>s have been loaded or not.
+     * </p>
+     *
+     * @param sids one or more security identities the caller is interest in knowing whether this <tt>Sid</tt>
+     *        supports
+     *
+     * @return <tt>true</tt> if every passed <tt>Sid</tt> is represented by this <tt>Acl</tt> instance
+     */
+    boolean isSidLoaded(List<Sid> sids);
 }

acl/src/main/java/org/springframework/security/acls/model/AclCache.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,30 +12,31 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.security.acls.model;
 
+import org.springframework.security.acls.jdbc.JdbcAclService;
+
 import java.io.Serializable;
 
-import org.springframework.security.acls.jdbc.JdbcAclService;
 
 /**
  * A caching layer for {@link JdbcAclService}.
  *
  * @author Ben Alex
+ *
  */
 public interface AclCache {
+    //~ Methods ========================================================================================================
 
-	void evictFromCache(Serializable pk);
+    void evictFromCache(Serializable pk);
 
-	void evictFromCache(ObjectIdentity objectIdentity);
+    void evictFromCache(ObjectIdentity objectIdentity);
 
-	MutableAcl getFromCache(ObjectIdentity objectIdentity);
+    MutableAcl getFromCache(ObjectIdentity objectIdentity);
 
-	MutableAcl getFromCache(Serializable pk);
+    MutableAcl getFromCache(Serializable pk);
 
-	void putInCache(MutableAcl acl);
-
-	void clearCache();
+    void putInCache(MutableAcl acl);
 
+    void clearCache();
 }

acl/src/main/java/org/springframework/security/acls/model/AclDataAccessException.java

@@ -1,19 +1,3 @@
-/*
- * Copyright 2002-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 package org.springframework.security.acls.model;
 
 /**
@@ -24,23 +8,24 @@ package org.springframework.security.acls.model;
  */
 public abstract class AclDataAccessException extends RuntimeException {
 
-	/**
-	 * Constructs an <code>AclDataAccessException</code> with the specified message and
-	 * root cause.
-	 * @param msg the detail message
-	 * @param cause the root cause
-	 */
-	public AclDataAccessException(String msg, Throwable cause) {
-		super(msg, cause);
-	}
-
-	/**
-	 * Constructs an <code>AclDataAccessException</code> with the specified message and no
-	 * root cause.
-	 * @param msg the detail message
-	 */
-	public AclDataAccessException(String msg) {
-		super(msg);
-	}
+    /**
+     * Constructs an <code>AclDataAccessException</code> with the specified
+     * message and root cause.
+     *
+     * @param msg the detail message
+     * @param cause the root cause
+     */
+    public AclDataAccessException(String msg, Throwable cause) {
+        super(msg, cause);
+    }
 
+    /**
+     * Constructs an <code>AclDataAccessException</code> with the specified
+     * message and no root cause.
+     *
+     * @param msg the detail message
+     */
+    public AclDataAccessException(String msg) {
+        super(msg);
+    }
 }

acl/src/main/java/org/springframework/security/acls/model/AclService.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,91 +12,87 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.security.acls.model;
 
+
 import java.util.List;
 import java.util.Map;
 
+
 /**
  * Provides retrieval of {@link Acl} instances.
  *
  * @author Ben Alex
  */
 public interface AclService {
+    //~ Methods ========================================================================================================
 
-	/**
-	 * Locates all object identities that use the specified parent. This is useful for
-	 * administration tools.
-	 * @param parentIdentity to locate children of
-	 * @return the children (or <tt>null</tt> if none were found)
-	 */
-	List<ObjectIdentity> findChildren(ObjectIdentity parentIdentity);
+    /**
+     * Locates all object identities that use the specified parent.  This is useful for administration tools.
+     *
+     * @param parentIdentity to locate children of
+     *
+     * @return the children (or <tt>null</tt> if none were found)
+     */
+    List<ObjectIdentity> findChildren(ObjectIdentity parentIdentity);
 
-	/**
-	 * Same as {@link #readAclsById(List)} except it returns only a single Acl.
-	 * <p>
-	 * This method should not be called as it does not leverage the underlying
-	 * implementation's potential ability to filter <tt>Acl</tt> entries based on a
-	 * {@link Sid} parameter.
-	 * </p>
-	 * @param object to locate an {@link Acl} for
-	 * @return the {@link Acl} for the requested {@link ObjectIdentity} (never
-	 * <tt>null</tt>)
-	 * @throws NotFoundException if an {@link Acl} was not found for the requested
-	 * {@link ObjectIdentity}
-	 */
-	Acl readAclById(ObjectIdentity object) throws NotFoundException;
+    /**
+     * Same as {@link #readAclsById(List)} except it returns only a single Acl.
+     * <p>
+     * This method should not be called as it does not leverage the underlying implementation's potential ability to
+     * filter <tt>Acl</tt> entries based on a {@link Sid} parameter.</p>
+     *
+     * @param object to locate an {@link Acl} for
+     *
+     * @return the {@link Acl} for the requested {@link ObjectIdentity} (never <tt>null</tt>)
+     *
+     * @throws NotFoundException if an {@link Acl} was not found for the requested {@link ObjectIdentity}
+     */
+    Acl readAclById(ObjectIdentity object) throws NotFoundException;
 
-	/**
-	 * Same as {@link #readAclsById(List, List)} except it returns only a single Acl.
-	 * @param object to locate an {@link Acl} for
-	 * @param sids the security identities for which {@link Acl} information is required
-	 * (may be <tt>null</tt> to denote all entries)
-	 * @return the {@link Acl} for the requested {@link ObjectIdentity} (never
-	 * <tt>null</tt>)
-	 * @throws NotFoundException if an {@link Acl} was not found for the requested
-	 * {@link ObjectIdentity}
-	 */
-	Acl readAclById(ObjectIdentity object, List<Sid> sids) throws NotFoundException;
+    /**
+     * Same as {@link #readAclsById(List, List)} except it returns only a single Acl.
+     *
+     * @param object to locate an {@link Acl} for
+     * @param sids the security identities for which  {@link Acl} information is required
+     *        (may be <tt>null</tt> to denote all entries)
+     *
+     * @return the {@link Acl} for the requested {@link ObjectIdentity} (never <tt>null</tt>)
+     *
+     * @throws NotFoundException if an {@link Acl} was not found for the requested {@link ObjectIdentity}
+     */
+    Acl readAclById(ObjectIdentity object, List<Sid> sids) throws NotFoundException;
 
-	/**
-	 * Obtains all the <tt>Acl</tt>s that apply for the passed <tt>Object</tt>s.
-	 * <p>
-	 * The returned map is keyed on the passed objects, with the values being the
-	 * <tt>Acl</tt> instances. Any unknown objects will not have a map key.
-	 * </p>
-	 * @param objects the objects to find {@link Acl} information for
-	 * @return a map with exactly one element for each {@link ObjectIdentity} passed as an
-	 * argument (never <tt>null</tt>)
-	 * @throws NotFoundException if an {@link Acl} was not found for each requested
-	 * {@link ObjectIdentity}
-	 */
-	Map<ObjectIdentity, Acl> readAclsById(List<ObjectIdentity> objects) throws NotFoundException;
-
-	/**
-	 * Obtains all the <tt>Acl</tt>s that apply for the passed <tt>Object</tt>s, but only
-	 * for the security identifies passed.
-	 * <p>
-	 * Implementations <em>MAY</em> provide a subset of the ACLs via this method although
-	 * this is NOT a requirement. This is intended to allow performance optimisations
-	 * within implementations. Callers should therefore use this method in preference to
-	 * the alternative overloaded version which does not have performance optimisation
-	 * opportunities.
-	 * </p>
-	 * <p>
-	 * The returned map is keyed on the passed objects, with the values being the
-	 * <tt>Acl</tt> instances. Any unknown objects (or objects for which the interested
-	 * <tt>Sid</tt>s do not have entries) will not have a map key.
-	 * </p>
-	 * @param objects the objects to find {@link Acl} information for
-	 * @param sids the security identities for which {@link Acl} information is required
-	 * (may be <tt>null</tt> to denote all entries)
-	 * @return a map with exactly one element for each {@link ObjectIdentity} passed as an
-	 * argument (never <tt>null</tt>)
-	 * @throws NotFoundException if an {@link Acl} was not found for each requested
-	 * {@link ObjectIdentity}
-	 */
-	Map<ObjectIdentity, Acl> readAclsById(List<ObjectIdentity> objects, List<Sid> sids) throws NotFoundException;
+    /**
+     * Obtains all the <tt>Acl</tt>s that apply for the passed <tt>Object</tt>s.<p>The returned map is
+     * keyed on the passed objects, with the values being the <tt>Acl</tt> instances. Any unknown objects will not
+     * have a map key.</p>
+     *
+     * @param objects the objects to find {@link Acl} information for
+     *
+     * @return a map with exactly one element for each {@link ObjectIdentity} passed as an argument (never <tt>null</tt>)
+     *
+     * @throws NotFoundException if an {@link Acl} was not found for each requested {@link ObjectIdentity}
+     */
+    Map<ObjectIdentity, Acl> readAclsById(List<ObjectIdentity> objects) throws NotFoundException;
 
+    /**
+     * Obtains all the <tt>Acl</tt>s that apply for the passed <tt>Object</tt>s, but only for the
+     * security identifies passed.<p>Implementations <em>MAY</em> provide a subset of the ACLs via this method
+     * although this is NOT a requirement. This is intended to allow performance optimisations within implementations.
+     * Callers should therefore use this method in preference to the alternative overloaded version which does not
+     * have performance optimisation opportunities.</p>
+     *  <p>The returned map is keyed on the passed objects, with the values being the <tt>Acl</tt>
+     * instances. Any unknown objects (or objects for which the interested <tt>Sid</tt>s do not have entries) will
+     * not have a map key.</p>
+     *
+     * @param objects the objects to find {@link Acl} information for
+     * @param sids the security identities for which  {@link Acl} information is required
+     *        (may be <tt>null</tt> to denote all entries)
+     *
+     * @return a map with exactly one element for each {@link ObjectIdentity} passed as an argument (never <tt>null</tt>)
+     *
+     * @throws NotFoundException if an {@link Acl} was not found for each requested {@link ObjectIdentity}
+     */
+    Map<ObjectIdentity, Acl> readAclsById(List<ObjectIdentity> objects, List<Sid> sids) throws NotFoundException;
 }

acl/src/main/java/org/springframework/security/acls/model/AlreadyExistsException.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,32 +12,34 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.security.acls.model;
 
+
 /**
  * Thrown if an <code>Acl</code> entry already exists for the object.
  *
  * @author Ben Alex
  */
 public class AlreadyExistsException extends AclDataAccessException {
+    //~ Constructors ===================================================================================================
 
-	/**
-	 * Constructs an <code>AlreadyExistsException</code> with the specified message.
-	 * @param msg the detail message
-	 */
-	public AlreadyExistsException(String msg) {
-		super(msg);
-	}
-
-	/**
-	 * Constructs an <code>AlreadyExistsException</code> with the specified message and
-	 * root cause.
-	 * @param msg the detail message
-	 * @param cause root cause
-	 */
-	public AlreadyExistsException(String msg, Throwable cause) {
-		super(msg, cause);
-	}
+    /**
+     * Constructs an <code>AlreadyExistsException</code> with the specified message.
+     *
+     * @param msg the detail message
+     */
+    public AlreadyExistsException(String msg) {
+        super(msg);
+    }
 
+    /**
+     * Constructs an <code>AlreadyExistsException</code> with the specified message
+     * and root cause.
+     *
+     * @param msg the detail message
+     * @param t root cause
+     */
+    public AlreadyExistsException(String msg, Throwable t) {
+        super(msg, t);
+    }
 }

acl/src/main/java/org/springframework/security/acls/model/AuditableAccessControlEntry.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,18 +12,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.security.acls.model;
 
+
 /**
  * Represents an ACE that provides auditing information.
  *
  * @author Ben Alex
+ *
  */
 public interface AuditableAccessControlEntry extends AccessControlEntry {
+    //~ Methods ========================================================================================================
 
-	boolean isAuditFailure();
-
-	boolean isAuditSuccess();
+    boolean isAuditFailure();
 
+    boolean isAuditSuccess();
 }

acl/src/main/java/org/springframework/security/acls/model/AuditableAcl.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,16 +12,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.security.acls.model;
 
+
 /**
  * A mutable ACL that provides audit capabilities.
  *
  * @author Ben Alex
+ *
  */
 public interface AuditableAcl extends MutableAcl {
+    //~ Methods ========================================================================================================
 
-	void updateAuditing(int aceIndex, boolean auditSuccess, boolean auditFailure);
-
+    void updateAuditing(int aceIndex, boolean auditSuccess, boolean auditFailure);
 }

acl/src/main/java/org/springframework/security/acls/model/ChildrenExistException.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,32 +12,35 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.security.acls.model;
 
+
 /**
  * Thrown if an {@link Acl} cannot be deleted because children <code>Acl</code>s exist.
  *
  * @author Ben Alex
  */
 public class ChildrenExistException extends AclDataAccessException {
+    //~ Constructors ===================================================================================================
 
-	/**
-	 * Constructs an <code>ChildrenExistException</code> with the specified message.
-	 * @param msg the detail message
-	 */
-	public ChildrenExistException(String msg) {
-		super(msg);
-	}
-
-	/**
-	 * Constructs an <code>ChildrenExistException</code> with the specified message and
-	 * root cause.
-	 * @param msg the detail message
-	 * @param cause root cause
-	 */
-	public ChildrenExistException(String msg, Throwable cause) {
-		super(msg, cause);
-	}
+    /**
+     * Constructs an <code>ChildrenExistException</code> with the specified
+     * message.
+     *
+     * @param msg the detail message
+     */
+    public ChildrenExistException(String msg) {
+        super(msg);
+    }
 
+    /**
+     * Constructs an <code>ChildrenExistException</code> with the specified
+     * message and root cause.
+     *
+     * @param msg the detail message
+     * @param t root cause
+     */
+    public ChildrenExistException(String msg, Throwable t) {
+        super(msg, t);
+    }
 }

acl/src/main/java/org/springframework/security/acls/model/MutableAcl.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,49 +12,56 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.security.acls.model;
 
 import java.io.Serializable;
 
+
+
 /**
  * A mutable <tt>Acl</tt>.
  * <p>
- * A mutable ACL must ensure that appropriate security checks are performed before
- * allowing access to its methods.
+ * A mutable ACL must ensure that appropriate security checks are performed
+ * before allowing access to its methods.
  *
  * @author Ben Alex
  */
 public interface MutableAcl extends Acl {
+    //~ Methods ========================================================================================================
 
-	void deleteAce(int aceIndex) throws NotFoundException;
+    void deleteAce(int aceIndex) throws NotFoundException;
 
-	/**
-	 * Obtains an identifier that represents this <tt>MutableAcl</tt>.
-	 * @return the identifier, or <tt>null</tt> if unsaved
-	 */
-	Serializable getId();
+    /**
+     * Obtains an identifier that represents this <tt>MutableAcl</tt>.
+     *
+     * @return the identifier, or <tt>null</tt> if unsaved
+     */
+    Serializable getId();
 
-	void insertAce(int atIndexLocation, Permission permission, Sid sid, boolean granting) throws NotFoundException;
+    void insertAce(int atIndexLocation, Permission permission, Sid sid, boolean granting)
+        throws NotFoundException;
 
-	/**
-	 * Changes the present owner to a different owner.
-	 * @param newOwner the new owner (mandatory; cannot be null)
-	 */
-	void setOwner(Sid newOwner);
+    /**
+     * Changes the present owner to a different owner.
+     *
+     * @param newOwner the new owner (mandatory; cannot be null)
+     */
+    void setOwner(Sid newOwner);
 
-	/**
-	 * Change the value returned by {@link Acl#isEntriesInheriting()}.
-	 * @param entriesInheriting the new value
-	 */
-	void setEntriesInheriting(boolean entriesInheriting);
+    /**
+     * Change the value returned by {@link Acl#isEntriesInheriting()}.
+     *
+     * @param entriesInheriting the new value
+     */
+    void setEntriesInheriting(boolean entriesInheriting);
 
-	/**
-	 * Changes the parent of this ACL.
-	 * @param newParent the new parent
-	 */
-	void setParent(Acl newParent);
-
-	void updateAce(int aceIndex, Permission permission) throws NotFoundException;
+    /**
+     * Changes the parent of this ACL.
+     *
+     * @param newParent the new parent
+     */
+    void setParent(Acl newParent);
 
+    void updateAce(int aceIndex, Permission permission)
+        throws NotFoundException;
 }

acl/src/main/java/org/springframework/security/acls/model/MutableAclService.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,41 +12,50 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.security.acls.model;
 
+
+
 /**
  * Provides support for creating and storing <code>Acl</code> instances.
  *
  * @author Ben Alex
  */
 public interface MutableAclService extends AclService {
+    //~ Methods ========================================================================================================
 
-	/**
-	 * Creates an empty <code>Acl</code> object in the database. It will have no entries.
-	 * The returned object will then be used to add entries.
-	 * @param objectIdentity the object identity to create
-	 * @return an ACL object with its ID set
-	 * @throws AlreadyExistsException if the passed object identity already has a record
-	 */
-	MutableAcl createAcl(ObjectIdentity objectIdentity) throws AlreadyExistsException;
+    /**
+     * Creates an empty <code>Acl</code> object in the database. It will have no entries. The returned object
+     * will then be used to add entries.
+     *
+     * @param objectIdentity the object identity to create
+     *
+     * @return an ACL object with its ID set
+     *
+     * @throws AlreadyExistsException if the passed object identity already has a record
+     */
+    MutableAcl createAcl(ObjectIdentity objectIdentity)
+        throws AlreadyExistsException;
 
-	/**
-	 * Removes the specified entry from the database.
-	 * @param objectIdentity the object identity to remove
-	 * @param deleteChildren whether to cascade the delete to children
-	 * @throws ChildrenExistException if the deleteChildren argument was
-	 * <code>false</code> but children exist
-	 */
-	void deleteAcl(ObjectIdentity objectIdentity, boolean deleteChildren) throws ChildrenExistException;
-
-	/**
-	 * Changes an existing <code>Acl</code> in the database.
-	 * @param acl to modify
-	 * @throws NotFoundException if the relevant record could not be found (did you
-	 * remember to use {@link #createAcl(ObjectIdentity)} to create the object, rather
-	 * than creating it with the <code>new</code> keyword?)
-	 */
-	MutableAcl updateAcl(MutableAcl acl) throws NotFoundException;
+    /**
+     * Removes the specified entry from the database.
+     *
+     * @param objectIdentity the object identity to remove
+     * @param deleteChildren whether to cascade the delete to children
+     *
+     * @throws ChildrenExistException if the deleteChildren argument was <code>false</code> but children exist
+     */
+    void deleteAcl(ObjectIdentity objectIdentity, boolean deleteChildren)
+        throws ChildrenExistException;
 
+    /**
+     * Changes an existing <code>Acl</code> in the database.
+     *
+     * @param acl to modify
+     *
+     * @throws NotFoundException if the relevant record could not be found (did you remember to use {@link
+     *         #createAcl(ObjectIdentity)} to create the object, rather than creating it with the <code>new</code>
+     *         keyword?)
+     */
+    MutableAcl updateAcl(MutableAcl acl) throws NotFoundException;
 }

acl/src/main/java/org/springframework/security/acls/model/NotFoundException.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,32 +12,34 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.security.acls.model;
 
+
 /**
  * Thrown if an ACL-related object cannot be found.
  *
  * @author Ben Alex
  */
 public class NotFoundException extends AclDataAccessException {
+    //~ Constructors ===================================================================================================
 
-	/**
-	 * Constructs an <code>NotFoundException</code> with the specified message.
-	 * @param msg the detail message
-	 */
-	public NotFoundException(String msg) {
-		super(msg);
-	}
-
-	/**
-	 * Constructs an <code>NotFoundException</code> with the specified message and root
-	 * cause.
-	 * @param msg the detail message
-	 * @param cause root cause
-	 */
-	public NotFoundException(String msg, Throwable cause) {
-		super(msg, cause);
-	}
+    /**
+     * Constructs an <code>NotFoundException</code> with the specified message.
+     *
+     * @param msg the detail message
+     */
+    public NotFoundException(String msg) {
+        super(msg);
+    }
 
+    /**
+     * Constructs an <code>NotFoundException</code> with the specified message
+     * and root cause.
+     *
+     * @param msg the detail message
+     * @param t root cause
+     */
+    public NotFoundException(String msg, Throwable t) {
+        super(msg, t);
+    }
 }

acl/src/main/java/org/springframework/security/acls/model/ObjectIdentity.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,62 +12,60 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.security.acls.model;
 
 import java.io.Serializable;
 
+
 /**
  * Represents the identity of an individual domain object instance.
  *
  * <p>
- * As implementations of <tt>ObjectIdentity</tt> are used as the key to represent domain
- * objects in the ACL subsystem, it is essential that implementations provide methods so
- * that object-equality rather than reference-equality can be relied upon reliably. In
- * other words, the ACL subsystem can consider two <tt>ObjectIdentity</tt>s equal if
- * <tt>identity1.equals(identity2)</tt>, rather than reference-equality of
- * <tt>identity1==identity2</tt>.
+ * As implementations of <tt>ObjectIdentity</tt> are used as the key to represent
+ * domain objects in the ACL subsystem, it is essential that implementations provide
+ * methods so that object-equality rather than reference-equality can be relied upon
+ * reliably. In other words, the ACL subsystem can consider two
+ * <tt>ObjectIdentity</tt>s equal if <tt>identity1.equals(identity2)</tt>, rather than
+ * reference-equality of <tt>identity1==identity2</tt>.
  * </p>
  *
  * @author Ben Alex
  */
 public interface ObjectIdentity extends Serializable {
+    //~ Methods ========================================================================================================
 
-	/**
-	 * @param obj to be compared
-	 * @return <tt>true</tt> if the objects are equal, <tt>false</tt> otherwise
-	 * @see Object#equals(Object)
-	 */
-	@Override
-	boolean equals(Object obj);
+    /**
+     * @param obj to be compared
+     *
+     * @return <tt>true</tt> if the objects are equal, <tt>false</tt> otherwise
+     * @see Object#equals(Object)
+     */
+    boolean equals(Object obj);
 
-	/**
-	 * Obtains the actual identifier. This identifier must not be reused to represent
-	 * other domain objects with the same <tt>javaType</tt>.
-	 *
-	 * <p>
-	 * Because ACLs are largely immutable, it is strongly recommended to use a synthetic
-	 * identifier (such as a database sequence number for the primary key). Do not use an
-	 * identifier with business meaning, as that business meaning may change in the future
-	 * such change will cascade to the ACL subsystem data.
-	 * </p>
-	 * @return the identifier (unique within this <tt>type</tt>; never <tt>null</tt>)
-	 */
-	Serializable getIdentifier();
+    /**
+     * Obtains the actual identifier. This identifier must not be reused to represent other domain objects with
+     * the same <tt>javaType</tt>.
+     *
+     * <p>Because ACLs are largely immutable, it is strongly recommended to use
+     * a synthetic identifier (such as a database sequence number for the primary key). Do not use an identifier with
+     * business meaning, as that business meaning may change in the future such change will cascade to the ACL
+     * subsystem data.</p>
+     *
+     * @return the identifier (unique within this <tt>type</tt>; never <tt>null</tt>)
+     */
+    Serializable getIdentifier();
 
-	/**
-	 * Obtains the "type" metadata for the domain object. This will often be a Java type
-	 * name (an interface or a class) &ndash; traditionally it is the name of the domain
-	 * object implementation class.
-	 * @return the "type" of the domain object (never <tt>null</tt>).
-	 */
-	String getType();
-
-	/**
-	 * @return a hash code representation of the <tt>ObjectIdentity</tt>
-	 * @see Object#hashCode()
-	 */
-	@Override
-	int hashCode();
+    /**
+     * Obtains the "type" metadata for the domain object. This will often be a Java type name (an interface or a class)
+     * &ndash; traditionally it is the name of the domain object implementation class.
+     *
+     * @return the "type" of the domain object (never <tt>null</tt>).
+     */
+    String getType();
 
+    /**
+     * @return a hash code representation of the <tt>ObjectIdentity</tt>
+     * @see Object#hashCode()
+     */
+    int hashCode();
 }

acl/src/main/java/org/springframework/security/acls/model/ObjectIdentityGenerator.java

@@ -1,41 +1,26 @@
-/*
- * Copyright 2002-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 package org.springframework.security.acls.model;
 
 import java.io.Serializable;
 
+
 /**
- * Strategy which creates an {@link ObjectIdentity} from an object identifier (such as a
- * primary key) and type information.
+ * Strategy which creates an {@link ObjectIdentity} from an object identifier (such as a primary key)
+ * and type information.
  * <p>
- * Differs from {@link ObjectIdentityRetrievalStrategy} in that it is used in situations
- * when the actual object instance isn't available.
+ * Differs from {@link ObjectIdentityRetrievalStrategy} in that it is used in situations when the actual object
+ * instance isn't available.
  *
  * @author Luke Taylor
  * @since 3.0
  */
 public interface ObjectIdentityGenerator {
 
-	/**
-	 * @param id the identifier of the domain object, not null
-	 * @param type the type of the object (often a class name), not null
-	 * @return the identity constructed using the supplied identifier and type
-	 * information.
-	 */
-	ObjectIdentity createObjectIdentity(Serializable id, String type);
+    /**
+     *
+     * @param id the identifier of the domain object, not null
+     * @param type the type of the object (often a class name), not null
+     * @return the identity constructed using the supplied identifier and type information.
+     */
+    ObjectIdentity createObjectIdentity(Serializable id, String type);
 
 }

acl/src/main/java/org/springframework/security/acls/model/ObjectIdentityRetrievalStrategy.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,14 +15,16 @@
 
 package org.springframework.security.acls.model;
 
+
 /**
  * Strategy interface that provides the ability to determine which {@link ObjectIdentity}
  * will be returned for a particular domain object
  *
  * @author Ben Alex
+ *
  */
 public interface ObjectIdentityRetrievalStrategy {
+    //~ Methods ========================================================================================================
 
-	ObjectIdentity getObjectIdentity(Object domainObject);
-
+    ObjectIdentity getObjectIdentity(Object domainObject);
 }

acl/src/main/java/org/springframework/security/acls/model/OwnershipAcl.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,21 +12,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.security.acls.model;
 
+
+
 /**
  * A mutable ACL that provides ownership capabilities.
  *
  * <p>
- * Generally the owner of an ACL is able to call any ACL mutator method, as well as assign
- * a new owner.
+ * Generally the owner of an ACL is able to call any ACL mutator method, as
+ * well as assign a new owner.
  *
  * @author Ben Alex
  */
 public interface OwnershipAcl extends MutableAcl {
+    //~ Methods ========================================================================================================
 
-	@Override
-	void setOwner(Sid newOwner);
-
+    void setOwner(Sid newOwner);
 }

acl/src/main/java/org/springframework/security/acls/model/Permission.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,7 +12,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.security.acls.model;
 
 import java.io.Serializable;
@@ -24,37 +22,36 @@ import java.io.Serializable;
  * @author Ben Alex
  */
 public interface Permission extends Serializable {
+    //~ Static fields/initializers =====================================================================================
 
-	char RESERVED_ON = '~';
+    char RESERVED_ON = '~';
+    char RESERVED_OFF = '.';
+    String THIRTY_TWO_RESERVED_OFF = "................................";
 
-	char RESERVED_OFF = '.';
+    //~ Methods ========================================================================================================
 
-	String THIRTY_TWO_RESERVED_OFF = "................................";
-
-	/**
-	 * Returns the bits that represents the permission.
-	 * @return the bits that represent the permission
-	 */
-	int getMask();
-
-	/**
-	 * Returns a 32-character long bit pattern <code>String</code> representing this
-	 * permission.
-	 * <p>
-	 * Implementations are free to format the pattern as they see fit, although under no
-	 * circumstances may {@link #RESERVED_OFF} or {@link #RESERVED_ON} be used within the
-	 * pattern. An exemption is in the case of {@link #RESERVED_OFF} which is used to
-	 * denote a bit that is off (clear). Implementations may also elect to use
-	 * {@link #RESERVED_ON} internally for computation purposes, although this method may
-	 * not return any <code>String</code> containing {@link #RESERVED_ON}.
-	 * <p>
-	 * The returned String must be 32 characters in length.
-	 * <p>
-	 * This method is only used for user interface and logging purposes. It is not used in
-	 * any permission calculations. Therefore, duplication of characters within the output
-	 * is permitted.
-	 * @return a 32-character bit pattern
-	 */
-	String getPattern();
+    /**
+     * Returns the bits that represents the permission.
+     *
+     * @return the bits that represent the permission
+     */
+    int getMask();
 
+    /**
+     * Returns a 32-character long bit pattern <code>String</code> representing this permission.
+     * <p>
+     * Implementations are free to format the pattern as they see fit, although under no circumstances may
+     * {@link #RESERVED_OFF} or {@link #RESERVED_ON} be used within the pattern. An exemption is in the case of
+     * {@link #RESERVED_OFF} which is used to denote a bit that is off (clear).
+     * Implementations may also elect to use {@link #RESERVED_ON} internally for computation purposes,
+     * although this method may not return any <code>String</code> containing {@link #RESERVED_ON}.
+     * <p>
+     * The returned String must be 32 characters in length.
+     * <p>
+     * This method is only used for user interface and logging purposes. It is not used in any permission
+     * calculations. Therefore, duplication of characters within the output is permitted.
+     *
+     * @return a 32-character bit pattern
+     */
+    String getPattern();
 }

acl/src/main/java/org/springframework/security/acls/model/PermissionGrantingStrategy.java

@@ -1,36 +0,0 @@
-/*
- * Copyright 2002-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.security.acls.model;
-
-import java.util.List;
-
-/**
- * Allow customization of the logic for determining whether a permission or permissions
- * are granted to a particular sid or sids by an {@link Acl}.
- *
- * @author Luke Taylor
- * @since 3.0.2
- */
-public interface PermissionGrantingStrategy {
-
-	/**
-	 * Returns true if the supplied strategy decides that the supplied {@code Acl} grants
-	 * access based on the supplied list of permissions and sids.
-	 */
-	boolean isGranted(Acl acl, List<Permission> permission, List<Sid> sids, boolean administrativeMode);
-
-}

acl/src/main/java/org/springframework/security/acls/model/Sid.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,7 +12,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.security.acls.model;
 
 import java.io.Serializable;
@@ -22,32 +20,32 @@ import java.io.Serializable;
  * A security identity recognised by the ACL system.
  *
  * <p>
- * This interface provides indirection between actual security objects (eg principals,
- * roles, groups etc) and what is stored inside an <code>Acl</code>. This is because an
- * <code>Acl</code> will not store an entire security object, but only an abstraction of
- * it. This interface therefore provides a simple way to compare these abstracted security
+ * This interface provides indirection between actual security objects (eg
+ * principals, roles, groups etc) and what is stored inside an
+ * <code>Acl</code>. This is because an <code>Acl</code> will not store an
+ * entire security object, but only an abstraction of it. This interface
+ * therefore provides a simple way to compare these abstracted security
  * identities with other security identities and actual security objects.
  * </p>
  *
  * @author Ben Alex
  */
 public interface Sid extends Serializable {
+    //~ Methods ========================================================================================================
 
-	/**
-	 * Refer to the <code>java.lang.Object</code> documentation for the interface
-	 * contract.
-	 * @param obj to be compared
-	 * @return <code>true</code> if the objects are equal, <code>false</code> otherwise
-	 */
-	@Override
-	boolean equals(Object obj);
-
-	/**
-	 * Refer to the <code>java.lang.Object</code> documentation for the interface
-	 * contract.
-	 * @return a hash code representation of this object
-	 */
-	@Override
-	int hashCode();
+    /**
+     * Refer to the <code>java.lang.Object</code> documentation for the interface contract.
+     *
+     * @param obj to be compared
+     *
+     * @return <code>true</code> if the objects are equal, <code>false</code> otherwise
+     */
+    boolean equals(Object obj);
 
+    /**
+     * Refer to the <code>java.lang.Object</code> documentation for the interface contract.
+     *
+     * @return a hash code representation of this object
+     */
+    int hashCode();
 }

acl/src/main/java/org/springframework/security/acls/model/SidRetrievalStrategy.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -20,14 +19,15 @@ import java.util.List;
 
 import org.springframework.security.core.Authentication;
 
+
 /**
- * Strategy interface that provides an ability to determine the {@link Sid} instances
- * applicable for an {@link Authentication}.
+ * Strategy interface that provides an ability to determine the {@link Sid} instances applicable
+ * for an {@link Authentication}.
  *
  * @author Ben Alex
  */
 public interface SidRetrievalStrategy {
+    //~ Methods ========================================================================================================
 
-	List<Sid> getSids(Authentication authentication);
-
+    List<Sid> getSids(Authentication authentication);
 }

acl/src/main/java/org/springframework/security/acls/model/UnloadedSidException.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,34 +12,35 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.security.acls.model;
 
+
 /**
- * Thrown if an {@link Acl} cannot perform an operation because it only loaded a subset of
- * <code>Sid</code>s and the caller has requested details for an unloaded <code>Sid</code>
- * .
+ * Thrown if an {@link Acl} cannot perform an operation because it only loaded a subset of <code>Sid</code>s and
+ * the caller has requested details for an unloaded <code>Sid</code>.
  *
  * @author Ben Alex
  */
 public class UnloadedSidException extends AclDataAccessException {
+    //~ Constructors ===================================================================================================
 
-	/**
-	 * Constructs an <code>NotFoundException</code> with the specified message.
-	 * @param msg the detail message
-	 */
-	public UnloadedSidException(String msg) {
-		super(msg);
-	}
-
-	/**
-	 * Constructs an <code>NotFoundException</code> with the specified message and root
-	 * cause.
-	 * @param msg the detail message
-	 * @param cause root cause
-	 */
-	public UnloadedSidException(String msg, Throwable cause) {
-		super(msg, cause);
-	}
+    /**
+     * Constructs an <code>NotFoundException</code> with the specified message.
+     *
+     * @param msg the detail message
+     */
+    public UnloadedSidException(String msg) {
+        super(msg);
+    }
 
+    /**
+     * Constructs an <code>NotFoundException</code> with the specified message
+     * and root cause.
+     *
+     * @param msg the detail message
+     * @param t root cause
+     */
+    public UnloadedSidException(String msg, Throwable t) {
+        super(msg, t);
+    }
 }

acl/src/main/java/org/springframework/security/acls/model/package-info.java

@@ -1,21 +1,5 @@
-/*
- * Copyright 2002-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * 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.
- */
-
 /**
- * Interfaces and shared classes to manage access control lists (ACLs) for domain object
- * instances.
+ * Interfaces and shared classes to manage access control lists (ACLs) for domain object instances.
  */
 package org.springframework.security.acls.model;
+

acl/src/main/java/org/springframework/security/acls/package-info.java

@@ -1,27 +1,9 @@
-/*
- * Copyright 2002-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * 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.
- */
-
 /**
- * The Spring Security ACL package which implements instance-based security for domain
- * objects.
+ * The Spring Security ACL package which implements instance-based security for domain objects.
  * <p>
- * Consider using the annotation based approach ({@code @PreAuthorize},
- * {@code @PostFilter} annotations) combined with a
- * {@link org.springframework.security.acls.AclPermissionEvaluator} in preference to the
- * older and more verbose attribute/voter/after-invocation approach from versions before
- * Spring Security 3.0.
+ * Consider using the annotation based approach ({@code @PreAuthorize}, {@code @PostFilter} annotations) combined
+ * with a {@link org.springframework.security.acls.AclPermissionEvaluator} in preference to the older and more verbose
+ * attribute/voter/after-invocation approach from versions before Spring Security 3.0.
  */
 package org.springframework.security.acls;
+

acl/src/main/resources/createAclSchema.sql

@@ -5,12 +5,12 @@
 -- drop table acl_class;
 -- drop table acl_sid;
 
+
 create table acl_sid(
     id bigint generated by default as identity(start with 100) not null primary key,
     principal boolean not null,
     sid varchar_ignorecase(100) not null,
-    constraint unique_uk_1 unique(sid,principal)
-);
+    constraint unique_uk_1 unique(sid,principal));
 
 create table acl_class(
     id bigint generated by default as identity(start with 100) not null primary key,

acl/src/main/resources/createAclSchemaMySQL.sql

@@ -1,46 +0,0 @@
--- ACL Schema SQL for MySQL 5.5+ / MariaDB equivalent
-
--- drop table acl_entry;
--- drop table acl_object_identity;
--- drop table acl_class;
--- drop table acl_sid;
-
-CREATE TABLE acl_sid (
-    id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
-    principal BOOLEAN NOT NULL,
-    sid VARCHAR(100) NOT NULL,
-    UNIQUE KEY unique_acl_sid (sid, principal)
-) ENGINE=InnoDB;
-
-CREATE TABLE acl_class (
-    id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
-    class VARCHAR(100) NOT NULL,
-    UNIQUE KEY uk_acl_class (class)
-) ENGINE=InnoDB;
-
-CREATE TABLE acl_object_identity (
-    id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
-    object_id_class BIGINT UNSIGNED NOT NULL,
-    object_id_identity VARCHAR(36) NOT NULL,
-    parent_object BIGINT UNSIGNED,
-    owner_sid BIGINT UNSIGNED,
-    entries_inheriting BOOLEAN NOT NULL,
-    UNIQUE KEY uk_acl_object_identity (object_id_class, object_id_identity),
-    CONSTRAINT fk_acl_object_identity_parent FOREIGN KEY (parent_object) REFERENCES acl_object_identity (id),
-    CONSTRAINT fk_acl_object_identity_class FOREIGN KEY (object_id_class) REFERENCES acl_class (id),
-    CONSTRAINT fk_acl_object_identity_owner FOREIGN KEY (owner_sid) REFERENCES acl_sid (id)
-) ENGINE=InnoDB;
-
-CREATE TABLE acl_entry (
-    id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
-    acl_object_identity BIGINT UNSIGNED NOT NULL,
-    ace_order INTEGER NOT NULL,
-    sid BIGINT UNSIGNED NOT NULL,
-    mask INTEGER UNSIGNED NOT NULL,
-    granting BOOLEAN NOT NULL,
-    audit_success BOOLEAN NOT NULL,
-    audit_failure BOOLEAN NOT NULL,
-    UNIQUE KEY unique_acl_entry (acl_object_identity, ace_order),
-    CONSTRAINT fk_acl_entry_object FOREIGN KEY (acl_object_identity) REFERENCES acl_object_identity (id),
-    CONSTRAINT fk_acl_entry_acl FOREIGN KEY (sid) REFERENCES acl_sid (id)
-) ENGINE=InnoDB;

acl/src/main/resources/createAclSchemaOracle.sql

@@ -1,82 +0,0 @@
--- ACL Schema SQL for Oracle Database 10g+
-
--- drop trigger acl_sid_id_trigger;
--- drop trigger acl_class_id_trigger;
--- drop trigger acl_object_identity_id_trigger;
--- drop trigger acl_entry_id_trigger;
--- drop sequence acl_sid_sequence;
--- drop sequence acl_class_sequence;
--- drop sequence acl_object_identity_sequence;
--- drop sequence acl_entry_sequence;
--- drop table acl_entry;
--- drop table acl_object_identity;
--- drop table acl_class;
--- drop table acl_sid;
-
-CREATE TABLE acl_sid (
-    id NUMBER(38) NOT NULL PRIMARY KEY,
-    principal NUMBER(1) NOT NULL CHECK (principal in (0, 1)),
-    sid NVARCHAR2(100) NOT NULL,
-    CONSTRAINT unique_acl_sid UNIQUE (sid, principal)
-);
-CREATE SEQUENCE acl_sid_sequence START WITH 1 INCREMENT BY 1 NOMAXVALUE;
-CREATE OR REPLACE TRIGGER acl_sid_id_trigger
-    BEFORE INSERT ON acl_sid
-    FOR EACH ROW
-BEGIN
-    SELECT acl_sid_sequence.nextval INTO :new.id FROM dual;
-END;
-
-CREATE TABLE acl_class (
-    id NUMBER(38) NOT NULL PRIMARY KEY,
-    class NVARCHAR2(100) NOT NULL,
-    CONSTRAINT uk_acl_class UNIQUE (class)
-);
-CREATE SEQUENCE acl_class_sequence START WITH 1 INCREMENT BY 1 NOMAXVALUE;
-CREATE OR REPLACE TRIGGER acl_class_id_trigger
-    BEFORE INSERT ON acl_class
-    FOR EACH ROW
-BEGIN
-    SELECT acl_class_sequence.nextval INTO :new.id FROM dual;
-END;
-
-CREATE TABLE acl_object_identity (
-    id NUMBER(38) NOT NULL PRIMARY KEY,
-    object_id_class NUMBER(38) NOT NULL,
-    object_id_identity NVARCHAR2(36) NOT NULL,
-    parent_object NUMBER(38),
-    owner_sid NUMBER(38),
-    entries_inheriting NUMBER(1) NOT NULL CHECK (entries_inheriting in (0, 1)),
-    CONSTRAINT uk_acl_object_identity UNIQUE (object_id_class, object_id_identity),
-    CONSTRAINT fk_acl_object_identity_parent FOREIGN KEY (parent_object) REFERENCES acl_object_identity (id),
-    CONSTRAINT fk_acl_object_identity_class FOREIGN KEY (object_id_class) REFERENCES acl_class (id),
-    CONSTRAINT fk_acl_object_identity_owner FOREIGN KEY (owner_sid) REFERENCES acl_sid (id)
-);
-CREATE SEQUENCE acl_object_identity_sequence START WITH 1 INCREMENT BY 1 NOMAXVALUE;
-CREATE OR REPLACE TRIGGER acl_object_identity_id_trigger
-    BEFORE INSERT ON acl_object_identity
-    FOR EACH ROW
-BEGIN
-    SELECT acl_object_identity_sequence.nextval INTO :new.id FROM dual;
-END;
-
-CREATE TABLE acl_entry (
-    id NUMBER(38) NOT NULL PRIMARY KEY,
-    acl_object_identity NUMBER(38) NOT NULL,
-    ace_order INTEGER NOT NULL,
-    sid NUMBER(38) NOT NULL,
-    mask INTEGER NOT NULL,
-    granting NUMBER(1) NOT NULL CHECK (granting in (0, 1)),
-    audit_success NUMBER(1) NOT NULL CHECK (audit_success in (0, 1)),
-    audit_failure NUMBER(1) NOT NULL CHECK (audit_failure in (0, 1)),
-    CONSTRAINT unique_acl_entry UNIQUE (acl_object_identity, ace_order),
-    CONSTRAINT fk_acl_entry_object FOREIGN KEY (acl_object_identity) REFERENCES acl_object_identity (id),
-    CONSTRAINT fk_acl_entry_acl FOREIGN KEY (sid) REFERENCES acl_sid (id)
-);
-CREATE SEQUENCE acl_entry_sequence START WITH 1 INCREMENT BY 1 NOMAXVALUE;
-CREATE OR REPLACE TRIGGER acl_entry_id_trigger
-    BEFORE INSERT ON acl_entry
-    FOR EACH ROW
-BEGIN
-    SELECT acl_entry_sequence.nextval INTO :new.id FROM dual;
-END;

acl/src/main/resources/createAclSchemaPostgres.sql

@@ -15,14 +15,13 @@ create table acl_sid(
 create table acl_class(
     id bigserial not null primary key,
     class varchar(100) not null,
-    class_id_type varchar(100),
     constraint unique_uk_2 unique(class)
 );
 
 create table acl_object_identity(
     id bigserial primary key,
     object_id_class bigint not null,
-    object_id_identity varchar(36) not null,
+    object_id_identity bigint not null,
     parent_object bigint,
     owner_sid bigint,
     entries_inheriting boolean not null,

acl/src/main/resources/createAclSchemaSqlServer.sql

@@ -1,46 +0,0 @@
--- ACL Schema SQL for Microsoft SQL Server 2008+
-
--- drop table acl_entry;
--- drop table acl_object_identity;
--- drop table acl_class;
--- drop table acl_sid;
-
-CREATE TABLE acl_sid (
-    id BIGINT NOT NULL IDENTITY PRIMARY KEY,
-    principal BIT NOT NULL,
-    sid VARCHAR(100) NOT NULL,
-    CONSTRAINT unique_acl_sid UNIQUE (sid, principal)
-);
-
-CREATE TABLE acl_class (
-    id BIGINT NOT NULL IDENTITY PRIMARY KEY,
-    class VARCHAR(100) NOT NULL,
-    CONSTRAINT uk_acl_class UNIQUE (class)
-);
-
-CREATE TABLE acl_object_identity (
-    id BIGINT NOT NULL IDENTITY PRIMARY KEY,
-    object_id_class BIGINT NOT NULL,
-    object_id_identity VARCHAR(36) NOT NULL,
-    parent_object BIGINT,
-    owner_sid BIGINT,
-    entries_inheriting BIT NOT NULL,
-    CONSTRAINT uk_acl_object_identity UNIQUE (object_id_class, object_id_identity),
-    CONSTRAINT fk_acl_object_identity_parent FOREIGN KEY (parent_object) REFERENCES acl_object_identity (id),
-    CONSTRAINT fk_acl_object_identity_class FOREIGN KEY (object_id_class) REFERENCES acl_class (id),
-    CONSTRAINT fk_acl_object_identity_owner FOREIGN KEY (owner_sid) REFERENCES acl_sid (id)
-);
-
-CREATE TABLE acl_entry (
-    id BIGINT NOT NULL IDENTITY PRIMARY KEY,
-    acl_object_identity BIGINT NOT NULL,
-    ace_order INTEGER NOT NULL,
-    sid BIGINT NOT NULL,
-    mask INTEGER NOT NULL,
-    granting BIT NOT NULL,
-    audit_success BIT NOT NULL,
-    audit_failure BIT NOT NULL,
-    CONSTRAINT unique_acl_entry UNIQUE (acl_object_identity, ace_order),
-    CONSTRAINT fk_acl_entry_object FOREIGN KEY (acl_object_identity) REFERENCES acl_object_identity (id),
-    CONSTRAINT fk_acl_entry_acl FOREIGN KEY (sid) REFERENCES acl_sid (id)
-);

acl/src/main/resources/createAclSchemaWithAclClassIdType.sql

@@ -1,47 +0,0 @@
--- ACL schema sql used in HSQLDB
-
--- drop table acl_entry;
--- drop table acl_object_identity;
--- drop table acl_class;
--- drop table acl_sid;
-
-create table acl_sid(
-    id bigint generated by default as identity(start with 100) not null primary key,
-    principal boolean not null,
-    sid varchar_ignorecase(100) not null,
-    constraint unique_uk_1 unique(sid,principal)
-);
-
-create table acl_class(
-    id bigint generated by default as identity(start with 100) not null primary key,
-    class varchar_ignorecase(100) not null,
-    class_id_type varchar_ignorecase(100),
-    constraint unique_uk_2 unique(class)
-);
-
-create table acl_object_identity(
-    id bigint generated by default as identity(start with 100) not null primary key,
-    object_id_class bigint not null,
-    object_id_identity varchar_ignorecase(36) not null,
-    parent_object bigint,
-    owner_sid bigint,
-    entries_inheriting boolean not null,
-    constraint unique_uk_3 unique(object_id_class,object_id_identity),
-    constraint foreign_fk_1 foreign key(parent_object)references acl_object_identity(id),
-    constraint foreign_fk_2 foreign key(object_id_class)references acl_class(id),
-    constraint foreign_fk_3 foreign key(owner_sid)references acl_sid(id)
-);
-
-create table acl_entry(
-    id bigint generated by default as identity(start with 100) not null primary key,
-    acl_object_identity bigint not null,
-    ace_order int not null,
-    sid bigint not null,
-    mask integer not null,
-    granting boolean not null,
-    audit_success boolean not null,
-    audit_failure boolean not null,
-    constraint unique_uk_4 unique(acl_object_identity,ace_order),
-    constraint foreign_fk_4 foreign key(acl_object_identity) references acl_object_identity(id),
-    constraint foreign_fk_5 foreign key(sid) references acl_sid(id)
-);

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

@@ -1,92 +1,127 @@
-/*
- * Copyright 2002-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 package org.springframework.security.acls;
 
-import org.junit.jupiter.api.Test;
-
 import org.springframework.security.acls.domain.AclFormattingUtils;
 import org.springframework.security.acls.model.Permission;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
-import static org.assertj.core.api.Assertions.assertThatNoException;
+import junit.framework.Assert;
+import junit.framework.TestCase;
 
 /**
  * Tests for {@link AclFormattingUtils}.
  *
  * @author Andrei Stefan
  */
-public class AclFormattingUtilsTests {
+public class AclFormattingUtilsTests extends TestCase {
 
-	@Test
-	public final void testDemergePatternsParametersConstraints() {
-		assertThatIllegalArgumentException().isThrownBy(() -> AclFormattingUtils.demergePatterns(null, "SOME STRING"));
-		assertThatIllegalArgumentException().isThrownBy(() -> AclFormattingUtils.demergePatterns("SOME STRING", null));
-		assertThatIllegalArgumentException()
-			.isThrownBy(() -> AclFormattingUtils.demergePatterns("SOME STRING", "LONGER SOME STRING"));
-		assertThatNoException().isThrownBy(() -> AclFormattingUtils.demergePatterns("SOME STRING", "SAME LENGTH"));
-	}
+    //~ Methods ========================================================================================================
 
-	@Test
-	public final void testDemergePatterns() {
-		String original = "...........................A...R";
-		String removeBits = "...............................R";
-		assertThat(AclFormattingUtils.demergePatterns(original, removeBits))
-			.isEqualTo("...........................A....");
-		assertThat(AclFormattingUtils.demergePatterns("ABCDEF", "......")).isEqualTo("ABCDEF");
-		assertThat(AclFormattingUtils.demergePatterns("ABCDEF", "GHIJKL")).isEqualTo("......");
-	}
+    public final void testDemergePatternsParametersConstraints() throws Exception {
+        try {
+            AclFormattingUtils.demergePatterns(null, "SOME STRING");
+            Assert.fail("It should have thrown IllegalArgumentException");
+        }
+        catch (IllegalArgumentException expected) {
+            Assert.assertTrue(true);
+        }
 
-	@Test
-	public final void testMergePatternsParametersConstraints() {
-		assertThatIllegalArgumentException().isThrownBy(() -> AclFormattingUtils.mergePatterns(null, "SOME STRING"));
-		assertThatIllegalArgumentException().isThrownBy(() -> AclFormattingUtils.mergePatterns("SOME STRING", null));
-		assertThatIllegalArgumentException()
-			.isThrownBy(() -> AclFormattingUtils.mergePatterns("SOME STRING", "LONGER SOME STRING"));
-		assertThatNoException().isThrownBy(() -> AclFormattingUtils.mergePatterns("SOME STRING", "SAME LENGTH"));
-	}
+        try {
+            AclFormattingUtils.demergePatterns("SOME STRING", null);
+            Assert.fail("It should have thrown IllegalArgumentException");
+        }
+        catch (IllegalArgumentException expected) {
+            Assert.assertTrue(true);
+        }
 
-	@Test
-	public final void testMergePatterns() {
-		String original = "...............................R";
-		String extraBits = "...........................A....";
-		assertThat(AclFormattingUtils.mergePatterns(original, extraBits)).isEqualTo("...........................A...R");
-		assertThat(AclFormattingUtils.mergePatterns("ABCDEF", "......")).isEqualTo("ABCDEF");
-		assertThat(AclFormattingUtils.mergePatterns("ABCDEF", "GHIJKL")).isEqualTo("GHIJKL");
-	}
+        try {
+            AclFormattingUtils.demergePatterns("SOME STRING", "LONGER SOME STRING");
+            Assert.fail("It should have thrown IllegalArgumentException");
+        }
+        catch (IllegalArgumentException expected) {
+            Assert.assertTrue(true);
+        }
 
-	@Test
-	public final void testBinaryPrints() {
-		assertThat(AclFormattingUtils.printBinary(15)).isEqualTo("............................****");
-		assertThatIllegalArgumentException()
-			.isThrownBy(() -> AclFormattingUtils.printBinary(15, Permission.RESERVED_ON));
-		assertThatIllegalArgumentException()
-			.isThrownBy(() -> AclFormattingUtils.printBinary(15, Permission.RESERVED_OFF));
-		assertThat(AclFormattingUtils.printBinary(15, 'x')).isEqualTo("............................xxxx");
-	}
+        try {
+            AclFormattingUtils.demergePatterns("SOME STRING", "SAME LENGTH");
+            Assert.assertTrue(true);
+        }
+        catch (IllegalArgumentException notExpected) {
+            Assert.fail("It shouldn't have thrown IllegalArgumentException");
+        }
+    }
 
-	@Test
-	public void testPrintBinaryNegative() {
-		assertThat(AclFormattingUtils.printBinary(0x80000000)).isEqualTo("*...............................");
-	}
+    public final void testDemergePatterns() throws Exception {
+        String original = "...........................A...R";
+        String removeBits = "...............................R";
+        Assert.assertEquals("...........................A....", AclFormattingUtils
+                .demergePatterns(original, removeBits));
 
-	@Test
-	public void testPrintBinaryMinusOne() {
-		assertThat(AclFormattingUtils.printBinary(0xffffffff)).isEqualTo("********************************");
-	}
+        Assert.assertEquals("ABCDEF", AclFormattingUtils.demergePatterns("ABCDEF", "......"));
+        Assert.assertEquals("......", AclFormattingUtils.demergePatterns("ABCDEF", "GHIJKL"));
+    }
 
+    public final void testMergePatternsParametersConstraints() throws Exception {
+        try {
+            AclFormattingUtils.mergePatterns(null, "SOME STRING");
+            Assert.fail("It should have thrown IllegalArgumentException");
+        }
+        catch (IllegalArgumentException expected) {
+            Assert.assertTrue(true);
+        }
+
+        try {
+            AclFormattingUtils.mergePatterns("SOME STRING", null);
+            Assert.fail("It should have thrown IllegalArgumentException");
+        }
+        catch (IllegalArgumentException expected) {
+            Assert.assertTrue(true);
+        }
+
+        try {
+            AclFormattingUtils.mergePatterns("SOME STRING", "LONGER SOME STRING");
+            Assert.fail("It should have thrown IllegalArgumentException");
+        }
+        catch (IllegalArgumentException expected) {
+            Assert.assertTrue(true);
+        }
+
+        try {
+            AclFormattingUtils.mergePatterns("SOME STRING", "SAME LENGTH");
+            Assert.assertTrue(true);
+        }
+        catch (IllegalArgumentException notExpected) {
+            Assert.fail("It shouldn't have thrown IllegalArgumentException");
+        }
+    }
+
+    public final void testMergePatterns() throws Exception {
+        String original = "...............................R";
+        String extraBits = "...........................A....";
+        Assert.assertEquals("...........................A...R", AclFormattingUtils
+                .mergePatterns(original, extraBits));
+
+        Assert.assertEquals("ABCDEF", AclFormattingUtils.mergePatterns("ABCDEF", "......"));
+        Assert.assertEquals("GHIJKL", AclFormattingUtils.mergePatterns("ABCDEF", "GHIJKL"));
+    }
+
+    public final void testBinaryPrints() throws Exception {
+        Assert.assertEquals("............................****", AclFormattingUtils.printBinary(15));
+
+        try {
+            AclFormattingUtils.printBinary(15, Permission.RESERVED_ON);
+            Assert.fail("It should have thrown IllegalArgumentException");
+        }
+        catch (IllegalArgumentException notExpected) {
+            Assert.assertTrue(true);
+        }
+
+        try {
+            AclFormattingUtils.printBinary(15, Permission.RESERVED_OFF);
+            Assert.fail("It should have thrown IllegalArgumentException");
+        }
+        catch (IllegalArgumentException notExpected) {
+            Assert.assertTrue(true);
+        }
+
+        Assert.assertEquals("............................xxxx", AclFormattingUtils.printBinary(15, 'x'));
+    }
 }

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

@@ -1,74 +0,0 @@
-/*
- * Copyright 2002-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.security.acls;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.junit.jupiter.api.Test;
-
-import org.springframework.security.acls.domain.ObjectIdentityImpl;
-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.SidRetrievalStrategy;
-import org.springframework.security.core.Authentication;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.BDDMockito.given;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-
-/**
- * @author Luke Taylor
- */
-@SuppressWarnings({ "unchecked" })
-public class AclPermissionCacheOptimizerTests {
-
-	@Test
-	public void eagerlyLoadsRequiredAcls() {
-		AclService service = mock(AclService.class);
-		AclPermissionCacheOptimizer pco = new AclPermissionCacheOptimizer(service);
-		ObjectIdentityRetrievalStrategy oidStrat = mock(ObjectIdentityRetrievalStrategy.class);
-		SidRetrievalStrategy sidStrat = mock(SidRetrievalStrategy.class);
-		pco.setObjectIdentityRetrievalStrategy(oidStrat);
-		pco.setSidRetrievalStrategy(sidStrat);
-		Object[] dos = { new Object(), null, new Object() };
-		ObjectIdentity[] oids = { new ObjectIdentityImpl("A", "1"), new ObjectIdentityImpl("A", "2") };
-		given(oidStrat.getObjectIdentity(dos[0])).willReturn(oids[0]);
-		given(oidStrat.getObjectIdentity(dos[2])).willReturn(oids[1]);
-		pco.cachePermissionsFor(mock(Authentication.class), Arrays.asList(dos));
-		// AclService should be invoked with the list of required Oids
-		verify(service).readAclsById(eq(Arrays.asList(oids)), any(List.class));
-	}
-
-	@Test
-	public void ignoresEmptyCollection() {
-		AclService service = mock(AclService.class);
-		AclPermissionCacheOptimizer pco = new AclPermissionCacheOptimizer(service);
-		ObjectIdentityRetrievalStrategy oids = mock(ObjectIdentityRetrievalStrategy.class);
-		SidRetrievalStrategy sids = mock(SidRetrievalStrategy.class);
-		pco.setObjectIdentityRetrievalStrategy(oids);
-		pco.setSidRetrievalStrategy(sids);
-		pco.cachePermissionsFor(mock(Authentication.class), Collections.emptyList());
-		verifyNoMoreInteractions(service, sids, oids);
-	}
-
-}

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

@@ -1,25 +1,10 @@
-/*
- * Copyright 2002-2018 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 org.springframework.security.acls;
 
-import java.util.Locale;
-
-import org.junit.jupiter.api.Test;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.*;
+import static org.mockito.Mockito.*;
 
+import org.junit.Test;
 import org.springframework.security.acls.model.Acl;
 import org.springframework.security.acls.model.AclService;
 import org.springframework.security.acls.model.ObjectIdentity;
@@ -27,50 +12,28 @@ import org.springframework.security.acls.model.ObjectIdentityRetrievalStrategy;
 import org.springframework.security.acls.model.SidRetrievalStrategy;
 import org.springframework.security.core.Authentication;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyList;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.BDDMockito.given;
-import static org.mockito.Mockito.mock;
-
 /**
+ *
  * @author Luke Taylor
  * @since 3.0
  */
 public class AclPermissionEvaluatorTests {
 
-	@Test
-	public void hasPermissionReturnsTrueIfAclGrantsPermission() {
-		AclService service = mock(AclService.class);
-		AclPermissionEvaluator pe = new AclPermissionEvaluator(service);
-		ObjectIdentity oid = mock(ObjectIdentity.class);
-		ObjectIdentityRetrievalStrategy oidStrategy = mock(ObjectIdentityRetrievalStrategy.class);
-		given(oidStrategy.getObjectIdentity(any(Object.class))).willReturn(oid);
-		pe.setObjectIdentityRetrievalStrategy(oidStrategy);
-		pe.setSidRetrievalStrategy(mock(SidRetrievalStrategy.class));
-		Acl acl = mock(Acl.class);
-		given(service.readAclById(any(ObjectIdentity.class), anyList())).willReturn(acl);
-		given(acl.isGranted(anyList(), anyList(), eq(false))).willReturn(true);
-		assertThat(pe.hasPermission(mock(Authentication.class), new Object(), "READ")).isTrue();
-	}
+    @Test
+    @SuppressWarnings("unchecked")
+    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(anyObject())).thenReturn(oid);
+        pe.setObjectIdentityRetrievalStrategy(oidStrategy);
+        pe.setSidRetrievalStrategy(mock(SidRetrievalStrategy.class));
+        Acl acl = mock(Acl.class);
 
-	@Test
-	public void resolvePermissionNonEnglishLocale() {
-		Locale systemLocale = Locale.getDefault();
-		Locale.setDefault(new Locale("tr"));
-		AclService service = mock(AclService.class);
-		AclPermissionEvaluator pe = new AclPermissionEvaluator(service);
-		ObjectIdentity oid = mock(ObjectIdentity.class);
-		ObjectIdentityRetrievalStrategy oidStrategy = mock(ObjectIdentityRetrievalStrategy.class);
-		given(oidStrategy.getObjectIdentity(any(Object.class))).willReturn(oid);
-		pe.setObjectIdentityRetrievalStrategy(oidStrategy);
-		pe.setSidRetrievalStrategy(mock(SidRetrievalStrategy.class));
-		Acl acl = mock(Acl.class);
-		given(service.readAclById(any(ObjectIdentity.class), anyList())).willReturn(acl);
-		given(acl.isGranted(anyList(), anyList(), eq(false))).willReturn(true);
-		assertThat(pe.hasPermission(mock(Authentication.class), new Object(), "write")).isTrue();
-		Locale.setDefault(systemLocale);
-	}
+        when(service.readAclById(any(ObjectIdentity.class), anyList())).thenReturn(acl);
+        when(acl.isGranted(anyList(), anyList(), eq(false))).thenReturn(true);
 
+        assertTrue(pe.hasPermission(mock(Authentication.class), new Object(), "READ"));
+    }
 }

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

@@ -1,19 +1,3 @@
-/*
- * Copyright 2002-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 package org.springframework.security.acls;
 
 /**

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

@@ -1,38 +0,0 @@
-/*
- * Copyright 2002-2017 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.security.acls;
-
-import java.util.UUID;
-
-/**
- * Dummy domain object class with a {@link UUID} for the Id.
- *
- * @author Luke Taylor
- */
-public final class TargetObjectWithUUID {
-
-	private UUID id;
-
-	public UUID getId() {
-		return this.id;
-	}
-
-	public void setId(UUID id) {
-		this.id = id;
-	}
-
-}