diff options
Diffstat (limited to 'java/jvpp/gen')
| -rwxr-xr-x | java/jvpp/gen/jvppgen/callback_gen.py | 4 | ||||
| -rwxr-xr-x | java/jvpp/gen/jvppgen/dto_gen.py | 10 | ||||
| -rwxr-xr-x | java/jvpp/gen/jvppgen/jni_gen.py | 4 | ||||
| -rwxr-xr-x | java/jvpp/gen/jvppgen/jni_impl_gen.py | 4 | ||||
| -rwxr-xr-x | java/jvpp/gen/jvppgen/jni_msg_handlers_gen.py | 2 | ||||
| -rw-r--r-- | java/jvpp/gen/jvppgen/jvpp_callback_facade_gen.py | 30 | ||||
| -rwxr-xr-x | java/jvpp/gen/jvppgen/jvpp_common_gen.py | 4 | ||||
| -rw-r--r-- | java/jvpp/gen/jvppgen/jvpp_future_facade_gen.py | 40 | ||||
| -rwxr-xr-x | java/jvpp/gen/jvppgen/jvpp_ifc_gen.py | 10 | ||||
| -rwxr-xr-x | java/jvpp/gen/jvppgen/jvpp_impl_gen.py | 20 | ||||
| -rwxr-xr-x | java/jvpp/gen/jvppgen/jvpp_model.py | 30 | ||||
| -rw-r--r-- | java/jvpp/gen/jvppgen/notification_gen.py | 10 |
12 files changed, 84 insertions, 84 deletions
diff --git a/java/jvpp/gen/jvppgen/callback_gen.py b/java/jvpp/gen/jvppgen/callback_gen.py index b1ad201..f1cc3a1 100755 --- a/java/jvpp/gen/jvppgen/callback_gen.py +++ b/java/jvpp/gen/jvppgen/callback_gen.py @@ -56,7 +56,7 @@ _CALLBACK_TEMPLATE = Template("""package $plugin_package.callback; * <p>Represents callback for plugin's api message. * <br>It was generated by jvppgen/callback_gen.py based on $json_filename. */ -public interface ${name}Callback extends io.fd.vpp.jvpp.callback.JVppCallback { +public interface ${name}Callback extends io.fd.jvpp.callback.JVppCallback { void on${name}(${plugin_package}.dto.${name} reply); } @@ -68,6 +68,6 @@ _GLOBAL_CALLBACK_TEMPLATE = Template("""package $plugin_package.callback; * <p>Global aggregated callback interface. * <br>It was generated by jvppgen/callback_gen.py based on $json_filename. */ -public interface JVpp${plugin_name}GlobalCallback extends io.fd.vpp.jvpp.callback.ControlPingCallback, $callbacks { +public interface JVpp${plugin_name}GlobalCallback extends io.fd.jvpp.callback.ControlPingCallback, $callbacks { } """) diff --git a/java/jvpp/gen/jvppgen/dto_gen.py b/java/jvpp/gen/jvppgen/dto_gen.py index cbd969d..c6e20fa 100755 --- a/java/jvpp/gen/jvppgen/dto_gen.py +++ b/java/jvpp/gen/jvppgen/dto_gen.py @@ -74,7 +74,7 @@ package $plugin_package.dto; $json_definition * </pre> */ -public final class $class_name implements io.fd.vpp.jvpp.dto.$base_type { +public final class $class_name implements io.fd.jvpp.dto.$base_type { $fields $hash_code $equals @@ -94,7 +94,7 @@ def _generate_send(model, msg): _SEND_TEMPLATE = Template(""" @Override - public int send(final io.fd.vpp.jvpp.JVpp jvpp) throws io.fd.vpp.jvpp.VppInvocationException { + public int send(final io.fd.jvpp.JVpp jvpp) throws io.fd.jvpp.VppInvocationException { return (($plugin_package.JVpp${plugin_name})jvpp).$method_name($args); }""") @@ -124,7 +124,7 @@ package $plugin_package.dto; $json_definition * </pre> */ -public final class $class_name implements io.fd.vpp.jvpp.dto.JVppReply<$plugin_package.dto.$request_name> { +public final class $class_name implements io.fd.jvpp.dto.JVppReply<$plugin_package.dto.$request_name> { $fields $hash_code $equals @@ -192,12 +192,12 @@ package $plugin_package.dto; $json_definition * </pre> */ -public final class ${details_class}ReplyDump implements io.fd.vpp.jvpp.dto.JVppReplyDump<${plugin_package}.dto.${dump_class}, ${plugin_package}.dto.${details_class}> { +public final class ${details_class}ReplyDump implements io.fd.jvpp.dto.JVppReplyDump<${plugin_package}.dto.${dump_class}, ${plugin_package}.dto.${details_class}> { public java.util.List<${details_class}> ${details_field} = new java.util.ArrayList<>(); @Override - @io.fd.vpp.jvpp.coverity.SuppressFBWarnings("UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD") + @io.fd.jvpp.coverity.SuppressFBWarnings("UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD") public int hashCode() { return java.util.Objects.hash(${details_field}); } diff --git a/java/jvpp/gen/jvppgen/jni_gen.py b/java/jvpp/gen/jvppgen/jni_gen.py index ad6c261..d73f7bf 100755 --- a/java/jvpp/gen/jvppgen/jni_gen.py +++ b/java/jvpp/gen/jvppgen/jni_gen.py @@ -65,10 +65,10 @@ def _generate_class_cache(plugin_name, messages): continue references.append(( msg.java_name_lower, - 'io/fd/vpp/jvpp/%s/dto/%s' % (plugin_name, msg.java_name_upper) + 'io/fd/jvpp/%s/dto/%s' % (plugin_name, msg.java_name_upper) )) - references.append(('callbackException', 'io/fd/vpp/jvpp/VppCallbackException')) + references.append(('callbackException', 'io/fd/jvpp/VppCallbackException')) return _CLASS_CACHE_TEMPLATE.substitute( class_references=_generate_class_references(references), diff --git a/java/jvpp/gen/jvppgen/jni_impl_gen.py b/java/jvpp/gen/jvppgen/jni_impl_gen.py index ef1bcbb..e53e5de 100755 --- a/java/jvpp/gen/jvppgen/jni_impl_gen.py +++ b/java/jvpp/gen/jvppgen/jni_impl_gen.py @@ -68,7 +68,7 @@ _JNI_IMPL_TEMPLATE = Template(""" * Generated based on $json_filename: $json_definition */ -JNIEXPORT jint JNICALL Java_io_fd_vpp_jvpp_${plugin_name}_JVpp${plugin_java_name}Impl_${java_method_name}0 +JNIEXPORT jint JNICALL Java_io_fd_jvpp_${plugin_name}_JVpp${plugin_java_name}Impl_${java_method_name}0 (JNIEnv * env, jclass clazz${arguments}) { ${plugin_name}_main_t *plugin_main = &${plugin_name}_main; vl_api_${c_name}_t * mp; @@ -98,7 +98,7 @@ $msg_initialization # TODO: cache method and field identifiers to achieve better performance # https://jira.fd.io/browse/HONEYCOMB-42 -_REQUEST_CLASS_TEMPLATE = Template(""" jclass requestClass = (*env)->FindClass(env, "io/fd/vpp/jvpp/${plugin_name}/dto/${java_dto_name}"); +_REQUEST_CLASS_TEMPLATE = Template(""" jclass requestClass = (*env)->FindClass(env, "io/fd/jvpp/${plugin_name}/dto/${java_dto_name}"); """) diff --git a/java/jvpp/gen/jvppgen/jni_msg_handlers_gen.py b/java/jvpp/gen/jvppgen/jni_msg_handlers_gen.py index ccd3dbc..e223526 100755 --- a/java/jvpp/gen/jvppgen/jni_msg_handlers_gen.py +++ b/java/jvpp/gen/jvppgen/jni_msg_handlers_gen.py @@ -67,7 +67,7 @@ $err_handler // User does not have to provide callbacks for all VPP messages. // We are ignoring messages that are not supported by user. (*env)->ExceptionClear(env); // just in case exception occurred in different place and was not properly cleared - jmethodID callbackMethod = (*env)->GetMethodID(env, plugin_main->callbackClass, "on${dto_name}", "(Lio/fd/vpp/jvpp/${plugin_name}/dto/${dto_name};)V"); + jmethodID callbackMethod = (*env)->GetMethodID(env, plugin_main->callbackClass, "on${dto_name}", "(Lio/fd/jvpp/${plugin_name}/dto/${dto_name};)V"); exc = (*env)->ExceptionOccurred(env); if (exc) { clib_warning("Unable to extract on${dto_name} method reference from ${plugin_name} plugin's callbackClass. Ignoring message.\\n"); 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; * <p>Callback Java API representation of $plugin_package plugin. * <br>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<Integer, io.fd.vpp.jvpp.callback.JVppCallback> callbacks; + private final java.util.Map<Integer, io.fd.jvpp.callback.JVppCallback> callbacks; private final $plugin_package.notification.${plugin_name}EventRegistryImpl eventRegistry = new $plugin_package.notification.${plugin_name}EventRegistryImpl(); /** * <p>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<Integer, io.fd.vpp.jvpp.callback.JVppCallback> requests; + private final java.util.Map<Integer, io.fd.jvpp.callback.JVppCallback> 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<Integer, io.fd.vpp.jvpp.callback.JVppCallback> requestMap, + public CallbackJVpp${plugin_name}FacadeCallback(final java.util.Map<Integer, io.fd.jvpp.callback.JVppCallback> 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) { diff --git a/java/jvpp/gen/jvppgen/jvpp_common_gen.py b/java/jvpp/gen/jvppgen/jvpp_common_gen.py index 499adbc..430c927 100755 --- a/java/jvpp/gen/jvppgen/jvpp_common_gen.py +++ b/java/jvpp/gen/jvppgen/jvpp_common_gen.py @@ -32,14 +32,14 @@ def generate_hash_code(fields): _HASH_CODE_TEMPLATE = Template(""" @Override - @io.fd.vpp.jvpp.coverity.SuppressFBWarnings("UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD") + @io.fd.jvpp.coverity.SuppressFBWarnings("UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD") public int hashCode() { return java.util.Objects.hash($fields); }""") _HASH_CODE_SINGLE_ARRAY_TEMPLATE = Template(""" @Override - @io.fd.vpp.jvpp.coverity.SuppressFBWarnings("UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD") + @io.fd.jvpp.coverity.SuppressFBWarnings("UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD") public int hashCode() { return java.util.Arrays.hashCode($array_field); }""") diff --git a/java/jvpp/gen/jvppgen/jvpp_future_facade_gen.py b/java/jvpp/gen/jvppgen/jvpp_future_facade_gen.py index 3da367a..7585906 100644 --- a/java/jvpp/gen/jvppgen/jvpp_future_facade_gen.py +++ b/java/jvpp/gen/jvppgen/jvpp_future_facade_gen.py @@ -40,7 +40,7 @@ package $plugin_package.future; * <p>Async facade extension adding specific methods for each request invocation * <br>It was generated by jvpp_future_facade_gen.py based on $json_filename. */ -public interface FutureJVpp${plugin_name} extends io.fd.vpp.jvpp.future.FutureJVppInvoker { +public interface FutureJVpp${plugin_name} extends io.fd.jvpp.future.FutureJVppInvoker { $methods @Override @@ -94,7 +94,7 @@ package $plugin_package.future; * <p>Implementation of FutureJVpp based on AbstractFutureJVppInvoker * <br>It was generated by jvpp_future_facade_gen.py based on $json_filename. */ -public class FutureJVpp${plugin_name}Facade extends io.fd.vpp.jvpp.future.AbstractFutureJVppInvoker implements FutureJVpp${plugin_name} { +public class FutureJVpp${plugin_name}Facade extends io.fd.jvpp.future.AbstractFutureJVppInvoker implements FutureJVpp${plugin_name} { private final $plugin_package.notification.${plugin_name}EventRegistryImpl eventRegistry = new $plugin_package.notification.${plugin_name}EventRegistryImpl(); @@ -103,11 +103,11 @@ public class FutureJVpp${plugin_name}Facade extends io.fd.vpp.jvpp.future.Abstra * Constructor internally creates FutureJVppFacadeCallback 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 FutureJVpp${plugin_name}Facade(final io.fd.vpp.jvpp.JVppRegistry registry, final io.fd.vpp.jvpp.JVpp jvpp) throws java.io.IOException { + public FutureJVpp${plugin_name}Facade(final io.fd.jvpp.JVppRegistry registry, final io.fd.jvpp.JVpp jvpp) throws java.io.IOException { super(jvpp, registry, new java.util.HashMap<>()); java.util.Objects.requireNonNull(registry, "JVppRegistry should not be null"); registry.register(jvpp, new FutureJVpp${plugin_name}FacadeCallback(getRequests(), eventRegistry)); @@ -178,12 +178,12 @@ package $plugin_package.future; */ public final class FutureJVpp${plugin_name}FacadeCallback implements $plugin_package.callback.JVpp${plugin_name}GlobalCallback { - private final java.util.Map<java.lang.Integer, java.util.concurrent.CompletableFuture<? extends io.fd.vpp.jvpp.dto.JVppReply<?>>> requests; + private final java.util.Map<java.lang.Integer, java.util.concurrent.CompletableFuture<? extends io.fd.jvpp.dto.JVppReply<?>>> requests; private final $plugin_package.notification.Global${plugin_name}EventCallback notificationCallback; private static final java.util.logging.Logger LOG = java.util.logging.Logger.getLogger(FutureJVpp${plugin_name}FacadeCallback.class.getName()); public FutureJVpp${plugin_name}FacadeCallback( - final java.util.Map<java.lang.Integer, java.util.concurrent.CompletableFuture<? extends io.fd.vpp.jvpp.dto.JVppReply<?>>> requestMap, + final java.util.Map<java.lang.Integer, java.util.concurrent.CompletableFuture<? extends io.fd.jvpp.dto.JVppReply<?>>> requestMap, final $plugin_package.notification.Global${plugin_name}EventCallback notificationCallback) { this.requests = requestMap; this.notificationCallback = notificationCallback; @@ -191,11 +191,11 @@ public final class FutureJVpp${plugin_name}FacadeCallback implements $plugin_pac @Override @SuppressWarnings("unchecked") - public void onError(io.fd.vpp.jvpp.VppCallbackException reply) { - final java.util.concurrent.CompletableFuture<io.fd.vpp.jvpp.dto.JVppReply<?>> completableFuture; + public void onError(io.fd.jvpp.VppCallbackException reply) { + final java.util.concurrent.CompletableFuture<io.fd.jvpp.dto.JVppReply<?>> completableFuture; synchronized(requests) { - completableFuture = (java.util.concurrent.CompletableFuture<io.fd.vpp.jvpp.dto.JVppReply<?>>) requests.get(reply.getCtxId()); + completableFuture = (java.util.concurrent.CompletableFuture<io.fd.jvpp.dto.JVppReply<?>>) requests.get(reply.getCtxId()); } if(completableFuture != null) { @@ -209,19 +209,19 @@ public final class FutureJVpp${plugin_name}FacadeCallback implements $plugin_pac @Override @SuppressWarnings("unchecked") - public void onControlPingReply(final io.fd.vpp.jvpp.dto.ControlPingReply reply) { - java.util.concurrent.CompletableFuture<io.fd.vpp.jvpp.dto.JVppReply<?>> completableFuture; + public void onControlPingReply(final io.fd.jvpp.dto.ControlPingReply reply) { + java.util.concurrent.CompletableFuture<io.fd.jvpp.dto.JVppReply<?>> completableFuture; final int replyId = reply.context; synchronized(requests) { - completableFuture = (java.util.concurrent.CompletableFuture<io.fd.vpp.jvpp.dto.JVppReply<?>>) requests.get(replyId); + completableFuture = (java.util.concurrent.CompletableFuture<io.fd.jvpp.dto.JVppReply<?>>) requests.get(replyId); if(completableFuture != null) { // Finish dump call - if (completableFuture instanceof io.fd.vpp.jvpp.future.AbstractFutureJVppInvoker.CompletableDumpFuture) { - completableFuture.complete(((io.fd.vpp.jvpp.future.AbstractFutureJVppInvoker.CompletableDumpFuture) completableFuture).getReplyDump()); + if (completableFuture instanceof io.fd.jvpp.future.AbstractFutureJVppInvoker.CompletableDumpFuture) { + completableFuture.complete(((io.fd.jvpp.future.AbstractFutureJVppInvoker.CompletableDumpFuture) completableFuture).getReplyDump()); // Remove future mapped to dump call context id - requests.remove(((io.fd.vpp.jvpp.future.AbstractFutureJVppInvoker.CompletableDumpFuture) completableFuture).getContextId()); + requests.remove(((io.fd.jvpp.future.AbstractFutureJVppInvoker.CompletableDumpFuture) completableFuture).getContextId()); } else { // reply to regular control ping, complete the future completableFuture.complete(reply); @@ -277,19 +277,19 @@ _FUTURE_JVPP_FACADE_DETAILS_CALLBACK_TEMPLATE = Template(""" @Override @SuppressWarnings("unchecked") public void on$callback_dto(final $plugin_package.dto.$callback_dto reply) { - io.fd.vpp.jvpp.future.AbstractFutureJVppInvoker.CompletableDumpFuture<$plugin_package.dto.${callback_dto}ReplyDump> completableFuture; + io.fd.jvpp.future.AbstractFutureJVppInvoker.CompletableDumpFuture<$plugin_package.dto.${callback_dto}ReplyDump> completableFuture; final int replyId = reply.context; if (LOG.isLoggable(java.util.logging.Level.FINE)) { LOG.fine(java.lang.String.format("Received $callback_dto event message: %s", reply)); } synchronized(requests) { - completableFuture = (io.fd.vpp.jvpp.future.AbstractFutureJVppInvoker.CompletableDumpFuture<$plugin_package.dto.${callback_dto}ReplyDump>) requests.get(replyId); + completableFuture = (io.fd.jvpp.future.AbstractFutureJVppInvoker.CompletableDumpFuture<$plugin_package.dto.${callback_dto}ReplyDump>) requests.get(replyId); if(completableFuture == null) { // reply received before writer created future, // create new future, and put into map to notify sender that reply is already received, // following details replies will add information to this future - completableFuture = new io.fd.vpp.jvpp.future.AbstractFutureJVppInvoker.CompletableDumpFuture<>(replyId, + completableFuture = new io.fd.jvpp.future.AbstractFutureJVppInvoker.CompletableDumpFuture<>(replyId, new $plugin_package.dto.${callback_dto}ReplyDump()); requests.put(replyId, completableFuture); } @@ -302,14 +302,14 @@ _FUTURE_JVPP_FACADE_REPLY_CALLBACK_TEMPLATE = Template(""" @Override @SuppressWarnings("unchecked") public void on$callback_dto(final $plugin_package.dto.$callback_dto reply) { - java.util.concurrent.CompletableFuture<io.fd.vpp.jvpp.dto.JVppReply<$plugin_package.dto.$request_dto>> completableFuture; + java.util.concurrent.CompletableFuture<io.fd.jvpp.dto.JVppReply<$plugin_package.dto.$request_dto>> completableFuture; final int replyId = reply.context; if (LOG.isLoggable(java.util.logging.Level.FINE)) { LOG.fine(java.lang.String.format("Received $callback_dto event message: %s", reply)); } synchronized(requests) { completableFuture = - (java.util.concurrent.CompletableFuture<io.fd.vpp.jvpp.dto.JVppReply<$plugin_package.dto.$request_dto>>) requests.get(replyId); + (java.util.concurrent.CompletableFuture<io.fd.jvpp.dto.JVppReply<$plugin_package.dto.$request_dto>>) requests.get(replyId); if(completableFuture != null) { // received reply on request, complete future created by sender and remove it from map diff --git a/java/jvpp/gen/jvppgen/jvpp_ifc_gen.py b/java/jvpp/gen/jvppgen/jvpp_ifc_gen.py index e2b2922..8350bbe 100755 --- a/java/jvpp/gen/jvppgen/jvpp_ifc_gen.py +++ b/java/jvpp/gen/jvppgen/jvpp_ifc_gen.py @@ -48,9 +48,9 @@ def _jvpp_ifc_filter(msg): _JVPP_IFC_METHOD_TEMPLATE = Template( - """ int $name($plugin_package.dto.$type request) throws io.fd.vpp.jvpp.VppInvocationException;""") + """ int $name($plugin_package.dto.$type request) throws io.fd.jvpp.VppInvocationException;""") -_JVPP_IFC_NO_ARG_METHOD_TEMPLATE = Template(""" int $name() throws io.fd.vpp.jvpp.VppInvocationException;""") +_JVPP_IFC_NO_ARG_METHOD_TEMPLATE = Template(""" int $name() throws io.fd.jvpp.VppInvocationException;""") _JVPP_IFC_TEMPLATE = Template("""package $plugin_package; @@ -59,13 +59,13 @@ _JVPP_IFC_TEMPLATE = Template("""package $plugin_package; * <br>It was generated by jvpp_impl_gen.py based on $json_filename. * <br>(python representation of api file generated by vppapigen) */ -public interface JVpp${plugin_name} extends io.fd.vpp.jvpp.JVpp { +public interface JVpp${plugin_name} extends io.fd.jvpp.JVpp { /** * Generic dispatch method for sending requests to VPP * - * @throws io.fd.vpp.jvpp.VppInvocationException if send request had failed + * @throws io.fd.jvpp.VppInvocationException if send request had failed */ - int send(io.fd.vpp.jvpp.dto.JVppRequest request) throws io.fd.vpp.jvpp.VppInvocationException; + int send(io.fd.jvpp.dto.JVppRequest request) throws io.fd.jvpp.VppInvocationException; $methods } """) diff --git a/java/jvpp/gen/jvppgen/jvpp_impl_gen.py b/java/jvpp/gen/jvppgen/jvpp_impl_gen.py index 376952b..f646efa 100755 --- a/java/jvpp/gen/jvppgen/jvpp_impl_gen.py +++ b/java/jvpp/gen/jvppgen/jvpp_impl_gen.py @@ -62,9 +62,9 @@ import java.nio.file.attribute.PosixFilePermissions; import java.util.Set; import java.util.logging.Logger; import java.util.logging.Level; -import io.fd.vpp.jvpp.callback.JVppCallback; -import io.fd.vpp.jvpp.VppConnection; -import io.fd.vpp.jvpp.JVppRegistry; +import io.fd.jvpp.callback.JVppCallback; +import io.fd.jvpp.VppConnection; +import io.fd.jvpp.JVppRegistry; /** * <p>Default implementation of JVpp interface. @@ -133,12 +133,12 @@ public final class JVpp${plugin_name}Impl implements $plugin_package.JVpp${plugi } @Override - public int send(io.fd.vpp.jvpp.dto.JVppRequest request) throws io.fd.vpp.jvpp.VppInvocationException { + public int send(io.fd.jvpp.dto.JVppRequest request) throws io.fd.jvpp.VppInvocationException { return request.send(this); } @Override - public final int controlPing(final io.fd.vpp.jvpp.dto.ControlPing controlPing) throws io.fd.vpp.jvpp.VppInvocationException { + public final int controlPing(final io.fd.jvpp.dto.ControlPing controlPing) throws io.fd.jvpp.VppInvocationException { return registry.controlPing(JVpp${plugin_name}Impl.class); } $methods @@ -147,7 +147,7 @@ $methods _JVPP_IMPL_METHOD_TEMPLATE = Template(""" private static native int ${name}0($plugin_package.dto.$type request); - public final int $name($plugin_package.dto.$type request) throws io.fd.vpp.jvpp.VppInvocationException { + public final int $name($plugin_package.dto.$type request) throws io.fd.jvpp.VppInvocationException { java.util.Objects.requireNonNull(request, "Null request object"); connection.checkActive(); if (LOG.isLoggable(Level.FINE)) { @@ -155,19 +155,19 @@ _JVPP_IMPL_METHOD_TEMPLATE = Template(""" } int result=${name}0(request); if (result<0){ - throw new io.fd.vpp.jvpp.VppInvocationException("${name}", result); + throw new io.fd.jvpp.VppInvocationException("${name}", result); } return result; }""") _JVPP_IMPL_NO_ARG_METHOD_TEMPLATE = Template(""" - private static native int ${name}0() throws io.fd.vpp.jvpp.VppInvocationException; - public final int $name() throws io.fd.vpp.jvpp.VppInvocationException { + private static native int ${name}0() throws io.fd.jvpp.VppInvocationException; + public final int $name() throws io.fd.jvpp.VppInvocationException { connection.checkActive(); LOG.fine("Sending $type event message"); int result=${name}0(); if(result<0){ - throw new io.fd.vpp.jvpp.VppInvocationException("${name}", result); + throw new io.fd.jvpp.VppInvocationException("${name}", result); } return result; }""") diff --git a/java/jvpp/gen/jvppgen/jvpp_model.py b/java/jvpp/gen/jvppgen/jvpp_model.py index c5a7e74..6c599c0 100755 --- a/java/jvpp/gen/jvppgen/jvpp_model.py +++ b/java/jvpp/gen/jvppgen/jvpp_model.py @@ -19,7 +19,7 @@ from collections import OrderedDict import binascii -BASE_PACKAGE = "io.fd.vpp.jvpp" +BASE_PACKAGE = "io.fd.jvpp" class ParseException(Exception): @@ -34,8 +34,8 @@ class Type(object): :param name: name of type as defined in .api file, e.g. u8, u32[] or mac_entry :param java_name: corresponding java name, e.g. byte, int[] or MacEntry - :param java_name_fqn: fully qualified java name, e.g. io.fd.vpp.jvpp.core.types.MacEntry - :param jni_signature: JNI Type signature, e.g. B, [I or Lio.fd.vpp.jvpp.core.types.MacEntry; + :param java_name_fqn: fully qualified java name, e.g. io.fd.jvpp.core.types.MacEntry + :param jni_signature: JNI Type signature, e.g. B, [I or Lio.fd.jvpp.core.types.MacEntry; See https://docs.oracle.com/javase/8/docs/technotes/guides/jni/spec/types.html#type_signatures :param jni_type: JNI reference type, e.g. jbyte jintArray, jobject See https://docs.oracle.com/javase/8/docs/technotes/guides/jni/spec/types.html#reference_types @@ -121,8 +121,8 @@ class Enum(Type): super(Enum, self).__init__( name=name, java_name=_java_name, - java_name_fqn="io.fd.vpp.jvpp.%s.types.%s" % (plugin_name, _java_name), - jni_signature="Lio/fd/vpp/jvpp/%s/types/%s;" % (plugin_name, _java_name), + java_name_fqn="io.fd.jvpp.%s.types.%s" % (plugin_name, _java_name), + jni_signature="Lio/fd/jvpp/%s/types/%s;" % (plugin_name, _java_name), jni_type="jobject", jni_accessor="Object", host_to_net_function="_host_to_net_%s" % name, @@ -136,7 +136,7 @@ class Enum(Type): self.vpp_name = "%s%s%s" % (_VPP_TYPE_PREFIX, name, _VPP_TYPE_SUFFIX) # Fully qualified class name used by FindClass function, see: # https://docs.oracle.com/javase/8/docs/technotes/guides/jni/spec/functions.html#FindClass - self.jni_name = "io/fd/vpp/jvpp/%s/types/%s" % (plugin_name, _java_name) + self.jni_name = "io/fd/jvpp/%s/types/%s" % (plugin_name, _java_name) def get_host_to_net_function(self, host_ref_name, net_ref_name): return "_host_to_net_%s(env, %s, &(%s))" % (self.name, host_ref_name, net_ref_name) @@ -149,8 +149,8 @@ class EnumSet(Type): super(EnumSet, self).__init__( name=name, java_name=_java_name, - java_name_fqn="io.fd.vpp.jvpp.%s.types.%s" % (plugin_name, _java_name), - jni_signature="Lio/fd/vpp/jvpp/%s/types/%s;" % (plugin_name, _java_name), + java_name_fqn="io.fd.jvpp.%s.types.%s" % (plugin_name, _java_name), + jni_signature="Lio/fd/jvpp/%s/types/%s;" % (plugin_name, _java_name), jni_type="jobject", jni_accessor="Object", host_to_net_function="_host_to_net_%s" % name, @@ -164,7 +164,7 @@ class EnumSet(Type): self.vpp_name = "%s%s%s" % (_VPP_TYPE_PREFIX, name, _VPP_TYPE_SUFFIX) # Fully qualified class name used by FindClass function, see: # https://docs.oracle.com/javase/8/docs/technotes/guides/jni/spec/functions.html#FindClass - self.jni_name = "io/fd/vpp/jvpp/%s/types/%s" % (plugin_name, _java_name) + self.jni_name = "io/fd/jvpp/%s/types/%s" % (plugin_name, _java_name) def get_host_to_net_function(self, host_ref_name, net_ref_name): return "_host_to_net_%s(env, %s, &(%s))" % (self.name, host_ref_name, net_ref_name) @@ -177,8 +177,8 @@ class Class(Type): super(Class, self).__init__( name=name, java_name=_java_name, - java_name_fqn="io.fd.vpp.jvpp.%s.types.%s" % (plugin_name, _java_name), - jni_signature="Lio/fd/vpp/jvpp/%s/types/%s;" % (plugin_name, _java_name), + java_name_fqn="io.fd.jvpp.%s.types.%s" % (plugin_name, _java_name), + jni_signature="Lio/fd/jvpp/%s/types/%s;" % (plugin_name, _java_name), jni_type="jobject", jni_accessor="Object", host_to_net_function="_host_to_net_%s" % name, @@ -192,7 +192,7 @@ class Class(Type): self.vpp_name = "%s%s%s" % (_VPP_TYPE_PREFIX, name, _VPP_TYPE_SUFFIX) # Fully qualified class name used by FindClass function, see: # https://docs.oracle.com/javase/8/docs/technotes/guides/jni/spec/functions.html#FindClass - self.jni_name = "io/fd/vpp/jvpp/%s/types/%s" % (plugin_name, _java_name) + self.jni_name = "io/fd/jvpp/%s/types/%s" % (plugin_name, _java_name) def get_host_to_net_function(self, host_ref_name, net_ref_name): return "_host_to_net_%s(env, %s, &(%s))" % (self.name, host_ref_name, net_ref_name) @@ -205,8 +205,8 @@ class Union(Type): super(Union, self).__init__( name=name, java_name=_java_name, - java_name_fqn="io.fd.vpp.jvpp.%s.types.%s" % (plugin_name, _java_name), - jni_signature="Lio/fd/vpp/jvpp/%s/types/%s;" % (plugin_name, _java_name), + java_name_fqn="io.fd.jvpp.%s.types.%s" % (plugin_name, _java_name), + jni_signature="Lio/fd/jvpp/%s/types/%s;" % (plugin_name, _java_name), jni_type="jobject", jni_accessor="Object", host_to_net_function="_host_to_net_%s" % name, @@ -220,7 +220,7 @@ class Union(Type): self.vpp_name = "%s%s%s" % (_VPP_TYPE_PREFIX, name, _VPP_TYPE_SUFFIX) # Fully qualified class name used by FindClass function, see: # https://docs.oracle.com/javase/8/docs/technotes/guides/jni/spec/functions.html#FindClass - self.jni_name = "io/fd/vpp/jvpp/%s/types/%s" % (plugin_name, _java_name) + self.jni_name = "io/fd/jvpp/%s/types/%s" % (plugin_name, _java_name) def get_host_to_net_function(self, host_ref_name, net_ref_name): return "_host_to_net_%s(env, %s, &(%s))" % (self.name, host_ref_name, net_ref_name) diff --git a/java/jvpp/gen/jvppgen/notification_gen.py b/java/jvpp/gen/jvppgen/notification_gen.py index fa86fe4..d2bb729 100644 --- a/java/jvpp/gen/jvppgen/notification_gen.py +++ b/java/jvpp/gen/jvppgen/notification_gen.py @@ -63,7 +63,7 @@ package $plugin_package.notification; * <p>Registry for notification callbacks defined in ${plugin_name}. * <br>It was generated by notification_gen.py based on $json_filename. */ -public interface ${plugin_name}EventRegistry extends io.fd.vpp.jvpp.notification.EventRegistry { +public interface ${plugin_name}EventRegistry extends io.fd.jvpp.notification.EventRegistry { $register_callback_methods @@ -119,7 +119,7 @@ _HANDLER_IMPL_TEMPLATE = Template(""" if (LOG.isLoggable(java.util.logging.Level.FINE)) { LOG.fine(java.lang.String.format("Received $notification event message: %s", notification)); } - final io.fd.vpp.jvpp.callback.JVppCallback jVppCallback = registeredCallbacks.get($plugin_package.dto.$notification.class); + final io.fd.jvpp.callback.JVppCallback jVppCallback = registeredCallbacks.get($plugin_package.dto.$notification.class); if (null != jVppCallback) { (($plugin_package.callback.$callback) registeredCallbacks .get($plugin_package.dto.$notification.class)) @@ -138,7 +138,7 @@ package $plugin_package.notification; public final class ${plugin_name}EventRegistryImpl implements ${plugin_name}EventRegistry, Global${plugin_name}EventCallback { // TODO add a special NotificationCallback interface and only allow those to be registered - private final java.util.concurrent.ConcurrentMap<Class<?>, io.fd.vpp.jvpp.callback.JVppCallback> registeredCallbacks = + private final java.util.concurrent.ConcurrentMap<Class<?>, io.fd.jvpp.callback.JVppCallback> registeredCallbacks = new java.util.concurrent.ConcurrentHashMap<>(); private static java.util.logging.Logger LOG = java.util.logging.Logger.getLogger(${plugin_name}EventRegistryImpl.class.getName()); @@ -151,7 +151,7 @@ public final class ${plugin_name}EventRegistryImpl implements ${plugin_name}Even } @Override - public void onError(io.fd.vpp.jvpp.VppCallbackException ex) { + public void onError(io.fd.jvpp.VppCallbackException ex) { java.util.logging.Logger LOG = java.util.logging.Logger.getLogger(${plugin_name}EventRegistryImpl.class.getName()); LOG.log(java.util.logging.Level.WARNING, java.lang.String.format("Received onError exception: call=%s, context=%d, retval=%d%n", ex.getMethodName(), ex.getCtxId(), ex.getErrorCode()), ex); @@ -210,7 +210,7 @@ package $plugin_package.notification; * Provides ${plugin_name}EventRegistry. * <br>The file was generated by notification_gen.py based on $json_filename. */ -public interface ${plugin_name}EventRegistryProvider extends io.fd.vpp.jvpp.notification.EventRegistryProvider { +public interface ${plugin_name}EventRegistryProvider extends io.fd.jvpp.notification.EventRegistryProvider { @Override public ${plugin_name}EventRegistry getEventRegistry(); |