From 136a940e813763da4c151043b86d29e8f2c7a3be Mon Sep 17 00:00:00 2001
From: Christopher Schnick <st141923@stud.uni-stuttgart.de>
Date: Fri, 20 May 2022 13:34:32 +0200
Subject: [PATCH] Rename data source classes

---
 ...ataSourceDescriptor.java => CollectionDataSource.java} | 8 ++++----
 .../source/{DataSourceDescriptor.java => DataSource.java} | 0
 .../{RawDataSourceDescriptor.java => RawDataSource.java}  | 0
 ...DataSourceDescriptor.java => StructureDataSource.java} | 0
 ...ableDataSourceDescriptor.java => TableDataSource.java} | 0
 ...{TextDataSourceDescriptor.java => TextDataSource.java} | 0
 6 files changed, 4 insertions(+), 4 deletions(-)
 rename core/src/main/java/io/xpipe/core/source/{CollectionDataSourceDescriptor.java => CollectionDataSource.java} (76%)
 rename core/src/main/java/io/xpipe/core/source/{DataSourceDescriptor.java => DataSource.java} (100%)
 rename core/src/main/java/io/xpipe/core/source/{RawDataSourceDescriptor.java => RawDataSource.java} (100%)
 rename core/src/main/java/io/xpipe/core/source/{StructureDataSourceDescriptor.java => StructureDataSource.java} (100%)
 rename core/src/main/java/io/xpipe/core/source/{TableDataSourceDescriptor.java => TableDataSource.java} (100%)
 rename core/src/main/java/io/xpipe/core/source/{TextDataSourceDescriptor.java => TextDataSource.java} (100%)

diff --git a/core/src/main/java/io/xpipe/core/source/CollectionDataSourceDescriptor.java b/core/src/main/java/io/xpipe/core/source/CollectionDataSource.java
similarity index 76%
rename from core/src/main/java/io/xpipe/core/source/CollectionDataSourceDescriptor.java
rename to core/src/main/java/io/xpipe/core/source/CollectionDataSource.java
index c212d920..9c9ad757 100644
--- a/core/src/main/java/io/xpipe/core/source/CollectionDataSourceDescriptor.java
+++ b/core/src/main/java/io/xpipe/core/source/CollectionDataSource.java
@@ -5,21 +5,21 @@ import io.xpipe.core.store.DataStore;
 import java.util.HashMap;
 import java.util.Map;
 
-public abstract class CollectionDataSourceDescriptor<DS extends DataStore> extends DataSourceDescriptor<DS> {
+public abstract class CollectionDataSource<DS extends DataStore> extends DataSourceDescriptor<DS> {
 
     private final Map<String, String> preferredProviders;
 
-    public CollectionDataSourceDescriptor(DS store) {
+    public CollectionDataSource(DS store) {
         super(store);
         this.preferredProviders = new HashMap<>();
     }
 
-    public CollectionDataSourceDescriptor<DS> annotate(String file, String provider) {
+    public CollectionDataSource<DS> annotate(String file, String provider) {
         preferredProviders.put(file, provider);
         return this;
     }
 
-    public CollectionDataSourceDescriptor<DS> annotate(Map<String, String> preferredProviders) {
+    public CollectionDataSource<DS> annotate(Map<String, String> preferredProviders) {
         this.preferredProviders.putAll(preferredProviders);
         return this;
     }
diff --git a/core/src/main/java/io/xpipe/core/source/DataSourceDescriptor.java b/core/src/main/java/io/xpipe/core/source/DataSource.java
similarity index 100%
rename from core/src/main/java/io/xpipe/core/source/DataSourceDescriptor.java
rename to core/src/main/java/io/xpipe/core/source/DataSource.java
diff --git a/core/src/main/java/io/xpipe/core/source/RawDataSourceDescriptor.java b/core/src/main/java/io/xpipe/core/source/RawDataSource.java
similarity index 100%
rename from core/src/main/java/io/xpipe/core/source/RawDataSourceDescriptor.java
rename to core/src/main/java/io/xpipe/core/source/RawDataSource.java
diff --git a/core/src/main/java/io/xpipe/core/source/StructureDataSourceDescriptor.java b/core/src/main/java/io/xpipe/core/source/StructureDataSource.java
similarity index 100%
rename from core/src/main/java/io/xpipe/core/source/StructureDataSourceDescriptor.java
rename to core/src/main/java/io/xpipe/core/source/StructureDataSource.java
diff --git a/core/src/main/java/io/xpipe/core/source/TableDataSourceDescriptor.java b/core/src/main/java/io/xpipe/core/source/TableDataSource.java
similarity index 100%
rename from core/src/main/java/io/xpipe/core/source/TableDataSourceDescriptor.java
rename to core/src/main/java/io/xpipe/core/source/TableDataSource.java
diff --git a/core/src/main/java/io/xpipe/core/source/TextDataSourceDescriptor.java b/core/src/main/java/io/xpipe/core/source/TextDataSource.java
similarity index 100%
rename from core/src/main/java/io/xpipe/core/source/TextDataSourceDescriptor.java
rename to core/src/main/java/io/xpipe/core/source/TextDataSource.java