merged LatestPackageRevisionMessage and ConfigurationMessage

Author: bitionaire

src/main/java/com/oneandone/go/plugin/maven/MavenRepositoryMaterial.java

@@ -206,7 +206,7 @@ private MessageHandler latestRevisionMessageHandler() {
         return new MessageHandler() {
             @Override
             public GoPluginApiResponse handle(final GoPluginApiRequest request) {
-                final LatestPackageRevisionMessage message = fromJsonString(request.requestBody(), LatestPackageRevisionMessage.class);
+                final ConfigurationMessage message = fromJsonString(request.requestBody(), ConfigurationMessage.class);
                 final PackageRevisionMessage revision = packageRepositoryPoller.getLatestRevision(message.getPackageConfiguration(), message.getRepositoryConfiguration());
                 return success(toJsonString(revision));
             }
@@ -222,7 +222,7 @@ private MessageHandler latestRevisionSinceMessageHandler() {
         return new MessageHandler() {
             @Override
             public GoPluginApiResponse handle(final GoPluginApiRequest request) {
-                final LatestPackageRevisionMessage message = fromJsonString(request.requestBody(), LatestPackageRevisionMessage.class);
+                final ConfigurationMessage message = fromJsonString(request.requestBody(), ConfigurationMessage.class);
                 final PackageRevisionMessage revision = packageRepositoryPoller.latestModificationSince(message.getPackageConfiguration(), message.getRepositoryConfiguration(), message.getPreviousRevision());
                 return success(revision == null ? null : toJsonString(revision));
             }

src/main/java/com/oneandone/go/plugin/maven/message/CheckConnectionResultMessage.java

@@ -6,21 +6,46 @@
 import java.util.Arrays;
 import java.util.List;
 
+/** The result of a connection check. */
 public class CheckConnectionResultMessage {
 
-    public enum STATUS {SUCCESS, FAILURE}
+    /** Enumeration of response status. */
+    public enum STATUS {
+        /** State representing a succeeded connection check. */
+        SUCCESS,
 
+        /** State representing a failed connection check. */
+        FAILURE
+    }
+
+    /** The connection check status */
     @Expose
     private STATUS status;
 
+    /**
+     * The list of messages associated with the connection check.
+     *
+     * @return list of messages associated with the connection check
+     */
     @Expose
     @Getter private List<String> messages;
 
+    /**
+     * Constructs a connection check result.
+     *
+     * @param status the check status
+     * @param messages list of connection check messages
+     */
     public CheckConnectionResultMessage(final STATUS status, final String... messages) {
         this.status = status;
         this.messages = Arrays.asList(messages);
     }
 
+    /**
+     * Returns {@code true} if the connection check succeeded, otherwise {@code false}.
+     *
+     * @return {@code true} if the connection check succeeded, otherwise {@code false}
+     */
     public boolean success() {
         return STATUS.SUCCESS.equals(status);
     }

src/main/java/com/oneandone/go/plugin/maven/message/ConfigurationMessage.java

@@ -2,23 +2,46 @@
 
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
+import lombok.Getter;
 
 import java.util.Map;
 
+/** The configuration message as send by the Go CD server to supply all configuration properties. */
 public class ConfigurationMessage {
 
+    /** The repository configuration property map. */
     @Expose
     @SerializedName("repository-configuration")
     private Map<String, PackageMaterialProperty> repositoryConfiguration;
 
+    /** The package configuration property map. */
     @Expose
     @SerializedName("package-configuration")
     private Map<String, PackageMaterialProperty> packageConfiguration;
 
+    /**
+     * The last known revision.
+     *
+     * @return the last known revision
+     */
+    @Expose
+    @SerializedName("previous-revision")
+    @Getter private PackageRevisionMessage previousRevision;
+
+    /**
+     * Returns the repository configuration properties.
+     *
+     * @return the repository configuration properties
+     */
     public PackageMaterialProperties getRepositoryConfiguration() {
         return new PackageMaterialProperties(repositoryConfiguration);
     }
 
+    /**
+     * Returns the package configuration properties.
+     *
+     * @return the package configuration properties
+     */
     public PackageMaterialProperties getPackageConfiguration() {
         return new PackageMaterialProperties(packageConfiguration);
     }

src/main/java/com/oneandone/go/plugin/maven/message/LatestPackageRevisionMessage.java

@@ -157,29 +157,12 @@ public String requestBody() {
     }
 
     private static ConfigurationMessage configuration() throws NoSuchFieldException, IllegalAccessException {
-        final ConfigurationMessage configurationMessage = new ConfigurationMessage();
-        final Class<ConfigurationMessage> messageClass = ConfigurationMessage.class;
-
-        final Field repositoryConfigurationField = messageClass.getDeclaredField("repositoryConfiguration");
-        repositoryConfigurationField.setAccessible(true);
-        final Map<String, PackageMaterialProperty> repositoryConfiguration = new HashMap<>();
-        repositoryConfiguration.put("REPO_URL", new PackageMaterialProperty().withValue("http://localhost:" + runningPort));
-        repositoryConfigurationField.set(configurationMessage, repositoryConfiguration);
-
-        final Field packageConfigurationField = messageClass.getDeclaredField("packageConfiguration");
-        packageConfigurationField.setAccessible(true);
-        final Map<String, PackageMaterialProperty> packageConfiguration = new HashMap<>();
-        packageConfiguration.put("GROUP_ID", new PackageMaterialProperty().withValue("com.oneandone.network"));
-        packageConfiguration.put("ARTIFACT_ID", new PackageMaterialProperty().withValue("rrd-client-ra"));
-        packageConfiguration.put("PACKAGING", new PackageMaterialProperty().withValue("rar"));
-        packageConfigurationField.set(configurationMessage, packageConfiguration);
-
-        return configurationMessage;
+        return configuration(null);
     }
 
-    private static LatestPackageRevisionMessage configuration(final PackageRevisionMessage revisionMessage) throws NoSuchFieldException, IllegalAccessException {
-        final LatestPackageRevisionMessage configurationMessage = new LatestPackageRevisionMessage();
-        final Class<LatestPackageRevisionMessage> messageClass = LatestPackageRevisionMessage.class;
+    private static ConfigurationMessage configuration(final PackageRevisionMessage revisionMessage) throws NoSuchFieldException, IllegalAccessException {
+        final ConfigurationMessage configurationMessage = new ConfigurationMessage();
+        final Class<ConfigurationMessage> messageClass = ConfigurationMessage.class;
 
         final Field repositoryConfigurationField = messageClass.getDeclaredField("repositoryConfiguration");
         repositoryConfigurationField.setAccessible(true);