go plugin api updates

Author: bitionaire

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.oneandone</groupId>
     <artifactId>go-maven-poller</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
 
     <url>https://github.com/1and1/go-maven-poller</url>
 
@@ -30,21 +30,21 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <go.version>14.4.0</go.version>
+        <go.version>16.3.0</go.version>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.16.2</version>
+            <version>1.16.8</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.3.1</version>
+            <version>2.5</version>
         </dependency>
 
         <dependency>
@@ -53,18 +53,6 @@
             <version>18.0</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>3.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <version>1.1.3</version>
-        </dependency>
-
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
@@ -74,26 +62,26 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>4.4.1</version>
+            <version>4.5.1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpcore</artifactId>
-            <version>4.4.1</version>
+            <version>4.4.4</version>
         </dependency>
 
         <dependency>
             <groupId>cd.go.plugin</groupId>
             <artifactId>go-plugin-api</artifactId>
-            <version>14.4.0</version>
+            <version>${go.version}</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.11</version>
+            <version>4.12</version>
             <scope>test</scope>
         </dependency>
 

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

@@ -10,9 +10,7 @@
 import com.thoughtworks.go.plugin.api.response.DefaultGoPluginApiResponse;
 import com.thoughtworks.go.plugin.api.response.GoPluginApiResponse;
 
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.Map;
+import java.util.*;
 
 import static com.oneandone.go.plugin.maven.util.JsonUtil.fromJsonString;
 import static com.oneandone.go.plugin.maven.util.JsonUtil.toJsonString;
@@ -33,6 +31,9 @@ public class MavenRepositoryMaterial extends AbstractGoPlugin {
     /** The plugin extension type. */
     public static final String EXTENSION = "package-repository";
 
+    /** Request to retrieve plugin configuration. */
+    public static final String REQUEST_PLUGIN_GET_CONFIGURATION = "go.plugin-settings.get-configuration";
+
     /** Request to retrieve the repository configuration definition.*/
     public static final String REQUEST_REPOSITORY_CONFIGURATION = "repository-configuration";
 
@@ -71,6 +72,7 @@ public MavenRepositoryMaterial() {
         configurationProvider = new ConfigurationProvider();
         packageRepositoryPoller = new MavenRepositoryPoller();
 
+        handlerMap.put(REQUEST_PLUGIN_GET_CONFIGURATION, getConfigurationMessageHandler());
         handlerMap.put(REQUEST_REPOSITORY_CONFIGURATION, repositoryConfigurationsMessageHandler());
         handlerMap.put(REQUEST_PACKAGE_CONFIGURATION, packageConfigurationMessageHandler());
         handlerMap.put(REQUEST_VALIDATE_REPOSITORY_CONFIGURATION, validateRepositoryConfigurationMessageHandler());
@@ -99,6 +101,15 @@ public GoPluginIdentifier pluginIdentifier() {
         return new GoPluginIdentifier(EXTENSION, Collections.singletonList("1.0"));
     }
 
+    private MessageHandler getConfigurationMessageHandler() {
+        return new MessageHandler() {
+            @Override
+            public GoPluginApiResponse handle(final GoPluginApiRequest request) {
+                return success(toJsonString(new Object()));
+            }
+        };
+    }
+
     /**
      * Returns a message handler for request of type [@link REQUEST_PACKAGE_CONFIGURATION}.
      *

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

@@ -1,6 +1,5 @@
 package com.oneandone.go.plugin.maven;
 
-import com.google.common.base.Joiner;
 import com.oneandone.go.plugin.maven.client.RepositoryClient;
 import com.oneandone.go.plugin.maven.client.RepositoryConnector;
 import com.oneandone.go.plugin.maven.config.ConfigurationProperties;

src/main/java/com/oneandone/go/plugin/maven/client/RepositoryConnector.java

@@ -5,9 +5,7 @@
 import com.oneandone.go.plugin.maven.util.MavenVersion;
 import com.thoughtworks.go.plugin.api.logging.Logger;
 import java.net.MalformedURLException;
-import java.net.URI;
 import java.net.URL;
-import java.util.logging.Level;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpHost;
 import org.apache.http.HttpResponse;

src/main/resources/plugin.xml

@@ -3,7 +3,7 @@
 <about>
     <name>Maven repository plugin</name>
     <version>${project.version}</version>
-    <target-go-version>14.4</target-go-version>
+    <target-go-version>16.3</target-go-version>
     <description>Polls a Maven repository by maven-metadata.xml</description>
     <vendor>
         <name>1und1 Internet AG</name>

src/test/java/com/oneandone/go/plugin/maven/MavenRepositoryMaterialTest.java

@@ -16,6 +16,7 @@
 
 import java.io.File;
 import java.lang.reflect.Field;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.Executors;
@@ -67,8 +68,15 @@ public void testHandle() throws Exception {
 
         final MavenRepositoryMaterial repositoryMaterial = new MavenRepositoryMaterial();
 
+        // request get conf
+        GoPluginApiResponse response = repositoryMaterial.handle(request("go.plugin-settings.get-configuration", null));
+        assertNotNull(response);
+        assertEquals(200, response.responseCode());
+        assertEquals(Collections.emptyMap(), response.responseHeaders());
+        assertEquals("{}", response.responseBody());
+
         // request repo conf
-        GoPluginApiResponse response = repositoryMaterial.handle(request("repository-configuration", null));
+        response = repositoryMaterial.handle(request("repository-configuration", null));
         PackageMaterialProperties properties = JsonUtil.fromJsonString(response.responseBody(), PackageMaterialProperties.class);
         assertNotNull(properties);