From 7dc47da131a423f8a4f601d7f4db4fb8e01aef17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ilkka=20Sepp=C3=A4l=C3=A4?= <ilkka.seppala@gofore.com>
Date: Tue, 5 Nov 2019 17:22:53 +0200
Subject: [PATCH] #1021 Checkstyle fixes for Composite pattern

---
 .../src/main/java/com/iluwatar/composite/App.java      |  8 ++++----
 .../src/main/java/com/iluwatar/composite/Letter.java   | 10 ++++------
 .../java/com/iluwatar/composite/LetterComposite.java   | 10 +++++-----
 .../main/java/com/iluwatar/composite/Messenger.java    |  4 +---
 .../src/main/java/com/iluwatar/composite/Sentence.java |  6 ++----
 .../src/main/java/com/iluwatar/composite/Word.java     |  6 ++----
 6 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/composite/src/main/java/com/iluwatar/composite/App.java b/composite/src/main/java/com/iluwatar/composite/App.java
index eb55b7762..7389c7a96 100644
--- a/composite/src/main/java/com/iluwatar/composite/App.java
+++ b/composite/src/main/java/com/iluwatar/composite/App.java
@@ -32,9 +32,9 @@ import org.slf4j.LoggerFactory;
  * of a composite is to "compose" objects into tree structures to represent part-whole hierarchies.
  * Implementing the Composite pattern lets clients treat individual objects and compositions
  * uniformly.
- * <p>
- * In this example we have sentences composed of words composed of letters. All of the objects can
- * be treated through the same interface ({@link LetterComposite}).
+ *
+ * <p>In this example we have sentences composed of words composed of letters. All of the objects
+ * can be treated through the same interface ({@link LetterComposite}).
  * 
  */
 public class App {
@@ -42,7 +42,7 @@ public class App {
   private static final Logger LOGGER = LoggerFactory.getLogger(App.class);
 
   /**
-   * Program entry point
+   * Program entry point.
    * 
    * @param args command line args
    */
diff --git a/composite/src/main/java/com/iluwatar/composite/Letter.java b/composite/src/main/java/com/iluwatar/composite/Letter.java
index 4583f9089..ab2d496ea 100644
--- a/composite/src/main/java/com/iluwatar/composite/Letter.java
+++ b/composite/src/main/java/com/iluwatar/composite/Letter.java
@@ -24,20 +24,18 @@
 package com.iluwatar.composite;
 
 /**
- *
- * Letter
- *
+ * Letter.
  */
 public class Letter extends LetterComposite {
 
-  private char c;
+  private char character;
 
   public Letter(char c) {
-    this.c = c;
+    this.character = c;
   }
 
   @Override
   protected void printThisBefore() {
-    System.out.print(c);
+    System.out.print(character);
   }
 }
diff --git a/composite/src/main/java/com/iluwatar/composite/LetterComposite.java b/composite/src/main/java/com/iluwatar/composite/LetterComposite.java
index 673e28f79..5d8af5435 100644
--- a/composite/src/main/java/com/iluwatar/composite/LetterComposite.java
+++ b/composite/src/main/java/com/iluwatar/composite/LetterComposite.java
@@ -27,9 +27,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * 
  * Composite interface.
- * 
  */
 public abstract class LetterComposite {
 
@@ -43,12 +41,14 @@ public abstract class LetterComposite {
     return children.size();
   }
 
-  protected void printThisBefore() {}
+  protected void printThisBefore() {
+  }
 
-  protected void printThisAfter() {}
+  protected void printThisAfter() {
+  }
 
   /**
-   * Print
+   * Print.
    */
   public void print() {
     printThisBefore();
diff --git a/composite/src/main/java/com/iluwatar/composite/Messenger.java b/composite/src/main/java/com/iluwatar/composite/Messenger.java
index ba6a08161..55929e7ee 100644
--- a/composite/src/main/java/com/iluwatar/composite/Messenger.java
+++ b/composite/src/main/java/com/iluwatar/composite/Messenger.java
@@ -26,9 +26,7 @@ package com.iluwatar.composite;
 import java.util.List;
 
 /**
- * 
- * Messenger
- *
+ * Messenger.
  */
 public class Messenger {
 
diff --git a/composite/src/main/java/com/iluwatar/composite/Sentence.java b/composite/src/main/java/com/iluwatar/composite/Sentence.java
index 08e12f152..c94ce84aa 100644
--- a/composite/src/main/java/com/iluwatar/composite/Sentence.java
+++ b/composite/src/main/java/com/iluwatar/composite/Sentence.java
@@ -26,14 +26,12 @@ package com.iluwatar.composite;
 import java.util.List;
 
 /**
- *
- * Sentence
- *
+ * Sentence.
  */
 public class Sentence extends LetterComposite {
 
   /**
-   * Constructor
+   * Constructor.
    */
   public Sentence(List<Word> words) {
     for (Word w : words) {
diff --git a/composite/src/main/java/com/iluwatar/composite/Word.java b/composite/src/main/java/com/iluwatar/composite/Word.java
index 7c71a7fdd..353c363a2 100644
--- a/composite/src/main/java/com/iluwatar/composite/Word.java
+++ b/composite/src/main/java/com/iluwatar/composite/Word.java
@@ -26,14 +26,12 @@ package com.iluwatar.composite;
 import java.util.List;
 
 /**
- *
- * Word
- *
+ * Word.
  */
 public class Word extends LetterComposite {
 
   /**
-   * Constructor
+   * Constructor.
    */
   public Word(List<Letter> letters) {
     for (Letter l : letters) {