Parse more checkstyle rules into OpenRewrite styles.

Also correct a few defaults which were wrong according to checkstyle's documentation.

Author: sambsnyd

rewrite-core/src/main/java/org/openrewrite/style/Style.java

@@ -39,7 +39,7 @@ default String getJacksonPolymorphicTypeTag() {
     }
 
     default Style merge(Style lowerPrecedence) {
-        return this;
+        return StyleHelper.merge(lowerPrecedence, this);
     }
 
     default Style applyDefaults() { return this; }

rewrite-java/src/main/java/org/openrewrite/java/style/Checkstyle.java

@@ -72,10 +72,11 @@ public static DefaultComesLastStyle defaultComesLast() {
         return new DefaultComesLastStyle(false);
     }
 
-    public static final EmptyBlockStyle.BlockPolicy defaultBlockPolicy = EmptyBlockStyle.BlockPolicy.TEXT;
+    // https://checkstyle.sourceforge.io/checks/blocks/emptyblock.html
+    public static final EmptyBlockStyle.BlockPolicy defaultBlockPolicy = EmptyBlockStyle.BlockPolicy.STATEMENT;
 
     public static EmptyBlockStyle emptyBlock() {
-        return new EmptyBlockStyle(EmptyBlockStyle.BlockPolicy.TEXT, true, true, true, true,
+        return new EmptyBlockStyle(EmptyBlockStyle.BlockPolicy.STATEMENT, true, true, true, true,
                 true, true, true, true, true, true, true, true);
     }
 
@@ -107,9 +108,10 @@ public static NeedBracesStyle needBracesStyle() {
         return new NeedBracesStyle(false, false);
     }
 
+    // https://checkstyle.sourceforge.io/checks/whitespace/nowhitespaceafter.html
     public static NoWhitespaceAfterStyle noWhitespaceAfterStyle() {
         return new NoWhitespaceAfterStyle(true, false, false, true, true, true,
-                true, false, true, true, true, true, true, true);
+                true, true, true, true, true, true, true, true);
     }
 
     public static NoWhitespaceBeforeStyle noWhitespaceBeforeStyle() {