ajout d'un permit join listener au zigbee network manager -> amelioration reporting gateway cloud #93

.github/workflows/codeql.yml

@@ -0,0 +1,45 @@
+name: 'CodeQL'
+
+on:
+  push:
+    branches: ['master']
+  pull_request:
+    branches: ['master']
+  schedule:
+    - cron: '47 12 * * 4'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [java]
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          java-version: '11'
+          distribution: 'temurin'
+          cache: maven
+
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v2
+        with:
+          languages: ${{ matrix.language }}
+          queries: +security-and-quality
+
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v2
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v2
+        with:
+          category: '/language:${{ matrix.language }}'

.github/workflows/errorprone.yml

@@ -0,0 +1,30 @@
+# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven
+
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+name: Error Prone Check
+
+on:
+  push:
+    branches: ['master']
+  pull_request:
+    branches: ['master']
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up JDK 11
+        uses: actions/setup-java@v3
+        with:
+          java-version: '11'
+          distribution: 'temurin'
+          cache: maven
+      - name: Build with Maven
+        run: mvn -P error-prone-check clean compile --file pom.xml

.gitignore

@@ -35,11 +35,14 @@ simple-network.xml
 *.gbl
 *.s37
 
-com.zsmartsystems.zigbee.console.main/database/
-
 
 # Gradle
 .gradle
 build/
 .gradletasknamecache
 !gradle-wrapper.jar
+
+#runtime
+com.zsmartsystems.zigbee.console.main/database/
+database/
+log4j.xml*

com.zsmartsystems.zigbee.autocode/.project

@@ -17,6 +17,7 @@
 		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 	</natures>

com.zsmartsystems.zigbee.autocode/pom.xml

@@ -1,32 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>com.zsmartsystems.zigbee</groupId>
-    <artifactId>com.zsmartsystems.zigbee.autocode</artifactId>
-    <packaging>jar</packaging>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <maven.main.skip>true</maven.main.skip>
-    </properties>
-    
-    <parent>
-        <groupId>com.zsmartsystems</groupId>
-        <artifactId>zigbee</artifactId>
-        <version>1.4.1-SNAPSHOT</version>
-    </parent>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>2.5</version>
-            </plugin>
- 
-           	<plugin>
+	<modelVersion>4.0.0</modelVersion>
+
+	<groupId>com.zsmartsystems.zigbee</groupId>
+	<artifactId>com.zsmartsystems.zigbee.autocode</artifactId>
+	<packaging>jar</packaging>
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+		<maven.main.skip>true</maven.main.skip>
+	</properties>
+
+	<parent>
+		<groupId>com.zsmartsystems</groupId>
+		<artifactId>zigbee</artifactId>
+		<version>1.4.15-SNAPSHOT</version>
+	</parent>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<version>2.5</version>
+			</plugin>
+
+			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-source-plugin</artifactId>
 				<executions>
@@ -41,21 +41,15 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>animal-sniffer-maven-plugin</artifactId>
-				<version>1.16</version>
 				<configuration>
+					<skip>true</skip>
 				</configuration>
-				<executions>
-					<execution>
-						<id>animal-sniffer</id>
-						<phase />
-					</execution>
-				</executions>
 			</plugin>
-        </plugins>
-    </build>
+		</plugins>
+	</build>
 
-    <dependencies>
+	<dependencies>
 
-    </dependencies>
+	</dependencies>
 
 </project>

com.zsmartsystems.zigbee.autocode/src/main/java/com/zsmartsystems/zigbee/autocode/ZclDataType.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2021 by the respective copyright holders.
+ * Copyright (c) 2016-2024 by the respective copyright holders.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -106,6 +106,7 @@ public static class DataTypeMap {
         dataTypeMapping.put("ENUMERATION_32_BIT", new DataTypeMap("Integer", 0x33, 4, false, 0xffffffff));
         dataTypeMapping.put("FLOAT_32_BIT", new DataTypeMap("Double", 0x39, 4, true));
         dataTypeMapping.put("DATA_8_BIT", new DataTypeMap("Integer", 0x08, 1, false));
+        dataTypeMapping.put("DATA_16_BIT", new DataTypeMap("Integer", 0x09, 2, false));
         dataTypeMapping.put("OCTET_STRING", new DataTypeMap("ByteArray", 0x41, -1, false));
         dataTypeMapping.put("CHARACTER_STRING", new DataTypeMap("String", 0x42, -1, false));
         dataTypeMapping.put("LONG_OCTET_STRING", new DataTypeMap("ByteArray", 0x43, -1, false));

com.zsmartsystems.zigbee.autocode/src/main/java/com/zsmartsystems/zigbee/autocode/ZigBeeBaseClassGenerator.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2021 by the respective copyright holders.
+ * Copyright (c) 2016-2024 by the respective copyright holders.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -286,9 +286,8 @@ protected void outputWithLinebreak(PrintStream out, String indent, List<ZigBeeXm
                 len += word.length();
             }
 
-            if (len != 2 + indent.length()) {
-                out.println();
-            }
+            // loop or skipping loop doesn't end line so we do
+            out.println();
         }
     }
 
@@ -347,9 +346,10 @@ protected void outputClassGenerated(PrintStream out) {
 
     protected void outputAttributeJavaDoc(PrintStream out, String type, ZigBeeXmlAttribute attribute,
             DataTypeMap zclDataType) {
+        String name = attribute.name.replaceAll("\\{\\{count\\}\\}", "");
         out.println();
         out.println("    /**");
-        out.println("     * " + type + " the <i>" + attribute.name + "</i> attribute [attribute ID <b>0x"
+        out.println("     * " + type + " the <i>" + name + "</i> attribute [attribute ID <b>0x"
                 + String.format("%04X", attribute.code) + "</b>].");
         if (attribute.description.size() != 0) {
             out.println("     * <p>");
@@ -385,7 +385,7 @@ protected void outputAttributeJavaDoc(PrintStream out, String type, ZigBeeXmlAtt
                 out.println("     * @param reportableChange {@link Object} delta required to trigger report");
             }
         } else if ("Set".equals(type)) {
-            out.println("     * @param " + stringToLowerCamelCase(attribute.name) + " the {@link "
+            out.println("     * @param " + stringToLowerCamelCase(name) + " the {@link "
                     + getDataTypeClass(attribute) + "} attribute value to be set");
         }
 

com.zsmartsystems.zigbee.autocode/src/main/java/com/zsmartsystems/zigbee/autocode/ZigBeeBaseFieldGenerator.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2021 by the respective copyright holders.
+ * Copyright (c) 2016-2024 by the respective copyright holders.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -164,8 +164,8 @@ protected void generateFields(PrintStream out, String parentClass, String classN
                 }
                 if (getAutoSized(fields, stringToLowerCamelCase(field.name)) != null) {
                     out.println(
-                            "        Integer " + stringToLowerCamelCase(field.name) + " = (" + getDataTypeClass(field)
-                                    + ") deserializer.deserialize(" + "ZclDataType." + field.type + ");");
+                            "        Integer " + stringToLowerCamelCase(field.name) + " = deserializer.deserialize(" +
+                            "ZclDataType." + field.type + ");");
                     continue;
                 }
 
@@ -175,8 +175,8 @@ protected void generateFields(PrintStream out, String parentClass, String classN
 
                     out.println("        if (" + field.sizer + " != null) {");
                     out.println("            for (int cnt = 0; cnt < " + field.sizer + "; cnt++) {");
-                    out.println("                " + stringToLowerCamelCase(field.name) + ".add((" + dataType
-                            + ") deserializer.deserialize(" + "ZclDataType." + field.type + "));");
+                    out.println("                " + stringToLowerCamelCase(field.name) +
+                            ".add(deserializer.deserialize(" + "ZclDataType." + field.type + "));");
                     out.println("            }");
                     out.println("        }");
                 } else if (field.condition != null) {
@@ -185,7 +185,7 @@ protected void generateFields(PrintStream out, String parentClass, String classN
                         // This checks for a single response
                         out.println("        if (deserializer.getRemainingLength() == 1) {");
                         out.println(
-                                "            status = (ZclStatus) deserializer.deserialize(ZclDataType.ZCL_STATUS);");
+                                "            status = deserializer.deserialize(ZclDataType.ZCL_STATUS);");
                         out.println("            return;");
                         out.println("        }");
                         continue;
@@ -196,13 +196,13 @@ protected void generateFields(PrintStream out, String parentClass, String classN
                         out.println("        if (" + field.condition.field + " " + getOperator(field.condition.operator)
                                 + " " + field.condition.value + ") {");
                     }
-                    out.println("            " + stringToLowerCamelCase(field.name) + " = (" + getDataTypeClass(field)
-                            + ") deserializer.deserialize(" + "ZclDataType." + field.type + ");");
+                    out.println("            " + stringToLowerCamelCase(field.name) + " = deserializer.deserialize(" + 
+                                "ZclDataType." + field.type + ");");
                     out.println("        }");
                 } else {
                     if (!field.type.isEmpty()) {
-                        out.println("        " + stringToLowerCamelCase(field.name) + " = (" + getDataTypeClass(field)
-                                + ") deserializer.deserialize(" + "ZclDataType." + field.type + ");");
+                        out.println("        " + stringToLowerCamelCase(field.name) + " = deserializer.deserialize(" +
+                                "ZclDataType." + field.type + ");");
                     } else {
                         out.println("        " + stringToLowerCamelCase(field.name) + " = new "
                                 + getDataTypeClass(field) + "();");

com.zsmartsystems.zigbee.autocode/src/main/java/com/zsmartsystems/zigbee/autocode/ZigBeeCodeGenerator.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2021 by the respective copyright holders.
+ * Copyright (c) 2016-2024 by the respective copyright holders.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -76,6 +76,7 @@ public static void main(final String[] args) {
         zclParser.addFile("src/main/resources/0204_ThermostatUserInterfaceConfiguration.xml");
 
         zclParser.addFile("src/main/resources/0300_ColorControl.xml");
+        zclParser.addFile("src/main/resources/0301_BallastConfiguration.xml");
 
         zclParser.addFile("src/main/resources/0400_IlluminanceMeasurement.xml");
         zclParser.addFile("src/main/resources/0401_IlluminanceLevelSensing.xml");
@@ -87,6 +88,12 @@ public static void main(final String[] args) {
         zclParser.addFile("src/main/resources/0407_LeafWetness.xml");
         zclParser.addFile("src/main/resources/0408_SoilMoisture.xml");
 
+        zclParser.addFile("src/main/resources/040C_CarbonMonoxide.xml");
+        zclParser.addFile("src/main/resources/040D_CarbonDioxide.xml");
+
+        zclParser.addFile("src/main/resources/042A_PM25Measurement.xml");
+        zclParser.addFile("src/main/resources/042B_FormaldehydeMeasurement.xml");
+
         zclParser.addFile("src/main/resources/0500_IasZone.xml");
         zclParser.addFile("src/main/resources/0501_IasAce.xml");
         zclParser.addFile("src/main/resources/0502_IasWd.xml");

com.zsmartsystems.zigbee.autocode/src/main/java/com/zsmartsystems/zigbee/autocode/ZigBeeZclClusterGenerator.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2021 by the respective copyright holders.
+ * Copyright (c) 2016-2024 by the respective copyright holders.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -194,11 +194,13 @@ private void generateZclClusterClasses(ZigBeeXmlCluster cluster, String packageR
 
         out.println("    @Override");
         out.println("    protected Map<Integer, ZclAttribute> initializeClientAttributes() {");
+        out.println("        Map<Integer, ZclAttribute> attributeMap = super.initializeClientAttributes();");
         createInitializeAttributes(out, cluster.name, attributesClient);
         out.println();
 
         out.println("    @Override");
         out.println("    protected Map<Integer, ZclAttribute> initializeServerAttributes() {");
+        out.println("        Map<Integer, ZclAttribute> attributeMap = super.initializeServerAttributes();");
         createInitializeAttributes(out, cluster.name, attributesServer);
         out.println();
 
@@ -276,7 +278,8 @@ private void generateZclClusterClasses(ZigBeeXmlCluster cluster, String packageR
             out.println("     * @param response the {@link " + commandClassName + "} to send");
             out.println("     */");
             out.println(
-                    "    public Future<CommandResult> sendResponse(" + commandClassName + " command, " + commandClassName
+                    "    public Future<CommandResult> sendResponse(" + commandClassName + " command, "
+                            + commandClassName
                             + " response) {");
             out.println("        return super.sendResponse(command, response);");
             out.println("    }");
@@ -297,17 +300,22 @@ private void generateZclClusterClasses(ZigBeeXmlCluster cluster, String packageR
                 outputAttributeJavaDoc(out, "Set", attribute, zclDataType);
                 out.println("    @Deprecated");
                 if (attribute.arrayStart != null && attribute.arrayCount != null && attribute.arrayCount > 0) {
-                    String name = attribute.name.replaceAll("\\{\\{count\\}\\}", "");
-                    out.println("    public Future<CommandResult> set" + stringToUpperCamelCase(name).replace("_", "")
-                            + "(final int arrayOffset, final " + getDataTypeClass(attribute) + " value) {");
-                    name = attribute.name.replaceAll("\\{\\{count\\}\\}", Integer.toString(attribute.arrayStart));
+                    String baseName = attribute.name.replaceAll("\\{\\{count\\}\\}", "");
                     out.println(
-                            "        return write(serverAttributes.get(" + getEnum(name) + " + arrayOffset), value);");
+                            "    public Future<CommandResult> set" + stringToUpperCamelCase(baseName).replace("_", "")
+                                    + "(final int arrayOffset, final " + getDataTypeClass(attribute) + " "
+                                    + stringToLowerCamelCase(baseName) + ") {");
+                    String name = attribute.name.replaceAll("\\{\\{count\\}\\}",
+                            Integer.toString(attribute.arrayStart));
+                    out.println(
+                            "        return write(serverAttributes.get(" + getEnum(name) + " + arrayOffset), "
+                                    + stringToLowerCamelCase(baseName) + ");");
                 } else {
                     out.println("    public Future<CommandResult> set"
                             + stringToUpperCamelCase(attribute.name).replace("_", "") + "(final "
-                            + getDataTypeClass(attribute) + " value) {");
-                    out.println("        return write(serverAttributes.get(" + getEnum(attribute.name) + "), value);");
+                            + getDataTypeClass(attribute) + " " + stringToLowerCamelCase(attribute.name) + ") {");
+                    out.println("        return write(serverAttributes.get(" + getEnum(attribute.name) + "), "
+                            + stringToLowerCamelCase(attribute.name) + ");");
                 }
                 out.println("    }");
             }
@@ -483,8 +491,6 @@ private void generateZclClusterClasses(ZigBeeXmlCluster cluster, String packageR
     }
 
     private void createInitializeAttributes(PrintStream out, String clusterName, List<ZigBeeXmlAttribute> attributes) {
-        out.println("        Map<Integer, ZclAttribute> attributeMap = new ConcurrentSkipListMap<>();");
-
         if (attributes.size() != 0) {
             out.println();
             for (final ZigBeeXmlAttribute attribute : attributes) {