wispborne · August 17, 2020 19:42 · Mar 4, 2019 · Mar 23, 2018 · Sep 2, 2016 · Jun 1, 2016
diff --git a/copy.java b/copy.java
@@ -0,0 +1,10 @@
+public Person cloneWithNewName(Person original, String newName) {
+  return new Person(
+    original.id,
+    newName,
+    original.role,
+    original.gender,
+    original.seatingPosition,
+    original.title
+  )
+}
diff --git a/copy.kt b/copy.kt
@@ -0,0 +1,2 @@
+fun cloneWithNewName(orignal: Person, newName: String): Person =
+  original.copy(name = newName)
diff --git a/KotlinComparisonClass.java b/KotlinComparisonClass.java
@@ -1,5 +1,5 @@
 /** Example of a {@link Class} declaration */
-final class MyClass {
+public final class MyClass {
   private boolean someBool;
 
   public MyClass() {
@@ -13,7 +13,7 @@ public boolean getSomeBool() {
     return someBool;
   }
 
-  protected void setSomeBool(@NonNull boolean value) {
+  public void setSomeBool(@NonNull boolean value) {
     someBool = value;
   }
 

diff --git a/MyClass.java → KotlinComparisonClass.java b/MyClass.java → KotlinComparisonClass.java
diff --git a/MyClass.kt → KotlinComparisonClass.kt b/MyClass.kt → KotlinComparisonClass.kt
diff --git a/MyClass.java b/MyClass.java
@@ -2,6 +2,9 @@
 final class MyClass {
   private boolean someBool;
 
+  public MyClass() {
+  }
+
   public MyClass(boolean someBool) {
     this.someBool = someBool;
   }

diff --git a/rxJava.kt b/rxJava.kt
@@ -3,5 +3,5 @@ fun printRxJavaStuff() {
   Observable.from(asList("one fish", "two fish", "red fish", "blue fish"))
   .filter { it.contains("one") || it.contains("two") }
   .map { it.replace("fish", "dish") }
-  .subscribe( { Timber.v(s) } ) // First prints "one dish", then "two dish"
+  .subscribe( { Timber.v(s) } )
 }
diff --git a/_Java_vs_Kotlin.md b/_Java_vs_Kotlin.md
@@ -1,2 +1,2 @@
-Comparison of Java to Kotlin for various simple code snippets.
+Comparison of Java 7 to Kotlin for various simple code snippets.
 Files with the same name do the same thing.
diff --git a/MyClass.java b/MyClass.java
@@ -19,7 +19,7 @@ public String toString() {
     return "someBool:" + someBool;
   }
 
-  // .copy override
-  // .hashcode override
-  // .equals override
+  // not shown: .copy override
+  // not shown: .hashcode override
+  // not shown: .equals override
 }
diff --git a/filter.java b/filter.java
@@ -1,5 +1,5 @@
 /** Returns a subset of {@code list} containing only the items where {@code someBool == true} */
-public List<MyClass> filterList(List<MyClass> list) {
+public final List<MyClass> filterList(List<MyClass> list) {
   List<MyClass> ret = new List<>(list.size());
 
   for(MyClass item : list) { 

diff --git a/nullability.java b/nullability.java
@@ -1,5 +1,5 @@
 /** Gets the second character in a string or, if not possible, returns some default value (which may be {@code null}) */
 @Nullable
-public String getSecondCharOrDefault(@NonNull String str, @Nullable String defaultVal) {
+public final String getSecondCharOrDefault(@NonNull String str, @Nullable String defaultVal) {
   return str.length() > 2 ? str.get(1) : defaultVal;
 }
diff --git a/rxJava.java b/rxJava.java
@@ -1,19 +1,22 @@
-        Observable.from(Arrays.asList("one fish", "two fish", "red fish", "blue fish"))
-        .filter(new Func1<String, Boolean>() {
-            @Override
-            public Boolean call(String s) {
-                return s.contains("one") || s.contains("two");
-            }
-        })
-        .map(new Func1<String, String>() {
-            @Override
-            public String call(String s) {
-                return s.replace("fish", "dish");
-            }
-        })
-        .subscribe(new Action1<String>() {
-            @Override
-            public void call(String s) {
-                Timber.v(s); // First prints "one dish", then "two dish"
-            }
-        });
+/** First prints "one dish", then "two dish" */
+public final void printRxJavaStuff() {
+  Observable.from(Arrays.asList("one fish", "two fish", "red fish", "blue fish"))
+  .filter(new Func1<String, Boolean>() {
+      @Override
+      public Boolean call(String s) {
+          return s.contains("one") || s.contains("two");
+      }
+  })
+  .map(new Func1<String, String>() {
+      @Override
+      public String call(String s) {
+          return s.replace("fish", "dish");
+      }
+      })
+  .subscribe(new Action1<String>() {
+      @Override
+      public void call(String s) {
+          Timber.v(s);
+      }
+  });
+}
diff --git a/rxJava.kt b/rxJava.kt
@@ -1,4 +1,7 @@
-Observable.from(asList("one fish", "two fish", "red fish", "blue fish"))
-.filter { it.contains("one") || it.contains("two") }
-.map { it.replace("fish", "dish") }
-.subscribe( { Timber.v(s) } ) // First prints "one dish", then "two dish"
+/** First prints "one dish", then "two dish" */
+fun printRxJavaStuff() {
+  Observable.from(asList("one fish", "two fish", "red fish", "blue fish"))
+  .filter { it.contains("one") || it.contains("two") }
+  .map { it.replace("fish", "dish") }
+  .subscribe( { Timber.v(s) } ) // First prints "one dish", then "two dish"
+}
diff --git a/rxJava.java b/rxJava.java
@@ -0,0 +1,19 @@
+        Observable.from(Arrays.asList("one fish", "two fish", "red fish", "blue fish"))
+        .filter(new Func1<String, Boolean>() {
+            @Override
+            public Boolean call(String s) {
+                return s.contains("one") || s.contains("two");
+            }
+        })
+        .map(new Func1<String, String>() {
+            @Override
+            public String call(String s) {
+                return s.replace("fish", "dish");
+            }
+        })
+        .subscribe(new Action1<String>() {
+            @Override
+            public void call(String s) {
+                Timber.v(s); // First prints "one dish", then "two dish"
+            }
+        });
diff --git a/rxJava.kt b/rxJava.kt
@@ -0,0 +1,4 @@
+Observable.from(asList("one fish", "two fish", "red fish", "blue fish"))
+.filter { it.contains("one") || it.contains("two") }
+.map { it.replace("fish", "dish") }
+.subscribe( { Timber.v(s) } ) // First prints "one dish", then "two dish"
diff --git a/nullability.java b/nullability.java
@@ -1,3 +1,4 @@
+/** Gets the second character in a string or, if not possible, returns some default value (which may be {@code null}) */
 @Nullable
 public String getSecondCharOrDefault(@NonNull String str, @Nullable String defaultVal) {
   return str.length() > 2 ? str.get(1) : defaultVal;

diff --git a/nullability.kt b/nullability.kt
@@ -1 +1,2 @@
+/** Gets the second character in a string or, if not possible, returns some default value (which may be `null`) */
 fun getSecondCharOrDefault(str: String, defaultVal: String?) = if(str.length > 2) str[1] else defaultVal
diff --git a/nullability.java b/nullability.java
@@ -0,0 +1,4 @@
+@Nullable
+public String getSecondCharOrDefault(@NonNull String str, @Nullable String defaultVal) {
+  return str.length() > 2 ? str.get(1) : defaultVal;
+}
diff --git a/nullability.kt b/nullability.kt
@@ -0,0 +1 @@
+fun getSecondCharOrDefault(str: String, defaultVal: String?) = if(str.length > 2) str[1] else defaultVal
diff --git a/_Java_vs_Kotlin.md b/_Java_vs_Kotlin.md
@@ -1,2 +1,2 @@
-Comparison of Java to Kotlin for various simple methods.
-Both files do exactly the same thing.
+Comparison of Java to Kotlin for various simple code snippets.
+Files with the same name do the same thing.
diff --git a/java.kt → filter.java b/java.kt → filter.java
@@ -9,9 +9,4 @@ public List<MyClass> filterList(List<MyClass> list) {
     }
 
   return ret;
-}
-
-/** Returns {@code "yes"} if {@code value == true} or {@code "no"} if {@code value == false}. */
-public boolean yesOrNo(boolean value) {
-  return value ? "yes" : "no";
 }
diff --git a/filter.kt b/filter.kt
@@ -0,0 +1,2 @@
+/** Returns a subset of `list` containing only the items where `someBool == true` */
+fun filterList(items:List<MyClass>) = items.filter { item -> item.someBool } // or { it.someBool }
diff --git a/kotlin.kt b/kotlin.kt
@@ -1,5 +0,0 @@
-/** Returns a subset of `list` containing only the items where `someBool == true` */
-fun filterList(items:List<MyClass>) = items.filter { item -> item.someBool } // or { it.someBool }
-
-/** Returns `"yes"` if `value == true` or `"no"` if `value == false`. */
-fun yesOrNo(value: Boolean) = if(value) "yes" else "no"

diff --git a/yesOrNo.java b/yesOrNo.java
@@ -0,0 +1,4 @@
+/** Returns {@code "yes"} if {@code value == true} or {@code "no"} if {@code value == false}. */
+public boolean yesOrNo(boolean value) {
+  return value ? "yes" : "no";
+}
diff --git a/yesOrNo.kt b/yesOrNo.kt
@@ -0,0 +1,2 @@
+/** Returns `"yes"` if `value == true` or `"no"` if `value == false`. */
+fun yesOrNo(value: Boolean) = if(value) "yes" else "no"
diff --git a/MyClass.java b/MyClass.java
@@ -0,0 +1,25 @@
+/** Example of a {@link Class} declaration */
+final class MyClass {
+  private boolean someBool;
+
+  public MyClass(boolean someBool) {
+    this.someBool = someBool;
+  }
+
+  public boolean getSomeBool() {
+    return someBool;
+  }
+
+  protected void setSomeBool(@NonNull boolean value) {
+    someBool = value;
+  }
+
+  @Override
+  public String toString() {
+    return "someBool:" + someBool;
+  }
+
+  // .copy override
+  // .hashcode override
+  // .equals override
+}
diff --git a/MyClass.kt b/MyClass.kt
@@ -0,0 +1,2 @@
+/** Example of a [Class] declaration. */
+data class MyClass(var someBool: Boolean = false)
diff --git a/java.kt b/java.kt
@@ -1,29 +1,3 @@
-/** Example of a {@link Class} declaration */
-final class MyClass {
-  private boolean someBool;
-
-  public MyClass(boolean someBool) {
-    this.someBool = someBool;
-  }
-
-  public boolean getSomeBool() {
-    return someBool;
-  }
-
-  protected void setSomeBool(@NonNull boolean value) {
-    someBool = value;
-  }
-
-  @Override
-  public String toString() {
-    return "someBool:" + someBool;
-  }
-
-  // .copy override
-  // .hashcode override
-  // .equals override
-}
-
 /** Returns a subset of {@code list} containing only the items where {@code someBool == true} */
 public List<MyClass> filterList(List<MyClass> list) {
   List<MyClass> ret = new List<>(list.size());

diff --git a/kotlin.kt b/kotlin.kt
@@ -1,6 +1,3 @@
-/** Example of a [Class] declaration. */
-data class MyClass(var someBool: Boolean = false)
-
 /** Returns a subset of `list` containing only the items where `someBool == true` */
 fun filterList(items:List<MyClass>) = items.filter { item -> item.someBool } // or { it.someBool }
 

diff --git a/java.kt b/java.kt
@@ -37,7 +37,7 @@ public List<MyClass> filterList(List<MyClass> list) {
   return ret;
 }
 
-/** Returns {@code "yes"} if {@code value == true} or {@code "no"} if {@code value == false}.
+/** Returns {@code "yes"} if {@code value == true} or {@code "no"} if {@code value == false}. */
 public boolean yesOrNo(boolean value) {
   return value ? "yes" : "no";
 }
diff --git a/kotlin.kt b/kotlin.kt
@@ -4,5 +4,5 @@ data class MyClass(var someBool: Boolean = false)
 /** Returns a subset of `list` containing only the items where `someBool == true` */
 fun filterList(items:List<MyClass>) = items.filter { item -> item.someBool } // or { it.someBool }
 
-/** Returns `"yes"` if `value == true` or `"no"` if `value == false`.
+/** Returns `"yes"` if `value == true` or `"no"` if `value == false`. */
 fun yesOrNo(value: Boolean) = if(value) "yes" else "no"
diff --git a/kotlin.kt b/kotlin.kt
@@ -1,4 +1,4 @@
-/** Example of a [Class] declaration.
+/** Example of a [Class] declaration. */
 data class MyClass(var someBool: Boolean = false)
 
 /** Returns a subset of `list` containing only the items where `someBool == true` */

diff --git a/java.kt b/java.kt
@@ -1,3 +1,4 @@
+/** Example of a {@link Class} declaration */
 final class MyClass {
   private boolean someBool;
 
@@ -34,4 +35,9 @@ public List<MyClass> filterList(List<MyClass> list) {
     }
 
   return ret;
+}
+
+/** Returns {@code "yes"} if {@code value == true} or {@code "no"} if {@code value == false}.
+public boolean yesOrNo(boolean value) {
+  return value ? "yes" : "no";
 }
diff --git a/kotlin.kt b/kotlin.kt
@@ -1,4 +1,8 @@
+/** Example of a [Class] declaration.
 data class MyClass(var someBool: Boolean = false)
 
 /** Returns a subset of `list` containing only the items where `someBool == true` */
-fun filterList(items:List<MyClass>) = items.filter { item -> item.someBool } // or { it.someBool }
+fun filterList(items:List<MyClass>) = items.filter { item -> item.someBool } // or { it.someBool }
+
+/** Returns `"yes"` if `value == true` or `"no"` if `value == false`.
+fun yesOrNo(value: Boolean) = if(value) "yes" else "no"
diff --git a/java.kt b/java.kt
@@ -1,4 +1,4 @@
-class MyClass {
+final class MyClass {
   private boolean someBool;
 
   public MyClass(boolean someBool) {
@@ -16,6 +16,11 @@ class MyClass {
   @Override
   public String toString() {
     return "someBool:" + someBool;
+  }
+
+  // .copy override
+  // .hashcode override
+  // .equals override
 }
 
 /** Returns a subset of {@code list} containing only the items where {@code someBool == true} */

diff --git a/_Java_vs_Kotlin.md b/_Java_vs_Kotlin.md
@@ -1 +1,2 @@
-Comparison of Java to Kotlin for various simple methods.
+Comparison of Java to Kotlin for various simple methods.
+Both files do exactly the same thing.
diff --git a/java.kt b/java.kt
@@ -1,3 +1,23 @@
+class MyClass {
+  private boolean someBool;
+
+  public MyClass(boolean someBool) {
+    this.someBool = someBool;
+  }
+
+  public boolean getSomeBool() {
+    return someBool;
+  }
+
+  protected void setSomeBool(@NonNull boolean value) {
+    someBool = value;
+  }
+
+  @Override
+  public String toString() {
+    return "someBool:" + someBool;
+}
+
 /** Returns a subset of {@code list} containing only the items where {@code someBool == true} */
 public List<MyClass> filterList(List<MyClass> list) {
   List<MyClass> ret = new List<>(list.size());

diff --git a/kotlin.kt b/kotlin.kt
@@ -1,2 +1,4 @@
+data class MyClass(var someBool: Boolean = false)
+
 /** Returns a subset of `list` containing only the items where `someBool == true` */
 fun filterList(items:List<MyClass>) = items.filter { item -> item.someBool } // or { it.someBool }
diff --git a/kotlin.kt b/kotlin.kt
@@ -1,2 +1,2 @@
 /** Returns a subset of `list` containing only the items where `someBool == true` */
-fun filterList(items:List<MyClass>) = items.filter { it.someBool }
+fun filterList(items:List<MyClass>) = items.filter { item -> item.someBool } // or { it.someBool }
diff --git a/java.kt b/java.kt
@@ -1,10 +1,12 @@
 /** Returns a subset of {@code list} containing only the items where {@code someBool == true} */
 public List<MyClass> filterList(List<MyClass> list) {
   List<MyClass> ret = new List<>(list.size());
+
   for(MyClass item : list) { 
     if(item.someBool) {
-      ret.add(item);
+        ret.add(item);
       }
     }
+
   return ret;
 }
diff --git a/_ReadMe.md → _Java_vs_Kotlin.md b/_ReadMe.md → _Java_vs_Kotlin.md
diff --git a/_ReadMe.md b/_ReadMe.md
@@ -0,0 +1 @@
+Comparison of Java to Kotlin for various simple methods.
diff --git a/java.kt b/java.kt
@@ -1,3 +1,4 @@
+/** Returns a subset of {@code list} containing only the items where {@code someBool == true} */
 public List<MyClass> filterList(List<MyClass> list) {
   List<MyClass> ret = new List<>(list.size());
   for(MyClass item : list) { 

diff --git a/kotlin.kt b/kotlin.kt
@@ -1 +1,2 @@
+/** Returns a subset of `list` containing only the items where `someBool == true` */
 fun filterList(items:List<MyClass>) = items.filter { it.someBool }
diff --git a/java.kt b/java.kt
@@ -0,0 +1,9 @@
+public List<MyClass> filterList(List<MyClass> list) {
+  List<MyClass> ret = new List<>(list.size());
+  for(MyClass item : list) { 
+    if(item.someBool) {
+      ret.add(item);
+      }
+    }
+  return ret;
+}
diff --git a/kotlin.kt b/kotlin.kt
@@ -0,0 +1 @@
+fun filterList(items:List<MyClass>) = items.filter { it.someBool }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		fun cloneWithNewName(orignal: Person, newName: String): Person =
		original.copy(name = newName)
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		/** Gets the second character in a string or, if not possible, returns some default value (which may be `null`) */
		fun getSecondCharOrDefault(str: String, defaultVal: String?) = if(str.length > 2) str[1] else defaultVal
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		fun getSecondCharOrDefault(str: String, defaultVal: String?) = if(str.length > 2) str[1] else defaultVal
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		/** Returns a subset of `list` containing only the items where `someBool == true` */
		fun filterList(items:List<MyClass>) = items.filter { item -> item.someBool } // or { it.someBool }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		/** Returns `"yes"` if `value == true` or `"no"` if `value == false`. */
		fun yesOrNo(value: Boolean) = if(value) "yes" else "no"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		/** Example of a [Class] declaration. */
		data class MyClass(var someBool: Boolean = false)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Comparison of Java to Kotlin for various simple methods.