refactor(policy): refactor context related domain models (30af00f2) · Commits · TFS / controller

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

+3 −7

Original line number	Diff line number	Diff line
		@@ -16,8 +16,8 @@

		package eu.teraflow.policy.context.model;

		import eu.teraflow.policy.common.Util;
		import java.util.List;
		import java.util.stream.Collectors;

		public class Service {

		@@ -74,13 +74,9 @@ public class Service {
		getClass().getSimpleName(),
		serviceId,
		serviceType.toString(),
		toString(serviceEndPointIds),
		toString(serviceConstraints),
		Util.toString(serviceEndPointIds),
		Util.toString(serviceConstraints),
		serviceStatus,
		serviceConfig);
		}

		private <T> String toString(List<T> list) {
		return list.stream().map(T::toString).collect(Collectors.joining(", "));
		}
		}

+2 −7

Original line number	Diff line number	Diff line
		@@ -16,8 +16,8 @@

		package eu.teraflow.policy.context.model;

		import eu.teraflow.policy.common.Util;
		import java.util.List;
		import java.util.stream.Collectors;

		public class ServiceConfig {

		@@ -33,11 +33,6 @@ public class ServiceConfig {

		@Override
		public String toString() {
		return String.format(
		"%s:{configRules:[%s]}", getClass().getSimpleName(), toString(configRules));
		}

		private <T> String toString(List<T> list) {
		return list.stream().map(T::toString).collect(Collectors.joining(", "));
		return String.format("%s:{[%s]}", getClass().getSimpleName(), Util.toString(configRules));
		}
		}

+2 −1

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@ public class ServiceStatus {

		@Override
		public String toString() {
		return String.format("%s:{serviceStatus:\"%s\"}", getClass().getSimpleName(), status);
		return String.format(
		"%s:{serviceStatus:\"%s\"}", getClass().getSimpleName(), status.toString());
		}
		}