From 987a4226ba48e6164d738a1f060c0b6262a3f9c8 Mon Sep 17 00:00:00 2001 From: Deep Prakash Dewanji Date: Thu, 26 Sep 2024 15:02:52 +0530 Subject: [PATCH 1/3] fix: removed json encoding as 6.5 needs huge version bump in sightly packages to support this encoding --- .../components/internal/form/FormStructureParserImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/FormStructureParserImpl.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/FormStructureParserImpl.java index ff4134129a..b4ec343de1 100644 --- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/FormStructureParserImpl.java +++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/FormStructureParserImpl.java @@ -123,11 +123,11 @@ public String getFormDefinition() { String result = null; FormContainer formContainer = resource.adaptTo(FormContainer.class); try { - HTMLCharacterEscapes htmlCharacterEscapes = new HTMLCharacterEscapes(); +// HTMLCharacterEscapes htmlCharacterEscapes = new HTMLCharacterEscapes(); ObjectMapper mapper = new ObjectMapper(); Writer writer = new StringWriter(); ObjectWriter objectWriter = mapper.writerWithView(Views.Publish.class); - objectWriter.getFactory().setCharacterEscapes(htmlCharacterEscapes); +// objectWriter.getFactory().setCharacterEscapes(htmlCharacterEscapes); // return publish view specific properties only for runtime objectWriter.writeValue(writer, formContainer); result = writer.toString(); From 12455dc37b64d00ce5f6b48cb6bc01646a3f694a Mon Sep 17 00:00:00 2001 From: Deep Prakash Dewanji Date: Thu, 26 Sep 2024 15:14:07 +0530 Subject: [PATCH 2/3] fix: removed json encoding as 6.5 needs huge version bump in sightly packages to support this encoding --- .../components/internal/form/FormStructureParserImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/FormStructureParserImpl.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/FormStructureParserImpl.java index b4ec343de1..6f8d281ebc 100644 --- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/FormStructureParserImpl.java +++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/FormStructureParserImpl.java @@ -123,11 +123,11 @@ public String getFormDefinition() { String result = null; FormContainer formContainer = resource.adaptTo(FormContainer.class); try { -// HTMLCharacterEscapes htmlCharacterEscapes = new HTMLCharacterEscapes(); + // HTMLCharacterEscapes htmlCharacterEscapes = new HTMLCharacterEscapes(); ObjectMapper mapper = new ObjectMapper(); Writer writer = new StringWriter(); ObjectWriter objectWriter = mapper.writerWithView(Views.Publish.class); -// objectWriter.getFactory().setCharacterEscapes(htmlCharacterEscapes); + // objectWriter.getFactory().setCharacterEscapes(htmlCharacterEscapes); // return publish view specific properties only for runtime objectWriter.writeValue(writer, formContainer); result = writer.toString(); From a1626c84c5f29833e25cef1c915ce3196c16cfb4 Mon Sep 17 00:00:00 2001 From: Deep Prakash Dewanji Date: Thu, 26 Sep 2024 18:47:07 +0530 Subject: [PATCH 3/3] fix: removed json encoding as 6.5 needs huge version bump in sightly packages to support this encoding --- .../core/components/internal/form/FormStructureParserImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/FormStructureParserImpl.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/FormStructureParserImpl.java index 6f8d281ebc..e4516cf5be 100644 --- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/FormStructureParserImpl.java +++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/FormStructureParserImpl.java @@ -123,6 +123,8 @@ public String getFormDefinition() { String result = null; FormContainer formContainer = resource.adaptTo(FormContainer.class); try { + // commenting the below line because this is causing problem in json encoding + // and solving this requires huge bump in 6.5 // HTMLCharacterEscapes htmlCharacterEscapes = new HTMLCharacterEscapes(); ObjectMapper mapper = new ObjectMapper(); Writer writer = new StringWriter();