Diff: source/StaticResource.cpp

Revision:

27:b8aaf7dc7023

Parent:

0:1f1f55e73248

Child:

33:1d0b855df5a5

diff -r d7b009313e3b -r b8aaf7dc7023 source/StaticResource.cpp
--- a/source/StaticResource.cpp	Sun Jun 12 03:18:25 2016 +0000
+++ b/source/StaticResource.cpp	Tue Jun 14 04:01:34 2016 +0000
@@ -1,92 +1,96 @@
-/**
- * @file    StaticResource.h
- * @brief   mbed CoAP Endpoint Static Resource class
- * @author  Doug Anson/Chris Paola
- * @version 1.0
- * @see
- *
- * Copyright (c) 2014
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "mbed-connector-interface/StaticResource.h"
-
-// Constructor
-StaticResource::StaticResource(const Logger *logger,const char *obj_name,const char *res_name, const char *value) : Resource<string>(logger,string(obj_name),string(res_name),string(value)), m_data_wrapper()
-{
-	this->m_object = NULL;
-}
-
-// Constructor
-StaticResource::StaticResource(const Logger *logger,const char *obj_name,const char *res_name,const string value) : Resource<string>(logger,string(obj_name),string(res_name),string(value))
-{
-    this->m_data_wrapper = NULL;
-    this->m_object = NULL;
-}
-
-// Constructor with buffer lengths
-StaticResource::StaticResource(const Logger *logger,const string obj_name,const string res_name,const string value) : Resource<string>(logger,string(obj_name),string(res_name),string(value))
-{
-    this->m_data_wrapper = NULL;
-    this->m_object = NULL;
-}
-
-// Copy constructor
-StaticResource::StaticResource(const StaticResource &resource) : Resource<string>((const Resource<string> &)resource)
-{
-    this->m_data_wrapper = resource.m_data_wrapper;
-    this->m_object = resource.m_object;
-}
-
-// Destructor
-StaticResource::~StaticResource() {
-}
-
-// bind CoAP Resource..
-M2MObject *StaticResource::bind(void *p) {
-	if (p != NULL) {
-		this->m_object = M2MInterfaceFactory::create_object(this->getObjName().c_str());
-        if (this->m_object != NULL) {
-            M2MObjectInstance* inst = this->m_object->create_object_instance();
-            if (inst != NULL) {
-            		if (this->getDataWrapper() != NULL) {
-            			// wrap the data...
-            			this->getDataWrapper()->wrap((uint8_t *)this->getValue().c_str(),(int)this->getValue().size());
-            			inst->create_static_resource(this->getResName().c_str(),"StaticResource",M2MResourceInstance::STRING,this->getDataWrapper()->get(),(uint8_t)this->getDataWrapper()->length());
-            			this->logger()->log("StaticResource: [%s] value: [%s] bound",this->getFullName().c_str(),this->getDataWrapper()->get());
-        			}
-        			else {
-        				// do not wrap the data...
-            			inst->create_static_resource(this->getResName().c_str(),"StaticResource",M2MResourceInstance::STRING,(uint8_t *)this->getValue().c_str(),(uint8_t)this->getValue().size());
-             			this->logger()->log("StaticResource: [%s] value: [%s] bound",this->getFullName().c_str(),this->getValue().c_str());
-        			}
-             }
-             else {
-             		// create_object_instance() failed...
-             		this->logger()->log("StaticResource: Unable to create object instance...");
-             		delete this->m_object;
-             		this->m_object = NULL;
-             }
-       }
-       else {
-       		// create_object() failed
-       		this->logger()->log("StaticResource: Unable to create object...");
-       }
-	}
-	else {
-      	 this->logger()->log("StaticResource: NULL value parameter in bind() request...");
-    }
-    return this->m_object;
-}
+/**
+ * @file    StaticResource.h
+ * @brief   mbed CoAP Endpoint Static Resource class
+ * @author  Doug Anson/Chris Paola
+ * @version 1.0
+ * @see
+ *
+ * Copyright (c) 2014
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mbed-connector-interface/StaticResource.h"
+
+// Endpoint 
+#include "mbed-connector-interface/ConnectorEndpoint.h"
+
+// Constructor
+StaticResource::StaticResource(const Logger *logger,const char *obj_name,const char *res_name, const char *value) : Resource<string>(logger,string(obj_name),string(res_name),string(value)), m_data_wrapper()
+{
+	this->m_data_wrapper = NULL;
+	this->m_res = NULL;
+}
+
+// Constructor
+StaticResource::StaticResource(const Logger *logger,const char *obj_name,const char *res_name,const string value) : Resource<string>(logger,string(obj_name),string(res_name),string(value))
+{
+    this->m_data_wrapper = NULL;
+    this->m_res = NULL;
+}
+
+// Constructor with buffer lengths
+StaticResource::StaticResource(const Logger *logger,const string obj_name,const string res_name,const string value) : Resource<string>(logger,string(obj_name),string(res_name),string(value))
+{
+    this->m_data_wrapper = NULL;
+    this->m_res = NULL;
+}
 
+// Copy constructor
+StaticResource::StaticResource(const StaticResource &resource) : Resource<string>((const Resource<string> &)resource)
+{
+    this->m_data_wrapper = resource.m_data_wrapper;
+    this->m_res = resource.m_res;
+}
+
+// Destructor
+StaticResource::~StaticResource() {
+}
+
+// bind CoAP Resource..
+void StaticResource::bind(void *ep) {
+	// Static Resources nailed to STRING type...
+	int type = (int)M2MResourceInstance::STRING;
+	
+	// check our Endpoint instance...
+	if (ep != NULL) {
+		// cast
+		Connector::Endpoint *endpoint = (Connector::Endpoint *)ep;
+		
+		// get our ObjectInstanceManager
+		ObjectInstanceManager *oim = endpoint->getObjectInstanceManager();
+		
+		if (this->getDataWrapper() != NULL) {
+			// wrap the data...
+            this->getDataWrapper()->wrap((uint8_t *)this->getValue().c_str(),(int)this->getValue().size());
+            
+			// Create our Resource
+			this->m_res = (M2MResource *)oim->createStaticResourceInstance((char *)this->getObjName().c_str(),(char *)this->getResName().c_str(),(char *)"StaticResource",(int)type,(void *)this->getDataWrapper()->get(),(int)this->getDataWrapper()->length());
+			if (this->m_res != NULL) {
+				// DEBUG
+				this->logger()->log("StaticResource: [%s] value: [%s] bound",this->getFullName().c_str(),this->getDataWrapper()->get());
+			}
+		}
+		else {
+			// Create our Resource
+			this->m_res = (M2MResource *)oim->createStaticResourceInstance((char *)this->getObjName().c_str(),(char *)this->getResName().c_str(),(char *)"StaticResource",(int)type,(void *)this->getValue().c_str(),(int)this->getValue().size());
+			if (this->m_res != NULL) {
+				this->logger()->log("StaticResource: [%s] value: [%s] bound",this->getFullName().c_str(),this->getValue().c_str());
+			}
+		}
+	}
+	else {
+		// no instance pointer to our endpoint
+      	this->logger()->log("%s: NULL endpoint instance pointer in bind() request...",this->getFullName().c_str());
+    }
+}
\ No newline at end of file