svn commit: r1894475 - in /manifoldcf/trunk/connectors/confluence-v6/connector/src: main/java/org/apache/manifoldcf/crawler/connectors/confluence/v6/ test/java/org/apache/manifoldcf/crawler/connectors/confluence/tests/

[jmssiera]

Author: jmssiera
Date: Fri Oct 22 12:51:06 2021
New Revision: 1894475

URL: http://svn.apache.org/viewvc?rev=1894475&view=rev
Log:
Fix CONNECTORS-1677

Modified:
    
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/v6/ConfluenceRepositoryConnector.java
    
manifoldcf/trunk/connectors/confluence-v6/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/confluence/tests/ConfluenceConnectorTest.java

Modified: 
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/v6/ConfluenceRepositoryConnector.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/confluence-v6/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/v6/ConfluenceRepositoryConnector.java?rev=1894475&r1=1894474&r2=1894475&view=diff
==============================================================================
--- 
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/v6/ConfluenceRepositoryConnector.java
 (original)
+++ 
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/v6/ConfluenceRepositoryConnector.java
 Fri Oct 22 12:51:06 2021
@@ -1187,14 +1187,6 @@ public class ConfluenceRepositoryConnect
   private ProcessResult processPageInternal(final boolean activeSecurity, 
final List<String> parentRestrictions, final Page page, final String 
manifoldDocumentIdentifier, final String version,
       final IProcessActivity activities, final boolean doLog, final 
Map<String, String> extraProperties) throws ManifoldCFException, 
ServiceInterruption, IOException {
 
-    /* Remove page if it has no content */
-    /*
-     * Page does not have content if there was an error trying to get the page
-     */
-    if (!page.hasContent()) {
-      activities.deleteDocument(manifoldDocumentIdentifier);
-      return new ProcessResult(page.getLength(), "DELETED", "");
-    }
     if (Logging.connectors != null && Logging.connectors.isDebugEnabled()) {
       Logging.connectors.debug("Confluence: This content exists: " + 
page.getId());
     }
@@ -1337,6 +1329,7 @@ public class ConfluenceRepositoryConnect
 
     rd.setBinary(page.getContentStream(), page.getLength());
     rd.addField("size", String.valueOf(page.getLength()));
+    rd.addField("url", documentURI);
 
     /* Ingest document */
     activities.ingestDocumentWithException(manifoldDocumentIdentifier, 
lastVersion, documentURI, rd);

Modified: 
manifoldcf/trunk/connectors/confluence-v6/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/confluence/tests/ConfluenceConnectorTest.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/confluence-v6/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/confluence/tests/ConfluenceConnectorTest.java?rev=1894475&r1=1894474&r2=1894475&view=diff
==============================================================================
--- 
manifoldcf/trunk/connectors/confluence-v6/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/confluence/tests/ConfluenceConnectorTest.java
 (original)
+++ 
manifoldcf/trunk/connectors/confluence-v6/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/confluence/tests/ConfluenceConnectorTest.java
 Fri Oct 22 12:51:06 2021
@@ -220,22 +220,5 @@ public class ConfluenceConnectorTest {
                verify(client, times(1)).getPage(id);
                verify(activities, times(1)).checkDocumentNeedsReindexing(id, 
version);
        }
-       
-       @Test
-       public void mockDeleteDocument() throws Exception{
-               Page fakePage = mock(Page.class);
-               when(fakePage.hasContent()).thenReturn(false);
-               String id = "A";
-               when(fakePage.hasContent()).thenReturn(false);
-               when(client.getPage(Mockito.anyString())).
-       thenReturn(fakePage);
-               
-               IExistingVersions statuses = mock(IExistingVersions.class);
-               IProcessActivity activities = mock(IProcessActivity.class);
-               connector.processDocuments(new String[]{id}, statuses, new 
Specification(), activities, 0, true);
-               verify(client, times(1)).getPage(id);
-               verify(activities, times(1)).deleteDocument(id);
-                               
-       }
                
 }