fix(trs): consume RefImpl and Jazz TRS feeds

trs/client/trs-client/pom.xml

@@ -127,6 +127,31 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
+      <version>4.13.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter</artifactId>
+      <version>5.10.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.vintage</groupId>
+      <artifactId>junit-vintage-engine</artifactId>
+      <version>5.10.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-junit-jupiter</artifactId>
+      <version>5.11.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mock-server</groupId>
+      <artifactId>mockserver-junit-jupiter</artifactId>
+      <version>5.15.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>

trs/client/trs-client/src/main/java/org/eclipse/lyo/trs/client/handlers/ConcurrentTrsProviderHandler.java

@@ -120,7 +120,7 @@ public boolean fetchRemoteChangeLogs(ChangeLog currentChangeLog, List<ChangeLog>
     private void pollAndProcessChanges() {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
         Date processingDateStart = new Date();
-        log.info("started dealing with TRS Provider: " + trsUriBase);
+        log.debug("started dealing with TRS Provider: " + trsUriBase);
 
         TrackedResourceSet updatedTrs = trsClient.extractRemoteTrs(trsUriBase);
         boolean indexingStage = false;

trs/client/trs-client/src/main/java/org/eclipse/lyo/trs/client/handlers/TrsProviderHandler.java

@@ -80,8 +80,14 @@ public void update() {
         } catch (Exception e) {
             // FIXME Andrew@2019-07-15: can get stuck in the loop
             log.warn("Force rebase");
+            log.debug("Force rebase exception: {}", e);
             lastProcessedChangeEventUri = null;
-            handler.rebase();
+            try {
+                handler.rebase();
+            } catch (Exception rebaseException) {
+                log.error("Error during rebase", rebaseException);
+                throw new RuntimeException("Failed to update TRS", e);
+            }
         }
     }
 
@@ -116,7 +122,7 @@ private void processChangeEvent(ChangeEvent changeEvent) {
      */
     private void pollAndProcessChanges() {
 
-        log.info("started dealing with TRS Provider: " + trsUriBase);
+        log.debug("started dealing with TRS Provider: " + trsUriBase);
 
         TrackedResourceSet updatedTrs = trsClient.extractRemoteTrs(trsUriBase);
         boolean indexingStage = false;
@@ -272,11 +278,18 @@ private boolean fetchRemoteChangeLogs(ChangeLog currentChangeLog, List<ChangeLog
                     break;
                 }
                 previousChangeLog = currentChangeLog.getPrevious();
+                if (ProviderUtil.isNilUri(lastProcessedChangeEventUri) && ProviderUtil.isNilUri(previousChangeLog)) {
+                    foundChangeEvent = true;
+                    break;
+                }
+                if (previousChangeLog == null) {
+                    break;
+                }
                 currentChangeLog = trsClient.fetchRemoteChangeLog(previousChangeLog);
             } else {
                 break;
             }
-        } while (!RDF.nil.getURI().equals(previousChangeLog.toString()));
+        } while (previousChangeLog != null && !RDF.nil.getURI().equals(previousChangeLog.toString()));
         return foundChangeEvent;
     }
 

trs/client/trs-client/src/test/java/org/eclipse/lyo/trs/client/handlers/ConcurrentTrsProviderHandlerTest.java

@@ -0,0 +1,74 @@
+package org.eclipse.lyo.trs.client.handlers;
+
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.List;
+import org.apache.jena.sys.JenaSystem;
+import org.apache.jena.vocabulary.RDF;
+import org.eclipse.lyo.core.trs.ChangeLog;
+import org.eclipse.lyo.trs.client.util.ITrackedResourceClient;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@ExtendWith(MockitoExtension.class)
+public class ConcurrentTrsProviderHandlerTest {
+
+    @Mock
+    private ITrackedResourceClient trsClient;
+    @Mock
+    private IProviderEventHandler handler;
+
+    @BeforeAll
+    public static void initJena() {
+        JenaSystem.init();
+    }
+
+    @Test
+    public void testFetchRemoteChangeLogs_HitNil_Found() {
+        URI trsUri = URI.create("http://example.com/trs");
+        ConcurrentTrsProviderHandler provider = new ConcurrentTrsProviderHandler(trsUri, trsClient, handler);
+
+        try {
+            java.lang.reflect.Field field = ConcurrentTrsProviderHandler.class.getDeclaredField("lastProcessedChangeEventUri");
+            field.setAccessible(true);
+            field.set(provider, URI.create(RDF.nil.getURI()));
+        } catch (Exception e) {
+            Assertions.fail("Failed to set private field", e);
+        }
+
+        ChangeLog currentLog = new ChangeLog();
+        currentLog.setPrevious(URI.create(RDF.nil.getURI()));
+
+        List<ChangeLog> changeLogs = new ArrayList<>();
+        boolean found = provider.fetchRemoteChangeLogs(currentLog, changeLogs);
+
+        Assertions.assertTrue(found, "Should find sync event when hitting nil and last processed is nil");
+        Assertions.assertEquals(1, changeLogs.size());
+    }
+
+    @Test
+    public void testFetchRemoteChangeLogs_HitNil_NotFound() {
+        URI trsUri = URI.create("http://example.com/trs");
+        ConcurrentTrsProviderHandler provider = new ConcurrentTrsProviderHandler(trsUri, trsClient, handler);
+
+        try {
+            java.lang.reflect.Field field = ConcurrentTrsProviderHandler.class.getDeclaredField("lastProcessedChangeEventUri");
+            field.setAccessible(true);
+            field.set(provider, URI.create("http://example.com/event/1"));
+        } catch (Exception e) {
+            Assertions.fail("Failed to set private field", e);
+        }
+
+        ChangeLog currentLog = new ChangeLog();
+        currentLog.setPrevious(URI.create(RDF.nil.getURI()));
+
+        List<ChangeLog> changeLogs = new ArrayList<>();
+        boolean found = provider.fetchRemoteChangeLogs(currentLog, changeLogs);
+
+        Assertions.assertFalse(found, "Should NOT find sync event if we hit nil but were looking for specific event");
+    }
+}