Change tundra.tn.exception:handle to include HTTP request context

including the headers in the Trading Networks activity log

Author: lachlan

code/classes/tundra/tn/exception.class

@@ -1,7 +1,7 @@
 package tundra.tn;
 
 // -----( IS Java Code Template v1.2
-// -----( CREATED: 2020-06-29T05:40:48.930
+// -----( CREATED: 2020-06-30T05:38:41.034
 // -----( ON-HOST: -
 
 import com.wm.data.*;
@@ -21,6 +21,7 @@
 import permafrost.tundra.content.ContentAttached;
 import permafrost.tundra.data.IDataHelper;
 import permafrost.tundra.data.IDataMap;
+import permafrost.tundra.data.IDataYAMLParser;
 import permafrost.tundra.id.ULID;
 import permafrost.tundra.lang.BaseException;
 import permafrost.tundra.lang.BooleanHelper;
@@ -92,9 +93,12 @@ public static final void handle (IData pipeline)
 		        IDataMap exceptionContent = IDataMap.of((IData)exceptionDocument.get("$exception.content"));
 
 		        if (exceptionContent.size() > 0) {
+		            StringBuilder builder = new StringBuilder();
+		            if (messageDetail != null) builder.append(messageDetail.trim());
 		            try {
 		                byte[] content = (byte[])exceptionContent.get("$content");
 		                String contentType = (String)exceptionContent.get("$content.type");
+		                IData context = (IData)exceptionContent.get("$content.context");
 
 		                if (content != null && content.length > 0) {
 		                    String extension = "";
@@ -113,10 +117,18 @@ public static final void handle (IData pipeline)
 
 		                    Service.doInvoke(NSName.create("tundra.tn.document.content:add"), scope);
 
-		                    messageDetail = messageDetail + "\nRefer to content part: " + partName + " (" + content.length + " byte" + (content.length == 1 ? "" : "s") + ")";
+		                    builder.append("\n---\nRefer to content part: ").append(partName);
+		                }
+
+		                if (context != null) {
+		                    IDataYAMLParser parser = new IDataYAMLParser();
+		                    String contextString = parser.emit(context, String.class);
+		                    builder.append("\n---\n").append(contextString);
 		                }
 		            } catch(Exception ex) {
 		                // suppress/ignore exceptions adding content part
+		            } finally {
+		                messageDetail = builder.toString();
 		            }
 		        }
 		    }

code/jars/Tundra.jar

@@ -29,33 +29,41 @@ bGU/IiksIHRydWUpKSB7CiAgICAgICAgICAgIG1lc3NhZ2VDbGFzcyA9ICJVbnJlY292ZXJhYmxl
 IjsKICAgICAgICAgICAgdXNlclN0YXR1cyA9ICJBQk9SVEVEIjsKICAgICAgICB9CgogICAgICAg
 IElEYXRhTWFwIGV4Y2VwdGlvbkNvbnRlbnQgPSBJRGF0YU1hcC5vZigoSURhdGEpZXhjZXB0aW9u
 RG9jdW1lbnQuZ2V0KCIkZXhjZXB0aW9uLmNvbnRlbnQiKSk7CgogICAgICAgIGlmIChleGNlcHRp
-b25Db250ZW50LnNpemUoKSA+IDApIHsKICAgICAgICAgICAgdHJ5IHsKICAgICAgICAgICAgICAg
-IGJ5dGVbXSBjb250ZW50ID0gKGJ5dGVbXSlleGNlcHRpb25Db250ZW50LmdldCgiJGNvbnRlbnQi
-KTsKICAgICAgICAgICAgICAgIFN0cmluZyBjb250ZW50VHlwZSA9IChTdHJpbmcpZXhjZXB0aW9u
-Q29udGVudC5nZXQoIiRjb250ZW50LnR5cGUiKTsKICAgICAgICAgICAgICAgIAogICAgICAgICAg
-ICAgICAgaWYgKGNvbnRlbnQgIT0gbnVsbCAmJiBjb250ZW50Lmxlbmd0aCA+IDApIHsKICAgICAg
-ICAgICAgICAgICAgICBTdHJpbmcgZXh0ZW5zaW9uID0gIiI7CiAgICAgICAgICAgICAgICAgICAg
-aWYgKGNvbnRlbnRUeXBlICE9IG51bGwpIHsKICAgICAgICAgICAgICAgICAgICAgICAgZXh0ZW5z
-aW9uID0gIi4iICsgTUlNRVR5cGVIZWxwZXIuZ2V0RmlsZUV4dGVuc2lvbihjb250ZW50VHlwZSk7
-CiAgICAgICAgICAgICAgICAgICAgfQoKICAgICAgICAgICAgICAgICAgICBTdHJpbmcgcGFydE5h
-bWUgPSBzZXJ2aWNlLnJlcGxhY2VBbGwoIlxcVyIsICJfIikgKyAiX2V4Y2VwdGlvbl8iICsgRGF0
-ZVRpbWVIZWxwZXIubm93KCJ5eXl5TU1kZEhIbW1zc1NTU1oiKSArIGV4dGVuc2lvbjsKCiAgICAg
-ICAgICAgICAgICAgICAgSURhdGFNYXAgc2NvcGUgPSBuZXcgSURhdGFNYXAoKTsKICAgICAgICAg
-ICAgICAgICAgICBzY29wZS5wdXQoIiRiaXpkb2MiLCBiaXpkb2MpOwogICAgICAgICAgICAgICAg
-ICAgIHNjb3BlLnB1dCgiJGNvbnRlbnQiLCBjb250ZW50KTsKICAgICAgICAgICAgICAgICAgICBz
-Y29wZS5wdXQoIiRjb250ZW50LnBhcnQiLCBwYXJ0TmFtZSk7CiAgICAgICAgICAgICAgICAgICAg
-c2NvcGUucHV0KCIkY29udGVudC50eXBlIiwgY29udGVudFR5cGUpOwogICAgICAgICAgICAgICAg
-ICAgIHNjb3BlLnB1dCgiJG92ZXJ3cml0ZT8iLCAidHJ1ZSIpOwoKICAgICAgICAgICAgICAgICAg
-ICBTZXJ2aWNlLmRvSW52b2tlKE5TTmFtZS5jcmVhdGUoInR1bmRyYS50bi5kb2N1bWVudC5jb250
-ZW50OmFkZCIpLCBzY29wZSk7CgogICAgICAgICAgICAgICAgICAgIG1lc3NhZ2VEZXRhaWwgPSBt
-ZXNzYWdlRGV0YWlsICsgIlxuUmVmZXIgdG8gY29udGVudCBwYXJ0OiAiICsgcGFydE5hbWUgKyAi
-ICgiICsgY29udGVudC5sZW5ndGggKyAiIGJ5dGUiICsgKGNvbnRlbnQubGVuZ3RoID09IDEgPyAi
-IiA6ICJzIikgKyAiKSI7CiAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgIH0gY2F0Y2goRXhj
-ZXB0aW9uIGV4KSB7CiAgICAgICAgICAgICAgICAvLyBzdXBwcmVzcy9pZ25vcmUgZXhjZXB0aW9u
-cyBhZGRpbmcgY29udGVudCBwYXJ0CiAgICAgICAgICAgIH0KICAgICAgICB9CiAgICB9CgogICAg
-QWN0aXZpdHlMb2dIZWxwZXIubG9nKEVudHJ5VHlwZS5FUlJPUiwgbWVzc2FnZUNsYXNzLCBtZXNz
-YWdlU3VtbWFyeSwgbWVzc2FnZURldGFpbCwgYml6ZG9jKTsKICAgIEJpekRvY0VudmVsb3BlSGVs
-cGVyLnNldFN0YXR1cyhiaXpkb2MsIG51bGwsIHVzZXJTdGF0dXMsIHN0YXR1c1NpbGVuY2UpOwoK
-ICAgIEV4Y2VwdGlvbkhlbHBlci5yYWlzZShleGNlcHRpb24pOwp9IGZpbmFsbHkgewogICAgY3Vy
-c29yLmRlc3Ryb3koKTsKfQ==</value>
+b25Db250ZW50LnNpemUoKSA+IDApIHsKICAgICAgICAgICAgU3RyaW5nQnVpbGRlciBidWlsZGVy
+ID0gbmV3IFN0cmluZ0J1aWxkZXIoKTsKICAgICAgICAgICAgaWYgKG1lc3NhZ2VEZXRhaWwgIT0g
+bnVsbCkgYnVpbGRlci5hcHBlbmQobWVzc2FnZURldGFpbC50cmltKCkpOwogICAgICAgICAgICB0
+cnkgewogICAgICAgICAgICAgICAgYnl0ZVtdIGNvbnRlbnQgPSAoYnl0ZVtdKWV4Y2VwdGlvbkNv
+bnRlbnQuZ2V0KCIkY29udGVudCIpOwogICAgICAgICAgICAgICAgU3RyaW5nIGNvbnRlbnRUeXBl
+ID0gKFN0cmluZylleGNlcHRpb25Db250ZW50LmdldCgiJGNvbnRlbnQudHlwZSIpOwogICAgICAg
+ICAgICAgICAgSURhdGEgY29udGV4dCA9IChJRGF0YSlleGNlcHRpb25Db250ZW50LmdldCgiJGNv
+bnRlbnQuY29udGV4dCIpOwogICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICBpZiAoY29u
+dGVudCAhPSBudWxsICYmIGNvbnRlbnQubGVuZ3RoID4gMCkgewogICAgICAgICAgICAgICAgICAg
+IFN0cmluZyBleHRlbnNpb24gPSAiIjsKICAgICAgICAgICAgICAgICAgICBpZiAoY29udGVudFR5
+cGUgIT0gbnVsbCkgewogICAgICAgICAgICAgICAgICAgICAgICBleHRlbnNpb24gPSAiLiIgKyBN
+SU1FVHlwZUhlbHBlci5nZXRGaWxlRXh0ZW5zaW9uKGNvbnRlbnRUeXBlKTsKICAgICAgICAgICAg
+ICAgICAgICB9CgogICAgICAgICAgICAgICAgICAgIFN0cmluZyBwYXJ0TmFtZSA9IHNlcnZpY2Uu
+cmVwbGFjZUFsbCgiXFxXIiwgIl8iKSArICJfZXhjZXB0aW9uXyIgKyBEYXRlVGltZUhlbHBlci5u
+b3coInl5eXlNTWRkSEhtbXNzU1NTWiIpICsgZXh0ZW5zaW9uOwoKICAgICAgICAgICAgICAgICAg
+ICBJRGF0YU1hcCBzY29wZSA9IG5ldyBJRGF0YU1hcCgpOwogICAgICAgICAgICAgICAgICAgIHNj
+b3BlLnB1dCgiJGJpemRvYyIsIGJpemRvYyk7CiAgICAgICAgICAgICAgICAgICAgc2NvcGUucHV0
+KCIkY29udGVudCIsIGNvbnRlbnQpOwogICAgICAgICAgICAgICAgICAgIHNjb3BlLnB1dCgiJGNv
+bnRlbnQucGFydCIsIHBhcnROYW1lKTsKICAgICAgICAgICAgICAgICAgICBzY29wZS5wdXQoIiRj
+b250ZW50LnR5cGUiLCBjb250ZW50VHlwZSk7CiAgICAgICAgICAgICAgICAgICAgc2NvcGUucHV0
+KCIkb3ZlcndyaXRlPyIsICJ0cnVlIik7CgogICAgICAgICAgICAgICAgICAgIFNlcnZpY2UuZG9J
+bnZva2UoTlNOYW1lLmNyZWF0ZSgidHVuZHJhLnRuLmRvY3VtZW50LmNvbnRlbnQ6YWRkIiksIHNj
+b3BlKTsKCiAgICAgICAgICAgICAgICAgICAgYnVpbGRlci5hcHBlbmQoIlxuLS0tXG5SZWZlciB0
+byBjb250ZW50IHBhcnQ6ICIpLmFwcGVuZChwYXJ0TmFtZSk7CiAgICAgICAgICAgICAgICB9Cgog
+ICAgICAgICAgICAgICAgaWYgKGNvbnRleHQgIT0gbnVsbCkgewogICAgICAgICAgICAgICAgICAg
+IElEYXRhWUFNTFBhcnNlciBwYXJzZXIgPSBuZXcgSURhdGFZQU1MUGFyc2VyKCk7CiAgICAgICAg
+ICAgICAgICAgICAgU3RyaW5nIGNvbnRleHRTdHJpbmcgPSBwYXJzZXIuZW1pdChjb250ZXh0LCBT
+dHJpbmcuY2xhc3MpOwogICAgICAgICAgICAgICAgICAgIGJ1aWxkZXIuYXBwZW5kKCJcbi0tLVxu
+IikuYXBwZW5kKGNvbnRleHRTdHJpbmcpOwogICAgICAgICAgICAgICAgfQogICAgICAgICAgICB9
+IGNhdGNoKEV4Y2VwdGlvbiBleCkgewogICAgICAgICAgICAgICAgLy8gc3VwcHJlc3MvaWdub3Jl
+IGV4Y2VwdGlvbnMgYWRkaW5nIGNvbnRlbnQgcGFydAogICAgICAgICAgICB9IGZpbmFsbHkgewog
+ICAgICAgICAgICAgICAgbWVzc2FnZURldGFpbCA9IGJ1aWxkZXIudG9TdHJpbmcoKTsKICAgICAg
+ICAgICAgfQogICAgICAgIH0KICAgIH0KCiAgICBBY3Rpdml0eUxvZ0hlbHBlci5sb2coRW50cnlU
+eXBlLkVSUk9SLCBtZXNzYWdlQ2xhc3MsIG1lc3NhZ2VTdW1tYXJ5LCBtZXNzYWdlRGV0YWlsLCBi
+aXpkb2MpOwogICAgQml6RG9jRW52ZWxvcGVIZWxwZXIuc2V0U3RhdHVzKGJpemRvYywgbnVsbCwg
+dXNlclN0YXR1cywgc3RhdHVzU2lsZW5jZSk7CgogICAgRXhjZXB0aW9uSGVscGVyLnJhaXNlKGV4
+Y2VwdGlvbik7Cn0gZmluYWxseSB7CiAgICBjdXJzb3IuZGVzdHJveSgpOwp9</value>
 </Values>

code/jars/TundraTN.jar

@@ -37,6 +37,7 @@ eCA9IG5ldyBCYXNlRXhjZXB0aW9uKG1lc3NhZ2UpOwogICAgfQoKICAgIHRocm93IGV4Owp9</value>
     <value>permafrost.tundra.content.ContentAttached</value>
     <value>permafrost.tundra.data.IDataHelper</value>
     <value>permafrost.tundra.data.IDataMap</value>
+    <value>permafrost.tundra.data.IDataYAMLParser</value>
     <value>permafrost.tundra.id.ULID</value>
     <value>permafrost.tundra.lang.BaseException</value>
     <value>permafrost.tundra.lang.BooleanHelper</value>