Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/xml
In directory
james.mmbase.org:/tmp/cvs-serv30736/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/xml
Modified Files:
XMLController.java XMLServlet.java
Log Message:
CMSC-907 Code Quality with PMD
Add final modifier to Util classes
Add final modifier to Logger instances
Change Boolean, Integer and Long instantiation to valueOf calls
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/xml
See also: http://www.mmbase.org/jira/browse/CMSC-907
Index: XMLController.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/xml/XMLController.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- XMLController.java 10 May 2008 16:31:23 -0000 1.8
+++ XMLController.java 16 May 2008 11:46:35 -0000 1.9
@@ -1,8 +1,8 @@
package com.finalist.cmsc.repository.xml;
import java.io.StringWriter;
-import java.util.*;
import java.text.DateFormat;
+import java.util.*;
import javax.xml.parsers.*;
import javax.xml.transform.*;
@@ -10,8 +10,8 @@
import javax.xml.transform.stream.StreamResult;
import net.sf.mmapps.commons.bridge.NodeFieldComparator;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.StringUtils;
import org.mmbase.bridge.*;
import org.mmbase.util.logging.Logger;
import org.mmbase.util.logging.Logging;
@@ -29,7 +29,7 @@
*/
public class XMLController {
- static Logger log =
Logging.getLoggerInstance(XMLController.class.getName());
+ private static final Logger log =
Logging.getLoggerInstance(XMLController.class.getName());
public final static List<String> defaultDisallowedTypes = new
ArrayList<String>();
public final static List<String> defaultDisallowedRelationTypes = new
ArrayList<String>();
@@ -112,8 +112,8 @@
return writeXml(document);
}
catch (Exception e) {
- e.printStackTrace();
- throw new Exception(e);
+ log.warn(Logging.stackTrace(e));
+ throw e;
}
}
@@ -125,8 +125,8 @@
return writeXml(document);
}
catch (Exception e) {
- e.printStackTrace();
- throw new Exception(e);
+ log.warn(Logging.stackTrace(e));
+ throw e;
}
}
@@ -138,8 +138,8 @@
return writeXml(document);
}
catch (Exception e) {
- e.printStackTrace();
- throw new Exception(e);
+ log.warn(Logging.stackTrace(e));
+ throw e;
}
}
@@ -159,21 +159,21 @@
NodeIterator nli1 = nodes.nodeIterator();
while (nli1.hasNext()) {
Node relatedNode = nli1.nextNode();
- nodesSeenButNotProcessed.add(new Integer(relatedNode.getNumber()));
+
nodesSeenButNotProcessed.add(Integer.valueOf(relatedNode.getNumber()));
}
NodeIterator nli = nodes.nodeIterator();
while (nli.hasNext()) {
Node n = nli.nextNode();
- nodesSeenButNotProcessed.remove(new Integer(n.getNumber()));
+ nodesSeenButNotProcessed.remove(Integer.valueOf(n.getNumber()));
toXmlNode(n, document, root, true, false, new HashMap<Integer,
Node>(), nodesSeenButNotProcessed);
}
return writeXml(document);
}
catch (Exception e) {
- e.printStackTrace();
- throw new Exception(e);
+ log.warn(Logging.stackTrace(e));
+ throw e;
}
}
@@ -192,8 +192,8 @@
return writeXml(document);
}
catch (Exception e) {
- e.printStackTrace();
- throw new Exception(e);
+ log.warn(Logging.stackTrace(e));
+ throw e;
}
}
@@ -228,9 +228,9 @@
toXmlFields(node, document, nodeElement, fieldsAsAttribute);
addExternalUrl(node, document, nodeElement, fieldsAsAttribute);
- processedNodes.put(new Integer(node.getNumber()), node);
+ processedNodes.put(Integer.valueOf(node.getNumber()), node);
- if (addRelations && !nodesSeenButNotProcessed.contains(new
Integer(node.getNumber()))) {
+ if (addRelations &&
!nodesSeenButNotProcessed.contains(Integer.valueOf(node.getNumber()))) {
RelationManagerList rml =
manager.getAllowedRelations((NodeManager) null, null, "DESTINATION");
RelationManagerIterator rmi = rml.relationManagerIterator();
while (rmi.hasNext()) {
@@ -242,7 +242,7 @@
}
}
}
- processedNodes.remove(new Integer(node.getNumber()));
+ processedNodes.remove(Integer.valueOf(node.getNumber()));
if (root != null) {
root.appendChild(nodeElement);
@@ -361,7 +361,7 @@
Object value = null;
if ("number".equals(fieldName)) {
- value = new Integer(node.getNumber());
+ value = Integer.valueOf(node.getNumber());
if (relationFields) {
fieldName = "relationnumber";
}
@@ -487,7 +487,7 @@
while (rli1.hasNext()) {
Relation relation = rli1.nextRelation();
Node relatedNode = relation.getDestination();
- nodesSeenButNotProcessed.add(new Integer(relatedNode.getNumber()));
+
nodesSeenButNotProcessed.add(Integer.valueOf(relatedNode.getNumber()));
}
RelationIterator rli = rl.relationIterator();
@@ -495,8 +495,8 @@
while (rli.hasNext()) {
Relation relation = rli.nextRelation();
Node relatedNode = relation.getDestination();
- if (!processedNodes.containsKey(new
Integer(relatedNode.getNumber()))) {
- nodesSeenButNotProcessed.remove(new
Integer(relatedNode.getNumber()));
+ if
(!processedNodes.containsKey(Integer.valueOf(relatedNode.getNumber()))) {
+
nodesSeenButNotProcessed.remove(Integer.valueOf(relatedNode.getNumber()));
toXmlNode(relatedNode, document, nodeElement, addRelations,
fieldsAsAttribute, processedNodes,
nodesSeenButNotProcessed);
toXmlFields(relation, document, (Element)
nodeElement.getLastChild(), true, true);
@@ -522,12 +522,12 @@
return
DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
}
catch (ParserConfigurationException e) {
- e.printStackTrace();
- throw new Exception(e);
+ log.warn(Logging.stackTrace(e));
+ throw e;
}
catch (FactoryConfigurationError e) {
- e.printStackTrace();
- throw new Exception(e);
+ log.warn(Logging.stackTrace(e));
+ throw e;
}
}
@@ -542,20 +542,20 @@
transformer.transform(new DOMSource(document), new
StreamResult(output));
}
catch (TransformerConfigurationException e) {
- e.printStackTrace();
- throw new Exception(e);
+ log.warn(Logging.stackTrace(e));
+ throw e;
}
catch (IllegalArgumentException e) {
- e.printStackTrace();
- throw new Exception(e);
+ log.warn(Logging.stackTrace(e));
+ throw e;
}
catch (TransformerFactoryConfigurationError e) {
- e.printStackTrace();
- throw new Exception(e);
+ log.warn(Logging.stackTrace(e));
+ throw e;
}
catch (TransformerException e) {
- e.printStackTrace();
- throw new Exception(e);
+ log.warn(Logging.stackTrace(e));
+ throw e;
}
return output.toString();
}
Index: XMLServlet.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/xml/XMLServlet.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- XMLServlet.java 10 May 2008 16:31:23 -0000 1.10
+++ XMLServlet.java 16 May 2008 11:46:35 -0000 1.11
@@ -2,14 +2,14 @@
import java.io.IOException;
import java.io.InputStream;
-import java.util.*;
+import java.util.Arrays;
+import java.util.List;
import javax.servlet.http.*;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.TransformerException;
import net.sf.mmapps.commons.util.HttpUtil;
-import org.apache.commons.lang.StringUtils;
import net.sf.mmapps.modules.cloudprovider.CloudProviderFactory;
import org.apache.commons.lang.StringUtils;
@@ -38,7 +38,7 @@
/**
* MMBase logging system
*/
- static Logger log = Logging.getLoggerInstance(XMLServlet.class.getName());
+ static final Logger log =
Logging.getLoggerInstance(XMLServlet.class.getName());
private static final String CHANNEL = "channel";
private static final String CONTENT_TYPE = "contentType";
@@ -293,7 +293,7 @@
if (previewdateParam != null) {
Integer date = null;
if (previewdateParam.matches("^\\d+$")) {
- date = new Integer(previewdateParam);
+ date = Integer.valueOf(previewdateParam);
ContentElementUtil.addLifeCycleConstraint(query, date);
}
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
