opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.14' into stable-2.15

Browse Source 
* stable-2.14:
  ListMailFilter: Static import from Collectors

Change-Id: I878b03a868da7f96957fa4c532ab61dfc1f17d07
This commit is contained in:
David Pursehouse
2017-12-15 17:07:46 +09:00
parent d4ab041a13 524890d8a1
commit 96bf6870d2
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gerrit-server/src/main/java/com/google/gerrit/server/mail/ListMailFilter.java
View File

@@ -14,13 +14,14 @@
package com.google.gerrit.server.mail; package com.google.gerrit.server.mail;
import static java.util.stream.Collectors.joining;
import com.google.gerrit.server.config.GerritServerConfig; import com.google.gerrit.server.config.GerritServerConfig;
import com.google.gerrit.server.mail.receive.MailMessage; import com.google.gerrit.server.mail.receive.MailMessage;
import com.google.inject.Inject; import com.google.inject.Inject;
import com.google.inject.Singleton; import com.google.inject.Singleton;
import java.util.Arrays; import java.util.Arrays;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import java.util.stream.Collectors;
import org.eclipse.jgit.lib.Config; import org.eclipse.jgit.lib.Config;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@@ -42,7 +43,7 @@ public class ListMailFilter implements MailFilter {
ListMailFilter(@GerritServerConfig Config cfg) { ListMailFilter(@GerritServerConfig Config cfg) {
this.mode = cfg.getEnum("receiveemail", "filter", "mode", ListFilterMode.OFF); this.mode = cfg.getEnum("receiveemail", "filter", "mode", ListFilterMode.OFF);
String[] addresses = cfg.getStringList("receiveemail", "filter", "patterns"); String[] addresses = cfg.getStringList("receiveemail", "filter", "patterns");
String concat = Arrays.asList(addresses).stream().collect(Collectors.joining("|")); String concat = Arrays.asList(addresses).stream().collect(joining("|"));
this.mailPattern = Pattern.compile(concat); this.mailPattern = Pattern.compile(concat);
} }