From 418a8d0c7a77607e1a71e4e45f0aefbeb27aa689 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Mon, 5 Sep 2022 11:37:15 +0200 Subject: [PATCH] [New] String interning of some fields --- .../java/li/strolch/model/GroupedParameterizedElement.java | 3 +-- .../src/main/java/li/strolch/model/activity/Action.java | 3 ++- .../java/li/strolch/model/parameter/AbstractParameter.java | 7 ++++--- .../src/main/java/li/strolch/model/policy/PolicyDef.java | 4 ++-- .../model/timedstate/AbstractStrolchTimedState.java | 7 ++++--- 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/li.strolch.model/src/main/java/li/strolch/model/GroupedParameterizedElement.java b/li.strolch.model/src/main/java/li/strolch/model/GroupedParameterizedElement.java index a7b255a00..ad1b2b469 100644 --- a/li.strolch.model/src/main/java/li/strolch/model/GroupedParameterizedElement.java +++ b/li.strolch.model/src/main/java/li/strolch/model/GroupedParameterizedElement.java @@ -30,7 +30,6 @@ import java.util.stream.Stream; import li.strolch.exception.StrolchException; import li.strolch.exception.StrolchModelException; import li.strolch.model.parameter.Parameter; -import li.strolch.model.parameter.StringParameter; /** * @author Robert von Burg @@ -81,7 +80,7 @@ public abstract class GroupedParameterizedElement extends AbstractStrolchElement throw new StrolchException(msg); } - this.type = type; + this.type = type.intern(); } @Override diff --git a/li.strolch.model/src/main/java/li/strolch/model/activity/Action.java b/li.strolch.model/src/main/java/li/strolch/model/activity/Action.java index cc68c8f67..36a0b02d2 100644 --- a/li.strolch.model/src/main/java/li/strolch/model/activity/Action.java +++ b/li.strolch.model/src/main/java/li/strolch/model/activity/Action.java @@ -18,6 +18,7 @@ package li.strolch.model.activity; import static li.strolch.model.StrolchModelConstants.BAG_RELATIONS; import static li.strolch.utils.helper.StringHelper.isNotEmpty; +import static li.strolch.utils.helper.StringHelper.trimOrEmpty; import java.text.MessageFormat; import java.util.*; @@ -67,7 +68,7 @@ public class Action extends GroupedParameterizedElement implements IActivityElem public Action(String id, String name, String type, String resourceId, String resourceType) { super(id, name, type); this.resourceId = resourceId; - this.resourceType = resourceType; + this.resourceType = trimOrEmpty(resourceType).intern(); this.state = State.CREATED; } diff --git a/li.strolch.model/src/main/java/li/strolch/model/parameter/AbstractParameter.java b/li.strolch.model/src/main/java/li/strolch/model/parameter/AbstractParameter.java index d649bccb7..071aa6b46 100644 --- a/li.strolch.model/src/main/java/li/strolch/model/parameter/AbstractParameter.java +++ b/li.strolch.model/src/main/java/li/strolch/model/parameter/AbstractParameter.java @@ -17,6 +17,7 @@ package li.strolch.model.parameter; import static li.strolch.model.StrolchModelConstants.INTERPRETATION_NONE; import static li.strolch.model.StrolchModelConstants.UOM_NONE; +import static li.strolch.utils.helper.StringHelper.trimOrEmpty; import java.text.MessageFormat; @@ -58,7 +59,7 @@ public abstract class AbstractParameter extends AbstractStrolchElement implem * the name */ public AbstractParameter(String id, String name) { - super(id, name); + super(trimOrEmpty(id).intern(), trimOrEmpty(name).intern()); } @Override @@ -83,7 +84,7 @@ public abstract class AbstractParameter extends AbstractStrolchElement implem if (StringHelper.isEmpty(interpretation)) { this.interpretation = INTERPRETATION_NONE; } else { - this.interpretation = interpretation; + this.interpretation = interpretation.intern(); } } @@ -103,7 +104,7 @@ public abstract class AbstractParameter extends AbstractStrolchElement implem if (StringHelper.isEmpty(uom)) { this.uom = UOM_NONE; } else { - this.uom = uom; + this.uom = uom.intern(); } } diff --git a/li.strolch.model/src/main/java/li/strolch/model/policy/PolicyDef.java b/li.strolch.model/src/main/java/li/strolch/model/policy/PolicyDef.java index 9cb33f1d2..d89083703 100644 --- a/li.strolch.model/src/main/java/li/strolch/model/policy/PolicyDef.java +++ b/li.strolch.model/src/main/java/li/strolch/model/policy/PolicyDef.java @@ -52,8 +52,8 @@ public abstract class PolicyDef { */ public PolicyDef(String type, String value) { super(); - this.type = type; - this.value = value; + this.type = type.intern(); + this.value = value.intern(); } /** diff --git a/li.strolch.model/src/main/java/li/strolch/model/timedstate/AbstractStrolchTimedState.java b/li.strolch.model/src/main/java/li/strolch/model/timedstate/AbstractStrolchTimedState.java index 0131768d4..c2d393328 100644 --- a/li.strolch.model/src/main/java/li/strolch/model/timedstate/AbstractStrolchTimedState.java +++ b/li.strolch.model/src/main/java/li/strolch/model/timedstate/AbstractStrolchTimedState.java @@ -17,6 +17,7 @@ package li.strolch.model.timedstate; import static li.strolch.model.StrolchModelConstants.INTERPRETATION_NONE; import static li.strolch.model.StrolchModelConstants.UOM_NONE; +import static li.strolch.utils.helper.StringHelper.trimOrEmpty; import li.strolch.model.*; import li.strolch.model.Locator.LocatorBuilder; @@ -48,7 +49,7 @@ public abstract class AbstractStrolchTimedState extends Abstra } public AbstractStrolchTimedState(String id, String name) { - super(id, name); + super(trimOrEmpty(id).intern(), trimOrEmpty(name).intern()); this.state = new TimedState<>(); } @@ -74,7 +75,7 @@ public abstract class AbstractStrolchTimedState extends Abstra if (StringHelper.isEmpty(interpretation)) { this.interpretation = INTERPRETATION_NONE; } else { - this.interpretation = interpretation; + this.interpretation = interpretation.intern(); } } @@ -89,7 +90,7 @@ public abstract class AbstractStrolchTimedState extends Abstra if (StringHelper.isEmpty(uom)) { this.uom = UOM_NONE; } else { - this.uom = uom; + this.uom = uom.intern(); } }