diff --git a/.gitignore b/.gitignore index e1aa7e6..7bd5c14 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ Personal/Test Driven Development/Hello World/.settings/org.eclipse.core.resource Personal/Test Driven Development/Hello World/.settings/org.eclipse.jdt.apt.core.prefs Personal/Test Driven Development/Hello World/.settings/org.eclipse.jdt.core.prefs Personal/Test Driven Development/Hello World/.settings/org.eclipse.m2e.core.prefs +/.idea/ diff --git a/2018 - 2019/2018/Conditionals/src/ConditionalStatements.java b/2018 - 2019/2018/Conditionals/src/ConditionalStatements.java index ba5b4fd..ed289b6 100644 --- a/2018 - 2019/2018/Conditionals/src/ConditionalStatements.java +++ b/2018 - 2019/2018/Conditionals/src/ConditionalStatements.java @@ -8,7 +8,7 @@ public class ConditionalStatements { System.out.print("Please enter your score: "); int score = in.nextInt(); in.close(); - + String output = "Your Grade is: "; // Checks if Grade is A if (score >= 70) { diff --git a/Java Streams/src/EnterTheCollector.java b/Java Streams/src/EnterTheCollector.java new file mode 100644 index 0000000..1bd1cf7 --- /dev/null +++ b/Java Streams/src/EnterTheCollector.java @@ -0,0 +1,26 @@ +import java.util.ArrayList; +import java.util.List; + +import static java.util.Comparator.comparingInt; + +public class EnterTheCollector { + public static void main(String[] args) { + StreamProduct door = new StreamProduct(1, "Wooden Door", 35); + StreamProduct floorPanel = new StreamProduct(2, "Floor Panel", 25); + StreamProduct window = new StreamProduct(3, "Glass Window", 10); + + List streamProducts = new ArrayList<>(); + streamProducts.add(door); + streamProducts.add(floorPanel); + streamProducts.add(window); + streamProducts.add(floorPanel); + streamProducts.add(window); + streamProducts.add(floorPanel); + + streamProducts + .stream() + .filter(product -> product.getWeight() < 30) + .sorted(comparingInt(StreamProduct::getWeight)) + .forEach(System.out::println); + } +} diff --git a/Java Streams/src/StreamProduct.java b/Java Streams/src/StreamProduct.java new file mode 100644 index 0000000..58785ad --- /dev/null +++ b/Java Streams/src/StreamProduct.java @@ -0,0 +1,47 @@ +import java.util.Objects; + +public class StreamProduct { + private final int id; + private final String name; + private final int weight; + + public StreamProduct(final int id, final String name, final int weight) { + this.id = id; + this.name = name; + this.weight = weight; + } + + public String getName() { + return name; + } + + public int getWeight() { + return weight; + } + + public int getId() { + return id; + } + + public String toString() { + return "Product{" + + "id=" + id + + ", name='" + name + '\'' + + ", weight=" + weight + + '}'; + } + + public boolean equals(final Object o) { + if (!(o instanceof StreamProduct)) return false; + + final StreamProduct streamProduct = (StreamProduct) o; + + return Objects.equals(id, streamProduct.id) + && Objects.equals(weight, streamProduct.weight) + && Objects.equals(name, streamProduct.name); + } + + public int hashCode() { + return Objects.hash(id, name, weight); + } +} diff --git a/Java Streams/src/StreamProducts.java b/Java Streams/src/StreamProducts.java new file mode 100644 index 0000000..6bed3c7 --- /dev/null +++ b/Java Streams/src/StreamProducts.java @@ -0,0 +1,43 @@ +import java.util.ArrayList; +import java.util.List; + +import static java.util.Comparator.comparingInt; + +public class StreamProducts { + public static void main(String[] args) { + StreamProduct door = new StreamProduct(1, "Wooden Door", 35); + StreamProduct floorPanel = new StreamProduct(2, "Floor Panel", 25); + StreamProduct window = new StreamProduct(3, "Glass Window", 10); + + List streamProducts = new ArrayList<>(); + streamProducts.add(door); + streamProducts.add(floorPanel); + streamProducts.add(window); + streamProducts.add(floorPanel); + streamProducts.add(window); + + namesOfLightProductsWeightSortedLoop(streamProducts); + namesOfLightProductsWeightSortedLoopStreamed(streamProducts); + } + + private static void namesOfLightProductsWeightSortedLoopStreamed(List streamProducts) { + + } + + private static void namesOfLightProductsWeightSortedLoop( + List streamProducts) { + List lightStreamProducts = new ArrayList<>(); + + for (StreamProduct streamProduct : streamProducts) { + if (streamProduct.getWeight() < 30) { + lightStreamProducts.add(streamProduct); + } + } + + lightStreamProducts.sort(comparingInt(StreamProduct::getWeight)); + + for (StreamProduct streamProduct : lightStreamProducts) { + System.out.println(streamProduct.getName()); + } + } +} diff --git a/Personal/Test Driven Development/Hello World/src/main/java/hello/world/Greeting.java b/Personal/Test Driven Development/Hello World/src/main/java/hello/world/Greeting.java index 1a1efab..05e23a4 100644 --- a/Personal/Test Driven Development/Hello World/src/main/java/hello/world/Greeting.java +++ b/Personal/Test Driven Development/Hello World/src/main/java/hello/world/Greeting.java @@ -1,4 +1,4 @@ -package hello.world; +package main.java.hello.world; public class Greeting { String message; diff --git a/Personal/Test Driven Development/Hello World/src/main/java/hello/world/HelloWorld.java b/Personal/Test Driven Development/Hello World/src/main/java/hello/world/HelloWorld.java index 9f638fc..f9cd300 100644 --- a/Personal/Test Driven Development/Hello World/src/main/java/hello/world/HelloWorld.java +++ b/Personal/Test Driven Development/Hello World/src/main/java/hello/world/HelloWorld.java @@ -1,4 +1,4 @@ -package hello.world; +package main.java.hello.world; /** * Hello world! diff --git a/Personal/Test Driven Development/Hello World/src/test/java/hello/world/HelloWorldTest.java b/Personal/Test Driven Development/Hello World/src/test/java/hello/world/HelloWorldTest.java index 5014521..c72fe29 100644 --- a/Personal/Test Driven Development/Hello World/src/test/java/hello/world/HelloWorldTest.java +++ b/Personal/Test Driven Development/Hello World/src/test/java/hello/world/HelloWorldTest.java @@ -1,8 +1,10 @@ -package hello.world; +package test.java.hello.world; -import static org.junit.Assert.assertEquals; +import main.java.hello.world.Greeting; import org.junit.Test; +import static org.junit.Assert.assertEquals; + /** * Unit test for simple App. */ diff --git a/Personal/Test Driven Development/Hello World/target/classes/hello/world/Greeting.class b/Personal/Test Driven Development/Hello World/target/classes/hello/world/Greeting.class index f9f4e13..701f089 100644 Binary files a/Personal/Test Driven Development/Hello World/target/classes/hello/world/Greeting.class and b/Personal/Test Driven Development/Hello World/target/classes/hello/world/Greeting.class differ diff --git a/Personal/Test Driven Development/Hello World/target/classes/hello/world/HelloWorld.class b/Personal/Test Driven Development/Hello World/target/classes/hello/world/HelloWorld.class index ac46d30..0499064 100644 Binary files a/Personal/Test Driven Development/Hello World/target/classes/hello/world/HelloWorld.class and b/Personal/Test Driven Development/Hello World/target/classes/hello/world/HelloWorld.class differ diff --git a/Personal/Test Driven Development/Hello World/target/test-classes/hello/world/HelloWorldTest.class b/Personal/Test Driven Development/Hello World/target/test-classes/hello/world/HelloWorldTest.class index e6f3398..9df508a 100644 Binary files a/Personal/Test Driven Development/Hello World/target/test-classes/hello/world/HelloWorldTest.class and b/Personal/Test Driven Development/Hello World/target/test-classes/hello/world/HelloWorldTest.class differ