Removed converting for string

Author: anzin

resources/fileTemplates/internal/Magento Data Model.php.ft

@@ -55,8 +55,9 @@ class ${NAME} #if (${EXTENDS})extends ${EXTENDS} #end #if (${IMPLEMENTS} && $has
             #end
             public function get$propertyUpperCamel(): ?$propertyType
             {
+                #set($propertyCast = "#if($propertyType != 'string')($propertyType)#{else}#end")
                 return $this->getData(self::$propertyUpperSnake) === null ? null
-                    : ($propertyType) $this->getData(self::$propertyUpperSnake);
+                    : $propertyCast $this->getData(self::$propertyUpperSnake);
             }
 
             #if ($hasInterface)

testData/actions/generation/generator/DataModelGenerator/generateDataModel/Sample.php

@@ -8,13 +8,30 @@
 
 class Sample extends DataObject implements SampleInterface
 {
+    /**
+     * @inheritDoc
+     */
+    public function getIdProperty(): ?int
+    {
+        return $this->getData(self::ID_PROPERTY) === null ? null
+            : (int)$this->getData(self::ID_PROPERTY);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setIdProperty(?int $idProperty): void
+    {
+        $this->setData(self::ID_PROPERTY, $idProperty);
+    }
+
     /**
      * @inheritDoc
      */
     public function getSampleProperty(): ?string
     {
         return $this->getData(self::SAMPLE_PROPERTY) === null ? null
-            : (string)$this->getData(self::SAMPLE_PROPERTY);
+            : $this->getData(self::SAMPLE_PROPERTY);
     }
 
     /**

testData/actions/generation/generator/DataModelGenerator/generateDataModelWithoutInterface/Sample.php

@@ -10,8 +10,32 @@ class Sample extends DataObject
     /**
      * String constants for property names
      */
+    const ID_PROPERTY = "id_property";
     const SAMPLE_PROPERTY = "sample_property";
 
+    /**
+     * Getter for IdProperty.
+     *
+     * @return int|null
+     */
+    public function getIdProperty(): ?int
+    {
+        return $this->getData(self::ID_PROPERTY) === null ? null
+            : (int)$this->getData(self::ID_PROPERTY);
+    }
+
+    /**
+     * Setter for IdProperty.
+     *
+     * @param int|null $idProperty
+     *
+     * @return void
+     */
+    public function setIdProperty(?int $idProperty): void
+    {
+        $this->setData(self::ID_PROPERTY, $idProperty);
+    }
+
     /**
      * Getter for SampleProperty.
      *
@@ -20,7 +44,7 @@ class Sample extends DataObject
     public function getSampleProperty(): ?string
     {
         return $this->getData(self::SAMPLE_PROPERTY) === null ? null
-            : (string)$this->getData(self::SAMPLE_PROPERTY);
+            : $this->getData(self::SAMPLE_PROPERTY);
     }
 
     /**

testData/actions/generation/generator/DataModelInterfaceGenerator/generateDataModelInterface/SampleInterface.php

@@ -8,8 +8,25 @@ interface SampleInterface
     /**
      * String constants for property names
      */
+    const ID_PROPERTY = "id_property";
     const SAMPLE_PROPERTY = "sample_property";
 
+    /**
+     * Getter for IdProperty.
+     *
+     * @return int|null
+     */
+    public function getIdProperty(): ?int;
+
+    /**
+     * Setter for IdProperty.
+     *
+     * @param int|null $idProperty
+     *
+     * @return void
+     */
+    public function setIdProperty(?int $idProperty): void;
+
     /**
      * Getter for SampleProperty.
      *

tests/com/magento/idea/magento2plugin/actions/generation/generator/DataModelGeneratorTest.java

@@ -22,7 +22,8 @@ public void testGenerateDataModel() {
                 "Foo_Bar",
                 "Foo\\Bar\\Model\\Data\\Sample",
                 "Foo\\Bar\\Api\\Data\\SampleInterface",
-                "SAMPLE_PROPERTY;sample_property;string;SampleProperty;sampleProperty",
+                "ID_PROPERTY;id_property;int;IdProperty;idProperty," +
+                        "SAMPLE_PROPERTY;sample_property;string;SampleProperty;sampleProperty",
                 true
         );
         final DataModelGenerator generator = new DataModelGenerator(
@@ -50,7 +51,8 @@ public void testGenerateDataModelWithoutInterface() {
                 "Foo_Bar",
                 "Foo\\Bar\\Model\\Data\\Sample",
                 "Foo\\Bar\\Api\\Data\\SampleInterface",
-                "SAMPLE_PROPERTY;sample_property;string;SampleProperty;sampleProperty",
+                "ID_PROPERTY;id_property;int;IdProperty;idProperty," +
+                        "SAMPLE_PROPERTY;sample_property;string;SampleProperty;sampleProperty",
                 false
         );
         final DataModelGenerator generator = new DataModelGenerator(

tests/com/magento/idea/magento2plugin/actions/generation/generator/DataModelInterfaceGeneratorTest.java

@@ -21,7 +21,8 @@ public void testGenerateDataModelInterface() {
                 "SampleInterface",
                 "Foo_Bar",
                 "Foo\\Bar\\Api\\Data\\SampleInterface",
-                "SAMPLE_PROPERTY;sample_property;string;SampleProperty;sampleProperty"
+                "ID_PROPERTY;id_property;int;IdProperty;idProperty," +
+                        "SAMPLE_PROPERTY;sample_property;string;SampleProperty;sampleProperty"
         );
         final DataModelInterfaceGenerator generator = new DataModelInterfaceGenerator(
                 project, interfaceData