Skip to content

Commit 0bbce6b

Browse files
authored
revert: Reactivate DataHub when Pulse is Activated (#1324)
1 parent 1cccaeb commit 0bbce6b

File tree

2 files changed

+2
-23
lines changed

2 files changed

+2
-23
lines changed

hivemq-edge/src/main/java/com/hivemq/bootstrap/services/EdgeCoreFactoryService.java

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -21,23 +21,10 @@
2121
import org.jetbrains.annotations.Nullable;
2222

2323
public class EdgeCoreFactoryService {
24-
private boolean pulseActivated;
2524

2625
private @Nullable WritingServiceFactory writingServiceFactory;
2726
private @Nullable DataCombiningTransformationServiceFactory dataCombiningTransformationServiceFactory;
2827

29-
public EdgeCoreFactoryService() {
30-
pulseActivated = false;
31-
}
32-
33-
public boolean isPulseActivated() {
34-
return pulseActivated;
35-
}
36-
37-
public void setPulseActivated(final boolean pulseActivated) {
38-
this.pulseActivated = pulseActivated;
39-
}
40-
4128
public void provideWritingServiceFactory(final @NotNull WritingServiceFactory writingServiceFactory) {
4229
this.writingServiceFactory = writingServiceFactory;
4330
}
@@ -52,7 +39,6 @@ public void provideDataCombiningTransformationServiceFactory(
5239
}
5340

5441
public @Nullable DataCombiningTransformationServiceFactory getDataCombiningTransformationServiceFactory() {
55-
// If Pulse is activated, external data combining service is disable.
56-
return pulseActivated ? null : dataCombiningTransformationServiceFactory;
42+
return dataCombiningTransformationServiceFactory;
5743
}
5844
}

hivemq-edge/src/main/java/com/hivemq/pulse/status/PulseAgentStatusChangedListener.java

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
package com.hivemq.pulse.status;
1818

1919
import com.hivemq.api.model.capabilities.Capability;
20-
import com.hivemq.bootstrap.services.EdgeCoreFactoryService;
2120
import com.hivemq.edge.HiveMQCapabilityService;
2221
import org.jetbrains.annotations.NotNull;
2322

@@ -28,14 +27,10 @@ public class PulseAgentStatusChangedListener implements StatusProvider.StatusCha
2827
"HiveMQ Pulse Agent Asset Management",
2928
"This enables HiveMQ Edge to be a HiveMQ Pulse Agent.");
3029
private final @NotNull HiveMQCapabilityService capabilityService;
31-
private final @NotNull EdgeCoreFactoryService edgeCoreFactoryService;
3230
private @NotNull Status status;
3331

34-
public PulseAgentStatusChangedListener(
35-
final @NotNull HiveMQCapabilityService capabilityService,
36-
final @NotNull EdgeCoreFactoryService edgeCoreFactoryService) {
32+
public PulseAgentStatusChangedListener(final @NotNull HiveMQCapabilityService capabilityService) {
3733
this.capabilityService = capabilityService;
38-
this.edgeCoreFactoryService = edgeCoreFactoryService;
3934
this.status = new Status(Status.ActivationStatus.DEACTIVATED, Status.ConnectionStatus.DISCONNECTED, List.of());
4035
}
4136

@@ -48,10 +43,8 @@ public void onStatusChanged(@NotNull final Status status) {
4843
this.status = status;
4944
if (this.status.activationStatus() == Status.ActivationStatus.ACTIVATED) {
5045
capabilityService.addCapability(CAPABILITY);
51-
edgeCoreFactoryService.setPulseActivated(true);
5246
} else {
5347
capabilityService.removeCapability(CAPABILITY);
54-
edgeCoreFactoryService.setPulseActivated(false);
5548
}
5649
}
5750
}

0 commit comments

Comments
 (0)