refactor

2024-08-09 11:08:04 +02:00
parent 5ae29966cd
commit 88f64189a2
19 changed files with 435 additions and 294 deletions
--- a/Processes/xml/Xml.process
+++ b/Processes/xml/Xml.process
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <pd:ProcessDefinition xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:pd="http://xmlns.tibco.com/bw/process/2003" xmlns:ns="http://www.tibco.com/pe/WriteToLogActivitySchema" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns2="http://www.demo.com/author">
    <xsd:import namespace="http://www.demo.com/author" schemaLocation="/Resources/WSDL/WSDL.wsdl"/>
-    <pd:name>Processes/xml/xml.process</pd:name>
+    <pd:name>Processes/xml/Xml.process</pd:name>
    <pd:startName>Start</pd:startName>
    <pd:startType>
        <xsd:element name="root">
@@ -13,13 +13,13 @@
            </xsd:complexType>
        </xsd:element>
    </pd:startType>
-    <pd:startX>67</pd:startX>
-    <pd:startY>77</pd:startY>
+    <pd:startX>86</pd:startX>
+    <pd:startY>180</pd:startY>
    <pd:returnBindings>
        <root>
-            <xsl:copy-of select="$XmlGET_DELETE/root/ns2:author"/>
+            <xsl:copy-of select="$XmlGetDelete/root/ns2:author"/>
            <status>
-                <xsl:value-of select="if (boolean($XmlPOST_PUT/root/status)) then $XmlPOST_PUT/root/status else $XmlGET_DELETE/root/status"/>
+                <xsl:value-of select="if (boolean($XmlPostPut/root/status)) then $XmlPostPut/root/status else $XmlGetDelete/root/status"/>
            </status>
        </root>
    </pd:returnBindings>
@@ -34,16 +34,16 @@
            </xsd:complexType>
        </xsd:element>
    </pd:endType>
-    <pd:endX>732</pd:endX>
-    <pd:endY>85</pd:endY>
+    <pd:endX>758</pd:endX>
+    <pd:endY>180</pd:endY>
    <pd:errorSchemas/>
    <pd:processVariables/>
    <pd:targetNamespace>http://xmlns.example.com/1719484154608</pd:targetNamespace>
-    <pd:activity name="XmlPOST_PUT">
+    <pd:activity name="XmlPostPut">
        <pd:type>com.tibco.pe.core.CallProcessActivity</pd:type>
        <pd:resourceType>ae.process.subprocess</pd:resourceType>
-        <pd:x>545</pd:x>
-        <pd:y>41</pd:y>
+        <pd:x>530</pd:x>
+        <pd:y>180</pd:y>
        <config>
            <processName>/Processes/xml/author/XmlPOST.process</processName>
            <processNameXPath>concat('/Processes/xml/author/Xml',$Start/root/method ,'.process')</processNameXPath>
@@ -76,8 +76,8 @@
    <pd:activity name="Map Data">
        <pd:type>com.tibco.plugin.mapper.MapperActivity</pd:type>
        <pd:resourceType>ae.activities.MapperActivity</pd:resourceType>
-        <pd:x>267</pd:x>
-        <pd:y>73</pd:y>
+        <pd:x>318</pd:x>
+        <pd:y>180</pd:y>
        <config>
            <element>
                <xsd:element name="root">
@@ -120,8 +120,8 @@
    <pd:activity name="Log">
        <pd:type>com.tibco.pe.core.WriteToLogActivity</pd:type>
        <pd:resourceType>ae.activities.log</pd:resourceType>
-        <pd:x>156</pd:x>
-        <pd:y>73</pd:y>
+        <pd:x>178</pd:x>
+        <pd:y>180</pd:y>
        <config>
            <role>User</role>
        </config>
@@ -133,11 +133,11 @@
            </ns:ActivityInput>
        </pd:inputBindings>
    </pd:activity>
-    <pd:activity name="XmlGET_DELETE">
+    <pd:activity name="XmlGetDelete">
        <pd:type>com.tibco.pe.core.CallProcessActivity</pd:type>
        <pd:resourceType>ae.process.subprocess</pd:resourceType>
-        <pd:x>539</pd:x>
-        <pd:y>147</pd:y>
+        <pd:x>527</pd:x>
+        <pd:y>343</pd:y>
        <config>
            <processName>/Processes/xml/author/XmlGET.process</processName>
            <processNameXPath>concat('/Processes/xml/author/Xml',$Start/root/method ,'.process')</processNameXPath>
@@ -151,7 +151,7 @@
        </pd:inputBindings>
    </pd:activity>
    <pd:transition>
-        <pd:from>XmlPOST_PUT</pd:from>
+        <pd:from>XmlPostPut</pd:from>
        <pd:to>End</pd:to>
        <pd:lineType>Default</pd:lineType>
        <pd:lineColor>-16777216</pd:lineColor>
@@ -159,8 +159,8 @@
    </pd:transition>
    <pd:transition>
        <pd:from>Map Data</pd:from>
-        <pd:to>XmlPOST_PUT</pd:to>
-        <pd:xpathDescription>post or put</pd:xpathDescription>
+        <pd:to>XmlPostPut</pd:to>
+        <pd:xpathDescription>postOrPut</pd:xpathDescription>
        <pd:lineType>Default</pd:lineType>
        <pd:lineColor>-16777216</pd:lineColor>
        <pd:conditionType>xpath</pd:conditionType>
@@ -182,15 +182,15 @@
    </pd:transition>
    <pd:transition>
        <pd:from>Map Data</pd:from>
-        <pd:to>XmlGET_DELETE</pd:to>
-        <pd:xpathDescription>get or delete</pd:xpathDescription>
+        <pd:to>XmlGetDelete</pd:to>
+        <pd:xpathDescription>getOrDelete</pd:xpathDescription>
        <pd:lineType>Default</pd:lineType>
        <pd:lineColor>-16777216</pd:lineColor>
        <pd:conditionType>xpath</pd:conditionType>
        <pd:xpath>$Start/root/method = 'DELETE' or $Start/root/method = 'GET'</pd:xpath>
    </pd:transition>
    <pd:transition>
-        <pd:from>XmlGET_DELETE</pd:from>
+        <pd:from>XmlGetDelete</pd:from>
        <pd:to>End</pd:to>
        <pd:lineType>Default</pd:lineType>
        <pd:lineColor>-16777216</pd:lineColor>
--- a/Processes/xml/author/XmlDELETE.process
+++ b/Processes/xml/author/XmlDELETE.process
@@ -14,8 +14,8 @@
            </xsd:complexType>
        </xsd:element>
    </pd:startType>
-    <pd:startX>149</pd:startX>
-    <pd:startY>258</pd:startY>
+    <pd:startX>184</pd:startX>
+    <pd:startY>205</pd:startY>
    <pd:returnBindings>
        <root>
            <status>
@@ -34,8 +34,8 @@
            </xsd:complexType>
        </xsd:element>
    </pd:endType>
-    <pd:endX>1010</pd:endX>
-    <pd:endY>262</pd:endY>
+    <pd:endX>1072</pd:endX>
+    <pd:endY>205</pd:endY>
    <pd:errorSchemas>
        <DeleteError wsMsgRef="pfx3:ErrorMessage"/>
    </pd:errorSchemas>
@@ -44,8 +44,8 @@
    <pd:activity name="Read File">
        <pd:type>com.tibco.plugin.file.FileReadActivity</pd:type>
        <pd:resourceType>ae.activities.FileReadActivity</pd:resourceType>
-        <pd:x>301</pd:x>
-        <pd:y>257</pd:y>
+        <pd:x>373</pd:x>
+        <pd:y>205</pd:y>
        <config>
            <encoding>text</encoding>
        </config>
@@ -60,8 +60,8 @@
    <pd:activity name="Parse XML">
        <pd:type>com.tibco.plugin.xml.XMLParseActivity</pd:type>
        <pd:resourceType>ae.activities.XMLParseActivity</pd:resourceType>
-        <pd:x>461</pd:x>
-        <pd:y>259</pd:y>
+        <pd:x>514</pd:x>
+        <pd:y>205</pd:y>
        <config>
            <inputStyle>text</inputStyle>
            <xsdVersion>default</xsdVersion>
@@ -74,11 +74,11 @@
            </xmlString>
        </pd:inputBindings>
    </pd:activity>
-    <pd:activity name="remove author with given id">
+    <pd:activity name="Remove Author By Id">
        <pd:type>com.tibco.plugin.mapper.MapperActivity</pd:type>
        <pd:resourceType>ae.activities.MapperActivity</pd:resourceType>
-        <pd:x>616</pd:x>
-        <pd:y>266</pd:y>
+        <pd:x>680</pd:x>
+        <pd:y>213</pd:y>
        <config>
            <element ref="pfx:authors"/>
        </config>
@@ -91,22 +91,22 @@
    <pd:activity name="Render XML">
        <pd:type>com.tibco.plugin.xml.XMLRendererActivity</pd:type>
        <pd:resourceType>ae.activities.XMLRendererActivity</pd:resourceType>
-        <pd:x>777</pd:x>
-        <pd:y>258</pd:y>
+        <pd:x>821</pd:x>
+        <pd:y>205</pd:y>
        <config>
            <renderAsText>text</renderAsText>
            <validateInput>false</validateInput>
            <term ref="pfx:authors"/>
        </config>
        <pd:inputBindings>
-            <xsl:copy-of select="$remove-author-with-given-id/pfx:authors"/>
+            <xsl:copy-of select="$Remove-Author-By-Id/pfx:authors"/>
        </pd:inputBindings>
    </pd:activity>
    <pd:activity name="Write File">
        <pd:type>com.tibco.plugin.file.FileWriteActivity</pd:type>
        <pd:resourceType>ae.activities.FileWriteActivity</pd:resourceType>
-        <pd:x>893</pd:x>
-        <pd:y>260</pd:y>
+        <pd:x>959</pd:x>
+        <pd:y>205</pd:y>
        <config>
            <encoding>text</encoding>
            <compressFile>None</compressFile>
@@ -125,8 +125,8 @@
    <pd:activity name="Generate Error">
        <pd:type>com.tibco.pe.core.GenerateErrorActivity</pd:type>
        <pd:resourceType>ae.activities.throw</pd:resourceType>
-        <pd:x>460</pd:x>
-        <pd:y>88</pd:y>
+        <pd:x>515</pd:x>
+        <pd:y>390</pd:y>
        <config>
            <faultName>DeleteError</faultName>
        </config>
@@ -160,13 +160,13 @@
    </pd:transition>
    <pd:transition>
        <pd:from>Parse XML</pd:from>
-        <pd:to>remove author with given id</pd:to>
+        <pd:to>Remove Author By Id</pd:to>
        <pd:lineType>Default</pd:lineType>
        <pd:lineColor>-16777216</pd:lineColor>
        <pd:conditionType>otherwise</pd:conditionType>
    </pd:transition>
    <pd:transition>
-        <pd:from>remove author with given id</pd:from>
+        <pd:from>Remove Author By Id</pd:from>
        <pd:to>Render XML</pd:to>
        <pd:lineType>Default</pd:lineType>
        <pd:lineColor>-16777216</pd:lineColor>
--- a/Processes/xml/author/XmlGET.process
+++ b/Processes/xml/author/XmlGET.process
@@ -17,7 +17,7 @@
    <pd:startY>76</pd:startY>
    <pd:returnBindings>
        <root>
-            <xsl:copy-of select="$get-author-by-id/pfx2:authors/pfx2:author"/>
+            <xsl:copy-of select="$Get-Author-By-Id/pfx2:authors/pfx2:author"/>
            <status>
                <xsl:value-of select="'author received'"/>
            </status>
@@ -74,7 +74,7 @@
            </pfx:ReadActivityInputClass>
        </pd:inputBindings>
    </pd:activity>
-    <pd:activity name="get author by id">
+    <pd:activity name="Get Author By Id">
        <pd:type>com.tibco.plugin.mapper.MapperActivity</pd:type>
        <pd:resourceType>ae.activities.MapperActivity</pd:resourceType>
        <pd:x>706</pd:x>
@@ -112,7 +112,7 @@
    </pd:activity>
    <pd:transition>
        <pd:from>Parse XML</pd:from>
-        <pd:to>get author by id</pd:to>
+        <pd:to>Get Author By Id</pd:to>
        <pd:lineType>Default</pd:lineType>
        <pd:lineColor>-16777216</pd:lineColor>
        <pd:conditionType>always</pd:conditionType>
@@ -132,16 +132,16 @@
        <pd:conditionType>always</pd:conditionType>
    </pd:transition>
    <pd:transition>
-        <pd:from>get author by id</pd:from>
+        <pd:from>Get Author By Id</pd:from>
        <pd:to>Generate Error</pd:to>
        <pd:xpathDescription>author does not exist</pd:xpathDescription>
        <pd:lineType>Default</pd:lineType>
        <pd:lineColor>-16777216</pd:lineColor>
        <pd:conditionType>xpath</pd:conditionType>
-        <pd:xpath>not(boolean($get-author-by-id/pfx2:authors/pfx2:author[@id=$Start/root/id ] ))</pd:xpath>
+        <pd:xpath>not(boolean($Get-Author-By-Id/pfx2:authors/pfx2:author[@id=$Start/root/id ] ))</pd:xpath>
    </pd:transition>
    <pd:transition>
-        <pd:from>get author by id</pd:from>
+        <pd:from>Get Author By Id</pd:from>
        <pd:to>End</pd:to>
        <pd:lineType>Default</pd:lineType>
        <pd:lineColor>-16777216</pd:lineColor>
--- a/Processes/xml/author/XmlPOST.process
+++ b/Processes/xml/author/XmlPOST.process
@@ -73,7 +73,7 @@
            </xmlString>
        </pd:inputBindings>
    </pd:activity>
-    <pd:activity name="add author">
+    <pd:activity name="Add Author">
        <pd:type>com.tibco.plugin.mapper.MapperActivity</pd:type>
        <pd:resourceType>ae.activities.MapperActivity</pd:resourceType>
        <pd:x>509</pd:x>
@@ -99,7 +99,7 @@
            <term ref="pfx:authors"/>
        </config>
        <pd:inputBindings>
-            <xsl:copy-of select="$add-author/pfx:authors"/>
+            <xsl:copy-of select="$Add-Author/pfx:authors"/>
        </pd:inputBindings>
    </pd:activity>
    <pd:activity name="Write File">
@@ -122,11 +122,11 @@
            </ns:WriteActivityInputTextClass>
        </pd:inputBindings>
    </pd:activity>
-    <pd:activity name="Render-XML-1">
+    <pd:activity name="Add Authors Template">
        <pd:type>com.tibco.plugin.xml.XMLRendererActivity</pd:type>
        <pd:resourceType>ae.activities.XMLRendererActivity</pd:resourceType>
-        <pd:x>193</pd:x>
-        <pd:y>339</pd:y>
+        <pd:x>192</pd:x>
+        <pd:y>348</pd:y>
        <config>
            <renderAsText>text</renderAsText>
            <validateInput>false</validateInput>
@@ -134,7 +134,7 @@
        </config>
        <pd:inputBindings/>
    </pd:activity>
-    <pd:activity name="Write-File-1">
+    <pd:activity name="InitializeFile">
        <pd:type>com.tibco.plugin.file.FileWriteActivity</pd:type>
        <pd:resourceType>ae.activities.FileWriteActivity</pd:resourceType>
        <pd:x>508</pd:x>
@@ -149,7 +149,7 @@
                    <xsl:value-of select="'/tibco/designer/5.12/projects/tibcoRepository/Resources/databases/databaseXML.xml'"/>
                </fileName>
                <textContent>
-                    <xsl:value-of select="$Render-XML-1/xmlString"/>
+                    <xsl:value-of select="$Add-Authors-Template/xmlString"/>
                </textContent>
            </ns:WriteActivityInputTextClass>
        </pd:inputBindings>
@@ -186,7 +186,7 @@
    <pd:transition>
        <pd:from>Read File</pd:from>
        <pd:to>Parse XML</pd:to>
-        <pd:xpathDescription>file not empty</pd:xpathDescription>
+        <pd:xpathDescription>fileNotEmpty</pd:xpathDescription>
        <pd:lineType>Default</pd:lineType>
        <pd:lineColor>-16777216</pd:lineColor>
        <pd:conditionType>xpath</pd:conditionType>
@@ -194,13 +194,13 @@
    </pd:transition>
    <pd:transition>
        <pd:from>Parse XML</pd:from>
-        <pd:to>add author</pd:to>
+        <pd:to>Add Author</pd:to>
        <pd:lineType>Default</pd:lineType>
        <pd:lineColor>-16777216</pd:lineColor>
        <pd:conditionType>otherwise</pd:conditionType>
    </pd:transition>
    <pd:transition>
-        <pd:from>add author</pd:from>
+        <pd:from>Add Author</pd:from>
        <pd:to>Render XML</pd:to>
        <pd:lineType>Default</pd:lineType>
        <pd:lineColor>-16777216</pd:lineColor>
@@ -222,21 +222,21 @@
    </pd:transition>
    <pd:transition>
        <pd:from>Read File</pd:from>
-        <pd:to>Render-XML-1</pd:to>
+        <pd:to>Add Authors Template</pd:to>
        <pd:lineType>Default</pd:lineType>
        <pd:lineColor>-16777216</pd:lineColor>
        <pd:conditionType>otherwise</pd:conditionType>
    </pd:transition>
    <pd:transition>
-        <pd:from>Render-XML-1</pd:from>
-        <pd:to>Write-File-1</pd:to>
+        <pd:from>Add Authors Template</pd:from>
+        <pd:to>InitializeFile</pd:to>
        <pd:lineType>Default</pd:lineType>
        <pd:lineColor>-16777216</pd:lineColor>
        <pd:conditionType>always</pd:conditionType>
    </pd:transition>
    <pd:transition>
-        <pd:from>Write-File-1</pd:from>
-        <pd:to>add author</pd:to>
+        <pd:from>InitializeFile</pd:from>
+        <pd:to>Add Author</pd:to>
        <pd:lineType>Default</pd:lineType>
        <pd:lineColor>-16777216</pd:lineColor>
        <pd:conditionType>always</pd:conditionType>
@@ -244,7 +244,7 @@
    <pd:transition>
        <pd:from>Parse XML</pd:from>
        <pd:to>Generate Error</pd:to>
-        <pd:xpathDescription>author with given id already exist</pd:xpathDescription>
+        <pd:xpathDescription>authorWithGivenIdAlreadyExist</pd:xpathDescription>
        <pd:lineType>Default</pd:lineType>
        <pd:lineColor>-16777216</pd:lineColor>
        <pd:conditionType>xpath</pd:conditionType>
--- a/Processes/xml/author/XmlPUT.process
+++ b/Processes/xml/author/XmlPUT.process
@@ -33,14 +33,14 @@
            </xsd:complexType>
        </xsd:element>
    </pd:endType>
-    <pd:endX>848</pd:endX>
-    <pd:endY>151</pd:endY>
+    <pd:endX>849</pd:endX>
+    <pd:endY>147</pd:endY>
    <pd:errorSchemas>
        <PutError wsMsgRef="pfx4:ErrorMessage"/>
    </pd:errorSchemas>
    <pd:processVariables/>
    <pd:targetNamespace>http://xmlns.example.com/1719920186128</pd:targetNamespace>
-    <pd:activity name="Read-File-1">
+    <pd:activity name="Read File">
        <pd:type>com.tibco.plugin.file.FileReadActivity</pd:type>
        <pd:resourceType>ae.activities.FileReadActivity</pd:resourceType>
        <pd:x>193</pd:x>
@@ -69,15 +69,15 @@
        </config>
        <pd:inputBindings>
            <xmlString>
-                <xsl:value-of select="$Read-File-1/ns:ReadActivityOutputTextClass/fileContent/textContent"/>
+                <xsl:value-of select="$Read-File/ns:ReadActivityOutputTextClass/fileContent/textContent"/>
            </xmlString>
        </pd:inputBindings>
    </pd:activity>
-    <pd:activity name="update author with given id">
+    <pd:activity name="Update Author With Id">
        <pd:type>com.tibco.plugin.mapper.MapperActivity</pd:type>
        <pd:resourceType>ae.activities.MapperActivity</pd:resourceType>
        <pd:x>465</pd:x>
-        <pd:y>156</pd:y>
+        <pd:y>155</pd:y>
        <config>
            <element ref="pfx:authors"/>
        </config>
@@ -100,7 +100,7 @@
            <term ref="pfx:authors"/>
        </config>
        <pd:inputBindings>
-            <xsl:copy-of select="$update-author-with-given-id/pfx:authors"/>
+            <xsl:copy-of select="$Update-Author-With-Id/pfx:authors"/>
        </pd:inputBindings>
    </pd:activity>
    <pd:activity name="Write File">
@@ -126,8 +126,8 @@
    <pd:activity name="Generate Error">
        <pd:type>com.tibco.pe.core.GenerateErrorActivity</pd:type>
        <pd:resourceType>ae.activities.throw</pd:resourceType>
-        <pd:x>347</pd:x>
-        <pd:y>291</pd:y>
+        <pd:x>342</pd:x>
+        <pd:y>290</pd:y>
        <config>
            <faultName>PutError</faultName>
        </config>
@@ -147,13 +147,13 @@
    </pd:activity>
    <pd:transition>
        <pd:from>Start</pd:from>
-        <pd:to>Read-File-1</pd:to>
+        <pd:to>Read File</pd:to>
        <pd:lineType>Default</pd:lineType>
        <pd:lineColor>-16777216</pd:lineColor>
        <pd:conditionType>always</pd:conditionType>
    </pd:transition>
    <pd:transition>
-        <pd:from>Read-File-1</pd:from>
+        <pd:from>Read File</pd:from>
        <pd:to>Parse XML</pd:to>
        <pd:lineType>Default</pd:lineType>
        <pd:lineColor>-16777216</pd:lineColor>
@@ -161,13 +161,13 @@
    </pd:transition>
    <pd:transition>
        <pd:from>Parse XML</pd:from>
-        <pd:to>update author with given id</pd:to>
+        <pd:to>Update Author With Id</pd:to>
        <pd:lineType>Default</pd:lineType>
        <pd:lineColor>-16777216</pd:lineColor>
        <pd:conditionType>otherwise</pd:conditionType>
    </pd:transition>
    <pd:transition>
-        <pd:from>update author with given id</pd:from>
+        <pd:from>Update Author With Id</pd:from>
        <pd:to>Render XML</pd:to>
        <pd:lineType>Default</pd:lineType>
        <pd:lineColor>-16777216</pd:lineColor>
@@ -190,7 +190,7 @@
    <pd:transition>
        <pd:from>Parse XML</pd:from>
        <pd:to>Generate Error</pd:to>
-        <pd:xpathDescription>author does not exist</pd:xpathDescription>
+        <pd:xpathDescription>authorDoesNotExist</pd:xpathDescription>
        <pd:lineType>Default</pd:lineType>
        <pd:lineColor>-16777216</pd:lineColor>
        <pd:conditionType>xpath</pd:conditionType>