[incubator-plc4x] branch master updated: [plc4j-pool] increased test coverage and fixed some sonar issues

[sr...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

sruehl pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git


The following commit(s) were added to refs/heads/master by this push:
     new 89309b5  [plc4j-pool] increased test coverage and fixed some sonar issues
89309b5 is described below

commit 89309b56ccab79360ffb47566b5270b4bc23bac0
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Fri Oct 26 18:35:30 2018 +0200

    [plc4j-pool] increased test coverage and fixed some sonar issues
---
 .../plc4x/java/utils/connectionpool/PooledPlcConnectionFactory.java     | 2 +-
 .../apache/plc4x/java/utils/connectionpool/PooledPlcDriverManager.java  | 2 +-
 .../plc4x/java/utils/connectionpool/PooledPlcDriverManagerTest.java     | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/plc4j/utils/connection-pool/src/main/java/org/apache/plc4x/java/utils/connectionpool/PooledPlcConnectionFactory.java b/plc4j/utils/connection-pool/src/main/java/org/apache/plc4x/java/utils/connectionpool/PooledPlcConnectionFactory.java
index 3563c4c..72d3deb 100644
--- a/plc4j/utils/connection-pool/src/main/java/org/apache/plc4x/java/utils/connectionpool/PooledPlcConnectionFactory.java
+++ b/plc4j/utils/connection-pool/src/main/java/org/apache/plc4x/java/utils/connectionpool/PooledPlcConnectionFactory.java
@@ -26,7 +26,7 @@ import org.slf4j.LoggerFactory;
 
 public abstract class PooledPlcConnectionFactory extends BasePooledObjectFactory<PlcConnection> {
 
-    private final static Logger LOGGER = LoggerFactory.getLogger(PooledPlcConnectionFactory.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(PooledPlcConnectionFactory.class);
 
     @Override
     public PooledObject<PlcConnection> wrap(PlcConnection plcConnection) {
diff --git a/plc4j/utils/connection-pool/src/main/java/org/apache/plc4x/java/utils/connectionpool/PooledPlcDriverManager.java b/plc4j/utils/connection-pool/src/main/java/org/apache/plc4x/java/utils/connectionpool/PooledPlcDriverManager.java
index f46910d..2f917d8 100644
--- a/plc4j/utils/connection-pool/src/main/java/org/apache/plc4x/java/utils/connectionpool/PooledPlcDriverManager.java
+++ b/plc4j/utils/connection-pool/src/main/java/org/apache/plc4x/java/utils/connectionpool/PooledPlcDriverManager.java
@@ -37,7 +37,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 public class PooledPlcDriverManager extends PlcDriverManager {
 
-    private final static Logger LOGGER = LoggerFactory.getLogger(PooledPlcDriverManager.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(PooledPlcDriverManager.class);
 
     private PoolCreator poolCreator;
 
diff --git a/plc4j/utils/connection-pool/src/test/java/org/apache/plc4x/java/utils/connectionpool/PooledPlcDriverManagerTest.java b/plc4j/utils/connection-pool/src/test/java/org/apache/plc4x/java/utils/connectionpool/PooledPlcDriverManagerTest.java
index 1e0bb6b..3c79b46 100644
--- a/plc4j/utils/connection-pool/src/test/java/org/apache/plc4x/java/utils/connectionpool/PooledPlcDriverManagerTest.java
+++ b/plc4j/utils/connection-pool/src/test/java/org/apache/plc4x/java/utils/connectionpool/PooledPlcDriverManagerTest.java
@@ -62,6 +62,8 @@ class PooledPlcDriverManagerTest implements WithAssertions {
     private PooledPlcDriverManager SUT = new PooledPlcDriverManager(pooledPlcConnectionFactory -> {
         GenericObjectPoolConfig<PlcConnection> plcConnectionGenericObjectPoolConfig = new GenericObjectPoolConfig<>();
         plcConnectionGenericObjectPoolConfig.setMinIdle(1);
+        plcConnectionGenericObjectPoolConfig.setTestOnBorrow(true);
+        plcConnectionGenericObjectPoolConfig.setTestOnReturn(true);
         return new GenericObjectPool<>(pooledPlcConnectionFactory, plcConnectionGenericObjectPoolConfig);
     });