Merge branch 'master' of ssh://git@github.com/ibh-systems/neoscada-misc

ibh-systems · Jul 14, 2017 · d86bd16 · d86bd16
2 parents edab30c + 83fb45a
commit d86bd16
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/...ada.generator.lib/src/main/java/com/ibh/systems/neoscada/generator/lib/Configuration.java b/...ada.generator.lib/src/main/java/com/ibh/systems/neoscada/generator/lib/Configuration.java
@@ -260,6 +260,15 @@ public JsonElement serialize ( final OpcXmlDaConnectionFactoryElement src, final
 
             object.addProperty ( "timeout", "" + src.getTimeOut () );
             object.addProperty ( "wsdlUrl", "" + src.getWsdlUrl () );
+
+            if ( !src.getTypeMappings ().isEmpty () )
+            {
+                for ( final Entry<String, String> type : src.getTypeMappings ().entrySet () )
+                {
+                    object.addProperty ( "itemType." + type.getKey (), "" + type.getValue () );
+                }
+            }
+
             return object;
         }
     }
@@ -323,7 +332,7 @@ public JsonElement serialize ( final ItemSummaryHandlerFactoryElement src, final
         {
             final JsonObject object = new JsonObject ();
             object.addProperty ( "master.id", src.getMasterId () );
-            object.addProperty ( "handlerPriority", src.getHandlerPriority () );
+            object.addProperty ( "handlerPriority", "" + src.getHandlerPriority () );
             object.addProperty ( "tag", Joiner.on ( ", " ).join ( src.getTags () ) );
             for ( final String tag : src.getTags () )
             {