Merge branch 'develop' into fix/AAE-23566-Audit-Events-Messages-dont-…

…follow-schema
Activiti · Aug 28, 2024 · f03ef60 · f03ef60
2 parents 7f4a0ac + caa4c6b
commit f03ef60
Show file tree

Hide file tree

Showing 307 changed files with 2,097 additions and 4,053 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -279,16 +279,9 @@ jobs:
 
       - name: Delete Helm chart for ${{ matrix.messaging-broker }}
         if: always()
-        env:
-          IS_PREVIEW: ${{ github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'preview') }}
         run: |
-          if [ $IS_PREVIEW = true ]
-          then
-              echo "Skipping delete Helm release for preview"
-          else
-              echo "Delete Helm release"
-              make delete
-          fi
+          echo "Delete Helm release"
+          make delete
 
   delete-test-images:
     runs-on: ubuntu-latest

diff --git a/activiti-cloud-api/pom.xml b/activiti-cloud-api/pom.xml
@@ -12,7 +12,7 @@
   <name>Activiti Cloud :: Runtime API Parent</name>
   <packaging>pom</packaging>
   <properties>
-    <activiti.version>8.7.0-alpha.16</activiti.version>
+    <activiti.version>8.7.0-alpha.20</activiti.version>
   </properties>
   <modules>
     <module>activiti-cloud-api-dependencies</module>

diff --git a/activiti-cloud-audit-service/activiti-cloud-audit-dependencies/pom.xml b/activiti-cloud-audit-service/activiti-cloud-audit-dependencies/pom.xml
@@ -20,14 +20,19 @@
         <artifactId>activiti-cloud-services-audit-parent</artifactId>
         <version>${project.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.activiti.cloud</groupId>
+        <artifactId>activiti-cloud-services-audit-consumer</artifactId>
+        <version>${project.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.activiti.cloud</groupId>
         <artifactId>activiti-cloud-services-audit-model</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.activiti.cloud</groupId>
-        <artifactId>activiti-cloud-services-audit-jpa</artifactId>
+        <artifactId>activiti-cloud-services-audit-rest</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -40,6 +45,16 @@
         <artifactId>activiti-cloud-services-audit-liquibase</artifactId>
         <version>${project.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.activiti.cloud</groupId>
+        <artifactId>activiti-cloud-starter-audit-rest</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.activiti.cloud</groupId>
+        <artifactId>activiti-cloud-starter-audit-consumer</artifactId>
+        <version>${project.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.activiti.cloud</groupId>
         <artifactId>activiti-cloud-starter-audit</artifactId>

diff --git a/activiti-cloud-audit-service/activiti-cloud-services-audit-api/pom.xml b/activiti-cloud-audit-service/activiti-cloud-services-audit-api/pom.xml
@@ -23,10 +23,6 @@
       <groupId>org.activiti.cloud</groupId>
       <artifactId>activiti-cloud-api-process-model-impl</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.activiti.cloud</groupId>
-      <artifactId>activiti-cloud-service-messaging-config</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.activiti.cloud</groupId>
       <artifactId>activiti-cloud-services-dbp-rest</artifactId>
@@ -60,14 +56,6 @@
       <artifactId>spring-boot-autoconfigure</artifactId>
       <optional>true</optional>
     </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-messaging</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.cloud</groupId>
-      <artifactId>spring-cloud-stream</artifactId>
-    </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-annotations</artifactId>

diff --git a/...src/main/java/org/activiti/cloud/services/audit/api/config/AuditAPIAutoConfiguration.java b/...src/main/java/org/activiti/cloud/services/audit/api/config/AuditAPIAutoConfiguration.java
@@ -18,10 +18,8 @@
 import org.activiti.cloud.services.audit.api.resources.EventsLinkRelationProvider;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Import;
 
 @AutoConfiguration
-@Import(AuditConsumerChannelsConfiguration.class)
 public class AuditAPIAutoConfiguration {
 
     @Bean

diff --git a/activiti-cloud-audit-service/activiti-cloud-services-audit-consumer/pom.xml b/activiti-cloud-audit-service/activiti-cloud-services-audit-consumer/pom.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.activiti.cloud</groupId>
+    <artifactId>activiti-cloud-audit-dependencies</artifactId>
+    <version>8.7.0-SNAPSHOT</version>
+    <relativePath>../activiti-cloud-audit-dependencies</relativePath>
+  </parent>
+  <artifactId>activiti-cloud-services-audit-consumer</artifactId>
+  <name>Activiti Cloud Audit :: Services :: Audit Events Consumer</name>
+
+  <properties>
+  </properties>
+  <dependencies>
+    <dependency>
+      <groupId>org.activiti.cloud</groupId>
+      <artifactId>activiti-cloud-api-model-shared</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.activiti.cloud</groupId>
+      <artifactId>activiti-cloud-service-messaging-config</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.activiti.cloud</groupId>
+      <artifactId>activiti-cloud-services-audit-model</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-test</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.cloud</groupId>
+      <artifactId>spring-cloud-starter-stream-rabbit</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/...AuditJPAControllersAutoConfiguration.java → ...ditConsumerChannelsAutoConfiguration.java b/...AuditJPAControllersAutoConfiguration.java → ...ditConsumerChannelsAutoConfiguration.java
@@ -13,14 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activiti.cloud.services.audit.jpa.controllers.config;
+package org.activiti.cloud.services.audit.api.config;
 
-import org.activiti.cloud.services.audit.jpa.controllers.AuditEventsAdminControllerImpl;
-import org.activiti.cloud.services.audit.jpa.controllers.AuditEventsControllerImpl;
-import org.activiti.cloud.services.audit.jpa.controllers.AuditEventsDeleteController;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.context.annotation.Import;
 
 @AutoConfiguration
-@Import({ AuditEventsAdminControllerImpl.class, AuditEventsControllerImpl.class, AuditEventsDeleteController.class })
-public class AuditJPAControllersAutoConfiguration {}
+@Import(AuditConsumerChannelsConfiguration.class)
+public class AuditConsumerChannelsAutoConfiguration {}
diff --git a/...g/AuditConsumerChannelsConfiguration.java → ...g/AuditConsumerChannelsConfiguration.java b/...g/AuditConsumerChannelsConfiguration.java → ...g/AuditConsumerChannelsConfiguration.java
diff --git a/.../streams/AuditConsumerChannelHandler.java → .../streams/AuditConsumerChannelHandler.java b/.../streams/AuditConsumerChannelHandler.java → .../streams/AuditConsumerChannelHandler.java
diff --git a/...it/api/streams/AuditConsumerChannels.java → ...it/api/streams/AuditConsumerChannels.java b/...it/api/streams/AuditConsumerChannels.java → ...it/api/streams/AuditConsumerChannels.java
diff --git a/...eams/AuditConsumerChannelHandlerImpl.java → ...eams/AuditConsumerChannelHandlerImpl.java b/...eams/AuditConsumerChannelHandlerImpl.java → ...eams/AuditConsumerChannelHandlerImpl.java
@@ -24,7 +24,6 @@
 import org.activiti.cloud.services.audit.api.converters.APIEventToEntityConverters;
 import org.activiti.cloud.services.audit.api.converters.EventToEntityConverter;
 import org.activiti.cloud.services.audit.api.streams.AuditConsumerChannelHandler;
-import org.activiti.cloud.services.audit.api.streams.AuditConsumerChannels;
 import org.activiti.cloud.services.audit.jpa.events.AuditEventEntity;
 import org.activiti.cloud.services.audit.jpa.repository.EventsRepository;
 import org.slf4j.Logger;

diff --git a/...fig/AuditJPAStreamsAutoConfiguration.java → ...fig/AuditJPAStreamsAutoConfiguration.java b/...fig/AuditJPAStreamsAutoConfiguration.java → ...fig/AuditJPAStreamsAutoConfiguration.java
diff --git a/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1,2 @@
+org.activiti.cloud.services.audit.api.config.AuditConsumerChannelsAutoConfiguration
+org.activiti.cloud.services.audit.jpa.streams.config.AuditJPAStreamsAutoConfiguration
diff --git a/.../AuditConsumerChannelHandlerImplTest.java → .../AuditConsumerChannelHandlerImplTest.java b/.../AuditConsumerChannelHandlerImplTest.java → .../AuditConsumerChannelHandlerImplTest.java
@@ -15,9 +15,6 @@
  */
 package org.activiti.cloud.services.audit.jpa.streams;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.*;
-
 import java.util.HashMap;
 import java.util.UUID;
 import org.activiti.api.process.model.events.ProcessRuntimeEvent;
@@ -28,12 +25,14 @@
 import org.activiti.cloud.services.audit.jpa.events.AuditEventEntity;
 import org.activiti.cloud.services.audit.jpa.events.ProcessCreatedAuditEventEntity;
 import org.activiti.cloud.services.audit.jpa.repository.EventsRepository;
+import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
+import org.mockito.Mockito;
 import org.mockito.junit.jupiter.MockitoExtension;
 
 @ExtendWith(MockitoExtension.class)
@@ -54,13 +53,14 @@ public class AuditConsumerChannelHandlerImplTest {
     @Test
     public void receiveEventShouldStoreEntity() {
         //given
-        CloudRuntimeEvent cloudRuntimeEvent = mock(CloudRuntimeEventImpl.class);
-        when(cloudRuntimeEvent.getEventType()).thenReturn(ProcessRuntimeEvent.ProcessEvents.PROCESS_CREATED);
-        EventToEntityConverter converter = mock(EventToEntityConverter.class);
-        when(converters.getConverterByEventTypeName(ProcessRuntimeEvent.ProcessEvents.PROCESS_CREATED.name()))
+        CloudRuntimeEvent cloudRuntimeEvent = Mockito.mock(CloudRuntimeEventImpl.class);
+        Mockito.when(cloudRuntimeEvent.getEventType()).thenReturn(ProcessRuntimeEvent.ProcessEvents.PROCESS_CREATED);
+        EventToEntityConverter converter = Mockito.mock(EventToEntityConverter.class);
+        Mockito
+            .when(converters.getConverterByEventTypeName(ProcessRuntimeEvent.ProcessEvents.PROCESS_CREATED.name()))
             .thenReturn(converter);
-        ProcessCreatedAuditEventEntity entity = mock(ProcessCreatedAuditEventEntity.class);
-        when(converter.convertToEntity(cloudRuntimeEvent)).thenReturn(entity);
+        ProcessCreatedAuditEventEntity entity = Mockito.mock(ProcessCreatedAuditEventEntity.class);
+        Mockito.when(converter.convertToEntity(cloudRuntimeEvent)).thenReturn(entity);
 
         CloudRuntimeEvent[] events = { cloudRuntimeEvent };
 
@@ -75,20 +75,21 @@ public void receiveEventShouldStoreEntity() {
         );
 
         //then
-        verify(eventsRepository).saveAll(argumentCaptor.capture());
-        assertThat(argumentCaptor.getValue()).containsOnly(entity);
+        Mockito.verify(eventsRepository).saveAll(argumentCaptor.capture());
+        Assertions.assertThat(argumentCaptor.getValue()).containsOnly(entity);
     }
 
     @Test
     public void messageIdShouldBeSet() {
         //given
-        CloudRuntimeEvent cloudRuntimeEvent = mock(CloudRuntimeEventImpl.class);
-        when(cloudRuntimeEvent.getEventType()).thenReturn(ProcessRuntimeEvent.ProcessEvents.PROCESS_CREATED);
-        EventToEntityConverter converter = mock(EventToEntityConverter.class);
-        when(converters.getConverterByEventTypeName(ProcessRuntimeEvent.ProcessEvents.PROCESS_CREATED.name()))
+        CloudRuntimeEvent cloudRuntimeEvent = Mockito.mock(CloudRuntimeEventImpl.class);
+        Mockito.when(cloudRuntimeEvent.getEventType()).thenReturn(ProcessRuntimeEvent.ProcessEvents.PROCESS_CREATED);
+        EventToEntityConverter converter = Mockito.mock(EventToEntityConverter.class);
+        Mockito
+            .when(converters.getConverterByEventTypeName(ProcessRuntimeEvent.ProcessEvents.PROCESS_CREATED.name()))
             .thenReturn(converter);
-        AuditEventEntity entity = mock(AuditEventEntity.class);
-        when(converter.convertToEntity(cloudRuntimeEvent)).thenReturn(entity);
+        AuditEventEntity entity = Mockito.mock(AuditEventEntity.class);
+        Mockito.when(converter.convertToEntity(cloudRuntimeEvent)).thenReturn(entity);
 
         CloudRuntimeEvent[] events = { cloudRuntimeEvent };
 
@@ -99,6 +100,6 @@ public void messageIdShouldBeSet() {
         handler.receiveCloudRuntimeEvent(headers, events);
 
         //then
-        verify((CloudRuntimeEventImpl) cloudRuntimeEvent).setMessageId(headers.get("id").toString());
+        Mockito.verify((CloudRuntimeEventImpl) cloudRuntimeEvent).setMessageId(headers.get("id").toString());
     }
 }
diff --git a/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
diff --git a/activiti-cloud-audit-service/activiti-cloud-services-audit-model/pom.xml b/activiti-cloud-audit-service/activiti-cloud-services-audit-model/pom.xml
@@ -65,6 +65,11 @@
       <groupId>jakarta.persistence</groupId>
       <artifactId>jakarta.persistence-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-autoconfigure</artifactId>
+      <optional>true</optional>
+    </dependency>
     <dependency>
       <groupId>org.springframework.data</groupId>
       <artifactId>spring-data-jpa</artifactId>

diff --git a/...onverters/APIEventToEntityConverters.java → ...onverters/APIEventToEntityConverters.java b/...onverters/APIEventToEntityConverters.java → ...onverters/APIEventToEntityConverters.java
diff --git a/...pi/converters/EventToEntityConverter.java → ...pi/converters/EventToEntityConverter.java b/...pi/converters/EventToEntityConverter.java → ...pi/converters/EventToEntityConverter.java
diff --git a/...t/jpa/conf/AuditJPAAutoConfiguration.java → ...t/jpa/conf/AuditJPAAutoConfiguration.java b/...t/jpa/conf/AuditJPAAutoConfiguration.java → ...t/jpa/conf/AuditJPAAutoConfiguration.java
@@ -18,7 +18,6 @@
 import java.util.Set;
 import org.activiti.cloud.services.audit.api.converters.APIEventToEntityConverters;
 import org.activiti.cloud.services.audit.api.converters.EventToEntityConverter;
-import org.activiti.cloud.services.audit.jpa.assembler.EventRepresentationModelAssembler;
 import org.activiti.cloud.services.audit.jpa.converters.ActivityCancelledEventConverter;
 import org.activiti.cloud.services.audit.jpa.converters.ActivityCompletedEventConverter;
 import org.activiti.cloud.services.audit.jpa.converters.ActivityStartedEventConverter;
@@ -68,20 +67,13 @@
 import org.activiti.cloud.services.audit.jpa.converters.VariableDeletedEventConverter;
 import org.activiti.cloud.services.audit.jpa.converters.VariableUpdatedEventConverter;
 import org.activiti.cloud.services.audit.jpa.repository.EventsRepository;
-import org.activiti.cloud.services.audit.jpa.service.AuditEventsAdminService;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 
 @AutoConfiguration
 public class AuditJPAAutoConfiguration {
 
-    @ConditionalOnMissingBean
-    @Bean
-    public EventRepresentationModelAssembler eventRepresentationModelAssembler() {
-        return new EventRepresentationModelAssembler();
-    }
-
     @ConditionalOnMissingBean
     @Bean
     public EventContextInfoAppender eventContextInfoAppender() {
@@ -448,9 +440,4 @@ public ApplicationRollbackEventConverter applicationRollbackEventConverter(
     ) {
         return new ApplicationRollbackEventConverter(eventContextInfoAppender);
     }
-
-    @Bean
-    public AuditEventsAdminService auditEventsAdminService(EventsRepository eventsRepository) {
-        return new AuditEventsAdminService(eventsRepository);
-    }
 }
diff --git a/...ters/ActivityCancelledEventConverter.java → ...ters/ActivityCancelledEventConverter.java b/...ters/ActivityCancelledEventConverter.java → ...ters/ActivityCancelledEventConverter.java
diff --git a/...ters/ActivityCompletedEventConverter.java → ...ters/ActivityCompletedEventConverter.java b/...ters/ActivityCompletedEventConverter.java → ...ters/ActivityCompletedEventConverter.java
diff --git a/...erters/ActivityStartedEventConverter.java → ...erters/ActivityStartedEventConverter.java b/...erters/ActivityStartedEventConverter.java → ...erters/ActivityStartedEventConverter.java
diff --git a/...rs/ApplicationDeployedEventConverter.java → ...rs/ApplicationDeployedEventConverter.java b/...rs/ApplicationDeployedEventConverter.java → ...rs/ApplicationDeployedEventConverter.java
diff --git a/...rs/ApplicationRollbackEventConverter.java → ...rs/ApplicationRollbackEventConverter.java b/...rs/ApplicationRollbackEventConverter.java → ...rs/ApplicationRollbackEventConverter.java
diff --git a/...onverters/BaseEventToEntityConverter.java → ...onverters/BaseEventToEntityConverter.java b/...onverters/BaseEventToEntityConverter.java → ...onverters/BaseEventToEntityConverter.java
diff --git a/...nverters/ErrorReceivedEventConverter.java → ...nverters/ErrorReceivedEventConverter.java b/...nverters/ErrorReceivedEventConverter.java → ...nverters/ErrorReceivedEventConverter.java
diff --git a/.../converters/EventContextInfoAppender.java → .../converters/EventContextInfoAppender.java b/.../converters/EventContextInfoAppender.java → .../converters/EventContextInfoAppender.java
diff --git a/...tegrationErrorReceivedEventConverter.java → ...tegrationErrorReceivedEventConverter.java b/...tegrationErrorReceivedEventConverter.java → ...tegrationErrorReceivedEventConverter.java
diff --git a/...s/IntegrationRequestedEventConverter.java → ...s/IntegrationRequestedEventConverter.java b/...s/IntegrationRequestedEventConverter.java → ...s/IntegrationRequestedEventConverter.java
diff --git a/...egrationResultReceivedEventConverter.java → ...egrationResultReceivedEventConverter.java b/...egrationResultReceivedEventConverter.java → ...egrationResultReceivedEventConverter.java
diff --git a/...erters/MessageReceivedEventConverter.java → ...erters/MessageReceivedEventConverter.java b/...erters/MessageReceivedEventConverter.java → ...erters/MessageReceivedEventConverter.java
diff --git a/...converters/MessageSentEventConverter.java → ...converters/MessageSentEventConverter.java b/...converters/MessageSentEventConverter.java → ...converters/MessageSentEventConverter.java
diff --git a/...eSubscriptionCancelledEventConverter.java → ...eSubscriptionCancelledEventConverter.java b/...eSubscriptionCancelledEventConverter.java → ...eSubscriptionCancelledEventConverter.java
diff --git a/...verters/MessageWaitingEventConverter.java → ...verters/MessageWaitingEventConverter.java b/...verters/MessageWaitingEventConverter.java → ...verters/MessageWaitingEventConverter.java
diff --git a/...rters/ProcessCancelledEventConverter.java → ...rters/ProcessCancelledEventConverter.java b/...rters/ProcessCancelledEventConverter.java → ...rters/ProcessCancelledEventConverter.java
diff --git a/...idateStarterGroupAddedEventConverter.java → ...idateStarterGroupAddedEventConverter.java b/...idateStarterGroupAddedEventConverter.java → ...idateStarterGroupAddedEventConverter.java
diff --git a/...ateStarterGroupRemovedEventConverter.java → ...ateStarterGroupRemovedEventConverter.java b/...ateStarterGroupRemovedEventConverter.java → ...ateStarterGroupRemovedEventConverter.java
diff --git a/...didateStarterUserAddedEventConverter.java → ...didateStarterUserAddedEventConverter.java b/...didateStarterUserAddedEventConverter.java → ...didateStarterUserAddedEventConverter.java
diff --git a/...dateStarterUserRemovedEventConverter.java → ...dateStarterUserRemovedEventConverter.java b/...dateStarterUserRemovedEventConverter.java → ...dateStarterUserRemovedEventConverter.java
diff --git a/...rters/ProcessCompletedEventConverter.java → ...rters/ProcessCompletedEventConverter.java b/...rters/ProcessCompletedEventConverter.java → ...rters/ProcessCompletedEventConverter.java
diff --git a/...verters/ProcessCreatedEventConverter.java → ...verters/ProcessCreatedEventConverter.java b/...verters/ProcessCreatedEventConverter.java → ...verters/ProcessCreatedEventConverter.java
diff --git a/...verters/ProcessDeletedEventConverter.java → ...verters/ProcessDeletedEventConverter.java b/...verters/ProcessDeletedEventConverter.java → ...verters/ProcessDeletedEventConverter.java
diff --git a/...erters/ProcessDeployedEventConverter.java → ...erters/ProcessDeployedEventConverter.java b/...erters/ProcessDeployedEventConverter.java → ...erters/ProcessDeployedEventConverter.java
diff --git a/...verters/ProcessResumedEventConverter.java → ...verters/ProcessResumedEventConverter.java b/...verters/ProcessResumedEventConverter.java → ...verters/ProcessResumedEventConverter.java
diff --git a/...verters/ProcessStartedEventConverter.java → ...verters/ProcessStartedEventConverter.java b/...verters/ProcessStartedEventConverter.java → ...verters/ProcessStartedEventConverter.java
diff --git a/...rters/ProcessSuspendedEventConverter.java → ...rters/ProcessSuspendedEventConverter.java b/...rters/ProcessSuspendedEventConverter.java → ...rters/ProcessSuspendedEventConverter.java
diff --git a/...verters/ProcessUpdatedEventConverter.java → ...verters/ProcessUpdatedEventConverter.java b/...verters/ProcessUpdatedEventConverter.java → ...verters/ProcessUpdatedEventConverter.java
diff --git a/...ters/SequenceFlowTakenEventConverter.java → ...ters/SequenceFlowTakenEventConverter.java b/...ters/SequenceFlowTakenEventConverter.java → ...ters/SequenceFlowTakenEventConverter.java
diff --git a/...verters/SignalReceivedEventConverter.java → ...verters/SignalReceivedEventConverter.java b/...verters/SignalReceivedEventConverter.java → ...verters/SignalReceivedEventConverter.java
diff --git a/...onverters/TaskAssignedEventConverter.java → ...onverters/TaskAssignedEventConverter.java b/...onverters/TaskAssignedEventConverter.java → ...onverters/TaskAssignedEventConverter.java
diff --git a/...nverters/TaskCancelledEventConverter.java → ...nverters/TaskCancelledEventConverter.java b/...nverters/TaskCancelledEventConverter.java → ...nverters/TaskCancelledEventConverter.java
diff --git a/...askCandidateGroupAddedEventConverter.java → ...askCandidateGroupAddedEventConverter.java b/...askCandidateGroupAddedEventConverter.java → ...askCandidateGroupAddedEventConverter.java
diff --git a/...kCandidateGroupRemovedEventConverter.java → ...kCandidateGroupRemovedEventConverter.java b/...kCandidateGroupRemovedEventConverter.java → ...kCandidateGroupRemovedEventConverter.java
diff --git a/...TaskCandidateUserAddedEventConverter.java → ...TaskCandidateUserAddedEventConverter.java b/...TaskCandidateUserAddedEventConverter.java → ...TaskCandidateUserAddedEventConverter.java
diff --git a/...skCandidateUserRemovedEventConverter.java → ...skCandidateUserRemovedEventConverter.java b/...skCandidateUserRemovedEventConverter.java → ...skCandidateUserRemovedEventConverter.java
diff --git a/...nverters/TaskCompletedEventConverter.java → ...nverters/TaskCompletedEventConverter.java b/...nverters/TaskCompletedEventConverter.java → ...nverters/TaskCompletedEventConverter.java
diff --git a/...converters/TaskCreatedEventConverter.java → ...converters/TaskCreatedEventConverter.java b/...converters/TaskCreatedEventConverter.java → ...converters/TaskCreatedEventConverter.java
diff --git a/...nverters/TaskSuspendedEventConverter.java → ...nverters/TaskSuspendedEventConverter.java b/...nverters/TaskSuspendedEventConverter.java → ...nverters/TaskSuspendedEventConverter.java
diff --git a/...converters/TaskUpdatedEventConverter.java → ...converters/TaskUpdatedEventConverter.java b/...converters/TaskUpdatedEventConverter.java → ...converters/TaskUpdatedEventConverter.java
diff --git a/...verters/TimerCancelledEventConverter.java → ...verters/TimerCancelledEventConverter.java b/...verters/TimerCancelledEventConverter.java → ...verters/TimerCancelledEventConverter.java
diff --git a/...nverters/TimerExecutedEventConverter.java → ...nverters/TimerExecutedEventConverter.java b/...nverters/TimerExecutedEventConverter.java → ...nverters/TimerExecutedEventConverter.java
diff --git a/...converters/TimerFailedEventConverter.java → ...converters/TimerFailedEventConverter.java b/...converters/TimerFailedEventConverter.java → ...converters/TimerFailedEventConverter.java
diff --git a/.../converters/TimerFiredEventConverter.java → .../converters/TimerFiredEventConverter.java b/.../converters/TimerFiredEventConverter.java → .../converters/TimerFiredEventConverter.java
diff --git a/...imerRetriesDecrementedEventConverter.java → ...imerRetriesDecrementedEventConverter.java b/...imerRetriesDecrementedEventConverter.java → ...imerRetriesDecrementedEventConverter.java
diff --git a/...verters/TimerScheduledEventConverter.java → ...verters/TimerScheduledEventConverter.java b/...verters/TimerScheduledEventConverter.java → ...verters/TimerScheduledEventConverter.java
diff --git a/...erters/VariableCreatedEventConverter.java → ...erters/VariableCreatedEventConverter.java b/...erters/VariableCreatedEventConverter.java → ...erters/VariableCreatedEventConverter.java
diff --git a/...erters/VariableDeletedEventConverter.java → ...erters/VariableDeletedEventConverter.java b/...erters/VariableDeletedEventConverter.java → ...erters/VariableDeletedEventConverter.java
diff --git a/...erters/VariableUpdatedEventConverter.java → ...erters/VariableUpdatedEventConverter.java b/...erters/VariableUpdatedEventConverter.java → ...erters/VariableUpdatedEventConverter.java
diff --git a/...ctiviti/cloud/services/audit/jpa/events/MessageSubscriptionCancelledAuditEventEntity.java b/...ctiviti/cloud/services/audit/jpa/events/MessageSubscriptionCancelledAuditEventEntity.java
@@ -22,7 +22,6 @@
 import org.activiti.api.process.model.MessageSubscription;
 import org.activiti.cloud.api.process.model.events.CloudMessageSubscriptionCancelledEvent;
 import org.activiti.cloud.services.audit.jpa.converters.json.MessageSubscriptionJpaJsonConverter;
-import org.hibernate.annotations.DynamicInsert;
 
 @Entity
 @DiscriminatorValue(value = MessageSubscriptionCancelledAuditEventEntity.MESSAGE_SUBSCRIPTION_CANCELLED_EVENT)

diff --git a/...ctiviti/cloud/services/audit/jpa/events/ProcessCandidateStarterGroupAddedEventEntity.java b/...ctiviti/cloud/services/audit/jpa/events/ProcessCandidateStarterGroupAddedEventEntity.java
@@ -23,7 +23,6 @@
 import org.activiti.api.runtime.model.impl.ProcessCandidateStarterGroupImpl;
 import org.activiti.cloud.api.process.model.events.CloudProcessCandidateStarterGroupAddedEvent;
 import org.activiti.cloud.services.audit.jpa.converters.json.ProcessCandidateStarterGroupJpaJsonConverter;
-import org.hibernate.annotations.DynamicInsert;
 
 @Entity(name = ProcessCandidateStarterGroupAddedEventEntity.PROCESS_CANDIDATE_STARTER_GROUP_ADDED_EVENT)
 @DiscriminatorValue(value = ProcessCandidateStarterGroupAddedEventEntity.PROCESS_CANDIDATE_STARTER_GROUP_ADDED_EVENT)

diff --git a/...activiti/cloud/services/audit/jpa/events/ProcessCandidateStarterUserAddedEventEntity.java b/...activiti/cloud/services/audit/jpa/events/ProcessCandidateStarterUserAddedEventEntity.java
@@ -23,7 +23,6 @@
 import org.activiti.api.runtime.model.impl.ProcessCandidateStarterUserImpl;
 import org.activiti.cloud.api.process.model.events.CloudProcessCandidateStarterUserAddedEvent;
 import org.activiti.cloud.services.audit.jpa.converters.json.ProcessCandidateStarterUserJpaJsonConverter;
-import org.hibernate.annotations.DynamicInsert;
 
 @Entity(name = ProcessCandidateStarterUserAddedEventEntity.PROCESS_CANDIDATE_STARTER_USER_ADDED_EVENT)
 @DiscriminatorValue(value = ProcessCandidateStarterUserAddedEventEntity.PROCESS_CANDIDATE_STARTER_USER_ADDED_EVENT)

diff --git a/...tiviti/cloud/services/audit/jpa/events/ProcessCandidateStarterUserRemovedEventEntity.java b/...tiviti/cloud/services/audit/jpa/events/ProcessCandidateStarterUserRemovedEventEntity.java
@@ -23,7 +23,6 @@
 import org.activiti.api.runtime.model.impl.ProcessCandidateStarterUserImpl;
 import org.activiti.cloud.api.process.model.events.CloudProcessCandidateStarterUserRemovedEvent;
 import org.activiti.cloud.services.audit.jpa.converters.json.ProcessCandidateStarterUserJpaJsonConverter;
-import org.hibernate.annotations.DynamicInsert;
 
 @Entity(name = ProcessCandidateStarterUserRemovedEventEntity.PROCESS_CANDIDATE_STARTER_USER_REMOVED_EVENT)
 @DiscriminatorValue(value = ProcessCandidateStarterUserRemovedEventEntity.PROCESS_CANDIDATE_STARTER_USER_REMOVED_EVENT)

diff --git a/...in/java/org/activiti/cloud/services/audit/jpa/events/ProcessDeployedAuditEventEntity.java b/...in/java/org/activiti/cloud/services/audit/jpa/events/ProcessDeployedAuditEventEntity.java
@@ -22,7 +22,6 @@
 import org.activiti.api.process.model.ProcessDefinition;
 import org.activiti.cloud.api.process.model.events.CloudProcessDeployedEvent;
 import org.activiti.cloud.services.audit.jpa.converters.json.ProcessDefinitionJpaJsonConverter;
-import org.hibernate.annotations.DynamicInsert;
 
 @Entity(name = ProcessDeployedAuditEventEntity.PROCESS_DEPLOYED_EVENT)
 @DiscriminatorValue(value = ProcessDeployedAuditEventEntity.PROCESS_DEPLOYED_EVENT)

diff --git a/.../main/java/org/activiti/cloud/services/audit/jpa/events/SequenceFlowAuditEventEntity.java b/.../main/java/org/activiti/cloud/services/audit/jpa/events/SequenceFlowAuditEventEntity.java
@@ -22,7 +22,6 @@
 import org.activiti.api.process.model.BPMNSequenceFlow;
 import org.activiti.cloud.api.process.model.events.CloudSequenceFlowTakenEvent;
 import org.activiti.cloud.services.audit.jpa.converters.json.SequenceFlowJpaJsonConverter;
-import org.hibernate.annotations.DynamicInsert;
 
 @Entity(name = SequenceFlowAuditEventEntity.SEQUENCE_FLOW_TAKEN_EVENT)
 @DiscriminatorValue(value = SequenceFlowAuditEventEntity.SEQUENCE_FLOW_TAKEN_EVENT)

diff --git a/...java/org/activiti/cloud/services/audit/jpa/events/TaskCandidateGroupAddedEventEntity.java b/...java/org/activiti/cloud/services/audit/jpa/events/TaskCandidateGroupAddedEventEntity.java
@@ -23,7 +23,6 @@
 import org.activiti.api.task.model.impl.TaskCandidateGroupImpl;
 import org.activiti.cloud.api.task.model.events.CloudTaskCandidateGroupAddedEvent;
 import org.activiti.cloud.services.audit.jpa.converters.json.TaskCandidateGroupJpaJsonConverter;
-import org.hibernate.annotations.DynamicInsert;
 
 @Entity(name = TaskCandidateGroupAddedEventEntity.TASK_CANDIDATE_GROUP_ADDED_EVENT)
 @DiscriminatorValue(value = TaskCandidateGroupAddedEventEntity.TASK_CANDIDATE_GROUP_ADDED_EVENT)

diff --git a/...va/org/activiti/cloud/services/audit/jpa/events/TaskCandidateGroupRemovedEventEntity.java b/...va/org/activiti/cloud/services/audit/jpa/events/TaskCandidateGroupRemovedEventEntity.java
@@ -23,7 +23,6 @@
 import org.activiti.api.task.model.impl.TaskCandidateGroupImpl;
 import org.activiti.cloud.api.task.model.events.CloudTaskCandidateGroupRemovedEvent;
 import org.activiti.cloud.services.audit.jpa.converters.json.TaskCandidateGroupJpaJsonConverter;
-import org.hibernate.annotations.DynamicInsert;
 
 @Entity(name = TaskCandidateGroupRemovedEventEntity.TASK_CANDIDATE_GROUP_REMOVED_EVENT)
 @DiscriminatorValue(value = TaskCandidateGroupRemovedEventEntity.TASK_CANDIDATE_GROUP_REMOVED_EVENT)

diff --git a/...it/jpa/repository/EventSpecification.java → ...it/jpa/repository/EventSpecification.java b/...it/jpa/repository/EventSpecification.java → ...it/jpa/repository/EventSpecification.java
diff --git a/...epository/EventSpecificationsBuilder.java → ...epository/EventSpecificationsBuilder.java b/...epository/EventSpecificationsBuilder.java → ...epository/EventSpecificationsBuilder.java
diff --git a/...udit/jpa/repository/EventsRepository.java → ...udit/jpa/repository/EventsRepository.java b/...udit/jpa/repository/EventsRepository.java → ...udit/jpa/repository/EventsRepository.java
@@ -21,9 +21,7 @@
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.data.repository.PagingAndSortingRepository;
-import org.springframework.data.rest.core.annotation.RepositoryRestResource;
 
-@RepositoryRestResource(exported = false)
 public interface EventsRepository<T extends AuditEventEntity>
     extends PagingAndSortingRepository<T, Long>, JpaSpecificationExecutor<T>, CrudRepository<T, Long> {
     Optional<T> findByEventId(String eventId);

diff --git a/.../audit/jpa/repository/SearchCriteria.java → .../audit/jpa/repository/SearchCriteria.java b/.../audit/jpa/repository/SearchCriteria.java → .../audit/jpa/repository/SearchCriteria.java
diff --git a/...audit/jpa/repository/SearchOperation.java → ...audit/jpa/repository/SearchOperation.java b/...audit/jpa/repository/SearchOperation.java → ...audit/jpa/repository/SearchOperation.java
diff --git a/...it/jpa/repository/SpecSearchCriteria.java → ...it/jpa/repository/SpecSearchCriteria.java b/...it/jpa/repository/SpecSearchCriteria.java → ...it/jpa/repository/SpecSearchCriteria.java
diff --git a/.../AuditJPARepositoryAutoConfiguration.java → .../AuditJPARepositoryAutoConfiguration.java b/.../AuditJPARepositoryAutoConfiguration.java → .../AuditJPARepositoryAutoConfiguration.java
diff --git a/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1,2 @@
+org.activiti.cloud.services.audit.jpa.conf.AuditJPAAutoConfiguration
+org.activiti.cloud.services.audit.jpa.repository.config.AuditJPARepositoryAutoConfiguration
diff --git a/...pplicationRollbackEventConverterTest.java → ...pplicationRollbackEventConverterTest.java b/...pplicationRollbackEventConverterTest.java → ...pplicationRollbackEventConverterTest.java
diff --git a/...ters/ErrorReceivedEventConverterTest.java → ...ters/ErrorReceivedEventConverterTest.java b/...ters/ErrorReceivedEventConverterTest.java → ...ters/ErrorReceivedEventConverterTest.java
diff --git a/...ationErrorReceivedEventConverterTest.java → ...ationErrorReceivedEventConverterTest.java b/...ationErrorReceivedEventConverterTest.java → ...ationErrorReceivedEventConverterTest.java
diff --git a/...tegrationRequestedEventConverterTest.java → ...tegrationRequestedEventConverterTest.java b/...tegrationRequestedEventConverterTest.java → ...tegrationRequestedEventConverterTest.java
diff --git a/...tionResultReceivedEventConverterTest.java → ...tionResultReceivedEventConverterTest.java b/...tionResultReceivedEventConverterTest.java → ...tionResultReceivedEventConverterTest.java
diff --git a/...converters/MessageEventConverterTest.java → ...converters/MessageEventConverterTest.java b/...converters/MessageEventConverterTest.java → ...converters/MessageEventConverterTest.java
diff --git a/...scriptionCancelledEventConverterTest.java → ...scriptionCancelledEventConverterTest.java b/...scriptionCancelledEventConverterTest.java → ...scriptionCancelledEventConverterTest.java
diff --git a/...ndidateStarterUserEventConverterTest.java → ...ndidateStarterUserEventConverterTest.java b/...ndidateStarterUserEventConverterTest.java → ...ndidateStarterUserEventConverterTest.java
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		org.activiti.cloud.services.audit.api.config.AuditConsumerChannelsAutoConfiguration
		org.activiti.cloud.services.audit.jpa.streams.config.AuditJPAStreamsAutoConfiguration
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		org.activiti.cloud.services.audit.jpa.conf.AuditJPAAutoConfiguration
		org.activiti.cloud.services.audit.jpa.repository.config.AuditJPARepositoryAutoConfiguration