move common parsing

2 files changed, 0 insertions, 142 deletions

diff --git a/vespalog/src/main/java/com/yahoo/log/internal/LevelsModSpec.java b/vespalog/src/main/java/com/yahoo/log/internal/LevelsModSpec.java
deleted file mode 100644
index 4e45b2a91c5..00000000000
--- a/vespalog/src/main/java/com/yahoo/log/internal/LevelsModSpec.java
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.log.internal;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-public class LevelsModSpec {
-    private static final String ON = "on";
-    private static final String OFF = "off";
-
-    private static Map<String, String> defaultLogLevels() {
-        var m = new LinkedHashMap<String,String>();
-        m.put("fatal", ON);
-        m.put("error", ON);
-        m.put("warning", ON);
-        m.put("info", ON);
-        m.put("event", ON);
-        m.put("config", ON);
-        m.put("debug", OFF);
-        m.put("spam", OFF);
-        return m;
-    }
-    private Map<String, String> levelMods = defaultLogLevels();
-
-    private void setAll(String value) {
-        for (String k : levelMods.keySet()) {
-            levelMods.put(k, value);
-        }
-    }
-    private void setAll() {
-        setAll(ON);
-    }
-    private void clearAll() {
-        setAll(OFF);
-    }
-
-    public LevelsModSpec addModifications(String mods) {
-        for (String s : mods.split("[+ ,]")) {
-            String offOn = ON;
-            if (s.startsWith("-")) {
-                offOn = OFF;
-                s = s.substring(1);
-            }
-            if (s.isEmpty()) continue;
-            if (s.equals("all")) {
-                setAll(offOn);
-            } else if (levelMods.containsKey(s)) {
-                levelMods.put(s, offOn);
-            } else {
-                throw new IllegalArgumentException("Unknown log level: "+s);
-            }
-        }
-        return this;
-    }
-
-    public LevelsModSpec setLevels(String levels) {
-        if (! (levels.startsWith("+") || levels.startsWith("-"))) {
-            clearAll();
-        }
-        return addModifications(levels);
-    }
-
-    public String toLogctlModSpec() {
-        var spec = new StringBuilder();
-        boolean comma = false;
-        for (var entry : levelMods.entrySet()) {
-            if (comma) {
-                spec.append(",");
-            }
-            spec.append(entry.getKey());
-            spec.append("=");
-            spec.append(entry.getValue());
-            comma = true;
-        }
-        return spec.toString();
-    }
-
-}
diff --git a/vespalog/src/test/java/com/yahoo/log/internal/LevelsModSpecTest.java b/vespalog/src/test/java/com/yahoo/log/internal/LevelsModSpecTest.java
deleted file mode 100644
index 0c4f5033133..00000000000
--- a/vespalog/src/test/java/com/yahoo/log/internal/LevelsModSpecTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.log.internal;
-
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * @author arnej
- */
-public class LevelsModSpecTest {
-
-    @Test
-    public void hasCorrectDefault() {
-        String wanted = "fatal=on,error=on,warning=on,info=on,event=on,config=on,debug=off,spam=off";
-        var l = new LevelsModSpec();
-        assertEquals(wanted, l.toLogctlModSpec());
-    }
-
-    @Test
-    public void canTurnInfoOff() {
-        String wanted = "fatal=on,error=on,warning=on,info=off,event=on,config=on,debug=off,spam=off";
-        var l = new LevelsModSpec();
-        l.setLevels("-info");
-        assertEquals(wanted, l.toLogctlModSpec());
-    }
-
-    @Test
-    public void canTurnDebugOn() {
-        String wanted = "fatal=on,error=on,warning=on,info=on,event=on,config=on,debug=on,spam=off";
-        var l = new LevelsModSpec();
-        l.setLevels("+debug");
-        assertEquals(wanted, l.toLogctlModSpec());
-    }
-
-    @Test
-    public void canSpeficyOnlySome() {
-        String wanted = "fatal=off,error=off,warning=on,info=off,event=off,config=off,debug=on,spam=off";
-        var l = new LevelsModSpec();
-        l.setLevels("warning debug");
-        assertEquals(wanted, l.toLogctlModSpec());
-        l = new LevelsModSpec();
-        l.setLevels("warning,debug");
-        assertEquals(wanted, l.toLogctlModSpec());
-        l = new LevelsModSpec();
-        l.setLevels("warning, debug");
-        assertEquals(wanted, l.toLogctlModSpec());
-    }
-
-    @Test
-    public void canSpeficyAllMinusSome() {
-        String wanted ="fatal=on,error=on,warning=on,info=off,event=on,config=on,debug=on,spam=off";
-        var l = new LevelsModSpec();
-        l.setLevels("all -info -spam");
-        assertEquals(wanted, l.toLogctlModSpec());
-        l = new LevelsModSpec();
-        l.setLevels("all,-info,-spam");
-        assertEquals(wanted, l.toLogctlModSpec());
-        l = new LevelsModSpec();
-        l.setLevels("all, -info, -spam");
-        assertEquals(wanted, l.toLogctlModSpec());
-    }
-
-}