mbed Connector Interface simplification API on top of mbed-client

Fork of mbedConnectorInterfaceV3 by Doug Anson

NOTE:

This repo has been replaced with https://github.com/ARMmbed/mbedConnectorInterface. No further updates will occur with this repo. Please use the github repo instead. Thanks!

Committer:
ansond
Date:
Thu Jun 23 22:26:15 2016 +0000
Revision:
49:c603a22495bb
Parent:
38:bb6d2be4d54c
Child:
50:4f04727cbf91
reduced memory usage

Who changed what in which revision?

UserRevisionLine numberNew contents of line
ansond 0:1f1f55e73248 1 /**
ansond 0:1f1f55e73248 2 * @file OptionsBuilder.cpp
ansond 0:1f1f55e73248 3 * @brief mbed CoAP OptionsBuilder class implementation
ansond 0:1f1f55e73248 4 * @author Doug Anson/Chris Paola
ansond 0:1f1f55e73248 5 * @version 1.0
ansond 0:1f1f55e73248 6 * @see
ansond 0:1f1f55e73248 7 *
ansond 0:1f1f55e73248 8 * Copyright (c) 2014
ansond 0:1f1f55e73248 9 *
ansond 0:1f1f55e73248 10 * Licensed under the Apache License, Version 2.0 (the "License");
ansond 0:1f1f55e73248 11 * you may not use this file except in compliance with the License.
ansond 0:1f1f55e73248 12 * You may obtain a copy of the License at
ansond 0:1f1f55e73248 13 *
ansond 0:1f1f55e73248 14 * http://www.apache.org/licenses/LICENSE-2.0
ansond 0:1f1f55e73248 15 *
ansond 0:1f1f55e73248 16 * Unless required by applicable law or agreed to in writing, software
ansond 0:1f1f55e73248 17 * distributed under the License is distributed on an "AS IS" BASIS,
ansond 0:1f1f55e73248 18 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
ansond 0:1f1f55e73248 19 * See the License for the specific language governing permissions and
ansond 0:1f1f55e73248 20 * limitations under the License.
ansond 0:1f1f55e73248 21 */
ansond 0:1f1f55e73248 22
ansond 33:1d0b855df5a5 23 // Class support
ansond 0:1f1f55e73248 24 #include "mbed-connector-interface/OptionsBuilder.h"
ansond 0:1f1f55e73248 25
ansond 0:1f1f55e73248 26 // external included configuration file for the endpoint...
ansond 0:1f1f55e73248 27 #include "mbed-connector-interface/configuration.h"
ansond 0:1f1f55e73248 28
ansond 33:1d0b855df5a5 29 // ResourceObserver support (enabled in configuration.h)
ansond 0:1f1f55e73248 30 #include "mbed-connector-interface/ThreadedResourceObserver.h"
ansond 0:1f1f55e73248 31 #include "mbed-connector-interface/TickerResourceObserver.h"
ansond 27:b8aaf7dc7023 32 #include "mbed-connector-interface/MinarResourceObserver.h"
ansond 0:1f1f55e73248 33
ansond 0:1f1f55e73248 34 // DEBUG
ansond 0:1f1f55e73248 35 #ifndef NDEBUG
ansond 0:1f1f55e73248 36 #define DEBUG_OUT(...) { printf(__VA_ARGS__); }
ansond 0:1f1f55e73248 37 #else
ansond 0:1f1f55e73248 38 #define DEBUG_OUT(...) /* nothing */
ansond 0:1f1f55e73248 39 #endif
ansond 0:1f1f55e73248 40
ansond 0:1f1f55e73248 41 // Connector namespace
ansond 0:1f1f55e73248 42 namespace Connector {
ansond 0:1f1f55e73248 43
ansond 0:1f1f55e73248 44 // Constructor
ansond 0:1f1f55e73248 45 OptionsBuilder::OptionsBuilder()
ansond 0:1f1f55e73248 46 {
ansond 27:b8aaf7dc7023 47 this->m_domain = NSP_DOMAIN;
ansond 27:b8aaf7dc7023 48 this->m_endpoint_type = NSP_ENDPOINT_TYPE;
ansond 27:b8aaf7dc7023 49 this->m_node_name = NODE_NAME;
ansond 27:b8aaf7dc7023 50 this->m_reg_update_period = REG_UPDATE_PERIOD_MS;
ansond 27:b8aaf7dc7023 51 this->m_lifetime = REG_LIFETIME_SEC;
ansond 27:b8aaf7dc7023 52 this->m_connector_url = string(CONNECTOR_URL);
ansond 49:c603a22495bb 53 this->m_server_cert - NULL;
ansond 49:c603a22495bb 54 this->m_server_cert_length = 0;
ansond 49:c603a22495bb 55 this->m_client_cert = NULL;
ansond 49:c603a22495bb 56 this->m_client_cert_length = 0;
ansond 49:c603a22495bb 57 this->m_client_key = NULL;
ansond 49:c603a22495bb 58 this->m_client_key_length = 0;
ansond 27:b8aaf7dc7023 59 this->m_device_resources_object = NULL;
ansond 27:b8aaf7dc7023 60 this->m_firmware_resources_object = NULL;
ansond 0:1f1f55e73248 61 this->m_static_resources.clear();
ansond 0:1f1f55e73248 62 this->m_dynamic_resources.clear();
ansond 0:1f1f55e73248 63 this->m_resource_observers.clear();
ansond 0:1f1f55e73248 64 }
ansond 0:1f1f55e73248 65
ansond 0:1f1f55e73248 66 // Copy Constructor
ansond 0:1f1f55e73248 67 OptionsBuilder::OptionsBuilder(const OptionsBuilder &ob) : Options(ob)
ansond 0:1f1f55e73248 68 {
ansond 8:f950fb1b78c0 69 this->m_domain = ob.m_domain;
ansond 0:1f1f55e73248 70 this->m_endpoint_type = ob.m_endpoint_type;
ansond 8:f950fb1b78c0 71 this->m_node_name = ob.m_node_name;
ansond 8:f950fb1b78c0 72 this->m_reg_update_period = ob.m_reg_update_period;
ansond 8:f950fb1b78c0 73 this->m_lifetime = ob.m_lifetime;
ansond 8:f950fb1b78c0 74 this->m_connector_url = ob.m_connector_url;
ansond 49:c603a22495bb 75 this->m_server_cert - ob.m_server_cert;
ansond 49:c603a22495bb 76 this->m_server_cert_length = ob.m_server_cert_length;
ansond 49:c603a22495bb 77 this->m_client_cert = ob.m_client_cert;
ansond 49:c603a22495bb 78 this->m_client_cert_length = ob.m_client_cert_length;
ansond 49:c603a22495bb 79 this->m_client_key = ob.m_client_key;
ansond 49:c603a22495bb 80 this->m_client_key_length= ob.m_client_key_length;
ansond 27:b8aaf7dc7023 81 this->m_device_resources_object = ob.m_device_resources_object;
ansond 27:b8aaf7dc7023 82 this->m_firmware_resources_object = ob.m_firmware_resources_object;
ansond 0:1f1f55e73248 83 this->m_static_resources = ob.m_static_resources;
ansond 0:1f1f55e73248 84 this->m_dynamic_resources = ob.m_dynamic_resources;
ansond 0:1f1f55e73248 85 this->m_resource_observers = ob.m_resource_observers;
ansond 0:1f1f55e73248 86 }
ansond 0:1f1f55e73248 87
ansond 0:1f1f55e73248 88 // Destructor
ansond 0:1f1f55e73248 89 OptionsBuilder::~OptionsBuilder()
ansond 0:1f1f55e73248 90 {
ansond 38:bb6d2be4d54c 91 this->m_device_resources_object = NULL;
ansond 38:bb6d2be4d54c 92 this->m_firmware_resources_object = NULL;
ansond 0:1f1f55e73248 93 this->m_static_resources.clear();
ansond 0:1f1f55e73248 94 this->m_dynamic_resources.clear();
ansond 0:1f1f55e73248 95 this->m_resource_observers.clear();
ansond 0:1f1f55e73248 96 }
ansond 0:1f1f55e73248 97
ansond 0:1f1f55e73248 98 // set lifetime
ansond 0:1f1f55e73248 99 OptionsBuilder &OptionsBuilder::setLifetime(int lifetime)
ansond 0:1f1f55e73248 100 {
ansond 0:1f1f55e73248 101 this->m_lifetime = lifetime;
ansond 0:1f1f55e73248 102 return *this;
ansond 0:1f1f55e73248 103 }
ansond 0:1f1f55e73248 104
ansond 0:1f1f55e73248 105 // set domain
ansond 0:1f1f55e73248 106 OptionsBuilder &OptionsBuilder::setDomain(const char *domain)
ansond 0:1f1f55e73248 107 {
ansond 0:1f1f55e73248 108 this->m_domain = string(domain);
ansond 0:1f1f55e73248 109 return *this;
ansond 0:1f1f55e73248 110 }
ansond 0:1f1f55e73248 111
ansond 0:1f1f55e73248 112 // set endpoint nodename
ansond 0:1f1f55e73248 113 OptionsBuilder &OptionsBuilder::setEndpointNodename(const char *node_name)
ansond 0:1f1f55e73248 114 {
ansond 0:1f1f55e73248 115 this->m_node_name = string(node_name);
ansond 0:1f1f55e73248 116 return *this;
ansond 0:1f1f55e73248 117 }
ansond 0:1f1f55e73248 118
ansond 0:1f1f55e73248 119 // set lifetime
ansond 0:1f1f55e73248 120 OptionsBuilder &OptionsBuilder::setEndpointType(const char *endpoint_type)
ansond 0:1f1f55e73248 121 {
ansond 0:1f1f55e73248 122 this->m_endpoint_type = string(endpoint_type);
ansond 0:1f1f55e73248 123 return *this;
ansond 0:1f1f55e73248 124 }
ansond 0:1f1f55e73248 125
ansond 0:1f1f55e73248 126 // set mbed registration update period
ansond 0:1f1f55e73248 127 OptionsBuilder &OptionsBuilder::setRegUpdatePeriod(const int reg_update_period)
ansond 0:1f1f55e73248 128 {
ansond 0:1f1f55e73248 129 this->m_reg_update_period = reg_update_period;
ansond 0:1f1f55e73248 130 return *this;
ansond 0:1f1f55e73248 131 }
ansond 0:1f1f55e73248 132
ansond 0:1f1f55e73248 133 // set Connector URL
ansond 0:1f1f55e73248 134 OptionsBuilder &OptionsBuilder::setConnectorURL(const char *connector_url)
ansond 0:1f1f55e73248 135 {
ansond 0:1f1f55e73248 136 if (connector_url != NULL) {
ansond 0:1f1f55e73248 137 this->m_connector_url = string(connector_url);
ansond 0:1f1f55e73248 138 }
ansond 0:1f1f55e73248 139 return *this;
ansond 0:1f1f55e73248 140 }
ansond 0:1f1f55e73248 141
ansond 27:b8aaf7dc7023 142 // add the device resources object
ansond 27:b8aaf7dc7023 143 OptionsBuilder &OptionsBuilder::setDeviceResourcesObject(const void *device_resources_object)
ansond 27:b8aaf7dc7023 144 {
ansond 27:b8aaf7dc7023 145 if (device_resources_object != NULL) {
ansond 27:b8aaf7dc7023 146 this->m_device_resources_object = (void *)device_resources_object;
ansond 27:b8aaf7dc7023 147 }
ansond 27:b8aaf7dc7023 148 return *this;
ansond 27:b8aaf7dc7023 149 }
ansond 27:b8aaf7dc7023 150
ansond 27:b8aaf7dc7023 151 // add the firmware resources object
ansond 27:b8aaf7dc7023 152 OptionsBuilder &OptionsBuilder::setFirmwareResourcesObject(const void *firmware_resources_object)
ansond 27:b8aaf7dc7023 153 {
ansond 27:b8aaf7dc7023 154 if (firmware_resources_object != NULL) {
ansond 27:b8aaf7dc7023 155 this->m_firmware_resources_object = (void *)firmware_resources_object;
ansond 0:1f1f55e73248 156 }
ansond 0:1f1f55e73248 157 return *this;
ansond 0:1f1f55e73248 158 }
ansond 0:1f1f55e73248 159
ansond 0:1f1f55e73248 160 // add static resource
ansond 0:1f1f55e73248 161 OptionsBuilder &OptionsBuilder::addResource(const StaticResource *resource)
ansond 0:1f1f55e73248 162 {
ansond 0:1f1f55e73248 163 if (resource != NULL) {
ansond 0:1f1f55e73248 164 ((StaticResource *)resource)->setOptions(this);
ansond 0:1f1f55e73248 165 this->m_static_resources.push_back((StaticResource *)resource);
ansond 0:1f1f55e73248 166 }
ansond 0:1f1f55e73248 167 return *this;
ansond 0:1f1f55e73248 168 }
ansond 0:1f1f55e73248 169
ansond 0:1f1f55e73248 170 // add dynamic resource
ansond 0:1f1f55e73248 171 OptionsBuilder &OptionsBuilder::addResource(const DynamicResource *resource)
ansond 0:1f1f55e73248 172 {
ansond 0:1f1f55e73248 173 // ensure that the boolean isn't mistaken by the compiler for the obs period...
ansond 0:1f1f55e73248 174 return this->addResource(resource,OBS_PERIOD_MS,!(((DynamicResource *)resource)->implementsObservation()));
ansond 0:1f1f55e73248 175 }
ansond 0:1f1f55e73248 176
ansond 0:1f1f55e73248 177 // add dynamic resource
ansond 0:1f1f55e73248 178 OptionsBuilder &OptionsBuilder::addResource(const DynamicResource *resource,const int sleep_time)
ansond 0:1f1f55e73248 179 {
ansond 0:1f1f55e73248 180 // ensure that the boolean isn't mistaken by the compiler for the obs period...
ansond 0:1f1f55e73248 181 return this->addResource(resource,sleep_time,!(((DynamicResource *)resource)->implementsObservation()));
ansond 0:1f1f55e73248 182 }
ansond 0:1f1f55e73248 183
ansond 0:1f1f55e73248 184 // add dynamic resource
ansond 0:1f1f55e73248 185 OptionsBuilder &OptionsBuilder::addResource(const DynamicResource *resource,const bool use_observer)
ansond 0:1f1f55e73248 186 {
ansond 0:1f1f55e73248 187 // ensure that the boolean isn't mistaken by the compiler for the obs period...
ansond 0:1f1f55e73248 188 return this->addResource(resource,OBS_PERIOD_MS,use_observer);
ansond 0:1f1f55e73248 189 }
ansond 0:1f1f55e73248 190
ansond 0:1f1f55e73248 191 // add dynamic resource
ansond 0:1f1f55e73248 192 OptionsBuilder &OptionsBuilder::addResource(const DynamicResource *resource,const int sleep_time,const bool use_observer)
ansond 0:1f1f55e73248 193 {
ansond 0:1f1f55e73248 194 if (resource != NULL) {
ansond 0:1f1f55e73248 195 this->m_dynamic_resources.push_back((DynamicResource *)resource);
ansond 0:1f1f55e73248 196 ((DynamicResource *)resource)->setOptions(this);
ansond 17:defb680f8fce 197 ((DynamicResource *)resource)->setEndpoint((const void *)this->getEndpoint());
ansond 0:1f1f55e73248 198 if (((DynamicResource *)resource)->isObservable() == true && use_observer == true) {
ansond 34:a10d65907549 199 // Establish the appropriate ResourceObserver
ansond 27:b8aaf7dc7023 200 #if defined (MCI_MINAR_SCHEDULER)
ansond 34:a10d65907549 201 // Minar-based Scheduler ResourceObserver
ansond 27:b8aaf7dc7023 202 MinarResourceObserver *observer = new MinarResourceObserver((DynamicResource *)resource,(int)sleep_time);
ansond 27:b8aaf7dc7023 203 #else
ansond 27:b8aaf7dc7023 204 #ifdef CONNECTOR_USING_THREADS
ansond 34:a10d65907549 205 // mbedOS RTOS Thread ResourceObserver
ansond 0:1f1f55e73248 206 ThreadedResourceObserver *observer = new ThreadedResourceObserver((DynamicResource *)resource,(int)sleep_time);
ansond 34:a10d65907549 207 #endif
ansond 34:a10d65907549 208 #ifdef CONNECTOR_USING_TICKER
ansond 34:a10d65907549 209 // mbed Ticker ResourceObserver
ansond 0:1f1f55e73248 210 TickerResourceObserver *observer = new TickerResourceObserver((DynamicResource *)resource,(int)sleep_time);
ansond 27:b8aaf7dc7023 211 #endif
ansond 0:1f1f55e73248 212 #endif
ansond 34:a10d65907549 213 // If no observer type is set in mbed-connector-interface/configuration.h (EndpointNetwork lib), then "observer" will be unresolved
ansond 0:1f1f55e73248 214 this->m_resource_observers.push_back(observer);
ansond 0:1f1f55e73248 215
ansond 0:1f1f55e73248 216 // immedate observation enablement option
ansond 0:1f1f55e73248 217 if (this->immedateObservationEnabled()) {
ansond 0:1f1f55e73248 218 observer->beginObservation();
ansond 0:1f1f55e73248 219 }
ansond 0:1f1f55e73248 220 }
ansond 0:1f1f55e73248 221 }
ansond 0:1f1f55e73248 222 return *this;
ansond 0:1f1f55e73248 223 }
ansond 0:1f1f55e73248 224
ansond 0:1f1f55e73248 225 // set WiFi SSID
ansond 0:1f1f55e73248 226 OptionsBuilder &OptionsBuilder::setWiFiSSID(char *ssid)
ansond 0:1f1f55e73248 227 {
ansond 0:1f1f55e73248 228 this->m_wifi_ssid = string(ssid);
ansond 0:1f1f55e73248 229 return *this;
ansond 0:1f1f55e73248 230 }
ansond 0:1f1f55e73248 231
ansond 0:1f1f55e73248 232 // set WiFi AuthType
ansond 0:1f1f55e73248 233 OptionsBuilder &OptionsBuilder::setWiFiAuthType(WiFiAuthTypes auth_type)
ansond 0:1f1f55e73248 234 {
ansond 0:1f1f55e73248 235 this->m_wifi_auth_type = auth_type;
ansond 0:1f1f55e73248 236 return *this;
ansond 0:1f1f55e73248 237 }
ansond 0:1f1f55e73248 238
ansond 0:1f1f55e73248 239 // set WiFi AuthKey
ansond 0:1f1f55e73248 240 OptionsBuilder &OptionsBuilder::setWiFiAuthKey(char *auth_key)
ansond 0:1f1f55e73248 241 {
ansond 0:1f1f55e73248 242 this->m_wifi_auth_key = string(auth_key);
ansond 0:1f1f55e73248 243 return *this;
ansond 0:1f1f55e73248 244 }
ansond 0:1f1f55e73248 245
ansond 8:f950fb1b78c0 246 // set 802.15.4 Pre Shared Key
ansond 8:f950fb1b78c0 247 OptionsBuilder &OptionsBuilder::setPreSharedKey(unsigned char psk[16])
ansond 0:1f1f55e73248 248 {
ansond 8:f950fb1b78c0 249 memset(this->m_psk,0,16);
ansond 8:f950fb1b78c0 250 for(int i=0;i<16;++i) {
ansond 8:f950fb1b78c0 251 this->m_psk[i] = psk[i];
ansond 8:f950fb1b78c0 252 }
ansond 0:1f1f55e73248 253 return *this;
ansond 0:1f1f55e73248 254 }
ansond 0:1f1f55e73248 255
ansond 8:f950fb1b78c0 256 // set 802.15.4 Pre Shared Key Identity
ansond 8:f950fb1b78c0 257 OptionsBuilder &OptionsBuilder::setPreSharedKeyIdentity(unsigned char psk_identity[2])
ansond 0:1f1f55e73248 258 {
ansond 8:f950fb1b78c0 259 memset(this->m_psk_identity,0,2);
ansond 8:f950fb1b78c0 260 for(int i=0;i<2;++i) {
ansond 8:f950fb1b78c0 261 this->m_psk_identity[i] = psk_identity[i];
ansond 8:f950fb1b78c0 262 }
ansond 0:1f1f55e73248 263 return *this;
ansond 0:1f1f55e73248 264 }
ansond 0:1f1f55e73248 265
ansond 9:faa43faea4ca 266 // set 802.15.4 Mesh Type
ansond 9:faa43faea4ca 267 OptionsBuilder &OptionsBuilder::setMeshType(MeshTypes mesh_type)
ansond 9:faa43faea4ca 268 {
ansond 9:faa43faea4ca 269 this->m_mesh_type = mesh_type;
ansond 9:faa43faea4ca 270 return *this;
ansond 9:faa43faea4ca 271 }
ansond 9:faa43faea4ca 272
ansond 10:3f79b5e67c22 273 // set the CoAP Connection Type
ansond 10:3f79b5e67c22 274 OptionsBuilder &OptionsBuilder::setCoAPConnectionType(CoAPConnectionTypes coap_connection_type)
ansond 10:3f79b5e67c22 275 {
ansond 10:3f79b5e67c22 276 this->m_coap_connection_type = coap_connection_type;
ansond 10:3f79b5e67c22 277 return *this;
ansond 10:3f79b5e67c22 278 }
ansond 10:3f79b5e67c22 279
ansond 10:3f79b5e67c22 280 // set the IP Address Type
ansond 10:3f79b5e67c22 281 OptionsBuilder &OptionsBuilder::setIPAddressType(IPAddressTypes ip_address_type)
ansond 10:3f79b5e67c22 282 {
ansond 10:3f79b5e67c22 283 this->m_ip_address_type = ip_address_type;
ansond 10:3f79b5e67c22 284 return *this;
ansond 10:3f79b5e67c22 285 }
ansond 10:3f79b5e67c22 286
ansond 0:1f1f55e73248 287 // build out our immutable self
ansond 0:1f1f55e73248 288 Options *OptionsBuilder::build()
ansond 0:1f1f55e73248 289 {
ansond 0:1f1f55e73248 290 return (Options *)this;
ansond 0:1f1f55e73248 291 }
ansond 0:1f1f55e73248 292
ansond 0:1f1f55e73248 293 // Enable/Disable immediate observationing
ansond 0:1f1f55e73248 294 OptionsBuilder &OptionsBuilder::setImmedateObservationEnabled(bool enable) {
ansond 0:1f1f55e73248 295 this->m_enable_immediate_observation = enable;
ansond 0:1f1f55e73248 296 return *this;
ansond 0:1f1f55e73248 297 }
ansond 0:1f1f55e73248 298
ansond 0:1f1f55e73248 299 // Enable/Disable GET-based control of observations
ansond 0:1f1f55e73248 300 OptionsBuilder &OptionsBuilder::setEnableGETObservationControl(bool enable) {
ansond 0:1f1f55e73248 301 this->m_enable_get_obs_control = enable;
ansond 0:1f1f55e73248 302 return *this;
ansond 0:1f1f55e73248 303 }
ansond 0:1f1f55e73248 304
ansond 0:1f1f55e73248 305 // set the server certificate
ansond 49:c603a22495bb 306 OptionsBuilder &OptionsBuilder::setServerCertificate(uint8_t *cert,int cert_size) {
ansond 49:c603a22495bb 307 this->m_server_cert = cert;
ansond 49:c603a22495bb 308 this->m_server_cert_length = cert_size;
ansond 0:1f1f55e73248 309 return *this;
ansond 0:1f1f55e73248 310 }
ansond 0:1f1f55e73248 311
ansond 0:1f1f55e73248 312 // set the client certificate
ansond 49:c603a22495bb 313 OptionsBuilder &OptionsBuilder::setClientCertificate(uint8_t *cert,int cert_size) {
ansond 49:c603a22495bb 314 this->m_client_cert = cert;
ansond 49:c603a22495bb 315 this->m_client_cert_length = cert_size;
ansond 0:1f1f55e73248 316 return *this;
ansond 0:1f1f55e73248 317 }
ansond 0:1f1f55e73248 318
ansond 0:1f1f55e73248 319 // set the client key
ansond 49:c603a22495bb 320 OptionsBuilder &OptionsBuilder::setClientKey(uint8_t *key,int key_size) {
ansond 49:c603a22495bb 321 this->m_client_key = key;
ansond 49:c603a22495bb 322 this->m_client_key_length = key_size;
ansond 0:1f1f55e73248 323 return *this;
ansond 0:1f1f55e73248 324 }
ansond 0:1f1f55e73248 325
ansond 22:68fcdc40b397 326 // set our endpoint
ansond 22:68fcdc40b397 327 void OptionsBuilder::setEndpoint(void *endpoint) {
ansond 22:68fcdc40b397 328 this->m_endpoint = endpoint;
ansond 22:68fcdc40b397 329 }
ansond 22:68fcdc40b397 330
ansond 0:1f1f55e73248 331 } // namespace Connector