Author: lindner
Date: Thu Jan 15 05:29:29 2009
New Revision: 734699

URL: http://svn.apache.org/viewvc?rev=734699&view=rev
Log:
SHINDIG-833 | wrap fine/finest logging calls

Modified:
    
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/JsonContainerConfig.java
    
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetFeatureRegistry.java
    
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsFeatureLoader.java
    
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsLibrary.java
    
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanAtomConverter.java
    
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanXmlConverter.java
    
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataServiceServlet.java

Modified: 
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/JsonContainerConfig.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/JsonContainerConfig.java?rev=734699&r1=734698&r2=734699&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/JsonContainerConfig.java
 (original)
+++ 
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/JsonContainerConfig.java
 Thu Jan 15 05:29:29 2009
@@ -40,6 +40,7 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.logging.Logger;
+import java.util.logging.Level;
 
 /**
  * Represents a container configuration using JSON notation.
@@ -143,7 +144,7 @@
             }
           loadFromString(ResourceLoader.getContent(file));
         } else {
-            LOG.finest(file.getAbsolutePath() + " doesn't seem to be a JS or 
JSON file.");
+            if (LOG.isLoggable(Level.FINEST)) 
LOG.finest(file.getAbsolutePath() + " doesn't seem to be a JS or JSON file.");
         }
       }
     } catch (IOException e) {

Modified: 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetFeatureRegistry.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetFeatureRegistry.java?rev=734699&r1=734698&r2=734699&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetFeatureRegistry.java
 (original)
+++ 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetFeatureRegistry.java
 Thu Jan 15 05:29:29 2009
@@ -33,6 +33,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.logging.Logger;
+import java.util.logging.Level;
 
 /**
  * Maintains a registry of all {...@code GadgetFeature} types supported by
@@ -85,7 +86,7 @@
       throw new IllegalStateException("register should never be " +
           "invoked after calling getLibraries");
     }
-    logger.fine("Registering feature: " + feature.getName());
+    if (logger.isLoggable(Level.FINE)) logger.fine("Registering feature: " + 
feature.getName());
     if (isCore(feature)) {
       core.put(feature.getName(), feature);
       for (GadgetFeature feat : features.values()) {

Modified: 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsFeatureLoader.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsFeatureLoader.java?rev=734699&r1=734698&r2=734699&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsFeatureLoader.java
 (original)
+++ 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsFeatureLoader.java
 Thu Jan 15 05:29:29 2009
@@ -38,6 +38,7 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.logging.Logger;
+import java.util.logging.Level;
 
 /**
  * Provides a mechanism for loading a group of js features from a directory.
@@ -148,7 +149,7 @@
           features.add(feature);
         }
       } else {
-          logger.finest(file.getAbsolutePath() + " doesn't seem to be an XML 
file.");
+          if (logger.isLoggable(Level.FINEST)) 
logger.finest(file.getAbsolutePath() + " doesn't seem to be an XML file.");
       }
     }
   }

Modified: 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsLibrary.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsLibrary.java?rev=734699&r1=734698&r2=734699&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsLibrary.java
 (original)
+++ 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsLibrary.java
 Thu Jan 15 05:29:29 2009
@@ -154,7 +154,7 @@
    * @return The contents of the file or resource named by @code name.
    */
   private static String loadData(String name, Type type) {
-    logger.fine("Loading js from: " + name + " type: " + type.toString());
+    if (logger.isLoggable(Level.FINE)) logger.fine("Loading js from: " + name 
+ " type: " + type.toString());
     if (type == Type.FILE) {
       return loadFile(name);
     } else if (type == Type.RESOURCE) {

Modified: 
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanAtomConverter.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanAtomConverter.java?rev=734699&r1=734698&r2=734699&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanAtomConverter.java
 (original)
+++ 
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanAtomConverter.java
 Thu Jan 15 05:29:29 2009
@@ -72,7 +72,7 @@
     try {
       writer.write("response", obj);
       toReturn =toReturn+ outputWriter.toString();
-      logger.finest("XML is: " + toReturn + "\n **** \n\n");
+      if (logger.isLoggable(Level.FINEST)) logger.finest("XML is: " + toReturn 
+ "\n **** \n\n");
 
     } catch (SAXException e) {
       logger.log(Level.SEVERE, e.getMessage(), e);
@@ -84,7 +84,7 @@
       try {
         writer.close();
       } catch (IOException e) {
-        logger.log(Level.FINEST, e.getMessage(), e);
+        if (logger.isLoggable(Level.FINEST)) logger.log(Level.FINEST, 
e.getMessage(), e);
       }
     }
 

Modified: 
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanXmlConverter.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanXmlConverter.java?rev=734699&r1=734698&r2=734699&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanXmlConverter.java
 (original)
+++ 
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanXmlConverter.java
 Thu Jan 15 05:29:29 2009
@@ -69,7 +69,7 @@
     try {
       writer.write("response", obj);
       toReturn = outputWriter.toString();
-      logger.finest("XML is: " + toReturn + "\n **** \n\n");
+      if (logger.isLoggable(Level.FINEST)) logger.finest("XML is: " + toReturn 
+ "\n **** \n\n");
 
     } catch (SAXException e) {
       logger.log(Level.SEVERE, e.getMessage(), e);
@@ -81,7 +81,7 @@
       try {
         writer.close();
       } catch (IOException e) {
-        logger.log(Level.FINEST, e.getMessage(), e);
+        if (logger.isLoggable(Level.FINEST)) logger.log(Level.FINEST, 
e.getMessage(), e);
       }
     }
 

Modified: 
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataServiceServlet.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataServiceServlet.java?rev=734699&r1=734698&r2=734699&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataServiceServlet.java
 (original)
+++ 
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataServiceServlet.java
 Thu Jan 15 05:29:29 2009
@@ -26,6 +26,7 @@
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.logging.Logger;
+import java.util.logging.Level;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -42,8 +43,7 @@
 
   public static final String CONTENT_TYPE = "CONTENT_TYPE";
 
-  private static final Logger logger = Logger.getLogger(
-      "org.apache.shindig.social.opensocial.spi");
+  private static final Logger logger = 
Logger.getLogger("org.apache.shindig.social.opensocial.spi");
 
   @Override
   protected void doGet(HttpServletRequest servletRequest,
@@ -70,7 +70,7 @@
   protected void doPost(HttpServletRequest servletRequest,
       HttpServletResponse servletResponse)
       throws ServletException, IOException {
-    logger.finest("Handling restful request for " + 
servletRequest.getPathInfo());
+    if (logger.isLoggable(Level.FINEST)) logger.finest("Handling restful 
request for " + servletRequest.getPathInfo());
 
     setCharacterEncodings(servletRequest, servletResponse);
 
@@ -126,13 +126,13 @@
       formatString = servletRequest.getParameter(FORMAT_PARAM);
     } catch (Throwable t) {
       // this happens while testing
-      logger.fine("Unexpected error : format param is null " + t.toString());
+      if (logger.isLoggable(Level.FINE)) logger.fine("Unexpected error : 
format param is null " + t.toString());
     }
     try {
       contentType = servletRequest.getHeader(CONTENT_TYPE);
     } catch (Throwable t) {
       //this happens while testing
-      logger.fine("Unexpected error : content type is null " + t.toString());
+      if (logger.isLoggable(Level.FINE)) logger.fine("Unexpected error : 
content type is null " + t.toString());
     }
 
     if (contentType != null) {


Reply via email to