diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/branchConfig/NewRootBunch.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/branchConfig/NewRootBunch.java
index 187b90f54ab9..5347391b125e 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/branchConfig/NewRootBunch.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/branchConfig/NewRootBunch.java
@@ -103,7 +103,7 @@ public class NewRootBunch {
   }
 
   public void reloadBranches(@NotNull VirtualFile root, @Nullable SvnBranchConfigurationNew prev, @NotNull SvnBranchConfigurationNew next) {
-    final Set<String> oldUrls = (prev == null) ? Collections.<String>emptySet() : new HashSet<>(prev.getBranchUrls());
+    final Set<String> oldUrls = (prev == null) ? Collections.emptySet() : new HashSet<>(prev.getBranchUrls());
     final SvnVcs vcs = SvnVcs.getInstance(myProject);
     if (!vcs.isVcsBackgroundOperationsAllowed(root)) return;
 
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/config/SvnConfigureProxiesComponent.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/config/SvnConfigureProxiesComponent.java
index 59112f5c20e6..39ffc92864ad 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/config/SvnConfigureProxiesComponent.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/config/SvnConfigureProxiesComponent.java
@@ -86,7 +86,7 @@ public class SvnConfigureProxiesComponent extends MasterDetailsComponent {
   private void addGroup(final ProxyGroup template) {
     final ProxyGroup group;
     if (template == null) {
-      group = new ProxyGroup(getNewName(), "", ContainerUtil.<String, String>newHashMap());
+      group = new ProxyGroup(getNewName(), "", ContainerUtil.newHashMap());
     } else {
       group = new ProxyGroup(getNewName(), template.getPatterns(), template.getProperties());
     }
@@ -256,7 +256,7 @@ public class SvnConfigureProxiesComponent extends MasterDetailsComponent {
     myRoot.removeAllChildren();
 
     DefaultProxyGroup defaultProxyGroup = myManager.getDefaultGroup();
-    defaultProxyGroup = (defaultProxyGroup == null) ? new DefaultProxyGroup(Collections.<String, String>emptyMap()) : defaultProxyGroup;
+    defaultProxyGroup = (defaultProxyGroup == null) ? new DefaultProxyGroup(Collections.emptyMap()) : defaultProxyGroup;
     final Map<String, ProxyGroup> userGroups = myManager.getGroups();
 
     myRoot.add(createNodeForObject(defaultProxyGroup));
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/difftool/properties/SvnPropertiesDiffViewer.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/difftool/properties/SvnPropertiesDiffViewer.java
index f0d136689467..164d92a9053e 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/difftool/properties/SvnPropertiesDiffViewer.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/difftool/properties/SvnPropertiesDiffViewer.java
@@ -440,13 +440,13 @@ public class SvnPropertiesDiffViewer extends TwosideTextDiffViewer {
     @NotNull
     @Override
     public List<DiffContent> getContents() {
-      return ContainerUtil.<DiffContent>list(myContent1, myContent2);
+      return ContainerUtil.list(myContent1, myContent2);
     }
 
     @NotNull
     @Override
     public List<String> getContentTitles() {
-      return myEmbedded ? ContainerUtil.<String>list(null, null) : myRequest.getContentTitles();
+      return myEmbedded ? ContainerUtil.list(null, null) : myRequest.getContentTitles();
     }
 
     @Nullable
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnHistoryProvider.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnHistoryProvider.java
index 017cb7e11137..9e39393be2ec 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnHistoryProvider.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnHistoryProvider.java
@@ -243,7 +243,7 @@ public class SvnHistoryProvider
     }
 
     final SvnHistorySession historySession =
-      new SvnHistorySession(myVcs, Collections.<VcsFileRevision>emptyList(), committedPath, showMergeSources && Boolean.TRUE.equals(logLoader.mySupport15), null, false,
+      new SvnHistorySession(myVcs, Collections.emptyList(), committedPath, showMergeSources && Boolean.TRUE.equals(logLoader.mySupport15), null, false,
                             ! path.isNonLocal());
 
     final Ref<Boolean> sessionReported = new Ref<>();
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/Merger.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/Merger.java
index 0a77112f976c..ddb3be33b23b 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/Merger.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/Merger.java
@@ -181,7 +181,7 @@ public class Merger implements IMerger {
 
   @Nullable
   public String getSkipped() {
-    return getSkippedMessage(myMergeChunk != null ? myMergeChunk.chunkAndAfterLists() : ContainerUtil.<CommittedChangeList>emptyList());
+    return getSkippedMessage(myMergeChunk != null ? myMergeChunk.chunkAndAfterLists() : ContainerUtil.emptyList());
   }
 
   @Nullable
@@ -221,7 +221,7 @@ public class Merger implements IMerger {
       List<CommittedChangeList> processed =
         myMergeChunk != null
         ? ContainerUtil.newArrayList(myMergeChunk.chunkAndBeforeLists())
-        : ContainerUtil.<CommittedChangeList>emptyList();
+        : ContainerUtil.emptyList();
 
       myProject.getMessageBus().syncPublisher(COMMITTED_CHANGES_MERGED_STATE).event(processed);
     }
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/mergeinfo/BranchInfo.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/mergeinfo/BranchInfo.java
index ff8f83de17d1..5e4da658822e 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/mergeinfo/BranchInfo.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/mergeinfo/BranchInfo.java
@@ -335,7 +335,7 @@ public class BranchInfo {
       result = SvnMergeInfoCache.MergeCheckResult.getInstance(isAskedRevisionMerged);
     }
     else {
-      myPathMergedMap.put(pathWithRevisionNumber, Collections.<Long>emptySet());
+      myPathMergedMap.put(pathWithRevisionNumber, Collections.emptySet());
       result = SvnMergeInfoCache.MergeCheckResult.NOT_MERGED;
     }
 
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/treeConflict/SvnTreeConflictResolver.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/treeConflict/SvnTreeConflictResolver.java
index 00c286b7ef41..c767690ed6bd 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/treeConflict/SvnTreeConflictResolver.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/treeConflict/SvnTreeConflictResolver.java
@@ -118,7 +118,7 @@ public class SvnTreeConflictResolver {
       updateFile(ioFile, SVNRevision.HEAD);
       FileUtil.delete(ioFile);
     } else {
-      Set<File> usedToBeAdded = myPath.isDirectory() ? getDescendantsWithAddedStatus(ioFile) : ContainerUtil.<File>newHashSet();
+      Set<File> usedToBeAdded = myPath.isDirectory() ? getDescendantsWithAddedStatus(ioFile) : ContainerUtil.newHashSet();
 
       revert(ioFile);
       for (File wasAdded : usedToBeAdded) {
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/update/AbstractSvnUpdateIntegrateEnvironment.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/update/AbstractSvnUpdateIntegrateEnvironment.java
index d5ebf0fe518b..bb170715c095 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/update/AbstractSvnUpdateIntegrateEnvironment.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/update/AbstractSvnUpdateIntegrateEnvironment.java
@@ -95,7 +95,7 @@ public abstract class AbstractSvnUpdateIntegrateEnvironment implements UpdateEnv
       WaitForProgressToShow.runOrInvokeLaterAboveProgress(() -> Messages
         .showErrorDialog(myVcs.getProject(), SvnBundle.message("message.text.update.no.directories.found"),
                          SvnBundle.message("messate.text.update.error")), null, myVcs.getProject());
-      return new UpdateSessionAdapter(Collections.<VcsException>emptyList(), true);
+      return new UpdateSessionAdapter(Collections.emptyList(), true);
     }
 
     return new MyUpdateSessionAdapter(contentRoots, updatedFiles, exceptions);
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/update/UpdateEventHandler.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/update/UpdateEventHandler.java
index d8bbaccd9f47..f6eb96acbaa2 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/update/UpdateEventHandler.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/update/UpdateEventHandler.java
@@ -89,7 +89,7 @@ public class UpdateEventHandler implements ProgressTracker {
    * TODO: UPDATE_STARTED event in some code paths.
    */
   public void startUpdate() {
-    myFilesWaitingForRevision.push(ContainerUtil.<Pair<String, String>>newArrayList());
+    myFilesWaitingForRevision.push(ContainerUtil.newArrayList());
   }
 
   public void finishUpdate() {
@@ -189,7 +189,7 @@ public class UpdateEventHandler implements ProgressTracker {
       if (mySequentialUpdatesContext != null) {
         mySequentialUpdatesContext.registerExternalRootBeingUpdated(event.getFile());
       }
-      myFilesWaitingForRevision.push(ContainerUtil.<Pair<String, String>>newArrayList());
+      myFilesWaitingForRevision.push(ContainerUtil.newArrayList());
       myExternalsCount++;
       myText = SvnBundle.message("progress.text.updating.external.location", event.getFile().getAbsolutePath());
     }