Merge branch 'develop' of https://labs.etsi.org/rep/tfs/controller into fix/release-2 (4e3700b6) · Commits · TFS / controller

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

+21 −1

Original line number	Diff line number	Diff line
		@@ -41,15 +41,21 @@ public class AutomationServiceImpl implements AutomationService {

		@Override
		public Uni<Device> addDevice(String deviceId) {

		final var deserializedDeviceUni = contextService.getDevice(deviceId);

		deserializedDeviceUni
		.onFailure()
		.recoverWithNull()
		.subscribe()
		.with(
		device -> {
		final var id = deviceId;

		if (device == null) {
		LOGGER.warnf("%s is null. Ignoring...", device);
		return;
		}

		if (device.isEnabled()) {
		LOGGER.warnf("%s has already been enabled. Ignoring...", device);
		return;
		@@ -88,11 +94,18 @@ public class AutomationServiceImpl implements AutomationService {
		final var deserializedDeviceUni = contextService.getDevice(deviceId);

		deserializedDeviceUni
		.onFailure()
		.recoverWithNull()
		.subscribe()
		.with(
		device -> {
		final var id = deviceId;

		if (device == null) {
		LOGGER.warnf("%s is null. Ignoring...", device);
		return;
		}

		if (device.isDisabled()) {
		LOGGER.warnf("%s has already been disabled. Ignoring...", device);
		return;
		@@ -120,11 +133,18 @@ public class AutomationServiceImpl implements AutomationService {
		final var deserializedDeviceUni = contextService.getDevice(deviceId);

		deserializedDeviceUni
		.onFailure()
		.recoverWithNull()
		.subscribe()
		.with(
		device -> {
		final var id = deviceId;

		if (device == null) {
		LOGGER.warnf("%s is null. Ignoring...", device);
		return;
		}

		if (!device.isEnabled()) {
		LOGGER.warnf("Cannot update disabled device %s. Ignoring...", device);
		return;

+27235 −20442

File changed.

Preview size limit exceeded, changes collapsed.

+4 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,8 @@ public interface ContextService extends MutinyService {

		io.smallrye.mutiny.Uni<context.ContextOuterClass.Topology> getTopology(context.ContextOuterClass.TopologyId request);

		io.smallrye.mutiny.Uni<context.ContextOuterClass.TopologyDetails> getTopologyDetails(context.ContextOuterClass.TopologyId request);

		io.smallrye.mutiny.Uni<context.ContextOuterClass.TopologyId> setTopology(context.ContextOuterClass.Topology request);

		io.smallrye.mutiny.Uni<context.ContextOuterClass.Empty> removeTopology(context.ContextOuterClass.TopologyId request);
		@@ -38,6 +40,8 @@ public interface ContextService extends MutinyService {

		io.smallrye.mutiny.Uni<context.ContextOuterClass.Empty> removeDevice(context.ContextOuterClass.DeviceId request);

		io.smallrye.mutiny.Uni<context.ContextOuterClass.EndPointNameList> listEndPointNames(context.ContextOuterClass.EndPointIdList request);

		io.smallrye.mutiny.Uni<context.ContextOuterClass.LinkIdList> listLinkIds(context.ContextOuterClass.Empty request);

		io.smallrye.mutiny.Uni<context.ContextOuterClass.LinkList> listLinks(context.ContextOuterClass.Empty request);

+16 −0

Original line number	Diff line number	Diff line
		@@ -80,6 +80,14 @@ public class ContextServiceBean extends MutinyContextServiceGrpc.ContextServiceI
		}
		}
		@Override
		public io.smallrye.mutiny.Uni<context.ContextOuterClass.TopologyDetails> getTopologyDetails(context.ContextOuterClass.TopologyId request) {
		try {
		return delegate.getTopologyDetails(request);
		} catch (UnsupportedOperationException e) {
		throw new io.grpc.StatusRuntimeException(io.grpc.Status.UNIMPLEMENTED);
		}
		}
		@Override
		public io.smallrye.mutiny.Uni<context.ContextOuterClass.TopologyId> setTopology(context.ContextOuterClass.Topology request) {
		try {
		return delegate.setTopology(request);
		@@ -136,6 +144,14 @@ public class ContextServiceBean extends MutinyContextServiceGrpc.ContextServiceI
		}
		}
		@Override
		public io.smallrye.mutiny.Uni<context.ContextOuterClass.EndPointNameList> listEndPointNames(context.ContextOuterClass.EndPointIdList request) {
		try {
		return delegate.listEndPointNames(request);
		} catch (UnsupportedOperationException e) {
		throw new io.grpc.StatusRuntimeException(io.grpc.Status.UNIMPLEMENTED);
		}
		}
		@Override
		public io.smallrye.mutiny.Uni<context.ContextOuterClass.LinkIdList> listLinkIds(context.ContextOuterClass.Empty request) {
		try {
		return delegate.listLinkIds(request);

+8 −0

Original line number	Diff line number	Diff line
		@@ -53,6 +53,10 @@ public class ContextServiceClient implements ContextService, MutinyClient<Mutiny
		return stub.getTopology(request);
		}
		@Override
		public io.smallrye.mutiny.Uni<context.ContextOuterClass.TopologyDetails> getTopologyDetails(context.ContextOuterClass.TopologyId request) {
		return stub.getTopologyDetails(request);
		}
		@Override
		public io.smallrye.mutiny.Uni<context.ContextOuterClass.TopologyId> setTopology(context.ContextOuterClass.Topology request) {
		return stub.setTopology(request);
		}
		@@ -81,6 +85,10 @@ public class ContextServiceClient implements ContextService, MutinyClient<Mutiny
		return stub.removeDevice(request);
		}
		@Override
		public io.smallrye.mutiny.Uni<context.ContextOuterClass.EndPointNameList> listEndPointNames(context.ContextOuterClass.EndPointIdList request) {
		return stub.listEndPointNames(request);
		}
		@Override
		public io.smallrye.mutiny.Uni<context.ContextOuterClass.LinkIdList> listLinkIds(context.ContextOuterClass.Empty request) {
		return stub.listLinkIds(request);
		}