refactor(NLVObject): use defined Unwrap for NLVObject subclasses

mbroadst · mbroadst · commit 7039cbbcbdf8 · 2016-08-27T15:28:55.000-04:00
diff --git a/src/domain.cc b/src/domain.cc
diff --git a/src/hypervisor.cc b/src/hypervisor.cc
@@ -280,7 +280,7 @@ NAN_METHOD(Hypervisor::Disconnect)
   }
 
   Nan::Callback *callback = new Nan::Callback(info[0].As<Function>());
-  Hypervisor *hv = Nan::ObjectWrap::Unwrap<Hypervisor>(info.This());
+  Hypervisor *hv = Hypervisor::Unwrap(info.This());
   Nan::AsyncQueueWorker(new DisconnectWorker(callback, hv));
   return;
 }
@@ -436,7 +436,7 @@ NAN_METHOD(Hypervisor::GetMaxVcpus)
 
   std::string type(*Nan::Utf8String(info[0]));
   Nan::Callback *callback = new Nan::Callback(info[1].As<Function>());
-  Hypervisor *hypervisor = Nan::ObjectWrap::Unwrap<Hypervisor>(info.This());
+  Hypervisor *hypervisor = Hypervisor::Unwrap(info.This());
   Nan::AsyncQueueWorker(new GetMaxVcpusWorker(callback, hypervisor->virHandle(), type));
   return;
 }
@@ -481,7 +481,7 @@ NAN_METHOD(Hypervisor::SetKeepAlive)
   int interval = info[0]->IntegerValue();
   unsigned int count = info[1]->IntegerValue();
   Nan::Callback *callback = new Nan::Callback(info[2].As<Function>());
-  Hypervisor *hypervisor = Nan::ObjectWrap::Unwrap<Hypervisor>(info.This());
+  Hypervisor *hypervisor = Hypervisor::Unwrap(info.This());
   Nan::AsyncQueueWorker(new SetKeepAliveWorker(callback, hypervisor->virHandle(), interval, count));
   return;
 }
@@ -520,7 +520,7 @@ NAN_METHOD(Hypervisor::GetBaselineCPU)
   }
 
   Nan::Callback *callback = new Nan::Callback(info[1].As<Function>());
-  Hypervisor *hypervisor = Nan::ObjectWrap::Unwrap<Hypervisor>(info.This());
+  Hypervisor *hypervisor = Hypervisor::Unwrap(info.This());
   Nan::AsyncQueueWorker(new GetBaselineCPUWorker(callback, hypervisor->virHandle(), cpus, count, flags));
   return;
 }
@@ -556,7 +556,7 @@ NAN_METHOD(Hypervisor::CompareCPU)
   int flags = 0;
   std::string cpu(*Nan::Utf8String(info[0]->ToString()));
   Nan::Callback *callback = new Nan::Callback(info[1].As<Function>());
-  Hypervisor *hypervisor = Nan::ObjectWrap::Unwrap<Hypervisor>(info.This());
+  Hypervisor *hypervisor = Hypervisor::Unwrap(info.This());
   Nan::AsyncQueueWorker(new CompareCPUWorker(callback, hypervisor->virHandle(), cpu, flags));
   return;
 }
@@ -713,7 +713,7 @@ NAN_METHOD(Hypervisor::ListNodeDevices)
     callback = new Nan::Callback(info[0].As<Function>());
   }
 
-  Hypervisor *hypervisor = Nan::ObjectWrap::Unwrap<Hypervisor>(info.This());
+  Hypervisor *hypervisor = Hypervisor::Unwrap(info.This());
   Nan::AsyncQueueWorker(new ListNodeDevicesWorker(callback, hypervisor->virHandle(), capability));
   return;
 }
@@ -830,7 +830,7 @@ NAN_METHOD(Hypervisor::GetNodeMemoryStats)
     return;
   }
   Nan::Callback *callback = new Nan::Callback(info[2].As<Function>());
-  Hypervisor *hypervisor = Nan::ObjectWrap::Unwrap<Hypervisor>(info.This());
+  Hypervisor *hypervisor = Hypervisor::Unwrap(info.This());
   int numCells = info[0]->IntegerValue();
   int flags = info[1]->IntegerValue();
   Nan::AsyncQueueWorker(new GetNodeMemoryStatsWorker(callback, hypervisor->virHandle(), numCells, flags));
@@ -880,7 +880,7 @@ NAN_METHOD(Hypervisor::GetNodeCellsFreeMemory)
   }
 
   Nan::Callback *callback = new Nan::Callback(info[2].As<Function>());
-  Hypervisor *hypervisor = Nan::ObjectWrap::Unwrap<Hypervisor>(info.This());
+  Hypervisor *hypervisor = Hypervisor::Unwrap(info.This());
   Nan::AsyncQueueWorker(new GetNodeCellsFreeMemoryWorker(callback, hypervisor->virHandle(), startCell, maxCells));
   return;
 }
diff --git a/src/interface.cc b/src/interface.cc
@@ -102,7 +102,7 @@ NAN_METHOD(Interface::LookupByName)
     return;
   }
 
-  Hypervisor *hv = Nan::ObjectWrap::Unwrap<Hypervisor>(object);
+  Hypervisor *hv = Hypervisor::Unwrap(object);
   std::string name(*Nan::Utf8String(info[0]->ToString()));
   Nan::Callback *callback = new Nan::Callback(info[1].As<Function>());
   NLV::AsyncQueueWorker(new LookupByNameWorker(callback, hv, name), info.This());
@@ -125,7 +125,7 @@ NAN_METHOD(Interface::LookupByMacAddress)
     return;
   }
 
-  Hypervisor *hv = Nan::ObjectWrap::Unwrap<Hypervisor>(object);
+  Hypervisor *hv = Hypervisor::Unwrap(object);
   std::string uuid(*Nan::Utf8String(info[0]->ToString()));
   Nan::Callback *callback = new Nan::Callback(info[1].As<Function>());
   NLV::AsyncQueueWorker(new LookupByMacAddressWorker(callback, hv, uuid), info.This());
diff --git a/src/nlv_object.h b/src/nlv_object.h
@@ -113,6 +113,7 @@ class NLVObject : public NLVObjectBase
       Nan::ThrowTypeError(error);
       return nullptr;
     }
+
     return Unwrap(val->ToObject());
   }
 
diff --git a/src/node_device.cc b/src/node_device.cc
@@ -47,7 +47,7 @@ NAN_METHOD(NodeDevice::LookupByName)
     return;
   }
 
-  Hypervisor *hv = Nan::ObjectWrap::Unwrap<Hypervisor>(info.This());
+  Hypervisor *hv = Hypervisor::Unwrap(info.This());
   std::string name(*Nan::Utf8String(info[0]->ToString()));
   Nan::Callback *callback = new Nan::Callback(info[1].As<Function>());
   Nan::AsyncQueueWorker(new LookupByNameWorker(callback, hv, name));
@@ -68,7 +68,7 @@ NAN_METHOD(NodeDevice::Create)
     return;
   }
 
-  Hypervisor *hv = Nan::ObjectWrap::Unwrap<Hypervisor>(info.This());
+  Hypervisor *hv = Hypervisor::Unwrap(info.This());
   std::string xmlData(*Nan::Utf8String(info[0]->ToString()));
   Nan::Callback *callback = new Nan::Callback(info[1].As<Function>());
   Nan::AsyncQueueWorker(new CreateWorker(callback, hv, xmlData));
diff --git a/src/secret.cc b/src/secret.cc
@@ -82,7 +82,7 @@ NAN_METHOD(Secret::LookupByUsage)
     return;
   }
 
-  Hypervisor *hv = Nan::ObjectWrap::Unwrap<Hypervisor>(info.This());
+  Hypervisor *hv = Hypervisor::Unwrap(info.This());
   int usageType = info[0]->Int32Value();
   std::string usageId(*Nan::Utf8String(info[1]->ToString()));
   Nan::Callback *callback = new Nan::Callback(info[2].As<Function>());
@@ -115,7 +115,7 @@ NAN_METHOD(Secret::LookupByUUID)
     return;
   }
 
-  Hypervisor *hv = Nan::ObjectWrap::Unwrap<Hypervisor>(info.This());
+  Hypervisor *hv = Hypervisor::Unwrap(info.This());
   std::string uuid(*Nan::Utf8String(info[0]->ToString()));
   Nan::Callback *callback = new Nan::Callback(info[1].As<Function>());
   Nan::AsyncQueueWorker(new LookupByUUIDWorker(callback, hv, uuid));
@@ -193,7 +193,7 @@ NAN_METHOD(Secret::SetValue)
 
   std::string value(*Nan::Utf8String(info[0]->ToString()));
   Nan::Callback *callback = new Nan::Callback(info[1].As<Function>());
-  Secret *secret = Nan::ObjectWrap::Unwrap<Secret>(info.This());
+  Secret *secret = Secret::Unwrap(info.This());
   Nan::AsyncQueueWorker(new SetValueWorker(callback, secret->virHandle(), value));
   return;
 }
diff --git a/src/storage_volume.cc b/src/storage_volume.cc
@@ -97,7 +97,7 @@ NAN_METHOD(StorageVolume::GetInfo)
   }
 
   Nan::Callback *callback = new Nan::Callback(info[0].As<Function>());
-  StorageVolume *storageVolume = Nan::ObjectWrap::Unwrap<StorageVolume>(info.This());
+  StorageVolume *storageVolume = StorageVolume::Unwrap(info.This());
   Nan::AsyncQueueWorker(new GetInfoWorker(callback, storageVolume->virHandle()));
   return;
 }
@@ -194,7 +194,7 @@ NAN_METHOD(StorageVolume::LookupByName)
     return;
   }
 
-  StoragePool *sp = Nan::ObjectWrap::Unwrap<StoragePool>(object);
+  StoragePool *sp = StoragePool::Unwrap(object);
   std::string name(*Nan::Utf8String(info[0]->ToString()));
   Nan::Callback *callback = new Nan::Callback(info[1].As<Function>());
   NLV::AsyncQueueWorker(new LookupByNameWorker(callback, sp, name), info.This());
@@ -217,7 +217,7 @@ NAN_METHOD(StorageVolume::LookupByKey)
     return;
   }
 
-  Hypervisor *hv = Nan::ObjectWrap::Unwrap<Hypervisor>(object);
+  Hypervisor *hv = Hypervisor::Unwrap(object);
   std::string key(*Nan::Utf8String(info[0]->ToString()));
   Nan::Callback *callback = new Nan::Callback(info[1].As<Function>());
   NLV::AsyncQueueWorker(new LookupByKeyWorker(callback, hv, key), info.This());
@@ -240,7 +240,7 @@ NAN_METHOD(StorageVolume::LookupByPath)
     return;
   }
 
-  Hypervisor *hv = Nan::ObjectWrap::Unwrap<Hypervisor>(object);
+  Hypervisor *hv = Hypervisor::Unwrap(object);
   std::string path(*Nan::Utf8String(info[0]->ToString()));
   Nan::Callback *callback = new Nan::Callback(info[1].As<Function>());
   NLV::AsyncQueueWorker(new LookupByPathWorker(callback, hv, path), info.This());
@@ -277,8 +277,8 @@ NAN_METHOD(StorageVolume::Clone)
   }
 
   std::string xml(*Nan::Utf8String(info[1]->ToString()));
-  StoragePool *sp = Nan::ObjectWrap::Unwrap<StoragePool>(object);
-  StorageVolume *sv = Nan::ObjectWrap::Unwrap<StorageVolume>(info[0]->ToObject());
+  StoragePool *sp = StoragePool::Unwrap(object);
+  StorageVolume *sv = StorageVolume::Unwrap(info[0]->ToObject());
   Nan::Callback *callback = new Nan::Callback(info[2].As<Function>());
   NLV::AsyncQueueWorker(new CloneWorker(callback, sp, xml, sv->virHandle()), info.This());
   return;
diff --git a/src/worker_macros.h b/src/worker_macros.h
@@ -47,7 +47,7 @@
       return; \
     } \
     Nan::Callback *callback = new Nan::Callback(info[0].As<Function>());  \
-    Class *object = Nan::ObjectWrap::Unwrap<Class>(info.This()); \
+    Class *object = Class::Unwrap(info.This()); \
     Nan::AsyncQueueWorker(new Method##Worker(callback, object->virHandle()));  \
     return; \
   }
@@ -68,7 +68,7 @@
       Nan::ThrowTypeError("signature is callback or flags, callback"); \
       return; \
     } \
-    Class *object = Nan::ObjectWrap::Unwrap<Class>(info.This()); \
+    Class *object = Class::Unwrap(info.This()); \
     Nan::AsyncQueueWorker(new Method##Worker(callback, object->virHandle(), flags));  \
     return; \
   }
@@ -85,7 +85,7 @@
       Nan::ThrowTypeError("You must specify a Hypervisor instance");  \
       return; \
     } \
-    Hypervisor *hv = Nan::ObjectWrap::Unwrap<Hypervisor>(info.This()); \
+    Hypervisor *hv = Hypervisor::Unwrap(info.This()); \
     std::string xmlData(*Nan::Utf8String(info[0]->ToString())); \
     Nan::Callback *callback = new Nan::Callback(info[1].As<Function>());  \
     NLV::AsyncQueueWorker(new DefineWorker(callback, hv, xmlData), info.This()); \
@@ -104,7 +104,7 @@
       Nan::ThrowTypeError("You must specify a Hypervisor instance");  \
       return; \
     } \
-    Hypervisor *hv = Nan::ObjectWrap::Unwrap<Hypervisor>(info.This()); \
+    Hypervisor *hv = Hypervisor::Unwrap(info.This()); \
     std::string xmlData(*Nan::Utf8String(info[0]->ToString())); \
     Nan::Callback *callback = new Nan::Callback(info[1].As<Function>());  \
     NLV::AsyncQueueWorker(new CreateWorker(callback, hv, xmlData), info.This()); \

Original file line number	Diff line number	Diff line change
`@@ -280,7 +280,7 @@ NAN_METHOD(Hypervisor::Disconnect)`
`280`	`280`	`}`
`281`	`281`
`282`	`282`	`Nan::Callback *callback = new Nan::Callback(info[0].As<Function>());`
`283`		`- Hypervisor *hv = Nan::ObjectWrap::Unwrap<Hypervisor>(info.This());`
	`283`	`+ Hypervisor *hv = Hypervisor::Unwrap(info.This());`
`284`	`284`	`Nan::AsyncQueueWorker(new DisconnectWorker(callback, hv));`
`285`	`285`	`return;`
`286`	`286`	`}`
`@@ -436,7 +436,7 @@ NAN_METHOD(Hypervisor::GetMaxVcpus)`
`436`	`436`
`437`	`437`	`std::string type(*Nan::Utf8String(info[0]));`
`438`	`438`	`Nan::Callback *callback = new Nan::Callback(info[1].As<Function>());`
`439`		`- Hypervisor *hypervisor = Nan::ObjectWrap::Unwrap<Hypervisor>(info.This());`
	`439`	`+ Hypervisor *hypervisor = Hypervisor::Unwrap(info.This());`
`440`	`440`	`Nan::AsyncQueueWorker(new GetMaxVcpusWorker(callback, hypervisor->virHandle(), type));`
`441`	`441`	`return;`
`442`	`442`	`}`
`@@ -481,7 +481,7 @@ NAN_METHOD(Hypervisor::SetKeepAlive)`
`481`	`481`	`int interval = info[0]->IntegerValue();`
`482`	`482`	`unsigned int count = info[1]->IntegerValue();`
`483`	`483`	`Nan::Callback *callback = new Nan::Callback(info[2].As<Function>());`
`484`		`- Hypervisor *hypervisor = Nan::ObjectWrap::Unwrap<Hypervisor>(info.This());`
	`484`	`+ Hypervisor *hypervisor = Hypervisor::Unwrap(info.This());`
`485`	`485`	`Nan::AsyncQueueWorker(new SetKeepAliveWorker(callback, hypervisor->virHandle(), interval, count));`
`486`	`486`	`return;`
`487`	`487`	`}`
`@@ -520,7 +520,7 @@ NAN_METHOD(Hypervisor::GetBaselineCPU)`
`520`	`520`	`}`
`521`	`521`
`522`	`522`	`Nan::Callback *callback = new Nan::Callback(info[1].As<Function>());`
`523`		`- Hypervisor *hypervisor = Nan::ObjectWrap::Unwrap<Hypervisor>(info.This());`
	`523`	`+ Hypervisor *hypervisor = Hypervisor::Unwrap(info.This());`
`524`	`524`	`Nan::AsyncQueueWorker(new GetBaselineCPUWorker(callback, hypervisor->virHandle(), cpus, count, flags));`
`525`	`525`	`return;`
`526`	`526`	`}`
`@@ -556,7 +556,7 @@ NAN_METHOD(Hypervisor::CompareCPU)`
`556`	`556`	`int flags = 0;`
`557`	`557`	`std::string cpu(*Nan::Utf8String(info[0]->ToString()));`
`558`	`558`	`Nan::Callback *callback = new Nan::Callback(info[1].As<Function>());`
`559`		`- Hypervisor *hypervisor = Nan::ObjectWrap::Unwrap<Hypervisor>(info.This());`
	`559`	`+ Hypervisor *hypervisor = Hypervisor::Unwrap(info.This());`
`560`	`560`	`Nan::AsyncQueueWorker(new CompareCPUWorker(callback, hypervisor->virHandle(), cpu, flags));`
`561`	`561`	`return;`
`562`	`562`	`}`
`@@ -713,7 +713,7 @@ NAN_METHOD(Hypervisor::ListNodeDevices)`
`713`	`713`	`callback = new Nan::Callback(info[0].As<Function>());`
`714`	`714`	`}`
`715`	`715`
`716`		`- Hypervisor *hypervisor = Nan::ObjectWrap::Unwrap<Hypervisor>(info.This());`
	`716`	`+ Hypervisor *hypervisor = Hypervisor::Unwrap(info.This());`
`717`	`717`	`Nan::AsyncQueueWorker(new ListNodeDevicesWorker(callback, hypervisor->virHandle(), capability));`
`718`	`718`	`return;`
`719`	`719`	`}`
`@@ -830,7 +830,7 @@ NAN_METHOD(Hypervisor::GetNodeMemoryStats)`
`830`	`830`	`return;`
`831`	`831`	`}`
`832`	`832`	`Nan::Callback *callback = new Nan::Callback(info[2].As<Function>());`
`833`		`- Hypervisor *hypervisor = Nan::ObjectWrap::Unwrap<Hypervisor>(info.This());`
	`833`	`+ Hypervisor *hypervisor = Hypervisor::Unwrap(info.This());`
`834`	`834`	`int numCells = info[0]->IntegerValue();`
`835`	`835`	`int flags = info[1]->IntegerValue();`
`836`	`836`	`Nan::AsyncQueueWorker(new GetNodeMemoryStatsWorker(callback, hypervisor->virHandle(), numCells, flags));`
`@@ -880,7 +880,7 @@ NAN_METHOD(Hypervisor::GetNodeCellsFreeMemory)`
`880`	`880`	`}`
`881`	`881`
`882`	`882`	`Nan::Callback *callback = new Nan::Callback(info[2].As<Function>());`
`883`		`- Hypervisor *hypervisor = Nan::ObjectWrap::Unwrap<Hypervisor>(info.This());`
	`883`	`+ Hypervisor *hypervisor = Hypervisor::Unwrap(info.This());`
`884`	`884`	`Nan::AsyncQueueWorker(new GetNodeCellsFreeMemoryWorker(callback, hypervisor->virHandle(), startCell, maxCells));`
`885`	`885`	`return;`
`886`	`886`	`}`
Original file line number	Diff line number	Diff line change
`@@ -113,6 +113,7 @@ class NLVObject : public NLVObjectBase`
`113`	`113`	`Nan::ThrowTypeError(error);`
`114`	`114`	`return nullptr;`
`115`	`115`	`}`
	`116`	`+`
`116`	`117`	`return Unwrap(val->ToObject());`
`117`	`118`	`}`
`118`	`119`