Remove Optionals and refactor

1 files changed, 10 insertions, 5 deletions

diff --git a/AlgoAufgabe1/src/de/ostfalia/algo/ws18/s1/Member.java b/AlgoAufgabe1/src/de/ostfalia/algo/ws18/s1/Member.java
index 0d0c9bd..7ade60e 100644
--- a/AlgoAufgabe1/src/de/ostfalia/algo/ws18/s1/Member.java
+++ b/AlgoAufgabe1/src/de/ostfalia/algo/ws18/s1/Member.java
@@ -104,10 +104,7 @@ public class Member implements IMember {
 		String nameKeyPart = encodeLetters(member.name.substring(0, 1));
 		String surnameKeyPart = encodeLetters(member.firstname.substring(0, 1));
 		String dateKeyPart = encodeDate(member.date);
-		String key = String.format("%s%s%s",
-				nameKeyPart,
-				surnameKeyPart,
-				dateKeyPart);
+		String key = nameKeyPart + surnameKeyPart + dateKeyPart;
 		return Long.valueOf(key);
 	}
 
@@ -118,7 +115,7 @@ public class Member implements IMember {
 	 * @return A String ttmmjjjj.
 	 */
 	private static String encodeDate(LocalDate date) {
-		return String.format("%02d%02d%02d",
+		return String.format("%02d%02d%02d", // 2 digits, left pad
 				date.getDayOfMonth(),
 				date.getMonthValue(),
 				date.getYear());
@@ -165,6 +162,7 @@ public class Member implements IMember {
 	/**
 	 * Return this member as string.
 	 */
+	@Override
 	public String toString() {
 		return this.key + ", "
 				+ this.name + ", "
@@ -179,30 +177,37 @@ public class Member implements IMember {
 	 * 
 	 * @return @see Comparable
 	 */
+	@Override
 	public int compareTo(IMember member) {
 		return Long.compare(this.key, member.getKey());
 	}
 	
+	@Override
 	public String getName() {
 		return this.name;
 	}
 	
+	@Override
 	public Gender getGender() {
 		return this.gender;
 	}
 	
+	@Override
 	public LocalDate getDate() {
 		return this.date;
 	}
 	
+	@Override
 	public String getFirstName() {
 		return this.firstname;
 	}
 	
+	@Override
 	public long getKey() {
 		return this.key;
 	}
 	
+	@Override
 	public KindOfSport getKindOfSport() {
 		return this.kindOfSport;
 	}