Finish Hotfix-53

This commit is contained in:
2024-03-11 19:13:46 +01:00

View File

@@ -280,12 +280,14 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
return this.type; return this.type;
} }
@JsonIgnore
public String getTableName() { public String getTableName() {
Table t = getClass().getAnnotation(Table.class); Table t = getClass().getAnnotation(Table.class);
if (t != null) return t.value(); if (t != null) return t.value();
else return ""; else return "";
} }
@JsonIgnore
public Boolean getLoadedFromDb() { public Boolean getLoadedFromDb() {
return this.loadedFromDb; return this.loadedFromDb;
} }
@@ -303,6 +305,7 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
this.username = username; this.username = username;
} }
@JsonIgnore
public String getApplicationName() { public String getApplicationName() {
return applicationName; return applicationName;
} }
@@ -321,6 +324,7 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
this.dbName = dbName; this.dbName = dbName;
} }
@JsonIgnore
public EntityPropertyHolder getEntityHolder() { public EntityPropertyHolder getEntityHolder() {
return entityHolder == null ? ContextLoader.getCurrentWebApplicationContext().getBean(EntityPropertyHolder.class) : entityHolder; return entityHolder == null ? ContextLoader.getCurrentWebApplicationContext().getBean(EntityPropertyHolder.class) : entityHolder;
} }
@@ -329,6 +333,7 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
this.entityHolder = entityHolder; this.entityHolder = entityHolder;
} }
@JsonIgnore
public DroolsDataCompleting getCompletingManager() { public DroolsDataCompleting getCompletingManager() {
return dataCompleting == null ? ContextLoader.getCurrentWebApplicationContext().getBean(DroolsDataCompleting.class) : dataCompleting; return dataCompleting == null ? ContextLoader.getCurrentWebApplicationContext().getBean(DroolsDataCompleting.class) : dataCompleting;
} }
@@ -337,6 +342,7 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
this.dataCompleting = dataCompleting; this.dataCompleting = dataCompleting;
} }
@JsonIgnore
public Boolean getOnlyPkMaster() { public Boolean getOnlyPkMaster() {
return onlyPkMaster; return onlyPkMaster;
} }
@@ -353,6 +359,7 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
this.nativeSql = nativeSql; this.nativeSql = nativeSql;
} }
@JsonIgnore
public HashMap<String, Object> getOldPk() { public HashMap<String, Object> getOldPk() {
return oldPk; return oldPk;
} }
@@ -362,6 +369,7 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
return this; return this;
} }
@JsonIgnore
public Boolean getExecuteRecalc() { public Boolean getExecuteRecalc() {
return executeRecalc; return executeRecalc;
} }
@@ -370,6 +378,7 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
this.executeRecalc = executeRecalc; this.executeRecalc = executeRecalc;
} }
@JsonIgnore
public String getWhereCond() { public String getWhereCond() {
return whereCond; return whereCond;
} }
@@ -378,6 +387,7 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
this.whereCond = whereCond; this.whereCond = whereCond;
} }
@JsonIgnore
public List<String> getExcludedColumns() { public List<String> getExcludedColumns() {
return excludedColumns; return excludedColumns;
} }
@@ -388,6 +398,7 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
} }
} }
@JsonIgnore
public List<String> getRecalcColumns() { public List<String> getRecalcColumns() {
return recalcColumns; return recalcColumns;
} }
@@ -1086,6 +1097,7 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
} }
@JsonIgnore
public List<ForeignKeyDTO> getChkConstraintSql() { public List<ForeignKeyDTO> getChkConstraintSql() {
List<ForeignKeyDTO> listConstraintDTO = new ArrayList<ForeignKeyDTO>(); List<ForeignKeyDTO> listConstraintDTO = new ArrayList<ForeignKeyDTO>();
List<Field> fields = getEntityHolder().getFields(this.getClass()); List<Field> fields = getEntityHolder().getFields(this.getClass());
@@ -1649,6 +1661,7 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
deleteAllEntities(conn, whereCondDel); deleteAllEntities(conn, whereCondDel);
} }
@JsonIgnore
private String getWhereCondDelete() throws Exception { private String getWhereCondDelete() throws Exception {
Field[] fields = this.getClass().getDeclaredFields(); Field[] fields = this.getClass().getDeclaredFields();
List<String> where = getPkWhereCond(fields, this); List<String> where = getPkWhereCond(fields, this);
@@ -1675,6 +1688,7 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
this.delete(); this.delete();
} }
@JsonIgnore
public String getPkWhereCond() throws IllegalAccessException { public String getPkWhereCond() throws IllegalAccessException {
Field[] fields = this.getClass().getDeclaredFields(); Field[] fields = this.getClass().getDeclaredFields();
List<String> where = getPkWhereCond(fields, this); List<String> where = getPkWhereCond(fields, this);
@@ -1777,6 +1791,7 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
} }
} }
@JsonIgnore
private String getWhereCondOldPk() throws IllegalAccessException, IOException, FieldMissingException { private String getWhereCondOldPk() throws IllegalAccessException, IOException, FieldMissingException {
Field[] fields = this.getClass().getDeclaredFields(); Field[] fields = this.getClass().getDeclaredFields();
List<String> where = getPkWhereCond(fields, this); List<String> where = getPkWhereCond(fields, this);
@@ -2047,6 +2062,7 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
return builder.toString(); return builder.toString();
} }
@JsonIgnore
public Long getTransactionGroupId() { public Long getTransactionGroupId() {
return transactionGroupId; return transactionGroupId;
} }