Skip to content

Commit 38030ac

Browse files
brianwykabrianwyka
authored
Remove Logback (#47)
* Remove logback in favor of simpler console logging * Increase converage in exec module * Fix exec pom
1 parent 3f2e1eb commit 38030ac

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+1641
-900
lines changed

‎attribution.txt‎

Lines changed: 274 additions & 330 deletions
Large diffs are not rendered by default.

‎cli/pom.xml‎

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<sonar.cpd.exclusions>**/picocli/**/*.*</sonar.cpd.exclusions>
3232

3333
<!-- PICOCLI VERSION -->
34-
<picocli.version>4.5.2</picocli.version>
34+
<picocli.version>4.6.1</picocli.version>
3535

3636
</properties>
3737

@@ -46,14 +46,8 @@
4646

4747
<!-- THIRD-PARTY RUNTIME DEPENDENCIES -->
4848
<dependency>
49-
<groupId>ch.qos.logback</groupId>
50-
<artifactId>logback-classic</artifactId>
51-
<scope>runtime</scope>
52-
</dependency>
53-
<dependency>
54-
<groupId>org.fusesource.jansi</groupId>
55-
<artifactId>jansi</artifactId>
56-
<version>1.17.1</version>
49+
<groupId>org.slf4j</groupId>
50+
<artifactId>slf4j-nop</artifactId>
5751
<scope>runtime</scope>
5852
</dependency>
5953

@@ -228,9 +222,9 @@
228222
<type>jar</type>
229223
</dependency>
230224
<dependency>
231-
<groupId>ch.qos.logback</groupId>
232-
<artifactId>logback-classic</artifactId>
233-
<version>${logback.version}</version>
225+
<groupId>org.slf4j</groupId>
226+
<artifactId>slf4j-simple</artifactId>
227+
<version>${slf4j.version}</version>
234228
</dependency>
235229
</dependencies>
236230
</plugin>
@@ -371,16 +365,16 @@
371365
<rules>
372366
<bannedDependencies>
373367
<includes combine.children="append">
374-
<include>ch.qos.logback:*:*:*:*</include>
375368
<include>com.fasterxml.jackson.core:*:*:*:*</include>
376369
<include>com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:*:*</include>
377370
<include>com.jayway.jsonpath:json-path:*:*:*</include>
378371
<include>net.minidev:accessors-smart:*:*:*</include>
379372
<include>net.minidev:json-smart:*:*:*</include>
380373
<include>org.apache.maven:maven-model:*:*:*</include>
381374
<include>org.codehaus.plexus:plexus-utils:*:*:*</include>
382-
<include>org.fusesource.jansi:jansi:*:*:*</include>
383375
<include>org.ow2.asm:asm:*:*:*</include>
376+
<include>org.slf4j:slf4j-api:*:*:*</include>
377+
<include>org.slf4j:slf4j-nop:*:*:*</include>
384378
<include>org.yaml:snakeyaml:*:*:*</include>
385379
</includes>
386380
</bannedDependencies>

‎cli/scripts/update-picocli.sh‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,11 @@ set -e
1111
#########################################################################
1212

1313
# Retrieve Latest Version
14-
VERSION=$(curl -sI https://github.com/remkop/picocli/releases/latest | grep -i location | awk -F"/" '{ printf "%s", $NF }' | tr -d 'v' | tr -d '\r\n')
14+
VERSION=$(curl -sI https://github.com/remkop/picocli/releases/latest | grep -i location: | awk -F"/" '{ printf "%s", $NF }' | tr -d 'v' | tr -d '\r\n')
1515

1616
# Global Variables
1717
DIR="$( cd "$( dirname "$( dirname "${BASH_SOURCE[0]}" )")" && pwd )"
18+
ROOT_DIR="$( cd "$( dirname "$( dirname "$( dirname "${BASH_SOURCE[0]}" )")")" && pwd )"
1819
BASE_URL="https://raw.githubusercontent.com/remkop/picocli"
1920
LICENSE_URL="$BASE_URL/v$VERSION/LICENSE"
2021
LICENSE_FILE_PATH="$DIR/src/main/resources/META-INF/licenses/picocli.txt"
@@ -32,6 +33,9 @@ sed -i 's/public\sclass\sCommandLine/@SuppressWarnings({"rawtypes", "deprecation
3233
# Replace the version in pom.xml file for plugin references
3334
sed -i "s/<picocli.version>[-[:alnum:]./]\{1,\}<\/picocli.version>/<picocli.version>$VERSION<\/picocli.version>/" "$DIR/pom.xml"
3435

36+
# Replace the version in attribution.txt file
37+
sed -i "s/Package: info.picocli:[-[:alnum:]./]\{1,\}/Package: info.picocli:$VERSION/" "$ROOT_DIR/attribution.txt"
38+
3539
# Remove TODOs so not highlighted in editor
3640
sed -i 's/TODO/TIDO/g' "$SOURCE_FILE_PATH"
3741

‎cli/src/main/java/com/optum/sourcehawk/cli/BitbucketScanCommand.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import com.optum.sourcehawk.core.data.RemoteRef;
66
import com.optum.sourcehawk.core.repository.BitbucketRepositoryFileReader;
77
import com.optum.sourcehawk.core.repository.RepositoryFileReader;
8-
import lombok.extern.slf4j.Slf4j;
98
import lombok.val;
109
import picocli.CommandLine;
1110

@@ -19,7 +18,6 @@
1918
*
2019
* @author Brian Wyka
2120
*/
22-
@Slf4j
2321
@CommandLine.Command(
2422
name = "bitbucket",
2523
aliases = "bb",

‎cli/src/main/java/com/optum/sourcehawk/cli/CommandOptions.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ static class Exec {
4646
@CommandLine.Option(
4747
names = {"-f", "--output-format"},
4848
description = "Output Format, valid values: ${COMPLETION-CANDIDATES}",
49-
defaultValue = "CONSOLE",
49+
defaultValue = "TEXT",
5050
showDefaultValue = CommandLine.Help.Visibility.ALWAYS
5151
)
5252
OutputFormat outputFormat;

‎cli/src/main/java/com/optum/sourcehawk/cli/FixCommand.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import com.optum.sourcehawk.exec.fix.FixExecutor;
88
import com.optum.sourcehawk.exec.fix.FixResultFactory;
99
import com.optum.sourcehawk.exec.fix.FixResultLogger;
10-
import lombok.extern.slf4j.Slf4j;
1110
import lombok.val;
1211
import picocli.CommandLine;
1312

@@ -18,7 +17,6 @@
1817
*
1918
* @author Brian Wyka
2019
*/
21-
@Slf4j
2220
@CommandLine.Command(
2321
name = "fix",
2422
aliases = { "correct", "resolve" },

‎cli/src/main/java/com/optum/sourcehawk/cli/FlattenConfigCommand.java‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,10 @@
22

33
import com.optum.sourcehawk.core.constants.SourcehawkConstants;
44
import com.optum.sourcehawk.core.result.FlattenConfigResult;
5-
import com.optum.sourcehawk.core.utils.StringUtils;
65
import com.optum.sourcehawk.core.utils.Try;
7-
import com.optum.sourcehawk.exec.ExecLoggers;
6+
import com.optum.sourcehawk.exec.Console;
87
import com.optum.sourcehawk.exec.config.FlattenConfigExecutor;
98
import com.optum.sourcehawk.exec.config.FlattenConfigResultLogger;
10-
import lombok.extern.slf4j.Slf4j;
119
import lombok.val;
1210
import picocli.CommandLine;
1311

@@ -20,7 +18,6 @@
2018
*
2119
* @author Christian Oestreich
2220
*/
23-
@Slf4j
2421
@CommandLine.Command(
2522
name = "flatten-config",
2623
aliases = {"fc", "flatten"},
@@ -60,12 +57,9 @@ public static void main(final String... args) {
6057
*/
6158
public Integer call() {
6259
val configurationFileLocation = getConfigurationFileLocation();
63-
if (StringUtils.isBlankOrEmpty(configurationFileLocation)) {
64-
return CommandLine.ExitCode.SOFTWARE;
65-
}
6660
val flattenConfigResult = execute(configurationFileLocation);
6761
if (flattenConfigResult.isError()) {
68-
ExecLoggers.CONSOLE_RAW.info(flattenConfigResult.getMessage());
62+
Console.Err.log(flattenConfigResult.getMessage());
6963
return CommandLine.ExitCode.SOFTWARE;
7064
}
7165
FlattenConfigResultLogger.log(flattenConfigResult, outputPath);

‎cli/src/main/java/com/optum/sourcehawk/cli/GithubScanCommand.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import com.optum.sourcehawk.core.data.RemoteRef;
66
import com.optum.sourcehawk.core.repository.GithubRepositoryFileReader;
77
import com.optum.sourcehawk.core.repository.RepositoryFileReader;
8-
import lombok.extern.slf4j.Slf4j;
98
import lombok.val;
109
import picocli.CommandLine;
1110

@@ -19,7 +18,6 @@
1918
*
2019
* @author Brian Wyka
2120
*/
22-
@Slf4j
2321
@CommandLine.Command(
2422
name = "github",
2523
aliases = "gh",

‎cli/src/main/java/com/optum/sourcehawk/cli/ScanCommand.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import com.optum.sourcehawk.exec.scan.ScanExecutor;
88
import com.optum.sourcehawk.exec.scan.ScanResultFactory;
99
import com.optum.sourcehawk.exec.scan.ScanResultLogger;
10-
import lombok.extern.slf4j.Slf4j;
1110
import lombok.val;
1211
import picocli.CommandLine;
1312

@@ -18,7 +17,6 @@
1817
*
1918
* @author Brian Wyka
2019
*/
21-
@Slf4j
2220
@CommandLine.Command(
2321
name = "scan",
2422
aliases = { "flyover", "survey" },

‎cli/src/main/java/com/optum/sourcehawk/cli/Sourcehawk.java‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@
1919
aliases = "shawk",
2020
description = "Watch over your source like a hawk",
2121
mixinStandardHelpOptions = true,
22+
headerHeading = "@|fg(magenta) >_ S O U R C E H A W K|@",
23+
synopsisHeading = "%n",
24+
commandListHeading ="%nCommands:%n",
25+
footer = "Copyright (c) 2020 Optum",
2226
versionProvider = Sourcehawk.VersionProvider.class,
2327
subcommands = {
2428
CommandLine.HelpCommand.class,
@@ -36,7 +40,13 @@ public class Sourcehawk {
3640
* @param args the command line args
3741
*/
3842
public static void main(final String[] args) {
39-
val status = new CommandLine(new Sourcehawk()).execute(args);
43+
val defaultColorScheme = CommandLine.Help.defaultColorScheme(CommandLine.Help.Ansi.AUTO);
44+
val colorScheme = new CommandLine.Help.ColorScheme.Builder(defaultColorScheme)
45+
.commands(CommandLine.Help.Ansi.Style.bold, CommandLine.Help.Ansi.Style.fg_cyan)
46+
.build();
47+
val status = new CommandLine(new Sourcehawk())
48+
.setColorScheme(colorScheme)
49+
.execute(args);
4050
Runtime.getRuntime().halt(status);
4151
}
4252

0 commit comments

Comments
 (0)