1 files changed, 5 insertions, 19 deletions
diff --git a/src/components/smart_objects/include/smart_objects/number_schema_item.h b/src/components/smart_objects/include/smart_objects/number_schema_item.h
index fb4d287fe4..f5dd8ba42b 100644
--- a/src/components/smart_objects/include/smart_objects/number_schema_item.h
+++ b/src/components/smart_objects/include/smart_objects/number_schema_item.h
@@ -85,10 +85,7 @@ class TNumberSchemaItem : public CDefaultSchemaItem<NumberType> {
   TNumberSchemaItem(const TSchemaItemParameter<NumberType>& MinValue,
                     const TSchemaItemParameter<NumberType>& MaxValue,
                     const TSchemaItemParameter<NumberType>& DefaultValue);
-  /**
-   * @brief Compares if param value type is correct
-   **/
-  bool isValidNumberType(SmartType type);
+  bool isNumberType(SmartType type);
 
   /**
    * @brief Minimum and Maximum allowed values.
@@ -108,27 +105,16 @@ TNumberSchemaItem<NumberType>::create(
 }
 
 template<typename NumberType>
-bool TNumberSchemaItem<NumberType>::isValidNumberType(SmartType type) {
-  NumberType value(0);
-  if ((SmartType_Double == type) &&
-	  (typeid(double) == typeid(value))) {
-	  return true;
-  } else if ((SmartType_Integer == type) &&
-		     (typeid(int32_t) == typeid(value)  ||
-		      typeid(uint32_t) == typeid(value) ||
-		      typeid(int64_t) == typeid(value))) {
-	  return true;
-  } else {
-	  return false;
-  }
+bool TNumberSchemaItem<NumberType>::isNumberType(SmartType type) {
+  return SmartType_Integer == type || SmartType_Double == type;
 }
 
 template<typename NumberType>
 Errors::eType TNumberSchemaItem<NumberType>::validate(const SmartObject& Object) {
-  if (!isValidNumberType(Object.getType())) {
+  if (!isNumberType(Object.getType())) {
     return Errors::INVALID_VALUE;
   }
-  NumberType value(0);
+  NumberType value;
   if (typeid(int32_t) == typeid(value)) {
     value = Object.asInt();
   } else if (typeid(uint32_t) == typeid(value)) {