From aec07c09892fda2de18e92729f000d07226c3da6 Mon Sep 17 00:00:00 2001
From: seayar <602174096@qq.com>
Date: Fri, 23 Aug 2019 11:07:23 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9modbus=20POM=EF=BC=8C?=
 =?UTF-8?q?=E4=BB=A5=E5=8F=8Aresults=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                   |   2 +
 pom.xml                                      | 102 ++-----------------
 src/com/serotonin/modbus4j/BatchResults.java |  16 ++-
 3 files changed, 23 insertions(+), 97 deletions(-)

diff --git a/.gitignore b/.gitignore
index b83d222..4e36687 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 /target/
+.settings/
+.idea/
diff --git a/pom.xml b/pom.xml
index 0e6d926..10e600b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,81 +1,13 @@
-<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">
+<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.infiniteautomation</groupId>
     <artifactId>modbus4j</artifactId>
-    <version>3.0.6-SNAPSHOT</version>
+    <version>3.0.6</version>
     <name>Modbus4j Library</name>
     <properties>
-      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
-    <build>
-        <sourceDirectory>src</sourceDirectory>
-        <testSourceDirectory>src_test</testSourceDirectory>
-        <plugins>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.7.0</version>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                </configuration>
-            </plugin>
-            <plugin>
-			  <groupId>org.apache.maven.plugins</groupId>
-			  <artifactId>maven-source-plugin</artifactId>
-			  <version>3.0.1</version>
-			  <executions>
-			    <execution>
-			      <id>attach-sources</id>
-			      <goals>
-			        <goal>jar</goal>
-			      </goals>
-			    </execution>
-			  </executions>
-			</plugin>
-            <plugin>
-			   <groupId>org.apache.maven.plugins</groupId>
-			   <artifactId>maven-deploy-plugin</artifactId>
-			   <version>2.8.1</version>
-			   <configuration>
-			      <skip>true</skip>
-			   </configuration>
-			</plugin>
-			<plugin>
-			   <groupId>org.sonatype.plugins</groupId>
-			   <artifactId>nexus-staging-maven-plugin</artifactId>
-			   <version>1.5.1</version>
-			   <executions>
-			      <execution>
-			         <id>default-deploy</id>
-			         <phase>deploy</phase>
-			         <goals>
-			            <goal>deploy</goal>
-			         </goals>
-			      </execution>
-			   </executions>
-			   <configuration>
-			      <serverId>ias-releases</serverId>
-			      <nexusUrl>https://maven.mangoautomation.net/</nexusUrl>
-			      <skipStaging>true</skipStaging>
-			   </configuration>
-			</plugin>
-		    <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-release-plugin</artifactId>
-                <version>2.5.3</version>
-                <dependencies>
-                  <dependency>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-scm-plugin</artifactId>
-                    <version>1.9.5</version>
-                  </dependency>
-                </dependencies>
-                <configuration>
-                    <tagNameFormat>v@{project.version}</tagNameFormat>
-                 </configuration>
-              </plugin>
-        </plugins>
-    </build>
     <dependencies>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -88,24 +20,10 @@
             <version>1.1.1</version>
         </dependency>
     </dependencies>
-    <issueManagement>
-        <url>https://github.com/infiniteautomation/modbus4j/issues</url>
-        <system>github</system>
-    </issueManagement>
-    <scm>
-        <url>https://github.com/infiniteautomation/modbus4j</url>
-        <connection>scm:git:https://github.com/infiniteautomation/modbus4j.git</connection>
-        <developerConnection>scm:git:[push=]https://github.com/infiniteautomation/modbus4j.git[fetch=]https://github.com/infiniteautomation/modbus4j.git</developerConnection>
-        <tag>HEAD</tag>
-    </scm>
-	<distributionManagement>
-	   <snapshotRepository>
-	      <id>ias-snapshots</id>
-	      <url>https://maven.mangoautomation.net/repository/ias-snapshot/</url>
-	   </snapshotRepository>
-	   <repository>
-	      <id>ias-releases</id>
-	   	  <url>https://maven.mangoautomation.net/repository/ias-release/</url>
-	   </repository>
-	</distributionManagement>
+    <distributionManagement>
+        <repository>
+            <id>thirdparty</id>
+            <url>http://maven.seayar.tk/nexus/content/repositories/thirdparty/</url>
+        </repository>
+    </distributionManagement>
 </project>
\ No newline at end of file
diff --git a/src/com/serotonin/modbus4j/BatchResults.java b/src/com/serotonin/modbus4j/BatchResults.java
index e4fd171..a4882c4 100644
--- a/src/com/serotonin/modbus4j/BatchResults.java
+++ b/src/com/serotonin/modbus4j/BatchResults.java
@@ -5,12 +5,12 @@
  *
  * Copyright (C) 2006-2011 Serotonin Software Technologies Inc. http://serotoninsoftware.com
  * @author Matthew Lohbihler
- * 
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -30,18 +30,22 @@
  * @version 5.0.0
  */
 public class BatchResults<K> {
-    private final Map<K, Object> data = new HashMap<>();
+    protected final Map<K, Object> data = new HashMap<>();
 
     /**
      * <p>addResult.</p>
      *
-     * @param key a K object.
+     * @param key   a K object.
      * @param value a {@link java.lang.Object} object.
      */
     public void addResult(K key, Object value) {
         data.put(key, value);
     }
 
+    public void addBatchResults(BatchResults<K> results) {
+        this.data.putAll(results.data);
+    }
+
     /**
      * <p>getValue.</p>
      *
@@ -92,7 +96,9 @@ public Float getFloatValue(K key) {
         return (Float) getValue(key);
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public String toString() {
         return data.toString();

From 46ad2ad2bf176c81bcb80dc8df4c51217552e07e Mon Sep 17 00:00:00 2001
From: seayar <602174096@qq.com>
Date: Fri, 5 Jun 2020 14:30:55 +0800
Subject: [PATCH 2/2] #change: src/com/serotonin/modbus4j BatchResults.java:
 Add result sets in bulk #change: the gitignore fit the idea ide.

---
 pom.xml                                      | 102 +++++++++++++++++--
 src/com/serotonin/modbus4j/BatchResults.java |  16 +--
 2 files changed, 101 insertions(+), 17 deletions(-)

diff --git a/pom.xml b/pom.xml
index 10e600b..0e6d926 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,13 +1,81 @@
-<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">
+<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.infiniteautomation</groupId>
     <artifactId>modbus4j</artifactId>
-    <version>3.0.6</version>
+    <version>3.0.6-SNAPSHOT</version>
     <name>Modbus4j Library</name>
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
+    <build>
+        <sourceDirectory>src</sourceDirectory>
+        <testSourceDirectory>src_test</testSourceDirectory>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.7.0</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+            <plugin>
+			  <groupId>org.apache.maven.plugins</groupId>
+			  <artifactId>maven-source-plugin</artifactId>
+			  <version>3.0.1</version>
+			  <executions>
+			    <execution>
+			      <id>attach-sources</id>
+			      <goals>
+			        <goal>jar</goal>
+			      </goals>
+			    </execution>
+			  </executions>
+			</plugin>
+            <plugin>
+			   <groupId>org.apache.maven.plugins</groupId>
+			   <artifactId>maven-deploy-plugin</artifactId>
+			   <version>2.8.1</version>
+			   <configuration>
+			      <skip>true</skip>
+			   </configuration>
+			</plugin>
+			<plugin>
+			   <groupId>org.sonatype.plugins</groupId>
+			   <artifactId>nexus-staging-maven-plugin</artifactId>
+			   <version>1.5.1</version>
+			   <executions>
+			      <execution>
+			         <id>default-deploy</id>
+			         <phase>deploy</phase>
+			         <goals>
+			            <goal>deploy</goal>
+			         </goals>
+			      </execution>
+			   </executions>
+			   <configuration>
+			      <serverId>ias-releases</serverId>
+			      <nexusUrl>https://maven.mangoautomation.net/</nexusUrl>
+			      <skipStaging>true</skipStaging>
+			   </configuration>
+			</plugin>
+		    <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-release-plugin</artifactId>
+                <version>2.5.3</version>
+                <dependencies>
+                  <dependency>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-scm-plugin</artifactId>
+                    <version>1.9.5</version>
+                  </dependency>
+                </dependencies>
+                <configuration>
+                    <tagNameFormat>v@{project.version}</tagNameFormat>
+                 </configuration>
+              </plugin>
+        </plugins>
+    </build>
     <dependencies>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -20,10 +88,24 @@
             <version>1.1.1</version>
         </dependency>
     </dependencies>
-    <distributionManagement>
-        <repository>
-            <id>thirdparty</id>
-            <url>http://maven.seayar.tk/nexus/content/repositories/thirdparty/</url>
-        </repository>
-    </distributionManagement>
+    <issueManagement>
+        <url>https://github.com/infiniteautomation/modbus4j/issues</url>
+        <system>github</system>
+    </issueManagement>
+    <scm>
+        <url>https://github.com/infiniteautomation/modbus4j</url>
+        <connection>scm:git:https://github.com/infiniteautomation/modbus4j.git</connection>
+        <developerConnection>scm:git:[push=]https://github.com/infiniteautomation/modbus4j.git[fetch=]https://github.com/infiniteautomation/modbus4j.git</developerConnection>
+        <tag>HEAD</tag>
+    </scm>
+	<distributionManagement>
+	   <snapshotRepository>
+	      <id>ias-snapshots</id>
+	      <url>https://maven.mangoautomation.net/repository/ias-snapshot/</url>
+	   </snapshotRepository>
+	   <repository>
+	      <id>ias-releases</id>
+	   	  <url>https://maven.mangoautomation.net/repository/ias-release/</url>
+	   </repository>
+	</distributionManagement>
 </project>
\ No newline at end of file
diff --git a/src/com/serotonin/modbus4j/BatchResults.java b/src/com/serotonin/modbus4j/BatchResults.java
index a4882c4..d3210de 100644
--- a/src/com/serotonin/modbus4j/BatchResults.java
+++ b/src/com/serotonin/modbus4j/BatchResults.java
@@ -5,12 +5,12 @@
  *
  * Copyright (C) 2006-2011 Serotonin Software Technologies Inc. http://serotoninsoftware.com
  * @author Matthew Lohbihler
- *
+ * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
- *
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -30,18 +30,22 @@
  * @version 5.0.0
  */
 public class BatchResults<K> {
-    protected final Map<K, Object> data = new HashMap<>();
+    private final Map<K, Object> data = new HashMap<>();
 
     /**
      * <p>addResult.</p>
      *
-     * @param key   a K object.
+     * @param key a K object.
      * @param value a {@link java.lang.Object} object.
      */
     public void addResult(K key, Object value) {
         data.put(key, value);
     }
 
+    /**
+     * <p>Add result sets in bulk</p>
+     * @param results Batch results
+     */
     public void addBatchResults(BatchResults<K> results) {
         this.data.putAll(results.data);
     }
@@ -96,9 +100,7 @@ public Float getFloatValue(K key) {
         return (Float) getValue(key);
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public String toString() {
         return data.toString();