refactor the EventAwareEntity interface

Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>

hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/EntityPropertyChangeListener.java

@@ -8,6 +8,7 @@
  */
 package org.eclipse.hawkbit.repository.jpa.model;
 
+import org.eclipse.hawkbit.repository.jpa.model.helper.AfterTransactionCommitExecutorHolder;
 import org.eclipse.persistence.descriptors.DescriptorEvent;
 import org.eclipse.persistence.descriptors.DescriptorEventAdapter;
 
@@ -19,21 +20,34 @@ public class EntityPropertyChangeListener extends DescriptorEventAdapter {
 
     @Override
     public void postInsert(final DescriptorEvent event) {
-
         final Object object = event.getObject();
-        if (object instanceof EventAwareEntity) {
+        if (isEventAwareEntity(object)) {
-            ((EventAwareEntity) object).fireCreateEvent(object,event);
+            doNotifiy(() -> ((EventAwareEntity) object).fireCreateEvent(event));
         }
     }
 
     @Override
     public void postUpdate(final DescriptorEvent event) {
-        
         final Object object = event.getObject();
-        if (object instanceof EventAwareEntity) {
+        if (isEventAwareEntity(object)) {
-            ((EventAwareEntity) object).fireUpdateEvent(object,event);
+            doNotifiy(() -> ((EventAwareEntity) object).fireUpdateEvent(event));
         }
     }
 
+    @Override
+    public void postDelete(final DescriptorEvent event) {
+        final Object object = event.getObject();
+        if (isEventAwareEntity(object)) {
+            doNotifiy(() -> ((EventAwareEntity) object).fireDeleteEvent(event));
+        }
+    }
+
+    private boolean isEventAwareEntity(final Object object) {
+        return object instanceof EventAwareEntity;
+    }
+
+    private void doNotifiy(final Runnable runnable) {
+        AfterTransactionCommitExecutorHolder.getInstance().getAfterCommit().afterCommit(runnable);
+    }
 
 }

hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/EventAwareEntity.java

@@ -1,20 +1,20 @@
-/**
+/**
- * Copyright (c) 2015 Bosch Software Innovations GmbH and others.
+ * Copyright (c) 2015 Bosch Software Innovations GmbH and others.
- *
+ *
- * All rights reserved. This program and the accompanying materials
+ * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+ * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
- */
+ */
-package org.eclipse.hawkbit.repository.jpa.model;
+package org.eclipse.hawkbit.repository.jpa.model;
-
+
-import org.eclipse.persistence.descriptors.DescriptorEvent;
+import org.eclipse.persistence.descriptors.DescriptorEvent;
-
+
-public interface EventAwareEntity<T> {
+public interface EventAwareEntity {
-
+
-    public void fireCreateEvent(T t,DescriptorEvent descriptorEvent);
+    void fireCreateEvent(DescriptorEvent descriptorEvent);
-
+
-    public void fireUpdateEvent(T t,DescriptorEvent descriptorEvent);
+    void fireUpdateEvent(DescriptorEvent descriptorEvent);
-
+
-    public void fireDeleteEvent(T t,DescriptorEvent descriptorEvent);
+    void fireDeleteEvent(DescriptorEvent descriptorEvent);
-}
+}

hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaAction.java

@@ -30,7 +30,6 @@ import javax.persistence.Table;
 
 import org.eclipse.hawkbit.repository.eventbus.event.ActionCreatedEvent;
 import org.eclipse.hawkbit.repository.eventbus.event.ActionPropertyChangeEvent;
-import org.eclipse.hawkbit.repository.jpa.model.helper.AfterTransactionCommitExecutorHolder;
 import org.eclipse.hawkbit.repository.jpa.model.helper.EntityPropertyChangeHelper;
 import org.eclipse.hawkbit.repository.jpa.model.helper.EventBusHolder;
 import org.eclipse.hawkbit.repository.model.Action;
@@ -55,7 +54,7 @@ import org.eclipse.persistence.descriptors.DescriptorEvent;
 // exception squid:S2160 - BaseEntity equals/hashcode is handling correctly for
 // sub entities
 @SuppressWarnings("squid:S2160")
-public class JpaAction extends AbstractJpaTenantAwareBaseEntity implements Action, EventAwareEntity<JpaAction> {
+public class JpaAction extends AbstractJpaTenantAwareBaseEntity implements Action, EventAwareEntity {
     private static final long serialVersionUID = 1L;
 
     @ManyToOne(fetch = FetchType.LAZY)
@@ -178,23 +177,19 @@ public class JpaAction extends AbstractJpaTenantAwareBaseEntity implements Actio
     }
 
     @Override
-    public void fireCreateEvent(final JpaAction jpaAction, final DescriptorEvent descriptorEvent) {
+    public void fireCreateEvent(final DescriptorEvent descriptorEvent) {
-        AfterTransactionCommitExecutorHolder.getInstance().getAfterCommit()
+        EventBusHolder.getInstance().getEventBus().post(new ActionCreatedEvent(this));
-                .afterCommit(() -> EventBusHolder.getInstance().getEventBus().post(new ActionCreatedEvent(jpaAction)));
-
     }
 
     @Override
-    public void fireUpdateEvent(final JpaAction jpaAction, final DescriptorEvent descriptorEvent) {
+    public void fireUpdateEvent(final DescriptorEvent descriptorEvent) {
-        AfterTransactionCommitExecutorHolder.getInstance().getAfterCommit().afterCommit(
+        EventBusHolder.getInstance().getEventBus().post(new ActionPropertyChangeEvent(this,
-                () -> EventBusHolder.getInstance().getEventBus().post(new ActionPropertyChangeEvent(jpaAction,
+                EntityPropertyChangeHelper.getChangeSet(Action.class, descriptorEvent)));
-                        EntityPropertyChangeHelper.getChangeSet(Action.class, descriptorEvent))));
-
     }
 
     @Override
-    public void fireDeleteEvent(final JpaAction jpaAction, final DescriptorEvent descriptorEvent) {
+    public void fireDeleteEvent(final DescriptorEvent descriptorEvent) {
-
+        // there is no action deletion
     }
 
 }

hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaDistributionSet.java

@@ -36,10 +36,10 @@ import javax.persistence.UniqueConstraint;
 
 import org.eclipse.hawkbit.repository.eventbus.event.AbstractPropertyChangeEvent;
 import org.eclipse.hawkbit.repository.eventbus.event.DistributionCreatedEvent;
+import org.eclipse.hawkbit.repository.eventbus.event.DistributionDeletedEvent;
 import org.eclipse.hawkbit.repository.eventbus.event.DistributionSetUpdateEvent;
 import org.eclipse.hawkbit.repository.exception.DistributionSetTypeUndefinedException;
 import org.eclipse.hawkbit.repository.exception.UnsupportedSoftwareModuleForThisDistributionSetException;
-import org.eclipse.hawkbit.repository.jpa.model.helper.AfterTransactionCommitExecutorHolder;
 import org.eclipse.hawkbit.repository.jpa.model.helper.EntityPropertyChangeHelper;
 import org.eclipse.hawkbit.repository.jpa.model.helper.EventBusHolder;
 import org.eclipse.hawkbit.repository.model.Action;
@@ -69,11 +69,12 @@ import org.eclipse.persistence.descriptors.DescriptorEvent;
 // exception squid:S2160 - BaseEntity equals/hashcode is handling correctly for
 // sub entities
 @SuppressWarnings("squid:S2160")
-public class JpaDistributionSet extends AbstractJpaNamedVersionedEntity
+public class JpaDistributionSet extends AbstractJpaNamedVersionedEntity implements DistributionSet, EventAwareEntity {
-        implements DistributionSet, EventAwareEntity<JpaDistributionSet> {
     private static final long serialVersionUID = 1L;
 
-    private static final String COMPLETE = "complete";
+    private static final String COMPLETE_PROPERTY = "complete";
+
+    private static final String DELETED_PROPERTY = "deleted";
 
     @Column(name = "required_migration_step")
     private boolean requiredMigrationStep;
@@ -291,30 +292,30 @@ public class JpaDistributionSet extends AbstractJpaNamedVersionedEntity
     }
 
     @Override
-    public void fireCreateEvent(final JpaDistributionSet jpaDistributionSet, final DescriptorEvent descriptorEvent) {
+    public void fireCreateEvent(final DescriptorEvent descriptorEvent) {
-        AfterTransactionCommitExecutorHolder.getInstance().getAfterCommit().afterCommit(() -> EventBusHolder
+        EventBusHolder.getInstance().getEventBus().post(new DistributionCreatedEvent(this));
-                .getInstance().getEventBus().post(new DistributionCreatedEvent(jpaDistributionSet)));
-
     }
 
     @Override
-    public void fireUpdateEvent(final JpaDistributionSet jpaDistributionSet, final DescriptorEvent descriptorEvent) {
+    public void fireUpdateEvent(final DescriptorEvent descriptorEvent) {
         final Map<String, AbstractPropertyChangeEvent<JpaDistributionSet>.Values> changeSet = EntityPropertyChangeHelper
                 .getChangeSet(JpaDistributionSet.class, descriptorEvent);
-        if (changeSet.containsKey(COMPLETE) && changeSet.get(COMPLETE).getOldValue().equals(false)
+        if (changeSet.containsKey(COMPLETE_PROPERTY) && changeSet.get(COMPLETE_PROPERTY).getOldValue().equals(false)
-                && changeSet.get(COMPLETE).getNewValue().equals(true)) {
+                && changeSet.get(COMPLETE_PROPERTY).getNewValue().equals(true)) {
-            AfterTransactionCommitExecutorHolder.getInstance().getAfterCommit().afterCommit(() -> EventBusHolder
+            EventBusHolder.getInstance().getEventBus().post(new DistributionCreatedEvent(this));
-                    .getInstance().getEventBus().post(new DistributionCreatedEvent(jpaDistributionSet)));
         }
+        EventBusHolder.getInstance().getEventBus().post(new DistributionSetUpdateEvent(this));
 
-        AfterTransactionCommitExecutorHolder.getInstance().getAfterCommit().afterCommit(() -> EventBusHolder
+        if (changeSet.containsKey(DELETED_PROPERTY)) {
-                .getInstance().getEventBus().post(new DistributionSetUpdateEvent(jpaDistributionSet)));
+            final Boolean newDeleted = (Boolean) changeSet.get(DELETED_PROPERTY).getNewValue();
-
+            if (newDeleted) {
+                EventBusHolder.getInstance().getEventBus().post(new DistributionDeletedEvent(getTenant(), getId()));
+            }
+        }
     }
 
     @Override
-    public void fireDeleteEvent(final JpaDistributionSet jpaDistributionSet, final DescriptorEvent descriptorEvent) {
+    public void fireDeleteEvent(final DescriptorEvent descriptorEvent) {
-
+        EventBusHolder.getInstance().getEventBus().post(new DistributionDeletedEvent(getTenant(), getId()));
     }
-
 }

hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaRollout.java

@@ -28,7 +28,6 @@ import javax.persistence.UniqueConstraint;
 import org.eclipse.hawkbit.repository.eventbus.event.RolloutPropertyChangeEvent;
 import org.eclipse.hawkbit.repository.jpa.cache.CacheField;
 import org.eclipse.hawkbit.repository.jpa.cache.CacheKeys;
-import org.eclipse.hawkbit.repository.jpa.model.helper.AfterTransactionCommitExecutorHolder;
 import org.eclipse.hawkbit.repository.jpa.model.helper.EntityPropertyChangeHelper;
 import org.eclipse.hawkbit.repository.jpa.model.helper.EventBusHolder;
 import org.eclipse.hawkbit.repository.model.Action.ActionType;
@@ -49,7 +48,7 @@ import org.eclipse.persistence.descriptors.DescriptorEvent;
 // exception squid:S2160 - BaseEntity equals/hashcode is handling correctly for
 // sub entities
 @SuppressWarnings("squid:S2160")
-public class JpaRollout extends AbstractJpaNamedEntity implements Rollout, EventAwareEntity<JpaRollout> {
+public class JpaRollout extends AbstractJpaNamedEntity implements Rollout, EventAwareEntity {
 
     private static final long serialVersionUID = 1L;
 
@@ -203,21 +202,20 @@ public class JpaRollout extends AbstractJpaNamedEntity implements Rollout, Event
     }
 
     @Override
-    public void fireCreateEvent(final JpaRollout jpaRollout, final DescriptorEvent descriptorEvent) {
+    public void fireCreateEvent(final DescriptorEvent descriptorEvent) {
+        // there is no rollout creation event
+    }
+
+    @Override
+    public void fireUpdateEvent(final DescriptorEvent descriptorEvent) {
+        EventBusHolder.getInstance().getEventBus().post(new RolloutPropertyChangeEvent(this,
+                EntityPropertyChangeHelper.getChangeSet(Rollout.class, descriptorEvent)));
 
     }
 
     @Override
-    public void fireUpdateEvent(final JpaRollout jpaRollout, final DescriptorEvent descriptorEvent) {
+    public void fireDeleteEvent(final DescriptorEvent descriptorEvent) {
-        AfterTransactionCommitExecutorHolder.getInstance().getAfterCommit().afterCommit(
+        // there is no rollout deletion event
-                () -> EventBusHolder.getInstance().getEventBus().post(new RolloutPropertyChangeEvent(jpaRollout,
-                        EntityPropertyChangeHelper.getChangeSet(Rollout.class, descriptorEvent))));
-
-    }
-
-    @Override
-    public void fireDeleteEvent(final JpaRollout jpaRollout, final DescriptorEvent descriptorEvent) {
-
     }
 
 }

hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaRolloutGroup.java

@@ -26,7 +26,6 @@ import javax.persistence.Transient;
 import javax.persistence.UniqueConstraint;
 
 import org.eclipse.hawkbit.repository.eventbus.event.RolloutGroupPropertyChangeEvent;
-import org.eclipse.hawkbit.repository.jpa.model.helper.AfterTransactionCommitExecutorHolder;
 import org.eclipse.hawkbit.repository.jpa.model.helper.EntityPropertyChangeHelper;
 import org.eclipse.hawkbit.repository.jpa.model.helper.EventBusHolder;
 import org.eclipse.hawkbit.repository.model.Rollout;
@@ -45,7 +44,7 @@ import org.eclipse.persistence.descriptors.DescriptorEvent;
 // exception squid:S2160 - BaseEntity equals/hashcode is handling correctly for
 // sub entities
 @SuppressWarnings("squid:S2160")
-public class JpaRolloutGroup extends AbstractJpaNamedEntity implements RolloutGroup, EventAwareEntity<JpaRolloutGroup> {
+public class JpaRolloutGroup extends AbstractJpaNamedEntity implements RolloutGroup, EventAwareEntity {
 
     private static final long serialVersionUID = 1L;
 
@@ -242,21 +241,18 @@ public class JpaRolloutGroup extends AbstractJpaNamedEntity implements RolloutGr
     }
 
     @Override
-    public void fireCreateEvent(final JpaRolloutGroup jpaRolloutGroup, final DescriptorEvent descriptorEvent) {
+    public void fireCreateEvent(final DescriptorEvent descriptorEvent) {
-
+        // there is no RolloutGroup created event
     }
 
     @Override
-    public void fireUpdateEvent(final JpaRolloutGroup jpaRolloutGroup, final DescriptorEvent descriptorEvent) {
+    public void fireUpdateEvent(final DescriptorEvent descriptorEvent) {
-        AfterTransactionCommitExecutorHolder.getInstance().getAfterCommit()
+        EventBusHolder.getInstance().getEventBus().post(new RolloutGroupPropertyChangeEvent(this,
-                .afterCommit(() -> EventBusHolder.getInstance().getEventBus()
+                EntityPropertyChangeHelper.getChangeSet(RolloutGroup.class, descriptorEvent)));
-                        .post(new RolloutGroupPropertyChangeEvent(jpaRolloutGroup,
-                                EntityPropertyChangeHelper.getChangeSet(RolloutGroup.class, descriptorEvent))));
     }
 
     @Override
-    public void fireDeleteEvent(final JpaRolloutGroup jpaRolloutGroup, final DescriptorEvent descriptorEvent) {
+    public void fireDeleteEvent(final DescriptorEvent descriptorEvent) {
-
+        // there is no RolloutGroup deleted event
     }
-
 }

hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTarget.java

@@ -37,8 +37,8 @@ import javax.validation.constraints.Size;
 
 import org.eclipse.hawkbit.im.authentication.SpPermission;
 import org.eclipse.hawkbit.repository.eventbus.event.TargetCreatedEvent;
+import org.eclipse.hawkbit.repository.eventbus.event.TargetDeletedEvent;
 import org.eclipse.hawkbit.repository.eventbus.event.TargetUpdatedEvent;
-import org.eclipse.hawkbit.repository.jpa.model.helper.AfterTransactionCommitExecutorHolder;
 import org.eclipse.hawkbit.repository.jpa.model.helper.EventBusHolder;
 import org.eclipse.hawkbit.repository.jpa.model.helper.SecurityChecker;
 import org.eclipse.hawkbit.repository.jpa.model.helper.SecurityTokenGeneratorHolder;
@@ -69,8 +69,7 @@ import org.springframework.data.domain.Persistable;
 // exception squid:S2160 - BaseEntity equals/hashcode is handling correctly for
 // sub entities
 @SuppressWarnings("squid:S2160")
-public class JpaTarget extends AbstractJpaNamedEntity
+public class JpaTarget extends AbstractJpaNamedEntity implements Persistable<Long>, Target, EventAwareEntity {
-        implements Persistable<Long>, Target, EventAwareEntity<JpaTarget> {
     private static final long serialVersionUID = 1L;
 
     @Column(name = "controller_id", length = 64)
@@ -239,21 +238,17 @@ public class JpaTarget extends AbstractJpaNamedEntity
     }
 
     @Override
-    public void fireCreateEvent(final JpaTarget jpaTarget, final DescriptorEvent descriptorEvent) {
+    public void fireCreateEvent(final DescriptorEvent descriptorEvent) {
-        AfterTransactionCommitExecutorHolder.getInstance().getAfterCommit()
+        EventBusHolder.getInstance().getEventBus().post(new TargetCreatedEvent(this));
-                .afterCommit(() -> EventBusHolder.getInstance().getEventBus().post(new TargetCreatedEvent(jpaTarget)));
     }
 
     @Override
-    public void fireUpdateEvent(final JpaTarget jpaTarget, final DescriptorEvent descriptorEvent) {
+    public void fireUpdateEvent(final DescriptorEvent descriptorEvent) {
-        AfterTransactionCommitExecutorHolder.getInstance().getAfterCommit()
+        EventBusHolder.getInstance().getEventBus().post(new TargetUpdatedEvent(this));
-                .afterCommit(() -> EventBusHolder.getInstance().getEventBus().post(new TargetUpdatedEvent(jpaTarget)));
-
     }
 
     @Override
-    public void fireDeleteEvent(final JpaTarget jpaTarget, final DescriptorEvent descriptorEvent) {
+    public void fireDeleteEvent(final DescriptorEvent descriptorEvent) {
-
+        EventBusHolder.getInstance().getEventBus().post(new TargetDeletedEvent(getTenant(), getId()));
     }
-
 }

hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTargetInfo.java

@@ -40,7 +40,6 @@ import javax.persistence.Transient;
 
 import org.eclipse.hawkbit.repository.eventbus.event.TargetInfoUpdateEvent;
 import org.eclipse.hawkbit.repository.exception.InvalidTargetAddressException;
-import org.eclipse.hawkbit.repository.jpa.model.helper.AfterTransactionCommitExecutorHolder;
 import org.eclipse.hawkbit.repository.jpa.model.helper.EventBusHolder;
 import org.eclipse.hawkbit.repository.jpa.model.helper.SystemSecurityContextHolder;
 import org.eclipse.hawkbit.repository.jpa.model.helper.TenantConfigurationManagementHolder;
@@ -70,7 +69,7 @@ import org.springframework.data.domain.Persistable;
         @Index(name = "sp_idx_target_info_02", columnList = "target_id,update_status") })
 @Entity
 @EntityListeners(EntityPropertyChangeListener.class)
-public class JpaTargetInfo implements Persistable<Long>, TargetInfo, EventAwareEntity<JpaTargetInfo> {
+public class JpaTargetInfo implements Persistable<Long>, TargetInfo, EventAwareEntity {
     private static final long serialVersionUID = 1L;
 
     private static final Logger LOG = LoggerFactory.getLogger(TargetInfo.class);
@@ -329,17 +328,17 @@ public class JpaTargetInfo implements Persistable<Long>, TargetInfo, EventAwareE
     }
 
     @Override
-    public void fireCreateEvent(final JpaTargetInfo jpaTargetInfo, final DescriptorEvent descriptorEvent) {
+    public void fireCreateEvent(final DescriptorEvent descriptorEvent) {
         // there is no target info created event
     }
 
     @Override
-    public void fireUpdateEvent(final JpaTargetInfo jpaTargetInfo, final DescriptorEvent descriptorEvent) {
+    public void fireUpdateEvent(final DescriptorEvent descriptorEvent) {
-        AfterTransactionCommitExecutorHolder.getInstance().getAfterCommit().afterCommit(
+        EventBusHolder.getInstance().getEventBus().post(new TargetInfoUpdateEvent(this));
-                () -> EventBusHolder.getInstance().getEventBus().post(new TargetInfoUpdateEvent(jpaTargetInfo)));
     }
 
     @Override
-    public void fireDeleteEvent(final JpaTargetInfo jpaTargetInfo, final DescriptorEvent descriptorEvent) {
+    public void fireDeleteEvent(final DescriptorEvent descriptorEvent) {
+        // there is no target info deleted event
     }
 }