Commit 994736fc authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Pre-merge code cleanup and header fixing.

parent d41ae3f3

src/policy/src/main/java/eu/teraflow/policy/Serializer.java

+7 −15
Original line number Diff line number Diff line
@@ -101,7 +101,6 @@ import monitoring.Monitoring; 
import monitoring.Monitoring.AlarmID;

import monitoring.Monitoring.KpiId;

import monitoring.Monitoring.SubscriptionID;

import org.jboss.logging.Logger;

import policy.Policy;

import policy.Policy.PolicyRuleId;

import policy.PolicyAction;
@@ -110,8 +109,6 @@ import policy.PolicyCondition; 
@Singleton

public class Serializer {



    private static final Logger LOGGER = Logger.getLogger(Serializer.class);



    public DeviceId serializeDeviceId(String expectedDeviceId) {

        final var builder = DeviceId.newBuilder();

        final var uuid = serializeUuid(expectedDeviceId);
@@ -1557,8 +1554,6 @@ public class Serializer { 
    public Monitoring.KpiValueRange serialize(KpiValueRange kpiValueRange) {

        final var builder = Monitoring.KpiValueRange.newBuilder();



        LOGGER.infof("inside KpiValueRange %s", kpiValueRange);



        final var kpiValueMin = kpiValueRange.getKpiMinValue();

        final var kpiValueMax = kpiValueRange.getKpiMaxValue();
@@ -1578,8 +1573,8 @@ public class Serializer { 
            serializedKpiValueMax = serialize(kpiValueMax);

        }



        builder.setKpiMaxValue(serializedKpiValueMax);

        builder.setKpiMinValue(serializedKpiValueMin);

        builder.setKpiMaxValue(serializedKpiValueMax);



        return builder.build();

    }
@@ -1614,29 +1609,26 @@ public class Serializer { 
    }



    public Monitoring.AlarmDescriptor serialize(AlarmDescriptor alarmDescriptor) {

        LOGGER.infof("inside serialize %s", alarmDescriptor);

        final var builder = Monitoring.AlarmDescriptor.newBuilder();



        // final var alarmId = alarmDescriptor.getAlarmId();

        final var alarmId = alarmDescriptor.getAlarmId();

        final var alarmDescription = alarmDescriptor.getAlarmDescription();

        final var name = alarmDescriptor.getName();

        final var kpiId = alarmDescriptor.getKpiId();

        final var kpiValueRange = alarmDescriptor.getKpiValueRange();

        // final var timestamp = alarmDescriptor.getTimestamp();

        final var timestamp = alarmDescriptor.getTimestamp();



        // final var serializedAlarmId = serializeAlarmId(alarmId);

        final var serializedAlarmId = serializeAlarmId(alarmId);

        final var serializedKpiId = serializeKpiId(kpiId);

        final var serializedKpiValueRange = serialize(kpiValueRange);

        // final var serializedTimestamp = serialize(timestamp);

        final var serializedTimestamp = serialize(timestamp);



        // builder.setAlarmId(serializedAlarmId);

        builder.setAlarmId(serializedAlarmId);

        builder.setAlarmDescription(alarmDescription);

        builder.setName(name);

        builder.setKpiId(serializedKpiId);

        builder.setKpiValueRange(serializedKpiValueRange);

        // builder.setTimestamp(serializedTimestamp);



        LOGGER.infof("just before leaving serialize");

        builder.setTimestamp(serializedTimestamp);



        return builder.build();

    }

src/policy/src/main/java/eu/teraflow/policy/monitoring/MonitoringGatewayImpl.java

+0 −9
Original line number Diff line number Diff line
@@ -31,13 +31,10 @@ import io.smallrye.mutiny.Uni; 
import javax.enterprise.context.ApplicationScoped;

import javax.inject.Inject;

import monitoring.MutinyMonitoringServiceGrpc.MutinyMonitoringServiceStub;

import org.jboss.logging.Logger;



@ApplicationScoped

public class MonitoringGatewayImpl implements MonitoringGateway {



    private static final Logger LOGGER = Logger.getLogger(MonitoringGatewayImpl.class);



    @GrpcClient("monitoring")

    MutinyMonitoringServiceStub streamingDelegateMonitoring;
@@ -102,9 +99,6 @@ public class MonitoringGatewayImpl implements MonitoringGateway { 
    public Uni<String> setKpiAlarm(AlarmDescriptor alarmDescriptor) {

        final var serializedAlarmDescriptor = serializer.serialize(alarmDescriptor);



        LOGGER.infof("inside setKpiAlarm");

        LOGGER.infof("AlarmDescriptor = %s", serializedAlarmDescriptor);



        return streamingDelegateMonitoring

                .setKpiAlarm(serializedAlarmDescriptor)

                .onItem()
@@ -125,9 +119,6 @@ public class MonitoringGatewayImpl implements MonitoringGateway { 
    public Multi<AlarmResponse> getAlarmResponseStream(AlarmSubscription alarmSubscription) {

        final var serializedAlarmSubscription = serializer.serialize(alarmSubscription);



        LOGGER.infof("inside getAlarmResponseStream");

        LOGGER.infof("AlarmSubscription = %s", serializedAlarmSubscription);



        return streamingDelegateMonitoring

                .getAlarmResponseStream(serializedAlarmSubscription)

                .onItem()

src/policy/src/main/resources/application.yml

+0 −3
Original line number Diff line number Diff line
@@ -28,9 +28,6 @@ quarkus: 
      context:

        host: ${quarkus.kubernetes.env.vars.context-service-host}

        port: 1010

      context_policy:

        host: ${quarkus.kubernetes.env.vars.context-service-host}

        port: 1010

      monitoring:

        host: ${quarkus.kubernetes.env.vars.monitoring-service-host}

        port: 7070

src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleActionConfig.java

+1 −1

File changed.

Contains only whitespace changes.

src/policy/src/main/java/eu/teraflow/policy/common/Util.java

+1 −1

File changed.

Contains only whitespace changes.

src/policy/src/main/java/eu/teraflow/policy/context/model/LocationTypeGpsPosition.java

+1 −1

File changed.

Contains only whitespace changes.