From 9b413f81ff696751aa60472eb365533281771bbb Mon Sep 17 00:00:00 2001 From: delvh Date: Thu, 2 Apr 2020 09:06:10 +0200 Subject: [PATCH] Added Junit 5 as dependency --- .classpath | 4 ++-- pom.xml | 9 ++++++++- src/main/java/envoy/data/Contact.java | 2 +- src/main/java/envoy/data/User.java | 3 +-- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.classpath b/.classpath index e716709..43b52b8 100644 --- a/.classpath +++ b/.classpath @@ -8,9 +8,9 @@ + - @@ -21,9 +21,9 @@ + - diff --git a/pom.xml b/pom.xml index 98d18f7..aa2ee32 100644 --- a/pom.xml +++ b/pom.xml @@ -16,6 +16,13 @@ 11 + + + org.junit.jupiter + junit-jupiter-engine + 5.5.2 + + envoy-common @@ -23,7 +30,7 @@ src/main/resources - src/test/java + src/test/java diff --git a/src/main/java/envoy/data/Contact.java b/src/main/java/envoy/data/Contact.java index b3b2d03..4de77a0 100644 --- a/src/main/java/envoy/data/Contact.java +++ b/src/main/java/envoy/data/Contact.java @@ -28,7 +28,7 @@ public abstract class Contact implements Serializable { * * @param id the ID of this contact * @param name the name of this contact - * @param contacts the {@link Contacts} of this {@link Contact} + * @param contacts the contacts of this {@link Contact} * @since Envoy Common v0.1-beta */ public Contact(long id, String name, Set contacts) { diff --git a/src/main/java/envoy/data/User.java b/src/main/java/envoy/data/User.java index ca64d0d..01b2439 100644 --- a/src/main/java/envoy/data/User.java +++ b/src/main/java/envoy/data/User.java @@ -2,7 +2,6 @@ package envoy.data; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; -import java.util.ArrayList; import java.util.HashSet; import java.util.Set; @@ -126,7 +125,7 @@ public final class User extends Contact { if (serializeContacts) { getContacts().stream().filter(User.class::isInstance).map(User.class::cast).forEach(user -> user.serializeContacts = false); outputStream.writeObject(getContacts()); - } else outputStream.writeObject(new ArrayList<>()); + } else outputStream.writeObject(new HashSet<>()); } /**