litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-3119 Skip methods of a map in BaseDumpDirective.getMapDump().

Browse source
This commit is contained in:
ryounes 2011-08-09 16:10:37 +00:00
parent 1f9bcac9b1
commit da8c374676
2 changed files with 46 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
webapp/src/freemarker/ext/dump/BaseDumpDirective.java
View file

@ -323,13 +323,21 @@ public abstract class BaseDumpDirective implements TemplateDirectiveModel {
TemplateModelIterator iModel = keys.iterator();
while (iModel.hasNext()) {
String key = iModel.next().toString();
// Workaround this oddity: model.object does not contain
// Work around this oddity: model.object does not contain
// values for "empty" and "keys", but model.keys() does.
if ("class".equals(key) || "empty".equals(key)) {
continue;
}
TemplateModel value = model.get(key);
items.put(key, getDump(value));
// A map with exposed methods includes methods inherited from Map and Object like
// size(), getClass(), etc. Punt on these for now by suppressing in the dump,
// though this is not the optimal solution. If they are exposed to the templates,
// the dump should also expose them. I'm guessing that in most cases these
// methods are not relevant to template authors.
if (! (value instanceof TemplateMethodModel)) {
items.put(key, getDump(value));
}
}
map.put(Key.VALUE.toString(), items);
return map;

42
webapp/test/freemarker/ext/dump/DumpDirectiveTest.java
View file

@ -654,11 +654,6 @@ public class DumpDirectiveTest {
test(varName, dataModel, expectedDump);
}
@Test
public void dumpHash() {
}
@Test
public void dumpStringToStringMap() {
@ -1039,6 +1034,7 @@ public class DumpDirectiveTest {
private int id;
private String middleName;
private List<String> favoriteColors;
// private Map<String, String> degrees;
private Employee supervisor;
private float salary;
@ -1071,6 +1067,10 @@ public class DumpDirectiveTest {
favoriteColors.add(color);
}
}
// void setDegrees(Map<String, String> degrees) {
// this.degrees = degrees;
// }
float getSalary() {
return salary;
@ -1127,6 +1127,10 @@ public class DumpDirectiveTest {
return favoriteColors;
}
// public Map<String, String> getDegrees() {
// return degrees;
// }
public String familyName() {
return lastName;
}
@ -1141,6 +1145,11 @@ public class DumpDirectiveTest {
jdoe.setFavoriteColors("blue", "green");
jdoe.setSalary(65000);
// Map<String, String> degrees = new HashMap<String, String>();
// degrees.put("BA", "Mathematics");
// degrees.put("MS", "Computer Science");
// jdoe.setDegrees(degrees);
c.clear();
c.set(1975, Calendar.OCTOBER, 25);
c = DateUtils.truncate(c, Calendar.DATE);
@ -1158,7 +1167,7 @@ public class DumpDirectiveTest {
Map<String, Object> supervisorExpectedDump = new HashMap<String, Object>();
supervisorExpectedDump.put(Key.TYPE.toString(), "freemarker.ext.dump.DumpDirectiveTest$Employee");
supervisorExpectedDump.put(Key.VALUE.toString(), getJaneSmithExpectedDump(exposureLevel));
supervisorExpectedDump.put(Key.VALUE.toString(), getJaneSmithExpectedDump(exposureLevel));
// Properties
SortedMap<String, Object> propertiesExpectedDump = new TreeMap<String, Object>();
@ -1198,6 +1207,7 @@ public class DumpDirectiveTest {
marriedExpectedDump.put(Key.VALUE.toString(), true);
propertiesExpectedDump.put("married", marriedExpectedDump);
propertiesExpectedDump.put("supervisor", supervisorExpectedDump);
Map<String, Object> favoriteColorsExpectedDump = new HashMap<String, Object>();
@ -1213,6 +1223,22 @@ public class DumpDirectiveTest {
favoriteColorListExpectedDump.add(color2ExpectedDump);
favoriteColorsExpectedDump.put(Key.VALUE.toString(), favoriteColorListExpectedDump);
propertiesExpectedDump.put("favoriteColors", favoriteColorsExpectedDump);
// This test fails, don't know why
// Map<String, Object> degreesExpectedDump = new HashMap<String, Object>();
// degreesExpectedDump.put(Key.TYPE.toString(), Type.HASH);
// Map<String, Map<String, Object>> degreeMapExpectedDump = new HashMap<String, Map<String, Object>>();
// Map<String, Object> degree1ExpectedDump = new HashMap<String, Object>();
// degree1ExpectedDump.put(Key.TYPE.toString(), Type.STRING);
// degree1ExpectedDump.put(Key.VALUE.toString(), "Mathematics");
// degreeMapExpectedDump.put("BA", degree1ExpectedDump);
// Map<String, Object> degree2ExpectedDump = new HashMap<String, Object>();
// degree2ExpectedDump.put(Key.TYPE.toString(), Type.STRING);
// degree2ExpectedDump.put(Key.VALUE.toString(), "Computer Science");
// degreeMapExpectedDump.put("MS", degree2ExpectedDump);
// degreesExpectedDump.put(Key.VALUE.toString(), degreeMapExpectedDump);
// propertiesExpectedDump.put("degrees", degreesExpectedDump);
}
expectedDump.put(Key.PROPERTIES.toString(), propertiesExpectedDump);
@ -1315,6 +1341,10 @@ public class DumpDirectiveTest {
favoriteColorListExpectedDump.add(color2ExpectedDump);
favoriteColorsExpectedDump.put(Key.VALUE.toString(), favoriteColorListExpectedDump);
propertiesExpectedDump.put("favoriteColors", favoriteColorsExpectedDump);
// Map<String, Object> degreesExpectedDump = new HashMap<String, Object>();
// degreesExpectedDump.put(Key.VALUE.toString(), Value.NULL);
// propertiesExpectedDump.put("degrees", degreesExpectedDump);
}
expectedDump.put(Key.PROPERTIES.toString(), propertiesExpectedDump);