From 4b82db070b10d7dc8f738a68b68a6936b3aa2b6b Mon Sep 17 00:00:00 2001 From: csowada Date: Sat, 25 Mar 2023 17:56:42 +0100 Subject: [PATCH] Replace IEBusValue clone() --- .../java/de/csdev/ebus/cfg/std/EBusConfigurationReader.java | 4 ++-- .../java/de/csdev/ebus/command/EBusCommandNestedValue.java | 6 +++--- src/main/java/de/csdev/ebus/command/EBusCommandValue.java | 2 +- src/main/java/de/csdev/ebus/command/IEBusValue.java | 4 ++-- 4 files changed, 8 insertions(+), 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 index 5a84a29..79d8687 100644 --- 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 index a32a77c..0cf35cd 100644 --- 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 index ee61d0f..92d4aa2 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 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 index 0041b58..791e0bb 100644 --- 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(); }