From d2b2d188e6a473419deecf4e029ac0afc0bcc09f Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Sun, 20 Nov 2011 14:05:19 +0100
Subject: [PATCH] improve logging

---
 .../scm/client/AbstractClientHandler.java     | 25 +++++++++++++++++--
 .../scm/client/JerseyClientProvider.java      | 21 +++++++++++++---
 2 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/scm-clients/scm-client-impl/src/main/java/sonia/scm/client/AbstractClientHandler.java b/scm-clients/scm-client-impl/src/main/java/sonia/scm/client/AbstractClientHandler.java
index 963c3cdbda..0e29456adc 100644
--- a/scm-clients/scm-client-impl/src/main/java/sonia/scm/client/AbstractClientHandler.java
+++ b/scm-clients/scm-client-impl/src/main/java/sonia/scm/client/AbstractClientHandler.java
@@ -35,6 +35,9 @@ package sonia.scm.client;
 
 //~--- non-JDK imports --------------------------------------------------------
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import sonia.scm.ModelObject;
 import sonia.scm.url.UrlProvider;
 import sonia.scm.util.AssertUtil;
@@ -58,6 +61,12 @@ public abstract class AbstractClientHandler<T extends ModelObject>
         implements ClientHandler<T>
 {
 
+  /** the logger for AbstractClientHandler */
+  private static final Logger logger =
+    LoggerFactory.getLogger(AbstractClientHandler.class);
+
+  //~--- constructors ---------------------------------------------------------
+
   /**
    * Constructs ...
    *
@@ -234,7 +243,15 @@ public abstract class AbstractClientHandler<T extends ModelObject>
   public List<T> getAll()
   {
     List<T> items = null;
-    WebResource resource = client.resource(getItemsUrl());
+    String url = getItemsUrl();
+
+    if (logger.isDebugEnabled())
+    {
+      logger.debug("fetch all items of {} from url", itemClass.getSimpleName(),
+                   url);
+    }
+
+    WebResource resource = client.resource(url);
     ClientResponse response = null;
 
     try
@@ -284,6 +301,11 @@ public abstract class AbstractClientHandler<T extends ModelObject>
    */
   protected T getItemByUrl(String url)
   {
+    if (logger.isDebugEnabled())
+    {
+      logger.debug("fetch item {} from url {}", itemClass.getSimpleName(), url);
+    }
+
     T item = null;
     WebResource resource = client.resource(url);
     ClientResponse response = null;
@@ -321,5 +343,4 @@ public abstract class AbstractClientHandler<T extends ModelObject>
 
   /** Field description */
   private Class<T> itemClass;
-  ;
 }
diff --git a/scm-clients/scm-client-impl/src/main/java/sonia/scm/client/JerseyClientProvider.java b/scm-clients/scm-client-impl/src/main/java/sonia/scm/client/JerseyClientProvider.java
index cbe5627f90..8c38f83eb1 100644
--- a/scm-clients/scm-client-impl/src/main/java/sonia/scm/client/JerseyClientProvider.java
+++ b/scm-clients/scm-client-impl/src/main/java/sonia/scm/client/JerseyClientProvider.java
@@ -124,8 +124,14 @@ public class JerseyClientProvider implements ScmClientProvider
 
     if (Util.isNotEmpty(username) && Util.isNotEmpty(password))
     {
-      WebResource resource = ClientUtil.createResource(client,
-                               urlProvider.getAuthenticationUrl(),
+      String authUrl = urlProvider.getAuthenticationUrl();
+
+      if (logger.isDebugEnabled())
+      {
+        logger.debug("try login at {}", authUrl);
+      }
+
+      WebResource resource = ClientUtil.createResource(client, authUrl,
                                enableLogging);
 
       if (logger.isDebugEnabled())
@@ -142,8 +148,15 @@ public class JerseyClientProvider implements ScmClientProvider
     }
     else
     {
-      WebResource resource = ClientUtil.createResource(client,
-                               urlProvider.getStateUrl(), enableLogging);
+      String stateUrl = urlProvider.getStateUrl();
+
+      if (logger.isDebugEnabled())
+      {
+        logger.debug("retrive state from {}", stateUrl);
+      }
+
+      WebResource resource = ClientUtil.createResource(client, stateUrl,
+                               enableLogging);
 
       if (logger.isDebugEnabled())
       {