changed log4j2 notation for slf4j

CaboLabs · Aug 22, 2024 · 5d78fd1 · 5d78fd1
1 parent 8aec98b
commit 5d78fd1
Show file tree

Hide file tree

Showing 29 changed files with 10 additions and 33 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,2 +1,2 @@
-version = 2.0.1
+version = 2.0.2
 group = com.cabolabs
diff --git a/opt.bat b/opt.bat
@@ -1 +1 @@
-java -cp "./lib/*;%GROOVY_HOME%/embeddable/groovy-all-2.4.7.jar;build/libs/opt-2.0.1.jar" com.cabolabs.openehr.opt.Main %1 %2 %3 %4 %5 %6 %7
+java -cp "./lib/*;%GROOVY_HOME%/embeddable/groovy-all-2.4.7.jar;build/libs/opt-2.0.2.jar" com.cabolabs.openehr.opt.Main %1 %2 %3 %4 %5 %6 %7
diff --git a/opt.sh b/opt.sh
@@ -1 +1 @@
-java -cp "./lib/*:$GROOVY_HOME/lib/*:build/libs/opt-2.0.1.jar" com.cabolabs.openehr.opt.Main $1 $2 $3 $4 $5 $6 $7
+java -cp "./lib/*:$GROOVY_HOME/lib/*:build/libs/opt-2.0.2.jar" com.cabolabs.openehr.opt.Main $1 $2 $3 $4 $5 $6 $7
diff --git a/src/main/groovy/com/cabolabs/openehr/formats/OpenEhrJsonParser.groovy b/src/main/groovy/com/cabolabs/openehr/formats/OpenEhrJsonParser.groovy
@@ -35,7 +35,7 @@ import com.cabolabs.openehr.dto_1_0_2.demographic.*
 import com.cabolabs.openehr.opt.instance_validation.JsonInstanceValidation
 import groovy.json.JsonSlurper
 
-@groovy.util.logging.Log4j2
+@groovy.util.logging.Slf4j
 class OpenEhrJsonParser {
 
    def jsonValidator

diff --git a/src/main/groovy/com/cabolabs/openehr/formats/OpenEhrJsonParserQuick.groovy b/src/main/groovy/com/cabolabs/openehr/formats/OpenEhrJsonParserQuick.groovy
@@ -39,7 +39,7 @@ import groovy.json.JsonSlurper
  * This is the same as the original JsonParser but doesn't generate the paths for pathable, those can be
  * calculated later. So for uses that don't require the paths in the RM instances, this will be faster.
  */
-@groovy.util.logging.Log4j2
+@groovy.util.logging.Slf4j
 class OpenEhrJsonParserQuick {
 
    //private Logger log = LogManager.getLogger(getClass())

diff --git a/src/main/groovy/com/cabolabs/openehr/formats/OpenEhrXmlParser.groovy b/src/main/groovy/com/cabolabs/openehr/formats/OpenEhrXmlParser.groovy
@@ -41,7 +41,6 @@ import com.cabolabs.openehr.opt.instance_validation.*
 //import groovy.xml.XmlSlurper
 //import groovy.xml.slurpersupport.GPathResult
 
-@groovy.util.logging.Log4j2
 class OpenEhrXmlParser {
 
    def schemaValidate = false

diff --git a/src/main/groovy/com/cabolabs/openehr/opt/manager/OptManager.groovy b/src/main/groovy/com/cabolabs/openehr/opt/manager/OptManager.groovy
@@ -9,7 +9,7 @@ import groovy.transform.Synchronized
 import groovy.time.TimeCategory
 import groovy.time.TimeDuration
 
-@groovy.util.logging.Log4j2
+@groovy.util.logging.Slf4j
 class OptManager {
 
    //private Logger log = LogManager.getLogger(getClass())

diff --git a/src/main/groovy/com/cabolabs/openehr/opt/manager/OptRepositoryFSImpl.groovy b/src/main/groovy/com/cabolabs/openehr/opt/manager/OptRepositoryFSImpl.groovy
@@ -5,7 +5,7 @@ import net.pempek.unicode.UnicodeBOMInputStream
 // import org.apache.logging.log4j.LogManager
 import java.io.FileNotFoundException
 
-@groovy.util.logging.Log4j2
+@groovy.util.logging.Slf4j
 class OptRepositoryFSImpl implements OptRepository {
 
    private static String PS = File.separator

diff --git a/src/main/groovy/com/cabolabs/openehr/opt/model/ArchetypeSlot.groovy b/src/main/groovy/com/cabolabs/openehr/opt/model/ArchetypeSlot.groovy
@@ -2,7 +2,6 @@ package com.cabolabs.openehr.opt.model
 
 import com.cabolabs.openehr.opt.model.primitive.CPrimitive
 
-@groovy.util.logging.Log4j2
 class ArchetypeSlot extends ObjectNode {
 
    // TODO: assertion

diff --git a/src/main/groovy/com/cabolabs/openehr/opt/model/AttributeNode.groovy b/src/main/groovy/com/cabolabs/openehr/opt/model/AttributeNode.groovy
@@ -1,6 +1,5 @@
 package com.cabolabs.openehr.opt.model
 
-@groovy.util.logging.Log4j2
 class AttributeNode extends Constraint {
 
    // AOM type

diff --git a/src/main/groovy/com/cabolabs/openehr/opt/model/ObjectNode.groovy b/src/main/groovy/com/cabolabs/openehr/opt/model/ObjectNode.groovy
@@ -3,7 +3,7 @@ package com.cabolabs.openehr.opt.model
 import java.util.Map
 import groovy.util.slurpersupport.GPathResult
 
-@groovy.util.logging.Log4j2
+@groovy.util.logging.Slf4j
 class ObjectNode extends Constraint {
 
    OperationalTemplate owner

diff --git a/src/main/groovy/com/cabolabs/openehr/opt/model/OperationalTemplate.groovy b/src/main/groovy/com/cabolabs/openehr/opt/model/OperationalTemplate.groovy
@@ -4,7 +4,7 @@ package com.cabolabs.openehr.opt.model
 import com.cabolabs.openehr.rm_1_0_2.Model
 import com.cabolabs.openehr.opt.model.primitive.*
 
-@groovy.util.logging.Log4j2
+@groovy.util.logging.Slf4j
 class OperationalTemplate {
 
    String uid

diff --git a/src/main/groovy/com/cabolabs/openehr/opt/model/PrimitiveObjectNode.groovy b/src/main/groovy/com/cabolabs/openehr/opt/model/PrimitiveObjectNode.groovy
@@ -2,7 +2,6 @@ package com.cabolabs.openehr.opt.model
 
 import com.cabolabs.openehr.opt.model.primitive.CPrimitive
 
-@groovy.util.logging.Log4j2
 class PrimitiveObjectNode extends ObjectNode {
 
    CPrimitive item

diff --git a/src/main/groovy/com/cabolabs/openehr/opt/model/domain/CCodePhrase.groovy b/src/main/groovy/com/cabolabs/openehr/opt/model/domain/CCodePhrase.groovy
@@ -5,8 +5,6 @@ import com.cabolabs.openehr.opt.model.validation.ValidationResult
 //import com.cabolabs.openehr.rm_1_0_2.common.archetyped.Pathable
 import com.cabolabs.openehr.rm_1_0_2.data_types.text.CodePhrase
 
-
-@groovy.util.logging.Log4j2
 class CCodePhrase extends ObjectNode {
 
    // CODE LIST CONSTRAINT
@@ -64,8 +62,6 @@ class CCodePhrase extends ObjectNode {
 
       if (this.terminologyId)
       {
-         //log.info("CCodePhrase isValid")
-
          if (_terminologyId != this.terminologyId)
          {
             return new ValidationResult(isValid: false, message: "terminology_id '${_terminologyId}' doesn't match '${this.terminologyId}'")

diff --git a/src/main/groovy/com/cabolabs/openehr/opt/model/domain/CDvOrdinal.groovy b/src/main/groovy/com/cabolabs/openehr/opt/model/domain/CDvOrdinal.groovy
@@ -4,7 +4,6 @@ import com.cabolabs.openehr.opt.model.ObjectNode
 import com.cabolabs.openehr.opt.model.validation.ValidationResult
 import com.cabolabs.openehr.rm_1_0_2.data_types.quantity.DvOrdinal
 
-@groovy.util.logging.Log4j2
 class CDvOrdinal extends ObjectNode {
 
    // List<CDvOrdinalItem>

diff --git a/src/main/groovy/com/cabolabs/openehr/opt/model/domain/CDvOrdinalItem.groovy b/src/main/groovy/com/cabolabs/openehr/opt/model/domain/CDvOrdinalItem.groovy
@@ -2,7 +2,6 @@ package com.cabolabs.openehr.opt.model.domain
 
 import com.cabolabs.openehr.opt.model.datatypes.CodePhrase
 
-@groovy.util.logging.Log4j2
 class CDvOrdinalItem {
 
    int value

diff --git a/src/main/groovy/com/cabolabs/openehr/opt/model/domain/CDvQuantity.groovy b/src/main/groovy/com/cabolabs/openehr/opt/model/domain/CDvQuantity.groovy
@@ -5,8 +5,6 @@ import com.cabolabs.openehr.opt.model.datatypes.CodePhrase
 import com.cabolabs.openehr.opt.model.validation.ValidationResult
 import com.cabolabs.openehr.rm_1_0_2.data_types.quantity.DvQuantity
 
-
-@groovy.util.logging.Log4j2
 class CDvQuantity extends ObjectNode {
 
    // property: CODE_PHRASE

diff --git a/src/main/groovy/com/cabolabs/openehr/opt/model/domain/CQuantityItem.groovy b/src/main/groovy/com/cabolabs/openehr/opt/model/domain/CQuantityItem.groovy
@@ -3,7 +3,6 @@ package com.cabolabs.openehr.opt.model.domain
 import com.cabolabs.openehr.opt.model.IntervalBigDecimal
 import com.cabolabs.openehr.opt.model.IntervalInt
 
-@groovy.util.logging.Log4j2
 class CQuantityItem {
 
    IntervalBigDecimal magnitude // can be null

diff --git a/src/main/groovy/com/cabolabs/openehr/opt/model/primitive/CBoolean.groovy b/src/main/groovy/com/cabolabs/openehr/opt/model/primitive/CBoolean.groovy
@@ -3,7 +3,6 @@ package com.cabolabs.openehr.opt.model.primitive
 import com.cabolabs.openehr.opt.model.IntervalInt
 import com.cabolabs.openehr.opt.model.validation.ValidationResult
 
-@groovy.util.logging.Log4j2
 class CBoolean extends CPrimitive {
 
    Boolean trueValid

diff --git a/src/main/groovy/com/cabolabs/openehr/opt/model/primitive/CDate.groovy b/src/main/groovy/com/cabolabs/openehr/opt/model/primitive/CDate.groovy
@@ -7,7 +7,6 @@ import java.text.SimpleDateFormat
 import java.text.ParseException
 import com.cabolabs.openehr.rm_1_0_2.common.archetyped.Pathable
 
-@groovy.util.logging.Log4j2
 class CDate extends CPrimitive {
 
    // TODO: list constraint (this is not commonly used)

diff --git a/src/main/groovy/com/cabolabs/openehr/opt/model/primitive/CDateTime.groovy b/src/main/groovy/com/cabolabs/openehr/opt/model/primitive/CDateTime.groovy
@@ -7,7 +7,6 @@ import com.cabolabs.openehr.rm_1_0_2.common.archetyped.Pathable
 import java.text.SimpleDateFormat
 import java.text.ParseException
 
-@groovy.util.logging.Log4j2
 class CDateTime extends CPrimitive {
 
    // TODO: list constraint (this is not commonly used)

diff --git a/src/main/groovy/com/cabolabs/openehr/opt/model/primitive/CDuration.groovy b/src/main/groovy/com/cabolabs/openehr/opt/model/primitive/CDuration.groovy
@@ -4,7 +4,6 @@ import com.cabolabs.openehr.opt.model.IntervalDuration
 import com.cabolabs.openehr.opt.model.datatypes.Duration
 import com.cabolabs.openehr.opt.model.validation.ValidationResult
 
-@groovy.util.logging.Log4j2
 class CDuration extends CPrimitive {
 
    String pattern

diff --git a/src/main/groovy/com/cabolabs/openehr/opt/model/primitive/CInteger.groovy b/src/main/groovy/com/cabolabs/openehr/opt/model/primitive/CInteger.groovy
@@ -3,7 +3,6 @@ package com.cabolabs.openehr.opt.model.primitive
 import com.cabolabs.openehr.opt.model.IntervalInt
 import com.cabolabs.openehr.opt.model.validation.ValidationResult
 
-@groovy.util.logging.Log4j2
 class CInteger extends CPrimitive {
 
    // list constraint (this is not commonly used)

diff --git a/src/main/groovy/com/cabolabs/openehr/opt/model/primitive/CPrimitive.groovy b/src/main/groovy/com/cabolabs/openehr/opt/model/primitive/CPrimitive.groovy
@@ -1,6 +1,5 @@
 package com.cabolabs.openehr.opt.model.primitive
 
-@groovy.util.logging.Log4j2
 class CPrimitive {
 
 }
diff --git a/src/main/groovy/com/cabolabs/openehr/opt/model/primitive/CReal.groovy b/src/main/groovy/com/cabolabs/openehr/opt/model/primitive/CReal.groovy
@@ -3,7 +3,6 @@ package com.cabolabs.openehr.opt.model.primitive
 import com.cabolabs.openehr.opt.model.IntervalBigDecimal
 import com.cabolabs.openehr.opt.model.validation.ValidationResult
 
-@groovy.util.logging.Log4j2
 class CReal extends CPrimitive {
 
    // TODO: list constraint (this is not commonly used)

diff --git a/src/main/groovy/com/cabolabs/openehr/opt/model/primitive/CString.groovy b/src/main/groovy/com/cabolabs/openehr/opt/model/primitive/CString.groovy
@@ -2,7 +2,6 @@ package com.cabolabs.openehr.opt.model.primitive
 
 import com.cabolabs.openehr.opt.model.validation.ValidationResult
 
-@groovy.util.logging.Log4j2
 class CString extends CPrimitive {
 
    String pattern

diff --git a/src/main/groovy/com/cabolabs/openehr/opt/model/primitive/CTime.groovy b/src/main/groovy/com/cabolabs/openehr/opt/model/primitive/CTime.groovy
@@ -7,7 +7,6 @@ import com.cabolabs.openehr.rm_1_0_2.common.archetyped.Pathable
 import java.text.ParseException
 import java.text.SimpleDateFormat
 
-@groovy.util.logging.Log4j2
 class CTime extends CPrimitive {
 
    // TODO: range constraint

diff --git a/src/main/groovy/com/cabolabs/openehr/opt/parser/OperationalTemplateParser.groovy b/src/main/groovy/com/cabolabs/openehr/opt/parser/OperationalTemplateParser.groovy
@@ -9,7 +9,6 @@ import groovy.util.slurpersupport.GPathResult
 // import org.apache.logging.log4j.LogManager
 // import org.apache.logging.log4j.Logger
 
-@groovy.util.logging.Log4j2
 class OperationalTemplateParser {
 
    //private Logger log = LogManager.getLogger(getClass())

diff --git a/src/main/groovy/com/cabolabs/openehr/terminology/TerminologyParser.groovy b/src/main/groovy/com/cabolabs/openehr/terminology/TerminologyParser.groovy
@@ -6,7 +6,7 @@ import groovy.util.slurpersupport.GPathResult
 // import org.apache.logging.log4j.LogManager
 // import org.apache.logging.log4j.Logger
 
-@groovy.util.logging.Log4j2
+@groovy.util.logging.Slf4j
 class TerminologyParser {
 
    private static TerminologyParser instance = null
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		java -cp "./lib/*;%GROOVY_HOME%/embeddable/groovy-all-2.4.7.jar;build/libs/opt-2.0.1.jar" com.cabolabs.openehr.opt.Main %1 %2 %3 %4 %5 %6 %7
		java -cp "./lib/*;%GROOVY_HOME%/embeddable/groovy-all-2.4.7.jar;build/libs/opt-2.0.2.jar" com.cabolabs.openehr.opt.Main %1 %2 %3 %4 %5 %6 %7
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		java -cp "./lib/:$GROOVY_HOME/lib/:build/libs/opt-2.0.1.jar" com.cabolabs.openehr.opt.Main $1 $2 $3 $4 $5 $6 $7
		java -cp "./lib/:$GROOVY_HOME/lib/:build/libs/opt-2.0.2.jar" com.cabolabs.openehr.opt.Main $1 $2 $3 $4 $5 $6 $7