Merge branch 'develop'

csowada · Mar 25, 2023 · d9345e7 · d9345e7
2 parents d59f7f1 + 4b82db0
commit d9345e7
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/src/main/java/de/csdev/ebus/cfg/std/EBusConfigurationReader.java b/src/main/java/de/csdev/ebus/cfg/std/EBusConfigurationReader.java
@@ -439,7 +439,7 @@ protected EBusCommand parseTelegramConfiguration(@NonNull IEBusCommandCollection
                 for (EBusCommandValue commandValue : templateCollection) {
 
                     // clone the original value
-                    EBusCommandValue clone = commandValue.clone();
+                    EBusCommandValue clone = commandValue.getClonedInstance();
                     clone.setParent(commandMethod);
 
                     overwritePropertiesFromTemplate(clone, valueDto);
@@ -479,7 +479,7 @@ protected EBusCommand parseTelegramConfiguration(@NonNull IEBusCommandCollection
             if (templateCollection != null && !templateCollection.isEmpty()) {
                 for (EBusCommandValue commandValue : templateCollection) {
 
-                    EBusCommandValue clone = commandValue.clone();
+                    EBusCommandValue clone = commandValue.getClonedInstance();
                     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
@@ -55,12 +55,12 @@ protected EBusCommandNestedValue createInstance() {
     }
 
     @Override
-    public @NonNull EBusCommandValue clone() {
-        EBusCommandNestedValue clone = (EBusCommandNestedValue) super.clone();
+    public @NonNull EBusCommandValue getClonedInstance() {
+        EBusCommandNestedValue clone = (EBusCommandNestedValue) super.getClonedInstance();
 
         // deep clone list
         for (IEBusValue value : list) {
-            clone.add(value.clone());
+            clone.add(value.getClonedInstance());
         }
 
         return clone;

diff --git 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 clone() {
+    public @NonNull EBusCommandValue getClonedInstance() {
 
         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
@@ -25,7 +25,7 @@
  */
 
 @NonNullByDefault
-public interface IEBusValue extends Cloneable {
+public interface IEBusValue {
 
     /**
      * Returns the type of this value
@@ -117,5 +117,5 @@ public interface IEBusValue extends Cloneable {
      *
      * @return
      */
-    public @NonNull IEBusValue clone();
+    public IEBusValue getClonedInstance();
 }