gaspersic/java-design-patterns
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

3
data-bus/pom.xml
View File

@ -27,9 +27,6 @@
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<properties>
<lombok.version>1.16.14</lombok.version>
</properties>
<parent>
<groupId>com.iluwatar</groupId>
<artifactId>java-design-patterns</artifactId>

15
data-bus/src/main/java/com/iluwatar/databus/AbstractDataType.java
View File

@ -47,22 +47,17 @@ SOFTWARE.
package com.iluwatar.databus;
import lombok.Getter;
import lombok.Setter;
/**
* Base for data to send via the Data-Bus.
*
* @author Paul Campbell (pcampbell@kemitix.net)
*/
@Getter
@Setter
public class AbstractDataType implements DataType {
private DataBus dataBus;
@Override
public DataBus getDataBus() {
return dataBus;
}
@Override
public void setDataBus(DataBus dataBus) {
this.dataBus = dataBus;
}
}

12
data-bus/src/main/java/com/iluwatar/databus/data/MessageData.java
View File

@ -25,24 +25,20 @@ package com.iluwatar.databus.data;
import com.iluwatar.databus.AbstractDataType;
import com.iluwatar.databus.DataType;
import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* An event raised when a string message is sent.
*
* @author Paul Campbell (pcampbell@kemitix.net)
*/
@Getter
@AllArgsConstructor
public class MessageData extends AbstractDataType {
private final String message;
public MessageData(String message) {
this.message = message;
}
public String getMessage() {
return message;
}
public static DataType of(final String message) {
return new MessageData(message);
}

12
data-bus/src/main/java/com/iluwatar/databus/data/StartingData.java
View File

@ -26,24 +26,20 @@ package com.iluwatar.databus.data;
import com.iluwatar.databus.AbstractDataType;
import com.iluwatar.databus.DataType;
import java.time.LocalDateTime;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
/**
* An event raised when applications starts, containing the start time of the application.
*
* @author Paul Campbell (pcampbell@kemitix.net)
*/
@RequiredArgsConstructor
@Getter
public class StartingData extends AbstractDataType {
private final LocalDateTime when;
public StartingData(LocalDateTime when) {
this.when = when;
}
public LocalDateTime getWhen() {
return when;
}
public static DataType of(final LocalDateTime when) {
return new StartingData(when);
}

12
data-bus/src/main/java/com/iluwatar/databus/data/StoppingData.java
View File

@ -26,24 +26,20 @@ package com.iluwatar.databus.data;
import com.iluwatar.databus.AbstractDataType;
import com.iluwatar.databus.DataType;
import java.time.LocalDateTime;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
/**
* An event raised when applications stops, containing the stop time of the application.
*
* @author Paul Campbell (pcampbell@kemitix.net)
*/
@RequiredArgsConstructor
@Getter
public class StoppingData extends AbstractDataType {
private final LocalDateTime when;
public StoppingData(LocalDateTime when) {
this.when = when;
}
public LocalDateTime getWhen() {
return when;
}
public static DataType of(final LocalDateTime when) {
return new StoppingData(when);
}

7
data-bus/src/main/java/com/iluwatar/databus/members/MessageCollectorMember.java
View File

@ -28,17 +28,16 @@ import com.iluwatar.databus.Member;
import com.iluwatar.databus.data.MessageData;
import java.util.ArrayList;
import java.util.List;
import java.util.logging.Logger;
import lombok.extern.slf4j.Slf4j;
/**
* Receiver of Data-Bus events that collects the messages from each {@link MessageData}.
*
* @author Paul Campbell (pcampbell@kemitix.net)
*/
@Slf4j
public class MessageCollectorMember implements Member {
private static final Logger LOGGER = Logger.getLogger(MessageCollectorMember.class.getName());
private final String name;
private final List<String> messages = new ArrayList<>();
@ -55,7 +54,7 @@ public class MessageCollectorMember implements Member {
}
private void handleEvent(MessageData data) {
LOGGER.info(String.format("%s sees message %s", name, data.getMessage()));
LOGGER.info("{} sees message {}", name, data.getMessage());
messages.add(data.getMessage());
}

26
data-bus/src/main/java/com/iluwatar/databus/members/StatusMember.java
View File

@ -29,27 +29,26 @@ import com.iluwatar.databus.data.MessageData;
import com.iluwatar.databus.data.StartingData;
import com.iluwatar.databus.data.StoppingData;
import java.time.LocalDateTime;
import java.util.logging.Logger;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
/**
* Receiver of Data-Bus events.
*
* @author Paul Campbell (pcampbell@kemitix.net)
*/
@Getter
@Slf4j
@RequiredArgsConstructor
public class StatusMember implements Member {
private static final Logger LOGGER = Logger.getLogger(StatusMember.class.getName());
private final int id;
private LocalDateTime started;
private LocalDateTime stopped;
public StatusMember(int id) {
this.id = id;
}
@Override
public void accept(final DataType data) {
if (data instanceof StartingData) {
@ -61,21 +60,14 @@ public class StatusMember implements Member {
private void handleEvent(StartingData data) {
started = data.getWhen();
LOGGER.info(String.format("Receiver #%d sees application started at %s", id, started));
LOGGER.info("Receiver {} sees application started at {}", id, started);
}
private void handleEvent(StoppingData data) {
stopped = data.getWhen();
LOGGER.info(String.format("Receiver #%d sees application stopping at %s", id, stopped));
LOGGER.info(String.format("Receiver #%d sending goodbye message", id));
LOGGER.info("Receiver {} sees application stopping at {}", id, stopped);
LOGGER.info("Receiver {} sending goodbye message", id);
data.getDataBus().publish(MessageData.of(String.format("Goodbye cruel world from #%d!", id)));
}
public LocalDateTime getStarted() {
return started;
}
public LocalDateTime getStopped() {
return stopped;
}
}

8
data-bus/src/test/java/com/iluwatar/databus/DataBusTest.java
View File

@ -36,7 +36,7 @@ import org.mockito.MockitoAnnotations;
*
* @author Paul Campbell (pcampbell@kemitix.net)
*/
public class DataBusTest {
class DataBusTest {
@Mock
private Member member;
@ -45,12 +45,12 @@ public class DataBusTest {
private DataType event;
@BeforeEach
public void setUp() {
void setUp() {
MockitoAnnotations.initMocks(this);
}
@Test
public void publishedEventIsReceivedBySubscribedMember() {
void publishedEventIsReceivedBySubscribedMember() {
//given
final var dataBus = DataBus.getInstance();
dataBus.subscribe(member);
@ -61,7 +61,7 @@ public class DataBusTest {
}
@Test
public void publishedEventIsNotReceivedByMemberAfterUnsubscribing() {
void publishedEventIsNotReceivedByMemberAfterUnsubscribing() {
//given
final var dataBus = DataBus.getInstance();
dataBus.subscribe(member);

6
data-bus/src/test/java/com/iluwatar/databus/members/MessageCollectorMemberTest.java
View File

@ -36,10 +36,10 @@ import org.junit.jupiter.api.Test;
*
* @author Paul Campbell (pcampbell@kemitix.net)
*/
public class MessageCollectorMemberTest {
class MessageCollectorMemberTest {
@Test
public void collectMessageFromMessageData() {
void collectMessageFromMessageData() {
//given
final var message = "message";
final var messageData = new MessageData(message);
@ -51,7 +51,7 @@ public class MessageCollectorMemberTest {
}
@Test
public void collectIgnoresMessageFromOtherDataTypes() {
void collectIgnoresMessageFromOtherDataTypes() {
//given
final var startingData = new StartingData(LocalDateTime.now());
final var collector = new MessageCollectorMember("collector");

8
data-bus/src/test/java/com/iluwatar/databus/members/StatusMemberTest.java
View File

@ -39,10 +39,10 @@ import org.junit.jupiter.api.Test;
*
* @author Paul Campbell (pcampbell@kemitix.net)
*/
public class StatusMemberTest {
class StatusMemberTest {
@Test
public void statusRecordsTheStartTime() {
void statusRecordsTheStartTime() {
//given
final var startTime = LocalDateTime.of(2017, Month.APRIL, 1, 19, 9);
final var startingData = new StartingData(startTime);
@ -54,7 +54,7 @@ public class StatusMemberTest {
}
@Test
public void statusRecordsTheStopTime() {
void statusRecordsTheStopTime() {
//given
final var stop = LocalDateTime.of(2017, Month.APRIL, 1, 19, 12);
final var stoppingData = new StoppingData(stop);
@ -67,7 +67,7 @@ public class StatusMemberTest {
}
@Test
public void statusIgnoresMessageData() {
void statusIgnoresMessageData() {
//given
final var messageData = new MessageData("message");
final var statusMember = new StatusMember(1);