From f80d8df515217549f442a316a087965c95fce4a5 Mon Sep 17 00:00:00 2001 From: sgiannopoulos Date: Fri, 22 Mar 2024 17:41:00 +0200 Subject: [PATCH] add json ignore --- .../models/descriptiotemplate/DefinitionModel.java | 6 ++++++ .../models/descriptiotemplate/FieldSetModel.java | 4 ++++ .../commonmodels/models/descriptiotemplate/PageModel.java | 4 ++++ .../models/descriptiotemplate/SectionModel.java | 4 ++++ 4 files changed, 18 insertions(+) diff --git a/src/main/java/eu/eudat/commonmodels/models/descriptiotemplate/DefinitionModel.java b/src/main/java/eu/eudat/commonmodels/models/descriptiotemplate/DefinitionModel.java index aefc17a..fbad319 100644 --- a/src/main/java/eu/eudat/commonmodels/models/descriptiotemplate/DefinitionModel.java +++ b/src/main/java/eu/eudat/commonmodels/models/descriptiotemplate/DefinitionModel.java @@ -1,5 +1,7 @@ package eu.eudat.commonmodels.models.descriptiotemplate; +import com.fasterxml.jackson.annotation.JsonIgnore; + import java.util.ArrayList; import java.util.List; @@ -16,6 +18,7 @@ public class DefinitionModel { } + @JsonIgnore public List getAllField(){ List fieldEntities = new ArrayList<>(); if (this.getPages() != null){ @@ -26,6 +29,7 @@ public class DefinitionModel { return fieldEntities; } + @JsonIgnore public List getAllFieldSets(){ List fieldSetsEntities = new ArrayList<>(); if (this.getPages() != null){ @@ -36,10 +40,12 @@ public class DefinitionModel { return fieldSetsEntities; } + @JsonIgnore public List getFieldSetById(String id) { return this.getAllFieldSets().stream().filter(x-> id.equals(x.getId())).toList(); } + @JsonIgnore public List getFieldById(String id) { return this.getAllField().stream().filter(x-> id.equals(x.getId())).toList(); } diff --git a/src/main/java/eu/eudat/commonmodels/models/descriptiotemplate/FieldSetModel.java b/src/main/java/eu/eudat/commonmodels/models/descriptiotemplate/FieldSetModel.java index ad486e9..ed91943 100644 --- a/src/main/java/eu/eudat/commonmodels/models/descriptiotemplate/FieldSetModel.java +++ b/src/main/java/eu/eudat/commonmodels/models/descriptiotemplate/FieldSetModel.java @@ -1,5 +1,7 @@ package eu.eudat.commonmodels.models.descriptiotemplate; +import com.fasterxml.jackson.annotation.JsonIgnore; + import java.util.ArrayList; import java.util.List; @@ -97,10 +99,12 @@ public class FieldSetModel { + @JsonIgnore public List getAllField() { return this.getFields() == null ? new ArrayList<>() : this.getFields(); } + @JsonIgnore public List getFieldById(String id) { return this.getAllField().stream().filter(x-> id.equals(x.getId())).toList(); } diff --git a/src/main/java/eu/eudat/commonmodels/models/descriptiotemplate/PageModel.java b/src/main/java/eu/eudat/commonmodels/models/descriptiotemplate/PageModel.java index c4593ce..5b9263e 100644 --- a/src/main/java/eu/eudat/commonmodels/models/descriptiotemplate/PageModel.java +++ b/src/main/java/eu/eudat/commonmodels/models/descriptiotemplate/PageModel.java @@ -1,5 +1,7 @@ package eu.eudat.commonmodels.models.descriptiotemplate; +import com.fasterxml.jackson.annotation.JsonIgnore; + import java.util.ArrayList; import java.util.List; @@ -44,6 +46,7 @@ public class PageModel { public void setSections(List sections) { this.sections = sections; } + @JsonIgnore public List getAllField(){ List fieldEntities = new ArrayList<>(); if (this.getSections() != null){ @@ -54,6 +57,7 @@ public class PageModel { return fieldEntities; } + @JsonIgnore public List getAllFieldSets(){ List fieldSetsEntities = new ArrayList<>(); if (this.getSections() != null){ diff --git a/src/main/java/eu/eudat/commonmodels/models/descriptiotemplate/SectionModel.java b/src/main/java/eu/eudat/commonmodels/models/descriptiotemplate/SectionModel.java index 0428f1e..5bdd175 100644 --- a/src/main/java/eu/eudat/commonmodels/models/descriptiotemplate/SectionModel.java +++ b/src/main/java/eu/eudat/commonmodels/models/descriptiotemplate/SectionModel.java @@ -1,5 +1,7 @@ package eu.eudat.commonmodels.models.descriptiotemplate; +import com.fasterxml.jackson.annotation.JsonIgnore; + import java.util.ArrayList; import java.util.List; @@ -105,6 +107,7 @@ public class SectionModel { this.fieldSets = fieldSets; } + @JsonIgnore public List getAllField(){ List fieldEntities = new ArrayList<>(); if (this.getFieldSets() != null){ @@ -120,6 +123,7 @@ public class SectionModel { return fieldEntities; } + @JsonIgnore public List getAllFieldSets(){ List fieldSetEntities = new ArrayList<>(); if (this.getFieldSets() != null){