style(automation): remove code smells and format code (783dfb0f) · Commits · TFS / controller

src/automation/src/main/java/eu/teraflow/automation/AutomationGatewayImpl.java

+19 −18

Original line number	Diff line number	Diff line
		@@ -84,7 +84,8 @@ public class AutomationGatewayImpl implements AutomationGateway {
		return Uni.createFrom().item(() -> Automation.DeviceDeletionResult.newBuilder().build());
		}

		// TODO When `DeviceRoleState` domain object will be created, move this method to Serializer class and create related tests
		// TODO When `DeviceRoleState` domain object will be created, move this method to Serializer class
		// and create related tests
		private Automation.DeviceRoleState transformToDeviceRoleState(Device device, String devRoleId) {

		final var deviceRoleId = new DeviceRoleId(devRoleId, device.getDeviceId());

src/automation/src/main/java/eu/teraflow/automation/context/ContextGatewayImpl.java

+15 −17

Original line number	Diff line number	Diff line
		@@ -19,18 +19,16 @@ package eu.teraflow.automation.context;
		import context.ContextOuterClass;
		import context.MutinyContextServiceGrpc.MutinyContextServiceStub;
		import eu.teraflow.automation.Serializer;
		import eu.teraflow.automation.device.model.*;
		import eu.teraflow.automation.device.model.Device;
		import eu.teraflow.automation.device.model.DeviceEvent;
		import io.quarkus.grpc.GrpcClient;
		import io.smallrye.mutiny.Multi;
		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;

src/automation/src/main/java/eu/teraflow/automation/device/DeviceGatewayImpl.java

+14 −17

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@

		package eu.teraflow.automation.device;

		import context.ContextOuterClass;
		import device.DeviceService;
		import eu.teraflow.automation.Serializer;
		import eu.teraflow.automation.device.model.Device;
		@@ -25,11 +24,9 @@ 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 DeviceGatewayImpl implements DeviceGateway {
		private static final Logger LOGGER = Logger.getLogger(DeviceGatewayImpl.class);

		@GrpcClient("device")
		DeviceService deviceDelegate;

src/automation/src/test/java/eu/teraflow/automation/AutomationServiceTest.java

+20 −18

Original line number	Diff line number	Diff line
		@@ -20,13 +20,15 @@ import static org.assertj.core.api.Assertions.assertThat;

		import automation.Automation;
		import automation.AutomationService;
		import context.ContextOuterClass;
		import eu.teraflow.automation.model.DeviceRole;
		import eu.teraflow.automation.model.DeviceRoleId;
		import eu.teraflow.automation.context.ContextGateway;
		import eu.teraflow.automation.device.DeviceGateway;
		import eu.teraflow.automation.device.model.*;
		import eu.teraflow.automation.device.model.ConfigActionEnum;
		import eu.teraflow.automation.device.model.ConfigRule;
		import eu.teraflow.automation.device.model.Device;
		import eu.teraflow.automation.device.model.DeviceConfig;
		import eu.teraflow.automation.device.model.DeviceOperationalStatus;
		import eu.teraflow.automation.model.DeviceRole;
		import eu.teraflow.automation.model.DeviceRoleId;
		import eu.teraflow.automation.model.DeviceRoleType;
		import io.quarkus.grpc.GrpcClient;
		import io.quarkus.test.junit.QuarkusTest;

src/automation/src/test/java/eu/teraflow/automation/SerializerTest.java

+34 −28

Original line number	Diff line number	Diff line
		@@ -53,7 +53,8 @@ class SerializerTest {
		final var expectedDeviceId = "expectedDeviceId";

		final var deviceIdUuid = serializer.serializeUuid(expectedDeviceId);
		final var deviceId = ContextOuterClass.DeviceId.newBuilder().setDeviceUuid(deviceIdUuid).build();
		final var deviceId =
		ContextOuterClass.DeviceId.newBuilder().setDeviceUuid(deviceIdUuid).build();

		final var serializedDeviceId = serializer.serializeDeviceId(expectedDeviceId);

		@@ -65,7 +66,8 @@ class SerializerTest {
		final var expectedDeviceId = "expectedDeviceId";

		final var serializedDeviceIdUuid = serializer.serializeUuid("expectedDeviceId");
		final var serializedDeviceId = DeviceId.newBuilder().setDeviceUuid(serializedDeviceIdUuid).build();
		final var serializedDeviceId =
		DeviceId.newBuilder().setDeviceUuid(serializedDeviceIdUuid).build();

		final var deviceId = serializer.deserialize(serializedDeviceId);

		@@ -80,7 +82,10 @@ class SerializerTest {
		final var deviceRoleId = new DeviceRoleId(expectedDevRoleId, expectedDeviceId);
		final var serializedDeviceRoleIdUuid = serializer.serializeUuid(expectedDevRoleId);
		final var serializedDeviceRoleDeviceIdUuid = serializer.serializeUuid(expectedDeviceId);
		final var serializedDeviceRoleDeviceId = ContextOuterClass.DeviceId.newBuilder().setDeviceUuid(serializedDeviceRoleDeviceIdUuid).build();
		final var serializedDeviceRoleDeviceId =
		ContextOuterClass.DeviceId.newBuilder()
		.setDeviceUuid(serializedDeviceRoleDeviceIdUuid)
		.build();

		final var expectedDeviceRoleId =
		Automation.DeviceRoleId.newBuilder()
		@@ -88,8 +93,7 @@ class SerializerTest {
		.setDevId(serializedDeviceRoleDeviceId)
		.build();

		final var serializedDevRoleId =
		serializer.serialize(deviceRoleId);
		final var serializedDevRoleId = serializer.serialize(deviceRoleId);

		assertThat(serializedDevRoleId).usingRecursiveComparison().isEqualTo(expectedDeviceRoleId);
		}
		@@ -142,14 +146,16 @@ class SerializerTest {
		final var serializedDeviceRoleDevRoleIdUuid = serializer.serializeUuid(expectedDevRoleId);
		final var serializedDeviceRoleDeviceId = serializer.serializeDeviceId(expectedDeviceId);

		final var expectedDeviceRoleId = Automation.DeviceRoleId.newBuilder()
		final var expectedDeviceRoleId =
		Automation.DeviceRoleId.newBuilder()
		.setDevRoleId(serializedDeviceRoleDevRoleIdUuid)
		.setDevId(serializedDeviceRoleDeviceId)
		.build();

		final var expectedDeviceRoleType = Automation.DeviceRoleType.PIPELINE_CONF;

		final var expectedDeviceRole = Automation.DeviceRole.newBuilder()
		final var expectedDeviceRole =
		Automation.DeviceRole.newBuilder()
		.setDevRoleId(expectedDeviceRoleId)
		.setDevRoleType(expectedDeviceRoleType)
		.build();

Admin message