Merge pull request #7463 from vespa-engine/balder/put-back-public-api

Reinstate old visibility since imagesearch are using non-public apis.

2 files changed, 12 insertions, 12 deletions

diff --git a/vespaclient-core/src/main/java/com/yahoo/feedhandler/VespaFeedHandler.java b/vespaclient-core/src/main/java/com/yahoo/feedhandler/VespaFeedHandler.java
index 32c2d848b82..4adfe3ebe1d 100755
--- a/vespaclient-core/src/main/java/com/yahoo/feedhandler/VespaFeedHandler.java
+++ b/vespaclient-core/src/main/java/com/yahoo/feedhandler/VespaFeedHandler.java
@@ -48,17 +48,17 @@ public final class VespaFeedHandler extends VespaFeedHandlerBase {
                             SlobroksConfig slobroksConfig,
                             ClusterListConfig clusterListConfig,
                             Executor executor,
-                            Metric metric) throws Exception {
+                            Metric metric)  {
         super(feederConfig, loadTypeConfig, documentmanagerConfig, slobroksConfig, clusterListConfig, executor, metric);
         this.maxBusyThreads = feederConfig.maxbusythreads();
     }
 
-    VespaFeedHandler(FeedContext context, Executor executor) throws Exception {
+    VespaFeedHandler(FeedContext context, Executor executor) {
         super(context, executor);
         this.maxBusyThreads = 32;
     }
 
-    public static VespaFeedHandler createFromContext(FeedContext context, Executor executor) throws Exception {
+    public static VespaFeedHandler createFromContext(FeedContext context, Executor executor) {
         return new VespaFeedHandler(context, executor);
     }
 
diff --git a/vespaclient-core/src/main/java/com/yahoo/feedhandler/VespaFeedHandlerBase.java b/vespaclient-core/src/main/java/com/yahoo/feedhandler/VespaFeedHandlerBase.java
index 7dc852bfd6d..a22cbc08e38 100755
--- a/vespaclient-core/src/main/java/com/yahoo/feedhandler/VespaFeedHandlerBase.java
+++ b/vespaclient-core/src/main/java/com/yahoo/feedhandler/VespaFeedHandlerBase.java
@@ -42,29 +42,29 @@ public abstract class VespaFeedHandlerBase extends ThreadedHttpRequestHandler {
              executor, (long)feederConfig.timeout() * 1000);
     }
 
-    VespaFeedHandlerBase(FeedContext context, Executor executor) {
+    public VespaFeedHandlerBase(FeedContext context, Executor executor) {
         this(context, executor, context.getPropertyProcessor().getDefaultTimeoutMillis());
     }
 
-    private VespaFeedHandlerBase(FeedContext context, Executor executor, long defaultTimeoutMillis) {
+    public VespaFeedHandlerBase(FeedContext context, Executor executor, long defaultTimeoutMillis) {
         super(executor, context.getMetricAPI());
         this.context = context;
         this.defaultTimeoutMillis = defaultTimeoutMillis;
     }
 
-    SharedSender getSharedSender(String route) {
+    public SharedSender getSharedSender(String route) {
         return context.getSharedSender(route);
     }
 
-    DocprocService getDocprocChain(HttpRequest request) {
+    public DocprocService getDocprocChain(HttpRequest request) {
         return context.getPropertyProcessor().getDocprocChain(request);
     }
 
-    ComponentRegistry<DocprocService> getDocprocServiceRegistry(HttpRequest request) {
+    public ComponentRegistry<DocprocService> getDocprocServiceRegistry(HttpRequest request) {
         return context.getPropertyProcessor().getDocprocServiceRegistry(request);
     }
 
-    MessagePropertyProcessor getPropertyProcessor() {
+    public MessagePropertyProcessor getPropertyProcessor() {
         return context.getPropertyProcessor();
     }
 
@@ -74,7 +74,7 @@ public abstract class VespaFeedHandlerBase extends ThreadedHttpRequestHandler {
      *         original data stream.
      * @throws IllegalArgumentException if GZIP stream creation failed
      */
-    InputStream getRequestInputStream(HttpRequest request) {
+    public InputStream getRequestInputStream(HttpRequest request) {
         if ("gzip".equals(request.getHeader("Content-Encoding"))) {
             try {
                 return new GZIPInputStream(request.getData());
@@ -86,7 +86,7 @@ public abstract class VespaFeedHandlerBase extends ThreadedHttpRequestHandler {
         }
     }
 
-    DocumentTypeManager getDocumentTypeManager() {
+    protected DocumentTypeManager getDocumentTypeManager() {
         return context.getDocumentTypeManager();
     }
 
@@ -94,7 +94,7 @@ public abstract class VespaFeedHandlerBase extends ThreadedHttpRequestHandler {
         return context.getMetrics();
     }
 
-    long getTimeoutMillis(HttpRequest request) {
+    protected long getTimeoutMillis(HttpRequest request) {
         return ParameterParser.asMilliSeconds(request.getProperty("timeout"), defaultTimeoutMillis);
     }