Remove the ICache interface

Throughout the code, Geocache is used where ICache should be used.
Moreover, except in the tests, ICache is only implemented in Geocache.

6 files changed, 18 insertions, 7 deletions

diff --git a/tests/src/cgeo/geocaching/test/mock/GC1ZXX2.java b/tests/src/cgeo/geocaching/test/mock/GC1ZXX2.java
index 34422ff..8d9d7af 100644
--- a/tests/src/cgeo/geocaching/test/mock/GC1ZXX2.java
+++ b/tests/src/cgeo/geocaching/test/mock/GC1ZXX2.java
@@ -6,6 +6,8 @@ import cgeo.geocaching.enumerations.CacheType;
 import cgeo.geocaching.enumerations.LogType;
 import cgeo.geocaching.location.Geopoint;
 
+import org.eclipse.jdt.annotation.NonNull;
+
 import java.text.ParseException;
 import java.util.Date;
 import java.util.HashMap;
@@ -58,6 +60,7 @@ public class GC1ZXX2 extends MockedCache {
         return true;
     }
 
+    @NonNull
     @Override
     public String getOwnerUserId() {
         return "daniel354";
diff --git a/tests/src/cgeo/geocaching/test/mock/GC2CJPF.java b/tests/src/cgeo/geocaching/test/mock/GC2CJPF.java
index bf01f61..8a8cf95 100644
--- a/tests/src/cgeo/geocaching/test/mock/GC2CJPF.java
+++ b/tests/src/cgeo/geocaching/test/mock/GC2CJPF.java
@@ -7,6 +7,8 @@ import cgeo.geocaching.enumerations.LogType;
 import cgeo.geocaching.location.Geopoint;
 import cgeo.geocaching.settings.Settings;
 
+import org.eclipse.jdt.annotation.NonNull;
+
 import java.text.ParseException;
 import java.util.Date;
 import java.util.HashMap;
@@ -39,6 +41,7 @@ public class GC2CJPF extends MockedCache {
         return "Tom03";
     }
 
+    @NonNull
     @Override
     public String getOwnerUserId() {
         return getOwnerDisplayName();
diff --git a/tests/src/cgeo/geocaching/test/mock/GC2JVEH.java b/tests/src/cgeo/geocaching/test/mock/GC2JVEH.java
index cfccc3a..dff6bce 100644
--- a/tests/src/cgeo/geocaching/test/mock/GC2JVEH.java
+++ b/tests/src/cgeo/geocaching/test/mock/GC2JVEH.java
@@ -8,6 +8,8 @@ import cgeo.geocaching.enumerations.CacheType;
 import cgeo.geocaching.enumerations.LogType;
 import cgeo.geocaching.location.Geopoint;
 
+import org.eclipse.jdt.annotation.NonNull;
+
 import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Date;
@@ -56,6 +58,7 @@ public class GC2JVEH extends MockedCache {
         return "indianerjones, der merlyn,reflektordetektor";
     }
 
+    @NonNull
     @Override
     public String getOwnerUserId() {
         return "indianerjones";
diff --git a/tests/src/cgeo/geocaching/test/mock/GC3XX5J.java b/tests/src/cgeo/geocaching/test/mock/GC3XX5J.java
index 9f69e8e..d468b3b 100644
--- a/tests/src/cgeo/geocaching/test/mock/GC3XX5J.java
+++ b/tests/src/cgeo/geocaching/test/mock/GC3XX5J.java
@@ -6,6 +6,8 @@ import cgeo.geocaching.enumerations.CacheType;
 import cgeo.geocaching.enumerations.LogType;
 import cgeo.geocaching.location.Geopoint;
 
+import org.eclipse.jdt.annotation.NonNull;
+
 import java.text.ParseException;
 import java.util.Date;
 import java.util.HashMap;
@@ -58,6 +60,7 @@ public class GC3XX5J extends MockedCache {
         return false;
     }
 
+    @NonNull
     @Override
     public String getOwnerUserId() {
         return "David & Ajda";
diff --git a/tests/src/cgeo/geocaching/test/mock/MockedCache.java b/tests/src/cgeo/geocaching/test/mock/MockedCache.java
index 6fb249d..14d8d70 100644
--- a/tests/src/cgeo/geocaching/test/mock/MockedCache.java
+++ b/tests/src/cgeo/geocaching/test/mock/MockedCache.java
@@ -2,7 +2,7 @@ package cgeo.geocaching.test.mock;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import cgeo.geocaching.ICache;
+import cgeo.geocaching.Geocache;
 import cgeo.geocaching.Image;
 import cgeo.geocaching.Trackable;
 import cgeo.geocaching.connector.gc.GCConstants;
@@ -20,10 +20,10 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.List;
 
-public abstract class MockedCache implements ICache {
+public abstract class MockedCache extends Geocache {
 
     final protected Geopoint coords;
-    private String data;
+    private final String data;
     private String mockedDataUser;
 
     protected MockedCache(final Geopoint coords) {
@@ -38,7 +38,7 @@ public abstract class MockedCache implements ICache {
         return mockedDataUser;
     }
 
-    public void setMockedDataUser(String mockedDataUser) {
+    public void setMockedDataUser(final String mockedDataUser) {
         this.mockedDataUser = mockedDataUser;
         assertThat(StringUtils.isNotBlank(this.mockedDataUser)).isTrue();
     }
@@ -71,7 +71,7 @@ public abstract class MockedCache implements ICache {
             }
 
             return TextUtils.replaceWhitespace(buffer.toString());
-        } catch (IOException e) {
+        } catch (final IOException e) {
             Assert.fail(e.getMessage());
         } finally {
             IOUtils.closeQuietly(is);
diff --git a/tests/src/cgeo/test/Compare.java b/tests/src/cgeo/test/Compare.java
index cabbf43..dbc4732 100644
--- a/tests/src/cgeo/test/Compare.java
+++ b/tests/src/cgeo/test/Compare.java
@@ -3,7 +3,6 @@ package cgeo.test;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import cgeo.geocaching.Geocache;
-import cgeo.geocaching.ICache;
 import cgeo.geocaching.enumerations.LogType;
 import cgeo.geocaching.utils.CryptUtils;
 
@@ -13,7 +12,7 @@ import java.util.Date;
 
 public abstract class Compare {
 
-    public static void assertCompareCaches(ICache expected, Geocache actual, boolean all) {
+    public static void assertCompareCaches(Geocache expected, Geocache actual, boolean all) {
         final String geocode = expected.getGeocode();
         final String cacheStr = "Cache " + geocode + ": ";
         assertThat(actual).isNotNull();