[DOXIA-534] Migrate logging to slf4j and deprecate doxia-logging-api #8
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
slachiewicz
force-pushed
the
feature/DOXIA-534-logging2
branch
from
b2a21de
to
52e598a
Compare
slachiewicz
force-pushed
the
feature/DOXIA-534-logging2
branch
from
52e598a
to
93f3966
Compare
Deprecate doxia-logging-api based on plexus and implement logging based on slf4j. more log updates
slachiewicz
force-pushed
the
feature/DOXIA-534-logging2
branch
from
93f3966
to
e71b154
Compare
elharo
reviewed
Mar 21, 2020
|
|
||
| protected Logger logger = LoggerFactory.getLogger( getClass() ); |
| @@ -151,6 +153,7 @@ public void executeMacro( String macroId, MacroRequest request, Sink sink ) | |||
| * @return The base directory. | |||
| * @deprecated this does not work in multi-module builds, see DOXIA-373 | |||
| */ | |||
| @Deprecated | |||
| protected File getBasedir() | |||
| { | |||
| // TODO: This is baaad, it should come in with the request. | |||
| @@ -58,18 +60,24 @@ | |||
| /** lazy xmlReader to validate xml content*/ | |||
| private XMLReader xmlReader; | |||
|
|
|||
| private Log logger; | |||
| private static final Logger LOGGER = LoggerFactory.getLogger( XmlValidator.class ); | |||
There was a problem hiding this comment.
logger since it's not really a constant value
| @@ -161,13 +164,12 @@ private Log getLog() | |||
| private static final Pattern ELEMENT_TYPE_PATTERN = | |||
| Pattern.compile( "Element type \".*\" must be declared.", Pattern.DOTALL ); | |||
|
|
|||
| private final Log log; | |||
| private final Logger log = LoggerFactory.getLogger( MessagesErrorHandler.class ); | |||
| protected static String normalizeLineEnds(String s) { | ||
| if ( s != null) { | ||
| return s.replace("\r\n", "\n" ); | ||
| // .replace('\r', '\n'); |
| * Wrap a Slf4j logger into a Doxia logger. | ||
| * | ||
| * @since 1.7 | ||
| * @deprecated use directly slf4j |
|
|
||
| public void debug( CharSequence content ) | ||
| { | ||
| if ( logger.isDebugEnabled() ) |
There was a problem hiding this comment.
use braces in multiline ifs
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
New version that deprecates doxia-logging