Revert responseJSONObjectMapper

This commit is contained in:
2024-03-04 15:15:20 +01:00
parent 10f6702573
commit 5104bdb53f

View File

@@ -38,40 +38,35 @@ public class ResponseJSONObjectMapper extends CommonObjectMapper {
writer.serializeAsField(pojo, jgen, provider);
return;
} else {
boolean isEntityBase = false;
boolean onlyPkMaster = true;
EntityBase entityBase = null;
Boolean onlyPkMaster = true;
if (pojo instanceof EntityBase) {
isEntityBase = true;
entityBase = (EntityBase) pojo;
onlyPkMaster = ((EntityBase) pojo).getOnlyPkMaster();
}
if (isEntityBase){
onlyPkMaster = entityBase.getOnlyPkMaster();
if(onlyPkMaster &&
(entityBase.getOperation() == OperationType.SELECT_OBJECT ||
entityBase.getOperation() == OperationType.SELECT))
onlyPkMaster = false;
}
Field f = pojo.getClass().getDeclaredField(writer.getName());
if (f != null) {
PK pk = f.getAnnotation(PK.class);
SqlField sqlField = f.getAnnotation(SqlField.class);
EntityChild child = f.getAnnotation(EntityChild.class);
if (!onlyPkMaster) {
writer.serializeAsField(pojo, jgen, provider);
} else {
if (pk != null || child != null || (sqlField != null && sqlField.isReturned())) {
if (((EntityBase) pojo).getOperation() == OperationType.SELECT ||
((EntityBase) pojo).getOperation() == OperationType.SELECT_OBJECT) {
if (f.getGenericType() != null) {
writer.serializeAsField(pojo, jgen, provider);
}
} else {
if (onlyPkMaster && child != null)
return;
if (pk != null || child != null || (sqlField != null && sqlField.isReturned())) {
writer.serializeAsField(pojo, jgen, provider);
}
}
return;
}
}
} catch (Exception e) {
@@ -106,4 +101,5 @@ public class ResponseJSONObjectMapper extends CommonObjectMapper {
setupModules(module);
}
}