mirror of
https://github.com/ebean-orm/ebean.git
synced 2026-11-18 14:58:47 +00:00
Fix for #91 Stateless Update API Change, #90 Removed BeanState.setReference(), #89 Remove support for multiple @Id properties
This commit is contained in:
1 parent
5e2d592c2a
commit
0d1c9e2883
66 files changed
+1045
-1768
No files matched your search
@@ -29,9 +29,6 @@ import com.avaje.ebeaninternal.server.el.ElPropertyValue;
|
||||
*/
|
||||
public class TCsvReader<T> implements CsvReader<T> {
|
||||
|
||||
// private static final Logger logger =
|
||||
// Logger.getLogger(TCsvReader.class.getName());
|
||||
|
||||
private static final TimeStringParser TIME_PARSER = new TimeStringParser();
|
||||
|
||||
private final EbeanServer server;
|
||||
@@ -113,14 +110,6 @@ public class TCsvReader<T> implements CsvReader<T> {
|
||||
addProperty(propertyName, null);
|
||||
}
|
||||
|
||||
public void addReference(String propertyName) {
|
||||
addProperty(propertyName, null, true);
|
||||
}
|
||||
|
||||
public void addProperty(String propertyName, StringParser parser) {
|
||||
addProperty(propertyName, parser, false);
|
||||
}
|
||||
|
||||
public void addDateTime(String propertyName, String dateTimeFormat) {
|
||||
addDateTime(propertyName, dateTimeFormat, Locale.getDefault());
|
||||
}
|
||||
@@ -143,7 +132,7 @@ public class TCsvReader<T> implements CsvReader<T> {
|
||||
SimpleDateFormat sdf = new SimpleDateFormat(dateTimeFormat, locale);
|
||||
DateTimeParser parser = new DateTimeParser(sdf, dateTimeFormat, elProp);
|
||||
|
||||
CsvColumn column = new CsvColumn(elProp, parser, false);
|
||||
CsvColumn column = new CsvColumn(elProp, parser);
|
||||
columnList.add(column);
|
||||
}
|
||||
|
||||
@@ -161,13 +150,13 @@ public class TCsvReader<T> implements CsvReader<T> {
|
||||
}
|
||||
}
|
||||
|
||||
public void addProperty(String propertyName, StringParser parser, boolean reference) {
|
||||
public void addProperty(String propertyName, StringParser parser) {
|
||||
|
||||
ElPropertyValue elProp = descriptor.getElGetValue(propertyName);
|
||||
if (parser == null) {
|
||||
parser = elProp.getStringParser();
|
||||
}
|
||||
CsvColumn column = new CsvColumn(elProp, parser, reference);
|
||||
CsvColumn column = new CsvColumn(elProp, parser);
|
||||
columnList.add(column);
|
||||
}
|
||||
|
||||
@@ -250,7 +239,7 @@ public class TCsvReader<T> implements CsvReader<T> {
|
||||
} else if (elProp.isAssocProperty()) {
|
||||
BeanPropertyAssocOne<?> assocOne = (BeanPropertyAssocOne<?>) elProp.getBeanProperty();
|
||||
String idProp = assocOne.getBeanDescriptor().getIdBinder().getIdProperty();
|
||||
addReference(line[i] + "." + idProp);
|
||||
addProperty(line[i] + "." + idProp);
|
||||
} else {
|
||||
addProperty(line[i]);
|
||||
}
|
||||
@@ -304,7 +293,6 @@ public class TCsvReader<T> implements CsvReader<T> {
|
||||
private final ElPropertyValue elProp;
|
||||
private final StringParser parser;
|
||||
private final boolean ignore;
|
||||
private final boolean reference;
|
||||
|
||||
/**
|
||||
* Constructor for the IGNORE column.
|
||||
@@ -312,17 +300,15 @@ public class TCsvReader<T> implements CsvReader<T> {
|
||||
private CsvColumn() {
|
||||
this.elProp = null;
|
||||
this.parser = null;
|
||||
this.reference = false;
|
||||
this.ignore = true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Construct with a property and parser.
|
||||
*/
|
||||
public CsvColumn(ElPropertyValue elProp, StringParser parser, boolean reference) {
|
||||
public CsvColumn(ElPropertyValue elProp, StringParser parser) {
|
||||
this.elProp = elProp;
|
||||
this.parser = parser;
|
||||
this.reference = reference;
|
||||
this.ignore = false;
|
||||
}
|
||||
|
||||
@@ -333,7 +319,7 @@ public class TCsvReader<T> implements CsvReader<T> {
|
||||
|
||||
if (!ignore) {
|
||||
Object value = parser.parse(strValue);
|
||||
elProp.elSetValue(bean, value, true, reference);
|
||||
elProp.elSetValue(bean, value, true);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -163,8 +163,7 @@ public class ReadJsonContext extends ReadBasicJsonContext {
|
||||
|
||||
public void setLoadedState(){
|
||||
if (ebi != null){
|
||||
// takes into account reference beans
|
||||
beanDescriptor.setLoadedProps(ebi, loadedProps);
|
||||
ebi.setLoaded();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -344,7 +344,7 @@ public class WriteJsonContext implements JsonWriter {
|
||||
}
|
||||
|
||||
public WriteBeanState pushBeanState(Object bean) {
|
||||
WriteBeanState newState = new WriteBeanState(bean);
|
||||
WriteBeanState newState = new WriteBeanState();//bean);
|
||||
WriteBeanState prevState = beanState;
|
||||
beanState = newState;
|
||||
return prevState;
|
||||
@@ -354,26 +354,15 @@ public class WriteJsonContext implements JsonWriter {
|
||||
this.beanState = previousState;
|
||||
}
|
||||
|
||||
public boolean isReferenceBean() {
|
||||
return beanState.isReferenceBean();
|
||||
}
|
||||
|
||||
|
||||
public static class WriteBeanState {
|
||||
|
||||
private final EntityBeanIntercept ebi;
|
||||
private final boolean referenceBean;
|
||||
private boolean firstKeyOut;
|
||||
|
||||
public WriteBeanState(Object bean) {
|
||||
this.ebi = ((EntityBean)bean)._ebean_getIntercept();
|
||||
this.referenceBean = ebi.isReference();
|
||||
public WriteBeanState() {
|
||||
|
||||
}
|
||||
|
||||
public boolean isReferenceBean() {
|
||||
return referenceBean;
|
||||
}
|
||||
|
||||
public boolean isFirstKey() {
|
||||
if (!firstKeyOut){
|
||||
firstKeyOut = true;
|
||||
|
||||
Reference in new issue
Block a user