Skip to content

Migrate decaf Exceptions #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ZafrulLipu wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Migrate decaf Exceptions #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7763f0e
migrate decaf Exceptions
May 6, 2026
836d085
change signature
May 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
5 changes: 2 additions & 3 deletions ...ator/src/main/java/org/apache/activemq/openwire/tool/commands/CommandSourceGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ public void generate( PrintWriter out ) {
out.println("using namespace activemq::exceptions;");
out.println("using namespace activemq::commands;");
out.println("using namespace decaf::lang;");
out.println("using namespace decaf::lang::exceptions;");
if( isComparable() ) {
out.println("using namespace decaf::internal::util;");
}
Expand Down Expand Up @@ -95,7 +94,7 @@ public void generate( PrintWriter out ) {
out.println(" const "+getClassName()+"* srcPtr = dynamic_cast<const "+getClassName()+"*>(src);");
out.println("");
out.println(" if (srcPtr == NULL || src == NULL) {");
out.println(" throw decaf::lang::exceptions::NullPointerException(");
out.println(" throw NullPointerException(");
out.println(" __FILE__, __LINE__,");
out.println(" \""+getClassName()+"::copyDataStructure - src is NULL or invalid\");");
out.println(" }");
Expand Down Expand Up @@ -203,7 +202,7 @@ protected void populateIncludeFilesSet() {
includes.add("<activemq/commands/"+getClassName()+".h>");
includes.add("<activemq/state/CommandVisitor.h>");
includes.add("<activemq/exceptions/ActiveMQException.h>");
includes.add("<decaf/lang/exceptions/NullPointerException.h>");
includes.add("<activemq/exceptions/ExceptionTypes.h>");
if( isHashable() ) {
includes.add("<decaf/util/HashCode.h>");
}
Expand Down
14 changes: 8 additions & 6 deletions ...ator/src/main/java/org/apache/activemq/openwire/tool/commands/MessageSourceGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,9 +118,10 @@ protected void generateAdditionalMethods( PrintWriter out ) {
out.println(" &properties, marshalledProperties );");
out.println(" }");
out.println(" }");
out.println(" AMQ_CATCH_RETHROW(decaf::io::IOException)");
out.println(" AMQ_CATCH_EXCEPTION_CONVERT(decaf::lang::Exception, decaf::io::IOException)");
out.println(" AMQ_CATCHALL_THROW(decaf::io::IOException)");
out.println(" AMQ_CATCH_RETHROW(activemq::exceptions::IOException)");
out.println(" AMQ_CATCH_EXCEPTION_CONVERT(decaf::lang::Exception,");
out.println(" activemq::exceptions::IOException)");
out.println(" AMQ_CATCHALL_THROW(activemq::exceptions::IOException)");
out.println("}");
out.println("");
out.println("////////////////////////////////////////////////////////////////////////////////");
Expand All @@ -130,9 +131,10 @@ protected void generateAdditionalMethods( PrintWriter out ) {
out.println(" wireformat::openwire::marshal::PrimitiveTypesMarshaller::unmarshal(");
out.println(" &properties, marshalledProperties);");
out.println(" }");
out.println(" AMQ_CATCH_RETHROW(decaf::io::IOException)");
out.println(" AMQ_CATCH_EXCEPTION_CONVERT(decaf::lang::Exception, decaf::io::IOException)");
out.println(" AMQ_CATCHALL_THROW(decaf::io::IOException)");
out.println(" AMQ_CATCH_RETHROW(activemq::exceptions::IOException)");
out.println(" AMQ_CATCH_EXCEPTION_CONVERT(decaf::lang::Exception,");
out.println(" activemq::exceptions::IOException)");
out.println(" AMQ_CATCHALL_THROW(activemq::exceptions::IOException)");
out.println("}");
out.println("");
}
Expand Down
36 changes: 21 additions & 15 deletions ...java/org/apache/activemq/openwire/tool/marshallers/AmqCppMarshallingClassesGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -572,6 +572,7 @@ protected void generateFile(PrintWriter out) throws Exception {
out.println("");
out.println("#include <activemq/commands/"+jclass.getSimpleName()+".h>");
out.println("#include <activemq/exceptions/ActiveMQException.h>");
out.println("#include <activemq/wireformat/openwire/marshal/OpenWireMarshalCatchMacros.h>");
out.println("#include <decaf/lang/Pointer.h>");
out.println("");
out.println("//");
Expand Down Expand Up @@ -645,9 +646,10 @@ protected void generateFile(PrintWriter out) throws Exception {
}

out.println(" }");
out.println(" AMQ_CATCH_RETHROW(decaf::io::IOException)" );
out.println(" AMQ_CATCH_EXCEPTION_CONVERT(exceptions::ActiveMQException, decaf::io::IOException)" );
out.println(" AMQ_CATCHALL_THROW(decaf::io::IOException)" );
out.println(" AMQ_CATCH_RETHROW(activemq::exceptions::IOException)" );
out.println(" AMQ_CATCH_EXCEPTION_CONVERT(activemq::exceptions::ActiveMQException," );
out.println(" activemq::exceptions::IOException)" );
out.println(" AMQ_CATCHALL_THROW(activemq::exceptions::IOException)" );
out.println("}");
out.println("");
out.println("///////////////////////////////////////////////////////////////////////////////");
Expand Down Expand Up @@ -680,9 +682,10 @@ protected void generateFile(PrintWriter out) throws Exception {
out.println("");
out.println(" return rc + "+baseSize+";");
out.println(" }");
out.println(" AMQ_CATCH_RETHROW(decaf::io::IOException)" );
out.println(" AMQ_CATCH_EXCEPTION_CONVERT(exceptions::ActiveMQException, decaf::io::IOException)" );
out.println(" AMQ_CATCHALL_THROW(decaf::io::IOException)" );
out.println(" AMQ_CATCH_RETHROW(activemq::exceptions::IOException)" );
out.println(" AMQ_CATCH_EXCEPTION_CONVERT(activemq::exceptions::ActiveMQException," );
out.println(" activemq::exceptions::IOException)" );
out.println(" AMQ_CATCHALL_THROW(activemq::exceptions::IOException)" );
out.println("}");
out.println("");
out.println("///////////////////////////////////////////////////////////////////////////////");
Expand Down Expand Up @@ -712,9 +715,10 @@ protected void generateFile(PrintWriter out) throws Exception {
}

out.println(" }");
out.println(" AMQ_CATCH_RETHROW(decaf::io::IOException)" );
out.println(" AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException)" );
out.println(" AMQ_CATCHALL_THROW(decaf::io::IOException)" );
out.println(" AMQ_CATCH_RETHROW(activemq::exceptions::IOException)" );
out.println(" AMQ_CATCH_EXCEPTION_CONVERT(activemq::exceptions::ActiveMQException," );
out.println(" activemq::exceptions::IOException)" );
out.println(" AMQ_CATCHALL_THROW(activemq::exceptions::IOException)" );
out.println("}");
out.println("");
out.println("///////////////////////////////////////////////////////////////////////////////");
Expand Down Expand Up @@ -747,9 +751,10 @@ protected void generateFile(PrintWriter out) throws Exception {
}

out.println(" }");
out.println(" AMQ_CATCH_RETHROW(decaf::io::IOException)" );
out.println(" AMQ_CATCH_EXCEPTION_CONVERT(exceptions::ActiveMQException, decaf::io::IOException)" );
out.println(" AMQ_CATCHALL_THROW(decaf::io::IOException)" );
out.println(" AMQ_CATCH_RETHROW(activemq::exceptions::IOException)" );
out.println(" AMQ_CATCH_EXCEPTION_CONVERT(activemq::exceptions::ActiveMQException," );
out.println(" activemq::exceptions::IOException)" );
out.println(" AMQ_CATCHALL_THROW(activemq::exceptions::IOException)" );
out.println("}");
out.println("");
out.println("///////////////////////////////////////////////////////////////////////////////");
Expand Down Expand Up @@ -783,9 +788,10 @@ protected void generateFile(PrintWriter out) throws Exception {
}

out.println(" }");
out.println(" AMQ_CATCH_RETHROW(decaf::io::IOException)" );
out.println(" AMQ_CATCH_EXCEPTION_CONVERT(exceptions::ActiveMQException, decaf::io::IOException)" );
out.println(" AMQ_CATCHALL_THROW(decaf::io::IOException)" );
out.println(" AMQ_CATCH_RETHROW(activemq::exceptions::IOException)" );
out.println(" AMQ_CATCH_EXCEPTION_CONVERT(activemq::exceptions::ActiveMQException," );
out.println(" activemq::exceptions::IOException)" );
out.println(" AMQ_CATCHALL_THROW(activemq::exceptions::IOException)" );
out.println("}");
out.println("");
}
Expand Down
2 changes: 1 addition & 1 deletion ...java/org/apache/activemq/openwire/tool/marshallers/AmqCppMarshallingHeadersGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ protected void generateFile(PrintWriter out) throws Exception {
out.println("");
out.println("#include <decaf/io/DataInputStream.h>");
out.println("#include <decaf/io/DataOutputStream.h>");
out.println("#include <decaf/io/IOException.h>");
out.println("#include <activemq/exceptions/IoCatchMacros.h>");
out.println("#include <activemq/util/Config.h>");
out.println("#include <activemq/commands/DataStructure.h>");
out.println("#include <activemq/wireformat/openwire/OpenWireFormat.h>");
Expand Down
9 changes: 5 additions & 4 deletions activemq-cpp/src/examples/advisories/AdvisoryConsumer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,21 @@
#include <cms/Message.h>
#include <cms/TextMessage.h>
#include <cms/Topic.h>
#include <decaf/lang/exceptions/NullPointerException.h>

#include <stdexcept>

#include <activemq/commands/ActiveMQMessage.h>
#include <activemq/commands/ProducerInfo.h>
#include <activemq/exceptions/ExceptionTypes.h>
#include <string>

using namespace std;
using namespace activemq;
using namespace activemq::commands;
using namespace activemq::exceptions;
using namespace activemqcpp;
using namespace activemqcpp::examples;
using namespace activemqcpp::examples::advisories;
using namespace decaf;
using namespace decaf::lang;
using namespace decaf::lang::exceptions;

////////////////////////////////////////////////////////////////////////////////
AdvisoryConsumer::AdvisoryConsumer(cms::Session* session)
Expand Down
7 changes: 5 additions & 2 deletions activemq-cpp/src/examples/advisories/AdvisoryProducer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,18 @@
#include <cms/TextMessage.h>
#include <cms/Topic.h>
#include <decaf/lang/Integer.h>
#include <decaf/lang/exceptions/NullPointerException.h>

#include <activemq/exceptions/ExceptionTypes.h>
#include <stdexcept>
#include <string>

using namespace std;
using namespace activemq::exceptions;
using namespace activemqcpp;
using namespace activemqcpp::examples;
using namespace activemqcpp::examples::advisories;
using namespace decaf;
using namespace decaf::lang;
using namespace decaf::lang::exceptions;

////////////////////////////////////////////////////////////////////////////////
AdvisoryProducer::AdvisoryProducer(cms::Session* session)
Expand Down
31 changes: 14 additions & 17 deletions activemq-cpp/src/examples/advisories/TempDestinationAdvisoryConsumer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,11 @@
#include <activemq/commands/ActiveMQMessage.h>
#include <activemq/commands/DestinationInfo.h>
#include <activemq/core/ActiveMQConstants.h>
#include <activemq/exceptions/ExceptionTypes.h>
#include <cms/Message.h>
#include <cms/TextMessage.h>
#include <cms/Topic.h>
#include <decaf/lang/Integer.h>
#include <decaf/lang/exceptions/ClassCastException.h>
#include <decaf/lang/exceptions/NullPointerException.h>
#include <stdexcept>

using namespace std;
using namespace activemqcpp;
Expand All @@ -34,9 +33,7 @@ using namespace activemqcpp::examples::advisories;
using namespace activemq;
using namespace activemq::commands;
using namespace activemq::core;
using namespace decaf;
using namespace decaf::lang;
using namespace decaf::lang::exceptions;
using namespace activemq::exceptions;

////////////////////////////////////////////////////////////////////////////////
TempDestinationAdvisoryConsumer::TempDestinationAdvisoryConsumer(
Expand Down Expand Up @@ -78,12 +75,18 @@ void TempDestinationAdvisoryConsumer::onMessage(const cms::Message* message)
std::cout << "Advisory Message contains a Command Object!"
<< std::endl;

try
{
std::shared_ptr<DestinationInfo> info =
std::dynamic_pointer_cast<DestinationInfo>(
amqMessage->getDataStructure());
std::shared_ptr<DestinationInfo> info =
std::dynamic_pointer_cast<DestinationInfo>(
amqMessage->getDataStructure());

if (!info)
{
std::cout << "ERROR: Expected the Command to be a "
"DestinationInfo, "
<< "it wasn't so PANIC!!" << std::endl;
}
else
{
unsigned char operationType = info->getOperationType();

if (operationType ==
Expand All @@ -106,12 +109,6 @@ void TempDestinationAdvisoryConsumer::onMessage(const cms::Message* message)
<< std::endl;
}
}
catch (ClassCastException& ex)
{
std::cout << "ERROR: Expected the Command to be a "
"DestinationInfo, "
<< "it wasn't so PANIC!!" << std::endl;
}
}
}
else
Expand Down
4 changes: 3 additions & 1 deletion activemq-cpp/src/examples/cmstemplate-stress/ConnectionFactoryMgr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,10 @@

#include "ConnectionFactoryMgr.h"
#include <activemq/core/ActiveMQConnectionFactory.h>
#include <activemq/exceptions/ExceptionTypes.h>

using namespace std;
using namespace activemq::exceptions;
using namespace cms;
using namespace decaf;
using namespace decaf::lang;
Expand Down Expand Up @@ -89,7 +91,7 @@ ConnectionFactory* ConnectionFactoryMgr::getConnectionFactory(
{
connectionFactory = connectionFactories->get(url);
}
catch (NoSuchElementException& ex)
catch (NoSuchElementException&)
{
}

Expand Down
1 change: 0 additions & 1 deletion activemq-cpp/src/examples/stress-test/BrokerMonitor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ extern bool VERBOSE;
using namespace cms;
using namespace cms::stress;
using namespace activemq::cmsutil;
using namespace decaf::lang::exceptions;
using namespace decaf::lang;
using namespace decaf::util;
using namespace decaf::util::concurrent;
Expand Down
1 change: 0 additions & 1 deletion activemq-cpp/src/examples/stress-test/CmsStress.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ using namespace cms;
using namespace cms::stress;
using namespace activemq::library;
using namespace decaf::lang;
using namespace decaf::lang::exceptions;
using namespace decaf::util::concurrent;
using namespace decaf::util::concurrent::atomic;

Expand Down
5 changes: 3 additions & 2 deletions activemq-cpp/src/examples/stress-test/ConnectionFactoryMgr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@

#include "ConnectionFactoryMgr.h"
#include <activemq/core/ActiveMQConnectionFactory.h>
#include <activemq/exceptions/ExceptionTypes.h>

using namespace decaf::lang::exceptions;
using namespace activemq::core;
using namespace activemq::exceptions;
using namespace decaf::lang;
using namespace cms;
using namespace cms::stress;
Expand Down Expand Up @@ -82,7 +83,7 @@ ConnectionFactory* ConnectionFactoryMgr::getConnectionFactory(
connectionFactory = connectionFactories->get(url);
}
}
catch (NoSuchElementException& ex)
catch (NoSuchElementException&)
{
}

Expand Down
30 changes: 2 additions & 28 deletions activemq-cpp/src/main/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,8 @@ set(ACTIVEMQ_CPP_SOURCES
activemq/exceptions/ActiveMQException.cpp
activemq/exceptions/BrokerException.cpp
activemq/exceptions/ConnectionFailedException.cpp
activemq/exceptions/BufferUnderflowException.cpp
activemq/exceptions/IoExceptions.cpp
activemq/io/LoggingInputStream.cpp
activemq/io/LoggingOutputStream.cpp
activemq/library/ActiveMQCPP.cpp
Expand Down Expand Up @@ -402,21 +404,16 @@ set(ACTIVEMQ_CPP_SOURCES
decaf/io/DataInputStream.cpp
decaf/io/DataOutput.cpp
decaf/io/DataOutputStream.cpp
decaf/io/EOFException.cpp
decaf/io/FileDescriptor.cpp
decaf/io/FilterInputStream.cpp
decaf/io/FilterOutputStream.cpp
decaf/io/Flushable.cpp
decaf/io/IOException.cpp
decaf/io/InputStream.cpp
decaf/io/InputStreamReader.cpp
decaf/io/InterruptedIOException.cpp
decaf/io/OutputStream.cpp
decaf/io/OutputStreamWriter.cpp
decaf/io/PushbackInputStream.cpp
decaf/io/Reader.cpp
decaf/io/UTFDataFormatException.cpp
decaf/io/UnsupportedEncodingException.cpp
decaf/io/Writer.cpp
decaf/lang/AbstractStringBuilder.cpp
decaf/lang/Appendable.cpp
Expand Down Expand Up @@ -444,26 +441,7 @@ set(ACTIVEMQ_CPP_SOURCES
decaf/lang/Thread.cpp
decaf/lang/ThreadGroup.cpp
decaf/lang/ThreadLocal.cpp
decaf/lang/Throwable.cpp
decaf/lang/Types.cpp
decaf/lang/exceptions/ArrayIndexOutOfBoundsException.cpp
decaf/lang/exceptions/ClassCastException.cpp
decaf/lang/exceptions/CloneNotSupportedException.cpp
decaf/lang/exceptions/IllegalArgumentException.cpp
decaf/lang/exceptions/IllegalMonitorStateException.cpp
decaf/lang/exceptions/IllegalStateException.cpp
decaf/lang/exceptions/IllegalThreadStateException.cpp
decaf/lang/exceptions/IndexOutOfBoundsException.cpp
decaf/lang/exceptions/InterruptedException.cpp
decaf/lang/exceptions/InvalidStateException.cpp
decaf/lang/exceptions/NegativeArraySizeException.cpp
decaf/lang/exceptions/NullPointerException.cpp
decaf/lang/exceptions/NumberFormatException.cpp
decaf/lang/exceptions/OutOfMemoryError.cpp
decaf/lang/exceptions/RuntimeException.cpp
decaf/lang/exceptions/SecurityException.cpp
decaf/lang/exceptions/StringIndexOutOfBoundsException.cpp
decaf/lang/exceptions/UnsupportedOperationException.cpp
decaf/net/BindException.cpp
decaf/net/ConnectException.cpp
decaf/net/ContentHandlerFactory.cpp
Expand Down Expand Up @@ -503,7 +481,6 @@ set(ACTIVEMQ_CPP_SOURCES
decaf/net/UnknownServiceException.cpp
decaf/nio/Buffer.cpp
decaf/nio/BufferOverflowException.cpp
decaf/nio/BufferUnderflowException.cpp
decaf/nio/ByteBuffer.cpp
decaf/nio/CharBuffer.cpp
decaf/nio/DoubleBuffer.cpp
Expand All @@ -525,7 +502,6 @@ set(ACTIVEMQ_CPP_SOURCES
decaf/security/NoSuchProviderException.cpp
decaf/security/Principal.cpp
decaf/security/Provider.cpp
decaf/security/ProviderException.cpp
decaf/security/ProviderService.cpp
decaf/security/PublicKey.cpp
decaf/security/SecureRandom.cpp
Expand Down Expand Up @@ -553,7 +529,6 @@ set(ACTIVEMQ_CPP_SOURCES
decaf/util/Collection.cpp
decaf/util/Collections.cpp
decaf/util/Comparator.cpp
decaf/util/ConcurrentModificationException.cpp
decaf/util/Date.cpp
decaf/util/Deque.cpp
decaf/util/HashCode.cpp
Expand All @@ -568,7 +543,6 @@ set(ACTIVEMQ_CPP_SOURCES
decaf/util/ListIterator.cpp
decaf/util/Map.cpp
decaf/util/MapEntry.cpp
decaf/util/NoSuchElementException.cpp
decaf/util/PriorityQueue.cpp
decaf/util/Properties.cpp
decaf/util/Queue.cpp
Expand Down
Loading
Loading