From 59932b1d6f6cf64214d2de6c53778db5aa7bb293 Mon Sep 17 00:00:00 2001 From: Michael Herdt <55577866+herdt-michael@users.noreply.github.com> Date: Mon, 25 Apr 2022 15:39:44 +0200 Subject: [PATCH] Extend event for entity events (#1250) * Extend event information by it's first interface class and improve constructing the event by providing the directly only. Signed-off-by: Michael Herdt * Check if entity interface is assignable from TenantAwareBaseEntity. Signed-off-by: Michael Herdt --- .../AmqpMessageDispatcherServiceTest.java | 8 +++---- .../event/entity/EntityIdEvent.java | 5 ++++ .../remote/DistributionSetDeletedEvent.java | 5 ++-- .../DistributionSetTagDeletedEvent.java | 5 ++-- .../DistributionSetTypeDeletedEvent.java | 5 ++-- .../event/remote/RemoteIdEvent.java | 23 ++++++++++++++++--- .../event/remote/RolloutDeletedEvent.java | 5 ++-- .../remote/RolloutGroupDeletedEvent.java | 5 ++-- .../remote/SoftwareModuleDeletedEvent.java | 5 ++-- .../SoftwareModuleTypeDeletedEvent.java | 5 ++-- .../TargetAttributesRequestedEvent.java | 4 +++- .../event/remote/TargetDeletedEvent.java | 4 +++- .../remote/TargetFilterQueryDeletedEvent.java | 5 ++-- .../event/remote/TargetTagDeletedEvent.java | 5 ++-- .../event/remote/TargetTypeDeletedEvent.java | 5 ++-- .../TenantConfigurationDeletedEvent.java | 4 +++- .../remote/entity/RemoteEntityEvent.java | 2 +- ...gementMethodPreAuthorizeAnnotatedTest.java | 2 +- .../jpa/JpaControllerManagement.java | 2 +- .../jpa/JpaDistributionSetManagement.java | 2 +- .../repository/jpa/JpaRolloutExecutor.java | 2 +- .../repository/jpa/JpaTargetManagement.java | 4 ++-- .../jpa/model/JpaDistributionSet.java | 4 ++-- .../jpa/model/JpaDistributionSetTag.java | 2 +- .../jpa/model/JpaDistributionSetType.java | 2 +- .../repository/jpa/model/JpaRollout.java | 4 ++-- .../repository/jpa/model/JpaRolloutGroup.java | 2 +- .../jpa/model/JpaSoftwareModule.java | 4 ++-- .../jpa/model/JpaSoftwareModuleType.java | 2 +- .../repository/jpa/model/JpaTarget.java | 2 +- .../jpa/model/JpaTargetFilterQuery.java | 2 +- .../repository/jpa/model/JpaTargetTag.java | 2 +- .../repository/jpa/model/JpaTargetType.java | 2 +- .../jpa/model/JpaTenantConfiguration.java | 2 +- .../event/remote/RemoteIdEventTest.java | 8 ++++--- .../ui/push/event/ActionChangedEvent.java | 2 +- .../ui/push/event/RolloutChangedEvent.java | 2 +- .../push/event/RolloutGroupChangedEvent.java | 2 +- 38 files changed, 98 insertions(+), 58 deletions(-) diff --git a/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpMessageDispatcherServiceTest.java b/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpMessageDispatcherServiceTest.java index f6010e54b..7e12d189a 100644 --- a/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpMessageDispatcherServiceTest.java +++ b/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpMessageDispatcherServiceTest.java @@ -219,7 +219,7 @@ class AmqpMessageDispatcherServiceTest extends AbstractIntegrationTest { void sendUpdateAttributesRequest() { final String amqpUri = "amqp://anyhost"; final TargetAttributesRequestedEvent targetAttributesRequestedEvent = new TargetAttributesRequestedEvent(TENANT, - 1L, CONTROLLER_ID, amqpUri, Target.class.getName(), serviceMatcher.getServiceId()); + 1L, CONTROLLER_ID, amqpUri, Target.class, serviceMatcher.getServiceId()); amqpMessageDispatcherService.targetTriggerUpdateAttributes(targetAttributesRequestedEvent); @@ -247,7 +247,7 @@ class AmqpMessageDispatcherServiceTest extends AbstractIntegrationTest { // setup final String amqpUri = "amqp://anyhost"; final TargetDeletedEvent targetDeletedEvent = new TargetDeletedEvent(TENANT, 1L, CONTROLLER_ID, amqpUri, - Target.class.getName(), serviceMatcher.getServiceId()); + Target.class, serviceMatcher.getServiceId()); // test amqpMessageDispatcherService.targetDelete(targetDeletedEvent); @@ -264,7 +264,7 @@ class AmqpMessageDispatcherServiceTest extends AbstractIntegrationTest { // setup final String noAmqpUri = "http://anyhost"; final TargetDeletedEvent targetDeletedEvent = new TargetDeletedEvent(TENANT, 1L, CONTROLLER_ID, noAmqpUri, - Target.class.getName(), serviceMatcher.getServiceId()); + Target.class, serviceMatcher.getServiceId()); // test amqpMessageDispatcherService.targetDelete(targetDeletedEvent); @@ -280,7 +280,7 @@ class AmqpMessageDispatcherServiceTest extends AbstractIntegrationTest { // setup final String noAmqpUri = null; final TargetDeletedEvent targetDeletedEvent = new TargetDeletedEvent(TENANT, 1L, CONTROLLER_ID, noAmqpUri, - Target.class.getName(), serviceMatcher.getServiceId()); + Target.class, serviceMatcher.getServiceId()); // test amqpMessageDispatcherService.targetDelete(targetDeletedEvent); diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/entity/EntityIdEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/entity/EntityIdEvent.java index 043a6380b..fa9cc5a54 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/entity/EntityIdEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/entity/EntityIdEvent.java @@ -20,6 +20,11 @@ public interface EntityIdEvent extends TenantAwareEvent { */ String getEntityClass(); + /** + * @return the class of entities interface + */ + String getInterfaceClass(); + /** * @return the ID of the entity of this event. */ diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/DistributionSetDeletedEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/DistributionSetDeletedEvent.java index bc26ffa1b..92dd7d299 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/DistributionSetDeletedEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/DistributionSetDeletedEvent.java @@ -10,6 +10,7 @@ package org.eclipse.hawkbit.repository.event.remote; import org.eclipse.hawkbit.repository.event.entity.EntityDeletedEvent; import org.eclipse.hawkbit.repository.model.DistributionSet; +import org.eclipse.hawkbit.repository.model.TenantAwareBaseEntity; /** * Defines the remote event for deletion of {@link DistributionSet}. @@ -35,8 +36,8 @@ public class DistributionSetDeletedEvent extends RemoteIdEvent implements Entity * @param applicationId * the origin application id */ - public DistributionSetDeletedEvent(final String tenant, final Long entityId, final String entityClass, - final String applicationId) { + public DistributionSetDeletedEvent(final String tenant, final Long entityId, + final Class entityClass, final String applicationId) { super(entityId, tenant, entityClass, applicationId); } } diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/DistributionSetTagDeletedEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/DistributionSetTagDeletedEvent.java index 1ffeac2c1..f129cc33a 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/DistributionSetTagDeletedEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/DistributionSetTagDeletedEvent.java @@ -10,6 +10,7 @@ package org.eclipse.hawkbit.repository.event.remote; import org.eclipse.hawkbit.repository.event.entity.EntityDeletedEvent; import org.eclipse.hawkbit.repository.model.DistributionSetTag; +import org.eclipse.hawkbit.repository.model.TenantAwareBaseEntity; /** * Defines the the remote event of delete a {@link DistributionSetTag}. @@ -38,8 +39,8 @@ public class DistributionSetTagDeletedEvent extends RemoteIdEvent implements Ent * the origin application id */ - public DistributionSetTagDeletedEvent(final String tenant, final Long entityId, final String entityClass, - final String applicationId) { + public DistributionSetTagDeletedEvent(final String tenant, final Long entityId, + final Class entityClass, final String applicationId) { super(entityId, tenant, entityClass, applicationId); } } diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/DistributionSetTypeDeletedEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/DistributionSetTypeDeletedEvent.java index 7bfed6c72..c228567a0 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/DistributionSetTypeDeletedEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/DistributionSetTypeDeletedEvent.java @@ -10,6 +10,7 @@ package org.eclipse.hawkbit.repository.event.remote; import org.eclipse.hawkbit.repository.event.entity.EntityDeletedEvent; import org.eclipse.hawkbit.repository.model.DistributionSetType; +import org.eclipse.hawkbit.repository.model.TenantAwareBaseEntity; /** * @@ -38,8 +39,8 @@ public class DistributionSetTypeDeletedEvent extends RemoteIdEvent implements En * @param applicationId * the origin application id */ - public DistributionSetTypeDeletedEvent(final String tenant, final Long entityId, final String entityClass, - final String applicationId) { + public DistributionSetTypeDeletedEvent(final String tenant, final Long entityId, + final Class entityClass, final String applicationId) { super(entityId, tenant, entityClass, applicationId); } diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/RemoteIdEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/RemoteIdEvent.java index 9dd0e6f8d..c08559cef 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/RemoteIdEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/RemoteIdEvent.java @@ -8,6 +8,10 @@ */ package org.eclipse.hawkbit.repository.event.remote; +import org.eclipse.hawkbit.repository.model.TenantAwareBaseEntity; + +import java.util.Arrays; + /** * An base definition class for an event which contains an id. * @@ -20,6 +24,8 @@ public class RemoteIdEvent extends RemoteTenantAwareEvent { private String entityClass; + private String interfaceClass; + /** * Default constructor. */ @@ -39,13 +45,21 @@ public class RemoteIdEvent extends RemoteTenantAwareEvent { * @param applicationId * the origin application id */ - protected RemoteIdEvent(final Long entityId, final String tenant, final String entityClass, - final String applicationId) { + protected RemoteIdEvent(final Long entityId, final String tenant, + final Class entityClass, final String applicationId) { super(entityId, tenant, applicationId); - this.entityClass = entityClass; + this.entityClass = entityClass.getName(); + this.interfaceClass = entityClass.isInterface() ? entityClass.getName() + : getInterfaceEntity(entityClass).getName(); this.entityId = entityId; } + private static Class getInterfaceEntity(final Class baseEntity) { + final Class[] interfaces = baseEntity.getInterfaces(); + return Arrays.stream(interfaces).filter(TenantAwareBaseEntity.class::isAssignableFrom).findFirst() + .orElse(baseEntity); + } + /** * @return the entityClass */ @@ -57,4 +71,7 @@ public class RemoteIdEvent extends RemoteTenantAwareEvent { return entityId; } + public String getInterfaceClass() { + return interfaceClass; + } } diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/RolloutDeletedEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/RolloutDeletedEvent.java index 3cd2f8e0b..5cdeb939e 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/RolloutDeletedEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/RolloutDeletedEvent.java @@ -10,6 +10,7 @@ package org.eclipse.hawkbit.repository.event.remote; import org.eclipse.hawkbit.repository.event.entity.EntityDeletedEvent; import org.eclipse.hawkbit.repository.model.Rollout; +import org.eclipse.hawkbit.repository.model.TenantAwareBaseEntity; /** * @@ -38,8 +39,8 @@ public class RolloutDeletedEvent extends RemoteIdEvent implements EntityDeletedE * @param applicationId * the origin application id */ - public RolloutDeletedEvent(final String tenant, final Long entityId, final String entityClass, - final String applicationId) { + public RolloutDeletedEvent(final String tenant, final Long entityId, + final Class entityClass, final String applicationId) { super(entityId, tenant, entityClass, applicationId); } diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/RolloutGroupDeletedEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/RolloutGroupDeletedEvent.java index b58c5a3a0..91830bea7 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/RolloutGroupDeletedEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/RolloutGroupDeletedEvent.java @@ -10,6 +10,7 @@ package org.eclipse.hawkbit.repository.event.remote; import org.eclipse.hawkbit.repository.event.entity.EntityDeletedEvent; import org.eclipse.hawkbit.repository.model.RolloutGroup; +import org.eclipse.hawkbit.repository.model.TenantAwareBaseEntity; /** * @@ -38,8 +39,8 @@ public class RolloutGroupDeletedEvent extends RemoteIdEvent implements EntityDel * @param applicationId * the origin application id */ - public RolloutGroupDeletedEvent(final String tenant, final Long entityId, final String entityClass, - final String applicationId) { + public RolloutGroupDeletedEvent(final String tenant, final Long entityId, + final Class entityClass, final String applicationId) { super(entityId, tenant, entityClass, applicationId); } diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/SoftwareModuleDeletedEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/SoftwareModuleDeletedEvent.java index ae3ef6352..97b84e613 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/SoftwareModuleDeletedEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/SoftwareModuleDeletedEvent.java @@ -10,6 +10,7 @@ package org.eclipse.hawkbit.repository.event.remote; import org.eclipse.hawkbit.repository.event.entity.EntityDeletedEvent; import org.eclipse.hawkbit.repository.model.SoftwareModule; +import org.eclipse.hawkbit.repository.model.TenantAwareBaseEntity; /** * @@ -38,8 +39,8 @@ public class SoftwareModuleDeletedEvent extends RemoteIdEvent implements EntityD * @param applicationId * the origin application id */ - public SoftwareModuleDeletedEvent(final String tenant, final Long entityId, final String entityClass, - final String applicationId) { + public SoftwareModuleDeletedEvent(final String tenant, final Long entityId, + final Class entityClass, final String applicationId) { super(entityId, tenant, entityClass, applicationId); } diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/SoftwareModuleTypeDeletedEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/SoftwareModuleTypeDeletedEvent.java index 050ff16c6..4ae5530cc 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/SoftwareModuleTypeDeletedEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/SoftwareModuleTypeDeletedEvent.java @@ -10,6 +10,7 @@ package org.eclipse.hawkbit.repository.event.remote; import org.eclipse.hawkbit.repository.event.entity.EntityDeletedEvent; import org.eclipse.hawkbit.repository.model.SoftwareModuleType; +import org.eclipse.hawkbit.repository.model.TenantAwareBaseEntity; /** * @@ -38,8 +39,8 @@ public class SoftwareModuleTypeDeletedEvent extends RemoteIdEvent implements Ent * @param applicationId * the origin application id */ - public SoftwareModuleTypeDeletedEvent(final String tenant, final Long entityId, final String entityClass, - final String applicationId) { + public SoftwareModuleTypeDeletedEvent(final String tenant, final Long entityId, + final Class entityClass, final String applicationId) { super(entityId, tenant, entityClass, applicationId); } diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/TargetAttributesRequestedEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/TargetAttributesRequestedEvent.java index c580151d2..b09d79cd0 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/TargetAttributesRequestedEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/TargetAttributesRequestedEvent.java @@ -9,6 +9,7 @@ package org.eclipse.hawkbit.repository.event.remote; import org.eclipse.hawkbit.repository.model.Target; +import org.eclipse.hawkbit.repository.model.TenantAwareBaseEntity; /** * Defines the remote event of triggering attribute updates of a {@link Target}. @@ -42,7 +43,8 @@ public class TargetAttributesRequestedEvent extends RemoteIdEvent { * the origin application id */ public TargetAttributesRequestedEvent(final String tenant, final Long entityId, final String controllerId, - final String targetAddress, final String entityClass, final String applicationId) { + final String targetAddress, final Class entityClass, + final String applicationId) { super(entityId, tenant, entityClass, applicationId); this.controllerId = controllerId; this.targetAddress = targetAddress; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/TargetDeletedEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/TargetDeletedEvent.java index d41cb2430..f91c55790 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/TargetDeletedEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/TargetDeletedEvent.java @@ -10,6 +10,7 @@ package org.eclipse.hawkbit.repository.event.remote; import org.eclipse.hawkbit.repository.event.entity.EntityDeletedEvent; import org.eclipse.hawkbit.repository.model.Target; +import org.eclipse.hawkbit.repository.model.TenantAwareBaseEntity; /** * @@ -44,7 +45,8 @@ public class TargetDeletedEvent extends RemoteIdEvent implements EntityDeletedEv * the origin application id */ public TargetDeletedEvent(final String tenant, final Long entityId, final String controllerId, - final String targetAddress, final String entityClass, final String applicationId) { + final String targetAddress, final Class entityClass, + final String applicationId) { super(entityId, tenant, entityClass, applicationId); this.controllerId = controllerId; this.targetAddress = targetAddress; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/TargetFilterQueryDeletedEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/TargetFilterQueryDeletedEvent.java index 2d626719a..bb8ce08c9 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/TargetFilterQueryDeletedEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/TargetFilterQueryDeletedEvent.java @@ -10,6 +10,7 @@ package org.eclipse.hawkbit.repository.event.remote; import org.eclipse.hawkbit.repository.event.entity.EntityDeletedEvent; import org.eclipse.hawkbit.repository.model.TargetFilterQuery; +import org.eclipse.hawkbit.repository.model.TenantAwareBaseEntity; /** * @@ -37,8 +38,8 @@ public class TargetFilterQueryDeletedEvent extends RemoteIdEvent implements Enti * @param applicationId * the origin application id */ - public TargetFilterQueryDeletedEvent(final String tenant, final Long entityId, final String entityClass, - final String applicationId) { + public TargetFilterQueryDeletedEvent(final String tenant, final Long entityId, + final Class entityClass, final String applicationId) { super(entityId, tenant, entityClass, applicationId); } } diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/TargetTagDeletedEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/TargetTagDeletedEvent.java index 311dad332..a5d7c5950 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/TargetTagDeletedEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/TargetTagDeletedEvent.java @@ -10,6 +10,7 @@ package org.eclipse.hawkbit.repository.event.remote; import org.eclipse.hawkbit.repository.event.entity.EntityDeletedEvent; import org.eclipse.hawkbit.repository.model.TargetTag; +import org.eclipse.hawkbit.repository.model.TenantAwareBaseEntity; /** * Defines the remote event of delete a {@link TargetTag}. @@ -38,8 +39,8 @@ public class TargetTagDeletedEvent extends RemoteIdEvent implements EntityDelete * @param applicationId * the origin application id */ - public TargetTagDeletedEvent(final String tenant, final Long entityId, final String entityClass, - final String applicationId) { + public TargetTagDeletedEvent(final String tenant, final Long entityId, + final Class entityClass, final String applicationId) { super(entityId, tenant, entityClass, applicationId); } } diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/TargetTypeDeletedEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/TargetTypeDeletedEvent.java index d411773bd..c430c1dad 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/TargetTypeDeletedEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/TargetTypeDeletedEvent.java @@ -10,6 +10,7 @@ package org.eclipse.hawkbit.repository.event.remote; import org.eclipse.hawkbit.repository.event.entity.EntityDeletedEvent; import org.eclipse.hawkbit.repository.model.TargetType; +import org.eclipse.hawkbit.repository.model.TenantAwareBaseEntity; /** * @@ -38,8 +39,8 @@ public class TargetTypeDeletedEvent extends RemoteIdEvent implements EntityDelet * @param applicationId * the origin application id */ - public TargetTypeDeletedEvent(final String tenant, final Long entityId, final String entityClass, - final String applicationId) { + public TargetTypeDeletedEvent(final String tenant, final Long entityId, + final Class entityClass, final String applicationId) { super(entityId, tenant, entityClass, applicationId); } diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/TenantConfigurationDeletedEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/TenantConfigurationDeletedEvent.java index 99b842c7d..000978a52 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/TenantConfigurationDeletedEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/TenantConfigurationDeletedEvent.java @@ -9,6 +9,7 @@ package org.eclipse.hawkbit.repository.event.remote; import org.eclipse.hawkbit.repository.event.entity.EntityDeletedEvent; +import org.eclipse.hawkbit.repository.model.TenantAwareBaseEntity; /** * @@ -43,7 +44,8 @@ public class TenantConfigurationDeletedEvent extends RemoteIdEvent implements En * the origin application id */ public TenantConfigurationDeletedEvent(final String tenant, final Long entityId, final String configKey, - final String configValue, final String entityClass, final String applicationId) { + final String configValue, final Class entityClass, + final String applicationId) { super(entityId, tenant, entityClass, applicationId); this.configKey = configKey; this.configValue = configValue; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/RemoteEntityEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/RemoteEntityEvent.java index 5791bb1ae..312a04756 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/RemoteEntityEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/RemoteEntityEvent.java @@ -49,7 +49,7 @@ public class RemoteEntityEvent extends RemoteId * the origin application id */ protected RemoteEntityEvent(final E baseEntity, final String applicationId) { - super(baseEntity.getId(), baseEntity.getTenant(), baseEntity.getClass().getName(), applicationId); + super(baseEntity.getId(), baseEntity.getTenant(), baseEntity.getClass(), applicationId); this.entity = baseEntity; } diff --git a/hawkbit-repository/hawkbit-repository-api/src/test/java/org/eclipse/hawkbit/repository/RepositoryManagementMethodPreAuthorizeAnnotatedTest.java b/hawkbit-repository/hawkbit-repository-api/src/test/java/org/eclipse/hawkbit/repository/RepositoryManagementMethodPreAuthorizeAnnotatedTest.java index 9996920ce..2f4e80802 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/test/java/org/eclipse/hawkbit/repository/RepositoryManagementMethodPreAuthorizeAnnotatedTest.java +++ b/hawkbit-repository/hawkbit-repository-api/src/test/java/org/eclipse/hawkbit/repository/RepositoryManagementMethodPreAuthorizeAnnotatedTest.java @@ -76,7 +76,7 @@ public class RepositoryManagementMethodPreAuthorizeAnnotatedTest { } final PreAuthorize annotation = method.getAnnotation(PreAuthorize.class); assertThat(annotation).as("The public method " + method.getName() + " in class " + clazz.getName() - + " is not annoated with @PreAuthorize, security leak?").isNotNull(); + + " is not annotated with @PreAuthorize, security leak?").isNotNull(); } } diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaControllerManagement.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaControllerManagement.java index 4df948243..7da99c428 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaControllerManagement.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaControllerManagement.java @@ -682,7 +682,7 @@ public class JpaControllerManagement extends JpaActionManagement implements Cont eventPublisherHolder.getEventPublisher() .publishEvent(new TargetAttributesRequestedEvent(tenantAware.getCurrentTenant(), target.getId(), target.getControllerId(), target.getAddress() != null ? target.getAddress().toString() : null, - JpaTarget.class.getName(), eventPublisherHolder.getApplicationId())); + JpaTarget.class, eventPublisherHolder.getApplicationId())); } private void handleErrorOnAction(final JpaAction mergedAction, final JpaTarget mergedTarget) { diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaDistributionSetManagement.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaDistributionSetManagement.java index cbca3616f..d82fb7152 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaDistributionSetManagement.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaDistributionSetManagement.java @@ -273,7 +273,7 @@ public class JpaDistributionSetManagement implements DistributionSetManagement { afterCommit.afterCommit(() -> distributionSetIDs.forEach(dsId -> eventPublisherHolder.getEventPublisher() .publishEvent(new DistributionSetDeletedEvent(tenantAware.getCurrentTenant(), dsId, - JpaDistributionSet.class.getName(), eventPublisherHolder.getApplicationId())))); + JpaDistributionSet.class, eventPublisherHolder.getApplicationId())))); } @Override diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaRolloutExecutor.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaRolloutExecutor.java index 0f7397b6e..06a99bd44 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaRolloutExecutor.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaRolloutExecutor.java @@ -354,7 +354,7 @@ public class JpaRolloutExecutor implements RolloutExecutor { afterCommit.afterCommit(() -> groupIds.forEach(rolloutGroupId -> eventPublisherHolder.getEventPublisher() .publishEvent(new RolloutGroupDeletedEvent(tenantAware.getCurrentTenant(), rolloutGroupId, - JpaRolloutGroup.class.getName(), eventPublisherHolder.getApplicationId())))); + JpaRolloutGroup.class, eventPublisherHolder.getApplicationId())))); } private boolean isRolloutComplete(final JpaRollout rollout) { diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaTargetManagement.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaTargetManagement.java index 642bc5eec..35dd03ba0 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaTargetManagement.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaTargetManagement.java @@ -352,7 +352,7 @@ public class JpaTargetManagement implements TargetManagement { .publishEvent(new TargetDeletedEvent(tenantAware.getCurrentTenant(), target.getId(), target.getControllerId(), Optional.ofNullable(target.getAddress()).map(URI::toString).orElse(null), - JpaTarget.class.getName(), eventPublisherHolder.getApplicationId())))); + JpaTarget.class, eventPublisherHolder.getApplicationId())))); } @Override @@ -836,7 +836,7 @@ public class JpaTargetManagement implements TargetManagement { eventPublisherHolder.getEventPublisher() .publishEvent(new TargetAttributesRequestedEvent(tenantAware.getCurrentTenant(), target.getId(), target.getControllerId(), target.getAddress() != null ? target.getAddress().toString() : null, - JpaTarget.class.getName(), eventPublisherHolder.getApplicationId())); + JpaTarget.class, eventPublisherHolder.getApplicationId())); } @Override diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaDistributionSet.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaDistributionSet.java index 3f9466060..e9c122c20 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaDistributionSet.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaDistributionSet.java @@ -341,14 +341,14 @@ public class JpaDistributionSet extends AbstractJpaNamedVersionedEntity implemen new DistributionSetUpdatedEvent(this, EventPublisherHolder.getInstance().getApplicationId(), complete)); if (isSoftDeleted(descriptorEvent)) { - publishEventWithEventPublisher(new DistributionSetDeletedEvent(getTenant(), getId(), getClass().getName(), + publishEventWithEventPublisher(new DistributionSetDeletedEvent(getTenant(), getId(), getClass(), EventPublisherHolder.getInstance().getApplicationId())); } } @Override public void fireDeleteEvent(final DescriptorEvent descriptorEvent) { - publishEventWithEventPublisher(new DistributionSetDeletedEvent(getTenant(), getId(), getClass().getName(), + publishEventWithEventPublisher(new DistributionSetDeletedEvent(getTenant(), getId(), getClass(), EventPublisherHolder.getInstance().getApplicationId())); } diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaDistributionSetTag.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaDistributionSetTag.java index ef4e68017..45e0af13e 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaDistributionSetTag.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaDistributionSetTag.java @@ -89,7 +89,7 @@ public class JpaDistributionSetTag extends JpaTag implements DistributionSetTag, @Override public void fireDeleteEvent(final DescriptorEvent descriptorEvent) { EventPublisherHolder.getInstance().getEventPublisher().publishEvent(new DistributionSetTagDeletedEvent( - getTenant(), getId(), getClass().getName(), EventPublisherHolder.getInstance().getApplicationId())); + getTenant(), getId(), getClass(), EventPublisherHolder.getInstance().getApplicationId())); } } diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaDistributionSetType.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaDistributionSetType.java index b55ac92a5..d747b3610 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaDistributionSetType.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaDistributionSetType.java @@ -260,6 +260,6 @@ public class JpaDistributionSetType extends AbstractJpaNamedEntity implements Di @Override public void fireDeleteEvent(final DescriptorEvent descriptorEvent) { EventPublisherHolder.getInstance().getEventPublisher().publishEvent(new DistributionSetTypeDeletedEvent( - getTenant(), getId(), getClass().getName(), EventPublisherHolder.getInstance().getApplicationId())); + getTenant(), getId(), getClass(), EventPublisherHolder.getInstance().getApplicationId())); } } diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaRollout.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaRollout.java index 10d771c4f..094342730 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaRollout.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaRollout.java @@ -271,7 +271,7 @@ public class JpaRollout extends AbstractJpaNamedEntity implements Rollout, Event if (isSoftDeleted(descriptorEvent)) { EventPublisherHolder.getInstance().getEventPublisher().publishEvent(new RolloutDeletedEvent(getTenant(), - getId(), getClass().getName(), EventPublisherHolder.getInstance().getApplicationId())); + getId(), getClass(), EventPublisherHolder.getInstance().getApplicationId())); } } @@ -288,7 +288,7 @@ public class JpaRollout extends AbstractJpaNamedEntity implements Rollout, Event @Override public void fireDeleteEvent(final DescriptorEvent descriptorEvent) { EventPublisherHolder.getInstance().getEventPublisher().publishEvent(new RolloutDeletedEvent(getTenant(), - getId(), getClass().getName(), EventPublisherHolder.getInstance().getApplicationId())); + getId(), getClass(), EventPublisherHolder.getInstance().getApplicationId())); } @Override diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaRolloutGroup.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaRolloutGroup.java index ffd7f4c71..beb4bb27f 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaRolloutGroup.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaRolloutGroup.java @@ -296,6 +296,6 @@ public class JpaRolloutGroup extends AbstractJpaNamedEntity implements RolloutGr @Override public void fireDeleteEvent(final DescriptorEvent descriptorEvent) { EventPublisherHolder.getInstance().getEventPublisher().publishEvent(new RolloutGroupDeletedEvent(getTenant(), - getId(), getClass().getName(), EventPublisherHolder.getInstance().getApplicationId())); + getId(), getClass(), EventPublisherHolder.getInstance().getApplicationId())); } } diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaSoftwareModule.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaSoftwareModule.java index 3dc0044ff..41833e396 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaSoftwareModule.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaSoftwareModule.java @@ -251,7 +251,7 @@ public class JpaSoftwareModule extends AbstractJpaNamedVersionedEntity implement if (isSoftDeleted(descriptorEvent)) { EventPublisherHolder.getInstance().getEventPublisher().publishEvent(new SoftwareModuleDeletedEvent( - getTenant(), getId(), getClass().getName(), EventPublisherHolder.getInstance().getApplicationId())); + getTenant(), getId(), getClass(), EventPublisherHolder.getInstance().getApplicationId())); } } @@ -268,7 +268,7 @@ public class JpaSoftwareModule extends AbstractJpaNamedVersionedEntity implement @Override public void fireDeleteEvent(final DescriptorEvent descriptorEvent) { EventPublisherHolder.getInstance().getEventPublisher().publishEvent(new SoftwareModuleDeletedEvent(getTenant(), - getId(), getClass().getName(), EventPublisherHolder.getInstance().getApplicationId())); + getId(), getClass(), EventPublisherHolder.getInstance().getApplicationId())); } } diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaSoftwareModuleType.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaSoftwareModuleType.java index 643138d3a..c39d45a53 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaSoftwareModuleType.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaSoftwareModuleType.java @@ -159,6 +159,6 @@ public class JpaSoftwareModuleType extends AbstractJpaNamedEntity implements Sof @Override public void fireDeleteEvent(final DescriptorEvent descriptorEvent) { EventPublisherHolder.getInstance().getEventPublisher().publishEvent(new SoftwareModuleTypeDeletedEvent( - getTenant(), getId(), getClass().getName(), EventPublisherHolder.getInstance().getApplicationId())); + getTenant(), getId(), getClass(), EventPublisherHolder.getInstance().getApplicationId())); } } diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTarget.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTarget.java index 63e645bfd..8528bf8f0 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTarget.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTarget.java @@ -505,6 +505,6 @@ public class JpaTarget extends AbstractJpaNamedEntity implements Target, EventAw public void fireDeleteEvent(final DescriptorEvent descriptorEvent) { EventPublisherHolder.getInstance().getEventPublisher() .publishEvent(new TargetDeletedEvent(getTenant(), getId(), getControllerId(), address, - getClass().getName(), EventPublisherHolder.getInstance().getApplicationId())); + getClass(), EventPublisherHolder.getInstance().getApplicationId())); } } diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTargetFilterQuery.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTargetFilterQuery.java index eea5468c9..2a26f73f5 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTargetFilterQuery.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTargetFilterQuery.java @@ -175,6 +175,6 @@ public class JpaTargetFilterQuery extends AbstractJpaTenantAwareBaseEntity @Override public void fireDeleteEvent(final DescriptorEvent descriptorEvent) { EventPublisherHolder.getInstance().getEventPublisher().publishEvent(new TargetFilterQueryDeletedEvent( - getTenant(), getId(), getClass().getName(), EventPublisherHolder.getInstance().getApplicationId())); + getTenant(), getId(), getClass(), EventPublisherHolder.getInstance().getApplicationId())); } } diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTargetTag.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTargetTag.java index 72e730d51..1eaf403e0 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTargetTag.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTargetTag.java @@ -85,7 +85,7 @@ public class JpaTargetTag extends JpaTag implements TargetTag, EventAwareEntity @Override public void fireDeleteEvent(final DescriptorEvent descriptorEvent) { EventPublisherHolder.getInstance().getEventPublisher().publishEvent(new TargetTagDeletedEvent(getTenant(), - getId(), getClass().getName(), EventPublisherHolder.getInstance().getApplicationId())); + getId(), getClass(), EventPublisherHolder.getInstance().getApplicationId())); } diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTargetType.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTargetType.java index cbfe0e725..cd6054cc3 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTargetType.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTargetType.java @@ -151,6 +151,6 @@ public class JpaTargetType extends AbstractJpaNamedEntity implements TargetType, @Override public void fireDeleteEvent(DescriptorEvent descriptorEvent) { EventPublisherHolder.getInstance().getEventPublisher().publishEvent(new TargetTypeDeletedEvent( - getTenant(), getId(), getClass().getName(), EventPublisherHolder.getInstance().getApplicationId())); + getTenant(), getId(), getClass(), EventPublisherHolder.getInstance().getApplicationId())); } } diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTenantConfiguration.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTenantConfiguration.java index 069f3976e..b134d1884 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTenantConfiguration.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTenantConfiguration.java @@ -101,6 +101,6 @@ public class JpaTenantConfiguration extends AbstractJpaTenantAwareBaseEntity public void fireDeleteEvent(final DescriptorEvent descriptorEvent) { EventPublisherHolder.getInstance().getEventPublisher() .publishEvent(new TenantConfigurationDeletedEvent(getTenant(), getId(), getKey(), getValue(), - getClass().getName(), EventPublisherHolder.getInstance().getApplicationId())); + getClass(), EventPublisherHolder.getInstance().getApplicationId())); } } diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/RemoteIdEventTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/RemoteIdEventTest.java index 825b4a8d9..a029f1d66 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/RemoteIdEventTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/RemoteIdEventTest.java @@ -18,6 +18,8 @@ import io.qameta.allure.Description; import io.qameta.allure.Feature; import io.qameta.allure.Story; +import org.eclipse.hawkbit.repository.jpa.model.JpaAction; +import org.eclipse.hawkbit.repository.model.TenantAwareBaseEntity; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -32,7 +34,7 @@ public class RemoteIdEventTest extends AbstractRemoteEventTest { private static String TENANT = "tenant"; - private static String ENTIY_CLASS = "EntityClass"; + private static Class ENTITY_CLASS = JpaAction.class; private static String NODE = "Node"; @@ -56,7 +58,7 @@ public class RemoteIdEventTest extends AbstractRemoteEventTest { @Description("Verifies that the target id is correct reloaded") public void testTargetDeletedEvent() { final TargetDeletedEvent deletedEvent = new TargetDeletedEvent(TENANT, ENTITY_ID, CONTROLLER_ID, ADDRESS, - ENTIY_CLASS, NODE); + ENTITY_CLASS, NODE); assertEntity(deletedEvent); } @@ -85,7 +87,7 @@ public class RemoteIdEventTest extends AbstractRemoteEventTest { .orElseThrow(() -> new IllegalArgumentException("Given event is not RemoteIdEvent compatible")); try { - final RemoteIdEvent event = (RemoteIdEvent) constructor.newInstance(TENANT, ENTITY_ID, ENTIY_CLASS, NODE); + final RemoteIdEvent event = (RemoteIdEvent) constructor.newInstance(TENANT, ENTITY_ID, ENTITY_CLASS, NODE); assertEntity(event); } catch (final ReflectiveOperationException e) { fail("Exception should not happen " + e.getMessage()); diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/push/event/ActionChangedEvent.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/push/event/ActionChangedEvent.java index fe5a3883c..9b5f5c0ec 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/push/event/ActionChangedEvent.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/push/event/ActionChangedEvent.java @@ -43,7 +43,7 @@ public class ActionChangedEvent extends RemoteIdEvent implements EntityUpdatedEv */ public ActionChangedEvent(final String tenant, final Long targetId, final Long entityId) { // application id is not needed, because we compose the event ourselves - super(entityId, tenant, Action.class.getName(), null); + super(entityId, tenant, Action.class, null); this.targetId = targetId; } diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/push/event/RolloutChangedEvent.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/push/event/RolloutChangedEvent.java index e97ff7671..11086fb2e 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/push/event/RolloutChangedEvent.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/push/event/RolloutChangedEvent.java @@ -37,6 +37,6 @@ public class RolloutChangedEvent extends RemoteIdEvent implements EntityUpdatedE */ public RolloutChangedEvent(final String tenant, final Long entityId) { // application id is not needed, because we compose the event ourselves - super(entityId, tenant, Rollout.class.getName(), null); + super(entityId, tenant, Rollout.class, null); } } diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/push/event/RolloutGroupChangedEvent.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/push/event/RolloutGroupChangedEvent.java index 60860b05b..bcdaacfc7 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/push/event/RolloutGroupChangedEvent.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/push/event/RolloutGroupChangedEvent.java @@ -43,7 +43,7 @@ public class RolloutGroupChangedEvent extends RemoteIdEvent implements EntityUpd */ public RolloutGroupChangedEvent(final String tenant, final Long rolloutId, final Long entityId) { // application id is not needed, because we compose the event ourselves - super(entityId, tenant, RolloutGroup.class.getName(), null); + super(entityId, tenant, RolloutGroup.class, null); this.rolloutId = rolloutId; }