1 files changed, 0 insertions, 42 deletions
diff --git a/vespaclient-core/src/main/java/com/yahoo/feedapi/FeedContext.java b/vespaclient-core/src/main/java/com/yahoo/feedapi/FeedContext.java
index 6bfd132a70f..3a435f7cda2 100755
--- a/vespaclient-core/src/main/java/com/yahoo/feedapi/FeedContext.java
+++ b/vespaclient-core/src/main/java/com/yahoo/feedapi/FeedContext.java
@@ -1,14 +1,9 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.feedapi;
 
-import com.yahoo.cloud.config.ClusterListConfig;
-import com.yahoo.cloud.config.SlobroksConfig;
-import com.yahoo.document.config.DocumentmanagerConfig;
 import com.yahoo.jdisc.Metric;
-import com.yahoo.vespa.config.content.LoadTypeConfig;
 import com.yahoo.document.DocumentTypeManager;
 import com.yahoo.clientmetrics.ClientMetrics;
-import com.yahoo.vespaclient.config.FeederConfig;
 
 import java.util.Map;
 import java.util.TreeMap;
@@ -33,10 +28,6 @@ public class FeedContext {
         this.metric = metric;
     }
 
-    public ClientMetrics getMetrics() {
-        return metrics;
-    }
-
     public Metric getMetricAPI() {
         return metric;
     }
@@ -83,37 +74,4 @@ public class FeedContext {
         return docTypeManager;
     }
 
-    public static FeedContext getInstance(FeederConfig feederConfig, 
-                                          LoadTypeConfig loadTypeConfig, 
-                                          DocumentmanagerConfig documentmanagerConfig, 
-                                          SlobroksConfig slobroksConfig,
-                                          Metric metric) {
-        synchronized (sync) {
-            try {
-                if (instance == null) {
-                    MessagePropertyProcessor proc = new MessagePropertyProcessor(feederConfig, loadTypeConfig);
-                    
-                    if (System.getProperty("vespa.local", "false").equals("true")) {
-                        // Use injected configs when running from Application. This means we cannot reconfigure
-                        MessageBusSessionFactory mbusFactory = new MessageBusSessionFactory(proc, documentmanagerConfig, slobroksConfig);
-                        instance = new FeedContext(proc, mbusFactory, mbusFactory.getAccess().getDocumentTypeManager(), metric);
-                    }
-                    else {
-                        // Don't send configs to messagebus to make it self-subscribe instead as this instance
-                        // survives reconfig :-/
-                        // This code will die soon ...
-                        MessageBusSessionFactory mbusFactory = new MessageBusSessionFactory(proc, null, null);
-                        instance = new FeedContext(proc, mbusFactory, mbusFactory.getAccess().getDocumentTypeManager(), metric);
-                    }
-                } else {
-                    instance.getPropertyProcessor().configure(feederConfig, loadTypeConfig);
-                }
-
-                return instance;
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
-        }
-    }
-
 }