From f306f89373130ee8666179ed0a9c3f8e154c4630 Mon Sep 17 00:00:00 2001
From: Henning Baldersheim <balder@yahoo-inc.com>
Date: Wed, 5 Dec 2018 00:19:57 +0100
Subject: Do not create static stuff you do not use.

---
 .../main/java/com/yahoo/docproc/DocprocService.java    |  2 +-
 .../main/java/com/yahoo/docproc/proxy/SchemaMap.java   | 18 +-----------------
 .../docproc/proxy/SchemaMappingAndAccessesTest.java    |  6 +++---
 3 files changed, 5 insertions(+), 21 deletions(-)

(limited to 'docproc')

diff --git a/docproc/src/main/java/com/yahoo/docproc/DocprocService.java b/docproc/src/main/java/com/yahoo/docproc/DocprocService.java
index b7a5e3aa5ef..766b433c4dd 100644
--- a/docproc/src/main/java/com/yahoo/docproc/DocprocService.java
+++ b/docproc/src/main/java/com/yahoo/docproc/DocprocService.java
@@ -38,7 +38,7 @@ public class DocprocService extends AbstractComponent {
     private boolean inService = false;
     /** The current state of this service */
     private boolean acceptingNewProcessings = true;
-    public static SchemaMap schemaMap = new SchemaMap(null);
+    public static SchemaMap schemaMap = new SchemaMap();
     private DocumentTypeManager documentTypeManager = null;
 
     public DocprocService(ComponentId id) {
diff --git a/docproc/src/main/java/com/yahoo/docproc/proxy/SchemaMap.java b/docproc/src/main/java/com/yahoo/docproc/proxy/SchemaMap.java
index fb7e34021d2..ea32eb7a549 100644
--- a/docproc/src/main/java/com/yahoo/docproc/proxy/SchemaMap.java
+++ b/docproc/src/main/java/com/yahoo/docproc/proxy/SchemaMap.java
@@ -9,7 +9,6 @@ import com.yahoo.config.docproc.SchemamappingConfig.Fieldmapping;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.logging.Logger;
 
 /**
  * Can be used to map field names from input doc into names used in a docproc that was
@@ -71,28 +70,13 @@ public class SchemaMap implements ConfigSubscriber.SingleSubscriber<Schemamappin
     }
 
     // (key->inProcessor),...
-    private final ConfigSubscriber subscriber;
+
     private Map<SchemaMapKey, String> fields = new HashMap<>();
 
     void addMapping(String chain, String docproc, String doctype, String inDocument, String inProcessor) {
         fields.put(new SchemaMapKey(chain, docproc, doctype, inDocument), inProcessor);
     }
 
-    /**
-     * New map from the docproc cluster's config id
-     * @param configid can be null. Will not get anything from config in that case.
-     */
-    public SchemaMap(String configid) {
-        subscriber = new ConfigSubscriber();
-        if (configid!=null) {
-            subscriber.subscribe(this, SchemamappingConfig.class, configid);
-        }
-    }
-
-    public SchemaMap() {
-        this(null);
-    }
-
     @Override
     public void configure(SchemamappingConfig config) {
         if (config == null) {
diff --git a/docproc/src/test/java/com/yahoo/docproc/proxy/SchemaMappingAndAccessesTest.java b/docproc/src/test/java/com/yahoo/docproc/proxy/SchemaMappingAndAccessesTest.java
index 20212d6ef4c..358518d4461 100644
--- a/docproc/src/test/java/com/yahoo/docproc/proxy/SchemaMappingAndAccessesTest.java
+++ b/docproc/src/test/java/com/yahoo/docproc/proxy/SchemaMappingAndAccessesTest.java
@@ -427,7 +427,7 @@ public class SchemaMappingAndAccessesTest {
 
     @Test
     public void testSchemaMapKey() {
-        SchemaMap map = new SchemaMap(null);
+        SchemaMap map = new SchemaMap();
         SchemaMap.SchemaMapKey key1 = map.new SchemaMapKey("chain", "docproc", "doctype", "from");
         SchemaMap.SchemaMapKey key1_1 = map.new SchemaMapKey("chain", "docproc", "doctype", "from");
         SchemaMap.SchemaMapKey key2 = map.new SchemaMapKey("chain", "docproc", "doctype2", "from");
@@ -437,7 +437,7 @@ public class SchemaMappingAndAccessesTest {
 
     @Test
     public void testSchemaMapConfig() {
-        SchemaMap map = new SchemaMap(null);
+        SchemaMap map = new SchemaMap();
         SchemamappingConfig.Builder scb = new SchemamappingConfig.Builder();
         scb.fieldmapping(new SchemamappingConfig.Fieldmapping.Builder().chain("mychain").docproc("mydocproc").doctype("mydoctype").
                 indocument("myindoc").inprocessor("myinprocessor"));
@@ -447,7 +447,7 @@ public class SchemaMappingAndAccessesTest {
 
     @Test
     public void testSchemaMapNoDocType() {
-        SchemaMap map = new SchemaMap(null);
+        SchemaMap map = new SchemaMap();
         map.addMapping("mychain", "com.yahoo.MyDocProc", null, "inDoc1", "inProc1");
         map.addMapping("mychain", "com.yahoo.MyDocProc", null, "inDoc2", "inProc2");
         Map<Pair<String, String>, String> cMap = map.chainMap("mychain", "com.yahoo.MyDocProc");
-- 
cgit v1.2.3