From 69e9c652f028ff697d304a7ddd4f7a5a400e887a Mon Sep 17 00:00:00 2001 From: Aldrin Leal Date: Thu, 7 Sep 2023 14:47:20 -0500 Subject: [PATCH] Less Logging --- .../io/github/pixee/maven/operator/Ignorable.kt | 11 +++++++++++ .../io/github/pixee/maven/operator/POMScanner.kt | 14 ++++++++++---- .../github/pixee/maven/operator/QueryByResolver.kt | 2 +- .../pixee/maven/operator/UnwrapEffectivePom.kt | 8 +++++++- 4 files changed, 29 insertions(+), 6 deletions(-) create mode 100644 src/main/java/io/github/pixee/maven/operator/Ignorable.kt diff --git a/src/main/java/io/github/pixee/maven/operator/Ignorable.kt b/src/main/java/io/github/pixee/maven/operator/Ignorable.kt new file mode 100644 index 0000000..11bcb5e --- /dev/null +++ b/src/main/java/io/github/pixee/maven/operator/Ignorable.kt @@ -0,0 +1,11 @@ +package io.github.pixee.maven.operator + +import org.slf4j.Logger +import org.slf4j.LoggerFactory + +/** + * Internal Tag Object for Ignorable Messages + */ +object Ignorable { + internal val LOGGER: Logger = LoggerFactory.getLogger(Ignorable::class.java) +} \ No newline at end of file diff --git a/src/main/java/io/github/pixee/maven/operator/POMScanner.kt b/src/main/java/io/github/pixee/maven/operator/POMScanner.kt index 6634f40..3c7893e 100644 --- a/src/main/java/io/github/pixee/maven/operator/POMScanner.kt +++ b/src/main/java/io/github/pixee/maven/operator/POMScanner.kt @@ -1,5 +1,6 @@ package io.github.pixee.maven.operator +import org.apache.maven.model.building.ModelBuildingException import org.dom4j.Element import org.slf4j.Logger import org.slf4j.LoggerFactory @@ -21,7 +22,11 @@ object POMScanner { val parentPoms: List = try { getParentPoms(originalFile) } catch (e: Exception) { - LOGGER.warn("While trying embedder: ", e) + if (e is ModelBuildingException) { + Ignorable.LOGGER.debug("mbe (you can ignore): ", e) + } else { + LOGGER.warn("While trying embedder: ", e) + } return legacyScanFrom(originalFile, topLevelDirectory) } @@ -133,9 +138,10 @@ object POMScanner { private fun getParentPoms(originalFile: File): List { - val embedderFacadeResponse = EmbedderFacade.invokeEmbedder( - EmbedderFacadeRequest(offline = true, pomFile = originalFile) - ) + val embedderFacadeResponse = + EmbedderFacade.invokeEmbedder( + EmbedderFacadeRequest(offline = true, pomFile = originalFile) + ) val res = embedderFacadeResponse.modelBuildingResult diff --git a/src/main/java/io/github/pixee/maven/operator/QueryByResolver.kt b/src/main/java/io/github/pixee/maven/operator/QueryByResolver.kt index a54094f..8948f84 100644 --- a/src/main/java/io/github/pixee/maven/operator/QueryByResolver.kt +++ b/src/main/java/io/github/pixee/maven/operator/QueryByResolver.kt @@ -41,7 +41,7 @@ class QueryByResolver : AbstractQueryCommand() { try { embedderFacadeResponse = EmbedderFacade.invokeEmbedder(req) } catch (mbe: ModelBuildingException) { - LOGGER.warn("Oops:", mbe) + Ignorable.LOGGER.debug("mbe (you can ignore): ", mbe) return false } diff --git a/src/main/java/io/github/pixee/maven/operator/UnwrapEffectivePom.kt b/src/main/java/io/github/pixee/maven/operator/UnwrapEffectivePom.kt index 876827a..3b335ff 100644 --- a/src/main/java/io/github/pixee/maven/operator/UnwrapEffectivePom.kt +++ b/src/main/java/io/github/pixee/maven/operator/UnwrapEffectivePom.kt @@ -1,5 +1,6 @@ package io.github.pixee.maven.operator +import org.apache.maven.model.building.ModelBuildingException import org.codehaus.plexus.util.xml.Xpp3Dom import org.slf4j.Logger import org.slf4j.LoggerFactory @@ -13,7 +14,12 @@ class UnwrapEffectivePom : AbstractVersionCommand() { try { executeInternal(pm) } catch (e: Exception) { - LOGGER.warn("Failure", e) + + if (e is ModelBuildingException) { + Ignorable.LOGGER.debug("mbe (you can ignore): ", e) + } else { + LOGGER.warn("While trying embedder: ", e) + } false }