Skip to content

(chores) improve differentiation of unrelated logging variables #7879

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
orpiske merged 2 commits into from
Jun 25, 2022
Merged

(chores) improve differentiation of unrelated logging variables #7879

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7395343
(chores) camel-catalog-maven: improve differentiation of unrelated lo…
orpiske Jun 25, 2022
5d638f8
(chores) camel-itest-cdi: improve differentiation of unrelated loggin…
orpiske Jun 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions ...alog-maven/src/main/java/org/apache/camel/catalog/maven/DefaultMavenArtifactProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
*/
public class DefaultMavenArtifactProvider implements MavenArtifactProvider {

private static final Logger LOG = LoggerFactory.getLogger(DefaultMavenArtifactProvider.class);
private static final Logger LOGGER = LoggerFactory.getLogger(DefaultMavenArtifactProvider.class);
private String cacheDirectory;
private boolean log;

Expand Down Expand Up @@ -70,7 +70,7 @@ public Set<String> addArtifactToCatalog(
try {
if (cacheDirectory != null) {
if (log) {
LOG.debug("Using cache directory: {}", cacheDirectory);
LOGGER.debug("Using cache directory: {}", cacheDirectory);
}
System.setProperty("grape.root", cacheDirectory);
}
Expand All @@ -89,7 +89,7 @@ public Set<String> addArtifactToCatalog(
param.put("transitive", false);

if (log) {
LOG.info("Downloading {}:{}:{}", groupId, artifactId, version);
LOGGER.info("Downloading {}:{}:{}", groupId, artifactId, version);
}
Grape.grab(param);

Expand All @@ -101,7 +101,7 @@ public Set<String> addArtifactToCatalog(

} catch (Exception e) {
if (log) {
LOG.warn("Error during add components from artifact {}:{}:{} due {}", groupId, artifactId, version,
LOGGER.warn("Error during add components from artifact {}:{}:{} due {}", groupId, artifactId, version,
e.getMessage(), e);
}
}
Expand All @@ -123,7 +123,7 @@ protected void scanCamelComponents(CamelCatalog camelCatalog, ClassLoader classL
String json = loadComponentJSonSchema(log, classLoader, scheme);
if (json != null) {
if (log) {
LOG.info("Adding component: {}", scheme);
LOGGER.info("Adding component: {}", scheme);
}
camelCatalog.addComponent(scheme, javaType, json);
names.add(scheme);
Expand Down
8 changes: 4 additions & 4 deletions ...camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/MavenVersionManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
*/
public class MavenVersionManager implements VersionManager, Closeable {

private static final Logger LOG = LoggerFactory.getLogger(MavenVersionManager.class);
private static final Logger LOGGER = LoggerFactory.getLogger(MavenVersionManager.class);

private ClassLoader classLoader;
private final ClassLoader groovyClassLoader = new GroovyClassLoader();
Expand Down Expand Up @@ -122,7 +122,7 @@ public boolean loadVersion(String version) {
return true;
} catch (Exception e) {
if (log) {
LOG.warn("Cannot load version {} due {}", version, e.getMessage(), e);
LOGGER.warn("Cannot load version {} due {}", version, e.getMessage(), e);
}
return false;
}
Expand Down Expand Up @@ -152,7 +152,7 @@ public boolean loadRuntimeProviderVersion(String groupId, String artifactId, Str
return true;
} catch (Exception e) {
if (log) {
LOG.warn("Cannot load runtime provider version {} due {}", version, e.getMessage(), e);
LOGGER.warn("Cannot load runtime provider version {} due {}", version, e.getMessage(), e);
}
return false;
}
Expand Down Expand Up @@ -201,7 +201,7 @@ private InputStream doGetResourceAsStream(String name, String version) {
}
} catch (IOException e) {
if (log) {
LOG.warn("Cannot open resource {} and version {} due {}", name, version, e.getMessage(), e);
LOGGER.warn("Cannot open resource {} and version {} due {}", name, version, e.getMessage(), e);
}
}

Expand Down
4 changes: 2 additions & 2 deletions tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/MyRoutes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
@ApplicationScoped
public class MyRoutes extends RouteBuilder {

private static final Logger LOG = LoggerFactory.getLogger(MyRoutes.class);
private static final Logger LOGGER = LoggerFactory.getLogger(MyRoutes.class);

@Inject
@Uri(value = "seda:a")
Expand All @@ -46,7 +46,7 @@ public class MyRoutes extends RouteBuilder {

@Override
public void configure() {
LOG.info("Adding route from {} to {}", a, b);
LOGGER.info("Adding route from {} to {}", a, b);
from(a).to(b);
}

Expand Down