From 1f5b92038d3876847253c32cec575387c87f55c1 Mon Sep 17 00:00:00 2001 From: Zach Date: Tue, 27 Jul 2021 18:53:47 -0400 Subject: [PATCH] Only 1 test case not passing, regarding testConversionAgent, do not understand what error messages are referring to --- looptest.iml | 8 +-- .../streams/StreamFilter.java | 32 +++++++--- .../streams/anthropoid/PersonFactory.java | 20 +++++-- .../streams/anthropoid/PersonWarehouse.java | 60 +++++++++++++++---- .../streams/conversions/ArrayConverter.java | 8 ++- .../streams/conversions/ListConverter.java | 7 ++- .../streams/conversions/StreamConverter.java | 6 +- 7 files changed, 106 insertions(+), 35 deletions(-) diff --git a/looptest.iml b/looptest.iml index 7f2d304..e34277e 100644 --- a/looptest.iml +++ b/looptest.iml @@ -10,10 +10,10 @@ - + - - - + + + \ No newline at end of file diff --git a/src/main/java/com/zipcodewilmington/streams/StreamFilter.java b/src/main/java/com/zipcodewilmington/streams/StreamFilter.java index d8b89ae..d2c1977 100644 --- a/src/main/java/com/zipcodewilmington/streams/StreamFilter.java +++ b/src/main/java/com/zipcodewilmington/streams/StreamFilter.java @@ -5,6 +5,9 @@ import com.zipcodewilmington.streams.tools.RandomUtils; import com.zipcodewilmington.streams.tools.StringUtils; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -20,7 +23,14 @@ public class StreamFilter { * No arg constructor */ //TODO - construct person stream of 100 person objects; startingCharacter is a random capital letter public StreamFilter() { - this(Stream.empty(), null); + PersonFactory factory = new PersonFactory(); + List list = new ArrayList<>(); + Collections.nCopies(100, 1) + .stream() + .forEach(i -> list.add(factory.createRandomPerson())); + personStream = list.stream(); + startingCharacter = RandomUtils.createCharacter('A', 'Z').toString(); + } /** @@ -28,7 +38,7 @@ public StreamFilter() { * @param startingCharacter - character to filter by */ //TODO public StreamFilter(Person[] people, Character startingCharacter) { - this(Stream.empty(), null); + this(Arrays.stream(people), startingCharacter); } /** @@ -36,7 +46,7 @@ public StreamFilter(Person[] people, Character startingCharacter) { * @param startingCharacter - character to filter by */ //TODO public StreamFilter(List people, Character startingCharacter) { - this(Stream.empty(), null); + this(people.stream(), startingCharacter); } @@ -55,7 +65,9 @@ public StreamFilter(Stream people, Character startingCharacter) { * @return a list of person object whose name starts with `this.startingCharacter` */ //TODO public List toListMultiLine() { - return null; + return personStream + .filter(person ->startingCharacter.equals(person.getName().charAt(0))) + .collect(Collectors.toList()); } @@ -64,7 +76,9 @@ public List toListMultiLine() { * @return a list of person objects whose name starts with `this.startingCharacter` */ //TODO public List toListOneLine() { - return null; + return personStream + .filter(person ->startingCharacter.equals(person.getName().charAt(0))) + .collect(Collectors.toList()); } @@ -73,7 +87,9 @@ public List toListOneLine() { * @return an array of person object whose name starts with `this.startingCharacter` */ //TODO public Person[] toArrayOneLine() { - return null; + return personStream + .filter((person) -> startingCharacter.equals(person.getName().charAt(0))) + .collect(Collectors.toList()).toArray(new Person[0]); } @@ -82,7 +98,9 @@ public Person[] toArrayOneLine() { * @return an array of person object whose name starts with `this.startingCharacter` */ //TODO public Person[] toArrayMultiLine() { - return null; + return personStream + .filter((person) -> startingCharacter.equals(person.getName().charAt(0))) + .collect(Collectors.toList()).toArray(new Person[0]); } } diff --git a/src/main/java/com/zipcodewilmington/streams/anthropoid/PersonFactory.java b/src/main/java/com/zipcodewilmington/streams/anthropoid/PersonFactory.java index a10ec7b..369ba17 100644 --- a/src/main/java/com/zipcodewilmington/streams/anthropoid/PersonFactory.java +++ b/src/main/java/com/zipcodewilmington/streams/anthropoid/PersonFactory.java @@ -3,8 +3,8 @@ import com.zipcodewilmington.streams.tools.RandomUtils; import com.zipcodewilmington.streams.tools.StringUtils; -import java.util.Date; -import java.util.List; +import java.util.*; +import java.util.function.Supplier; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -39,7 +39,11 @@ public Person createRandomPerson() { * @return - ArrayList of Person objects */ // TODO public List createPersonList(int listSize) { - return null; + List list = new ArrayList<>(); + Collections.nCopies(listSize, 1) + .stream() + .forEach(i -> list.add(createRandomPerson())); + return list; } @@ -48,7 +52,10 @@ public List createPersonList(int listSize) { * @return - Array of Person objects */ // TODO public Person[] createPersonArray(int arrayLength) { - return null; + return Stream + .generate(this::createRandomPerson) + .limit(arrayLength) + .collect(Collectors.toList()).toArray(new Person[0]); } @@ -59,6 +66,9 @@ public Person[] createPersonArray(int arrayLength) { * @return - Stream representation of collection of Person objects */ // TODO public Stream createPersonStream(int streamCount) { - return null; + List list = this.createPersonList(streamCount); + return list.stream(); } + + } diff --git a/src/main/java/com/zipcodewilmington/streams/anthropoid/PersonWarehouse.java b/src/main/java/com/zipcodewilmington/streams/anthropoid/PersonWarehouse.java index a4960b1..db83f43 100644 --- a/src/main/java/com/zipcodewilmington/streams/anthropoid/PersonWarehouse.java +++ b/src/main/java/com/zipcodewilmington/streams/anthropoid/PersonWarehouse.java @@ -4,10 +4,7 @@ import com.zipcodewilmington.streams.tools.logging.LoggerHandler; import com.zipcodewilmington.streams.tools.logging.LoggerWarehouse; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -36,7 +33,12 @@ public void addPerson(Person person) { * @return list of names of Person objects */ // TODO public List getNames() { - return null; + List list = + this.people + .stream() + .map(Person::getName) + .collect(Collectors.toList()); + return list; } @@ -44,7 +46,21 @@ public List getNames() { * @return list of uniquely named Person objects */ //TODO public Stream getUniquelyNamedPeople() { - return null; + List namesList = getNames() + .stream() + .distinct() + .collect(Collectors.toList()); + List uniquelyNamePeople = new ArrayList<>(); + + people.stream() + .forEach(person ->{ + if(namesList.contains(person.getName())){ + uniquelyNamePeople.add(person); + namesList.remove(person.getName()); + } + }); + Stream resultStream = uniquelyNamePeople.stream(); + return resultStream; } @@ -53,7 +69,10 @@ public Stream getUniquelyNamedPeople() { * @return a Stream of respective */ //TODO public Stream getUniquelyNamedPeopleStartingWith(Character character) { - return null; + List uniquelyNamedPeople = getUniquelyNamedPeople() + .collect(Collectors.toList()); + return uniquelyNamedPeople.stream() + .filter(person -> person.getName().charAt(0) == character); } /** @@ -61,14 +80,17 @@ public Stream getUniquelyNamedPeopleStartingWith(Character character) { * @return a Stream of respective */ //TODO public Stream getFirstNUniquelyNamedPeople(int n) { - return null; + return getUniquelyNamedPeople() + .limit(n); } /** * @return a mapping of Person Id to the respective Person name */ // TODO public Map getIdToNameMap() { - return null; + return people + .stream() + .collect(Collectors.toMap(Person::getPersonalId, Person::getName)); } @@ -76,7 +98,16 @@ public Map getIdToNameMap() { * @return Stream of Stream of Aliases */ // TODO public Stream> getNestedAliases() { - return null; +// //List aliases = people +// String[] aliases = people +// .stream() +// .map(Person::getAliases) +// //.collect(Collectors.toList()); +// //.toArray(new String[0]); +// .toArray(String[]::new); +// Stream resultStream = (Stream) Stream.of(aliases)//Arrays.stream(aliases) +// .map(element -> Stream.of(element)); + return Stream.of(getAllAliases()); } @@ -84,7 +115,14 @@ public Stream> getNestedAliases() { * @return Stream of all Aliases */ // TODO public Stream getAllAliases() { - return null; + return people + .stream() + .map(Person::getAliases) + //.forEach(alias -> alias.); + .collect(Collectors.toList()) + //.toArray(new String[0]) + .stream() + .flatMap(index -> Stream.of(index)); } // DO NOT MODIFY diff --git a/src/main/java/com/zipcodewilmington/streams/conversions/ArrayConverter.java b/src/main/java/com/zipcodewilmington/streams/conversions/ArrayConverter.java index 0a9d4d8..24b2170 100644 --- a/src/main/java/com/zipcodewilmington/streams/conversions/ArrayConverter.java +++ b/src/main/java/com/zipcodewilmington/streams/conversions/ArrayConverter.java @@ -12,6 +12,7 @@ * Created by leon on 5/25/17. */ public final class ArrayConverter extends PersonConversionAgent { + private Person[] peopleArray = super.objectSequence; public ArrayConverter(Person... people) { super(people); } @@ -25,16 +26,17 @@ public ArrayConverter(int collectionSize) { //TODO public List toList() { - return null; + return toStream() + .collect(Collectors.toList()); } //TODO public Stream toStream() { - return null; + return Arrays.stream(peopleArray); } @Override public Person[] toArray() { - return super.objectSequence; + return peopleArray; } } diff --git a/src/main/java/com/zipcodewilmington/streams/conversions/ListConverter.java b/src/main/java/com/zipcodewilmington/streams/conversions/ListConverter.java index b64540b..e378be7 100644 --- a/src/main/java/com/zipcodewilmington/streams/conversions/ListConverter.java +++ b/src/main/java/com/zipcodewilmington/streams/conversions/ListConverter.java @@ -11,6 +11,7 @@ * Created by leon on 5/25/17. */ public final class ListConverter extends PersonConversionAgent> { + List peopleList = super.objectSequence; public ListConverter(List people) { super(people); } @@ -29,11 +30,13 @@ public List toList() { //TODO public Stream toStream() { - return null; + return peopleList.stream(); } //TODO public Person[] toArray() { - return null; + return peopleList + .stream() + .toArray(Person[]::new); } } diff --git a/src/main/java/com/zipcodewilmington/streams/conversions/StreamConverter.java b/src/main/java/com/zipcodewilmington/streams/conversions/StreamConverter.java index 159d048..6d49a1d 100644 --- a/src/main/java/com/zipcodewilmington/streams/conversions/StreamConverter.java +++ b/src/main/java/com/zipcodewilmington/streams/conversions/StreamConverter.java @@ -25,16 +25,16 @@ public StreamConverter(int collectionSize) { // TODO public List toList() { - return null; + return personList; } // TODO public Stream toStream() { - return null; + return this.personList.stream(); } // TODO public Person[] toArray() { - return null; + return personList.toArray(new Person[0]); } }