diff --git a/hivemq-edge/src/main/java/com/hivemq/bootstrap/services/EdgeCoreFactoryService.java b/hivemq-edge/src/main/java/com/hivemq/bootstrap/services/EdgeCoreFactoryService.java index 3f6e397c50..ed9eaedd1f 100644 --- a/hivemq-edge/src/main/java/com/hivemq/bootstrap/services/EdgeCoreFactoryService.java +++ b/hivemq-edge/src/main/java/com/hivemq/bootstrap/services/EdgeCoreFactoryService.java @@ -21,23 +21,10 @@ import org.jetbrains.annotations.Nullable; public class EdgeCoreFactoryService { - private boolean pulseActivated; private @Nullable WritingServiceFactory writingServiceFactory; private @Nullable DataCombiningTransformationServiceFactory dataCombiningTransformationServiceFactory; - public EdgeCoreFactoryService() { - pulseActivated = false; - } - - public boolean isPulseActivated() { - return pulseActivated; - } - - public void setPulseActivated(final boolean pulseActivated) { - this.pulseActivated = pulseActivated; - } - public void provideWritingServiceFactory(final @NotNull WritingServiceFactory writingServiceFactory) { this.writingServiceFactory = writingServiceFactory; } @@ -52,7 +39,6 @@ public void provideDataCombiningTransformationServiceFactory( } public @Nullable DataCombiningTransformationServiceFactory getDataCombiningTransformationServiceFactory() { - // If Pulse is activated, external data combining service is disable. - return pulseActivated ? null : dataCombiningTransformationServiceFactory; + return dataCombiningTransformationServiceFactory; } } diff --git a/hivemq-edge/src/main/java/com/hivemq/pulse/status/PulseAgentStatusChangedListener.java b/hivemq-edge/src/main/java/com/hivemq/pulse/status/PulseAgentStatusChangedListener.java index dff2b1af8b..0b44929e57 100644 --- a/hivemq-edge/src/main/java/com/hivemq/pulse/status/PulseAgentStatusChangedListener.java +++ b/hivemq-edge/src/main/java/com/hivemq/pulse/status/PulseAgentStatusChangedListener.java @@ -17,7 +17,6 @@ package com.hivemq.pulse.status; import com.hivemq.api.model.capabilities.Capability; -import com.hivemq.bootstrap.services.EdgeCoreFactoryService; import com.hivemq.edge.HiveMQCapabilityService; import org.jetbrains.annotations.NotNull; @@ -28,14 +27,10 @@ public class PulseAgentStatusChangedListener implements StatusProvider.StatusCha "HiveMQ Pulse Agent Asset Management", "This enables HiveMQ Edge to be a HiveMQ Pulse Agent."); private final @NotNull HiveMQCapabilityService capabilityService; - private final @NotNull EdgeCoreFactoryService edgeCoreFactoryService; private @NotNull Status status; - public PulseAgentStatusChangedListener( - final @NotNull HiveMQCapabilityService capabilityService, - final @NotNull EdgeCoreFactoryService edgeCoreFactoryService) { + public PulseAgentStatusChangedListener(final @NotNull HiveMQCapabilityService capabilityService) { this.capabilityService = capabilityService; - this.edgeCoreFactoryService = edgeCoreFactoryService; this.status = new Status(Status.ActivationStatus.DEACTIVATED, Status.ConnectionStatus.DISCONNECTED, List.of()); } @@ -48,10 +43,8 @@ public void onStatusChanged(@NotNull final Status status) { this.status = status; if (this.status.activationStatus() == Status.ActivationStatus.ACTIVATED) { capabilityService.addCapability(CAPABILITY); - edgeCoreFactoryService.setPulseActivated(true); } else { capabilityService.removeCapability(CAPABILITY); - edgeCoreFactoryService.setPulseActivated(false); } } }