From c1ca71be82ff46d2fc77ce6a3549a2565086ec74 Mon Sep 17 00:00:00 2001
From: Manuel Jenny <git@manueljenny.ch>
Date: Wed, 17 Mar 2021 17:37:02 +0100
Subject: [PATCH] fix: remove `PCloudIdCloudNode` interface

---
 .../org/cryptomator/data/cloud/pcloud/PCloudIdCache.java | 8 ++++----
 .../cryptomator/data/cloud/pcloud/PCloudIdCloudNode.java | 9 ---------
 .../org/cryptomator/data/cloud/pcloud/PCloudNode.java    | 5 +++--
 3 files changed, 7 insertions(+), 15 deletions(-)
 delete mode 100644 data/src/main/java/org/cryptomator/data/cloud/pcloud/PCloudIdCloudNode.java

diff --git a/data/src/main/java/org/cryptomator/data/cloud/pcloud/PCloudIdCache.java b/data/src/main/java/org/cryptomator/data/cloud/pcloud/PCloudIdCache.java
index 7c22b0cd..5862fedd 100644
--- a/data/src/main/java/org/cryptomator/data/cloud/pcloud/PCloudIdCache.java
+++ b/data/src/main/java/org/cryptomator/data/cloud/pcloud/PCloudIdCache.java
@@ -19,12 +19,12 @@ class PCloudIdCache {
 		return cache.get(path);
 	}
 
-	<T extends PCloudIdCloudNode> T cache(T value) {
+	<T extends PCloudNode> T cache(T value) {
 		add(value);
 		return value;
 	}
 
-	public void add(PCloudIdCloudNode node) {
+	public void add(PCloudNode node) {
 		add(node.getPath(), new NodeInfo(node));
 	}
 
@@ -32,7 +32,7 @@ class PCloudIdCache {
 		cache.put(path, info);
 	}
 
-	public void remove(PCloudIdCloudNode node) {
+	public void remove(PCloudNode node) {
 		remove(node.getPath());
 	}
 
@@ -55,7 +55,7 @@ class PCloudIdCache {
 		private final Long id;
 		private final boolean isFolder;
 
-		private NodeInfo(PCloudIdCloudNode node) {
+		private NodeInfo(PCloudNode node) {
 			this(node.getId(), node instanceof CloudFolder);
 		}
 
diff --git a/data/src/main/java/org/cryptomator/data/cloud/pcloud/PCloudIdCloudNode.java b/data/src/main/java/org/cryptomator/data/cloud/pcloud/PCloudIdCloudNode.java
deleted file mode 100644
index 3490cb53..00000000
--- a/data/src/main/java/org/cryptomator/data/cloud/pcloud/PCloudIdCloudNode.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.cryptomator.data.cloud.pcloud;
-
-import org.cryptomator.domain.CloudNode;
-
-interface PCloudIdCloudNode extends CloudNode {
-
-	Long getId();
-
-}
diff --git a/data/src/main/java/org/cryptomator/data/cloud/pcloud/PCloudNode.java b/data/src/main/java/org/cryptomator/data/cloud/pcloud/PCloudNode.java
index 29f22567..e58b6775 100644
--- a/data/src/main/java/org/cryptomator/data/cloud/pcloud/PCloudNode.java
+++ b/data/src/main/java/org/cryptomator/data/cloud/pcloud/PCloudNode.java
@@ -1,8 +1,9 @@
 package org.cryptomator.data.cloud.pcloud;
 
-interface PCloudNode extends PCloudIdCloudNode {
+import org.cryptomator.domain.CloudNode;
+
+interface PCloudNode extends CloudNode {
 
-	@Override
 	Long getId();
 
 	@Override