From efd1da83e3bd5810948f26ce04b50958e33bfa57 Mon Sep 17 00:00:00 2001 From: pivovarit Date: Sun, 4 Dec 2016 12:41:12 +0100 Subject: [PATCH] Reformat Optional --- .../java/nio2/async/AsyncEchoTest.java | 89 +++++-------------- .../baeldung/java8/optional/OptionalTest.java | 66 +++++++++----- 2 files changed, 67 insertions(+), 88 deletions(-) diff --git a/core-java/src/test/java/com/baeldung/java/nio2/async/AsyncEchoTest.java b/core-java/src/test/java/com/baeldung/java/nio2/async/AsyncEchoTest.java index 579301c5f9..93cb3e1eb6 100644 --- a/core-java/src/test/java/com/baeldung/java/nio2/async/AsyncEchoTest.java +++ b/core-java/src/test/java/com/baeldung/java/nio2/async/AsyncEchoTest.java @@ -1,77 +1,36 @@ package com.baeldung.java.nio2.async; -import java.io.File; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + import java.io.IOException; -import java.net.InetSocketAddress; -import java.nio.ByteBuffer; -import java.nio.channels.AsynchronousServerSocketChannel; -import java.nio.channels.AsynchronousSocketChannel; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.Future; -public class AsyncEchoServer { - private AsynchronousServerSocketChannel serverChannel; - private Future acceptResult; - private AsynchronousSocketChannel clientChannel; +import static org.junit.Assert.assertEquals; - public AsyncEchoServer() { - try { - serverChannel = AsynchronousServerSocketChannel.open(); - InetSocketAddress hostAddress = new InetSocketAddress("localhost", 4999); - serverChannel.bind(hostAddress); - acceptResult = serverChannel.accept(); - } catch (IOException e) { - e.printStackTrace(); - } +public class AsyncEchoTest { + + Process server; + AsyncEchoClient client; + + @Before + public void setup() throws IOException, InterruptedException { + server = AsyncEchoServer2.start(); + client = AsyncEchoClient.getInstance(); } - public void runServer() { - try { - clientChannel = acceptResult.get(); - if ((clientChannel != null) && (clientChannel.isOpen())) { - while (true) { - - ByteBuffer buffer = ByteBuffer.allocate(32); - Future readResult = clientChannel.read(buffer); - - //do other things as operation continues in background - readResult.get(); - - buffer.flip(); - String message = new String(buffer.array()).trim(); - if (message.equals("bye")) { - break; // while loop - } - buffer = ByteBuffer.wrap(new String(message).getBytes()); - Future writeResult = clientChannel.write(buffer); - //run other code - writeResult.get(); - buffer.clear(); - - } // while() - - clientChannel.close(); - serverChannel.close(); - - } - } catch (InterruptedException | ExecutionException | IOException e) { - e.printStackTrace(); - } - + @Test + public void givenServerClient_whenServerEchosMessage_thenCorrect() throws Exception { + String resp1 = client.sendMessage("hello"); + String resp2 = client.sendMessage("world"); + assertEquals("hello", resp1); + assertEquals("world", resp2); } - public static void main(String[] args) { - AsyncEchoServer server = new AsyncEchoServer(); - server.runServer(); + @After + public void teardown() throws IOException { + server.destroy(); + client.stop(); } - public static Process start() throws IOException, InterruptedException { - String javaHome = System.getProperty("java.home"); - String javaBin = javaHome + File.separator + "bin" + File.separator + "java"; - String classpath = System.getProperty("java.class.path"); - String className = AsyncEchoServer.class.getCanonicalName(); - ProcessBuilder builder = new ProcessBuilder(javaBin, "-cp", classpath, className); - - return builder.start(); - } } diff --git a/core-java/src/test/java/com/baeldung/java8/optional/OptionalTest.java b/core-java/src/test/java/com/baeldung/java8/optional/OptionalTest.java index e292021731..5a1b3c9889 100644 --- a/core-java/src/test/java/com/baeldung/java8/optional/OptionalTest.java +++ b/core-java/src/test/java/com/baeldung/java8/optional/OptionalTest.java @@ -1,15 +1,14 @@ package com.baeldung.java8.optional; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import com.baeldung.java_8_features.Person; +import org.junit.Test; import java.util.Arrays; import java.util.List; import java.util.NoSuchElementException; import java.util.Optional; -import org.junit.Test; +import static org.junit.Assert.*; public class OptionalTest { // creating Optional @@ -89,9 +88,11 @@ public class OptionalTest { public void whenOptionalFilterWorks_thenCorrect() { Integer year = 2016; Optional yearOptional = Optional.of(year); - boolean is2016 = yearOptional.filter(y -> y == 2016).isPresent(); + boolean is2016 = yearOptional.filter(y -> y == 2016) + .isPresent(); assertTrue(is2016); - boolean is2017 = yearOptional.filter(y -> y == 2017).isPresent(); + boolean is2017 = yearOptional.filter(y -> y == 2017) + .isPresent(); assertFalse(is2017); } @@ -101,7 +102,8 @@ public class OptionalTest { List companyNames = Arrays.asList("paypal", "oracle", "", "microsoft", "", "apple"); Optional> listOptional = Optional.of(companyNames); - int size = listOptional.map(List::size).orElse(0); + int size = listOptional.map(List::size) + .orElse(0); assertEquals(6, size); } @@ -110,7 +112,8 @@ public class OptionalTest { String name = "baeldung"; Optional nameOptional = Optional.of(name); - int len = nameOptional.map(String::length).orElse(0); + int len = nameOptional.map(String::length) + .orElse(0); assertEquals(8, len); } @@ -118,10 +121,13 @@ public class OptionalTest { public void givenOptional_whenMapWorksWithFilter_thenCorrect() { String password = " password "; Optional passOpt = Optional.of(password); - boolean correctPassword = passOpt.filter(pass -> pass.equals("password")).isPresent(); + boolean correctPassword = passOpt.filter(pass -> pass.equals("password")) + .isPresent(); assertFalse(correctPassword); - correctPassword = passOpt.map(String::trim).filter(pass -> pass.equals("password")).isPresent(); + correctPassword = passOpt.map(String::trim) + .filter(pass -> pass.equals("password")) + .isPresent(); assertTrue(correctPassword); } @@ -131,12 +137,17 @@ public class OptionalTest { Person person = new Person("john", 26); Optional personOptional = Optional.of(person); - Optional> nameOptionalWrapper = personOptional.map(Person::getName); - Optional nameOptional = nameOptionalWrapper.orElseThrow(IllegalArgumentException::new); - String name1 = nameOptional.orElseThrow(IllegalArgumentException::new); + Optional> nameOptionalWrapper = personOptional + .map(Person::getName); + Optional nameOptional = nameOptionalWrapper + .orElseThrow(IllegalArgumentException::new); + String name1 = nameOptional + .orElseThrow(IllegalArgumentException::new); assertEquals("john", name1); - String name = personOptional.flatMap(Person::getName).orElseThrow(IllegalArgumentException::new); + String name = personOptional + .flatMap(Person::getName) + .orElseThrow(IllegalArgumentException::new); assertEquals("john", name); } @@ -146,7 +157,10 @@ public class OptionalTest { person.setPassword("password"); Optional personOptional = Optional.of(person); - String password = personOptional.flatMap(Person::getPassword).filter(cleanPass -> cleanPass.equals("password")).orElseThrow(IllegalArgumentException::new); + String password = personOptional + .flatMap(Person::getPassword) + .filter(cleanPass -> cleanPass.equals("password")) + .orElseThrow(IllegalArgumentException::new); assertEquals("password", password); } @@ -154,7 +168,8 @@ public class OptionalTest { @Test public void whenOrElseWorks_thenCorrect() { String nullName = null; - String name = Optional.ofNullable(nullName).orElse("john"); + String name = Optional.ofNullable(nullName) + .orElse("john"); assertEquals("john", name); } @@ -162,12 +177,14 @@ public class OptionalTest { @Test public void whenOrElseGetWorks_thenCorrect() { String nullName = null; - String name = Optional.ofNullable(nullName).orElseGet(() -> "john"); + String name = Optional.ofNullable(nullName) + .orElseGet(() -> "john"); assertEquals("john", name); - name = Optional.ofNullable(nullName).orElseGet(() -> { - return "doe"; - }); + name = Optional.ofNullable(nullName) + .orElseGet(() -> { + return "doe"; + }); assertEquals("doe", name); } @@ -176,7 +193,8 @@ public class OptionalTest { public void whenOrElseGetAndOrElseOverlap_thenCorrect() { String text = null; System.out.println("Using orElseGet:"); - String defaultText = Optional.ofNullable(text).orElseGet(this::getMyDefault); + String defaultText = Optional.ofNullable(text) + .orElseGet(this::getMyDefault); assertEquals("Default Value", defaultText); System.out.println("Using orElse:"); @@ -188,7 +206,8 @@ public class OptionalTest { public void whenOrElseGetAndOrElseDiffer_thenCorrect() { String text = "Text present"; System.out.println("Using orElseGet:"); - String defaultText = Optional.ofNullable(text).orElseGet(this::getMyDefault); + String defaultText = Optional.ofNullable(text) + .orElseGet(this::getMyDefault); assertEquals("Text present", defaultText); System.out.println("Using orElse:"); @@ -200,7 +219,8 @@ public class OptionalTest { @Test(expected = IllegalArgumentException.class) public void whenOrElseThrowWorks_thenCorrect() { String nullName = null; - String name = Optional.ofNullable(nullName).orElseThrow(IllegalArgumentException::new); + String name = Optional.ofNullable(nullName) + .orElseThrow(IllegalArgumentException::new); } public String getMyDefault() {