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

zh/decorator/README.md

@@ -40,10 +40,9 @@ public interface Troll {
   void fleeBattle();
 }
 
+@Slf4j
 public class SimpleTroll implements Troll {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(SimpleTroll.class);
-
   @Override
   public void attack() {
     LOGGER.info("The troll tries to grab you!");
@@ -64,10 +63,9 @@ public class SimpleTroll implements Troll {
 下面我们想为巨魔添加球棒。我们可以用装饰者来动态的实现。
 
 ```java
+@Slf4j
 public class ClubbedTroll implements Troll {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(ClubbedTroll.class);
-
   private final Troll decorated;
 
   public ClubbedTroll(Troll decorated) {