From 696ed86affe8e04a681d05077877f3f5b8191f09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Manuel=20Su=C3=A1rez?= Date: Wed, 7 Mar 2018 00:19:33 -0300 Subject: [PATCH 1/3] Captain is implementing RowingBoat - Adapter pattern Captain and RowingBoat aren't interchangable. Captain, as a client, may have a method to use the boat, but it isn't needed that they share the same interface, as it makes the code more confusing. --- adapter/src/main/java/com/iluwatar/adapter/Captain.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adapter/src/main/java/com/iluwatar/adapter/Captain.java b/adapter/src/main/java/com/iluwatar/adapter/Captain.java index 369016980..29140cfdc 100644 --- a/adapter/src/main/java/com/iluwatar/adapter/Captain.java +++ b/adapter/src/main/java/com/iluwatar/adapter/Captain.java @@ -26,7 +26,7 @@ package com.iluwatar.adapter; * The Captain uses {@link RowingBoat} to sail.
* This is the client in the pattern. */ -public class Captain implements RowingBoat { +public class Captain { private RowingBoat rowingBoat; From 915a1f3eb0d251cfa9c432cd0a582278f698cd84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Manuel=20Su=C3=A1rez?= Date: Wed, 7 Mar 2018 17:26:39 -0300 Subject: [PATCH 2/3] Forgot to delete row's @Override My bad, sorry. It should compile now. --- adapter/src/main/java/com/iluwatar/adapter/Captain.java | 1 - 1 file changed, 1 deletion(-) diff --git a/adapter/src/main/java/com/iluwatar/adapter/Captain.java b/adapter/src/main/java/com/iluwatar/adapter/Captain.java index 29140cfdc..8593ca321 100644 --- a/adapter/src/main/java/com/iluwatar/adapter/Captain.java +++ b/adapter/src/main/java/com/iluwatar/adapter/Captain.java @@ -40,7 +40,6 @@ public class Captain { this.rowingBoat = rowingBoat; } - @Override public void row() { rowingBoat.row(); } From 87cb33f69b0d612e029ee454253f3a7cbce05fb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Manuel=20Su=C3=A1rez?= Date: Wed, 7 Mar 2018 17:43:03 -0300 Subject: [PATCH 3/3] Fixed tests --- .../src/test/java/com/iluwatar/adapter/AdapterPatternTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adapter/src/test/java/com/iluwatar/adapter/AdapterPatternTest.java b/adapter/src/test/java/com/iluwatar/adapter/AdapterPatternTest.java index 033440b81..82a951e30 100644 --- a/adapter/src/test/java/com/iluwatar/adapter/AdapterPatternTest.java +++ b/adapter/src/test/java/com/iluwatar/adapter/AdapterPatternTest.java @@ -66,7 +66,7 @@ public class AdapterPatternTest { */ @Test public void testAdapter() { - RowingBoat captain = (RowingBoat) beans.get(ROWING_BEAN); + Captain captain = (Captain) beans.get(ROWING_BEAN); // when captain moves captain.row();