This is an automated email from the ASF dual-hosted git repository.
dpavlov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git
The following commit(s) were added to refs/heads/master by this push:
new a823304 Optimize imports & code formatted for Email,slack & logs
a823304 is described below
commit a8233048a0f8663a50917330e5cf2711bcaa8d5b
Author: Dmitriy Pavlov <[email protected]>
AuthorDate: Fri Feb 15 18:30:17 2019 +0300
Optimize imports & code formatted for Email,slack & logs
---
.../apache/ignite/ci/logs/LogIgniteSpecific.java | 4 ++--
.../org/apache/ignite/ci/logs/LogMsgToWarn.java | 6 +++---
.../org/apache/ignite/ci/logs/LogsAnalyzer.java | 4 ++--
.../ignite/ci/logs/handlers/TestLogHandler.java | 7 ++-----
.../org/apache/ignite/ci/mail/EmailSender.java | 24 ++++++++++++++--------
.../org/apache/ignite/ci/mail/SlackSender.java | 11 +++++-----
6 files changed, 29 insertions(+), 27 deletions(-)
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/logs/LogIgniteSpecific.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/logs/LogIgniteSpecific.java
index f6427f5..a053c25 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/logs/LogIgniteSpecific.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/logs/LogIgniteSpecific.java
@@ -30,11 +30,11 @@ public class LogIgniteSpecific implements
ILogProductSpecific {
/** {@inheritDoc} */
@Override public boolean isTestStarting(String line) {
- return line.contains(STARTING_TEST) && line.contains(TEST_NAME_END);
+ return line.contains(STARTING_TEST) && line.contains(TEST_NAME_END);
}
/** {@inheritDoc} */
@Override public boolean isTestStopping(String line) {
- return line.contains(STOPPING_TEST);
+ return line.contains(STOPPING_TEST);
}
}
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/logs/LogMsgToWarn.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/logs/LogMsgToWarn.java
index ae4c600..309e7e7 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/logs/LogMsgToWarn.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/logs/LogMsgToWarn.java
@@ -24,8 +24,8 @@ import
org.apache.ignite.ci.tcmodel.result.problems.ProblemOccurrence;
*
*/
//todo make non static
- //todo include test name
- //todo add NPE
+//todo include test name
+//todo add NPE
public class LogMsgToWarn {
private static final String JAVA_LEVEL_DEADLOCK_TXT = " Java-level
deadlock:";
@@ -38,7 +38,7 @@ public class LogMsgToWarn {
@Nullable
public static String getProblemCode(String line) {
- if(line.contains(JAVA_LEVEL_DEADLOCK_TXT))
+ if (line.contains(JAVA_LEVEL_DEADLOCK_TXT))
return ProblemOccurrence.JAVA_LEVEL_DEADLOCK;
return null;
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/logs/LogsAnalyzer.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/logs/LogsAnalyzer.java
index fbbeadb..c9a0529 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/logs/LogsAnalyzer.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/logs/LogsAnalyzer.java
@@ -27,7 +27,6 @@ import java.util.List;
import java.util.function.Function;
import java.util.stream.Stream;
import javax.annotation.concurrent.NotThreadSafe;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -56,7 +55,8 @@ public class LogsAnalyzer implements Function<File, File> {
}
catch (IOException e) {
throw new UncheckedIOException(e);
- } finally {
+ }
+ finally {
lineHandlersList.forEach(this::closeSilent);
}
return file;
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/logs/handlers/TestLogHandler.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/logs/handlers/TestLogHandler.java
index b93fce4..6e66882 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/logs/handlers/TestLogHandler.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/logs/handlers/TestLogHandler.java
@@ -38,12 +38,10 @@ public class TestLogHandler implements ILineHandler {
private static final String TEST_NAME_END = " <<<";
private static final String ENDL = String.format("%n");
- private static final ILogProductSpecific logSpecific =new
LogIgniteSpecific();
+ private static final ILogProductSpecific logSpecific = new
LogIgniteSpecific();
public static final TestLogCheckResult FAKE_RESULT = new
TestLogCheckResult();
private final List<String> curTestLog = new ArrayList<>();
-
-
private String currentTestName = null;
private File workFolder;
@@ -66,7 +64,6 @@ public class TestLogHandler implements ILineHandler {
}
String startTest = line.substring(line.indexOf(STARTING_TEST) +
STARTING_TEST.length(), line.indexOf(TEST_NAME_END));
-
this.currentTestName = startTest;
}
else if (currentTestName != null && logSpecific.isTestStopping(line)) {
@@ -77,7 +74,7 @@ public class TestLogHandler implements ILineHandler {
if (currentTestName == null)
return;
- if(SAVE_LOG_STAT)
+ if (SAVE_LOG_STAT)
curTest().addLineStat(line);
if (LogMsgToWarn.needWarn(line))
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/mail/EmailSender.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/mail/EmailSender.java
index 26c2632..adec91d 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/mail/EmailSender.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/mail/EmailSender.java
@@ -17,11 +17,17 @@
package org.apache.ignite.ci.mail;
-import javax.mail.*;
+import java.util.Properties;
+import javax.mail.Authenticator;
+import javax.mail.Message;
+import javax.mail.MessagingException;
+import javax.mail.Multipart;
+import javax.mail.PasswordAuthentication;
+import javax.mail.Session;
+import javax.mail.Transport;
import javax.mail.internet.InternetAddress;
import javax.mail.internet.MimeBodyPart;
import javax.mail.internet.MimeMessage;
-import java.util.Properties;
import javax.mail.internet.MimeMultipart;
import org.apache.ignite.ci.HelperConfig;
import org.apache.ignite.ci.conf.PasswordEncoder;
@@ -44,7 +50,7 @@ public class EmailSender {
public static void sendEmail(String to, String subject, String html,
String plainText) {
Properties cfgProps = HelperConfig.loadEmailSettings();
- String from = HelperConfig.getMandatoryProperty(cfgProps,
HelperConfig.USERNAME, HelperConfig. MAIL_PROPS);
+ String from = HelperConfig.getMandatoryProperty(cfgProps,
HelperConfig.USERNAME, HelperConfig.MAIL_PROPS);
String enc = HelperConfig.getMandatoryProperty(cfgProps,
HelperConfig.ENCODED_PASSWORD, HelperConfig.MAIL_PROPS);
String pwd = PasswordEncoder.decode(enc);
@@ -52,7 +58,7 @@ public class EmailSender {
Properties props = new Properties();
props.put("mail.smtp.host", "smtp.gmail.com");
props.put("mail.smtp.socketFactory.port", "465");
- props.put("mail.smtp.socketFactory.class",
"javax.net.ssl.SSLSocketFactory");
+ props.put("mail.smtp.socketFactory.class",
"javax.net.ssl.SSLSocketFactory");
props.put("mail.smtp.auth", "true");
props.put("mail.smtp.port", "465");
@@ -61,11 +67,11 @@ public class EmailSender {
// Get the default Session object.
Session ses = Session.getInstance(props,
- new Authenticator() {
- @Override protected PasswordAuthentication
getPasswordAuthentication() {
- return new PasswordAuthentication(from, pwd);
- }
- });
+ new Authenticator() {
+ @Override protected PasswordAuthentication
getPasswordAuthentication() {
+ return new PasswordAuthentication(from, pwd);
+ }
+ });
try {
// Create a default MimeMessage object.
MimeMessage msg = new MimeMessage(ses);
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/mail/SlackSender.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/mail/SlackSender.java
index cbd3f71..6ea085e 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/mail/SlackSender.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/mail/SlackSender.java
@@ -23,10 +23,9 @@ import com.ullink.slack.simpleslackapi.SlackSession;
import com.ullink.slack.simpleslackapi.SlackUser;
import com.ullink.slack.simpleslackapi.impl.SlackSessionFactory;
import com.ullink.slack.simpleslackapi.replies.SlackMessageReply;
-import org.apache.ignite.ci.HelperConfig;
-
import java.io.IOException;
import java.util.Properties;
+import org.apache.ignite.ci.HelperConfig;
/**
*
@@ -34,14 +33,14 @@ import java.util.Properties;
public class SlackSender {
public static boolean sendMessage(String addr, String msg) throws
IOException {
Properties cfgProps = HelperConfig.loadEmailSettings();
- String authTok = HelperConfig.getMandatoryProperty(cfgProps,
HelperConfig.SLACK_AUTH_TOKEN, HelperConfig. MAIL_PROPS);
+ String authTok = HelperConfig.getMandatoryProperty(cfgProps,
HelperConfig.SLACK_AUTH_TOKEN, HelperConfig.MAIL_PROPS);
SlackSession ses =
SlackSessionFactory.createWebSocketSlackSession(authTok);
ses.connect();
try {
- if(addr.startsWith("#")) {
+ if (addr.startsWith("#")) {
String ch = addr.substring(1);
SlackChannel slackCh = ses.findChannelByName(ch);
@@ -54,7 +53,7 @@ public class SlackSender {
SlackMessageHandle<SlackMessageReply> handle =
ses.sendMessage(slackCh, msg);
- System.out.println("Message to channel " + addr + " " + msg +
"; acked: " + handle.isAcked());
+ System.out.println("Message to channel " + addr + " " + msg +
"; acked: " + handle.isAcked());
}
else {
SlackUser user = ses.findUserByUserName(addr); //make sure bot
is a member of the user.
@@ -67,7 +66,7 @@ public class SlackSender {
SlackMessageHandle<SlackMessageReply> handle =
ses.sendMessageToUser(user, msg, null);
- System.out.println("Message to user " + addr + " " + msg + ";
acked: " + handle.isAcked());
+ System.out.println("Message to user " + addr + " " + msg + ";
acked: " + handle.isAcked());
}
}
