http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/impl/CacheListener.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/CacheListener.hpp b/src/clicache/src/impl/CacheListener.hpp index 9c8a802..92857cf 100644 --- a/src/clicache/src/impl/CacheListener.hpp +++ b/src/clicache/src/impl/CacheListener.hpp @@ -32,8 +32,6 @@ namespace Apache { namespace Client { -namespace Generic - { generic<class TKey, class TValue> public ref class CacheListenerGeneric : CacheListenerAdapter<Object^, Object^> @@ -49,67 +47,67 @@ namespace Generic m_listener = listener; } - virtual void AfterUpdate(Apache::Geode::Client::Generic::EntryEvent<Object^, Object^>^ event) override + virtual void AfterUpdate(Apache::Geode::Client::EntryEvent<Object^, Object^>^ event) override { - EntryEvent<TKey, TValue> gevent(Generic::GetNativePtr<apache::geode::client::EntryEvent>(event)); + EntryEvent<TKey, TValue> gevent(Client::GetNativePtr<apache::geode::client::EntryEvent>(event)); m_listener->AfterUpdate(%gevent); } - virtual void AfterCreate(Apache::Geode::Client::Generic::EntryEvent<Object^, Object^>^ event) override + virtual void AfterCreate(Apache::Geode::Client::EntryEvent<Object^, Object^>^ event) override { - EntryEvent<TKey, TValue> gevent(Generic::GetNativePtr<apache::geode::client::EntryEvent>(event)); + EntryEvent<TKey, TValue> gevent(Client::GetNativePtr<apache::geode::client::EntryEvent>(event)); m_listener->AfterCreate(%gevent); } - virtual void AfterInvalidate(Apache::Geode::Client::Generic::EntryEvent<Object^, Object^>^ event) override + virtual void AfterInvalidate(Apache::Geode::Client::EntryEvent<Object^, Object^>^ event) override { - EntryEvent<TKey, TValue> gevent(Generic::GetNativePtr<apache::geode::client::EntryEvent>(event)); + EntryEvent<TKey, TValue> gevent(Client::GetNativePtr<apache::geode::client::EntryEvent>(event)); m_listener->AfterInvalidate(%gevent); } - virtual void AfterDestroy(Apache::Geode::Client::Generic::EntryEvent<Object^, Object^>^ event) override + virtual void AfterDestroy(Apache::Geode::Client::EntryEvent<Object^, Object^>^ event) override { - EntryEvent<TKey, TValue> gevent(Generic::GetNativePtr<apache::geode::client::EntryEvent>(event)); + EntryEvent<TKey, TValue> gevent(Client::GetNativePtr<apache::geode::client::EntryEvent>(event)); m_listener->AfterDestroy(%gevent); } - virtual void AfterRegionLive(Apache::Geode::Client::Generic::RegionEvent<Object^, Object^>^ event) override + virtual void AfterRegionLive(Apache::Geode::Client::RegionEvent<Object^, Object^>^ event) override { - RegionEvent<TKey, TValue> gevent(Generic::GetNativePtr<apache::geode::client::RegionEvent>(event)); + RegionEvent<TKey, TValue> gevent(Client::GetNativePtr<apache::geode::client::RegionEvent>(event)); m_listener->AfterRegionLive(%gevent); } - virtual void AfterRegionClear(Apache::Geode::Client::Generic::RegionEvent<Object^, Object^>^ event) override + virtual void AfterRegionClear(Apache::Geode::Client::RegionEvent<Object^, Object^>^ event) override { - RegionEvent<TKey, TValue> gevent(Generic::GetNativePtr<apache::geode::client::RegionEvent>(event)); + RegionEvent<TKey, TValue> gevent(Client::GetNativePtr<apache::geode::client::RegionEvent>(event)); m_listener->AfterRegionClear(%gevent); } - virtual void AfterRegionDestroy(Apache::Geode::Client::Generic::RegionEvent<Object^, Object^>^ event) override + virtual void AfterRegionDestroy(Apache::Geode::Client::RegionEvent<Object^, Object^>^ event) override { - RegionEvent<TKey, TValue> gevent(Generic::GetNativePtr<apache::geode::client::RegionEvent>(event)); + RegionEvent<TKey, TValue> gevent(Client::GetNativePtr<apache::geode::client::RegionEvent>(event)); m_listener->AfterRegionDestroy(%gevent); } - virtual void AfterRegionInvalidate(Apache::Geode::Client::Generic::RegionEvent<Object^, Object^>^ event) override + virtual void AfterRegionInvalidate(Apache::Geode::Client::RegionEvent<Object^, Object^>^ event) override { - RegionEvent<TKey, TValue> gevent(Generic::GetNativePtr<apache::geode::client::RegionEvent>(event)); + RegionEvent<TKey, TValue> gevent(Client::GetNativePtr<apache::geode::client::RegionEvent>(event)); m_listener->AfterRegionInvalidate(%gevent); } - virtual void AfterRegionDisconnected(Apache::Geode::Client::Generic::IRegion<Object^, Object^>^ event) override + virtual void AfterRegionDisconnected(Apache::Geode::Client::IRegion<Object^, Object^>^ event) override { - Apache::Geode::Client::Generic::IRegion<TKey, TValue>^ gevent = Apache::Geode::Client::Generic::Region<TKey, TValue>::Create(Apache::Geode::Client::Generic::GetNativePtr<apache::geode::client::Region>(reinterpret_cast<Apache::Geode::Client::Generic::Region<Object^, Object^>^>(event))); + Apache::Geode::Client::IRegion<TKey, TValue>^ gevent = Apache::Geode::Client::Region<TKey, TValue>::Create(Apache::Geode::Client::GetNativePtr<apache::geode::client::Region>(reinterpret_cast<Apache::Geode::Client::Region<Object^, Object^>^>(event))); m_listener->AfterRegionDisconnected(gevent); } - virtual void Close(Apache::Geode::Client::Generic::IRegion<Object^, Object^>^ event) override + virtual void Close(Apache::Geode::Client::IRegion<Object^, Object^>^ event) override { - Apache::Geode::Client::Generic::IRegion<TKey, TValue>^ gevent = Apache::Geode::Client::Generic::Region<TKey, TValue>::Create(Apache::Geode::Client::Generic::GetNativePtr<apache::geode::client::Region>(reinterpret_cast<Apache::Geode::Client::Generic::Region<Object^, Object^>^>(event))); + Apache::Geode::Client::IRegion<TKey, TValue>^ gevent = Apache::Geode::Client::Region<TKey, TValue>::Create(Apache::Geode::Client::GetNativePtr<apache::geode::client::Region>(reinterpret_cast<Apache::Geode::Client::Region<Object^, Object^>^>(event))); m_listener->Close(gevent); } }; - } - } - } -} + } // namespace Client + } // namespace Geode +} // namespace Apache +
http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/impl/CacheLoader.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/CacheLoader.hpp b/src/clicache/src/impl/CacheLoader.hpp index 4f8c23a..80f49c8 100644 --- a/src/clicache/src/impl/CacheLoader.hpp +++ b/src/clicache/src/impl/CacheLoader.hpp @@ -28,7 +28,7 @@ using namespace System; -//using namespace Apache::Geode::Client::Generic; +//using namespace Apache::Geode::Client; namespace Apache { @@ -36,8 +36,6 @@ namespace Apache { namespace Client { -namespace Generic - { public interface class ICacheLoaderProxy { @@ -81,7 +79,7 @@ namespace Generic m_loader->Close(gregion); } }; - } - } - } -} + } // namespace Client + } // namespace Geode +} // namespace Apache + http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/impl/CacheWriter.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/CacheWriter.hpp b/src/clicache/src/impl/CacheWriter.hpp index 2e088fb..da03a1f 100644 --- a/src/clicache/src/impl/CacheWriter.hpp +++ b/src/clicache/src/impl/CacheWriter.hpp @@ -32,11 +32,9 @@ namespace Apache { namespace Client { -namespace Generic - { generic<class TKey, class TValue> - public ref class CacheWriterGeneric : Apache::Geode::Client::Generic::CacheWriterAdapter<Object^, Object^> + public ref class CacheWriterGeneric : Apache::Geode::Client::CacheWriterAdapter<Object^, Object^> { private: @@ -49,43 +47,43 @@ namespace Generic m_writer = writer; } - virtual bool BeforeUpdate( Apache::Geode::Client::Generic::EntryEvent<Object^, Object^>^ ev ) override + virtual bool BeforeUpdate( Apache::Geode::Client::EntryEvent<Object^, Object^>^ ev ) override { - EntryEvent<TKey, TValue> gevent(Generic::GetNativePtr<apache::geode::client::EntryEvent>(ev)); + EntryEvent<TKey, TValue> gevent(Client::GetNativePtr<apache::geode::client::EntryEvent>(ev)); return m_writer->BeforeUpdate(%gevent); } - virtual bool BeforeCreate(Apache::Geode::Client::Generic::EntryEvent<Object^, Object^>^ ev) override + virtual bool BeforeCreate(Apache::Geode::Client::EntryEvent<Object^, Object^>^ ev) override { - EntryEvent<TKey, TValue> gevent(Generic::GetNativePtr<apache::geode::client::EntryEvent>(ev)); + EntryEvent<TKey, TValue> gevent(Client::GetNativePtr<apache::geode::client::EntryEvent>(ev)); return m_writer->BeforeCreate(%gevent); } - virtual bool BeforeDestroy(Apache::Geode::Client::Generic::EntryEvent<Object^, Object^>^ ev) override + virtual bool BeforeDestroy(Apache::Geode::Client::EntryEvent<Object^, Object^>^ ev) override { - EntryEvent<TKey, TValue> gevent(Generic::GetNativePtr<apache::geode::client::EntryEvent>(ev)); + EntryEvent<TKey, TValue> gevent(Client::GetNativePtr<apache::geode::client::EntryEvent>(ev)); return m_writer->BeforeDestroy(%gevent); } - virtual bool BeforeRegionClear( Apache::Geode::Client::Generic::RegionEvent<Object^, Object^>^ ev ) override + virtual bool BeforeRegionClear( Apache::Geode::Client::RegionEvent<Object^, Object^>^ ev ) override { - RegionEvent<TKey, TValue> gevent(Generic::GetNativePtr<apache::geode::client::RegionEvent>(ev)); + RegionEvent<TKey, TValue> gevent(Client::GetNativePtr<apache::geode::client::RegionEvent>(ev)); return m_writer->BeforeRegionClear(%gevent); } - virtual bool BeforeRegionDestroy(Apache::Geode::Client::Generic::RegionEvent<Object^, Object^>^ ev) override + virtual bool BeforeRegionDestroy(Apache::Geode::Client::RegionEvent<Object^, Object^>^ ev) override { - RegionEvent<TKey, TValue> gevent(Generic::GetNativePtr<apache::geode::client::RegionEvent>(ev)); + RegionEvent<TKey, TValue> gevent(Client::GetNativePtr<apache::geode::client::RegionEvent>(ev)); return m_writer->BeforeRegionDestroy(%gevent); } - virtual void Close(Apache::Geode::Client::Generic::Region<Object^, Object^>^ region) override + virtual void Close(Apache::Geode::Client::Region<Object^, Object^>^ region) override { - IRegion<TKey, TValue>^ gregion = Apache::Geode::Client::Generic::Region<TKey, TValue>::Create(Generic::GetNativePtr<apache::geode::client::Region>(region)); + IRegion<TKey, TValue>^ gregion = Apache::Geode::Client::Region<TKey, TValue>::Create(Client::GetNativePtr<apache::geode::client::Region>(region)); m_writer->Close(gregion); } }; - } - } - } -} + } // namespace Client + } // namespace Geode +} // namespace Apache + http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/impl/CliCallbackDelgate.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/CliCallbackDelgate.hpp b/src/clicache/src/impl/CliCallbackDelgate.hpp index 7cea76c..f5861ac 100755 --- a/src/clicache/src/impl/CliCallbackDelgate.hpp +++ b/src/clicache/src/impl/CliCallbackDelgate.hpp @@ -32,8 +32,6 @@ namespace Apache { namespace Client { -namespace Generic - { /// <summary> /// to get the callback from c++ layer @@ -48,16 +46,14 @@ namespace Generic void Callback( ) { - Apache::Geode::Client::Generic::Log::Fine("CliCallbackDelgate::Callback( ) "); - Apache::Geode::Client::Generic::Internal::PdxTypeRegistry::clear(); + Apache::Geode::Client::Log::Fine("CliCallbackDelgate::Callback( ) "); + Apache::Geode::Client::Internal::PdxTypeRegistry::clear(); } private: }; - - } - } -} -} \ No newline at end of file + } // namespace Client + } // namespace Geode +} // namespace Apache http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/impl/CqListenerProxy.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/CqListenerProxy.hpp b/src/clicache/src/impl/CqListenerProxy.hpp index 8c7b1d7..29b003f 100644 --- a/src/clicache/src/impl/CqListenerProxy.hpp +++ b/src/clicache/src/impl/CqListenerProxy.hpp @@ -29,11 +29,9 @@ namespace Apache { namespace Client { -namespace Generic - { generic<class TKey, class TResult> - public ref class CqListenerGeneric : Apache::Geode::Client::Generic::ICqListener<Object^, Object^> + public ref class CqListenerGeneric : Apache::Geode::Client::ICqListener<Object^, Object^> { private: @@ -46,14 +44,14 @@ namespace Generic m_listener = listener; } - virtual void OnEvent( Apache::Geode::Client::Generic::CqEvent<Object^, Object^>^ ev) + virtual void OnEvent( Apache::Geode::Client::CqEvent<Object^, Object^>^ ev) { //TODO:split---Done CqEvent<TKey, TResult> gevent(GetNativePtr<apache::geode::client::CqEvent>(ev)); m_listener->OnEvent(%gevent); } - virtual void OnError(Apache::Geode::Client::Generic::CqEvent<Object^, Object^>^ ev) + virtual void OnError(Apache::Geode::Client::CqEvent<Object^, Object^>^ ev) { //TODO::split--Done CqEvent<TKey, TResult> gevent(GetNativePtr<apache::geode::client::CqEvent>(ev)); @@ -65,7 +63,7 @@ namespace Generic m_listener->Close(); } }; - } - } - } -} + } // namespace Client + } // namespace Geode +} // namespace Apache + http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/impl/CqStatusListenerProxy.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/CqStatusListenerProxy.hpp b/src/clicache/src/impl/CqStatusListenerProxy.hpp index 960bf9f..d2b4004 100644 --- a/src/clicache/src/impl/CqStatusListenerProxy.hpp +++ b/src/clicache/src/impl/CqStatusListenerProxy.hpp @@ -26,10 +26,9 @@ namespace Apache { namespace Client { -namespace Generic - { + generic<class TKey, class TResult> - public ref class CqStatusListenerGeneric : Apache::Geode::Client::Generic::ICqStatusListener<Object^, Object^> + public ref class CqStatusListenerGeneric : Apache::Geode::Client::ICqStatusListener<Object^, Object^> { private: @@ -42,14 +41,14 @@ namespace Generic m_listener = dynamic_cast<ICqStatusListener<TKey, TResult>^>(listener); } - virtual void OnEvent(Apache::Geode::Client::Generic::CqEvent<Object^, Object^>^ ev) + virtual void OnEvent(Apache::Geode::Client::CqEvent<Object^, Object^>^ ev) { //TODO:split---Done CqEvent<TKey, TResult> gevent(GetNativePtr<apache::geode::client::CqEvent>(ev)); m_listener->OnEvent(%gevent); } - virtual void OnError( Apache::Geode::Client::Generic::CqEvent<Object^, Object^>^ ev) + virtual void OnError( Apache::Geode::Client::CqEvent<Object^, Object^>^ ev) { //TODO::split--Done CqEvent<TKey, TResult> gevent(GetNativePtr<apache::geode::client::CqEvent>(ev)); @@ -71,8 +70,8 @@ namespace Generic m_listener->OnCqConnected(); } }; - } - } - } -} + } // namespace Client + } // namespace Geode +} // namespace Apache + http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/impl/DelegateWrapper.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/DelegateWrapper.hpp b/src/clicache/src/impl/DelegateWrapper.hpp index a0e804f..23f985d 100644 --- a/src/clicache/src/impl/DelegateWrapper.hpp +++ b/src/clicache/src/impl/DelegateWrapper.hpp @@ -31,8 +31,6 @@ namespace Apache { namespace Client { -namespace Generic - { /// <summary> /// Template class to wrap a managed <see cref="TypeFactoryMethod" /> @@ -99,8 +97,6 @@ namespace Generic TypeFactoryMethodGeneric^ m_delegate; }; - - } - } -} -} \ No newline at end of file + } // namespace Client + } // namespace Geode +} // namespace Apache http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/impl/DotNetTypes.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/DotNetTypes.hpp b/src/clicache/src/impl/DotNetTypes.hpp index 2b9b021..d777e7c 100755 --- a/src/clicache/src/impl/DotNetTypes.hpp +++ b/src/clicache/src/impl/DotNetTypes.hpp @@ -23,8 +23,7 @@ namespace Apache { namespace Client { -namespace Generic - { + namespace Internal { public ref class DotNetTypes sealed @@ -55,8 +54,8 @@ namespace Generic static Type^ VoidType = Type::GetType("System.Void"); static Type^ ObjectType = Type::GetType("System.Object"); }; - } - } - } - } + } // namespace Client + } // namespace Geode +} // namespace Apache + } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/impl/EnumInfo.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/EnumInfo.cpp b/src/clicache/src/impl/EnumInfo.cpp index 7f209bd..4a300a3 100755 --- a/src/clicache/src/impl/EnumInfo.cpp +++ b/src/clicache/src/impl/EnumInfo.cpp @@ -28,8 +28,7 @@ namespace Apache { namespace Client { -namespace Generic - { + namespace Internal { void EnumInfo::ToData( DataOutput^ output ) @@ -54,13 +53,9 @@ namespace Generic Object^ obj = Enum::Parse(t, _enumName); return obj; - } - + } // namespace Client + } // namespace Geode +} // namespace Apache - - - } - } - } } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/impl/EnumInfo.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/EnumInfo.hpp b/src/clicache/src/impl/EnumInfo.hpp index c8bb812..0d7d40b 100755 --- a/src/clicache/src/impl/EnumInfo.hpp +++ b/src/clicache/src/impl/EnumInfo.hpp @@ -27,8 +27,7 @@ namespace Apache { namespace Client { -namespace Generic - { + namespace Internal { public ref class EnumInfo : public IGFSerializable @@ -98,8 +97,8 @@ namespace Generic Object^ GetEnum(); }; - } - } - } - } + } // namespace Client + } // namespace Geode +} // namespace Apache + } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/impl/FixedPartitionResolver.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/FixedPartitionResolver.hpp b/src/clicache/src/impl/FixedPartitionResolver.hpp index a51c833..03f57c9 100644 --- a/src/clicache/src/impl/FixedPartitionResolver.hpp +++ b/src/clicache/src/impl/FixedPartitionResolver.hpp @@ -30,8 +30,6 @@ namespace Apache { namespace Client { -namespace Generic - { public interface class IFixedPartitionResolverProxy { @@ -98,7 +96,7 @@ namespace Generic return mnStr->CharPtr; } }; - } - } - } -} + } // namespace Client + } // namespace Geode +} // namespace Apache + http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/impl/GFDataInputStream.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/GFDataInputStream.hpp b/src/clicache/src/impl/GFDataInputStream.hpp index 91cf62f..89d2bb7 100644 --- a/src/clicache/src/impl/GFDataInputStream.hpp +++ b/src/clicache/src/impl/GFDataInputStream.hpp @@ -30,8 +30,7 @@ namespace Apache { namespace Client { -namespace Generic - { + ref class GFDataInputStream : public Stream { public: @@ -132,7 +131,6 @@ namespace Generic int m_maxSize; DataInput ^ m_buffer; }; - } - } -} -} \ No newline at end of file + } // namespace Client + } // namespace Geode +} // namespace Apache http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/impl/GFDataOutputStream.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/GFDataOutputStream.hpp b/src/clicache/src/impl/GFDataOutputStream.hpp index 56a3242..433fdd9 100644 --- a/src/clicache/src/impl/GFDataOutputStream.hpp +++ b/src/clicache/src/impl/GFDataOutputStream.hpp @@ -30,8 +30,7 @@ namespace Apache { namespace Client { -namespace Generic - { + ref class GFDataOutputStream : public Stream { public: @@ -113,7 +112,7 @@ namespace Generic int m_position; DataOutput ^ m_buffer; }; - } - } -} -} + } // namespace Client + } // namespace Geode +} // namespace Apache + http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/impl/GFNullStream.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/GFNullStream.hpp b/src/clicache/src/impl/GFNullStream.hpp index c45f752..5703d02 100644 --- a/src/clicache/src/impl/GFNullStream.hpp +++ b/src/clicache/src/impl/GFNullStream.hpp @@ -28,8 +28,7 @@ namespace Apache { namespace Client { -namespace Generic - { + ref class GFNullStream : public Stream { public: @@ -115,7 +114,6 @@ namespace Generic private: int m_position; }; - } - } -} -} \ No newline at end of file + } // namespace Client + } // namespace Geode +} // namespace Apache http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/impl/ManagedAuthInitialize.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/ManagedAuthInitialize.cpp b/src/clicache/src/impl/ManagedAuthInitialize.cpp index d0028f0..9468e3e 100644 --- a/src/clicache/src/impl/ManagedAuthInitialize.cpp +++ b/src/clicache/src/impl/ManagedAuthInitialize.cpp @@ -40,9 +40,9 @@ namespace apache try { String^ mg_assemblyPath = - Apache::Geode::Client::Generic::ManagedString::Get(assemblyPath); + Apache::Geode::Client::ManagedString::Get(assemblyPath); String^ mg_factoryFunctionName = - Apache::Geode::Client::Generic::ManagedString::Get(factoryFunctionName); + Apache::Geode::Client::ManagedString::Get(factoryFunctionName); String^ mg_typeName = nullptr; int32_t dotIndx = -1; @@ -102,7 +102,7 @@ namespace apache */ //typeInst = typeInst->GetType()->MakeGenericType(types); - Apache::Geode::Client::Generic::Log::Info("Loading function: [{0}]", mg_factoryFunctionName); + Apache::Geode::Client::Log::Info("Loading function: [{0}]", mg_factoryFunctionName); /* MethodInfo^ mInfo = typeInst->GetMethod( mg_factoryFunctionName, @@ -132,7 +132,7 @@ namespace apache ex_str += assemblyPath; throw AuthenticationRequiredException(ex_str.c_str()); } - ManagedAuthInitializeGeneric * maig = new ManagedAuthInitializeGeneric(safe_cast<Apache::Geode::Client::Generic::IAuthInitialize^>(userptr)); + ManagedAuthInitializeGeneric * maig = new ManagedAuthInitializeGeneric(safe_cast<Apache::Geode::Client::IAuthInitialize^>(userptr)); return maig; } else @@ -147,7 +147,7 @@ namespace apache } else { - Apache::Geode::Client::Generic::ManagedString typeName(mg_typeName); + Apache::Geode::Client::ManagedString typeName(mg_typeName); std::string ex_str = "ManagedAuthInitializeGeneric: Could not load type ["; ex_str += typeName.CharPtr; ex_str += "] in assembly: "; @@ -170,7 +170,7 @@ namespace apache } catch (System::Exception^ ex) { - Apache::Geode::Client::Generic::ManagedString mg_exStr(ex->ToString()); + Apache::Geode::Client::ManagedString mg_exStr(ex->ToString()); std::string ex_str = "ManagedAuthInitializeGeneric: Got an exception while " "loading managed library: "; ex_str += mg_exStr.CharPtr; @@ -183,17 +183,17 @@ namespace apache securityprops, const char* server) { try { - Apache::Geode::Client::Generic::Properties<String^, String^>^ mprops = - Apache::Geode::Client::Generic::Properties<String^, String^>::Create<String^, String^>(securityprops.ptr()); - String^ mg_server = Apache::Geode::Client::Generic::ManagedString::Get(server); + Apache::Geode::Client::Properties<String^, String^>^ mprops = + Apache::Geode::Client::Properties<String^, String^>::Create<String^, String^>(securityprops.ptr()); + String^ mg_server = Apache::Geode::Client::ManagedString::Get(server); return PropertiesPtr(m_managedptr->GetCredentials(mprops, mg_server)->NativePtr()); } - catch (Apache::Geode::Client::Generic::GemFireException^ ex) { + catch (Apache::Geode::Client::GemFireException^ ex) { ex->ThrowNative(); } catch (System::Exception^ ex) { - Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex); + Apache::Geode::Client::GemFireException::ThrowNative(ex); } return NULLPTR; } @@ -203,11 +203,11 @@ namespace apache try { m_managedptr->Close(); } - catch (Apache::Geode::Client::Generic::GemFireException^ ex) { + catch (Apache::Geode::Client::GemFireException^ ex) { ex->ThrowNative(); } catch (System::Exception^ ex) { - Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex); + Apache::Geode::Client::GemFireException::ThrowNative(ex); } } http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/impl/ManagedAuthInitialize.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/ManagedAuthInitialize.hpp b/src/clicache/src/impl/ManagedAuthInitialize.hpp index 6ef656f..2d25e2a 100644 --- a/src/clicache/src/impl/ManagedAuthInitialize.hpp +++ b/src/clicache/src/impl/ManagedAuthInitialize.hpp @@ -32,7 +32,7 @@ namespace apache { /// <summary> - /// Wraps the managed <see cref="Apache.Geode.Client.Generic.IAuthInitialize" /> + /// Wraps the managed <see cref="Apache.Geode.Client.IAuthInitialize" /> /// object and implements the native <c>apache::geode::client::AuthInitialize</c> interface. /// </summary> class ManagedAuthInitializeGeneric @@ -46,7 +46,7 @@ namespace apache /// <param name="managedptr"> /// The managed object. /// </param> - inline ManagedAuthInitializeGeneric(Apache::Geode::Client::Generic::IAuthInitialize^ managedptr) + inline ManagedAuthInitializeGeneric(Apache::Geode::Client::IAuthInitialize^ managedptr) : m_managedptr(managedptr) { } /// <summary> @@ -100,7 +100,7 @@ namespace apache /// <summary> /// Returns the wrapped managed object reference. /// </summary> - inline Apache::Geode::Client::Generic::IAuthInitialize^ ptr() const + inline Apache::Geode::Client::IAuthInitialize^ ptr() const { return m_managedptr; } @@ -113,7 +113,7 @@ namespace apache /// to be called which is not what is desired when this object is destroyed. Normally this /// managed object may be created by the user and will be handled automatically by the GC. /// </summary> - gcroot<Apache::Geode::Client::Generic::IAuthInitialize^> m_managedptr; + gcroot<Apache::Geode::Client::IAuthInitialize^> m_managedptr; // Disable the copy and assignment constructors ManagedAuthInitializeGeneric(const ManagedAuthInitializeGeneric&); http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/impl/ManagedCacheListener.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/ManagedCacheListener.cpp b/src/clicache/src/impl/ManagedCacheListener.cpp index 8752067..9a12870 100644 --- a/src/clicache/src/impl/ManagedCacheListener.cpp +++ b/src/clicache/src/impl/ManagedCacheListener.cpp @@ -44,9 +44,9 @@ namespace apache try { String^ mg_assemblyPath = - Apache::Geode::Client::Generic::ManagedString::Get(assemblyPath); + Apache::Geode::Client::ManagedString::Get(assemblyPath); String^ mg_factoryFunctionName = - Apache::Geode::Client::Generic::ManagedString::Get(factoryFunctionName); + Apache::Geode::Client::ManagedString::Get(factoryFunctionName); String^ mg_typeName = nullptr; String^ mg_genericKey = nullptr; @@ -100,7 +100,7 @@ namespace apache mg_genericVal = mg_genericVal->Trim(); mg_factoryFunctionName = mg_factoryFunctionName->Substring(dotIndx + 1); - Apache::Geode::Client::Generic::Log::Fine("Attempting to instantiate a [{0}<{1}, {2}>] via the [{3}] factory method.", + Apache::Geode::Client::Log::Fine("Attempting to instantiate a [{0}<{1}, {2}>] via the [{3}] factory method.", mg_typeName, mg_genericKey, mg_genericVal, mg_factoryFunctionName); typeBuilder->Append("`2"); @@ -122,7 +122,7 @@ namespace apache throw apache::geode::client::IllegalArgumentException(ex_str.c_str()); } - Apache::Geode::Client::Generic::Log::Debug("Loading type: [{0}]", mg_typeName); + Apache::Geode::Client::Log::Debug("Loading type: [{0}]", mg_typeName); Type^ typeInst = assmb->GetType(mg_typeName, false, true); @@ -139,7 +139,7 @@ namespace apache } typeInst = typeInst->MakeGenericType(types); - Apache::Geode::Client::Generic::Log::Info("Loading function: [{0}]", mg_factoryFunctionName); + Apache::Geode::Client::Log::Info("Loading function: [{0}]", mg_factoryFunctionName); MethodInfo^ mInfo = typeInst->GetMethod(mg_factoryFunctionName, BindingFlags::Public | BindingFlags::Static | BindingFlags::IgnoreCase); @@ -153,7 +153,7 @@ namespace apache } catch (System::Exception^ ex) { - Apache::Geode::Client::Generic::Log::Debug("{0}: {1}", ex->GetType()->Name, ex->Message); + Apache::Geode::Client::Log::Debug("{0}: {1}", ex->GetType()->Name, ex->Message); userptr = nullptr; } if (userptr == nullptr) @@ -168,7 +168,7 @@ namespace apache ManagedCacheListenerGeneric * mgcl = new ManagedCacheListenerGeneric(userptr); - Type^ clgType = Type::GetType("Apache.Geode.Client.Generic.CacheListenerGeneric`2"); + Type^ clgType = Type::GetType("Apache.Geode.Client.CacheListenerGeneric`2"); clgType = clgType->MakeGenericType(types); Object^ clg = Activator::CreateInstance(clgType); @@ -177,7 +177,7 @@ namespace apache params[0] = userptr; mInfo->Invoke(clg, params); - mgcl->setptr((Apache::Geode::Client::Generic::ICacheListener<Object^, Object^>^)clg); + mgcl->setptr((Apache::Geode::Client::ICacheListener<Object^, Object^>^)clg); return mgcl; } @@ -193,7 +193,7 @@ namespace apache } else { - Apache::Geode::Client::Generic::ManagedString typeName(mg_typeName); + Apache::Geode::Client::ManagedString typeName(mg_typeName); std::string ex_str = "ManagedCacheListenerGeneric: Could not load type ["; ex_str += typeName.CharPtr; ex_str += "] in assembly: "; @@ -207,7 +207,7 @@ namespace apache } catch (System::Exception^ ex) { - Apache::Geode::Client::Generic::ManagedString mg_exStr(ex->ToString()); + Apache::Geode::Client::ManagedString mg_exStr(ex->ToString()); std::string ex_str = "ManagedCacheListenerGeneric: Got an exception while " "loading managed library: "; ex_str += mg_exStr.CharPtr; @@ -219,141 +219,141 @@ namespace apache void ManagedCacheListenerGeneric::afterCreate(const apache::geode::client::EntryEvent& ev) { try { - Apache::Geode::Client::Generic::EntryEvent<Object^, Object^> mevent(&ev); + Apache::Geode::Client::EntryEvent<Object^, Object^> mevent(&ev); m_managedptr->AfterCreate(%mevent); } - catch (Apache::Geode::Client::Generic::GemFireException^ ex) { + catch (Apache::Geode::Client::GemFireException^ ex) { ex->ThrowNative(); } catch (System::Exception^ ex) { - Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex); + Apache::Geode::Client::GemFireException::ThrowNative(ex); } } void ManagedCacheListenerGeneric::afterUpdate(const apache::geode::client::EntryEvent& ev) { try { - Apache::Geode::Client::Generic::EntryEvent<Object^, Object^> mevent(&ev); + Apache::Geode::Client::EntryEvent<Object^, Object^> mevent(&ev); m_managedptr->AfterUpdate(%mevent); } - catch (Apache::Geode::Client::Generic::GemFireException^ ex) { + catch (Apache::Geode::Client::GemFireException^ ex) { ex->ThrowNative(); } catch (System::Exception^ ex) { - Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex); + Apache::Geode::Client::GemFireException::ThrowNative(ex); } } void ManagedCacheListenerGeneric::afterInvalidate(const apache::geode::client::EntryEvent& ev) { try { - Apache::Geode::Client::Generic::EntryEvent<Object^, Object^> mevent(&ev); + Apache::Geode::Client::EntryEvent<Object^, Object^> mevent(&ev); m_managedptr->AfterInvalidate(%mevent); } - catch (Apache::Geode::Client::Generic::GemFireException^ ex) { + catch (Apache::Geode::Client::GemFireException^ ex) { ex->ThrowNative(); } catch (System::Exception^ ex) { - Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex); + Apache::Geode::Client::GemFireException::ThrowNative(ex); } } void ManagedCacheListenerGeneric::afterDestroy(const apache::geode::client::EntryEvent& ev) { try { - Apache::Geode::Client::Generic::EntryEvent<Object^, Object^> mevent(&ev); + Apache::Geode::Client::EntryEvent<Object^, Object^> mevent(&ev); m_managedptr->AfterDestroy(%mevent); } - catch (Apache::Geode::Client::Generic::GemFireException^ ex) { + catch (Apache::Geode::Client::GemFireException^ ex) { ex->ThrowNative(); } catch (System::Exception^ ex) { - Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex); + Apache::Geode::Client::GemFireException::ThrowNative(ex); } } void ManagedCacheListenerGeneric::afterRegionClear(const apache::geode::client::RegionEvent& ev) { try { - Apache::Geode::Client::Generic::RegionEvent<Object^, Object^> mevent(&ev); + Apache::Geode::Client::RegionEvent<Object^, Object^> mevent(&ev); m_managedptr->AfterRegionClear(%mevent); } - catch (Apache::Geode::Client::Generic::GemFireException^ ex) { + catch (Apache::Geode::Client::GemFireException^ ex) { ex->ThrowNative(); } catch (System::Exception^ ex) { - Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex); + Apache::Geode::Client::GemFireException::ThrowNative(ex); } } void ManagedCacheListenerGeneric::afterRegionInvalidate(const apache::geode::client::RegionEvent& ev) { try { - Apache::Geode::Client::Generic::RegionEvent<Object^, Object^> mevent(&ev); + Apache::Geode::Client::RegionEvent<Object^, Object^> mevent(&ev); m_managedptr->AfterRegionInvalidate(%mevent); } - catch (Apache::Geode::Client::Generic::GemFireException^ ex) { + catch (Apache::Geode::Client::GemFireException^ ex) { ex->ThrowNative(); } catch (System::Exception^ ex) { - Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex); + Apache::Geode::Client::GemFireException::ThrowNative(ex); } } void ManagedCacheListenerGeneric::afterRegionDestroy(const apache::geode::client::RegionEvent& ev) { try { - Apache::Geode::Client::Generic::RegionEvent<Object^, Object^> mevent(&ev); + Apache::Geode::Client::RegionEvent<Object^, Object^> mevent(&ev); m_managedptr->AfterRegionDestroy(%mevent); } - catch (Apache::Geode::Client::Generic::GemFireException^ ex) { + catch (Apache::Geode::Client::GemFireException^ ex) { ex->ThrowNative(); } catch (System::Exception^ ex) { - Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex); + Apache::Geode::Client::GemFireException::ThrowNative(ex); } } void ManagedCacheListenerGeneric::afterRegionLive(const apache::geode::client::RegionEvent& ev) { try { - Apache::Geode::Client::Generic::RegionEvent<Object^, Object^> mevent(&ev); + Apache::Geode::Client::RegionEvent<Object^, Object^> mevent(&ev); m_managedptr->AfterRegionLive(%mevent); } - catch (Apache::Geode::Client::Generic::GemFireException^ ex) { + catch (Apache::Geode::Client::GemFireException^ ex) { ex->ThrowNative(); } catch (System::Exception^ ex) { - Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex); + Apache::Geode::Client::GemFireException::ThrowNative(ex); } } void ManagedCacheListenerGeneric::close(const apache::geode::client::RegionPtr& region) { try { - Apache::Geode::Client::Generic::IRegion<Object^, Object^>^ mregion = - Apache::Geode::Client::Generic::Region<Object^, Object^>::Create(region.ptr()); + Apache::Geode::Client::IRegion<Object^, Object^>^ mregion = + Apache::Geode::Client::Region<Object^, Object^>::Create(region.ptr()); m_managedptr->Close(mregion); } - catch (Apache::Geode::Client::Generic::GemFireException^ ex) { + catch (Apache::Geode::Client::GemFireException^ ex) { ex->ThrowNative(); } catch (System::Exception^ ex) { - Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex); + Apache::Geode::Client::GemFireException::ThrowNative(ex); } } void ManagedCacheListenerGeneric::afterRegionDisconnected(const apache::geode::client::RegionPtr& region) { try { - Apache::Geode::Client::Generic::IRegion<Object^, Object^>^ mregion = - Apache::Geode::Client::Generic::Region<Object^, Object^>::Create(region.ptr()); + Apache::Geode::Client::IRegion<Object^, Object^>^ mregion = + Apache::Geode::Client::Region<Object^, Object^>::Create(region.ptr()); m_managedptr->AfterRegionDisconnected(mregion); } - catch (Apache::Geode::Client::Generic::GemFireException^ ex) { + catch (Apache::Geode::Client::GemFireException^ ex) { ex->ThrowNative(); } catch (System::Exception^ ex) { - Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex); + Apache::Geode::Client::GemFireException::ThrowNative(ex); } } http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/impl/ManagedCacheListener.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/ManagedCacheListener.hpp b/src/clicache/src/impl/ManagedCacheListener.hpp index 97a2a83..238a6c6 100644 --- a/src/clicache/src/impl/ManagedCacheListener.hpp +++ b/src/clicache/src/impl/ManagedCacheListener.hpp @@ -22,17 +22,6 @@ #include <gfcpp/CacheListener.hpp> #include "../ICacheListener.hpp" -namespace Apache -{ - namespace Geode - { - namespace Client - { -interface class ICacheListener; - } - } -} - namespace apache { namespace geode { namespace client { @@ -207,12 +196,12 @@ namespace apache { /// <summary> /// Returns the wrapped managed object reference. /// </summary> - inline Apache::Geode::Client::Generic::ICacheListener<Object^, Object^>^ ptr() const + inline Apache::Geode::Client::ICacheListener<Object^, Object^>^ ptr() const { return m_managedptr; } - inline void setptr(Apache::Geode::Client::Generic::ICacheListener<Object^, Object^>^ managedptr) + inline void setptr(Apache::Geode::Client::ICacheListener<Object^, Object^>^ managedptr) { m_managedptr = managedptr; } @@ -230,7 +219,7 @@ namespace apache { /// to be called which is not what is desired when this object is destroyed. Normally this /// managed object may be created by the user and will be handled automatically by the GC. /// </summary> - gcroot<Apache::Geode::Client::Generic::ICacheListener<Object^, Object^>^> m_managedptr; + gcroot<Apache::Geode::Client::ICacheListener<Object^, Object^>^> m_managedptr; gcroot<Object^> m_userptr; }; http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/impl/ManagedCacheLoader.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/ManagedCacheLoader.cpp b/src/clicache/src/impl/ManagedCacheLoader.cpp index 4492a02..3d82804 100644 --- a/src/clicache/src/impl/ManagedCacheLoader.cpp +++ b/src/clicache/src/impl/ManagedCacheLoader.cpp @@ -42,9 +42,9 @@ namespace apache try { String^ mg_assemblyPath = - Apache::Geode::Client::Generic::ManagedString::Get(assemblyPath); + Apache::Geode::Client::ManagedString::Get(assemblyPath); String^ mg_factoryFunctionName = - Apache::Geode::Client::Generic::ManagedString::Get(factoryFunctionName); + Apache::Geode::Client::ManagedString::Get(factoryFunctionName); String^ mg_typeName = nullptr; String^ mg_genericKey = nullptr; @@ -98,7 +98,7 @@ namespace apache mg_genericVal = mg_genericVal->Trim(); mg_factoryFunctionName = mg_factoryFunctionName->Substring(dotIndx + 1); - Apache::Geode::Client::Generic::Log::Fine("Attempting to instantiate a [{0}<{1}, {2}>] via the [{3}] factory method.", + Apache::Geode::Client::Log::Fine("Attempting to instantiate a [{0}<{1}, {2}>] via the [{3}] factory method.", mg_typeName, mg_genericKey, mg_genericVal, mg_factoryFunctionName); typeBuilder->Append("`2"); @@ -120,7 +120,7 @@ namespace apache throw IllegalArgumentException(ex_str.c_str()); } - Apache::Geode::Client::Generic::Log::Debug("Loading type: [{0}]", mg_typeName); + Apache::Geode::Client::Log::Debug("Loading type: [{0}]", mg_typeName); Type^ typeInst = assmb->GetType(mg_typeName, false, true); @@ -137,7 +137,7 @@ namespace apache } typeInst = typeInst->MakeGenericType(types); - Apache::Geode::Client::Generic::Log::Info("Loading function: [{0}]", mg_factoryFunctionName); + Apache::Geode::Client::Log::Info("Loading function: [{0}]", mg_factoryFunctionName); MethodInfo^ mInfo = typeInst->GetMethod(mg_factoryFunctionName, BindingFlags::Public | BindingFlags::Static | BindingFlags::IgnoreCase); @@ -151,7 +151,7 @@ namespace apache } catch (System::Exception^ ex) { - Apache::Geode::Client::Generic::Log::Debug("{0}: {1}", ex->GetType()->Name, ex->Message); + Apache::Geode::Client::Log::Debug("{0}: {1}", ex->GetType()->Name, ex->Message); managedptr = nullptr; } if (managedptr == nullptr) @@ -166,7 +166,7 @@ namespace apache ManagedCacheLoaderGeneric* mgcl = new ManagedCacheLoaderGeneric(managedptr); - Type^ clgType = Type::GetType("Apache.Geode.Client.Generic.CacheLoaderGeneric`2"); + Type^ clgType = Type::GetType("Apache.Geode.Client.CacheLoaderGeneric`2"); clgType = clgType->MakeGenericType(types); Object^ clg = Activator::CreateInstance(clgType); @@ -175,7 +175,7 @@ namespace apache params[0] = managedptr; mInfo->Invoke(clg, params); - mgcl->setptr((Apache::Geode::Client::Generic::ICacheLoaderProxy^)clg); + mgcl->setptr((Apache::Geode::Client::ICacheLoaderProxy^)clg); return mgcl; } @@ -191,7 +191,7 @@ namespace apache } else { - Apache::Geode::Client::Generic::ManagedString typeName(mg_typeName); + Apache::Geode::Client::ManagedString typeName(mg_typeName); std::string ex_str = "ManagedCacheLoaderGeneric: Could not load type ["; ex_str += typeName.CharPtr; ex_str += "] in assembly: "; @@ -205,7 +205,7 @@ namespace apache } catch (System::Exception^ ex) { - Apache::Geode::Client::Generic::ManagedString mg_exStr(ex->ToString()); + Apache::Geode::Client::ManagedString mg_exStr(ex->ToString()); std::string ex_str = "ManagedCacheLoaderGeneric: Got an exception while " "loading managed library: "; ex_str += mg_exStr.CharPtr; @@ -233,11 +233,11 @@ namespace apache */ return m_managedptr->load(region, key, aCallbackArgument); } - catch (Apache::Geode::Client::Generic::GemFireException^ ex) { + catch (Apache::Geode::Client::GemFireException^ ex) { ex->ThrowNative(); } catch (System::Exception^ ex) { - Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex); + Apache::Geode::Client::GemFireException::ThrowNative(ex); } return NULLPTR; } @@ -252,11 +252,11 @@ namespace apache m_managedptr->close(region); } - catch (Apache::Geode::Client::Generic::GemFireException^ ex) { + catch (Apache::Geode::Client::GemFireException^ ex) { ex->ThrowNative(); } catch (System::Exception^ ex) { - Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex); + Apache::Geode::Client::GemFireException::ThrowNative(ex); } } http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/impl/ManagedCacheLoader.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/ManagedCacheLoader.hpp b/src/clicache/src/impl/ManagedCacheLoader.hpp index 3586b89..5e6b327 100644 --- a/src/clicache/src/impl/ManagedCacheLoader.hpp +++ b/src/clicache/src/impl/ManagedCacheLoader.hpp @@ -124,7 +124,7 @@ namespace apache } */ - inline void setptr(Apache::Geode::Client::Generic::ICacheLoaderProxy^ managedptr) + inline void setptr(Apache::Geode::Client::ICacheLoaderProxy^ managedptr) { m_managedptr = managedptr; } @@ -143,7 +143,7 @@ namespace apache /// to be called which is not what is desired when this object is destroyed. Normally this /// managed object may be created by the user and will be handled automatically by the GC. /// </summary> - gcroot<Apache::Geode::Client::Generic::ICacheLoaderProxy^> m_managedptr; + gcroot<Apache::Geode::Client::ICacheLoaderProxy^> m_managedptr; gcroot<Object^> m_userptr; http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/impl/ManagedCacheWriter.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/ManagedCacheWriter.cpp b/src/clicache/src/impl/ManagedCacheWriter.cpp index 8c09e27..52a3566 100644 --- a/src/clicache/src/impl/ManagedCacheWriter.cpp +++ b/src/clicache/src/impl/ManagedCacheWriter.cpp @@ -44,9 +44,9 @@ namespace apache try { String^ mg_assemblyPath = - Apache::Geode::Client::Generic::ManagedString::Get(assemblyPath); + Apache::Geode::Client::ManagedString::Get(assemblyPath); String^ mg_factoryFunctionName = - Apache::Geode::Client::Generic::ManagedString::Get(factoryFunctionName); + Apache::Geode::Client::ManagedString::Get(factoryFunctionName); String^ mg_typeName = nullptr; String^ mg_genericKey = nullptr; @@ -100,7 +100,7 @@ namespace apache mg_genericVal = mg_genericVal->Trim(); mg_factoryFunctionName = mg_factoryFunctionName->Substring(dotIndx + 1); - Apache::Geode::Client::Generic::Log::Fine( + Apache::Geode::Client::Log::Fine( "Attempting to instantiate a [{0}<{1}, {2}>] via the [{3}] factory method.", mg_typeName, mg_genericKey, mg_genericVal, mg_factoryFunctionName); @@ -123,7 +123,7 @@ namespace apache throw IllegalArgumentException(ex_str.c_str()); } - Apache::Geode::Client::Generic::Log::Debug("Loading type: [{0}]", mg_typeName); + Apache::Geode::Client::Log::Debug("Loading type: [{0}]", mg_typeName); Type^ typeInst = assmb->GetType(mg_typeName, false, true); @@ -140,7 +140,7 @@ namespace apache } typeInst = typeInst->MakeGenericType(types); - Apache::Geode::Client::Generic::Log::Info("Loading function: [{0}]", mg_factoryFunctionName); + Apache::Geode::Client::Log::Info("Loading function: [{0}]", mg_factoryFunctionName); MethodInfo^ mInfo = typeInst->GetMethod(mg_factoryFunctionName, BindingFlags::Public | BindingFlags::Static | BindingFlags::IgnoreCase); @@ -153,7 +153,7 @@ namespace apache } catch (System::Exception^ ex) { - Apache::Geode::Client::Generic::Log::Debug("{0}: {1}", ex->GetType()->Name, ex->Message); + Apache::Geode::Client::Log::Debug("{0}: {1}", ex->GetType()->Name, ex->Message); managedptr = nullptr; } if (managedptr == nullptr) @@ -167,7 +167,7 @@ namespace apache } ManagedCacheWriterGeneric* mgcw = new ManagedCacheWriterGeneric(managedptr); - Type^ cwgType = Type::GetType("Apache.Geode.Client.Generic.CacheWriterGeneric`2"); + Type^ cwgType = Type::GetType("Apache.Geode.Client.CacheWriterGeneric`2"); cwgType = cwgType->MakeGenericType(types); Object^ cwg = Activator::CreateInstance(cwgType); @@ -176,7 +176,7 @@ namespace apache params[0] = managedptr; mInfo->Invoke(cwg, params); - mgcw->setptr((Apache::Geode::Client::Generic::ICacheWriter<Object^, Object^>^)cwg); + mgcw->setptr((Apache::Geode::Client::ICacheWriter<Object^, Object^>^)cwg); return mgcw; } @@ -192,7 +192,7 @@ namespace apache } else { - Apache::Geode::Client::Generic::ManagedString typeName(mg_typeName); + Apache::Geode::Client::ManagedString typeName(mg_typeName); std::string ex_str = "ManagedCacheWriterGeneric: Could not load type ["; ex_str += typeName.CharPtr; ex_str += "] in assembly: "; @@ -206,7 +206,7 @@ namespace apache } catch (System::Exception^ ex) { - Apache::Geode::Client::Generic::ManagedString mg_exStr(ex->ToString()); + Apache::Geode::Client::ManagedString mg_exStr(ex->ToString()); std::string ex_str = "ManagedCacheWriterGeneric: Got an exception while " "loading managed library: "; ex_str += mg_exStr.CharPtr; @@ -218,15 +218,15 @@ namespace apache bool ManagedCacheWriterGeneric::beforeUpdate(const EntryEvent& ev) { try { - Apache::Geode::Client::Generic::EntryEvent<Object^, Object^> mevent(&ev); + Apache::Geode::Client::EntryEvent<Object^, Object^> mevent(&ev); return m_managedptr->BeforeUpdate(%mevent); } - catch (Apache::Geode::Client::Generic::GemFireException^ ex) { + catch (Apache::Geode::Client::GemFireException^ ex) { ex->ThrowNative(); } catch (System::Exception^ ex) { - Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex); + Apache::Geode::Client::GemFireException::ThrowNative(ex); } return false; } @@ -234,15 +234,15 @@ namespace apache bool ManagedCacheWriterGeneric::beforeCreate(const EntryEvent& ev) { try { - Apache::Geode::Client::Generic::EntryEvent<Object^, Object^> mevent(&ev); + Apache::Geode::Client::EntryEvent<Object^, Object^> mevent(&ev); return m_managedptr->BeforeCreate(%mevent); } - catch (Apache::Geode::Client::Generic::GemFireException^ ex) { + catch (Apache::Geode::Client::GemFireException^ ex) { ex->ThrowNative(); } catch (System::Exception^ ex) { - Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex); + Apache::Geode::Client::GemFireException::ThrowNative(ex); } return false; } @@ -250,30 +250,30 @@ namespace apache bool ManagedCacheWriterGeneric::beforeDestroy(const EntryEvent& ev) { try { - Apache::Geode::Client::Generic::EntryEvent<Object^, Object^> mevent(&ev); + Apache::Geode::Client::EntryEvent<Object^, Object^> mevent(&ev); return m_managedptr->BeforeDestroy(%mevent); } - catch (Apache::Geode::Client::Generic::GemFireException^ ex) { + catch (Apache::Geode::Client::GemFireException^ ex) { ex->ThrowNative(); } catch (System::Exception^ ex) { - Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex); + Apache::Geode::Client::GemFireException::ThrowNative(ex); } return false; } bool ManagedCacheWriterGeneric::beforeRegionClear(const RegionEvent& ev) { try { - Apache::Geode::Client::Generic::RegionEvent<Object^, Object^> mevent(&ev); + Apache::Geode::Client::RegionEvent<Object^, Object^> mevent(&ev); return m_managedptr->BeforeRegionClear(%mevent); } - catch (Apache::Geode::Client::Generic::GemFireException^ ex) { + catch (Apache::Geode::Client::GemFireException^ ex) { ex->ThrowNative(); } catch (System::Exception^ ex) { - Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex); + Apache::Geode::Client::GemFireException::ThrowNative(ex); } return false; } @@ -281,15 +281,15 @@ namespace apache bool ManagedCacheWriterGeneric::beforeRegionDestroy(const RegionEvent& ev) { try { - Apache::Geode::Client::Generic::RegionEvent<Object^, Object^> mevent(&ev); + Apache::Geode::Client::RegionEvent<Object^, Object^> mevent(&ev); return m_managedptr->BeforeRegionDestroy(%mevent); } - catch (Apache::Geode::Client::Generic::GemFireException^ ex) { + catch (Apache::Geode::Client::GemFireException^ ex) { ex->ThrowNative(); } catch (System::Exception^ ex) { - Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex); + Apache::Geode::Client::GemFireException::ThrowNative(ex); } return false; } @@ -297,16 +297,16 @@ namespace apache void ManagedCacheWriterGeneric::close(const RegionPtr& rp) { try { - Apache::Geode::Client::Generic::IRegion<Object^, Object^>^ mregion = - Apache::Geode::Client::Generic::Region<Object^, Object^>::Create(rp.ptr()); + Apache::Geode::Client::IRegion<Object^, Object^>^ mregion = + Apache::Geode::Client::Region<Object^, Object^>::Create(rp.ptr()); - m_managedptr->Close(reinterpret_cast<Apache::Geode::Client::Generic::Region<Object^, Object^>^>(mregion)); + m_managedptr->Close(reinterpret_cast<Apache::Geode::Client::Region<Object^, Object^>^>(mregion)); } - catch (Apache::Geode::Client::Generic::GemFireException^ ex) { + catch (Apache::Geode::Client::GemFireException^ ex) { ex->ThrowNative(); } catch (System::Exception^ ex) { - Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex); + Apache::Geode::Client::GemFireException::ThrowNative(ex); } } http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/impl/ManagedCacheWriter.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/ManagedCacheWriter.hpp b/src/clicache/src/impl/ManagedCacheWriter.hpp index 23713d3..95d8c31 100644 --- a/src/clicache/src/impl/ManagedCacheWriter.hpp +++ b/src/clicache/src/impl/ManagedCacheWriter.hpp @@ -23,17 +23,6 @@ #include "../ICacheWriter.hpp" using namespace System; -//using namespace apache::geode::client; -namespace Apache -{ - namespace Geode - { - namespace Client - { -interface class ICacheWriter; - } - } -} namespace apache { @@ -165,12 +154,12 @@ namespace apache /// <summary> /// Returns the wrapped managed object reference. /// </summary> - inline Apache::Geode::Client::Generic::ICacheWriter<Object^, Object^>^ ptr() const + inline Apache::Geode::Client::ICacheWriter<Object^, Object^>^ ptr() const { return m_managedptr; } - inline void setptr(Apache::Geode::Client::Generic::ICacheWriter<Object^, Object^>^ managedptr) + inline void setptr(Apache::Geode::Client::ICacheWriter<Object^, Object^>^ managedptr) { m_managedptr = managedptr; } @@ -189,7 +178,7 @@ namespace apache /// to be called which is not what is desired when this object is destroyed. Normally this /// managed object may be created by the user and will be handled automatically by the GC. /// </summary> - gcroot<Apache::Geode::Client::Generic::ICacheWriter<Object^, Object^>^> m_managedptr; + gcroot<Apache::Geode::Client::ICacheWriter<Object^, Object^>^> m_managedptr; gcroot<Object^> m_userptr; }; http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/impl/ManagedCacheableDelta.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/ManagedCacheableDelta.cpp b/src/clicache/src/impl/ManagedCacheableDelta.cpp index f27d876..c81841a 100644 --- a/src/clicache/src/impl/ManagedCacheableDelta.cpp +++ b/src/clicache/src/impl/ManagedCacheableDelta.cpp @@ -38,18 +38,18 @@ namespace apache { try { uint32 pos = (int)output.getBufferLength(); - Apache::Geode::Client::Generic::DataOutput mg_output(&output, true); + Apache::Geode::Client::DataOutput mg_output(&output, true); m_managedSerializableptr->ToData(%mg_output); //this will move the cursor in c++ layer mg_output.WriteBytesToUMDataOutput(); ManagedCacheableDeltaGeneric* tmp = const_cast<ManagedCacheableDeltaGeneric*>(this); tmp->m_objectSize = (int)(output.getBufferLength() - pos); } - catch (Apache::Geode::Client::Generic::GemFireException^ ex) { + catch (Apache::Geode::Client::GemFireException^ ex) { ex->ThrowNative(); } catch (System::Exception^ ex) { - Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex); + Apache::Geode::Client::GemFireException::ThrowNative(ex); } } @@ -57,7 +57,7 @@ namespace apache { try { int pos = input.getBytesRead(); - Apache::Geode::Client::Generic::DataInput mg_input(&input, true); + Apache::Geode::Client::DataInput mg_input(&input, true); m_managedSerializableptr->FromData(%mg_input); //this will move the cursor in c++ layer @@ -69,11 +69,11 @@ namespace apache m_hashcode = m_managedptr->GetHashCode(); } - catch (Apache::Geode::Client::Generic::GemFireException^ ex) { + catch (Apache::Geode::Client::GemFireException^ ex) { ex->ThrowNative(); } catch (System::Exception^ ex) { - Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex); + Apache::Geode::Client::GemFireException::ThrowNative(ex); } return this; } @@ -87,11 +87,11 @@ namespace apache else return m_objectSize; } - catch (Apache::Geode::Client::Generic::GemFireException^ ex) { + catch (Apache::Geode::Client::GemFireException^ ex) { ex->ThrowNative(); } catch (System::Exception^ ex) { - Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex); + Apache::Geode::Client::GemFireException::ThrowNative(ex); } return 0; } @@ -102,11 +102,11 @@ namespace apache try { classId = m_managedSerializableptr->ClassId; } - catch (Apache::Geode::Client::Generic::GemFireException^ ex) { + catch (Apache::Geode::Client::GemFireException^ ex) { ex->ThrowNative(); } catch (System::Exception^ ex) { - Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex); + Apache::Geode::Client::GemFireException::ThrowNative(ex); } return (classId >= 0x80000000 ? 0 : classId); } @@ -128,11 +128,11 @@ namespace apache return (int8_t)GemfireTypeIdsImpl::CacheableUserData4; } } - catch (Apache::Geode::Client::Generic::GemFireException^ ex) { + catch (Apache::Geode::Client::GemFireException^ ex) { ex->ThrowNative(); } catch (System::Exception^ ex) { - Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex); + Apache::Geode::Client::GemFireException::ThrowNative(ex); } return 0; } @@ -160,23 +160,23 @@ namespace apache void ManagedCacheableDeltaGeneric::toDelta(DataOutput& output) const { try { - Apache::Geode::Client::Generic::DataOutput mg_output(&output, true); + Apache::Geode::Client::DataOutput mg_output(&output, true); m_managedptr->ToDelta(%mg_output); //this will move the cursor in c++ layer mg_output.WriteBytesToUMDataOutput(); } - catch (Apache::Geode::Client::Generic::GemFireException^ ex) { + catch (Apache::Geode::Client::GemFireException^ ex) { ex->ThrowNative(); } catch (System::Exception^ ex) { - Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex); + Apache::Geode::Client::GemFireException::ThrowNative(ex); } } void ManagedCacheableDeltaGeneric::fromDelta(DataInput& input) { try { - Apache::Geode::Client::Generic::DataInput mg_input(&input, true); + Apache::Geode::Client::DataInput mg_input(&input, true); m_managedptr->FromDelta(%mg_input); //this will move the cursor in c++ layer @@ -184,11 +184,11 @@ namespace apache m_hashcode = m_managedptr->GetHashCode(); } - catch (Apache::Geode::Client::Generic::GemFireException^ ex) { + catch (Apache::Geode::Client::GemFireException^ ex) { ex->ThrowNative(); } catch (System::Exception^ ex) { - Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex); + Apache::Geode::Client::GemFireException::ThrowNative(ex); } } @@ -196,10 +196,10 @@ namespace apache { try { ICloneable^ cloneable = dynamic_cast<ICloneable^>(( - Apache::Geode::Client::Generic::IGFDelta^) m_managedptr); + Apache::Geode::Client::IGFDelta^) m_managedptr); if (cloneable) { - Apache::Geode::Client::Generic::IGFSerializable^ Mclone = - dynamic_cast<Apache::Geode::Client::Generic::IGFSerializable^>(cloneable->Clone()); + Apache::Geode::Client::IGFSerializable^ Mclone = + dynamic_cast<Apache::Geode::Client::IGFSerializable^>(cloneable->Clone()); return DeltaPtr(static_cast<ManagedCacheableDeltaGeneric*>( SafeMSerializableConvertGeneric(Mclone))); } @@ -207,11 +207,11 @@ namespace apache return Delta::clone(); } } - catch (Apache::Geode::Client::Generic::GemFireException^ ex) { + catch (Apache::Geode::Client::GemFireException^ ex) { ex->ThrowNative(); } catch (System::Exception^ ex) { - Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex); + Apache::Geode::Client::GemFireException::ThrowNative(ex); } return NULLPTR; } @@ -228,11 +228,11 @@ namespace apache } return false; } - catch (Apache::Geode::Client::Generic::GemFireException^ ex) { + catch (Apache::Geode::Client::GemFireException^ ex) { ex->ThrowNative(); } catch (System::Exception^ ex) { - Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex); + Apache::Geode::Client::GemFireException::ThrowNative(ex); } return false; } @@ -242,11 +242,11 @@ namespace apache try { return m_managedptr->Equals(other.ptr()); } - catch (Apache::Geode::Client::Generic::GemFireException^ ex) { + catch (Apache::Geode::Client::GemFireException^ ex) { ex->ThrowNative(); } catch (System::Exception^ ex) { - Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex); + Apache::Geode::Client::GemFireException::ThrowNative(ex); } return false; @@ -263,15 +263,15 @@ namespace apache if (maxLength > 0) { String^ logstr = m_managedptr->GetType()->Name + '(' + m_managedptr->ToString() + ')'; - Apache::Geode::Client::Generic::ManagedString mg_str(logstr); + Apache::Geode::Client::ManagedString mg_str(logstr); return snprintf(buffer, maxLength, "%s", mg_str.CharPtr); } } - catch (Apache::Geode::Client::Generic::GemFireException^ ex) { + catch (Apache::Geode::Client::GemFireException^ ex) { ex->ThrowNative(); } catch (System::Exception^ ex) { - Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex); + Apache::Geode::Client::GemFireException::ThrowNative(ex); } return 0; } http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/impl/ManagedCacheableDelta.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/ManagedCacheableDelta.hpp b/src/clicache/src/impl/ManagedCacheableDelta.hpp index 0823ba1..ef6c013 100644 --- a/src/clicache/src/impl/ManagedCacheableDelta.hpp +++ b/src/clicache/src/impl/ManagedCacheableDelta.hpp @@ -33,14 +33,13 @@ namespace Apache { namespace Client { -namespace Generic - { + interface class IGFSerializable; interface class IGFDelta; - } - } -} -} + } // namespace Client + } // namespace Geode +} // namespace Apache + namespace apache { @@ -69,20 +68,20 @@ namespace apache /// The managed object. /// </param> inline ManagedCacheableDeltaGeneric( - Apache::Geode::Client::Generic::IGFDelta^ managedptr) + Apache::Geode::Client::IGFDelta^ managedptr) : m_managedptr(managedptr) { - m_managedSerializableptr = dynamic_cast <Apache::Geode::Client::Generic::IGFSerializable^> (managedptr); + m_managedSerializableptr = dynamic_cast <Apache::Geode::Client::IGFSerializable^> (managedptr); m_classId = m_managedSerializableptr->ClassId; m_objectSize = 0; } inline ManagedCacheableDeltaGeneric( - Apache::Geode::Client::Generic::IGFDelta^ managedptr, int hashcode, int classId) + Apache::Geode::Client::IGFDelta^ managedptr, int hashcode, int classId) : m_managedptr(managedptr) { m_hashcode = hashcode; m_classId = classId; - m_managedSerializableptr = dynamic_cast <Apache::Geode::Client::Generic::IGFSerializable^> (managedptr); + m_managedSerializableptr = dynamic_cast <Apache::Geode::Client::IGFSerializable^> (managedptr); m_objectSize = 0; } @@ -161,7 +160,7 @@ namespace apache /// <summary> /// Returns the wrapped managed object reference. /// </summary> - inline Apache::Geode::Client::Generic::IGFDelta^ ptr() const + inline Apache::Geode::Client::IGFDelta^ ptr() const { return m_managedptr; } @@ -175,8 +174,8 @@ namespace apache /// to be called which is not what is desired when this object is destroyed. Normally this /// managed object may be created by the user and will be handled automatically by the GC. /// </summary> - gcroot<Apache::Geode::Client::Generic::IGFDelta^> m_managedptr; - gcroot<Apache::Geode::Client::Generic::IGFSerializable^> m_managedSerializableptr; + gcroot<Apache::Geode::Client::IGFDelta^> m_managedptr; + gcroot<Apache::Geode::Client::IGFSerializable^> m_managedSerializableptr; // Disable the copy and assignment constructors ManagedCacheableDeltaGeneric(const ManagedCacheableDeltaGeneric&); ManagedCacheableDeltaGeneric& operator = (const ManagedCacheableDeltaGeneric&);
