Fix broken tests, cleanup

Author: lolepezy

src/main/java/net/ripe/rpki/ta/config/Config.java

@@ -1,19 +1,16 @@
 package net.ripe.rpki.ta.config;
 
 import com.google.common.base.Preconditions;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
+import lombok.*;
 import org.joda.time.Period;
 
 import javax.security.auth.x500.X500Principal;
 import java.net.URI;
 
-
 @Getter
 @EqualsAndHashCode
 @ToString
+@NoArgsConstructor
 public class Config {
     @Setter
     private X500Principal trustAnchorName;
@@ -45,6 +42,7 @@ public class Config {
     private Period minimumValidityPeriod;
 
     private final String minimalValidityErrorMessage = "Minimum validity period cannot be null";
+
     public Period getMinimumValidityPeriod() {
         return Preconditions.checkNotNull(minimumValidityPeriod, minimalValidityErrorMessage);
     }

src/test/java/net/ripe/rpki/ta/integration/MainIntegrationTest.java

@@ -436,11 +436,11 @@ public void test_process_request_make_sure_ta_certificate_reissued_if_it_is_too_
                             "--response=" + response.getAbsolutePath() +
                             " --force-new-ta-certificate --env=test").exitCode).isZero();
 
-            final TAState taStateAfterRrdpChange = reloadTaState();
+            final TAState taStateAfterReissue = reloadTaState();
 
-            assertThat(taStateAfterRrdpChange).isNotNull();
+            assertThat(taStateAfterReissue).isNotNull();
 
-            final X509ResourceCertificate taCertAfter = getTaCertificate(taStateAfterRrdpChange);
+            final X509ResourceCertificate taCertAfter = getTaCertificate(taStateAfterReissue);
             assertThat(taCertBefore.getSerialNumber()).isNotEqualTo(taCertAfter.getSerialNumber());
 
             // Check that TA certificate was re-issued
@@ -469,7 +469,7 @@ public void test_process_request_do_not_reissue_ta_certificate_without_force_opt
             " --env=test");
         assertEquals(EXIT_ERROR_2, run.exitCode);
         assertThat(run.stderr).contains("The following problem occurred: " +
-            "TA certificate has to be re-issued: Different notification.xml URL, " +
+            "The TA certificate has to be re-issued: Different notification.xml URL, " +
             "request has 'https://new-url.ripe.net/notification.xml', config has 'https://localhost:7788/notification.xml', " +
             "bailing out. Provide force-new-ta-certificate option to force TA certificate re-issue.");
     }