Merge pull request #33 from DatavenueLiveObjects/new-FIFO_SDK-java-and-libs

New fifo sdk, java and libs

Author: grzegorzswistak

.github/workflows/manual_release.yml

@@ -7,10 +7,10 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Create tag by maven-release plugin
-        uses: qcastel/[email protected].2
+        uses: qcastel/[email protected].41
         with:
           release-branch-name: "master"
           git-release-bot-name: "auto"

.github/workflows/on_commit.yml renamed to .github/workflows/on_push.yml

@@ -8,10 +8,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK 1.8
-      uses: actions/setup-java@v1
+    - uses: actions/checkout@v4
+    - name: Set up JDK
+      uses: actions/setup-java@v2
       with:
-        java-version: 1.8
+        distribution: 'zulu'
+        java-version: '21'
     - name: Build with Maven
       run: mvn clean test --file pom.xml

README.md

@@ -28,11 +28,12 @@ The software is an open source toolbox which has to be integrated into an end to
 Live Objects platform supports load balancing between multiple MQTT subscribers.
 
 ## Technologies
-* Java 8
-* Spring Boot 2.4.4
-* Microsoft Azure SDK IoT 1.22.0
-* Microsoft Application Insights Java SDK Spring Boot Starter 2.5.1
-* Azure Metrics Spring Boot Starter 2.2.1
+* Java 21
+* Spring Boot 3.2.3
+* Microsoft Iot Hub Java Service SDK 2.1.7
+* Microsoft IoT Hub Java Device Client 2.4.1
+* Microsoft Application Insights Java SDK Spring Boot Starter 2.6.4
+* Azure Metrics Spring Boot Starter 2.3.5
 
 ## Requirements
 In order to run the connector you need to have: 
@@ -42,8 +43,8 @@ In order to run the connector you need to have:
 * **Application Insights resource created (per each Iot Hub)** (creation process is described in official [documentation](https://docs.microsoft.com/pl-pl/azure/azure-monitor/app/create-new-resource)) 
 * **App Service plan created (per each Iot Hub)** (creation process is described in official [documentation](https://docs.microsoft.com/en-us/azure/app-service/app-service-plan-manage))
 * **Development tools (only when building the package)**
- * **Java SE Development Kit 8**
- * **Apache Maven**
+* **Java SE Development Kit 21**
+* **Apache Maven**
 
 ## Getting the installation package
 
@@ -87,52 +88,51 @@ All configuration can be found in **application.yaml** file located in src/main/
 8          qos: 1
 9          keep-alive-interval-seconds: 30
 10         page-size: 20
-11         synchronization-device-interval: 10
-12         mqtt-persistence-dir: ${basedir:.}/temp/
-13  
-14       azure-iot-hub-list:
-15         -
-16           iot-connection-string: YOUR_IOT_CONNECTION_STRING
-17           iot-host-name: YOUR_IOT_HOST_NAME
-18           synchronization-thread-pool-size: 40
-19           device-client-connection-timeout: 5000
-20           tagPlatformKey: platform
-21           tagPlatformValue: LiveObjectsGroupIoT1
-22    
-23           lo-messages-topic: MESSAGES_TOPIC
-24           lo-devices-topic: DEVICES_TOPIC
-25           lo-devices-group: DEVICES_GROUP
-26
-27         -
-28           iot-connection-string: YOUR_IOT_CONNECTION_STRING
-29           iot-host-name: YOUR_IOT_HOST_NAME
-30           synchronization-thread-pool-size: 40
-31           device-client-connection-timeout: 5000
-32           tagPlatformKey: platform
-33           tagPlatformValue: LiveObjectsGroupIoT1
-34    
-35           lo-messages-topic: MESSAGES_TOPIC
-36           lo-devices-topic: DEVICES_TOPIC
-37           lo-devices-group: DEVICES_GROUP
-38
-39   azure:
-40     application-insights:
-41       instrumentation-key: YOUR_INSTMENTATION_KEY
-42       channel:
-43         in-process:
-44           developer-mode: true
-45           max-telemetry-buffer-capacity: 500
-46           flush-interval-in-seconds: 5
-47
-48   management:
-49     endpoints:
-50       web:
-51         exposure:
-52           include: "*"
-53
-54   spring:
-55     application:
-56       name: Lo2IotHub
+11         device-synchronization: true
+12         device-synchronization-interval: 86400 # in seconds - 24h
+13         mqtt-persistence-dir: ${basedir:.}/temp/
+14    
+15      azure-iot-hub-list:
+16        -
+17          iot-connection-string: YOUR_IOT_CONNECTION_STRING
+18          iot-host-name: YOUR_IOT_HOST_NAME
+19          device-registration-thread-pool-size: 10
+20          device-registration-period: 200 # in milliseconds - 200ms
+21          device-reestablish-session-delay: 10000 # in milliseconds - 10s
+22          device-client-connection-timeout: 5000
+23          message-expiry-time: 60000 # in milliseconds - 60s
+24          message-send-max-attempts: 10
+25          message-resend-delay: 10000 # in milliseconds - 10s
+26          tagPlatformKey: platform
+27          tagPlatformValue: LiveObjectsGroupIoT1
+28        
+29          lo-messages-topic: MESSAGES_TOPIC
+30          lo-devices-topic: DEVICES_TOPIC
+31          lo-devices-group: DEVICES_GROUP
+32    
+33        -
+34          iot-connection-string: YOUR_IOT_CONNECTION_STRING
+35          iot-host-name: YOUR_IOT_HOST_NAME
+36          device-registration-thread-pool-size: 10
+37          device-registration-period: 200 # in milliseconds - 200ms
+38          device-reestablish-session-delay: 10000 # in milliseconds - 10s
+39          device-client-connection-timeout: 5000
+40          message-expiry-time: 60000 # in milliseconds - 60s
+41          message-send-max-attempts: 10
+42          message-resend-delay: 10000 # in milliseconds - 10s
+43          tagPlatformKey: platform
+44          tagPlatformValue: LiveObjectsGroupIoT1
+45    
+46          lo-messages-topic: MESSAGES_TOPIC
+47          lo-devices-topic: DEVICES_TOPIC
+48          lo-devices-group: DEVICES_GROUP
+49    
+50     azure:
+51       application-insights:
+52         enabled: true
+53         instrumentation-key: YOUR_INSTMENTATION_KEY
+54      
+...
 ```
 
 #### hostname
@@ -166,7 +166,7 @@ This value, measured in seconds, defines the maximum time interval between messa
 #### page-size
 Maximum number of devices in single response. Max 1000
 
-#### synchronization-device-interval
+#### device-synchronization-interval
 Controls the interval (in seconds) at which device synchronization process starts.
 
 #### iot-connection-string
@@ -179,8 +179,8 @@ The `iot-host-name` can be found in the details of IoT Hub:
 
 ![IoT Hub 1](./assets/iot_hub_1.png)
 
-#### synchronization-thread-pool-size 
-How many threads will be used in devices synchronization process
+#### device-registration-thread-pool-size 
+How many threads will be used in devices registration process
 
 #### device-client-connection-timeout
 The length of time, in milliseconds, that any given operation will expire in. These operations include reconnecting upon a connection drop and sending a message.
@@ -293,22 +293,22 @@ You can deploy this connector wherever you want (local server, cloud provider et
   ```
 - Copy the file to the virtual machine ([documentation](https://docs.microsoft.com/pl-pl/azure/virtual-machines/linux/copy-files-to-linux-vm-using-scp)):
   ```
-  scp target/lo2iot-1.0.zip azureuser@YOUR_MACHINE_IP:~
+  scp target/lo2iot-[VERSION].zip azureuser@YOUR_MACHINE_IP:~
   ```
 - Install unzip and java  
   ```
   sudo apt-get install unzip
   ```
   ```
-  sudo apt-get install openjdk-11-jdk -y
+  sudo apt-get install openjdk-21-jdk -y
   ```
 - Unpack the installation package:
   ```
-  unzip lo2iot-1.0.zip 
+  unzip lo2iot-[VERSION].zip 
   ```
 - Run `start.sh` script:
   ```
-  ./lo2iot-1.0/bin/app.sh
+  ./lo2iot-[VERSION]/bin/app.sh
   ```
 
 If you want to stop and completely delete this machine you should run:

THIRD-PARTY.txt

@@ -1,13 +1,13 @@
-COMPONENT                               | VERSION       | LICENCE                    | URL
+COMPONENT                                         | VERSION       | LICENCE                    | URL
 ----------------------------------------------------------------------------------------------------------------------------------------------
-Spring Boot                             | 2.4.4         | Apache License             | Version 2.0, https://www.apache.org/licenses/LICENSE-2.0
-Iot Hub Java Service SDK                | 1.18.0        | MIT License                | http://opensource.org/licenses/MIT
-IoT Hub Java Device Client              | 1.18.0        | MIT License                | http://opensource.org/licenses/MIT
-azure-eventhubs                         | 2.3.2         | MIT license                | http://www.opensource.org/licenses/mit-license.php
-applicationinsights-spring-boot-starter | 2.5.1         | MIT License                | http://www.opensource.org/licenses/mit-license.php
-azure-spring-boot-metrics-starter       | 2.2.1         | MIT                        | https://github.com/Microsoft/azure-spring-b
-Apache Commons Text                     | 1.9           | Apache License 2.0         | http://www.apache.org/licenses/LICENSE-2.0.txt
-Failsafe                                | 2.4.0         | Apache License 2.0         | https://www.apache.org/licenses/LICENSE-2.0
-Spring Boot Starter Test                | 2.4.4         | Apache License 2.0         | https://www.apache.org/licenses/LICENSE-2.0
-ArchUnit                                | 0.17.0        | Apache License             | Version 2.0, https://www.apache.org/licenses/LICENSE-2.0
-ArchUnit                                | 0.17.0        | BSD                        | https://asm.ow2.io/license.html
+Spring Boot                                       | 3.2.3         | Apache License 2.0         | https://www.apache.org/licenses/LICENSE-2.0
+Iot Hub Java Service SDK                          | 2.1.7         | MIT License                | http://opensource.org/licenses/MIT
+IoT Hub Java Device Client                        | 2.4.1         | MIT License                | http://opensource.org/licenses/MIT
+Application Insights Java SDK Spring Boot Starter | 2.6.4         | MIT License                | http://www.opensource.org/licenses/mit-license.php
+Azure Metrics Spring Boot Starter                 | 2.3.5         | MIT License                | http://opensource.org/licenses/MIT
+Maven Model                                       | 3.9.6         | Apache License 2.0         | http://www.apache.org/licenses/LICENSE-2.0.txt
+Apache Commons Text                               | 1.11.0        | Apache License 2.0         | http://www.apache.org/licenses/LICENSE-2.0.txt
+Failsafe                                          | 2.4.4         | Apache License 2.0         | https://www.apache.org/licenses/LICENSE-2.0
+Spring Boot Starter Test                          | 3.2.3         | Apache License 2.0         | https://www.apache.org/licenses/LICENSE-2.0
+ArchUnit                                          | 1.2.1         | Apache License 2.0         | https://www.apache.org/licenses/LICENSE-2.0
+ArchUnit                                          | 1.2.1         | Apache License 2.0, BSD    | https://www.apache.org/licenses/LICENSE-2.0 https://asm.ow2.io/license.html

pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.7.0</version>
+		<version>3.2.3</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.orange.lo.sample.lo2iot</groupId>
@@ -14,7 +14,7 @@
 	<description>Connector between live object and azure IoT Hub</description>
 
 	<properties>
-		<java.version>1.8</java.version>
+		<java.version>21</java.version>
 	</properties>
 
     <repositories>
@@ -28,7 +28,7 @@
 		<dependency>
 			<groupId>com.github.DatavenueLiveObjects</groupId>
 			<artifactId>FIFO_SDK_LiveObjects</artifactId>
-			<version>v1.16</version>
+			<version>v2.0.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -41,7 +41,7 @@
         <dependency>
             <groupId>com.microsoft.azure.sdk.iot</groupId>
             <artifactId>iot-service-client</artifactId>
-            <version>2.1.6</version>
+            <version>2.1.7</version>
         </dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -51,17 +51,17 @@
         <dependency>
             <groupId>com.microsoft.azure.sdk.iot</groupId>
             <artifactId>iot-device-client</artifactId>
-            <version>2.4.0</version>
+            <version>2.4.1</version>
         </dependency>
 		<dependency>
 		    <groupId>com.microsoft.azure</groupId>
 		    <artifactId>applicationinsights-spring-boot-starter</artifactId>
-		    <version>2.5.1</version>
+		    <version>2.6.4</version>
 		</dependency>
 		 <dependency> 
 		      <groupId>com.microsoft.azure</groupId>
 		      <artifactId>azure-spring-boot-metrics-starter</artifactId>
-		      <version>2.2.1</version>
+		      <version>2.3.5</version>
 		</dependency>
 		<dependency>
             <groupId>org.springframework.integration</groupId>
@@ -70,12 +70,12 @@
         <dependency>
 		    <groupId>org.apache.maven</groupId>
 		    <artifactId>maven-model</artifactId>
-		    <version>3.8.5</version>
+		    <version>3.9.6</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-text</artifactId>
-			<version>1.10.0</version>
+			<version>1.11.0</version>
 		</dependency>
 		<dependency>
 			<groupId>net.jodah</groupId>
@@ -90,13 +90,13 @@
 		<dependency>
 			<groupId>com.tngtech.archunit</groupId>
 			<artifactId>archunit</artifactId>
-			<version>0.23.1</version>
+			<version>1.2.1</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.tngtech.archunit</groupId>
 			<artifactId>archunit-junit5</artifactId>
-			<version>0.23.1</version>
+			<version>1.2.1</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>

src/main/java/com/orange/lo/sample/lo2iothub/ApplicationConfig.java

@@ -73,7 +73,7 @@ public TaskScheduler taskScheduler() {
     }
 
     @Bean
-    public void init() {
+    public Object init() {
         RetryPolicy<Void> commandRetryPolicy = restCommandRetryPolicy();
         TaskScheduler taskScheduler = taskScheduler();
         RetryPolicy<List<Group>> groupRetryPolicy = restGroupRetryPolicy();
@@ -144,6 +144,7 @@ public void init() {
                 }
             });
         });
+        return new Object();
     }
 
     private IoTDeviceProvider createIotDeviceProvider(AzureIotHubProperties azureIotHubProperties) {