added beans.xml to other inverter projects

ai-republic · Jan 18, 2024 · bb56b8e · bb56b8e
1 parent d43e339
commit bb56b8e
Show file tree

Hide file tree

Showing 10 changed files with 42 additions and 2 deletions.
diff --git a/core-api/src/main/java/com/airepublic/bmstoinverter/core/Inverter.java b/core-api/src/main/java/com/airepublic/bmstoinverter/core/Inverter.java
@@ -27,8 +27,8 @@ public void init() {
         final PortType portType = getClass().getAnnotation(PortType.class);
 
         if (portType == null) {
-            LOG.error(PortType.class.getName() + " Annotation is missing on PortProcessor " + getClass().getCanonicalName());
-            throw new IllegalArgumentException(PortType.class.getName() + " Annotation is missing on PortProcessor " + getClass().getCanonicalName());
+            LOG.error(PortType.class.getName() + " Annotation is missing on Inverter " + getClass().getCanonicalName());
+            throw new IllegalArgumentException(PortType.class.getName() + " Annotation is missing on Inverter " + getClass().getCanonicalName());
         }
 
         // from the protocol get the service class to use

diff --git a/core-api/src/main/java/com/airepublic/bmstoinverter/core/protocol/can/CAN.java b/core-api/src/main/java/com/airepublic/bmstoinverter/core/protocol/can/CAN.java
@@ -3,7 +3,9 @@
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
 
 import jakarta.inject.Qualifier;
 
@@ -13,5 +15,6 @@
 @Qualifier
 @Retention(RUNTIME)
 @Documented
+@Target({ ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER, ElementType.TYPE })
 public @interface CAN {
 }
diff --git a/core-api/src/main/java/com/airepublic/bmstoinverter/core/protocol/modbus/ModBus.java b/core-api/src/main/java/com/airepublic/bmstoinverter/core/protocol/modbus/ModBus.java
@@ -3,7 +3,9 @@
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
 
 import jakarta.inject.Qualifier;
 
@@ -13,6 +15,7 @@
 @Qualifier
 @Retention(RUNTIME)
 @Documented
+@Target({ ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER, ElementType.TYPE })
 public @interface ModBus {
 
 }
diff --git a/core-api/src/main/java/com/airepublic/bmstoinverter/core/protocol/rs485/RS485.java b/core-api/src/main/java/com/airepublic/bmstoinverter/core/protocol/rs485/RS485.java
@@ -3,7 +3,9 @@
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
 
 import jakarta.inject.Qualifier;
 
@@ -13,6 +15,7 @@
 @Qualifier
 @Retention(RUNTIME)
 @Documented
+@Target({ ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER, ElementType.TYPE })
 public @interface RS485 {
 
 }
diff --git a/inverter-growatt-can/pom.xml b/inverter-growatt-can/pom.xml
@@ -20,10 +20,17 @@
 	</properties>
 
 	<dependencies>
+		<dependency>
+			<groupId>com.ai-republic.bms-to-inverter</groupId>
+			<artifactId>core-api</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
 		<dependency>
 			<groupId>com.ai-republic.bms-to-inverter</groupId>
 			<artifactId>protocol-can</artifactId>
 			<version>${project.version}</version>
 		</dependency>
+
 	</dependencies>
 </project>
diff --git a/inverter-growatt-can/src/main/resources/META-INF/beans.xml b/inverter-growatt-can/src/main/resources/META-INF/beans.xml
@@ -0,0 +1,4 @@
+<beans xmlns="https://jakarta.ee/xml/ns/jakartaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd"
+	bean-discovery-mode="all" version="4.0">
+</beans>
diff --git a/inverter-growatt-rs485/pom.xml b/inverter-growatt-rs485/pom.xml
@@ -16,6 +16,12 @@
 
 
 	<dependencies>
+		<dependency>
+			<groupId>com.ai-republic.bms-to-inverter</groupId>
+			<artifactId>core-api</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
 		<dependency>
 			<groupId>com.ai-republic.bms-to-inverter</groupId>
 			<artifactId>protocol-modbus</artifactId>

diff --git a/inverter-growatt-rs485/src/main/resources/META-INF/beans.xml b/inverter-growatt-rs485/src/main/resources/META-INF/beans.xml
@@ -0,0 +1,4 @@
+<beans xmlns="https://jakarta.ee/xml/ns/jakartaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd"
+	bean-discovery-mode="all" version="4.0">
+</beans>
diff --git a/inverter-solark-can/pom.xml b/inverter-solark-can/pom.xml
@@ -20,6 +20,12 @@
 	</properties>
 
 	<dependencies>
+		<dependency>
+			<groupId>com.ai-republic.bms-to-inverter</groupId>
+			<artifactId>core-api</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
 		<dependency>
 			<groupId>com.ai-republic.bms-to-inverter</groupId>
 			<artifactId>protocol-can</artifactId>

diff --git a/inverter-solark-can/src/main/resources/META-INF/beans.xml b/inverter-solark-can/src/main/resources/META-INF/beans.xml
@@ -0,0 +1,4 @@
+<beans xmlns="https://jakarta.ee/xml/ns/jakartaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd"
+	bean-discovery-mode="all" version="4.0">
+</beans>