0.5.0 - change logger to slf4j

uia4j · Apr 2, 2020 · ce72af9 · ce72af9
1 parent 4cf9de1
commit ce72af9
Show file tree

Hide file tree

Showing 16 changed files with 42 additions and 65 deletions.
diff --git a/uia.comm/log4j.properties b/uia.comm/log4j.properties
diff --git a/uia.comm/pom.xml b/uia.comm/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
  	<groupId>org.uia.solution</groupId>
  	<artifactId>uia-comm</artifactId>
-	<version>0.4.0</version>
+	<version>0.5.0</version>
 	<packaging>jar</packaging>
 	<name>uia-comm</name>
 	<url>https://github.com/uia4j/uia-comm</url>
@@ -20,9 +20,10 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-			<version>1.2.14</version>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-simple</artifactId>
+			<version>1.7.30</version>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.rxtx</groupId>
@@ -34,6 +35,11 @@
 			<artifactId>uia-utils</artifactId>
 			<version>0.2.0</version>
 		</dependency>
+		<dependency>
+		    <groupId>org.slf4j</groupId>
+		    <artifactId>slf4j-api</artifactId>
+		    <version>1.7.30</version>
+		</dependency>
 	</dependencies>
     <repositories>
         <repository>

diff --git a/uia.comm/src/main/java/uia/comm/DatagramClient.java b/uia.comm/src/main/java/uia/comm/DatagramClient.java
@@ -23,7 +23,8 @@
 import java.nio.channels.DatagramChannel;
 import java.util.HashMap;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import uia.comm.protocol.Protocol;
 import uia.comm.protocol.ProtocolEventArgs;
@@ -39,7 +40,7 @@
  */
 public class DatagramClient implements ProtocolEventHandler<DatagramDataController>, CommClient<DatagramDataController> {
 
-    private final static Logger logger = Logger.getLogger(DatagramClient.class);
+    private final static Logger logger = LoggerFactory.getLogger(DatagramClient.class);
 
     private final Protocol<DatagramDataController> protocol;
 

diff --git a/uia.comm/src/main/java/uia/comm/DatagramDataController.java b/uia.comm/src/main/java/uia/comm/DatagramDataController.java
@@ -27,7 +27,8 @@
 import java.util.Arrays;
 import java.util.Iterator;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import uia.comm.protocol.ProtocolMonitor;
 import uia.utils.ByteUtils;
@@ -39,7 +40,7 @@
  */
 public class DatagramDataController implements DataController {
 
-    private final static Logger logger = Logger.getLogger(DatagramDataController.class);
+    private final static Logger logger = LoggerFactory.getLogger(DatagramDataController.class);
 
     private final ProtocolMonitor<DatagramDataController> monitor;
 
@@ -107,7 +108,7 @@ public synchronized boolean send(byte[] data, int times) {
                     return true;
                 }
                 else {
-                    logger.fatal(String.format("%s> write count error!!", this.name));
+                    logger.error(String.format("%s> write count error!!", this.name));
                 }
             }
             catch (Exception ex) {
@@ -203,7 +204,7 @@ synchronized boolean receive() throws IOException {
             value = Arrays.copyOf(value, len);
             for (byte b : value) {
                 if (this.monitor.getDataLength() > this.maxCache) {
-                    logger.fatal(this.name + "> out of maxCchte:" + this.maxCache);
+                    logger.error(this.name + "> out of maxCchte:" + this.maxCache);
                     this.monitor.reset();
                 }
                 this.monitor.read(b);
@@ -243,7 +244,7 @@ private void running() {
                             receive();
                         }
                         catch (Exception e) {
-                        	logger.fatal(dgChannel, e);
+                        	logger.error(dgChannel.toString() + " failed", e);
                         	break;
                         }
                     }

diff --git a/uia.comm/src/main/java/uia/comm/MessageCallOutConcurrent.java b/uia.comm/src/main/java/uia/comm/MessageCallOutConcurrent.java
@@ -20,7 +20,8 @@
 
 import java.util.concurrent.Callable;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  *
@@ -29,7 +30,7 @@
  */
 class MessageCallOutConcurrent implements MessageCallOut, Callable<byte[]> {
 
-    private final static Logger logger = Logger.getLogger(MessageCallOutConcurrent.class);
+    private final static Logger logger = LoggerFactory.getLogger(MessageCallOutConcurrent.class);
 
     private final String name;
 

diff --git a/uia.comm/src/main/java/uia/comm/RS232.java b/uia.comm/src/main/java/uia/comm/RS232.java
@@ -35,7 +35,8 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import uia.comm.protocol.Protocol;
 import uia.comm.protocol.ProtocolEventArgs;
@@ -50,7 +51,7 @@
  */
 public class RS232 implements ProtocolEventHandler<RS232>, CommClient<RS232> {
 
-    private final static Logger logger = Logger.getLogger(RS232.class);
+    private final static Logger logger = LoggerFactory.getLogger(RS232.class);
 
     private String aliasName;
 

diff --git a/uia.comm/src/main/java/uia/comm/SocketClient.java b/uia.comm/src/main/java/uia/comm/SocketClient.java
@@ -34,7 +34,8 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import uia.comm.protocol.Protocol;
 import uia.comm.protocol.ProtocolEventArgs;
@@ -50,7 +51,7 @@
  */
 public class SocketClient implements ProtocolEventHandler<SocketDataController>, CommClient<SocketDataController> {
 
-    private final static Logger logger = Logger.getLogger(SocketClient.class);
+    private final static Logger logger = LoggerFactory.getLogger(SocketClient.class);
 
     private final Protocol<SocketDataController> protocol;
 

diff --git a/uia.comm/src/main/java/uia/comm/SocketDataController.java b/uia.comm/src/main/java/uia/comm/SocketDataController.java
@@ -27,7 +27,8 @@
 import java.util.Date;
 import java.util.Iterator;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import uia.comm.protocol.ProtocolMonitor;
 import uia.utils.ByteUtils;
@@ -39,7 +40,7 @@
  */
 public class SocketDataController implements DataController {
 
-    private final static Logger logger = Logger.getLogger(SocketDataController.class);
+    private final static Logger logger = LoggerFactory.getLogger(SocketDataController.class);
 
     private final ProtocolMonitor<SocketDataController> monitor;
 
@@ -112,7 +113,7 @@ public synchronized boolean send(byte[] data, int times) {
                     return true;
                 }
                 else {
-                    logger.fatal(String.format("%s> write count error!!", this.name));
+                    logger.error(String.format("%s> write count error!!", this.name));
                 }
             }
             catch (Exception ex) {
@@ -206,7 +207,7 @@ synchronized boolean receive() throws IOException {
                 value = Arrays.copyOf(value, len);
                 for (byte b : value) {
                     if (this.monitor.getDataLength() > this.maxCache) {
-                        logger.fatal(this.name + "> out of maxCchte:" + this.maxCache);
+                        logger.error(this.name + "> out of maxCchte:" + this.maxCache);
                         this.monitor.reset();
                     }
                     this.monitor.read(b);
@@ -244,7 +245,7 @@ private void running() {
                         receive();
                     }
                     catch (Exception e) {
-                    	logger.fatal(socketChannel, e);
+                    	logger.error(socketChannel.toString() + " failed", e);
                     	break;
                     }
                 }

diff --git a/uia.comm/src/main/java/uia/comm/SocketServer.java b/uia.comm/src/main/java/uia/comm/SocketServer.java
@@ -35,7 +35,8 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import uia.comm.protocol.Protocol;
 import uia.comm.protocol.ProtocolEventArgs;
@@ -57,7 +58,7 @@ public enum ConnectionStyle {
 
     private static int INST = 0;
 
-    private final static Logger logger = Logger.getLogger(SocketServer.class);
+    private final static Logger logger = LoggerFactory.getLogger(SocketServer.class);
 
     private final int port;
 
@@ -388,7 +389,7 @@ public boolean start() {
             this.ch.register(this.serverSelector, SelectionKey.OP_ACCEPT);
         }
         catch (Exception ex) {
-            logger.error(ex);
+            logger.error(ex.getMessage(), ex);
             return false;
         }
 

diff --git a/uia.comm/src/main/java/uia/comm/Version.java b/uia.comm/src/main/java/uia/comm/Version.java
@@ -2,6 +2,6 @@
 
 public interface Version {
 
-	public static final String NO = "2019711A";
+	public static final String NO = "0.5.200402A";
 
 }
diff --git a/uia.comm/src/main/java/uia/comm/VirtualSocketClient.java b/uia.comm/src/main/java/uia/comm/VirtualSocketClient.java
@@ -20,7 +20,8 @@
 
 import java.util.concurrent.LinkedBlockingQueue;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import uia.utils.ByteUtils;
 
@@ -31,7 +32,7 @@
  */
 public class VirtualSocketClient {
 
-    private final static Logger logger = Logger.getLogger(VirtualSocketClient.class);
+    private final static Logger logger = LoggerFactory.getLogger(VirtualSocketClient.class);
 
     private SocketClient activeClient;
 

diff --git a/uia.comm/src/test/java/uia/comm/NGSocketTest.java b/uia.comm/src/test/java/uia/comm/NGSocketTest.java
@@ -18,7 +18,6 @@
  *******************************************************************************/
 package uia.comm;
 
-import org.apache.log4j.PropertyConfigurator;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -38,7 +37,6 @@ public class NGSocketTest implements MessageManager, MessageCallOut, MessageCall
     private final SocketServer server;
 
     public NGSocketTest() throws Exception {
-        PropertyConfigurator.configure("log4j.properties");
         this.server = new SocketServer(
                 new NGProtocol<SocketDataController>(),
                 PORT,

diff --git a/uia.comm/src/test/java/uia/comm/SocketClientTest.java b/uia.comm/src/test/java/uia/comm/SocketClientTest.java
@@ -18,7 +18,6 @@
  *******************************************************************************/
 package uia.comm;
 
-import org.apache.log4j.PropertyConfigurator;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -39,7 +38,6 @@ public class SocketClientTest {
 	private int size = 100000;
 
     public SocketClientTest() {
-        PropertyConfigurator.configure("log4j.properties");
     }
 
     @Test

diff --git a/uia.comm/src/test/java/uia/comm/SocketServerTest.java b/uia.comm/src/test/java/uia/comm/SocketServerTest.java
@@ -18,7 +18,6 @@
  *******************************************************************************/
 package uia.comm;
 
-import org.apache.log4j.PropertyConfigurator;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -38,7 +37,6 @@ public class SocketServerTest {
 	private int size = 100000;
 
     public SocketServerTest() {
-        PropertyConfigurator.configure("log4j.properties");
     }
 
     @Test

diff --git a/uia.comm/src/test/java/uia/comm/XMLSocketTest.java b/uia.comm/src/test/java/uia/comm/XMLSocketTest.java
@@ -18,7 +18,6 @@
  *******************************************************************************/
 package uia.comm;
 
-import org.apache.log4j.PropertyConfigurator;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -38,8 +37,6 @@ public class XMLSocketTest implements MessageManager, MessageCallOut, MessageCal
     private final SocketServer server;
 
     public XMLSocketTest() throws Exception {
-        PropertyConfigurator.configure("log4j.properties");
-
         this.server = new SocketServer(
                 new XMLProtocol<SocketDataController>("BBRAUN"),
                 PORT,

diff --git a/uia.comm/src/test/java/uia/comm/my/ClientRequest.java b/uia.comm/src/test/java/uia/comm/my/ClientRequest.java
@@ -18,8 +18,6 @@
  *******************************************************************************/
 package uia.comm.my;
 
-import org.junit.Assert;
-
 import uia.comm.MessageCallIn;
 import uia.comm.MessageCallOut;
 import uia.comm.SocketDataController;