From 6ac95e1e9da51700364c853826044743aa740d33 Mon Sep 17 00:00:00 2001
From: jomu <jomu@711a9084-f618-47a6-a783-754c49204487>
Date: Wed, 30 Sep 2015 06:30:38 +0000
Subject: [PATCH] optimized logging

---
 .../sharepoint/api/ServiceLogHandler.java     | 21 ++++++++++------
 .../shared/sharepoint/api/lists/SPLists.java  |  1 -
 .../sharepoint/api/usergroup/SPUserGroup.java | 25 +++++++++++++++----
 3 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/sharepoint/api/src/main/java/de/muehlencord/shared/sharepoint/api/ServiceLogHandler.java b/sharepoint/api/src/main/java/de/muehlencord/shared/sharepoint/api/ServiceLogHandler.java
index 0735159..7503f23 100644
--- a/sharepoint/api/src/main/java/de/muehlencord/shared/sharepoint/api/ServiceLogHandler.java
+++ b/sharepoint/api/src/main/java/de/muehlencord/shared/sharepoint/api/ServiceLogHandler.java
@@ -9,8 +9,10 @@ import javax.xml.soap.SOAPMessage;
 import javax.xml.ws.handler.MessageContext;
 import javax.xml.ws.handler.soap.SOAPHandler;
 import javax.xml.ws.handler.soap.SOAPMessageContext;
+import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+
 ;
 
 /**
@@ -19,7 +21,9 @@ import org.apache.logging.log4j.Logger;
  */
 public class ServiceLogHandler implements SOAPHandler<SOAPMessageContext> {
 
-    /** the logging object. */
+    /**
+     * the logging object.
+     */
     private final static Logger LOGGER = LogManager.getLogger(ServiceLogHandler.class);
 
     @Override
@@ -49,19 +53,20 @@ public class ServiceLogHandler implements SOAPHandler<SOAPMessageContext> {
 
     @Override
     public boolean handleMessage(SOAPMessageContext arg0) {
-        LOGGER.info("Test");
         SOAPMessage message = arg0.getMessage();
         boolean isOutboundMessage = (Boolean) arg0.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY);
-        if (isOutboundMessage) {
-            LOGGER.debug("OUTBOUND MESSAGE");
-        } else {
-            LOGGER.debug("INBOUND MESSAGE");
+        if (LOGGER.isTraceEnabled()) {
+            if (isOutboundMessage) {
+                LOGGER.log(Level.TRACE, "OUTBOUND MESSAGE");
+            } else {
+                LOGGER.log(Level.TRACE, "INBOUND MESSAGE");
+            }
         }
         try (ByteArrayOutputStream os = new ByteArrayOutputStream()) {
             message.writeTo(os);
-            LOGGER.debug(os.toString("UTF-8"));
+            LOGGER.log(Level.TRACE, os.toString("UTF-8"));
         } catch (SOAPException | IOException e) {
-            LOGGER.debug(e.toString(), e);
+            LOGGER.log(Level.DEBUG, e.toString(), e);
         }
 
         return true;
diff --git a/sharepoint/api/src/main/java/de/muehlencord/shared/sharepoint/api/lists/SPLists.java b/sharepoint/api/src/main/java/de/muehlencord/shared/sharepoint/api/lists/SPLists.java
index a45935b..cc6f92e 100644
--- a/sharepoint/api/src/main/java/de/muehlencord/shared/sharepoint/api/lists/SPLists.java
+++ b/sharepoint/api/src/main/java/de/muehlencord/shared/sharepoint/api/lists/SPLists.java
@@ -107,7 +107,6 @@ public class SPLists extends SPJaxbObject<de.muehlencord.shared.sharepoint.api.l
                     // Parse XML file                    
                     Element rootElement = (Element) content;
                     String listsString = SPObject.xmlToString(rootElement.getOwnerDocument());
-                    // System.out.println(listsString);
                     this.setValue(listsString);
                 }
             }
diff --git a/sharepoint/api/src/main/java/de/muehlencord/shared/sharepoint/api/usergroup/SPUserGroup.java b/sharepoint/api/src/main/java/de/muehlencord/shared/sharepoint/api/usergroup/SPUserGroup.java
index 8df0028..d978059 100644
--- a/sharepoint/api/src/main/java/de/muehlencord/shared/sharepoint/api/usergroup/SPUserGroup.java
+++ b/sharepoint/api/src/main/java/de/muehlencord/shared/sharepoint/api/usergroup/SPUserGroup.java
@@ -19,6 +19,9 @@ import javax.xml.bind.JAXBException;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.ws.BindingProvider;
 import javax.xml.ws.handler.Handler;
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.w3c.dom.Element;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
@@ -31,21 +34,24 @@ import org.xml.sax.SAXException;
  */
 public class SPUserGroup extends SPObject {
 
+    private final static Logger LOGGER = LogManager.getLogger(SPUserGroup.class.getName());
+
     public SPUserGroup(SPContext context) {
         super(context);
     }
 
     public void addUserToGroup(String userLoginName, String groupName) throws JAXBException, SAXException, ParserConfigurationException,
-        NoSuchAlgorithmException, IOException, KeyManagementException {
+            NoSuchAlgorithmException, IOException, KeyManagementException {
         SPUser user = getUser(userLoginName);
         if (user == null) {
             throw new SAXException("User not found");
         }
         getUserGroupPort().addUserToGroup(groupName, user.getUserName(), user.getUserLoginName(), user.getUserEmail(), user.getUserNotes());
+        LOGGER.info("User " + user.getUserName() + " added to group " + groupName);
     }
 
     public void removeUserFromGroup(String userLoginName, String groupName) throws NoSuchAlgorithmException, KeyManagementException, MalformedURLException,
-        JAXBException, SAXException {
+            JAXBException, SAXException {
         SPUser user = getUser(userLoginName);
         if (user == null) {
             throw new SAXException("User not found");
@@ -55,6 +61,7 @@ public class SPUserGroup extends SPObject {
         } else {
             getUserGroupPort().removeUserFromGroup(groupName, "i:0#.w|" + user.getUserLoginName());
         }
+        LOGGER.info("User " + user.getUserName() + " removed from group " + groupName);
 
     }
 
@@ -71,14 +78,22 @@ public class SPUserGroup extends SPObject {
                     Node userNode = userNodeList.item(i);
                     NamedNodeMap attributes = userNode.getAttributes();
                     if ((attributes.getNamedItem("LoginName") != null)
-                        && (attributes.getNamedItem("LoginName").getNodeValue().equals("i:0#.w|" + userLoginName))) {
+                            && (attributes.getNamedItem("LoginName").getNodeValue().equals("i:0#.w|" + userLoginName))) {
+                        if (LOGGER.isDebugEnabled()) {
+                            LOGGER.log(Level.DEBUG, "User " + userLoginName + " is member of group " + groupName);
+                        }
                         return true; // user found
-                    } else {
                     }
                 }
             }
+            if (LOGGER.isDebugEnabled()) {
+                LOGGER.log(Level.DEBUG, "User " + userLoginName + " is not a member of group " + groupName);
+            }
             return false;
         } else {
+            if (LOGGER.isDebugEnabled()) {
+                LOGGER.log(Level.DEBUG, "User " + userLoginName + " not found");
+            }
             return false;
         }
     }
@@ -120,7 +135,7 @@ public class SPUserGroup extends SPObject {
 
     // TODO does not return full object, how to refresh the object to get all attributes?
     public SPUser getUserFromEmail(String emailAddress) throws JAXBException, ParserConfigurationException, SAXException, IOException,
-        NoSuchAlgorithmException, KeyManagementException {
+            NoSuchAlgorithmException, KeyManagementException {
 
         String xml = "<Users><User Email=\"" + emailAddress + "\"/></Users>";
         EmailXml emailXml = new GetUserLoginFromEmail.EmailXml();