From 2388db4347cf0c4a1032cb945db2fdb1011d74d7 Mon Sep 17 00:00:00 2001 From: Michal Cmarada Date: Thu, 28 Feb 2019 10:21:59 +0100 Subject: Update package names updating package names from io.fd.vpp.jvpp* to io.fd.jvpp* Change-Id: Ia1634db8f0875ff6ecfeddc281041cd49c4aacc2 Signed-off-by: Michal Cmarada --- java/jvpp/gen/jvppgen/jvpp_callback_facade_gen.py | 30 +++++++++++------------ 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'java/jvpp/gen/jvppgen/jvpp_callback_facade_gen.py') diff --git a/java/jvpp/gen/jvppgen/jvpp_callback_facade_gen.py b/java/jvpp/gen/jvppgen/jvpp_callback_facade_gen.py index ebc552b..d41080d 100644 --- a/java/jvpp/gen/jvppgen/jvpp_callback_facade_gen.py +++ b/java/jvpp/gen/jvppgen/jvpp_callback_facade_gen.py @@ -41,7 +41,7 @@ package $plugin_package.callfacade; *

Callback Java API representation of $plugin_package plugin. *
It was generated by jvpp_callback_facade_gen.py based on $json_filename. */ -public interface CallbackJVpp${plugin_name} extends io.fd.vpp.jvpp.notification.EventRegistryProvider, java.lang.AutoCloseable { +public interface CallbackJVpp${plugin_name} extends io.fd.jvpp.notification.EventRegistryProvider, java.lang.AutoCloseable { // TODO add send @@ -72,10 +72,10 @@ def _generate_ifc_methods(model): return "\n".join(methods) _IFC_NO_ARG_METHOD_TEMPLATE = Template( - """ void $name($plugin_package.callback.${reply}Callback callback) throws io.fd.vpp.jvpp.VppInvocationException;""") + """ void $name($plugin_package.callback.${reply}Callback callback) throws io.fd.jvpp.VppInvocationException;""") _IFC_METHOD_TEMPLATE = Template( - """ void $name($plugin_package.dto.$request request, $plugin_package.callback.${reply}Callback callback) throws io.fd.vpp.jvpp.VppInvocationException;""") + """ void $name($plugin_package.dto.$request request, $plugin_package.callback.${reply}Callback callback) throws io.fd.jvpp.VppInvocationException;""") def _generate_impl(work_dir, model): @@ -97,18 +97,18 @@ package $plugin_package.callfacade; public final class CallbackJVpp${plugin_name}Facade implements CallbackJVpp${plugin_name} { private final $plugin_package.JVpp${plugin_name} jvpp; - private final java.util.Map callbacks; + private final java.util.Map callbacks; private final $plugin_package.notification.${plugin_name}EventRegistryImpl eventRegistry = new $plugin_package.notification.${plugin_name}EventRegistryImpl(); /** *

Create CallbackJVpp${plugin_name}Facade object for provided JVpp instance. * Constructor internally creates CallbackJVppFacadeCallback class for processing callbacks * and then connects to provided JVpp instance * - * @param jvpp provided io.fd.vpp.jvpp.JVpp instance + * @param jvpp provided io.fd.jvpp.JVpp instance * * @throws java.io.IOException in case instance cannot connect to JVPP */ - public CallbackJVpp${plugin_name}Facade(final io.fd.vpp.jvpp.JVppRegistry registry, final $plugin_package.JVpp${plugin_name} jvpp) throws java.io.IOException { + public CallbackJVpp${plugin_name}Facade(final io.fd.jvpp.JVppRegistry registry, final $plugin_package.JVpp${plugin_name} jvpp) throws java.io.IOException { this.jvpp = java.util.Objects.requireNonNull(jvpp,"jvpp is null"); this.callbacks = new java.util.HashMap<>(); java.util.Objects.requireNonNull(registry, "JVppRegistry should not be null"); @@ -154,14 +154,14 @@ def _generate_impl_methods(model): return "\n".join(methods) _IMPL_NO_ARG_METHOD_TEMPLATE = Template( - """ public final void $name($plugin_package.callback.${reply}Callback callback) throws io.fd.vpp.jvpp.VppInvocationException { + """ public final void $name($plugin_package.callback.${reply}Callback callback) throws io.fd.jvpp.VppInvocationException { synchronized (callbacks) { callbacks.put(jvpp.$name(), callback); } } """) -_IMPL_METHOD_TEMPLATE = Template(""" public final void $name($plugin_package.dto.$request request, $plugin_package.callback.${reply}Callback callback) throws io.fd.vpp.jvpp.VppInvocationException { +_IMPL_METHOD_TEMPLATE = Template(""" public final void $name($plugin_package.dto.$request request, $plugin_package.callback.${reply}Callback callback) throws io.fd.jvpp.VppInvocationException { synchronized (callbacks) { callbacks.put(jvpp.$name(request), callback); } @@ -187,20 +187,20 @@ package $plugin_package.callfacade; */ public final class CallbackJVpp${plugin_name}FacadeCallback implements $plugin_package.callback.JVpp${plugin_name}GlobalCallback { - private final java.util.Map requests; + private final java.util.Map requests; private final $plugin_package.notification.Global${plugin_name}EventCallback eventCallback; private static final java.util.logging.Logger LOG = java.util.logging.Logger.getLogger(CallbackJVpp${plugin_name}FacadeCallback.class.getName()); - public CallbackJVpp${plugin_name}FacadeCallback(final java.util.Map requestMap, + public CallbackJVpp${plugin_name}FacadeCallback(final java.util.Map requestMap, final $plugin_package.notification.Global${plugin_name}EventCallback eventCallback) { this.requests = requestMap; this.eventCallback = eventCallback; } @Override - public void onError(io.fd.vpp.jvpp.VppCallbackException reply) { + public void onError(io.fd.jvpp.VppCallbackException reply) { - io.fd.vpp.jvpp.callback.JVppCallback failedCall; + io.fd.jvpp.callback.JVppCallback failedCall; synchronized(requests) { failedCall = requests.remove(reply.getCtxId()); } @@ -217,12 +217,12 @@ public final class CallbackJVpp${plugin_name}FacadeCallback implements $plugin_p @Override @SuppressWarnings("unchecked") - public void onControlPingReply(final io.fd.vpp.jvpp.dto.ControlPingReply reply) { + public void onControlPingReply(final io.fd.jvpp.dto.ControlPingReply reply) { - io.fd.vpp.jvpp.callback.ControlPingCallback callback; + io.fd.jvpp.callback.ControlPingCallback callback; final int replyId = reply.context; synchronized(requests) { - callback = (io.fd.vpp.jvpp.callback.ControlPingCallback) requests.remove(replyId); + callback = (io.fd.jvpp.callback.ControlPingCallback) requests.remove(replyId); } if(callback != null) { -- cgit 1.2.3-korg