//------------------------------------------------------------------------------
//------------------------------------------------------ EngineImpl::createAvp()
//------------------------------------------------------------------------------
-Avp* EngineImpl::createAvp(const AvpId *id) throw(anna::RuntimeException) {
+Avp* EngineImpl::createAvp(const AvpId *id) noexcept(false) {
Avp *result(NULL);
anna::Guard guard(this, "diameter::codec::EngineImpl::createAvp");
//------------------------------------------------------------------------------
//-------------------------------------------------- EngineImpl::createMessage()
//------------------------------------------------------------------------------
-Message* EngineImpl::createMessage(const CommandId *id) throw(anna::RuntimeException) {
+Message* EngineImpl::createMessage(const CommandId *id) noexcept(false) {
Message *result(NULL);
anna::Guard guard(this, "diameter::codec::EngineImpl::createMessage");
//------------------------------------------------------------------------------
//-------------------------------------------------- EngineImpl::createMessage()
//------------------------------------------------------------------------------
-Message *EngineImpl::createMessage(const std::string & xmlPathFile) throw(anna::RuntimeException) {
+Message *EngineImpl::createMessage(const std::string & xmlPathFile_or_string, bool pathfile_or_string) noexcept(false) {
Message *result = createMessage();
- result->loadXML(xmlPathFile);
+ if (pathfile_or_string)
+ result->loadXMLFile(xmlPathFile_or_string);
+ else
+ result->loadXMLString(xmlPathFile_or_string);
+
return result;
}
-std::string EngineImpl::asString(void) const throw() {
+std::string EngineImpl::asString(void) const {
std::string result = anna::Component::asString();
result += "\nValidationDepth: ";
result += asText(a_validationDepth);
result += "\nFixMode: ";
result += asText(a_fixMode);
result += "\nActivated Dictionary: ";
- result += a_dictionary ? (a_dictionary->getName()) : "<null>";
+ result += a_dictionary ? (a_dictionary->getName()) : "[null]";
return result;
}
//---------------------------------------------------------- EngineImpl::asXML()
//------------------------------------------------------------------------------
anna::xml::Node* EngineImpl::asXML(anna::xml::Node* parent) const
-throw() {
+{
parent = anna::Component::asXML(parent);
anna::xml::Node* result = parent->createChild("diameter.codec.EngineImpl");
result->createAttribute("ValidationDepth", asText(a_validationDepth));
//--------------------------------------------------------- EngineImpl::asText()
//------------------------------------------------------------------------------
const char* EngineImpl::asText(const ValidationDepth::_v vd)
-throw() {
+{
static const char* text [] = { "Complete", "FirstError" };
return text [vd];
}
//--------------------------------------------------------- EngineImpl::asText()
//------------------------------------------------------------------------------
const char* EngineImpl::asText(const ValidationMode::_v vm)
-throw() {
+{
static const char* text [] = { "BeforeEncoding", "AfterDecoding", "Always", "Never" };
return text [vm];
}
//--------------------------------------------------------- EngineImpl::asText()
//------------------------------------------------------------------------------
const char* EngineImpl::asText(const FixMode::_v fm)
-throw() {
+{
static const char* text [] = { "BeforeEncoding", "AfterDecoding", "Always", "Never" };
return text [fm];
}
//------------------------------------------------------------------------------
//---------------------------------------------- EngineImpl::validationAnomaly()
//------------------------------------------------------------------------------
-void EngineImpl::validationAnomaly(const std::string & description) const throw(anna::RuntimeException) {
+void EngineImpl::validationAnomaly(const std::string & description) const noexcept(false) {
std::string msg = "Validation error: ";
if(a_validationDepth == ValidationDepth::FirstError)
//------------------------------------------------------------------------------
//--------------------------------------------------- EngineImpl::avpIdForName()
//------------------------------------------------------------------------------
-anna::diameter::AvpId EngineImpl::avpIdForName(const char * name) throw(anna::RuntimeException) {
+anna::diameter::AvpId EngineImpl::avpIdForName(const char * name) noexcept(false) {
if(!name)
throw anna::RuntimeException("Provided NULL Avp Logical Name", ANNA_FILE_LOCATION);
//------------------------------------------------------------------------------
//----------------------------------------------- EngineImpl::commandIdForName()
//------------------------------------------------------------------------------
-anna::diameter::CommandId EngineImpl::commandIdForName(const char * name) throw(anna::RuntimeException) {
+anna::diameter::CommandId EngineImpl::commandIdForName(const char * name) noexcept(false) {
if(!name)
throw anna::RuntimeException("Provided NULL Command Logical Name", ANNA_FILE_LOCATION);