incorporating review comments

adobe · Sep 23, 2024 · c6aa36c · c6aa36c
1 parent c46ad17
commit c6aa36c
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/...core/src/main/java/com/adobe/cq/forms/core/components/util/AbstractFormComponentImpl.java b/...core/src/main/java/com/adobe/cq/forms/core/components/util/AbstractFormComponentImpl.java
@@ -80,7 +80,7 @@ public class AbstractFormComponentImpl extends AbstractComponentImpl implements
     // mandatory property else adapt should fail for adaptive form components
     @ValueMapValue(injectionStrategy = InjectionStrategy.OPTIONAL, name = ReservedProperties.PN_FIELDTYPE)
     protected String fieldTypeJcr;
-    protected FieldType fieldType;
+    private FieldType fieldType;
 
     @ValueMapValue(injectionStrategy = InjectionStrategy.OPTIONAL, name = ReservedProperties.PN_NAME)
     @Nullable

diff --git a/.../test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/ButtonImplTest.java b/.../test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/ButtonImplTest.java
@@ -147,6 +147,5 @@ void testGetProperties() {
     void testNoFieldType() {
         Button button = Utils.getComponentUnderTest(PATH_BUTTON_NO_FIELDTYPE, Button.class, context);
         assertEquals(FieldType.BUTTON.getValue(), button.getFieldType());
-        Utils.testJSONExport(button, Utils.getTestExporterJSONPath(BASE, PATH_BUTTON_NO_FIELDTYPE));
     }
 }
diff --git a/bundles/af-core/src/test/resources/schema/0.14.1/adaptive-form.schema.json b/bundles/af-core/src/test/resources/schema/0.14.1/adaptive-form.schema.json
@@ -811,9 +811,7 @@
             "rules",
             "screenReaderText",
             "tooltip",
-            "visible",
-            "type",
-            "buttonType"
+            "visible"
           ],
           "errorMessage": {
             "enum": "${0} property is not allowed in Button"