Remove SetPolicyRule grpc call (f04e2962) · Commits · TFS / controller

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

+8 −57

Original line number	Diff line number	Diff line
		@@ -43,67 +43,25 @@ public class PolicyRuleConditionValidator {
		this.contextService = contextService;
		}

		public Uni<Boolean> validateDeviceId(String deviceId) {
		final var isDeviceIdValid = isDeviceIdValid(deviceId);

		isDeviceIdValid
		.subscribe()
		.with(
		deviceIdIdBooleanValue -> {
		if (Boolean.FALSE.equals(deviceIdIdBooleanValue)) {
		LOGGER.errorf(INVALID_MESSAGE, deviceId);
		}
		LOGGER.infof(VALID_MESSAGE, deviceId);
		});

		return isDeviceIdValid;
		}

		public Uni<Boolean> validateServiceId(ServiceId serviceId, List<String> deviceIds) {
		final var isServiceIdValid = isServiceIdValid(serviceId, deviceIds);

		isServiceIdValid
		.subscribe()
		.with(
		serviceIdBooleanValue -> {
		if (Boolean.FALSE.equals(serviceIdBooleanValue)) {
		LOGGER.errorf(INVALID_MESSAGE, serviceId);
		}
		});

		return isServiceIdValid;
		}

		public Uni<Boolean> validateUpdatedPolicyRuleId(String updatedPolicyRuleId) {
		final var isUpdatedPolicyRuleIdValid = isUpdatedPolicyRuleIdValid(updatedPolicyRuleId);

		isUpdatedPolicyRuleIdValid
		.subscribe()
		.with(
		serviceIdBooleanValue -> {
		if (Boolean.FALSE.equals(serviceIdBooleanValue)) {
		LOGGER.errorf(INVALID_MESSAGE, updatedPolicyRuleId);
		}
		});

		return isUpdatedPolicyRuleIdValid;
		}

		private Uni<Boolean> isDeviceIdValid(String deviceId) {
		public Uni<Boolean> isDeviceIdValid(String deviceId) {
		return contextService
		.getDevice(deviceId)
		.onFailure()
		.recoverWithItem((Device) null)
		.onItem()
		.transform(device -> checkIfDeviceIdExists(device, deviceId));
		}

		private boolean checkIfDeviceIdExists(Device device, String deviceId) {
		final var deviceDeviceId = device.getDeviceId();
		if (device == null) {
		return false;
		}

		final var deviceDeviceId = device.getDeviceId();
		return deviceDeviceId.equals(deviceId);
		}

		public Uni<Boolean> isServiceIdValid(ServiceId serviceId, List<String> deviceIds) {

		return contextService
		.getService(serviceId)
		.onFailure()
		@@ -144,14 +102,7 @@ public class PolicyRuleConditionValidator {
		return deviceIds.containsAll(serviceDeviceIds);
		}

		public Uni<Boolean> isServicesDeviceIdsValid(ServiceId serviceId, List<String> deviceIds) {
		return contextService
		.getService(serviceId)
		.onItem()
		.transform(service -> checkIfServicesDeviceIdsExist(service, deviceIds));
		}

		private Uni<Boolean> isUpdatedPolicyRuleIdValid(String updatedPolicyRuleId) {
		public Uni<Boolean> isUpdatedPolicyRuleIdValid(String updatedPolicyRuleId) {
		return contextService
		.getPolicyRule(updatedPolicyRuleId)
		.onItem()

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

+183 −335

File changed.

Preview size limit exceeded, changes collapsed.