diff options
Diffstat (limited to 'java/jvpp-registry')
-rw-r--r-- | java/jvpp-registry/io/fd/jvpp/AbstractCallbackApiTest.java (renamed from java/jvpp-registry/io/fd/vpp/jvpp/AbstractCallbackApiTest.java) | 8 | ||||
-rw-r--r-- | java/jvpp-registry/io/fd/jvpp/Assertions.java (renamed from java/jvpp-registry/io/fd/vpp/jvpp/Assertions.java) | 2 | ||||
-rw-r--r-- | java/jvpp-registry/io/fd/jvpp/JVpp.java (renamed from java/jvpp-registry/io/fd/vpp/jvpp/JVpp.java) | 8 | ||||
-rw-r--r-- | java/jvpp-registry/io/fd/jvpp/JVppRegistry.java (renamed from java/jvpp-registry/io/fd/vpp/jvpp/JVppRegistry.java) | 4 | ||||
-rw-r--r-- | java/jvpp-registry/io/fd/jvpp/JVppRegistryImpl.java (renamed from java/jvpp-registry/io/fd/vpp/jvpp/JVppRegistryImpl.java) | 8 | ||||
-rw-r--r-- | java/jvpp-registry/io/fd/jvpp/NativeLibraryLoader.java (renamed from java/jvpp-registry/io/fd/vpp/jvpp/NativeLibraryLoader.java) | 2 | ||||
-rw-r--r-- | java/jvpp-registry/io/fd/jvpp/VppBaseCallException.java (renamed from java/jvpp-registry/io/fd/vpp/jvpp/VppBaseCallException.java) | 2 | ||||
-rw-r--r-- | java/jvpp-registry/io/fd/jvpp/VppCallbackException.java (renamed from java/jvpp-registry/io/fd/vpp/jvpp/VppCallbackException.java) | 2 | ||||
-rw-r--r-- | java/jvpp-registry/io/fd/jvpp/VppConnection.java (renamed from java/jvpp-registry/io/fd/vpp/jvpp/VppConnection.java) | 2 | ||||
-rw-r--r-- | java/jvpp-registry/io/fd/jvpp/VppInvocationException.java (renamed from java/jvpp-registry/io/fd/vpp/jvpp/VppInvocationException.java) | 2 | ||||
-rw-r--r-- | java/jvpp-registry/io/fd/jvpp/VppJNIConnection.java (renamed from java/jvpp-registry/io/fd/vpp/jvpp/VppJNIConnection.java) | 4 | ||||
-rw-r--r-- | java/jvpp-registry/io/fd/jvpp/callback/ControlPingCallback.java (renamed from java/jvpp-registry/io/fd/vpp/jvpp/callback/ControlPingCallback.java) | 4 | ||||
-rw-r--r-- | java/jvpp-registry/io/fd/jvpp/callback/JVppCallback.java (renamed from java/jvpp-registry/io/fd/vpp/jvpp/callback/JVppCallback.java) | 4 | ||||
-rw-r--r-- | java/jvpp-registry/io/fd/jvpp/callback/JVppNotificationCallback.java (renamed from java/jvpp-registry/io/fd/vpp/jvpp/callback/JVppNotificationCallback.java) | 2 | ||||
-rw-r--r-- | java/jvpp-registry/io/fd/jvpp/coverity/SuppressFBWarnings.java (renamed from java/jvpp-registry/io/fd/vpp/jvpp/coverity/SuppressFBWarnings.java) | 2 | ||||
-rw-r--r-- | java/jvpp-registry/io/fd/jvpp/dto/ControlPing.java (renamed from java/jvpp-registry/io/fd/vpp/jvpp/dto/ControlPing.java) | 6 | ||||
-rw-r--r-- | java/jvpp-registry/io/fd/jvpp/dto/ControlPingReply.java (renamed from java/jvpp-registry/io/fd/vpp/jvpp/dto/ControlPingReply.java) | 2 | ||||
-rw-r--r-- | java/jvpp-registry/io/fd/jvpp/dto/JVppDump.java (renamed from java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppDump.java) | 2 | ||||
-rw-r--r-- | java/jvpp-registry/io/fd/jvpp/dto/JVppReply.java (renamed from java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppReply.java) | 2 | ||||
-rw-r--r-- | java/jvpp-registry/io/fd/jvpp/dto/JVppReplyDump.java (renamed from java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppReplyDump.java) | 2 | ||||
-rw-r--r-- | java/jvpp-registry/io/fd/jvpp/dto/JVppRequest.java (renamed from java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppRequest.java) | 6 | ||||
-rw-r--r-- | java/jvpp-registry/io/fd/jvpp/future/AbstractFutureJVppInvoker.java (renamed from java/jvpp-registry/io/fd/vpp/jvpp/future/AbstractFutureJVppInvoker.java) | 16 | ||||
-rw-r--r-- | java/jvpp-registry/io/fd/jvpp/future/FutureJVppInvoker.java (renamed from java/jvpp-registry/io/fd/vpp/jvpp/future/FutureJVppInvoker.java) | 14 | ||||
-rw-r--r-- | java/jvpp-registry/io/fd/jvpp/notification/EventRegistry.java (renamed from java/jvpp-registry/io/fd/vpp/jvpp/notification/EventRegistry.java) | 2 | ||||
-rw-r--r-- | java/jvpp-registry/io/fd/jvpp/notification/EventRegistryProvider.java (renamed from java/jvpp-registry/io/fd/vpp/jvpp/notification/EventRegistryProvider.java) | 2 | ||||
-rw-r--r-- | java/jvpp-registry/io/fd/jvpp/test/ConnectionTest.java (renamed from java/jvpp-registry/io/fd/vpp/jvpp/test/ConnectionTest.java) | 8 | ||||
-rw-r--r-- | java/jvpp-registry/jvpp_registry.c | 18 |
27 files changed, 68 insertions, 68 deletions
diff --git a/java/jvpp-registry/io/fd/vpp/jvpp/AbstractCallbackApiTest.java b/java/jvpp-registry/io/fd/jvpp/AbstractCallbackApiTest.java index d221d1e..a2e38e1 100644 --- a/java/jvpp-registry/io/fd/vpp/jvpp/AbstractCallbackApiTest.java +++ b/java/jvpp-registry/io/fd/jvpp/AbstractCallbackApiTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package io.fd.vpp.jvpp; +package io.fd.jvpp; -import io.fd.vpp.jvpp.callback.ControlPingCallback; -import io.fd.vpp.jvpp.dto.ControlPing; -import io.fd.vpp.jvpp.dto.ControlPingReply; +import io.fd.jvpp.callback.ControlPingCallback; +import io.fd.jvpp.dto.ControlPing; +import io.fd.jvpp.dto.ControlPingReply; public abstract class AbstractCallbackApiTest { diff --git a/java/jvpp-registry/io/fd/vpp/jvpp/Assertions.java b/java/jvpp-registry/io/fd/jvpp/Assertions.java index f8b591f..2a403ad 100644 --- a/java/jvpp-registry/io/fd/vpp/jvpp/Assertions.java +++ b/java/jvpp-registry/io/fd/jvpp/Assertions.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.fd.vpp.jvpp; +package io.fd.jvpp; public class Assertions { diff --git a/java/jvpp-registry/io/fd/vpp/jvpp/JVpp.java b/java/jvpp-registry/io/fd/jvpp/JVpp.java index 55f25a7..251b0a7 100644 --- a/java/jvpp-registry/io/fd/vpp/jvpp/JVpp.java +++ b/java/jvpp-registry/io/fd/jvpp/JVpp.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package io.fd.vpp.jvpp; +package io.fd.jvpp; -import io.fd.vpp.jvpp.callback.JVppCallback; -import io.fd.vpp.jvpp.dto.ControlPing; -import io.fd.vpp.jvpp.dto.JVppRequest; +import io.fd.jvpp.callback.JVppCallback; +import io.fd.jvpp.dto.ControlPing; +import io.fd.jvpp.dto.JVppRequest; /** * Base interface for plugin's Java API. diff --git a/java/jvpp-registry/io/fd/vpp/jvpp/JVppRegistry.java b/java/jvpp-registry/io/fd/jvpp/JVppRegistry.java index 6535db0..f182a0a 100644 --- a/java/jvpp-registry/io/fd/vpp/jvpp/JVppRegistry.java +++ b/java/jvpp-registry/io/fd/jvpp/JVppRegistry.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.fd.vpp.jvpp; +package io.fd.jvpp; -import io.fd.vpp.jvpp.callback.JVppCallback; +import io.fd.jvpp.callback.JVppCallback; /** * Manages VPP connection and stores plugin callbacks. diff --git a/java/jvpp-registry/io/fd/vpp/jvpp/JVppRegistryImpl.java b/java/jvpp-registry/io/fd/jvpp/JVppRegistryImpl.java index baef14c..7caa64c 100644 --- a/java/jvpp-registry/io/fd/vpp/jvpp/JVppRegistryImpl.java +++ b/java/jvpp-registry/io/fd/jvpp/JVppRegistryImpl.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package io.fd.vpp.jvpp; +package io.fd.jvpp; import static java.util.Objects.requireNonNull; -import io.fd.vpp.jvpp.callback.ControlPingCallback; -import io.fd.vpp.jvpp.callback.JVppCallback; -import io.fd.vpp.jvpp.dto.ControlPingReply; +import io.fd.jvpp.callback.ControlPingCallback; +import io.fd.jvpp.callback.JVppCallback; +import io.fd.jvpp.dto.ControlPingReply; import java.io.IOException; import java.util.HashMap; import java.util.Map; diff --git a/java/jvpp-registry/io/fd/vpp/jvpp/NativeLibraryLoader.java b/java/jvpp-registry/io/fd/jvpp/NativeLibraryLoader.java index ce6d1bf..54097f1 100644 --- a/java/jvpp-registry/io/fd/vpp/jvpp/NativeLibraryLoader.java +++ b/java/jvpp-registry/io/fd/jvpp/NativeLibraryLoader.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.fd.vpp.jvpp; +package io.fd.jvpp; import java.io.IOException; import java.io.InputStream; diff --git a/java/jvpp-registry/io/fd/vpp/jvpp/VppBaseCallException.java b/java/jvpp-registry/io/fd/jvpp/VppBaseCallException.java index 7fc1682..1fbe579 100644 --- a/java/jvpp-registry/io/fd/vpp/jvpp/VppBaseCallException.java +++ b/java/jvpp-registry/io/fd/jvpp/VppBaseCallException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.fd.vpp.jvpp; +package io.fd.jvpp; /** diff --git a/java/jvpp-registry/io/fd/vpp/jvpp/VppCallbackException.java b/java/jvpp-registry/io/fd/jvpp/VppCallbackException.java index adcc5d2..2cd6a45 100644 --- a/java/jvpp-registry/io/fd/vpp/jvpp/VppCallbackException.java +++ b/java/jvpp-registry/io/fd/jvpp/VppCallbackException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.fd.vpp.jvpp; +package io.fd.jvpp; /** * Callback Exception representing failed operation of JVpp request call diff --git a/java/jvpp-registry/io/fd/vpp/jvpp/VppConnection.java b/java/jvpp-registry/io/fd/jvpp/VppConnection.java index e6fd3bd..5d7c03a 100644 --- a/java/jvpp-registry/io/fd/vpp/jvpp/VppConnection.java +++ b/java/jvpp-registry/io/fd/jvpp/VppConnection.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.fd.vpp.jvpp; +package io.fd.jvpp; import java.io.IOException; diff --git a/java/jvpp-registry/io/fd/vpp/jvpp/VppInvocationException.java b/java/jvpp-registry/io/fd/jvpp/VppInvocationException.java index a7ccb19..8125eb6 100644 --- a/java/jvpp-registry/io/fd/vpp/jvpp/VppInvocationException.java +++ b/java/jvpp-registry/io/fd/jvpp/VppInvocationException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.fd.vpp.jvpp; +package io.fd.jvpp; /** * Exception thrown when Vpp jAPI method invocation failed. diff --git a/java/jvpp-registry/io/fd/vpp/jvpp/VppJNIConnection.java b/java/jvpp-registry/io/fd/jvpp/VppJNIConnection.java index 6a414f3..ff0eb1e 100644 --- a/java/jvpp-registry/io/fd/vpp/jvpp/VppJNIConnection.java +++ b/java/jvpp-registry/io/fd/jvpp/VppJNIConnection.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.fd.vpp.jvpp; +package io.fd.jvpp; -import static io.fd.vpp.jvpp.NativeLibraryLoader.loadLibrary; +import static io.fd.jvpp.NativeLibraryLoader.loadLibrary; import static java.lang.String.format; import java.io.IOException; diff --git a/java/jvpp-registry/io/fd/vpp/jvpp/callback/ControlPingCallback.java b/java/jvpp-registry/io/fd/jvpp/callback/ControlPingCallback.java index efddfdb..f2cca3c 100644 --- a/java/jvpp-registry/io/fd/vpp/jvpp/callback/ControlPingCallback.java +++ b/java/jvpp-registry/io/fd/jvpp/callback/ControlPingCallback.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.fd.vpp.jvpp.callback; +package io.fd.jvpp.callback; -import io.fd.vpp.jvpp.dto.ControlPingReply; +import io.fd.jvpp.dto.ControlPingReply; /** * Represents callback for control_ping message. diff --git a/java/jvpp-registry/io/fd/vpp/jvpp/callback/JVppCallback.java b/java/jvpp-registry/io/fd/jvpp/callback/JVppCallback.java index ae02063..00e85c9 100644 --- a/java/jvpp-registry/io/fd/vpp/jvpp/callback/JVppCallback.java +++ b/java/jvpp-registry/io/fd/jvpp/callback/JVppCallback.java @@ -14,8 +14,8 @@ * limitations under the License. */ -package io.fd.vpp.jvpp.callback; -import io.fd.vpp.jvpp.VppCallbackException; +package io.fd.jvpp.callback; +import io.fd.jvpp.VppCallbackException; /** * Base JVppCallback interface diff --git a/java/jvpp-registry/io/fd/vpp/jvpp/callback/JVppNotificationCallback.java b/java/jvpp-registry/io/fd/jvpp/callback/JVppNotificationCallback.java index 8ab0cb2..7193f4d 100644 --- a/java/jvpp-registry/io/fd/vpp/jvpp/callback/JVppNotificationCallback.java +++ b/java/jvpp-registry/io/fd/jvpp/callback/JVppNotificationCallback.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.fd.vpp.jvpp.callback; +package io.fd.jvpp.callback; /** * Notification callback diff --git a/java/jvpp-registry/io/fd/vpp/jvpp/coverity/SuppressFBWarnings.java b/java/jvpp-registry/io/fd/jvpp/coverity/SuppressFBWarnings.java index 1e780bb..7f9724d 100644 --- a/java/jvpp-registry/io/fd/vpp/jvpp/coverity/SuppressFBWarnings.java +++ b/java/jvpp-registry/io/fd/jvpp/coverity/SuppressFBWarnings.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.fd.vpp.jvpp.coverity; +package io.fd.jvpp.coverity; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/java/jvpp-registry/io/fd/vpp/jvpp/dto/ControlPing.java b/java/jvpp-registry/io/fd/jvpp/dto/ControlPing.java index 984e167..e2a7c26 100644 --- a/java/jvpp-registry/io/fd/vpp/jvpp/dto/ControlPing.java +++ b/java/jvpp-registry/io/fd/jvpp/dto/ControlPing.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package io.fd.vpp.jvpp.dto; +package io.fd.jvpp.dto; -import io.fd.vpp.jvpp.JVpp; -import io.fd.vpp.jvpp.VppInvocationException; +import io.fd.jvpp.JVpp; +import io.fd.jvpp.VppInvocationException; /** * Represents request DTO for control_ping message. diff --git a/java/jvpp-registry/io/fd/vpp/jvpp/dto/ControlPingReply.java b/java/jvpp-registry/io/fd/jvpp/dto/ControlPingReply.java index 61e4d0e..68d5a2d 100644 --- a/java/jvpp-registry/io/fd/vpp/jvpp/dto/ControlPingReply.java +++ b/java/jvpp-registry/io/fd/jvpp/dto/ControlPingReply.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.fd.vpp.jvpp.dto; +package io.fd.jvpp.dto; import java.util.Objects; diff --git a/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppDump.java b/java/jvpp-registry/io/fd/jvpp/dto/JVppDump.java index 60b9898..9f8db7f 100644 --- a/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppDump.java +++ b/java/jvpp-registry/io/fd/jvpp/dto/JVppDump.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.fd.vpp.jvpp.dto; +package io.fd.jvpp.dto; /** * Base interface for all dump requests diff --git a/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppReply.java b/java/jvpp-registry/io/fd/jvpp/dto/JVppReply.java index 73f512d..9088ade 100644 --- a/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppReply.java +++ b/java/jvpp-registry/io/fd/jvpp/dto/JVppReply.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.fd.vpp.jvpp.dto; +package io.fd.jvpp.dto; /** * Base interface for all reply DTOs diff --git a/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppReplyDump.java b/java/jvpp-registry/io/fd/jvpp/dto/JVppReplyDump.java index 1511139..a24b120 100644 --- a/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppReplyDump.java +++ b/java/jvpp-registry/io/fd/jvpp/dto/JVppReplyDump.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.fd.vpp.jvpp.dto; +package io.fd.jvpp.dto; /** * Base interface for all dump replies diff --git a/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppRequest.java b/java/jvpp-registry/io/fd/jvpp/dto/JVppRequest.java index 9b301da..f82f5a3 100644 --- a/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppRequest.java +++ b/java/jvpp-registry/io/fd/jvpp/dto/JVppRequest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package io.fd.vpp.jvpp.dto; +package io.fd.jvpp.dto; -import io.fd.vpp.jvpp.JVpp; -import io.fd.vpp.jvpp.VppInvocationException; +import io.fd.jvpp.JVpp; +import io.fd.jvpp.VppInvocationException; /** * Base interface for all request DTOs diff --git a/java/jvpp-registry/io/fd/vpp/jvpp/future/AbstractFutureJVppInvoker.java b/java/jvpp-registry/io/fd/jvpp/future/AbstractFutureJVppInvoker.java index ac85f53..406ccfb 100644 --- a/java/jvpp-registry/io/fd/vpp/jvpp/future/AbstractFutureJVppInvoker.java +++ b/java/jvpp-registry/io/fd/jvpp/future/AbstractFutureJVppInvoker.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.fd.vpp.jvpp.future; +package io.fd.jvpp.future; import java.util.Map; @@ -22,13 +22,13 @@ import java.util.Objects; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; -import io.fd.vpp.jvpp.JVpp; -import io.fd.vpp.jvpp.JVppRegistry; -import io.fd.vpp.jvpp.VppInvocationException; -import io.fd.vpp.jvpp.dto.JVppDump; -import io.fd.vpp.jvpp.dto.JVppReply; -import io.fd.vpp.jvpp.dto.JVppReplyDump; -import io.fd.vpp.jvpp.dto.JVppRequest; +import io.fd.jvpp.JVpp; +import io.fd.jvpp.JVppRegistry; +import io.fd.jvpp.VppInvocationException; +import io.fd.jvpp.dto.JVppDump; +import io.fd.jvpp.dto.JVppReply; +import io.fd.jvpp.dto.JVppReplyDump; +import io.fd.jvpp.dto.JVppRequest; /** * Future facade on top of JVpp diff --git a/java/jvpp-registry/io/fd/vpp/jvpp/future/FutureJVppInvoker.java b/java/jvpp-registry/io/fd/jvpp/future/FutureJVppInvoker.java index 65250ed..f421f5a 100644 --- a/java/jvpp-registry/io/fd/vpp/jvpp/future/FutureJVppInvoker.java +++ b/java/jvpp-registry/io/fd/jvpp/future/FutureJVppInvoker.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package io.fd.vpp.jvpp.future; +package io.fd.jvpp.future; -import io.fd.vpp.jvpp.dto.JVppReply; -import io.fd.vpp.jvpp.dto.JVppReplyDump; -import io.fd.vpp.jvpp.dto.JVppRequest; +import io.fd.jvpp.dto.JVppReply; +import io.fd.jvpp.dto.JVppReplyDump; +import io.fd.jvpp.dto.JVppRequest; import java.util.concurrent.CompletionStage; -import io.fd.vpp.jvpp.notification.EventRegistryProvider; +import io.fd.jvpp.notification.EventRegistryProvider; /** * Future facade on top of JVpp @@ -33,7 +33,7 @@ public interface FutureJVppInvoker extends EventRegistryProvider, AutoCloseable * Invoke asynchronous operation on VPP * * @return CompletionStage with future result of an async VPP call - * @throws io.fd.vpp.jvpp.VppInvocationException when send request failed with details + * @throws io.fd.jvpp.VppInvocationException when send request failed with details */ <REQ extends JVppRequest, REPLY extends JVppReply<REQ>> CompletionStage<REPLY> send(REQ req); @@ -42,7 +42,7 @@ public interface FutureJVppInvoker extends EventRegistryProvider, AutoCloseable * Invoke asynchronous dump operation on VPP * * @return CompletionStage with aggregated future result of an async VPP dump call - * @throws io.fd.vpp.jvpp.VppInvocationException when send request failed with details + * @throws io.fd.jvpp.VppInvocationException when send request failed with details */ <REQ extends JVppRequest, REPLY extends JVppReply<REQ>, DUMP extends JVppReplyDump<REQ, REPLY>> CompletionStage<DUMP> send( REQ req, DUMP emptyReplyDump); diff --git a/java/jvpp-registry/io/fd/vpp/jvpp/notification/EventRegistry.java b/java/jvpp-registry/io/fd/jvpp/notification/EventRegistry.java index 12515a5..f25b038 100644 --- a/java/jvpp-registry/io/fd/vpp/jvpp/notification/EventRegistry.java +++ b/java/jvpp-registry/io/fd/jvpp/notification/EventRegistry.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.fd.vpp.jvpp.notification; +package io.fd.jvpp.notification; /** * Base registry for notification callbacks. diff --git a/java/jvpp-registry/io/fd/vpp/jvpp/notification/EventRegistryProvider.java b/java/jvpp-registry/io/fd/jvpp/notification/EventRegistryProvider.java index 1ac5d55..a1702da 100644 --- a/java/jvpp-registry/io/fd/vpp/jvpp/notification/EventRegistryProvider.java +++ b/java/jvpp-registry/io/fd/jvpp/notification/EventRegistryProvider.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.fd.vpp.jvpp.notification; +package io.fd.jvpp.notification; /** * Provides notification registry diff --git a/java/jvpp-registry/io/fd/vpp/jvpp/test/ConnectionTest.java b/java/jvpp-registry/io/fd/jvpp/test/ConnectionTest.java index 27b4d29..b982d11 100644 --- a/java/jvpp-registry/io/fd/vpp/jvpp/test/ConnectionTest.java +++ b/java/jvpp-registry/io/fd/jvpp/test/ConnectionTest.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package io.fd.vpp.jvpp.test; +package io.fd.jvpp.test; -import io.fd.vpp.jvpp.JVppRegistry; -import io.fd.vpp.jvpp.JVppRegistryImpl; +import io.fd.jvpp.JVppRegistry; +import io.fd.jvpp.JVppRegistryImpl; /** * Run using: - * sudo java -cp build-vpp-native/vpp-api/java/jvpp-registry-16.09.jar io.fd.vpp.jvpp.test.ConnectionTest + * sudo java -cp build-vpp-native/vpp-api/java/jvpp-registry-16.09.jar io.fd.jvpp.test.ConnectionTest */ public class ConnectionTest { diff --git a/java/jvpp-registry/jvpp_registry.c b/java/jvpp-registry/jvpp_registry.c index bbe9719..a8dfa60 100644 --- a/java/jvpp-registry/jvpp_registry.c +++ b/java/jvpp-registry/jvpp_registry.c @@ -22,8 +22,8 @@ #include <jni.h> #include <jvpp-common/jvpp_common.h> -#include "io_fd_vpp_jvpp_VppJNIConnection.h" -#include "io_fd_vpp_jvpp_JVppRegistryImpl.h" +#include "io_fd_jvpp_VppJNIConnection.h" +#include "io_fd_jvpp_JVppRegistryImpl.h" #include <vpp/api/vpe_msg_enum.h> #define vl_typedefs /* define message structures */ @@ -145,7 +145,7 @@ static void vl_api_control_ping_reply_t_handler( rm->controlPingReplyClass, "<init>", "()V"); jmethodID callbackMethod = (*env)->GetMethodID(env, rm->registryClass, "onControlPingReply", - "(Lio/fd/vpp/jvpp/dto/ControlPingReply;)V"); + "(Lio/fd/jvpp/dto/ControlPingReply;)V"); jobject dto = (*env)->NewObject(env, rm->controlPingReplyClass, constructor); @@ -276,7 +276,7 @@ static int connect_to_vpe(char *shm_prefix, char *name) { return send_initial_control_ping(); } -JNIEXPORT jobject JNICALL Java_io_fd_vpp_jvpp_VppJNIConnection_clientConnect( +JNIEXPORT jobject JNICALL Java_io_fd_jvpp_VppJNIConnection_clientConnect( JNIEnv *env, jclass obj, jstring shmPrefix, jstring clientName) { /* * TODO introducing memory prefix as variable can be used in hc2vpp @@ -291,7 +291,7 @@ JNIEXPORT jobject JNICALL Java_io_fd_vpp_jvpp_VppJNIConnection_clientConnect( jvpp_registry_main_t * rm = &jvpp_registry_main; jclass connectionInfoClass = (*env)->FindClass(env, - "io/fd/vpp/jvpp/VppJNIConnection$ConnectionInfo"); + "io/fd/jvpp/VppJNIConnection$ConnectionInfo"); jmethodID connectionInfoConstructor = (*env)->GetMethodID(env, connectionInfoClass, "<init>", "(JIII)V"); @@ -327,7 +327,7 @@ JNIEXPORT jobject JNICALL Java_io_fd_vpp_jvpp_VppJNIConnection_clientConnect( (jint) jm->my_client_index, (jint) rv, (jint) rm->vpe_pid); } -JNIEXPORT jint JNICALL Java_io_fd_vpp_jvpp_JVppRegistryImpl_controlPing0( +JNIEXPORT jint JNICALL Java_io_fd_jvpp_JVppRegistryImpl_controlPing0( JNIEnv *env, jobject regstryObject) { jvpp_main_t * jm = &jvpp_main; vl_api_control_ping_t * mp; @@ -353,7 +353,7 @@ JNIEXPORT jint JNICALL Java_io_fd_vpp_jvpp_JVppRegistryImpl_controlPing0( return my_context_id; } -JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_VppJNIConnection_clientDisconnect( +JNIEXPORT void JNICALL Java_io_fd_jvpp_VppJNIConnection_clientDisconnect( JNIEnv *env, jclass clazz) { jvpp_registry_main_t * rm = &jvpp_registry_main; rm->is_connected = 0; // TODO make thread safe @@ -380,7 +380,7 @@ jint JNI_OnLoad(JavaVM *vm, void *reserved) { } rm->controlPingReplyClass = (jclass) (*env)->NewGlobalRef(env, - (*env)->FindClass(env, "io/fd/vpp/jvpp/dto/ControlPingReply")); + (*env)->FindClass(env, "io/fd/jvpp/dto/ControlPingReply")); if ((*env)->ExceptionCheck(env)) { (*env)->ExceptionDescribe(env); clib_warning("Failed to cache class references\n"); @@ -388,7 +388,7 @@ jint JNI_OnLoad(JavaVM *vm, void *reserved) { } rm->callbackExceptionClass = (jclass) (*env)->NewGlobalRef(env, - (*env)->FindClass(env, "io/fd/vpp/jvpp/VppCallbackException")); + (*env)->FindClass(env, "io/fd/jvpp/VppCallbackException")); if ((*env)->ExceptionCheck(env)) { (*env)->ExceptionDescribe(env); return JNI_ERR; |