From 2a225313ae278ecffd256ecba4ce1d672bae3288 Mon Sep 17 00:00:00 2001 From: csowada Date: Sun, 31 Jan 2021 12:27:45 +0100 Subject: [PATCH] Revert "Feature/remove clone 1" --- pom.xml | 2 +- .../ebus/cfg/std/EBusConfigurationReader.java | 4 ++-- .../ebus/command/EBusCommandNestedValue.java | 6 +++--- .../csdev/ebus/command/EBusCommandValue.java | 2 +- .../java/de/csdev/ebus/command/IEBusValue.java | 4 ++-- .../command/datatypes/ext/EBusTypeBytes.java | 2 +- .../command/datatypes/ext/EBusTypeDate.java | 12 ++++++------ .../datatypes/ext/EBusTypeDateTime.java | 10 +++++----- .../command/datatypes/ext/EBusTypeKWCrc.java | 4 ++-- .../datatypes/ext/EBusTypeMultiWord.java | 4 ++-- .../command/datatypes/ext/EBusTypeString.java | 2 +- .../command/datatypes/ext/EBusTypeTime.java | 18 +++++++++--------- .../command/datatypes/ext/EBusTypeVersion.java | 2 +- .../command/datatypes/std/EBusTypeBCD.java | 2 +- .../command/datatypes/std/EBusTypeBit.java | 6 +++--- .../command/datatypes/std/EBusTypeByte.java | 4 ++-- .../command/datatypes/std/EBusTypeChar.java | 2 +- .../command/datatypes/std/EBusTypeData1b.java | 2 +- .../command/datatypes/std/EBusTypeData1c.java | 2 +- .../command/datatypes/std/EBusTypeData2b.java | 2 +- .../command/datatypes/std/EBusTypeData2c.java | 2 +- .../command/datatypes/std/EBusTypeFloat.java | 2 +- .../command/datatypes/std/EBusTypeInteger.java | 2 +- .../command/datatypes/std/EBusTypeNumber.java | 2 +- .../datatypes/std/EBusTypeUnsignedNumber.java | 2 +- .../command/datatypes/std/EBusTypeWord.java | 4 ++-- 26 files changed, 53 insertions(+), 53 deletions(-) diff --git a/pom.xml b/pom.xml index 913a1f4..54369ef 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ eBUS core library - This library handles the communication with heating engineering via the BUS specification. This protocol is used by many heating manufacturers in Europe. de.cs-dev.ebus ebus-core - 1.1.5-SNAPSHOT + 1.1.4 https://github.com/csowada/ebus bundle diff --git a/src/main/java/de/csdev/ebus/cfg/std/EBusConfigurationReader.java b/src/main/java/de/csdev/ebus/cfg/std/EBusConfigurationReader.java index 02d6137..244b981 100644 --- a/src/main/java/de/csdev/ebus/cfg/std/EBusConfigurationReader.java +++ b/src/main/java/de/csdev/ebus/cfg/std/EBusConfigurationReader.java @@ -433,7 +433,7 @@ protected EBusCommand parseTelegramConfiguration(@NonNull IEBusCommandCollection for (EBusCommandValue commandValue : templateCollection) { // clone the original value - EBusCommandValue clone = commandValue.getClonedInstance(); + EBusCommandValue clone = commandValue.clone(); clone.setParent(commandMethod); overwritePropertiesFromTemplate(clone, valueDto); @@ -473,7 +473,7 @@ protected EBusCommand parseTelegramConfiguration(@NonNull IEBusCommandCollection if (templateCollection != null && !templateCollection.isEmpty()) { for (EBusCommandValue commandValue : templateCollection) { - EBusCommandValue clone = commandValue.getClonedInstance(); + EBusCommandValue clone = commandValue.clone(); clone.setParent(commandMethod); overwritePropertiesFromTemplate(clone, valueDto); diff --git a/src/main/java/de/csdev/ebus/command/EBusCommandNestedValue.java b/src/main/java/de/csdev/ebus/command/EBusCommandNestedValue.java index d4364cb..db4dab2 100644 --- a/src/main/java/de/csdev/ebus/command/EBusCommandNestedValue.java +++ b/src/main/java/de/csdev/ebus/command/EBusCommandNestedValue.java @@ -56,12 +56,12 @@ protected EBusCommandNestedValue createInstance() { } @Override - public @NonNull EBusCommandValue getClonedInstance() { - EBusCommandNestedValue clone = (EBusCommandNestedValue) super.getClonedInstance(); + public @NonNull EBusCommandValue clone() { + EBusCommandNestedValue clone = (EBusCommandNestedValue) super.clone(); // deep clone list for (IEBusValue value : list) { - clone.add(value.getClonedInstance()); + clone.add(value.clone()); } return clone; diff --git a/src/main/java/de/csdev/ebus/command/EBusCommandValue.java b/src/main/java/de/csdev/ebus/command/EBusCommandValue.java index e889ffb..683346f 100644 --- a/src/main/java/de/csdev/ebus/command/EBusCommandValue.java +++ b/src/main/java/de/csdev/ebus/command/EBusCommandValue.java @@ -63,7 +63,7 @@ protected EBusCommandValue createInstance() { } @Override - public @NonNull EBusCommandValue getClonedInstance() { + public @NonNull EBusCommandValue clone() { EBusCommandValue clone = createInstance(); clone.defaultValue = this.defaultValue; diff --git a/src/main/java/de/csdev/ebus/command/IEBusValue.java b/src/main/java/de/csdev/ebus/command/IEBusValue.java index 951126b..9c9bcc1 100644 --- a/src/main/java/de/csdev/ebus/command/IEBusValue.java +++ b/src/main/java/de/csdev/ebus/command/IEBusValue.java @@ -22,7 +22,7 @@ * @author Christian Sowada - Initial contribution * */ -public interface IEBusValue { +public interface IEBusValue extends Cloneable { /** * Returns the type of this value @@ -115,5 +115,5 @@ public interface IEBusValue { * * @return */ - public @NonNull IEBusValue getClonedInstance(); + public @NonNull IEBusValue clone(); } diff --git a/src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeBytes.java b/src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeBytes.java index 34e484a..380e933 100644 --- a/src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeBytes.java +++ b/src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeBytes.java @@ -22,7 +22,7 @@ */ public class EBusTypeBytes extends EBusAbstractType { - public static final String TYPE_BYTES = "bytes"; + public static String TYPE_BYTES = "bytes"; private static String[] supportedTypes = new String[] { TYPE_BYTES }; diff --git a/src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeDate.java b/src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeDate.java index c1c7bb1..beb1552 100644 --- a/src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeDate.java +++ b/src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeDate.java @@ -31,17 +31,17 @@ */ public class EBusTypeDate extends EBusAbstractType { - public static final String TYPE_DATE = "date"; + public static String TYPE_DATE = "date"; - public static final String DEFAULT = "std"; // BDA - 4 + public static String DEFAULT = "std"; // BDA - 4 - public static final String SHORT = "short"; // BDA:3 - 3 + public static String SHORT = "short"; // BDA:3 - 3 - public static final String HEX = "hex"; // BDA:3 - 4 + public static String HEX = "hex"; // BDA:3 - 4 - public static final String HEX_SHORT = "hex_short"; // BDA:3 - 3 + public static String HEX_SHORT = "hex_short"; // BDA:3 - 3 - public static final String DAYS = "days"; // DAY - 2 + public static String DAYS = "days"; // DAY - 2 private static String[] supportedTypes = new String[] { TYPE_DATE }; diff --git a/src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeDateTime.java b/src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeDateTime.java index 6887249..8302dd2 100644 --- a/src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeDateTime.java +++ b/src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeDateTime.java @@ -32,15 +32,15 @@ public class EBusTypeDateTime extends EBusAbstractType { private static final Logger logger = LoggerFactory.getLogger(EBusTypeDateTime.class); - public static final String TYPE_DATETIME = "datetime"; + public static String TYPE_DATETIME = "datetime"; - public static final String TIME_FIRST = "timeFirst"; + private static String[] supportedTypes = new String[] { TYPE_DATETIME }; - public static final String VARIANT_DATE = "variantDate"; + public static String TIME_FIRST = "timeFirst"; - public static final String VARIANT_TIME = "variantTime"; + public static String VARIANT_DATE = "variantDate"; - private static String[] supportedTypes = new String[] { TYPE_DATETIME }; + public static String VARIANT_TIME = "variantTime"; private boolean timeFirst = true; diff --git a/src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeKWCrc.java b/src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeKWCrc.java index d5740ba..c7c0083 100644 --- a/src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeKWCrc.java +++ b/src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeKWCrc.java @@ -23,9 +23,9 @@ */ public class EBusTypeKWCrc extends EBusAbstractType implements IEBusComplexType { - public static final String TYPE_KW_CRC = "kw-crc"; + public static String TYPE_KW_CRC = "kw-crc"; - public static final String POS = "pos"; + public static String POS = "pos"; public static int pos = 0; diff --git a/src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeMultiWord.java b/src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeMultiWord.java index 8cc5235..af94cf1 100644 --- a/src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeMultiWord.java +++ b/src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeMultiWord.java @@ -24,9 +24,9 @@ */ public class EBusTypeMultiWord extends EBusAbstractType { - public static final String TYPE_MWORD = "mword"; + public static String TYPE_MWORD = "mword"; - public static final String BLOCK_MULTIPLIER = "multiplier"; + public static String BLOCK_MULTIPLIER = "multiplier"; private static String[] supportedTypes = new String[] { TYPE_MWORD }; diff --git a/src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeString.java b/src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeString.java index d4fdf6e..61fe1a0 100644 --- a/src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeString.java +++ b/src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeString.java @@ -18,7 +18,7 @@ */ public class EBusTypeString extends EBusAbstractType { - public static final String TYPE_STRING = "string"; + public static String TYPE_STRING = "string"; private static String[] supportedTypes = new String[] { TYPE_STRING }; diff --git a/src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeTime.java b/src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeTime.java index f256b21..df85167 100644 --- a/src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeTime.java +++ b/src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeTime.java @@ -31,21 +31,21 @@ */ public class EBusTypeTime extends EBusAbstractType { - public static final String TYPE_TIME = "time"; + public static String TYPE_TIME = "time"; - public static final String DEFAULT = "std"; // BTI - 3 - public static final String HEX = "hex"; // HTI - 3 + public static String DEFAULT = "std"; // BTI - 3 + public static String HEX = "hex"; // HTI - 3 - public static final String SHORT = "short"; // BTM - 2 - public static final String HEX_SHORT = "hex_short"; // HTM - 2 + public static String SHORT = "short"; // BTM - 2 + public static String HEX_SHORT = "hex_short"; // HTM - 2 - public static final String MINUTES = "minutes"; // MIN - 2 - public static final String MINUTES_SHORT = "minutes_short"; // MIN - 1 + public static String MINUTES = "minutes"; // MIN - 2 + public static String MINUTES_SHORT = "minutes_short"; // MIN - 1 - public static final String MINUTE_MULTIPLIER = "minuteMultiplier"; - private static String[] supportedTypes = new String[] { TYPE_TIME }; + public static String MINUTE_MULTIPLIER = "minuteMultiplier"; + private String variant = DEFAULT; private BigDecimal minuteMultiplier = BigDecimal.valueOf(1); diff --git a/src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeVersion.java b/src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeVersion.java index cd63fef..cbd47f1 100644 --- a/src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeVersion.java +++ b/src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeVersion.java @@ -23,7 +23,7 @@ */ public class EBusTypeVersion extends EBusAbstractType { - public static final String TYPE_VERSION = "version"; + public static String TYPE_VERSION = "version"; private static String[] supportedTypes = new String[] { TYPE_VERSION }; diff --git a/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeBCD.java b/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeBCD.java index 02dcfc6..1fbc336 100644 --- a/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeBCD.java +++ b/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeBCD.java @@ -24,7 +24,7 @@ */ public class EBusTypeBCD extends EBusAbstractType { - public static final String TYPE_BCD = "bcd"; + public static String TYPE_BCD = "bcd"; private static String[] supportedTypes = new String[] { TYPE_BCD }; diff --git a/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeBit.java b/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeBit.java index 27e8fd7..66e6ae9 100644 --- a/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeBit.java +++ b/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeBit.java @@ -21,12 +21,12 @@ */ public class EBusTypeBit extends EBusAbstractType { - public static final String TYPE_BIT = "bit"; + public static String TYPE_BIT = "bit"; - public static final String POS = "pos"; - private static String[] supportedTypes = new String[] { TYPE_BIT }; + public static String POS = "pos"; + private Integer pos = null; public EBusTypeBit() { diff --git a/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeByte.java b/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeByte.java index a14ed06..97c6586 100644 --- a/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeByte.java +++ b/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeByte.java @@ -16,8 +16,8 @@ */ public class EBusTypeByte extends AbstractEBusTypeUnsignedNumber { - public static final String TYPE_UCHAR = "uchar"; - public static final String TYPE_BYTE = "byte"; + public static String TYPE_UCHAR = "uchar"; + public static String TYPE_BYTE = "byte"; private static String[] supportedTypes = new String[] { TYPE_BYTE, TYPE_UCHAR }; diff --git a/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeChar.java b/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeChar.java index f5d64a2..f10a112 100644 --- a/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeChar.java +++ b/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeChar.java @@ -16,7 +16,7 @@ */ public class EBusTypeChar extends AbstractEBusTypeNumber { - public static final String TYPE_CHAR = "char"; + public static String TYPE_CHAR = "char"; private static String[] supportedTypes = new String[] { TYPE_CHAR }; diff --git a/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeData1b.java b/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeData1b.java index ed73620..1736836 100644 --- a/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeData1b.java +++ b/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeData1b.java @@ -16,7 +16,7 @@ */ public class EBusTypeData1b extends AbstractEBusTypeNumber { - public static final String TYPE_DATA1B = "data1b"; + public static String TYPE_DATA1B = "data1b"; private static String[] supportedTypes = new String[] { TYPE_DATA1B }; diff --git a/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeData1c.java b/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeData1c.java index 8fd6896..855548b 100644 --- a/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeData1c.java +++ b/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeData1c.java @@ -22,7 +22,7 @@ */ public class EBusTypeData1c extends AbstractEBusTypeUnsignedNumber { - public static final String TYPE_DATA1C = "data1c"; + public static String TYPE_DATA1C = "data1c"; private static String[] supportedTypes = new String[] { TYPE_DATA1C }; diff --git a/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeData2b.java b/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeData2b.java index 7a5d95b..0d1906c 100644 --- a/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeData2b.java +++ b/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeData2b.java @@ -22,7 +22,7 @@ */ public class EBusTypeData2b extends AbstractEBusTypeNumber { - public static final String TYPE_DATA2B = "data2b"; + public static String TYPE_DATA2B = "data2b"; private static String[] supportedTypes = new String[] { TYPE_DATA2B }; diff --git a/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeData2c.java b/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeData2c.java index e254a93..b2dd47b 100644 --- a/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeData2c.java +++ b/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeData2c.java @@ -22,7 +22,7 @@ */ public class EBusTypeData2c extends AbstractEBusTypeNumber { - public static final String TYPE_DATA2C = "data2c"; + public static String TYPE_DATA2C = "data2c"; private static String[] supportedTypes = new String[] { TYPE_DATA2C }; diff --git a/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeFloat.java b/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeFloat.java index 91d0061..cfebb99 100644 --- a/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeFloat.java +++ b/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeFloat.java @@ -29,7 +29,7 @@ public class EBusTypeFloat extends EBusAbstractType { private static final Logger logger = LoggerFactory.getLogger(EBusTypeFloat.class); - public static final String TYPE_FLOAT = "float"; + public static String TYPE_FLOAT = "float"; private static String[] supportedTypes = new String[] { TYPE_FLOAT }; diff --git a/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeInteger.java b/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeInteger.java index 141488b..3e4c866 100644 --- a/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeInteger.java +++ b/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeInteger.java @@ -16,7 +16,7 @@ */ public class EBusTypeInteger extends AbstractEBusTypeNumber { - public static final String TYPE_INTEGER = "int"; + public static String TYPE_INTEGER = "int"; private static String[] supportedTypes = new String[] { TYPE_INTEGER }; diff --git a/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeNumber.java b/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeNumber.java index 73885e0..ce003bf 100644 --- a/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeNumber.java +++ b/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeNumber.java @@ -16,7 +16,7 @@ */ public class EBusTypeNumber extends AbstractEBusTypeNumber { - public static final String TYPE_NUMBER = "number"; + public static String TYPE_NUMBER = "number"; private static String[] supportedTypes = new String[] { TYPE_NUMBER }; diff --git a/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeUnsignedNumber.java b/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeUnsignedNumber.java index 4b85f6d..68638bd 100644 --- a/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeUnsignedNumber.java +++ b/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeUnsignedNumber.java @@ -16,7 +16,7 @@ */ public class EBusTypeUnsignedNumber extends AbstractEBusTypeUnsignedNumber { - public static final String TYPE_UNUMBER = "unumber"; + public static String TYPE_UNUMBER = "unumber"; private static String[] supportedTypes = new String[] { TYPE_UNUMBER }; diff --git a/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeWord.java b/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeWord.java index b492f95..b9e5b19 100644 --- a/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeWord.java +++ b/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeWord.java @@ -16,8 +16,8 @@ */ public class EBusTypeWord extends AbstractEBusTypeUnsignedNumber { - public static final String TYPE_WORD = "word"; - public static final String TYPE_UINT = "uint"; + public static String TYPE_WORD = "word"; + public static String TYPE_UINT = "uint"; private static String[] supportedTypes = new String[] { TYPE_WORD, TYPE_UINT };