Commit 2e86388c authored by Trisha Gee's avatar Trisha Gee
Browse files

[Ch10b] Simplifying the name of the song list in the factory. Changing the...

[Ch10b] Simplifying the name of the song list in the factory. Changing the factory methods example to use SongV4
parent d4a0aa34
Loading
Loading
Loading
Loading
+3 −3
Changes for src/main/java/ch10b/CollectionsFactoryMethods.java: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -19,9 +19,9 @@ public class CollectionsFactoryMethods {
  }

  public static void createAListOfSongs() {
    List<SongV2> songs = List.of(new SongV2("somersault", "zero 7", 147),
                                 new SongV2("cassidy", "grateful dead", 158),
                                 new SongV2("$10", "hitchhiker", 140));
    List<SongV4> songs = List.of(new SongV4("somersault", "zero 7", 147),
                                 new SongV4("cassidy", "grateful dead", 158),
                                 new SongV4("$10", "hitchhiker", 140));
  }

  public static void createASet() {
+18 −18
Changes for src/main/java/ch10b/MockMoreSongs.java: 18 added lines, 18 removed lines.
Original line number Diff line number Diff line
@@ -6,27 +6,27 @@ import java.util.List;
class MockMoreSongs {

  public static List<SongV3> getSongsV3() {
    List<SongV3> mySongs = new ArrayList<>();
    mySongs.add(new SongV3("somersault", "zero 7", 147));
    mySongs.add(new SongV3("cassidy", "grateful dead", 158));
    mySongs.add(new SongV3("$10", "hitchhiker", 140));
    mySongs.add(new SongV3("havana", "cabello", 105));
    mySongs.add(new SongV3("$10", "hitchhiker", 140));
    mySongs.add(new SongV3("cassidy", "grateful dead", 158));
    mySongs.add(new SongV3("50 ways", "simon", 102));
    return mySongs;
    List<SongV3> songs = new ArrayList<>();
    songs.add(new SongV3("somersault", "zero 7", 147));
    songs.add(new SongV3("cassidy", "grateful dead", 158));
    songs.add(new SongV3("$10", "hitchhiker", 140));
    songs.add(new SongV3("havana", "cabello", 105));
    songs.add(new SongV3("$10", "hitchhiker", 140));
    songs.add(new SongV3("cassidy", "grateful dead", 158));
    songs.add(new SongV3("50 ways", "simon", 102));
    return songs;
  }

  public static List<SongV4> getSongsV4() {
    List<SongV4> mySongs = new ArrayList<>();
    mySongs.add(new SongV4("somersault", "zero 7", 147));
    mySongs.add(new SongV4("cassidy", "grateful dead", 158));
    mySongs.add(new SongV4("$10", "hitchhiker", 140));
    mySongs.add(new SongV4("havana", "cabello", 105));
    mySongs.add(new SongV4("$10", "hitchhiker", 140));
    mySongs.add(new SongV4("cassidy", "grateful dead", 158));
    mySongs.add(new SongV4("50 ways", "simon", 102));
    return mySongs;
    List<SongV4> songs = new ArrayList<>();
    songs.add(new SongV4("somersault", "zero 7", 147));
    songs.add(new SongV4("cassidy", "grateful dead", 158));
    songs.add(new SongV4("$10", "hitchhiker", 140));
    songs.add(new SongV4("havana", "cabello", 105));
    songs.add(new SongV4("$10", "hitchhiker", 140));
    songs.add(new SongV4("cassidy", "grateful dead", 158));
    songs.add(new SongV4("50 ways", "simon", 102));
    return songs;
  }
}

+16 −16
Changes for src/main/java/ch10b/MockSongs.java: 16 added lines, 16 removed lines.
Original line number Diff line number Diff line
@@ -16,26 +16,26 @@ class MockSongs {
  }

  public static List<SongV2> getSongsV2() {
    List<SongV2> mySongs = new ArrayList<>();
    mySongs.add(new SongV2("somersault", "zero 7", 147));
    mySongs.add(new SongV2("cassidy", "grateful dead", 158));
    mySongs.add(new SongV2("$10", "hitchhiker", 140));
    List<SongV2> songs = new ArrayList<>();
    songs.add(new SongV2("somersault", "zero 7", 147));
    songs.add(new SongV2("cassidy", "grateful dead", 158));
    songs.add(new SongV2("$10", "hitchhiker", 140));

    mySongs.add(new SongV2("havana", "cabello", 105));
    mySongs.add(new SongV2("Cassidy", "grateful dead", 158));
    mySongs.add(new SongV2("50 ways", "simon", 102));
    return mySongs;
    songs.add(new SongV2("havana", "cabello", 105));
    songs.add(new SongV2("Cassidy", "grateful dead", 158));
    songs.add(new SongV2("50 ways", "simon", 102));
    return songs;
  }

  public static List<SongV3> getSongsV3() {
    List<SongV3> mySongs = new ArrayList<>();
    mySongs.add(new SongV3("somersault", "zero 7", 147));
    mySongs.add(new SongV3("cassidy", "grateful dead", 158));
    mySongs.add(new SongV3("$10", "hitchhiker", 140));
    List<SongV3> songs = new ArrayList<>();
    songs.add(new SongV3("somersault", "zero 7", 147));
    songs.add(new SongV3("cassidy", "grateful dead", 158));
    songs.add(new SongV3("$10", "hitchhiker", 140));

    mySongs.add(new SongV3("havana", "cabello", 105));
    mySongs.add(new SongV3("Cassidy", "grateful dead", 158));
    mySongs.add(new SongV3("50 ways", "simon", 102));
    return mySongs;
    songs.add(new SongV3("havana", "cabello", 105));
    songs.add(new SongV3("Cassidy", "grateful dead", 158));
    songs.add(new SongV3("50 ways", "simon", 102));
    return songs;
  }
}