Java 11 migraiton: marker

altaiezior · altaiezior · commit e6c74a5fb97f · 2020-04-12T21:35:48.000Z
diff --git a/marker/src/main/java/App.java b/marker/src/main/java/App.java
@@ -21,9 +21,6 @@
  * THE SOFTWARE.
  */
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 /**
  * Created by Alexis on 28-Apr-17. With Marker interface idea is to make empty interface and extend
  * it. Basically it is just to identify the special objects from normal objects. Like in case of
@@ -46,22 +43,10 @@ public class App {
    * @param args command line args
    */
   public static void main(String[] args) {
-
-    final Logger logger = LoggerFactory.getLogger(App.class);
-    Guard guard = new Guard();
-    Thief thief = new Thief();
-
-    if (guard instanceof Permission) {
-      guard.enter();
-    } else {
-      logger.info("You have no permission to enter, please leave this area");
-    }
-
-    if (thief instanceof Permission) {
-      thief.steal();
-    } else {
-      thief.doNothing();
-    }
+    var guard = new Guard();
+    var thief = new Thief();
+    guard.enter();
+    thief.doNothing();
   }
 }
 
diff --git a/marker/src/main/java/Guard.java b/marker/src/main/java/Guard.java
@@ -31,8 +31,7 @@ public class Guard implements Permission {
 
   private static final Logger LOGGER = LoggerFactory.getLogger(Guard.class);
 
-  protected static void enter() {
-
+  protected void enter() {
     LOGGER.info("You can enter");
   }
 }
diff --git a/marker/src/main/java/Thief.java b/marker/src/main/java/Thief.java
@@ -35,7 +35,7 @@ protected static void steal() {
     LOGGER.info("Steal valuable items");
   }
 
-  protected static void doNothing() {
+  protected void doNothing() {
     LOGGER.info("Pretend nothing happened and just leave");
   }
 }
diff --git a/marker/src/test/java/AppTest.java b/marker/src/test/java/AppTest.java
@@ -30,7 +30,6 @@ public class AppTest {
 
   @Test
   public void test() {
-    String[] args = {};
-    App.main(args);
+    App.main(new String[]{});
   }
 }
diff --git a/marker/src/test/java/GuardTest.java b/marker/src/test/java/GuardTest.java
@@ -33,7 +33,7 @@ public class GuardTest {
 
   @Test
   public void testGuard() {
-    Guard guard = new Guard();
+    var guard = new Guard();
     assertThat(guard, instanceOf(Permission.class));
   }
 }
diff --git a/marker/src/test/java/ThiefTest.java b/marker/src/test/java/ThiefTest.java
@@ -21,17 +21,19 @@
  * THE SOFTWARE.
  */
 
-import org.junit.jupiter.api.Test;
+import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.MatcherAssert.assertThat;
 
-import static org.junit.jupiter.api.Assertions.assertFalse;
+import org.junit.jupiter.api.Test;
 
 /**
  * Thief test
  */
 public class ThiefTest {
   @Test
   public void testThief() {
-    Thief thief = new Thief();
-    assertFalse(thief instanceof Permission);
+    var thief = new Thief();
+    assertThat(thief, not(instanceOf(Permission.class)));
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,7 @@ public class Guard implements Permission {`
`31`	`31`
`32`	`32`	`private static final Logger LOGGER = LoggerFactory.getLogger(Guard.class);`
`33`	`33`
`34`		`- protected static void enter() {`
`35`		`-`
	`34`	`+ protected void enter() {`
`36`	`35`	`LOGGER.info("You can enter");`
`37`	`36`	`}`
`38`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ protected static void steal() {`
`35`	`35`	`LOGGER.info("Steal valuable items");`
`36`	`36`	`}`
`37`	`37`
`38`		`- protected static void doNothing() {`
	`38`	`+ protected void doNothing() {`
`39`	`39`	`LOGGER.info("Pretend nothing happened and just leave");`
`40`	`40`	`}`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,6 @@ public class AppTest {`
`30`	`30`
`31`	`31`	`@Test`
`32`	`32`	`public void test() {`
`33`		`- String[] args = {};`
`34`		`- App.main(args);`
	`33`	`+ App.main(new String[]{});`
`35`	`34`	`}`
`36`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public class GuardTest {`
`33`	`33`
`34`	`34`	`@Test`
`35`	`35`	`public void testGuard() {`
`36`		`- Guard guard = new Guard();`
	`36`	`+ var guard = new Guard();`
`37`	`37`	`assertThat(guard, instanceOf(Permission.class));`
`38`	`38`	`}`
`39`	`39`	`}`