ESDK-1601 Updated the interface and implementation of the ChannelInformation class for reference manual and synchronizing interface between EMAJ and EMAC. Restore the original version of EMAC 100__MarketPrice__Streaming example.

soranat.thiarachow · soranat.thiarachow · commit 67f228d29279 · 2018-11-13T17:17:33.000-06:00
diff --git a/Cpp-C/Ema/Examples/Training/Consumer/100_Series/100__MarketPrice__Streaming/Consumer.cpp b/Cpp-C/Ema/Examples/Training/Consumer/100_Series/100__MarketPrice__Streaming/Consumer.cpp
@@ -6,7 +6,6 @@
 ///*|-----------------------------------------------------------------------------
 
 #include "Consumer.h"
-#include <stdlib.h>
 
 using namespace thomsonreuters::ema::access;
 using namespace std;
@@ -18,28 +17,20 @@ void AppClient::onRefreshMsg( const RefreshMsg& refreshMsg, const OmmConsumerEve
 
 void AppClient::onUpdateMsg( const UpdateMsg& updateMsg, const OmmConsumerEvent& ) 
 {
-  static int i(0);  
-  cout << "updateMsg " << ++i << " for " << updateMsg.getName() << endl;
-  //	cout << updateMsg << endl;		// defaults to updateMsg.toString()
-  if (i == 20)
-	exit(1);
+	cout << updateMsg << endl;		// defaults to updateMsg.toString()
 }
 
 void AppClient::onStatusMsg( const StatusMsg& statusMsg, const OmmConsumerEvent& ) 
 {
 	cout << statusMsg << endl;		// defaults to statusMsg.toString()
 }
 
-int main()
+int main( int argc, char* argv[] )
 { 
 	try { 
 		AppClient client;
-		OmmConsumer consumer( OmmConsumerConfig("EmaConfig.xml").username( "user" ) );
+		OmmConsumer consumer( OmmConsumerConfig().host( "localhost:14002" ).username( "user" ) );
 		consumer.registerClient( ReqMsg().serviceName( "DIRECT_FEED" ).name( "IBM.N" ), client );
-		UInt64 h(consumer.registerClient( ReqMsg().serviceName( "DIRECT_FEED" ).name( "GOOG.N" ), client ));
-		sleep( 2000 );
-		consumer.unregister(h);
-		cout << "called unregister" << endl;
 		sleep( 60000 );				// API calls onRefreshMsg(), onUpdateMsg(), or onStatusMsg()
 	} catch ( const OmmException& excp ) {
 		cout << excp << endl;
diff --git a/Cpp-C/Ema/Src/Access/CMakeLists.txt b/Cpp-C/Ema/Src/Access/CMakeLists.txt
@@ -41,7 +41,7 @@ else()
             Impl/ActiveConfig.cpp Impl/ActiveConfig.h
             # Impl/C....
             Impl/ChannelCallbackClient.cpp Impl/ChannelCallbackClient.h
-			Impl/ChannelInformation.cpp
+            Impl/ChannelInformation.cpp
             Impl/ClientSession.cpp Impl/ClientSession.h
             Impl/ComplexType.cpp Impl/ConfigErrorHandling.h
             # Impl/D....
@@ -208,6 +208,7 @@ else()
             # Include/
             Include/AckMsg.h
             Include/Attrib.h
+            Include/ChannelInformation.h
             Include/Common.h
             Include/ComplexType.h
             Include/Data.h
diff --git a/Cpp-C/Ema/Src/Access/Impl/ChannelInformation.cpp b/Cpp-C/Ema/Src/Access/Impl/ChannelInformation.cpp
@@ -41,7 +41,7 @@ const EmaString& ChannelInformation::toString() const {
   }
   _toString.append( "\n\tconnection type: " );
   switch( _connectionType ) {
-	case InitEnum: _toString.append( "not connected" ); break;
+	case ConnectionType::Unidentified: _toString.append("unknown"); break;
 	case SocketEnum: _toString.append( "socket" ); break;
 	case EncryptedEnum: _toString.append( "encrypted" ); break;
 	case HttpEnum: _toString.append( "http" ); break;
@@ -72,7 +72,7 @@ ChannelInformation::operator const char*() const
 
 void ChannelInformation::clear() {
   _channelState = UnknownChannelStateEnum;
-  _connectionType = InitEnum;
+  _connectionType = ConnectionType::Unidentified;
   _hostname.clear();
   _ipAddress.clear();
   _connectedComponentInfo.clear();
diff --git a/Cpp-C/Ema/Src/Access/Include/ChannelInformation.h b/Cpp-C/Ema/Src/Access/Include/ChannelInformation.h
@@ -57,7 +57,7 @@ class EMA_ACCESS_API ChannelInformation
   */
   enum ConnectionType
   {
-	InitEnum = -1,            /*!< (-1) Channel is not connected */
+	Unidentified = -1,         /*!< (-1) Unidentified */
 	SocketEnum = 0,           /*!< (0) Channel is a standard TCP socket connection type */
 	EncryptedEnum = 1,        /*!< (1) Channel is encrypted */
 	HttpEnum = 2,             /*!< (2) Channel is an HTTP connection based tunneling type */
@@ -124,55 +124,55 @@ class EMA_ACCESS_API ChannelInformation
   */
   void clear();
 
-  /** returns the connected component info as a string
+  /** Gets the connected component info as a string
 	  @return string representation of this object's connected component info
   */
   const EmaString& getConnectedComponentInfo() const { return _connectedComponentInfo; }
 
-  /** returns the hostname as a string
+  /** Gets the hostname as a string
 	  @return string representation of this object's hostname
 	  \remark see discussion of this class at the top of this file for more information
   */
   const EmaString& getHostname() const { return _hostname; }
 
-  /** returns the IP address as a string
+  /** Gets the IP address of the connected client
 	  @return string representation of this object's IP address
 	  \remark see discussion of this class at the top of this file for more information.
 	  \remark this is set only for IProvider applications
   */
   const EmaString& getIPaddress() const { return _ipAddress; }
 
-  /** returns the channel state as a ChannelState enum
+  /** Gets the channel state as a ChannelState enum
 	  @return ChannelState enum representation of this object's channel state
   */
   ChannelState getChannelState() const { return _channelState; }
 
-  /** returns the connection type as a ConnectionType enum
+  /** Gets the connection type as a ConnectionType enum
 	  @return ConnectionType enum representation of this object's connection type
   */
   ConnectionType getConnectionType() const { return _connectionType; }
 
-  /** returns the protocol type as a ProtocolType enum
+  /** Gets the protocol type as a ProtocolType enum
 	  @return ProtocolType enum representation of this object's protocol type
   */
   ProtocolType getProtocolType() const { return _protocolType; }
 
-  /** returns the major version as a UInt32
+  /** Gets the major version
 	  @return UInt32 representation of this object's major version
   */
   UInt32 getMajorVersion() const { return _majorVersion; }
 
-  /** returns the minor version as a UInt32
+  /** Gets the minor version
 	  @return UInt32 representation of this object's minor version
   */
   UInt32 getMinorVersion() const { return _minorVersion; }
 
-  /** returns the ping timeout as a UInt32
+  /** Gets the ping timeout
 	  @return UInt32 representation of this object's ping timeout
   */
   UInt32 getPingTimeout() const { return _pingTimeout; }
 
-  /** Returns a string representation of the class instance.
+  /** Gets a string representation of the class instance.
 	  @return string representation of the class instance.
   */
   const EmaString& toString() const;
@@ -193,7 +193,7 @@ class EMA_ACCESS_API ChannelInformation
   */
   ChannelInformation& hostname(const EmaString& hostname);
 
-  /** Specifies IP address
+  /** Specifies the IP address of the connected client
 	  @param[in] ipAddress specifies IP address as a string
 	  @return reference to this object
   */
@@ -224,19 +224,19 @@ class EMA_ACCESS_API ChannelInformation
   ChannelInformation& protocolType(ProtocolType protocolType);
 
   /** Specifies major version
-	  @param[in] majorVersion specifies majorVersion as a UInt32
+	  @param[in] majorVersion specifies majorVersion
 	  @return reference to this object
   */
   ChannelInformation& majorVersion(UInt32 majorVersion);
 
   /** Specifies minor version
-	  @param[in] minorVersion specifies minorVersion as a UInt32
+	  @param[in] minorVersion specifies minorVersion
 	  @return reference to this object
   */
   ChannelInformation& minorVersion(UInt32 minorVersion);
 
   /** Specifies ping timeout
-	  @param[in] pingTimeout specifies ping timeout as a UInt32
+	  @param[in] pingTimeout specifies ping timeout
 	  @return reference to this object
   */
   ChannelInformation& pingTimeout(UInt32 pingTimeout);
diff --git a/Java/Ema/Core/src/main/java/com/thomsonreuters/ema/access/ChannelInformation.java b/Java/Ema/Core/src/main/java/com/thomsonreuters/ema/access/ChannelInformation.java
diff --git a/Java/Ema/Core/src/main/java/com/thomsonreuters/ema/access/ChannelInformationImpl.java b/Java/Ema/Core/src/main/java/com/thomsonreuters/ema/access/ChannelInformationImpl.java
