From edba4c3ec2f2de6a4e747e4f975740c41ce0c74a Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Sat, 19 Mar 2022 16:46:03 +0100 Subject: [PATCH] Removed some unused properties from the ContentSections entity --- .../contentsection/ContentSection.java | 92 +++---------------- ...e_unused_columns_from_content_sections.sql | 4 + ...e_unused_columns_from_content_sections.sql | 4 + 3 files changed, 21 insertions(+), 79 deletions(-) create mode 100644 ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/h2/V7_0_0_32__remove_unused_columns_from_content_sections.sql create mode 100644 ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/pgsql/V7_0_0_32__remove_unused_columns_from_content_sections.sql diff --git a/ccm-cms/src/main/java/org/librecms/contentsection/ContentSection.java b/ccm-cms/src/main/java/org/librecms/contentsection/ContentSection.java index 1d38d8c4e..498e1e2e0 100644 --- a/ccm-cms/src/main/java/org/librecms/contentsection/ContentSection.java +++ b/ccm-cms/src/main/java/org/librecms/contentsection/ContentSection.java @@ -164,18 +164,6 @@ public class ContentSection @JoinColumn(name = "ROOT_ASSETS_FOLDER_ID") private Folder rootAssetsFolder; - @Column(name = "PAGE_RESOLVER_CLASS", length = 1024) - private String pageResolverClass; - - @Column(name = "ITEM_RESOLVER_CLASS", length = 1024) - private String itemResolverClass; - - @Column(name = "TEMPLATE_RESOLVER_CLASS", length = 1024) - private String templateResolverClass; - - @Column(name = "XML_GENERATOR_CLASS", length = 1024) - private String xmlGeneratorClass; - @ManyToMany @JoinTable(name = "CONTENT_SECTION_ROLES", schema = DB_SCHEMA, @@ -248,38 +236,6 @@ public class ContentSection this.rootAssetsFolder = rootAssetsFolder; } - public String getPageResolverClass() { - return pageResolverClass; - } - - public void setPageResolverClass(final String pageResolverClass) { - this.pageResolverClass = pageResolverClass; - } - - public String getItemResolverClass() { - return itemResolverClass; - } - - public void setItemResolverClass(final String itemResolverClass) { - this.itemResolverClass = itemResolverClass; - } - - public String getTemplateResolverClass() { - return templateResolverClass; - } - - public void setTemplateResolverClass(final String templateResolverClass) { - this.templateResolverClass = templateResolverClass; - } - - public String getXmlGeneratorClass() { - return xmlGeneratorClass; - } - - public void setXmlGeneratorClass(final String xmlGeneratorClass) { - this.xmlGeneratorClass = xmlGeneratorClass; - } - public List getRoles() { return Collections.unmodifiableList(roles); } @@ -378,10 +334,6 @@ public class ContentSection hash = 47 * hash + Objects.hashCode(label); hash = 47 * hash + Objects.hashCode(rootDocumentsFolder); hash = 47 * hash + Objects.hashCode(rootAssetsFolder); - hash = 47 * hash + Objects.hashCode(pageResolverClass); - hash = 47 * hash + Objects.hashCode(itemResolverClass); - hash = 47 * hash + Objects.hashCode(templateResolverClass); - hash = 47 * hash + Objects.hashCode(xmlGeneratorClass); hash = 47 * hash + Objects.hashCode(defaultLocale); return hash; } @@ -414,19 +366,6 @@ public class ContentSection if (!Objects.equals(rootAssetsFolder, other.getRootAssetsFolder())) { return false; } - if (!Objects.equals(pageResolverClass, other.getPageResolverClass())) { - return false; - } - if (!Objects.equals(itemResolverClass, other.getItemResolverClass())) { - return false; - } - if (!Objects.equals(templateResolverClass, - other.getTemplateResolverClass())) { - return false; - } - if (!Objects.equals(xmlGeneratorClass, other.getXmlGeneratorClass())) { - return false; - } return Objects.equals(defaultLocale, other.getDefaultLocale()); } @@ -437,24 +376,19 @@ public class ContentSection @Override public String toString(final String data) { - return super.toString(String.format( - ", label = \"%s\", " - + "rootDocumentsFolder = \"%s\", " - + "rootAssetsFolder = \"%s\", " - + "pageResolverClass = \"%s\", " - + "itemResolverClass = \"%s\", " - + "templateResolverClass = \"%s\", " - + "xmlGeneratorClass = \"%s\", " - + "defaultLocale = \"%s\"%s", - label, - Objects.toString(rootDocumentsFolder), - Objects.toString(rootAssetsFolder), - pageResolverClass, - itemResolverClass, - templateResolverClass, - xmlGeneratorClass, - Objects.toString(defaultLocale), - data)); + return super.toString( + String.format( + ", label = \"%s\", " + + "rootDocumentsFolder = \"%s\", " + + "rootAssetsFolder = \"%s\", " + + "defaultLocale = \"%s\"%s", + label, + Objects.toString(rootDocumentsFolder), + Objects.toString(rootAssetsFolder), + Objects.toString(defaultLocale), + data + ) + ); } } diff --git a/ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/h2/V7_0_0_32__remove_unused_columns_from_content_sections.sql b/ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/h2/V7_0_0_32__remove_unused_columns_from_content_sections.sql new file mode 100644 index 000000000..76504aa46 --- /dev/null +++ b/ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/h2/V7_0_0_32__remove_unused_columns_from_content_sections.sql @@ -0,0 +1,4 @@ +alter table CCM_CMS.CONTENT_SECTIONS drop column PAGE_RESOLVER_CLASS; +alter table CCM_CMS.CONTENT_SECTIONS drop column ITEM_RESOLVER_CLASS; +alter table CCM_CMS.CONTENT_SECTIONS drop column TEMPLATE_RESOLVER_CLASS; +alter table CCM_CMS.CONTENT_SECTIONS drop column XML_GENERATOR_CLASS; diff --git a/ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/pgsql/V7_0_0_32__remove_unused_columns_from_content_sections.sql b/ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/pgsql/V7_0_0_32__remove_unused_columns_from_content_sections.sql new file mode 100644 index 000000000..76504aa46 --- /dev/null +++ b/ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/pgsql/V7_0_0_32__remove_unused_columns_from_content_sections.sql @@ -0,0 +1,4 @@ +alter table CCM_CMS.CONTENT_SECTIONS drop column PAGE_RESOLVER_CLASS; +alter table CCM_CMS.CONTENT_SECTIONS drop column ITEM_RESOLVER_CLASS; +alter table CCM_CMS.CONTENT_SECTIONS drop column TEMPLATE_RESOLVER_CLASS; +alter table CCM_CMS.CONTENT_SECTIONS drop column XML_GENERATOR_CLASS;