v3.0.0 milestone 3

--HG-- branch : v300
teslanet-nl · Apr 14, 2024 · 502c2b2 · 502c2b2
1 parent aa11b10
commit 502c2b2
Show file tree

Hide file tree

Showing 110 changed files with 2,458 additions and 1,094 deletions.
diff --git a/LICENSE_HEADER.txt b/LICENSE_HEADER.txt
@@ -2,7 +2,7 @@
  * #%L
  * Mule CoAP Connector
  * %%
- * Copyright (C) 2019 - 2023 (teslanet.nl) Rogier Cobben
+ * Copyright (C) 2019 - 2024 (teslanet.nl) Rogier Cobben
  * 
  * Contributors:
  *     (teslanet.nl) Rogier Cobben - initial creation

diff --git a/README.md b/README.md
@@ -26,8 +26,7 @@ and other.
 
 ## Uses
 
-* [Californium](https://www.eclipse.org/californium/) 2.8.0
-* [Californium](https://www.eclipse.org/californium/) 3.10.0 (development)
+* [Californium](https://www.eclipse.org/californium/) 3.11.0
 
 ## Installation
 
@@ -39,21 +38,7 @@ add following dependency to your `pom.xml`:
     <dependency>
         <groupId>nl.teslanet.mule.connectors.coap</groupId>
         <artifactId>mule-coap-connector</artifactId>
-        <version>2.1.1</version>
-        <classifier>mule-plugin</classifier>
-    </dependency>
-
-```
-
-To use the latest development milestone, 
-add following dependency to your `pom.xml`:
-
-```xml
-
-    <dependency>
-        <groupId>nl.teslanet.mule.connectors.coap</groupId>
-        <artifactId>mule-coap-connector</artifactId>
-        <version>3.0.0-M2</version>
+        <version>3.0.0-M3</version>
         <classifier>mule-plugin</classifier>
     </dependency>
 

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,8 +1,14 @@
 # Mule CoAP Connector Release Notes
 ![Mule-Coap logo](icon/icon.svg)
 
+## Development milestone 3.0.0-M3
+
+* Development phase 3
+* Californium 3.11.0 upgrade 
+
 ## Development milestone 3.0.0-M2
 
+* Development phase 2
 * Californium 3.10.0 upgrade 
 
 ## Release 2.1.1

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
  * #%L
  * Mule CoAP Connector
  * %%
- * Copyright (C) 2019 - 2023 (teslanet.nl) Rogier Cobben
+ * Copyright (C) 2019 - 2024 (teslanet.nl) Rogier Cobben
  * 
  * Contributors:
  *     (teslanet.nl) Rogier Cobben - initial creation
@@ -65,7 +65,7 @@
 	<properties>
 		<category>Community</category>
 		<licensePath>LICENSE.md</licensePath>
-		<californiumVersion>3.10.0</californiumVersion>
+		<californiumVersion>3.11.0</californiumVersion>
 		<commonsLangVersion>3.14.0</commonsLangVersion>
         <slf4jVersion>1.7.36</slf4jVersion>
         <munit.extensions.maven.plugin.version>1.1.3</munit.extensions.maven.plugin.version>
@@ -195,7 +195,7 @@ Contributors:
 				</executions>
 				<configuration>
 					<forkCount>1</forkCount>
-					<!-- don't reuse because threads hang in mule tests -->
+					<!-- don't reuse -->
 					<reuseForks>false</reuseForks>
 					<!-- argLine>-Xmx1024m -XX:MaxPermSize=256m</argLine -->
 				</configuration>
@@ -293,7 +293,7 @@ Contributors:
 		<dependency>
 			<groupId>org.mule.module</groupId>
 			<artifactId>mule-java-module</artifactId>
-			<version>1.2.11</version>
+			<version>1.2.13</version>
 			<classifier>mule-plugin</classifier>
 			<scope>provided</scope>
 		</dependency>
@@ -307,7 +307,7 @@ Contributors:
 		<dependency>
 			<groupId>org.mule.connectors</groupId>
 			<artifactId>mule-objectstore-connector</artifactId>
-			<version>1.2.1</version>
+			<version>1.2.2</version>
 			<classifier>mule-plugin</classifier>
 			<scope>test</scope>
 		</dependency>
@@ -333,13 +333,13 @@ Contributors:
 		<dependency>
 			<groupId>org.awaitility</groupId>
 			<artifactId>awaitility</artifactId>
-			<version>4.2.0</version>
+			<version>4.2.1</version>
 			<scope>test</scope>
 		</dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-slf4j-impl</artifactId>
-            <version>2.22.0</version>
+            <version>2.23.1</version>
             <scope>test</scope>
         </dependency>
 	</dependencies>
@@ -375,7 +375,7 @@ Contributors:
 					<plugin>
 						<groupId>org.jacoco</groupId>
 						<artifactId>jacoco-maven-plugin</artifactId>
-						<version>0.8.8</version>
+						<version>0.8.11</version>
 						<executions>
 							<execution>
 								<id>prepare-agent</id>
@@ -394,7 +394,7 @@ Contributors:
 					<plugin>
 						<groupId>org.sonarsource.scanner.maven</groupId>
 						<artifactId>sonar-maven-plugin</artifactId>
-						<version>3.9.1.2184</version>
+						<version>3.11.0.3922</version>
 					</plugin>
 				</plugins>
 			</build>

diff --git a/src/main/java/nl/teslanet/mule/connectors/coap/api/config/ExchangeParams.java b/src/main/java/nl/teslanet/mule/connectors/coap/api/config/ExchangeParams.java
@@ -184,7 +184,6 @@ public class ExchangeParams implements VisitableConfig
     @ParameterDsl( allowReferences= false )
     public String maxTransmitWait= null;
 
-    //TODO cf3 move to multicast params?
     /**
      * The expected maximum response delay over all servers 
      * that the client can send a multicast request to. See
@@ -223,7 +222,6 @@ public class ExchangeParams implements VisitableConfig
     @ParameterDsl( allowReferences= false )
     public Integer tokenSizeLimit= null;
 
-    //TODO cf3 handle values <= 0, differentiate values in multicast-endpoint and udp-endpoint
     /**
      * Base for multicast MID range. Multicast requests use MIDs in the range [base...65536). 
      * A negative or zero value disables multicast requests.
@@ -300,7 +298,6 @@ public class ExchangeParams implements VisitableConfig
     @ParameterDsl( allowReferences= false )
     public Deduplicator deduplicator= null;
 
-    //TODO cf3 move to udp/multicast
     /**
      * Configuration of the congestion control algorithm, if any.
      */

diff --git a/src/main/java/nl/teslanet/mule/connectors/coap/api/config/OptionParams.java b/src/main/java/nl/teslanet/mule/connectors/coap/api/config/OptionParams.java
@@ -2,7 +2,7 @@
  * #%L
  * Mule CoAP Connector
  * %%
- * Copyright (C) 2019 - 2023 (teslanet.nl) Rogier Cobben
+ * Copyright (C) 2019 - 2024 (teslanet.nl) Rogier Cobben
  * 
  * Contributors:
  *     (teslanet.nl) Rogier Cobben - initial creation
@@ -41,13 +41,17 @@
  */
 public class OptionParams implements VisitableConfig
 {
-    //TODO cf3 non critical options need to be understood as well. Not suitable for proxy.. 
+    //TODO non critical options need to be understood as well. Not suitable for proxy.. 
     /**
-    * The list of critical other options that the endpoint understands. 
+    * The list of other options that the endpoint understands. 
     * Messages containing critical options that are not understood will be refused.
+    * Elective options that are not understood will be ignored.
     */
     @Parameter
-    @Summary( value= "The critical other options that the endpoint understands. \nMessages containing critical options that are not understood will be rejected." )
+    @Summary(
+                    value= "The other options that the endpoint understands. " + "\nMessages containing critical options that are not understood will be rejected. "
+                        + "\nElective options that are not understood will be ignored."
+    )
     @Expression( ExpressionSupport.NOT_SUPPORTED )
     @ParameterDsl( allowInlineDefinition= true, allowReferences= false )
     public List< OtherOptionConfig > otherOptionConfigs;

diff --git a/src/main/java/nl/teslanet/mule/connectors/coap/api/config/SocketParams.java b/src/main/java/nl/teslanet/mule/connectors/coap/api/config/SocketParams.java
@@ -2,7 +2,7 @@
  * #%L
  * Mule CoAP Connector
  * %%
- * Copyright (C) 2019 - 2023 (teslanet.nl) Rogier Cobben
+ * Copyright (C) 2019 - 2024 (teslanet.nl) Rogier Cobben
  * 
  * Contributors:
  *     (teslanet.nl) Rogier Cobben - initial creation
@@ -80,6 +80,16 @@ public class SocketParams implements VisitableConfig
     @ParameterDsl( allowReferences= false )
     public Integer sendBuffer= null;
 
+    /**
+     * Reuse address when true.
+     */
+    @Parameter
+    @Optional( defaultValue= "false" )
+    @Summary( value= "Reuse address when true." )
+    @Expression( ExpressionSupport.NOT_SUPPORTED )
+    @ParameterDsl( allowReferences= false )
+    public boolean reuseAddress= false;
+
     /**
      * Accept visitor.
      */

diff --git a/src/main/java/nl/teslanet/mule/connectors/coap/api/config/Unused.java b/src/main/java/nl/teslanet/mule/connectors/coap/api/config/Unused.java
@@ -2,7 +2,7 @@
  * #%L
  * Mule CoAP Connector
  * %%
- * Copyright (C) 2019 - 2023 (teslanet.nl) Rogier Cobben
+ * Copyright (C) 2019 - 2024 (teslanet.nl) Rogier Cobben
  * 
  * Contributors:
  *     (teslanet.nl) Rogier Cobben - initial creation
@@ -55,7 +55,7 @@ public class Unused implements VisitableConfig
     @Override
     public void accept( ConfigVisitor visitor )
     {
-        //visitor.visit( this );
+        //no visit
     }
 
 }
diff --git a/src/main/java/nl/teslanet/mule/connectors/coap/api/config/endpoint/AbstractEndpoint.java b/src/main/java/nl/teslanet/mule/connectors/coap/api/config/endpoint/AbstractEndpoint.java
@@ -141,7 +141,7 @@ protected AbstractEndpoint()
      */
     protected AbstractEndpoint( String name )
     {
-        configName= name;
+        this.configName= name;
         //initialise nullsafe params
         socketParams= new SocketParams();
         blockwiseParams= new BlockwiseParams();
@@ -160,7 +160,6 @@ protected AbstractEndpoint( String name, int port )
     {
         this( name );
         socketParams.bindToPort= port;
-        exchangeParams= new ExchangeParams( new GroupedMidTracker() );
     }
 
     /**

diff --git a/...s/coap/api/config/options/OptionType.java → ...coap/api/config/options/OptionFormat.java b/...s/coap/api/config/options/OptionType.java → ...coap/api/config/options/OptionFormat.java
@@ -22,12 +22,11 @@
  */
 package nl.teslanet.mule.connectors.coap.api.config.options;
 
-
 /**
- * Enum for CoAP Option types.
+ * Enum for CoAP Option Formats.
  *
  */
-public enum OptionType
+public enum OptionFormat
 {
     EMPTY, INTEGER, OPAQUE, STRING
 }