Move InputType default to config #11418

save changes

Author: anatol-sialitski

modules/core/core-api/src/main/java/com/enonic/xp/inputtype/InputTypeDefault.java

@@ -7,7 +7,6 @@
 
 import com.enonic.xp.data.Property;
 import com.enonic.xp.data.PropertyTree;
-import com.enonic.xp.form.Input;
 import com.enonic.xp.util.GeoPoint;
 import com.enonic.xp.util.Reference;
 
@@ -79,14 +78,4 @@ protected final Property longProperty( final long value )
         final PropertyTree tree = new PropertyTree();
         return tree.addLong( "test", value );
     }
-
-    protected final Input.Builder getDefaultInputBuilder( final InputTypeName inputTypeName, final String defaultValue )
-    {
-        final InputTypeProperty defaultProperty = InputTypeProperty.create( "default", PropertyValue.stringValue( defaultValue ) ).build();
-
-        final InputTypeDefault inputTypeDefault = InputTypeDefault.create().property( defaultProperty ).build();
-
-        return Input.create().name( "inputName" ).label( "label" ).inputType( inputTypeName ).defaultValue( inputTypeDefault );
-
-    }
 }

modules/core/core-api/src/main/java/com/enonic/xp/page/PageDefaultValuesProcessor.java

@@ -5,7 +5,6 @@
 import com.enonic.xp.data.Value;
 import com.enonic.xp.data.ValueFactory;
 import com.enonic.xp.data.ValueTypes;
-import com.enonic.xp.form.Input;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -42,18 +41,6 @@ public void testCreateProperty()
         assertSame( ValueTypes.BOOLEAN, value.getType() );
     }
 
-    @Test
-    public void testCreateDefaultValue()
-    {
-        final Input input = getDefaultInputBuilder( InputTypeName.CHECK_BOX, "checked" ).build();
-
-        final Value value = this.type.createDefaultValue( input );
-
-        assertNotNull( value );
-        assertEquals( "true", value.toString() );
-
-    }
-
     @Test
     public void testValidate()
     {

modules/core/core-api/src/test/java/com/enonic/xp/inputtype/BaseInputTypeTest.java

@@ -7,7 +7,6 @@
 import com.enonic.xp.data.Value;
 import com.enonic.xp.data.ValueFactory;
 import com.enonic.xp.data.ValueTypes;
-import com.enonic.xp.form.Input;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -44,18 +43,6 @@ public void testCreateProperty()
         assertSame( ValueTypes.STRING, value.getType() );
     }
 
-    @Test
-    public void testCreateDefaultValue()
-    {
-        final Input input = getDefaultInputBuilder( InputTypeName.COMBO_BOX, "testOption" ).build();
-
-        final Value value = this.type.createDefaultValue( input );
-
-        assertNotNull( value );
-        assertEquals( "testOption", value.toString() );
-
-    }
-
     @Test
     public void testValidate()
     {

modules/core/core-api/src/test/java/com/enonic/xp/inputtype/CheckBoxTypeTest.java

@@ -5,7 +5,6 @@
 import com.enonic.xp.data.Value;
 import com.enonic.xp.data.ValueFactory;
 import com.enonic.xp.data.ValueTypes;
-import com.enonic.xp.form.Input;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -42,17 +41,6 @@ public void testCreateProperty()
         assertSame( ValueTypes.STRING, value.getType() );
     }
 
-    @Test
-    public void testCreateDefaultValue()
-    {
-        final Input input = getDefaultInputBuilder( InputTypeName.CUSTOM_SELECTOR, "testValue" ).build();
-        final Value value = this.type.createDefaultValue( input );
-
-        assertNotNull( value );
-        assertEquals( "testValue", value.toString() );
-
-    }
-
     @Test
     public void testValidate()
     {

modules/core/core-api/src/test/java/com/enonic/xp/inputtype/ComboBoxTypeTest.java

@@ -5,7 +5,6 @@
 import com.enonic.xp.data.Value;
 import com.enonic.xp.data.ValueFactory;
 import com.enonic.xp.data.ValueTypes;
-import com.enonic.xp.form.Input;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -42,26 +41,6 @@ public void testCreateProperty()
         assertSame( ValueTypes.LOCAL_DATE_TIME, value.getType() );
     }
 
-    @Test
-    public void testCreateDefaultValue()
-    {
-        final Input input = getDefaultInputBuilder( InputTypeName.DATE_TIME, "2014-08-16T05:03:45" ).build();
-
-        final Value value = this.type.createDefaultValue( input );
-
-        assertNotNull( value );
-        assertSame( ValueTypes.LOCAL_DATE_TIME, value.getType() );
-        assertEquals( "2014-08-16T05:03:45", value.toString() );
-    }
-
-    @Test
-    public void testRelativeDefaultValue_date_time_invalid()
-    {
-        final Input input = getDefaultInputBuilder( InputTypeName.DATE_TIME, "+1year -5months -36d +2minutes -1haaur" ).build();
-
-        assertThrows( IllegalArgumentException.class, () -> this.type.createDefaultValue( input ) );
-    }
-
     @Test
     public void testValidate_dateTime()
     {

modules/core/core-api/src/test/java/com/enonic/xp/inputtype/CustomSelectorTypeTest.java

@@ -1,13 +1,10 @@
 package com.enonic.xp.inputtype;
 
-import java.time.LocalDate;
-
 import org.junit.jupiter.api.Test;
 
 import com.enonic.xp.data.Value;
 import com.enonic.xp.data.ValueFactory;
 import com.enonic.xp.data.ValueTypes;
-import com.enonic.xp.form.Input;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -44,38 +41,6 @@ public void testCreateProperty()
         assertSame( ValueTypes.LOCAL_DATE, value.getType() );
     }
 
-    @Test
-    public void testCreateDefaultValue()
-    {
-        final Input input = getDefaultInputBuilder( InputTypeName.DATE, "2014-08-16" ).build();
-
-        final Value value = this.type.createDefaultValue( input );
-
-        assertNotNull( value );
-        assertSame( ValueTypes.LOCAL_DATE, value.getType() );
-        assertEquals( value.toString(), "2014-08-16" );
-    }
-
-    @Test
-    public void testRelativeDefaultValue()
-    {
-        final Input input = getDefaultInputBuilder( InputTypeName.DATE, "+1year -5months -36d" ).build();
-
-        final Value value = this.type.createDefaultValue( input );
-
-        assertNotNull( value );
-        assertSame( ValueTypes.LOCAL_DATE, value.getType() );
-        assertEquals( value.getObject(), LocalDate.now().plusYears( 1 ).plusMonths( -5 ).plusDays( -36 ) );
-    }
-
-    @Test
-    public void testCreateDefaultValue_invalid()
-    {
-        final Input input = getDefaultInputBuilder( InputTypeName.DATE, "2014-18-16" ).build();
-
-        assertThrows(IllegalArgumentException.class, () -> this.type.createDefaultValue( input ) );
-    }
-
     @Test
     public void testValidate()
     {

modules/core/core-api/src/test/java/com/enonic/xp/inputtype/DateTimeTypeTest.java

@@ -5,7 +5,6 @@
 import com.enonic.xp.data.Value;
 import com.enonic.xp.data.ValueFactory;
 import com.enonic.xp.data.ValueTypes;
-import com.enonic.xp.form.Input;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -41,17 +40,6 @@ public void testCreateProperty()
         assertSame( ValueTypes.DOUBLE, value.getType() );
     }
 
-    @Test
-    public void testCreateDefaultValue()
-    {
-        final Input input = getDefaultInputBuilder( InputTypeName.DOUBLE, "1.3" ).build();
-
-        final Value value = this.type.createDefaultValue( input );
-
-        assertNotNull( value );
-        assertEquals( 1.3D, value.asDouble(), Double.MIN_NORMAL );
-    }
-
     @Test
     public void testValidate()
     {

modules/core/core-api/src/test/java/com/enonic/xp/inputtype/DateTypeTest.java

@@ -5,7 +5,6 @@
 import com.enonic.xp.data.Value;
 import com.enonic.xp.data.ValueFactory;
 import com.enonic.xp.data.ValueTypes;
-import com.enonic.xp.form.Input;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -42,25 +41,6 @@ public void testCreateProperty()
         assertSame( ValueTypes.GEO_POINT, value.getType() );
     }
 
-    @Test
-    public void testCreateDefaultValue()
-    {
-        final Input input = getDefaultInputBuilder( InputTypeName.GEO_POINT, "41.387588,2.169994" ).build();
-
-        final Value value = this.type.createDefaultValue( input );
-
-        assertNotNull( value );
-        assertEquals( "41.387588,2.169994", value.toString() );
-
-    }
-
-    @Test
-    public void testCreateDefaultValue_invalid()
-    {
-        final Input input = getDefaultInputBuilder( InputTypeName.GEO_POINT, "41.387588;2.169994" ).build();
-        assertThrows(IllegalArgumentException.class, () -> this.type.createDefaultValue( input ) );
-    }
-
     @Test
     public void testValidate()
     {