From 8549715c5f90656d5fd00c4879898a6b65ba24d6 Mon Sep 17 00:00:00 2001 From: Ilho Kim Date: Wed, 31 Aug 2022 11:26:17 +0900 Subject: [PATCH] Apply plugin structure to cion java group event callback Change-Id: I3348afbc16a20504f66f94160d226c81b77f756a Signed-off-by: Ilho Kim --- .../aitt_plugin_java_transportable.cc | 22 +++++++++++++++++++++ .../aitt_plugin_java_transportable.h | 2 ++ idlc/gen_cion/default_java_transportable.cc | 23 ++++++++++++++++++++++ idlc/gen_cion/default_java_transportable.h | 2 ++ idlc/gen_cion/java_cion_group_gen.cc | 8 +++++++- idlc/gen_cion/java_cion_group_gen_cb.h | 8 ++------ idlc/gen_cion/java_transportable.h | 2 ++ 7 files changed, 60 insertions(+), 7 deletions(-) diff --git a/idlc/gen_aitt_plugin/aitt_plugin_java_transportable.cc b/idlc/gen_aitt_plugin/aitt_plugin_java_transportable.cc index bb5540d..f4a4ba5 100644 --- a/idlc/gen_aitt_plugin/aitt_plugin_java_transportable.cc +++ b/idlc/gen_aitt_plugin/aitt_plugin_java_transportable.cc @@ -64,6 +64,20 @@ R"__java_cb( } )__java_cb"; +constexpr const char __ON_LEFT_EVENT_METHOD[] = +R"__java_cb( + @Override + public void onLeft( peerInfo, String topic_name) { + } +)__java_cb"; + +constexpr const char __ON_JOINED_EVENT_METHOD[] = +R"__java_cb( + @Override + public void onJoined( peerInfo, String topic_name) { + } +)__java_cb"; + } // namespace namespace tidl { @@ -92,4 +106,12 @@ std::string AittPluginJavaTransportable::GenGroupBaseConstructor() const { return __GROUP_BASE_CONSTRUCTOR; } +std::string AittPluginJavaTransportable::GenOnLeftEventMethod() const { + return __ON_LEFT_EVENT_METHOD; +} + +std::string AittPluginJavaTransportable::GenOnJoinedEventMethod() const { + return __ON_JOINED_EVENT_METHOD; +} + } // namespace tidl diff --git a/idlc/gen_aitt_plugin/aitt_plugin_java_transportable.h b/idlc/gen_aitt_plugin/aitt_plugin_java_transportable.h index 05d107d..7c77676 100644 --- a/idlc/gen_aitt_plugin/aitt_plugin_java_transportable.h +++ b/idlc/gen_aitt_plugin/aitt_plugin_java_transportable.h @@ -31,6 +31,8 @@ class AittPluginJavaTransportable : public DefaultJavaTransportable { std::string GenClientBaseConstructor() const override; std::string GenServerBaseConstructor() const override; std::string GenGroupBaseConstructor() const override; + std::string GenOnLeftEventMethod() const override; + std::string GenOnJoinedEventMethod() const override; }; } // namespace tidl diff --git a/idlc/gen_cion/default_java_transportable.cc b/idlc/gen_cion/default_java_transportable.cc index 3801f32..eb03687 100644 --- a/idlc/gen_cion/default_java_transportable.cc +++ b/idlc/gen_cion/default_java_transportable.cc @@ -150,6 +150,21 @@ R"__java_cb( } )__java_cb"; +constexpr const char __ON_LEFT_EVENT_METHOD[] = +R"__java_cb( + @Override + public void onLeft( peerInfo) { + } +)__java_cb"; + +constexpr const char __ON_JOINED_EVENT_METHOD[] = +R"__java_cb( + @Override + public void onJoined(PeerInfo peerInfo, String topic_name) { + } +)__java_cb"; + + } // namespace namespace tidl { @@ -324,4 +339,12 @@ std::string DefaultJavaTransportable::GenGroupBaseConstructor() const { return __GROUP_BASE_CONSTRUCTOR; } +std::string DefaultJavaTransportable::GenOnLeftEventMethod() const { + return __ON_LEFT_EVENT_METHOD; +} + +std::string DefaultJavaTransportable::GenOnJoinedEventMethod() const { + return __ON_JOINED_EVENT_METHOD; +} + } // namespace tidl diff --git a/idlc/gen_cion/default_java_transportable.h b/idlc/gen_cion/default_java_transportable.h index f2a3557..372d971 100644 --- a/idlc/gen_cion/default_java_transportable.h +++ b/idlc/gen_cion/default_java_transportable.h @@ -64,6 +64,8 @@ class DefaultJavaTransportable : public JavaTransportable { std::string GenClientBaseConstructor() const override; std::string GenServerBaseConstructor() const override; std::string GenGroupBaseConstructor() const override; + std::string GenOnLeftEventMethod() const override; + std::string GenOnJoinedEventMethod() const override; }; } // namespace tidl diff --git a/idlc/gen_cion/java_cion_group_gen.cc b/idlc/gen_cion/java_cion_group_gen.cc index c1e7afb..b55677b 100644 --- a/idlc/gen_cion/java_cion_group_gen.cc +++ b/idlc/gen_cion/java_cion_group_gen.cc @@ -74,7 +74,13 @@ void JavaCionGroupGen::GenInterface(std::ofstream& stream, const Interface& ifac void JavaCionGroupGen::GenEvents(std::ofstream& stream, const Interface& iface) { stream << ReplaceAll(CB_EVENT_METHODS, - "", GetTransportable().Java().GenPeerInfoType()) << NLine(1); + { + { "", + GetTransportable().Java().GenOnLeftEventMethod() }, + { "", + GetTransportable().Java().GenOnJoinedEventMethod() }, + { "", GetTransportable().Java().GenPeerInfoType() } + }) << NLine(1); for (const auto& decl : iface.GetDeclarations()) GenEvent(stream, iface, *decl); diff --git a/idlc/gen_cion/java_cion_group_gen_cb.h b/idlc/gen_cion/java_cion_group_gen_cb.h index e69ce0f..e8cba61 100644 --- a/idlc/gen_cion/java_cion_group_gen_cb.h +++ b/idlc/gen_cion/java_cion_group_gen_cb.h @@ -33,16 +33,12 @@ R"__java_cb( /** * This method will be invoked when another peer left from the current group. */ - @Override - public void onLeft( peerInfo) { - } + /** * This method will be invoked when another peer joined from the current group. */ - @Override - public void onJoined( peerInfo) { - } + )__java_cb"; const char CB_ON_PAYLOAD_RECEIVED_FRONT[] = diff --git a/idlc/gen_cion/java_transportable.h b/idlc/gen_cion/java_transportable.h index 42ccd32..4edf1c2 100644 --- a/idlc/gen_cion/java_transportable.h +++ b/idlc/gen_cion/java_transportable.h @@ -62,6 +62,8 @@ class JavaTransportable { virtual std::string GenClientBaseConstructor() const = 0; virtual std::string GenServerBaseConstructor() const = 0; virtual std::string GenGroupBaseConstructor() const = 0; + virtual std::string GenOnLeftEventMethod() const = 0; + virtual std::string GenOnJoinedEventMethod() const = 0; }; } // namespace tidl -- 2.7.4