You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by ms...@apache.org on 2019/03/11 07:39:53 UTC
[incubator-plc4x] branch develop updated: Changes to the classes of
Authentification Exceptions
This is an automated email from the ASF dual-hosted git repository.
msommer pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
The following commit(s) were added to refs/heads/develop by this push:
new 8c1d0be Changes to the classes of Authentification Exceptions
new 4e99caa Merge branch 'develop' of https://gitbox.apache.org/repos/asf/incubator-plc4x into develop
8c1d0be is described below
commit 8c1d0be09b62793886e804cc3fd04cfb84ea2955
Author: Markus Sommer <ms...@apache.org>
AuthorDate: Sun Mar 10 11:59:29 2019 +0100
Changes to the classes of
Authentification
Exceptions
---
.../PlcUsernamePasswordAuthentication.cpp | 14 +-
.../PlcUsernamePasswordAuthentication.h | 4 +-
.../cpp/api/exceptions/PlcConnectionException.h | 6 +-
.../plc4x/cpp/api/exceptions/PlcException.cpp | 6 +-
.../apache/plc4x/cpp/api/exceptions/PlcException.h | 6 +-
.../cpp/api/exceptions/PlcFieldRangeException.cpp | 4 +-
.../PlcIncompatibleDatatypeException.cpp | 4 +-
.../exceptions/PlcIncompatibleDatatypeException.h | 2 +-
.../api/exceptions/PlcInvalidFieldException.cpp | 20 +--
.../cpp/api/exceptions/PlcInvalidFieldException.h | 8 +-
.../plc4x/cpp/api/exceptions/PlcIoException.h | 6 +-
.../api/exceptions/PlcNotImplementedException.h | 2 +-
.../cpp/api/exceptions/PlcProtocolException.h | 6 +-
.../PlcProtocolPayloadTooBigException.cpp | 20 +--
.../exceptions/PlcProtocolPayloadTooBigException.h | 10 +-
.../cpp/api/exceptions/PlcRuntimeException.cpp | 6 +-
.../plc4x/cpp/api/exceptions/PlcRuntimeException.h | 6 +-
.../cpp/api/exceptions/PlcTimeoutException.cpp | 8 +-
.../plc4x/cpp/api/exceptions/PlcTimeoutException.h | 4 +-
.../exceptions/PlcUnsupportedDataTypeException.h | 6 +-
.../exceptions/PlcUnsupportedOperationException.h | 6 +-
.../plc4x/cpp/api/messages/PlcFieldResponse.h | 4 +-
.../plc4x/cpp/api/messages/PlcReadRequest.cpp | 4 +-
.../apache/plc4x/cpp/api/messages/PlcReadRequest.h | 2 +-
.../plc4x/cpp/api/messages/PlcReadRequestBuilder.h | 2 +-
.../plc4x/cpp/api/messages/PlcReadResponse.h | 144 ++++++++++-----------
26 files changed, 155 insertions(+), 155 deletions(-)
diff --git a/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/authentication/PlcUsernamePasswordAuthentication.cpp b/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/authentication/PlcUsernamePasswordAuthentication.cpp
index 11dfc8b..0c48616 100755
--- a/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/authentication/PlcUsernamePasswordAuthentication.cpp
+++ b/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/authentication/PlcUsernamePasswordAuthentication.cpp
@@ -38,8 +38,8 @@ namespace org
PlcUsernamePasswordAuthentication::PlcUsernamePasswordAuthentication(std::string username, std::string password)
{
// Check isNull (Java) not required, is every time a valid string
- this->username = username;
- this->password = password;
+ this->_strUsername = username;
+ this->_strPassword = password;
}
PlcUsernamePasswordAuthentication::~PlcUsernamePasswordAuthentication()
{
@@ -50,7 +50,7 @@ namespace org
*---------------------------------------------------------------------*/
std::string PlcUsernamePasswordAuthentication::getUsername()
{
- return username;
+ return _strUsername;
}
/**---------------------------------------------------------------------
@@ -58,7 +58,7 @@ namespace org
*---------------------------------------------------------------------*/
std::string PlcUsernamePasswordAuthentication::getPassword()
{
- return password;
+ return _strPassword;
}
/**---------------------------------------------------------------------
* Check for equality (identical object or identical values)
@@ -67,7 +67,7 @@ namespace org
{
bool bResult = false;
- if ( (this == &auth) || ( (username.compare(auth.getUsername()) == 0) && (password.compare(auth.getPassword()) == 0) ))
+ if ( (this == &auth) || ( (_strUsername.compare(auth.getUsername()) == 0) && (_strPassword.compare(auth.getPassword()) == 0) ))
{
return true;
}
@@ -77,7 +77,7 @@ namespace org
std::string PlcUsernamePasswordAuthentication::toString()
{
- return "PlcUsernamePasswordAuthentication{ username='" + username + '\'' +
+ return "PlcUsernamePasswordAuthentication{ username='" + _strUsername + '\'' +
", password='" + "*****************" + '\'' +
'}';
}
@@ -86,7 +86,7 @@ namespace org
{
boost::hash<std::string> string_hash;
- return string_hash(username + password);
+ return string_hash(_strUsername + _strPassword);
}
}
diff --git a/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/authentication/PlcUsernamePasswordAuthentication.h b/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/authentication/PlcUsernamePasswordAuthentication.h
index 5c4bfc2..0795dc2 100755
--- a/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/authentication/PlcUsernamePasswordAuthentication.h
+++ b/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/authentication/PlcUsernamePasswordAuthentication.h
@@ -52,8 +52,8 @@ namespace org
protected:
- std::string username;
- std::string password;
+ std::string _strUsername;
+ std::string _strPassword;
};
}
}
diff --git a/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcConnectionException.h b/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcConnectionException.h
index 7eedd8a..20625e7 100755
--- a/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcConnectionException.h
+++ b/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcConnectionException.h
@@ -38,9 +38,9 @@ namespace org
{
public:
PlcConnectionException(): PlcException() {}
- explicit PlcConnectionException(const std::string &message): PlcException(message){}
- PlcConnectionException(const std::string &message, const std::exception &exception): PlcException(message, exception){}
- explicit PlcConnectionException(const std::exception &exception): PlcException(exception){}
+ explicit PlcConnectionException(const std::string& strMessage): PlcException(strMessage){}
+ PlcConnectionException(const std::string& strMessage, const std::exception& exException): PlcException(strMessage, exException){}
+ explicit PlcConnectionException(const std::exception& exException): PlcException(exException){}
};
}
}
diff --git a/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcException.cpp b/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcException.cpp
index f56cf8c..e27c6e2 100755
--- a/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcException.cpp
+++ b/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcException.cpp
@@ -38,12 +38,12 @@ namespace org
{
}
- PlcException::PlcException(const std::string &message, const std::exception &exception) :
- logic_error(message) // message suppressed, as no matching constructor is available
+ PlcException::PlcException(const std::string& strMessage, const std::exception& exException) :
+ logic_error(strMessage) // message suppressed, as no matching constructor is available
{
}
- PlcException::PlcException(const std::exception &ex) :
+ PlcException::PlcException(const std::exception& ex) :
logic_error("error")
{
}
diff --git a/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcException.h b/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcException.h
index 7133406..60bda17 100755
--- a/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcException.h
+++ b/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcException.h
@@ -44,9 +44,9 @@ namespace org
{
public:
PlcException();
- explicit PlcException(const std::string &message): std::logic_error(message.c_str()){}
- PlcException(const std::string &message, const std::exception &exception);
- explicit PlcException(const std::exception &exception);
+ explicit PlcException(const std::string& strMessage): std::logic_error(strMessage.c_str()) {}
+ PlcException(const std::string& strMessage, const std::exception& exException);
+ explicit PlcException(const std::exception& exException);
};
}
}
diff --git a/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcFieldRangeException.cpp b/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcFieldRangeException.cpp
index 1ee4abd..16a5348 100755
--- a/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcFieldRangeException.cpp
+++ b/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcFieldRangeException.cpp
@@ -32,8 +32,8 @@ namespace org
namespace exceptions
{
- PlcFieldRangeException::PlcFieldRangeException(int maxIndex, int requestedIndex) :
- PlcRuntimeException("requested index of " + std::to_string(requestedIndex) + " is outside the valid range of 0 -" + std::to_string(maxIndex))
+ PlcFieldRangeException::PlcFieldRangeException(int iMaxIndex, int iRequestedIndex) :
+ PlcRuntimeException("requested index of " + std::to_string(iRequestedIndex) + " is outside the valid range of 0 -" + std::to_string(iMaxIndex))
{
}
diff --git a/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcIncompatibleDatatypeException.cpp b/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcIncompatibleDatatypeException.cpp
index 478331c..a62e968 100755
--- a/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcIncompatibleDatatypeException.cpp
+++ b/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcIncompatibleDatatypeException.cpp
@@ -32,8 +32,8 @@ namespace org
namespace exceptions
{
- PlcIncompatibleDatatypeException::PlcIncompatibleDatatypeException(const std::string &dataTypeName, int index) :
- PlcRuntimeException("Incompatible Datatype" + dataTypeName + " at index " + std::to_string(index))
+ PlcIncompatibleDatatypeException::PlcIncompatibleDatatypeException(const std::string& strDataTypeName, int iIndex) :
+ PlcRuntimeException("Incompatible Datatype" + strDataTypeName + " at index " + std::to_string(iIndex))
{
}
diff --git a/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcIncompatibleDatatypeException.h b/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcIncompatibleDatatypeException.h
index 75e296c..96e9a00 100755
--- a/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcIncompatibleDatatypeException.h
+++ b/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcIncompatibleDatatypeException.h
@@ -37,7 +37,7 @@ namespace org
class PlcIncompatibleDatatypeException : public PlcRuntimeException
{
public:
- PlcIncompatibleDatatypeException(const std::string &dataTypeName, int);
+ PlcIncompatibleDatatypeException(const std::string&, int);
};
}
}
diff --git a/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcInvalidFieldException.cpp b/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcInvalidFieldException.cpp
index 1403e0e..0d65740 100755
--- a/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcInvalidFieldException.cpp
+++ b/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcInvalidFieldException.cpp
@@ -32,27 +32,27 @@ namespace org
namespace exceptions
{
- PlcInvalidFieldException::PlcInvalidFieldException(const std::string &fieldToBeParsed) :
- PlcRuntimeException(fieldToBeParsed + " invalid")
+ PlcInvalidFieldException::PlcInvalidFieldException(const std::string& strFieldToBeParsed) :
+ PlcRuntimeException(strFieldToBeParsed + " invalid")
{
- _fieldToBeParsed = fieldToBeParsed;
+ _strFieldToBeParsed = strFieldToBeParsed;
}
- PlcInvalidFieldException::PlcInvalidFieldException(const std::string &fieldToBeParsed, const std::string &pattern) :
- PlcRuntimeException(fieldToBeParsed + " doesn't match " + pattern)
+ PlcInvalidFieldException::PlcInvalidFieldException(const std::string& strFieldToBeParsed, const std::string& strPattern) :
+ PlcRuntimeException(strFieldToBeParsed + " doesn't match " + strPattern)
{
- _fieldToBeParsed = fieldToBeParsed;
+ _strFieldToBeParsed = strFieldToBeParsed;
}
- PlcInvalidFieldException::PlcInvalidFieldException(const std::string &fieldToBeParsed, const std::string &pattern, const std::string &readablePattern) :
- PlcRuntimeException(fieldToBeParsed + " doesn't match " + readablePattern + '(' + pattern + ')')
+ PlcInvalidFieldException::PlcInvalidFieldException(const std::string& strFieldToBeParsed, const std::string& strPattern, const std::string& strReadablePattern) :
+ PlcRuntimeException(strFieldToBeParsed + " doesn't match " + strReadablePattern + '(' + strPattern + ')')
{
- _fieldToBeParsed = fieldToBeParsed;
+ _strFieldToBeParsed = strFieldToBeParsed;
}
std::string PlcInvalidFieldException::getFieldToBeParsed()
{
- return _fieldToBeParsed;
+ return _strFieldToBeParsed;
}
}
diff --git a/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcInvalidFieldException.h b/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcInvalidFieldException.h
index 6704d69..b9eab8e 100755
--- a/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcInvalidFieldException.h
+++ b/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcInvalidFieldException.h
@@ -37,14 +37,14 @@ namespace org
class PlcInvalidFieldException : public PlcRuntimeException
{
public:
- explicit PlcInvalidFieldException(const std::string &fieldToBeParsed);
- PlcInvalidFieldException(const std::string &fieldToBeParsed, const std::string &pattern);
- PlcInvalidFieldException(const std::string &fieldToBeParsed, const std::string &pattern, const std::string &readablePattern);
+ explicit PlcInvalidFieldException(const std::string& strFieldToBeParsed);
+ PlcInvalidFieldException(const std::string& strFieldToBeParsed, const std::string& strPattern);
+ PlcInvalidFieldException(const std::string& strFieldToBeParsed, const std::string& strPattern, const std::string &strReadablePattern);
std::string getFieldToBeParsed();
private:
- std::string _fieldToBeParsed;
+ std::string _strFieldToBeParsed;
};
}
diff --git a/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcIoException.h b/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcIoException.h
index 6fac068..d797d13 100755
--- a/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcIoException.h
+++ b/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcIoException.h
@@ -40,9 +40,9 @@ namespace org
class PlcIoException : public PlcException
{
public:
- explicit PlcIoException(const std::string &message): PlcException(message) {}
- PlcIoException(const std::string &message, const std::exception &exception): PlcException(message, exception){}
- explicit PlcIoException(const std::exception &exception): PlcException(exception){}
+ explicit PlcIoException(const std::string& strMessage): PlcException(strMessage) {}
+ PlcIoException(const std::string& strMessage, const std::exception &exException): PlcException(strMessage, exException){}
+ explicit PlcIoException(const std::exception& exException): PlcException(exException){}
};
}
diff --git a/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcNotImplementedException.h b/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcNotImplementedException.h
index e114df1..1ceae5e 100755
--- a/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcNotImplementedException.h
+++ b/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcNotImplementedException.h
@@ -41,7 +41,7 @@ namespace org
class PlcNotImplementedException : public PlcRuntimeException
{
public:
- explicit PlcNotImplementedException(const std::string &message): PlcRuntimeException(message){}
+ explicit PlcNotImplementedException(const std::string& strMessage): PlcRuntimeException(strMessage){}
};
}
}
diff --git a/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcProtocolException.h b/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcProtocolException.h
index a0410f2..57b7346 100755
--- a/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcProtocolException.h
+++ b/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcProtocolException.h
@@ -43,9 +43,9 @@ namespace org
class PlcProtocolException : public PlcException
{
public:
- explicit PlcProtocolException(const std::string &message): PlcException(message){}
- PlcProtocolException(const std::string &message, const std::exception &exception): PlcException(message, exception){};
- explicit PlcProtocolException(const std::exception &exception): PlcException(exception){}
+ explicit PlcProtocolException(const std::string& strMessage): PlcException(strMessage){}
+ PlcProtocolException(const std::string& strMessage, const std::exception& exException): PlcException(strMessage, exException){};
+ explicit PlcProtocolException(const std::exception& exException): PlcException(exException){}
};
}
}
diff --git a/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcProtocolPayloadTooBigException.cpp b/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcProtocolPayloadTooBigException.cpp
index 217ce93..a23ca8d 100755
--- a/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcProtocolPayloadTooBigException.cpp
+++ b/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcProtocolPayloadTooBigException.cpp
@@ -32,33 +32,33 @@ namespace org
namespace exceptions
{
- PlcProtocolPayloadTooBigException::PlcProtocolPayloadTooBigException(const std::string &protocolName, int maxSize, int actualSize, std::vector<char> payload) :
- PlcProtocolException("Payload for protocol '" + protocolName + "' with size " + std::to_string(actualSize) + " exceeded allowed maximum of " + std::to_string(maxSize))
+ PlcProtocolPayloadTooBigException::PlcProtocolPayloadTooBigException(const std::string& strProtocolName, int iMaxSize, int iActualSize, std::vector<char> vecPayload) :
+ PlcProtocolException("Payload for protocol '" + strProtocolName + "' with size " + std::to_string(iActualSize) + " exceeded allowed maximum of " + std::to_string(iMaxSize))
{
- _protocolName = protocolName;
- _maxSize = maxSize;
- _actualSize = actualSize;
- _payload = payload;
+ _strProtocolName = strProtocolName;
+ _iMaxSize = iMaxSize;
+ _iActualSize = iActualSize;
+ _vecPayload = vecPayload;
}
std::string PlcProtocolPayloadTooBigException::getProtocolName()
{
- return _protocolName;
+ return _strProtocolName;
}
int PlcProtocolPayloadTooBigException::getMaxSize()
{
- return _maxSize;
+ return _iMaxSize;
}
int PlcProtocolPayloadTooBigException::getActualSize()
{
- return _actualSize;
+ return _iActualSize;
}
std::vector<char> PlcProtocolPayloadTooBigException::getPayload()
{
- return _payload;
+ return _vecPayload;
}
}
diff --git a/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcProtocolPayloadTooBigException.h b/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcProtocolPayloadTooBigException.h
index e0b00c5..6811134 100755
--- a/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcProtocolPayloadTooBigException.h
+++ b/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcProtocolPayloadTooBigException.h
@@ -40,7 +40,7 @@ namespace org
class PlcProtocolPayloadTooBigException : public PlcProtocolException
{
public:
- PlcProtocolPayloadTooBigException(const std::string &protocolName, int, int, std::vector<char>);
+ PlcProtocolPayloadTooBigException(const std::string& strProtocolName, int iMaxSize, int iActualSize, std::vector<char> vecPayload);
std::string getProtocolName();
int getMaxSize();
@@ -48,10 +48,10 @@ namespace org
std::vector<char> getPayload();
private:
- std::string _protocolName;
- int _maxSize;
- int _actualSize;
- std::vector<char> _payload;
+ std::string _strProtocolName;
+ int _iMaxSize;
+ int _iActualSize;
+ std::vector<char> _vecPayload;
};
}
diff --git a/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcRuntimeException.cpp b/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcRuntimeException.cpp
index 7502746..be12a6a 100755
--- a/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcRuntimeException.cpp
+++ b/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcRuntimeException.cpp
@@ -33,12 +33,12 @@ namespace org
namespace exceptions
{
- PlcRuntimeException::PlcRuntimeException(const std::string &message, const std::exception &exception) :
- runtime_error(message) // message suppressed, as no matching constructor is available
+ PlcRuntimeException::PlcRuntimeException(const std::string& strMessage, const std::exception& exException) :
+ runtime_error(strMessage) // message suppressed, as no matching constructor is available
{
}
- PlcRuntimeException::PlcRuntimeException(const std::exception &ex) :
+ PlcRuntimeException::PlcRuntimeException(const std::exception& exException) :
runtime_error("error")
{
}
diff --git a/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcRuntimeException.h b/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcRuntimeException.h
index ca3043b..784b535 100755
--- a/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcRuntimeException.h
+++ b/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcRuntimeException.h
@@ -44,9 +44,9 @@ namespace org
class PlcRuntimeException : public std::runtime_error
{
public:
- explicit PlcRuntimeException(const std::string &message): std::runtime_error(message.c_str()){}
- PlcRuntimeException(const std::string &message, const std::exception &exception);
- explicit PlcRuntimeException(const std::exception &exception);
+ explicit PlcRuntimeException(const std::string& strMessage): std::runtime_error(strMessage.c_str()){}
+ PlcRuntimeException(const std::string& strMessage, const std::exception &exException);
+ explicit PlcRuntimeException(const std::exception& exException);
};
}
}
diff --git a/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcTimeoutException.cpp b/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcTimeoutException.cpp
index ba10aec..558113a 100755
--- a/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcTimeoutException.cpp
+++ b/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcTimeoutException.cpp
@@ -32,15 +32,15 @@ namespace org
namespace exceptions
{
- PlcTimeoutException::PlcTimeoutException(long timeout) :
- PlcRuntimeException("Timeout reached after " + std::to_string(timeout) + "ns")
+ PlcTimeoutException::PlcTimeoutException(long lTimeout) :
+ PlcRuntimeException("Timeout reached after " + std::to_string(lTimeout) + "ns")
{
- _timeout = timeout;
+ _lTimeout = lTimeout;
}
long PlcTimeoutException::getTimeout()
{
- return _timeout;
+ return _lTimeout;
}
}
diff --git a/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcTimeoutException.h b/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcTimeoutException.h
index 3a441e0..44e0be4 100755
--- a/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcTimeoutException.h
+++ b/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcTimeoutException.h
@@ -48,7 +48,7 @@ namespace org
*
* @param timeout in nanoseconds.
*/
- explicit PlcTimeoutException(long);
+ explicit PlcTimeoutException(long lTimeout);
long getTimeout();
@@ -56,7 +56,7 @@ namespace org
/**
* @return the timeout in nanoseconds.
*/
- long _timeout;
+ long _lTimeout;
};
}
}
diff --git a/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcUnsupportedDataTypeException.h b/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcUnsupportedDataTypeException.h
index 0b852ae..9910997 100755
--- a/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcUnsupportedDataTypeException.h
+++ b/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcUnsupportedDataTypeException.h
@@ -40,9 +40,9 @@ namespace org
class PlcUnsupportedDataTypeException : public PlcRuntimeException
{
public:
- explicit PlcUnsupportedDataTypeException(const std::string &message): PlcRuntimeException(message){}
- PlcUnsupportedDataTypeException(const std::string &message, const std::exception &exception): PlcRuntimeException(message, exception){}
- explicit PlcUnsupportedDataTypeException(const std::exception &exception): PlcRuntimeException(exception){}
+ explicit PlcUnsupportedDataTypeException(const std::string& strMessage): PlcRuntimeException(strMessage){}
+ PlcUnsupportedDataTypeException(const std::string& strMessage, const std::exception &exException): PlcRuntimeException(strMessage, exException){}
+ explicit PlcUnsupportedDataTypeException(const std::exception &exException): PlcRuntimeException(exException){}
};
}
}
diff --git a/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcUnsupportedOperationException.h b/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcUnsupportedOperationException.h
index 9e80546..8c631bb 100755
--- a/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcUnsupportedOperationException.h
+++ b/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcUnsupportedOperationException.h
@@ -40,9 +40,9 @@ namespace org
class PlcUnsupportedOperationException : public PlcRuntimeException
{
public:
- explicit PlcUnsupportedOperationException(const std::string &message): PlcRuntimeException(message) {}
- PlcUnsupportedOperationException(const std::string &message, const std::exception &exception): PlcRuntimeException(message, exception){}
- explicit PlcUnsupportedOperationException(const std::exception &exception): PlcRuntimeException(exception){}
+ explicit PlcUnsupportedOperationException(const std::string& strMessage): PlcRuntimeException(strMessage) {}
+ PlcUnsupportedOperationException(const std::string& strMessage, const std::exception& exException): PlcRuntimeException(strMessage, exException){}
+ explicit PlcUnsupportedOperationException(const std::exception& exException): PlcRuntimeException(exException){}
};
}
}
diff --git a/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcFieldResponse.h b/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcFieldResponse.h
index 48ef7e4..a436415 100755
--- a/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcFieldResponse.h
+++ b/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcFieldResponse.h
@@ -50,8 +50,8 @@ namespace org
{
public:
virtual std::vector<std::string>* getFieldNames() = 0;
- virtual PlcField* getField(std::string) = 0;
- virtual PlcResponseCode* getresponseCode(std::string) = 0;
+ virtual PlcField* getField(std::string& strName) = 0;
+ virtual PlcResponseCode* getresponseCode(std::string& strName) = 0;
virtual PlcRequest* getRequest() = 0;
private:
diff --git a/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcReadRequest.cpp b/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcReadRequest.cpp
index 5ca2d09..88a9b9f 100755
--- a/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcReadRequest.cpp
+++ b/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcReadRequest.cpp
@@ -33,7 +33,7 @@ namespace org
{
PlcReadRequest::PlcReadRequest()
{
- _builder = nullptr;
+ _pPlcbuilder = nullptr;
}
PlcReadRequest::~PlcReadRequest()
@@ -43,7 +43,7 @@ namespace org
PlcReadRequestBuilder* PlcReadRequest::getBuilder() const
{
- return _builder;
+ return _pPlcbuilder;
}
}
}
diff --git a/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcReadRequest.h b/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcReadRequest.h
index 303c6b2..65dc62b 100755
--- a/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcReadRequest.h
+++ b/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcReadRequest.h
@@ -49,7 +49,7 @@ namespace org
PlcReadRequestBuilder* getBuilder() const;
private:
- PlcReadRequestBuilder* _builder;
+ PlcReadRequestBuilder* _pPlcbuilder;
};
}
diff --git a/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcReadRequestBuilder.h b/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcReadRequestBuilder.h
index c71f055..cdb16a7 100755
--- a/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcReadRequestBuilder.h
+++ b/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcReadRequestBuilder.h
@@ -42,7 +42,7 @@ namespace org
class PlcReadRequestBuilder : public PlcRequestBuilder
{
public:
- virtual PlcReadRequestBuilder* addItem(std::string, std::string) = 0;
+ virtual PlcReadRequestBuilder* addItem(std::string& strName, std::string& strFieldQuery) = 0;
};
diff --git a/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcReadResponse.h b/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcReadResponse.h
index 73ae699..1ce5370 100755
--- a/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcReadResponse.h
+++ b/plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcReadResponse.h
@@ -50,78 +50,78 @@ namespace org
{
public:
virtual PlcRequest* getRequest() = 0;
- virtual int getNumberOfValues(std::string) = 0;
- virtual ValueTypeObject* getObject(std::string) = 0;
- virtual ValueTypeObject* getObject(std::string, int) = 0;
- virtual std::vector<ValueTypeObject*>* getAllObjects(std::string) = 0;
- virtual bool isValidBoolean(std::string) = 0;
- virtual bool isValidBoolean(std::string, int) = 0;
- virtual bool getBoolean(std::string) = 0;
- virtual bool getBoolean(std::string, int) = 0;
- virtual std::vector<bool>* getAllBooleans(std::string) = 0;
- virtual bool isValidByte(std::string) = 0;
- virtual bool isValidByte(std::string, int) = 0;
- virtual char getByte(std::string) = 0;
- virtual char getByte(std::string, int) = 0;
- virtual std::vector<char>* getAllBytes(std::string) = 0;
- virtual bool isValidShort(std::string) = 0;
- virtual bool isValidShort(std::string, int) = 0;
- virtual short getShort(std::string) = 0;
- virtual short getShort(std::string, int) = 0;
- virtual std::vector<short>* getAllShorts(std::string) = 0;
- virtual bool isValidInteger(std::string) = 0;
- virtual bool isValidInteger(std::string, int) = 0;
- virtual int getInteger(std::string) = 0;
- virtual int getInteger(std::string, int) = 0;
- virtual std::vector<int>* getAllIntegers(std::string) = 0;
- virtual bool isValidBigInteger(std::string) = 0;
- virtual bool isValidBigInteger(std::string, int) = 0;
- virtual long long* getBigInteger(std::string) = 0;
- virtual long long* getBigInteger(std::string, int) = 0;
- virtual std::vector<long long>* getAllBigIntegers(std::string) = 0;
- virtual bool isValidLong(std::string) = 0;
- virtual bool isValidLong(std::string, int) = 0;
- virtual long getLong(std::string) = 0;
- virtual long getLong(std::string, int) = 0;
- virtual std::vector<long>* getAllLongs(std::string) = 0;
- virtual bool isValidFloat(std::string) = 0;
- virtual bool isValidFloat(std::string, int) = 0;
- virtual float getFloat(std::string) = 0;
- virtual float getFloat(std::string, int) = 0;
- virtual std::vector<float>* getAllFloats(std::string) = 0;
- virtual bool isValidDouble(std::string) = 0;
- virtual double getDouble(std::string) = 0;
- virtual double getDouble(std::string, int) = 0;
- virtual std::vector<double>* getAllDoubles(std::string) = 0;
- virtual bool isValidBigDecimal(std::string) = 0;
- virtual cpp_dec_float_100 getBigDecimal(std::string) = 0;
- virtual cpp_dec_float_100 getBigDecimal(std::string, int) = 0;
- virtual std::vector<cpp_dec_float_100>* getAllBigDecimals(std::string) = 0;
- virtual bool isValidString(std::string) = 0;
- virtual bool isValidString(std::string, int) = 0;
- virtual std::string getString(std::string) = 0;
- virtual std::string getString(std::string, int) = 0;
- virtual std::vector<std::string>* getAllStrings(std::string) = 0;
- virtual bool isValidTime(std::string) = 0;
- virtual bool isValidTime(std::string, int) = 0;
- virtual std::time_t getTime(std::string) = 0;
- virtual std::time_t getTime(std::string, int) = 0;
- virtual std::vector<std::time_t>* getAllTimes(std::string) = 0;
- virtual bool isValidDate(std::string) = 0;
- virtual bool isValidDate(std::string, int) = 0;
- virtual tm& getDate(std::string) = 0;
- virtual tm& getDate(std::string, int) = 0;
- virtual std::vector<tm>* getAllDates(std::string)= 0;
- virtual bool isValidDateTime(std::string) = 0;
- virtual bool isValidDateTime(std::string, int) = 0;
- virtual tm* getDateTime(std::string) = 0;
- virtual tm* getDateTime(std::string, int) = 0;
- virtual std::vector<tm>* getAllDateTimes(std::string) = 0;
- virtual bool isValidByteArray(std::string) = 0;
- virtual bool isValidByteArray(std::string, int) = 0;
- virtual std::vector<char>* getByteArray(std::string) = 0; // Todo: Pointer to byte-array ???
- virtual std::vector<char>* getByteArray(std::string, int) = 0; // Todo: Pointer to byte-array ???
- virtual std::vector<std::vector<char>*>* getAllByteArrays(std::string) = 0;
+ virtual int getNumberOfValues(std::string& strName) = 0;
+ virtual ValueTypeObject* getObject(std::string& strName) = 0;
+ virtual ValueTypeObject* getObject(std::string& strName, int& iIndex) = 0;
+ virtual std::vector<ValueTypeObject*>* getAllObjects(std::string& strName) = 0;
+ virtual bool isValidBoolean(std::string& strName) = 0;
+ virtual bool isValidBoolean(std::string& strName, int& iIndex) = 0;
+ virtual bool getBoolean(std::string& strName) = 0;
+ virtual bool getBoolean(std::string& strName, int iIndex) = 0;
+ virtual std::vector<bool>* getAllBooleans(std::string& strName) = 0;
+ virtual bool isValidByte(std::string& strName) = 0;
+ virtual bool isValidByte(std::string& strName, int iIndex) = 0;
+ virtual char getByte(std::string& strName) = 0;
+ virtual char getByte(std::string& strName, int& iIndex) = 0;
+ virtual std::vector<char>* getAllBytes(std::string& strName) = 0;
+ virtual bool isValidShort(std::string& strName) = 0;
+ virtual bool isValidShort(std::string& strName, int iIndex) = 0;
+ virtual short getShort(std::string& strName) = 0;
+ virtual short getShort(std::string& strName, int& iIndex) = 0;
+ virtual std::vector<short>* getAllShorts(std::string& strName) = 0;
+ virtual bool isValidInteger(std::string& strName) = 0;
+ virtual bool isValidInteger(std::string& strName, int& iIndex) = 0;
+ virtual int getInteger(std::string& strName) = 0;
+ virtual int getInteger(std::string& strName, int& iIndex) = 0;
+ virtual std::vector<int>* getAllIntegers(std::string& strName) = 0;
+ virtual bool isValidBigInteger(std::string& strName) = 0;
+ virtual bool isValidBigInteger(std::string& strName, int& iIndex) = 0;
+ virtual long long* getBigInteger(std::string& strName) = 0;
+ virtual long long* getBigInteger(std::string& strName, int& iIndex) = 0;
+ virtual std::vector<long long>* getAllBigIntegers(std::string& strName) = 0;
+ virtual bool isValidLong(std::string& strName) = 0;
+ virtual bool isValidLong(std::string& strName, int& iIndex) = 0;
+ virtual long getLong(std::string& strName) = 0;
+ virtual long getLong(std::string& strName, int& iIndex) = 0;
+ virtual std::vector<long>* getAllLongs(std::string& strName) = 0;
+ virtual bool isValidFloat(std::string& strName) = 0;
+ virtual bool isValidFloat(std::string& strName, int& iIndex) = 0;
+ virtual float getFloat(std::string& strName) = 0;
+ virtual float getFloat(std::string& strName, int& iIndex) = 0;
+ virtual std::vector<float>* getAllFloats(std::string& strName) = 0;
+ virtual bool isValidDouble(std::string& strName) = 0;
+ virtual double getDouble(std::string& strName) = 0;
+ virtual double getDouble(std::string& strName, int& iIndex) = 0;
+ virtual std::vector<double>* getAllDoubles(std::string& strName) = 0;
+ virtual bool isValidBigDecimal(std::string& strName) = 0;
+ virtual cpp_dec_float_100 getBigDecimal(std::string& strName) = 0;
+ virtual cpp_dec_float_100 getBigDecimal(std::string& strName, int& iIndex) = 0;
+ virtual std::vector<cpp_dec_float_100>* getAllBigDecimals(std::string& strName) = 0;
+ virtual bool isValidString(std::string& strName) = 0;
+ virtual bool isValidString(std::string& strName, int& iIndex) = 0;
+ virtual std::string getString(std::string& strName) = 0;
+ virtual std::string getString(std::string& strName, int& iIndex) = 0;
+ virtual std::vector<std::string>* getAllStrings(std::string& strName) = 0;
+ virtual bool isValidTime(std::string& strName) = 0;
+ virtual bool isValidTime(std::string& strName, int& iIndex) = 0;
+ virtual std::time_t getTime(std::string& strName) = 0;
+ virtual std::time_t getTime(std::string& strName, int& iIndex) = 0;
+ virtual std::vector<std::time_t>* getAllTimes(std::string& strName) = 0;
+ virtual bool isValidDate(std::string& strName) = 0;
+ virtual bool isValidDate(std::string& strName, int& iIndex) = 0;
+ virtual tm& getDate(std::string& strName) = 0;
+ virtual tm& getDate(std::string& strName, int& iIndex) = 0;
+ virtual std::vector<tm>* getAllDates(std::string& strName)= 0;
+ virtual bool isValidDateTime(std::string& strName) = 0;
+ virtual bool isValidDateTime(std::string& strName, int& iIndex) = 0;
+ virtual tm* getDateTime(std::string& strName) = 0;
+ virtual tm* getDateTime(std::string& strName, int& iIndex) = 0;
+ virtual std::vector<tm>* getAllDateTimes(std::string& strName) = 0;
+ virtual bool isValidByteArray(std::string& strName) = 0;
+ virtual bool isValidByteArray(std::string& strName, int& iIndex) = 0;
+ virtual std::vector<char>* getByteArray(std::string& strName) = 0; // Todo: Pointer to byte-array ???
+ virtual std::vector<char>* getByteArray(std::string& strName, int& iIndex) = 0; // Todo: Pointer to byte-array ???
+ virtual std::vector<std::vector<char>*>* getAllByteArrays(std::string& strName) = 0;
private:
};