fixup! Add GoogleFetcher

Rename to GoogleDriveFetcher. This name is more appropriate as the
files.get call is specific to Google Drive

Author: bartek

…pipes/fetchers/google/GoogleFetcher.java …/fetchers/google/GoogleDriveFetcher.javatika-pipes/tika-fetchers/tika-fetcher-google/src/main/java/org/apache/tika/pipes/fetchers/google/GoogleFetcher.java renamed to tika-pipes/tika-fetchers/tika-fetcher-google/src/main/java/org/apache/tika/pipes/fetchers/google/GoogleDriveFetcher.java tika-pipes/tika-fetchers/tika-fetcher-google/src/main/java/org/apache/tika/pipes/fetchers/google/GoogleFetcher.java renamed to tika-pipes/tika-fetchers/tika-fetcher-google/src/main/java/org/apache/tika/pipes/fetchers/google/GoogleDriveFetcher.java

@@ -48,19 +48,19 @@
 import org.apache.tika.metadata.Metadata;
 import org.apache.tika.parser.ParseContext;
 import org.apache.tika.pipes.fetcher.AbstractFetcher;
-import org.apache.tika.pipes.fetchers.google.config.GoogleFetcherConfig;
+import org.apache.tika.pipes.fetchers.google.config.GoogleDriveFetcherConfig;
 
 
 /**
- * Google Fetcher allows the fetching of files from a Google Drive, using a
+ * GoogleDrive Fetcher allows the fetching of files from a Google Drive, using a
  * service account key.
  *
  * Fetch Keys are ${fileId},${subjectUser}, where the subject user is the
  * organizer of the file. This user is necessary as part of the key as the
  * service account must act on behalf of the user when querying for the file.
  */
-public class GoogleFetcher extends AbstractFetcher implements Initializable {
-    private static final Logger LOGGER = LoggerFactory.getLogger(GoogleFetcher.class);
+public class GoogleDriveFetcher extends AbstractFetcher implements Initializable {
+    private static final Logger LOGGER = LoggerFactory.getLogger(GoogleDriveFetcher.class);
     private static final JsonFactory JSON_FACTORY = GsonFactory.getDefaultInstance();
 
     private GoogleCredentials baseCredentials;
@@ -69,14 +69,14 @@ public class GoogleFetcher extends AbstractFetcher implements Initializable {
     private boolean spoolToTemp;
     private List<String> scopes;
 
-    private GoogleFetcherConfig config = new GoogleFetcherConfig();
+    private GoogleDriveFetcherConfig config = new GoogleDriveFetcherConfig();
 
-    public GoogleFetcher() {
+    public GoogleDriveFetcher() {
         scopes = new ArrayList<>();
         scopes.add(DriveScopes.DRIVE_READONLY);
     }
 
-    public GoogleFetcher(GoogleFetcherConfig config) {
+    public GoogleDriveFetcher(GoogleDriveFetcherConfig config) {
         this.config = config;
     }
 

…s/google/config/GoogleFetcherConfig.java …gle/config/GoogleDriveFetcherConfig.javatika-pipes/tika-fetchers/tika-fetcher-google/src/main/java/org/apache/tika/pipes/fetchers/google/config/GoogleFetcherConfig.java renamed to tika-pipes/tika-fetchers/tika-fetcher-google/src/main/java/org/apache/tika/pipes/fetchers/google/config/GoogleDriveFetcherConfig.java tika-pipes/tika-fetchers/tika-fetcher-google/src/main/java/org/apache/tika/pipes/fetchers/google/config/GoogleFetcherConfig.java renamed to tika-pipes/tika-fetchers/tika-fetcher-google/src/main/java/org/apache/tika/pipes/fetchers/google/config/GoogleDriveFetcherConfig.java

@@ -21,7 +21,7 @@
 
 import org.apache.tika.pipes.fetcher.config.AbstractConfig;
 
-public class GoogleFetcherConfig extends AbstractConfig {
+public class GoogleDriveFetcherConfig extends AbstractConfig {
     private long[] throttleSeconds;
     private boolean spoolToTemp;
     protected String serviceAccountKeyBase64;
@@ -32,7 +32,7 @@ public boolean isSpoolToTemp() {
         return spoolToTemp;
     }
 
-    public GoogleFetcherConfig setSpoolToTemp(boolean spoolToTemp) {
+    public GoogleDriveFetcherConfig setSpoolToTemp(boolean spoolToTemp) {
         this.spoolToTemp = spoolToTemp;
         return this;
     }
@@ -41,7 +41,7 @@ public long[] getThrottleSeconds() {
         return throttleSeconds;
     }
 
-    public GoogleFetcherConfig setThrottleSeconds(long[] throttleSeconds) {
+    public GoogleDriveFetcherConfig setThrottleSeconds(long[] throttleSeconds) {
         this.throttleSeconds = throttleSeconds;
         return this;
     }
@@ -50,7 +50,7 @@ public String getServiceAccountKeyBase64() {
         return serviceAccountKeyBase64;
     }
 
-    public GoogleFetcherConfig setServiceAccountKeyBase64(String serviceAccountKeyBase64) {
+    public GoogleDriveFetcherConfig setServiceAccountKeyBase64(String serviceAccountKeyBase64) {
         this.serviceAccountKeyBase64 = serviceAccountKeyBase64;
         return this;
     }
@@ -59,7 +59,7 @@ public String getSubjectUser() {
         return subjectUser;
     }
 
-    public GoogleFetcherConfig setSubjectUser(String subjectUser) {
+    public GoogleDriveFetcherConfig setSubjectUser(String subjectUser) {
         this.subjectUser = subjectUser;
         return this;
     }
@@ -68,7 +68,7 @@ public List<String> getScopes() {
         return scopes;
     }
 
-    public GoogleFetcherConfig setScopes(List<String> scopes) {
+    public GoogleDriveFetcherConfig setScopes(List<String> scopes) {
         this.scopes = scopes;
         return this;
     }