Commit 6a62b6495358cc00a671af287b9d0827c1669b02

Authored by volodymyr-babak
1 parent 4c262d57

Fixed controller tests

... ... @@ -15,34 +15,31 @@
15 15 */
16 16 package org.thingsboard.server.service.mail;
17 17
18   -import java.util.HashMap;
19   -import java.util.Locale;
20   -import java.util.Map;
21   -import java.util.Properties;
22   -
23   -import javax.annotation.PostConstruct;
24   -import javax.mail.internet.MimeMessage;
25   -
  18 +import com.fasterxml.jackson.databind.JsonNode;
26 19 import lombok.extern.slf4j.Slf4j;
27 20 import org.apache.commons.lang3.StringUtils;
28 21 import org.apache.velocity.app.VelocityEngine;
29   -import org.springframework.beans.factory.annotation.Qualifier;
30   -import org.thingsboard.server.exception.ThingsboardErrorCode;
31   -import org.thingsboard.server.exception.ThingsboardException;
32   -import org.thingsboard.server.common.data.AdminSettings;
33   -import org.thingsboard.server.dao.settings.AdminSettingsService;
34   -import org.thingsboard.server.dao.exception.IncorrectParameterException;
35   -import org.slf4j.Logger;
36   -import org.slf4j.LoggerFactory;
37 22 import org.springframework.beans.factory.annotation.Autowired;
  23 +import org.springframework.beans.factory.annotation.Qualifier;
38 24 import org.springframework.context.MessageSource;
39 25 import org.springframework.core.NestedRuntimeException;
40 26 import org.springframework.mail.javamail.JavaMailSenderImpl;
41 27 import org.springframework.mail.javamail.MimeMessageHelper;
42 28 import org.springframework.stereotype.Service;
43 29 import org.springframework.ui.velocity.VelocityEngineUtils;
  30 +import org.thingsboard.server.common.data.AdminSettings;
  31 +import org.thingsboard.server.dao.exception.IncorrectParameterException;
  32 +import org.thingsboard.server.dao.settings.AdminSettingsService;
  33 +import org.thingsboard.server.exception.ThingsboardErrorCode;
  34 +import org.thingsboard.server.exception.ThingsboardException;
  35 +
  36 +import javax.annotation.PostConstruct;
  37 +import javax.mail.internet.MimeMessage;
  38 +import java.util.HashMap;
  39 +import java.util.Locale;
  40 +import java.util.Map;
  41 +import java.util.Properties;
44 42
45   -import com.fasterxml.jackson.databind.JsonNode;
46 43 @Service
47 44 @Slf4j
48 45 public class DefaultMailService implements MailService {
... ...
... ... @@ -480,6 +480,10 @@
480 480 <groupId>javax.servlet</groupId>
481 481 <artifactId>servlet-api</artifactId>
482 482 </exclusion>
  483 + <exclusion>
  484 + <groupId>dom4j</groupId>
  485 + <artifactId>dom4j</artifactId>
  486 + </exclusion>
483 487 </exclusions>
484 488 </dependency>
485 489 <dependency>
... ...