diff --git a/core/src/main/java/hudson/AbstractMarkupText.java b/core/src/main/java/hudson/AbstractMarkupText.java
index 1e78b3e10cfa..2398f6f74469 100644
--- a/core/src/main/java/hudson/AbstractMarkupText.java
+++ b/core/src/main/java/hudson/AbstractMarkupText.java
@@ -141,7 +141,7 @@ public MarkupText.SubText findToken(Pattern pattern) {
     public List<MarkupText.SubText> findTokens(Pattern pattern) {
         String text = getText();
         Matcher m = pattern.matcher(text);
-        List<SubText> r = new ArrayList<SubText>();
+        List<SubText> r = new ArrayList<>();
 
         while(m.find()) {
             int idx = m.start();
diff --git a/core/src/main/java/hudson/BulkChange.java b/core/src/main/java/hudson/BulkChange.java
index 28b9fde42610..e65fa4d3acb6 100644
--- a/core/src/main/java/hudson/BulkChange.java
+++ b/core/src/main/java/hudson/BulkChange.java
@@ -132,7 +132,7 @@ private void pop() {
     /**
      * {@link BulkChange}s that are effective currently.
      */
-    private static final ThreadLocal<BulkChange> INSCOPE = new ThreadLocal<BulkChange>();
+    private static final ThreadLocal<BulkChange> INSCOPE = new ThreadLocal<>();
 
     /**
      * Gets the {@link BulkChange} instance currently in scope for the current thread.
diff --git a/core/src/main/java/hudson/ClassicPluginStrategy.java b/core/src/main/java/hudson/ClassicPluginStrategy.java
index fdd2e88dd196..1d93d3fb249c 100644
--- a/core/src/main/java/hudson/ClassicPluginStrategy.java
+++ b/core/src/main/java/hudson/ClassicPluginStrategy.java
@@ -192,7 +192,7 @@ private static Manifest loadLinkedManifest(File archive) throws IOException {
         // TODO: define a mechanism to hide classes
         // String export = manifest.getMainAttributes().getValue("Export");
 
-        List<File> paths = new ArrayList<File>();
+        List<File> paths = new ArrayList<>();
         if (isLinked) {
             parseClassPath(manifest, archive, paths, "Libraries", ",");
             parseClassPath(manifest, archive, paths, "Class-Path", " +"); // backward compatibility
@@ -218,8 +218,8 @@ private static Manifest loadLinkedManifest(File archive) throws IOException {
         }
 
         // compute dependencies
-        List<PluginWrapper.Dependency> dependencies = new ArrayList<PluginWrapper.Dependency>();
-        List<PluginWrapper.Dependency> optionalDependencies = new ArrayList<PluginWrapper.Dependency>();
+        List<PluginWrapper.Dependency> dependencies = new ArrayList<>();
+        List<PluginWrapper.Dependency> optionalDependencies = new ArrayList<>();
         String v = atts.getValue("Plugin-Dependencies");
         if (v != null) {
             for (String s : v.split(",")) {
@@ -336,7 +336,7 @@ public <T> List<ExtensionComponent<T>> findComponents(Class<T> type, Hudson huds
             } catch (AbstractMethodError e) {
                 // backward compatibility
                 for (T t : finder.findExtensions(type, hudson))
-                    r.add(new ExtensionComponent<T>(t));
+                    r.add(new ExtensionComponent<>(t));
             }
         }
 
@@ -578,7 +578,7 @@ private List<PluginWrapper> getTransitiveDependencies() {
                 CyclicGraphDetector<PluginWrapper> cgd = new CyclicGraphDetector<PluginWrapper>() {
                     @Override
                     protected List<PluginWrapper> getEdges(PluginWrapper pw) {
-                        List<PluginWrapper> dep = new ArrayList<PluginWrapper>();
+                        List<PluginWrapper> dep = new ArrayList<>();
                         for (Dependency d : pw.getDependencies()) {
                             PluginWrapper p = pluginManager.getPlugin(d.shortName);
                             if (p!=null && p.isActive())
@@ -644,7 +644,7 @@ protected Class<?> findClass(String name) throws ClassNotFoundException {
         @SuppressFBWarnings(value = "DMI_COLLECTION_OF_URLS",
                             justification = "Should not produce network overheads since the URL is local. JENKINS-53793 is a follow-up")
         protected Enumeration<URL> findResources(String name) throws IOException {
-            HashSet<URL> result = new HashSet<URL>();
+            HashSet<URL> result = new HashSet<>();
 
             if (PluginManager.FAST_LOOKUP) {
                     for (PluginWrapper pw : getTransitiveDependencies()) {
diff --git a/core/src/main/java/hudson/DNSMultiCast.java b/core/src/main/java/hudson/DNSMultiCast.java
index aa71b2e23b2b..fcb3fe33bb05 100644
--- a/core/src/main/java/hudson/DNSMultiCast.java
+++ b/core/src/main/java/hudson/DNSMultiCast.java
@@ -32,7 +32,7 @@ public Object call() {
                 try {
                     jmdns = JmDNS.create();
 
-                    Map<String,String> props = new HashMap<String, String>();
+                    Map<String,String> props = new HashMap<>();
                     String rootURL = jenkins.getRootUrl();
                     if (rootURL==null)  return null;
 
diff --git a/core/src/main/java/hudson/DescriptorExtensionList.java b/core/src/main/java/hudson/DescriptorExtensionList.java
index 8452227e5e94..5e9d35f7ec4a 100644
--- a/core/src/main/java/hudson/DescriptorExtensionList.java
+++ b/core/src/main/java/hudson/DescriptorExtensionList.java
@@ -76,7 +76,7 @@ DescriptorExtensionList<T,D> createDescriptorList(Jenkins jenkins, Class<T> desc
         if (describableType == (Class) Publisher.class) {
             return (DescriptorExtensionList) new Publisher.DescriptorExtensionListImpl(jenkins);
         }
-        return new DescriptorExtensionList<T,D>(jenkins,describableType);
+        return new DescriptorExtensionList<>(jenkins, describableType);
     }
 
     /**
@@ -199,7 +199,7 @@ protected Collection<ExtensionComponent<D>> load(ExtensionComponentSet delta) {
     }
 
     private List<ExtensionComponent<D>> _load(Iterable<ExtensionComponent<Descriptor>> set) {
-        List<ExtensionComponent<D>> r = new ArrayList<ExtensionComponent<D>>();
+        List<ExtensionComponent<D>> r = new ArrayList<>();
         for( ExtensionComponent<Descriptor> c : set ) {
             Descriptor d = c.getInstance();
             try {
diff --git a/core/src/main/java/hudson/EnvVars.java b/core/src/main/java/hudson/EnvVars.java
index 6d2f451071ee..8caaebf31290 100644
--- a/core/src/main/java/hudson/EnvVars.java
+++ b/core/src/main/java/hudson/EnvVars.java
@@ -200,7 +200,7 @@ public TraceResolver(Comparator<? super String> comparator) {
             }
             
             public void clear() {
-                referredVariables = new TreeSet<String>(comparator);
+                referredVariables = new TreeSet<>(comparator);
             }
             
             public String resolve(String name) {
@@ -288,8 +288,8 @@ private void cutCycle(List<String> cycle) {
          * Scan all variables and list all referring variables.
          */
         public void scan() {
-            refereeSetMap = new TreeMap<String, Set<String>>(comparator);
-            List<String> extendingVariableNames = new ArrayList<String>();
+            refereeSetMap = new TreeMap<>(comparator);
+            List<String> extendingVariableNames = new ArrayList<>();
             
             TraceResolver resolver = new TraceResolver(comparator);
             
@@ -327,10 +327,10 @@ public void scan() {
             
             // When A refers B, the last appearance of B always comes after
             // the last appearance of A.
-            List<String> reversedDuplicatedOrder = new ArrayList<String>(sorter.getSorted());
+            List<String> reversedDuplicatedOrder = new ArrayList<>(sorter.getSorted());
             Collections.reverse(reversedDuplicatedOrder);
             
-            orderedVariableNames = new ArrayList<String>(overrides.size());
+            orderedVariableNames = new ArrayList<>(overrides.size());
             for(String key: reversedDuplicatedOrder) {
                 if(overrides.containsKey(key) && !orderedVariableNames.contains(key)) {
                     orderedVariableNames.add(key);
diff --git a/core/src/main/java/hudson/ExpressionFactory2.java b/core/src/main/java/hudson/ExpressionFactory2.java
index 277858c933d5..c8704fccfdb8 100644
--- a/core/src/main/java/hudson/ExpressionFactory2.java
+++ b/core/src/main/java/hudson/ExpressionFactory2.java
@@ -168,5 +168,5 @@ public Collection values() {
      *
      * @see Functions#getCurrentJellyContext()
      */
-    protected static final ThreadLocal<JellyContext> CURRENT_CONTEXT = new ThreadLocal<JellyContext>();
+    protected static final ThreadLocal<JellyContext> CURRENT_CONTEXT = new ThreadLocal<>();
 }
diff --git a/core/src/main/java/hudson/ExtensionList.java b/core/src/main/java/hudson/ExtensionList.java
index b4d32bd06de2..0417f1674ce1 100644
--- a/core/src/main/java/hudson/ExtensionList.java
+++ b/core/src/main/java/hudson/ExtensionList.java
@@ -86,7 +86,7 @@ public class ExtensionList<T> extends AbstractList<T> implements OnMaster {
     @CopyOnWrite
     private volatile List<ExtensionComponent<T>> extensions;
 
-    private final List<ExtensionListListener> listeners = new CopyOnWriteArrayList<ExtensionListListener>();
+    private final List<ExtensionListListener> listeners = new CopyOnWriteArrayList<>();
 
     /**
      * Place to store manually registered instances with the per-Hudson scope.
@@ -104,7 +104,7 @@ protected ExtensionList(Hudson hudson, Class<T> extensionType) {
     }
 
     protected ExtensionList(Jenkins jenkins, Class<T> extensionType) {
-        this(jenkins,extensionType,new CopyOnWriteArrayList<ExtensionComponent<T>>());
+        this(jenkins,extensionType, new CopyOnWriteArrayList<>());
     }
 
     /**
@@ -237,7 +237,7 @@ public boolean removeAll(Collection<?> c) {
     private synchronized boolean removeSync(Object o) {
         boolean removed = removeComponent(legacyInstances, o);
         if(extensions!=null) {
-            List<ExtensionComponent<T>> r = new ArrayList<ExtensionComponent<T>>(extensions);
+            List<ExtensionComponent<T>> r = new ArrayList<>(extensions);
             removed |= removeComponent(r,o);
             extensions = sort(r);
         }
@@ -279,11 +279,11 @@ public boolean add(T t) {
     }
 
     private synchronized boolean addSync(T t) {
-        legacyInstances.add(new ExtensionComponent<T>(t));
+        legacyInstances.add(new ExtensionComponent<>(t));
         // if we've already filled extensions, add it
         if(extensions!=null) {
-            List<ExtensionComponent<T>> r = new ArrayList<ExtensionComponent<T>>(extensions);
-            r.add(new ExtensionComponent<T>(t));
+            List<ExtensionComponent<T>> r = new ArrayList<>(extensions);
+            r.add(new ExtensionComponent<>(t));
             extensions = sort(r);
         }
         return true;
@@ -395,7 +395,7 @@ protected Collection<ExtensionComponent<T>> load(ExtensionComponentSet delta) {
      * The implementation should copy a list, do a sort, and return the new instance.
      */
     protected List<ExtensionComponent<T>> sort(List<ExtensionComponent<T>> r) {
-        r = new ArrayList<ExtensionComponent<T>>(r);
+        r = new ArrayList<>(r);
         Collections.sort(r);
         return r;
     }
@@ -412,7 +412,7 @@ public static <T> ExtensionList<T> create(Hudson hudson, Class<T> type) {
     @SuppressWarnings({"unchecked", "rawtypes"})
     public static <T> ExtensionList<T> create(Jenkins jenkins, Class<T> type) {
         if(type.getAnnotation(LegacyInstancesAreScopedToHudson.class)!=null)
-            return new ExtensionList<T>(jenkins,type);
+            return new ExtensionList<>(jenkins, type);
         else {
             return new ExtensionList(jenkins, type, staticLegacyInstances.computeIfAbsent(type, key -> new CopyOnWriteArrayList()));
         }
diff --git a/core/src/main/java/hudson/FilePath.java b/core/src/main/java/hudson/FilePath.java
index 66d2ea9aae03..13311e72b587 100644
--- a/core/src/main/java/hudson/FilePath.java
+++ b/core/src/main/java/hudson/FilePath.java
@@ -325,7 +325,7 @@ public static String normalize(@Nonnull String path) {
         }
         boolean isAbsolute = buf.length() > 0;
         // Split remaining path into tokens, trimming any duplicate or trailing separators
-        List<String> tokens = new ArrayList<String>();
+        List<String> tokens = new ArrayList<>();
         int s = 0, end = path.length();
         for (int i = 0; i < end; i++) {
             char c = path.charAt(i);
@@ -1061,7 +1061,7 @@ private <T> T act(final FileCallable<T> callable, ClassLoader cl) throws IOExcep
         if(channel!=null) {
             // run this on a remote system
             try {
-                DelegatingCallable<T,IOException> wrapper = new FileCallableWrapper<T>(callable, cl);
+                DelegatingCallable<T,IOException> wrapper = new FileCallableWrapper<>(callable, cl);
                 for (FileCallableWrapperFactory factory : ExtensionList.lookup(FileCallableWrapperFactory.class)) {
                     wrapper = factory.wrap(wrapper);
                 }
@@ -1136,7 +1136,7 @@ protected void after() {}
      */
     public <T> Future<T> actAsync(final FileCallable<T> callable) throws IOException, InterruptedException {
         try {
-            DelegatingCallable<T,IOException> wrapper = new FileCallableWrapper<T>(callable);
+            DelegatingCallable<T,IOException> wrapper = new FileCallableWrapper<>(callable);
             for (FileCallableWrapperFactory factory : ExtensionList.lookup(FileCallableWrapperFactory.class)) {
                 wrapper = factory.wrap(wrapper);
             }
@@ -1839,7 +1839,7 @@ public List<FilePath> invoke(File f, VirtualChannel channel) throws IOException
                     return Collections.emptyList();
                 }
 
-                ArrayList<FilePath> r = new ArrayList<FilePath>(children.length);
+                ArrayList<FilePath> r = new ArrayList<>(children.length);
                 for (File child : children)
                     r.add(new FilePath(child));
 
diff --git a/core/src/main/java/hudson/Functions.java b/core/src/main/java/hudson/Functions.java
index 118a1f70faf8..76fdf2f8130a 100644
--- a/core/src/main/java/hudson/Functions.java
+++ b/core/src/main/java/hudson/Functions.java
@@ -465,7 +465,7 @@ public static String appendIfNotNull(String text, String suffix, String nullText
     }
 
     public static Map getSystemProperties() {
-        return new TreeMap<Object,Object>(System.getProperties());
+        return new TreeMap<>(System.getProperties());
     }
 
     /**
@@ -479,7 +479,7 @@ public static String getSystemProperty(String key) {
     }
 
     public static Map getEnvVars() {
-        return new TreeMap<String,String>(EnvVars.masterEnvVars);
+        return new TreeMap<>(EnvVars.masterEnvVars);
     }
 
     public static boolean isWindows() {
@@ -544,7 +544,7 @@ private static String[] logRecordPreformat(LogRecord r) {
      * @since 1.525
      */
     public static <T> Iterable<T> reverse(Collection<T> collection) {
-        List<T> list = new ArrayList<T>(collection);
+        List<T> list = new ArrayList<>(collection);
         Collections.reverse(list);
         return list;
     }
diff --git a/core/src/main/java/hudson/Launcher.java b/core/src/main/java/hudson/Launcher.java
index f0f18b4f81df..45fe90cab0f2 100644
--- a/core/src/main/java/hudson/Launcher.java
+++ b/core/src/main/java/hudson/Launcher.java
@@ -197,14 +197,14 @@ public ProcStarter cmds(String... args) {
         }
 
         public ProcStarter cmds(File program, String... args) {
-            commands = new ArrayList<String>(args.length+1);
+            commands = new ArrayList<>(args.length + 1);
             commands.add(program.getPath());
             commands.addAll(Arrays.asList(args));
             return this;
         }
 
         public ProcStarter cmds(List<String> args) {
-            commands = new ArrayList<String>(args);
+            commands = new ArrayList<>(args);
             return this;
         }
 
diff --git a/core/src/main/java/hudson/Lookup.java b/core/src/main/java/hudson/Lookup.java
index 090f3eb28449..b0b40ba89151 100644
--- a/core/src/main/java/hudson/Lookup.java
+++ b/core/src/main/java/hudson/Lookup.java
@@ -32,7 +32,7 @@
  * @author Kohsuke Kawaguchi
  */
 public class Lookup {
-    private final ConcurrentHashMap<Class,Object> data = new ConcurrentHashMap<Class,Object>();
+    private final ConcurrentHashMap<Class,Object> data = new ConcurrentHashMap<>();
 
     public <T> T get(Class<T> type) {
         return type.cast(data.get(type));
diff --git a/core/src/main/java/hudson/Main.java b/core/src/main/java/hudson/Main.java
index c4aa94275567..55ee2fb9f0aa 100644
--- a/core/src/main/java/hudson/Main.java
+++ b/core/src/main/java/hudson/Main.java
@@ -152,7 +152,7 @@ public static int remotePost(String[] args) throws Exception {
                 // run the command
                 long start = System.currentTimeMillis();
 
-                List<String> cmd = new ArrayList<String>();
+                List<String> cmd = new ArrayList<>();
                 for( int i=1; i<args.length; i++ )
                     cmd.add(args[i]);
                 Proc proc = new Proc.LocalProc(cmd.toArray(new String[0]),(String[])null,System.in,
diff --git a/core/src/main/java/hudson/MarkupText.java b/core/src/main/java/hudson/MarkupText.java
index 12a9b3b8484c..107c8fbdfc1f 100644
--- a/core/src/main/java/hudson/MarkupText.java
+++ b/core/src/main/java/hudson/MarkupText.java
@@ -45,7 +45,7 @@ public class MarkupText extends AbstractMarkupText {
     /**
      * Added mark up tags.
      */
-    private final List<Tag> tags = new ArrayList<Tag>();
+    private final List<Tag> tags = new ArrayList<>();
 
     /**
      * Represents one mark up inserted into text.
diff --git a/core/src/main/java/hudson/PermalinkList.java b/core/src/main/java/hudson/PermalinkList.java
index 0c4a3085a630..caffd8baf0fe 100644
--- a/core/src/main/java/hudson/PermalinkList.java
+++ b/core/src/main/java/hudson/PermalinkList.java
@@ -60,7 +60,7 @@ public Permalink get(String id) {
      * Finds the closest name match by its ID.
      */
     public Permalink findNearest(String id) {
-        List<String> ids = new ArrayList<String>();
+        List<String> ids = new ArrayList<>();
         for (Permalink p : this)
             ids.add(p.getId());
         String nearest = EditDistance.findNearest(id, ids);
diff --git a/core/src/main/java/hudson/PluginManager.java b/core/src/main/java/hudson/PluginManager.java
index c26ca2439deb..ba0648b7bcc0 100644
--- a/core/src/main/java/hudson/PluginManager.java
+++ b/core/src/main/java/hudson/PluginManager.java
@@ -284,9 +284,9 @@ private enum PMConstructor {
     /**
      * All active plugins, topologically sorted so that when X depends on Y, Y appears in the list before X does.
      */
-    protected final List<PluginWrapper> activePlugins = new CopyOnWriteArrayList<PluginWrapper>();
+    protected final List<PluginWrapper> activePlugins = new CopyOnWriteArrayList<>();
 
-    protected final List<FailedPlugin> failedPlugins = new ArrayList<FailedPlugin>();
+    protected final List<FailedPlugin> failedPlugins = new ArrayList<>();
 
     /**
      * Plug-in root directory.
@@ -422,7 +422,7 @@ public void run(Reactor session) throws Exception {
                             // once we've listed plugins, we can fill in the reactor with plugin-specific initialization tasks
                             TaskGraphBuilder g = new TaskGraphBuilder();
 
-                            final Map<String,File> inspectedShortNames = new HashMap<String,File>();
+                            final Map<String,File> inspectedShortNames = new HashMap<>();
 
                             for( final File arc : archives ) {
                                 g.followedBy().notFatal().attains(PLUGINS_LISTED).add("Inspecting plugin " + arc, new Executable() {
@@ -465,7 +465,7 @@ public void run(Reactor reactor) throws Exception {
                                         CyclicGraphDetector<PluginWrapper> cgd = new CyclicGraphDetector<PluginWrapper>() {
                                             @Override
                                             protected List<PluginWrapper> getEdges(PluginWrapper p) {
-                                                List<PluginWrapper> next = new ArrayList<PluginWrapper>();
+                                                List<PluginWrapper> next = new ArrayList<>();
                                                 addTo(p.getDependencies(), next);
                                                 addTo(p.getOptionalDependencies(), next);
                                                 return next;
@@ -1241,7 +1241,7 @@ public PluginWrapper getPlugin(Class<? extends Plugin> pluginClazz) {
      * @return The list of plugins implementing the specified class.
      */
     public List<PluginWrapper> getPlugins(Class<? extends Plugin> pluginSuperclass) {
-        List<PluginWrapper> result = new ArrayList<PluginWrapper>();
+        List<PluginWrapper> result = new ArrayList<>();
         for (PluginWrapper p : getPlugins()) {
             if(pluginSuperclass.isInstance(p.getPlugin()))
                 result.add(p);
@@ -1264,7 +1264,7 @@ public String getSearchUrl() {
      */
     @Deprecated
     public <T> Collection<Class<? extends T>> discover( Class<T> spi ) {
-        Set<Class<? extends T>> result = new HashSet<Class<? extends T>>();
+        Set<Class<? extends T>> result = new HashSet<>();
 
         for (PluginWrapper p : activePlugins) {
             Service.load(spi, p.classLoader, result);
@@ -1807,7 +1807,7 @@ public Descriptor<ProxyConfiguration> getProxyDescriptor() {
      */
     public List<Future<UpdateCenter.UpdateCenterJob>> prevalidateConfig(InputStream configXml) throws IOException {
         Jenkins.getInstance().checkPermission(Jenkins.ADMINISTER);
-        List<Future<UpdateCenter.UpdateCenterJob>> jobs = new ArrayList<Future<UpdateCenter.UpdateCenterJob>>();
+        List<Future<UpdateCenter.UpdateCenterJob>> jobs = new ArrayList<>();
         UpdateCenter uc = Jenkins.getInstance().getUpdateCenter();
         // TODO call uc.updateAllSites() when available? perhaps not, since we should not block on network here
         for (Map.Entry<String,VersionNumber> requestedPlugin : parseRequestedPlugins(configXml).entrySet()) {
@@ -1901,7 +1901,7 @@ public HttpResponse doInstallNecessaryPlugins(StaplerRequest req) throws IOExcep
      * Parses configuration XML files and picks up references to XML files.
      */
     public Map<String,VersionNumber> parseRequestedPlugins(InputStream configXml) throws IOException {
-        final Map<String,VersionNumber> requestedPlugins = new TreeMap<String,VersionNumber>();
+        final Map<String,VersionNumber> requestedPlugins = new TreeMap<>();
         try {
             SAXParserFactory.newInstance().newSAXParser().parse(configXml, new DefaultHandler() {
                 @Override public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
@@ -1981,16 +1981,16 @@ public final class UberClassLoader extends ClassLoader {
          * Make generated types visible.
          * Keyed by the generated class name.
          */
-        private ConcurrentMap<String, WeakReference<Class>> generatedClasses = new ConcurrentHashMap<String, WeakReference<Class>>();
+        private ConcurrentMap<String, WeakReference<Class>> generatedClasses = new ConcurrentHashMap<>();
         /** Cache of loaded, or known to be unloadable, classes. */
-        private final Map<String,Class<?>> loaded = new HashMap<String,Class<?>>();
+        private final Map<String,Class<?>> loaded = new HashMap<>();
 
         public UberClassLoader() {
             super(PluginManager.class.getClassLoader());
         }
 
         public void addNamedClass(String className, Class c) {
-            generatedClasses.put(className,new WeakReference<Class>(c));
+            generatedClasses.put(className, new WeakReference<>(c));
         }
 
         @Override
@@ -2071,7 +2071,7 @@ protected URL findResource(String name) {
 
         @Override
         protected Enumeration<URL> findResources(String name) throws IOException {
-            List<URL> resources = new ArrayList<URL>();
+            List<URL> resources = new ArrayList<>();
             if (FAST_LOOKUP) {
                     for (PluginWrapper p : activePlugins) {
                         resources.addAll(Collections.list(ClassLoaderReflectionToolkit._findResources(p.classLoader, name)));
diff --git a/core/src/main/java/hudson/Util.java b/core/src/main/java/hudson/Util.java
index 9699df02c892..dc3de475bf37 100644
--- a/core/src/main/java/hudson/Util.java
+++ b/core/src/main/java/hudson/Util.java
@@ -114,7 +114,7 @@ public class Util {
      */
     @Nonnull
     public static <T> List<T> filter( @Nonnull Iterable<?> base, @Nonnull Class<T> type ) {
-        List<T> r = new ArrayList<T>();
+        List<T> r = new ArrayList<>();
         for (Object i : base) {
             if(type.isInstance(i))
                 r.add(type.cast(i));
@@ -144,7 +144,7 @@ public static <T> List<T> filter( @Nonnull List<?> base, @Nonnull Class<T> type
      */
     @Nullable
     public static String replaceMacro( @CheckForNull String s, @Nonnull Map<String,String> properties) {
-        return replaceMacro(s,new VariableResolver.ByMap<String>(properties));
+        return replaceMacro(s, new VariableResolver.ByMap<>(properties));
     }
 
     /**
@@ -783,7 +783,7 @@ public static String combine(long n, @Nonnull String suffix) {
      */
     @Nonnull
     public static <T> List<T> createSubList(@Nonnull Collection<?> source, @Nonnull Class<T> type ) {
-        List<T> r = new ArrayList<T>();
+        List<T> r = new ArrayList<>();
         for (Object item : source) {
             if(type.isInstance(item))
                 r.add(type.cast(item));
@@ -1117,7 +1117,7 @@ public static <T> List<T> join(@Nonnull Collection<? extends T>... items) {
         int size = 0;
         for (Collection<? extends T> item : items)
             size += item.size();
-        List<T> r = new ArrayList<T>(size);
+        List<T> r = new ArrayList<>(size);
         for (Collection<? extends T> item : items)
             r.addAll(item);
         return r;
diff --git a/core/src/main/java/hudson/cli/CLICommand.java b/core/src/main/java/hudson/cli/CLICommand.java
index 738c738a63e0..4a47ae973c8e 100644
--- a/core/src/main/java/hudson/cli/CLICommand.java
+++ b/core/src/main/java/hudson/cli/CLICommand.java
@@ -530,7 +530,7 @@ public static CLICommand clone(String name) {
 
     private static final Logger LOGGER = Logger.getLogger(CLICommand.class.getName());
 
-    private static final ThreadLocal<CLICommand> CURRENT_COMMAND = new ThreadLocal<CLICommand>();
+    private static final ThreadLocal<CLICommand> CURRENT_COMMAND = new ThreadLocal<>();
 
     /*package*/ static CLICommand setCurrent(CLICommand cmd) {
         CLICommand old = getCurrent();
diff --git a/core/src/main/java/hudson/cli/InstallPluginCommand.java b/core/src/main/java/hudson/cli/InstallPluginCommand.java
index 2bbabe09c655..5279a7fd3a3f 100644
--- a/core/src/main/java/hudson/cli/InstallPluginCommand.java
+++ b/core/src/main/java/hudson/cli/InstallPluginCommand.java
@@ -63,7 +63,7 @@ public String getShortDescription() {
             "and the plugin will be installed from the update center. If the short name includes a minimum version number " +
             "(like ‘findbugs:1.4’), and there are multiple update centers publishing different versions, the update centers " +
             "will be searched in order for the first one publishing a version that is at least the specified version.")
-    public List<String> sources = new ArrayList<String>();
+    public List<String> sources = new ArrayList<>();
 
     @Option(name="-name",usage="If specified, the plugin will be installed as this short name (whereas normally the name is inferred from the source name automatically).")
     public String name; // TODO better to parse out Short-Name from the manifest and deprecate this option
diff --git a/core/src/main/java/hudson/console/ConsoleNote.java b/core/src/main/java/hudson/console/ConsoleNote.java
index 39977a590ee5..3c18b657168a 100644
--- a/core/src/main/java/hudson/console/ConsoleNote.java
+++ b/core/src/main/java/hudson/console/ConsoleNote.java
@@ -340,7 +340,7 @@ public static int findPreamble(byte[] buf, int start, int len) {
      * @since 1.350
      */
     public static List<String> removeNotes(Collection<String> logLines) {
-        List<String> r = new ArrayList<String>(logLines.size());
+        List<String> r = new ArrayList<>(logLines.size());
         for (String l : logLines)
             r.add(removeNotes(l));
         return r;
diff --git a/core/src/main/java/hudson/diagnosis/MemoryUsageMonitor.java b/core/src/main/java/hudson/diagnosis/MemoryUsageMonitor.java
index 1ba648eb38fe..eba9991aff14 100644
--- a/core/src/main/java/hudson/diagnosis/MemoryUsageMonitor.java
+++ b/core/src/main/java/hudson/diagnosis/MemoryUsageMonitor.java
@@ -53,7 +53,7 @@ public final class MemoryUsageMonitor extends PeriodicWork {
      * A memory group is conceptually a set of memory pools. 
      */
     public final class MemoryGroup {
-        private final List<MemoryPoolMXBean> pools = new ArrayList<MemoryPoolMXBean>();
+        private final List<MemoryPoolMXBean> pools = new ArrayList<>();
 
         /**
          * Trend of the memory usage, after GCs.
diff --git a/core/src/main/java/hudson/diagnosis/NullIdDescriptorMonitor.java b/core/src/main/java/hudson/diagnosis/NullIdDescriptorMonitor.java
index 8b3778262ef5..27a5685f1dcc 100644
--- a/core/src/main/java/hudson/diagnosis/NullIdDescriptorMonitor.java
+++ b/core/src/main/java/hudson/diagnosis/NullIdDescriptorMonitor.java
@@ -55,7 +55,7 @@ public String getDisplayName() {
         return Messages.NullIdDescriptorMonitor_DisplayName();
     }
 
-    private final List<Descriptor> problems = new ArrayList<Descriptor>();
+    private final List<Descriptor> problems = new ArrayList<>();
 
     @Override
     public boolean isActivated() {
diff --git a/core/src/main/java/hudson/diagnosis/OldDataMonitor.java b/core/src/main/java/hudson/diagnosis/OldDataMonitor.java
index 7fc185737c15..c4317b4816af 100644
--- a/core/src/main/java/hudson/diagnosis/OldDataMonitor.java
+++ b/core/src/main/java/hudson/diagnosis/OldDataMonitor.java
@@ -78,7 +78,7 @@
 public class OldDataMonitor extends AdministrativeMonitor {
     private static final Logger LOGGER = Logger.getLogger(OldDataMonitor.class.getName());
 
-    private ConcurrentMap<SaveableReference,VersionRange> data = new ConcurrentHashMap<SaveableReference,VersionRange>();
+    private ConcurrentMap<SaveableReference,VersionRange> data = new ConcurrentHashMap<>();
 
     /**
      * Gets instance of the monitor.
@@ -106,7 +106,7 @@ public boolean isActivated() {
     }
 
     public Map<Saveable,VersionRange> getData() {
-        Map<Saveable,VersionRange> r = new HashMap<Saveable,VersionRange>();
+        Map<Saveable,VersionRange> r = new HashMap<>();
         for (Map.Entry<SaveableReference,VersionRange> entry : this.data.entrySet()) {
             Saveable s = entry.getKey().get();
             if (s != null) {
diff --git a/core/src/main/java/hudson/init/InitStrategy.java b/core/src/main/java/hudson/init/InitStrategy.java
index 9d7d287c4310..c6c5795e546c 100644
--- a/core/src/main/java/hudson/init/InitStrategy.java
+++ b/core/src/main/java/hudson/init/InitStrategy.java
@@ -45,7 +45,7 @@ public class InitStrategy {
      *      and when that happens, Jenkins will ignore all but the first one in the list.
      */
     public List<File> listPluginArchives(PluginManager pm) throws IOException {
-        List<File> r = new ArrayList<File>();
+        List<File> r = new ArrayList<>();
 
         // the ordering makes sure that during the debugging we get proper precedence among duplicates.
         // for example, while doing "mvn jpi:run" or "mvn hpi:run" on a plugin that's bundled with Jenkins, we want to the
diff --git a/core/src/main/java/hudson/init/TaskMethodFinder.java b/core/src/main/java/hudson/init/TaskMethodFinder.java
index 0e09bfe26782..bbd60a61bfe0 100644
--- a/core/src/main/java/hudson/init/TaskMethodFinder.java
+++ b/core/src/main/java/hudson/init/TaskMethodFinder.java
@@ -32,7 +32,7 @@
 abstract class TaskMethodFinder<T extends Annotation> extends TaskBuilder {
     private static final Logger LOGGER = Logger.getLogger(TaskMethodFinder.class.getName());
     protected final ClassLoader cl;
-    private final Set<Method> discovered = new HashSet<Method>();
+    private final Set<Method> discovered = new HashSet<>();
 
     private final Class<T> type;
     private final Class<? extends Enum> milestoneType;
@@ -52,7 +52,7 @@ public TaskMethodFinder(Class<T> type, Class<? extends Enum> milestoneType, Clas
     protected abstract boolean fatalOf(T i);
 
     public Collection<Task> discoverTasks(Reactor session) throws IOException {
-        List<Task> result = new ArrayList<Task>();
+        List<Task> result = new ArrayList<>();
         for (Method e : Index.list(type, cl, Method.class)) {
             if (filter(e)) continue;   // already reported once
 
@@ -180,7 +180,7 @@ public String toString() {
         }
 
         private Collection<Milestone> toMilestones(String[] tokens, Milestone m) {
-            List<Milestone> r = new ArrayList<Milestone>();
+            List<Milestone> r = new ArrayList<>();
             for (String s : tokens) {
                 try {
                     r.add((Milestone)Enum.valueOf(milestoneType,s));
diff --git a/core/src/main/java/hudson/logging/LogRecorder.java b/core/src/main/java/hudson/logging/LogRecorder.java
index 0ca0d57196a8..85de03238709 100644
--- a/core/src/main/java/hudson/logging/LogRecorder.java
+++ b/core/src/main/java/hudson/logging/LogRecorder.java
@@ -75,7 +75,7 @@
 public class LogRecorder extends AbstractModelObject implements Saveable {
     private volatile String name;
 
-    public final CopyOnWriteList<Target> targets = new CopyOnWriteList<Target>();
+    public final CopyOnWriteList<Target> targets = new CopyOnWriteList<>();
     private final static TargetComparator TARGET_COMPARATOR = new TargetComparator();
     
     @Restricted(NoExternalUse.class)
diff --git a/core/src/main/java/hudson/logging/LogRecorderManager.java b/core/src/main/java/hudson/logging/LogRecorderManager.java
index 78c24c2a2efb..a572900a5597 100644
--- a/core/src/main/java/hudson/logging/LogRecorderManager.java
+++ b/core/src/main/java/hudson/logging/LogRecorderManager.java
@@ -68,7 +68,7 @@ public class LogRecorderManager extends AbstractModelObject implements ModelObje
     /**
      * {@link LogRecorder}s keyed by their {@linkplain LogRecorder#name name}.
      */
-    public transient final Map<String,LogRecorder> logRecorders = new CopyOnWriteMap.Tree<String,LogRecorder>();
+    public transient final Map<String,LogRecorder> logRecorders = new CopyOnWriteMap.Tree<>();
 
     public String getDisplayName() {
         return Messages.LogRecorderManager_DisplayName();
@@ -160,7 +160,7 @@ public void doRss( StaplerRequest req, StaplerResponse rsp ) throws IOException,
         String level = req.getParameter("level");
         if(level!=null) {
             Level threshold = Level.parse(level);
-            List<LogRecord> filtered = new ArrayList<LogRecord>();
+            List<LogRecord> filtered = new ArrayList<>();
             for (LogRecord r : logs) {
                 if(r.getLevel().intValue() >= threshold.intValue())
                     filtered.add(r);
diff --git a/core/src/main/java/hudson/logging/WeakLogHandler.java b/core/src/main/java/hudson/logging/WeakLogHandler.java
index 339c50ef6411..9a51f279de28 100644
--- a/core/src/main/java/hudson/logging/WeakLogHandler.java
+++ b/core/src/main/java/hudson/logging/WeakLogHandler.java
@@ -44,7 +44,7 @@ public final class WeakLogHandler extends Handler {
     public WeakLogHandler(Handler target, Logger logger) {
         this.logger = logger;
         logger.addHandler(this);
-        this.target = new WeakReference<Handler>(target);
+        this.target = new WeakReference<>(target);
     }
 
     public void publish(LogRecord record) {
diff --git a/core/src/main/java/hudson/model/AbstractBuild.java b/core/src/main/java/hudson/model/AbstractBuild.java
index 2268f3dd9967..a868edb9de94 100644
--- a/core/src/main/java/hudson/model/AbstractBuild.java
+++ b/core/src/main/java/hudson/model/AbstractBuild.java
@@ -465,7 +465,7 @@ public Result run(@Nonnull BuildListener listener) throws Exception {
                     listener.getLogger().print(Messages.AbstractBuild_BuildingOnMaster());
                 } else {
                     listener.getLogger().print(Messages.AbstractBuild_BuildingRemotely(ModelHyperlinkNote.encodeTo("/computer/" + builtOn, node.getDisplayName())));
-                    Set<LabelAtom> assignedLabels = new HashSet<LabelAtom>(node.getAssignedLabels());
+                    Set<LabelAtom> assignedLabels = new HashSet<>(node.getAssignedLabels());
                     assignedLabels.remove(node.getSelfLabel());
                     if (!assignedLabels.isEmpty()) {
                         boolean first = true;
@@ -536,7 +536,7 @@ protected Launcher createLauncher(@Nonnull BuildListener listener) throws IOExce
                     l = bw.decorateLauncher(AbstractBuild.this,l,listener);
             }
 
-            buildEnvironments = new ArrayList<Environment>();
+            buildEnvironments = new ArrayList<>();
 
             for (RunListener rl: RunListener.all()) {
                 Environment environment = rl.setUpEnvironment(AbstractBuild.this, l, listener);
@@ -583,7 +583,7 @@ public void defaultCheckout() throws IOException, InterruptedException {
                         }
 
                         build.scm = scm.createChangeLogParser();
-                        build.changeSet = new WeakReference<ChangeLogSet<? extends Entry>>(build.calcChangeSet());
+                        build.changeSet = new WeakReference<>(build.calcChangeSet());
 
                         for (SCMListener l : SCMListener.all())
                             try {
@@ -635,7 +635,7 @@ public final void post(BuildListener listener) throws Exception {
                 post2(listener);
             } finally {
                 // update the culprit list
-                HashSet<String> r = new HashSet<String>();
+                HashSet<String> r = new HashSet<>();
                 for (User u : getCulprits())
                     r.add(u.getId());
                 culprits = ImmutableSortedSet.copyOf(r);
@@ -834,7 +834,7 @@ protected final boolean preBuild(BuildListener listener,Iterable<? extends Build
         if (cs==null)
             cs = ChangeLogSet.createEmpty(this);
 
-        changeSet = new WeakReference<ChangeLogSet<? extends Entry>>(cs);
+        changeSet = new WeakReference<>(cs);
         return cs;
     }
 
@@ -903,7 +903,7 @@ public EnvVars getEnvironment(TaskListener log) throws IOException, InterruptedE
     public EnvironmentList getEnvironments() {
         Executor e = Executor.currentExecutor();
         if (e!=null && e.getCurrentExecutable()==this) {
-            if (buildEnvironments==null)    buildEnvironments = new ArrayList<Environment>();
+            if (buildEnvironments==null)    buildEnvironments = new ArrayList<>();
             return new EnvironmentList(buildEnvironments); 
         }
         
@@ -936,7 +936,7 @@ public List<Action> getPersistentActions(){
      * @since 1.378
      */
     public Set<String> getSensitiveBuildVariables() {
-        Set<String> s = new HashSet<String>();
+        Set<String> s = new HashSet<>();
 
         ParametersAction parameters = getAction(ParametersAction.class);
         if (parameters != null) {
@@ -973,7 +973,7 @@ public Set<String> getSensitiveBuildVariables() {
      *      The returned map is mutable so that subtypes can put more values.
      */
     public Map<String,String> getBuildVariables() {
-        Map<String,String> r = new HashMap<String, String>();
+        Map<String,String> r = new HashMap<>();
 
         ParametersAction parameters = getAction(ParametersAction.class);
         if (parameters!=null) {
@@ -1000,7 +1000,7 @@ public Map<String,String> getBuildVariables() {
      * Creates {@link VariableResolver} backed by {@link #getBuildVariables()}.
      */
     public final VariableResolver<String> getBuildVariableResolver() {
-        return new VariableResolver.ByMap<String>(getBuildVariables());
+        return new VariableResolver.ByMap<>(getBuildVariables());
     }
 
     /**
@@ -1173,7 +1173,7 @@ public AbstractBuild<?,?> getUpstreamRelationshipBuild(AbstractProject<?,?> that
      *      of builds (which can be empty if no build uses the artifact from this build or downstream is not {@link AbstractProject#isFingerprintConfigured}.)
      */
     public Map<AbstractProject,RangeSet> getDownstreamBuilds() {
-        Map<AbstractProject,RangeSet> r = new HashMap<AbstractProject,RangeSet>();
+        Map<AbstractProject,RangeSet> r = new HashMap<>();
         for (AbstractProject p : getParent().getDownstreamProjects()) {
             if (p.isFingerprintConfigured())
                 r.put(p,getDownstreamRelationship(p));
@@ -1200,7 +1200,7 @@ public Map<AbstractProject,Integer> getTransitiveUpstreamBuilds() {
     }
 
     private Map<AbstractProject, Integer> _getUpstreamBuilds(Collection<AbstractProject> projects) {
-        Map<AbstractProject,Integer> r = new HashMap<AbstractProject,Integer>();
+        Map<AbstractProject,Integer> r = new HashMap<>();
         for (AbstractProject p : projects) {
             int n = getUpstreamRelationship(p);
             if (n>=0)
@@ -1222,7 +1222,7 @@ public Map<AbstractProject,DependencyChange> getDependencyChanges(AbstractBuild
         Map<AbstractProject,Integer> ndep = n.getDependencies(true);
         Map<AbstractProject,Integer> odep = o.getDependencies(true);
 
-        Map<AbstractProject,DependencyChange> r = new HashMap<AbstractProject,DependencyChange>();
+        Map<AbstractProject,DependencyChange> r = new HashMap<>();
 
         for (Map.Entry<AbstractProject,Integer> entry : odep.entrySet()) {
             AbstractProject p = entry.getKey();
@@ -1274,7 +1274,7 @@ public DependencyChange(AbstractProject<?,?> project, int fromId, int toId) {
          * of IDs, but due to log rotations, some builds may be already unavailable.
          */
         public List<AbstractBuild> getBuilds() {
-            List<AbstractBuild> r = new ArrayList<AbstractBuild>();
+            List<AbstractBuild> r = new ArrayList<>();
 
             AbstractBuild<?,?> b = project.getNearestBuild(fromId);
             if (b!=null && b.getNumber()==fromId)
diff --git a/core/src/main/java/hudson/model/Actionable.java b/core/src/main/java/hudson/model/Actionable.java
index 96eeda813ab2..496c2de2866c 100644
--- a/core/src/main/java/hudson/model/Actionable.java
+++ b/core/src/main/java/hudson/model/Actionable.java
@@ -78,7 +78,7 @@ public List<Action> getActions() {
         if (actions == null) {
             synchronized (this) {
                 if (actions == null) {
-                    actions = new CopyOnWriteArrayList<Action>();
+                    actions = new CopyOnWriteArrayList<>();
                 }
             }
         }
@@ -196,7 +196,7 @@ public boolean addOrReplaceAction(@Nonnull Action a) {
             throw new IllegalArgumentException("Action must be non-null");
         }
         // CopyOnWriteArrayList does not support Iterator.remove, so need to do it this way:
-        List<Action> old = new ArrayList<Action>(1);
+        List<Action> old = new ArrayList<>(1);
         List<Action> current = getActions();
         boolean found = false;
         for (Action a2 : current) {
@@ -255,7 +255,7 @@ public boolean removeActions(@Nonnull Class<? extends Action> clazz) {
             throw new IllegalArgumentException("Action type must be non-null");
         }
         // CopyOnWriteArrayList does not support Iterator.remove, so need to do it this way:
-        List<Action> old = new ArrayList<Action>();
+        List<Action> old = new ArrayList<>();
         List<Action> current = getActions();
         for (Action a : current) {
             if (clazz.isInstance(a)) {
@@ -290,7 +290,7 @@ public boolean replaceActions(@Nonnull Class<? extends Action> clazz, @Nonnull A
             throw new IllegalArgumentException("Action must be non-null");
         }
         // CopyOnWriteArrayList does not support Iterator.remove, so need to do it this way:
-        List<Action> old = new ArrayList<Action>();
+        List<Action> old = new ArrayList<>();
         List<Action> current = getActions();
         boolean found = false;
         for (Action a1 : current) {
diff --git a/core/src/main/java/hudson/model/AutoCompletionCandidates.java b/core/src/main/java/hudson/model/AutoCompletionCandidates.java
index 29ce16f4ca59..e8e64b8e4833 100644
--- a/core/src/main/java/hudson/model/AutoCompletionCandidates.java
+++ b/core/src/main/java/hudson/model/AutoCompletionCandidates.java
@@ -48,7 +48,7 @@
  * @author Kohsuke Kawaguchi
  */
 public class AutoCompletionCandidates implements HttpResponse {
-    private final List<String> values = new ArrayList<String>();
+    private final List<String> values = new ArrayList<>();
 
     public AutoCompletionCandidates add(String v) {
         values.add(v);
diff --git a/core/src/main/java/hudson/model/Build.java b/core/src/main/java/hudson/model/Build.java
index 15aed23050bc..00f9c21d4eb4 100644
--- a/core/src/main/java/hudson/model/Build.java
+++ b/core/src/main/java/hudson/model/Build.java
@@ -147,7 +147,7 @@ protected Result doRun(@Nonnull BuildListener listener) throws Exception {
 
             Result r = null;
             try {
-                List<BuildWrapper> wrappers = new ArrayList<BuildWrapper>(project.getBuildWrappers().values());
+                List<BuildWrapper> wrappers = new ArrayList<>(project.getBuildWrappers().values());
                 
                 ParametersAction parameters = getAction(ParametersAction.class);
                 if (parameters != null)
diff --git a/core/src/main/java/hudson/model/Cause.java b/core/src/main/java/hudson/model/Cause.java
index d05cd867b505..4758f17dd06c 100644
--- a/core/src/main/java/hudson/model/Cause.java
+++ b/core/src/main/java/hudson/model/Cause.java
@@ -175,8 +175,8 @@ public UpstreamCause(Run<?, ?> up) {
             upstreamBuild = up.getNumber();
             upstreamProject = up.getParent().getFullName();
             upstreamUrl = up.getParent().getUrl();
-            upstreamCauses = new ArrayList<Cause>();
-            Set<String> traversed = new HashSet<String>();
+            upstreamCauses = new ArrayList<>();
+            Set<String> traversed = new HashSet<>();
             for (Cause c : up.getCauses()) {
                 upstreamCauses.add(trim(c, MAX_DEPTH, traversed));
             }
@@ -234,7 +234,7 @@ public int hashCode() {
                 return c;
             }
             UpstreamCause uc = (UpstreamCause) c;
-            List<Cause> cs = new ArrayList<Cause>();
+            List<Cause> cs = new ArrayList<>();
             if (depth > 0) {
                 if (traversed.add(uc.upstreamUrl + uc.upstreamBuild)) {
                     for (Cause c2 : uc.upstreamCauses) {
@@ -333,7 +333,7 @@ public static class ConverterImpl extends XStream2.PassthruConverter<UpstreamCau
             public ConverterImpl(XStream2 xstream) { super(xstream); }
             @Override protected void callback(UpstreamCause uc, UnmarshallingContext context) {
                 if (uc.upstreamCause != null) {
-                    if (uc.upstreamCauses == null) uc.upstreamCauses = new ArrayList<Cause>();
+                    if (uc.upstreamCauses == null) uc.upstreamCauses = new ArrayList<>();
                     uc.upstreamCauses.add(uc.upstreamCause);
                     uc.upstreamCause = null;
                     OldDataMonitor.report(context, "1.288");
diff --git a/core/src/main/java/hudson/model/ChoiceParameterDefinition.java b/core/src/main/java/hudson/model/ChoiceParameterDefinition.java
index 9ea14153624d..ffe11cb3fdab 100644
--- a/core/src/main/java/hudson/model/ChoiceParameterDefinition.java
+++ b/core/src/main/java/hudson/model/ChoiceParameterDefinition.java
@@ -45,7 +45,7 @@ public ChoiceParameterDefinition(String name, String choices, String description
 
     public ChoiceParameterDefinition(String name, String[] choices, String description) {
         super(name, description);
-        this.choices = new ArrayList<String>(Arrays.asList(choices));
+        this.choices = new ArrayList<>(Arrays.asList(choices));
         defaultValue = null;
     }
 
diff --git a/core/src/main/java/hudson/model/Computer.java b/core/src/main/java/hudson/model/Computer.java
index e4c3a661b84d..9a271550a25a 100644
--- a/core/src/main/java/hudson/model/Computer.java
+++ b/core/src/main/java/hudson/model/Computer.java
@@ -150,9 +150,9 @@
 @ExportedBean
 public /*transient*/ abstract class Computer extends Actionable implements AccessControlled, ExecutorListener, DescriptorByNameOwner {
 
-    private final CopyOnWriteArrayList<Executor> executors = new CopyOnWriteArrayList<Executor>();
+    private final CopyOnWriteArrayList<Executor> executors = new CopyOnWriteArrayList<>();
     // TODO:
-    private final CopyOnWriteArrayList<OneOffExecutor> oneOffExecutors = new CopyOnWriteArrayList<OneOffExecutor>();
+    private final CopyOnWriteArrayList<OneOffExecutor> oneOffExecutors = new CopyOnWriteArrayList<>();
 
     private int numExecutors;
 
@@ -199,7 +199,7 @@
      * @see Executor#resetWorkUnit(String)
      */
     private transient final List<TerminationRequest> terminatedBy = Collections.synchronizedList(new ArrayList
-            <TerminationRequest>());
+            <>());
 
     /**
      * This method captures the information of a request to terminate a computer instance. Method is public as
@@ -241,7 +241,7 @@ public void recordTermination() {
      * @since 1.607
      */
     public List<TerminationRequest> getTerminatedBy() {
-        return new ArrayList<TerminationRequest>(terminatedBy);
+        return new ArrayList<>(terminatedBy);
     }
 
     public Computer(Node node) {
@@ -260,7 +260,7 @@ public List<ComputerPanelBox> getComputerPanelBoxs(){
      */
     @SuppressWarnings("deprecation")
     public List<Action> getActions() {
-    	List<Action> result = new ArrayList<Action>();
+    	List<Action> result = new ArrayList<>();
     	result.addAll(super.getActions());
     	synchronized (this) {
     		if (transientActions == null) {
@@ -327,7 +327,7 @@ public String getLog() throws IOException {
      */
     public AnnotatedLargeText<Computer> getLogText() {
         checkPermission(CONNECT);
-        return new AnnotatedLargeText<Computer>(getLogFile(), Charset.defaultCharset(), false, this);
+        return new AnnotatedLargeText<>(getLogFile(), Charset.defaultCharset(), false, this);
     }
 
     public ACL getACL() {
@@ -910,7 +910,7 @@ private void addNewExecutorIfNecessary() {
         if (Jenkins.getInstanceOrNull() == null) {
             return;
         }
-        Set<Integer> availableNumbers  = new HashSet<Integer>();
+        Set<Integer> availableNumbers  = new HashSet<>();
         for (int i = 0; i < numExecutors; i++)
             availableNumbers.add(i);
 
@@ -965,7 +965,7 @@ public final int countExecutors() {
     @Exported
     @StaplerDispatchable
     public List<Executor> getExecutors() {
-        return new ArrayList<Executor>(executors);
+        return new ArrayList<>(executors);
     }
 
     /**
@@ -974,7 +974,7 @@ public List<Executor> getExecutors() {
     @Exported
     @StaplerDispatchable
     public List<OneOffExecutor> getOneOffExecutors() {
-        return new ArrayList<OneOffExecutor>(oneOffExecutors);
+        return new ArrayList<>(oneOffExecutors);
     }
 
     /**
@@ -998,7 +998,7 @@ public List<Executor> getAllExecutors() {
     @Restricted(NoExternalUse.class)
     public List<DisplayExecutor> getDisplayExecutors() {
         // The size may change while we are populating, but let's start with a reasonable guess to minimize resizing
-        List<DisplayExecutor> result = new ArrayList<DisplayExecutor>(executors.size()+oneOffExecutors.size());
+        List<DisplayExecutor> result = new ArrayList<>(executors.size() + oneOffExecutors.size());
         int index = 0;
         for (Executor e: executors) {
             if (e.isDisplayCell()) {
@@ -1153,7 +1153,7 @@ public String getSearchUrl() {
      */
     @Exported(inline=true)
     public Map<String/*monitor name*/,Object> getMonitorData() {
-        Map<String,Object> r = new HashMap<String, Object>();
+        Map<String,Object> r = new HashMap<>();
         if (hasPermission(CONNECT)) {
             for (NodeMonitor monitor : NodeMonitor.getAll())
                 r.put(monitor.getClass().getName(), monitor.data(this));
@@ -1324,7 +1324,7 @@ private static class ListPossibleNames extends MasterToSlaveCallable<List<String
         private static final Logger LOGGER = Logger.getLogger(ListPossibleNames.class.getName());
         
         public List<String> call() throws IOException {
-            List<String> names = new ArrayList<String>();
+            List<String> names = new ArrayList<>();
 
             Enumeration<NetworkInterface> nis = NetworkInterface.getNetworkInterfaces();
             while (nis.hasMoreElements()) {
diff --git a/core/src/main/java/hudson/model/ComputerPanelBox.java b/core/src/main/java/hudson/model/ComputerPanelBox.java
index 94ee1aaa3ca9..d5e7e45cba50 100644
--- a/core/src/main/java/hudson/model/ComputerPanelBox.java
+++ b/core/src/main/java/hudson/model/ComputerPanelBox.java
@@ -37,7 +37,7 @@ public Computer getComputer(){
      *      List of all the registered {@link ComputerPanelBox}s.
      */
     public static List<ComputerPanelBox> all(Computer computer) {
-        List<ComputerPanelBox> boxs = new ArrayList<ComputerPanelBox>();
+        List<ComputerPanelBox> boxs = new ArrayList<>();
         for(ComputerPanelBox box:  ExtensionList.lookup(ComputerPanelBox.class)){
             box.setComputer(computer);
             boxs.add(box);
diff --git a/core/src/main/java/hudson/model/ComputerSet.java b/core/src/main/java/hudson/model/ComputerSet.java
index 5dbadb921955..1b618d0d508f 100644
--- a/core/src/main/java/hudson/model/ComputerSet.java
+++ b/core/src/main/java/hudson/model/ComputerSet.java
@@ -85,7 +85,7 @@ public void save() throws IOException {
     };
 
     private static final DescribableList<NodeMonitor,Descriptor<NodeMonitor>> monitors
-            = new DescribableList<NodeMonitor, Descriptor<NodeMonitor>>(MONITORS_OWNER);
+            = new DescribableList<>(MONITORS_OWNER);
 
     @Exported
     public String getDisplayName() {
@@ -129,7 +129,7 @@ public static DescribableList<NodeMonitor,Descriptor<NodeMonitor>> getMonitors()
      * Returns a subset pf {@link #getMonitors()} that are {@linkplain NodeMonitor#isIgnored() not ignored}.
      */
     public static Map<Descriptor<NodeMonitor>,NodeMonitor> getNonIgnoredMonitors() {
-        Map<Descriptor<NodeMonitor>,NodeMonitor> r = new HashMap<Descriptor<NodeMonitor>, NodeMonitor>();
+        Map<Descriptor<NodeMonitor>,NodeMonitor> r = new HashMap<>();
         for (NodeMonitor m : monitors) {
             if(!m.isIgnored())
                 r.put(m.getDescriptor(),m);
@@ -421,7 +421,7 @@ public void doRun() {
      */
     @Nonnull
     public static List<String> getComputerNames() {
-        final ArrayList<String> names = new ArrayList<String>();
+        final ArrayList<String> names = new ArrayList<>();
         for (Computer c : Jenkins.getInstance().getComputers()) {
             if (!c.getName().isEmpty()) {
                 names.add(c.getName());
@@ -435,14 +435,14 @@ public static List<String> getComputerNames() {
     static {
         try {
             DescribableList<NodeMonitor,Descriptor<NodeMonitor>> r
-                    = new DescribableList<NodeMonitor, Descriptor<NodeMonitor>>(Saveable.NOOP);
+                    = new DescribableList<>(Saveable.NOOP);
 
             // load persisted monitors
             XmlFile xf = getConfigFile();
             if(xf.exists()) {
                 DescribableList<NodeMonitor,Descriptor<NodeMonitor>> persisted =
                         (DescribableList<NodeMonitor,Descriptor<NodeMonitor>>) xf.read();
-                List<NodeMonitor> sanitized = new ArrayList<NodeMonitor>();
+                List<NodeMonitor> sanitized = new ArrayList<>();
                 for (NodeMonitor nm : persisted) {
                     try {
                         nm.getDescriptor();
diff --git a/core/src/main/java/hudson/model/DependencyGraph.java b/core/src/main/java/hudson/model/DependencyGraph.java
index 6c7469a3021b..bce830b4ee94 100644
--- a/core/src/main/java/hudson/model/DependencyGraph.java
+++ b/core/src/main/java/hudson/model/DependencyGraph.java
@@ -70,8 +70,8 @@
  */
 public class DependencyGraph implements Comparator<AbstractProject> {
 
-    private Map<AbstractProject, List<DependencyGroup>> forward = new HashMap<AbstractProject, List<DependencyGroup>>();
-    private Map<AbstractProject, List<DependencyGroup>> backward = new HashMap<AbstractProject, List<DependencyGroup>>();
+    private Map<AbstractProject, List<DependencyGroup>> forward = new HashMap<>();
+    private Map<AbstractProject, List<DependencyGroup>> backward = new HashMap<>();
 
     private transient Map<Class<?>, Object> computationalData;
 
@@ -90,7 +90,7 @@ public void build() {
         // Set full privileges while computing to avoid missing any projects the current user cannot see.
         SecurityContext saveCtx = ACL.impersonate(ACL.SYSTEM);
         try {
-            this.computationalData = new HashMap<Class<?>, Object>();
+            this.computationalData = new HashMap<>();
             for( AbstractProject p : Jenkins.getInstance().allItems(AbstractProject.class) )
                 p.buildDependencyGraph(this);
 
@@ -113,7 +113,7 @@ private void topologicalDagSort() {
         DirectedGraph<AbstractProject> g = new DirectedGraph<AbstractProject>() {
             @Override
             protected Collection<AbstractProject> nodes() {
-                final Set<AbstractProject> nodes = new HashSet<AbstractProject>();
+                final Set<AbstractProject> nodes = new HashSet<>();
                 nodes.addAll(forward.keySet());
                 nodes.addAll(backward.keySet());
                 return nodes;
@@ -127,8 +127,8 @@ protected Collection<AbstractProject> forward(AbstractProject node) {
 
         List<SCC<AbstractProject>> sccs = g.getStronglyConnectedComponents();
 
-        final Map<AbstractProject,Integer> topoOrder = new HashMap<AbstractProject,Integer>();
-        topologicallySorted = new ArrayList<AbstractProject<?,?>>();
+        final Map<AbstractProject,Integer> topoOrder = new HashMap<>();
+        topologicallySorted = new ArrayList<>();
         int idx=0;
         for (SCC<AbstractProject> scc : sccs) {
             for (AbstractProject n : scc) {
@@ -196,7 +196,7 @@ public List<AbstractProject> getUpstream(AbstractProject p) {
     private List<AbstractProject> get(Map<AbstractProject, List<DependencyGroup>> map, AbstractProject src, boolean up) {
         List<DependencyGroup> v = map.get(src);
         if(v==null) return Collections.emptyList();
-        List<AbstractProject> result = new ArrayList<AbstractProject>(v.size());
+        List<AbstractProject> result = new ArrayList<>(v.size());
         for (DependencyGroup d : v) result.add(up ? d.getUpstreamProject() : d.getDownstreamProject());
         return result;
     }
@@ -284,8 +284,8 @@ public void addDependencyDeclarers(AbstractProject upstream, Collection<?> possi
      * where the length is greater than 1.
      */
     public boolean hasIndirectDependencies(AbstractProject src, AbstractProject dst) {
-        Set<AbstractProject> visited = new HashSet<AbstractProject>();
-        Stack<AbstractProject> queue = new Stack<AbstractProject>();
+        Set<AbstractProject> visited = new HashSet<>();
+        Stack<AbstractProject> queue = new Stack<>();
 
         queue.addAll(getDownstream(src));
         queue.remove(dst);
@@ -316,8 +316,8 @@ public Set<AbstractProject> getTransitiveDownstream(AbstractProject src) {
     }
 
     private Set<AbstractProject> getTransitive(Map<AbstractProject, List<DependencyGroup>> direction, AbstractProject src, boolean up) {
-        Set<AbstractProject> visited = new HashSet<AbstractProject>();
-        Stack<AbstractProject> queue = new Stack<AbstractProject>();
+        Set<AbstractProject> visited = new HashSet<>();
+        Stack<AbstractProject> queue = new Stack<>();
 
         queue.add(src);
 
@@ -336,7 +336,7 @@ private Set<AbstractProject> getTransitive(Map<AbstractProject, List<DependencyG
     private void add(Map<AbstractProject, List<DependencyGroup>> map, AbstractProject key, Dependency dep) {
         List<DependencyGroup> set = map.get(key);
         if(set==null) {
-            set = new ArrayList<DependencyGroup>();
+            set = new ArrayList<>();
             map.put(key,set);
         }
         for (DependencyGroup d : set) {
@@ -457,7 +457,7 @@ public int hashCode() {
      * Collect multiple dependencies between the same two projects.
      */
     private static class DependencyGroup {
-        private Set<Dependency> group = new LinkedHashSet<Dependency>();
+        private Set<Dependency> group = new LinkedHashSet<>();
 
         DependencyGroup(Dependency first) {
             this.upstream = first.getUpstreamProject();
diff --git a/core/src/main/java/hudson/model/Descriptor.java b/core/src/main/java/hudson/model/Descriptor.java
index 3d941cd0586d..b00b60e4fb56 100644
--- a/core/src/main/java/hudson/model/Descriptor.java
+++ b/core/src/main/java/hudson/model/Descriptor.java
@@ -137,7 +137,7 @@ public abstract class Descriptor<T extends Describable<T>> implements Saveable,
      */
     public transient final Class<? extends T> clazz;
 
-    private transient final Map<String,CheckMethod> checkMethods = new ConcurrentHashMap<String,CheckMethod>(2);
+    private transient final Map<String,CheckMethod> checkMethods = new ConcurrentHashMap<>(2);
 
     /**
      * Lazily computed list of properties on {@link #clazz} and on the descriptor itself.
@@ -233,7 +233,7 @@ public List<? extends Descriptor> getApplicableItemDescriptors() {
      *
      * @see #getHelpFile(String) 
      */
-    private transient final Map<String,HelpRedirect> helpRedirect = new HashMap<String,HelpRedirect>(2);
+    private transient final Map<String,HelpRedirect> helpRedirect = new HashMap<>(2);
 
     private static class HelpRedirect {
         private final Class<? extends Describable> owner;
@@ -416,7 +416,7 @@ public void calcFillSettings(String field, Map<String,Object> attributes) {
             throw new IllegalStateException(String.format("%s doesn't have the %s method for filling a drop-down list", getClass(), methodName));
 
         // build query parameter line by figuring out what should be submitted
-        List<String> depends = buildFillDependencies(method, new ArrayList<String>());
+        List<String> depends = buildFillDependencies(method, new ArrayList<>());
 
         if (!depends.isEmpty())
             attributes.put("fillDependsOn",Util.join(depends," "));
@@ -506,7 +506,7 @@ public PropertyType getGlobalPropertyType(String field) {
      * Given the class, list up its {@link PropertyType}s from its public fields/getters.
      */
     private Map<String, PropertyType> buildPropertyTypes(Class<?> clazz) {
-        Map<String, PropertyType> r = new HashMap<String, PropertyType>();
+        Map<String, PropertyType> r = new HashMap<>();
         for (Field f : clazz.getFields())
             r.put(f.getName(),new PropertyType(f));
 
@@ -855,7 +855,7 @@ protected final String getViewPage(Class<?> clazz, String pageName) {
     }
 
     protected List<String> getPossibleViewNames(String baseName) {
-        List<String> names = new ArrayList<String>();
+        List<String> names = new ArrayList<>();
         for (Facet f : WebApp.get(Jenkins.getInstance().servletContext).facets) {
             if (f instanceof JellyCompatibleFacet) {
                 JellyCompatibleFacet jcf = (JellyCompatibleFacet) f;
@@ -981,12 +981,12 @@ public static <T> T[] toArray( T... values ) {
     }
 
     public static <T> List<T> toList( T... values ) {
-        return new ArrayList<T>(Arrays.asList(values));
+        return new ArrayList<>(Arrays.asList(values));
     }
 
     public static <T extends Describable<T>>
     Map<Descriptor<T>,T> toMap(Iterable<T> describables) {
-        Map<Descriptor<T>,T> m = new LinkedHashMap<Descriptor<T>,T>();
+        Map<Descriptor<T>,T> m = new LinkedHashMap<>();
         for (T d : describables) {
             Descriptor<T> descriptor;
             try {
@@ -1025,7 +1025,7 @@ List<T> newInstancesFromHeteroList(StaplerRequest req, JSONObject formData, Stri
     List<T> newInstancesFromHeteroList(StaplerRequest req, Object formData,
                 Collection<? extends Descriptor<T>> descriptors) throws FormException {
 
-        List<T> items = new ArrayList<T>();
+        List<T> items = new ArrayList<>();
 
         if (formData!=null) {
             for (Object o : JSONArray.fromObject(formData)) {
diff --git a/core/src/main/java/hudson/model/DescriptorVisibilityFilter.java b/core/src/main/java/hudson/model/DescriptorVisibilityFilter.java
index e449569500d8..ef099a64dc77 100644
--- a/core/src/main/java/hudson/model/DescriptorVisibilityFilter.java
+++ b/core/src/main/java/hudson/model/DescriptorVisibilityFilter.java
@@ -65,7 +65,7 @@ public static ExtensionList<DescriptorVisibilityFilter> all() {
 
     public static <T extends Descriptor> List<T> apply(Object context, Iterable<T> source) {
         ExtensionList<DescriptorVisibilityFilter> filters = all();
-        List<T> r = new ArrayList<T>();
+        List<T> r = new ArrayList<>();
         Class<?> contextClass = context == null ? null : context.getClass();
 
         if (source == null) {
@@ -110,7 +110,7 @@ public static <T extends Descriptor> List<T> apply(Object context, Iterable<T> s
 
     public static <T extends Descriptor> List<T> applyType(Class<?> contextClass, Iterable<T> source) {
         ExtensionList<DescriptorVisibilityFilter> filters = all();
-        List<T> r = new ArrayList<T>();
+        List<T> r = new ArrayList<>();
 
         OUTER:
         for (T d : source) {
diff --git a/core/src/main/java/hudson/model/DownloadService.java b/core/src/main/java/hudson/model/DownloadService.java
index 125d58a39490..1b0c4088fb83 100644
--- a/core/src/main/java/hudson/model/DownloadService.java
+++ b/core/src/main/java/hudson/model/DownloadService.java
@@ -309,7 +309,7 @@ public String getUrl() {
          * URLs to download from.
          */
         public List<String> getUrls() {
-            List<String> updateSites = new ArrayList<String>();
+            List<String> updateSites = new ArrayList<>();
             for (UpdateSite site : Jenkins.getActiveInstance().getUpdateCenter().getSiteList()) {
                 String siteUrl = site.getUrl();
                 int baseUrlEnd = siteUrl.indexOf("update-center.json");
diff --git a/core/src/main/java/hudson/model/Executor.java b/core/src/main/java/hudson/model/Executor.java
index 5f90ad1bfcf3..b466779e1ac0 100644
--- a/core/src/main/java/hudson/model/Executor.java
+++ b/core/src/main/java/hudson/model/Executor.java
@@ -139,7 +139,7 @@ public class Executor extends Thread implements ModelObject {
      * Cause of interruption. Access needs to be synchronized.
      */
     @GuardedBy("lock")
-    private final List<CauseOfInterruption> causes = new Vector<CauseOfInterruption>();
+    private final List<CauseOfInterruption> causes = new Vector<>();
 
     public Executor(@Nonnull Computer owner, int n) {
         super("Executor #"+n+" for "+owner.getDisplayName());
@@ -271,7 +271,7 @@ public void recordCauseOfInterruption(Run<?,?> build, TaskListener listener) {
         lock.writeLock().lock();
         try {
             if (causes.isEmpty())   return;
-            r = new ArrayList<CauseOfInterruption>(causes);
+            r = new ArrayList<>(causes);
             causes.clear();
         } finally {
             lock.writeLock().unlock();
@@ -961,7 +961,7 @@ public static long getEstimatedDurationFor(Executable e) {
      * Mechanism to allow threads (in particular the channel request handling threads) to
      * run on behalf of {@link Executor}.
      */
-    private static final ThreadLocal<Executor> IMPERSONATION = new ThreadLocal<Executor>();
+    private static final ThreadLocal<Executor> IMPERSONATION = new ThreadLocal<>();
 
     private static final Logger LOGGER = Logger.getLogger(Executor.class.getName());
 }
diff --git a/core/src/main/java/hudson/model/Fingerprint.java b/core/src/main/java/hudson/model/Fingerprint.java
index cb33903bd190..2a06ca74cf6b 100644
--- a/core/src/main/java/hudson/model/Fingerprint.java
+++ b/core/src/main/java/hudson/model/Fingerprint.java
@@ -349,7 +349,7 @@ public static final class RangeSet {
         private final List<Range> ranges;
 
         public RangeSet() {
-            this(new ArrayList<Range>());
+            this(new ArrayList<>());
         }
 
         private RangeSet(List<Range> data) {
@@ -417,7 +417,7 @@ protected Iterator<Integer> expand(Range range) {
          */
         @Exported
         public synchronized List<Range> getRanges() {
-            return new ArrayList<Range>(ranges);
+            return new ArrayList<>(ranges);
         }
 
         /**
@@ -515,7 +515,7 @@ public synchronized void add(RangeSet that) {
          * @return true if this range set was modified as a result.
          */
         public synchronized boolean retainAll(RangeSet that) {
-            List<Range> intersection = new ArrayList<Range>();
+            List<Range> intersection = new ArrayList<>();
 
             int lhs=0,rhs=0;
             while(lhs<this.ranges.size() && rhs<that.ranges.size()) {
@@ -561,7 +561,7 @@ public synchronized boolean retainAll(RangeSet that) {
          */
         public synchronized boolean removeAll(RangeSet that) {
             boolean modified = false;
-            List<Range> sub = new ArrayList<Range>();
+            List<Range> sub = new ArrayList<>();
 
             int lhs=0,rhs=0;
             while(lhs<this.ranges.size() && rhs<that.ranges.size()) {
@@ -866,9 +866,9 @@ private void locationChanged(Item item, String oldName, String newName) {
     /**
      * Range of builds that use this file keyed by a job full name.
      */
-    private Hashtable<String,RangeSet> usages = new Hashtable<String,RangeSet>();
+    private Hashtable<String,RangeSet> usages = new Hashtable<>();
 
-    PersistedList<FingerprintFacet> facets = new PersistedList<FingerprintFacet>(this);
+    PersistedList<FingerprintFacet> facets = new PersistedList<>(this);
 
     /**
      * Lazily computed immutable {@link FingerprintFacet}s created from {@link TransientFingerprintFacetFactory}.
@@ -967,7 +967,7 @@ public RangeSet getRangeSet(Job job) {
      * Gets the sorted list of job names where this jar is used.
      */
     public @Nonnull List<String> getJobs() {
-        List<String> r = new ArrayList<String>();
+        List<String> r = new ArrayList<>();
         r.addAll(usages.keySet());
         Collections.sort(r);
         return r;
@@ -993,7 +993,7 @@ public RangeItem(String name, RangeSet ranges) {
     // this is for remote API
     @Exported(name="usage")
     public @Nonnull List<RangeItem> _getUsages() {
-        List<RangeItem> r = new ArrayList<RangeItem>();
+        List<RangeItem> r = new ArrayList<>();
         final Jenkins instance = Jenkins.getInstance();
         for (Entry<String, RangeSet> e : usages.entrySet()) {
             final String itemName = e.getKey();
@@ -1032,7 +1032,7 @@ public synchronized void add(@Nonnull String jobFullName, int n) throws IOExcept
     // JENKINS-49588
     protected Object readResolve() {
         if (usages == null) {
-            usages = new Hashtable<String,RangeSet>();
+            usages = new Hashtable<>();
         }
         return this;
     }
@@ -1087,7 +1087,7 @@ public synchronized boolean isAlive() {
     public synchronized boolean trim() throws IOException {
         boolean modified = false;
 
-        for (Entry<String,RangeSet> e : new Hashtable<String,RangeSet>(usages).entrySet()) {// copy because we mutate
+        for (Entry<String,RangeSet> e : new Hashtable<>(usages).entrySet()) {// copy because we mutate
             Job j = Jenkins.getInstance().getItemByFullName(e.getKey(),Job.class);
             if(j==null) {// no such job any more. recycle the record
                 modified = true;
@@ -1158,7 +1158,7 @@ public synchronized boolean trim() throws IOException {
      */
     public @Nonnull Collection<FingerprintFacet> getFacets() {
         if (transientFacets==null) {
-            List<FingerprintFacet> transientFacets = new ArrayList<FingerprintFacet>();
+            List<FingerprintFacet> transientFacets = new ArrayList<>();
             for (TransientFingerprintFacetFactory fff : TransientFingerprintFacetFactory.all()) {
                 fff.createFor(this,transientFacets);
             }
@@ -1199,7 +1199,7 @@ public int size() {
      * @return Sorted list of {@link FingerprintFacet}s 
      */
     public @Nonnull Collection<FingerprintFacet> getSortedFacets() {
-        List<FingerprintFacet> r = new ArrayList<FingerprintFacet>(getFacets());
+        List<FingerprintFacet> r = new ArrayList<>(getFacets());
         Collections.sort(r,new Comparator<FingerprintFacet>() {
             public int compare(FingerprintFacet o1, FingerprintFacet o2) {
                 long a = o1.getTimestamp();
@@ -1230,7 +1230,7 @@ public int compare(FingerprintFacet o1, FingerprintFacet o2) {
      * Returns the actions contributed from {@link #getFacets()}
      */
     public @Nonnull List<Action> getActions() {
-        List<Action> r = new ArrayList<Action>();
+        List<Action> r = new ArrayList<>();
         for (FingerprintFacet ff : getFacets())
             ff.createActions(r);
         return Collections.unmodifiableList(r);
@@ -1381,7 +1381,7 @@ public Api getApi() {
             if(logger.isLoggable(Level.FINE))
                 logger.fine("Loading fingerprint "+file+" took "+(System.currentTimeMillis()-start)+"ms");
             if (f.facets==null)
-                f.facets = new PersistedList<FingerprintFacet>(f);
+                f.facets = new PersistedList<>(f);
             for (FingerprintFacet facet : f.facets)
                 facet._setOwner(f);
             return f;
@@ -1420,7 +1420,7 @@ private static String messageOfParseException(Throwable t) {
     }
 
     @Override public String toString() {
-        return "Fingerprint[original=" + original + ",hash=" + getHashString() + ",fileName=" + fileName + ",timestamp=" + DATE_CONVERTER.toString(timestamp) + ",usages=" + ((usages == null) ? "null" : new TreeMap<String,RangeSet>(getUsages())) + ",facets=" + facets + "]";
+        return "Fingerprint[original=" + original + ",hash=" + getHashString() + ",fileName=" + fileName + ",timestamp=" + DATE_CONVERTER.toString(timestamp) + ",usages=" + ((usages == null) ? "null" : new TreeMap<>(getUsages())) + ",facets=" + facets + "]";
     }
     
     /**
diff --git a/core/src/main/java/hudson/model/HealthReport.java b/core/src/main/java/hudson/model/HealthReport.java
index ddcc1f9deceb..7b675382723c 100644
--- a/core/src/main/java/hudson/model/HealthReport.java
+++ b/core/src/main/java/hudson/model/HealthReport.java
@@ -62,7 +62,7 @@ public class HealthReport implements Serializable, Comparable<HealthReport> {
     private static final String HEALTH_0_TO_20_IMG = "health-00to19.png";
     private static final String HEALTH_UNKNOWN_IMG = "empty.png";
 
-    private static final Map<String, String> iconIMGToClassMap = new HashMap<String, String>();
+    private static final Map<String, String> iconIMGToClassMap = new HashMap<>();
     static {
         iconIMGToClassMap.put(HEALTH_OVER_80_IMG, HEALTH_OVER_80);
         iconIMGToClassMap.put(HEALTH_61_TO_80_IMG, HEALTH_61_TO_80);
diff --git a/core/src/main/java/hudson/model/ItemGroupMixIn.java b/core/src/main/java/hudson/model/ItemGroupMixIn.java
index 195d4d8c0ce9..3fb988afa358 100644
--- a/core/src/main/java/hudson/model/ItemGroupMixIn.java
+++ b/core/src/main/java/hudson/model/ItemGroupMixIn.java
@@ -107,7 +107,7 @@ public boolean accept(File child) {
                 return child.isDirectory();
             }
         });
-        CopyOnWriteMap.Tree<K,V> configurations = new CopyOnWriteMap.Tree<K,V>();
+        CopyOnWriteMap.Tree<K,V> configurations = new CopyOnWriteMap.Tree<>();
         for (File subdir : subdirs) {
             try {
                 // Try to retain the identity of an existing child object if we can.
diff --git a/core/src/main/java/hudson/model/Items.java b/core/src/main/java/hudson/model/Items.java
index d0a26238a3d3..12fce1434e9f 100644
--- a/core/src/main/java/hudson/model/Items.java
+++ b/core/src/main/java/hudson/model/Items.java
@@ -69,7 +69,7 @@ public class Items {
      *      Use {@link #all()} for read access and {@link Extension} for registration.
      */
     @Deprecated
-    public static final List<TopLevelItemDescriptor> LIST = (List)new DescriptorList<TopLevelItem>(TopLevelItem.class);
+    public static final List<TopLevelItemDescriptor> LIST = (List) new DescriptorList<>(TopLevelItem.class);
 
     /**
      * Used to behave differently when loading posted configuration as opposed to persisted configuration.
@@ -173,7 +173,7 @@ public static List<TopLevelItemDescriptor> all(ItemGroup c) {
      * @since 1.607
      */
     public static List<TopLevelItemDescriptor> all(Authentication a, ItemGroup c) {
-        List<TopLevelItemDescriptor> result = new ArrayList<TopLevelItemDescriptor>();
+        List<TopLevelItemDescriptor> result = new ArrayList<>();
         ACL acl;
         if (c instanceof AccessControlled) {
             acl = ((AccessControlled) c).getACL();
@@ -224,7 +224,7 @@ public static <T extends Item> List<T> fromNameList(String list, Class<T> type)
     public static <T extends Item> List<T> fromNameList(ItemGroup context, @Nonnull String list, @Nonnull Class<T> type) {
         final Jenkins jenkins = Jenkins.getInstance();
         
-        List<T> r = new ArrayList<T>();
+        List<T> r = new ArrayList<>();
         if (jenkins == null) {
             return r;
         }
@@ -250,7 +250,7 @@ public static String getCanonicalName(ItemGroup context, String path) {
         String[] c = context.getFullName().split("/");
         String[] p = path.split("/");
 
-        Stack<String> name = new Stack<String>();
+        Stack<String> name = new Stack<>();
         for (int i=0; i<c.length;i++) {
             if (i==0 && c[i].equals("")) continue;
             name.push(c[i]);
@@ -294,7 +294,7 @@ public static String getCanonicalName(ItemGroup context, String path) {
     public static String computeRelativeNamesAfterRenaming(String oldFullName, String newFullName, String relativeNames, ItemGroup context) {
 
         StringTokenizer tokens = new StringTokenizer(relativeNames,",");
-        List<String> newValue = new ArrayList<String>();
+        List<String> newValue = new ArrayList<>();
         while(tokens.hasMoreTokens()) {
             String relativeName = tokens.nextToken().trim();
             String canonicalName = getCanonicalName(context, relativeName);
@@ -400,12 +400,12 @@ public static XmlFile getConfigFile(Item item) {
      * @since 1.512
      */
     public static <T extends Item> List<T> getAllItems(final ItemGroup root, Class<T> type) {
-        List<T> r = new ArrayList<T>();
+        List<T> r = new ArrayList<>();
         getAllItems(root, type, r);
         return r;
     }
     private static <T extends Item> void getAllItems(final ItemGroup root, Class<T> type, List<T> r) {
-        List<Item> items = new ArrayList<Item>(((ItemGroup<?>) root).getItems());
+        List<Item> items = new ArrayList<>(((ItemGroup<?>) root).getItems());
         // because we add items depth first, we can use the quicker BY_NAME comparison
         Collections.sort(items, BY_NAME);
         for (Item i : items) {
diff --git a/core/src/main/java/hudson/model/Job.java b/core/src/main/java/hudson/model/Job.java
index 047e90a85f44..820c85e8aea3 100644
--- a/core/src/main/java/hudson/model/Job.java
+++ b/core/src/main/java/hudson/model/Job.java
@@ -175,7 +175,7 @@ public abstract class Job<JobT extends Job<JobT, RunT>, RunT extends Run<JobT, R
      * List of properties configured for this project.
      */
     // this should have been DescribableList but now it's too late
-    protected CopyOnWriteList<JobProperty<? super JobT>> properties = new CopyOnWriteList<JobProperty<? super JobT>>();
+    protected CopyOnWriteList<JobProperty<? super JobT>> properties = new CopyOnWriteList<>();
 
     @Restricted(NoExternalUse.class)
     public transient RunIdMigrator runIdMigrator;
@@ -232,7 +232,7 @@ public void onLoad(ItemGroup<? extends Item> parent, String name)
         }
 
         if (properties == null) // didn't exist < 1.72
-            properties = new CopyOnWriteList<JobProperty<? super JobT>>();
+            properties = new CopyOnWriteList<>();
 
         for (JobProperty p : properties)
             p.setOwner(this);
@@ -595,14 +595,14 @@ public JobProperty getProperty(String className) {
      * @see JobProperty#getJobOverrides
      */
     public Collection<?> getOverrides() {
-        List<Object> r = new ArrayList<Object>();
+        List<Object> r = new ArrayList<>();
         for (JobProperty<? super JobT> p : properties)
             r.addAll(p.getJobOverrides());
         return r;
     }
 
     public List<Widget> getWidgets() {
-        ArrayList<Widget> r = new ArrayList<Widget>();
+        ArrayList<Widget> r = new ArrayList<>();
         r.add(createHistoryWidget());
         return r;
     }
@@ -741,7 +741,7 @@ public RunList<RunT> getNewBuilds() {
      * Obtains all the {@link Run}s whose build numbers matches the given {@link RangeSet}.
      */
     public synchronized List<RunT> getBuilds(RangeSet rs) {
-        List<RunT> builds = new LinkedList<RunT>();
+        List<RunT> builds = new LinkedList<>();
 
         for (Range r : rs.getRanges()) {
             for (RunT b = getNearestBuild(r.start); b!=null && b.getNumber()<r.end; b=b.getNextBuild()) {
@@ -997,7 +997,7 @@ public RunT getLastCompletedBuild() {
      */
     public List<RunT> getLastBuildsOverThreshold(int numberOfBuilds, Result threshold) {
         
-        List<RunT> result = new ArrayList<RunT>(numberOfBuilds);
+        List<RunT> result = new ArrayList<>(numberOfBuilds);
         
         RunT r = getLastBuild();
         while (r != null && result.size() < numberOfBuilds) {
@@ -1021,7 +1021,7 @@ public List<RunT> getLastBuildsOverThreshold(int numberOfBuilds, Result threshol
      */
     @SuppressWarnings("unchecked")
     protected List<RunT> getEstimatedDurationCandidates() {
-        List<RunT> candidates = new ArrayList<RunT>(3);
+        List<RunT> candidates = new ArrayList<>(3);
         RunT lastSuccessful = getLastSuccessfulBuild();
         int lastSuccessfulNumber = -1;
         if (lastSuccessful != null) {
@@ -1031,7 +1031,7 @@ protected List<RunT> getEstimatedDurationCandidates() {
 
         int i = 0;
         RunT r = getLastBuild();
-        List<RunT> fallbackCandidates = new ArrayList<RunT>(3);
+        List<RunT> fallbackCandidates = new ArrayList<>(3);
         while (r != null && candidates.size() < 3 && i < 6) {
             if (!r.isBuilding() && r.getResult() != null && r.getNumber() != lastSuccessfulNumber) {
                 Result result = r.getResult();
@@ -1103,7 +1103,7 @@ public FeedItem(ChangeLogSet.Entry e, int idx) {
             }
         }
 
-        List<FeedItem> entries = new ArrayList<FeedItem>();
+        List<FeedItem> entries = new ArrayList<>();
         String scmDisplayName = "";
         if (this instanceof SCMTriggerItem) {
             SCMTriggerItem scmItem = (SCMTriggerItem) this;
@@ -1199,7 +1199,7 @@ public HealthReport getBuildHealth() {
 
     @Exported(name = "healthReport")
     public List<HealthReport> getBuildHealthReports() {
-        List<HealthReport> reports = new ArrayList<HealthReport>();
+        List<HealthReport> reports = new ArrayList<>();
         RunT lastBuild = getLastBuild();
 
         if (lastBuild != null && lastBuild.isBuilding()) {
@@ -1241,7 +1241,7 @@ public List<HealthReport> getBuildHealthReports() {
 
             // store the cache
             cachedBuildHealthReportsBuildNumber = lastBuild.getNumber();
-            cachedBuildHealthReports = new ArrayList<HealthReport>(reports);
+            cachedBuildHealthReports = new ArrayList<>(reports);
         }
 
         return reports;
@@ -1332,7 +1332,7 @@ public synchronized void doConfigSubmit(StaplerRequest req,
 
                 logRotator = null;
 
-                DescribableList<JobProperty<?>, JobPropertyDescriptor> t = new DescribableList<JobProperty<?>, JobPropertyDescriptor>(NOOP,getAllProperties());
+                DescribableList<JobProperty<?>, JobPropertyDescriptor> t = new DescribableList<>(NOOP, getAllProperties());
                 JSONObject jsonProperties = json.optJSONObject("properties");
                 if (jsonProperties != null) {
                   t.rebuild(req,jsonProperties,JobPropertyDescriptor.getPropertyDescriptors(Job.this.getClass()));
@@ -1469,7 +1469,7 @@ public String toString() {
 
                 }
 
-                DataSetBuilder<String, ChartLabel> data = new DataSetBuilder<String, ChartLabel>();
+                DataSetBuilder<String, ChartLabel> data = new DataSetBuilder<>();
                 for (Run r : getNewBuilds()) {
                     if (r.isBuilding())
                         continue;
diff --git a/core/src/main/java/hudson/model/JobPropertyDescriptor.java b/core/src/main/java/hudson/model/JobPropertyDescriptor.java
index 6955dff091cc..1a90cedf85dd 100644
--- a/core/src/main/java/hudson/model/JobPropertyDescriptor.java
+++ b/core/src/main/java/hudson/model/JobPropertyDescriptor.java
@@ -99,7 +99,7 @@ public boolean isApplicable(Class<? extends Job> jobType) {
      * Gets the {@link JobPropertyDescriptor}s applicable for a given job type.
      */
     public static List<JobPropertyDescriptor> getPropertyDescriptors(Class<? extends Job> clazz) {
-        List<JobPropertyDescriptor> r = new ArrayList<JobPropertyDescriptor>();
+        List<JobPropertyDescriptor> r = new ArrayList<>();
         for (JobPropertyDescriptor p : all())
             if(p.isApplicable(clazz))
                 r.add(p);
diff --git a/core/src/main/java/hudson/model/Label.java b/core/src/main/java/hudson/model/Label.java
index 049d0f89fc32..7e9736078db5 100644
--- a/core/src/main/java/hudson/model/Label.java
+++ b/core/src/main/java/hudson/model/Label.java
@@ -241,7 +241,7 @@ public Set<Node> getSortedNodes() {
     @Exported
     public Set<Cloud> getClouds() {
         if(clouds==null) {
-            Set<Cloud> r = new HashSet<Cloud>();
+            Set<Cloud> r = new HashSet<>();
             Jenkins h = Jenkins.getInstance();
             for (Cloud c : h.clouds) {
                 if(c.canProvision(this))
@@ -381,7 +381,7 @@ private String toString(Collection<? extends ModelObject> model) {
      */
     @Exported
     public List<AbstractProject> getTiedJobs() {
-        List<AbstractProject> r = new ArrayList<AbstractProject>();
+        List<AbstractProject> r = new ArrayList<>();
         for (AbstractProject<?,?> p : Jenkins.getInstance().allItems(AbstractProject.class)) {
             if(p instanceof TopLevelItem && this.equals(p.getAssignedLabel()))
                 r.add(p);
@@ -417,7 +417,7 @@ public int getTiedJobCount() {
                     }
                 }
                 if (topLevelItem instanceof ItemGroup) {
-                    Stack<ItemGroup> q = new Stack<ItemGroup>();
+                    Stack<ItemGroup> q = new Stack<>();
                     q.push((ItemGroup) topLevelItem);
 
                     while (!q.isEmpty()) {
@@ -480,7 +480,7 @@ public Api getApi() {
      * @since 1.420
      */
     public Set<LabelAtom> listAtoms() {
-        Set<LabelAtom> r = new HashSet<LabelAtom>();
+        Set<LabelAtom> r = new HashSet<>();
         accept(ATOM_COLLECTOR,r);
         return r;
     }
diff --git a/core/src/main/java/hudson/model/ListView.java b/core/src/main/java/hudson/model/ListView.java
index 9d84eb32cebb..96d8ce1f9eb5 100644
--- a/core/src/main/java/hudson/model/ListView.java
+++ b/core/src/main/java/hudson/model/ListView.java
@@ -77,7 +77,7 @@ public class ListView extends View implements DirectlyModifiableView {
      * List of job names. This is what gets serialized.
      */
     @GuardedBy("this")
-    /*package*/ /*almost-final*/ SortedSet<String> jobNames = new TreeSet<String>(CaseInsensitiveComparator.INSTANCE);
+    /*package*/ /*almost-final*/ SortedSet<String> jobNames = new TreeSet<>(CaseInsensitiveComparator.INSTANCE);
     
     private DescribableList<ViewJobFilter, Descriptor<ViewJobFilter>> jobFilters;
 
@@ -135,7 +135,7 @@ private Object readResolve() {
         }
         synchronized(this) {
             if (jobNames == null) {
-                jobNames = new TreeSet<String>(CaseInsensitiveComparator.INSTANCE);
+                jobNames = new TreeSet<>(CaseInsensitiveComparator.INSTANCE);
             }
         }
         initColumns();
@@ -145,14 +145,14 @@ private Object readResolve() {
 
     protected void initColumns() {
         if (columns == null)
-            columns = new DescribableList<ListViewColumn, Descriptor<ListViewColumn>>(this,
+            columns = new DescribableList<>(this,
                     ListViewColumn.createDefaultInitialColumnList(getClass())
             );
     }
 
     protected void initJobFilters() {
         if (jobFilters == null)
-            jobFilters = new DescribableList<ViewJobFilter, Descriptor<ViewJobFilter>>(this);
+            jobFilters = new DescribableList<>(this);
     }
 
     /**
@@ -196,14 +196,14 @@ public List<TopLevelItem> getItems() {
      */
     private List<TopLevelItem> getItems(boolean recurse) {
         SortedSet<String> names;
-        List<TopLevelItem> items = new ArrayList<TopLevelItem>();
+        List<TopLevelItem> items = new ArrayList<>();
 
         synchronized (this) {
-            names = new TreeSet<String>(jobNames);
+            names = new TreeSet<>(jobNames);
         }
 
         ItemGroup<? extends TopLevelItem> parent = getOwner().getItemGroup();
-        List<TopLevelItem> parentItems = new ArrayList<TopLevelItem>(parent.getItems());
+        List<TopLevelItem> parentItems = new ArrayList<>(parent.getItems());
         includeItems(parent, parentItems, names);
 
         Boolean statusFilter = this.statusFilter; // capture the value to isolate us from concurrent update
@@ -223,13 +223,13 @@ private List<TopLevelItem> getItems(boolean recurse) {
 
         // check the filters
         Iterable<ViewJobFilter> jobFilters = getJobFilters();
-        List<TopLevelItem> allItems = new ArrayList<TopLevelItem>(parentItems);
-        if (recurse) allItems = expand(allItems, new ArrayList<TopLevelItem>());
+        List<TopLevelItem> allItems = new ArrayList<>(parentItems);
+        if (recurse) allItems = expand(allItems, new ArrayList<>());
     	for (ViewJobFilter jobFilter: jobFilters) {
     		items = jobFilter.filter(items, allItems, this);
     	}
         // for sanity, trim off duplicates
-        items = new ArrayList<TopLevelItem>(new LinkedHashSet<TopLevelItem>(items));
+        items = new ArrayList<>(new LinkedHashSet<>(items));
         
         return items;
     }
@@ -459,12 +459,12 @@ protected void submit(StaplerRequest req) throws ServletException, FormException
         setIncludeRegex(req.getParameter("useincluderegex") != null ? req.getParameter("includeRegex") : null);
 
         if (columns == null) {
-            columns = new DescribableList<ListViewColumn,Descriptor<ListViewColumn>>(this);
+            columns = new DescribableList<>(this);
         }
         columns.rebuildHetero(req, json, ListViewColumn.all(), "columns");
         
         if (jobFilters == null) {
-        	jobFilters = new DescribableList<ViewJobFilter,Descriptor<ViewJobFilter>>(this);
+        	jobFilters = new DescribableList<>(this);
         }
         jobFilters.rebuildHetero(req, json, ViewJobFilter.all(), "jobFilters");
 
@@ -545,7 +545,7 @@ private void locationChanged(ViewGroup vg, String oldFullName, String newFullNam
         private void renameViewItem(String oldFullName, String newFullName, ViewGroup vg, ListView lv) {
             boolean needsSave;
             synchronized (lv) {
-                Set<String> oldJobNames = new HashSet<String>(lv.jobNames);
+                Set<String> oldJobNames = new HashSet<>(lv.jobNames);
                 lv.jobNames.clear();
                 for (String oldName : oldJobNames) {
                     lv.jobNames.add(Items.computeRelativeNamesAfterRenaming(oldFullName, newFullName, oldName, vg.getItemGroup()));
diff --git a/core/src/main/java/hudson/model/LoadBalancer.java b/core/src/main/java/hudson/model/LoadBalancer.java
index ce69e8977930..fca13b938c47 100644
--- a/core/src/main/java/hudson/model/LoadBalancer.java
+++ b/core/src/main/java/hudson/model/LoadBalancer.java
@@ -79,9 +79,9 @@ public abstract class LoadBalancer implements ExtensionPoint {
         @Override
         public Mapping map(Task task, MappingWorksheet ws) {
             // build consistent hash for each work chunk
-            List<ConsistentHash<ExecutorChunk>> hashes = new ArrayList<ConsistentHash<ExecutorChunk>>(ws.works.size());
+            List<ConsistentHash<ExecutorChunk>> hashes = new ArrayList<>(ws.works.size());
             for (int i=0; i<ws.works.size(); i++) {
-                ConsistentHash<ExecutorChunk> hash = new ConsistentHash<ExecutorChunk>(new Hash<ExecutorChunk>() {
+                ConsistentHash<ExecutorChunk> hash = new ConsistentHash<>(new Hash<ExecutorChunk>() {
                     public String hash(ExecutorChunk node) {
                         return node.getName();
                     }
diff --git a/core/src/main/java/hudson/model/MultiStageTimeSeries.java b/core/src/main/java/hudson/model/MultiStageTimeSeries.java
index 62867f2e26a0..a6b226fa7119 100644
--- a/core/src/main/java/hudson/model/MultiStageTimeSeries.java
+++ b/core/src/main/java/hudson/model/MultiStageTimeSeries.java
@@ -201,7 +201,7 @@ public static class TrendChart implements HttpResponse {
 
         public TrendChart(TimeScale timeScale, MultiStageTimeSeries... series) {
             this.timeScale = timeScale;
-            this.series = new ArrayList<MultiStageTimeSeries>(Arrays.asList(series));
+            this.series = new ArrayList<>(Arrays.asList(series));
             this.dataset = createDataset();
         }
 
diff --git a/core/src/main/java/hudson/model/MyView.java b/core/src/main/java/hudson/model/MyView.java
index d24ad9785233..3dcc8e397a39 100644
--- a/core/src/main/java/hudson/model/MyView.java
+++ b/core/src/main/java/hudson/model/MyView.java
@@ -75,7 +75,7 @@ public TopLevelItem doCreateItem(StaplerRequest req, StaplerResponse rsp)
 
     @Override
     public Collection<TopLevelItem> getItems() {
-        List<TopLevelItem> items = new ArrayList<TopLevelItem>();
+        List<TopLevelItem> items = new ArrayList<>();
         for (TopLevelItem item : getOwner().getItemGroup().getItems()) {
             if (item.hasPermission(Item.CONFIGURE)) {
                 items.add(item);
diff --git a/core/src/main/java/hudson/model/MyViewsProperty.java b/core/src/main/java/hudson/model/MyViewsProperty.java
index b4b246e2cae7..4ebb4fdc226b 100644
--- a/core/src/main/java/hudson/model/MyViewsProperty.java
+++ b/core/src/main/java/hudson/model/MyViewsProperty.java
@@ -73,7 +73,7 @@ public class MyViewsProperty extends UserProperty implements ModifiableViewGroup
     /**
      * Always hold at least one view.
      */
-    private CopyOnWriteArrayList<View> views = new CopyOnWriteArrayList<View>();
+    private CopyOnWriteArrayList<View> views = new CopyOnWriteArrayList<>();
 
     private transient ViewGroupMixIn viewGroupMixIn;
 
@@ -91,7 +91,7 @@ private MyViewsProperty() {
     public Object readResolve() {
         if (views == null)
             // this shouldn't happen, but an error in 1.319 meant the last view could be deleted
-            views = new CopyOnWriteArrayList<View>();
+            views = new CopyOnWriteArrayList<>();
 
         if (views.isEmpty()) {
             // preserve the non-empty invariant
diff --git a/core/src/main/java/hudson/model/PageDecorator.java b/core/src/main/java/hudson/model/PageDecorator.java
index 6f42942ace25..a9a5f174fdfc 100644
--- a/core/src/main/java/hudson/model/PageDecorator.java
+++ b/core/src/main/java/hudson/model/PageDecorator.java
@@ -108,7 +108,7 @@ public final String getUrl() {
      *      Use {@link #all()} for read access, and use {@link Extension} for registration.
      */
     @Deprecated
-    public static final List<PageDecorator> ALL = (List)new DescriptorList<PageDecorator>(PageDecorator.class);
+    public static final List<PageDecorator> ALL = (List) new DescriptorList<>(PageDecorator.class);
 
     /**
      * Returns all the registered {@link PageDecorator} descriptors.
diff --git a/core/src/main/java/hudson/model/PaneStatusProperties.java b/core/src/main/java/hudson/model/PaneStatusProperties.java
index 279f72fa64c7..0cd6e0aeeeed 100644
--- a/core/src/main/java/hudson/model/PaneStatusProperties.java
+++ b/core/src/main/java/hudson/model/PaneStatusProperties.java
@@ -13,7 +13,7 @@
 
 public class PaneStatusProperties extends UserProperty implements Saveable {
 	
-	private final PersistedList<String> collapsed = new PersistedList<String>(this);
+	private final PersistedList<String> collapsed = new PersistedList<>(this);
 	
 	private static final PaneStatusProperties FALLBACK = new PaneStatusPropertiesSessionFallback();
 	
diff --git a/core/src/main/java/hudson/model/ParameterDefinition.java b/core/src/main/java/hudson/model/ParameterDefinition.java
index d535a90a0514..57fdf5346845 100644
--- a/core/src/main/java/hudson/model/ParameterDefinition.java
+++ b/core/src/main/java/hudson/model/ParameterDefinition.java
@@ -232,7 +232,7 @@ public static DescriptorExtensionList<ParameterDefinition,ParameterDescriptor> a
      *      Use {@link #all()} for read access, and {@link Extension} for registration.
      */
     @Deprecated
-    public static final DescriptorList<ParameterDefinition> LIST = new DescriptorList<ParameterDefinition>(ParameterDefinition.class);
+    public static final DescriptorList<ParameterDefinition> LIST = new DescriptorList<>(ParameterDefinition.class);
 
     public abstract static class ParameterDescriptor extends
             Descriptor<ParameterDefinition> {
diff --git a/core/src/main/java/hudson/model/ParametersAction.java b/core/src/main/java/hudson/model/ParametersAction.java
index ccf6f4eb908b..6e2ef3468616 100644
--- a/core/src/main/java/hudson/model/ParametersAction.java
+++ b/core/src/main/java/hudson/model/ParametersAction.java
@@ -222,11 +222,11 @@ public boolean shouldSchedule(List<Action> actions) {
             return !parameters.isEmpty();
         } else {
             // I don't think we need multiple ParametersActions, but let's be defensive
-            Set<ParameterValue> params = new HashSet<ParameterValue>();
+            Set<ParameterValue> params = new HashSet<>();
             for (ParametersAction other: others) {
                 params.addAll(other.parameters);
             }
-            return !params.equals(new HashSet<ParameterValue>(this.parameters));
+            return !params.equals(new HashSet<>(this.parameters));
         }
     }
 
@@ -324,7 +324,7 @@ private List<? extends ParameterValue> filter(List<ParameterValue> parameters) {
             return parameters;
         }
 
-        List<ParameterValue> filteredParameters = new ArrayList<ParameterValue>();
+        List<ParameterValue> filteredParameters = new ArrayList<>();
 
         for (ParameterValue v : this.parameters) {
             if (this.parameterDefinitionNames.contains(v.getName()) || isSafeParameter(v.getName())) {
diff --git a/core/src/main/java/hudson/model/ParametersDefinitionProperty.java b/core/src/main/java/hudson/model/ParametersDefinitionProperty.java
index 1fa26ed3720a..815070e093c2 100644
--- a/core/src/main/java/hudson/model/ParametersDefinitionProperty.java
+++ b/core/src/main/java/hudson/model/ParametersDefinitionProperty.java
@@ -138,7 +138,7 @@ public void _doBuild(StaplerRequest req, StaplerResponse rsp, @QueryParameter Ti
             delay=new TimeDuration(TimeUnit.MILLISECONDS.convert(getJob().getQuietPeriod(), TimeUnit.SECONDS));
 
 
-        List<ParameterValue> values = new ArrayList<ParameterValue>();
+        List<ParameterValue> values = new ArrayList<>();
         
         JSONObject formData = req.getSubmittedForm();
         JSONArray a = JSONArray.fromObject(formData.get("parameter"));
@@ -177,7 +177,7 @@ public void buildWithParameters(StaplerRequest req, StaplerResponse rsp) throws
     }
 
     public void buildWithParameters(StaplerRequest req, StaplerResponse rsp, @CheckForNull TimeDuration delay) throws IOException, ServletException {
-        List<ParameterValue> values = new ArrayList<ParameterValue>();
+        List<ParameterValue> values = new ArrayList<>();
         for (ParameterDefinition d: parameterDefinitions) {
         	ParameterValue value = d.createValue(req);
         	if (value != null) {
diff --git a/core/src/main/java/hudson/model/PermalinkProjectAction.java b/core/src/main/java/hudson/model/PermalinkProjectAction.java
index 22c949e7d4c3..7909040f654d 100644
--- a/core/src/main/java/hudson/model/PermalinkProjectAction.java
+++ b/core/src/main/java/hudson/model/PermalinkProjectAction.java
@@ -91,7 +91,7 @@ abstract class Permalink {
         /**
          * List of {@link Permalink}s that are built into Jenkins.
          */
-        public static final List<Permalink> BUILTIN = new CopyOnWriteArrayList<Permalink>();
+        public static final List<Permalink> BUILTIN = new CopyOnWriteArrayList<>();
 
         public static final Permalink LAST_BUILD = new Permalink() {
             public String getDisplayName() {
diff --git a/core/src/main/java/hudson/model/Project.java b/core/src/main/java/hudson/model/Project.java
index b969b9942c03..ff1119b5e234 100644
--- a/core/src/main/java/hudson/model/Project.java
+++ b/core/src/main/java/hudson/model/Project.java
@@ -157,7 +157,7 @@ public DescribableList<BuildWrapper, Descriptor<BuildWrapper>> getBuildWrappersL
 
     @Override
     protected Set<ResourceActivity> getResourceActivities() {
-        final Set<ResourceActivity> activities = new HashSet<ResourceActivity>();
+        final Set<ResourceActivity> activities = new HashSet<>();
 
         activities.addAll(super.getResourceActivities());
         activities.addAll(Util.filter(getBuildersList(),ResourceActivity.class));
diff --git a/core/src/main/java/hudson/model/Queue.java b/core/src/main/java/hudson/model/Queue.java
index b2c4f7135a9d..8c3233059931 100644
--- a/core/src/main/java/hudson/model/Queue.java
+++ b/core/src/main/java/hudson/model/Queue.java
@@ -184,7 +184,7 @@ public class Queue extends ResourceController implements Saveable {
      * This consists of {@link Item}s that cannot be run yet
      * because its time has not yet come.
      */
-    private final Set<WaitingItem> waitingList = new TreeSet<WaitingItem>();
+    private final Set<WaitingItem> waitingList = new TreeSet<>();
 
     /**
      * {@link Task}s that can be built immediately
@@ -193,20 +193,20 @@ public class Queue extends ResourceController implements Saveable {
      * blocked via {@link QueueTaskDispatcher#canRun(Item)},
      * or otherwise blocked by {@link Task#isBuildBlocked()}.
      */
-    private final ItemList<BlockedItem> blockedProjects = new ItemList<BlockedItem>();
+    private final ItemList<BlockedItem> blockedProjects = new ItemList<>();
 
     /**
      * {@link Task}s that can be built immediately
      * that are waiting for available {@link Executor}.
      * This list is sorted in such a way that earlier items are built earlier.
      */
-    private final ItemList<BuildableItem> buildables = new ItemList<BuildableItem>();
+    private final ItemList<BuildableItem> buildables = new ItemList<>();
 
     /**
      * {@link Task}s that are being handed over to the executor, but execution
      * has not started yet.
      */
-    private final ItemList<BuildableItem> pendings = new ItemList<BuildableItem>();
+    private final ItemList<BuildableItem> pendings = new ItemList<>();
 
     private transient volatile Snapshot snapshot = new Snapshot(waitingList, blockedProjects, buildables, pendings);
 
@@ -319,7 +319,7 @@ public String toString() {
 
     private volatile transient QueueSorter sorter;
 
-    private transient final AtmostOneTaskExecutor<Void> maintainerThread = new AtmostOneTaskExecutor<Void>(new Callable<Void>() {
+    private transient final AtmostOneTaskExecutor<Void> maintainerThread = new AtmostOneTaskExecutor<>(new Callable<Void>() {
         @Override
         public Void call() throws Exception {
             maintain();
@@ -365,7 +365,7 @@ public void setSorter(QueueSorter sorter) {
      */
     static class State {
         public long counter;
-        public List<Item> items = new ArrayList<Item>();
+        public List<Item> items = new ArrayList<>();
     }
 
     /**
@@ -495,7 +495,7 @@ public void clear() {
         Jenkins.getInstance().checkPermission(Jenkins.ADMINISTER);
         lock.lock();
         try { try {
-            for (WaitingItem i : new ArrayList<WaitingItem>(
+            for (WaitingItem i : new ArrayList<>(
                     waitingList))   // copy the list as we'll modify it in the loop
                 i.cancel(this);
             blockedProjects.cancelAll();
@@ -579,7 +579,7 @@ public WaitingItem schedule(Task p, int quietPeriod, List<Action> actions) {
      */
     public @Nonnull ScheduleResult schedule2(Task p, int quietPeriod, List<Action> actions) {
         // remove nulls
-        actions = new ArrayList<Action>(actions);
+        actions = new ArrayList<>(actions);
         for (Iterator<Action> itr = actions.iterator(); itr.hasNext();) {
             Action a =  itr.next();
             if (a==null)    itr.remove();
@@ -617,14 +617,14 @@ public WaitingItem schedule(Task p, int quietPeriod, List<Action> actions) {
             due.add(Calendar.SECOND, quietPeriod);
 
             // Do we already have this task in the queue? Because if so, we won't schedule a new one.
-            List<Item> duplicatesInQueue = new ArrayList<Item>();
+            List<Item> duplicatesInQueue = new ArrayList<>();
             for (Item item : liveGetItems(p)) {
                 boolean shouldScheduleItem = false;
                 for (QueueAction action : item.getActions(QueueAction.class)) {
                     shouldScheduleItem |= action.shouldSchedule(actions);
                 }
                 for (QueueAction action : Util.filter(actions, QueueAction.class)) {
-                    shouldScheduleItem |= action.shouldSchedule((new ArrayList<Action>(item.getAllActions())));
+                    shouldScheduleItem |= action.shouldSchedule((new ArrayList<>(item.getAllActions())));
                 }
                 if (!shouldScheduleItem) {
                     duplicatesInQueue.add(item);
@@ -787,7 +787,7 @@ private WaitingItem peek() {
     @Exported(inline=true)
     public Item[] getItems() {
         Snapshot s = this.snapshot;
-        List<Item> r = new ArrayList<Item>();
+        List<Item> r = new ArrayList<>();
 
         for(WaitingItem p : s.waitingList) {
             r = checkPermissionsAndAddToList(r, p);
@@ -826,7 +826,7 @@ private List<Item> checkPermissionsAndAddToList(List<Item> r, Item t) {
     @Exported(inline=true)
     public StubItem[] getDiscoverableItems() {
         Snapshot s = this.snapshot;
-        List<StubItem> r = new ArrayList<StubItem>();
+        List<StubItem> r = new ArrayList<>();
 
         for(WaitingItem p : s.waitingList) {
             r = filterDiscoverableItemListBasedOnPermissions(r, p);
@@ -904,7 +904,7 @@ public Item getItem(long id) {
      */
     public List<BuildableItem> getBuildableItems(Computer c) {
         Snapshot snapshot = this.snapshot;
-        List<BuildableItem> result = new ArrayList<BuildableItem>();
+        List<BuildableItem> result = new ArrayList<>();
         _getBuildableItems(c, snapshot.buildables, result);
         _getBuildableItems(c, snapshot.pendings, result);
         return result;
@@ -925,7 +925,7 @@ private void _getBuildableItems(Computer c, List<BuildableItem> col, List<Builda
      */
     public List<BuildableItem> getBuildableItems() {
         Snapshot snapshot = this.snapshot;
-        ArrayList<BuildableItem> r = new ArrayList<BuildableItem>(snapshot.buildables);
+        ArrayList<BuildableItem> r = new ArrayList<>(snapshot.buildables);
         r.addAll(snapshot.pendings);
         return r;
     }
@@ -934,14 +934,14 @@ public List<BuildableItem> getBuildableItems() {
      * Gets the snapshot of all {@link BuildableItem}s.
      */
     public List<BuildableItem> getPendingItems() {
-        return new ArrayList<BuildableItem>(snapshot.pendings);
+        return new ArrayList<>(snapshot.pendings);
     }
 
     /**
      * Gets the snapshot of all {@link BlockedItem}s.
      */
     protected List<BlockedItem> getBlockedItems() {
-        return new ArrayList<BlockedItem>(snapshot.blockedProjects);
+        return new ArrayList<>(snapshot.blockedProjects);
     }
     
     /**
@@ -969,7 +969,7 @@ public void clearLeftItems() {
      */
     public List<Item> getUnblockedItems() {
         Snapshot snapshot = this.snapshot;
-        List<Item> queuedNotBlocked = new ArrayList<Item>();
+        List<Item> queuedNotBlocked = new ArrayList<>();
         queuedNotBlocked.addAll(snapshot.waitingList);
         queuedNotBlocked.addAll(snapshot.buildables);
         queuedNotBlocked.addAll(snapshot.pendings);
@@ -984,7 +984,7 @@ public List<Item> getUnblockedItems() {
      */
     public Set<Task> getUnblockedTasks() {
         List<Item> items = getUnblockedItems();
-        Set<Task> unblockedTasks = new HashSet<Task>(items.size());
+        Set<Task> unblockedTasks = new HashSet<>(items.size());
         for (Queue.Item t : items)
             unblockedTasks.add(t.task);
         return unblockedTasks;
@@ -1089,7 +1089,7 @@ public Item getItem(Task t) {
     private List<Item> liveGetItems(Task t) {
         lock.lock();
         try {
-            List<Item> result = new ArrayList<Item>();
+            List<Item> result = new ArrayList<>();
             result.addAll(blockedProjects.getAll(t));
             result.addAll(buildables.getAll(t));
             // Do not include pendings—we have already finalized WorkUnitContext.actions.
@@ -1117,7 +1117,7 @@ private List<Item> liveGetItems(Task t) {
      */
     public List<Item> getItems(Task t) {
         Snapshot snapshot = this.snapshot;
-        List<Item> result = new ArrayList<Item>();
+        List<Item> result = new ArrayList<>();
         for (Item item : snapshot.blockedProjects) {
             if (item.task.equals(t)) {
                 result.add(item);
@@ -1356,7 +1356,7 @@ public static <V> java.util.concurrent.Callable<V> wrapWithLock(java.util.concur
         final Jenkins jenkins = Jenkins.getInstanceOrNull();
         // TODO confirm safe to assume non-null and use getInstance()
         final Queue queue = jenkins == null ? null : jenkins.getQueue();
-        return queue == null ? callable : new LockedJUCCallable<V>(callable);
+        return queue == null ? callable : new LockedJUCCallable<>(callable);
     }
 
     @Override
@@ -1466,10 +1466,10 @@ public void maintain() {
             LOGGER.log(Level.FINE, "Queue maintenance started on {0} with {1}", new Object[] {this, snapshot});
 
             // The executors that are currently waiting for a job to run.
-            Map<Executor, JobOffer> parked = new HashMap<Executor, JobOffer>();
+            Map<Executor, JobOffer> parked = new HashMap<>();
 
             {// update parked (and identify any pending items whose executor has disappeared)
-                List<BuildableItem> lostPendings = new ArrayList<BuildableItem>(pendings);
+                List<BuildableItem> lostPendings = new ArrayList<>(pendings);
                 for (Computer c : jenkins.getComputers()) {
                     for (Executor e : c.getAllExecutors()) {
                         if (e.isInterrupted()) {
@@ -1584,7 +1584,7 @@ public void maintain() {
             updateSnapshot();
             
             // allocate buildable jobs to executors
-            for (BuildableItem p : new ArrayList<BuildableItem>(
+            for (BuildableItem p : new ArrayList<>(
                     buildables)) {// copy as we'll mutate the list in the loop
                 // one last check to make sure this build is not blocked.
                 CauseOfBlockage causeOfBlockage = getCauseOfBlockageForItem(p);
@@ -1721,7 +1721,7 @@ private Runnable makeFlyWeightTaskBuildable(final BuildableItem p){
                 }
             }
 
-            Map<Node, Integer> hashSource = new HashMap<Node, Integer>(h.getNodes().size());
+            Map<Node, Integer> hashSource = new HashMap<>(h.getNodes().size());
 
             // Even if master is configured with zero executors, we may need to run a flyweight task like MatrixProject on it.
             hashSource.put(h, Math.max(h.getNumExecutors() * 100, 1));
@@ -1730,7 +1730,7 @@ private Runnable makeFlyWeightTaskBuildable(final BuildableItem p){
                 hashSource.put(n, n.getNumExecutors() * 100);
             }
 
-            ConsistentHash<Node> hash = new ConsistentHash<Node>(NODE_HASH);
+            ConsistentHash<Node> hash = new ConsistentHash<>(NODE_HASH);
             hash.addAll(hashSource);
 
             String fullDisplayName = p.task.getFullDisplayName();
@@ -2222,7 +2222,7 @@ protected Item(Task task, List<Action> actions, long id, FutureImpl future, long
         @SuppressWarnings("deprecation") // JENKINS-51584
         protected Item(Item item) {
             // do not use item.getAllActions() here as this will persist actions from a TransientActionFactory
-            this(item.task, new ArrayList<Action>(item.getActions()), item.id, item.future, item.inQueueSince);
+            this(item.task, new ArrayList<>(item.getActions()), item.id, item.future, item.inQueueSince);
         }
 
         /**
diff --git a/core/src/main/java/hudson/model/ResourceController.java b/core/src/main/java/hudson/model/ResourceController.java
index 852a72f3669d..9d1a82c85209 100644
--- a/core/src/main/java/hudson/model/ResourceController.java
+++ b/core/src/main/java/hudson/model/ResourceController.java
@@ -42,7 +42,7 @@ public class ResourceController {
     /**
      * {@link ResourceList}s that are used by activities that are in progress.
      */
-    private final Set<ResourceActivity> inProgress = new CopyOnWriteArraySet<ResourceActivity>();
+    private final Set<ResourceActivity> inProgress = new CopyOnWriteArraySet<>();
 
     /**
      * View of {@link #inProgress} that exposes its {@link ResourceList}.
diff --git a/core/src/main/java/hudson/model/ResourceList.java b/core/src/main/java/hudson/model/ResourceList.java
index 0a5217088e76..d3fdb9302ec2 100644
--- a/core/src/main/java/hudson/model/ResourceList.java
+++ b/core/src/main/java/hudson/model/ResourceList.java
@@ -52,7 +52,7 @@ public final class ResourceList {
     /**
      * All resources (R/W.)
      */
-    private final Set<Resource> all = new HashSet<Resource>();
+    private final Set<Resource> all = new HashSet<>();
 
     /**
      * Write accesses. Values are the # of write counts that this list uses.
@@ -60,7 +60,7 @@ public final class ResourceList {
      * The values are mostly supposed to be 1, but when {@link ResourceController}
      * uses a list to keep track of the union of all the activities, it can get larger.
      */
-    private final Map<Resource,Integer> write = new HashMap<Resource,Integer>();
+    private final Map<Resource,Integer> write = new HashMap<>();
     private static final Integer MAX_INT = Integer.MAX_VALUE;
 
     /**
@@ -143,7 +143,7 @@ private Resource _getConflict(ResourceList lhs, ResourceList rhs) {
 
     @Override
     public String toString() {
-        Map<Resource,String> m = new HashMap<Resource,String>();
+        Map<Resource,String> m = new HashMap<>();
         for (Resource r : all)
             m.put(r,"R");
         for (Entry<Resource,Integer> e : write.entrySet())
diff --git a/core/src/main/java/hudson/model/Result.java b/core/src/main/java/hudson/model/Result.java
index 8b1d05fc4b0f..ea912c856d69 100644
--- a/core/src/main/java/hudson/model/Result.java
+++ b/core/src/main/java/hudson/model/Result.java
@@ -155,7 +155,7 @@ public boolean isCompleteBuild() {
     }
 
     private static @Nonnull List<String> getNames() {
-        List<String> l = new ArrayList<String>();
+        List<String> l = new ArrayList<>();
         for (Result r : all)
             l.add(r.name);
         return l;
diff --git a/core/src/main/java/hudson/model/Run.java b/core/src/main/java/hudson/model/Run.java
index 8565876d292e..9ff9cdfb41a7 100644
--- a/core/src/main/java/hudson/model/Run.java
+++ b/core/src/main/java/hudson/model/Run.java
@@ -381,7 +381,7 @@ protected void onLoad() {
      */
     @Deprecated
     public List<Action> getTransientActions() {
-        List<Action> actions = new ArrayList<Action>();
+        List<Action> actions = new ArrayList<>();
         for (TransientBuildActionFactory factory: TransientBuildActionFactory.all()) {
             for (Action created : factory.createFor(this)) {
                 if (created == null) {
@@ -821,7 +821,7 @@ public int getNumber() {
      * @since 1.556
      */   
     protected @Nonnull BuildReference<RunT> createReference() {
-        return new BuildReference<RunT>(getId(), _this());
+        return new BuildReference<>(getId(), _this());
     }
 
     /**
@@ -865,7 +865,7 @@ protected void dropLinks() {
     public final @CheckForNull RunT getPreviousBuildInProgress() {
         if(previousBuildInProgress==this)   return null;    // the most common case
 
-        List<RunT> fixUp = new ArrayList<RunT>();
+        List<RunT> fixUp = new ArrayList<>();
         RunT r = _this(); // 'r' is the source of the pointer (so that we can add it to fix up if we find that the target of the pointer is inefficient.)
         RunT answer;
         while (true) {
@@ -948,7 +948,7 @@ protected void dropLinks() {
      * @since 1.383
      */  
     public @Nonnull List<RunT> getPreviousBuildsOverThreshold(int numberOfBuilds, @Nonnull Result threshold) {
-        List<RunT> builds = new ArrayList<RunT>(numberOfBuilds);
+        List<RunT> builds = new ArrayList<>(numberOfBuilds);
         
         RunT r = getPreviousBuild();
         while (r != null && builds.size() < numberOfBuilds) {
@@ -1216,7 +1216,7 @@ public final class ArtifactList extends ArrayList<Artifact> {
          * Map of Artifact to treeNodeId of parent node in tree view.
          * Contains Artifact objects for directories and files (the ArrayList contains only files).
          */
-        private LinkedHashMap<Artifact,String> tree = new LinkedHashMap<Artifact,String>();
+        private LinkedHashMap<Artifact,String> tree = new LinkedHashMap<>();
 
         void updateFrom(SerializableArtifactList clone) {
             Map<String, Artifact> artifacts = new HashMap<>(); // need to share objects between tree and list, since computeDisplayName mutates displayPath
@@ -1256,7 +1256,7 @@ public void computeDisplayName() {
             int depth=0;
             do {
                 collision = false;
-                Map<String,Integer/*index*/> names = new HashMap<String,Integer>();
+                Map<String,Integer/*index*/> names = new HashMap<>();
                 for (int i = 0; i < tokens.length; i++) {
                     String[] token = tokens[i];
                     String displayName = combineLast(token,len[i]);
@@ -1658,7 +1658,7 @@ private final class CheckpointSet {
              * Stages of the builds that this runner has completed. This is used for concurrent {@link RunExecution}s to
              * coordinate and serialize their executions where necessary.
              */
-            private final Set<CheckPoint> checkpoints = new HashSet<CheckPoint>();
+            private final Set<CheckPoint> checkpoints = new HashSet<>();
 
             private boolean allDone;
 
@@ -1697,7 +1697,7 @@ private synchronized void allDone() {
 
         private final CheckpointSet checkpoints = new CheckpointSet();
 
-        private final Map<Object,Object> attributes = new HashMap<Object, Object>();
+        private final Map<Object,Object> attributes = new HashMap<>();
 
         /**
          * Performs the main build and returns the status code.
diff --git a/core/src/main/java/hudson/model/RunnerStack.java b/core/src/main/java/hudson/model/RunnerStack.java
index 2cade6d5efb6..ae12e70294b7 100644
--- a/core/src/main/java/hudson/model/RunnerStack.java
+++ b/core/src/main/java/hudson/model/RunnerStack.java
@@ -38,12 +38,12 @@
  * @since 1.319
  */
 final class RunnerStack {
-    private final Map<Executor,Stack<RunExecution>> stack = new WeakHashMap<Executor,Stack<RunExecution>>();
+    private final Map<Executor,Stack<RunExecution>> stack = new WeakHashMap<>();
 
     synchronized void push(RunExecution r) {
         Executor e = Executor.currentExecutor();
         Stack<RunExecution> s = stack.get(e);
-        if(s==null) stack.put(e,s=new Stack<RunExecution>());
+        if(s==null) stack.put(e,s= new Stack<>());
         s.push(r);
     }
 
diff --git a/core/src/main/java/hudson/model/Slave.java b/core/src/main/java/hudson/model/Slave.java
index c3cad4eea739..c9514a34d757 100644
--- a/core/src/main/java/hudson/model/Slave.java
+++ b/core/src/main/java/hudson/model/Slave.java
@@ -636,7 +636,7 @@ public final List<Descriptor<RetentionStrategy<?>>> retentionStrategyDescriptors
         @SuppressWarnings("unchecked") // used by Jelly EL only
         @Restricted(NoExternalUse.class) // used by Jelly EL only
         public final List<NodePropertyDescriptor> nodePropertyDescriptors(@CheckForNull Slave it) {
-            List<NodePropertyDescriptor> result = new ArrayList<NodePropertyDescriptor>();
+            List<NodePropertyDescriptor> result = new ArrayList<>();
             Collection<NodePropertyDescriptor> list =
                     (Collection) Jenkins.getInstance().getDescriptorList(NodeProperty.class);
             for (NodePropertyDescriptor npd : it == null
diff --git a/core/src/main/java/hudson/model/TaskThread.java b/core/src/main/java/hudson/model/TaskThread.java
index 73623e7b0d04..9fb5ba25e9dc 100644
--- a/core/src/main/java/hudson/model/TaskThread.java
+++ b/core/src/main/java/hudson/model/TaskThread.java
@@ -97,7 +97,7 @@ public Reader readAll() throws IOException {
      */
     protected final void associateWith(TaskAction action) {
         action.workerThread = this;
-        action.log = new WeakReference<AnnotatedLargeText>(log);
+        action.log = new WeakReference<>(log);
     }
 
     /**
@@ -188,7 +188,7 @@ public static ListenerAndText forMemory(TaskAction context) {
 
             return new ListenerAndText(
                 new StreamTaskListener(log),
-                new AnnotatedLargeText<TaskAction>(log,Charset.defaultCharset(),false,context)
+                new AnnotatedLargeText<>(log, Charset.defaultCharset(), false, context)
             );
         }
 
@@ -198,7 +198,7 @@ public static ListenerAndText forMemory(TaskAction context) {
         public static ListenerAndText forFile(File f, TaskAction context) throws IOException {
             return new ListenerAndText(
                 new StreamTaskListener(f),
-                new AnnotatedLargeText<TaskAction>(f,Charset.defaultCharset(),false,context)
+                new AnnotatedLargeText<>(f, Charset.defaultCharset(), false, context)
             );
         }
     }
diff --git a/core/src/main/java/hudson/model/TransientComputerActionFactory.java b/core/src/main/java/hudson/model/TransientComputerActionFactory.java
index 3a77db8c5260..1506da71352c 100644
--- a/core/src/main/java/hudson/model/TransientComputerActionFactory.java
+++ b/core/src/main/java/hudson/model/TransientComputerActionFactory.java
@@ -64,7 +64,7 @@ public static ExtensionList<TransientComputerActionFactory> all() {
      * Creates {@link Action}s for a node, using all registered {@link TransientComputerActionFactory}s.
      */
 	public static List<Action> createAllFor(Computer target) {
-		List<Action> result = new ArrayList<Action>();
+		List<Action> result = new ArrayList<>();
 		for (TransientComputerActionFactory f: all()) {
 			result.addAll(f.createFor(target));
 		}
diff --git a/core/src/main/java/hudson/model/TransientViewActionFactory.java b/core/src/main/java/hudson/model/TransientViewActionFactory.java
index edf9a1c85afc..d5fa9dcfc2f5 100644
--- a/core/src/main/java/hudson/model/TransientViewActionFactory.java
+++ b/core/src/main/java/hudson/model/TransientViewActionFactory.java
@@ -31,7 +31,7 @@ public static ExtensionList<TransientViewActionFactory> all() {
      * Creates {@link Action}s for a view, using all registered {@link TransientViewActionFactory}s.
      */
 	public static List<Action> createAllFor(View v) {
-		List<Action> result = new ArrayList<Action>();
+		List<Action> result = new ArrayList<>();
 		for (TransientViewActionFactory f: all()) {
 			result.addAll(f.createFor(v));
 		}
diff --git a/core/src/main/java/hudson/model/TreeView.java b/core/src/main/java/hudson/model/TreeView.java
index d70c2d4744d6..d4229acbf882 100644
--- a/core/src/main/java/hudson/model/TreeView.java
+++ b/core/src/main/java/hudson/model/TreeView.java
@@ -62,12 +62,12 @@ public class TreeView extends View implements ViewGroup {
      * List of job names. This is what gets serialized.
      */
     private final Set<String> jobNames
-        = new TreeSet<String>(CaseInsensitiveComparator.INSTANCE);
+        = new TreeSet<>(CaseInsensitiveComparator.INSTANCE);
 
     /**
      * Nested views.
      */
-    private final CopyOnWriteArrayList<View> views = new CopyOnWriteArrayList<View>();
+    private final CopyOnWriteArrayList<View> views = new CopyOnWriteArrayList<>();
 
     @DataBoundConstructor
     public TreeView(String name) {
diff --git a/core/src/main/java/hudson/model/UpdateCenter.java b/core/src/main/java/hudson/model/UpdateCenter.java
index 0185e4f854d4..2b1cdd4c943b 100644
--- a/core/src/main/java/hudson/model/UpdateCenter.java
+++ b/core/src/main/java/hudson/model/UpdateCenter.java
@@ -189,18 +189,18 @@ public class UpdateCenter extends AbstractModelObject implements Saveable, OnMas
     /**
      * List of created {@link UpdateCenterJob}s. Access needs to be synchronized.
      */
-    private final Vector<UpdateCenterJob> jobs = new Vector<UpdateCenterJob>();
+    private final Vector<UpdateCenterJob> jobs = new Vector<>();
 
     /**
      * {@link UpdateSite}s from which we've already installed a plugin at least once.
      * This is used to skip network tests.
      */
-    private final Set<UpdateSite> sourcesUsed = new HashSet<UpdateSite>();
+    private final Set<UpdateSite> sourcesUsed = new HashSet<>();
 
     /**
      * List of {@link UpdateSite}s to be used.
      */
-    private final PersistedList<UpdateSite> sites = new PersistedList<UpdateSite>(this);
+    private final PersistedList<UpdateSite> sites = new PersistedList<>(this);
 
     /**
      * Update center configuration data
@@ -338,7 +338,7 @@ public void configure(UpdateCenterConfiguration config) {
     @StaplerDispatchable
     public List<UpdateCenterJob> getJobs() {
         synchronized (jobs) {
-            return new ArrayList<UpdateCenterJob>(jobs);
+            return new ArrayList<>(jobs);
         }
     }
 
@@ -918,7 +918,7 @@ private XmlFile getConfigFile() {
 
     @Exported
     public List<Plugin> getAvailables() {
-        Map<String,Plugin> pluginMap = new LinkedHashMap<String, Plugin>();
+        Map<String,Plugin> pluginMap = new LinkedHashMap<>();
         for (UpdateSite site : sites) {
             for (Plugin plugin: site.getAvailables()) {
                 final Plugin existing = pluginMap.get(plugin.name);
@@ -935,7 +935,7 @@ public List<Plugin> getAvailables() {
             }
         }
 
-        return new ArrayList<Plugin>(pluginMap.values());
+        return new ArrayList<>(pluginMap.values());
     }
 
     /**
@@ -943,7 +943,7 @@ public List<Plugin> getAvailables() {
      * A plugin with multiple categories will appear multiple times in the list.
      */
     public PluginEntry[] getCategorizedAvailables() {
-        TreeSet<PluginEntry> entries = new TreeSet<PluginEntry>();
+        TreeSet<PluginEntry> entries = new TreeSet<>();
         for (Plugin p : getAvailables()) {
             if (p.categories==null || p.categories.length==0)
                 entries.add(new PluginEntry(p, getCategoryDisplayName(null)));
@@ -966,7 +966,7 @@ private static String getCategoryDisplayName(String category) {
     }
 
     public List<Plugin> getUpdates() {
-        Map<String,Plugin> pluginMap = new LinkedHashMap<String, Plugin>();
+        Map<String,Plugin> pluginMap = new LinkedHashMap<>();
         for (UpdateSite site : sites) {
             for (Plugin plugin: site.getUpdates()) {
                 final Plugin existing = pluginMap.get(plugin.name);
@@ -983,7 +983,7 @@ public List<Plugin> getUpdates() {
             }
         }
 
-        return new ArrayList<Plugin>(pluginMap.values());
+        return new ArrayList<>(pluginMap.values());
     }
 
     /**
@@ -997,7 +997,7 @@ public List<Plugin> getUpdates() {
      *
      */
     public List<FormValidation> updateAllSites() throws InterruptedException, ExecutionException {
-        List <Future<FormValidation>> futures = new ArrayList<Future<FormValidation>>();
+        List <Future<FormValidation>> futures = new ArrayList<>();
         for (UpdateSite site : getSites()) {
             Future<FormValidation> future = site.updateDirectly(DownloadService.signatureCheck);
             if (future != null) {
@@ -1005,7 +1005,7 @@ public List<FormValidation> updateAllSites() throws InterruptedException, Execut
             }
         }
 
-        List<FormValidation> results = new ArrayList<FormValidation>();
+        List<FormValidation> results = new ArrayList<>();
         for (Future<FormValidation> f : futures) {
             results.add(f.get());
         }
diff --git a/core/src/main/java/hudson/model/UpdateSite.java b/core/src/main/java/hudson/model/UpdateSite.java
index 153d692093b9..c4a3abf71ec6 100644
--- a/core/src/main/java/hudson/model/UpdateSite.java
+++ b/core/src/main/java/hudson/model/UpdateSite.java
@@ -355,7 +355,7 @@ public JSONObject getJSONObject() {
      */
     @Exported
     public List<Plugin> getAvailables() {
-        List<Plugin> r = new ArrayList<Plugin>();
+        List<Plugin> r = new ArrayList<>();
         Data data = getData();
         if(data==null)     return Collections.emptyList();
         for (Plugin p : data.plugins.values()) {
@@ -415,7 +415,7 @@ public List<Plugin> getUpdates() {
         Data data = getData();
         if(data==null)      return Collections.emptyList(); // fail to determine
         
-        List<Plugin> r = new ArrayList<Plugin>();
+        List<Plugin> r = new ArrayList<>();
         for (PluginWrapper pw : Jenkins.getInstance().getPluginManager().getPlugins()) {
             Plugin p = pw.getUpdateInfo();
             if(p!=null) r.add(p);
@@ -515,13 +515,13 @@ public final class Data {
         /**
          * Plugins in the repository, keyed by their artifact IDs.
          */
-        public final Map<String,Plugin> plugins = new TreeMap<String,Plugin>(String.CASE_INSENSITIVE_ORDER);
+        public final Map<String,Plugin> plugins = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
         /**
          * List of warnings (mostly security) published with the update site.
          *
          * @since 2.40
          */
-        private final Set<Warning> warnings = new HashSet<Warning>();
+        private final Set<Warning> warnings = new HashSet<>();
 
         /**
          * If this is non-null, Jenkins is going to check the connectivity to this URL to make sure
@@ -1073,7 +1073,7 @@ public boolean isCompatibleWithInstalledVersion() {
          */
         @Exported
         public List<Plugin> getNeededDependencies() {
-            List<Plugin> deps = new ArrayList<Plugin>();
+            List<Plugin> deps = new ArrayList<>();
 
             for(Map.Entry<String,String> e : dependencies.entrySet()) {
                 VersionNumber requiredVersion = e.getValue() != null ? new VersionNumber(e.getValue()) : null;
diff --git a/core/src/main/java/hudson/model/UsageStatistics.java b/core/src/main/java/hudson/model/UsageStatistics.java
index e7037555ae24..93e4057c4092 100644
--- a/core/src/main/java/hudson/model/UsageStatistics.java
+++ b/core/src/main/java/hudson/model/UsageStatistics.java
@@ -130,7 +130,7 @@ public String getStatData() throws IOException {
         o.put("servletContainer", j.servletContext.getServerInfo());
         o.put("version", Jenkins.VERSION);
 
-        List<JSONObject> nodes = new ArrayList<JSONObject>();
+        List<JSONObject> nodes = new ArrayList<>();
         for( Computer c : j.getComputers() ) {
             JSONObject  n = new JSONObject();
             if(c.getNode()==j) {
@@ -146,7 +146,7 @@ public String getStatData() throws IOException {
         }
         o.put("nodes",nodes);
 
-        List<JSONObject> plugins = new ArrayList<JSONObject>();
+        List<JSONObject> plugins = new ArrayList<>();
         for( PluginWrapper pw : j.getPluginManager().getPlugins() ) {
             if(!pw.isActive())  continue;   // treat disabled plugins as if they are uninstalled
             JSONObject p = new JSONObject();
diff --git a/core/src/main/java/hudson/model/UserProperties.java b/core/src/main/java/hudson/model/UserProperties.java
index 2c936dfbbfa2..3b02a7c7114c 100644
--- a/core/src/main/java/hudson/model/UserProperties.java
+++ b/core/src/main/java/hudson/model/UserProperties.java
@@ -40,5 +40,5 @@ public class UserProperties {
      *      Use {@link UserProperty#all()} for read access and {@link Extension} for auto-registration.
      */
     @Deprecated
-    public static final List<UserPropertyDescriptor> LIST = (List)new DescriptorList<UserProperty>(UserProperty.class);
+    public static final List<UserPropertyDescriptor> LIST = (List) new DescriptorList<>(UserProperty.class);
 }
diff --git a/core/src/main/java/hudson/model/View.java b/core/src/main/java/hudson/model/View.java
index a062f19b8c5b..ff391155ede6 100644
--- a/core/src/main/java/hudson/model/View.java
+++ b/core/src/main/java/hudson/model/View.java
@@ -206,7 +206,7 @@ protected View(String name, ViewGroup owner) {
     public Collection<TopLevelItem> getAllItems() {
 
         if (this instanceof ViewGroup) {
-            final Collection<TopLevelItem> items = new LinkedHashSet<TopLevelItem>(getItems());
+            final Collection<TopLevelItem> items = new LinkedHashSet<>(getItems());
 
             for(View view: ((ViewGroup) this).getViews()) {
                 items.addAll(view.getAllItems());
@@ -318,7 +318,7 @@ public DescribableList<ViewProperty,ViewPropertyDescriptor> getProperties() {
      * on this label.
      */
     public List<ViewPropertyDescriptor> getApplicablePropertyDescriptors() {
-        List<ViewPropertyDescriptor> r = new ArrayList<ViewPropertyDescriptor>();
+        List<ViewPropertyDescriptor> r = new ArrayList<>();
         for (ViewPropertyDescriptor pd : ViewProperty.all()) {
             if (pd.isEnabledFor(this))
                 r.add(pd);
@@ -428,9 +428,9 @@ public List<Computer> getComputers() {
             return Arrays.asList(computers);
         }
 
-        List<Computer> result = new ArrayList<Computer>();
+        List<Computer> result = new ArrayList<>();
 
-        HashSet<Label> labels = new HashSet<Label>();
+        HashSet<Label> labels = new HashSet<>();
         for (Item item : getItems()) {
             if (item instanceof AbstractProject<?, ?>) {
                 labels.addAll(((AbstractProject<?, ?>) item).getRelevantLabels());
@@ -725,7 +725,7 @@ public People(View parent) {
         }
 
         private Map<User,UserInfo> getUserInfo(Collection<? extends Item> items) {
-            Map<User,UserInfo> users = new HashMap<User,UserInfo>();
+            Map<User,UserInfo> users = new HashMap<>();
             for (Item item : items) {
                 for (Job<?, ?> job : item.getAllJobs()) {
                     RunList<? extends Run<?, ?>> runs = job.getBuilds();
@@ -754,7 +754,7 @@ else if (info.getLastChange().before(r.getTimestamp())) {
         }
 
         private List<UserInfo> toList(Map<User,UserInfo> users) {
-            ArrayList<UserInfo> list = new ArrayList<UserInfo>();
+            ArrayList<UserInfo> list = new ArrayList<>();
             list.addAll(users.values());
             Collections.sort(list);
             return Collections.unmodifiableList(list);
@@ -799,8 +799,8 @@ public static final class AsynchPeople extends ProgressiveRendering { // JENKINS
 
         private final Collection<TopLevelItem> items;
         private final User unknown;
-        private final Map<User,UserInfo> users = new HashMap<User,UserInfo>();
-        private final Set<User> modified = new HashSet<User>();
+        private final Map<User,UserInfo> users = new HashMap<>();
+        private final Set<User> modified = new HashSet<>();
         private final String iconSize;
         public final ModelObject parent;
 
@@ -1085,7 +1085,7 @@ public Categories doItemCategories(StaplerRequest req, StaplerResponse rsp, @Que
         }
         for (TopLevelItemDescriptor descriptor : DescriptorVisibilityFilter.apply(getOwner().getItemGroup(), Items.all(Jenkins.getAuthentication(), getOwner().getItemGroup()))) {
             ItemCategory ic = ItemCategory.getCategory(descriptor);
-            Map<String, Serializable> metadata = new HashMap<String, Serializable>();
+            Map<String, Serializable> metadata = new HashMap<>();
 
             // Information about Item.
             metadata.put("class", descriptor.getId());
@@ -1109,7 +1109,7 @@ public Categories doItemCategories(StaplerRequest req, StaplerResponse rsp, @Que
             if (category != null) {
                 category.getItems().add(metadata);
             } else {
-                List<Map<String, Serializable>> temp = new ArrayList<Map<String, Serializable>>();
+                List<Map<String, Serializable>> temp = new ArrayList<>();
                 temp.add(metadata);
                 category = new Category(ic.getId(), ic.getDisplayName(), ic.getDescription(), ic.getOrder(), ic.getMinToShow(), temp);
                 categories.getItems().add(category);
@@ -1140,7 +1140,7 @@ private void rss(StaplerRequest req, StaplerResponse rsp, String suffix, RunList
     }
 
     public void doRssLatest( StaplerRequest req, StaplerResponse rsp ) throws IOException, ServletException {
-        List<Run> lastBuilds = new ArrayList<Run>();
+        List<Run> lastBuilds = new ArrayList<>();
         for (TopLevelItem item : getItems()) {
             if (item instanceof Job) {
                 Job job = (Job) item;
@@ -1241,7 +1241,7 @@ public ModelObjectWithContextMenu.ContextMenu doChildrenContextMenu(StaplerReque
      *      Use {@link #all()} for read access, and use {@link Extension} for registration.
      */
     @Deprecated
-    public static final DescriptorList<View> LIST = new DescriptorList<View>(View.class);
+    public static final DescriptorList<View> LIST = new DescriptorList<>(View.class);
 
     /**
      * Returns all the registered {@link ViewDescriptor}s.
@@ -1259,7 +1259,7 @@ public static DescriptorExtensionList<View,ViewDescriptor> all() {
      */
     @Nonnull
     public static List<ViewDescriptor> allInstantiable() {
-        List<ViewDescriptor> r = new ArrayList<ViewDescriptor>();
+        List<ViewDescriptor> r = new ArrayList<>();
         StaplerRequest request = Stapler.getCurrentRequest();
         if (request == null) {
             throw new IllegalStateException("This method can only be invoked from a stapler request");
@@ -1403,7 +1403,7 @@ protected void onModified() throws IOException {
      * "Job" in "New Job". When a view is used in a context that restricts the child type,
      * It might be useful to override this.
      */
-    public static final Message<View> NEW_PRONOUN = new Message<View>();
+    public static final Message<View> NEW_PRONOUN = new Message<>();
 
     private final static Logger LOGGER = Logger.getLogger(View.class.getName());
 }
diff --git a/core/src/main/java/hudson/model/ViewGroupMixIn.java b/core/src/main/java/hudson/model/ViewGroupMixIn.java
index 6547a8c5ae92..ce55ff8406d3 100644
--- a/core/src/main/java/hudson/model/ViewGroupMixIn.java
+++ b/core/src/main/java/hudson/model/ViewGroupMixIn.java
@@ -146,7 +146,7 @@ public View getView(@CheckForNull String name) {
     @Exported
     public Collection<View> getViews() {
         List<View> orig = views();
-        List<View> copy = new ArrayList<View>(orig.size());
+        List<View> copy = new ArrayList<>(orig.size());
         for (View v : orig) {
             if (v.hasPermission(View.READ))
                 copy.add(v);
diff --git a/core/src/main/java/hudson/model/ViewJob.java b/core/src/main/java/hudson/model/ViewJob.java
index 2bf7fa976662..dc16020834eb 100644
--- a/core/src/main/java/hudson/model/ViewJob.java
+++ b/core/src/main/java/hudson/model/ViewJob.java
@@ -60,7 +60,7 @@ public abstract class ViewJob<JobT extends ViewJob<JobT,RunT>, RunT extends Run<
     /**
      * All {@link Run}s. Copy-on-write semantics.
      */
-    protected transient /*almost final*/ RunMap<RunT> runs = new RunMap<RunT>();
+    protected transient /*almost final*/ RunMap<RunT> runs = new RunMap<>();
 
     private transient boolean notLoaded = true;
 
@@ -105,7 +105,7 @@ protected SortedMap<Integer,RunT> _getRuns() {
             // if none is loaded yet, do so immediately.
             synchronized(this) {
                 if(runs==null)
-                    runs = new RunMap<RunT>();
+                    runs = new RunMap<>();
                 if(notLoaded) {
                     notLoaded = false;
                     _reload();   
@@ -177,7 +177,7 @@ private static final class ReloadThread extends Thread {
          * This is a set, so no {@link ExternalJob}s are scheduled twice, yet
          * it's order is predictable, avoiding starvation.
          */
-        final Set<ViewJob> reloadQueue = new LinkedHashSet<ViewJob>();
+        final Set<ViewJob> reloadQueue = new LinkedHashSet<>();
 
         private ReloadThread() {
             setName("ViewJob reload thread");
diff --git a/core/src/main/java/hudson/model/WorkspaceCleanupThread.java b/core/src/main/java/hudson/model/WorkspaceCleanupThread.java
index 8c55c2bc4d8b..bae5553fe788 100644
--- a/core/src/main/java/hudson/model/WorkspaceCleanupThread.java
+++ b/core/src/main/java/hudson/model/WorkspaceCleanupThread.java
@@ -65,7 +65,7 @@ public static void invoke() {
             LOGGER.fine("Disabled. Skipping execution");
             return;
         }
-        List<Node> nodes = new ArrayList<Node>();
+        List<Node> nodes = new ArrayList<>();
         Jenkins j = Jenkins.getInstance();
         nodes.add(j);
         nodes.addAll(j.getNodes());
diff --git a/core/src/main/java/hudson/model/labels/LabelAtom.java b/core/src/main/java/hudson/model/labels/LabelAtom.java
index 3a6e6b44b2bf..d2a634cd4c01 100644
--- a/core/src/main/java/hudson/model/labels/LabelAtom.java
+++ b/core/src/main/java/hudson/model/labels/LabelAtom.java
@@ -66,10 +66,10 @@
  */
 public class LabelAtom extends Label implements Saveable {
     private DescribableList<LabelAtomProperty,LabelAtomPropertyDescriptor> properties =
-            new DescribableList<LabelAtomProperty,LabelAtomPropertyDescriptor>(this);
+            new DescribableList<>(this);
 
     @CopyOnWrite
-    protected transient volatile List<Action> transientActions = new Vector<Action>();
+    protected transient volatile List<Action> transientActions = new Vector<>();
 
     private String description;
 
@@ -100,7 +100,7 @@ public String getExpression() {
     @Override
     public List<Action> getActions() {
         // add all the transient actions, too
-        List<Action> actions = new Vector<Action>(super.getActions());
+        List<Action> actions = new Vector<>(super.getActions());
         actions.addAll(transientActions);
         // return the read only list to cause a failure on plugins who try to add an action here
         return Collections.unmodifiableList(actions);
@@ -109,7 +109,7 @@ public List<Action> getActions() {
     // TODO implement addAction, addOrReplaceAction, removeAction, removeActions, replaceActions
 
     protected void updateTransientActions() {
-        Vector<Action> ta = new Vector<Action>();
+        Vector<Action> ta = new Vector<>();
 
         for (LabelAtomProperty p : properties)
             ta.addAll(p.getActions(this));
@@ -236,7 +236,7 @@ public synchronized void doSubmitDescription( StaplerRequest req, StaplerRespons
     }
 
     public static LabelAtom findNearest(String name) {
-        List<String> candidates = new ArrayList<String>();
+        List<String> candidates = new ArrayList<>();
         for (LabelAtom a : Jenkins.getInstance().getLabelAtoms()) {
             candidates.add(a.getName());
         }
diff --git a/core/src/main/java/hudson/model/listeners/SCMListener.java b/core/src/main/java/hudson/model/listeners/SCMListener.java
index ebbcaa397dd8..2415ce86fa8d 100644
--- a/core/src/main/java/hudson/model/listeners/SCMListener.java
+++ b/core/src/main/java/hudson/model/listeners/SCMListener.java
@@ -130,7 +130,7 @@ public static Collection<? extends SCMListener> all() {
         if (j == null) { // TODO use !Functions.isExtensionsAvailable() once JENKINS-33377
             return Collections.emptySet();
         }
-        List<SCMListener> r = new ArrayList<SCMListener>(j.getExtensionList(SCMListener.class));
+        List<SCMListener> r = new ArrayList<>(j.getExtensionList(SCMListener.class));
         for (SCMListener l : j.getSCMListeners()) {
             r.add(l);
         }
diff --git a/core/src/main/java/hudson/model/queue/BackFiller.java b/core/src/main/java/hudson/model/queue/BackFiller.java
index bc3773cc4d3c..17c421c43fa3 100644
--- a/core/src/main/java/hudson/model/queue/BackFiller.java
+++ b/core/src/main/java/hudson/model/queue/BackFiller.java
@@ -32,7 +32,7 @@ public class BackFiller extends LoadPredictor {
     @Override
     public Iterable<FutureLoad> predict(MappingWorksheet plan, Computer computer, long start, long end) {
         TimeRange timeRange = new TimeRange(start, end - start);
-        List<FutureLoad> loads = new ArrayList<FutureLoad>();
+        List<FutureLoad> loads = new ArrayList<>();
 
         for (BuildableItem bi : Jenkins.getInstance().getQueue().getBuildableItems()) {
             TentativePlan tp = bi.getAction(TentativePlan.class);
@@ -94,7 +94,7 @@ private TentativePlan makeTentativePlan(BuildableItem bi) {
         recursion = true;
         try {
             // pretend for now that all executors are available and decide some assignment that's executable.
-            List<PseudoExecutorSlot> slots = new ArrayList<PseudoExecutorSlot>();
+            List<PseudoExecutorSlot> slots = new ArrayList<>();
             for (Computer c : Jenkins.getInstance().getComputers()) {
                 if (c.isOffline())  continue;
                 for (Executor e : c.getExecutors()) {
@@ -109,7 +109,7 @@ private TentativePlan makeTentativePlan(BuildableItem bi) {
             if (m==null)    return null;
 
             // figure out how many executors we need on each computer?
-            Map<Computer,Integer> footprint = new HashMap<Computer, Integer>();
+            Map<Computer,Integer> footprint = new HashMap<>();
             for (Entry<WorkChunk, ExecutorChunk> e : m.toMap().entrySet()) {
                 Computer c = e.getValue().computer;
                 Integer v = footprint.get(c);
diff --git a/core/src/main/java/hudson/model/queue/FutureImpl.java b/core/src/main/java/hudson/model/queue/FutureImpl.java
index 2104dd4fcfff..172fd6bb47db 100644
--- a/core/src/main/java/hudson/model/queue/FutureImpl.java
+++ b/core/src/main/java/hudson/model/queue/FutureImpl.java
@@ -47,14 +47,14 @@ public final class FutureImpl extends AsyncFutureImpl<Executable> implements Que
     /**
      * If the computation has started, set to {@link Executor}s that are running the build.
      */
-    private final Set<Executor> executors = new HashSet<Executor>();
+    private final Set<Executor> executors = new HashSet<>();
 
     /**
      * {@link Future} that completes when the task started running.
      *
      * In contrast, {@link FutureImpl} will complete when the task finishes.
      */
-    /*package*/ final AsyncFutureImpl<Executable> start = new AsyncFutureImpl<Executable>();
+    /*package*/ final AsyncFutureImpl<Executable> start = new AsyncFutureImpl<>();
 
     public FutureImpl(Task task) {
         this.task = task;
diff --git a/core/src/main/java/hudson/model/queue/LoadPredictor.java b/core/src/main/java/hudson/model/queue/LoadPredictor.java
index 2fc4bf8d657c..9e8ce7bc0716 100644
--- a/core/src/main/java/hudson/model/queue/LoadPredictor.java
+++ b/core/src/main/java/hudson/model/queue/LoadPredictor.java
@@ -92,7 +92,7 @@ public static class CurrentlyRunningTasks extends LoadPredictor {
         @Override
         public Iterable<FutureLoad> predict(MappingWorksheet plan, final Computer computer, long start, long eternity) {
             long now = System.currentTimeMillis();
-            List<FutureLoad> fl = new ArrayList<FutureLoad>();
+            List<FutureLoad> fl = new ArrayList<>();
             for (Executor e : computer.getExecutors()) {
                 if (e.isIdle())     continue;
 
diff --git a/core/src/main/java/hudson/model/queue/MappingWorksheet.java b/core/src/main/java/hudson/model/queue/MappingWorksheet.java
index 561c950e4aa3..2a72df28c043 100644
--- a/core/src/main/java/hudson/model/queue/MappingWorksheet.java
+++ b/core/src/main/java/hudson/model/queue/MappingWorksheet.java
@@ -218,7 +218,7 @@ private Label getAssignedLabel(SubTask task) {
         }
 
         public List<ExecutorChunk> applicableExecutorChunks() {
-            List<ExecutorChunk> r = new ArrayList<ExecutorChunk>(executors.size());
+            List<ExecutorChunk> r = new ArrayList<>(executors.size());
             for (ExecutorChunk e : executors) {
                 if (e.canAccept(this))
                     r.add(e);
@@ -270,7 +270,7 @@ public int size() {
          * Returns the assignment as a map.
          */
         public Map<WorkChunk,ExecutorChunk> toMap() {
-            Map<WorkChunk,ExecutorChunk> r = new HashMap<WorkChunk,ExecutorChunk>();
+            Map<WorkChunk,ExecutorChunk> r = new HashMap<>();
             for (int i=0; i<size(); i++)
                 r.put(get(i),assigned(i));
             return r;
@@ -322,12 +322,12 @@ public MappingWorksheet(BuildableItem item, List<? extends ExecutorSlot> offers,
         this.item = item;
         
         // group executors by their computers
-        Map<Computer,List<ExecutorSlot>> j = new HashMap<Computer, List<ExecutorSlot>>();
+        Map<Computer,List<ExecutorSlot>> j = new HashMap<>();
         for (ExecutorSlot o : offers) {
             Computer c = o.getExecutor().getOwner();
             List<ExecutorSlot> l = j.get(c);
             if (l==null)
-                j.put(c,l=new ArrayList<ExecutorSlot>());
+                j.put(c,l= new ArrayList<>());
             l.add(o);
         }
 
@@ -363,7 +363,7 @@ public MappingWorksheet(BuildableItem item, List<? extends ExecutorSlot> offers,
         }
 
         // build into the final shape
-        List<ExecutorChunk> executors = new ArrayList<ExecutorChunk>();
+        List<ExecutorChunk> executors = new ArrayList<>();
         for (List<ExecutorSlot> group : j.values()) {
             if (group.isEmpty())    continue;   // evict empty group
             ExecutorChunk ec = new ExecutorChunk(group, executors.size());
@@ -373,19 +373,19 @@ public MappingWorksheet(BuildableItem item, List<? extends ExecutorSlot> offers,
         this.executors = ImmutableList.copyOf(executors);
 
         // group execution units into chunks. use of LinkedHashMap ensures that the main work comes at the top
-        Map<Object,List<SubTask>> m = new LinkedHashMap<Object,List<SubTask>>();
+        Map<Object,List<SubTask>> m = new LinkedHashMap<>();
         for (SubTask meu : item.task.getSubTasks()) {
             Object c = meu.getSameNodeConstraint();
             if (c==null)    c = new Object();
 
             List<SubTask> l = m.get(c);
             if (l==null)
-                m.put(c,l= new ArrayList<SubTask>());
+                m.put(c,l= new ArrayList<>());
             l.add(meu);
         }
 
         // build into the final shape
-        List<WorkChunk> works = new ArrayList<WorkChunk>();
+        List<WorkChunk> works = new ArrayList<>();
         for (List<SubTask> group : m.values()) {
             works.add(new WorkChunk(group,works.size()));
         }
diff --git a/core/src/main/java/hudson/model/queue/Timeline.java b/core/src/main/java/hudson/model/queue/Timeline.java
index 91c1b9aeb1bc..43da59fc68ee 100644
--- a/core/src/main/java/hudson/model/queue/Timeline.java
+++ b/core/src/main/java/hudson/model/queue/Timeline.java
@@ -38,7 +38,7 @@
 */
 final class Timeline {
     // int[] is always length=1
-    private final TreeMap<Long, int[]> data = new TreeMap<Long, int[]>();
+    private final TreeMap<Long, int[]> data = new TreeMap<>();
 
     /**
      * Obtains q(t) for the given t.
diff --git a/core/src/main/java/hudson/model/queue/WorkUnitContext.java b/core/src/main/java/hudson/model/queue/WorkUnitContext.java
index 8afce5cbfd0f..82a9ef343d61 100644
--- a/core/src/main/java/hudson/model/queue/WorkUnitContext.java
+++ b/core/src/main/java/hudson/model/queue/WorkUnitContext.java
@@ -56,7 +56,7 @@ public final class WorkUnitContext {
 
     private final Latch startLatch, endLatch;
 
-    private List<WorkUnit> workUnits = new ArrayList<WorkUnit>();
+    private List<WorkUnit> workUnits = new ArrayList<>();
 
     /**
      * If the execution is aborted, set to non-null that indicates where it was aborted.
@@ -68,7 +68,7 @@ public WorkUnitContext(BuildableItem item) {
         this.task = item.task;
         this.future = (FutureImpl)item.getFuture();
         // JENKINS-51584 do not use item.getAllActions() here.
-        this.actions = new ArrayList<Action>(item.getActions());
+        this.actions = new ArrayList<>(item.getActions());
         // +1 for the main task
         int workUnitSize = task.getSubTasks().size();
         startLatch = new Latch(workUnitSize) {
diff --git a/core/src/main/java/hudson/node_monitors/AbstractAsyncNodeMonitorDescriptor.java b/core/src/main/java/hudson/node_monitors/AbstractAsyncNodeMonitorDescriptor.java
index e35ae80a7e13..7c9637146ad3 100644
--- a/core/src/main/java/hudson/node_monitors/AbstractAsyncNodeMonitorDescriptor.java
+++ b/core/src/main/java/hudson/node_monitors/AbstractAsyncNodeMonitorDescriptor.java
@@ -80,7 +80,7 @@ protected Map<Computer, T> monitor() throws InterruptedException {
      * Perform monitoring with detailed reporting.
      */
     protected final @Nonnull Result<T> monitorDetailed() throws InterruptedException {
-        Map<Computer,Future<T>> futures = new HashMap<Computer,Future<T>>();
+        Map<Computer,Future<T>> futures = new HashMap<>();
         Set<Computer> skipped = new HashSet<>();
 
         for (Computer c : Jenkins.getInstance().getComputers()) {
@@ -102,7 +102,7 @@ protected Map<Computer, T> monitor() throws InterruptedException {
         final long now = System.currentTimeMillis();
         final long end = now + getMonitoringTimeOut();
 
-        final Map<Computer,T> data = new HashMap<Computer,T>();
+        final Map<Computer,T> data = new HashMap<>();
 
         for (Entry<Computer, Future<T>> e : futures.entrySet()) {
             Computer c = e.getKey();
diff --git a/core/src/main/java/hudson/node_monitors/AbstractNodeMonitorDescriptor.java b/core/src/main/java/hudson/node_monitors/AbstractNodeMonitorDescriptor.java
index ee1cd6c41db3..e76b992060aa 100644
--- a/core/src/main/java/hudson/node_monitors/AbstractNodeMonitorDescriptor.java
+++ b/core/src/main/java/hudson/node_monitors/AbstractNodeMonitorDescriptor.java
@@ -140,7 +140,7 @@ public void doRun() {
      *      For all the computers, report the monitored values.
      */
     protected Map<Computer,T> monitor() throws InterruptedException {
-        Map<Computer,T> data = new HashMap<Computer,T>();
+        Map<Computer,T> data = new HashMap<>();
         for( Computer c : Jenkins.getInstance().getComputers() ) {
             try {
                 Thread.currentThread().setName("Monitoring "+c.getDisplayName()+" for "+getDisplayName());
diff --git a/core/src/main/java/hudson/node_monitors/NodeMonitor.java b/core/src/main/java/hudson/node_monitors/NodeMonitor.java
index 665b9cafe6dc..f5fea7f6eb13 100644
--- a/core/src/main/java/hudson/node_monitors/NodeMonitor.java
+++ b/core/src/main/java/hudson/node_monitors/NodeMonitor.java
@@ -140,7 +140,7 @@ public void setIgnored(boolean ignored) {
      *      Use {@link #all()} for read access and {@link Extension} for registration.
      */
     @Deprecated
-    public static final DescriptorList<NodeMonitor> LIST = new DescriptorList<NodeMonitor>(NodeMonitor.class);
+    public static final DescriptorList<NodeMonitor> LIST = new DescriptorList<>(NodeMonitor.class);
 
     /**
      * Returns all the registered {@link NodeMonitor} descriptors.
diff --git a/core/src/main/java/hudson/scm/ChangeLogSet.java b/core/src/main/java/hudson/scm/ChangeLogSet.java
index 472e1eaa942b..770b55274934 100644
--- a/core/src/main/java/hudson/scm/ChangeLogSet.java
+++ b/core/src/main/java/hudson/scm/ChangeLogSet.java
@@ -107,7 +107,7 @@ public RepositoryBrowser<?> getBrowser() {
     // method for the remote API.
     @Exported
     public final Object[] getItems() {
-        List<T> r = new ArrayList<T>();
+        List<T> r = new ArrayList<>();
         for (T t : this)
             r.add(t);
         return r.toArray();
diff --git a/core/src/main/java/hudson/scm/RepositoryBrowsers.java b/core/src/main/java/hudson/scm/RepositoryBrowsers.java
index e32f0210ef42..11b034f119bd 100644
--- a/core/src/main/java/hudson/scm/RepositoryBrowsers.java
+++ b/core/src/main/java/hudson/scm/RepositoryBrowsers.java
@@ -53,7 +53,7 @@ public class RepositoryBrowsers {
      * Only returns those {@link RepositoryBrowser} descriptors that extend from the given type.
      */
     public static List<Descriptor<RepositoryBrowser<?>>> filter(Class<? extends RepositoryBrowser> t) {
-        List<Descriptor<RepositoryBrowser<?>>> r = new ArrayList<Descriptor<RepositoryBrowser<?>>>();
+        List<Descriptor<RepositoryBrowser<?>>> r = new ArrayList<>();
         for (Descriptor<RepositoryBrowser<?>> d : RepositoryBrowser.all())
             if(d.isSubTypeOf(t))
                 r.add(d);
diff --git a/core/src/main/java/hudson/scm/SCMS.java b/core/src/main/java/hudson/scm/SCMS.java
index 5a821eb1fc52..64a0c02cd88c 100644
--- a/core/src/main/java/hudson/scm/SCMS.java
+++ b/core/src/main/java/hudson/scm/SCMS.java
@@ -46,7 +46,7 @@ public class SCMS {
      *      Use {@link SCM#all()} for read access and {@link Extension} for registration.
      */
     @Deprecated
-    public static final List<SCMDescriptor<?>> SCMS = (List)new DescriptorList<SCM>(SCM.class);
+    public static final List<SCMDescriptor<?>> SCMS = (List) new DescriptorList<>(SCM.class);
 
     /**
      * Parses {@link SCM} configuration from the submitted form.
diff --git a/core/src/main/java/hudson/search/ParsedQuickSilver.java b/core/src/main/java/hudson/search/ParsedQuickSilver.java
index 8f3a47f9b568..4af2614364cf 100644
--- a/core/src/main/java/hudson/search/ParsedQuickSilver.java
+++ b/core/src/main/java/hudson/search/ParsedQuickSilver.java
@@ -39,7 +39,7 @@
  * @author Kohsuke Kawaguchi
  */
 final class ParsedQuickSilver {
-    private static final Map<Class,ParsedQuickSilver> TABLE = new HashMap<Class,ParsedQuickSilver>();
+    private static final Map<Class,ParsedQuickSilver> TABLE = new HashMap<>();
 
     synchronized static ParsedQuickSilver get(Class<? extends SearchableModelObject> clazz) {
         ParsedQuickSilver pqs = TABLE.get(clazz);
@@ -48,7 +48,7 @@ synchronized static ParsedQuickSilver get(Class<? extends SearchableModelObject>
         return pqs;
     }
 
-    private final List<Getter> getters = new ArrayList<Getter>();
+    private final List<Getter> getters = new ArrayList<>();
 
     private ParsedQuickSilver(Class<? extends SearchableModelObject> clazz) {
         QuickSilver qs;
diff --git a/core/src/main/java/hudson/search/Search.java b/core/src/main/java/hudson/search/Search.java
index ba743c75552c..d799078f938c 100644
--- a/core/src/main/java/hudson/search/Search.java
+++ b/core/src/main/java/hudson/search/Search.java
@@ -142,7 +142,7 @@ public void doSuggest(StaplerRequest req, StaplerResponse rsp, @QueryParameter S
      *      a certain threshold to avoid showing too many options. 
      */
     public SearchResult getSuggestions(StaplerRequest req, String query) {
-        Set<String> paths = new HashSet<String>();  // paths already added, to control duplicates
+        Set<String> paths = new HashSet<>();  // paths already added, to control duplicates
         SearchResultImpl r = new SearchResultImpl();
         int max = req.hasParameter("max") ? Integer.parseInt(req.getParameter("max")) : 100;
         SearchableModelObject smo = findClosestSearchableModelObject(req);
diff --git a/core/src/main/java/hudson/search/SearchIndexBuilder.java b/core/src/main/java/hudson/search/SearchIndexBuilder.java
index b6d2f11f3d14..0c62e2ad5feb 100644
--- a/core/src/main/java/hudson/search/SearchIndexBuilder.java
+++ b/core/src/main/java/hudson/search/SearchIndexBuilder.java
@@ -38,9 +38,9 @@
  * @see AbstractModelObject#makeSearchIndex()
  */
 public final class SearchIndexBuilder {
-    private final List<SearchItem> items = new ArrayList<SearchItem>();
+    private final List<SearchItem> items = new ArrayList<>();
 
-    private final List<SearchIndex> indices = new ArrayList<SearchIndex>();
+    private final List<SearchIndex> indices = new ArrayList<>();
 
     /**
      * Adds all {@link QuickSilver}-annotated properties to the search index.
diff --git a/core/src/main/java/hudson/security/AuthorizationStrategy.java b/core/src/main/java/hudson/security/AuthorizationStrategy.java
index c8ee16e68161..e032a64ae253 100644
--- a/core/src/main/java/hudson/security/AuthorizationStrategy.java
+++ b/core/src/main/java/hudson/security/AuthorizationStrategy.java
@@ -194,7 +194,7 @@ public abstract class AuthorizationStrategy extends AbstractDescribableImpl<Auth
      *      Use {@link #all()} for read access, and {@link Extension} for registration.
      */
     @Deprecated
-    public static final DescriptorList<AuthorizationStrategy> LIST = new DescriptorList<AuthorizationStrategy>(AuthorizationStrategy.class);
+    public static final DescriptorList<AuthorizationStrategy> LIST = new DescriptorList<>(AuthorizationStrategy.class);
     
     /**
      * {@link AuthorizationStrategy} that implements the semantics
diff --git a/core/src/main/java/hudson/security/ContainerAuthentication.java b/core/src/main/java/hudson/security/ContainerAuthentication.java
index f990ad333c34..66d22b30aaea 100644
--- a/core/src/main/java/hudson/security/ContainerAuthentication.java
+++ b/core/src/main/java/hudson/security/ContainerAuthentication.java
@@ -60,7 +60,7 @@ public ContainerAuthentication(HttpServletRequest request) {
 
         // Servlet API doesn't provide a way to list up all roles the current user
         // has, so we need to ask AuthorizationStrategy what roles it is going to check against.
-        List<GrantedAuthority> l = new ArrayList<GrantedAuthority>();
+        List<GrantedAuthority> l = new ArrayList<>();
         for( String g : Jenkins.getInstance().getAuthorizationStrategy().getGroups()) {
             if(request.isUserInRole(g))
                 l.add(new GrantedAuthorityImpl(g));
diff --git a/core/src/main/java/hudson/security/FederatedLoginServiceUserProperty.java b/core/src/main/java/hudson/security/FederatedLoginServiceUserProperty.java
index 8084522b8e15..334fa1dcd1b0 100644
--- a/core/src/main/java/hudson/security/FederatedLoginServiceUserProperty.java
+++ b/core/src/main/java/hudson/security/FederatedLoginServiceUserProperty.java
@@ -45,7 +45,7 @@ public class FederatedLoginServiceUserProperty extends UserProperty {
     protected final Set<String> identifiers;
 
     protected FederatedLoginServiceUserProperty(Collection<String> identifiers) {
-        this.identifiers = new HashSet<String>(identifiers);
+        this.identifiers = new HashSet<>(identifiers);
     }
 
     public boolean has(String identifier) {
diff --git a/core/src/main/java/hudson/security/Permission.java b/core/src/main/java/hudson/security/Permission.java
index 31f6a944e25f..040aa94534d6 100644
--- a/core/src/main/java/hudson/security/Permission.java
+++ b/core/src/main/java/hudson/security/Permission.java
@@ -287,7 +287,7 @@ public boolean getEnabled() {
     /**
      * All permissions in the system but in a single list.
      */
-    private static final List<Permission> ALL = new CopyOnWriteArrayList<Permission>();
+    private static final List<Permission> ALL = new CopyOnWriteArrayList<>();
 
     private static final List<Permission> ALL_VIEW = Collections.unmodifiableList(ALL);
 
diff --git a/core/src/main/java/hudson/security/PermissionGroup.java b/core/src/main/java/hudson/security/PermissionGroup.java
index ef39787662f7..891a3a5e0e5e 100644
--- a/core/src/main/java/hudson/security/PermissionGroup.java
+++ b/core/src/main/java/hudson/security/PermissionGroup.java
@@ -41,7 +41,7 @@
  * Sortable by the owner class name.
  */
 public final class PermissionGroup implements Iterable<Permission>, Comparable<PermissionGroup> {
-    private final SortedSet<Permission> permissions = new TreeSet<Permission>(Permission.ID_COMPARATOR);
+    private final SortedSet<Permission> permissions = new TreeSet<>(Permission.ID_COMPARATOR);
 
     @Nonnull
     public final Class owner;
@@ -104,7 +104,7 @@ public Iterator<Permission> iterator() {
      * Lists up all the permissions in this group.
      */
     public synchronized List<Permission> getPermissions() {
-        return new ArrayList<Permission>(permissions);
+        return new ArrayList<>(permissions);
     }
 
     public synchronized boolean hasPermissionContainedBy(PermissionScope scope) {
@@ -169,7 +169,7 @@ private static synchronized void register(PermissionGroup g) {
      *      always non-null. Read-only.
      */
     public static synchronized List<PermissionGroup> getAll() {
-        return new ArrayList<PermissionGroup>(PERMISSIONS);
+        return new ArrayList<>(PERMISSIONS);
     }
 
     /**
@@ -189,5 +189,5 @@ public static synchronized List<PermissionGroup> getAll() {
     /**
      * All the permissions in the system, keyed by their owners.
      */
-    private static final SortedSet<PermissionGroup> PERMISSIONS = new TreeSet<PermissionGroup>();
+    private static final SortedSet<PermissionGroup> PERMISSIONS = new TreeSet<>();
 }
diff --git a/core/src/main/java/hudson/security/SecurityRealm.java b/core/src/main/java/hudson/security/SecurityRealm.java
index 867183f4b583..c7deaf7602f8 100644
--- a/core/src/main/java/hudson/security/SecurityRealm.java
+++ b/core/src/main/java/hudson/security/SecurityRealm.java
@@ -641,7 +641,7 @@ and both needs to use the same key (this is a reflection of a poor design in Acg
      *      Use {@link #all()} for read access, and use {@link Extension} for registration.
      */
     @Deprecated
-    public static final DescriptorList<SecurityRealm> LIST = new DescriptorList<SecurityRealm>(SecurityRealm.class);
+    public static final DescriptorList<SecurityRealm> LIST = new DescriptorList<>(SecurityRealm.class);
 
     /**
      * Returns all the registered {@link SecurityRealm} descriptors.
diff --git a/core/src/main/java/hudson/security/SparseACL.java b/core/src/main/java/hudson/security/SparseACL.java
index 5a70a2a50eba..d9c67a05ecdd 100644
--- a/core/src/main/java/hudson/security/SparseACL.java
+++ b/core/src/main/java/hudson/security/SparseACL.java
@@ -50,7 +50,7 @@ public Entry(Sid sid, Permission permission, boolean allowed) {
         }
     }
 
-    private final List<Entry> entries = new ArrayList<Entry>();
+    private final List<Entry> entries = new ArrayList<>();
     /**
      * Parent to delegate to. Can be null.
      */
diff --git a/core/src/main/java/hudson/security/WhoAmI.java b/core/src/main/java/hudson/security/WhoAmI.java
index 66e837acd37f..6002bdf519c2 100644
--- a/core/src/main/java/hudson/security/WhoAmI.java
+++ b/core/src/main/java/hudson/security/WhoAmI.java
@@ -65,7 +65,7 @@ public String[] getAuthorities() {
         if (auth().getAuthorities() == null) {
             return MemoryReductionUtil.EMPTY_STRING_ARRAY;
         }
-        List <String> authorities = new ArrayList<String>();
+        List <String> authorities = new ArrayList<>();
         for (GrantedAuthority a : auth().getAuthorities()) {
             authorities.add(a.getAuthority());
         }
diff --git a/core/src/main/java/hudson/tasks/ArtifactArchiver.java b/core/src/main/java/hudson/tasks/ArtifactArchiver.java
index b0f54d905060..18daf64e2ffb 100644
--- a/core/src/main/java/hudson/tasks/ArtifactArchiver.java
+++ b/core/src/main/java/hudson/tasks/ArtifactArchiver.java
@@ -279,7 +279,7 @@ private static final class ListFiles extends MasterToSlaveFileCallable<Map<Strin
         }
 
         @Override public Map<String,String> invoke(File basedir, VirtualChannel channel) throws IOException, InterruptedException {
-            Map<String,String> r = new HashMap<String,String>();
+            Map<String,String> r = new HashMap<>();
 
             FileSet fileSet = Util.createFileSet(basedir, includes, excludes);
             fileSet.setDefaultexcludes(defaultExcludes);
diff --git a/core/src/main/java/hudson/tasks/BuildStep.java b/core/src/main/java/hudson/tasks/BuildStep.java
index ad81455335c1..600b419a1ab7 100644
--- a/core/src/main/java/hudson/tasks/BuildStep.java
+++ b/core/src/main/java/hudson/tasks/BuildStep.java
@@ -232,7 +232,7 @@ default BuildStepMonitor getRequiredMonitorService() {
      *      {@link Extension} for registration.
      */
     @Deprecated
-    List<Descriptor<Builder>> BUILDERS = new DescriptorList<Builder>(Builder.class);
+    List<Descriptor<Builder>> BUILDERS = new DescriptorList<>(Builder.class);
 
     /**
      * List of all installed publishers.
@@ -259,14 +259,14 @@ final class PublisherList extends AbstractList<Descriptor<Publisher>> {
          * {@link Descriptor}s are actually stored in here.
          * Since {@link PublisherList} lives longer than {@link jenkins.model.Jenkins} we cannot directly use {@link ExtensionList}.
          */
-        private final DescriptorList<Publisher> core = new DescriptorList<Publisher>(Publisher.class);
+        private final DescriptorList<Publisher> core = new DescriptorList<>(Publisher.class);
 
         /**
          * For descriptors that are manually registered, remember what kind it was since
          * older plugins don't extend from neither {@link Recorder} nor {@link Notifier}.
          */
         /*package*/ static final WeakHashMap<Descriptor<Publisher>,Class<? extends Publisher>/*either Recorder.class or Notifier.class*/>
-                KIND = new WeakHashMap<Descriptor<Publisher>, Class<? extends Publisher>>();
+                KIND = new WeakHashMap<>();
 
         private PublisherList() {
         }
diff --git a/core/src/main/java/hudson/tasks/BuildStepDescriptor.java b/core/src/main/java/hudson/tasks/BuildStepDescriptor.java
index dbabe4226603..4f70a550cea1 100644
--- a/core/src/main/java/hudson/tasks/BuildStepDescriptor.java
+++ b/core/src/main/java/hudson/tasks/BuildStepDescriptor.java
@@ -74,7 +74,7 @@ List<Descriptor<T>> filter(List<Descriptor<T>> base, Class<? extends AbstractPro
         // descriptor of the project
         Descriptor pd = Jenkins.getInstance().getDescriptor((Class) type);
 
-        List<Descriptor<T>> r = new ArrayList<Descriptor<T>>(base.size());
+        List<Descriptor<T>> r = new ArrayList<>(base.size());
         for (Descriptor<T> d : base) {
             if (pd instanceof AbstractProjectDescriptor && !((AbstractProjectDescriptor)pd).isApplicable(d))
                 continue;
diff --git a/core/src/main/java/hudson/tasks/BuildTrigger.java b/core/src/main/java/hudson/tasks/BuildTrigger.java
index 78f8ef13f8a1..c924a6e37cce 100644
--- a/core/src/main/java/hudson/tasks/BuildTrigger.java
+++ b/core/src/main/java/hudson/tasks/BuildTrigger.java
@@ -256,7 +256,7 @@ public static boolean execute(AbstractBuild build, BuildListener listener) {
         // Check all downstream Project of the project, not just those defined by BuildTrigger
         // TODO this may not yet be up to date if rebuildDependencyGraphAsync has been used; need a method to wait for the last call made before now to finish
         final DependencyGraph graph = Jenkins.getInstance().getDependencyGraph();
-        List<Dependency> downstreamProjects = new ArrayList<Dependency>(
+        List<Dependency> downstreamProjects = new ArrayList<>(
                 graph.getDownstreamDependencies(build.getProject()));
         // Sort topologically
         Collections.sort(downstreamProjects, new Comparator<Dependency>() {
@@ -267,7 +267,7 @@ public int compare(Dependency lhs, Dependency rhs) {
         });
 
         for (Dependency dep : downstreamProjects) {
-            List<Action> buildActions = new ArrayList<Action>();
+            List<Action> buildActions = new ArrayList<>();
             if (dep.shouldTriggerBuild(build, listener, buildActions)) {
                 AbstractProject p = dep.getDownstreamProject();
                 // Allow shouldTriggerBuild to return false first, in case it is skipping because of a lack of Item.READ/DISCOVER permission:
diff --git a/core/src/main/java/hudson/tasks/Fingerprinter.java b/core/src/main/java/hudson/tasks/Fingerprinter.java
index 959bbaebc0ae..b71cf200e201 100644
--- a/core/src/main/java/hudson/tasks/Fingerprinter.java
+++ b/core/src/main/java/hudson/tasks/Fingerprinter.java
@@ -119,7 +119,7 @@ public void perform(Run<?,?> build, FilePath workspace, Launcher launcher, TaskL
         try {
             listener.getLogger().println(Messages.Fingerprinter_Recording());
 
-            Map<String,String> record = new HashMap<String,String>();
+            Map<String,String> record = new HashMap<>();
             
             EnvVars environment = build.getEnvironment(listener);
             if(targets.length()!=0) {
@@ -152,7 +152,7 @@ public BuildStepMonitor getRequiredMonitorService() {
     public void buildDependencyGraph(AbstractProject owner, DependencyGraph graph) {
         if (enableFingerprintsInDependencyGraph) {
             RunList builds = owner.getBuilds();
-            Set<String> seenUpstreamProjects = new HashSet<String>();
+            Set<String> seenUpstreamProjects = new HashSet<>();
 
             for (Object build1 : builds) {
                 Run build = (Run) build1;
@@ -222,7 +222,7 @@ private static final class FindRecords extends MasterToSlaveFileCallable<List<Re
 
         @Override
         public List<Record> invoke(File baseDir, VirtualChannel channel) throws IOException {
-            List<Record> results = new ArrayList<Record>();
+            List<Record> results = new ArrayList<>();
 
             FileSet src = Util.createFileSet(baseDir,targets);
 
@@ -316,7 +316,7 @@ public FingerprintAction(AbstractBuild build, Map<String, String> record) {
         }
 
         public void add(Map<String,String> moreRecords) {
-            Map<String,String> r = new HashMap<String, String>(record);
+            Map<String,String> r = new HashMap<>(record);
             r.putAll(moreRecords);
             record = compact(r);
             ref = null;
@@ -361,7 +361,7 @@ record = compact(record);
 
         /** Share data structure with other builds, mainly those of the same job. */
         private PackedMap<String,String> compact(Map<String,String> record) {
-            Map<String,String> b = new HashMap<String,String>();
+            Map<String,String> b = new HashMap<>();
             for (Entry<String,String> e : record.entrySet()) {
                 b.put(e.getKey().intern(), e.getValue().intern());
             }
@@ -380,7 +380,7 @@ public synchronized Map<String,Fingerprint> getFingerprints() {
 
             Jenkins h = Jenkins.getInstance();
 
-            Map<String,Fingerprint> m = new TreeMap<String,Fingerprint>();
+            Map<String,Fingerprint> m = new TreeMap<>();
             for (Entry<String, String> r : record.entrySet()) {
                 try {
                     Fingerprint fp = h._getFingerprint(r.getValue());
@@ -392,7 +392,7 @@ public synchronized Map<String,Fingerprint> getFingerprints() {
             }
 
             m = ImmutableMap.copyOf(m);
-            ref = new WeakReference<Map<String,Fingerprint>>(m);
+            ref = new WeakReference<>(m);
             return m;
         }
 
@@ -411,7 +411,7 @@ public Map<AbstractProject,Integer> getDependencies() {
          * @since 1.430
          */
         public Map<AbstractProject,Integer> getDependencies(boolean includeMissing) {
-            Map<AbstractProject,Integer> r = new HashMap<AbstractProject,Integer>();
+            Map<AbstractProject,Integer> r = new HashMap<>();
 
             for (Fingerprint fp : getFingerprints().values()) {
                 BuildPtr bp = fp.getOriginal();
diff --git a/core/src/main/java/hudson/tasks/Maven.java b/core/src/main/java/hudson/tasks/Maven.java
index 5bccbfe78548..63c3d944e626 100644
--- a/core/src/main/java/hudson/tasks/Maven.java
+++ b/core/src/main/java/hudson/tasks/Maven.java
@@ -349,7 +349,7 @@ public boolean perform(AbstractBuild<?,?> build, Launcher launcher, BuildListene
             }
 
             // Add properties from builder configuration, AFTER the injected build variables.
-            final VariableResolver<String> resolver = new Union<String>(new ByMap<String>(env), vr);
+            final VariableResolver<String> resolver = new Union<>(new ByMap<>(env), vr);
             args.addKeyValuePairsFromPropertyString("-D", this.properties, resolver, sensitiveVars);
 
             if (usesPrivateRepository())
@@ -460,7 +460,7 @@ public MavenInstallation[] getInstallations() {
         }
 
 		public void setInstallations(MavenInstallation... installations) {
-			List<MavenInstallation> tmpList = new ArrayList<Maven.MavenInstallation>();
+			List<MavenInstallation> tmpList = new ArrayList<>();
 			// remote empty Maven installation : 
 			if(installations != null) {
 				Collections.addAll(tmpList, installations);
diff --git a/core/src/main/java/hudson/tasks/Publisher.java b/core/src/main/java/hudson/tasks/Publisher.java
index c1c8a601e26e..08c484738e4e 100644
--- a/core/src/main/java/hudson/tasks/Publisher.java
+++ b/core/src/main/java/hudson/tasks/Publisher.java
@@ -135,7 +135,7 @@ public DescriptorExtensionListImpl(Jenkins hudson) {
 
         @Override
         protected List<ExtensionComponent<Descriptor<Publisher>>> sort(List<ExtensionComponent<Descriptor<Publisher>>> r) {
-            List<ExtensionComponent<Descriptor<Publisher>>> copy = new ArrayList<ExtensionComponent<Descriptor<Publisher>>>(r);
+            List<ExtensionComponent<Descriptor<Publisher>>> copy = new ArrayList<>(r);
             Collections.sort(copy,this);
             return copy;
         }
diff --git a/core/src/main/java/hudson/tasks/Shell.java b/core/src/main/java/hudson/tasks/Shell.java
index 3455076d5bfc..97c534b346f4 100644
--- a/core/src/main/java/hudson/tasks/Shell.java
+++ b/core/src/main/java/hudson/tasks/Shell.java
@@ -88,7 +88,7 @@ public String[] buildCommandLine(FilePath script) {
             // interpreter override
             int end = command.indexOf('\n');
             if(end<0)   end=command.length();
-            List<String> args = new ArrayList<String>();
+            List<String> args = new ArrayList<>();
             args.addAll(Arrays.asList(Util.tokenize(command.substring(0,end).trim())));
             args.add(script.getRemote());
             args.set(0,args.get(0).substring(2));   // trim off "#!"
diff --git a/core/src/main/java/hudson/tools/DownloadFromUrlInstaller.java b/core/src/main/java/hudson/tools/DownloadFromUrlInstaller.java
index dab3fda6693f..ab67566d7f78 100644
--- a/core/src/main/java/hudson/tools/DownloadFromUrlInstaller.java
+++ b/core/src/main/java/hudson/tools/DownloadFromUrlInstaller.java
@@ -178,7 +178,7 @@ private boolean isDefaultSchema(List<JSONObject> jsonList) {
         private JSONObject reduce(List<JSONObject> jsonList) {
             List<ToolInstallerEntry> reducedToolEntries = new LinkedList<>();
 
-            HashSet<String> processedIds = new HashSet<String>();
+            HashSet<String> processedIds = new HashSet<>();
             for (JSONObject jsonToolList : jsonList) {
                 ToolInstallerList toolInstallerList = (ToolInstallerList) JSONObject.toBean(jsonToolList, ToolInstallerList.class);
                 for(ToolInstallerEntry entry : toolInstallerList.list) {
diff --git a/core/src/main/java/hudson/tools/InstallSourceProperty.java b/core/src/main/java/hudson/tools/InstallSourceProperty.java
index 7ef474d015f3..ef358df253ef 100644
--- a/core/src/main/java/hudson/tools/InstallSourceProperty.java
+++ b/core/src/main/java/hudson/tools/InstallSourceProperty.java
@@ -42,7 +42,7 @@
 public class InstallSourceProperty extends ToolProperty<ToolInstallation> {
     // TODO: get the proper Saveable
     public final DescribableList<ToolInstaller, Descriptor<ToolInstaller>> installers =
-            new DescribableList<ToolInstaller, Descriptor<ToolInstaller>>(Saveable.NOOP);
+            new DescribableList<>(Saveable.NOOP);
 
     @DataBoundConstructor
     public InstallSourceProperty(List<? extends ToolInstaller> installers) throws IOException {
diff --git a/core/src/main/java/hudson/tools/InstallerTranslator.java b/core/src/main/java/hudson/tools/InstallerTranslator.java
index fd45212bd740..dfe22db37e63 100644
--- a/core/src/main/java/hudson/tools/InstallerTranslator.java
+++ b/core/src/main/java/hudson/tools/InstallerTranslator.java
@@ -40,7 +40,7 @@
 @Extension
 public class InstallerTranslator extends ToolLocationTranslator {
 
-    private static final Map<Node,Map<ToolInstallation,Semaphore>> mutexByNode = new WeakHashMap<Node,Map<ToolInstallation,Semaphore>>();
+    private static final Map<Node,Map<ToolInstallation,Semaphore>> mutexByNode = new WeakHashMap<>();
 
     public String getToolHome(Node node, ToolInstallation tool, TaskListener log) throws IOException, InterruptedException {
         if (node.getRootPath() == null) {
@@ -52,7 +52,7 @@ public String getToolHome(Node node, ToolInstallation tool, TaskListener log) th
             return null;
         }
 
-        ArrayList<String> inapplicableInstallersMessages = new ArrayList<String>();
+        ArrayList<String> inapplicableInstallersMessages = new ArrayList<>();
 
         for (ToolInstaller installer : isp.installers) {
             if (installer.appliesTo(node)) {
@@ -60,7 +60,7 @@ public String getToolHome(Node node, ToolInstallation tool, TaskListener log) th
                 synchronized (mutexByNode) {
                     Map<ToolInstallation, Semaphore> mutexByTool = mutexByNode.get(node);
                     if (mutexByTool == null) {
-                        mutexByNode.put(node, mutexByTool = new WeakHashMap<ToolInstallation, Semaphore>());
+                        mutexByNode.put(node, mutexByTool = new WeakHashMap<>());
                     }
                     semaphore = mutexByTool.get(tool);
                     if (semaphore == null) {
diff --git a/core/src/main/java/hudson/tools/PropertyDescriptor.java b/core/src/main/java/hudson/tools/PropertyDescriptor.java
index fe619a85d6cd..0ef31633928c 100644
--- a/core/src/main/java/hudson/tools/PropertyDescriptor.java
+++ b/core/src/main/java/hudson/tools/PropertyDescriptor.java
@@ -50,7 +50,7 @@ public boolean isApplicable(Class<? extends T> targetType) {
     }
 
     public static <D extends PropertyDescriptor<?,T>,T> List<D> for_(List<D> all, Class<? extends T> target) {
-        List<D> result = new ArrayList<D>();
+        List<D> result = new ArrayList<>();
         for (D d : all)
             if (d.isApplicable(target))
                 result.add(d);
diff --git a/core/src/main/java/hudson/tools/ToolDescriptor.java b/core/src/main/java/hudson/tools/ToolDescriptor.java
index c39149ceebe3..76a07f39bacd 100644
--- a/core/src/main/java/hudson/tools/ToolDescriptor.java
+++ b/core/src/main/java/hudson/tools/ToolDescriptor.java
@@ -136,7 +136,7 @@ public List<? extends ToolInstaller> getDefaultInstallers() {
      */
     public DescribableList<ToolProperty<?>,ToolPropertyDescriptor> getDefaultProperties() throws IOException {
         DescribableList<ToolProperty<?>,ToolPropertyDescriptor> r
-                = new DescribableList<ToolProperty<?>, ToolPropertyDescriptor>(NOOP);
+                = new DescribableList<>(NOOP);
 
         List<? extends ToolInstaller> installers = getDefaultInstallers();
         if(!installers.isEmpty())
diff --git a/core/src/main/java/hudson/tools/ToolInstallation.java b/core/src/main/java/hudson/tools/ToolInstallation.java
index e6f104dffc4c..59a5317a124e 100644
--- a/core/src/main/java/hudson/tools/ToolInstallation.java
+++ b/core/src/main/java/hudson/tools/ToolInstallation.java
@@ -84,7 +84,7 @@ public abstract class ToolInstallation extends AbstractDescribableImpl<ToolInsta
      */
     @XStreamSerializable
     private transient /*almost final*/ DescribableList<ToolProperty<?>,ToolPropertyDescriptor> properties
-            = new DescribableList<ToolProperty<?>,ToolPropertyDescriptor>(Saveable.NOOP);
+            = new DescribableList<>(Saveable.NOOP);
 
     /**
      * @deprecated
@@ -211,7 +211,7 @@ protected String translateFor(Node node, TaskListener log) throws IOException, I
      */
     protected Object readResolve() {
         if(properties==null)
-            properties = new DescribableList<ToolProperty<?>,ToolPropertyDescriptor>(Saveable.NOOP);
+            properties = new DescribableList<>(Saveable.NOOP);
         for (ToolProperty<?> p : properties)
             _setTool(p, this);
         return this;
diff --git a/core/src/main/java/hudson/tools/ToolInstallerDescriptor.java b/core/src/main/java/hudson/tools/ToolInstallerDescriptor.java
index 09d60b622a88..e0e543d578fd 100644
--- a/core/src/main/java/hudson/tools/ToolInstallerDescriptor.java
+++ b/core/src/main/java/hudson/tools/ToolInstallerDescriptor.java
@@ -55,7 +55,7 @@ public static DescriptorExtensionList<ToolInstaller,ToolInstallerDescriptor<?>>
      * Filters {@link #all()} by eliminating things that are not applicable to the given type.
      */
     public static List<ToolInstallerDescriptor<?>> for_(Class<? extends ToolInstallation> type) {
-        List<ToolInstallerDescriptor<?>> r = new ArrayList<ToolInstallerDescriptor<?>>();
+        List<ToolInstallerDescriptor<?>> r = new ArrayList<>();
         for (ToolInstallerDescriptor<?> d : all())
             if(d.isApplicable(type))
                 r.add(d);
diff --git a/core/src/main/java/hudson/tools/ToolLocationNodeProperty.java b/core/src/main/java/hudson/tools/ToolLocationNodeProperty.java
index d5a356083953..1c3c1e53da6c 100644
--- a/core/src/main/java/hudson/tools/ToolLocationNodeProperty.java
+++ b/core/src/main/java/hudson/tools/ToolLocationNodeProperty.java
@@ -57,7 +57,7 @@ public class ToolLocationNodeProperty extends NodeProperty<Node> {
     @DataBoundConstructor
     public ToolLocationNodeProperty(List<ToolLocation> locations) {
         if (locations == null) {
-            locations = new ArrayList<ToolLocation>();
+            locations = new ArrayList<>();
         }
         this.locations = locations;
     }
diff --git a/core/src/main/java/hudson/util/ArgumentListBuilder.java b/core/src/main/java/hudson/util/ArgumentListBuilder.java
index 59f149b03480..d40cbc523345 100644
--- a/core/src/main/java/hudson/util/ArgumentListBuilder.java
+++ b/core/src/main/java/hudson/util/ArgumentListBuilder.java
@@ -46,7 +46,7 @@
  * @author Kohsuke Kawaguchi
  */
 public class ArgumentListBuilder implements Serializable, Cloneable {
-    private final List<String> args = new ArrayList<String>();
+    private final List<String> args = new ArrayList<>();
     /**
      * Bit mask indicating arguments that shouldn't be echoed-back (e.g., password)
      */
diff --git a/core/src/main/java/hudson/util/BootFailure.java b/core/src/main/java/hudson/util/BootFailure.java
index 8d1055b1c297..5649d79d6a2e 100644
--- a/core/src/main/java/hudson/util/BootFailure.java
+++ b/core/src/main/java/hudson/util/BootFailure.java
@@ -55,7 +55,7 @@ public void publish(ServletContext context, @CheckForNull File home) {
      * Parses the boot attempt file carefully so as not to cause the entire hook script to fail to execute.
      */
     protected List<Date> loadAttempts(File home) {
-        List<Date> dates = new ArrayList<Date>();
+        List<Date> dates = new ArrayList<>();
         if (home!=null) {
             File f = getBootFailureFile(home);
             try {
diff --git a/core/src/main/java/hudson/util/CharSpool.java b/core/src/main/java/hudson/util/CharSpool.java
index 6ab9c531d68f..887c6aba5f57 100644
--- a/core/src/main/java/hudson/util/CharSpool.java
+++ b/core/src/main/java/hudson/util/CharSpool.java
@@ -57,7 +57,7 @@ private void renew() {
             return;
 
         if(buf==null)
-            buf = new LinkedList<char[]>();
+            buf = new LinkedList<>();
         buf.add(last);
         last = new char[1024];
         pos = 0;
diff --git a/core/src/main/java/hudson/util/ClasspathBuilder.java b/core/src/main/java/hudson/util/ClasspathBuilder.java
index e8bfafecc250..eb4b73064702 100644
--- a/core/src/main/java/hudson/util/ClasspathBuilder.java
+++ b/core/src/main/java/hudson/util/ClasspathBuilder.java
@@ -17,7 +17,7 @@
  * @since 1.300
  */
 public class ClasspathBuilder implements Serializable {
-    private final List<String> args = new ArrayList<String>();
+    private final List<String> args = new ArrayList<>();
 
     /**
      * Adds a single directory or a jar file.
diff --git a/core/src/main/java/hudson/util/CompressedFile.java b/core/src/main/java/hudson/util/CompressedFile.java
index 0fcc867ef5d1..e4660691959e 100644
--- a/core/src/main/java/hudson/util/CompressedFile.java
+++ b/core/src/main/java/hudson/util/CompressedFile.java
@@ -166,7 +166,7 @@ public void run() {
      * this should be a fairly low-priority task.
      */
     private static final ExecutorService compressionThread = new ThreadPoolExecutor(
-        0, 1, 5L, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>(),
+        0, 1, 5L, TimeUnit.SECONDS, new LinkedBlockingQueue<>(),
         new ExceptionCatchingThreadFactory(new NamingThreadFactory(new DaemonThreadFactory(), "CompressedFile")));
 
     private static final Logger LOGGER = Logger.getLogger(CompressedFile.class.getName());
diff --git a/core/src/main/java/hudson/util/ConsistentHash.java b/core/src/main/java/hudson/util/ConsistentHash.java
index d26e3b4fc89c..e1aa16990b07 100644
--- a/core/src/main/java/hudson/util/ConsistentHash.java
+++ b/core/src/main/java/hudson/util/ConsistentHash.java
@@ -64,7 +64,7 @@ public class ConsistentHash<T> {
     /**
      * All the items in the hash, to their replication factors.
      */
-    private final Map<T,Point[]> items = new HashMap<T,Point[]>();
+    private final Map<T,Point[]> items = new HashMap<>();
     private int numPoints;
 
     private final int defaultReplication;
@@ -141,15 +141,16 @@ T lookup(int queryPoint) {
          */
         Iterator<T> list(int queryPoint) {
             final int start = index(queryPoint);
-            return new DuplicateFilterIterator<T>(new Iterator<T>() {
-                int pos=0;
+            return new DuplicateFilterIterator<>(new Iterator<T>() {
+                int pos = 0;
+
                 public boolean hasNext() {
-                    return pos<owner.length;
+                    return pos < owner.length;
                 }
 
                 public T next() {
-                    if(!hasNext())  throw new NoSuchElementException();
-                    return (T)owner[(start+(pos++))%owner.length];
+                    if (!hasNext()) throw new NoSuchElementException();
+                    return (T) owner[(start + (pos++)) % owner.length];
                 }
 
                 public void remove() {
diff --git a/core/src/main/java/hudson/util/CopyOnWriteList.java b/core/src/main/java/hudson/util/CopyOnWriteList.java
index 4e6af51dc660..c6a0f20ad069 100644
--- a/core/src/main/java/hudson/util/CopyOnWriteList.java
+++ b/core/src/main/java/hudson/util/CopyOnWriteList.java
@@ -59,7 +59,7 @@ public CopyOnWriteList(List<E> core) {
     }
 
     private CopyOnWriteList(List<E> core, boolean noCopy) {
-        this.core = noCopy ? core : new ArrayList<E>(core);
+        this.core = noCopy ? core : new ArrayList<>(core);
     }
 
     public CopyOnWriteList() {
@@ -67,13 +67,13 @@ public CopyOnWriteList() {
     }
 
     public synchronized void add(E e) {
-        List<E> n = new ArrayList<E>(core);
+        List<E> n = new ArrayList<>(core);
         n.add(e);
         core = n;
     }
 
     public synchronized void addAll(Collection<? extends E> items) {
-        List<E> n = new ArrayList<E>(core);
+        List<E> n = new ArrayList<>(core);
         n.addAll(items);
         core = n;
     }
@@ -86,7 +86,7 @@ public synchronized void addAll(Collection<? extends E> items) {
      *      in which case there's no change.
      */
     public synchronized boolean remove(E e) {
-        List<E> n = new ArrayList<E>(core);
+        List<E> n = new ArrayList<>(core);
         boolean r = n.remove(e);
         core = n;
         return r;
@@ -135,7 +135,7 @@ public void replaceBy(E... that) {
     }
 
     public void clear() {
-        this.core = new ArrayList<E>();
+        this.core = new ArrayList<>();
     }
 
     public <E> E[] toArray(E[] array) {
diff --git a/core/src/main/java/hudson/util/CopyOnWriteMap.java b/core/src/main/java/hudson/util/CopyOnWriteMap.java
index 3624bf550e1e..f57e56889dc0 100644
--- a/core/src/main/java/hudson/util/CopyOnWriteMap.java
+++ b/core/src/main/java/hudson/util/CopyOnWriteMap.java
@@ -166,14 +166,14 @@ public Set<Entry<K,V>> entrySet() {
      */
     public static final class Hash<K,V> extends CopyOnWriteMap<K,V> {
         public Hash(Map<K,V> core) {
-            super(new LinkedHashMap<K,V>(core));
+            super(new LinkedHashMap<>(core));
         }
 
         public Hash() {
         }
 
         protected Map<K,V> copy() {
-            return new LinkedHashMap<K,V>(core);
+            return new LinkedHashMap<>(core);
         }
 
         public static class ConverterImpl extends MapConverter {
@@ -210,7 +210,7 @@ public Tree(Map<K,V> core, Comparator<K> comparator) {
         }
 
         public Tree(Comparator<K> comparator) {
-            super(new TreeMap<K,V>(comparator));
+            super(new TreeMap<>(comparator));
             this.comparator = comparator;
         }
 
@@ -219,14 +219,14 @@ public Tree() {
         }
 
         protected Map<K,V> copy() {
-            TreeMap<K,V> m = new TreeMap<K,V>(comparator);
+            TreeMap<K,V> m = new TreeMap<>(comparator);
             m.putAll(core);
             return m;
         }
 
         @Override
         public synchronized void clear() {
-            update(new TreeMap<K,V>(comparator));
+            update(new TreeMap<>(comparator));
         }
 
         public static class ConverterImpl extends TreeMapConverter {
diff --git a/core/src/main/java/hudson/util/CyclicGraphDetector.java b/core/src/main/java/hudson/util/CyclicGraphDetector.java
index 8e4b6d33c0b7..07c4037799c8 100644
--- a/core/src/main/java/hudson/util/CyclicGraphDetector.java
+++ b/core/src/main/java/hudson/util/CyclicGraphDetector.java
@@ -14,11 +14,11 @@
  * @author Kohsuke Kawaguchi
  */
 public abstract class CyclicGraphDetector<N> {
-    private final Set<N> visited = new HashSet<N>();
-    private final Set<N> visiting = new HashSet<N>();
-    private final Stack<N> path = new Stack<N>();
+    private final Set<N> visited = new HashSet<>();
+    private final Set<N> visiting = new HashSet<>();
+    private final Stack<N> path = new Stack<>();
 
-    private final List<N> topologicalOrder = new ArrayList<N>();
+    private final List<N> topologicalOrder = new ArrayList<>();
 
     public void run(Iterable<? extends N> allNodes) throws CycleDetectedException {
         for (N n : allNodes){
diff --git a/core/src/main/java/hudson/util/DataSetBuilder.java b/core/src/main/java/hudson/util/DataSetBuilder.java
index def57650868d..87fd0bba42a8 100644
--- a/core/src/main/java/hudson/util/DataSetBuilder.java
+++ b/core/src/main/java/hudson/util/DataSetBuilder.java
@@ -44,9 +44,9 @@
  */
 public final class DataSetBuilder<Row extends Comparable,Column extends Comparable> {
 
-    private List<Number> values = new ArrayList<Number>();
-    private List<Row> rows = new ArrayList<Row>();
-    private List<Column> columns = new ArrayList<Column>();
+    private List<Number> values = new ArrayList<>();
+    private List<Row> rows = new ArrayList<>();
+    private List<Column> columns = new ArrayList<>();
 
     public void add( Number value, Row rowKey, Column columnKey ) {
         values.add(value);
@@ -57,8 +57,8 @@ public void add( Number value, Row rowKey, Column columnKey ) {
     public CategoryDataset build() {
         DefaultCategoryDataset ds = new DefaultCategoryDataset();
 
-        TreeSet<Row> rowSet = new TreeSet<Row>(rows);
-        TreeSet<Column> colSet = new TreeSet<Column>(columns);
+        TreeSet<Row> rowSet = new TreeSet<>(rows);
+        TreeSet<Column> colSet = new TreeSet<>(columns);
 
         Comparable[] _rows = rowSet.toArray(new Comparable[rowSet.size()]);
         Comparable[] _cols = colSet.toArray(new Comparable[colSet.size()]);
diff --git a/core/src/main/java/hudson/util/DescribableList.java b/core/src/main/java/hudson/util/DescribableList.java
index 18642093c7f4..3c3a85a7859f 100644
--- a/core/src/main/java/hudson/util/DescribableList.java
+++ b/core/src/main/java/hudson/util/DescribableList.java
@@ -162,7 +162,7 @@ public Map<D,T> toMap() {
      *      Structured form data that includes the data for nested descriptor list.
      */
     public void rebuild(StaplerRequest req, JSONObject json, List<? extends Descriptor<T>> descriptors) throws FormException, IOException {
-        List<T> newList = new ArrayList<T>();
+        List<T> newList = new ArrayList<>();
 
         for (Descriptor<T> d : descriptors) {
             T existing = get((D)d);
diff --git a/core/src/main/java/hudson/util/DescriptorList.java b/core/src/main/java/hudson/util/DescriptorList.java
index 34ea3ba796d8..0cdb0df804a9 100644
--- a/core/src/main/java/hudson/util/DescriptorList.java
+++ b/core/src/main/java/hudson/util/DescriptorList.java
@@ -82,7 +82,7 @@ public final class DescriptorList<T extends Describable<T>> extends AbstractList
     @Deprecated
     public DescriptorList(Descriptor<T>... descriptors) {
         this.type = null;
-        this.legacy = new CopyOnWriteArrayList<Descriptor<T>>(descriptors);
+        this.legacy = new CopyOnWriteArrayList<>(descriptors);
     }
 
     /**
diff --git a/core/src/main/java/hudson/util/FormValidation.java b/core/src/main/java/hudson/util/FormValidation.java
index 60b63b18ac7c..b77c50bec6c6 100644
--- a/core/src/main/java/hudson/util/FormValidation.java
+++ b/core/src/main/java/hudson/util/FormValidation.java
@@ -596,7 +596,7 @@ public CheckMethod(Descriptor descriptor, String fieldName) {
 
             method = ReflectionUtils.getPublicMethodNamed(descriptor.getClass(), "doCheck" + capitalizedFieldName);
             if(method !=null) {
-                names = new ArrayList<String>();
+                names = new ArrayList<>();
                 findParameters(method);
             } else {
                 names = null;
diff --git a/core/src/main/java/hudson/util/Iterators.java b/core/src/main/java/hudson/util/Iterators.java
index d07e97f38b79..68ae293c269f 100644
--- a/core/src/main/java/hudson/util/Iterators.java
+++ b/core/src/main/java/hudson/util/Iterators.java
@@ -148,7 +148,7 @@ public void remove() {
      * Remove duplicates from another iterator.
      */
     public static final class DuplicateFilterIterator<T> extends FilterIterator<T> {
-        private final Set<T> seen = new HashSet<T>();
+        private final Set<T> seen = new HashSet<>();
 
         public DuplicateFilterIterator(Iterator<? extends T> core) {
             super(core);
@@ -336,7 +336,7 @@ protected Iterator<T> expand(Iterable<? extends T> iterable) {
      */
     public static <T> Iterator<T> removeDups(Iterator<T> iterator) {
         return new FilterIterator<T>(iterator) {
-            final Set<T> found = new HashSet<T>();
+            final Set<T> found = new HashSet<>();
             @Override
             protected boolean filter(T t) {
                 return found.add(t);
diff --git a/core/src/main/java/hudson/util/JVMBuilder.java b/core/src/main/java/hudson/util/JVMBuilder.java
index aa77d16ddbcd..8166cbe49761 100644
--- a/core/src/main/java/hudson/util/JVMBuilder.java
+++ b/core/src/main/java/hudson/util/JVMBuilder.java
@@ -41,7 +41,7 @@
  */
 public class JVMBuilder implements Serializable {
     private final ClasspathBuilder classpath = new ClasspathBuilder();
-    private final Map<String,String> systemProperties = new TreeMap<String,String>();
+    private final Map<String,String> systemProperties = new TreeMap<>();
     private final ArgumentListBuilder args = new ArgumentListBuilder();
     private final ArgumentListBuilder vmopts = new ArgumentListBuilder();
     private FilePath pwd;
diff --git a/core/src/main/java/hudson/util/KeyedDataStorage.java b/core/src/main/java/hudson/util/KeyedDataStorage.java
index 183443945515..93f15b6a09ae 100644
--- a/core/src/main/java/hudson/util/KeyedDataStorage.java
+++ b/core/src/main/java/hudson/util/KeyedDataStorage.java
@@ -63,7 +63,7 @@ public abstract class KeyedDataStorage<T,P> {
      * If it's {@link Loading}, then that indicates the fingerprint is being loaded.
      * The thread can wait on this object to be notified when the loading completes.
      */
-    private final ConcurrentHashMap<String,Object> core = new ConcurrentHashMap<String,Object>();
+    private final ConcurrentHashMap<String,Object> core = new ConcurrentHashMap<>();
 
     /**
      * Used in {@link KeyedDataStorage#core} to indicate that the loading of a fingerprint
@@ -149,7 +149,7 @@ public synchronized void set(@CheckForNull T value) {
 
             // the fingerprint doesn't seem to be loaded thus far, so let's load it now.
             // the care needs to be taken that other threads might be trying to do the same.
-            Loading<T> l = new Loading<T>();
+            Loading<T> l = new Loading<>();
             if(value==null ? core.putIfAbsent(key,l)!=null : !core.replace(key,value,l)) {
                 // the value has changed since then. another thread is attempting to do the same.
                 // go back to square 1 and try it again.
@@ -175,7 +175,7 @@ public synchronized void set(@CheckForNull T value) {
 
             // the map needs to be updated to reflect the result of loading
             if(t!=null)
-                core.put(key,new SoftReference<T>(t));
+                core.put(key, new SoftReference<>(t));
             else
                 core.remove(key);
 
diff --git a/core/src/main/java/hudson/util/Memoizer.java b/core/src/main/java/hudson/util/Memoizer.java
index 8e4057100b10..cce36b315c33 100644
--- a/core/src/main/java/hudson/util/Memoizer.java
+++ b/core/src/main/java/hudson/util/Memoizer.java
@@ -38,7 +38,7 @@
  */
 @Deprecated
 public abstract class Memoizer<K,V> {
-    private final ConcurrentHashMap<K,V> store = new ConcurrentHashMap<K,V>();
+    private final ConcurrentHashMap<K,V> store = new ConcurrentHashMap<>();
 
     public V get(K key) {
         V v = store.get(key);
diff --git a/core/src/main/java/hudson/util/MultipartFormDataParser.java b/core/src/main/java/hudson/util/MultipartFormDataParser.java
index 466962e4a361..141523e65f5a 100644
--- a/core/src/main/java/hudson/util/MultipartFormDataParser.java
+++ b/core/src/main/java/hudson/util/MultipartFormDataParser.java
@@ -44,7 +44,7 @@
  */
 public class MultipartFormDataParser implements AutoCloseable {
     private final ServletFileUpload upload = new ServletFileUpload(new DiskFileItemFactory());
-    private final Map<String,FileItem> byName = new HashMap<String,FileItem>();
+    private final Map<String,FileItem> byName = new HashMap<>();
 
     public MultipartFormDataParser(HttpServletRequest request) throws ServletException {
         try {
diff --git a/core/src/main/java/hudson/util/PackedMap.java b/core/src/main/java/hudson/util/PackedMap.java
index b395a20d6ad4..617f0dfdf3b3 100644
--- a/core/src/main/java/hudson/util/PackedMap.java
+++ b/core/src/main/java/hudson/util/PackedMap.java
@@ -64,7 +64,7 @@ public final class PackedMap<K,V> extends AbstractMap<K,V> {
      *      Map to copy contents from. Iteration order is preserved.
      */
     public static <K,V> PackedMap<K,V> of(Map<? extends K,? extends V> src) {
-        return new PackedMap<K, V>(src);
+        return new PackedMap<>(src);
     }
 
     private PackedMap(Map<? extends K,? extends V> src) {
diff --git a/core/src/main/java/hudson/util/PersistedList.java b/core/src/main/java/hudson/util/PersistedList.java
index ae27fbfc481e..78373c34c6bb 100644
--- a/core/src/main/java/hudson/util/PersistedList.java
+++ b/core/src/main/java/hudson/util/PersistedList.java
@@ -48,7 +48,7 @@
  * @since 1.333
  */
 public class PersistedList<T> extends AbstractList<T> {
-    protected final CopyOnWriteList<T> data = new CopyOnWriteList<T>();
+    protected final CopyOnWriteList<T> data = new CopyOnWriteList<>();
     protected Saveable owner = Saveable.NOOP;
 
     protected PersistedList() {
@@ -100,7 +100,7 @@ public <U extends T> U get(Class<U> type) {
      * Gets all instances that matches the given type.
      */
     public <U extends T> List<U> getAll(Class<U> type) {
-        List<U> r = new ArrayList<U>();
+        List<U> r = new ArrayList<>();
         for (T t : data)
             if(type.isInstance(t))
                 r.add(type.cast(t));
@@ -131,7 +131,7 @@ public void remove(Class<? extends T> type) throws IOException {
      * as copy-on-write semantics make this rather slow.
      */
     public void replace(T from, T to) throws IOException {
-        List<T> copy = new ArrayList<T>(data.getView());
+        List<T> copy = new ArrayList<>(data.getView());
         for (int i=0; i<copy.size(); i++) {
             if (copy.get(i).equals(from))
                 copy.set(i,to);
diff --git a/core/src/main/java/hudson/util/PluginServletFilter.java b/core/src/main/java/hudson/util/PluginServletFilter.java
index 08ab06151193..3ffe1de3336f 100644
--- a/core/src/main/java/hudson/util/PluginServletFilter.java
+++ b/core/src/main/java/hudson/util/PluginServletFilter.java
@@ -60,7 +60,7 @@
  * @see SecurityRealm
  */
 public class PluginServletFilter implements Filter, ExtensionPoint {
-    private final List<Filter> list = new CopyOnWriteArrayList<Filter>();
+    private final List<Filter> list = new CopyOnWriteArrayList<>();
 
     private /*almost final*/ FilterConfig config;
 
@@ -69,7 +69,7 @@ public class PluginServletFilter implements Filter, ExtensionPoint {
      * starts functioning, when we are not sure which Jenkins instance a filter belongs to, put it here,
      * and let the first Jenkins instance take over.
      */
-    private static final List<Filter> LEGACY = new Vector<Filter>();
+    private static final List<Filter> LEGACY = new Vector<>();
 
     private static final String KEY = PluginServletFilter.class.getName();
 
diff --git a/core/src/main/java/hudson/util/ProcessTree.java b/core/src/main/java/hudson/util/ProcessTree.java
index fd33d2f9952b..a0c2c6fc481f 100644
--- a/core/src/main/java/hudson/util/ProcessTree.java
+++ b/core/src/main/java/hudson/util/ProcessTree.java
@@ -99,7 +99,7 @@ public abstract class ProcessTree implements Iterable<OSProcess>, IProcessTree,
     /**
      * To be filled in the constructor of the derived type.
      */
-    protected final Map<Integer/*pid*/, OSProcess> processes = new HashMap<Integer, OSProcess>();
+    protected final Map<Integer/*pid*/, OSProcess> processes = new HashMap<>();
 
     /**
      * Lazily obtained {@link ProcessKiller}s to be applied on this process tree.
diff --git a/core/src/main/java/hudson/util/QueryParameterMap.java b/core/src/main/java/hudson/util/QueryParameterMap.java
index 1b7683d824a3..11bd6b67c13b 100644
--- a/core/src/main/java/hudson/util/QueryParameterMap.java
+++ b/core/src/main/java/hudson/util/QueryParameterMap.java
@@ -48,7 +48,7 @@
  * @since 1.394
  */
 public class QueryParameterMap {
-    private final Map<String,List<String>> store = new HashMap<String, List<String>>();
+    private final Map<String,List<String>> store = new HashMap<>();
 
     /**
      * @param queryString
@@ -63,7 +63,7 @@ public QueryParameterMap(String queryString) {
                 String value = URLDecoder.decode(kv[1], "UTF-8");
                 List<String> values = store.get(key);
                 if (values == null)
-                    store.put(key, values = new ArrayList<String>());
+                    store.put(key, values = new ArrayList<>());
                 values.add(value);
             }
         } catch (UnsupportedEncodingException e) {
diff --git a/core/src/main/java/hudson/util/RemotingDiagnostics.java b/core/src/main/java/hudson/util/RemotingDiagnostics.java
index 447b19a5c99e..57d397b7f433 100644
--- a/core/src/main/java/hudson/util/RemotingDiagnostics.java
+++ b/core/src/main/java/hudson/util/RemotingDiagnostics.java
@@ -75,7 +75,7 @@ public static Map<Object,Object> getSystemProperties(VirtualChannel channel) thr
 
     private static final class GetSystemProperties extends MasterToSlaveCallable<Map<Object,Object>,RuntimeException> {
         public Map<Object,Object> call() {
-            return new TreeMap<Object,Object>(System.getProperties());
+            return new TreeMap<>(System.getProperties());
         }
         private static final long serialVersionUID = 1L;
     }
@@ -88,13 +88,13 @@ public static Map<String,String> getThreadDump(VirtualChannel channel) throws IO
 
     public static Future<Map<String,String>> getThreadDumpAsync(VirtualChannel channel) throws IOException, InterruptedException {
         if(channel==null)
-            return new AsyncFutureImpl<Map<String, String>>(Collections.singletonMap("N/A","offline"));
+            return new AsyncFutureImpl<>(Collections.singletonMap("N/A", "offline"));
         return channel.callAsync(new GetThreadDump());
     }
 
     private static final class GetThreadDump extends MasterToSlaveCallable<Map<String,String>,RuntimeException> {
         public Map<String,String> call() {
-            Map<String,String> r = new LinkedHashMap<String,String>();
+            Map<String,String> r = new LinkedHashMap<>();
                 ThreadInfo[] data = Functions.getThreadInfos();
                 Functions.ThreadGroupMap map = Functions.sortThreadsAndGetGroupMap(data);
                 for (ThreadInfo ti : data)
diff --git a/core/src/main/java/hudson/util/RobustReflectionConverter.java b/core/src/main/java/hudson/util/RobustReflectionConverter.java
index 68d2dc816fa2..8c876ce18ed7 100644
--- a/core/src/main/java/hudson/util/RobustReflectionConverter.java
+++ b/core/src/main/java/hudson/util/RobustReflectionConverter.java
@@ -84,7 +84,7 @@ the class name (which requires calling class.getName, which may not be cached, t
         with the fields as the keys.**/
     private final ReadWriteLock criticalFieldsLock = new ReentrantReadWriteLock();
     @GuardedBy("criticalFieldsLock")
-    private final Map<String, Set<String>> criticalFields = new HashMap<String, Set<String>>();
+    private final Map<String, Set<String>> criticalFields = new HashMap<>();
 
     public RobustReflectionConverter(Mapper mapper, ReflectionProvider reflectionProvider) {
         this(mapper, reflectionProvider, new XStream2().new PluginClassOwnership());
@@ -104,7 +104,7 @@ void addCriticalField(Class<?> clazz, String field) {
             // If the class already exists, then add a new field, otherwise
             // create the hash map field
             if (!criticalFields.containsKey(field)) {
-                criticalFields.put(field, new HashSet<String>());
+                criticalFields.put(field, new HashSet<>());
             }
             criticalFields.get(field).add(clazz.getName());
         }
@@ -376,7 +376,7 @@ public static void addErrorInContext(UnmarshallingContext context, Throwable e)
         LOGGER.log(FINE, "Failed to load", e);
         ArrayList<Throwable> list = (ArrayList<Throwable>)context.get("ReadError");
         if (list == null)
-            context.put("ReadError", list = new ArrayList<Throwable>());
+            context.put("ReadError", list = new ArrayList<>());
         list.add(e);
     }
 
diff --git a/core/src/main/java/hudson/util/RunList.java b/core/src/main/java/hudson/util/RunList.java
index bdc9cb61f4d6..44136da9b991 100644
--- a/core/src/main/java/hudson/util/RunList.java
+++ b/core/src/main/java/hudson/util/RunList.java
@@ -58,11 +58,11 @@ public RunList(Job j) {
     }
 
     public RunList(View view) {// this is a type unsafe operation
-        Set<Job> jobs = new HashSet<Job>();
+        Set<Job> jobs = new HashSet<>();
         for (TopLevelItem item : view.getItems())
             jobs.addAll(item.getAllJobs());
 
-        List<Iterable<R>> runLists = new ArrayList<Iterable<R>>();
+        List<Iterable<R>> runLists = new ArrayList<>();
         for (Job job : jobs) {
             runLists.add(job.getBuilds());
         }
@@ -70,7 +70,7 @@ public RunList(View view) {// this is a type unsafe operation
     }
 
     public RunList(Collection<? extends Job> jobs) {
-        List<Iterable<R>> runLists = new ArrayList<Iterable<R>>();
+        List<Iterable<R>> runLists = new ArrayList<>();
         for (Job j : jobs)
             runLists.add(j.getBuilds());
         this.base = combine(runLists);
@@ -148,7 +148,7 @@ public R get(int index) {
      */
     @Override
     public List<R> subList(int fromIndex, int toIndex) {
-        List<R> r = new ArrayList<R>();
+        List<R> r = new ArrayList<>();
         Iterator<R> itr = iterator();
         hudson.util.Iterators.skip(itr, fromIndex);
         for (int i=toIndex-fromIndex; i>0; i--) {
diff --git a/core/src/main/java/hudson/util/SecretRewriter.java b/core/src/main/java/hudson/util/SecretRewriter.java
index e0ac4df4c74b..ab4afceee1ba 100644
--- a/core/src/main/java/hudson/util/SecretRewriter.java
+++ b/core/src/main/java/hudson/util/SecretRewriter.java
@@ -41,7 +41,7 @@ public class SecretRewriter {
      * Canonical paths of the directories we are recursing to protect
      * against symlink induced cycles.
      */
-    private Set<String> callstack = new HashSet<String>();
+    private Set<String> callstack = new HashSet<>();
 
     public SecretRewriter() throws GeneralSecurityException {
         cipher = Secret.getCipher("AES");
diff --git a/core/src/main/java/hudson/util/SequentialExecutionQueue.java b/core/src/main/java/hudson/util/SequentialExecutionQueue.java
index 1ad1915099ef..d2ba8209c0c2 100644
--- a/core/src/main/java/hudson/util/SequentialExecutionQueue.java
+++ b/core/src/main/java/hudson/util/SequentialExecutionQueue.java
@@ -25,13 +25,13 @@ public class SequentialExecutionQueue implements Executor {
     /**
      * Access is synchronized by {@code Queue.this}
      */
-    private final Map<Runnable,QueueEntry> entries = new HashMap<Runnable,QueueEntry>();
+    private final Map<Runnable,QueueEntry> entries = new HashMap<>();
     private ExecutorService executors;
 
     /**
      * {@link Runnable}s that are currently executing. Useful for trouble-shooting.
      */
-    private final Set<QueueEntry> inProgress = new HashSet<QueueEntry>();
+    private final Set<QueueEntry> inProgress = new HashSet<>();
 
     public SequentialExecutionQueue(ExecutorService executors) {
         this.executors = executors;
@@ -86,7 +86,7 @@ public synchronized boolean isStarving(long threshold) {
      * Gets {@link Runnable}s that are currently executed by a live thread.
      */
     public synchronized Set<Runnable> getInProgress() {
-        Set<Runnable> items = new HashSet<Runnable>();
+        Set<Runnable> items = new HashSet<>();
         for (QueueEntry entry : inProgress) {
             items.add(entry.item);
         }
diff --git a/core/src/main/java/hudson/util/Service.java b/core/src/main/java/hudson/util/Service.java
index 43ef0e9fa15c..478d610b4c09 100644
--- a/core/src/main/java/hudson/util/Service.java
+++ b/core/src/main/java/hudson/util/Service.java
@@ -46,7 +46,7 @@
 @Deprecated
 public class Service {
     public static <T> List<T> loadInstances(ClassLoader classLoader, Class<T> type) throws IOException {
-        List<T> result = new ArrayList<T>();
+        List<T> result = new ArrayList<>();
 
         final Enumeration<URL> e = classLoader.getResources("META-INF/services/"+type.getName());
         while (e.hasMoreElements()) {
diff --git a/core/src/main/java/hudson/util/TableNestChecker.java b/core/src/main/java/hudson/util/TableNestChecker.java
index 9187da965ac9..d5ceead677d1 100644
--- a/core/src/main/java/hudson/util/TableNestChecker.java
+++ b/core/src/main/java/hudson/util/TableNestChecker.java
@@ -54,8 +54,8 @@
  */
 public class TableNestChecker extends XMLFilterImpl {
 
-    private final Stack<Checker> elements = new Stack<Checker>();
-    private final Stack<String> tagNames = new Stack<String>();
+    private final Stack<Checker> elements = new Stack<>();
+    private final Stack<String> tagNames = new Stack<>();
 
     public static void applyTo(XMLOutput xo) {
         xo.setContentHandler(new TableNestChecker(xo.getContentHandler()));
@@ -108,7 +108,7 @@ private static final class InList implements Checker {
         private final Set<String> tags;
 
         private InList(String... tags) {
-            this.tags = new HashSet<String>(Arrays.asList(tags));
+            this.tags = new HashSet<>(Arrays.asList(tags));
         }
 
         public boolean isAllowed(String childTag) {
@@ -116,7 +116,7 @@ public boolean isAllowed(String childTag) {
         }
     }
 
-    private static final Map<String,Checker> CHECKERS = new HashMap<String, Checker>();
+    private static final Map<String,Checker> CHECKERS = new HashMap<>();
 
     static {
         CHECKERS.put("TABLE",new InList("TR","THEAD","TBODY"));
diff --git a/core/src/main/java/hudson/util/TagCloud.java b/core/src/main/java/hudson/util/TagCloud.java
index 9b1e0a6eb06e..56b4cd7b151c 100644
--- a/core/src/main/java/hudson/util/TagCloud.java
+++ b/core/src/main/java/hudson/util/TagCloud.java
@@ -59,7 +59,7 @@ public interface WeightFunction<T> {
         float weight(T item);
     }
 
-    private final List<Entry> entries = new ArrayList<Entry>();
+    private final List<Entry> entries = new ArrayList<>();
     private float max = 1;
 
     /**
diff --git a/core/src/main/java/hudson/util/XStream2.java b/core/src/main/java/hudson/util/XStream2.java
index d4124ae14744..96758e43a735 100644
--- a/core/src/main/java/hudson/util/XStream2.java
+++ b/core/src/main/java/hudson/util/XStream2.java
@@ -90,9 +90,9 @@ public class XStream2 extends XStream {
     private static final Logger LOGGER = Logger.getLogger(XStream2.class.getName());
 
     private RobustReflectionConverter reflectionConverter;
-    private final ThreadLocal<Boolean> oldData = new ThreadLocal<Boolean>();
+    private final ThreadLocal<Boolean> oldData = new ThreadLocal<>();
     private final @CheckForNull ClassOwnership classOwnership;
-    private final Map<String,Class<?>> compatibilityAliases = new ConcurrentHashMap<String, Class<?>>();
+    private final Map<String,Class<?>> compatibilityAliases = new ConcurrentHashMap<>();
 
     /**
      * Hook to insert {@link Mapper}s after they are created.
@@ -397,7 +397,7 @@ public Class realClass(String elementName) {
     private static final class AssociatedConverterImpl implements Converter {
         private final XStream xstream;
         private final ConcurrentHashMap<Class<?>,Converter> cache =
-                new ConcurrentHashMap<Class<?>,Converter>();
+                new ConcurrentHashMap<>();
 
         private AssociatedConverterImpl(XStream xstream) {
             this.xstream = xstream;
diff --git a/core/src/main/java/hudson/util/jna/RegistryKey.java b/core/src/main/java/hudson/util/jna/RegistryKey.java
index d4fe32973c38..e2051fcbc1e2 100644
--- a/core/src/main/java/hudson/util/jna/RegistryKey.java
+++ b/core/src/main/java/hudson/util/jna/RegistryKey.java
@@ -187,7 +187,7 @@ public void delete() {
      */
     public Collection<String> getSubKeys() {
         WINBASE.FILETIME lpftLastWriteTime;
-        TreeSet<String> subKeys = new TreeSet<String>();
+        TreeSet<String> subKeys = new TreeSet<>();
         char[] lpName = new char[256];
         IntByReference lpcName = new IntByReference(256);
         lpftLastWriteTime = new WINBASE.FILETIME();
@@ -228,7 +228,7 @@ public TreeMap<String, Object> getValues() {
         byte[] lpData;
         IntByReference lpcchValueName, lpType, lpcbData;
         String name;
-        TreeMap<String, Object> values = new TreeMap<String, Object>(String.CASE_INSENSITIVE_ORDER);
+        TreeMap<String, Object> values = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
 
         lpValueName = new char[16384];
         lpcchValueName = new IntByReference(16384);
diff --git a/core/src/main/java/hudson/util/spring/BeanBuilder.java b/core/src/main/java/hudson/util/spring/BeanBuilder.java
index 22399d5c030b..a4d3bd4244fd 100644
--- a/core/src/main/java/hudson/util/spring/BeanBuilder.java
+++ b/core/src/main/java/hudson/util/spring/BeanBuilder.java
@@ -87,7 +87,7 @@ public class BeanBuilder extends GroovyObjectSupport {
     private static final String ANONYMOUS_BEAN = "bean";
     private RuntimeSpringConfiguration springConfig = new DefaultRuntimeSpringConfiguration();
     private BeanConfiguration currentBeanConfig;
-    private Map<String,DeferredProperty> deferredProperties = new HashMap<String,DeferredProperty>();
+    private Map<String,DeferredProperty> deferredProperties = new HashMap<>();
     private ApplicationContext parentCtx;
     private Map binding = new HashMap();
     private ClassLoader classLoader = null;
@@ -172,7 +172,7 @@ public BeanDefinition getBeanDefinition(String name) {
      */
     public Map<String,BeanDefinition> getBeanDefinitions() {
 
-        Map<String,BeanDefinition> beanDefinitions = new HashMap<String,BeanDefinition>();
+        Map<String,BeanDefinition> beanDefinitions = new HashMap<>();
         for (String beanName : getSpringConfig().getBeanNames()) {
             BeanDefinition bd = getSpringConfig()
                     .getBeanConfig(beanName)
diff --git a/core/src/main/java/hudson/util/spring/DefaultBeanConfiguration.java b/core/src/main/java/hudson/util/spring/DefaultBeanConfiguration.java
index c5430681d902..7e2cf68b32a4 100644
--- a/core/src/main/java/hudson/util/spring/DefaultBeanConfiguration.java
+++ b/core/src/main/java/hudson/util/spring/DefaultBeanConfiguration.java
@@ -50,7 +50,7 @@ class DefaultBeanConfiguration extends GroovyObjectSupport implements BeanConfig
     private static final String PARENT = "parent";
     private static final String BY_TYPE = "byType";
     private static final String BY_CONSTRUCTOR = "constructor";
-    private static final Set<String> DYNAMIC_PROPS = new HashSet<String>(Arrays.asList(AUTOWIRE, CONSTRUCTOR_ARGS, DESTROY_METHOD, FACTORY_BEAN, FACTORY_METHOD, INIT_METHOD, BY_NAME, BY_TYPE, BY_CONSTRUCTOR));
+    private static final Set<String> DYNAMIC_PROPS = new HashSet<>(Arrays.asList(AUTOWIRE, CONSTRUCTOR_ARGS, DESTROY_METHOD, FACTORY_BEAN, FACTORY_METHOD, INIT_METHOD, BY_NAME, BY_TYPE, BY_CONSTRUCTOR));
     private String parentName;
 
     @Override
diff --git a/core/src/main/java/hudson/views/ListViewColumn.java b/core/src/main/java/hudson/views/ListViewColumn.java
index 4b1581a2f967..08b584f2e404 100644
--- a/core/src/main/java/hudson/views/ListViewColumn.java
+++ b/core/src/main/java/hudson/views/ListViewColumn.java
@@ -96,7 +96,7 @@ public static DescriptorExtensionList<ListViewColumn, Descriptor<ListViewColumn>
      *      Use {@link #all()} for read access and {@link Extension} for registration.
      */
     @Deprecated
-    public static final DescriptorList<ListViewColumn> LIST = new DescriptorList<ListViewColumn>(ListViewColumn.class);
+    public static final DescriptorList<ListViewColumn> LIST = new DescriptorList<>(ListViewColumn.class);
 
     /**
      * Whether this column will be shown by default.
@@ -152,7 +152,7 @@ public static List<ListViewColumn> createDefaultInitialColumnList(View view) {
     private static List<ListViewColumn> createDefaultInitialColumnList(List<Descriptor<ListViewColumn>> descriptors) {
         // OK, set up default list of columns:
         // create all instances
-        ArrayList<ListViewColumn> r = new ArrayList<ListViewColumn>();
+        ArrayList<ListViewColumn> r = new ArrayList<>();
         final JSONObject emptyJSON = new JSONObject();
         for (Descriptor<ListViewColumn> d : descriptors)
             try {
diff --git a/core/src/main/java/hudson/views/ViewsTabBar.java b/core/src/main/java/hudson/views/ViewsTabBar.java
index 14565969373b..b8d2eb869d55 100644
--- a/core/src/main/java/hudson/views/ViewsTabBar.java
+++ b/core/src/main/java/hudson/views/ViewsTabBar.java
@@ -84,7 +84,7 @@ public ViewsTabBarDescriptor getDescriptor() {
     @Restricted(NoExternalUse.class)
     @SuppressWarnings("unused") // invoked from stapler view
     public List<View> sort(@Nonnull List<? extends View> views) {
-        List<View> result = new ArrayList<View>(views);
+        List<View> result = new ArrayList<>(views);
         Collections.sort(result, new Comparator<View>() {
             @Override
             public int compare(View o1, View o2) {
diff --git a/core/src/main/java/hudson/widgets/BuildHistoryWidget.java b/core/src/main/java/hudson/widgets/BuildHistoryWidget.java
index eb1986e718d6..baa7c0341d4c 100644
--- a/core/src/main/java/hudson/widgets/BuildHistoryWidget.java
+++ b/core/src/main/java/hudson/widgets/BuildHistoryWidget.java
@@ -60,7 +60,7 @@ public Item getQueuedItem() {
      * Returns the queue item if the owner is scheduled for execution in the queue, in REVERSE ORDER
      */
     public List<Item> getQueuedItems() {
-        LinkedList<Item> list = new LinkedList<Item>();
+        LinkedList<Item> list = new LinkedList<>();
         for (Item item : Jenkins.getInstance().getQueue().getItems()) {
             if (item.task == owner) {
                 list.addFirst(item);
diff --git a/core/src/main/java/hudson/widgets/HistoryWidget.java b/core/src/main/java/hudson/widgets/HistoryWidget.java
index f9472768d8a3..24c976b45bab 100644
--- a/core/src/main/java/hudson/widgets/HistoryWidget.java
+++ b/core/src/main/java/hudson/widgets/HistoryWidget.java
@@ -164,9 +164,9 @@ private List<HistoryPageEntry<T>> toPageEntries(Iterable<T> historyItemList) {
             return Collections.emptyList();
         }
 
-        List<HistoryPageEntry<T>> pageEntries = new ArrayList<HistoryPageEntry<T>>();
+        List<HistoryPageEntry<T>> pageEntries = new ArrayList<>();
         while (iterator.hasNext()) {
-            pageEntries.add(new HistoryPageEntry<T>(iterator.next()));
+            pageEntries.add(new HistoryPageEntry<>(iterator.next()));
         }
 
         return pageEntries;
@@ -184,7 +184,7 @@ public HistoryPageFilter getHistoryPageFilter() {
     }
 
     protected HistoryPageFilter<T> newPageFilter() {
-        HistoryPageFilter<T> historyPageFilter = new HistoryPageFilter<T>(THRESHOLD);
+        HistoryPageFilter<T> historyPageFilter = new HistoryPageFilter<>(THRESHOLD);
 
         if (newerThan != null) {
             historyPageFilter.setNewerThan(newerThan);
@@ -220,7 +220,7 @@ public void doAjax( StaplerRequest req, StaplerResponse rsp,
         rsp.setContentType("text/html;charset=UTF-8");
 
         // pick up builds to send back
-        List<T> items = new ArrayList<T>();
+        List<T> items = new ArrayList<>();
 
         if (n != null) {
             String nn=null; // we'll compute next n here
diff --git a/core/src/main/java/hudson/widgets/RenderOnDemandClosure.java b/core/src/main/java/hudson/widgets/RenderOnDemandClosure.java
index 05c3611a86d2..c6b0b5cad864 100644
--- a/core/src/main/java/hudson/widgets/RenderOnDemandClosure.java
+++ b/core/src/main/java/hudson/widgets/RenderOnDemandClosure.java
@@ -63,7 +63,7 @@ public class RenderOnDemandClosure {
     private final String[] adjuncts;
 
     public RenderOnDemandClosure(JellyContext context, String attributesToCapture) {
-        List<Script> bodyStack = new ArrayList<Script>();
+        List<Script> bodyStack = new ArrayList<>();
         for (JellyContext c = context; c!=null; c=c.getParent()) {
             Script script = (Script) c.getVariables().get("org.apache.commons.jelly.body");
             if(script!=null) bodyStack.add(script);
@@ -71,7 +71,7 @@ public RenderOnDemandClosure(JellyContext context, String attributesToCapture) {
         this.bodyStack = bodyStack.toArray(new Script[bodyStack.size()]);
         assert !bodyStack.isEmpty();    // there must be at least one, which is the direct child of <l:renderOnDemand>
 
-        Map<String,Object> variables = new HashMap<String, Object>();
+        Map<String,Object> variables = new HashMap<>();
         for (String v : Util.fixNull(attributesToCapture).split(","))
             variables.put(v.intern(),context.getVariable(v));
 
diff --git a/core/src/main/java/jenkins/FilePathFilterAggregator.java b/core/src/main/java/jenkins/FilePathFilterAggregator.java
index f81ce2f77f55..96285d012887 100644
--- a/core/src/main/java/jenkins/FilePathFilterAggregator.java
+++ b/core/src/main/java/jenkins/FilePathFilterAggregator.java
@@ -18,7 +18,7 @@
  * @since 1.587 / 1.580.1
  */
 class FilePathFilterAggregator extends FilePathFilter {
-    private final CopyOnWriteArrayList<Entry> all = new CopyOnWriteArrayList<Entry>();
+    private final CopyOnWriteArrayList<Entry> all = new CopyOnWriteArrayList<>();
 
     private class Entry implements Comparable<Entry> {
         final FilePathFilter filter;
@@ -139,7 +139,7 @@ public boolean stat(File f) throws SecurityException {
         return "FilePathFilterAggregator" + all;
     }
 
-    static final ChannelProperty<FilePathFilterAggregator> KEY = new ChannelProperty<FilePathFilterAggregator>(FilePathFilterAggregator.class, "FilePathFilters");
+    static final ChannelProperty<FilePathFilterAggregator> KEY = new ChannelProperty<>(FilePathFilterAggregator.class, "FilePathFilters");
 
     public static final int DEFAULT_ORDINAL = 0;
 }
diff --git a/core/src/main/java/jenkins/InitReactorRunner.java b/core/src/main/java/jenkins/InitReactorRunner.java
index aa6ef83ab752..fd76f9121469 100644
--- a/core/src/main/java/jenkins/InitReactorRunner.java
+++ b/core/src/main/java/jenkins/InitReactorRunner.java
@@ -41,7 +41,7 @@ public void run(Reactor reactor) throws InterruptedException, ReactorException,
         ExecutorService es;
         if (Jenkins.PARALLEL_LOAD)
             es = new ThreadPoolExecutor(
-                TWICE_CPU_NUM, TWICE_CPU_NUM, 5L, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>(), new DaemonThreadFactory());
+                TWICE_CPU_NUM, TWICE_CPU_NUM, 5L, TimeUnit.SECONDS, new LinkedBlockingQueue<>(), new DaemonThreadFactory());
         else
             es = Executors.newSingleThreadExecutor(new NamingThreadFactory(new DaemonThreadFactory(), "InitReactorRunner"));
         try {
diff --git a/core/src/main/java/jenkins/diagnosis/HsErrPidList.java b/core/src/main/java/jenkins/diagnosis/HsErrPidList.java
index c4972064310b..cfe514be765c 100644
--- a/core/src/main/java/jenkins/diagnosis/HsErrPidList.java
+++ b/core/src/main/java/jenkins/diagnosis/HsErrPidList.java
@@ -41,7 +41,7 @@ public class HsErrPidList extends AdministrativeMonitor {
     /**
      * hs_err_pid files that we think belong to us.
      */
-    /*package*/ final List<HsErrPidFile> files = new ArrayList<HsErrPidFile>();
+    /*package*/ final List<HsErrPidFile> files = new ArrayList<>();
 
     /**
      * Used to keep a marker file memory-mapped, so that we can find hs_err_pid files that belong to us.
diff --git a/core/src/main/java/jenkins/install/InstallUtil.java b/core/src/main/java/jenkins/install/InstallUtil.java
index 8ee5f1a57b9b..256d81290666 100644
--- a/core/src/main/java/jenkins/install/InstallUtil.java
+++ b/core/src/main/java/jenkins/install/InstallUtil.java
@@ -316,7 +316,7 @@ public static synchronized void persistInstallStatus(List<UpdateCenterJob> insta
 		return;
 	}
 	LOGGER.fine("Writing install state to: " + installingPluginsFile.getAbsolutePath());
-	Map<String,String> statuses = new HashMap<String,String>();
+	Map<String,String> statuses = new HashMap<>();
 	for(UpdateCenterJob j : installingPlugins) {
 		if(j instanceof InstallationJob && j.getCorrelationId() != null) { // only include install jobs with a correlation id (directly selected)
 			InstallationJob ij = (InstallationJob)j;
diff --git a/core/src/main/java/jenkins/management/AsynchronousAdministrativeMonitor.java b/core/src/main/java/jenkins/management/AsynchronousAdministrativeMonitor.java
index 4e621ab53b24..fd3c5edd6ea0 100644
--- a/core/src/main/java/jenkins/management/AsynchronousAdministrativeMonitor.java
+++ b/core/src/main/java/jenkins/management/AsynchronousAdministrativeMonitor.java
@@ -47,7 +47,7 @@ public boolean isFixingActive() {
      * Used to URL-bind {@link AnnotatedLargeText}.
      */
     public AnnotatedLargeText getLogText() {
-        return new AnnotatedLargeText<AsynchronousAdministrativeMonitor>(
+        return new AnnotatedLargeText<>(
                 getLogFile(), Charset.defaultCharset(),
                 !isFixingActive(), this);
     }
diff --git a/core/src/main/java/jenkins/model/ArtifactManagerConfiguration.java b/core/src/main/java/jenkins/model/ArtifactManagerConfiguration.java
index cb411800d954..3b5ce11b8e84 100644
--- a/core/src/main/java/jenkins/model/ArtifactManagerConfiguration.java
+++ b/core/src/main/java/jenkins/model/ArtifactManagerConfiguration.java
@@ -45,7 +45,7 @@ public class ArtifactManagerConfiguration extends GlobalConfiguration implements
         return GlobalConfiguration.all().getInstance(ArtifactManagerConfiguration.class);
     }
 
-    private final DescribableList<ArtifactManagerFactory,ArtifactManagerFactoryDescriptor> artifactManagerFactories = new DescribableList<ArtifactManagerFactory,ArtifactManagerFactoryDescriptor>(this);
+    private final DescribableList<ArtifactManagerFactory,ArtifactManagerFactoryDescriptor> artifactManagerFactories = new DescribableList<>(this);
 
     private Object readResolve() {
         artifactManagerFactories.setOwner(this);
diff --git a/core/src/main/java/jenkins/model/Jenkins.java b/core/src/main/java/jenkins/model/Jenkins.java
index 5f363a6f404a..802e8d072970 100644
--- a/core/src/main/java/jenkins/model/Jenkins.java
+++ b/core/src/main/java/jenkins/model/Jenkins.java
@@ -437,7 +437,7 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
     /**
      * All {@link Item}s keyed by their {@link Item#getName() name}s.
      */
-    /*package*/ transient final Map<String,TopLevelItem> items = new CopyOnWriteMap.Tree<String,TopLevelItem>(CaseInsensitiveComparator.INSTANCE);
+    /*package*/ transient final Map<String,TopLevelItem> items = new CopyOnWriteMap.Tree<>(CaseInsensitiveComparator.INSTANCE);
 
     /**
      * The sole instance.
@@ -460,7 +460,7 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
      */
     private transient static FileBoolean STARTUP_MARKER_FILE;
 
-    private volatile List<JDK> jdks = new ArrayList<JDK>();
+    private volatile List<JDK> jdks = new ArrayList<>();
 
     private transient volatile DependencyGraph dependencyGraph;
     private final transient AtomicBoolean dependencyGraphDirty = new AtomicBoolean();
@@ -490,7 +490,7 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
     /**
      * {@link Computer}s in this Jenkins system. Read-only.
      */
-    protected transient final Map<Node,Computer> computers = new CopyOnWriteMap.Hash<Node,Computer>();
+    protected transient final Map<Node,Computer> computers = new CopyOnWriteMap.Hash<>();
 
     /**
      * Active {@link Cloud}s.
@@ -548,7 +548,7 @@ protected void onModified() throws IOException {
     /**
      * {@link View}s.
      */
-    private final CopyOnWriteArrayList<View> views = new CopyOnWriteArrayList<View>();
+    private final CopyOnWriteArrayList<View> views = new CopyOnWriteArrayList<>();
 
     /**
      * Name of the primary view.
@@ -583,7 +583,7 @@ protected void onModified() throws IOException {
     /**
      * List of registered {@link SCMListener}s.
      */
-    private transient final CopyOnWriteList<SCMListener> scmListeners = new CopyOnWriteList<SCMListener>();
+    private transient final CopyOnWriteList<SCMListener> scmListeners = new CopyOnWriteList<>();
 
     /**
      * TCP agent port.
@@ -652,7 +652,7 @@ private static int getSlaveAgentPortInitialValue(int def) {
      * All labels known to Jenkins. This allows us to reuse the same label instances
      * as much as possible, even though that's not a strict requirement.
      */
-    private transient final ConcurrentHashMap<String,Label> labels = new ConcurrentHashMap<String,Label>();
+    private transient final ConcurrentHashMap<String,Label> labels = new ConcurrentHashMap<>();
 
     /**
      * Load statistics of the entire system.
@@ -696,17 +696,17 @@ private static int getSlaveAgentPortInitialValue(int def) {
      * Transient action list. Useful for adding navigation items to the navigation bar
      * on the left.
      */
-    private transient final List<Action> actions = new CopyOnWriteArrayList<Action>();
+    private transient final List<Action> actions = new CopyOnWriteArrayList<>();
 
     /**
      * List of master node properties
      */
-    private DescribableList<NodeProperty<?>,NodePropertyDescriptor> nodeProperties = new DescribableList<NodeProperty<?>,NodePropertyDescriptor>(this);
+    private DescribableList<NodeProperty<?>,NodePropertyDescriptor> nodeProperties = new DescribableList<>(this);
 
     /**
      * List of global properties
      */
-    private DescribableList<NodeProperty<?>,NodePropertyDescriptor> globalNodeProperties = new DescribableList<NodeProperty<?>,NodePropertyDescriptor>(this);
+    private DescribableList<NodeProperty<?>,NodePropertyDescriptor> globalNodeProperties = new DescribableList<>(this);
 
     /**
      * {@link AdministrativeMonitor}s installed on this system.
@@ -1633,7 +1633,7 @@ public <P extends Plugin> P getPlugin(Class<P> clazz) {
      * @return The plugin instances.
      */
     public <P extends Plugin> List<P> getPlugins(Class<P> clazz) {
-        List<P> result = new ArrayList<P>();
+        List<P> result = new ArrayList<>();
         for (PluginWrapper w: pluginManager.getPlugins(clazz)) {
             result.add((P)w.getPlugin());
         }
@@ -1729,7 +1729,7 @@ public List<Action> getActions() {
      */
     @Exported(name="jobs")
     public List<TopLevelItem> getItems() {
-        List<TopLevelItem> viewableItems = new ArrayList<TopLevelItem>();
+        List<TopLevelItem> viewableItems = new ArrayList<>();
         for (TopLevelItem item : items.values()) {
             if (item.hasPermission(Item.READ))
                 viewableItems.add(item);
@@ -1753,7 +1753,7 @@ public Map<String,TopLevelItem> getItemMap() {
      * Gets just the immediate children of {@link Jenkins} but of the given type.
      */
     public <T> List<T> getItems(Class<T> type) {
-        List<T> r = new ArrayList<T>();
+        List<T> r = new ArrayList<>();
         for (TopLevelItem i : getItems())
             if (type.isInstance(i))
                  r.add(type.cast(i));
@@ -1778,7 +1778,7 @@ public List<Project> getProjects() {
      * Gets the names of all the {@link Job}s.
      */
     public Collection<String> getJobNames() {
-        List<String> names = new ArrayList<String>();
+        List<String> names = new ArrayList<>();
         for (Job j : allItems(Job.class))
             names.add(j.getFullName());
         Collections.sort(names, String.CASE_INSENSITIVE_ORDER);
@@ -1793,7 +1793,7 @@ public List<Action> getViewActions() {
      * Gets the names of all the {@link TopLevelItem}s.
      */
     public Collection<String> getTopLevelItemNames() {
-        List<String> names = new ArrayList<String>();
+        List<String> names = new ArrayList<>();
         for (TopLevelItem j : items.values())
             names.add(j.getName());
         return names;
@@ -1986,7 +1986,7 @@ public Label getLabel(String expr) {
      * Gets all the active labels in the current system.
      */
     public Set<Label> getLabels() {
-        Set<Label> r = new TreeSet<Label>();
+        Set<Label> r = new TreeSet<>();
         for (Label l : labels.values()) {
             if(!l.isEmpty())
                 r.add(l);
@@ -1995,7 +1995,7 @@ public Set<Label> getLabels() {
     }
 
     public Set<LabelAtom> getLabelAtoms() {
-        Set<LabelAtom> r = new TreeSet<LabelAtom>();
+        Set<LabelAtom> r = new TreeSet<>();
         for (Label l : labels.values()) {
             if(!l.isEmpty() && l instanceof LabelAtom)
                 r.add((LabelAtom)l);
@@ -2024,7 +2024,7 @@ public List<JDK> getJDKs() {
      */
     @Restricted(NoExternalUse.class)
     public void setJDKs(Collection<? extends JDK> jdks) {
-        this.jdks = new ArrayList<JDK>(jdks);
+        this.jdks = new ArrayList<>(jdks);
     }
 
     /**
@@ -3137,7 +3137,7 @@ private synchronized TaskBuilder loadTasks() throws IOException {
         }
         File[] subdirs = projectsDir.listFiles();
 
-        final Set<String> loadedNames = Collections.synchronizedSet(new HashSet<String>());
+        final Set<String> loadedNames = Collections.synchronizedSet(new HashSet<>());
 
         TaskGraphBuilder g = new TaskGraphBuilder();
         Handle loadJenkins = g.requires(EXTENSIONS_AUGMENTED).attains(JOB_LOADED).add("Loading global config", new Executable() {
@@ -3421,7 +3421,7 @@ public void onAttained(Milestone milestone) {
 
     private Set<Future<?>> _cleanUpDisconnectComputers(final List<Throwable> errors) {
         LOGGER.log(Main.isUnitTest ? Level.FINE : Level.INFO, "Starting node disconnection");
-        final Set<Future<?>> pending = new HashSet<Future<?>>();
+        final Set<Future<?>> pending = new HashSet<>();
         // JENKINS-28840 we know we will be interrupting all the Computers so get the Queue lock once for all
         Queue.withLock(new Runnable() {
             @Override
@@ -3874,7 +3874,7 @@ public Map<String,Map<String,String>> getAllThreadDumps() throws IOException, In
         checkPermission(ADMINISTER);
 
         // issue the requests all at once
-        Map<String,Future<Map<String,String>>> future = new HashMap<String, Future<Map<String, String>>>();
+        Map<String,Future<Map<String,String>>> future = new HashMap<>();
 
         for (Computer c : getComputers()) {
             try {
@@ -3891,7 +3891,7 @@ public Map<String,Map<String,String>> getAllThreadDumps() throws IOException, In
         // this is a precaution against hang nodes
         long endTime = System.currentTimeMillis() + TimeUnit.SECONDS.toMillis(5);
 
-        Map<String,Map<String,String>> r = new HashMap<String, Map<String, String>>();
+        Map<String,Map<String,String>> r = new HashMap<>();
         for (Entry<String, Future<Map<String, String>>> e : future.entrySet()) {
             try {
                 r.put(e.getKey(), e.getValue().get(endTime-System.currentTimeMillis(), TimeUnit.MILLISECONDS));
@@ -3899,7 +3899,7 @@ public Map<String,Map<String,String>> getAllThreadDumps() throws IOException, In
                 r.put(e.getKey(), Collections.singletonMap("Failed to retrieve thread dump", Functions.printThrowable(x)));
             }
         }
-        return Collections.unmodifiableSortedMap(new TreeMap<String, Map<String, String>>(r));
+        return Collections.unmodifiableSortedMap(new TreeMap<>(r));
     }
 
     @RequirePOST
@@ -4167,7 +4167,7 @@ public void doSimulateOutOfMemory() throws IOException {
         checkPermission(ADMINISTER);
 
         System.out.println("Creating artificial OutOfMemoryError situation");
-        List<Object> args = new ArrayList<Object>();
+        List<Object> args = new ArrayList<>();
         //noinspection InfiniteLoopStatement
         while (true)
             args.add(new byte[1024*1024]);
@@ -4599,8 +4599,8 @@ public void doResources(StaplerRequest req, StaplerResponse rsp) throws IOExcept
      * Extension list that {@link #doResources(StaplerRequest, StaplerResponse)} can serve.
      * This set is mutable to allow plugins to add additional extensions.
      */
-    public static final Set<String> ALLOWED_RESOURCE_EXTENSIONS = new HashSet<String>(Arrays.asList(
-        "js|css|jpeg|jpg|png|gif|html|htm".split("\\|")
+    public static final Set<String> ALLOWED_RESOURCE_EXTENSIONS = new HashSet<>(Arrays.asList(
+            "js|css|jpeg|jpg|png|gif|html|htm".split("\\|")
     ));
 
     /**
@@ -4748,7 +4748,7 @@ public boolean isSubjectToMandatoryReadPermissionCheck(String restOfPath) {
      * @since 1.495
      */
     public Collection<String> getUnprotectedRootActions() {
-        Set<String> names = new TreeSet<String>();
+        Set<String> names = new TreeSet<>();
         names.add("jnlpJars"); // TODO cleaner to refactor doJnlpJars into a URA
         // TODO consider caching (expiring cache when actions changes)
         for (Action a : getActions()) {
@@ -4992,7 +4992,7 @@ protected Future<?> _connect(boolean forceReconnect) {
      */
     /*package*/ transient final ExecutorService threadPoolForLoad = new ThreadPoolExecutor(
         TWICE_CPU_NUM, TWICE_CPU_NUM,
-        5L, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>(), new NamingThreadFactory(new DaemonThreadFactory(), "Jenkins load"));
+        5L, TimeUnit.SECONDS, new LinkedBlockingQueue<>(), new NamingThreadFactory(new DaemonThreadFactory(), "Jenkins load"));
 
 
     private static void computeVersion(ServletContext context) {
diff --git a/core/src/main/java/jenkins/model/ModelObjectWithContextMenu.java b/core/src/main/java/jenkins/model/ModelObjectWithContextMenu.java
index 3073ebb84d35..e20e71289c83 100644
--- a/core/src/main/java/jenkins/model/ModelObjectWithContextMenu.java
+++ b/core/src/main/java/jenkins/model/ModelObjectWithContextMenu.java
@@ -66,7 +66,7 @@ class ContextMenu implements HttpResponse {
          * The actual contents of the menu.
          */
         @Exported(inline=true)
-        public final List<MenuItem> items = new ArrayList<MenuItem>();
+        public final List<MenuItem> items = new ArrayList<>();
         
         public void generateResponse(StaplerRequest req, StaplerResponse rsp, Object o) throws IOException, ServletException {
             rsp.serveExposedBean(req,this,Flavor.JSON);
diff --git a/core/src/main/java/jenkins/model/Nodes.java b/core/src/main/java/jenkins/model/Nodes.java
index 24f9ac7431c0..f16961a9c78d 100644
--- a/core/src/main/java/jenkins/model/Nodes.java
+++ b/core/src/main/java/jenkins/model/Nodes.java
@@ -73,7 +73,7 @@ public class Nodes implements Saveable {
     /**
      * The map of nodes.
      */
-    private final ConcurrentMap<String, Node> nodes = new ConcurrentSkipListMap<String, Node>();
+    private final ConcurrentMap<String, Node> nodes = new ConcurrentSkipListMap<>();
 
     /**
      * Constructor, intended to be called only from {@link Jenkins}.
@@ -93,7 +93,7 @@ public class Nodes implements Saveable {
      */
     @Nonnull
     public List<Node> getNodes() {
-        return new ArrayList<Node>(nodes.values());
+        return new ArrayList<>(nodes.values());
     }
 
     /**
@@ -106,7 +106,7 @@ public void setNodes(final @Nonnull Collection<? extends Node> nodes) throws IOE
         Queue.withLock(new Runnable() {
             @Override
             public void run() {
-                Set<String> toRemove = new HashSet<String>(Nodes.this.nodes.keySet());
+                Set<String> toRemove = new HashSet<>(Nodes.this.nodes.keySet());
                 for (Node n : nodes) {
                     final String name = n.getNodeName();
                     toRemove.remove(name);
@@ -279,7 +279,7 @@ public void save() throws IOException {
             return;
         }
         final File nodesDir = getNodesDir();
-        final Set<String> existing = new HashSet<String>();
+        final Set<String> existing = new HashSet<>();
         for (Node n : nodes.values()) {
             if (n instanceof EphemeralNode) {
                 continue;
@@ -322,7 +322,7 @@ public boolean accept(File child) {
                 return child.isDirectory();
             }
         });
-        final Map<String, Node> newNodes = new TreeMap<String, Node>();
+        final Map<String, Node> newNodes = new TreeMap<>();
         if (subdirs != null) {
             for (File subdir : subdirs) {
                 try {
diff --git a/core/src/main/java/jenkins/model/ParameterizedJobMixIn.java b/core/src/main/java/jenkins/model/ParameterizedJobMixIn.java
index 2f95dd429603..36d334b3aed6 100644
--- a/core/src/main/java/jenkins/model/ParameterizedJobMixIn.java
+++ b/core/src/main/java/jenkins/model/ParameterizedJobMixIn.java
@@ -149,7 +149,7 @@ public final boolean scheduleBuild(int quietPeriod, Cause c) {
         if (!asJob().isBuildable())
             return null;
 
-        List<Action> queueActions = new ArrayList<Action>(actions);
+        List<Action> queueActions = new ArrayList<>(actions);
         if (isParameterized() && Util.filter(queueActions, ParametersAction.class).isEmpty()) {
             queueActions.add(new ParametersAction(getDefaultParametersValues()));
         }
@@ -158,7 +158,7 @@ public final boolean scheduleBuild(int quietPeriod, Cause c) {
 
     private List<ParameterValue> getDefaultParametersValues() {
         ParametersDefinitionProperty paramDefProp = asJob().getProperty(ParametersDefinitionProperty.class);
-        ArrayList<ParameterValue> defValues = new ArrayList<ParameterValue>();
+        ArrayList<ParameterValue> defValues = new ArrayList<>();
 
         /*
          * This check is made ONLY if someone will call this method even if isParametrized() is false.
@@ -285,7 +285,7 @@ public static CauseAction getBuildCause(ParameterizedJob job, StaplerRequest req
      * @see #getBuildNowText
      * @since 1.624
      */
-    public static final AlternativeUiTextProvider.Message<ParameterizedJob> BUILD_NOW_TEXT = new AlternativeUiTextProvider.Message<ParameterizedJob>();
+    public static final AlternativeUiTextProvider.Message<ParameterizedJob> BUILD_NOW_TEXT = new AlternativeUiTextProvider.Message<>();
 
     /**
      * Suggested implementation of {@link ParameterizedJob#getBuildNowText}.
diff --git a/core/src/main/java/jenkins/model/PeepholePermalink.java b/core/src/main/java/jenkins/model/PeepholePermalink.java
index aa15eff6b21a..f8cbb2f2d18c 100644
--- a/core/src/main/java/jenkins/model/PeepholePermalink.java
+++ b/core/src/main/java/jenkins/model/PeepholePermalink.java
@@ -62,7 +62,7 @@
 public abstract class PeepholePermalink extends Permalink implements Predicate<Run<?,?>> {
 
     /** JENKINS-22822: avoids rereading symlinks */
-    static final Map<File,String> symlinks = new HashMap<File,String>();
+    static final Map<File,String> symlinks = new HashMap<>();
 
     /**
      * Checks if the given build satisfies the peep-hole criteria.
diff --git a/core/src/main/java/jenkins/model/RunIdMigrator.java b/core/src/main/java/jenkins/model/RunIdMigrator.java
index 27482324fe1e..60e91ec48f84 100644
--- a/core/src/main/java/jenkins/model/RunIdMigrator.java
+++ b/core/src/main/java/jenkins/model/RunIdMigrator.java
@@ -81,12 +81,12 @@ public final class RunIdMigrator {
     static final Logger LOGGER = Logger.getLogger(RunIdMigrator.class.getName());
     private static final String MAP_FILE = "legacyIds";
     /** avoids wasting a map for new jobs */
-    private static final Map<String,Integer> EMPTY = new TreeMap<String,Integer>();
+    private static final Map<String,Integer> EMPTY = new TreeMap<>();
 
     /**
      * Did we record "unmigrate" instruction for this $JENKINS_HOME? Yes if it's in the set.
      */
-    private static final Set<File> offeredToUnmigrate = Collections.synchronizedSet(new HashSet<File>());
+    private static final Set<File> offeredToUnmigrate = Collections.synchronizedSet(new HashSet<>());
 
     private @Nonnull Map<String,Integer> idToNumber = EMPTY;
 
@@ -103,7 +103,7 @@ private boolean load(File dir) {
         if (f.length() == 0) {
             return true;
         }
-        idToNumber = new TreeMap<String,Integer>();
+        idToNumber = new TreeMap<>();
         try {
             for (String line : FileUtils.readLines(f)) {
                 int i = line.indexOf(' ');
@@ -190,10 +190,10 @@ private static String getUnmigrationCommandLine(File jenkinsHome) {
 
     private static final Pattern NUMBER_ELT = Pattern.compile("(?m)^  <number>(\\d+)</number>(\r?\n)");
     private void doMigrate(File dir) {
-        idToNumber = new TreeMap<String,Integer>();
+        idToNumber = new TreeMap<>();
         File[] kids = dir.listFiles();
         // Need to process symlinks first so we can rename to them.
-        List<File> kidsList = new ArrayList<File>(Arrays.asList(kids));
+        List<File> kidsList = new ArrayList<>(Arrays.asList(kids));
         Iterator<File> it = kidsList.iterator();
         while (it.hasNext()) {
             File kid = it.next();
diff --git a/core/src/main/java/jenkins/model/item_category/Categories.java b/core/src/main/java/jenkins/model/item_category/Categories.java
index fe188dafbe36..4ae25096e65d 100644
--- a/core/src/main/java/jenkins/model/item_category/Categories.java
+++ b/core/src/main/java/jenkins/model/item_category/Categories.java
@@ -55,7 +55,7 @@ public class Categories implements HttpResponse, Serializable {
     private List<Category> items;
 
     public Categories() {
-        items = new ArrayList<Category>();
+        items = new ArrayList<>();
     }
 
     @Exported(name = "categories")
diff --git a/core/src/main/java/jenkins/model/lazy/AbstractLazyLoadRunMap.java b/core/src/main/java/jenkins/model/lazy/AbstractLazyLoadRunMap.java
index b1d7ae6afe98..6ede80cf599e 100644
--- a/core/src/main/java/jenkins/model/lazy/AbstractLazyLoadRunMap.java
+++ b/core/src/main/java/jenkins/model/lazy/AbstractLazyLoadRunMap.java
@@ -98,7 +98,7 @@ public abstract class AbstractLazyLoadRunMap<R> extends AbstractMap<Integer,R> i
      * Updated atomically. Once set to this field, the index object may not be modified.
      */
     private volatile Index index = new Index();
-    private LazyLoadRunMapEntrySet<R> entrySet = new LazyLoadRunMapEntrySet<R>(this);
+    private LazyLoadRunMapEntrySet<R> entrySet = new LazyLoadRunMapEntrySet<>(this);
 
     /**
      * Historical holder for map.
@@ -120,11 +120,11 @@ private class Index {
         private final TreeMap<Integer,BuildReference<R>> byNumber;
 
         private Index() {
-            byNumber = new TreeMap<Integer,BuildReference<R>>(Collections.reverseOrder());
+            byNumber = new TreeMap<>(Collections.reverseOrder());
         }
 
         private Index(Index rhs) {
-            byNumber = new TreeMap<Integer,BuildReference<R>>(rhs.byNumber);
+            byNumber = new TreeMap<>(rhs.byNumber);
         }
     }
 
@@ -223,7 +223,7 @@ public Set<Entry<Integer, R>> entrySet() {
      * Returns a read-only view of records that has already been loaded.
      */
     public SortedMap<Integer,R> getLoadedBuilds() {
-        return Collections.unmodifiableSortedMap(new BuildReferenceMapAdapter<R>(this, index.byNumber));
+        return Collections.unmodifiableSortedMap(new BuildReferenceMapAdapter<>(this, index.byNumber));
     }
 
     /**
@@ -249,7 +249,7 @@ public SortedMap<Integer, R> subMap(Integer fromKey, Integer toKey) {
             assert i!=null;
         }
 
-        return Collections.unmodifiableSortedMap(new BuildReferenceMapAdapter<R>(this, index.byNumber.subMap(fromKey, toKey)));
+        return Collections.unmodifiableSortedMap(new BuildReferenceMapAdapter<>(this, index.byNumber.subMap(fromKey, toKey)));
     }
 
     public SortedMap<Integer, R> headMap(Integer toKey) {
@@ -532,7 +532,7 @@ protected String getIdOf(R r) {
      * Allow subtype to capture a reference.
      */
     protected BuildReference<R> createReference(R r) {
-        return new BuildReference<R>(getIdOf(r),r);
+        return new BuildReference<>(getIdOf(r), r);
     }
 
 
diff --git a/core/src/main/java/jenkins/model/lazy/BuildReference.java b/core/src/main/java/jenkins/model/lazy/BuildReference.java
index 25f460b27fc9..7b6f0ec1deaa 100644
--- a/core/src/main/java/jenkins/model/lazy/BuildReference.java
+++ b/core/src/main/java/jenkins/model/lazy/BuildReference.java
@@ -115,7 +115,7 @@ public interface HolderFactory extends ExtensionPoint {
     private static <R> Holder<R> findHolder(R referent) {
         if (referent == null) {
             // AbstractBuild.NONE
-            return new DefaultHolderFactory.NoHolder<R>();
+            return new DefaultHolderFactory.NoHolder<>();
         }
         for (HolderFactory f : ExtensionList.lookup(HolderFactory.class)) {
             Holder<R> h = f.make(referent);
@@ -149,13 +149,13 @@ private static <R> Holder<R> findHolder(R referent) {
 
         @Override public <R> Holder<R> make(R referent) {
             if (mode == null || mode.equals("soft")) {
-                return new SoftHolder<R>(referent);
+                return new SoftHolder<>(referent);
             } else if (mode.equals("weak")) {
-                return new WeakHolder<R>(referent);
+                return new WeakHolder<>(referent);
             } else if (mode.equals("strong")) {
-                return new StrongHolder<R>(referent);
+                return new StrongHolder<>(referent);
             } else if (mode.equals("none")) {
-                return new NoHolder<R>();
+                return new NoHolder<>();
             } else {
                 throw new IllegalStateException("unrecognized value of " + MODE_PROPERTY + ": " + mode);
             }
diff --git a/core/src/main/java/jenkins/model/lazy/BuildReferenceMapAdapter.java b/core/src/main/java/jenkins/model/lazy/BuildReferenceMapAdapter.java
index 362138a2ac5c..8c2cd0167efc 100644
--- a/core/src/main/java/jenkins/model/lazy/BuildReferenceMapAdapter.java
+++ b/core/src/main/java/jenkins/model/lazy/BuildReferenceMapAdapter.java
@@ -56,15 +56,15 @@ public Comparator<? super Integer> comparator() {
     }
 
     public SortedMap<Integer, R> subMap(Integer fromKey, Integer toKey) {
-        return new BuildReferenceMapAdapter<R>(loader,core.subMap(fromKey, toKey));
+        return new BuildReferenceMapAdapter<>(loader, core.subMap(fromKey, toKey));
     }
 
     public SortedMap<Integer, R> headMap(Integer toKey) {
-        return new BuildReferenceMapAdapter<R>(loader,core.headMap(toKey));
+        return new BuildReferenceMapAdapter<>(loader, core.headMap(toKey));
     }
 
     public SortedMap<Integer, R> tailMap(Integer fromKey) {
-        return new BuildReferenceMapAdapter<R>(loader,core.tailMap(fromKey));
+        return new BuildReferenceMapAdapter<>(loader, core.tailMap(fromKey));
     }
 
     public Integer firstKey() {
@@ -135,7 +135,7 @@ public int hashCode() {
     }
 
     @Override public String toString() {
-        return new LinkedHashMap<Integer,R>(this).toString();
+        return new LinkedHashMap<>(this).toString();
     }
 
     private class CollectionAdapter implements Collection<R> {
@@ -169,7 +169,7 @@ protected R adapt(BuildReference<R> ref) {
         }
 
         public Object[] toArray() {
-            List<Object> list = new ArrayList<Object>();
+            List<Object> list = new ArrayList<>();
             for (R r : this)
                 list.add(r);
             return list.toArray();
@@ -274,7 +274,7 @@ protected Entry<Integer, R> adapt(Entry<Integer, BuildReference<R>> e) {
         }
 
         public Object[] toArray() {
-            List<Object> list = new ArrayList<Object>();
+            List<Object> list = new ArrayList<>();
             for (Entry<Integer, R> r : this)
                 list.add(r);
             return list.toArray();
diff --git a/core/src/main/java/jenkins/model/lazy/LazyBuildMixIn.java b/core/src/main/java/jenkins/model/lazy/LazyBuildMixIn.java
index b01c4a24315b..2cc274b7f294 100644
--- a/core/src/main/java/jenkins/model/lazy/LazyBuildMixIn.java
+++ b/core/src/main/java/jenkins/model/lazy/LazyBuildMixIn.java
@@ -62,7 +62,7 @@ public abstract class LazyBuildMixIn<JobT extends Job<JobT,RunT> & Queue.Task &
     private static final Logger LOGGER = Logger.getLogger(LazyBuildMixIn.class.getName());
 
     @SuppressWarnings("deprecation") // [JENKINS-15156] builds accessed before onLoad or onCreatedFromScratch called
-    private @Nonnull RunMap<RunT> builds = new RunMap<RunT>();
+    private @Nonnull RunMap<RunT> builds = new RunMap<>();
 
     /**
      * Initializes this mixin.
@@ -137,8 +137,9 @@ public void onLoad(ItemGroup<? extends Item> parent, String name) throws IOExcep
     }
 
     private RunMap<RunT> createBuildRunMap() {
-        RunMap<RunT> r = new RunMap<RunT>(asJob().getBuildDir(), new RunMap.Constructor<RunT>() {
-            @Override public RunT create(File dir) throws IOException {
+        RunMap<RunT> r = new RunMap<>(asJob().getBuildDir(), new RunMap.Constructor<RunT>() {
+            @Override
+            public RunT create(File dir) throws IOException {
                 return loadBuild(dir);
             }
         });
@@ -329,7 +330,7 @@ protected RunMixIn() {}
          */
         public final synchronized BuildReference<RunT> createReference() {
             if (selfReference == null) {
-                selfReference = new BuildReference<RunT>(asRun().getId(), asRun());
+                selfReference = new BuildReference<>(asRun().getId(), asRun());
             }
             return selfReference;
         }
diff --git a/core/src/main/java/jenkins/model/lazy/LazyLoadRunMapEntrySet.java b/core/src/main/java/jenkins/model/lazy/LazyLoadRunMapEntrySet.java
index 48aada93e017..a102a0ddcdbc 100644
--- a/core/src/main/java/jenkins/model/lazy/LazyLoadRunMapEntrySet.java
+++ b/core/src/main/java/jenkins/model/lazy/LazyLoadRunMapEntrySet.java
@@ -28,7 +28,7 @@ class LazyLoadRunMapEntrySet<R> extends AbstractSet<Entry<Integer,R>> {
 
     private synchronized Set<Entry<Integer,R>> all() {
         if (all==null)
-            all = new BuildReferenceMapAdapter<R>(owner,owner.all()).entrySet();
+            all = new BuildReferenceMapAdapter<>(owner, owner.all()).entrySet();
         return all;
     }
 
@@ -78,7 +78,7 @@ public Entry<Integer,R> next() {
             }
 
             private Entry<Integer, R> entryOf(R r) {
-                return new SimpleImmutableEntry<Integer, R>(owner.getNumberOf(r),r);
+                return new SimpleImmutableEntry<>(owner.getNumberOf(r), r);
             }
 
             public void remove() {
diff --git a/core/src/main/java/jenkins/model/lazy/SortedList.java b/core/src/main/java/jenkins/model/lazy/SortedList.java
index fe6605769323..7d7424222aec 100644
--- a/core/src/main/java/jenkins/model/lazy/SortedList.java
+++ b/core/src/main/java/jenkins/model/lazy/SortedList.java
@@ -38,7 +38,7 @@ class SortedList<T extends Comparable<T>> extends AbstractList<T> {
     private List<T> data;
 
     public SortedList(List<T> data) {
-        this.data = new ArrayList<T>(data);
+        this.data = new ArrayList<>(data);
         assert isSorted();
     }
 
diff --git a/core/src/main/java/jenkins/org/apache/commons/validator/routines/InetAddressValidator.java b/core/src/main/java/jenkins/org/apache/commons/validator/routines/InetAddressValidator.java
index 59ac7ceb2b0a..d051018096b0 100644
--- a/core/src/main/java/jenkins/org/apache/commons/validator/routines/InetAddressValidator.java
+++ b/core/src/main/java/jenkins/org/apache/commons/validator/routines/InetAddressValidator.java
@@ -142,7 +142,7 @@ public boolean isValidInet6Address(String inet6Address) {
         }
         String[] octets = inet6Address.split(":");
         if (containsCompressedZeroes) {
-            List<String> octetList = new ArrayList<String>(Arrays.asList(octets));
+            List<String> octetList = new ArrayList<>(Arrays.asList(octets));
             if (inet6Address.endsWith("::")) {
                 // String.split() drops ending empty segments
                 octetList.add("");
diff --git a/core/src/main/java/jenkins/org/apache/commons/validator/routines/UrlValidator.java b/core/src/main/java/jenkins/org/apache/commons/validator/routines/UrlValidator.java
index 3d7e082f35b2..1e0b810f0b15 100644
--- a/core/src/main/java/jenkins/org/apache/commons/validator/routines/UrlValidator.java
+++ b/core/src/main/java/jenkins/org/apache/commons/validator/routines/UrlValidator.java
@@ -283,7 +283,7 @@ public UrlValidator(String[] schemes, RegexValidator authorityValidator, long op
             if (schemes == null) {
                 schemes = DEFAULT_SCHEMES;
             }
-            allowedSchemes = new HashSet<String>(schemes.length);
+            allowedSchemes = new HashSet<>(schemes.length);
             for (String scheme : schemes) {
                 allowedSchemes.add(scheme.toLowerCase(Locale.ENGLISH));
             }
diff --git a/core/src/main/java/jenkins/security/LastGrantedAuthoritiesProperty.java b/core/src/main/java/jenkins/security/LastGrantedAuthoritiesProperty.java
index 2f851ac2d786..71919db1a83f 100644
--- a/core/src/main/java/jenkins/security/LastGrantedAuthoritiesProperty.java
+++ b/core/src/main/java/jenkins/security/LastGrantedAuthoritiesProperty.java
@@ -70,7 +70,7 @@ public GrantedAuthority[] getAuthorities() {
      * Persist the information with the new {@link UserDetails}.
      */
     public void update(@Nonnull Authentication auth) throws IOException {
-        List<String> roles = new ArrayList<String>();
+        List<String> roles = new ArrayList<>();
         for (GrantedAuthority ga : auth.getAuthorities()) {
             roles.add(ga.getAuthority());
         }
diff --git a/core/src/main/java/jenkins/security/QueueItemAuthenticatorConfiguration.java b/core/src/main/java/jenkins/security/QueueItemAuthenticatorConfiguration.java
index 4b5b15fb01bf..b814cc61d5da 100644
--- a/core/src/main/java/jenkins/security/QueueItemAuthenticatorConfiguration.java
+++ b/core/src/main/java/jenkins/security/QueueItemAuthenticatorConfiguration.java
@@ -23,7 +23,7 @@
 @Extension @Symbol("queueItemAuthenticator")
 public class QueueItemAuthenticatorConfiguration extends GlobalConfiguration implements PersistentDescriptor {
     private final DescribableList<QueueItemAuthenticator,QueueItemAuthenticatorDescriptor> authenticators
-        = new DescribableList<QueueItemAuthenticator, QueueItemAuthenticatorDescriptor>(this);
+        = new DescribableList<>(this);
 
     private Object readResolve() {
         authenticators.setOwner(this);
diff --git a/core/src/main/java/jenkins/security/QueueItemAuthenticatorProvider.java b/core/src/main/java/jenkins/security/QueueItemAuthenticatorProvider.java
index dbdca64a1a96..98572c825dfd 100644
--- a/core/src/main/java/jenkins/security/QueueItemAuthenticatorProvider.java
+++ b/core/src/main/java/jenkins/security/QueueItemAuthenticatorProvider.java
@@ -41,7 +41,7 @@ public boolean hasNext() {
                 if (provider == null) {
                     continue;
                 }
-                delegate = new ArrayList<QueueItemAuthenticator>(provider.getAuthenticators()).iterator();
+                delegate = new ArrayList<>(provider.getAuthenticators()).iterator();
             }
             return delegate != null && delegate.hasNext();
         }
diff --git a/core/src/main/java/jenkins/security/SecurityListener.java b/core/src/main/java/jenkins/security/SecurityListener.java
index 7b28bc5e07af..21e5624c5fd9 100644
--- a/core/src/main/java/jenkins/security/SecurityListener.java
+++ b/core/src/main/java/jenkins/security/SecurityListener.java
@@ -93,7 +93,7 @@ protected void loggedOut(@Nonnull String username){}
     /** @since 1.569 */
     public static void fireAuthenticated(@Nonnull UserDetails details) {
         if (LOGGER.isLoggable(Level.FINE)) {
-            List<String> groups = new ArrayList<String>();
+            List<String> groups = new ArrayList<>();
             for (GrantedAuthority auth : details.getAuthorities()) {
                 if (!auth.equals(SecurityRealm.AUTHENTICATED_AUTHORITY)) {
                     groups.add(auth.getAuthority());
diff --git a/core/src/main/java/jenkins/security/UpdateSiteWarningsMonitor.java b/core/src/main/java/jenkins/security/UpdateSiteWarningsMonitor.java
index ef376b0e5bf7..d19b2b8034fb 100644
--- a/core/src/main/java/jenkins/security/UpdateSiteWarningsMonitor.java
+++ b/core/src/main/java/jenkins/security/UpdateSiteWarningsMonitor.java
@@ -112,7 +112,7 @@ public Map<PluginWrapper, List<UpdateSite.Warning>> getActivePluginWarningsByPlu
             PluginWrapper plugin = Jenkins.getInstance().getPluginManager().getPlugin(pluginName);
 
             if (!activePluginWarningsByPlugin.containsKey(plugin)) {
-                activePluginWarningsByPlugin.put(plugin, new ArrayList<UpdateSite.Warning>());
+                activePluginWarningsByPlugin.put(plugin, new ArrayList<>());
             }
             activePluginWarningsByPlugin.get(plugin).add(warning);
         }
diff --git a/core/src/main/java/jenkins/security/s2m/CallableRejectionConfig.java b/core/src/main/java/jenkins/security/s2m/CallableRejectionConfig.java
index fecdfb7a1f1c..b9e4a453bb5c 100644
--- a/core/src/main/java/jenkins/security/s2m/CallableRejectionConfig.java
+++ b/core/src/main/java/jenkins/security/s2m/CallableRejectionConfig.java
@@ -27,7 +27,7 @@ public class CallableRejectionConfig extends ConfigFile<Class,Set<Class>> {
 
     @Override
     protected Set<Class> create() {
-        return new HashSet<Class>();
+        return new HashSet<>();
     }
 
     @Override
@@ -66,7 +66,7 @@ void report(Class c) {
      * Return the object that helps the UI rendering by providing the details.
      */
     public List<RejectedCallable> describe() {
-        List<RejectedCallable> l = new ArrayList<RejectedCallable>();
+        List<RejectedCallable> l = new ArrayList<>();
         for (Class c : get()) {
             if (!whitelist.contains(c.getName()))
                 l.add(new RejectedCallable(c));
diff --git a/core/src/main/java/jenkins/security/s2m/CallableWhitelistConfig.java b/core/src/main/java/jenkins/security/s2m/CallableWhitelistConfig.java
index a56d5f8b33fc..efc9f331f254 100644
--- a/core/src/main/java/jenkins/security/s2m/CallableWhitelistConfig.java
+++ b/core/src/main/java/jenkins/security/s2m/CallableWhitelistConfig.java
@@ -20,7 +20,7 @@ class CallableWhitelistConfig extends ConfigDirectory<String,Set<String>> {
 
     @Override
     protected Set<String> create() {
-        return new HashSet<String>();
+        return new HashSet<>();
     }
 
     @Override
diff --git a/core/src/main/java/jenkins/security/s2m/FilePathRuleConfig.java b/core/src/main/java/jenkins/security/s2m/FilePathRuleConfig.java
index 122d7e687d64..0ebaa9a8a046 100644
--- a/core/src/main/java/jenkins/security/s2m/FilePathRuleConfig.java
+++ b/core/src/main/java/jenkins/security/s2m/FilePathRuleConfig.java
@@ -26,7 +26,7 @@ class FilePathRuleConfig extends ConfigDirectory<FilePathRule,List<FilePathRule>
 
     @Override
     protected List<FilePathRule> create() {
-        return new ArrayList<FilePathRule>();
+        return new ArrayList<>();
     }
 
     @Override
diff --git a/core/src/main/java/jenkins/tasks/SimpleBuildWrapper.java b/core/src/main/java/jenkins/tasks/SimpleBuildWrapper.java
index e2da11b2bf93..20ead80606c2 100644
--- a/core/src/main/java/jenkins/tasks/SimpleBuildWrapper.java
+++ b/core/src/main/java/jenkins/tasks/SimpleBuildWrapper.java
@@ -82,7 +82,7 @@ public abstract class SimpleBuildWrapper extends BuildWrapper {
      */
     public static final class Context {
         private Disposer disposer;
-        private final Map<String,String> env = new HashMap<String,String>();
+        private final Map<String,String> env = new HashMap<>();
         public @Nonnull Map<String,String> getEnv() {
             return env;
         }
diff --git a/core/src/main/java/jenkins/util/DirectedGraph.java b/core/src/main/java/jenkins/util/DirectedGraph.java
index ff7c1da0f212..4cf248d9f4c8 100644
--- a/core/src/main/java/jenkins/util/DirectedGraph.java
+++ b/core/src/main/java/jenkins/util/DirectedGraph.java
@@ -44,7 +44,7 @@ public static class SCC<N> extends AbstractSet<N> {
          */
         public final int index;
 
-        private final List<N> members = new ArrayList<N>();
+        private final List<N> members = new ArrayList<>();
 
         public SCC(int index) {
             this.index = index;
@@ -94,12 +94,12 @@ Collection<N> edges() {
      * See http://en.wikipedia.org/wiki/Tarjan's_strongly_connected_components_algorithm
      */
     public List<SCC<N>> getStronglyConnectedComponents() {
-        final Map<N, Node> nodes = new HashMap<N, Node>();
+        final Map<N, Node> nodes = new HashMap<>();
         for (N n : nodes()) {
             nodes.put(n,new Node(n));
         }
 
-        final List<SCC<N>> sccs = new ArrayList<SCC<N>>();
+        final List<SCC<N>> sccs = new ArrayList<>();
 
         class Tarjan {
             int index = 0;
@@ -107,7 +107,7 @@ class Tarjan {
             /**
              * Nodes not yet classified for the strongly connected components
              */
-            Stack<Node> pending = new Stack<Node>();
+            Stack<Node> pending = new Stack<>();
             
             void traverse() {
                 for (Node n : nodes.values()) {
@@ -133,7 +133,7 @@ void visit(Node v) {
 
                 if (v.lowlink==v.index) {
                     // found a new SCC
-                    SCC<N> scc = new SCC<N>(sccIndex++);
+                    SCC<N> scc = new SCC<>(sccIndex++);
                     sccs.add(scc);
 
                     Node w;
diff --git a/core/src/main/java/jenkins/util/InterceptingExecutorService.java b/core/src/main/java/jenkins/util/InterceptingExecutorService.java
index 8af246cd0531..2141ea9e53a1 100644
--- a/core/src/main/java/jenkins/util/InterceptingExecutorService.java
+++ b/core/src/main/java/jenkins/util/InterceptingExecutorService.java
@@ -75,7 +75,7 @@ public void execute(Runnable command) {
     }
 
     private <T> Collection<Callable<T>> wrap(Collection<? extends Callable<T>> callables) {
-        List<Callable<T>> r = new ArrayList<Callable<T>>();
+        List<Callable<T>> r = new ArrayList<>();
         for (Callable<T> c : callables) {
             r.add(wrap(c));
         }
diff --git a/core/src/main/java/jenkins/util/JSONSignatureValidator.java b/core/src/main/java/jenkins/util/JSONSignatureValidator.java
index ec6f20da9b1b..60e925cb27d6 100644
--- a/core/src/main/java/jenkins/util/JSONSignatureValidator.java
+++ b/core/src/main/java/jenkins/util/JSONSignatureValidator.java
@@ -65,7 +65,7 @@ public FormValidation verifySignature(JSONObject o) throws IOException {
             }
             o.remove("signature");
 
-            List<X509Certificate> certs = new ArrayList<X509Certificate>();
+            List<X509Certificate> certs = new ArrayList<>();
             {// load and verify certificates
                 CertificateFactory cf = CertificateFactory.getInstance("X509");
                 for (Object cert : signature.getJSONArray("certificates")) {
@@ -243,7 +243,7 @@ private boolean digestMatches(byte[] digest, String providedDigest) {
     protected Set<TrustAnchor> loadTrustAnchors(CertificateFactory cf) throws IOException {
         // if we trust default root CAs, we end up trusting anyone who has a valid certificate,
         // which isn't useful at all
-        Set<TrustAnchor> anchors = new HashSet<TrustAnchor>(); // CertificateUtil.getDefaultRootCAs();
+        Set<TrustAnchor> anchors = new HashSet<>(); // CertificateUtil.getDefaultRootCAs();
         Jenkins j = Jenkins.getInstance();
         for (String cert : (Set<String>) j.servletContext.getResourcePaths("/WEB-INF/update-center-rootCAs")) {
             if (cert.endsWith("/") || cert.endsWith(".txt"))  {
diff --git a/core/src/main/java/jenkins/util/ProgressiveRendering.java b/core/src/main/java/jenkins/util/ProgressiveRendering.java
index e675b945f498..e3f74770ab15 100644
--- a/core/src/main/java/jenkins/util/ProgressiveRendering.java
+++ b/core/src/main/java/jenkins/util/ProgressiveRendering.java
@@ -161,7 +161,7 @@ private void release() {
     private static RequestImpl createMockRequest() {
         RequestImpl currentRequest = (RequestImpl) Stapler.getCurrentRequest();
         HttpServletRequest original = (HttpServletRequest) currentRequest.getRequest();
-        final Map<String,Object> getters = new HashMap<String,Object>();
+        final Map<String,Object> getters = new HashMap<>();
         for (Method method : HttpServletRequest.class.getMethods()) {
             String m = method.getName();
             if ((m.startsWith("get") || m.startsWith("is")) && method.getParameterTypes().length == 0) {
diff --git a/core/src/main/java/jenkins/util/VirtualFile.java b/core/src/main/java/jenkins/util/VirtualFile.java
index 0cce3d1a65b7..80a747143bb3 100644
--- a/core/src/main/java/jenkins/util/VirtualFile.java
+++ b/core/src/main/java/jenkins/util/VirtualFile.java
@@ -855,7 +855,7 @@ private static final class Scanner extends MasterToSlaveFileCallable<List<String
             if (includes.isEmpty()) { // see Glob class Javadoc, and list(String, String, boolean) note
                 return Collections.emptyList();
             }
-            final List<String> paths = new ArrayList<String>();
+            final List<String> paths = new ArrayList<>();
             new DirScanner.Glob(includes, excludes, useDefaultExcludes).scan(f, new FileVisitor() {
                 @Override
                 public void visit(File f, String relativePath) throws IOException {
diff --git a/core/src/main/java/jenkins/util/groovy/GroovyHookScript.java b/core/src/main/java/jenkins/util/groovy/GroovyHookScript.java
index 4f15ed49658e..4032541fe2f5 100644
--- a/core/src/main/java/jenkins/util/groovy/GroovyHookScript.java
+++ b/core/src/main/java/jenkins/util/groovy/GroovyHookScript.java
@@ -83,7 +83,7 @@ public void run() {
         Set<String> resources = servletContext.getResourcePaths("/WEB-INF/"+ hookGroovyD +"/");
         if (resources!=null) {
             // sort to execute them in a deterministic order
-            for (String res : new TreeSet<String>(resources)) {
+            for (String res : new TreeSet<>(resources)) {
                 try {
                     URL bundled = servletContext.getResource(res);
                     execute(bundled);
diff --git a/core/src/main/java/jenkins/util/xml/FilteredFunctionContext.java b/core/src/main/java/jenkins/util/xml/FilteredFunctionContext.java
index 81048283deee..bc2d3ad5d183 100644
--- a/core/src/main/java/jenkins/util/xml/FilteredFunctionContext.java
+++ b/core/src/main/java/jenkins/util/xml/FilteredFunctionContext.java
@@ -52,7 +52,7 @@ public class FilteredFunctionContext implements FunctionContext {
     /**
      * Default set of "bad" function names.
      */
-    private static final Set<String> DEFAULT_ILLEGAL_FUNCTIONS = Collections.unmodifiableSet(new HashSet<String>(
+    private static final Set<String> DEFAULT_ILLEGAL_FUNCTIONS = Collections.unmodifiableSet(new HashSet<>(
             Arrays.asList("document")
     ));
     private final FunctionContext base;
diff --git a/core/src/main/java/jenkins/util/xstream/XStreamDOM.java b/core/src/main/java/jenkins/util/xstream/XStreamDOM.java
index 2b2ed1621bd1..c10428a5ec70 100644
--- a/core/src/main/java/jenkins/util/xstream/XStreamDOM.java
+++ b/core/src/main/java/jenkins/util/xstream/XStreamDOM.java
@@ -187,7 +187,7 @@ public XStreamDOM expandMacro(VariableResolver<String> vars) {
 
         List<XStreamDOM> newChildren = null;
         if (children!=null) {
-            newChildren = new ArrayList<XStreamDOM>(children.size());
+            newChildren = new ArrayList<>(children.size());
             for (XStreamDOM d : children)
                 newChildren.add(d.expandMacro(vars));
         }
@@ -274,7 +274,7 @@ public static XStreamDOM from(HierarchicalStreamReader in) {
     }
 
     public Map<String, String> getAttributeMap() {
-        Map<String,String> r = new HashMap<String, String>();
+        Map<String,String> r = new HashMap<>();
         for (int i=0; i<attributes.length; i+=2)
             r.put(attributes[i],attributes[i+1]);
         return r;
@@ -315,7 +315,7 @@ public String xpath() {
             }
         }
 
-        private final Stack<Pointer> pointers = new Stack<Pointer>();
+        private final Stack<Pointer> pointers = new Stack<>();
 
 
         public ReaderImpl(XStreamDOM current) {
diff --git a/core/src/main/java/jenkins/widgets/RunListProgressiveRendering.java b/core/src/main/java/jenkins/widgets/RunListProgressiveRendering.java
index b7ec216f1ac4..045a6da5854e 100644
--- a/core/src/main/java/jenkins/widgets/RunListProgressiveRendering.java
+++ b/core/src/main/java/jenkins/widgets/RunListProgressiveRendering.java
@@ -47,7 +47,7 @@ public abstract class RunListProgressiveRendering extends ProgressiveRendering {
      * but then like Zeno’s paradox we will never seem to finish until we actually do.
      */
     private static final double MAX_LIKELY_RUNS = 20;
-    private final List<JSONObject> results = new ArrayList<JSONObject>();
+    private final List<JSONObject> results = new ArrayList<>();
     private Iterable<? extends Run<?,?>> builds;
 
     /** Jelly cannot call a constructor with arguments. */