From d3f9a8bff5f1e21d0f2ff766b9ff3e52a827cab6 Mon Sep 17 00:00:00 2001
From: Tomohisa Igarashi <tm.igarashi@gmail.com>
Date: Thu, 10 Oct 2019 19:37:14 -0400
Subject: [PATCH] chore: Update to AtlasMap 1.42.9

Contains:
https://issues.jboss.org/browse/ENTESB-11959 - Data mapper fails when editing already created integration
---
 app/integration/bom/pom.xml                               | 2 +-
 app/pom.xml                                               | 2 +-
 app/ui-react/packages/atlasmap-assembly/package.json      | 2 +-
 .../src/app/data-mapper-host.component.ts                 | 8 +++-----
 app/ui-react/yarn.lock                                    | 8 ++++----
 5 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/app/integration/bom/pom.xml b/app/integration/bom/pom.xml
index 051286c1c35..773d5c09f16 100644
--- a/app/integration/bom/pom.xml
+++ b/app/integration/bom/pom.xml
@@ -29,7 +29,7 @@
   <properties>
     <spring-boot.version>1.5.13.RELEASE</spring-boot.version>
     <camel.version>2.21.0.fuse-750029</camel.version>
-    <atlasmap.version>1.42.6</atlasmap.version>
+    <atlasmap.version>1.42.9</atlasmap.version>
     <jackson.databind.version>2.8.11.3</jackson.databind.version>
   </properties>
 
diff --git a/app/pom.xml b/app/pom.xml
index 742f042a7b9..3e737a85846 100644
--- a/app/pom.xml
+++ b/app/pom.xml
@@ -37,7 +37,7 @@
     <syndesis.version>${project.version}</syndesis.version>
 
     <!-- Atlasmap version -->
-    <atlasmap.version>1.42.6</atlasmap.version>
+    <atlasmap.version>1.42.9</atlasmap.version>
 
     <!-- Image names -->
     <image.s2i>syndesis/syndesis-s2i:%l</image.s2i>
diff --git a/app/ui-react/packages/atlasmap-assembly/package.json b/app/ui-react/packages/atlasmap-assembly/package.json
index be489702adf..018c8fb8ec6 100644
--- a/app/ui-react/packages/atlasmap-assembly/package.json
+++ b/app/ui-react/packages/atlasmap-assembly/package.json
@@ -91,7 +91,7 @@
     "@angular/platform-browser": "7.2.7",
     "@angular/platform-browser-dynamic": "7.2.7",
     "@angular/router": "7.2.7",
-    "@atlasmap/atlasmap-data-mapper": "^1.42.6",
+    "@atlasmap/atlasmap-data-mapper": "^1.42.9",
     "@types/jasmine": "^3.3.9",
     "@types/jasmine-jquery": "^1.5.32",
     "@types/jasminewd2": "^2.0.3",
diff --git a/app/ui-react/packages/atlasmap-assembly/src/app/data-mapper-host.component.ts b/app/ui-react/packages/atlasmap-assembly/src/app/data-mapper-host.component.ts
index 2e8cd15d682..be166c7d53f 100644
--- a/app/ui-react/packages/atlasmap-assembly/src/app/data-mapper-host.component.ts
+++ b/app/ui-react/packages/atlasmap-assembly/src/app/data-mapper-host.component.ts
@@ -141,11 +141,9 @@ export class DataMapperHostComponent implements OnInit, OnDestroy, OnChanges {
     }
 
     if (this.initialMappings) {
-      try {
-        MappingSerializer.deserializeMappingServiceJSON(JSON.parse(this.initialMappings), c);
-      } catch (err) {
-        // TODO popup or error alert?  At least catch this so we initialize
-        console.error(err);
+      c.preloadedMappingJson = this.initialMappings;
+      if (c.isTraceEnabled()) {
+        c.logger.trace(`Added mapping definition: ${this.initialMappings}`)
       }
     }
 
diff --git a/app/ui-react/yarn.lock b/app/ui-react/yarn.lock
index 29614f92639..9fb0fb76ac1 100644
--- a/app/ui-react/yarn.lock
+++ b/app/ui-react/yarn.lock
@@ -313,10 +313,10 @@
   dependencies:
     tslib "^1.9.0"
 
-"@atlasmap/atlasmap-data-mapper@^1.42.6":
-  version "1.42.6"
-  resolved "https://registry.yarnpkg.com/@atlasmap/atlasmap-data-mapper/-/atlasmap-data-mapper-1.42.6.tgz#72fb94d422a222979152e80278e1585d26ce94cf"
-  integrity sha512-m2xkD097K6D+GM+eVDh2rjMO3dHXMMp6d8PN3CKZdy9oQzlggX/Oj6abik+l8s1R2PyR1uya4DIWQh80t4yD8w==
+"@atlasmap/atlasmap-data-mapper@^1.42.9":
+  version "1.42.9"
+  resolved "https://registry.yarnpkg.com/@atlasmap/atlasmap-data-mapper/-/atlasmap-data-mapper-1.42.9.tgz#0a34a9201fa1a597ffb6be08f505713167955522"
+  integrity sha512-eq9FnJOFDTLkpaCphyAduo31sVcmU8xyo9IhtkN5OH2U1sD2yLLgGjxDtHIDLBVfq2tQRQhmzSVkj7JN1oDaTQ==
   dependencies:
     tslib "^1.9.0"