From c20f5a62d6f11e6e42f334e88117f7cd95080ee6 Mon Sep 17 00:00:00 2001 From: Andries Smit Date: Mon, 14 Mar 2016 17:55:17 +0100 Subject: [PATCH 1/2] Replace ALL leading underscores Replace all leading underscores, allows to have multiple relations with the same name in one Data Model --- javasource/restservices/util/JsonDeserializer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/javasource/restservices/util/JsonDeserializer.java b/javasource/restservices/util/JsonDeserializer.java index 09066cb..47a631c 100644 --- a/javasource/restservices/util/JsonDeserializer.java +++ b/javasource/restservices/util/JsonDeserializer.java @@ -150,8 +150,8 @@ private static Map buildAttributeNameMap(IMetaObject metaObject) for(IMetaAssociation assoc : metaObject.getMetaAssociationsParent()) { String name = assoc.getName().split("\\.")[1]; attrMap.put(name.toLowerCase(), assoc.getName()); - if (name.startsWith("_")) - attrMap.put(name.substring(1).toLowerCase(), assoc.getName()); + name = name.toLowerCase().replaceAll("^_+(?!$)", ""); // Replace leading underscores + attrMap.put(name, assoc.getName()); } for(IMetaPrimitive prim : metaObject.getMetaPrimitives()) { From b9f89b1ee81d89cf2dab315c8f4fddbb8571b82c Mon Sep 17 00:00:00 2001 From: Andries Smit Date: Mon, 14 Mar 2016 17:59:05 +0100 Subject: [PATCH 2/2] Removed duplicate line --- javasource/restservices/util/JsonDeserializer.java | 1 - 1 file changed, 1 deletion(-) diff --git a/javasource/restservices/util/JsonDeserializer.java b/javasource/restservices/util/JsonDeserializer.java index 47a631c..3484956 100644 --- a/javasource/restservices/util/JsonDeserializer.java +++ b/javasource/restservices/util/JsonDeserializer.java @@ -149,7 +149,6 @@ private static Map buildAttributeNameMap(IMetaObject metaObject) for(IMetaAssociation assoc : metaObject.getMetaAssociationsParent()) { String name = assoc.getName().split("\\.")[1]; - attrMap.put(name.toLowerCase(), assoc.getName()); name = name.toLowerCase().replaceAll("^_+(?!$)", ""); // Replace leading underscores attrMap.put(name, assoc.getName()); }