refactor: host to mailHost for expressing intent

Author: goekay

src/main/java/de/rwth/idsg/steve/repository/dto/MailSettings.java

@@ -32,7 +32,7 @@
 @Builder
 public class MailSettings {
     private final boolean enabled;
-    private final String host, username, password, from, protocol;
+    private final String mailHost, username, password, from, protocol;
     private final Integer port;
     private final List<String> recipients;
     private final List<NotificationFeature> enabledFeatures;

src/main/java/de/rwth/idsg/steve/repository/impl/SettingsRepositoryImpl.java

@@ -66,7 +66,7 @@ public SettingsForm getForm() {
                            .heartbeat(toMin(r.getHeartbeatIntervalInSeconds()))
                            .expiration(r.getHoursToExpire())
                            .enabled(r.getMailEnabled())
-                           .host(r.getMailHost())
+                           .mailHost(r.getMailHost())
                            .username(r.getMailUsername())
                            .password(r.getMailPassword())
                            .from(r.getMailFrom())
@@ -87,7 +87,7 @@ public MailSettings getMailSettings() {
 
         return MailSettings.builder()
                            .enabled(r.getMailEnabled())
-                           .host(r.getMailHost())
+                           .mailHost(r.getMailHost())
                            .username(r.getMailUsername())
                            .password(r.getMailPassword())
                            .from(r.getMailFrom())
@@ -118,7 +118,7 @@ public void update(SettingsForm form) {
                .set(SETTINGS.HEARTBEAT_INTERVAL_IN_SECONDS, toSec(form.getHeartbeat()))
                .set(SETTINGS.HOURS_TO_EXPIRE, form.getExpiration())
                .set(SETTINGS.MAIL_ENABLED, form.getEnabled())
-               .set(SETTINGS.MAIL_HOST, form.getHost())
+               .set(SETTINGS.MAIL_HOST, form.getMailHost())
                .set(SETTINGS.MAIL_USERNAME, form.getUsername())
                .set(SETTINGS.MAIL_PASSWORD, form.getPassword())
                .set(SETTINGS.MAIL_FROM, form.getFrom())

src/main/java/de/rwth/idsg/steve/service/MailServiceDefault.java

@@ -102,7 +102,7 @@ private static Session createSession(MailSettings settings) {
         Properties props = new Properties();
         String protocol = settings.getProtocol();
 
-        props.setProperty("mail.host", "" + settings.getHost());
+        props.setProperty("mail.host", "" + settings.getMailHost());
         props.setProperty("mail.transport.protocol", "" + protocol);
         props.setProperty("mail." + protocol + ".port", "" + settings.getPort());
 

src/main/java/de/rwth/idsg/steve/web/dto/SettingsForm.java

@@ -66,7 +66,7 @@ public class SettingsForm {
     @Email(message = "'From' field is not a valid e-mail address")
     private String from;
 
-    private String host, username, password, protocol;
+    private String mailHost, username, password, protocol;
 
     @Min(value = 1, message = "Port must be positive")
     private Integer port;

src/main/resources/webapp/WEB-INF/views/settings.jsp

@@ -60,7 +60,7 @@
     <table class="userInputFullPage">
         <tr><td>Enable Notifications?:</td><td><form:checkbox path="enabled"/></td></tr>
         <tr><td>Protocol:</td><td><form:input path="protocol"/></td></tr>
-        <tr><td>Host:</td><td><form:input path="host"/></td></tr>
+        <tr><td>Host:</td><td><form:input path="mailHost"/></td></tr>
         <tr><td>Port:</td><td><form:input path="port"/></td></tr>
         <tr><td>From:</td><td><form:input path="from"/></td></tr>
         <tr><td>User name:</td><td><form:input path="username"/></td></tr>
@@ -85,4 +85,4 @@
 
 </form:form>
 </div>
-<%@ include file="00-footer.jsp" %>
+<%@ include file="00-footer.jsp" %>