summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjacobkeeler <jacob.keeler@livioradio.com>2019-03-12 15:36:48 -0400
committerjacobkeeler <jacob.keeler@livioradio.com>2019-03-12 15:36:48 -0400
commitf94e7c768ce4fede9f02d63a8f24efaec255bc32 (patch)
treed8d9b00e281cd144020d8b7180d05b5ddef87dc4
parent24b9d518cac5e0a5543e467f7b368c3e62d21028 (diff)
downloadsdl_core-f94e7c768ce4fede9f02d63a8f24efaec255bc32.tar.gz
Rename `allow_unknown_parameters` in SO files
-rw-r--r--src/components/smart_objects/include/smart_objects/always_false_schema_item.h2
-rw-r--r--src/components/smart_objects/include/smart_objects/always_true_schema_item.h2
-rw-r--r--src/components/smart_objects/include/smart_objects/array_schema_item.h2
-rw-r--r--src/components/smart_objects/include/smart_objects/default_shema_item.h4
-rw-r--r--src/components/smart_objects/include/smart_objects/enum_schema_item.h6
-rw-r--r--src/components/smart_objects/include/smart_objects/number_schema_item.h4
-rw-r--r--src/components/smart_objects/include/smart_objects/object_schema_item.h2
-rw-r--r--src/components/smart_objects/include/smart_objects/schema_item.h2
-rw-r--r--src/components/smart_objects/include/smart_objects/smart_object.h2
-rw-r--r--src/components/smart_objects/include/smart_objects/smart_schema.h2
-rw-r--r--src/components/smart_objects/include/smart_objects/string_schema_item.h2
-rw-r--r--src/components/smart_objects/src/always_false_schema_item.cc2
-rw-r--r--src/components/smart_objects/src/always_true_schema_item.cc2
-rw-r--r--src/components/smart_objects/src/array_schema_item.cc4
-rw-r--r--src/components/smart_objects/src/object_schema_item.cc4
-rw-r--r--src/components/smart_objects/src/schema_item.cc2
-rw-r--r--src/components/smart_objects/src/smart_object.cc4
-rw-r--r--src/components/smart_objects/src/smart_schema.cc4
-rw-r--r--src/components/smart_objects/src/string_schema_item.cc2
19 files changed, 27 insertions, 27 deletions
diff --git a/src/components/smart_objects/include/smart_objects/always_false_schema_item.h b/src/components/smart_objects/include/smart_objects/always_false_schema_item.h
index 5e635d049b..c88c4e697a 100644
--- a/src/components/smart_objects/include/smart_objects/always_false_schema_item.h
+++ b/src/components/smart_objects/include/smart_objects/always_false_schema_item.h
@@ -59,7 +59,7 @@ class CAlwaysFalseSchemaItem : public ISchemaItem {
const SmartObject& Object,
rpc::ValidationReport* report__,
const utils::SemanticVersion& MessageVersion = utils::SemanticVersion(),
- const bool allow_unknown_parameters = false) OVERRIDE;
+ const bool allow_unknown_enums = false) OVERRIDE;
private:
CAlwaysFalseSchemaItem();
diff --git a/src/components/smart_objects/include/smart_objects/always_true_schema_item.h b/src/components/smart_objects/include/smart_objects/always_true_schema_item.h
index efa208833a..0cd3d15452 100644
--- a/src/components/smart_objects/include/smart_objects/always_true_schema_item.h
+++ b/src/components/smart_objects/include/smart_objects/always_true_schema_item.h
@@ -59,7 +59,7 @@ class CAlwaysTrueSchemaItem : public ISchemaItem {
const SmartObject& Object,
rpc::ValidationReport* report__,
const utils::SemanticVersion& MessageVersion = utils::SemanticVersion(),
- const bool allow_unknown_parameters = false) OVERRIDE;
+ const bool allow_unknown_enums = false) OVERRIDE;
private:
CAlwaysTrueSchemaItem();
diff --git a/src/components/smart_objects/include/smart_objects/array_schema_item.h b/src/components/smart_objects/include/smart_objects/array_schema_item.h
index 3f2e22849d..427d209020 100644
--- a/src/components/smart_objects/include/smart_objects/array_schema_item.h
+++ b/src/components/smart_objects/include/smart_objects/array_schema_item.h
@@ -74,7 +74,7 @@ class CArraySchemaItem : public ISchemaItem {
const SmartObject& Object,
rpc::ValidationReport* report__,
const utils::SemanticVersion& MessageVersion = utils::SemanticVersion(),
- const bool allow_unknown_parameters = false) OVERRIDE;
+ const bool allow_unknown_enums = false) OVERRIDE;
/**
* @brief Apply schema.
diff --git a/src/components/smart_objects/include/smart_objects/default_shema_item.h b/src/components/smart_objects/include/smart_objects/default_shema_item.h
index f86bd81f71..b07c668e97 100644
--- a/src/components/smart_objects/include/smart_objects/default_shema_item.h
+++ b/src/components/smart_objects/include/smart_objects/default_shema_item.h
@@ -59,7 +59,7 @@ class CDefaultSchemaItem : public ISchemaItem {
const SmartObject& Object,
rpc::ValidationReport* report__,
const utils::SemanticVersion& MessageVersion = utils::SemanticVersion(),
- const bool allow_unknown_parameters = false) OVERRIDE;
+ const bool allow_unknown_enums = false) OVERRIDE;
/**
* @brief Set default value to an object.
@@ -107,7 +107,7 @@ errors::eType CDefaultSchemaItem<Type>::validate(
const SmartObject& Object,
rpc::ValidationReport* report__,
const utils::SemanticVersion& MessageVersion,
- const bool allow_unknown_parameters) {
+ const bool allow_unknown_enums) {
if (getSmartType() != Object.getType()) {
std::string validation_info = "Incorrect type, expected: " +
SmartObject::typeToString(getSmartType()) +
diff --git a/src/components/smart_objects/include/smart_objects/enum_schema_item.h b/src/components/smart_objects/include/smart_objects/enum_schema_item.h
index 2067859d88..02e10b5603 100644
--- a/src/components/smart_objects/include/smart_objects/enum_schema_item.h
+++ b/src/components/smart_objects/include/smart_objects/enum_schema_item.h
@@ -114,7 +114,7 @@ class TEnumSchemaItem : public CDefaultSchemaItem<EnumType> {
const SmartObject& Object,
rpc::ValidationReport* report__,
const utils::SemanticVersion& MessageVersion = utils::SemanticVersion(),
- const bool allow_unknown_parameters = false) OVERRIDE;
+ const bool allow_unknown_enums = false) OVERRIDE;
/**
* @brief Return the correct history signature based on message version.
* @param signatures Vector reference of enums history items.
@@ -312,11 +312,11 @@ errors::eType TEnumSchemaItem<EnumType>::validate(
const SmartObject& Object,
rpc::ValidationReport* report__,
const utils::SemanticVersion& MessageVersion,
- const bool allow_unknown_parameters) {
+ const bool allow_unknown_enums) {
if (SmartType_Integer != Object.getType()) {
std::string validation_info;
if (SmartType_String == Object.getType()) {
- if (allow_unknown_parameters) {
+ if (allow_unknown_enums) {
return errors::OK;
}
validation_info = "Invalid enum value: " + Object.asString();
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 0c6c657026..041f7ecd52 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
@@ -76,7 +76,7 @@ class TNumberSchemaItem : public CDefaultSchemaItem<NumberType> {
const SmartObject& Object,
rpc::ValidationReport* report__,
const utils::SemanticVersion& MessageVersion = utils::SemanticVersion(),
- const bool allow_unknown_parameters = false) OVERRIDE;
+ const bool allow_unknown_enums = false) OVERRIDE;
private:
/**
@@ -139,7 +139,7 @@ errors::eType TNumberSchemaItem<NumberType>::validate(
const SmartObject& Object,
rpc::ValidationReport* report__,
const utils::SemanticVersion& MessageVersion,
- const bool allow_unknown_parameters) {
+ const bool allow_unknown_enums) {
if (!isValidNumberType(Object.getType())) {
SmartType expectedType = (typeid(double) == typeid(Object.getType()))
? SmartType_Double
diff --git a/src/components/smart_objects/include/smart_objects/object_schema_item.h b/src/components/smart_objects/include/smart_objects/object_schema_item.h
index 3f452c08cc..cacda792bf 100644
--- a/src/components/smart_objects/include/smart_objects/object_schema_item.h
+++ b/src/components/smart_objects/include/smart_objects/object_schema_item.h
@@ -115,7 +115,7 @@ class CObjectSchemaItem : public ISchemaItem {
const SmartObject& Object,
rpc::ValidationReport* report__,
const utils::SemanticVersion& MessageVersion = utils::SemanticVersion(),
- const bool allow_unknown_parameters = false) OVERRIDE;
+ const bool allow_unknown_enums = false) OVERRIDE;
/**
* @brief Apply schema.
* @param Object Object to apply schema.
diff --git a/src/components/smart_objects/include/smart_objects/schema_item.h b/src/components/smart_objects/include/smart_objects/schema_item.h
index 644d03728f..585e312c1a 100644
--- a/src/components/smart_objects/include/smart_objects/schema_item.h
+++ b/src/components/smart_objects/include/smart_objects/schema_item.h
@@ -65,7 +65,7 @@ class ISchemaItem {
const SmartObject& Object,
rpc::ValidationReport* report__,
const utils::SemanticVersion& MessageVersion = utils::SemanticVersion(),
- const bool allow_unknown_parameters = false);
+ const bool allow_unknown_enums = false);
/**
* @brief Set default value to an object.
diff --git a/src/components/smart_objects/include/smart_objects/smart_object.h b/src/components/smart_objects/include/smart_objects/smart_object.h
index c1c1983e81..d4db14d33f 100644
--- a/src/components/smart_objects/include/smart_objects/smart_object.h
+++ b/src/components/smart_objects/include/smart_objects/smart_object.h
@@ -681,7 +681,7 @@ class SmartObject FINAL {
errors::eType validate(
rpc::ValidationReport* report__,
const utils::SemanticVersion& MessageVersion = utils::SemanticVersion(),
- const bool allow_unknown_parameters = false);
+ const bool allow_unknown_enums = false);
/**
* @brief Sets new schema
diff --git a/src/components/smart_objects/include/smart_objects/smart_schema.h b/src/components/smart_objects/include/smart_objects/smart_schema.h
index d9ef7ae418..072b3c0b7e 100644
--- a/src/components/smart_objects/include/smart_objects/smart_schema.h
+++ b/src/components/smart_objects/include/smart_objects/smart_schema.h
@@ -72,7 +72,7 @@ class CSmartSchema FINAL {
const SmartObject& Object,
rpc::ValidationReport* report__,
const utils::SemanticVersion& messageVersion = utils::SemanticVersion(),
- const bool allow_unknown_parameters = false) const;
+ const bool allow_unknown_enums = false) const;
/**
* @brief Set new root schema item.
diff --git a/src/components/smart_objects/include/smart_objects/string_schema_item.h b/src/components/smart_objects/include/smart_objects/string_schema_item.h
index 678097b838..5f95ca0389 100644
--- a/src/components/smart_objects/include/smart_objects/string_schema_item.h
+++ b/src/components/smart_objects/include/smart_objects/string_schema_item.h
@@ -71,7 +71,7 @@ class CStringSchemaItem : public CDefaultSchemaItem<std::string> {
const SmartObject& Object,
rpc::ValidationReport* report__,
const utils::SemanticVersion& MessageVersion = utils::SemanticVersion(),
- const bool allow_unknown_parameters = false) OVERRIDE;
+ const bool allow_unknown_enums = false) OVERRIDE;
private:
/**
diff --git a/src/components/smart_objects/src/always_false_schema_item.cc b/src/components/smart_objects/src/always_false_schema_item.cc
index 62ae6549b9..4f8f4584af 100644
--- a/src/components/smart_objects/src/always_false_schema_item.cc
+++ b/src/components/smart_objects/src/always_false_schema_item.cc
@@ -45,7 +45,7 @@ errors::eType CAlwaysFalseSchemaItem::validate(
const SmartObject& Object,
rpc::ValidationReport* report__,
const utils::SemanticVersion& MessageVersion,
- const bool allow_unknown_parameters) {
+ const bool allow_unknown_enums) {
report__->set_validation_info("Generic error");
return errors::ERROR;
}
diff --git a/src/components/smart_objects/src/always_true_schema_item.cc b/src/components/smart_objects/src/always_true_schema_item.cc
index 9421654900..855bfef2a0 100644
--- a/src/components/smart_objects/src/always_true_schema_item.cc
+++ b/src/components/smart_objects/src/always_true_schema_item.cc
@@ -43,7 +43,7 @@ errors::eType CAlwaysTrueSchemaItem::validate(
const SmartObject& Object,
rpc::ValidationReport* report__,
const utils::SemanticVersion& MessageVersion,
- const bool allow_unknown_parameters) {
+ const bool allow_unknown_enums) {
return errors::OK;
}
diff --git a/src/components/smart_objects/src/array_schema_item.cc b/src/components/smart_objects/src/array_schema_item.cc
index 0b616db692..1671a97644 100644
--- a/src/components/smart_objects/src/array_schema_item.cc
+++ b/src/components/smart_objects/src/array_schema_item.cc
@@ -46,7 +46,7 @@ errors::eType CArraySchemaItem::validate(
const SmartObject& Object,
rpc::ValidationReport* report__,
const utils::SemanticVersion& MessageVersion,
- const bool allow_unknown_parameters) {
+ const bool allow_unknown_enums) {
if (SmartType_Array != Object.getType()) {
std::string validation_info = "Incorrect type, expected: " +
SmartObject::typeToString(SmartType_Array) +
@@ -82,7 +82,7 @@ errors::eType CArraySchemaItem::validate(
mElementSchemaItem->validate(Object.getElement(i),
&report__->ReportSubobject(strVal.str()),
MessageVersion,
- allow_unknown_parameters);
+ allow_unknown_enums);
if (errors::OK != result) {
return result;
}
diff --git a/src/components/smart_objects/src/object_schema_item.cc b/src/components/smart_objects/src/object_schema_item.cc
index 382ae93e6d..21d2316e48 100644
--- a/src/components/smart_objects/src/object_schema_item.cc
+++ b/src/components/smart_objects/src/object_schema_item.cc
@@ -111,7 +111,7 @@ errors::eType CObjectSchemaItem::validate(
const SmartObject& object,
rpc::ValidationReport* report__,
const utils::SemanticVersion& MessageVersion,
- const bool allow_unknown_parameters) {
+ const bool allow_unknown_enums) {
if (SmartType_Map != object.getType()) {
std::string validation_info = "Incorrect type, expected: " +
SmartObject::typeToString(SmartType_Map) +
@@ -147,7 +147,7 @@ errors::eType CObjectSchemaItem::validate(
correct_member.mSchemaItem->validate(field,
&report__->ReportSubobject(key),
MessageVersion,
- allow_unknown_parameters);
+ allow_unknown_enums);
if (errors::OK != result) {
return result;
}
diff --git a/src/components/smart_objects/src/schema_item.cc b/src/components/smart_objects/src/schema_item.cc
index f116cae708..8c40e2c7bd 100644
--- a/src/components/smart_objects/src/schema_item.cc
+++ b/src/components/smart_objects/src/schema_item.cc
@@ -39,7 +39,7 @@ errors::eType ISchemaItem::validate(
const SmartObject& object,
rpc::ValidationReport* report__,
const utils::SemanticVersion& MessageVersion,
- const bool allow_unknown_parameters) {
+ const bool allow_unknown_enums) {
return errors::ERROR;
}
diff --git a/src/components/smart_objects/src/smart_object.cc b/src/components/smart_objects/src/smart_object.cc
index d58310ec95..ef5dc787be 100644
--- a/src/components/smart_objects/src/smart_object.cc
+++ b/src/components/smart_objects/src/smart_object.cc
@@ -879,9 +879,9 @@ bool SmartObject::isValid() const {
errors::eType SmartObject::validate(
rpc::ValidationReport* report__,
const utils::SemanticVersion& MessageVersion,
- const bool allow_unknown_parameters) {
+ const bool allow_unknown_enums) {
return m_schema.validate(
- *this, report__, MessageVersion, allow_unknown_parameters);
+ *this, report__, MessageVersion, allow_unknown_enums);
}
void SmartObject::setSchema(const CSmartSchema& schema) {
diff --git a/src/components/smart_objects/src/smart_schema.cc b/src/components/smart_objects/src/smart_schema.cc
index 062bb18c8c..4ab5e5ff23 100644
--- a/src/components/smart_objects/src/smart_schema.cc
+++ b/src/components/smart_objects/src/smart_schema.cc
@@ -44,9 +44,9 @@ errors::eType CSmartSchema::validate(
const SmartObject& object,
rpc::ValidationReport* report__,
const utils::SemanticVersion& MessageVersion,
- const bool allow_unknown_parameters) const {
+ const bool allow_unknown_enums) const {
return mSchemaItem->validate(
- object, report__, MessageVersion, allow_unknown_parameters);
+ object, report__, MessageVersion, allow_unknown_enums);
}
void CSmartSchema::setSchemaItem(const ISchemaItemPtr schemaItem) {
diff --git a/src/components/smart_objects/src/string_schema_item.cc b/src/components/smart_objects/src/string_schema_item.cc
index 7331dd1340..e2ebde1861 100644
--- a/src/components/smart_objects/src/string_schema_item.cc
+++ b/src/components/smart_objects/src/string_schema_item.cc
@@ -50,7 +50,7 @@ errors::eType CStringSchemaItem::validate(
const SmartObject& Object,
rpc::ValidationReport* report__,
const utils::SemanticVersion& MessageVersion,
- const bool allow_unknown_parameters) {
+ const bool allow_unknown_enums) {
if (SmartType_String != Object.getType()) {
std::string validation_info = "Incorrect type, expected: " +
SmartObject::typeToString(SmartType_String) +