Remove legacy compat for LogRecorder

Author: timja

core/src/main/java/hudson/logging/LogRecorder.java

@@ -31,7 +31,6 @@
 import hudson.BulkChange;
 import hudson.Extension;
 import hudson.FilePath;
-import hudson.RestrictedSince;
 import hudson.Util;
 import hudson.XmlFile;
 import hudson.model.AbstractModelObject;
@@ -43,7 +42,6 @@
 import hudson.remoting.Channel;
 import hudson.remoting.VirtualChannel;
 import hudson.slaves.ComputerListener;
-import hudson.util.CopyOnWriteList;
 import hudson.util.FormApply;
 import hudson.util.FormValidation;
 import hudson.util.HttpResponses;
@@ -104,15 +102,6 @@
 public class LogRecorder extends AbstractModelObject implements Loadable, Saveable {
     private volatile String name;
 
-    /**
-     * No longer used.
-     *
-     * @deprecated use {@link #getLoggers()}
-     */
-    @Deprecated
-    @Restricted(NoExternalUse.class)
-    @RestrictedSince("2.324")
-    public final transient CopyOnWriteList<Target> targets = new CopyOnWriteList<>();
     private List<Target> loggers = new ArrayList<>();
     private static final TargetComparator TARGET_COMPARATOR = new TargetComparator();
 
@@ -124,22 +113,6 @@ public LogRecorder(String name) {
         new WeakLogHandler(handler, Logger.getLogger(""));
     }
 
-    private Object readResolve() {
-        if (loggers == null) {
-            loggers = new ArrayList<>();
-        }
-
-        List<Target> tempLoggers = new ArrayList<>(loggers);
-
-        if (!targets.isEmpty()) {
-            loggers.addAll(targets.getView());
-        }
-        if (!tempLoggers.isEmpty() && !targets.getView().equals(tempLoggers)) {
-            targets.addAll(tempLoggers);
-        }
-        return this;
-    }
-
     public List<Target> getLoggers() {
         return loggers;
     }
@@ -455,7 +428,6 @@ public synchronized void doConfigSubmit(StaplerRequest2 req, StaplerResponse2 rs
             recorders.remove(new LogRecorder(name));
             this.name = newName;
             recorders.add(this);
-            getParent().setRecorders(recorders); // ensure that legacy logRecorders field is synced on save
             redirect = "../" + Util.rawEncode(newName) + '/';
         }
 
@@ -491,31 +463,12 @@ public synchronized void load() throws IOException {
     public synchronized void save() throws IOException {
         if (BulkChange.contains(this))   return;
 
-        handlePluginUpdatingLegacyLogManagerMap();
         getConfigFile().write(this);
         loggers.forEach(Target::enable);
 
         SaveableListener.fireOnChange(this, getConfigFile());
     }
 
-    @SuppressWarnings("deprecation") // this is for compatibility
-    private void handlePluginUpdatingLegacyLogManagerMap() {
-        if (getParent().logRecorders.size() > getParent().getRecorders().size()) {
-            for (LogRecorder logRecorder : getParent().logRecorders.values()) {
-                if (!getParent().getRecorders().contains(logRecorder)) {
-                    getParent().getRecorders().add(logRecorder);
-                }
-            }
-        }
-        if (getParent().getRecorders().size() > getParent().logRecorders.size()) {
-            for (LogRecorder logRecorder : getParent().getRecorders()) {
-                if (!getParent().logRecorders.containsKey(logRecorder.getName())) {
-                    getParent().logRecorders.put(logRecorder.getName(), logRecorder);
-                }
-            }
-        }
-    }
-
     @Override
     public boolean equals(Object o) {
         if (this == o) {

core/src/main/java/hudson/logging/LogRecorderManager.java

@@ -155,7 +155,6 @@ public void load() throws IOException {
             lr.load();
             recorders.add(lr);
         }
-        setRecorders(recorders); // ensure that legacy logRecorders field is synced on load
     }
 
     /**

test/src/test/java/hudson/logging/LogRecorderManagerTest.java

@@ -29,7 +29,6 @@
 import static org.hamcrest.Matchers.empty;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasSize;
-import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -174,42 +173,6 @@ public class LogRecorderManagerTest {
         assertFalse(text, text.contains("LambdaLog @FINER"));
     }
 
-    @Test
-    @SuppressWarnings("deprecation")
-    public void addingLogRecorderToLegacyMapAddsToRecordersList() throws IOException {
-        LogRecorderManager log = j.jenkins.getLog();
-
-        assertThat(log.logRecorders.size(), is(0));
-        assertThat(log.getRecorders().size(), is(0));
-
-        LogRecorder logRecorder = new LogRecorder("dummy");
-        logRecorder.getLoggers().add(new LogRecorder.Target("dummy", Level.ALL));
-
-        log.logRecorders.put("dummy", logRecorder);
-        logRecorder.save();
-
-        assertThat(log.logRecorders.size(), is(1));
-        assertThat(log.getRecorders().size(), is(1));
-    }
-
-    @Test
-    @SuppressWarnings("deprecation")
-    public void addingLogRecorderToListAddsToLegacyRecordersMap() throws IOException {
-        LogRecorderManager log = j.jenkins.getLog();
-
-        assertThat(log.logRecorders.size(), is(0));
-        assertThat(log.getRecorders().size(), is(0));
-
-        LogRecorder logRecorder = new LogRecorder("dummy");
-        logRecorder.getLoggers().add(new LogRecorder.Target("dummy", Level.ALL));
-
-        log.getRecorders().add(logRecorder);
-        logRecorder.save();
-
-        assertThat(log.logRecorders.size(), is(1));
-        assertThat(log.getRecorders().size(), is(1));
-    }
-
     @Test
     public void deletingLogRecorder() throws IOException {
         LogRecorderManager log = j.jenkins.getLog();