From fca7e9c8c7e9b0ffd579624b7c137db46eeeb6ca Mon Sep 17 00:00:00 2001 From: "adamski.pro" Date: Wed, 30 Oct 2019 07:19:33 +0100 Subject: [PATCH] https://github.com/iluwatar/java-design-patterns/issues/1021 - decrease number of checkstyle errors in callback pattern (#1053) --- .../main/java/com/iluwatar/callback/App.java | 22 +++++++++++-------- .../java/com/iluwatar/callback/Callback.java | 4 ++-- .../com/iluwatar/callback/LambdasApp.java | 15 ++++++++----- .../com/iluwatar/callback/SimpleTask.java | 14 +++++++----- .../main/java/com/iluwatar/callback/Task.java | 6 ++--- .../com/iluwatar/callback/package-info.java | 1 + 6 files changed, 36 insertions(+), 26 deletions(-) create mode 100644 callback/src/main/java/com/iluwatar/callback/package-info.java diff --git a/callback/src/main/java/com/iluwatar/callback/App.java b/callback/src/main/java/com/iluwatar/callback/App.java index 3a9cd00cb..842f01dcd 100644 --- a/callback/src/main/java/com/iluwatar/callback/App.java +++ b/callback/src/main/java/com/iluwatar/callback/App.java @@ -24,23 +24,27 @@ package com.iluwatar.callback; import org.slf4j.Logger; -import org.slf4j.LoggerFactory; + +import static org.slf4j.LoggerFactory.getLogger; /** - * - * Callback pattern is more native for functional languages where functions are treated as - * first-class citizens. Prior to Java 8 callbacks can be simulated using simple (alike command) - * interfaces. - * + * + * Callback pattern is more native for functional languages where functions are + * treated as first-class citizens. Prior to Java 8 callbacks can be simulated + * using simple (alike command) interfaces. + * */ -public class App { +public final class App { - private static final Logger LOGGER = LoggerFactory.getLogger(App.class); + private static final Logger LOGGER = getLogger(App.class); + + private App() { + } /** * Program entry point */ - public static void main(String[] args) { + public static void main(final String[] args) { Task task = new SimpleTask(); Callback callback = () -> LOGGER.info("I'm done now."); task.executeWith(callback); diff --git a/callback/src/main/java/com/iluwatar/callback/Callback.java b/callback/src/main/java/com/iluwatar/callback/Callback.java index 15f083662..0158dcda0 100644 --- a/callback/src/main/java/com/iluwatar/callback/Callback.java +++ b/callback/src/main/java/com/iluwatar/callback/Callback.java @@ -24,9 +24,9 @@ package com.iluwatar.callback; /** - * + * * Callback interface - * + * */ public interface Callback { diff --git a/callback/src/main/java/com/iluwatar/callback/LambdasApp.java b/callback/src/main/java/com/iluwatar/callback/LambdasApp.java index 2b445d9ca..18715e3b7 100644 --- a/callback/src/main/java/com/iluwatar/callback/LambdasApp.java +++ b/callback/src/main/java/com/iluwatar/callback/LambdasApp.java @@ -24,22 +24,25 @@ package com.iluwatar.callback; import org.slf4j.Logger; -import org.slf4j.LoggerFactory; + +import static org.slf4j.LoggerFactory.getLogger; /** * - * This example generates the exact same output as {@link App} however the callback has been - * defined as a Lambdas expression. + * This example generates the exact same output as {@link App} however the + * callback has been defined as a Lambdas expression. * */ -public class LambdasApp { +public final class LambdasApp { - private static final Logger LOGGER = LoggerFactory.getLogger(LambdasApp.class); + private static final Logger LOGGER = getLogger(LambdasApp.class); + + private LambdasApp() { } /** * Program entry point */ - public static void main(String[] args) { + public static void main(final String[] args) { Task task = new SimpleTask(); Callback c = () -> LOGGER.info("I'm done now."); task.executeWith(c); diff --git a/callback/src/main/java/com/iluwatar/callback/SimpleTask.java b/callback/src/main/java/com/iluwatar/callback/SimpleTask.java index 155d1e96d..21162833a 100644 --- a/callback/src/main/java/com/iluwatar/callback/SimpleTask.java +++ b/callback/src/main/java/com/iluwatar/callback/SimpleTask.java @@ -24,19 +24,21 @@ package com.iluwatar.callback; import org.slf4j.Logger; -import org.slf4j.LoggerFactory; + +import static org.slf4j.LoggerFactory.getLogger; /** - * + * * Implementation of task that need to be executed - * + * */ -public class SimpleTask extends Task { +public final class SimpleTask extends Task { - private static final Logger LOGGER = LoggerFactory.getLogger(SimpleTask.class); + private static final Logger LOGGER = getLogger(SimpleTask.class); @Override public void execute() { - LOGGER.info("Perform some important activity and after call the callback method."); + LOGGER.info("Perform some important activity and after call the" + + " callback method."); } } diff --git a/callback/src/main/java/com/iluwatar/callback/Task.java b/callback/src/main/java/com/iluwatar/callback/Task.java index 9f2abe85f..15cd99e9a 100644 --- a/callback/src/main/java/com/iluwatar/callback/Task.java +++ b/callback/src/main/java/com/iluwatar/callback/Task.java @@ -24,16 +24,16 @@ package com.iluwatar.callback; /** - * + * * Template-method class for callback hook execution - * + * */ public abstract class Task { /** * Execute with callback */ - public final void executeWith(Callback callback) { + final void executeWith(final Callback callback) { execute(); if (callback != null) { callback.call(); diff --git a/callback/src/main/java/com/iluwatar/callback/package-info.java b/callback/src/main/java/com/iluwatar/callback/package-info.java new file mode 100644 index 000000000..a72bbb50d --- /dev/null +++ b/callback/src/main/java/com/iluwatar/callback/package-info.java @@ -0,0 +1 @@ +package com.iluwatar.callback;