📍Use lombok, reformat, and optimize the code (#1560)

* Use lombok, reformat, and optimize the code

* Fix merge conflicts and some sonar issues

Co-authored-by: va1m <va1m@email.com>
This commit is contained in:
va1m
2021-03-13 13:19:21 +01:00
committed by GitHub
parent 0e26a6adb5
commit 5cf2fe009b
681 changed files with 2472 additions and 4966 deletions

View File

@ -38,10 +38,9 @@ Let's take our goldmine example from above. Here we have the dwarven mine worker
there's a base class `DwarvenMineWorker`:
```java
@Slf4j
public abstract class DwarvenMineWorker {
private static final Logger LOGGER = LoggerFactory.getLogger(DwarvenMineWorker.class);
public void goToSleep() {
LOGGER.info("{} goes to sleep.", name());
}
@ -99,10 +98,9 @@ Then we have the concrete dwarf classes `DwarvenTunnelDigger`, `DwarvenGoldDigge
`DwarvenCartOperator`:
```java
@Slf4j
public class DwarvenTunnelDigger extends DwarvenMineWorker {
private static final Logger LOGGER = LoggerFactory.getLogger(DwarvenTunnelDigger.class);
@Override
public void work() {
LOGGER.info("{} creates another promising tunnel.", name());
@ -114,10 +112,9 @@ public class DwarvenTunnelDigger extends DwarvenMineWorker {
}
}
@Slf4j
public class DwarvenGoldDigger extends DwarvenMineWorker {
private static final Logger LOGGER = LoggerFactory.getLogger(DwarvenGoldDigger.class);
@Override
public void work() {
LOGGER.info("{} digs for gold.", name());
@ -129,10 +126,9 @@ public class DwarvenGoldDigger extends DwarvenMineWorker {
}
}
@Slf4j
public class DwarvenCartOperator extends DwarvenMineWorker {
private static final Logger LOGGER = LoggerFactory.getLogger(DwarvenCartOperator.class);
@Override
public void work() {
LOGGER.info("{} moves gold chunks out of the mine.", name());

View File

@ -23,16 +23,14 @@
package com.iluwatar.facade;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import lombok.extern.slf4j.Slf4j;
/**
* DwarvenCartOperator is one of the goldmine subsystems.
*/
@Slf4j
public class DwarvenCartOperator extends DwarvenMineWorker {
private static final Logger LOGGER = LoggerFactory.getLogger(DwarvenCartOperator.class);
@Override
public void work() {
LOGGER.info("{} moves gold chunks out of the mine.", name());

View File

@ -23,16 +23,14 @@
package com.iluwatar.facade;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import lombok.extern.slf4j.Slf4j;
/**
* DwarvenGoldDigger is one of the goldmine subsystems.
*/
@Slf4j
public class DwarvenGoldDigger extends DwarvenMineWorker {
private static final Logger LOGGER = LoggerFactory.getLogger(DwarvenGoldDigger.class);
@Override
public void work() {
LOGGER.info("{} digs for gold.", name());

View File

@ -24,16 +24,14 @@
package com.iluwatar.facade;
import java.util.Arrays;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import lombok.extern.slf4j.Slf4j;
/**
* DwarvenMineWorker is one of the goldmine subsystems.
*/
@Slf4j
public abstract class DwarvenMineWorker {
private static final Logger LOGGER = LoggerFactory.getLogger(DwarvenMineWorker.class);
public void goToSleep() {
LOGGER.info("{} goes to sleep.", name());
}

View File

@ -23,16 +23,14 @@
package com.iluwatar.facade;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import lombok.extern.slf4j.Slf4j;
/**
* DwarvenTunnelDigger is one of the goldmine subsystems.
*/
@Slf4j
public class DwarvenTunnelDigger extends DwarvenMineWorker {
private static final Logger LOGGER = LoggerFactory.getLogger(DwarvenTunnelDigger.class);
@Override
public void work() {
LOGGER.info("{} creates another promising tunnel.", name());

View File

@ -41,17 +41,17 @@ import org.slf4j.LoggerFactory;
*
* @author Jeroen Meulemeester
*/
public class DwarvenGoldmineFacadeTest {
class DwarvenGoldmineFacadeTest {
private InMemoryAppender appender;
@BeforeEach
public void setUp() {
void setUp() {
appender = new InMemoryAppender();
}
@AfterEach
public void tearDown() {
void tearDown() {
appender.stop();
}
@ -63,7 +63,7 @@ public class DwarvenGoldmineFacadeTest {
* See if the workers are doing what's expected from them on each step.
*/
@Test
public void testFullWorkDay() {
void testFullWorkDay() {
final var goldMine = new DwarvenGoldmineFacade();
goldMine.startNewDay();
@ -108,7 +108,7 @@ public class DwarvenGoldmineFacadeTest {
assertEquals(15, appender.getLogSize());
}
private class InMemoryAppender extends AppenderBase<ILoggingEvent> {
private static class InMemoryAppender extends AppenderBase<ILoggingEvent> {
private final List<ILoggingEvent> log = new LinkedList<>();