diff --git a/data-bus/pom.xml b/data-bus/pom.xml index b2e246c3d..9e9f6a70a 100644 --- a/data-bus/pom.xml +++ b/data-bus/pom.xml @@ -42,11 +42,5 @@ junit test - - org.projectlombok - lombok - ${lombok.version} - provided - diff --git a/data-bus/src/main/java/com/iluwatar/databus/App.java b/data-bus/src/main/java/com/iluwatar/databus/App.java index b76873cec..2dff853b9 100644 --- a/data-bus/src/main/java/com/iluwatar/databus/App.java +++ b/data-bus/src/main/java/com/iluwatar/databus/App.java @@ -23,12 +23,11 @@ package com.iluwatar.databus; -import com.iluwatar.databus.data.StoppingData; -import com.iluwatar.databus.data.StartingData; import com.iluwatar.databus.data.MessageData; +import com.iluwatar.databus.data.StartingData; +import com.iluwatar.databus.data.StoppingData; import com.iluwatar.databus.members.CounterMember; import com.iluwatar.databus.members.StatusMember; -import lombok.extern.slf4j.Slf4j; import java.time.LocalDateTime; @@ -39,7 +38,6 @@ import java.time.LocalDateTime; * * @author Paul Campbell (pcampbell@kemitix.net) */ -@Slf4j class App { public static void main(String[] args) { diff --git a/data-bus/src/main/java/com/iluwatar/databus/data/MessageData.java b/data-bus/src/main/java/com/iluwatar/databus/data/MessageData.java index 2750b013e..934022be9 100644 --- a/data-bus/src/main/java/com/iluwatar/databus/data/MessageData.java +++ b/data-bus/src/main/java/com/iluwatar/databus/data/MessageData.java @@ -25,18 +25,20 @@ package com.iluwatar.databus.data; import com.iluwatar.databus.AbstractDataType; import com.iluwatar.databus.DataType; -import lombok.RequiredArgsConstructor; /** * . * * @author Paul Campbell (pcampbell@kemitix.net) */ -@RequiredArgsConstructor public class MessageData extends AbstractDataType { private final String message; + public MessageData(String message) { + this.message = message; + } + public String getMessage() { return message; } diff --git a/data-bus/src/main/java/com/iluwatar/databus/data/StartingData.java b/data-bus/src/main/java/com/iluwatar/databus/data/StartingData.java index f7159b77a..ac7391f1a 100644 --- a/data-bus/src/main/java/com/iluwatar/databus/data/StartingData.java +++ b/data-bus/src/main/java/com/iluwatar/databus/data/StartingData.java @@ -25,7 +25,6 @@ package com.iluwatar.databus.data; import com.iluwatar.databus.AbstractDataType; import com.iluwatar.databus.DataType; -import lombok.RequiredArgsConstructor; import java.time.LocalDateTime; @@ -34,11 +33,14 @@ import java.time.LocalDateTime; * * @author Paul Campbell (pcampbell@kemitix.net) */ -@RequiredArgsConstructor public class StartingData extends AbstractDataType { private final LocalDateTime when; + public StartingData(LocalDateTime when) { + this.when = when; + } + public LocalDateTime getWhen() { return when; } diff --git a/data-bus/src/main/java/com/iluwatar/databus/data/StoppingData.java b/data-bus/src/main/java/com/iluwatar/databus/data/StoppingData.java index 57918ec4c..b5e30568f 100644 --- a/data-bus/src/main/java/com/iluwatar/databus/data/StoppingData.java +++ b/data-bus/src/main/java/com/iluwatar/databus/data/StoppingData.java @@ -25,7 +25,6 @@ package com.iluwatar.databus.data; import com.iluwatar.databus.AbstractDataType; import com.iluwatar.databus.DataType; -import lombok.RequiredArgsConstructor; import java.time.LocalDateTime; @@ -34,11 +33,14 @@ import java.time.LocalDateTime; * * @author Paul Campbell (pcampbell@kemitix.net) */ -@RequiredArgsConstructor public class StoppingData extends AbstractDataType { private final LocalDateTime when; + public StoppingData(LocalDateTime when) { + this.when = when; + } + public LocalDateTime getWhen() { return when; } diff --git a/data-bus/src/main/java/com/iluwatar/databus/members/CounterMember.java b/data-bus/src/main/java/com/iluwatar/databus/members/CounterMember.java index 45c90abb0..d43bf4bab 100644 --- a/data-bus/src/main/java/com/iluwatar/databus/members/CounterMember.java +++ b/data-bus/src/main/java/com/iluwatar/databus/members/CounterMember.java @@ -26,20 +26,24 @@ package com.iluwatar.databus.members; import com.iluwatar.databus.DataType; import com.iluwatar.databus.Member; import com.iluwatar.databus.data.MessageData; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; + +import java.util.logging.Logger; /** * Receiver of Data-Bus events. * * @author Paul Campbell (pcampbell@kemitix.net) */ -@Slf4j -@RequiredArgsConstructor public class CounterMember implements Member { + private static final Logger LOGGER = Logger.getLogger(CounterMember.class.getName()); + private final String name; + public CounterMember(String name) { + this.name = name; + } + @Override public void accept(final DataType data) { if (data instanceof MessageData) { @@ -48,6 +52,6 @@ public class CounterMember implements Member { } private void handleEvent(MessageData data) { - log.info("{} sees message {}", name, data.getMessage()); + LOGGER.info(String.format("%s sees message %s", name, data.getMessage())); } } diff --git a/data-bus/src/main/java/com/iluwatar/databus/members/StatusMember.java b/data-bus/src/main/java/com/iluwatar/databus/members/StatusMember.java index 5e1ca1656..f11e1e0ab 100644 --- a/data-bus/src/main/java/com/iluwatar/databus/members/StatusMember.java +++ b/data-bus/src/main/java/com/iluwatar/databus/members/StatusMember.java @@ -28,20 +28,24 @@ import com.iluwatar.databus.Member; import com.iluwatar.databus.data.MessageData; import com.iluwatar.databus.data.StartingData; import com.iluwatar.databus.data.StoppingData; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; + +import java.util.logging.Logger; /** * Receiver of Data-Bus events. * * @author Paul Campbell (pcampbell@kemitix.net) */ -@Slf4j -@RequiredArgsConstructor public class StatusMember implements Member { + private static final Logger LOGGER = Logger.getLogger(StatusMember.class.getName()); + private final int id; + public StatusMember(int id) { + this.id = id; + } + @Override public void accept(final DataType data) { if (data instanceof StartingData) { @@ -52,12 +56,12 @@ public class StatusMember implements Member { } private void handleEvent(StartingData data) { - log.info("Receiver #{} sees application started at {}", id, data.getWhen()); + LOGGER.info(String.format("Receiver #%d sees application started at %s", id, data.getWhen())); } private void handleEvent(StoppingData data) { - log.info("Receiver #{} sees application stopping at {}", id, data.getWhen()); - log.info("Receiver #{} sending goodbye message", id); + LOGGER.info(String.format("Receiver #%d sees application stopping at %s", id, data.getWhen())); + LOGGER.info(String.format("Receiver #%d sending goodbye message", id)); data.getDataBus().publish(MessageData.of(String.format("Goodbye cruel world from #%d!", id))); } }