📍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>

extension-objects/src/main/java/concreteextensions/Commander.java

@@ -24,29 +24,24 @@
 package concreteextensions;
 
 import abstractextensions.CommanderExtension;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import units.CommanderUnit;
 
 /**
  * Class defining Commander.
  */
+@Getter
+@RequiredArgsConstructor
+@Slf4j
 public class Commander implements CommanderExtension {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(Commander.class);
-
   private final CommanderUnit unit;
 
-  public Commander(CommanderUnit commanderUnit) {
-    this.unit = commanderUnit;
-  }
-
   @Override
   public void commanderReady() {
     LOGGER.info("[Commander] " + unit.getName() + " is ready!");
   }
 
-  public CommanderUnit getUnit() {
-    return unit;
-  }
 }

extension-objects/src/main/java/concreteextensions/Sergeant.java

@@ -24,29 +24,24 @@
 package concreteextensions;
 
 import abstractextensions.SergeantExtension;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import units.SergeantUnit;
 
 /**
  * Class defining Sergeant.
  */
+@Getter
+@RequiredArgsConstructor
+@Slf4j
 public class Sergeant implements SergeantExtension {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(Sergeant.class);
-
   private final SergeantUnit unit;
 
-  public Sergeant(SergeantUnit sergeantUnit) {
-    this.unit = sergeantUnit;
-  }
-
   @Override
   public void sergeantReady() {
     LOGGER.info("[Sergeant] " + unit.getName() + " is ready!");
   }
 
-  public SergeantUnit getUnit() {
-    return unit;
-  }
 }

extension-objects/src/main/java/concreteextensions/Soldier.java

@@ -24,28 +24,24 @@
 package concreteextensions;
 
 import abstractextensions.SoldierExtension;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import units.SoldierUnit;
 
 /**
  * Class defining Soldier.
  */
+@Getter
+@RequiredArgsConstructor
+@Slf4j
 public class Soldier implements SoldierExtension {
-  private static final Logger LOGGER = LoggerFactory.getLogger(Soldier.class);
 
   private final SoldierUnit unit;
 
-  public Soldier(SoldierUnit soldierUnit) {
-    this.unit = soldierUnit;
-  }
-
   @Override
   public void soldierReady() {
     LOGGER.info("[Soldier] " + unit.getName() + " is ready!");
   }
 
-  public SoldierUnit getUnit() {
-    return unit;
-  }
 }

extension-objects/src/main/java/units/Unit.java

@@ -24,10 +24,14 @@
 package units;
 
 import abstractextensions.UnitExtension;
+import lombok.Getter;
+import lombok.Setter;
 
 /**
  * Class defining Unit, other units will extend this class.
  */
+@Setter
+@Getter
 public class Unit {
 
   private String name;
@@ -37,14 +41,6 @@ public class Unit {
     this.name = name;
   }
 
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
   public UnitExtension getUnitExtension(String extensionName) {
     return null;
   }

extension-objects/src/test/java/concreteextensions/CommanderTest.java

@@ -57,9 +57,9 @@ class CommanderTest {
 
     List<ILoggingEvent> logsList = listAppender.list;
     assertEquals("[Commander] " + commander.getUnit().getName() + " is ready!", logsList.get(0)
-            .getMessage());
+        .getMessage());
     assertEquals(Level.INFO, logsList.get(0)
-            .getLevel());
+        .getLevel());
   }
 
 }

extension-objects/src/test/java/concreteextensions/SergeantTest.java

@@ -55,9 +55,9 @@ class SergeantTest {
 
     List<ILoggingEvent> logsList = listAppender.list;
     assertEquals("[Sergeant] " + sergeant.getUnit().getName() + " is ready!", logsList.get(0)
-            .getMessage());
+        .getMessage());
     assertEquals(Level.INFO, logsList.get(0)
-            .getLevel());
+        .getLevel());
   }
 
 }

extension-objects/src/test/java/concreteextensions/SoldierTest.java

@@ -55,9 +55,9 @@ class SoldierTest {
 
     List<ILoggingEvent> logsList = listAppender.list;
     assertEquals("[Soldier] " + soldier.getUnit().getName() + " is ready!", logsList.get(0)
-            .getMessage());
+        .getMessage());
     assertEquals(Level.INFO, logsList.get(0)
-            .getLevel());
+        .getLevel());
   }
 
 }

extension-objects/src/test/java/units/CommanderUnitTest.java

@@ -31,9 +31,10 @@ import org.junit.jupiter.api.Test;
 /**
  * Created by Srdjan on 03-May-17.
  */
-public class CommanderUnitTest {
+class CommanderUnitTest {
+
   @Test
-  public void getUnitExtension() {
+  void getUnitExtension() {
     final var unit = new CommanderUnit("CommanderUnitName");
 
     assertNull(unit.getUnitExtension("SoldierExtension"));

extension-objects/src/test/java/units/SergeantUnitTest.java

@@ -31,9 +31,10 @@ import org.junit.jupiter.api.Test;
 /**
  * Created by Srdjan on 03-May-17.
  */
-public class SergeantUnitTest {
+class SergeantUnitTest {
+
   @Test
-  public void getUnitExtension() {
+  void getUnitExtension() {
     final var unit = new SergeantUnit("SergeantUnitName");
 
     assertNull(unit.getUnitExtension("SoldierExtension"));

extension-objects/src/test/java/units/SoldierUnitTest.java

@@ -31,9 +31,10 @@ import org.junit.jupiter.api.Test;
 /**
  * Created by Srdjan on 03-May-17.
  */
-public class SoldierUnitTest {
+class SoldierUnitTest {
+
   @Test
-  public void getUnitExtension() {
+  void getUnitExtension() {
     final var unit = new SoldierUnit("SoldierUnitName");
 
     assertNotNull(unit.getUnitExtension("SoldierExtension"));

extension-objects/src/test/java/units/UnitTest.java

@@ -31,10 +31,10 @@ import org.junit.jupiter.api.Test;
 /**
  * Created by Srdjan on 03-May-17.
  */
-public class UnitTest {
+class UnitTest {
 
   @Test
-  public void testConstGetSet() throws Exception {
+  void testConstGetSet() throws Exception {
     final var name = "testName";
     final var unit = new Unit(name);
     assertEquals(name, unit.getName());