Skip to content

Commit

Permalink
Merge pull request #100 from majran/Issue-98-log4j
Browse files Browse the repository at this point in the history
replace log4j with logback
  • Loading branch information
viclovsky authored Feb 11, 2022
2 parents ab6c225 + 8ab6ecf commit 356b746
Show file tree
Hide file tree
Showing 8 changed files with 32 additions and 22 deletions.
5 changes: 3 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,9 @@ configure(subprojects) {
dependency("io.swagger.core.v3:swagger-models:2.1.10")
dependency("io.swagger.parser.v3:swagger-parser:2.0.25")

dependency("org.slf4j:slf4j-simple:1.7.30")
dependency("log4j:log4j:1.2.17")
dependency("org.slf4j:slf4j-api:1.7.32")
dependency("ch.qos.logback:logback-classic:1.2.10")

dependency("com.beust:jcommander:1.81")
dependency("junit:junit:4.13.2")
dependency("org.hamcrest:hamcrest:2.2")
Expand Down
4 changes: 2 additions & 2 deletions swagger-coverage-commandline/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ repositories {
dependencies {
api(project(":swagger-coverage-commons"))
implementation("io.swagger.parser.v3:swagger-parser")
implementation("org.slf4j:slf4j-simple")
implementation("log4j:log4j")
implementation("org.slf4j:slf4j-api")
implementation("ch.qos.logback:logback-classic")
implementation("com.beust:jcommander")
implementation("org.springframework:spring-web")
testImplementation("junit:junit")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
package com.github.viclovsky.swagger.coverage;

import ch.qos.logback.classic.Level;
import com.beust.jcommander.JCommander;
import com.beust.jcommander.ParameterException;
import com.beust.jcommander.Parameters;
import com.beust.jcommander.ParametersDelegate;
import com.github.viclovsky.swagger.coverage.core.generator.Generator;
import com.github.viclovsky.swagger.coverage.option.MainOptions;
import com.github.viclovsky.swagger.coverage.option.VerboseOptions;
import org.apache.log4j.Level;
import org.apache.log4j.LogManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down Expand Up @@ -55,12 +54,16 @@ public Optional<ExitCode> parse(final String... args) {
}

private ExitCode run() {

ch.qos.logback.classic.Logger rootLogger =
(ch.qos.logback.classic.Logger) LoggerFactory.getLogger(org.slf4j.Logger.ROOT_LOGGER_NAME);

if (verboseOptions.isQuiet()) {
LogManager.getRootLogger().setLevel(Level.OFF);
rootLogger.setLevel(Level.OFF);
}

if (verboseOptions.isVerbose()) {
LogManager.getRootLogger().setLevel(Level.DEBUG);
rootLogger.setLevel(Level.DEBUG);
}

if (mainOptions.isHelp()) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
import com.github.viclovsky.swagger.coverage.SwaggerCoverageWriteException;
import com.github.viclovsky.swagger.coverage.core.results.Results;
import com.github.viclovsky.swagger.coverage.model.SwaggerCoverage2ModelJackson;
import org.apache.log4j.Logger;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.io.IOException;
import java.io.OutputStream;
Expand All @@ -16,7 +17,7 @@

public class FileSystemResultsWriter implements CoverageResultsWriter {

private final static Logger LOGGER = Logger.getLogger(FileSystemResultsWriter.class);
private final static Logger LOGGER = LoggerFactory.getLogger(FileSystemResultsWriter.class);
private final ObjectMapper mapper;
private final String fileName;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,16 @@
import com.github.viclovsky.swagger.coverage.core.results.Results;
import com.github.viclovsky.swagger.coverage.core.results.data.OperationResult;
import io.swagger.v3.oas.models.Operation;
import org.apache.log4j.Logger;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.text.DecimalFormat;
import java.util.Map;
import java.util.Set;

public class LogResultsWriter implements CoverageResultsWriter {

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

public LogResultsWriter() {
}
Expand Down

This file was deleted.

12 changes: 12 additions & 0 deletions swagger-coverage-commandline/src/main/resources/logback.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
<Target>System.out</Target>
<encoder>
<pattern>%d{HH:mm:ss} %-5p %c{1} - %m%n</pattern>
</encoder>
</appender>
<root level="ALL">
<appender-ref ref="stdout"/>
</root>
</configuration>
4 changes: 2 additions & 2 deletions swagger-coverage-commons/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ dependencies {
//dirty fix https://github.com/viclovsky/swagger-coverage/issues/90
implementation("io.swagger.core.v3:swagger-core")
implementation("io.swagger.core.v3:swagger-models")
implementation("org.slf4j:slf4j-simple")
implementation("log4j:log4j")
implementation("org.slf4j:slf4j-api")
implementation("ch.qos.logback:logback-classic")
implementation("com.fasterxml.jackson.core:jackson-core")
implementation("com.fasterxml.jackson.core:jackson-databind")
implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.10.1")
Expand Down

0 comments on commit 356b746

Please sign in to comment.