This is an automated email from the ASF dual-hosted git repository.
piergiorgio pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/manifoldcf.git
The following commit(s) were added to refs/heads/trunk by this push:
new dd7d4f22a Revert "Merge pull request #142 from
douglascrp/google-drive-api-upgrade"
dd7d4f22a is described below
commit dd7d4f22a33c17a977630e8cfcbc38908e310419
Author: Piergiorgio Lucidi <[email protected]>
AuthorDate: Thu Nov 28 10:00:39 2024 +0100
Revert "Merge pull request #142 from douglascrp/google-drive-api-upgrade"
This reverts commit ebcc4ff7b34204fb63ad0621b3e4f0f4153785cb, reversing
changes made to 601815c8a0e4302d5b8590148687e21a18cb937d.
---
build.xml | 36 ++---------
connectors/googledrive/build.xml | 2 -
.../GoogleDriveRepositoryConnector.java | 69 ++++++++++++----------
.../connectors/googledrive/GoogleDriveSession.java | 13 +---
connectors/googledrive/pom.xml | 6 +-
5 files changed, 50 insertions(+), 76 deletions(-)
diff --git a/build.xml b/build.xml
index cc7ddaea2..c9adca03c 100644
--- a/build.xml
+++ b/build.xml
@@ -116,12 +116,8 @@
<property name="dropbox-client.version" value="1.5.3"/>
<property name="json-simple.version" value="1.1.1"/>
<property name="json.version" value="1.8"/>
- <property name="google-drive-api-client.version"
value="v3-rev20220815-2.0.0"/>
- <property name="google-http-client.version" value="1.42.1"/>
- <property name="google-oauth-client.version" value="1.34.1"/>
- <property name="google-api-client.version" value="2.0.0"/>
- <property name="opencensus.version" value="0.31.1"/>
- <property name="grpc.version" value="1.27.2"/>
+ <property name="google-api-client.version" value="v2-rev326-1.25.0"/>
+ <property name="google-http-client.version" value="1.25.0"/>
<property name="findbugs.version" value="3.0.2"/>
<property name="j2objc.version" value="1.1"/>
<property name="jackson-core.version" value="2.13.1"/>
@@ -2258,7 +2254,7 @@ Use Apache Forrest version forrest-0.9-dev or higher.
<antcall target="download-via-maven">
<param name="target" value="lib"/>
<param name="project-path" value="com/google/apis"/>
- <param name="artifact-version"
value="${google-drive-api-client.version}"/>
+ <param name="artifact-version"
value="${google-api-client.version}"/>
<param name="artifact-name" value="google-api-services-drive"/>
<param name="artifact-type" value="jar"/>
</antcall>
@@ -2293,7 +2289,7 @@ Use Apache Forrest version forrest-0.9-dev or higher.
<antcall target="download-via-maven">
<param name="target" value="lib"/>
<param name="project-path" value="com/google/oauth-client"/>
- <param name="artifact-version"
value="${google-oauth-client.version}"/>
+ <param name="artifact-version"
value="${google-http-client.version}"/>
<param name="artifact-name" value="google-oauth-client"/>
<param name="artifact-type" value="jar"/>
</antcall>
@@ -2307,31 +2303,11 @@ Use Apache Forrest version forrest-0.9-dev or higher.
<antcall target="download-via-maven">
<param name="target" value="lib"/>
<param name="project-path" value="com/google/api-client"/>
- <param name="artifact-version"
value="${google-api-client.version}"/>
+ <param name="artifact-version"
value="${google-http-client.version}"/>
<param name="artifact-name" value="google-api-client"/>
<param name="artifact-type" value="jar"/>
</antcall>
- <antcall target="download-via-maven">
- <param name="target" value="lib"/>
- <param name="project-path" value="io/opencensus"/>
- <param name="artifact-version" value="${opencensus.version}"/>
- <param name="artifact-name" value="opencensus-api"/>
- <param name="artifact-type" value="jar"/>
- </antcall>
- <antcall target="download-via-maven">
- <param name="target" value="lib"/>
- <param name="project-path" value="io/opencensus"/>
- <param name="artifact-version" value="${opencensus.version}"/>
- <param name="artifact-name" value="opencensus-contrib-http-util"/>
- <param name="artifact-type" value="jar"/>
- </antcall>
- <antcall target="download-via-maven">
- <param name="target" value="lib"/>
- <param name="project-path" value="io/grpc"/>
- <param name="artifact-version" value="${grpc.version}"/>
- <param name="artifact-name" value="grpc-context"/>
- <param name="artifact-type" value="jar"/>
- </antcall>
+
</target>
<target name="download-sharepoint-plugins">
diff --git a/connectors/googledrive/build.xml b/connectors/googledrive/build.xml
index 63c5f1ef1..976b8f63f 100644
--- a/connectors/googledrive/build.xml
+++ b/connectors/googledrive/build.xml
@@ -48,8 +48,6 @@
<include name="jackson-core*.jar"/>
<include name="jsr305*.jar"/>
<include name="j2objc-annotations*.jar"/>
- <include name="grpc-context*.jar"/>
- <include name="opencensus*.jar"/>
</fileset>
</copy>
</target>
diff --git
a/connectors/googledrive/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/googledrive/GoogleDriveRepositoryConnector.java
b/connectors/googledrive/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/googledrive/GoogleDriveRepositoryConnector.java
index ded861cb8..c28bb55cc 100644
---
a/connectors/googledrive/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/googledrive/GoogleDriveRepositoryConnector.java
+++
b/connectors/googledrive/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/googledrive/GoogleDriveRepositoryConnector.java
@@ -54,9 +54,10 @@ import
org.apache.manifoldcf.crawler.interfaces.IProcessActivity;
import org.apache.manifoldcf.crawler.interfaces.ISeedingActivity;
import org.apache.manifoldcf.crawler.system.Logging;
-import com.google.common.base.Objects;
+import com.google.api.client.repackaged.com.google.common.base.Objects;
import com.google.api.client.util.DateTime;
import com.google.api.services.drive.model.File;
+import com.google.api.services.drive.model.ParentReference;
/**
*
@@ -980,24 +981,33 @@ public class GoogleDriveRepositoryConnector extends
BaseRepositoryConnector {
for (String documentIdentifier : documentIdentifiers) {
File googleFile = getObject(documentIdentifier);
-
- if (Logging.connectors.isDebugEnabled()) {
- Logging.connectors.debug("GOOGLEDRIVE: Processing document identifier
'"
- + documentIdentifier + "'");
- Logging.connectors.debug("GOOGLEDRIVE: have this file:\t" +
googleFile.getName());
- }
-
+
+ // StringBuilder log = new StringBuilder();
+ // log.append("File Original Name: " + googleFile.getOriginalFilename());
+ // log.append(System.getProperty("line.separator"));
+ // log.append("File Title: " + googleFile.getTitle());
+ // log.append(System.getProperty("line.separator"));
+ // log.append("File Description: " + googleFile.getDescription());
+ // log.append(System.getProperty("line.separator"));
+ // log.append("File Extension: " + googleFile.getFileExtension());
+ // log.append(System.getProperty("line.separator"));
+ // log.append("File MimeType: " + googleFile.getMimeType());
+ // log.append(System.getProperty("line.separator"));
+ // log.append("File Version: " + googleFile.getVersion());
+ // log.append(System.getProperty("line.separator"));
+ //
+ // System.out.println(log);
+
String versionString;
- if (googleFile == null || (googleFile.containsKey("explicitlyTrashed")
&& googleFile.getExplicitlyTrashed()) ||
-
googleFile.getMimeType().equals("application/vnd.google-apps.shortcut")) {
+ if (googleFile == null || (googleFile.containsKey("explicitlyTrashed")
&& googleFile.getExplicitlyTrashed())) {
//its deleted, move on
activities.deleteDocument(documentIdentifier);
continue;
}
if (!isDir(googleFile)) {
- String rev = googleFile.getModifiedTime().toStringRfc3339();
+ String rev = googleFile.getModifiedDate().toStringRfc3339();
if (StringUtils.isNotEmpty(rev)) {
StringBuilder sb = new StringBuilder();
@@ -1036,7 +1046,7 @@ public class GoogleDriveRepositoryConnector extends
BaseRepositoryConnector {
if (Logging.connectors.isDebugEnabled()) {
Logging.connectors.debug("GOOGLEDRIVE: Processing document
identifier '"
+ nodeId + "'");
- Logging.connectors.debug("GOOGLEDRIVE: have this file:\t" +
googleFile.getName());
+ Logging.connectors.debug("GOOGLEDRIVE: have this file:\t" +
googleFile.getTitle());
}
if
("application/vnd.google-apps.folder".equals(googleFile.getMimeType())) {
@@ -1100,16 +1110,16 @@ public class GoogleDriveRepositoryConnector extends
BaseRepositoryConnector {
}
// Get the file length
- Long fileLengthLong = googleFile.getSize() != null ?
googleFile.getSize() : 0L;
+ Long fileLengthLong =
Objects.firstNonNull(googleFile.getFileSize(), 0L);
if (fileLengthLong != null) {
// Now do standard stuff
long fileLength = fileLengthLong.longValue();
String mimeType = googleFile.getMimeType();
- DateTime createdDateObject = googleFile.getCreatedTime();
- DateTime modifiedDateObject = googleFile.getModifiedTime();
+ DateTime createdDateObject = googleFile.getCreatedDate();
+ DateTime modifiedDateObject = googleFile.getModifiedDate();
String extension = googleFile.getFileExtension();
- String title = cleanupFileFolderName(googleFile.getName());
+ String title = cleanupFileFolderName(googleFile.getTitle());
Date createdDate = (createdDateObject==null)?null:new
Date(createdDateObject.getValue());
Date modifiedDate = (modifiedDateObject==null)?null:new
Date(modifiedDateObject.getValue());
// We always direct to the PDF except for Spreadsheets
@@ -1343,14 +1353,14 @@ public class GoogleDriveRepositoryConnector extends
BaseRepositoryConnector {
try {
if (!isDir(googleFile)) {
if (googleFile.getParents() != null &&
!googleFile.getParents().isEmpty()) {
- String parentRef = googleFile.getParents().get(0);
+ ParentReference parentRef = googleFile.getParents().get(0);
File parent;
- parent = getObject(parentRef);
+ parent = getObject(parentRef.getId());
String path = getFilePath(parent);
String name;
- String title = cleanupFileFolderName(googleFile.getName());
+ String title = cleanupFileFolderName(googleFile.getTitle());
String extension = googleFile.getFileExtension();
@@ -1377,7 +1387,7 @@ public class GoogleDriveRepositoryConnector extends
BaseRepositoryConnector {
}
} else {
String path = getFilePath(googleFile);
- String name = cleanupFileFolderName(googleFile.getName());
+ String name = cleanupFileFolderName(googleFile.getTitle());
fullContentPath = path + SLASH + name;
}
} catch (ManifoldCFException e) {
@@ -1397,7 +1407,7 @@ public class GoogleDriveRepositoryConnector extends
BaseRepositoryConnector {
String folderPath = "";
String fullFilePath = null;
- List<String> parentReferencesList = file.getParents();
+ List<ParentReference> parentReferencesList = file.getParents();
List<String> folderList = new ArrayList<String>();
List<String> finalFolderList = getfoldersList(parentReferencesList,
folderList);
@@ -1407,22 +1417,21 @@ public class GoogleDriveRepositoryConnector extends
BaseRepositoryConnector {
folderPath += "/" + folder;
}
- fullFilePath = folderPath + "/" + cleanupFileFolderName(file.getName());
+ fullFilePath = folderPath + "/" + cleanupFileFolderName(file.getTitle());
return fullFilePath;
}
- private List<String> getfoldersList(List<String> parentReferencesList,
List<String> folderList)
+ private List<String> getfoldersList(List<ParentReference>
parentReferencesList, List<String> folderList)
throws IOException, ManifoldCFException, ServiceInterruption {
-
- for (int i = 0; parentReferencesList != null && i <
parentReferencesList.size(); i++) {
- String id = parentReferencesList.get(i);
+ for (int i = 0; i < parentReferencesList.size(); i++) {
+ String id = parentReferencesList.get(i).getId();
File file = getObject(id);
- folderList.add(cleanupFileFolderName(file.getName()));
+ folderList.add(cleanupFileFolderName(file.getTitle()));
- if (file.getParents() != null && !(file.getParents().isEmpty())) {
- List<String> parentReferenceslist2 = file.getParents();
+ if (!(file.getParents().isEmpty())) {
+ List<ParentReference> parentReferenceslist2 = file.getParents();
getfoldersList(parentReferenceslist2, folderList);
}
}
@@ -1482,7 +1491,7 @@ public class GoogleDriveRepositoryConnector extends
BaseRepositoryConnector {
*/
protected static String getUrl(File googleFile, String exportType) {
if (googleFile.containsKey("fileSize")) {
- return googleFile.getWebContentLink();
+ return googleFile.getDownloadUrl();
} else {
return (googleFile.getExportLinks() != null) ?
googleFile.getExportLinks().get(exportType) : null;
}
diff --git
a/connectors/googledrive/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/googledrive/GoogleDriveSession.java
b/connectors/googledrive/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/googledrive/GoogleDriveSession.java
index ad3a07354..fd235c3fe 100644
---
a/connectors/googledrive/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/googledrive/GoogleDriveSession.java
+++
b/connectors/googledrive/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/googledrive/GoogleDriveSession.java
@@ -105,13 +105,10 @@ public class GoogleDriveSession {
request = drive.files().list().setQ(googleDriveQuery);
request.setIncludeTeamDriveItems(true);
request.setSupportsTeamDrives(true);
- request.setSupportsAllDrives(true);
-
- request.setFields("*");
do {
FileList files = request.execute();
- for (File f : files.getFiles()) {
+ for (File f : files.getItems()) {
idBuffer.add(f.getId());
}
request.setPageToken(files.getNextPageToken());
@@ -124,11 +121,8 @@ public class GoogleDriveSession {
public File getObject(String id) throws IOException {
Get get = drive.files().get(id);
get.setSupportsTeamDrives(true);
- get.setSupportsAllDrives(true);
- get.setFields("*");
File file = get.execute();
-
return file;
}
@@ -139,13 +133,10 @@ public class GoogleDriveSession {
Drive.Files.List request = drive.files().list().setQ("'" + nodeId + "' in
parents");
request.setIncludeTeamDriveItems(true);
request.setSupportsTeamDrives(true);
- request.setSupportsAllDrives(true);
-
- request.setFields("*");
do {
FileList files = request.execute();
- for (File f : files.getFiles()) {
+ for (File f : files.getItems()) {
idBuffer.add(f.getId());
}
request.setPageToken(files.getNextPageToken());
diff --git a/connectors/googledrive/pom.xml b/connectors/googledrive/pom.xml
index 674938409..170b7f310 100644
--- a/connectors/googledrive/pom.xml
+++ b/connectors/googledrive/pom.xml
@@ -40,8 +40,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <project.http.version>1.42.1</project.http.version>
- <project.oauth.version>1.34.1</project.oauth.version>
+ <project.http.version>1.25.0</project.http.version>
+ <project.oauth.version>1.25.0</project.oauth.version>
</properties>
<artifactId>mcf-googledrive-connector</artifactId>
@@ -380,7 +380,7 @@
<dependency>
<groupId>com.google.apis</groupId>
<artifactId>google-api-services-drive</artifactId>
- <version>v3-rev20220815-2.0.0</version>
+ <version>v2-rev326-1.25.0</version>
</dependency>
<dependency>
<groupId>com.google.http-client</groupId>
