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

NIHVIVO-1564 Continue work on object dump

Browse source
This commit is contained in:
ryounes 2011-04-18 18:38:50 +00:00
parent 98d9be5cf2
commit b2b3086ef6
2 changed files with 132 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -20,6 +20,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import freemarker.core.Environment; import freemarker.core.Environment;
import freemarker.ext.beans.StringModel;
import freemarker.template.Template; import freemarker.template.Template;
import freemarker.template.TemplateBooleanModel; import freemarker.template.TemplateBooleanModel;
import freemarker.template.TemplateCollectionModel; import freemarker.template.TemplateCollectionModel;
@ -137,43 +138,39 @@ public abstract class BaseDumpDirective implements TemplateDirectiveModel {
// Don't return null if model == null. We still want to send the map to the template. // Don't return null if model == null. We still want to send the map to the template.
if (model != null) { if (model != null) {
// NumberModel is both TemplateNumberModel and TemplateHashModelEx. Similarly for
// BooleanModel, DateModel, etc. These are the types used for property values obtained if ( model instanceof TemplateSequenceModel ) {
// via getObjectData(). So the TemplateHashModelEx case has to follow TemplateNumberModel, map.putAll( getTemplateModelData( ( TemplateSequenceModel)model ) );
// etc.
if (model instanceof TemplateScalarModel) {
if (! (model instanceof TemplateHashModelEx)) {
map.putAll( getTemplateModelData( (TemplateScalarModel)model ) );
} else {
Object unwrappedModel = DeepUnwrap.permissiveUnwrap(model);
// StringModel can wrap either a String or a complex Java object. We have to
// unwrap the model to find out which it is.
if (unwrappedModel instanceof String) {
map.putAll( getTemplateModelData( (TemplateScalarModel)model ) );
} else {
map.putAll( getTemplateModelData( ( TemplateHashModelEx)model ) );
}
}
} else if (model instanceof TemplateBooleanModel) {
map.putAll( getTemplateModelData( (TemplateBooleanModel)model ) );
} else if (model instanceof TemplateNumberModel) { } else if ( model instanceof TemplateNumberModel ) {
map.putAll( getTemplateModelData( (TemplateNumberModel)model ) ); map.putAll( getTemplateModelData( (TemplateNumberModel)model ) );
} else if (model instanceof TemplateDateModel) { } else if ( model instanceof TemplateBooleanModel ) {
map.putAll( getTemplateModelData( (TemplateBooleanModel)model ) );
} else if ( model instanceof TemplateDateModel ) {
map.putAll( getTemplateModelData( (TemplateDateModel)model ) ); map.putAll( getTemplateModelData( (TemplateDateModel)model ) );
} else if (model instanceof TemplateSequenceModel){
map.putAll( getTemplateModelData( ( TemplateSequenceModel)model ) );
} else if (model instanceof TemplateCollectionModel) { } else if ( model instanceof TemplateCollectionModel ) {
map.putAll( getTemplateModelData( ( TemplateCollectionModel)model ) ); map.putAll( getTemplateModelData( ( TemplateCollectionModel)model ) );
} else if ( model instanceof StringModel ) {
} else if (model instanceof TemplateHashModelEx) { Object unwrappedModel = DeepUnwrap.permissiveUnwrap(model);
if (unwrappedModel instanceof String) {
map.putAll( getTemplateModelData( (TemplateScalarModel)model ) );
} else {
map.putAll( getTemplateModelData( ( TemplateHashModelEx)model ) );
}
} else if ( model instanceof TemplateScalarModel ) {
map.putAll( getTemplateModelData( (TemplateScalarModel)model ) );
} else if ( model instanceof TemplateHashModelEx ) {
map.putAll( getTemplateModelData( ( TemplateHashModelEx)model ) ); map.putAll( getTemplateModelData( ( TemplateHashModelEx)model ) );
} else if (model instanceof TemplateHashModel) { } else if (model instanceof TemplateHashModel ) {
map.putAll( getTemplateModelData( ( TemplateHashModel)model ) ); map.putAll( getTemplateModelData( ( TemplateHashModel)model ) );
// Nodes and transforms not included here // Nodes and transforms not included here

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

@ -670,7 +670,7 @@ public class DumpDirectiveTest {
expectedDump.put(Key.NAME.toString(), varName); expectedDump.put(Key.NAME.toString(), varName);
expectedDump.put(Key.TYPE.toString(), "freemarker.ext.dump.DumpDirectiveTest$Employee"); expectedDump.put(Key.TYPE.toString(), "freemarker.ext.dump.DumpDirectiveTest$Employee");
SortedMap<String, Object> propertiesExpectedDump = getPropertiesExpectedDump(); SortedMap<String, Object> propertiesExpectedDump = getJohnDoePropertiesExpectedDump();
expectedDump.put(Key.VALUE.toString(), propertiesExpectedDump); expectedDump.put(Key.VALUE.toString(), propertiesExpectedDump);
@ -702,7 +702,7 @@ public class DumpDirectiveTest {
expectedDump.put(Key.NAME.toString(), varName); expectedDump.put(Key.NAME.toString(), varName);
expectedDump.put(Key.TYPE.toString(), "freemarker.ext.dump.DumpDirectiveTest$Employee"); expectedDump.put(Key.TYPE.toString(), "freemarker.ext.dump.DumpDirectiveTest$Employee");
SortedMap<String, Object> methodsExpectedDump = getPropertiesExpectedDump(); SortedMap<String, Object> methodsExpectedDump = getJohnDoePropertiesExpectedDump();
// methodsExpectedDump.putAll(...); // methodsExpectedDump.putAll(...);
expectedDump.put(Key.VALUE.toString(), methodsExpectedDump); expectedDump.put(Key.VALUE.toString(), methodsExpectedDump);
@ -734,7 +734,7 @@ public class DumpDirectiveTest {
expectedDump.put(Key.NAME.toString(), varName); expectedDump.put(Key.NAME.toString(), varName);
expectedDump.put(Key.TYPE.toString(), "freemarker.ext.dump.DumpDirectiveTest$Employee"); expectedDump.put(Key.TYPE.toString(), "freemarker.ext.dump.DumpDirectiveTest$Employee");
SortedMap<String, Object> methodsExpectedDump = getPropertiesExpectedDump(); SortedMap<String, Object> methodsExpectedDump = getJohnDoePropertiesExpectedDump();
// methodsExpectedDump.putAll(...); // methodsExpectedDump.putAll(...);
expectedDump.put(Key.VALUE.toString(), methodsExpectedDump); expectedDump.put(Key.VALUE.toString(), methodsExpectedDump);
@ -877,22 +877,23 @@ public class DumpDirectiveTest {
private String firstName; private String firstName;
private String lastName; private String lastName;
private String nickname; private String nickname;
private Date birthdate; //private Date birthdate;
private boolean married; private boolean married;
private int id; private int id;
private String middleName; private String middleName;
private List<String> favoriteColors;
private Employee supervisor; private Employee supervisor;
private List<Employee> supervisees;
private float salary; private float salary;
Employee(String firstName, String lastName, Date birthdate, int id) { Employee(String firstName, String lastName, int id) {
this.firstName = firstName; this.firstName = firstName;
this.lastName = lastName; this.lastName = lastName;
this.middleName = null; // test a null value this.middleName = null; // test a null value
this.birthdate = birthdate; //this.birthdate = birthdate;
this.married = true; this.married = true;
this.id = id; this.id = id;
this.nickname = ""; this.nickname = "";
this.favoriteColors = new ArrayList<String>();
count++; count++;
} }
@ -900,10 +901,6 @@ public class DumpDirectiveTest {
this.supervisor = supervisor; this.supervisor = supervisor;
} }
void setSupervisees(List<Employee> supervisees) {
this.supervisees = supervisees;
}
void setSalary(float salary) { void setSalary(float salary) {
this.salary = salary; this.salary = salary;
} }
@ -911,6 +908,12 @@ public class DumpDirectiveTest {
public void setNickname(String nickname) { public void setNickname(String nickname) {
this.nickname = nickname; this.nickname = nickname;
} }
public void setFavoriteColors(String...colors) {
for (String color : colors) {
favoriteColors.add(color);
}
}
// Not available to templates // Not available to templates
float getSalary() { float getSalary() {
@ -960,45 +963,35 @@ public class DumpDirectiveTest {
return supervisor; return supervisor;
} }
public List<Employee> getSupervisees() { public List<String> getFavoriteColors() {
return supervisees; return favoriteColors;
} }
} }
private Employee getEmployee() { private Employee getEmployee() {
Calendar c = Calendar.getInstance();
c.set(75, Calendar.MAY, 5); Employee jdoe = new Employee("John", "Doe", 34523);
Employee jdoe = new Employee("John", "Doe", c.getTime(), 34523); jdoe.setFavoriteColors("blue", "green");
// c.set(65, Calendar.AUGUST, 10);
// Employee jsmith = new Employee("Jane", "Smith", c.getTime(), 78234);
//
// c.set(80, Calendar.JUNE, 20);
// Employee mjones = new Employee("Michael", "Jones", c.getTime(), 65432);
//
// c.set(81, Calendar.NOVEMBER, 30);
// Employee mturner = new Employee("Mary", "Turner", c.getTime(), 89531);
List<Employee> supervisees = new ArrayList<Employee>();
// supervisees.add(mjones);
// supervisees.add(mturner);
//jdoe.setSupervisor(jsmith);
//jdoe.setSupervisees(supervisees);
jdoe.setSalary(65000); jdoe.setSalary(65000);
Employee jsmith = new Employee("Jane", "Smith", 78234);
jsmith.setFavoriteColors("red", "orange");
jdoe.setSupervisor(jsmith);
return jdoe; return jdoe;
} }
private SortedMap<String, Object> getPropertiesExpectedDump() { private SortedMap<String, Object> getJohnDoePropertiesExpectedDump() {
SortedMap<String, Object> propertiesExpectedDump = new TreeMap<String, Object>(); SortedMap<String, Object> propertiesExpectedDump = new TreeMap<String, Object>();
Map<String, Object> birthdateExpectedDump = new HashMap<String, Object>(); // Map<String, Object> birthdateExpectedDump = new HashMap<String, Object>();
birthdateExpectedDump.put(Key.TYPE.toString(), Type.DATE); // birthdateExpectedDump.put(Key.TYPE.toString(), Type.DATE);
birthdateExpectedDump.put(Key.DATE_TYPE.toString(), DateType.UNKNOWN); // birthdateExpectedDump.put(Key.DATE_TYPE.toString(), DateType.UNKNOWN);
Calendar c = Calendar.getInstance(); // Calendar c = Calendar.getInstance();
c.set(75, Calendar.MAY, 5); // c.set(75, Calendar.MAY, 5);
birthdateExpectedDump.put(Key.VALUE.toString(), c.getTime()); // birthdateExpectedDump.put(Key.VALUE.toString(), c.getTime());
//propertiesExpectedDump.put("birthdate", birthdateExpectedDump); // propertiesExpectedDump.put("birthdate", birthdateExpectedDump);
Map<String, Object> fullNameExpectedDump = new HashMap<String, Object>(); Map<String, Object> fullNameExpectedDump = new HashMap<String, Object>();
fullNameExpectedDump.put(Key.TYPE.toString(), Type.STRING); fullNameExpectedDump.put(Key.TYPE.toString(), Type.STRING);
@ -1023,19 +1016,83 @@ public class DumpDirectiveTest {
marriedExpectedDump.put(Key.TYPE.toString(), Type.BOOLEAN); marriedExpectedDump.put(Key.TYPE.toString(), Type.BOOLEAN);
marriedExpectedDump.put(Key.VALUE.toString(), true); marriedExpectedDump.put(Key.VALUE.toString(), true);
propertiesExpectedDump.put("married", marriedExpectedDump); propertiesExpectedDump.put("married", marriedExpectedDump);
Map<String, Object> superviseesExpectedDump = new HashMap<String, Object>();
//superviseesExpectedDump.put(Key.TYPE.toString(), Type.SEQUENCE);
superviseesExpectedDump.put(Key.VALUE.toString(), "null");
propertiesExpectedDump.put("supervisees", superviseesExpectedDump);
Map<String, Object> supervisorExpectedDump = new HashMap<String, Object>();
//supervisorExpectedDump.put(Key.TYPE.toString(), "freemarker.ext.dump.DumpDirectiveTest$Employee");
supervisorExpectedDump.put(Key.VALUE.toString(), "null");
propertiesExpectedDump.put("supervisor", supervisorExpectedDump);
Map<String, Object> supervisorExpectedDump = new HashMap<String, Object>();
supervisorExpectedDump.put(Key.TYPE.toString(), "freemarker.ext.dump.DumpDirectiveTest$Employee");
supervisorExpectedDump.put(Key.VALUE.toString(), getJaneSmithPropertiesExpectedDump());
propertiesExpectedDump.put("supervisor", supervisorExpectedDump);
Map<String, Object> favoriteColorsExpectedDump = new HashMap<String, Object>();
favoriteColorsExpectedDump.put(Key.TYPE.toString(), Type.SEQUENCE);
List<Map<String, Object>> favoriteColorListExpectedDump = new ArrayList<Map<String, Object>>();
Map<String, Object> color1ExpectedDump = new HashMap<String, Object>();
color1ExpectedDump.put(Key.TYPE.toString(), Type.STRING);
color1ExpectedDump.put(Key.VALUE.toString(), "blue");
favoriteColorListExpectedDump.add(color1ExpectedDump);
Map<String, Object> color2ExpectedDump = new HashMap<String, Object>();
color2ExpectedDump.put(Key.TYPE.toString(), Type.STRING);
color2ExpectedDump.put(Key.VALUE.toString(), "green");
favoriteColorListExpectedDump.add(color2ExpectedDump);
favoriteColorsExpectedDump.put(Key.VALUE.toString(), favoriteColorListExpectedDump);
propertiesExpectedDump.put("favoriteColors", favoriteColorsExpectedDump);
return propertiesExpectedDump; return propertiesExpectedDump;
} }
private SortedMap<String, Object> getJaneSmithPropertiesExpectedDump() {
SortedMap<String, Object> propertiesExpectedDump = new TreeMap<String, Object>();
// Map<String, Object> birthdateExpectedDump = new HashMap<String, Object>();
// birthdateExpectedDump.put(Key.TYPE.toString(), Type.DATE);
// birthdateExpectedDump.put(Key.DATE_TYPE.toString(), DateType.UNKNOWN);
// Calendar c = Calendar.getInstance();
// c.set(75, Calendar.MAY, 5);
// birthdateExpectedDump.put(Key.VALUE.toString(), c.getTime());
// propertiesExpectedDump.put("birthdate", birthdateExpectedDump);
Map<String, Object> fullNameExpectedDump = new HashMap<String, Object>();
fullNameExpectedDump.put(Key.TYPE.toString(), Type.STRING);
fullNameExpectedDump.put(Key.VALUE.toString(), "Jane Smith");
propertiesExpectedDump.put("fullName", fullNameExpectedDump);
Map<String, Object> idExpectedDump = new HashMap<String, Object>();
idExpectedDump.put(Key.TYPE.toString(), Type.NUMBER);
idExpectedDump.put(Key.VALUE.toString(), 78234);
propertiesExpectedDump.put("id", idExpectedDump);
Map<String, Object> nicknameExpectedDump = new HashMap<String, Object>();
nicknameExpectedDump.put(Key.TYPE.toString(), Type.STRING);
nicknameExpectedDump.put(Key.VALUE.toString(), "");
propertiesExpectedDump.put("nickname", nicknameExpectedDump);
Map<String, Object> middleNameExpectedDump = new HashMap<String, Object>();
middleNameExpectedDump.put(Key.VALUE.toString(), "null");
propertiesExpectedDump.put("middleName", middleNameExpectedDump);
Map<String, Object> marriedExpectedDump = new HashMap<String, Object>();
marriedExpectedDump.put(Key.TYPE.toString(), Type.BOOLEAN);
marriedExpectedDump.put(Key.VALUE.toString(), true);
propertiesExpectedDump.put("married", marriedExpectedDump);
Map<String, Object> supervisorExpectedDump = new HashMap<String, Object>();
supervisorExpectedDump.put(Key.VALUE.toString(), "null");
propertiesExpectedDump.put("supervisor", supervisorExpectedDump);
Map<String, Object> favoriteColorsExpectedDump = new HashMap<String, Object>();
favoriteColorsExpectedDump.put(Key.TYPE.toString(), Type.SEQUENCE);
List<Map<String, Object>> favoriteColorListExpectedDump = new ArrayList<Map<String, Object>>();
Map<String, Object> color1ExpectedDump = new HashMap<String, Object>();
color1ExpectedDump.put(Key.TYPE.toString(), Type.STRING);
color1ExpectedDump.put(Key.VALUE.toString(), "red");
favoriteColorListExpectedDump.add(color1ExpectedDump);
Map<String, Object> color2ExpectedDump = new HashMap<String, Object>();
color2ExpectedDump.put(Key.TYPE.toString(), Type.STRING);
color2ExpectedDump.put(Key.VALUE.toString(), "orange");
favoriteColorListExpectedDump.add(color2ExpectedDump);
favoriteColorsExpectedDump.put(Key.VALUE.toString(), favoriteColorListExpectedDump);
propertiesExpectedDump.put("favoriteColors", favoriteColorsExpectedDump);
return propertiesExpectedDump;
}
} }