teiiddes-2542: The key value was not always unique since we were not …

…consistantly using "rest_param:" when adding entries to the map which created apparent dulpicate entries. Changed logic to consitantly prefix the map key value with "rest_param:".
Teiid-Designer · May 27, 2015 · c5d0fe8 · c5d0fe8
1 parent d0849f0
commit c5d0fe8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/...id.designer.datatools.ui/src/org/teiid/designer/datatools/profiles/ws/ParameterPanel.java b/...id.designer.datatools.ui/src/org/teiid/designer/datatools/profiles/ws/ParameterPanel.java
@@ -282,7 +282,7 @@ void handleAddProperty() {
             String defaultValue = dialog.getDefaultValue();
             Parameter parameter = new Parameter(name, defaultValue, Parameter.Type.fromValue(type));
 
-            this.parameterMap.put(name, parameter);
+            this.parameterMap.put(Parameter.PREFIX+name, parameter);
 
             // update UI from model
             this.propertiesViewer.refresh();
@@ -326,14 +326,14 @@ void handleRemoveProperty() {
         assert (selectedProperty != null);
 
         // update model
-        parameterMap.remove(selectedProperty.getName());
+        parameterMap.remove(Parameter.PREFIX+selectedProperty.getName());
 
         // update UI
         this.propertiesViewer.refresh();
 
         if (this.wsProfileDetailsWizardPage!=null){
         	wsProfileDetailsWizardPage.setParameterMap(this.parameterMap);
-        	wsProfileDetailsWizardPage.getProfileProperties().remove(selectedProperty.getName());
+        	wsProfileDetailsWizardPage.getProfileProperties().remove(Parameter.PREFIX+selectedProperty.getName());
         	wsProfileDetailsWizardPage.urlPreviewText.setText(wsProfileDetailsWizardPage.updateUrlPreview().toString());
         }else{
         	propertyPage.setParameterMap(this.parameterMap);

diff --git a/...eiid.designer.datatools.ui/src/org/teiid/designer/datatools/profiles/ws/PropertyPage.java b/...eiid.designer.datatools.ui/src/org/teiid/designer/datatools/profiles/ws/PropertyPage.java
@@ -350,7 +350,7 @@ private StringBuilder buildParameterString() {
 	    	  }else{
 	    		  parameterString.append("&");   //$NON-NLS-1$  
 	    	  }
-	    	  parameterString.append(key).append("=").append(value.getDefaultValue()); //$NON-NLS-1$
+	    	  parameterString.append(value.getName()).append("=").append(value.getDefaultValue()); //$NON-NLS-1$
 	      }
 	    }
 
@@ -501,7 +501,6 @@ private void initControls() {
     private void loadParameters(Properties props) {
     	for( Object key : props.keySet() )  {
     		String keyStr = (String)key;
-
     		if( keyStr.startsWith(Parameter.PREFIX)) {
     			Parameter newParam = new Parameter(keyStr, props.getProperty((String)key));
     			parameterMap.put(newParam.getName(), newParam);

diff --git a/...datatools.ui/src/org/teiid/designer/datatools/profiles/ws/WSProfileDetailsWizardPage.java b/...datatools.ui/src/org/teiid/designer/datatools/profiles/ws/WSProfileDetailsWizardPage.java
@@ -315,7 +315,7 @@ private String buildParameterString() throws UnsupportedEncodingException {
 				} else {
 					parameterString.append("&"); //$NON-NLS-1$  
 				}
-				parameterString.append(encodeString(key)).append("=").append(encodeString(value.getDefaultValue())); //$NON-NLS-1$
+				parameterString.append(encodeString(value.getName())).append("=").append(encodeString(value.getDefaultValue())); //$NON-NLS-1$
 			}
 		}