Refactor operation parsing

bundles/org.openhab.binding.haywardomnilogiclocal/src/main/java/org/openhab/binding/haywardomnilogiclocal/internal/config/ActionConfig.java

@@ -0,0 +1,47 @@
+package org.openhab.binding.haywardomnilogiclocal.internal.config;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.eclipse.jdt.annotation.Nullable;
+
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+import com.thoughtworks.xstream.annotations.XStreamConverter;
+import com.thoughtworks.xstream.annotations.XStreamImplicit;
+import com.thoughtworks.xstream.converters.extended.ToAttributedValueConverter;
+
+/**
+ * Representation of an Action element.
+ */
+@NonNullByDefault
+@XStreamAlias("Action")
+@XStreamConverter(value = ToAttributedValueConverter.class, strings = "type")
+public class ActionConfig {
+    private @Nullable String type;
+
+    @XStreamImplicit(itemFieldName = "Device")
+    private final List<DeviceConfig> devices = new ArrayList<>();
+
+    @XStreamImplicit(itemFieldName = "Parameter")
+    private final List<ParameterConfig> parameters = new ArrayList<>();
+
+    @XStreamImplicit(itemFieldName = "Operation")
+    private final List<OperationConfig> operations = new ArrayList<>();
+
+    public @Nullable String getType() {
+        return type;
+    }
+
+    public List<DeviceConfig> getDevices() {
+        return devices;
+    }
+
+    public List<ParameterConfig> getParameters() {
+        return parameters;
+    }
+
+    public List<OperationConfig> getOperations() {
+        return operations;
+    }
+}

bundles/org.openhab.binding.haywardomnilogiclocal/src/main/java/org/openhab/binding/haywardomnilogiclocal/internal/config/ChlorinatorConfig.java

@@ -9,8 +9,6 @@
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
 import com.thoughtworks.xstream.annotations.XStreamImplicit;
-import com.thoughtworks.xstream.annotations.XStreamConverter;
-import com.thoughtworks.xstream.converters.extended.ToAttributedValueConverter;
 
 /**
  * Representation of a Chlorinator element.
@@ -102,47 +100,5 @@ public List<OperationConfig> getOperations() {
         return operations;
     }
 
-    @NonNullByDefault
-    @XStreamAlias("Operation")
-    @XStreamConverter(value = ToAttributedValueConverter.class, strings = "type")
-    public static class OperationConfig {
-        private @Nullable String type;
-
-        @XStreamImplicit(itemFieldName = "Action")
-        private final List<ActionConfig> actions = new ArrayList<>();
-
-        public @Nullable String getType() {
-            return type;
-        }
-
-        public List<ActionConfig> getActions() {
-            return actions;
-        }
-    }
-
-    @NonNullByDefault
-    @XStreamAlias("Action")
-    @XStreamConverter(value = ToAttributedValueConverter.class, strings = "type")
-    public static class ActionConfig {
-        private @Nullable String type;
-
-        @XStreamImplicit(itemFieldName = "Device")
-        private final List<DeviceConfig> devices = new ArrayList<>();
-
-        @XStreamImplicit(itemFieldName = "Parameter")
-        private final List<ParameterConfig> parameters = new ArrayList<>();
-
-        public @Nullable String getType() {
-            return type;
-        }
-
-        public List<DeviceConfig> getDevices() {
-            return devices;
-        }
-
-        public List<ParameterConfig> getParameters() {
-            return parameters;
-        }
-    }
 }
 

bundles/org.openhab.binding.haywardomnilogiclocal/src/main/java/org/openhab/binding/haywardomnilogiclocal/internal/config/ConfigParser.java

@@ -18,10 +18,11 @@ public final class ConfigParser {
         XSTREAM.ignoreUnknownElements();
         XSTREAM.addPermission(AnyTypePermission.ANY);
         XSTREAM.processAnnotations(new Class<?>[] { MspConfig.class, SystemConfig.class, BackyardConfig.class,
-                BodyOfWaterConfig.class, PumpConfig.class, FilterConfig.class, HeaterConfig.class, SensorConfig.class,
-                VirtualHeaterConfig.class, ChlorinatorConfig.class, ColorLogicLightConfig.class, RelayConfig.class,
-                SchedulesConfig.class, ScheduleConfig.class, ScheduleActionConfig.class, DeviceConfig.class,
-                ParameterConfig.class, DmtConfig.class });
+                BodyOfWaterConfig.class, PumpConfig.class, FilterConfig.class, HeaterConfig.class,
+                HeaterConfig.HeaterEquipmentConfig.class, SensorConfig.class, VirtualHeaterConfig.class,
+                ChlorinatorConfig.class, ColorLogicLightConfig.class, RelayConfig.class, OperationConfig.class,
+                ActionConfig.class, SchedulesConfig.class, ScheduleConfig.class, ScheduleActionConfig.class,
+                DeviceConfig.class, ParameterConfig.class, DmtConfig.class });
     }
 
     private ConfigParser() {

bundles/org.openhab.binding.haywardomnilogiclocal/src/main/java/org/openhab/binding/haywardomnilogiclocal/internal/config/FilterConfig.java

@@ -9,8 +9,6 @@
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
 import com.thoughtworks.xstream.annotations.XStreamImplicit;
-import com.thoughtworks.xstream.annotations.XStreamConverter;
-import com.thoughtworks.xstream.converters.extended.ToAttributedValueConverter;
 
 /**
  * Representation of a Filter element.
@@ -135,47 +133,5 @@ public List<OperationConfig> getOperations() {
         return operations;
     }
 
-    @NonNullByDefault
-    @XStreamAlias("Operation")
-    @XStreamConverter(value = ToAttributedValueConverter.class, strings = "type")
-    public static class OperationConfig {
-        private @Nullable String type;
-
-        @XStreamImplicit(itemFieldName = "Action")
-        private final List<ActionConfig> actions = new ArrayList<>();
-
-        public @Nullable String getType() {
-            return type;
-        }
-
-        public List<ActionConfig> getActions() {
-            return actions;
-        }
-    }
-
-    @NonNullByDefault
-    @XStreamAlias("Action")
-    @XStreamConverter(value = ToAttributedValueConverter.class, strings = "type")
-    public static class ActionConfig {
-        private @Nullable String type;
-
-        @XStreamImplicit(itemFieldName = "Device")
-        private final List<DeviceConfig> devices = new ArrayList<>();
-
-        @XStreamImplicit(itemFieldName = "Parameter")
-        private final List<ParameterConfig> parameters = new ArrayList<>();
-
-        public @Nullable String getType() {
-            return type;
-        }
-
-        public List<DeviceConfig> getDevices() {
-            return devices;
-        }
-
-        public List<ParameterConfig> getParameters() {
-            return parameters;
-        }
-    }
 }
 

bundles/org.openhab.binding.haywardomnilogiclocal/src/main/java/org/openhab/binding/haywardomnilogiclocal/internal/config/HeaterConfig.java

@@ -9,8 +9,6 @@
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
 import com.thoughtworks.xstream.annotations.XStreamImplicit;
-import com.thoughtworks.xstream.annotations.XStreamConverter;
-import com.thoughtworks.xstream.converters.extended.ToAttributedValueConverter;
 
 /**
  * Representation of a Heater element.
@@ -106,56 +104,6 @@ public List<OperationConfig> getOperations() {
         return operations;
     }
 
-    @NonNullByDefault
-    @XStreamAlias("Operation")
-    @XStreamConverter(value = ToAttributedValueConverter.class, strings = "type")
-    public static class OperationConfig {
-        private @Nullable String type;
-
-        @XStreamImplicit(itemFieldName = "Action")
-        private final List<ActionConfig> actions = new ArrayList<>();
-
-        @XStreamImplicit(itemFieldName = "Heater-Equipment")
-        private final List<HeaterEquipmentConfig> heaterEquipment = new ArrayList<>();
-
-        public @Nullable String getType() {
-            return type;
-        }
-
-        public List<ActionConfig> getActions() {
-            return actions;
-        }
-
-        public List<HeaterEquipmentConfig> getHeaterEquipment() {
-            return heaterEquipment;
-        }
-    }
-
-    @NonNullByDefault
-    @XStreamAlias("Action")
-    @XStreamConverter(value = ToAttributedValueConverter.class, strings = "type")
-    public static class ActionConfig {
-        private @Nullable String type;
-
-        @XStreamImplicit(itemFieldName = "Device")
-        private final List<DeviceConfig> devices = new ArrayList<>();
-
-        @XStreamImplicit(itemFieldName = "Parameter")
-        private final List<ParameterConfig> parameters = new ArrayList<>();
-
-        public @Nullable String getType() {
-            return type;
-        }
-
-        public List<DeviceConfig> getDevices() {
-            return devices;
-        }
-
-        public List<ParameterConfig> getParameters() {
-            return parameters;
-        }
-    }
-
     @NonNullByDefault
     @XStreamAlias("Heater-Equipment")
     public static class HeaterEquipmentConfig {

bundles/org.openhab.binding.haywardomnilogiclocal/src/main/java/org/openhab/binding/haywardomnilogiclocal/internal/config/OperationConfig.java

@@ -0,0 +1,56 @@
+package org.openhab.binding.haywardomnilogiclocal.internal.config;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.eclipse.jdt.annotation.Nullable;
+
+import org.openhab.binding.haywardomnilogiclocal.internal.config.HeaterConfig.HeaterEquipmentConfig;
+
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+import com.thoughtworks.xstream.annotations.XStreamConverter;
+import com.thoughtworks.xstream.annotations.XStreamImplicit;
+import com.thoughtworks.xstream.converters.extended.ToAttributedValueConverter;
+
+/**
+ * Representation of an Operation element.
+ */
+@NonNullByDefault
+@XStreamAlias("Operation")
+@XStreamConverter(value = ToAttributedValueConverter.class, strings = "type")
+public class OperationConfig {
+    private @Nullable String type;
+
+    @XStreamImplicit(itemFieldName = "Action")
+    private final List<ActionConfig> actions = new ArrayList<>();
+
+    @XStreamImplicit(itemFieldName = "Operation")
+    private final List<OperationConfig> operations = new ArrayList<>();
+
+    @XStreamImplicit(itemFieldName = "Parameter")
+    private final List<ParameterConfig> parameters = new ArrayList<>();
+
+    @XStreamImplicit(itemFieldName = "Heater-Equipment")
+    private final List<HeaterEquipmentConfig> heaterEquipment = new ArrayList<>();
+
+    public @Nullable String getType() {
+        return type;
+    }
+
+    public List<ActionConfig> getActions() {
+        return actions;
+    }
+
+    public List<OperationConfig> getOperations() {
+        return operations;
+    }
+
+    public List<ParameterConfig> getParameters() {
+        return parameters;
+    }
+
+    public List<HeaterEquipmentConfig> getHeaterEquipment() {
+        return heaterEquipment;
+    }
+}

bundles/org.openhab.binding.haywardomnilogiclocal/src/main/java/org/openhab/binding/haywardomnilogiclocal/internal/config/PumpConfig.java

@@ -9,8 +9,6 @@
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
 import com.thoughtworks.xstream.annotations.XStreamImplicit;
-import com.thoughtworks.xstream.annotations.XStreamConverter;
-import com.thoughtworks.xstream.converters.extended.ToAttributedValueConverter;
 
 /**
  * Representation of a Pump element.
@@ -122,47 +120,5 @@ public List<OperationConfig> getOperations() {
         return operations;
     }
 
-    @NonNullByDefault
-    @XStreamAlias("Operation")
-    @XStreamConverter(value = ToAttributedValueConverter.class, strings = "type")
-    public static class OperationConfig {
-        private @Nullable String type;
-
-        @XStreamImplicit(itemFieldName = "Action")
-        private final List<ActionConfig> actions = new ArrayList<>();
-
-        public @Nullable String getType() {
-            return type;
-        }
-
-        public List<ActionConfig> getActions() {
-            return actions;
-        }
-    }
-
-    @NonNullByDefault
-    @XStreamAlias("Action")
-    @XStreamConverter(value = ToAttributedValueConverter.class, strings = "type")
-    public static class ActionConfig {
-        private @Nullable String type;
-
-        @XStreamImplicit(itemFieldName = "Device")
-        private final List<DeviceConfig> devices = new ArrayList<>();
-
-        @XStreamImplicit(itemFieldName = "Parameter")
-        private final List<ParameterConfig> parameters = new ArrayList<>();
-
-        public @Nullable String getType() {
-            return type;
-        }
-
-        public List<DeviceConfig> getDevices() {
-            return devices;
-        }
-
-        public List<ParameterConfig> getParameters() {
-            return parameters;
-        }
-    }
 }