Merge pull request #22 from BBE78/bugfix/#36

Migration to SLF4J
EXIficient · Apr 3, 2023 · 9ce14e6 · 9ce14e6
2 parents bcdc223 + f9784cb
commit 9ce14e6
Show file tree

Hide file tree

Showing 7 changed files with 83 additions and 123 deletions.
diff --git a/pom.xml b/pom.xml
@@ -49,6 +49,11 @@
 			<artifactId>exificient-core</artifactId>
 			<version>1.0.5-SNAPSHOT</version>
 		</dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>2.0.6</version>
+        </dependency>
 		<!-- Runtime Dependencies (schema-informed mode) -->
 		<dependency>
 			<groupId>xerces</groupId>
@@ -75,6 +80,12 @@
 			<version>1.0.4</version><!-- -SNAPSHOT -->
 			<scope>test</scope>
 		</dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <version>2.0.6</version>
+            <scope>test</scope>
+        </dependency>
 	</dependencies>
 
 	<properties>

diff --git a/src/main/java/com/siemens/ct/exi/grammars/EXIContentModelBuilder.java b/src/main/java/com/siemens/ct/exi/grammars/EXIContentModelBuilder.java
@@ -62,6 +62,8 @@
 import org.apache.xerces.xs.XSParticle;
 import org.apache.xerces.xs.XSTerm;
 import org.apache.xerces.xs.XSWildcard;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.siemens.ct.exi.core.exceptions.EXIException;
 import com.siemens.ct.exi.core.grammars.event.AttributeGeneric;
@@ -86,7 +88,8 @@
 public abstract class EXIContentModelBuilder extends CMBuilder implements
 		XMLErrorHandler {
 
-	private static final boolean DEBUG = false;
+	/** The logger used in this class. */
+	private static final Logger LOGGER = LoggerFactory.getLogger(EXIContentModelBuilder.class);
 
 	protected static final Event END_ELEMENT = new EndElement();
 	protected static final Event START_ELEMENT_GENERIC = new StartElementGeneric();
@@ -333,9 +336,7 @@ protected SchemaInformedGrammar handleParticle(XSComplexTypeDefinition ctd,
 
 			CMState startState = new CMState(possibleElements, isEnd, state,
 					elementsMaxOccursUnbounded, occurenceInfo);
-			if (DEBUG) {
-				System.out.println("Start = " + startState);
-			}
+			LOGGER.debug("Start = {}", startState);
 
 			Map<CMState, SchemaInformedGrammar> knownStates = new HashMap<CMState, SchemaInformedGrammar>();
 			addNewState(knownStates, startState, isMixedContent);
@@ -568,10 +569,7 @@ protected List<XSElementDeclaration> getPossibleElementDeclarations(
 
 	private static void printTransition(CMState startState, XSObject xs,
 			CMState nextState) {
-		if (DEBUG) {
-			System.out.println("\t" + startState + " --> " + xs + " --> "
-					+ nextState);
-		}
+		LOGGER.debug("\t{} --> {} --> {}", startState, xs, nextState);
 	}
 
 	/*

diff --git a/src/main/java/com/siemens/ct/exi/grammars/persistency/Grammars2JSON.java b/src/main/java/com/siemens/ct/exi/grammars/persistency/Grammars2JSON.java
@@ -32,6 +32,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.siemens.ct.exi.core.context.GrammarContext;
 import com.siemens.ct.exi.core.context.GrammarUriContext;
 import com.siemens.ct.exi.core.context.QNameContext;
@@ -72,6 +75,9 @@
 
 public class Grammars2JSON {
 
+	/** The logger used in this class. */
+	private static final Logger LOGGER = LoggerFactory.getLogger(Grammars2JSON.class);
+
 	public static final PrintStream ps = System.out;
 
 	public static final boolean STATS_ON = true;
@@ -546,7 +552,7 @@ protected void printGrammarProduction(Writer w, int ind,
 						GrammarsConstants.CHARACTERS_GENERIC);
 				break;
 			default:
-				System.err.println("Unknown Event " + ei.getEvent());
+				LOGGER.error("Unknown Event {}", ei.getEvent());
 			}
 
 			// next state ID

diff --git a/src/main/java/com/siemens/ct/exi/grammars/persistency/Grammars2JavaSourceCode.java b/src/main/java/com/siemens/ct/exi/grammars/persistency/Grammars2JavaSourceCode.java
@@ -11,6 +11,9 @@
 import java.io.StringWriter;
 import java.math.BigInteger;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.siemens.ct.exi.core.context.GrammarContext;
 import com.siemens.ct.exi.core.context.GrammarUriContext;
 import com.siemens.ct.exi.core.context.QNameContext;
@@ -46,6 +49,9 @@
 
 public class Grammars2JavaSourceCode {
 
+	/** The logger used in this class. */
+	private static final Logger LOGGER = LoggerFactory.getLogger(Grammars2JavaSourceCode.class);
+
 	protected static final String TOKEN_GRAMMAR_CONTEXT_BEGIN = "/* BEGIN GrammarContext ----- */";
 	protected static final String TOKEN_GRAMMAR_CONTEXT_END = "/* END GrammarContext ----- */";
 
@@ -399,8 +405,7 @@ public void generateCode() throws IOException {
 				SchemaInformedStartTag sist = (SchemaInformedStartTag) r;
 				Grammar elementContentGrammar = sist.getElementContentGrammar();
 				if (elementContentGrammar instanceof SchemaInformedStartTag) {
-					System.err.println("Error for " + sist + " and "
-							+ elementContentGrammar);
+					LOGGER.error("Error for {} and {}", sist, elementContentGrammar);
 				}
 				int elementContentGrammarID = gpreps
 						.getGrammarID(elementContentGrammar);

diff --git a/src/main/java/com/siemens/ct/exi/grammars/regex/REUtil.java b/src/main/java/com/siemens/ct/exi/grammars/regex/REUtil.java
@@ -21,6 +21,9 @@
 
 import java.text.CharacterIterator;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 //import org.apache.xerces.impl.xpath.regex.Match;
 //import org.apache.xerces.impl.xpath.regex.ParseException;
 
@@ -30,6 +33,10 @@
  * @version $Id: REUtil.java 828015 2009-10-21 13:56:13Z knoaman $
  */
 public final class REUtil {
+
+	/** The logger used in this class. */
+	private static final Logger LOGGER = LoggerFactory.getLogger(REUtil.class);
+
 	private REUtil() {
 	}
 
@@ -229,7 +236,7 @@ public static void main(String[] argv) {
 					else if (target == null)
 						target = argv[i];
 					else
-						System.err.println("Unnecessary: " + argv[i]);
+						LOGGER.warn("Unnecessary: {}", argv[i]);
 				} else if (argv[i].equals("-i")) {
 					options += "i";
 				} else if (argv[i].equals("-m")) {
@@ -243,7 +250,7 @@ else if (target == null)
 				} else if (argv[i].equals("-X")) {
 					options += "X";
 				} else {
-					System.err.println("Unknown option: " + argv[i]);
+					LOGGER.warn("Unknown option: {}", argv[i]);
 				}
 			}
 			RegularExpression reg = new RegularExpression(pattern, options);
@@ -264,24 +271,9 @@ else if (target == null)
 				}
 			}
 		} catch (ParseException pe) {
-			if (pattern == null) {
-				pe.printStackTrace();
-			} else {
-				System.err
-						.println("org.apache.xerces.utils.regex.ParseException: "
-								+ pe.getMessage());
-				String indent = "        ";
-				System.err.println(indent + pattern);
-				int loc = pe.getLocation();
-				if (loc >= 0) {
-					System.err.print(indent);
-					for (int i = 0; i < loc; i++)
-						System.err.print("-");
-					System.err.println("^");
-				}
-			}
+			LOGGER.error("unexpected ParseException", pe);
 		} catch (Exception e) {
-			e.printStackTrace();
+			LOGGER.error("unexpected error", e);
 		}
 	}
 

diff --git a/src/main/java/com/siemens/ct/exi/grammars/regex/RangeToken.java b/src/main/java/com/siemens/ct/exi/grammars/regex/RangeToken.java
@@ -1,5 +1,8 @@
 package com.siemens.ct.exi.grammars.regex;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -30,6 +33,9 @@ final class RangeToken extends Token implements java.io.Serializable {
 
 	private static final long serialVersionUID = -553983121197679934L;
 
+	/** The logger used in this class. */
+	private static final Logger LOGGER = LoggerFactory.getLogger(RangeToken.class);
+
 	int[] ranges;
 	boolean sorted;
 	boolean compacted;
@@ -129,7 +135,6 @@ protected void sortRanges() {
 	 * this.ranges is sorted.
 	 */
 	protected void compactRanges() {
-		boolean DEBUG = false;
 		if (this.ranges == null || this.ranges.length <= 2)
 			return;
 		if (this.isCompacted())
@@ -148,39 +153,33 @@ protected void compactRanges() {
 				if (baseend + 1 < this.ranges[target])
 					break;
 				if (baseend + 1 == this.ranges[target]) {
-					if (DEBUG)
-						System.err
-								.println("Token#compactRanges(): Compaction: ["
-										+ this.ranges[base] + ", "
-										+ this.ranges[base + 1] + "], ["
-										+ this.ranges[target] + ", "
-										+ this.ranges[target + 1] + "] -> ["
-										+ this.ranges[base] + ", "
-										+ this.ranges[target + 1] + "]");
+					LOGGER.debug("Token#compactRanges(): Compaction: [{}, {}], [{}, {}] -> [{}, {}]",
+							this.ranges[base],
+							this.ranges[base + 1],
+							this.ranges[target],
+							this.ranges[target + 1],
+							this.ranges[base],
+							this.ranges[target + 1]);
 					this.ranges[base + 1] = this.ranges[target + 1];
 					baseend = this.ranges[base + 1];
 					target += 2;
 				} else if (baseend >= this.ranges[target + 1]) {
-					if (DEBUG)
-						System.err
-								.println("Token#compactRanges(): Compaction: ["
-										+ this.ranges[base] + ", "
-										+ this.ranges[base + 1] + "], ["
-										+ this.ranges[target] + ", "
-										+ this.ranges[target + 1] + "] -> ["
-										+ this.ranges[base] + ", "
-										+ this.ranges[base + 1] + "]");
+					LOGGER.debug("Token#compactRanges(): Compaction: [{}, {}], [{}, {}] -> [{}, {}]",
+							this.ranges[base],
+							this.ranges[base + 1],
+							this.ranges[target],
+							this.ranges[target + 1],
+							this.ranges[base],
+							this.ranges[base + 1]);
 					target += 2;
 				} else if (baseend < this.ranges[target + 1]) {
-					if (DEBUG)
-						System.err
-								.println("Token#compactRanges(): Compaction: ["
-										+ this.ranges[base] + ", "
-										+ this.ranges[base + 1] + "], ["
-										+ this.ranges[target] + ", "
-										+ this.ranges[target + 1] + "] -> ["
-										+ this.ranges[base] + ", "
-										+ this.ranges[target + 1] + "]");
+					LOGGER.debug("Token#compactRanges(): Compaction: [{}, {}], [{}, {}] -> [{}, {}]",
+							this.ranges[base],
+							this.ranges[base + 1],
+							this.ranges[target],
+							this.ranges[target + 1],
+							this.ranges[base],
+							this.ranges[target + 1]);
 					this.ranges[base + 1] = this.ranges[target + 1];
 					baseend = this.ranges[base + 1];
 					target += 2;
@@ -500,19 +499,6 @@ synchronized RangeToken getCaseInsensitiveToken() {
 		return lowers;
 	}
 
-	void dumpRanges() {
-		System.err.print("RANGE: ");
-		if (this.ranges == null) {
-			System.err.println(" NULL");
-			return;
-		}
-		for (int i = 0; i < this.ranges.length; i += 2) {
-			System.err.print("[" + this.ranges[i] + "," + this.ranges[i + 1]
-					+ "] ");
-		}
-		System.err.println("");
-	}
-
 	boolean match(int ch) {
 		if (this.map == null)
 			this.createMap();