Finish Ingress V2 interface

pom.xml

@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.6.2</version>
+        <version>2.6.7</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
@@ -26,7 +26,6 @@
     </properties>
 
     <dependencies>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>
@@ -48,6 +47,11 @@
             <artifactId>spring-boot-starter-validation</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-aop</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-configuration-processor</artifactId>
@@ -80,7 +84,6 @@
             <artifactId>commons-io</artifactId>
             <version>2.11.0</version>
         </dependency>
-
     </dependencies>
 
     <build>

src/main/java/com/logreposit/ta/cmireaderservice/configuration/ApplicationConfiguration.java

@@ -1,6 +1,6 @@
 package com.logreposit.ta.cmireaderservice.configuration;
 
-import com.logreposit.ta.cmireaderservice.dtos.logreposit.tacmi.enums.DeviceType;
+import com.logreposit.ta.cmireaderservice.dtos.common.DeviceType;
 import lombok.Getter;
 import lombok.Setter;
 import org.springframework.boot.context.properties.ConfigurationProperties;

src/main/java/com/logreposit/ta/cmireaderservice/configuration/RetryConfiguration.java

@@ -0,0 +1,8 @@
+package com.logreposit.ta.cmireaderservice.configuration;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.retry.annotation.EnableRetry;
+
+@Configuration
+@EnableRetry
+public class RetryConfiguration {}

src/main/java/com/logreposit/ta/cmireaderservice/dtos/cmi/CmiApiResponseData.java

@@ -5,6 +5,8 @@
 import com.logreposit.ta.cmireaderservice.dtos.cmi.io.CmiApiInput;
 import com.logreposit.ta.cmireaderservice.dtos.cmi.io.CmiApiLoggingAnalog;
 import com.logreposit.ta.cmireaderservice.dtos.cmi.io.CmiApiLoggingDigital;
+import com.logreposit.ta.cmireaderservice.dtos.cmi.io.CmiApiNetworkAnalog;
+import com.logreposit.ta.cmireaderservice.dtos.cmi.io.CmiApiNetworkDigital;
 import com.logreposit.ta.cmireaderservice.dtos.cmi.io.CmiApiOutput;
 import lombok.Getter;
 import lombok.Setter;
@@ -29,6 +31,12 @@ public class CmiApiResponseData
     @JsonProperty(value = "Logging Digital")
     private List<CmiApiLoggingDigital> digitalLoggingValues;
 
+    @JsonProperty(value = "Network Analog")
+    private List<CmiApiNetworkAnalog> analogNetworkValues;
+
+    @JsonProperty(value = "Network Digital")
+    private List<CmiApiNetworkDigital> digitalNetworkValues;
+
     @JsonProperty(value = "DL-Bus")
     private List<Object> dlBusValues;
 
@@ -38,6 +46,8 @@ public CmiApiResponseData()
         this.outputs              = new ArrayList<>();
         this.analogLoggingValues  = new ArrayList<>();
         this.digitalLoggingValues = new ArrayList<>();
+        this.analogNetworkValues  = new ArrayList<>();
+        this.digitalNetworkValues = new ArrayList<>();
         this.dlBusValues          = new ArrayList<>();
     }
 }

src/main/java/com/logreposit/ta/cmireaderservice/dtos/cmi/io/CmiApiNetworkAnalog.java

@@ -0,0 +1,8 @@
+package com.logreposit.ta.cmireaderservice.dtos.cmi.io;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class CmiApiNetworkAnalog extends CmiApiIO
+{
+}

src/main/java/com/logreposit/ta/cmireaderservice/dtos/cmi/io/CmiApiNetworkDigital.java

@@ -0,0 +1,8 @@
+package com.logreposit.ta.cmireaderservice.dtos.cmi.io;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class CmiApiNetworkDigital extends CmiApiIO
+{
+}

src/main/java/com/logreposit/ta/cmireaderservice/dtos/logreposit/tacmi/enums/DeviceType.java → src/main/java/com/logreposit/ta/cmireaderservice/dtos/common/DeviceType.java

@@ -1,4 +1,4 @@
-package com.logreposit.ta.cmireaderservice.dtos.logreposit.tacmi.enums;
+package com.logreposit.ta.cmireaderservice.dtos.common;
 
 public enum DeviceType
 {

src/main/java/com/logreposit/ta/cmireaderservice/dtos/common/RasState.java

@@ -0,0 +1,22 @@
+package com.logreposit.ta.cmireaderservice.dtos.common;
+
+import java.util.Arrays;
+
+public enum RasState
+{
+    TIME_AUTO("0"),
+    STANDARD("1"),
+    SETBACK("2"),
+    STANDBY_FROST_PROTECTION("3"),
+    UNKNOWN("UNKNOWN");
+
+    private final String taValue;
+
+    RasState(String taValue) {
+        this.taValue = taValue;
+    }
+
+    public static RasState of(String taValue) {
+        return Arrays.stream(RasState.values()).filter(s -> s.taValue.equals(taValue)).findFirst().orElse(UNKNOWN);
+    }
+}

src/main/java/com/logreposit/ta/cmireaderservice/dtos/common/SignalType.java

@@ -0,0 +1,20 @@
+package com.logreposit.ta.cmireaderservice.dtos.common;
+
+import java.util.Arrays;
+
+public enum SignalType
+{
+    ANALOG("A"),
+    DIGITAL("D"),
+    UNKNOWN("UNKNOWN");
+
+    private final String taValue;
+
+    SignalType(String taValue) {
+        this.taValue = taValue;
+    }
+
+    public static SignalType of(String taValue) {
+        return Arrays.stream(SignalType.values()).filter(s -> s.taValue.equals(taValue)).findFirst().orElse(UNKNOWN);
+    }
+}