Transaction synchronization

.github/workflows/ci.yaml

@@ -0,0 +1,37 @@
+name: "CI"
+on:
+  pull_request:
+jobs:
+  tests:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        java: [8, 11]
+    steps:
+      - uses: actions/checkout@v2
+      - run: cd $GITHUB_WORKSPACE
+
+      - uses: actions/setup-java@v1
+        with:
+          java-version: ${{ matrix.java }}
+          java-package: jdk
+          architecture: x64
+
+      - run: ./gradlew check
+      - uses: actions/upload-artifact@v2
+        if: ${{ always() }}
+        with:
+          name: testreport-audit-test-${{ matrix.java }}
+          path: examples/audit-test/build/reports/tests
+      - uses: actions/upload-artifact@v2
+        if: ${{ always() }}
+        with:
+          name: testreport-audit-test-allow-update-outside-transaction-${{ matrix.java }}
+          path: examples/audit-test-allow-update-outside-transaction/build/reports/tests
+
+      - run: ./gradlew :examples:audit-test:check -Daudit-test.AuditTrail.datasource=DEFAULT
+      - uses: actions/upload-artifact@v2
+        if: ${{ always() }}
+        with:
+          name: testreport-audit-test-single-datasource-${{ matrix.java }}
+          path: examples/audit-test/build/reports/tests

.gitignore

@@ -25,3 +25,5 @@ classes
 /.asscache
 /audit-test/.asscache
 .vscode/settings.json
+/plugin/out
+/examples/audit-test/out

README.md

@@ -77,7 +77,7 @@ Special thanks to all the contributors (in alphabetical order):
 
 
 ## Continuous Integration Server
-[![Build Status](https://travis-ci.org/robertoschwald/grails-audit-logging-plugin.svg?branch=master)](https://travis-ci.org/robertoschwald/grails-audit-logging-plugin)
+[![Build Status](https://github.com/robertoschwald/grails-audit-logging-plugin/workflows/CI/badge.svg)](https://github.com/robertoschwald/grails-audit-logging-plugin/actions)
 
 ## Bintray Repository
 <a href='https://bintray.com/robertoschwald/plugins/audit-logging/view?source=watch' alt='Get automatic notifications about new "audit-logging" versions'><img src='https://www.bintray.com/docs/images/bintray_badge_color.png'></a>

examples/audit-test-allow-update-outside-transaction/README.md

@@ -0,0 +1,8 @@
+This is a sample test project for audit-logging.
+
+You can run the tests by
+
+    ./gradlew check
+
+In comparison to `examples/audit-test` this application tests support for applications that are using `hibernate.allow_update_outside_transaction = true` and are not using a second datasource for `AuditTrail`.
+

examples/audit-test-allow-update-outside-transaction/build.gradle

@@ -0,0 +1,103 @@
+buildscript {
+    ext {
+        grailsVersion = project.grailsVersion
+    }
+    repositories {
+        mavenLocal()
+        maven { url "https://repo.grails.org/grails/core" }
+    }
+    dependencies {
+        classpath "org.grails:grails-gradle-plugin:$grailsVersion"
+        classpath "com.bertramlabs.plugins:asset-pipeline-gradle:3.0.7"
+    }
+}
+
+version file("$rootDir/version.txt").text.trim()
+group "audit.test"
+
+apply plugin: "war"
+apply plugin: "asset-pipeline"
+apply plugin: 'eclipse'
+apply plugin: 'idea'
+apply plugin: "org.grails.grails-web"
+apply plugin: "org.grails.grails-gsp"
+
+ext {
+    grailsVersion = project.grailsVersion
+    gradleWrapperVersion = project.gradleWrapperVersion
+}
+
+assets {
+    minifyJs = true
+    minifyCss = true
+}
+
+repositories {
+    mavenLocal()
+    maven { url "https://repo.grails.org/grails/core" }
+}
+
+grails {
+    plugins {
+        compile project(":audit-logging")
+    }
+}
+
+configurations {
+    developmentOnly
+    runtimeClasspath {
+        extendsFrom developmentOnly
+    }
+}
+
+dependencies {
+    developmentOnly("org.springframework.boot:spring-boot-devtools")
+    compile "org.springframework.boot:spring-boot-starter-logging"
+    compile "org.springframework.boot:spring-boot-autoconfigure"
+    compile "org.grails:grails-core"
+    compile "org.springframework.boot:spring-boot-starter-actuator"
+    compile "org.springframework.boot:spring-boot-starter-tomcat"
+    compile "org.grails:grails-web-boot"
+    compile "org.grails:grails-logging"
+    compile "org.grails:grails-plugin-rest"
+    compile "org.grails:grails-plugin-databinding"
+    compile "org.grails:grails-plugin-i18n"
+    compile "org.grails:grails-plugin-services"
+    compile "org.grails:grails-plugin-url-mappings"
+    compile "org.grails:grails-plugin-interceptors"
+    compile "org.grails.plugins:cache"
+    compile "org.grails.plugins:async"
+    compile "org.grails.plugins:scaffolding"
+    compile "org.grails.plugins:events"
+    compile "org.grails.plugins:hibernate5"
+    compile "org.hibernate:hibernate-core:5.4.0.Final"
+    compile "org.hibernate:hibernate-ehcache:5.4.0.Final"
+    compile "org.grails.plugins:gsp"
+    console "org.grails:grails-console"
+    profile "org.grails.profiles:web"
+    runtime "org.glassfish.web:el-impl:2.1.2-b03"
+    runtime "com.h2database:h2"
+    runtime "org.apache.tomcat:tomcat-jdbc"
+    runtime "javax.xml.bind:jaxb-api:2.3.0"
+    runtime "com.bertramlabs.plugins:asset-pipeline-grails:3.0.7"
+    testCompile "org.grails:grails-gorm-testing-support"
+    testCompile "org.mockito:mockito-core"
+    testCompile "org.grails:grails-web-testing-support"
+    testCompile "org.grails.plugins:geb"
+    testCompile "org.seleniumhq.selenium:selenium-remote-driver:3.14.0"
+    testCompile "org.seleniumhq.selenium:selenium-api:3.14.0"
+    testCompile "org.seleniumhq.selenium:selenium-support:3.14.0"
+    testRuntime "org.seleniumhq.selenium:selenium-chrome-driver:3.14.0"
+    testRuntime "org.seleniumhq.selenium:selenium-firefox-driver:3.14.0"
+}
+
+task wrapper(type: Wrapper) {
+    gradleVersion = gradleWrapperVersion
+}
+
+test {
+    testLogging {
+        showStandardStreams = true
+        exceptionFormat = 'full'
+    }
+}

examples/audit-test-allow-update-outside-transaction/grails-app/conf/application.groovy

@@ -0,0 +1,24 @@
+grails {
+    plugin {
+        auditLog {
+            verbose = true
+            excluded = ['version', 'lastUpdated', 'lastUpdatedBy']
+            logFullClassName = true
+            failOnError = true
+            mask = ['ssn']
+            logIds = true
+            defaultActor = 'SYS'
+            replacementPatterns = ["a.b": ""]
+            truncateLength = 1000000
+        }
+    }
+}
+
+// Added by the Audit-Logging plugin:
+grails.plugin.auditLog.auditDomainClassName = 'test.AuditTrail'
+
+hibernate_second {
+    cache.use_second_level_cache = true
+    cache.use_query_cache = false
+    cache.region.factory_class = 'org.hibernate.cache.ehcache.EhCacheRegionFactory'
+}

examples/audit-test-allow-update-outside-transaction/grails-app/conf/application.yml

@@ -0,0 +1,112 @@
+---
+grails:
+    profile: web
+    codegen:
+        defaultPackage: audit.test
+info:
+    app:
+        name: '@info.app.name@'
+        version: '@info.app.version@'
+        grailsVersion: '@info.app.grailsVersion@'
+spring:
+    groovy:
+        template:
+            check-template-location: false
+
+---
+grails:
+    mime:
+        disable:
+            accept:
+                header:
+                    userAgents:
+                        - Gecko
+                        - WebKit
+                        - Presto
+                        - Trident
+        types:
+            all: '*/*'
+            atom: application/atom+xml
+            css: text/css
+            csv: text/csv
+            form: application/x-www-form-urlencoded
+            html: 
+              - text/html
+              - application/xhtml+xml
+            js: text/javascript
+            json:
+              - application/json
+              - text/json
+            multipartForm: multipart/form-data
+            pdf: application/pdf
+            rss: application/rss+xml
+            text: text/plain
+            hal: 
+              - application/hal+json
+              - application/hal+xml
+            xml:
+              - text/xml
+              - application/xml
+    urlmapping:
+        cache:
+            maxsize: 1000
+    controllers:
+        defaultScope: singleton
+    converters:
+        encoding: UTF-8
+    views:
+        default:
+            codec: html
+        gsp:
+            encoding: UTF-8
+            htmlcodec: xml
+            codecs:
+                expression: html
+                scriptlets: html
+                taglib: none
+                staticparts: none
+dataSource:
+    pooled: true
+    driverClassName: "org.h2.Driver"
+    username: "sa"
+    password: ""
+hibernate:
+    allow_update_outside_transaction: true
+    cache:
+        queries: false
+        use_second_level_cache: true
+        use_query_cache: false
+        region:
+            factory_class: 'org.hibernate.cache.ehcache.SingletonEhCacheRegionFactory'
+
+environments:
+    development:
+        dataSource:
+            dbCreate: "create-drop"
+            url: "jdbc:h2:mem:devDb;MVCC=TRUE;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE"
+    test:
+        dataSource:
+            dbCreate: "update"
+            url: "jdbc:h2:mem:testDb;MVCC=TRUE;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE"
+        dataSources:
+            second:
+                dbCreate: "update"
+                url: "jdbc:h2:mem:testDb2;MVCC=TRUE;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE"
+    production:
+        dataSource:
+            dbCreate: "update"
+            url: "jdbc:h2:prodDb;MVCC=TRUE;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE"
+            properties:
+               maxActive: -1
+               minEvictableIdleTimeMillis: 1800000
+               timeBetweenEvictionRunsMillis: 1800000
+               numTestsPerEvictionRun: 3
+               testOnBorrow: true
+               testWhileIdle: true
+               testOnReturn: false
+               validationQuery: "SELECT 1"
+               jdbcInterceptors: "ConnectionState"
+        dataSources:
+            second:
+                dbCreate: "update"
+            url: "jdbc:h2:mem:testDb2;MVCC=TRUE;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE"

examples/audit-test-allow-update-outside-transaction/grails-app/conf/logback.groovy

@@ -0,0 +1,32 @@
+import ch.qos.logback.classic.encoder.PatternLayoutEncoder
+import grails.util.BuildSettings
+import grails.util.Environment
+
+
+// See http://logback.qos.ch/manual/groovy.html for details on configuration
+appender('STDOUT', ConsoleAppender) {
+    encoder(PatternLayoutEncoder) {
+        pattern = "%level %logger - %msg%n"
+    }
+}
+
+logger("grails.plugins.orm.auditable", DEBUG)
+logger("test", DEBUG)
+
+root(ERROR, ['STDOUT'])
+
+if(Environment.current == Environment.DEVELOPMENT) {
+    def targetDir = BuildSettings.TARGET_DIR
+    if(targetDir) {
+
+        appender("FULL_STACKTRACE", FileAppender) {
+
+            file = "${targetDir}/stacktrace.log"
+            append = true
+            encoder(PatternLayoutEncoder) {
+                pattern = "%level %logger - %msg%n"
+            }
+        }
+        logger("StackTrace", ERROR, ['FULL_STACKTRACE'], false )
+    }
+}

examples/audit-test-allow-update-outside-transaction/grails-app/conf/spring/resources.groovy

@@ -0,0 +1,3 @@
+// Place your Spring DSL code here
+beans = {
+}