Author: dbrosius
Date: Fri Jan 1 14:16:21 2016
New Revision: 1722495
URL: http://svn.apache.org/viewvc?rev=1722495&view=rev
Log:
use slf4j parameterized logging
Modified:
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImportHandler.java
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImporterImpl.java
Modified:
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImportHandler.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImportHandler.java?rev=1722495&r1=1722494&r2=1722495&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImportHandler.java
(original)
+++
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImportHandler.java
Fri Jan 1 14:16:21 2016
@@ -81,25 +81,22 @@ public class ImportHandler extends Defau
@Override
public void warning(SAXParseException e) throws SAXException {
// log exception and carry on...
- log.warn("warning encountered at line: " + e.getLineNumber()
- + ", column: " + e.getColumnNumber()
- + " while parsing XML stream", e);
+ log.warn("warning encountered at line: {}, column: {} while parsing
XML stream",
+ e.getLineNumber(), e.getColumnNumber(), e);
}
@Override
public void error(SAXParseException e) throws SAXException {
// log exception and carry on...
- log.error("error encountered at line: " + e.getLineNumber()
- + ", column: " + e.getColumnNumber()
- + " while parsing XML stream: " + e.toString());
+ log.error("error encountered at line: {}, column: {} while parsing XML
stream",
+ e.getLineNumber(), e.getColumnNumber(), e);
}
@Override
public void fatalError(SAXParseException e) throws SAXException {
// log and re-throw exception
- log.error("fatal error encountered at line: " + e.getLineNumber()
- + ", column: " + e.getColumnNumber()
- + " while parsing XML stream: " + e.toString());
+ log.error("fatal error encountered at line: {}, column: {} while
parsing XML stream",
+ e.getLineNumber(), e.getColumnNumber(), e);
throw e;
}
Modified:
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImporterImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImporterImpl.java?rev=1722495&r1=1722494&r2=1722495&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImporterImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImporterImpl.java
Fri Jan 1 14:16:21 2016
@@ -280,7 +280,7 @@ public class ImporterImpl implements Imp
PropertyDefinition def =
pi.getPropertyDef(effectiveNodeTypeProvider.getEffectiveNodeType(tree));
if (def.isProtected()) {
// skip protected property
- log.debug("Protected property " + pi.getName());
+ log.debug("Protected property {}", pi.getName());
// notify the ProtectedPropertyImporter.
for (ProtectedPropertyImporter ppi : getPropertyImporters()) {
@@ -344,7 +344,7 @@ public class ImporterImpl implements Imp
String ntName = nodeInfo.getPrimaryTypeName();
if (parent == null) {
- log.debug("Skipping node: " + nodeName);
+ log.debug("Skipping node: {}", nodeName);
// parent node was skipped, skip this child node too
parents.push(null); // push null onto stack for skipped node
// notify the p-i-importer
@@ -358,7 +358,7 @@ public class ImporterImpl implements Imp
if (parentDef.isProtected()) {
// skip protected node
parents.push(null);
- log.debug("Skipping protected node: " + nodeName);
+ log.debug("Skipping protected node: {}", nodeName);
if (pnImporter != null) {
// pnImporter was already started (current nodeInfo is a
sibling)
@@ -406,7 +406,7 @@ public class ImporterImpl implements Imp
is the a leaf in the tree to be imported 'end' will
not have an effect on the importer, that was never
started.
*/
- log.debug("Skipping protected node: " + existing);
+ log.debug("Skipping protected node: {}", existing);
parents.push(existing);
/**
* let ProtectedPropertyImporters handle the properties
@@ -456,7 +456,7 @@ public class ImporterImpl implements Imp
if (tree == null) {
// no new node has been created, so skip this node
parents.push(null); // push null onto stack for
skipped node
- log.debug("Skipping existing node " +
nodeInfo.getName());
+ log.debug("Skipping existing node {}",
nodeInfo.getName());
return;
}
} else {
