Update examples to use slf4j-api.

Author: pmoerenhout

jsmpp-examples/src/main/java/org/jsmpp/examples/AcceptingConnectionAndBindExample.java

@@ -17,61 +17,60 @@
 import java.io.IOException;
 import java.util.concurrent.TimeoutException;
 
-import org.apache.log4j.BasicConfigurator;
 import org.jsmpp.PDUStringException;
 import org.jsmpp.SMPPConstant;
 import org.jsmpp.session.BindRequest;
 import org.jsmpp.session.SMPPServerSession;
 import org.jsmpp.session.SMPPServerSessionListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @author uudashr
  *
  */
 public class AcceptingConnectionAndBindExample {
+    private static final Logger LOGGER = LoggerFactory.getLogger(AcceptingConnectionAndBindExample.class);
 
     public static void main(String[] args) {
-        BasicConfigurator.configure();
         try {
-            System.out.println("Listening ...");
+            LOGGER.info("Listening ...");
             SMPPServerSessionListener sessionListener = new SMPPServerSessionListener(8056);
 
             // accepting connection, session still in OPEN state
             SMPPServerSession session = sessionListener.accept();
-            System.out.println("Accept connection");
+            LOGGER.info("Accept connection");
 
             try {
                 BindRequest request = session.waitForBind(5000);
-                System.out.println("Receive bind request");
+                LOGGER.info("Receive bind request");
 
                 if ("test".equals(request.getSystemId()) &&
                         "test".equals(request.getPassword())) {
-                    
+
                     // accepting request and send bind response immediately
-                    System.out.println("Accepting bind request, interface version is " + request.getInterfaceVersion());
+                    LOGGER.info("Accepting bind request, interface version is " + request.getInterfaceVersion());
                     request.accept("sys");
 
                     try { Thread.sleep(20000); } catch (InterruptedException e) {}
                 } else {
-                    System.out.println("Rejecting bind request");
+                    LOGGER.info("Rejecting bind request");
                     request.reject(SMPPConstant.STAT_ESME_RINVPASWD);
                 }
             } catch (TimeoutException e) {
-                System.out.println("No binding request made after 5000 millisecond");
-                e.printStackTrace();
+                LOGGER.error("No binding request made after 5000 millisecond", e);
             }
 
-            
             if (session.getSessionState().isBound()) {
-                System.out.println("Closing session");
+                LOGGER.info("Closing session");
                 session.unbindAndClose();
             }
-            System.out.println("Closing session listener");
+            LOGGER.info("Closing session listener");
             sessionListener.close();
         } catch (PDUStringException e) {
-            e.printStackTrace();
+            LOGGER.error("PDUStringException", e);
         } catch (IOException e) {
-            e.printStackTrace();
+            LOGGER.error("IOException", e);
         }
 
     }

jsmpp-examples/src/main/java/org/jsmpp/examples/AsyncSubmitReceiveDeliverSmExample.java

@@ -20,7 +20,6 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.log4j.BasicConfigurator;
 import org.jsmpp.InvalidResponseException;
 import org.jsmpp.PDUException;
 import org.jsmpp.bean.AlertNotification;
@@ -46,23 +45,25 @@
 import org.jsmpp.util.AbsoluteTimeFormatter;
 import org.jsmpp.util.InvalidDeliveryReceiptException;
 import org.jsmpp.util.TimeFormatter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @author uudashr
  *
  */
 public class AsyncSubmitReceiveDeliverSmExample {
-    private static TimeFormatter timeFormatter = new AbsoluteTimeFormatter();
+    private static final Logger LOGGER = LoggerFactory.getLogger(AsyncSubmitReceiveDeliverSmExample.class);
+    private static final TimeFormatter TIME_FORMATTER = new AbsoluteTimeFormatter();
+
     public static void main(String[] args) {
         final AtomicInteger counter = new AtomicInteger();
 
-        BasicConfigurator.configure();
         final SMPPSession session = new SMPPSession();
         try {
             session.connectAndBind("localhost", 8056, new BindParameter(BindType.BIND_TRX, "test", "test", "cp", TypeOfNumber.UNKNOWN, NumberingPlanIndicator.UNKNOWN, null));
         } catch (IOException e) {
-            System.err.println("Failed connect and bind to host");
-            e.printStackTrace();
+            LOGGER.error("Failed connect and bind to host", e);
         }
 
         // Set listener to receive deliver_sm
@@ -76,14 +77,13 @@ public void onAcceptDeliverSm(DeliverSm deliverSm)
                         DeliveryReceipt delReceipt = deliverSm.getShortMessageAsDeliveryReceipt();
                         long id = Long.parseLong(delReceipt.getId()) & 0xffffffff;
                         String messageId = Long.toString(id, 16).toUpperCase();
-                        System.out.println("Receiving delivery receipt for message '" + messageId + "' : " + delReceipt);
+                        LOGGER.info("Receiving delivery receipt for message '{}' : {}", messageId, delReceipt);
                     } catch (InvalidDeliveryReceiptException e) {
-                        System.err.println("Failed getting delivery receipt");
-                        e.printStackTrace();
+                        LOGGER.error("Failed getting delivery receipt", e);
                     }
                 } else {
                     // regular short message
-                    System.out.println("Receiving message : " + new String(deliverSm.getShortMessage()));
+                    LOGGER.info("Receiving message : {}", new String(deliverSm.getShortMessage()));
                 }
             }
 
@@ -110,29 +110,25 @@ public DataSmResult onAcceptDataSm(DataSm dataSm, Session source)
             execService.execute(new Runnable() {
                 public void run() {
                     try {
-                        String messageId = session.submitShortMessage("CMT", TypeOfNumber.INTERNATIONAL, NumberingPlanIndicator.UNKNOWN, "1616", TypeOfNumber.INTERNATIONAL, NumberingPlanIndicator.UNKNOWN, "628176504657", new ESMClass(), (byte)0, (byte)1,  timeFormatter.format(new Date()), null, registeredDelivery, (byte)0, DataCodings.ZERO, (byte)0, "jSMPP simplify SMPP on Java platform".getBytes());
-                        System.out.println("Message submitted, message_id is " + messageId);
+                        String messageId = session.submitShortMessage("CMT", TypeOfNumber.INTERNATIONAL, NumberingPlanIndicator.UNKNOWN, "1616", TypeOfNumber.INTERNATIONAL, NumberingPlanIndicator.UNKNOWN, "628176504657", new ESMClass(), (byte)0, (byte)1,  TIME_FORMATTER
+                            .format(new Date()), null, registeredDelivery, (byte)0, DataCodings.ZERO, (byte)0, "jSMPP simplify SMPP on Java platform".getBytes());
+                        LOGGER.info("Message submitted, message_id is {}", messageId);
                     } catch (PDUException e) {
-                        System.err.println("Invalid PDU parameter");
-                        e.printStackTrace();
+                        LOGGER.error("Invalid PDU parameter", e);
                         counter.incrementAndGet();
                     } catch (ResponseTimeoutException e) {
-                        System.err.println("Response timeout");
-                        e.printStackTrace();
+                        LOGGER.error("Response timeout", e);
                         counter.incrementAndGet();
                     } catch (InvalidResponseException e) {
                         // Invalid response
-                        System.err.println("Receive invalid respose");
-                        e.printStackTrace();
+                        LOGGER.error("Receive invalid respose", e);
                         counter.incrementAndGet();
                     } catch (NegativeResponseException e) {
                         // Receiving negative response (non-zero command_status)
-                        System.err.println("Receive negative response");
-                        e.printStackTrace();
+                        LOGGER.error("Receive negative response", e);
                         counter.incrementAndGet();
                     } catch (IOException e) {
-                        System.err.println("IO error occur");
-                        e.printStackTrace();
+                        LOGGER.error("I/O error occured", e);
                         counter.incrementAndGet();
                     }
                 }
@@ -142,7 +138,7 @@ public void run() {
         while (counter.get() != maxMessage) {
             try { Thread.sleep(1000); }
             catch (InterruptedException e) {
-                System.err.println("Interrupted");
+                LOGGER.error("Interrupted");
             }
         }
         session.unbindAndClose();

jsmpp-examples/src/main/java/org/jsmpp/examples/MessageReceiverListenerImpl.java

@@ -14,6 +14,7 @@
  */
 package org.jsmpp.examples;
 
+import org.jsmpp.SMPPConstant;
 import org.jsmpp.bean.AlertNotification;
 import org.jsmpp.bean.DataSm;
 import org.jsmpp.bean.DeliverSm;
@@ -24,12 +25,17 @@
 import org.jsmpp.session.MessageReceiverListener;
 import org.jsmpp.session.Session;
 import org.jsmpp.util.InvalidDeliveryReceiptException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @author uudashr
  *
  */
 public class MessageReceiverListenerImpl implements MessageReceiverListener {
+    private static final Logger LOGGER = LoggerFactory.getLogger(MessageReceiverListenerImpl.class);
+    private static final String DATASM_NOT_IMPLEMENTED = "data_sm not implemented";
+
     public void onAcceptDeliverSm(DeliverSm deliverSm)
             throws ProcessRequestException {
 
@@ -46,11 +52,11 @@ public void onAcceptDeliverSm(DeliverSm deliverSm)
                  * you can update the status of your submitted message on the
                  * database based on messageId
                  */
-                
-                System.out.println("Receiving delivery receipt for message '" + messageId + " ' from " + deliverSm.getSourceAddr() + " to " + deliverSm.getDestAddress() + " : " + delReceipt);
+
+                LOGGER.info("Receiving delivery receipt for message '{}' from {} to {}: {}",
+                    messageId, deliverSm.getSourceAddr(), deliverSm.getDestAddress(), delReceipt);
             } catch (InvalidDeliveryReceiptException e) {
-                System.err.println("Failed getting delivery receipt");
-                e.printStackTrace();
+                LOGGER.error("Failed getting delivery receipt", e);
             }
         } else {
             // this message is regular short message
@@ -59,15 +65,17 @@ public void onAcceptDeliverSm(DeliverSm deliverSm)
              * you can save the incoming message to database.
              */
 
-            System.out.println("Receiving message : " + new String(deliverSm.getShortMessage()));
+            LOGGER.info("Receiving message : {}", new String(deliverSm.getShortMessage()));
         }
     }
 
     public void onAcceptAlertNotification(AlertNotification alertNotification) {
+        LOGGER.info("AlertNotification not implemented");
     }
 
     public DataSmResult onAcceptDataSm(DataSm dataSm, Session source)
             throws ProcessRequestException {
-        return null;
+        LOGGER.info("DataSm not implemented");
+        throw new ProcessRequestException(DATASM_NOT_IMPLEMENTED, SMPPConstant.STAT_ESME_RINVCMDID);
     }
 }

jsmpp-examples/src/main/java/org/jsmpp/examples/OpenAndBindExample.java

@@ -16,35 +16,34 @@
 
 import java.io.IOException;
 
-import org.apache.log4j.BasicConfigurator;
 import org.jsmpp.bean.BindType;
 import org.jsmpp.bean.NumberingPlanIndicator;
 import org.jsmpp.bean.TypeOfNumber;
 import org.jsmpp.session.BindParameter;
 import org.jsmpp.session.SMPPSession;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @author uudashr
  *
  */
 public class OpenAndBindExample {
+    private static final Logger LOGGER = LoggerFactory.getLogger(OpenAndBindExample.class);
 
     public static void main(String[] args) {
-        BasicConfigurator.configure();
         String host = "localhost";
         int port = 8056;
         SMPPSession session = new SMPPSession();
         try {
-            System.out.println("Connect and bind to " + host + " port " + port);
+            LOGGER.info("Connect and bind to {} port {}", host, port);
             session.connectAndBind(host, port, new BindParameter(BindType.BIND_TRX, "test", "test", "cp", TypeOfNumber.UNKNOWN, NumberingPlanIndicator.UNKNOWN, null));
         } catch (IOException e) {
             // Failed connect and bind to SMSC
-            System.err.println("Failed connect and bind to host");
-            e.printStackTrace();
+            LOGGER.error("Failed connect and bind to host", e);
         }
         try { Thread.sleep(10000); } catch (InterruptedException e) {}
         session.unbindAndClose();
     }
-    
-    
+
 }

jsmpp-examples/src/main/java/org/jsmpp/examples/ReceiveSubmittedMessageExample.java

@@ -17,7 +17,6 @@
 import java.io.IOException;
 import java.util.concurrent.TimeoutException;
 
-import org.apache.log4j.BasicConfigurator;
 import org.jsmpp.PDUStringException;
 import org.jsmpp.SMPPConstant;
 import org.jsmpp.bean.CancelSm;
@@ -38,27 +37,28 @@
 import org.jsmpp.util.MessageIDGenerator;
 import org.jsmpp.util.MessageId;
 import org.jsmpp.util.RandomMessageIDGenerator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @author uudashr
  *
  */
 public class ReceiveSubmittedMessageExample {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(ReceiveSubmittedMessageExample.class);
 
     public static void main(String[] args) {
-        BasicConfigurator.configure();
         try {
-            
-            
+
             // prepare generator of Message ID
             final MessageIDGenerator messageIdGenerator = new RandomMessageIDGenerator();
 
             // prepare the message receiver
             ServerMessageReceiverListener messageReceiverListener = new ServerMessageReceiverListener() {
-                public MessageId onAcceptSubmitSm(SubmitSm submitSm,
-                        SMPPServerSession source)
+                public MessageId onAcceptSubmitSm(SubmitSm submitSm, SMPPServerSession source)
                         throws ProcessRequestException {
-                    System.out.println("Receiving message : " + new String(submitSm.getShortMessage()));
+                    LOGGER.info("Receiving message : {}", new String(submitSm.getShortMessage()));
                     // need message_id to response submit_sm
                     return messageIdGenerator.newMessageId();
                 }
@@ -91,46 +91,44 @@ public void onAcceptReplaceSm(ReplaceSm replaceSm,
                 }
             };
 
-            System.out.println("Listening ...");
+            LOGGER.info("Listening ...");
             SMPPServerSessionListener sessionListener = new SMPPServerSessionListener(8056);
             // set all default ServerMessageReceiverListener for all accepted SMPPServerSessionListener
             sessionListener.setMessageReceiverListener(messageReceiverListener);
 
             // accepting connection, session still in OPEN state
             SMPPServerSession session = sessionListener.accept();
             // or we can set for each accepted session session.setMessageReceiverListener(messageReceiverListener)
-            System.out.println("Accept connection");
+            LOGGER.info("Accept connection");
 
             try {
                 BindRequest request = session.waitForBind(5000);
-                System.out.println("Receive bind request");
+                LOGGER.info("Receive bind request for system id {} and password {}", request.getSystemId(), request.getSystemId(), request.getPassword());
 
                 if ("test".equals(request.getSystemId()) &&
                         "test".equals(request.getPassword())) {
 
                     // accepting request and send bind response immediately
-                    System.out.println("Accepting bind request");
+                    LOGGER.info("Accepting bind request");
                     request.accept("sys");
-                    
-                    
+
                     try { Thread.sleep(20000); } catch (InterruptedException e) {}
                 } else {
-                    System.out.println("Rejecting bind request");
+                    LOGGER.info("Rejecting bind request");
                     request.reject(SMPPConstant.STAT_ESME_RINVPASWD);
                 }
             } catch (TimeoutException e) {
-                System.out.println("No binding request made after 5000 millisecond");
-                e.printStackTrace();
+                LOGGER.error("No binding request made after 5000 millisecond", e);
             }
-            
-            System.out.println("Closing session");
+
+            LOGGER.info("Closing session");
             session.unbindAndClose();
-            System.out.println("Closing session listener");
+            LOGGER.info("Closing session listener");
             sessionListener.close();
         } catch (PDUStringException e) {
-            e.printStackTrace();
+            LOGGER.error("PDUString exception", e);
         } catch (IOException e) {
-            e.printStackTrace();
+            LOGGER.error("I/O exception", e);
         }
     }
 }