From e0c425939d361e6fc66b60381fffc52b182bd4e6 Mon Sep 17 00:00:00 2001 From: Franklin_Zhang Date: Mon, 8 Jan 2018 18:43:48 +0800 Subject: [PATCH 1/2] Architecture update Interface Name Change Signed-off-by: Franklin_Zhang --- include/{INxService.h => INxModelService.h} | 2 +- ...ceInstance.h => INxModelServiceInstance.h} | 2 +- ...erviceRecord.h => INxModelServiceRecord.h} | 2 +- include/INxServiceAccess.h | 4 ++-- src/NxServiceAccess.cpp | 16 +++++++++++++ src/NxServiceAccess.h | 23 +++++++++++++++++++ src/NxServiceBase.cpp | 0 src/NxServiceBase.h | 0 8 files changed, 44 insertions(+), 5 deletions(-) rename include/{INxService.h => INxModelService.h} (97%) rename include/{INxServiceInstance.h => INxModelServiceInstance.h} (84%) rename include/{INxServiceRecord.h => INxModelServiceRecord.h} (94%) create mode 100644 src/NxServiceAccess.cpp create mode 100644 src/NxServiceAccess.h create mode 100644 src/NxServiceBase.cpp create mode 100644 src/NxServiceBase.h diff --git a/include/INxService.h b/include/INxModelService.h similarity index 97% rename from include/INxService.h rename to include/INxModelService.h index 72a1a05..92d47e1 100644 --- a/include/INxService.h +++ b/include/INxModelService.h @@ -38,7 +38,7 @@ namespace NJGIS } NjServicePermission; //! model service - class INjService: public virtual INxUnknown + class INjModelService: public virtual INxUnknown { public: //! get ID diff --git a/include/INxServiceInstance.h b/include/INxModelServiceInstance.h similarity index 84% rename from include/INxServiceInstance.h rename to include/INxModelServiceInstance.h index e9571b2..a6b68d6 100644 --- a/include/INxServiceInstance.h +++ b/include/INxModelServiceInstance.h @@ -10,7 +10,7 @@ namespace NJGIS { namespace SERVICE { - class INjServiceInstance : public virtual INxUnknown + class INjServiceServiceInstance : public virtual INxUnknown { public: virtual int getCurrentState(std::string& state) = 0; diff --git a/include/INxServiceRecord.h b/include/INxModelServiceRecord.h similarity index 94% rename from include/INxServiceRecord.h rename to include/INxModelServiceRecord.h index 9664694..070bc52 100644 --- a/include/INxServiceRecord.h +++ b/include/INxModelServiceRecord.h @@ -20,7 +20,7 @@ namespace NJGIS } NjRecordStatus; - class INjServiceRecord : public virtual INxUnknown + class INjModelServiceRecord : public virtual INxUnknown { public: virtual int getID(std::string& id) = 0; diff --git a/include/INxServiceAccess.h b/include/INxServiceAccess.h index aa8249e..646fd93 100644 --- a/include/INxServiceAccess.h +++ b/include/INxServiceAccess.h @@ -13,10 +13,10 @@ namespace NJGIS { public: //! get model service list - virtual int getServicesList(std::vector &list) = 0; + virtual int getServicesList(std::vector &list) = 0; //! get model service by OID - virtual NJGIS::SERVICE::INjService* getServiceByOID(const char* oid) = 0; + virtual NJGIS::SERVICE::INjModelService* getServiceByOID(const char* oid) = 0; //! get model servcie by name virtual int getServicesByName(const char* name, std::vector &list) = 0; diff --git a/src/NxServiceAccess.cpp b/src/NxServiceAccess.cpp new file mode 100644 index 0000000..cab4ba1 --- /dev/null +++ b/src/NxServiceAccess.cpp @@ -0,0 +1,16 @@ + +int NJGIS::SERVICE::NjServiceAccess::getServicesList( std::vector &list ) +{ + throw std::exception("The method or operation is not implemented."); +} + +NJGIS::SERVICE::INjService* NJGIS::SERVICE::NjServiceAccess::getServiceByOID( const char* oid ) +{ + throw std::exception("The method or operation is not implemented."); +} + +int NJGIS::SERVICE::NjServiceAccess::getServicesByName( const char* name, std::vector &list ) +{ + throw std::exception("The method or operation is not implemented."); +} + diff --git a/src/NxServiceAccess.h b/src/NxServiceAccess.h new file mode 100644 index 0000000..7e21e37 --- /dev/null +++ b/src/NxServiceAccess.h @@ -0,0 +1,23 @@ +#ifndef __NJGIS_NXSERVICEACCESS_H__ +#define __NJGIS_NXSERVICEACCESS_H__ + +#include "../include/INxServiceAccess.h" + +namespace NJGIS +{ + namespace SERVICE + { + class NjServiceAccess : public virtual INjServiceAccess + { + public: + virtual int getServicesList( std::vector &list ); + + virtual NJGIS::SERVICE::INjService* getServiceByOID( const char* oid ); + + virtual int getServicesByName( const char* name, std::vector &list ); + + }; + } +} + +#endif \ No newline at end of file diff --git a/src/NxServiceBase.cpp b/src/NxServiceBase.cpp new file mode 100644 index 0000000..e69de29 diff --git a/src/NxServiceBase.h b/src/NxServiceBase.h new file mode 100644 index 0000000..e69de29 -- Gitee From 22776ce7acec4d61547de34f73b78174a8b7a3dd Mon Sep 17 00:00:00 2001 From: Franklin_Zhang Date: Mon, 8 Jan 2018 23:26:03 +0800 Subject: [PATCH 2/2] update service base Signed-off-by: Franklin_Zhang --- include/INxData.h | 8 ++++---- include/INxDataConfiguration.h | 4 ++-- include/INxModelService.h | 7 ++++--- include/INxModelServiceInstance.h | 8 ++++---- include/INxModelServiceRecord.h | 4 ++-- include/INxServer.h | 14 ++++---------- include/INxServerFactory.h | 4 ++-- include/INxService.h | 23 +++++++++++++++++++++++ include/INxServiceAccess.h | 9 ++++----- include/INxUnknown.h | 4 ++-- include/NxServiceAPI.h | 4 ++-- src/NxServer.cpp | 20 ++++++++++++-------- src/NxServer.h | 9 ++++++--- src/NxServerFactory.h | 4 ++-- src/NxService.cpp | 1 + src/NxService.h | 27 +++++++++++++++++++++++++++ src/NxServiceAccess.cpp | 6 +++--- src/NxServiceAccess.h | 8 ++++---- src/NxServiceBase.cpp | 0 src/NxServiceBase.h | 0 utils/NxHttp.h | 4 ++-- 21 files changed, 110 insertions(+), 58 deletions(-) create mode 100644 include/INxService.h create mode 100644 src/NxService.cpp create mode 100644 src/NxService.h delete mode 100644 src/NxServiceBase.cpp delete mode 100644 src/NxServiceBase.h diff --git a/include/INxData.h b/include/INxData.h index 25ad728..47b5005 100644 --- a/include/INxData.h +++ b/include/INxData.h @@ -1,8 +1,8 @@ -#ifndef __NJGIS_INXDATA_H__ -#define __NJGIS_INXDATA_H__ +#ifndef __NJGIS_INJDATA_H__ +#define __NJGIS_INJDATA_H__ #include -#include "INxUnknown.h" +#include "INxService.h" namespace NJGIS { @@ -16,7 +16,7 @@ namespace NJGIS ZIP = 3 } NjDataType; - class INjData : public virtual INxUnknown + class INjData : public virtual INjService { public: virtual int isExist(); diff --git a/include/INxDataConfiguration.h b/include/INxDataConfiguration.h index e4584fc..c4d7137 100644 --- a/include/INxDataConfiguration.h +++ b/include/INxDataConfiguration.h @@ -1,5 +1,5 @@ -#ifndef __NJGIS_IDATACONFIGURATION_H__ -#define __NJGIS_IDATACONFIGURATION_H__ +#ifndef __NJGIS_INJDATACONFIGURATION_H__ +#define __NJGIS_INJDATACONFIGURATION_H__ #include "INxData.h" diff --git a/include/INxModelService.h b/include/INxModelService.h index 92d47e1..85d80f9 100644 --- a/include/INxModelService.h +++ b/include/INxModelService.h @@ -1,7 +1,8 @@ -#ifndef __NJGIS_INXSERVICE_H__ -#define __NJGIS_INXSERVICE_H__ +#ifndef __NJGIS_INJMODELSERVICE_H__ +#define __NJGIS_INJMODELSERVICE_H__ #include "INxDataConfiguration.h" +#include "INxService.h" namespace NJGIS { @@ -38,7 +39,7 @@ namespace NJGIS } NjServicePermission; //! model service - class INjModelService: public virtual INxUnknown + class INjModelService: public virtual INjService { public: //! get ID diff --git a/include/INxModelServiceInstance.h b/include/INxModelServiceInstance.h index a6b68d6..4cdce01 100644 --- a/include/INxModelServiceInstance.h +++ b/include/INxModelServiceInstance.h @@ -1,16 +1,16 @@ -#ifndef __NJGIS_ISERVICEINSTANCE_H__ -#define __NJGIS_ISERVICEINSTANCE_H__ +#ifndef __NJGIS_INJMODELSERVICEINSTANCE_H__ +#define __NJGIS_INJMODELSERVICEINSTANCE_H__ #include #include -#include "INxUnknown.h" +#include "INxService.h" namespace NJGIS { namespace SERVICE { - class INjServiceServiceInstance : public virtual INxUnknown + class INjServiceServiceInstance : public virtual INjService { public: virtual int getCurrentState(std::string& state) = 0; diff --git a/include/INxModelServiceRecord.h b/include/INxModelServiceRecord.h index 070bc52..bfe9ba5 100644 --- a/include/INxModelServiceRecord.h +++ b/include/INxModelServiceRecord.h @@ -1,5 +1,5 @@ -#ifndef __NJGIS_INXSERVICERECORD_H__ -#define __NJGIS_INXSERVICERECORD_H__ +#ifndef __NJGIS_INJSERVICERECORD_H__ +#define __NJGIS_INJSERVICERECORD_H__ #include #include diff --git a/include/INxServer.h b/include/INxServer.h index b4bbe7e..69d10ff 100644 --- a/include/INxServer.h +++ b/include/INxServer.h @@ -1,23 +1,17 @@ -#ifndef __NJGIS_INXSERVER_H__ -#define __NJGIS_INXSERVER_H__ +#ifndef __NJGIS_INXJSERVER_H__ +#define __NJGIS_INXJSERVER_H__ #include -#include "INxUnknown.h" +#include "INxService.h" #include "INxServiceAccess.h" namespace NJGIS { namespace SERVICE { - class INjServer : public virtual INxUnknown + class INjServer : public virtual INjService { public: - //! get IP "xxxx.xxxx.xxxx.xxxx" - virtual int getIP(std::string &ip) = 0; - - //! get Port - virtual int getPort() = 0; - //! set IP and Port virtual int setIPAndPort(const char* ip, const int port = 8060) = 0; diff --git a/include/INxServerFactory.h b/include/INxServerFactory.h index 0f485ce..81f21ad 100644 --- a/include/INxServerFactory.h +++ b/include/INxServerFactory.h @@ -1,5 +1,5 @@ -#ifndef __NJGIS_INXSERVERFACTORY_H__ -#define __NJGIS_INXSERVERFACTORY_H__ +#ifndef __NJGIS_INJSERVERFACTORY_H__ +#define __NJGIS_INJSERVERFACTORY_H__ #include "INxServer.h" diff --git a/include/INxService.h b/include/INxService.h new file mode 100644 index 0000000..fb9c7cd --- /dev/null +++ b/include/INxService.h @@ -0,0 +1,23 @@ +#ifndef _NJGIS_INJSERVICE_H__ +#define _NJGIS_INJSERVICE_H__ + +#include "INxUnknown.h" +#include + +namespace NJGIS +{ + namespace SERVICE + { + class INjService : public virtual INxUnknown + { + public: + virtual const char* getIP() = 0; + + virtual int getPort() = 0; + + virtual int getPortStr( std::string &port ) = 0; + }; + } +} + +#endif \ No newline at end of file diff --git a/include/INxServiceAccess.h b/include/INxServiceAccess.h index 646fd93..38d1a44 100644 --- a/include/INxServiceAccess.h +++ b/include/INxServiceAccess.h @@ -1,15 +1,14 @@ -#ifndef __NJGIS_INXSERVICEACCESS_H__ -#define __NJGIS_INXSERVICEACCESS_H__ +#ifndef __NJGIS_INJSERVICEACCESS_H__ +#define __NJGIS_INJSERVICEACCESS_H__ -#include "INxUnknown.h" -#include "INxService.h" +#include "INxModelService.h" #include namespace NJGIS { namespace SERVICE { - class INjServiceAccess : public virtual INxUnknown + class INjServiceAccess : public virtual INjService { public: //! get model service list diff --git a/include/INxUnknown.h b/include/INxUnknown.h index 813cc4f..8dc2f3b 100644 --- a/include/INxUnknown.h +++ b/include/INxUnknown.h @@ -1,5 +1,5 @@ -#ifndef __NJ_GIS_INXKNOWN_H__ -#define __NJ_GIS_INXKNOWN_H__ +#ifndef __NJGIS_INJKNOWN_H__ +#define __NJGIS_INJKNOWN_H__ namespace NJGIS { diff --git a/include/NxServiceAPI.h b/include/NxServiceAPI.h index b9f9538..23ec80b 100644 --- a/include/NxServiceAPI.h +++ b/include/NxServiceAPI.h @@ -1,5 +1,5 @@ -#ifndef __NJGIS_INXSERVICEAPI_H__ -#define __NJGIS_INXSERVICEAPI_H__ +#ifndef __NJGIS_NJSERVICEAPI_H__ +#define __NJGIS_NJSERVICEAPI_H__ #include "INxServerFactory.h" diff --git a/src/NxServer.cpp b/src/NxServer.cpp index 8f4039f..ada8764 100644 --- a/src/NxServer.cpp +++ b/src/NxServer.cpp @@ -2,10 +2,9 @@ #include "../utils/NxHttp.h" #include -int NJGIS::SERVICE::NjServer::getIP( std::string &ip ) +const char* NJGIS::SERVICE::NjServer::getIP() { - ip = this->_ip; - return 1; + return this->_ip.c_str(); } int NJGIS::SERVICE::NjServer::getPort( ) @@ -13,6 +12,14 @@ int NJGIS::SERVICE::NjServer::getPort( ) return this->_port; } +int NJGIS::SERVICE::NjServer::getPortStr(std::string &port) +{ + std::stringstream ss; + ss << this->_port; + ss >> port; + return 1; +} + int NJGIS::SERVICE::NjServer::setIPAndPort( const char* ip, const int port ) { this->_ip = ip; @@ -23,10 +30,8 @@ int NJGIS::SERVICE::NjServer::setIPAndPort( const char* ip, const int port ) int NJGIS::SERVICE::NjServer::connect() { - std::stringstream ss; - ss << this->_port; std::string strport; - ss >> strport; + this->getPortStr(strport); std::string url = "http://" + this->_ip + ":" + strport + "/ping"; std::string body = ""; @@ -48,6 +53,5 @@ int NJGIS::SERVICE::NjServer::connect( const char* ip, const int port ) NJGIS::SERVICE::INjServiceAccess* NJGIS::SERVICE::NjServer::getServiceAccess() { - throw std::exception("The method or operation is not implemented."); + return NULL; } - diff --git a/src/NxServer.h b/src/NxServer.h index 4dc961e..051ae8e 100644 --- a/src/NxServer.h +++ b/src/NxServer.h @@ -1,5 +1,5 @@ -#ifndef __NJGIS_NXSERVER_H__ -#define __NJGIS_NXSERVER_H__ +#ifndef __NJGIS_NJSERVER_H__ +#define __NJGIS_NJSERVER_H__ #include "../include/INxServer.h" @@ -14,10 +14,12 @@ namespace NJGIS NjServer(const char* ip, const int port):_ip(ip),_port(port){}; - virtual int getIP( std::string &ip ); + virtual const char* getIP(); virtual int getPort(); + virtual int getPortStr(std::string &port); + virtual int setIPAndPort( const char* ip, const int port = 8060 ); virtual int connect(); @@ -25,6 +27,7 @@ namespace NJGIS virtual int connect( const char* ip, const int port = 8060 ); virtual INjServiceAccess* getServiceAccess(); + private: std::string _ip; diff --git a/src/NxServerFactory.h b/src/NxServerFactory.h index bd2028c..a22a17a 100644 --- a/src/NxServerFactory.h +++ b/src/NxServerFactory.h @@ -1,5 +1,5 @@ -#ifndef __NJGSI_NXSERVERFACYORY_H__ -#define __NJGSI_NXSERVERFACYORY_H__ +#ifndef __NJGSI_NJSERVERFACYORY_H__ +#define __NJGSI_NJSERVERFACYORY_H__ #include "../include/INxServerFactory.h" diff --git a/src/NxService.cpp b/src/NxService.cpp new file mode 100644 index 0000000..8dcc2da --- /dev/null +++ b/src/NxService.cpp @@ -0,0 +1 @@ +#include "NxService.h" diff --git a/src/NxService.h b/src/NxService.h new file mode 100644 index 0000000..c0c1208 --- /dev/null +++ b/src/NxService.h @@ -0,0 +1,27 @@ +#ifndef _NJGIS_NJSERVICE_H__ +#define _NJGIS_NJSERVICE_H__ + +#include "../include/INxService.h" + +namespace NJGIS +{ + namespace SERVICE + { + class NjService : public virtual INjService + { + public: + NjService():_ip("127.0.0.1"),_port(8060){}; + + NjService(const char* ip, const int port):_ip(ip),_port(port){}; + + + private: + std::string _ip; + + int _port; + + }; + } +} + +#endif \ No newline at end of file diff --git a/src/NxServiceAccess.cpp b/src/NxServiceAccess.cpp index cab4ba1..0f91414 100644 --- a/src/NxServiceAccess.cpp +++ b/src/NxServiceAccess.cpp @@ -1,10 +1,11 @@ +#include "NxServiceAccess.h" -int NJGIS::SERVICE::NjServiceAccess::getServicesList( std::vector &list ) +int NJGIS::SERVICE::NjServiceAccess::getServicesList( std::vector &list ) { throw std::exception("The method or operation is not implemented."); } -NJGIS::SERVICE::INjService* NJGIS::SERVICE::NjServiceAccess::getServiceByOID( const char* oid ) +NJGIS::SERVICE::INjModelService* NJGIS::SERVICE::NjServiceAccess::getServiceByOID( const char* oid ) { throw std::exception("The method or operation is not implemented."); } @@ -13,4 +14,3 @@ int NJGIS::SERVICE::NjServiceAccess::getServicesByName( const char* name, std::v { throw std::exception("The method or operation is not implemented."); } - diff --git a/src/NxServiceAccess.h b/src/NxServiceAccess.h index 7e21e37..f7dcfb2 100644 --- a/src/NxServiceAccess.h +++ b/src/NxServiceAccess.h @@ -1,5 +1,5 @@ -#ifndef __NJGIS_NXSERVICEACCESS_H__ -#define __NJGIS_NXSERVICEACCESS_H__ +#ifndef __NJGIS_NJSERVICEACCESS_H__ +#define __NJGIS_NJSERVICEACCESS_H__ #include "../include/INxServiceAccess.h" @@ -10,9 +10,9 @@ namespace NJGIS class NjServiceAccess : public virtual INjServiceAccess { public: - virtual int getServicesList( std::vector &list ); + virtual int getServicesList( std::vector &list ); - virtual NJGIS::SERVICE::INjService* getServiceByOID( const char* oid ); + virtual NJGIS::SERVICE::INjModelService* getServiceByOID( const char* oid ); virtual int getServicesByName( const char* name, std::vector &list ); diff --git a/src/NxServiceBase.cpp b/src/NxServiceBase.cpp deleted file mode 100644 index e69de29..0000000 diff --git a/src/NxServiceBase.h b/src/NxServiceBase.h deleted file mode 100644 index e69de29..0000000 diff --git a/utils/NxHttp.h b/utils/NxHttp.h index c414283..294c703 100644 --- a/utils/NxHttp.h +++ b/utils/NxHttp.h @@ -1,5 +1,5 @@ -#ifndef __NJGIS_NXHTTP_H__ -#define __NJGIS_NXHTTP_H__ +#ifndef __NJGIS_NJHTTP_H__ +#define __NJGIS_NJHTTP_H__ #include -- Gitee