From 4fedec75b793c2aa67eb2716d32f159adc4c6559 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Mon, 17 Feb 2020 10:45:38 +0100 Subject: [PATCH] [Minor] Added constants to StrolchConstants --- .../java/li/strolch/runtime/StrolchConstants.java | 3 +++ .../execution/policy/ReservationExecution.java | 11 +++++------ .../execution/policy/ToErrorReservationExecution.java | 2 ++ .../strolch/execution/ReservationExecutionTest.java | 2 +- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/li.strolch.agent/src/main/java/li/strolch/runtime/StrolchConstants.java b/li.strolch.agent/src/main/java/li/strolch/runtime/StrolchConstants.java index 24cb89455..32a126765 100644 --- a/li.strolch.agent/src/main/java/li/strolch/runtime/StrolchConstants.java +++ b/li.strolch.agent/src/main/java/li/strolch/runtime/StrolchConstants.java @@ -118,9 +118,12 @@ public class StrolchConstants { public static class PolicyConstants { public static final String TYPE_PRODUCE = "Produce"; public static final String TYPE_CONSUME = "Consume"; + public static final String TYPE_RESERVE = "Reserve"; + public static final String TYPE_RELEASE = "Release"; public static final String BAG_OBJECTIVES = "Objectives"; + public static final String PARAM_RESERVED = "reserved"; public static final String PARAM_QUANTITY = "quantity"; public static final String PARAM_DURATION = "duration"; public static final String PARAM_ORDER = "order"; diff --git a/li.strolch.service/src/main/java/li/strolch/execution/policy/ReservationExecution.java b/li.strolch.service/src/main/java/li/strolch/execution/policy/ReservationExecution.java index a7da4e592..ceae656d6 100644 --- a/li.strolch.service/src/main/java/li/strolch/execution/policy/ReservationExecution.java +++ b/li.strolch.service/src/main/java/li/strolch/execution/policy/ReservationExecution.java @@ -1,6 +1,7 @@ package li.strolch.execution.policy; import static li.strolch.model.StrolchModelConstants.BAG_PARAMETERS; +import static li.strolch.runtime.StrolchConstants.PolicyConstants.*; import li.strolch.exception.StrolchModelException; import li.strolch.model.Locator; @@ -11,6 +12,7 @@ import li.strolch.model.parameter.BooleanParameter; import li.strolch.model.timevalue.impl.FloatValue; import li.strolch.model.timevalue.impl.ValueChange; import li.strolch.persistence.api.StrolchTransaction; +import li.strolch.runtime.StrolchConstants; /** *

@@ -21,18 +23,15 @@ import li.strolch.persistence.api.StrolchTransaction; *

* *

- * Note: the reservation is done for {@link Action} of type {@link #TYPE_RESERVE} and releasing is done for - * {@link Action} of type {@link #TYPE_RELEASE} + * Note: the reservation is done for {@link Action} of type {@link StrolchConstants.PolicyConstants#TYPE_RESERVE} + * and releasing is done for + * {@link Action} of type {@link StrolchConstants.PolicyConstants#TYPE_RELEASE} *

* * @author Robert von Burg */ public class ReservationExecution extends DurationExecution { - public static final String PARAM_RESERVED = "reserved"; - public static final String TYPE_RESERVE = "Reserve"; - public static final String TYPE_RELEASE = "Release"; - public ReservationExecution(StrolchTransaction tx) { super(tx); } diff --git a/li.strolch.service/src/main/java/li/strolch/execution/policy/ToErrorReservationExecution.java b/li.strolch.service/src/main/java/li/strolch/execution/policy/ToErrorReservationExecution.java index 73fe29ad7..fe1f34f47 100644 --- a/li.strolch.service/src/main/java/li/strolch/execution/policy/ToErrorReservationExecution.java +++ b/li.strolch.service/src/main/java/li/strolch/execution/policy/ToErrorReservationExecution.java @@ -1,5 +1,7 @@ package li.strolch.execution.policy; +import static li.strolch.runtime.StrolchConstants.PolicyConstants.TYPE_RESERVE; + import java.util.ResourceBundle; import li.strolch.handler.operationslog.LogMessage; diff --git a/li.strolch.service/src/test/java/li/strolch/execution/ReservationExecutionTest.java b/li.strolch.service/src/test/java/li/strolch/execution/ReservationExecutionTest.java index 8d0297dff..2b47ab159 100644 --- a/li.strolch.service/src/test/java/li/strolch/execution/ReservationExecutionTest.java +++ b/li.strolch.service/src/test/java/li/strolch/execution/ReservationExecutionTest.java @@ -1,7 +1,7 @@ package li.strolch.execution; -import static li.strolch.execution.policy.ReservationExecution.PARAM_RESERVED; import static li.strolch.model.StrolchModelConstants.BAG_PARAMETERS; +import static li.strolch.runtime.StrolchConstants.PolicyConstants.PARAM_RESERVED; import static org.junit.Assert.*; import java.io.File;