diff --git a/pom.xml b/pom.xml index 774308c..4467415 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.example guerrilla - 1.1.1 + 1.1.2 guerrilla Hit and Run diff --git a/src/main/java/com/example/guerrilla/config/AppConfig.java b/src/main/java/com/example/guerrilla/config/AppConfig.java index bd42fd6..800046d 100644 --- a/src/main/java/com/example/guerrilla/config/AppConfig.java +++ b/src/main/java/com/example/guerrilla/config/AppConfig.java @@ -53,7 +53,7 @@ public class AppConfig { public void setVipPages(List vipPages) { this.vipPages = vipPages; } - + public String toString() { return ReflectionToStringBuilder.toString(this); } diff --git a/src/main/java/com/example/guerrilla/service/CaptureService.java b/src/main/java/com/example/guerrilla/service/CaptureService.java index dc0fca9..fdd2f6a 100644 --- a/src/main/java/com/example/guerrilla/service/CaptureService.java +++ b/src/main/java/com/example/guerrilla/service/CaptureService.java @@ -9,6 +9,7 @@ import java.util.List; import java.util.Map; import org.apache.commons.io.FileUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; import org.htmlunit.WebClient; import org.htmlunit.html.HtmlButton; @@ -92,7 +93,7 @@ public class CaptureService { @Autowired private ObjectMapper objectMapper; - + @Autowired private SlackService slackService; @@ -126,15 +127,12 @@ public class CaptureService { logger.info("entriesDiffering key: {}", entry.getKey()); logger.info("entriesDiffering expected: {}", entry.getValue().leftValue()); logger.info("entriesDiffering actual: {}", entry.getValue().rightValue()); - contentBuilder.append(entry.getKey() + "
\n"); - contentBuilder.append("EXPECTED: " + entry.getValue().leftValue() + "
\n"); - contentBuilder.append("ACTUAL: " + entry.getValue().rightValue() + "
\n"); - contentBuilder.append("
\n"); + contentBuilder.append(entry.getKey() + "
\n" + entry.getValue().rightValue() + "
\n"); }); Pair sendEmailResult = Pair.of(Boolean.TRUE, emailService.sendEmail(fromAddress, smtpPassword, toAddresses, alertSubject, contentBuilder.toString())); logger.info("sendEmailResult: {}", sendEmailResult); - if (sendEmailResult.equals(Pair.of(Boolean.TRUE,Boolean.TRUE))) { + if (StringUtils.isNotEmpty(contentBuilder.toString())) { slackService.sendMessage(contentBuilder.toString()); } } diff --git a/src/main/java/com/example/guerrilla/service/SlackService.java b/src/main/java/com/example/guerrilla/service/SlackService.java index cf16508..fd66c1f 100644 --- a/src/main/java/com/example/guerrilla/service/SlackService.java +++ b/src/main/java/com/example/guerrilla/service/SlackService.java @@ -35,7 +35,7 @@ public class SlackService { // Initialize an API Methods client with the given token MethodsClient methods = slack.methods(token); - String message = new java.util.Date() + "\n\n" + content.replace("
", "\n\n"); + String message = new java.util.Date() + "\n" + content.replace("
", "\n"); // Build a request object ChatPostMessageRequest request = ChatPostMessageRequest.builder().channel(channel).text(message).build();