Pre-merge code cleanup (d82241f9) · Commits · TFS / controller

src/policy/src/main/docker/Dockerfile.multistage.jvm

+1 −2

Original line number	Diff line number	Diff line
		@@ -29,7 +29,7 @@ RUN mvn --errors --batch-mode package -Dmaven.test.skip=true
		# Stage 2
		FROM builder AS unit-test

		#RUN ./mvnw --errors --batch-mode -Pgenerate-consolidated-coverage verify
		RUN mvn --errors --batch-mode -Pgenerate-consolidated-coverage verify

		# Stage 3
		FROM registry.access.redhat.com/ubi8/ubi-minimal:8.4 AS release
		@@ -51,7 +51,6 @@ RUN microdnf install curl ca-certificates ${JAVA_PACKAGE} \
		&& chmod 540 /deployments/run-java.sh \
		&& echo "securerandom.source=file:/dev/urandom" >> /etc/alternatives/jre/conf/security/java.security

		ENV QUARKUS_LAUNCH_DEVMODE="true"
		# Configure the JAVA_OPTIONS, you can add -XshowSettings:vm to also display the heap size.
		ENV JAVA_OPTIONS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager"
		# We make four distinct layers so if there are application changes the library layers can be re-used

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

+0 −3

Original line number	Diff line number	Diff line
		@@ -157,7 +157,6 @@ public class PolicyServiceImpl implements PolicyService {

		return Uni.createFrom().item(policyRuleState);
		}
		LOGGER.infof("Passed 1st");

		final var policyRuleBasic = policyRuleService.getPolicyRuleBasic();
		if (!policyRuleBasic.areArgumentsValid()) {
		@@ -167,7 +166,6 @@ public class PolicyServiceImpl implements PolicyService {
		PolicyRuleStateEnum.POLICY_FAILED, policyRuleBasic.getExeceptionMessage());
		return Uni.createFrom().item(policyRuleState);
		}
		LOGGER.infof("Passed 2nd");

		final var serviceId = policyRuleService.getServiceId();
		final var deviceIds = policyRuleService.getDeviceIds();
		@@ -592,7 +590,6 @@ public class PolicyServiceImpl implements PolicyService {
		}

		private void applyActionService(String alarmId) {
		LOGGER.info("Inside applyActionService");
		PolicyRuleService policyRuleService = alarmPolicyRuleServiceMap.get(alarmId);
		PolicyRuleAction policyRuleAction =
		policyRuleService.getPolicyRuleBasic().getPolicyRuleActions().get(0);

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

+6 −14

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();

		@@ -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/context/ContextGatewayImpl.java

+5 −18

Original line number	Diff line number	Diff line
		@@ -28,13 +28,10 @@ import io.quarkus.grpc.GrpcClient;
		import io.smallrye.mutiny.Uni;
		import javax.enterprise.context.ApplicationScoped;
		import javax.inject.Inject;
		import org.jboss.logging.Logger;

		@ApplicationScoped
		public class ContextGatewayImpl implements ContextGateway {

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

		@GrpcClient("context")
		MutinyContextServiceStub streamingDelegateContext;

		@@ -55,8 +52,6 @@ public class ContextGatewayImpl implements ContextGateway {

		final var serializedServiceId = serializer.serialize(serviceId);

		LOGGER.infof("getService = %s", serializedServiceId);

		return streamingDelegateContext
		.getService(serializedServiceId)
		.onItem()
		@@ -97,19 +92,11 @@ public class ContextGatewayImpl implements ContextGateway {
		public Uni<String> setPolicyRule(PolicyRule policyRule) {
		// return Uni.createFrom().item("571eabc1-0f59-48da-b608-c45876c3fa8a");
		final var serializedPolicyRuleBasic = serializer.serialize(policyRule);
		LOGGER.infof("Inside setPolicyRule");

		var ret =
		streamingDelegateContextPolicy
		return streamingDelegateContextPolicy
		.setPolicyRule(serializedPolicyRuleBasic)
		.onItem()
		.transform(serializer::deserialize);
		ret.subscribe()
		.with(
		x -> {
		LOGGER.infof(x);
		});
		return ret;
		}

		@Override

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()