Remove new deprecation warnings
git-svn-id: https://svn.apache.org/repos/asf/manifoldcf/branches/CONNECTORS-990@1610706 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/DCTM/DCTM.java b/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/DCTM/DCTM.java
index dcf6aa8..b206472 100644
--- a/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/DCTM/DCTM.java
+++ b/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/DCTM/DCTM.java
@@ -1866,7 +1866,7 @@
}
if (rd == null)
- activities.deleteDocument(documentIdentifier,versionString);
+ activities.noDocument(documentIdentifier,versionString);
// Abort the retry loop and go on to the next document
break;
diff --git a/connectors/filenet/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filenet/FilenetConnector.java b/connectors/filenet/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filenet/FilenetConnector.java
index 0ea911b..e2ed4ba 100644
--- a/connectors/filenet/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filenet/FilenetConnector.java
+++ b/connectors/filenet/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filenet/FilenetConnector.java
@@ -1267,7 +1267,7 @@
null,documentIdentifier,"Authorization error",e.getMessage(),null);
if (Logging.connectors.isDebugEnabled())
Logging.connectors.debug("FileNet: Removing file '"+documentIdentifier+"' because: "+e.getMessage(),e);
- activities.deleteDocument(documentIdentifier,documentVersion);
+ activities.noDocument(documentIdentifier,documentVersion);
i++;
continue;
}
@@ -1350,7 +1350,7 @@
}
}
else
- activities.deleteDocument(documentIdentifier,documentVersion);
+ activities.noDocument(documentIdentifier,documentVersion);
}
finally
{
@@ -1384,7 +1384,7 @@
if (Logging.connectors.isDebugEnabled())
Logging.connectors.debug("FileNet: Removing version '"+documentIdentifier+"' because it seems to no longer exist");
- activities.deleteDocument(documentIdentifier,documentVersion);
+ activities.noDocument(documentIdentifier,documentVersion);
i++;
continue;
}
@@ -1414,7 +1414,7 @@
{
if (Logging.connectors.isDebugEnabled())
Logging.connectors.debug("FileNet: Removing version '"+documentIdentifier+"' because: "+e.getMessage(),e);
- activities.deleteDocument(documentIdentifier,documentVersion);
+ activities.noDocument(documentIdentifier,documentVersion);
i++;
continue;
}
diff --git a/connectors/hdfs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/hdfs/HDFSRepositoryConnector.java b/connectors/hdfs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/hdfs/HDFSRepositoryConnector.java
index 4333d9c..20b0880 100644
--- a/connectors/hdfs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/hdfs/HDFSRepositoryConnector.java
+++ b/connectors/hdfs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/hdfs/HDFSRepositoryConnector.java
@@ -409,7 +409,7 @@
if (fileStatus == null) {
// It is no longer there , so delete right away
- activities.deleteDocument(documentIdentifier,version);
+ activities.deleteDocument(documentIdentifier);
continue;
}
@@ -421,7 +421,7 @@
FileStatus[] fileStatuses = getChildren(fileStatus.getPath());
if (fileStatuses == null) {
// Directory was deleted, so remove
- activities.deleteDocument(documentIdentifier,version);
+ activities.deleteDocument(documentIdentifier);
continue;
}
for (int j = 0; j < fileStatuses.length; j++) {
diff --git a/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java b/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java
index e60fb5c..a3e4e35 100644
--- a/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java
+++ b/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java
@@ -722,7 +722,7 @@
if (map.get(documentIdentifier) != null)
{
// This means we did not see it (or data for it) in the result set. Delete it!
- activities.deleteDocument(documentIdentifier,versions[i]);
+ activities.deleteDocument(documentIdentifier);
}
}
i++;
diff --git a/connectors/jira/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jira/JiraRepositoryConnector.java b/connectors/jira/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jira/JiraRepositoryConnector.java
index d504852..676cba7 100644
--- a/connectors/jira/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jira/JiraRepositoryConnector.java
+++ b/connectors/jira/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jira/JiraRepositoryConnector.java
@@ -927,7 +927,7 @@
String issueKey = nodeId.substring(2);
JiraIssue jiraFile = getIssue(issueKey);
if (jiraFile == null) {
- activities.deleteDocument(nodeId, version);
+ activities.deleteDocument(nodeId);
continue;
}
diff --git a/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java b/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java
index d761acd..374d194 100644
--- a/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java
+++ b/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java
@@ -4440,7 +4440,7 @@
// Since we logged in, we should fail here if the ingestion user doesn't have access to the
// the document, but if we do, don't fail hard.
resultCode = "UNAUTHORIZED";
- activities.deleteDocument(documentIdentifier,version);
+ activities.noDocument(documentIdentifier,version);
return;
case HttpStatus.SC_OK:
@@ -4533,7 +4533,7 @@
else
{
resultCode = "SESSIONLOGINFAILED";
- activities.deleteDocument(documentIdentifier,version);
+ activities.noDocument(documentIdentifier,version);
}
break;
case HttpStatus.SC_BAD_REQUEST:
@@ -4731,7 +4731,7 @@
if (Logging.connectors.isDebugEnabled())
Logging.connectors.debug("Livelink: Excluding document "+documentIdentifier+" because its length ("+dataSize+") was rejected by output connector");
resultCode = "DOCUMENTTOOLONG";
- activities.deleteDocument(documentIdentifier,version);
+ activities.noDocument(documentIdentifier,version);
}
}
else
@@ -4741,7 +4741,7 @@
if (Logging.connectors.isDebugEnabled())
Logging.connectors.debug("Livelink: Excluding document "+documentIdentifier+" because its mime type ("+mimeType+") was rejected by output connector");
resultCode = "MIMETYPEEXCLUSION";
- activities.deleteDocument(documentIdentifier,version);
+ activities.noDocument(documentIdentifier,version);
}
}
else
@@ -4751,7 +4751,7 @@
if (Logging.connectors.isDebugEnabled())
Logging.connectors.debug("Livelink: Excluding document "+documentIdentifier+" because its URL ("+viewHttpAddress+") was rejected by output connector");
resultCode = "URLEXCLUSION";
- activities.deleteDocument(documentIdentifier,version);
+ activities.noDocument(documentIdentifier,version);
}
}
finally
diff --git a/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioConnector.java b/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioConnector.java
index 935b596..d6ac0e0 100644
--- a/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioConnector.java
+++ b/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioConnector.java
@@ -1164,7 +1164,7 @@
if (Logging.connectors.isDebugEnabled())
Logging.connectors.debug("Meridio: Could not retrieve document data for document id '" +
new Long(docId).toString() + "' in processDocuments method - deleting document.");
- activities.deleteDocument(documentIdentifier,docVersion);
+ activities.noDocument(documentIdentifier,docVersion);
i++;
continue;
}
@@ -1176,7 +1176,7 @@
Logging.connectors.debug("Meridio: Could not retrieve document owner for document id '" +
new Long(docId).toString() + "' in processDocuments method. No information or incorrect amount " +
"of information was returned");
- activities.deleteDocument(documentIdentifier,docVersion);
+ activities.noDocument(documentIdentifier,docVersion);
i++;
continue;
}
@@ -1336,7 +1336,7 @@
if (Logging.connectors.isDebugEnabled())
Logging.connectors.debug("Meridio: Failed to get content for document '" + new Long(docId).toString() + "'");
// No document. Delete what's there
- activities.deleteDocument(documentIdentifier,docVersion);
+ activities.noDocument(documentIdentifier,docVersion);
i++;
continue;
}
@@ -1370,13 +1370,13 @@
}
}
else
- activities.deleteDocument(documentIdentifier, docVersion);
+ activities.noDocument(documentIdentifier, docVersion);
}
else
{
if (Logging.connectors.isDebugEnabled())
Logging.connectors.debug("Meridio: Expected temporary file was not present - skipping document '"+new Long(docId).toString() + "'");
- activities.deleteDocument(documentIdentifier, docVersion);
+ activities.deleteDocument(documentIdentifier);
}
}
finally
diff --git a/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/RSSConnector.java b/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/RSSConnector.java
index 979cdd1..15aedc3 100644
--- a/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/RSSConnector.java
+++ b/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/RSSConnector.java
@@ -1239,7 +1239,7 @@
// Leave document in jobqueue, but do NOT get rid of it, or we will wind up seeing it queued again by
// somebody else. We *do* have to signal the document to be removed from the index, however, or it will
// stick around until the job is deleted.
- activities.deleteDocument(urlValue,version);
+ activities.noDocument(urlValue,version);
continue;
}
@@ -1528,7 +1528,7 @@
}
else
{
- activities.deleteDocument(urlValue,version);
+ activities.noDocument(urlValue,version);
if (Logging.connectors.isDebugEnabled())
Logging.connectors.debug("RSS: Skipping document '"+urlValue+"' because it cannot be indexed");
diff --git a/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java b/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java
index 3fb5141..95202c6 100644
--- a/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java
+++ b/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java
@@ -1322,28 +1322,28 @@
// Site/list no longer exists, so delete entry
if (Logging.connectors.isDebugEnabled())
Logging.connectors.debug("SharePoint: No list found for list '"+siteListPath+"' - deleting");
- activities.deleteDocument(documentIdentifier,version);
+ activities.deleteDocument(documentIdentifier);
}
}
else
{
if (Logging.connectors.isDebugEnabled())
Logging.connectors.debug("SharePoint: Access token lookup failed for list '"+siteListPath+"' - deleting");
- activities.deleteDocument(documentIdentifier,version);
+ activities.noDocument(documentIdentifier,version);
}
}
else
{
if (Logging.connectors.isDebugEnabled())
Logging.connectors.debug("SharePoint: Field list lookup failed for list '"+siteListPath+"' - deleting");
- activities.deleteDocument(documentIdentifier,version);
+ activities.noDocument(documentIdentifier,version);
}
}
else
{
if (Logging.connectors.isDebugEnabled())
Logging.connectors.debug("SharePoint: GUID lookup failed for list '"+siteListPath+"' - deleting");
- activities.deleteDocument(documentIdentifier,version);
+ activities.noDocument(documentIdentifier,version);
}
}
else
@@ -1413,7 +1413,7 @@
{
if (Logging.connectors.isDebugEnabled())
Logging.connectors.debug("SharePoint: List '"+decodedListPath+"' no longer exists - deleting item '"+documentIdentifier+"'");
- activities.deleteDocument(documentIdentifier,version);
+ activities.deleteDocument(documentIdentifier);
i++;
continue;
}
@@ -1479,7 +1479,7 @@
// Item has vanished
if (Logging.connectors.isDebugEnabled())
Logging.connectors.debug("SharePoint: Item metadata fetch failure indicated that item is gone: '"+documentIdentifier+"' - removing");
- activities.deleteDocument(documentIdentifier,version);
+ activities.noDocument(documentIdentifier,version);
i++;
continue;
}
@@ -1536,7 +1536,7 @@
}
else
// Document too long (should never happen; length is 0)
- activities.deleteDocument( documentIdentifier, version );
+ activities.noDocument( documentIdentifier, version );
}
}
else
@@ -1584,7 +1584,7 @@
accessTokens, denyTokens, createdDate, modifiedDate, null, guid, sDesc))
{
// Document not indexed for whatever reason
- activities.deleteDocument(documentIdentifier,version);
+ activities.noDocument(documentIdentifier,version);
i++;
continue;
}
@@ -1593,7 +1593,7 @@
{
if (Logging.connectors.isDebugEnabled())
Logging.connectors.debug("SharePoint: Skipping attachment '"+documentIdentifier+"' because no parent guid found");
- activities.deleteDocument(documentIdentifier,version);
+ activities.noDocument(documentIdentifier,version);
i++;
continue;
}
@@ -1664,28 +1664,28 @@
// Site/library no longer exists, so delete entry
if (Logging.connectors.isDebugEnabled())
Logging.connectors.debug("SharePoint: No list found for library '"+siteLibPath+"' - deleting");
- activities.deleteDocument(documentIdentifier,version);
+ activities.deleteDocument(documentIdentifier);
}
}
else
{
if (Logging.connectors.isDebugEnabled())
Logging.connectors.debug("SharePoint: Access token lookup failed for library '"+siteLibPath+"' - deleting");
- activities.deleteDocument(documentIdentifier,version);
+ activities.noDocument(documentIdentifier,version);
}
}
else
{
if (Logging.connectors.isDebugEnabled())
Logging.connectors.debug("SharePoint: Field list lookup failed for library '"+siteLibPath+"' - deleting");
- activities.deleteDocument(documentIdentifier,version);
+ activities.noDocument(documentIdentifier,version);
}
}
else
{
if (Logging.connectors.isDebugEnabled())
Logging.connectors.debug("SharePoint: GUID lookup failed for library '"+siteLibPath+"' - deleting");
- activities.deleteDocument(documentIdentifier,version);
+ activities.noDocument(documentIdentifier,version);
}
}
else
@@ -1751,7 +1751,7 @@
{
if (Logging.connectors.isDebugEnabled())
Logging.connectors.debug("SharePoint: Library '"+decodedLibPath+"' no longer exists - deleting document '"+documentIdentifier+"'");
- activities.deleteDocument(documentIdentifier,version);
+ activities.deleteDocument(documentIdentifier);
i++;
continue;
}
@@ -1763,7 +1763,7 @@
// Document has vanished
if (Logging.connectors.isDebugEnabled())
Logging.connectors.debug("SharePoint: Document metadata fetch failure indicated that document is gone: '"+documentIdentifier+"' - removing");
- activities.deleteDocument(documentIdentifier,version);
+ activities.noDocument(documentIdentifier,version);
i++;
continue;
}
@@ -1774,7 +1774,7 @@
acls, denyAcls, createdDate, modifiedDate, metadataValues, guid, sDesc))
{
// Document not indexed for whatever reason
- activities.deleteDocument(documentIdentifier,version);
+ activities.noDocument(documentIdentifier,version);
i++;
continue;
}
diff --git a/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/WebcrawlerConnector.java b/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/WebcrawlerConnector.java
index 949e847..ae753a7 100644
--- a/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/WebcrawlerConnector.java
+++ b/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/WebcrawlerConnector.java
@@ -1331,7 +1331,7 @@
// Leave document in jobqueue, but do NOT get rid of it, or we will wind up seeing it queued again by
// somebody else. We *do* have to signal the document to be removed from the index, however, or it will
// stick around until the job is deleted.
- activities.deleteDocument(documentIdentifier,version);
+ activities.noDocument(documentIdentifier,version);
continue;
}
@@ -1465,7 +1465,7 @@
// We do this by using a null url and a null repository document. If a document with this identifier was
// previously indexed, it will be removed.
- activities.deleteDocument(documentIdentifier,version);
+ activities.noDocument(documentIdentifier,version);
if (Logging.connectors.isDebugEnabled())
Logging.connectors.debug("WEB: Decided not to ingest '"+documentIdentifier+"' because it did not match ingestability criteria");
