diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar deleted file mode 100755 index 01e6799..0000000 Binary files a/.mvn/wrapper/maven-wrapper.jar and /dev/null differ diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties deleted file mode 100755 index 4cd6cde..0000000 --- a/.mvn/wrapper/maven-wrapper.properties +++ /dev/null @@ -1,2 +0,0 @@ -#Fri Sep 10 15:38:03 CEST 2021 -distributionUrl=https\://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.2/apache-maven-3.8.2-bin.zip diff --git a/CI.adoc b/CI.adoc deleted file mode 100644 index 87259b6..0000000 --- a/CI.adoc +++ /dev/null @@ -1,43 +0,0 @@ -= Continuous Integration - -image:https://jenkins.spring.io/buildStatus/icon?job=spring-data-envers%2Fmain&subject=Moore%20(main)[link=https://jenkins.spring.io/view/SpringData/job/spring-data-envers/] -image:https://jenkins.spring.io/buildStatus/icon?job=spring-data-envers%2F2.1.x&subject=Lovelace%20(2.1.x)[link=https://jenkins.spring.io/view/SpringData/job/spring-data-envers/] -image:https://jenkins.spring.io/buildStatus/icon?job=spring-data-envers%2F1.1.x&subject=Ingalls%20(1.1.x)[link=https://jenkins.spring.io/view/SpringData/job/spring-data-envers/] - -== Running CI tasks locally - -Since this pipeline is purely Docker-based, it's easy to: - -* Debug what went wrong on your local machine. -* Test out a a tweak to your `test.sh` script before sending it out. -* Experiment against a new image before submitting your pull request. - -All of these use cases are great reasons to essentially run what the CI server does on your local machine. - -IMPORTANT: To do this you must have Docker installed on your machine. - -1. `docker run -it --mount type=bind,source="$(pwd)",target=/spring-data-envers-github adoptopenjdk/openjdk8:latest /bin/bash` -+ -This will launch the Docker image and mount your source code at `spring-data-envers-github`. -+ -2. `cd spring-data-envers-github` -+ -Next, run your tests from inside the container: -+ -3. `./mvnw clean dependency:list test -Dsort` (or whatever profile you need to test out) - -Since the container is binding to your source, you can make edits from your IDE and continue to run build jobs. - -If you test building the artifact, do this: - -1. `docker run -it --mount type=bind,source="$(pwd)",target=/spring-data-envers-github adoptopenjdk/openjdk8:latest /bin/bash` -+ -This will launch the Docker image and mount your source code at `spring-data-envers-github`. -+ -2. `cd spring-data-envers-github` -+ -Next, try to package everything up from inside the container: -+ -3. `./mvnw -Pci,snapshot -Dmaven.test.skip=true clean package` - -NOTE: Docker containers can eat up disk space fast! From time to time, run `docker system prune` to clean out old images. diff --git a/CONTRIBUTING.adoc b/CONTRIBUTING.adoc deleted file mode 100644 index 740e8bd..0000000 --- a/CONTRIBUTING.adoc +++ /dev/null @@ -1,3 +0,0 @@ -= Spring Data contribution guidelines - -You find the contribution guidelines for Spring Data projects https://github.com/spring-projects/spring-data-build/blob/main/CONTRIBUTING.adoc[here]. diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index df1c19f..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,118 +0,0 @@ -pipeline { - agent none - - triggers { - pollSCM 'H/10 * * * *' - upstream(upstreamProjects: "spring-data-jpa/3.0.x", threshold: hudson.model.Result.SUCCESS) - } - - options { - disableConcurrentBuilds() - buildDiscarder(logRotator(numToKeepStr: '14')) - } - - stages { - stage("test: baseline (jdk17)") { - when { - anyOf { - branch 'main' - not { triggeredBy 'UpstreamCause' } - } - } - agent { - label 'data' - } - options { timeout(time: 30, unit: 'MINUTES') } - environment { - ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c') - } - steps { - script { - docker.withRegistry('', 'hub.docker.com-springbuildmaster') { - docker.image('openjdk:17-bullseye').inside('-v $HOME:/tmp/jenkins-home') { - sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list test -Dsort -U -B' - } - } - } - } - } - - stage('Release to artifactory') { - when { - anyOf { - branch 'main' - not { triggeredBy 'UpstreamCause' } - } - } - agent { - label 'data' - } - options { timeout(time: 20, unit: 'MINUTES') } - - environment { - ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c') - } - - steps { - script { - docker.withRegistry('', 'hub.docker.com-springbuildmaster') { - docker.image('openjdk:17-bullseye').inside('-v $HOME:/tmp/jenkins-home') { - sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' + - '-Dartifactory.server=https://repo.spring.io ' + - "-Dartifactory.username=${ARTIFACTORY_USR} " + - "-Dartifactory.password=${ARTIFACTORY_PSW} " + - "-Dartifactory.staging-repository=libs-snapshot-local " + - "-Dartifactory.build-name=spring-data-envers " + - "-Dartifactory.build-number=${BUILD_NUMBER} " + - '-Dmaven.test.skip=true clean deploy -U -B' - } - } - } - } - } - stage('Publish documentation') { - when { - branch 'main' - } - agent { - label 'data' - } - options { timeout(time: 20, unit: 'MINUTES') } - - environment { - ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c') - } - - steps { - script { - docker.withRegistry('', 'hub.docker.com-springbuildmaster') { - docker.image('openjdk:17-bullseye').inside('-v $HOME:/tmp/jenkins-home') { - sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,distribute ' + - '-Dartifactory.server=https://repo.spring.io ' + - "-Dartifactory.username=${ARTIFACTORY_USR} " + - "-Dartifactory.password=${ARTIFACTORY_PSW} " + - "-Dartifactory.distribution-repository=temp-private-local " + - '-Dmaven.test.skip=true clean deploy -U -B' - } - } - } - } - } - } - - post { - changed { - script { - slackSend( - color: (currentBuild.currentResult == 'SUCCESS') ? 'good' : 'danger', - channel: '#spring-data-dev', - message: "${currentBuild.fullDisplayName} - `${currentBuild.currentResult}`\n${env.BUILD_URL}") - emailext( - subject: "[${currentBuild.fullDisplayName}] ${currentBuild.currentResult}", - mimeType: 'text/html', - recipientProviders: [[$class: 'CulpritsRecipientProvider'], [$class: 'RequesterRecipientProvider']], - body: "${currentBuild.fullDisplayName} is reported as ${currentBuild.currentResult}") - } - } - } -} diff --git a/README.adoc b/README.adoc index 918c85f..7e63355 100644 --- a/README.adoc +++ b/README.adoc @@ -1,138 +1,6 @@ -image:https://spring.io/badges/spring-data-envers/ga.svg[title=Spring Data Envers,link=https://projects.spring.io/spring-data-envers#quick-start] -image:https://spring.io/badges/spring-data-envers/snapshot.svg[title=Spring Data Envers,link=https://projects.spring.io/spring-data-envers#quick-start] += Spring Data Envers -= Spring Data Envers image:https://jenkins.spring.io/buildStatus/icon?job=spring-data-envers%2Fmain&subject=Build[link=https://jenkins.spring.io/view/SpringData/job/spring-data-envers/] https://gitter.im/spring-projects/spring-data[image:https://badges.gitter.im/spring-projects/spring-data.svg[Gitter]] - -This project is an extension of the https://github.com/SpringSource/spring-data-jpa[Spring Data JPA] project to allow access to entity revisions managed by Hibernate Envers.The sources mostly originate from a contribution of Philipp Hügelmeyer https://github.com/hygl[@hygl]. - -The core feature of the module consists of an implementation of the `RevisionRepository` of Spring Data Commons. - -== Code of Conduct - -This project is governed by the https://github.com/spring-projects/.github/blob/e3cc2ff230d8f1dca06535aa6b5a4a23815861d4/CODE_OF_CONDUCT.md[Spring Code of Conduct]. By participating, you are expected to uphold this code of conduct. Please report unacceptable behavior to spring-code-of-conduct@pivotal.io. - -== Getting Started - -[source,java] ----- -public interface RevisionRepository> { - - Revision findLastChangeRevision(ID id); - - Revisions findRevisions(ID id); - - Page> findRevisions(ID id, Pageable pageable); -} ----- - -You can pull in this functionality to your repositories by simply additionally extending the interface just mentioned: - -[source,java] ----- -interface PersonRepository extends RevisionRepository, CrudRepository { - - // Your query methods go here -} ----- - -To activate the Spring Data Envers repositories, use the Spring Data Envers' `EnableEnversRepositories` annotation: - -[source,java] ----- -@Configuration -@EnableEnversRepositories -public class ApplicationConfiguration { - - // Your configuration beans - -} ----- - -or use the Spring Data JPA repositories namespace element's `factory-class` attribute, in case of XML configuration: - -[source,xml] ----- - ----- - -=== Maven configuration - -Add the Maven dependency: - -[source,xml] ----- - - org.springframework.data - spring-data-envers - ${version}.RELEASE - ----- - -If you'd rather like the latest snapshots of the upcoming major version, use our Maven snapshot repository and declare the appropriate dependency version. - -[source,xml] ----- - - org.springframework.data - spring-data-envers - ${version}.BUILD-SNAPSHOT - - - - spring-libs-snapshot - Spring Snapshot Repository - https://repo.spring.io/libs-snapshot - ----- - -== Getting Help - -Having trouble with Spring Data? We’d love to help! - -* Check the -https://docs.spring.io/spring-data/envers/docs/current/reference/html/[reference documentation], and https://docs.spring.io/spring-data/envers/docs/current/api/[Javadocs]. -* Learn the Spring basics – Spring Data builds on Spring Framework, check the https://spring.io[spring.io] web-site for a wealth of reference documentation. -If you are just starting out with Spring, try one of the https://spring.io/guides[guides]. -* Ask a question - we monitor https://stackoverflow.com[stackoverflow.com] for questions tagged with https://stackoverflow.com/tags/spring-data-envers[`spring-data-envers`]. -You can also chat with the community on https://gitter.im/spring-projects/spring-data[Gitter]. -* Report bugs with Spring Data envers at https://github.com/spring-projects/spring-data-envers/issues[github.com/spring-projects/spring-data-envers/issues]. - -== Reporting Issues - -Spring Data uses GitHub as issue tracking system to record bugs and feature requests. If you want to raise an issue, please follow the recommendations below: - -* Before you log a bug, please search the -https://github.com/spring-projects/spring-data-envers/issues[issue tracker] to see if someone has already reported the problem. -* If the issue doesn’t already exist, https://github.com/spring-projects/spring-data-envers/issues/new[create a new issue]. -* Please provide as much information as possible with the issue report, we like to know the version of Spring Data that you are using and JVM version. -* If you need to paste code, or include a stack trace use Markdown +++```+++ escapes before and after your text. -* If possible try to create a test-case or project that replicates the issue. Attach a link to your code or a compressed file containing your code. - -== Building from Source - -You don’t need to build from source to use Spring Data (binaries in https://repo.spring.io[repo.spring.io]), but if you want to try out the latest and greatest, Spring Data can be easily built with the https://github.com/takari/maven-wrapper[maven wrapper]. -You also need JDK 1.8. - -[source,bash] ----- - $ ./mvnw clean install ----- - -If you want to build with the regular `mvn` command, you will need https://maven.apache.org/run-maven/index.html[Maven v3.5.0 or above]. - -_Also see link:CONTRIBUTING.adoc[CONTRIBUTING.adoc] if you wish to submit pull requests, and in particular please sign the https://cla.pivotal.io/sign/spring[Contributor’s Agreement] before your first non-trivial change._ - -=== Building reference documentation - -Building the documentation builds also the project without running tests. - -[source,bash] ----- - $ ./mvnw clean install -Pdistribute ----- - -The generated documentation is available from `target/site/reference/html/index.html`. +This project is now part of https://github.com/spring-projects/spring-data-jpa[Spring Data JPA 3.0]. == License diff --git a/SECURITY.adoc b/SECURITY.adoc index f8864a7..132faa9 100644 --- a/SECURITY.adoc +++ b/SECURITY.adoc @@ -2,7 +2,7 @@ ## Supported Versions -Please see the https://spring.io/projects/spring-data-envers[Spring Data Envers] project page for supported versions. +Please see the https://spring.io/projects/spring-data-jpa[Spring Data JPA] project page for supported versions. ## Reporting a Vulnerability diff --git a/etc/eclipse-formatter.xml b/etc/eclipse-formatter.xml deleted file mode 100644 index c744687..0000000 --- a/etc/eclipse-formatter.xml +++ /dev/null @@ -1,291 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/mvnw b/mvnw deleted file mode 100755 index 8b9da3b..0000000 --- a/mvnw +++ /dev/null @@ -1,286 +0,0 @@ -#!/bin/sh -# ---------------------------------------------------------------------------- -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# 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. -# ---------------------------------------------------------------------------- - -# ---------------------------------------------------------------------------- -# Maven2 Start Up Batch script -# -# Required ENV vars: -# ------------------ -# JAVA_HOME - location of a JDK home dir -# -# Optional ENV vars -# ----------------- -# M2_HOME - location of maven2's installed home dir -# MAVEN_OPTS - parameters passed to the Java VM when running Maven -# e.g. to debug Maven itself, use -# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -# MAVEN_SKIP_RC - flag to disable loading of mavenrc files -# ---------------------------------------------------------------------------- - -if [ -z "$MAVEN_SKIP_RC" ] ; then - - if [ -f /etc/mavenrc ] ; then - . /etc/mavenrc - fi - - if [ -f "$HOME/.mavenrc" ] ; then - . "$HOME/.mavenrc" - fi - -fi - -# OS specific support. $var _must_ be set to either true or false. -cygwin=false; -darwin=false; -mingw=false -case "`uname`" in - CYGWIN*) cygwin=true ;; - MINGW*) mingw=true;; - Darwin*) darwin=true - # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home - # See https://developer.apple.com/library/mac/qa/qa1170/_index.html - if [ -z "$JAVA_HOME" ]; then - if [ -x "/usr/libexec/java_home" ]; then - export JAVA_HOME="`/usr/libexec/java_home`" - else - export JAVA_HOME="/Library/Java/Home" - fi - fi - ;; -esac - -if [ -z "$JAVA_HOME" ] ; then - if [ -r /etc/gentoo-release ] ; then - JAVA_HOME=`java-config --jre-home` - fi -fi - -if [ -z "$M2_HOME" ] ; then - ## resolve links - $0 may be a link to maven's home - PRG="$0" - - # need this for relative symlinks - while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG="`dirname "$PRG"`/$link" - fi - done - - saveddir=`pwd` - - M2_HOME=`dirname "$PRG"`/.. - - # make it fully qualified - M2_HOME=`cd "$M2_HOME" && pwd` - - cd "$saveddir" - # echo Using m2 at $M2_HOME -fi - -# For Cygwin, ensure paths are in UNIX format before anything is touched -if $cygwin ; then - [ -n "$M2_HOME" ] && - M2_HOME=`cygpath --unix "$M2_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --unix "$JAVA_HOME"` - [ -n "$CLASSPATH" ] && - CLASSPATH=`cygpath --path --unix "$CLASSPATH"` -fi - -# For Mingw, ensure paths are in UNIX format before anything is touched -if $mingw ; then - [ -n "$M2_HOME" ] && - M2_HOME="`(cd "$M2_HOME"; pwd)`" - [ -n "$JAVA_HOME" ] && - JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" - # TODO classpath? -fi - -if [ -z "$JAVA_HOME" ]; then - javaExecutable="`which javac`" - if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then - # readlink(1) is not available as standard on Solaris 10. - readLink=`which readlink` - if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then - if $darwin ; then - javaHome="`dirname \"$javaExecutable\"`" - javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" - else - javaExecutable="`readlink -f \"$javaExecutable\"`" - fi - javaHome="`dirname \"$javaExecutable\"`" - javaHome=`expr "$javaHome" : '\(.*\)/bin'` - JAVA_HOME="$javaHome" - export JAVA_HOME - fi - fi -fi - -if [ -z "$JAVACMD" ] ; then - if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - else - JAVACMD="`which java`" - fi -fi - -if [ ! -x "$JAVACMD" ] ; then - echo "Error: JAVA_HOME is not defined correctly." >&2 - echo " We cannot execute $JAVACMD" >&2 - exit 1 -fi - -if [ -z "$JAVA_HOME" ] ; then - echo "Warning: JAVA_HOME environment variable is not set." -fi - -CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher - -# traverses directory structure from process work directory to filesystem root -# first directory with .mvn subdirectory is considered project base directory -find_maven_basedir() { - - if [ -z "$1" ] - then - echo "Path not specified to find_maven_basedir" - return 1 - fi - - basedir="$1" - wdir="$1" - while [ "$wdir" != '/' ] ; do - if [ -d "$wdir"/.mvn ] ; then - basedir=$wdir - break - fi - # workaround for JBEAP-8937 (on Solaris 10/Sparc) - if [ -d "${wdir}" ]; then - wdir=`cd "$wdir/.."; pwd` - fi - # end of workaround - done - echo "${basedir}" -} - -# concatenates all lines of a file -concat_lines() { - if [ -f "$1" ]; then - echo "$(tr -s '\n' ' ' < "$1")" - fi -} - -BASE_DIR=`find_maven_basedir "$(pwd)"` -if [ -z "$BASE_DIR" ]; then - exit 1; -fi - -########################################################################################## -# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central -# This allows using the maven wrapper in projects that prohibit checking in binary data. -########################################################################################## -if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then - if [ "$MVNW_VERBOSE" = true ]; then - echo "Found .mvn/wrapper/maven-wrapper.jar" - fi -else - if [ "$MVNW_VERBOSE" = true ]; then - echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." - fi - jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar" - while IFS="=" read key value; do - case "$key" in (wrapperUrl) jarUrl="$value"; break ;; - esac - done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" - if [ "$MVNW_VERBOSE" = true ]; then - echo "Downloading from: $jarUrl" - fi - wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" - - if command -v wget > /dev/null; then - if [ "$MVNW_VERBOSE" = true ]; then - echo "Found wget ... using wget" - fi - wget "$jarUrl" -O "$wrapperJarPath" - elif command -v curl > /dev/null; then - if [ "$MVNW_VERBOSE" = true ]; then - echo "Found curl ... using curl" - fi - curl -o "$wrapperJarPath" "$jarUrl" - else - if [ "$MVNW_VERBOSE" = true ]; then - echo "Falling back to using Java to download" - fi - javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" - if [ -e "$javaClass" ]; then - if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then - if [ "$MVNW_VERBOSE" = true ]; then - echo " - Compiling MavenWrapperDownloader.java ..." - fi - # Compiling the Java class - ("$JAVA_HOME/bin/javac" "$javaClass") - fi - if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then - # Running the downloader - if [ "$MVNW_VERBOSE" = true ]; then - echo " - Running MavenWrapperDownloader.java ..." - fi - ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") - fi - fi - fi -fi -########################################################################################## -# End of extension -########################################################################################## - -export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} -if [ "$MVNW_VERBOSE" = true ]; then - echo $MAVEN_PROJECTBASEDIR -fi -MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" - -# For Cygwin, switch paths to Windows format before running java -if $cygwin; then - [ -n "$M2_HOME" ] && - M2_HOME=`cygpath --path --windows "$M2_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` - [ -n "$CLASSPATH" ] && - CLASSPATH=`cygpath --path --windows "$CLASSPATH"` - [ -n "$MAVEN_PROJECTBASEDIR" ] && - MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` -fi - -WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -exec "$JAVACMD" \ - $MAVEN_OPTS \ - -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ - "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ - ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/mvnw.cmd b/mvnw.cmd deleted file mode 100755 index fef5a8f..0000000 --- a/mvnw.cmd +++ /dev/null @@ -1,161 +0,0 @@ -@REM ---------------------------------------------------------------------------- -@REM Licensed to the Apache Software Foundation (ASF) under one -@REM or more contributor license agreements. See the NOTICE file -@REM distributed with this work for additional information -@REM regarding copyright ownership. The ASF licenses this file -@REM to you under the Apache License, Version 2.0 (the -@REM "License"); you may not use this file except in compliance -@REM with the License. You may obtain a copy of the License at -@REM -@REM https://www.apache.org/licenses/LICENSE-2.0 -@REM -@REM Unless required by applicable law or agreed to in writing, -@REM software distributed under the License is distributed on an -@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -@REM KIND, either express or implied. See the License for the -@REM specific language governing permissions and limitations -@REM under the License. -@REM ---------------------------------------------------------------------------- - -@REM ---------------------------------------------------------------------------- -@REM Maven2 Start Up Batch script -@REM -@REM Required ENV vars: -@REM JAVA_HOME - location of a JDK home dir -@REM -@REM Optional ENV vars -@REM M2_HOME - location of maven2's installed home dir -@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands -@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending -@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven -@REM e.g. to debug Maven itself, use -@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files -@REM ---------------------------------------------------------------------------- - -@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' -@echo off -@REM set title of command window -title %0 -@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on' -@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% - -@REM set %HOME% to equivalent of $HOME -if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") - -@REM Execute a user defined script before this one -if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre -@REM check for pre script, once with legacy .bat ending and once with .cmd ending -if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" -if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" -:skipRcPre - -@setlocal - -set ERROR_CODE=0 - -@REM To isolate internal variables from possible post scripts, we use another setlocal -@setlocal - -@REM ==== START VALIDATION ==== -if not "%JAVA_HOME%" == "" goto OkJHome - -echo. -echo Error: JAVA_HOME not found in your environment. >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -:OkJHome -if exist "%JAVA_HOME%\bin\java.exe" goto init - -echo. -echo Error: JAVA_HOME is set to an invalid directory. >&2 -echo JAVA_HOME = "%JAVA_HOME%" >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -@REM ==== END VALIDATION ==== - -:init - -@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". -@REM Fallback to current working directory if not found. - -set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% -IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir - -set EXEC_DIR=%CD% -set WDIR=%EXEC_DIR% -:findBaseDir -IF EXIST "%WDIR%"\.mvn goto baseDirFound -cd .. -IF "%WDIR%"=="%CD%" goto baseDirNotFound -set WDIR=%CD% -goto findBaseDir - -:baseDirFound -set MAVEN_PROJECTBASEDIR=%WDIR% -cd "%EXEC_DIR%" -goto endDetectBaseDir - -:baseDirNotFound -set MAVEN_PROJECTBASEDIR=%EXEC_DIR% -cd "%EXEC_DIR%" - -:endDetectBaseDir - -IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig - -@setlocal EnableExtensions EnableDelayedExpansion -for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a -@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% - -:endReadAdditionalConfig - -SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" -set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" -set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar" -FOR /F "tokens=1,2 delims==" %%A IN (%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties) DO ( - IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B -) - -@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central -@REM This allows using the maven wrapper in projects that prohibit checking in binary data. -if exist %WRAPPER_JAR% ( - echo Found %WRAPPER_JAR% -) else ( - echo Couldn't find %WRAPPER_JAR%, downloading it ... - echo Downloading from: %DOWNLOAD_URL% - powershell -Command "(New-Object Net.WebClient).DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')" - echo Finished downloading %WRAPPER_JAR% -) -@REM End of extension - -%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* -if ERRORLEVEL 1 goto error -goto end - -:error -set ERROR_CODE=1 - -:end -@endlocal & set ERROR_CODE=%ERROR_CODE% - -if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost -@REM check for post script, once with legacy .bat ending and once with .cmd ending -if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" -if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" -:skipRcPost - -@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' -if "%MAVEN_BATCH_PAUSE%" == "on" pause - -if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% - -exit /B %ERROR_CODE% diff --git a/pom.xml b/pom.xml deleted file mode 100755 index e6da4b5..0000000 --- a/pom.xml +++ /dev/null @@ -1,126 +0,0 @@ - - - 4.0.0 - - org.springframework.data - spring-data-envers - 3.0.0-SNAPSHOT - - - org.springframework.data.build - spring-data-parent - 3.0.0-SNAPSHOT - - - - Spring Data Envers - Spring Data extension to work with Hibernate Envers - https://github.com/SpringSource/spring-data-envers - - - - Oliver Gierke - ogierke@pivotal.io - Pivotal Software, Inc. - www.spring.io - - - Philip Huegelmeyer - philip.huegelmeyer@ble.de - BLE - www.ble.de - - - Michael Igler - michael.igler@forward-tech.de - Freelancer - - - Jens Schauder - jschauder@vmware.com - VMware, Inc. - www.spring.io - - - - - https://github.com/SpringSource/spring-data-envers - - - - 2.6.0-SNAPSHOT - 5.5.3.Final - spring.data.envers - - - - - - org.springframework.data - spring-data-jpa - ${springdata.jpa} - - - - - org.hibernate - hibernate-envers - ${hibernate.envers} - - - - - com.querydsl - querydsl-apt - ${querydsl} - provided - - - - com.querydsl - querydsl-jpa - ${querydsl} - true - - - - - com.h2database - h2 - 1.4.200 - test - - - - - - - - - org.apache.maven.plugins - maven-assembly-plugin - - - org.asciidoctor - asciidoctor-maven-plugin - - - - - - - - spring-libs-snapshot - https://repo.spring.io/libs-snapshot - - - - - - spring-plugins-release - https://repo.spring.io/plugins-release - - - - diff --git a/settings.xml b/settings.xml deleted file mode 100644 index b3227cc..0000000 --- a/settings.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - spring-plugins-release - ${env.ARTIFACTORY_USR} - ${env.ARTIFACTORY_PSW} - - - spring-libs-snapshot - ${env.ARTIFACTORY_USR} - ${env.ARTIFACTORY_PSW} - - - spring-libs-milestone - ${env.ARTIFACTORY_USR} - ${env.ARTIFACTORY_PSW} - - - spring-libs-release - ${env.ARTIFACTORY_USR} - ${env.ARTIFACTORY_PSW} - - - - \ No newline at end of file diff --git a/src/main/asciidoc/envers.adoc b/src/main/asciidoc/envers.adoc deleted file mode 100644 index 534ae9c..0000000 --- a/src/main/asciidoc/envers.adoc +++ /dev/null @@ -1,201 +0,0 @@ -[[envers.what.is.spring.data]] -== What is Spring Data Envers? - -Spring Data Envers makes typical Envers queries available in repositories for Spring Data JPA. -It differs from other Spring Data modules in that it is always used in combination with another Spring Data Module: Spring Data JPA. - -[[envers.what]] -== What is Envers? - -Envers is a https://hibernate.org/orm/envers/[Hibernate module] that adds auditing capabilities to JPA entities. -This documentation assumes you are familiar with Envers, just as Spring Data Envers relies on Envers being properly configured. - -[[envers.configuration]] -== Configuration - -As a starting point for using Spring Data Envers, you need a project with Spring Data JPA on the classpath and an additional `spring-data-envers` dependency: - -==== -[source,xml,subs="+attributes"] ----- - - - - - - org.springframework.data - spring-data-envers - {version} - - - ----- -==== - -This also brings `hibernate-envers` into the project as a transient dependency. - -To enable Spring Data Envers and Spring Data JPA, we need to configure two beans and a special `repositoryFactoryBeanClass`: - -==== -[source,java] ----- -@Configuration -@EnableEnversRepositories -@EnableTransactionManagement -public class EnversDemoConfiguration { - - @Bean - public DataSource dataSource() { - - EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder(); - return builder.setType(EmbeddedDatabaseType.HSQL).build(); - } - - @Bean - public LocalContainerEntityManagerFactoryBean entityManagerFactory() { - - HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter(); - vendorAdapter.setGenerateDdl(true); - - LocalContainerEntityManagerFactoryBean factory = new LocalContainerEntityManagerFactoryBean(); - factory.setJpaVendorAdapter(vendorAdapter); - factory.setPackagesToScan("example.springdata.jpa.envers"); - factory.setDataSource(dataSource()); - return factory; - } - - @Bean - public PlatformTransactionManager transactionManager(EntityManagerFactory entityManagerFactory) { - - JpaTransactionManager txManager = new JpaTransactionManager(); - txManager.setEntityManagerFactory(entityManagerFactory); - return txManager; - } -} ----- -==== - -To actually use Spring Data Envers, make one or more repositories into a {spring-data-commons-javadoc-base}/org/springframework/data/repository/history/RevisionRepository.html[`RevisionRepository`] by adding it as an extended interface: - -==== -[source,java] ----- -interface PersonRepository - extends CrudRepository, - RevisionRepository // <1> -{} ----- -<1> The first type parameter (`Person`) denotes the entity type, the second (`Long`) denotes the type of the id property, and the last one (`Long`) is the type of the revision number. -For Envers in default configuration, the revision number parameter should be `Integer` or `Long`. -==== - -The entity for that repository must be an entity with Envers auditing enabled (that is, it must have an `@Audited` annotation): - -==== -[source,java] ----- -@Entity -@Audited -class Person { - - @Id @GeneratedValue - Long id; - String name; - @Version Long version; -} ----- -==== - -[[envers.usage]] -== Usage - -You can now use the methods from `RevisionRepository` to query the revisions of the entity, as the following test case shows: - -==== -[source,java] ----- -@ExtendWith(SpringExtension.class) -@Import(EnversDemoConfiguration.class) // <1> -class EnversIntegrationTests { - - final PersonRepository repository; - final TransactionTemplate tx; - - EnversIntegrationTests(@Autowired PersonRepository repository, @Autowired PlatformTransactionManager tm) { - this.repository = repository; - this.tx = new TransactionTemplate(tm); - } - - @Test - void testRepository() { - - Person updated = preparePersonHistory(); - - Revisions revisions = repository.findRevisions(updated.id); - - Iterator> revisionIterator = revisions.iterator(); - - checkNextRevision(revisionIterator, "John", RevisionType.INSERT); - checkNextRevision(revisionIterator, "Jonny", RevisionType.UPDATE); - checkNextRevision(revisionIterator, null, RevisionType.DELETE); - assertThat(revisionIterator.hasNext()).isFalse(); - - } - - /** - * Checks that the next element in the iterator is a Revision entry referencing a Person - * with the given name after whatever change brought that Revision into existence. - *

- * As a side effect the Iterator gets advanced by one element. - * - * @param revisionIterator the iterator to be tested. - * @param name the expected name of the Person referenced by the Revision. - * @param revisionType the type of the revision denoting if it represents an insert, update or delete. - */ - private void checkNextRevision(Iterator> revisionIterator, String name, - RevisionType revisionType) { - - assertThat(revisionIterator.hasNext()).isTrue(); - Revision revision = revisionIterator.next(); - assertThat(revision.getEntity().name).isEqualTo(name); - assertThat(revision.getMetadata().getRevisionType()).isEqualTo(revisionType); - } - - /** - * Creates a Person with a couple of changes so it has a non-trivial revision history. - * @return the created Person. - */ - private Person preparePersonHistory() { - - Person john = new Person(); - john.setName("John"); - - // create - Person saved = tx.execute(__ -> repository.save(john)); - assertThat(saved).isNotNull(); - - saved.setName("Jonny"); - - // update - Person updated = tx.execute(__ -> repository.save(saved)); - assertThat(updated).isNotNull(); - - // delete - tx.executeWithoutResult(__ -> repository.delete(updated)); - return updated; - } -} ----- -<1> This references the application context configuration presented earlier (in the <> section). -==== - -[[envers.resources]] -== Further Resources - -You can download the https://github.com/spring-projects/spring-data-examples[Spring Data Envers example in the Spring Data Examples repository] and play around with to get a feel for how the library works. - -You should also check out the {spring-data-commons-javadoc-base}/org/springframework/data/repository/history/RevisionRepository.html[Javadoc for `RevisionRepository`] and related classes. - -You can ask questions at https://stackoverflow.com/questions/tagged/spring-data-envers[Stackoverflow by using the `spring-data-envers` tag]. - -The https://github.com/spring-projects/spring-data-envers[source code and issue tracker for Spring Data Envers is hosted at GitHub]. diff --git a/src/main/asciidoc/index.adoc b/src/main/asciidoc/index.adoc deleted file mode 100644 index f51aeef..0000000 --- a/src/main/asciidoc/index.adoc +++ /dev/null @@ -1,29 +0,0 @@ -= Spring Data Envers - Reference Documentation -Oliver Gierke; Jens Schauder; Mark Paluch -:revnumber: {version} -:revdate: {localdate} -:javadoc-base: https://docs.spring.io/spring-data/envers/docs/{revnumber}/api/ -:spring-data-commons-docs: ../../../../spring-data-commons/src/main/asciidoc -:spring-data-commons-javadoc-base: https://docs.spring.io/spring-data/commons/docs/current/api/ -(C) 2008-2022 The original authors. - -NOTE: Copies of this document may be made for your own use and for distribution to others, provided that you do not charge any fee for such copies and further provided that each copy contains this Copyright Notice, whether distributed in print or electronically. - -toc::[] - -include::{spring-data-commons-docs}/dependencies.adoc[leveloffset=+1] -include::{spring-data-commons-docs}/repositories.adoc[leveloffset=+1] - -[[reference]] -== Reference Documentation - -include::envers.adoc[leveloffset=+1] - - -[[appendix]] -== Appendix - -:numbered!: -include::{spring-data-commons-docs}/repository-namespace-reference.adoc[leveloffset=+1] -include::{spring-data-commons-docs}/repository-populator-namespace-reference.adoc[leveloffset=+1] -include::{spring-data-commons-docs}/repository-query-keywords-reference.adoc[leveloffset=+1] diff --git a/src/main/java/org/springframework/data/envers/repository/config/EnableEnversRepositories.java b/src/main/java/org/springframework/data/envers/repository/config/EnableEnversRepositories.java deleted file mode 100644 index effc3f5..0000000 --- a/src/main/java/org/springframework/data/envers/repository/config/EnableEnversRepositories.java +++ /dev/null @@ -1,199 +0,0 @@ -/* - * Copyright 2021-2022 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.data.envers.repository.config; - -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Inherited; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -import javax.persistence.EntityManagerFactory; - -import org.springframework.beans.factory.FactoryBean; -import org.springframework.context.annotation.ComponentScan.Filter; -import org.springframework.context.annotation.Lazy; -import org.springframework.core.annotation.AliasFor; -import org.springframework.data.envers.repository.support.EnversRevisionRepositoryFactoryBean; -import org.springframework.data.jpa.repository.config.EnableJpaRepositories; -import org.springframework.data.jpa.repository.support.JpaRepositoryFactoryBean; -import org.springframework.data.repository.config.BootstrapMode; -import org.springframework.data.repository.config.DefaultRepositoryBaseClass; -import org.springframework.data.repository.query.QueryLookupStrategy; -import org.springframework.data.repository.query.QueryLookupStrategy.Key; -import org.springframework.transaction.PlatformTransactionManager; - -/** - * Annotation to enable Envers repositories. Will scan the package of the annotated configuration class for Spring Data - * repositories by default. - *

- * This annotation is a meta-annotation for {@link EnableJpaRepositories @EnableJpaRepositories} overriding the default - * {@link #repositoryFactoryBeanClass} to {@link EnversRevisionRepositoryFactoryBean}. - * - * @author Mark Paluch - * @since 2.5 - * @see EnableJpaRepositories - * @see AliasFor - */ -@Target(ElementType.TYPE) -@Retention(RetentionPolicy.RUNTIME) -@Documented -@Inherited -@EnableJpaRepositories -public @interface EnableEnversRepositories { - - /** - * Alias for the {@link #basePackages()} attribute. Allows for more concise annotation declarations e.g.: - * {@code @EnableJpaRepositories("org.my.pkg")} instead of - * {@code @EnableEnversRepositories(basePackages="org.my.pkg")}. - */ - @AliasFor(annotation = EnableJpaRepositories.class) - String[] value() default {}; - - /** - * Base packages to scan for annotated components. {@link #value()} is an alias for (and mutually exclusive with) this - * attribute. Use {@link #basePackageClasses()} for a type-safe alternative to String-based package names. - */ - @AliasFor(annotation = EnableJpaRepositories.class) - String[] basePackages() default {}; - - /** - * Type-safe alternative to {@link #basePackages()} for specifying the packages to scan for annotated components. The - * package of each class specified will be scanned. Consider creating a special no-op marker class or interface in - * each package that serves no purpose other than being referenced by this attribute. - */ - @AliasFor(annotation = EnableJpaRepositories.class) - Class[] basePackageClasses() default {}; - - /** - * Specifies which types are eligible for component scanning. Further narrows the set of candidate components from - * everything in {@link #basePackages()} to everything in the base packages that matches the given filter or filters. - */ - @AliasFor(annotation = EnableJpaRepositories.class) - Filter[] includeFilters() default {}; - - /** - * Specifies which types are not eligible for component scanning. - */ - @AliasFor(annotation = EnableJpaRepositories.class) - Filter[] excludeFilters() default {}; - - /** - * Returns the postfix to be used when looking up custom repository implementations. Defaults to {@literal Impl}. So - * for a repository named {@code PersonRepository} the corresponding implementation class will be looked up scanning - * for {@code PersonRepositoryImpl}. - * - * @return - */ - @AliasFor(annotation = EnableJpaRepositories.class) - String repositoryImplementationPostfix() default "Impl"; - - /** - * Configures the location of where to find the Spring Data named queries properties file. Will default to - * {@code META-INF/jpa-named-queries.properties}. - * - * @return - */ - @AliasFor(annotation = EnableJpaRepositories.class) - String namedQueriesLocation() default ""; - - /** - * Returns the key of the {@link QueryLookupStrategy} to be used for lookup queries for query methods. Defaults to - * {@link Key#CREATE_IF_NOT_FOUND}. - * - * @return - */ - @AliasFor(annotation = EnableJpaRepositories.class) - Key queryLookupStrategy() default Key.CREATE_IF_NOT_FOUND; - - /** - * Returns the {@link FactoryBean} class to be used for each repository instance. Defaults to - * {@link JpaRepositoryFactoryBean}. - * - * @return - */ - @AliasFor(annotation = EnableJpaRepositories.class) - Class repositoryFactoryBeanClass() default EnversRevisionRepositoryFactoryBean.class; - - /** - * Configure the repository base class to be used to create repository proxies for this particular configuration. - * - * @return - */ - @AliasFor(annotation = EnableJpaRepositories.class) - Class repositoryBaseClass() default DefaultRepositoryBaseClass.class; - - // JPA specific configuration - - /** - * Configures the name of the {@link EntityManagerFactory} bean definition to be used to create repositories - * discovered through this annotation. Defaults to {@code entityManagerFactory}. - * - * @return - */ - @AliasFor(annotation = EnableJpaRepositories.class) - String entityManagerFactoryRef() default "entityManagerFactory"; - - /** - * Configures the name of the {@link PlatformTransactionManager} bean definition to be used to create repositories - * discovered through this annotation. Defaults to {@code transactionManager}. - * - * @return - */ - @AliasFor(annotation = EnableJpaRepositories.class) - String transactionManagerRef() default "transactionManager"; - - /** - * Configures whether nested repository-interfaces (e.g. defined as inner classes) should be discovered by the - * repositories infrastructure. - */ - @AliasFor(annotation = EnableJpaRepositories.class) - boolean considerNestedRepositories() default false; - - /** - * Configures whether to enable default transactions for Spring Data JPA repositories. Defaults to {@literal true}. If - * disabled, repositories must be used behind a facade that's configuring transactions (e.g. using Spring's annotation - * driven transaction facilities) or repository methods have to be used to demarcate transactions. - * - * @return whether to enable default transactions, defaults to {@literal true}. - */ - @AliasFor(annotation = EnableJpaRepositories.class) - boolean enableDefaultTransactions() default true; - - /** - * Configures when the repositories are initialized in the bootstrap lifecycle. {@link BootstrapMode#DEFAULT} - * (default) means eager initialization except all repository interfaces annotated with {@link Lazy}, - * {@link BootstrapMode#LAZY} means lazy by default including injection of lazy-initialization proxies into client - * beans so that those can be instantiated but will only trigger the initialization upon first repository usage (i.e a - * method invocation on it). This means repositories can still be uninitialized when the application context has - * completed its bootstrap. {@link BootstrapMode#DEFERRED} is fundamentally the same as {@link BootstrapMode#LAZY}, - * but triggers repository initialization when the application context finishes its bootstrap. - * - * @return - */ - @AliasFor(annotation = EnableJpaRepositories.class) - BootstrapMode bootstrapMode() default BootstrapMode.DEFAULT; - - /** - * Configures what character is used to escape the wildcards {@literal _} and {@literal %} in derived queries with - * {@literal contains}, {@literal startsWith} or {@literal endsWith} clauses. - * - * @return a single character used for escaping. - */ - @AliasFor(annotation = EnableJpaRepositories.class) - char escapeCharacter() default '\\'; -} diff --git a/src/main/java/org/springframework/data/envers/repository/config/package-info.java b/src/main/java/org/springframework/data/envers/repository/config/package-info.java deleted file mode 100644 index 2e79b25..0000000 --- a/src/main/java/org/springframework/data/envers/repository/config/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -/** - * Classes for Envers Repositories configuration support. - */ -@org.springframework.lang.NonNullApi -package org.springframework.data.envers.repository.config; diff --git a/src/main/java/org/springframework/data/envers/repository/support/DefaultRevisionEntityInformation.java b/src/main/java/org/springframework/data/envers/repository/support/DefaultRevisionEntityInformation.java deleted file mode 100644 index b4e8071..0000000 --- a/src/main/java/org/springframework/data/envers/repository/support/DefaultRevisionEntityInformation.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright 2012-2022 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.data.envers.repository.support; - -import org.hibernate.envers.DefaultRevisionEntity; -import org.springframework.data.repository.history.support.RevisionEntityInformation; - -/** - * {@link RevisionEntityInformation} for {@link DefaultRevisionEntity}. - * - * @author Oliver Gierke - */ -class DefaultRevisionEntityInformation implements RevisionEntityInformation { - - /* - * (non-Javadoc) - * @see org.springframework.data.repository.history.support.RevisionEntityInformation#getRevisionNumberType() - */ - public Class getRevisionNumberType() { - return Integer.class; - } - - /* - * (non-Javadoc) - * @see org.springframework.data.repository.history.support.RevisionEntityInformation#isDefaultRevisionEntity() - */ - public boolean isDefaultRevisionEntity() { - return true; - } - - /* - * (non-Javadoc) - * @see org.springframework.data.repository.history.support.RevisionEntityInformation#getRevisionEntityClass() - */ - public Class getRevisionEntityClass() { - return DefaultRevisionEntity.class; - } -} diff --git a/src/main/java/org/springframework/data/envers/repository/support/DefaultRevisionMetadata.java b/src/main/java/org/springframework/data/envers/repository/support/DefaultRevisionMetadata.java deleted file mode 100755 index 8fab747..0000000 --- a/src/main/java/org/springframework/data/envers/repository/support/DefaultRevisionMetadata.java +++ /dev/null @@ -1,123 +0,0 @@ -/* - * Copyright 2012-2022 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.data.envers.repository.support; - -import java.time.Instant; -import java.time.LocalDateTime; -import java.time.ZoneOffset; -import java.util.Optional; - -import org.hibernate.envers.DefaultRevisionEntity; - -import org.springframework.data.history.RevisionMetadata; -import org.springframework.util.Assert; - -/** - * {@link RevisionMetadata} working with a {@link DefaultRevisionEntity}. The entity/delegate itself gets ignored for - * {@link #equals(Object)} and {@link #hashCode()} since they depend on the way they were obtained. - * - * @author Oliver Gierke - * @author Philip Huegelmeyer - * @author Jens Schauder - */ -public final class DefaultRevisionMetadata implements RevisionMetadata { - - private final DefaultRevisionEntity entity; - private final RevisionType revisionType; - - public DefaultRevisionMetadata(DefaultRevisionEntity entity) { - this(entity, RevisionType.UNKNOWN); - } - - public DefaultRevisionMetadata(DefaultRevisionEntity entity, RevisionType revisionType) { - - Assert.notNull(entity, "DefaultRevisionEntity must not be null"); - - this.entity = entity; - this.revisionType = revisionType; - } - - /* - * (non-Javadoc) - * @see org.springframework.data.history.RevisionMetadata#getRevisionNumber() - */ - public Optional getRevisionNumber() { - return Optional.of(entity.getId()); - } - - /* - * (non-Javadoc) - * @see org.springframework.data.history.RevisionMetadata#getRevisionDate() - */ - @Deprecated - public Optional getRevisionDate() { - return getRevisionInstant().map(instant -> LocalDateTime.ofInstant(instant, ZoneOffset.systemDefault())); - } - - /* - * (non-Javadoc) - * @see org.springframework.data.history.RevisionMetadata#getRevisionInstant() - */ - @Override - public Optional getRevisionInstant() { - return Optional.of(Instant.ofEpochMilli(entity.getTimestamp())); - } - - /* - * (non-Javadoc) - * @see org.springframework.data.history.RevisionMetadata#getDelegate() - */ - @SuppressWarnings("unchecked") - public T getDelegate() { - return (T) entity; - } - - /* - * (non-Javadoc) - * @see org.springframework.data.history.RevisionMetadata#getRevisionType() - */ - @Override - public RevisionType getRevisionType() { - return revisionType; - } - - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ - @Override - public boolean equals(Object o) { - - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - DefaultRevisionMetadata that = (DefaultRevisionMetadata) o; - return getRevisionNumber().equals(that.getRevisionNumber()) - && getRevisionInstant().equals(that.getRevisionInstant()) && revisionType.equals(that.getRevisionType()); - } - - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ - @Override - public String toString() { - return "DefaultRevisionMetadata{" + "entity=" + entity + ", revisionType=" + revisionType + '}'; - } -} diff --git a/src/main/java/org/springframework/data/envers/repository/support/EnversRevisionRepository.java b/src/main/java/org/springframework/data/envers/repository/support/EnversRevisionRepository.java deleted file mode 100644 index 9d63891..0000000 --- a/src/main/java/org/springframework/data/envers/repository/support/EnversRevisionRepository.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 2012-2022 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.data.envers.repository.support; - -import java.io.Serializable; - -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.repository.NoRepositoryBean; -import org.springframework.data.repository.history.RevisionRepository; - -/** - * Convenience interface to allow pulling in {@link JpaRepository} and {@link RevisionRepository} functionality in one - * go. - * - * @author Oliver Gierke - * @author Michael Igler - * @deprecated since 1.1, in favor of simply extending {@link RevisionRepository}. - */ -@Deprecated -@NoRepositoryBean -public interface EnversRevisionRepository> - extends RevisionRepository, JpaRepository { - -} diff --git a/src/main/java/org/springframework/data/envers/repository/support/EnversRevisionRepositoryFactoryBean.java b/src/main/java/org/springframework/data/envers/repository/support/EnversRevisionRepositoryFactoryBean.java deleted file mode 100755 index fcd17f9..0000000 --- a/src/main/java/org/springframework/data/envers/repository/support/EnversRevisionRepositoryFactoryBean.java +++ /dev/null @@ -1,113 +0,0 @@ -/* - * Copyright 2012-2022 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.data.envers.repository.support; - -import java.util.Optional; - -import javax.persistence.EntityManager; - -import org.hibernate.envers.DefaultRevisionEntity; -import org.springframework.beans.factory.FactoryBean; -import org.springframework.data.jpa.repository.support.JpaRepositoryFactory; -import org.springframework.data.jpa.repository.support.JpaRepositoryFactoryBean; -import org.springframework.data.repository.core.RepositoryMetadata; -import org.springframework.data.repository.core.support.RepositoryComposition.RepositoryFragments; -import org.springframework.data.repository.core.support.RepositoryFactorySupport; -import org.springframework.data.repository.history.RevisionRepository; -import org.springframework.data.repository.history.support.RevisionEntityInformation; - -/** - * {@link FactoryBean} creating {@link RevisionRepository} instances. - * - * @author Oliver Gierke - * @author Michael Igler - */ -public class EnversRevisionRepositoryFactoryBean, S, ID, N extends Number & Comparable> - extends JpaRepositoryFactoryBean { - - private Class revisionEntityClass; - - /** - * Creates a new {@link EnversRevisionRepositoryFactoryBean} for the given repository interface. - * - * @param repositoryInterface must not be {@literal null}. - */ - public EnversRevisionRepositoryFactoryBean(Class repositoryInterface) { - super(repositoryInterface); - } - - /** - * Configures the revision entity class. Will default to {@link DefaultRevisionEntity}. - * - * @param revisionEntityClass - */ - public void setRevisionEntityClass(Class revisionEntityClass) { - this.revisionEntityClass = revisionEntityClass; - } - - /* - * (non-Javadoc) - * @see org.springframework.data.jpa.repository.support.JpaRepositoryFactoryBean#createRepositoryFactory(javax.persistence.EntityManager) - */ - @Override - protected RepositoryFactorySupport createRepositoryFactory(EntityManager entityManager) { - return new RevisionRepositoryFactory(entityManager, revisionEntityClass); - } - - /** - * Repository factory creating {@link RevisionRepository} instances. - * - * @author Oliver Gierke - * @author Jens Schauder - */ - private static class RevisionRepositoryFactory> extends JpaRepositoryFactory { - - private final RevisionEntityInformation revisionEntityInformation; - private final EntityManager entityManager; - - /** - * Creates a new {@link RevisionRepositoryFactory} using the given {@link EntityManager} and revision entity class. - * - * @param entityManager must not be {@literal null}. - * @param revisionEntityClass can be {@literal null}, will default to {@link DefaultRevisionEntity}. - */ - public RevisionRepositoryFactory(EntityManager entityManager, Class revisionEntityClass) { - - super(entityManager); - - this.entityManager = entityManager; - this.revisionEntityInformation = Optional.ofNullable(revisionEntityClass) // - .filter(it -> !it.equals(DefaultRevisionEntity.class))// - . map(ReflectionRevisionEntityInformation::new) // - .orElseGet(DefaultRevisionEntityInformation::new); - } - - @Override - protected RepositoryFragments getRepositoryFragments(RepositoryMetadata metadata) { - - Object fragmentImplementation = getTargetRepositoryViaReflection( // - EnversRevisionRepositoryImpl.class, // - getEntityInformation(metadata.getDomainType()), // - revisionEntityInformation, // - entityManager // - ); - - return RepositoryFragments // - .just(fragmentImplementation) // - .append(super.getRepositoryFragments(metadata)); - } - } -} diff --git a/src/main/java/org/springframework/data/envers/repository/support/EnversRevisionRepositoryImpl.java b/src/main/java/org/springframework/data/envers/repository/support/EnversRevisionRepositoryImpl.java deleted file mode 100755 index f705fdd..0000000 --- a/src/main/java/org/springframework/data/envers/repository/support/EnversRevisionRepositoryImpl.java +++ /dev/null @@ -1,230 +0,0 @@ -/* - * Copyright 2012-2022 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.data.envers.repository.support; - -import static org.springframework.data.history.RevisionMetadata.RevisionType.*; - -import java.util.ArrayList; -import java.util.List; -import java.util.Optional; - -import javax.persistence.EntityManager; - -import org.hibernate.envers.AuditReader; -import org.hibernate.envers.AuditReaderFactory; -import org.hibernate.envers.DefaultRevisionEntity; -import org.hibernate.envers.RevisionNumber; -import org.hibernate.envers.RevisionTimestamp; -import org.hibernate.envers.RevisionType; -import org.hibernate.envers.query.AuditEntity; -import org.hibernate.envers.query.AuditQuery; -import org.hibernate.envers.query.order.AuditOrder; - -import org.springframework.data.domain.Page; -import org.springframework.data.domain.PageImpl; -import org.springframework.data.domain.Pageable; -import org.springframework.data.history.AnnotationRevisionMetadata; -import org.springframework.data.history.Revision; -import org.springframework.data.history.RevisionMetadata; -import org.springframework.data.history.RevisionSort; -import org.springframework.data.history.Revisions; -import org.springframework.data.jpa.repository.support.JpaEntityInformation; -import org.springframework.data.repository.core.EntityInformation; -import org.springframework.data.repository.history.RevisionRepository; -import org.springframework.data.repository.history.support.RevisionEntityInformation; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.Assert; - -/** - * Repository implementation using Hibernate Envers to implement revision specific query methods. - * - * @author Oliver Gierke - * @author Philipp Huegelmeyer - * @author Michael Igler - * @author Jens Schauder - * @author Julien Millau - * @author Mark Paluch - * @author Sander Bylemans - */ -@Transactional(readOnly = true) -public class EnversRevisionRepositoryImpl> - implements RevisionRepository { - - private final EntityInformation entityInformation; - private final EntityManager entityManager; - - /** - * Creates a new {@link EnversRevisionRepositoryImpl} using the given {@link JpaEntityInformation}, - * {@link RevisionEntityInformation} and {@link EntityManager}. - * - * @param entityInformation must not be {@literal null}. - * @param revisionEntityInformation must not be {@literal null}. - * @param entityManager must not be {@literal null}. - */ - public EnversRevisionRepositoryImpl(JpaEntityInformation entityInformation, - RevisionEntityInformation revisionEntityInformation, EntityManager entityManager) { - - Assert.notNull(revisionEntityInformation, "RevisionEntityInformation must not be null!"); - - this.entityInformation = entityInformation; - this.entityManager = entityManager; - } - - /* - * (non-Javadoc) - * @see org.springframework.data.repository.history.RevisionRepository#findLastChangeRevision(java.io.Serializable) - */ - @SuppressWarnings("unchecked") - public Optional> findLastChangeRevision(ID id) { - - List singleResult = createBaseQuery(id) // - .addOrder(AuditEntity.revisionProperty("timestamp").desc()) // - .setMaxResults(1) // - .getResultList(); - - Assert.state(singleResult.size() <= 1, "We expect at most one result."); - - if (singleResult.isEmpty()) { - return Optional.empty(); - } - - return Optional.of(createRevision(new QueryResult<>(singleResult.get(0)))); - } - - /* - * (non-Javadoc) - * @see org.springframework.data.envers.repository.support.EnversRevisionRepository#findRevision(java.io.Serializable, java.lang.Number) - */ - @Override - @SuppressWarnings("unchecked") - public Optional> findRevision(ID id, N revisionNumber) { - - Assert.notNull(id, "Identifier must not be null!"); - Assert.notNull(revisionNumber, "Revision number must not be null!"); - - List singleResult = (List) createBaseQuery(id) // - .add(AuditEntity.revisionNumber().eq(revisionNumber)) // - .getResultList(); - - Assert.state(singleResult.size() <= 1, "We expect at most one result."); - - if (singleResult.isEmpty()) { - return Optional.empty(); - } - - return Optional.of(createRevision(new QueryResult<>(singleResult.get(0)))); - } - - @SuppressWarnings("unchecked") - public Revisions findRevisions(ID id) { - - List resultList = createBaseQuery(id).getResultList(); - List> revisionList = new ArrayList<>(resultList.size()); - - for (Object[] objects : resultList) { - revisionList.add(createRevision(new QueryResult<>(objects))); - } - - return Revisions.of(revisionList); - } - - @SuppressWarnings("unchecked") - public Page> findRevisions(ID id, Pageable pageable) { - - AuditOrder sorting = RevisionSort.getRevisionDirection(pageable.getSort()).isDescending() // - ? AuditEntity.revisionNumber().desc() // - : AuditEntity.revisionNumber().asc(); - - List resultList = createBaseQuery(id) // - .addOrder(sorting) // - .setFirstResult((int) pageable.getOffset()) // - .setMaxResults(pageable.getPageSize()) // - .getResultList(); - - Long count = (Long) createBaseQuery(id) // - .addProjection(AuditEntity.revisionNumber().count()).getSingleResult(); - - List> revisions = new ArrayList<>(); - - for (Object[] singleResult : resultList) { - revisions.add(createRevision(new QueryResult<>(singleResult))); - } - - return new PageImpl<>(revisions, pageable, count); - } - - private AuditQuery createBaseQuery(ID id) { - - Class type = entityInformation.getJavaType(); - AuditReader reader = AuditReaderFactory.get(entityManager); - - return reader.createQuery() // - .forRevisionsOfEntity(type, false, true) // - .add(AuditEntity.id().eq(id)); - } - - @SuppressWarnings("unchecked") - private Revision createRevision(QueryResult queryResult) { - return Revision.of((RevisionMetadata) queryResult.createRevisionMetadata(), queryResult.entity); - } - - @SuppressWarnings("unchecked") - static class QueryResult { - - private final T entity; - private final Object metadata; - private final RevisionMetadata.RevisionType revisionType; - - QueryResult(Object[] data) { - - Assert.notNull(data, "Data must not be null"); - Assert.isTrue( // - data.length == 3, // - () -> String.format("Data must have length three, but has length %d.", data.length)); - Assert.isTrue( // - data[2] instanceof RevisionType, // - () -> String.format("The third array element must be of type Revision type, but is of type %s", - data[2].getClass())); - - entity = (T) data[0]; - metadata = data[1]; - revisionType = convertRevisionType((RevisionType) data[2]); - } - - RevisionMetadata createRevisionMetadata() { - - return metadata instanceof DefaultRevisionEntity // - ? new DefaultRevisionMetadata((DefaultRevisionEntity) metadata, revisionType) // - : new AnnotationRevisionMetadata<>(metadata, RevisionNumber.class, RevisionTimestamp.class, revisionType); - } - - private static RevisionMetadata.RevisionType convertRevisionType(RevisionType datum) { - - switch (datum) { - - case ADD: - return INSERT; - case MOD: - return UPDATE; - case DEL: - return DELETE; - default: - return UNKNOWN; - } - } - } - -} diff --git a/src/main/java/org/springframework/data/envers/repository/support/ReflectionRevisionEntityInformation.java b/src/main/java/org/springframework/data/envers/repository/support/ReflectionRevisionEntityInformation.java deleted file mode 100644 index b47e181..0000000 --- a/src/main/java/org/springframework/data/envers/repository/support/ReflectionRevisionEntityInformation.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright 2012-2022 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.data.envers.repository.support; - -import org.hibernate.envers.RevisionNumber; - -import org.springframework.data.repository.history.support.RevisionEntityInformation; -import org.springframework.data.util.AnnotationDetectionFieldCallback; -import org.springframework.util.Assert; -import org.springframework.util.ReflectionUtils; - -/** - * {@link RevisionEntityInformation} that uses reflection to inspect a property annotated with {@link RevisionNumber} to - * find out about the revision number type. - * - * @author Oliver Gierke - */ -public class ReflectionRevisionEntityInformation implements RevisionEntityInformation { - - private final Class revisionEntityClass; - private final Class revisionNumberType; - - /** - * Creates a new {@link ReflectionRevisionEntityInformation} inspecting the given revision entity class. - * - * @param revisionEntityClass must not be {@literal null}. - */ - public ReflectionRevisionEntityInformation(Class revisionEntityClass) { - - Assert.notNull(revisionEntityClass, "Revision entity type must not be null!"); - - AnnotationDetectionFieldCallback fieldCallback = new AnnotationDetectionFieldCallback(RevisionNumber.class); - ReflectionUtils.doWithFields(revisionEntityClass, fieldCallback); - - this.revisionNumberType = fieldCallback.getRequiredType(); - this.revisionEntityClass = revisionEntityClass; - - } - - /* - * (non-Javadoc) - * @see org.springframework.data.repository.history.support.RevisionEntityInformation#isDefaultRevisionEntity() - */ - public boolean isDefaultRevisionEntity() { - return false; - } - - public Class getRevisionEntityClass() { - return this.revisionEntityClass; - } - - public Class getRevisionNumberType() { - return this.revisionNumberType; - } -} diff --git a/src/main/java/org/springframework/data/envers/repository/support/package-info.java b/src/main/java/org/springframework/data/envers/repository/support/package-info.java deleted file mode 100644 index dd135fd..0000000 --- a/src/main/java/org/springframework/data/envers/repository/support/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -/** - * Spring Data JPA specific converter infrastructure. - */ -@org.springframework.lang.NonNullApi -package org.springframework.data.envers.repository.support; diff --git a/src/main/resources/changelog.txt b/src/main/resources/changelog.txt deleted file mode 100644 index 01822a1..0000000 --- a/src/main/resources/changelog.txt +++ /dev/null @@ -1,260 +0,0 @@ -Spring Data Envers Changelog -========================== - -Changes in version 2.6.0-M1 (2021-07-16) ----------------------------------------- -* #305 - Upgrade to Envers 5.5.3.Final. -* #288 - Update CI to Java 16. - - -Changes in version 2.4.11 (2021-07-16) --------------------------------------- - - -Changes in version 2.5.2 (2021-06-22) -------------------------------------- - - -Changes in version 2.4.10 (2021-06-22) --------------------------------------- - - -Changes in version 2.5.1 (2021-05-14) -------------------------------------- - - -Changes in version 2.4.9 (2021-05-14) -------------------------------------- - - -Changes in version 2.5.0 (2021-04-14) -------------------------------------- - - -Changes in version 2.4.8 (2021-04-14) -------------------------------------- - - -Changes in version 2.3.9.RELEASE (2021-04-14) ---------------------------------------------- - - -Changes in version 2.4.7 (2021-03-31) -------------------------------------- - - -Changes in version 2.5.0-RC1 (2021-03-31) ------------------------------------------ -* #289 - Investigate `@EnableEnversRepositories` meta-annotation. - - -Changes in version 2.5.0-M5 (2021-03-17) ----------------------------------------- -* #283 - Editing pass. -* #282 - Add Java config example, fix StackOverflow tag URL. -* #61 - Spring Data Envers Documentation Only Contains General Spring Data Information. - - -Changes in version 2.4.6 (2021-03-17) -------------------------------------- -* #283 - Editing pass. -* #282 - Add Java config example, fix StackOverflow tag URL. -* #61 - Spring Data Envers Documentation Only Contains General Spring Data Information. - - -Changes in version 2.3.8.RELEASE (2021-03-17) ---------------------------------------------- -* #283 - Editing pass. -* #282 - Add Java config example, fix StackOverflow tag URL. -* #61 - Spring Data Envers Documentation Only Contains General Spring Data Information. - - -Changes in version 2.5.0-M4 (2021-02-18) ----------------------------------------- - - -Changes in version 2.4.5 (2021-02-18) -------------------------------------- - - -Changes in version 2.5.0-M3 (2021-02-17) ----------------------------------------- -* #265 - Enable Project automation through GitHub Actions. - - -Changes in version 2.4.4 (2021-02-17) -------------------------------------- - - -Changes in version 2.3.7.RELEASE (2021-02-17) ---------------------------------------------- -* #271 - Update copyright year to 2021. -* #266 - Update CI jobs with Docker Login. - - -Changes in version 2.5.0-M2 (2021-01-13) ----------------------------------------- -* #271 - Update copyright year to 2021. -* #266 - Update CI jobs with Docker Login. - - -Changes in version 2.4.3 (2021-01-13) -------------------------------------- -* #271 - Update copyright year to 2021. -* #266 - Update CI jobs with Docker Login. - - -Changes in version 2.4.2 (2020-12-09) -------------------------------------- -* #263 - Release 2.4.2 (2020.0.2). - - -Changes in version 2.5.0-M1 (2020-12-09) ----------------------------------------- -* #265 - Enable Project automation through GitHub Actions. -* #262 - Release 2.5 M1 (2021.0.0). - - -Changes in version 2.3.6.RELEASE (2020-12-09) ---------------------------------------------- -* #260 - Release 2.3.6 (Neumann SR6). - - -Changes in version 2.4.1 (2020-11-11) -------------------------------------- -* #261 - Release 2.4.1 (2020.0.1). - - -Changes in version 2.4.0 (2020-10-28) -------------------------------------- -* #257 - Release 2.4 GA (2020.0.0). - - -Changes in version 2.3.5.RELEASE (2020-10-28) ---------------------------------------------- -* #254 - Release 2.3.5 (Neumann SR5). - - -Changes in version 2.4.0-RC2 (2020-10-14) ------------------------------------------ -* #256 - Update CI jobs for Java 15. -* #255 - Release 2.4 RC2 (2020.0.0). - - -Changes in version 2.4.0-RC1 (2020-09-16) ------------------------------------------ -* #251 - Release 2.4 RC1 (2020.0.0). - - -Changes in version 2.3.4.RELEASE (2020-09-16) ---------------------------------------------- -* #252 - Release 2.3.4 (Neumann SR4). - - -Changes in version 2.3.3.RELEASE (2020-08-12) ---------------------------------------------- -* #247 - Release 2.3.3 (Neumann SR3). - - -Changes in version 2.4.0-M2 (2020-08-12) ----------------------------------------- -* #244 - Release 2.4 M2 (2020.0.0). - - -Changes in version 2.3.2.RELEASE (2020-07-22) ---------------------------------------------- -* #242 - Release 2.3.2 (Neumann SR2). - - -Changes in version 2.4.0-M1 (2020-06-25) ----------------------------------------- -* #239 - Use standard Spring code of conduct. -* #238 - Delombok source files. -* #237 - Release 2.4 M1 (2020.0.0). - - -Changes in version 2.3.1.RELEASE (2020-06-10) ---------------------------------------------- -* #236 - Release 2.3.1 (Neumann SR1). - - -Changes in version 2.3.0.RELEASE (2020-05-12) ---------------------------------------------- -* #234 - Release 2.3 GA (Neumann). - - -Changes in version 2.3.0.RC2 (2020-04-28) ------------------------------------------ -* #230 - Use JDK 14 for Java.NEXT CI testing. -* #229 - Release 2.3 RC2 (Neumann). -* #215 - RevisionType always Unknown in RevisionMetadata. - - -Changes in version 2.3.0.RC1 (2020-03-31) ------------------------------------------ -* #224 - Release 2.3 RC1 (Neumann). - - -Changes in version 2.3.0.M4 (2020-03-11) ----------------------------------------- -* #221 - Release 2.3 M4 (Neumann). - - -Changes in version 2.3.0.M3 (2020-02-12) ----------------------------------------- -* #220 - Release 2.3 M3 (Neumann). - - -Changes in version 2.3.0.M2 (2020-01-17) ----------------------------------------- -* #219 - Release 2.3 M2 (Neumann). - - -Changes in version 2.3.0.M1 (2020-01-16) ----------------------------------------- -* #210 - Upgrade to Envers 5.4.8. -* #205 - Release 2.3 M1 (Neumann). - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/license.txt b/src/main/resources/license.txt deleted file mode 100644 index 4211577..0000000 --- a/src/main/resources/license.txt +++ /dev/null @@ -1,279 +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. - -======================================================================= - -SPRING FRAMEWORK ${version} SUBCOMPONENTS: - -Spring Framework ${version} includes a number of subcomponents -with separate copyright notices and license terms. The product that -includes this file does not necessarily use all the open source -subcomponents referred to below. Your use of the source -code for these subcomponents is subject to the terms and -conditions of the following licenses. - - ->>> ASM 4.0 (org.ow2.asm:asm:4.0, org.ow2.asm:asm-commons:4.0): - -Copyright (c) 2000-2011 INRIA, France Telecom -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: - -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - -3. Neither the name of the copyright holders nor the names of its - contributors may be used to endorse or promote products derived from - this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF -THE POSSIBILITY OF SUCH DAMAGE. - -Copyright (c) 1999-2009, OW2 Consortium - - ->>> CGLIB 3.0 (cglib:cglib:3.0): - -Per the LICENSE file in the CGLIB JAR distribution downloaded from -https://sourceforge.net/projects/cglib/files/cglib3/3.0/cglib-3.0.jar/download, -CGLIB 3.0 is licensed under the Apache License, version 2.0, the text of which -is included above. - - -======================================================================= - -To the extent any open source subcomponents are licensed under the EPL and/or -other similar licenses that require the source code and/or modifications to -source code to be made available (as would be noted above), you may obtain a -copy of the source code corresponding to the binaries for such open source -components and modifications thereto, if any, (the "Source Files"), by -downloading the Source Files from https://www.springsource.org/download, or by -sending a request, with your name and address to: - - VMware, Inc., 3401 Hillview Avenue - Palo Alto, CA 94304 - United States of America - -or email info@vmware.com. All such requests should clearly specify: - - OPEN SOURCE FILES REQUEST - Attention General Counsel - -VMware shall mail a copy of the Source Files to you on a CD or equivalent -physical medium. This offer to obtain a copy of the Source Files is valid for -three years from the date you acquired this Software product. \ No newline at end of file diff --git a/src/main/resources/notice.txt b/src/main/resources/notice.txt deleted file mode 100644 index 2eadbe8..0000000 --- a/src/main/resources/notice.txt +++ /dev/null @@ -1,33 +0,0 @@ -Spring Data Envers 2.6 M3 (2021.1.0) -Copyright (c) 2015-2019 Pivotal Software, Inc. - -This product is licensed to you under the Apache License, Version 2.0 -(the "License"). You may not use this product except in compliance with -the License. - -This product may include a number of subcomponents with separate -copyright notices and license terms. Your use of the source code for -these subcomponents is subject to the terms and conditions of the -subcomponent's license, as noted in the license.txt file. - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/test/java/org/springframework/data/envers/Config.java b/src/test/java/org/springframework/data/envers/Config.java deleted file mode 100755 index 0d30f43..0000000 --- a/src/test/java/org/springframework/data/envers/Config.java +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Copyright 2012-2022 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.data.envers; - -import java.sql.SQLException; -import java.util.Collections; -import java.util.Map; - -import javax.sql.DataSource; - -import org.hibernate.envers.strategy.ValidityAuditStrategy; - -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.data.envers.repository.config.EnableEnversRepositories; -import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; -import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType; -import org.springframework.orm.jpa.AbstractEntityManagerFactoryBean; -import org.springframework.orm.jpa.JpaTransactionManager; -import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean; -import org.springframework.orm.jpa.vendor.Database; -import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter; -import org.springframework.transaction.PlatformTransactionManager; - -/** - * Spring JavaConfig configuration for general infrastructure. - * - * @author Oliver Gierke - */ -@Configuration -@EnableEnversRepositories -public class Config { - - @Bean - public DataSource dataSource() throws SQLException { - return new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.H2).build(); - } - - @Bean - public PlatformTransactionManager transactionManager() throws SQLException { - return new JpaTransactionManager(); - } - - @Bean - public AbstractEntityManagerFactoryBean entityManagerFactory() throws SQLException { - - HibernateJpaVendorAdapter jpaVendorAdapter = new HibernateJpaVendorAdapter(); - jpaVendorAdapter.setDatabase(Database.H2); - jpaVendorAdapter.setGenerateDdl(true); - - LocalContainerEntityManagerFactoryBean bean = new LocalContainerEntityManagerFactoryBean(); - bean.setJpaVendorAdapter(jpaVendorAdapter); - bean.setPackagesToScan(Config.class.getPackage().getName()); - bean.setDataSource(dataSource()); - bean.setJpaPropertyMap(jpaProperties()); - - return bean; - } - - private Map jpaProperties() { - return Collections.singletonMap("org.hibernate.envers.audit_strategy", ValidityAuditStrategy.class.getName()); - } -} diff --git a/src/test/java/org/springframework/data/envers/repository/support/DefaultRevisionMetadataUnitTests.java b/src/test/java/org/springframework/data/envers/repository/support/DefaultRevisionMetadataUnitTests.java deleted file mode 100644 index 44008e5..0000000 --- a/src/test/java/org/springframework/data/envers/repository/support/DefaultRevisionMetadataUnitTests.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright 2012-2022 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.data.envers.repository.support; - -import static org.assertj.core.api.Assertions.*; - -import java.time.Instant; -import java.time.LocalDateTime; -import java.time.ZoneOffset; -import java.time.temporal.ChronoUnit; - -import org.hibernate.envers.DefaultRevisionEntity; -import org.junit.jupiter.api.Test; - -/** - * Unit tests for {@link DefaultRevisionMetadata}. - * - * @author Benedikt Ritter - * @author Jens Schauder - * @author Mark Paluch - */ -class DefaultRevisionMetadataUnitTests { - - private static final Instant NOW = Instant.now();; - - @Test // #112 - void createsLocalDateTimeFromTimestamp() { - - DefaultRevisionEntity entity = new DefaultRevisionEntity(); - entity.setTimestamp(NOW.toEpochMilli()); - - DefaultRevisionMetadata metadata = new DefaultRevisionMetadata(entity); - - assertThat(metadata.getRevisionDate()) - .hasValue(LocalDateTime.ofInstant(NOW, ZoneOffset.systemDefault()).truncatedTo(ChronoUnit.MILLIS)); - } -} diff --git a/src/test/java/org/springframework/data/envers/repository/support/EnversRevisionRepositoryImplUnitTests.java b/src/test/java/org/springframework/data/envers/repository/support/EnversRevisionRepositoryImplUnitTests.java deleted file mode 100644 index df9acf0..0000000 --- a/src/test/java/org/springframework/data/envers/repository/support/EnversRevisionRepositoryImplUnitTests.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright 2020-2022 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.data.envers.repository.support; - -import static org.assertj.core.api.Assertions.*; -import static org.mockito.Mockito.*; - -import org.hibernate.envers.DefaultRevisionEntity; -import org.hibernate.envers.RevisionType; -import org.junit.jupiter.api.Test; -import org.springframework.data.history.AnnotationRevisionMetadata; -import org.springframework.data.history.RevisionMetadata; - -/** - * Unit tests for {@link EnversRevisionRepositoryImpl}. - * - * @author Jens Schauder - */ -class EnversRevisionRepositoryImplUnitTests { - - @Test // gh-215 - void revisionTypeOfAnnotationRevisionMetadataIsProperlySet() { - - Object[] data = new Object[] { "a", "some metadata", RevisionType.DEL }; - - EnversRevisionRepositoryImpl.QueryResult result = new EnversRevisionRepositoryImpl.QueryResult<>(data); - - RevisionMetadata revisionMetadata = result.createRevisionMetadata(); - - assertThat(revisionMetadata).isInstanceOf(AnnotationRevisionMetadata.class); - assertThat(revisionMetadata.getRevisionType()).isEqualTo(RevisionMetadata.RevisionType.DELETE); - } - - @Test // gh-215 - void revisionTypeOfDefaultRevisionMetadataIsProperlySet() { - - Object[] data = new Object[] { "a", mock(DefaultRevisionEntity.class), RevisionType.DEL }; - - EnversRevisionRepositoryImpl.QueryResult result = new EnversRevisionRepositoryImpl.QueryResult<>(data); - - RevisionMetadata revisionMetadata = result.createRevisionMetadata(); - - assertThat(revisionMetadata).isInstanceOf(DefaultRevisionMetadata.class); - assertThat(revisionMetadata.getRevisionType()).isEqualTo(RevisionMetadata.RevisionType.DELETE); - } - -} diff --git a/src/test/java/org/springframework/data/envers/repository/support/QueryDslRepositoryIntegrationTests.java b/src/test/java/org/springframework/data/envers/repository/support/QueryDslRepositoryIntegrationTests.java deleted file mode 100755 index c60011a..0000000 --- a/src/test/java/org/springframework/data/envers/repository/support/QueryDslRepositoryIntegrationTests.java +++ /dev/null @@ -1,97 +0,0 @@ -/* - * Copyright 2018-2022 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.data.envers.repository.support; - -import static org.assertj.core.api.Assertions.*; - -import java.util.Iterator; - -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.envers.Config; -import org.springframework.data.envers.sample.Country; -import org.springframework.data.envers.sample.CountryQueryDslRepository; -import org.springframework.data.envers.sample.QCountry; -import org.springframework.data.history.Revision; -import org.springframework.data.history.Revisions; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit.jupiter.SpringExtension; - -/** - * Integration tests for repositories with Querydsl support. They make sure that methods provided by both - * {@link org.springframework.data.repository.history.RevisionRepository} and {@link org.springframework.data.querydsl.QuerydslPredicateExecutor} are working. - * - * @author Dmytro Iaroslavskyi - * @author Jens Schauder - */ -@ExtendWith(SpringExtension.class) -@ContextConfiguration(classes = Config.class) -class QueryDslRepositoryIntegrationTests { - - @Autowired - CountryQueryDslRepository countryRepository; - - @BeforeEach - void setUp() { - countryRepository.deleteAll(); - } - - @Test - void testWithQueryDsl() { - - Country de = new Country(); - de.code = "de"; - de.name = "Deutschland"; - - countryRepository.save(de); - - Country found = countryRepository.findOne(QCountry.country.name.eq("Deutschland")).get(); - - assertThat(found).isNotNull(); - assertThat(found.id).isEqualTo(de.id); - } - - @Test - void testWithRevisions() { - - Country de = new Country(); - de.code = "de"; - de.name = "Deutschland"; - - countryRepository.save(de); - - de.name = "Germany"; - - countryRepository.save(de); - - Revisions revisions = countryRepository.findRevisions(de.id); - - assertThat(revisions).hasSize(2); - - Iterator> iterator = revisions.iterator(); - - Integer firstRevisionNumber = iterator.next().getRevisionNumber().get(); - Integer secondRevisionNumber = iterator.next().getRevisionNumber().get(); - - assertThat(countryRepository.findRevision(de.id, firstRevisionNumber).get().getEntity().name) - .isEqualTo("Deutschland"); - assertThat(countryRepository.findRevision(de.id, secondRevisionNumber).get().getEntity().name).isEqualTo("Germany"); - } - -} diff --git a/src/test/java/org/springframework/data/envers/repository/support/RepositoryIntegrationTests.java b/src/test/java/org/springframework/data/envers/repository/support/RepositoryIntegrationTests.java deleted file mode 100755 index d75066d..0000000 --- a/src/test/java/org/springframework/data/envers/repository/support/RepositoryIntegrationTests.java +++ /dev/null @@ -1,251 +0,0 @@ -/* - * Copyright 2012-2022 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.data.envers.repository.support; - -import static org.assertj.core.api.Assertions.*; -import static org.springframework.data.history.RevisionMetadata.RevisionType.*; - -import java.util.Arrays; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Optional; - -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.PageRequest; -import org.springframework.data.envers.Config; -import org.springframework.data.envers.sample.Country; -import org.springframework.data.envers.sample.CountryRepository; -import org.springframework.data.envers.sample.License; -import org.springframework.data.envers.sample.LicenseRepository; -import org.springframework.data.history.Revision; -import org.springframework.data.history.RevisionSort; -import org.springframework.data.history.Revisions; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit.jupiter.SpringExtension; - -/** - * Integration tests for repositories. - * - * @author Oliver Gierke - * @author Jens Schauder - */ -@ExtendWith(SpringExtension.class) -@ContextConfiguration(classes = Config.class) -class RepositoryIntegrationTests { - - @Autowired - LicenseRepository licenseRepository; - @Autowired - CountryRepository countryRepository; - - @BeforeEach - void setUp() { - - licenseRepository.deleteAll(); - countryRepository.deleteAll(); - } - - @AfterEach - void tearDown() { - - licenseRepository.deleteAll(); - countryRepository.deleteAll(); - } - - @Test - void testLifeCycle() { - - License license = new License(); - license.name = "Schnitzel"; - - licenseRepository.save(license); - - Country de = new Country(); - de.code = "de"; - de.name = "Deutschland"; - - countryRepository.save(de); - - Country se = new Country(); - se.code = "se"; - se.name = "Schweden"; - - countryRepository.save(se); - - license.laender = new HashSet<>(); - license.laender.addAll(Arrays.asList(de, se)); - - licenseRepository.save(license); - - de.name = "Daenemark"; - - countryRepository.save(de); - - Optional> revision = licenseRepository.findLastChangeRevision(license.id); - - assertThat(revision).hasValueSatisfying(it -> { - - Page> page = licenseRepository.findRevisions(license.id, PageRequest.of(0, 10)); - Revisions revisions = Revisions.of(page.getContent()); - assertThat(revisions.getLatestRevision()).isEqualTo(it); - }); - } - - @Test // #1 - void returnsEmptyLastRevisionForUnrevisionedEntity() { - assertThat(countryRepository.findLastChangeRevision(100L)).isEmpty(); - } - - @Test // #47 - void returnsEmptyRevisionsForUnrevisionedEntity() { - assertThat(countryRepository.findRevisions(100L)).isEmpty(); - } - - @Test // #47 - void returnsEmptyRevisionForUnrevisionedEntity() { - assertThat(countryRepository.findRevision(100L, 23)).isEmpty(); - } - - @Test // #31 - void returnsParticularRevisionForAnEntity() { - - Country de = new Country(); - de.code = "de"; - de.name = "Deutschland"; - - countryRepository.save(de); - - de.name = "Germany"; - - countryRepository.save(de); - - Revisions revisions = countryRepository.findRevisions(de.id); - - assertThat(revisions).hasSize(2); - - Iterator> iterator = revisions.iterator(); - Revision first = iterator.next(); - Revision second = iterator.next(); - - assertThat(countryRepository.findRevision(de.id, first.getRequiredRevisionNumber())) - .hasValueSatisfying(it -> assertThat(it.getEntity().name).isEqualTo("Deutschland")); - - assertThat(countryRepository.findRevision(de.id, second.getRequiredRevisionNumber())) - .hasValueSatisfying(it -> assertThat(it.getEntity().name).isEqualTo("Germany")); - } - - @Test // #55 - void considersRevisionNumberSortOrder() { - - Country de = new Country(); - de.code = "de"; - de.name = "Deutschland"; - - countryRepository.save(de); - - de.name = "Germany"; - - countryRepository.save(de); - - Page> page = countryRepository.findRevisions(de.id, - PageRequest.of(0, 10, RevisionSort.desc())); - - assertThat(page).hasSize(2); - assertThat(page.getContent().get(0).getRequiredRevisionNumber()) - .isGreaterThan(page.getContent().get(1).getRequiredRevisionNumber()); - } - - @Test // #21 - void findsDeletedRevisions() { - - Country de = new Country(); - de.code = "de"; - de.name = "Deutschland"; - - countryRepository.save(de); - - countryRepository.delete(de); - - Revisions revisions = countryRepository.findRevisions(de.id); - - assertThat(revisions).hasSize(2); - assertThat(revisions.getLatestRevision().getEntity()) // - .isNotNull() // - .extracting(c -> c.name, c -> c.code) // - .containsExactly(null, null); - } - - @Test // #47 - void includesCorrectRevisionType() { - - Country de = new Country(); - de.code = "de"; - de.name = "Deutschland"; - - countryRepository.save(de); - - de.name = "Bundes Republik Deutschland"; - - countryRepository.save(de); - - countryRepository.delete(de); - - Revisions revisions = countryRepository.findRevisions(de.id); - - assertThat(revisions) // - .extracting(r -> r.getMetadata().getRevisionType()) // - .containsExactly( // - INSERT, // - UPDATE, // - DELETE // - ); - } - - @Test // #146 - void shortCircuitingWhenOffsetIsToLarge() { - - Country de = new Country(); - de.code = "de"; - de.name = "Deutschland"; - - countryRepository.save(de); - - countryRepository.delete(de); - - check(de.id, 0, 1, 2); - check(de.id, 1, 1, 2); - check(de.id, 2, 0, 2); - } - - @Test // #47 - void paginationWithEmptyResult() { - - check(23L, 0, 0, 0); - } - - void check(Long id, int page, int expectedSize, int expectedTotalSize) { - - Page> revisions = countryRepository.findRevisions(id, PageRequest.of(page, 1)); - assertThat(revisions).hasSize(expectedSize); - assertThat(revisions.getTotalElements()).isEqualTo(expectedTotalSize); - } -} diff --git a/src/test/java/org/springframework/data/envers/sample/AbstractEntity.java b/src/test/java/org/springframework/data/envers/sample/AbstractEntity.java deleted file mode 100644 index f054d85..0000000 --- a/src/test/java/org/springframework/data/envers/sample/AbstractEntity.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 2012-2022 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.data.envers.sample; - -import lombok.EqualsAndHashCode; - -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; - -@MappedSuperclass -@EqualsAndHashCode -abstract class AbstractEntity { - - public @Id @GeneratedValue Long id; -} diff --git a/src/test/java/org/springframework/data/envers/sample/Country.java b/src/test/java/org/springframework/data/envers/sample/Country.java deleted file mode 100755 index cab9090..0000000 --- a/src/test/java/org/springframework/data/envers/sample/Country.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright 2012-2022 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.data.envers.sample; - -import javax.persistence.Entity; - -import lombok.ToString; -import org.hibernate.envers.Audited; - -/** - * Sample domain class. - * - * @author Oliver Gierke - * @author Jens Schauder - */ -@Audited -@Entity -@ToString -public class Country extends AbstractEntity { - - public String code; - public String name; -} diff --git a/src/test/java/org/springframework/data/envers/sample/CountryQueryDslRepository.java b/src/test/java/org/springframework/data/envers/sample/CountryQueryDslRepository.java deleted file mode 100755 index cab7f48..0000000 --- a/src/test/java/org/springframework/data/envers/sample/CountryQueryDslRepository.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright 2015-2022 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.data.envers.sample; - -import org.springframework.data.envers.repository.support.EnversRevisionRepository; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.querydsl.QuerydslPredicateExecutor; - -/** - * Repository with QueryDsl support for {@link Country} objects. - * - * @author Dmytro Iaroslavskyi - */ -public interface CountryQueryDslRepository - extends EnversRevisionRepository, JpaRepository, - QuerydslPredicateExecutor { - -} diff --git a/src/test/java/org/springframework/data/envers/sample/CountryRepository.java b/src/test/java/org/springframework/data/envers/sample/CountryRepository.java deleted file mode 100755 index 7a9f0fe..0000000 --- a/src/test/java/org/springframework/data/envers/sample/CountryRepository.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright 2012-2022 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.data.envers.sample; - -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.repository.history.RevisionRepository; - -/** - * Repository for {@link Country} objects. - * - * @author Oliver Gierke - */ -public interface CountryRepository extends RevisionRepository, JpaRepository { - -} diff --git a/src/test/java/org/springframework/data/envers/sample/License.java b/src/test/java/org/springframework/data/envers/sample/License.java deleted file mode 100755 index 41d2498..0000000 --- a/src/test/java/org/springframework/data/envers/sample/License.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright 2012-2022 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.data.envers.sample; - -import java.util.Set; - -import javax.persistence.Entity; -import javax.persistence.ManyToMany; -import javax.persistence.Version; - -import org.hibernate.envers.Audited; - -/** - * Sample domain class. - * - * @author Philip Huegelmeyer - */ -@Audited -@Entity -public class License extends AbstractEntity { - - @Version - public Integer version; - - public String name; - @ManyToMany - public Set laender; -} diff --git a/src/test/java/org/springframework/data/envers/sample/LicenseRepository.java b/src/test/java/org/springframework/data/envers/sample/LicenseRepository.java deleted file mode 100755 index e090011..0000000 --- a/src/test/java/org/springframework/data/envers/sample/LicenseRepository.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright 2012-2022 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.data.envers.sample; - -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.repository.history.RevisionRepository; - -/** - * Repository for {@link License} objects. - * - * @author Oliver Gierke - */ -public interface LicenseRepository extends RevisionRepository, JpaRepository { - -} diff --git a/src/test/java/org/springframework/data/envers/sample/QCountry.java b/src/test/java/org/springframework/data/envers/sample/QCountry.java deleted file mode 100755 index c218e55..0000000 --- a/src/test/java/org/springframework/data/envers/sample/QCountry.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright 2015-2022 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.data.envers.sample; - -import com.querydsl.core.types.Path; -import com.querydsl.core.types.PathMetadata; -import com.querydsl.core.types.dsl.EntityPathBase; -import com.querydsl.core.types.dsl.PathInits; -import com.querydsl.core.types.dsl.StringPath; - -import static com.querydsl.core.types.PathMetadataFactory.forVariable; - -/** - * Query class for Country domain. - * - * @author Dmytro Iaroslavskyi - */ -public class QCountry extends EntityPathBase { - - private static final long serialVersionUID = -936338527; - - private static final PathInits INITS = PathInits.DIRECT2; - - public static final QCountry country = new QCountry("country"); - - public final StringPath code = createString("code"); - public final StringPath name = createString("name"); - - public QCountry(String variable) { - this(Country.class, forVariable(variable), INITS); - } - - @SuppressWarnings("all") - public QCountry(Path path) { - this((Class) path.getType(), path.getMetadata(), path.getMetadata().isRoot() ? INITS : PathInits.DEFAULT); - } - - public QCountry(PathMetadata metadata) { - this(metadata, metadata.isRoot() ? INITS : PathInits.DEFAULT); - } - - public QCountry(PathMetadata metadata, PathInits inits) { - this(Country.class, metadata, inits); - } - - public QCountry(Class type, PathMetadata metadata, PathInits inits) { - super(type, metadata, inits); - } - -} diff --git a/src/test/resources/logback.xml b/src/test/resources/logback.xml deleted file mode 100644 index b2160dd..0000000 --- a/src/test/resources/logback.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - %d %5p %40.40c:%4L - %m%n - - - - - - - - - - \ No newline at end of file diff --git a/template.mf b/template.mf deleted file mode 100644 index 3321d44..0000000 --- a/template.mf +++ /dev/null @@ -1,15 +0,0 @@ -Bundle-SymbolicName: org.springframework.data.envers -Bundle-Name: ${project.name} -Bundle-Vendor: Pivotal Software, Inc. -Bundle-Version: ${project.version} -Bundle-ManifestVersion: 2 -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Import-Template: - com.querydsl.*;version="${querydsl:[=.=.=,+1.0.0)}";resolution:=optional, - javax.persistence.*;version="[2.0.0,3.0.0)", - org.hibernate.envers.*;version="${hibernate.envers:[=.=.=,+1.0.0)}", - org.joda.time.*;version="${jodatime:[=.=.=,+1.0.0)}", - org.springframework.*;version="${spring:[=.=.=,+1.0.0)}", - org.springframework.data.*;version="${springdata.commons:[=.=.=,+1.0.0)}", - org.springframework.data.jpa.*;version="${springdata.jpa:[=.=.=,+1.0.0)}" -DynamicImport-Package: *