Merge branch 'develop' into switch

Author: bowbahdoe

src/annotations/elements.md

@@ -20,14 +20,20 @@ The method should take no arguments.
 }
 ```
 
-And the return value needs to be one of a few built-in types like `Class`, `String`, `int`, `boolean`, etc.[^fulllist], an `enum`, or an array of one of those.
+And the return value needs to be one of a few built-in types like `Class`, `String`, `int`, `boolean`, etc.[^fulllist], an `enum`, another annotation interface, or an array of one of those.
 
 ```java,no_run,does_not_compile
 enum Priority {
     HIGH,
     LOW
 }
 
+@interface Deadline {
+    int year();
+    int month();
+    int day();
+}
+
 class PersonInCharge {}
 
 @interface Todo {
@@ -49,7 +55,10 @@ class PersonInCharge {}
     // Enums ✅
     Priority priority();
 
-    // Other Classes ❌
+    // Other annotations ✅
+    Deadline deadline();
+
+    // Other classes ❌
     PersonInCharge personInCharge();
 }
 ```

src/class_extension/relation_to_encapsulation.md

@@ -72,7 +72,8 @@ class Airplane {
 
     void bookMany(List<String> passengers) {
         for (var passenger : passengers) {
-            bookOne(passenger);
+            // Only change
+            this.passengers.add(passenger);
         }
     }
 }

src/lambdas/method_references.md

@@ -17,7 +17,7 @@ class Main {
     }
 
     void main() {
-        Drummer drummer = () -> drum();
+        Drummer drummer = () -> doDrum();
         drummer.drum();
     }
 }

src/modules/exports.md

@@ -33,7 +33,7 @@ package sky;
 // But classes within other packages of
 // the "reality" module can see it just fine.
 public class Cloud {
-    private final YelloCarpet fabricOfExistence
+    private final YellowCarpet fabricOfExistence
         = new YellowCarpet();
 
     // ...

src/objects/challenges.md

@@ -34,7 +34,7 @@ class Broom {
 class Witch {
     Object pullFromHat() {
         double r = Math.random();
-        if (Math.random() < 0.25) {
+        if (r < 0.25) {
             return new Spell("Ensmallen");
         }
         else if (r < 0.5) {

src/standard_input_ii/aggregating_data.md

@@ -55,11 +55,6 @@ you can use a class.[^dto]
 class Person {
     String firstName;
     String lastName;
-
-    Person(String firstName, String lastName) {
-        this.firstName = firstName;
-        this.lastName = lastName;
-    }
 }
 
 Person askForName() {
@@ -87,7 +82,10 @@ Person askForName() {
         }
     } while (true);
     
-    return new Person(firstName, lastName);
+    var person = new Person();
+    person.firstName = firstName;
+    person.lastName = lastName;
+    return person;
 }
 
 void main() {

src/standard_input_ii/delayed_assignment.md

@@ -12,7 +12,7 @@ The problem with this is that Java isn't smart enough to know that you always in
 void main() {
     String name;
     while (true) {
-        String name = IO.readln("What is your name? ");
+        name = IO.readln("What is your name? ");
         if (name.isBlank()) {
             IO.println("Name cannot be blank!");
             continue;
@@ -31,7 +31,7 @@ To get around this you can either give an explicit default value.
 void main() {
     String name = null;
     while (true) {
-        String name = IO.readln("What is your name? ");
+        name = IO.readln("What is your name? ");
         if (name.isBlank()) {
             IO.println("Name cannot be blank!");
             continue;
@@ -52,7 +52,7 @@ to see that the code in the loop will run at least once.
 void main() {
     String name;
     do {
-        String name = IO.readln("What is your name? ");
+        name = IO.readln("What is your name? ");
         if (name.isBlank()) {
             IO.println("Name cannot be blank!");
             continue;

src/standard_input_ii/enums.md

@@ -32,7 +32,7 @@ enum StopLight {
 void main() {
     StopLight color;
     while (true) {
-    String colorString = IO.readln("What color was the stoplight? ");
+        String colorString = IO.readln("What color was the stoplight? ");
         try {
             color = StopLight.valueOf(colorString);
         } catch (RuntimeException e) {

src/switch_ii/challenges.md

@@ -27,7 +27,7 @@ enum NaturalEnemy {
 }
 
 NaturalEnemy enemy(Profession p) {
-    switch (p) {
+    return switch (p) {
         case FIREFIGHTER -> {
             // CODE HERE
         };

src/time/instant.md

@@ -13,7 +13,7 @@ void main() {
 }
 ```
 
-But if you happen to know a number milliseconds after January 1, 1970 UTC[^epoch] you
+But if you happen to know the number of milliseconds since January 1, 1970 0:00 UTC[^epoch], you
 can get an `Instant` which represents that point in time with `Instant.ofEpochMilli`.
 
 ```java