fix: Update lsd-distributed-generator to 5.0.0

BREAKING CHANGE: Breaking dependency update - lsd-core & lsd-distributed-connector
lsd-consulting · Jun 13, 2023 · 062fd8f · 062fd8f
1 parent fe80c68
commit 062fd8f
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 40 deletions.
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/service/build.gradle.kts b/service/build.gradle.kts
@@ -86,7 +86,7 @@ dependencies {
     }
 
     // LSD
-    implementation("io.github.lsd-consulting:lsd-distributed-generator:4.1.0")
+    implementation("io.github.lsd-consulting:lsd-distributed-generator:5.0.0")
 
     //////////////////////////////////
     // Unit test dependencies

diff --git a/...rc/componentTest/kotlin/com/lsdconsulting/generatorui/LsdDistributedGeneratorUiApiTest.kt b/...rc/componentTest/kotlin/com/lsdconsulting/generatorui/LsdDistributedGeneratorUiApiTest.kt
@@ -3,7 +3,7 @@ package com.lsdconsulting.generatorui
 import com.natpryce.hamkrest.assertion.assertThat
 import com.natpryce.hamkrest.containsSubstring
 import com.natpryce.hamkrest.equalTo
-import io.lsdconsulting.lsd.distributed.access.model.InterceptedInteraction
+import io.lsdconsulting.lsd.distributed.connector.model.InterceptedInteraction
 import org.jeasy.random.EasyRandom
 import org.jeasy.random.EasyRandomParameters
 import org.junit.jupiter.api.BeforeEach

diff --git a/...c/componentTest/kotlin/com/lsdconsulting/generatorui/LsdDistributedGeneratorUiApproval.kt b/...c/componentTest/kotlin/com/lsdconsulting/generatorui/LsdDistributedGeneratorUiApproval.kt
@@ -1,11 +1,11 @@
 package com.lsdconsulting.generatorui
 
 import com.lsd.core.IdGenerator
-import io.lsdconsulting.lsd.distributed.access.model.InteractionType
-import io.lsdconsulting.lsd.distributed.access.model.InteractionType.REQUEST
-import io.lsdconsulting.lsd.distributed.access.model.InteractionType.RESPONSE
-import io.lsdconsulting.lsd.distributed.access.model.InterceptedInteraction
-import io.lsdconsulting.lsd.distributed.access.repository.InterceptedDocumentRepository
+import io.lsdconsulting.lsd.distributed.connector.model.InteractionType
+import io.lsdconsulting.lsd.distributed.connector.model.InteractionType.REQUEST
+import io.lsdconsulting.lsd.distributed.connector.model.InteractionType.RESPONSE
+import io.lsdconsulting.lsd.distributed.connector.model.InterceptedInteraction
+import io.lsdconsulting.lsd.distributed.connector.repository.InterceptedDocumentRepository
 import org.approvaltests.Approvals
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test

diff --git a/.../generatorui/LsdDistributedGeneratorUiApproval.shouldReturnApprovedResponse.approved.html b/.../generatorui/LsdDistributedGeneratorUiApproval.shouldReturnApprovedResponse.approved.html
@@ -8,39 +8,41 @@
 <main role="main">
 
     <h1 class="logo">LSD</h1>
-    <h1>Event Report</h1><article id="1">
+    <h1>Event Report</h1><article id="3">
         <span class="articleStart"></span>
         <h2 class="success">Diagram for traceIds</h2>
         <aside class="facts">
-            <div class="factTable">
+            <div class="table">
                 <h3>Key Facts</h3>
-                <div class="factRow">
-                    <div class="factRowHead">Description</div>
-                    <div class="factRowHead">Value</div>
-                </div><div class="factRow">
-                    <div class="factCell">traceIds</div>
-                    <div class="factCell">someTraceId</div>
-                </div><div class="factRow">
-                    <div class="factCell">startTime</div>
-                    <div class="factCell">1970-01-01T00:00Z[UTC]</div>
-                </div><div class="factRow">
-                    <div class="factCell">finishTime</div>
-                    <div class="factCell">1970-01-01T00:00Z[UTC]</div>
+                <div class="row">
+                    <div class="rowHead">Description</div>
+                    <div class="rowHead">Value</div>
+                </div><div class="row">
+                    <div class="cell">traceIds</div>
+                    <div class="cell">someTraceId</div>
+                </div><div class="row">
+                    <div class="cell">startTime</div>
+                    <div class="cell">1970-01-01T00:00Z[UTC]</div>
+                </div><div class="row">
+                    <div class="cell">finishTime</div>
+                    <div class="cell">1970-01-01T00:00Z[UTC]</div>
                 </div>
             </div>
         </aside>
+
         <section class="sequence diagram svg success">
             <h3 class="success">Sequence Diagram</h3>
-            <figure><?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="254px" preserveAspectRatio="none" style="width:275px;height:254px;background:#FFFFFF;" version="1.1" viewBox="0 0 275 254" width="275px" zoomAndPan="magnify"><defs/><g><line style="stroke:#708090;stroke-width:1.0;stroke-dasharray:5.0,5.0;" x1="41" x2="41" y1="88.4883" y2="167.1094"/><line style="stroke:#708090;stroke-width:1.0;stroke-dasharray:5.0,5.0;" x1="234" x2="234" y1="88.4883" y2="167.1094"/><text fill="#8392A2" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="47" x="15" y="85.5352">Source</text><ellipse cx="41.5" cy="19.5" fill="#FFA500" rx="8" ry="8" style="stroke:#7D8590;stroke-width:1.5;"/><path d="M41.5,27.5 L41.5,54.5 M28.5,35.5 L54.5,35.5 M41.5,54.5 L28.5,69.5 M41.5,54.5 L54.5,69.5 " fill="none" style="stroke:#7D8590;stroke-width:1.5;"/><text fill="#8392A2" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="47" x="15" y="179.6445">Source</text><ellipse cx="41.5" cy="192.0977" fill="#FFA500" rx="8" ry="8" style="stroke:#7D8590;stroke-width:1.5;"/><path d="M41.5,200.0977 L41.5,227.0977 M28.5,208.0977 L54.5,208.0977 M41.5,227.0977 L28.5,242.0977 M41.5,227.0977 L54.5,242.0977 " fill="none" style="stroke:#7D8590;stroke-width:1.5;"/><rect fill="#B0E0E6" height="30.4883" rx="2.5" ry="2.5" style="stroke:#7D8590;stroke-width:1.5;" width="59" x="205" y="57"/><text fill="#8392A2" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="212" y="77.5352">Target</text><rect fill="#B0E0E6" height="30.4883" rx="2.5" ry="2.5" style="stroke:#7D8590;stroke-width:1.5;" width="59" x="205" y="166.1094"/><text fill="#8392A2" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="212" y="186.6445">Target</text><polygon fill="#7D8590" points="222.5,115.7988,232.5,119.7988,222.5,123.7988,226.5,119.7988" style="stroke:#7D8590;stroke-width:1.0;"/><line style="stroke:#7D8590;stroke-width:1.5;" x1="41.5" x2="228.5" y1="119.7988" y2="119.7988"/><a href="#1" target="_top" title="GET /path" xlink:actuate="onRequest" xlink:href="#1" xlink:show="new" xlink:title="GET /path" xlink:type="simple"><text fill="#656D76" font-family="sans-serif" font-size="13" lengthAdjust="spacing" text-decoration="underline" textLength="63" x="48.5" y="115.0566">GET /path</text></a><polygon fill="#7D8590" points="52.5,145.1094,42.5,149.1094,52.5,153.1094,48.5,149.1094" style="stroke:#7D8590;stroke-width:1.0;"/><line style="stroke:#7D8590;stroke-width:1.5;stroke-dasharray:2.0,2.0;" x1="46.5" x2="233.5" y1="149.1094" y2="149.1094"/><a href="#2" target="_top" title="sync 200 response (25 ms)" xlink:actuate="onRequest" xlink:href="#2" xlink:show="new" xlink:title="sync 200 response (25 ms)" xlink:type="simple"><text fill="#656D76" font-family="sans-serif" font-size="13" lengthAdjust="spacing" text-decoration="underline" textLength="169" x="58.5" y="144.3672">sync 200 response (25 ms)</text></a></g></svg></figure>
-            <div onclick="location.href='#!';" id="2" class="overlay">
+            <figure><?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="254px" preserveAspectRatio="none" style="width:275px;height:254px;background:#FFFFFF;" version="1.1" viewBox="0 0 275 254" width="275px" zoomAndPan="magnify"><defs/><g><line style="stroke:#708090;stroke-width:1.0;stroke-dasharray:5.0,5.0;" x1="41" x2="41" y1="88.4883" y2="167.1094"/><line style="stroke:#708090;stroke-width:1.0;stroke-dasharray:5.0,5.0;" x1="234" x2="234" y1="88.4883" y2="167.1094"/><text fill="#8392A2" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="47" x="15" y="85.5352">Source</text><ellipse cx="41.5" cy="19.5" fill="#FFA500" rx="8" ry="8" style="stroke:#7D8590;stroke-width:1.5;"/><path d="M41.5,27.5 L41.5,54.5 M28.5,35.5 L54.5,35.5 M41.5,54.5 L28.5,69.5 M41.5,54.5 L54.5,69.5 " fill="none" style="stroke:#7D8590;stroke-width:1.5;"/><text fill="#8392A2" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="47" x="15" y="179.6445">Source</text><ellipse cx="41.5" cy="192.0977" fill="#FFA500" rx="8" ry="8" style="stroke:#7D8590;stroke-width:1.5;"/><path d="M41.5,200.0977 L41.5,227.0977 M28.5,208.0977 L54.5,208.0977 M41.5,227.0977 L28.5,242.0977 M41.5,227.0977 L54.5,242.0977 " fill="none" style="stroke:#7D8590;stroke-width:1.5;"/><rect fill="#B0E0E6" height="30.4883" rx="2.5" ry="2.5" style="stroke:#7D8590;stroke-width:1.5;" width="59" x="205" y="57"/><text fill="#8392A2" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="212" y="77.5352">Target</text><rect fill="#B0E0E6" height="30.4883" rx="2.5" ry="2.5" style="stroke:#7D8590;stroke-width:1.5;" width="59" x="205" y="166.1094"/><text fill="#8392A2" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="212" y="186.6445">Target</text><polygon fill="#7D8590" points="222.5,115.7988,232.5,119.7988,222.5,123.7988,226.5,119.7988" style="stroke:#7D8590;stroke-width:1.0;"/><line style="stroke:#7D8590;stroke-width:1.5;" x1="41.5" x2="228.5" y1="119.7988" y2="119.7988"/><a href="#1" target="_self" title="GET /path" xlink:actuate="onRequest" xlink:href="#1" xlink:show="new" xlink:title="GET /path" xlink:type="simple"><text fill="#656D76" font-family="sans-serif" font-size="13" lengthAdjust="spacing" text-decoration="underline" textLength="63" x="48.5" y="115.0566">GET /path</text></a><polygon fill="#7D8590" points="52.5,145.1094,42.5,149.1094,52.5,153.1094,48.5,149.1094" style="stroke:#7D8590;stroke-width:1.0;"/><line style="stroke:#7D8590;stroke-width:1.5;stroke-dasharray:2.0,2.0;" x1="46.5" x2="233.5" y1="149.1094" y2="149.1094"/><a href="#2" target="_self" title="sync 200 response (25 ms)" xlink:actuate="onRequest" xlink:href="#2" xlink:show="new" xlink:title="sync 200 response (25 ms)" xlink:type="simple"><text fill="#656D76" font-family="sans-serif" font-size="13" lengthAdjust="spacing" text-decoration="underline" textLength="169" x="58.5" y="144.3672">sync 200 response (25 ms)</text></a></g></svg></figure>
+            <div onclick="location.href='#!';" id="1" class="overlay">
                 <div class="popup" onclick="event.stopPropagation();">
                     <h2>PlantUml markup</h2>
-                    <span class="copy" title="copy" onclick="copyToClipboard('sequence_uml_code2')"></span>
+                    <span class="copy" title="copy" onclick="copyToClipboard('sequence_uml_code1')"></span>
                     <a class="close" href="#!">&times;</a>
                     <div class="content">
-                        <pre><code id="sequence_uml_code2">@startuml
+                        <pre><code id="sequence_uml_code1">@startuml
 
 !theme lsd-light from https://cdn.jsdelivr.net/gh/lsd-consulting/lsd-core@5/src/main/resources/static/
+skinparam svgLinkTarget _self
 
 hide unlinked
 
@@ -62,28 +64,28 @@ <h2>PlantUml markup</h2>
                     </div>
                 </div>
             </div>
-            <sub><a href="#2">[source]</a></sub>
-            <sub><a href="#3">[component diagram]</a></sub>
+            <sub><a href="#1">[source]</a></sub>
+            <sub><a href="#2">[component diagram]</a></sub>
         </section>
         <!-- Popup for component diagram -->
-        <div onclick="location.href='#!';" id="3" class="overlay">
+        <div onclick="location.href='#!';" id="2" class="overlay">
             <div class="popup" onclick="event.stopPropagation();">
                 <h2>Component Diagram</h2>
                 <a class="close" href="#!">&times;</a>
                 <div class="content">
                     <pre><?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="184px" preserveAspectRatio="none" style="width:103px;height:184px;" version="1.1" viewBox="0 0 103 184" width="103px" zoomAndPan="magnify"><defs/><g><!--entity Source--><g id="elem_Source"><ellipse cx="54" cy="26" fill="#FFA500" rx="8" ry="8" style="stroke:#000000;stroke-width:1.0;"/><path d="M54,34 L54,61 M41,42 L67,42 M54,61 L41,76 M54,61 L67,76 " fill="none" style="stroke:#000000;stroke-width:1.0;"/><text fill="#000000" font-family="Verdana" font-size="14" lengthAdjust="spacing" textLength="48" x="30" y="92.0752">Source</text></g><!--entity Target--><g id="elem_Target"><rect fill="#B0E0E6" height="47.0146" rx="2.5" ry="2.5" style="stroke:#000000;stroke-width:1.0;" width="86" x="11" y="131"/><rect fill="#B0E0E6" height="10" style="stroke:#000000;stroke-width:1.0;" width="15" x="77" y="136"/><rect fill="#B0E0E6" height="2" style="stroke:#000000;stroke-width:1.0;" width="4" x="75" y="138"/><rect fill="#B0E0E6" height="2" style="stroke:#000000;stroke-width:1.0;" width="4" x="75" y="142"/><text fill="#000000" font-family="Verdana" font-size="14" lengthAdjust="spacing" textLength="46" x="26" y="165.0752">Target</text></g><path d="M54,95.1394 C54,107.2563 54,120.264 54,130.9169 " fill="none" style="stroke:#000000;stroke-width:1.0;"/><polygon fill="#000000" points="54,130.9169,58,121.9169,54,125.9169,50,121.9169,54,130.9169" style="stroke:#000000;stroke-width:1.0;"/></g></svg></pre>
                 </div>
-                <sub><a href="#uml3">[source]</a></sub>
+                <sub><a href="#uml2">[source]</a></sub>
             </div>
         </div>
         <!-- Popup for component diagram UML via component diagram popup -->
-        <div onclick="location.href='#!';" id="uml3" class="overlay">
+        <div onclick="location.href='#!';" id="uml2" class="overlay">
             <div class="popup" onclick="event.stopPropagation();">
                 <h2>PlantUml markup</h2>
-                <span class="copy" title="copy" onclick="copyToClipboard('component_uml_code3')"></span>
-                <a class="close" href="#3">&times;</a><!--show previous popup on close-->
+                <span class="copy" title="copy" onclick="copyToClipboard('component_uml_code2')"></span>
+                <a class="close" href="#2">&times;</a><!--show previous popup on close-->
                 <div class="content">
-                    <pre><code id="component_uml_code3">@startuml
+                    <pre><code id="component_uml_code2">@startuml
 !pragma layout smetana
 !theme plain
 skinparam backgroundColor transparent
@@ -142,7 +144,7 @@ <h2>sync 200 response (25 ms)</h2>
     <script>hljs.highlightAll();</script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/mark.js/8.11.1/mark.min.js"></script>
     <script>
-        highlightKeywords();highlightFact("1", "someTraceId");highlightFact("1", "1970-01-01T00:00Z[UTC]");highlightFact("1", "1970-01-01T00:00Z[UTC]");
+        highlightKeywords();highlightFact("3", "someTraceId");highlightFact("3", "1970-01-01T00:00Z[UTC]");highlightFact("3", "1970-01-01T00:00Z[UTC]");
         unMarkSvg();
     </script>
 </footer>

diff --git a/service/src/main/kotlin/com/lsdconsulting/generatorui/controller/LsdController.kt b/service/src/main/kotlin/com/lsdconsulting/generatorui/controller/LsdController.kt
@@ -3,7 +3,7 @@ package com.lsdconsulting.generatorui.controller
 import com.lsdconsulting.generatorui.config.logger.log
 import com.lsdconsulting.generatorui.service.LsdGenerator
 import com.lsdconsulting.generatorui.service.LsdService
-import io.lsdconsulting.lsd.distributed.access.model.InterceptedInteraction
+import io.lsdconsulting.lsd.distributed.connector.model.InterceptedInteraction
 import io.lsdconsulting.stub.annotation.GenerateWireMockStub
 import org.springframework.http.MediaType.*
 import org.springframework.http.ResponseEntity

diff --git a/service/src/main/kotlin/com/lsdconsulting/generatorui/service/LsdService.kt b/service/src/main/kotlin/com/lsdconsulting/generatorui/service/LsdService.kt
@@ -1,9 +1,9 @@
 package com.lsdconsulting.generatorui.service
 
 import com.lsdconsulting.generatorui.controller.InterceptedFlowResponse
-import io.lsdconsulting.lsd.distributed.access.model.InterceptedInteraction
-import io.lsdconsulting.lsd.distributed.access.repository.InterceptedDocumentAdminRepository
-import io.lsdconsulting.lsd.distributed.access.repository.InterceptedDocumentRepository
+import io.lsdconsulting.lsd.distributed.connector.model.InterceptedInteraction
+import io.lsdconsulting.lsd.distributed.connector.repository.InterceptedDocumentAdminRepository
+import io.lsdconsulting.lsd.distributed.connector.repository.InterceptedDocumentRepository
 import org.springframework.stereotype.Service
 import java.time.temporal.ChronoUnit
 

diff --git a/service/src/test/kotlin/com/lsdconsulting/generatorui/controller/LsdControllerShould.kt b/service/src/test/kotlin/com/lsdconsulting/generatorui/controller/LsdControllerShould.kt
@@ -4,7 +4,7 @@ import com.lsdconsulting.generatorui.service.LsdGenerator
 import com.lsdconsulting.generatorui.service.LsdService
 import com.natpryce.hamkrest.assertion.assertThat
 import com.natpryce.hamkrest.equalTo
-import io.lsdconsulting.lsd.distributed.access.model.InterceptedInteraction
+import io.lsdconsulting.lsd.distributed.connector.model.InterceptedInteraction
 import io.mockk.every
 import io.mockk.mockk
 import io.mockk.verify