Remove dependency on Vespa annotations

5 files changed, 8 insertions, 499 deletions

diff --git a/vespa-http-client/abi-spec.json b/vespa-http-client/abi-spec.json
index 94c373ec5bd..9e26dfeeb6e 100644
--- a/vespa-http-client/abi-spec.json
+++ b/vespa-http-client/abi-spec.json
@@ -1,482 +1 @@
-{
-  "com.yahoo.vespa.http.client.FeedClient$ResultCallback": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "interface",
-      "abstract"
-    ],
-    "methods": [
-      "public abstract void onCompletion(java.lang.String, com.yahoo.vespa.http.client.Result)",
-      "public void onEndpointException(com.yahoo.vespa.http.client.FeedEndpointException)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.vespa.http.client.FeedClient": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
-      "java.lang.AutoCloseable"
-    ],
-    "attributes": [
-      "public",
-      "interface",
-      "abstract"
-    ],
-    "methods": [
-      "public void stream(java.lang.String, java.lang.CharSequence)",
-      "public void stream(java.lang.String, java.lang.CharSequence, java.lang.Object)",
-      "public abstract void stream(java.lang.String, java.lang.String, java.lang.CharSequence, java.lang.Object)",
-      "public abstract void close()",
-      "public abstract java.lang.String getStatsAsJson()",
-      "public static void feedJson(java.io.InputStream, com.yahoo.vespa.http.client.FeedClient, java.util.concurrent.atomic.AtomicInteger)",
-      "public static void feedXml(java.io.InputStream, com.yahoo.vespa.http.client.FeedClient, java.util.concurrent.atomic.AtomicInteger)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.vespa.http.client.FeedClientFactory": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>()",
-      "public static com.yahoo.vespa.http.client.FeedClient create(com.yahoo.vespa.http.client.config.SessionParams, com.yahoo.vespa.http.client.FeedClient$ResultCallback)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.vespa.http.client.FeedConnectException": {
-    "superClass": "com.yahoo.vespa.http.client.FeedEndpointException",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>(java.lang.Throwable, com.yahoo.vespa.http.client.config.Endpoint)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.vespa.http.client.FeedEndpointException": {
-    "superClass": "java.lang.RuntimeException",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "abstract"
-    ],
-    "methods": [
-      "protected void <init>(java.lang.String, java.lang.Throwable, com.yahoo.vespa.http.client.config.Endpoint)",
-      "public com.yahoo.vespa.http.client.config.Endpoint getEndpoint()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.vespa.http.client.FeedProtocolException": {
-    "superClass": "com.yahoo.vespa.http.client.FeedEndpointException",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>(int, java.lang.String, java.lang.Throwable, com.yahoo.vespa.http.client.config.Endpoint)",
-      "public int getHttpStatusCode()",
-      "public java.lang.String getHttpResponseMessage()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.vespa.http.client.Result$Detail": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "final"
-    ],
-    "methods": [
-      "public void <init>(com.yahoo.vespa.http.client.config.Endpoint, com.yahoo.vespa.http.client.Result$ResultType, java.lang.String, java.lang.Exception)",
-      "public void <init>(com.yahoo.vespa.http.client.config.Endpoint)",
-      "public com.yahoo.vespa.http.client.config.Endpoint getEndpoint()",
-      "public boolean isSuccess()",
-      "public com.yahoo.vespa.http.client.Result$ResultType getResultType()",
-      "public java.lang.Exception getException()",
-      "public java.lang.String getTraceMessage()",
-      "public java.lang.String toString()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.vespa.http.client.Result$ResultType": {
-    "superClass": "java.lang.Enum",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "final",
-      "enum"
-    ],
-    "methods": [
-      "public static com.yahoo.vespa.http.client.Result$ResultType[] values()",
-      "public static com.yahoo.vespa.http.client.Result$ResultType valueOf(java.lang.String)"
-    ],
-    "fields": [
-      "public static final enum com.yahoo.vespa.http.client.Result$ResultType OPERATION_EXECUTED",
-      "public static final enum com.yahoo.vespa.http.client.Result$ResultType TRANSITIVE_ERROR",
-      "public static final enum com.yahoo.vespa.http.client.Result$ResultType CONDITION_NOT_MET",
-      "public static final enum com.yahoo.vespa.http.client.Result$ResultType FATAL_ERROR"
-    ]
-  },
-  "com.yahoo.vespa.http.client.Result": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>(com.yahoo.vespa.http.client.core.Document, java.util.Collection, java.lang.StringBuilder)",
-      "public java.lang.String getDocumentId()",
-      "public java.lang.String getOperationId()",
-      "public java.lang.CharSequence getDocumentDataAsCharSequence()",
-      "public java.lang.Object getContext()",
-      "public boolean isSuccess()",
-      "public java.util.List getDetails()",
-      "public boolean hasLocalTrace()",
-      "public java.lang.String toString()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.vespa.http.client.Session": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
-      "java.lang.AutoCloseable"
-    ],
-    "attributes": [
-      "public",
-      "interface",
-      "abstract"
-    ],
-    "methods": [
-      "public abstract java.io.OutputStream stream(java.lang.CharSequence)",
-      "public abstract java.util.concurrent.BlockingQueue results()",
-      "public abstract void close()",
-      "public abstract java.lang.String getStatsAsJson()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.vespa.http.client.SessionFactory": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "final"
-    ],
-    "methods": [
-      "public void <init>()",
-      "public static com.yahoo.vespa.http.client.Session create(com.yahoo.vespa.http.client.config.SessionParams)",
-      "public static com.yahoo.vespa.http.client.Session create(com.yahoo.vespa.http.client.config.Endpoint)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.vespa.http.client.SimpleLoggerResultCallback": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
-      "com.yahoo.vespa.http.client.FeedClient$ResultCallback"
-    ],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "protected void println(java.lang.String)",
-      "public void <init>(java.util.concurrent.atomic.AtomicInteger, int)",
-      "public void printProgress()",
-      "protected com.yahoo.vespa.http.client.SimpleLoggerResultCallback$DocumentRate newSamplingPeriod(java.time.Instant)",
-      "public void onCompletion(java.lang.String, com.yahoo.vespa.http.client.Result)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.vespa.http.client.SyncFeedClient$SyncOperation": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>(java.lang.String, java.lang.CharSequence)",
-      "public void <init>(java.lang.String, java.lang.CharSequence, java.lang.Object)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.vespa.http.client.SyncFeedClient$SyncResult": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public java.util.List results()",
-      "public java.lang.Exception exception()",
-      "public boolean isSuccess()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.vespa.http.client.SyncFeedClient": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
-      "java.lang.AutoCloseable"
-    ],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>(com.yahoo.vespa.http.client.config.SessionParams)",
-      "public com.yahoo.vespa.http.client.SyncFeedClient$SyncResult stream(java.util.List)",
-      "public void close()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.vespa.http.client.config.Cluster$Builder": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "final"
-    ],
-    "methods": [
-      "public void <init>()",
-      "public com.yahoo.vespa.http.client.config.Cluster$Builder addEndpoint(com.yahoo.vespa.http.client.config.Endpoint)",
-      "public com.yahoo.vespa.http.client.config.Cluster$Builder setRoute(java.lang.String)",
-      "public com.yahoo.vespa.http.client.config.Cluster build()",
-      "public java.lang.String getRoute()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.vespa.http.client.config.Cluster": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "final"
-    ],
-    "methods": [
-      "public java.util.List getEndpoints()",
-      "public java.lang.String getRoute()",
-      "public java.lang.String toString()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.vespa.http.client.config.ConnectionParams$Builder": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "final"
-    ],
-    "methods": [
-      "public void <init>()",
-      "public com.yahoo.vespa.http.client.config.ConnectionParams$Builder setSslContext(javax.net.ssl.SSLContext)",
-      "public com.yahoo.vespa.http.client.config.ConnectionParams$Builder setHostnameVerifier(javax.net.ssl.HostnameVerifier)",
-      "public com.yahoo.vespa.http.client.config.ConnectionParams$Builder addHeader(java.lang.String, java.lang.String)",
-      "public com.yahoo.vespa.http.client.config.ConnectionParams$Builder addDynamicHeader(java.lang.String, com.yahoo.vespa.http.client.config.ConnectionParams$HeaderProvider)",
-      "public com.yahoo.vespa.http.client.config.ConnectionParams$Builder setNumPersistentConnectionsPerEndpoint(int)",
-      "public com.yahoo.vespa.http.client.config.ConnectionParams$Builder setProxyHost(java.lang.String)",
-      "public com.yahoo.vespa.http.client.config.ConnectionParams$Builder setProxyPort(int)",
-      "public com.yahoo.vespa.http.client.config.ConnectionParams$Builder setUseCompression(boolean)",
-      "public com.yahoo.vespa.http.client.config.ConnectionParams$Builder setMaxRetries(int)",
-      "public com.yahoo.vespa.http.client.config.ConnectionParams$Builder setDryRun(boolean)",
-      "public com.yahoo.vespa.http.client.config.ConnectionParams$Builder setMinTimeBetweenRetries(long, java.util.concurrent.TimeUnit)",
-      "public long getMinTimeBetweenRetriesMs()",
-      "public com.yahoo.vespa.http.client.config.ConnectionParams$Builder setTraceLevel(int)",
-      "public com.yahoo.vespa.http.client.config.ConnectionParams$Builder setTraceEveryXOperation(int)",
-      "public com.yahoo.vespa.http.client.config.ConnectionParams$Builder setPrintTraceToStdErr(boolean)",
-      "public com.yahoo.vespa.http.client.config.ConnectionParams build()",
-      "public int getNumPersistentConnectionsPerEndpoint()",
-      "public java.lang.String getProxyHost()",
-      "public boolean isDryRun()",
-      "public int getMaxRetries()",
-      "public int getTraceLevel()",
-      "public int getTraceEveryXOperation()",
-      "public boolean getPrintTraceToStdErr()",
-      "public int getProxyPort()",
-      "public javax.net.ssl.SSLContext getSslContext()",
-      "public javax.net.ssl.HostnameVerifier getHostnameVerifier()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.vespa.http.client.config.ConnectionParams$HeaderProvider": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "interface",
-      "abstract"
-    ],
-    "methods": [
-      "public abstract java.lang.String getHeaderValue()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.vespa.http.client.config.ConnectionParams": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "final"
-    ],
-    "methods": [
-      "public javax.net.ssl.SSLContext getSslContext()",
-      "public javax.net.ssl.HostnameVerifier getHostnameVerifier()",
-      "public java.util.Collection getHeaders()",
-      "public java.util.Map getDynamicHeaders()",
-      "public int getNumPersistentConnectionsPerEndpoint()",
-      "public java.lang.String getProxyHost()",
-      "public int getProxyPort()",
-      "public boolean getUseCompression()",
-      "public int getMaxRetries()",
-      "public long getMinTimeBetweenRetriesMs()",
-      "public boolean isDryRun()",
-      "public int getTraceLevel()",
-      "public int getTraceEveryXOperation()",
-      "public boolean getPrintTraceToStdErr()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.vespa.http.client.config.Endpoint": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
-      "java.io.Serializable"
-    ],
-    "attributes": [
-      "public",
-      "final"
-    ],
-    "methods": [
-      "public static com.yahoo.vespa.http.client.config.Endpoint create(java.lang.String)",
-      "public static com.yahoo.vespa.http.client.config.Endpoint create(java.lang.String, int, boolean)",
-      "public java.lang.String getHostname()",
-      "public int getPort()",
-      "public boolean isUseSsl()",
-      "public java.lang.String toString()",
-      "public boolean equals(java.lang.Object)",
-      "public int hashCode()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.vespa.http.client.config.FeedParams$Builder": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "final"
-    ],
-    "methods": [
-      "public void <init>()",
-      "public com.yahoo.vespa.http.client.config.FeedParams$Builder withSilentUpgrade(boolean)",
-      "public com.yahoo.vespa.http.client.config.FeedParams$Builder setMaxSleepTimeMs(long)",
-      "public com.yahoo.vespa.http.client.config.FeedParams$Builder setDenyIfBusyV3(boolean)",
-      "public com.yahoo.vespa.http.client.config.FeedParams$Builder setDataFormat(com.yahoo.vespa.http.client.config.FeedParams$DataFormat)",
-      "public com.yahoo.vespa.http.client.config.FeedParams$Builder setRoute(java.lang.String)",
-      "public com.yahoo.vespa.http.client.config.FeedParams$Builder setServerTimeout(long, java.util.concurrent.TimeUnit)",
-      "public com.yahoo.vespa.http.client.config.FeedParams$Builder setClientTimeout(long, java.util.concurrent.TimeUnit)",
-      "public com.yahoo.vespa.http.client.config.FeedParams$Builder setMaxChunkSizeBytes(int)",
-      "public com.yahoo.vespa.http.client.config.FeedParams$Builder setMaxInFlightRequests(int)",
-      "public com.yahoo.vespa.http.client.config.FeedParams$Builder setLocalQueueTimeOut(long)",
-      "public com.yahoo.vespa.http.client.config.FeedParams$Builder setPriority(java.lang.String)",
-      "public com.yahoo.vespa.http.client.config.FeedParams build()",
-      "public long getClientTimeout(java.util.concurrent.TimeUnit)",
-      "public long getServerTimeout(java.util.concurrent.TimeUnit)",
-      "public java.lang.String getRoute()",
-      "public com.yahoo.vespa.http.client.config.FeedParams$DataFormat getDataFormat()",
-      "public int getMaxChunkSizeBytes()",
-      "public int getmaxInFlightRequests()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.vespa.http.client.config.FeedParams$DataFormat": {
-    "superClass": "java.lang.Enum",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "final",
-      "enum"
-    ],
-    "methods": [
-      "public static com.yahoo.vespa.http.client.config.FeedParams$DataFormat[] values()",
-      "public static com.yahoo.vespa.http.client.config.FeedParams$DataFormat valueOf(java.lang.String)"
-    ],
-    "fields": [
-      "public static final enum com.yahoo.vespa.http.client.config.FeedParams$DataFormat XML_UTF8",
-      "public static final enum com.yahoo.vespa.http.client.config.FeedParams$DataFormat JSON_UTF8"
-    ]
-  },
-  "com.yahoo.vespa.http.client.config.FeedParams": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "final"
-    ],
-    "methods": [
-      "public boolean getDenyIfBusyV3()",
-      "public long getMaxSleepTimeMs()",
-      "public boolean getSilentUpgrade()",
-      "public com.yahoo.vespa.http.client.config.FeedParams$DataFormat getDataFormat()",
-      "public java.lang.String getRoute()",
-      "public long getServerTimeout(java.util.concurrent.TimeUnit)",
-      "public long getClientTimeout(java.util.concurrent.TimeUnit)",
-      "public int getMaxChunkSizeBytes()",
-      "public java.lang.String getPriority()",
-      "public java.lang.String toUriParameters()",
-      "public int getMaxInFlightRequests()",
-      "public long getLocalQueueTimeOut()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.vespa.http.client.config.SessionParams$Builder": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "final"
-    ],
-    "methods": [
-      "public void <init>()",
-      "public com.yahoo.vespa.http.client.config.SessionParams$Builder addCluster(com.yahoo.vespa.http.client.config.Cluster)",
-      "public com.yahoo.vespa.http.client.config.SessionParams$Builder setFeedParams(com.yahoo.vespa.http.client.config.FeedParams)",
-      "public com.yahoo.vespa.http.client.config.SessionParams$Builder setConnectionParams(com.yahoo.vespa.http.client.config.ConnectionParams)",
-      "public com.yahoo.vespa.http.client.config.SessionParams$Builder setErrorReporter(com.yahoo.vespa.http.client.config.SessionParams$ErrorReporter)",
-      "public com.yahoo.vespa.http.client.config.SessionParams$Builder setClientQueueSize(int)",
-      "public com.yahoo.vespa.http.client.config.SessionParams$Builder setThrottlerMinSize(int)",
-      "public com.yahoo.vespa.http.client.config.SessionParams build()",
-      "public com.yahoo.vespa.http.client.config.FeedParams getFeedParams()",
-      "public com.yahoo.vespa.http.client.config.ConnectionParams getConnectionParams()",
-      "public int getClientQueueSize()",
-      "public int getThrottlerMinSize()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.vespa.http.client.config.SessionParams$ErrorReporter": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "interface",
-      "abstract"
-    ],
-    "methods": [
-      "public abstract void onSessionError(com.yahoo.vespa.http.client.config.Endpoint, java.lang.String, java.lang.String)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.vespa.http.client.config.SessionParams": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "final"
-    ],
-    "methods": [
-      "public java.util.List getClusters()",
-      "public com.yahoo.vespa.http.client.config.FeedParams getFeedParams()",
-      "public com.yahoo.vespa.http.client.config.ConnectionParams getConnectionParams()",
-      "public int getClientQueueSize()",
-      "public int getThrottlerMinSize()",
-      "public com.yahoo.vespa.http.client.config.SessionParams$ErrorReporter getErrorReport()"
-    ],
-    "fields": []
-  }
-}
\ No newline at end of file
+{}
\ No newline at end of file
diff --git a/vespa-http-client/pom.xml b/vespa-http-client/pom.xml
index f98b39c70b1..dbae9db01c5 100644
--- a/vespa-http-client/pom.xml
+++ b/vespa-http-client/pom.xml
@@ -44,11 +44,6 @@
     </dependency>
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
-      <artifactId>annotations</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.yahoo.vespa</groupId>
       <artifactId>vespajlib</artifactId>
       <version>${project.version}</version>
     </dependency>
diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/config/package-info.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/config/package-info.java
index 17789e890d6..8300720e3ea 100644
--- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/config/package-info.java
+++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/config/package-info.java
@@ -1,10 +1,8 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 /**
  * Settings for creating clients/sessions.
+ *
+ * NOTE: This is a PUBLIC API, but not annotated as such because this is not a bundle and
+ *       we don't want to introduce Vespa dependencies.
  */
-@ExportPackage
-@PublicApi
 package com.yahoo.vespa.http.client.config;
-
-import com.yahoo.api.annotations.PublicApi;
-import com.yahoo.osgi.annotation.ExportPackage;
diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/package-info.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/package-info.java
index 56bd3e5cf99..211397476bd 100644
--- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/package-info.java
+++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/package-info.java
@@ -1,3 +1,2 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-@com.yahoo.api.annotations.PackageMarker
 package com.yahoo.vespa.http.client.core;
diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/package-info.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/package-info.java
index bd828363702..b14c2ffa4cc 100644
--- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/package-info.java
+++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/package-info.java
@@ -5,10 +5,8 @@
  * is the central interface which is used to interact with a cluster.
  * Use {@link com.yahoo.vespa.http.client.SessionFactory} to
  * instantiate a {@link com.yahoo.vespa.http.client.Session}.
- **/
-@ExportPackage
-@PublicApi
+ *
+ * NOTE: This is a PUBLIC API, but not annotated as such because this is not a bundle and
+ *       we don't want to introduce Vespa dependencies.
+ */
 package com.yahoo.vespa.http.client;
-
-import com.yahoo.api.annotations.PublicApi;
-import com.yahoo.osgi.annotation.ExportPackage;