Skip to content

Commit d7a61aa

Browse files
author
Bernardo-MG
committed
Using Lombok logger
1 parent 6da1bd2 commit d7a61aa

File tree

5 files changed

+32
-47
lines changed

5 files changed

+32
-47
lines changed

pom.xml

+9
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,15 @@
207207
<version>${dice.version}</version>
208208
</dependency>
209209
<!-- ============================================== -->
210+
<!-- ================== LOMBOK ==================== -->
211+
<!-- ============================================== -->
212+
<dependency>
213+
<!-- Lombok -->
214+
<groupId>org.projectlombok</groupId>
215+
<artifactId>lombok</artifactId>
216+
<scope>provided</scope>
217+
</dependency>
218+
<!-- ============================================== -->
210219
<!-- ================== LOGGERS =================== -->
211220
<!-- ============================================== -->
212221
<dependency>

src/main/java/com/bernardomg/tabletop/dice/cli/Main.java

+3-9
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,9 @@
1616

1717
package com.bernardomg.tabletop.dice.cli;
1818

19-
import org.slf4j.Logger;
20-
import org.slf4j.LoggerFactory;
21-
2219
import com.bernardomg.tabletop.dice.cli.menu.DiceMenu;
2320

21+
import lombok.extern.slf4j.Slf4j;
2422
import picocli.CommandLine;
2523

2624
/**
@@ -29,19 +27,15 @@
2927
* @author Bernardo Mart&iacute;nez Garrido
3028
*
3129
*/
30+
@Slf4j
3231
public class Main {
3332

34-
/**
35-
* Logger.
36-
*/
37-
private static final Logger LOGGER = LoggerFactory.getLogger(Main.class);
38-
3933
public static void main(final String[] args) {
4034
final Integer exitCode;
4135

4236
exitCode = new CommandLine(new DiceMenu()).execute(args);
4337

44-
LOGGER.debug("Exited with code {}", exitCode);
38+
log.debug("Exited with code {}", exitCode);
4539

4640
System.exit(exitCode);
4741
}

src/main/java/com/bernardomg/tabletop/dice/cli/command/DiceGathererCommand.java

+6-12
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@
2020
import java.util.stream.Collectors;
2121
import java.util.stream.StreamSupport;
2222

23-
import org.slf4j.Logger;
24-
import org.slf4j.LoggerFactory;
25-
2623
import com.bernardomg.tabletop.dice.Dice;
2724
import com.bernardomg.tabletop.dice.cli.version.ManifestVersionProvider;
2825
import com.bernardomg.tabletop.dice.interpreter.DiceGatherer;
@@ -31,6 +28,7 @@
3128
import com.bernardomg.tabletop.dice.parser.DiceParser;
3229
import com.google.common.collect.Iterables;
3330

31+
import lombok.extern.slf4j.Slf4j;
3432
import picocli.CommandLine.Command;
3533
import picocli.CommandLine.Model.CommandSpec;
3634
import picocli.CommandLine.Parameters;
@@ -44,24 +42,20 @@
4442
*/
4543
@Command(name = "gather", description = "Gathers dice from an expression", mixinStandardHelpOptions = true,
4644
versionProvider = ManifestVersionProvider.class)
45+
@Slf4j
4746
public final class DiceGathererCommand implements Runnable {
4847

49-
/**
50-
* Logger.
51-
*/
52-
private static final Logger LOGGER = LoggerFactory.getLogger(DiceGathererCommand.class);
53-
5448
/**
5549
* Expression to roll.
5650
*/
5751
@Parameters(index = "0", description = "The expression to roll", paramLabel = "EXP")
58-
private String expression;
52+
private String expression;
5953

6054
/**
6155
* Command specification. Used to get the line output.
6256
*/
6357
@Spec
64-
private CommandSpec spec;
58+
private CommandSpec spec;
6559

6660
/**
6761
* Default constructor.
@@ -78,14 +72,14 @@ public final void run() {
7872
final String diceText;
7973
final PrintWriter writer;
8074

81-
LOGGER.debug("Running expression {}", expression);
75+
log.debug("Running expression {}", expression);
8276

8377
parser = new DefaultDiceParser();
8478
gatherer = new DiceGatherer();
8579

8680
diceSets = parser.parse(expression, gatherer);
8781

88-
LOGGER.debug("Gathered dice sets {}", diceSets);
82+
log.debug("Gathered dice sets {}", diceSets);
8983

9084
writer = spec.commandLine()
9185
.getOut();

src/main/java/com/bernardomg/tabletop/dice/cli/command/DiceRollCommand.java

+11-17
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@
2020
import java.util.stream.Collectors;
2121
import java.util.stream.StreamSupport;
2222

23-
import org.slf4j.Logger;
24-
import org.slf4j.LoggerFactory;
25-
2623
import com.bernardomg.tabletop.dice.cli.version.ManifestVersionProvider;
2724
import com.bernardomg.tabletop.dice.history.RollHistory;
2825
import com.bernardomg.tabletop.dice.history.RollResult;
@@ -31,6 +28,7 @@
3128
import com.bernardomg.tabletop.dice.parser.DefaultDiceParser;
3229
import com.bernardomg.tabletop.dice.parser.DiceParser;
3330

31+
import lombok.extern.slf4j.Slf4j;
3432
import picocli.CommandLine.Command;
3533
import picocli.CommandLine.Model.CommandSpec;
3634
import picocli.CommandLine.Option;
@@ -45,36 +43,32 @@
4543
*/
4644
@Command(name = "roll", description = "Rolls an expression", mixinStandardHelpOptions = true,
4745
versionProvider = ManifestVersionProvider.class)
46+
@Slf4j
4847
public final class DiceRollCommand implements Runnable {
4948

50-
/**
51-
* Logger.
52-
*/
53-
private static final Logger LOGGER = LoggerFactory.getLogger(DiceRollCommand.class);
54-
5549
/**
5650
* Expression to roll.
5751
*/
5852
@Parameters(index = "0", description = "The expression to roll", paramLabel = "EXP")
59-
private String expression;
53+
private String expression;
6054

6155
/**
6256
* Roll history flag.
6357
*/
6458
@Option(names = "-history", description = "Prints the roll history", defaultValue = "false")
65-
private Boolean history;
59+
private Boolean history;
6660

6761
/**
6862
* Full history flag.
6963
*/
7064
@Option(names = "-fullHistory", description = "Prints a detailed roll history", defaultValue = "false")
71-
private Boolean historyDetailed;
65+
private Boolean historyDetailed;
7266

7367
/**
7468
* Command specification. Used to get the line output.
7569
*/
7670
@Spec
77-
private CommandSpec spec;
71+
private CommandSpec spec;
7872

7973
/**
8074
* Default constructor.
@@ -110,7 +104,7 @@ public final void run() {
110104
final PrintWriter writer;
111105
String valuesText;
112106

113-
LOGGER.debug("Running expression {}", expression);
107+
log.debug("Running expression {}", expression);
114108

115109
parser = new DefaultDiceParser();
116110
roller = new DiceRoller();
@@ -119,8 +113,8 @@ public final void run() {
119113

120114
totalRoll = rolls.getTotalRoll();
121115

122-
LOGGER.debug("Total roll {}", totalRoll);
123-
LOGGER.debug("History: {}", rolls.toString());
116+
log.debug("Total roll {}", totalRoll);
117+
log.debug("History: {}", rolls.toString());
124118

125119
writer = spec.commandLine()
126120
.getOut();
@@ -131,14 +125,14 @@ public final void run() {
131125
writer.printf("Total roll: %d%n", totalRoll);
132126

133127
if (history) {
134-
LOGGER.debug("Printing roll history");
128+
log.debug("Printing roll history");
135129

136130
writer.println("------------");
137131
writer.printf("Roll history: %s%n", rolls.toString());
138132
}
139133

140134
if (historyDetailed) {
141-
LOGGER.debug("Printing detailed roll history");
135+
log.debug("Printing detailed roll history");
142136

143137
writer.println("------------");
144138
writer.println("Detailed roll history");

src/main/java/com/bernardomg/tabletop/dice/cli/version/ManifestVersionProvider.java

+3-9
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@
2222
import java.util.jar.Attributes;
2323
import java.util.jar.Manifest;
2424

25-
import org.slf4j.Logger;
26-
import org.slf4j.LoggerFactory;
27-
25+
import lombok.extern.slf4j.Slf4j;
2826
import picocli.CommandLine;
2927
import picocli.CommandLine.IVersionProvider;
3028

@@ -34,13 +32,9 @@
3432
* @author Bernardo Mart&iacute;nez Garrido
3533
*
3634
*/
35+
@Slf4j
3736
public final class ManifestVersionProvider implements IVersionProvider {
3837

39-
/**
40-
* Logger.
41-
*/
42-
private static final Logger LOGGER = LoggerFactory.getLogger(ManifestVersionProvider.class);
43-
4438
/**
4539
* Project title. Used to identify the correct manifest.
4640
*/
@@ -74,7 +68,7 @@ public final String[] getVersion() throws Exception {
7468
try {
7569
manifest = new Manifest(url.openStream());
7670
} catch (final IOException ex) {
77-
LOGGER.error("Unable to read from {}", url);
71+
log.error("Unable to read from {}", url);
7872
// TODO: Use detailed error
7973
throw new RuntimeException();
8074
}

0 commit comments

Comments
 (0)