SCOUT-118, setting the key name and value correctly in the Address mapping
git-svn-id: https://svn.apache.org/repos/asf/juddi/scout/trunk@1140943 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/ws/scout/util/ScoutJaxrUddiV3Helper.java b/src/main/java/org/apache/ws/scout/util/ScoutJaxrUddiV3Helper.java
index db121d4..d2ead28 100644
--- a/src/main/java/org/apache/ws/scout/util/ScoutJaxrUddiV3Helper.java
+++ b/src/main/java/org/apache/ws/scout/util/ScoutJaxrUddiV3Helper.java
@@ -81,49 +81,49 @@
AddressLine stnumAL = objectFactory.createAddressLine();
stnumAL.setKeyName("STREET_NUMBER");
if (stnum != null) {
- stnumAL.setKeyValue(stnum);
+ stnumAL.setKeyValue("STREET_NUMBER");
stnumAL.setValue(stnum);
}
AddressLine stAL = objectFactory.createAddressLine();
stAL.setKeyName("STREET");
if (st != null) {
- stAL.setKeyValue(st);
+ stAL.setKeyValue("STREET");
stAL.setValue(st);
}
AddressLine cityAL = objectFactory.createAddressLine();
cityAL.setKeyName("CITY");
if (city != null) {
- cityAL.setKeyValue(city);
+ cityAL.setKeyValue("CITY");
cityAL.setValue(city);
}
AddressLine countryAL = objectFactory.createAddressLine();
countryAL.setKeyName("COUNTRY");
if (country != null) {
- countryAL.setKeyValue(country);
+ countryAL.setKeyValue("COUNTRY");
countryAL.setValue(country);
}
AddressLine codeAL = objectFactory.createAddressLine();
codeAL.setKeyName("POSTALCODE");
if (code != null) {
- codeAL.setKeyValue(code);
+ codeAL.setKeyValue("POSTALCODE");
codeAL.setValue(code);
}
AddressLine stateAL = objectFactory.createAddressLine();
stateAL.setKeyName("STATE");
if (state != null) {
- stateAL.setKeyValue(state);
+ stateAL.setKeyValue("STATE");
stateAL.setValue(state);
}
AddressLine typeAL = objectFactory.createAddressLine();
typeAL.setKeyName("TYPE");
if (type != null) {
- typeAL.setKeyValue(type);
+ typeAL.setKeyValue("TYPE");
typeAL.setValue(type);
}
diff --git a/src/main/java/org/apache/ws/scout/util/ScoutUddiV3JaxrHelper.java b/src/main/java/org/apache/ws/scout/util/ScoutUddiV3JaxrHelper.java
index f794db4..3014c07 100644
--- a/src/main/java/org/apache/ws/scout/util/ScoutUddiV3JaxrHelper.java
+++ b/src/main/java/org/apache/ws/scout/util/ScoutUddiV3JaxrHelper.java
@@ -307,7 +307,7 @@
PostalAddress pa = new PostalAddressImpl();
HashMap<String, String> hm = new HashMap<String, String>();
for (AddressLine anAddressLineArr : addressLineArr) {
- hm.put(anAddressLineArr.getKeyName(), anAddressLineArr.getKeyValue());
+ hm.put(anAddressLineArr.getKeyName(), anAddressLineArr.getValue());
}
if (hm.containsKey("STREET_NUMBER")) {
