JAMES-2277 don't use C-style array declaration
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/a65ec2cb Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/a65ec2cb Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/a65ec2cb Branch: refs/heads/master Commit: a65ec2cbf4687fda5b060331dd584439e2829a7d Parents: 4c18f12 Author: Matthieu Baechler <[email protected]> Authored: Fri Dec 22 16:59:56 2017 +0100 Committer: Matthieu Baechler <[email protected]> Committed: Tue Jan 9 15:16:03 2018 +0100 ---------------------------------------------------------------------- .../org/apache/james/mailbox/jcr/JCRUtils.java | 2 +- .../org/apache/mailet/base/StringUtils.java | 2 +- .../transport/matchers/GenericRegexMatcher.java | 2 +- .../james/transport/matchers/NESSpamCheck.java | 114 +++++++++---------- .../imap/message/response/SearchResponse.java | 2 +- .../fetch/PartialFetchBodyElement.java | 4 +- .../imap/utils/FixedLengthInputStream.java | 4 +- .../pop3/core/AbstractApopCmdHandler.java | 2 +- .../protocols/pop3/mailbox/ImapMailbox.java | 2 +- .../protocols/pop3/AbstractPOP3ServerTest.java | 2 +- .../james/protocols/smtp/SMTPResponse.java | 4 +- .../FileSystemBeanFactoryPostProcessor.java | 2 +- .../rrt/lib/AbstractRecipientRewriteTable.java | 2 +- .../lib/AbstractRecipientRewriteTableTest.java | 2 +- .../dnsservice/dnsjava/DNSJavaService.java | 2 +- .../impl/JamesMailetContext.java | 4 +- .../mailetcontainer/impl/ProcessorUtil.java | 2 +- .../lib/AbstractStateCompositeProcessor.java | 2 +- .../apache/james/fetchmail/FolderProcessor.java | 2 +- .../netty/ImapLineHandlerAdapter.java | 2 +- .../netty/AbstractConfigurableAsyncServer.java | 4 +- 21 files changed, 82 insertions(+), 82 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/a65ec2cb/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRUtils.java ---------------------------------------------------------------------- diff --git a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRUtils.java b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRUtils.java index 94719db..eb00f24 100644 --- a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRUtils.java +++ b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRUtils.java @@ -47,7 +47,7 @@ public class JCRUtils implements JCRImapConstants{ if (username == null) { session = repository.login(workspace); } else { - char pass[]; + char[] pass; if (password == null) { pass = new char[0]; } else { http://git-wip-us.apache.org/repos/asf/james-project/blob/a65ec2cb/mailet/base/src/main/java/org/apache/mailet/base/StringUtils.java ---------------------------------------------------------------------- diff --git a/mailet/base/src/main/java/org/apache/mailet/base/StringUtils.java b/mailet/base/src/main/java/org/apache/mailet/base/StringUtils.java index db619e5..0e1880f 100644 --- a/mailet/base/src/main/java/org/apache/mailet/base/StringUtils.java +++ b/mailet/base/src/main/java/org/apache/mailet/base/StringUtils.java @@ -78,7 +78,7 @@ public final class StringUtils { try { MessageDigest md = MessageDigest.getInstance("MD5"); StringBuilder sb = new StringBuilder(); - byte buf[] = message.getBytes(); + byte[] buf = message.getBytes(); byte[] md5 = md.digest(buf); for (byte aMd5 : md5) { http://git-wip-us.apache.org/repos/asf/james-project/blob/a65ec2cb/mailet/standard/src/main/java/org/apache/james/transport/matchers/GenericRegexMatcher.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/GenericRegexMatcher.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/GenericRegexMatcher.java index 6844963..729e1a7 100755 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/GenericRegexMatcher.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/GenericRegexMatcher.java @@ -75,7 +75,7 @@ public abstract class GenericRegexMatcher extends GenericMatcher { //Get the patterns for that header Pattern pattern = (Pattern) pattern1[1]; //Get the array of header values that match that - String headers[] = message.getHeader(headerName); + String[] headers = message.getHeader(headerName); //Loop through the header values if (headers != null) { for (String header : headers) { http://git-wip-us.apache.org/repos/asf/james-project/blob/a65ec2cb/mailet/standard/src/main/java/org/apache/james/transport/matchers/NESSpamCheck.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/NESSpamCheck.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/NESSpamCheck.java index 7934d27..0657af6 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/NESSpamCheck.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/NESSpamCheck.java @@ -35,63 +35,63 @@ import org.apache.mailet.base.RFC2822Headers; */ @Experimental public class NESSpamCheck extends GenericRegexMatcher { - protected Object NESPatterns[][] = {{RFC2822Headers.RECEIVED, "GAA.*-0600.*EST"}, - {RFC2822Headers.RECEIVED, "XAA.*-0700.*EDT"}, - {RFC2822Headers.RECEIVED, "xxxxxxxxxxxxxxxxxxxxx"}, - {RFC2822Headers.RECEIVED, "untrace?able"}, - {RFC2822Headers.RECEIVED, "from (baby|bewellnet|kllklk) "}, - {RFC2822Headers.TO, "Friend@public\\.com"}, - {RFC2822Headers.TO, "user@the[-_]internet"}, - {RFC2822Headers.DATE, "/[0-9]+/.+[AP]M.+Time"}, - {RFC2822Headers.SUBJECT, "^\\(?ADV?[:;)]"}, - {RFC2822Headers.MESSAGE_ID, "<>"}, - {RFC2822Headers.MESSAGE_ID_VARIATION, "<>"}, - {RFC2822Headers.MESSAGE_ID_VARIATION, "<(419\\.43|989\\.28)"}, - {"X-MimeOLE", "MimeOLE V[^0-9]"}, - //Added 20-Jun-1999. Appears to be broken spamware. - {"MIME-Version", "1.0From"}, - //Added 28-July-1999. Check X-Mailer for spamware. - {"X-Mailer", "DiffondiCool"}, - {"X-Mailer", "Emailer Platinum"}, - {"X-Mailer", "eMerge"}, - {"X-Mailer", "Crescent Internet Tool"}, - //Added 4-Apr-2000. Check X-Mailer for Cybercreek Avalanche - {"X-Mailer", "Avalanche"}, - //Added 21-Oct-1999. Subject contains 20 or more consecutive spaces - {"Subject", " "}, - //Added 31-Mar-2000. Invalid headers from MyGuestBook.exe CGI spamware - {"MessageID", "<.+>"}, - {"X-References", "0[A-Z0-9]+, 0[A-Z0-9]+$"}, - {"X-Other-References", "0[A-Z0-9]+$"}, - {"X-See-Also", "0[A-Z0-9]+$"}, - //Updated 28-Apr-1999. Check for "Sender", "Resent-From", or "Resent-By" - // before "X-UIDL". If found, then exit. - {RFC2822Headers.SENDER, ".+"}, - {RFC2822Headers.RESENT_FROM, ".+"}, - {"Resent-By", ".+"}, - //Updated 19-May-1999. Check for "X-Mozilla-Status" before "X-UIDL". - {"X-Mozilla-Status", ".+"}, - //Updated 20-Jul-1999. Check for "X-Mailer: Internet Mail Service" - // before "X-UIDL". - {"X-Mailer", "Internet Mail Service"}, - //Updated 25-Oct-1999. Check for "X-ID" before "X-UIDL". - {"X-ID", ".+"}, - //X-UIDL is a POP3 header that should normally not be seen - {"X-UIDL", ".*"}, - //Some headers are valid only for the Pegasus Mail client. So first check - //for Pegasus header and exit if found. If not found, check for - //invalid headers: "Comments: Authenticated sender", "X-PMFLAGS" and "X-pmrqc". - {"X-mailer", "Pegasus"}, - //Added 27-Aug-1999. Pegasus now uses X-Mailer instead of X-mailer. - {"X-Mailer", "Pegasus"}, - //Added 25-Oct-1999. Check for X-Confirm-Reading-To. - {"X-Confirm-Reading-To", ".+"}, - //Check for invalid Pegasus headers - {RFC2822Headers.COMMENTS, "Authenticated sender"}, - {"X-PMFLAGS", ".*"}, - {"X-Pmflags", ".*"}, - {"X-pmrqc", ".*"}, - {"Host-From:envonly", ".*"}}; + protected Object[][] NESPatterns = {{RFC2822Headers.RECEIVED, "GAA.*-0600.*EST"}, + {RFC2822Headers.RECEIVED, "XAA.*-0700.*EDT"}, + {RFC2822Headers.RECEIVED, "xxxxxxxxxxxxxxxxxxxxx"}, + {RFC2822Headers.RECEIVED, "untrace?able"}, + {RFC2822Headers.RECEIVED, "from (baby|bewellnet|kllklk) "}, + {RFC2822Headers.TO, "Friend@public\\.com"}, + {RFC2822Headers.TO, "user@the[-_]internet"}, + {RFC2822Headers.DATE, "/[0-9]+/.+[AP]M.+Time"}, + {RFC2822Headers.SUBJECT, "^\\(?ADV?[:;)]"}, + {RFC2822Headers.MESSAGE_ID, "<>"}, + {RFC2822Headers.MESSAGE_ID_VARIATION, "<>"}, + {RFC2822Headers.MESSAGE_ID_VARIATION, "<(419\\.43|989\\.28)"}, + {"X-MimeOLE", "MimeOLE V[^0-9]"}, + //Added 20-Jun-1999. Appears to be broken spamware. + {"MIME-Version", "1.0From"}, + //Added 28-July-1999. Check X-Mailer for spamware. + {"X-Mailer", "DiffondiCool"}, + {"X-Mailer", "Emailer Platinum"}, + {"X-Mailer", "eMerge"}, + {"X-Mailer", "Crescent Internet Tool"}, + //Added 4-Apr-2000. Check X-Mailer for Cybercreek Avalanche + {"X-Mailer", "Avalanche"}, + //Added 21-Oct-1999. Subject contains 20 or more consecutive spaces + {"Subject", " "}, + //Added 31-Mar-2000. Invalid headers from MyGuestBook.exe CGI spamware + {"MessageID", "<.+>"}, + {"X-References", "0[A-Z0-9]+, 0[A-Z0-9]+$"}, + {"X-Other-References", "0[A-Z0-9]+$"}, + {"X-See-Also", "0[A-Z0-9]+$"}, + //Updated 28-Apr-1999. Check for "Sender", "Resent-From", or "Resent-By" + // before "X-UIDL". If found, then exit. + {RFC2822Headers.SENDER, ".+"}, + {RFC2822Headers.RESENT_FROM, ".+"}, + {"Resent-By", ".+"}, + //Updated 19-May-1999. Check for "X-Mozilla-Status" before "X-UIDL". + {"X-Mozilla-Status", ".+"}, + //Updated 20-Jul-1999. Check for "X-Mailer: Internet Mail Service" + // before "X-UIDL". + {"X-Mailer", "Internet Mail Service"}, + //Updated 25-Oct-1999. Check for "X-ID" before "X-UIDL". + {"X-ID", ".+"}, + //X-UIDL is a POP3 header that should normally not be seen + {"X-UIDL", ".*"}, + //Some headers are valid only for the Pegasus Mail client. So first check + //for Pegasus header and exit if found. If not found, check for + //invalid headers: "Comments: Authenticated sender", "X-PMFLAGS" and "X-pmrqc". + {"X-mailer", "Pegasus"}, + //Added 27-Aug-1999. Pegasus now uses X-Mailer instead of X-mailer. + {"X-Mailer", "Pegasus"}, + //Added 25-Oct-1999. Check for X-Confirm-Reading-To. + {"X-Confirm-Reading-To", ".+"}, + //Check for invalid Pegasus headers + {RFC2822Headers.COMMENTS, "Authenticated sender"}, + {"X-PMFLAGS", ".*"}, + {"X-Pmflags", ".*"}, + {"X-pmrqc", ".*"}, + {"Host-From:envonly", ".*"}}; public void init() throws MessagingException { //No condition passed... just compile a bunch of regular expressions http://git-wip-us.apache.org/repos/asf/james-project/blob/a65ec2cb/protocols/imap/src/main/java/org/apache/james/imap/message/response/SearchResponse.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/message/response/SearchResponse.java b/protocols/imap/src/main/java/org/apache/james/imap/message/response/SearchResponse.java index f6c89a1..c8c9398 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/message/response/SearchResponse.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/message/response/SearchResponse.java @@ -27,7 +27,7 @@ import org.apache.james.imap.api.message.response.ImapResponseMessage; * A <code>SEARCH</code> response. */ public class SearchResponse implements ImapResponseMessage { - private final long ids[]; + private final long[] ids; private final Long highestModSeq; /** http://git-wip-us.apache.org/repos/asf/james-project/blob/a65ec2cb/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/PartialFetchBodyElement.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/PartialFetchBodyElement.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/PartialFetchBodyElement.java index 50ed566..3ae50fc 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/PartialFetchBodyElement.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/PartialFetchBodyElement.java @@ -127,14 +127,14 @@ final class PartialFetchBodyElement implements BodyElement { /** * @see java.io.FilterInputStream#read(byte[]) */ - public int read(byte b[]) throws IOException { + public int read(byte[] b) throws IOException { return read(b, 0, b.length); } /** * @see java.io.FilterInputStream#read(byte[], int, int) */ - public int read(byte b[], int off, int len) throws IOException { + public int read(byte[] b, int off, int len) throws IOException { checkOffset(); if (pos >= length) { http://git-wip-us.apache.org/repos/asf/james-project/blob/a65ec2cb/protocols/imap/src/main/java/org/apache/james/protocols/imap/utils/FixedLengthInputStream.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/protocols/imap/utils/FixedLengthInputStream.java b/protocols/imap/src/main/java/org/apache/james/protocols/imap/utils/FixedLengthInputStream.java index c643b19..df36784 100644 --- a/protocols/imap/src/main/java/org/apache/james/protocols/imap/utils/FixedLengthInputStream.java +++ b/protocols/imap/src/main/java/org/apache/james/protocols/imap/utils/FixedLengthInputStream.java @@ -48,12 +48,12 @@ public class FixedLengthInputStream extends FilterInputStream { return super.read(); } - public int read(byte b[]) throws IOException { + public int read(byte[] b) throws IOException { return read(b, 0, b.length); } - public int read(byte b[], int off, int len) throws IOException { + public int read(byte[] b, int off, int len) throws IOException { if (pos >= length) { return -1; http://git-wip-us.apache.org/repos/asf/james-project/blob/a65ec2cb/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/AbstractApopCmdHandler.java ---------------------------------------------------------------------- diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/AbstractApopCmdHandler.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/AbstractApopCmdHandler.java index f99e965..60d42a9 100644 --- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/AbstractApopCmdHandler.java +++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/AbstractApopCmdHandler.java @@ -48,7 +48,7 @@ public abstract class AbstractApopCmdHandler extends AbstractPassCmdHandler{ } String parameters = request.getArgument(); - String parts[] = null; + String[] parts = null; boolean syntaxError = false; if (parameters != null) { parts = parameters.split(" "); http://git-wip-us.apache.org/repos/asf/james-project/blob/a65ec2cb/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/mailbox/ImapMailbox.java ---------------------------------------------------------------------- diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/mailbox/ImapMailbox.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/mailbox/ImapMailbox.java index 5998e64..664c10a 100644 --- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/mailbox/ImapMailbox.java +++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/mailbox/ImapMailbox.java @@ -81,7 +81,7 @@ public abstract class ImapMailbox implements Mailbox { public abstract void remove(long... uids) throws IOException; public void remove(String... uids) throws NumberFormatException, IOException { - long imapUids[] = Arrays.stream(uids) + long[] imapUids = Arrays.stream(uids) .mapToLong(Long::parseLong) .toArray(); this.remove(imapUids); http://git-wip-us.apache.org/repos/asf/james-project/blob/a65ec2cb/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/AbstractPOP3ServerTest.java ---------------------------------------------------------------------- diff --git a/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/AbstractPOP3ServerTest.java b/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/AbstractPOP3ServerTest.java index 06fba2c..ef3d0af 100644 --- a/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/AbstractPOP3ServerTest.java +++ b/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/AbstractPOP3ServerTest.java @@ -497,7 +497,7 @@ public abstract class AbstractPOP3ServerTest { BufferedReader bufReader = new BufferedReader(reader); String line = null; int linesRead = 0; - String parts[] = message.body.split("\r\n"); + String[] parts = message.body.split("\r\n"); while ((line = bufReader.readLine()) != null) { assertThat(line).isEqualTo(parts[linesRead++]); http://git-wip-us.apache.org/repos/asf/james-project/blob/a65ec2cb/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPResponse.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPResponse.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPResponse.java index 5008517..b09bd7a 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPResponse.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPResponse.java @@ -61,7 +61,7 @@ public class SMTPResponse extends AbstractResponse { private static String extractCode(String raw) { - String args[] = raw.split(" "); + String[] args = raw.split(" "); if (args != null && args.length > 1) { return args[0]; @@ -71,7 +71,7 @@ public class SMTPResponse extends AbstractResponse { } private static String extractResponse(String raw) { - String args[] = raw.split(" "); + String[] args = raw.split(" "); if (args != null && args.length > 1) { return args[2]; http://git-wip-us.apache.org/repos/asf/james-project/blob/a65ec2cb/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/FileSystemBeanFactoryPostProcessor.java ---------------------------------------------------------------------- diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/FileSystemBeanFactoryPostProcessor.java b/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/FileSystemBeanFactoryPostProcessor.java index 0a4614d..7638f39 100644 --- a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/FileSystemBeanFactoryPostProcessor.java +++ b/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/FileSystemBeanFactoryPostProcessor.java @@ -53,7 +53,7 @@ public class FileSystemBeanFactoryPostProcessor implements BeanFactoryPostProces * (org.springframework.beans.factory.config.ConfigurableListableBeanFactory) */ public void postProcessBeanFactory(ConfigurableListableBeanFactory factory) throws BeansException { - String names[] = factory.getBeanDefinitionNames(); + String[] names = factory.getBeanDefinitionNames(); for (String name : names) { BeanDefinition def = factory.getBeanDefinition(name); visitor.visitBeanDefinition(def); http://git-wip-us.apache.org/repos/asf/james-project/blob/a65ec2cb/server/data/data-library/src/main/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTable.java ---------------------------------------------------------------------- diff --git a/server/data/data-library/src/main/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTable.java b/server/data/data-library/src/main/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTable.java index 8cfef05..92eee8a 100644 --- a/server/data/data-library/src/main/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTable.java +++ b/server/data/data-library/src/main/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTable.java @@ -147,7 +147,7 @@ public abstract class AbstractRecipientRewriteTable implements RecipientRewriteT String userName; String domainName; - String args[] = target.split("@"); + String[] args = target.split("@"); if (args != null && args.length > 1) { http://git-wip-us.apache.org/repos/asf/james-project/blob/a65ec2cb/server/data/data-library/src/test/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTableTest.java ---------------------------------------------------------------------- diff --git a/server/data/data-library/src/test/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTableTest.java b/server/data/data-library/src/test/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTableTest.java index 49fc402..add0b01 100644 --- a/server/data/data-library/src/test/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTableTest.java +++ b/server/data/data-library/src/test/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTableTest.java @@ -57,7 +57,7 @@ public abstract class AbstractRecipientRewriteTableTest { if (mappings != null) { for (String key : virtualUserTable.getAllMappings().keySet()) { - String args[] = key.split("@"); + String[] args = key.split("@"); Mappings map = mappings.get(key); http://git-wip-us.apache.org/repos/asf/james-project/blob/a65ec2cb/server/dns-service/dnsservice-dnsjava/src/main/java/org/apache/james/dnsservice/dnsjava/DNSJavaService.java ---------------------------------------------------------------------- diff --git a/server/dns-service/dnsservice-dnsjava/src/main/java/org/apache/james/dnsservice/dnsjava/DNSJavaService.java b/server/dns-service/dnsservice-dnsjava/src/main/java/org/apache/james/dnsservice/dnsjava/DNSJavaService.java index 2b5dd04..1ff0e96 100644 --- a/server/dns-service/dnsservice-dnsjava/src/main/java/org/apache/james/dnsservice/dnsjava/DNSJavaService.java +++ b/server/dns-service/dnsservice-dnsjava/src/main/java/org/apache/james/dnsservice/dnsjava/DNSJavaService.java @@ -258,7 +258,7 @@ public class DNSJavaService implements DNSService, DNSServiceMBean, Configurable * @throws TemporaryResolutionException get thrown on temporary problems */ private List<String> findMXRecordsRaw(String hostname) throws TemporaryResolutionException { - Record answers[] = lookup(hostname, Type.MX, "MX"); + Record[] answers = lookup(hostname, Type.MX, "MX"); List<String> servers = new ArrayList<>(); if (answers == null) { return servers; http://git-wip-us.apache.org/repos/asf/james-project/blob/a65ec2cb/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailetContext.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailetContext.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailetContext.java index c445af0..80d9172 100644 --- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailetContext.java +++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailetContext.java @@ -222,7 +222,7 @@ public class JamesMailetContext implements MailetContext, Configurable { reply.setSentDate(new Date()); Collection<MailAddress> recipients = new HashSet<>(); recipients.add(mail.getSender()); - InternetAddress addr[] = {new InternetAddress(mail.getSender().toString())}; + InternetAddress[] addr = {new InternetAddress(mail.getSender().toString())}; reply.setRecipients(Message.RecipientType.TO, addr); reply.setFrom(new InternetAddress(mail.getRecipients().iterator().next().toString())); reply.setText(bounceText); @@ -378,7 +378,7 @@ public class JamesMailetContext implements MailetContext, Configurable { public void sendMail(MimeMessage message) throws MessagingException { MailAddress sender = new MailAddress((InternetAddress) message.getFrom()[0]); Collection<MailAddress> recipients = new HashSet<>(); - Address addresses[] = message.getAllRecipients(); + Address[] addresses = message.getAllRecipients(); if (addresses != null) { for (Address address : addresses) { // Javamail treats the "newsgroups:" header field as a http://git-wip-us.apache.org/repos/asf/james-project/blob/a65ec2cb/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/ProcessorUtil.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/ProcessorUtil.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/ProcessorUtil.java index f1bfab6..b8a44a1 100644 --- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/ProcessorUtil.java +++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/ProcessorUtil.java @@ -74,7 +74,7 @@ public class ProcessorUtil { */ public static void verifyMailAddresses(Collection<MailAddress> col) throws MessagingException { try { - MailAddress addresses[] = col.toArray(new MailAddress[col.size()]); + MailAddress[] addresses = col.toArray(new MailAddress[col.size()]); // Why is this here? According to the javadoc for // java.util.Collection.toArray(Object[]), this should http://git-wip-us.apache.org/repos/asf/james-project/blob/a65ec2cb/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessor.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessor.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessor.java index ed707cb..1a716e5 100644 --- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessor.java +++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessor.java @@ -178,7 +178,7 @@ public abstract class AbstractStateCompositeProcessor implements MailProcessor, @PreDestroy public void dispose() { - String names[] = getProcessorStates(); + String[] names = getProcessorStates(); for (String name : names) { MailProcessor processor = getProcessor(name); if (processor instanceof AbstractStateMailetProcessor) { http://git-wip-us.apache.org/repos/asf/james-project/blob/a65ec2cb/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FolderProcessor.java ---------------------------------------------------------------------- diff --git a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FolderProcessor.java b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FolderProcessor.java index 1755fc0..3dccb67 100644 --- a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FolderProcessor.java +++ b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FolderProcessor.java @@ -138,7 +138,7 @@ public class FolderProcessor extends ProcessorAbstract { protected void recurse() throws MessagingException { if ((getFolder().getType() & Folder.HOLDS_FOLDERS) == Folder.HOLDS_FOLDERS) { // folder contains subfolders... - Folder folders[] = getFolder().list(); + Folder[] folders = getFolder().list(); for (Folder folder : folders) { new FolderProcessor(folder, getAccount()).process(); http://git-wip-us.apache.org/repos/asf/james-project/blob/a65ec2cb/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapLineHandlerAdapter.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapLineHandlerAdapter.java b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapLineHandlerAdapter.java index bfe300a..67f4476 100644 --- a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapLineHandlerAdapter.java +++ b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapLineHandlerAdapter.java @@ -44,7 +44,7 @@ public class ImapLineHandlerAdapter extends SimpleChannelUpstreamHandler { @Override public void messageReceived(ChannelHandlerContext ctx, MessageEvent e) throws Exception { ChannelBuffer buf = (ChannelBuffer) e.getMessage(); - byte data[]; + byte[] data; if (buf.hasArray()) { data = buf.array(); } else { http://git-wip-us.apache.org/repos/asf/james-project/blob/a65ec2cb/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java index 280304b..12b4c6f 100644 --- a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java +++ b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java @@ -160,10 +160,10 @@ public abstract class AbstractConfigurableAsyncServer extends AbstractAsyncServe return; } - String listen[] = config.getString("bind", "0.0.0.0:" + getDefaultPort()).split(","); + String[] listen = config.getString("bind", "0.0.0.0:" + getDefaultPort()).split(","); List<InetSocketAddress> bindAddresses = new ArrayList<>(); for (String aListen : listen) { - String bind[] = aListen.split(":"); + String[] bind = aListen.split(":"); InetSocketAddress address; String ip = bind[0].trim(); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
