1 files changed, 112 insertions, 2 deletions

diff --git a/src/components/policy/policy_external/include/policy/policy_table/types.h b/src/components/policy/policy_external/include/policy/policy_table/types.h
index 7f59c17384..11c76bdd68 100644
--- a/src/components/policy/policy_external/include/policy/policy_table/types.h
+++ b/src/components/policy/policy_external/include/policy/policy_table/types.h
@@ -37,7 +37,9 @@
 #include "utils/macro.h"
 
 #include "policy/policy_table/enums.h"
+#include "policy/policy_table/policy_enum_schema_factory.h"
 #include "rpc_base/rpc_message.h"
+#include "utils/helpers.h"
 
 namespace Json {
 class Value;
@@ -48,6 +50,7 @@ struct AppLevel;
 struct ApplicationParams;
 struct ConsentRecords;
 struct DeviceParams;
+struct EndpointProperty;
 struct MessageLanguages;
 struct MessageString;
 struct RpcParameters;
@@ -69,16 +72,18 @@ typedef Array<Enum<AppHMIType>, 0, 255> AppHMITypes;
 
 typedef Array<Enum<HmiLevel>, 0, 4> HmiLevels;
 
-typedef Array<Enum<Parameter>, 0, 100> Parameters;
+typedef Array<String<0, 255>, 0, 100> Parameters;
 
 typedef Map<RpcParameters, 0, UINT_MAX> Rpc;
 
-typedef Array<String<10, 255>, 1, 3> URL;
+typedef Array<String<10, INT_MAX>, 1, 3> URL;
 
 typedef Map<URL, 1, 255> URLList;
 
 typedef Map<URLList, 1, 255> ServiceEndpoints;
 
+typedef Map<EndpointProperty, 0, 255> ServiceEndpointProperties;
+
 typedef uint8_t NumberOfNotificationsType;
 typedef Map<Integer<NumberOfNotificationsType, 0, 255>, 0, 7>
     NumberOfNotificationsPerMinute;
@@ -349,6 +354,24 @@ struct Rpcs : CompositeType {
   bool Validate() const;
 };
 
+struct EndpointProperty : CompositeType {
+ public:
+  Optional<String<0, 100> > version;
+
+  EndpointProperty();
+  ~EndpointProperty();
+  explicit EndpointProperty(const Json::Value* value__);
+  Json::Value ToJsonValue() const;
+  bool is_valid() const;
+  bool is_initialized() const;
+  bool struct_empty() const;
+  void ReportErrors(rpc::ValidationReport* report__) const;
+  void SetPolicyTableType(PolicyTableType pt_type) OVERRIDE;
+
+ private:
+  bool Validate() const;
+};
+
 struct ModuleConfig : CompositeType {
  public:
   Integer<uint8_t, 0, 255> exchange_after_x_ignition_cycles;
@@ -357,6 +380,7 @@ struct ModuleConfig : CompositeType {
   Integer<uint16_t, 0, 65535> timeout_after_x_seconds;
   SecondsBetweenRetries seconds_between_retries;
   ServiceEndpoints endpoints;
+  Optional<ServiceEndpointProperties> endpoint_properties;
   NumberOfNotificationsPerMinute notifications_per_minute_by_priority;
   Optional<String<0, 100> > vehicle_make;
   Optional<String<0, 100> > vehicle_model;
@@ -367,6 +391,8 @@ struct ModuleConfig : CompositeType {
   Optional<Boolean> full_app_id_supported;
   Optional<Boolean> lock_screen_dismissal_enabled;
 
+  static const std::string kDefaultOemMappingServiceName;
+
  public:
   ModuleConfig();
   ModuleConfig(uint8_t exchange_after_x_ignition_cycles,
@@ -375,6 +401,7 @@ struct ModuleConfig : CompositeType {
                uint16_t timeout_after_x_seconds,
                const SecondsBetweenRetries& seconds_between_retries,
                const ServiceEndpoints& endpoints,
+               const ServiceEndpointProperties& endpoint_properties,
                const NumberOfNotificationsPerMinute&
                    notifications_per_minute_by_priority);
   ~ModuleConfig();
@@ -601,6 +628,88 @@ struct DeviceParams : CompositeType {
   bool Validate() const;
 };
 
+struct VehicleDataItem : CompositeType {
+ public:
+  static const std::vector<std::string> kPODTypes;
+
+  static const std::string kInteger;
+  static const std::string kStruct;
+  static const std::string kString;
+  static const std::string kFloat;
+  static const std::string kDouble;
+  static const std::string kBoolean;
+  static const std::string kName;
+  static const std::string kParams;
+
+  String<1, 255> name;
+  String<0, 255> type;
+  String<1, 255> key;
+  Boolean mandatory;
+  Optional<Array<VehicleDataItem, 0, 255> > params;
+
+  Optional<Boolean> array;
+  Optional<String<0, 255> > since;
+  Optional<String<0, 255> > until;
+  Optional<Boolean> removed;
+  Optional<Boolean> deprecated;
+  Optional<Float<-INT32_MAX, INT32_MAX> > minvalue;
+  Optional<Float<-INT32_MAX, INT32_MAX> > maxvalue;
+  Optional<Integer<uint32_t, 0, UINT32_MAX> > minsize;
+  Optional<Integer<uint32_t, 0, UINT32_MAX> > maxsize;
+  Optional<Integer<uint32_t, 0, UINT32_MAX> > minlength;
+  Optional<Integer<uint32_t, 0, UINT_MAX> > maxlength;
+
+  VehicleDataItem();
+  VehicleDataItem(const VehicleDataItem& policy_table);
+  explicit VehicleDataItem(const Json::Value* value__);
+
+  bool operator==(const VehicleDataItem& vd);
+
+  ~VehicleDataItem();
+
+  Json::Value ToJsonValue() const;
+  bool is_valid() const;
+  bool is_initialized() const;
+  bool struct_not_empty() const;
+  void ReportErrors(rpc::ValidationReport* report__) const;
+  virtual void SetPolicyTableType(PolicyTableType pt_type);
+
+  /**
+   * @brief Validates type of vehicle data item according to
+   * POD types and generated from API enums.
+   * @return true if type is valid.
+   */
+  bool ValidateTypes() const;
+  bool IsPrimitiveType() const;
+  bool ValidateNaming(std::string str) const;
+
+ private:
+  bool Validate() const;
+};
+
+typedef Array<VehicleDataItem, 0, 255> VehicleDataItems;
+
+struct VehicleData : CompositeType {
+ public:
+  Optional<String<0, 100> > schema_version;
+  Optional<VehicleDataItems> schema_items;
+
+  VehicleData();
+  VehicleData(const VehicleData& vehicle_data);
+  VehicleData(const Json::Value* value__);
+  ~VehicleData();
+
+  Json::Value ToJsonValue() const;
+  bool is_valid() const;
+  bool is_initialized() const;
+  bool struct_empty() const;
+  void ReportErrors(rpc::ValidationReport* report__) const;
+  virtual void SetPolicyTableType(PolicyTableType pt_type);
+
+ private:
+  bool Validate() const;
+};
+
 struct PolicyTable : CompositeType {
  public:
   ApplicationPoliciesSection app_policies_section;
@@ -610,6 +719,7 @@ struct PolicyTable : CompositeType {
   Optional<ModuleMeta> module_meta;
   Optional<UsageAndErrorCounts> usage_and_error_counts;
   Optional<DeviceData> device_data;
+  Optional<VehicleData> vehicle_data;
 
  public:
   PolicyTable();