Update REST port when configuration replaced

Author: russgold

src/main/java/io/prometheus/wls/rest/ConfigurationServlet.java

@@ -99,7 +99,7 @@ private void configure(PostAction postAction, List<FileItem> fileItems) throws I
         }
     }
 
-    private class PostAction {
+    private static class PostAction {
         // The action to take. May be either "replace" or "append"
         private String effect = DEFAULT_ACTION;
         private ExporterConfig uploadedConfig;

src/main/java/io/prometheus/wls/rest/domain/ExporterConfig.java

@@ -285,6 +285,7 @@ public void append(ExporterConfig config2) {
     public void replace(ExporterConfig config2) {
         this.metricsNameSnakeCase = config2.metricsNameSnakeCase;
         this.useDomainQualifier = config2.useDomainQualifier;
+        this.restPort = config2.restPort;
         MBeanSelector[] newQueries = config2.getQueries();
         this.queries = Arrays.copyOf(newQueries, newQueries.length);
         this.domainName = null;

src/test/java/io/prometheus/wls/rest/ConfigurationServletTest.java

@@ -38,6 +38,8 @@
  */
 public class ConfigurationServletTest {
 
+    private final static int REST_PORT = 7651;
+
     private final WebClientFactoryStub factory = createStrictStub(WebClientFactoryStub.class);
     private final ConfigurationServlet servlet = new ConfigurationServlet(factory);
     private final HttpServletResponseStub response = createServletResponse();
@@ -77,6 +79,16 @@ public void servletAnnotationIndicatesConfigurationPage() {
             "    key: name\n" +
             "    values: [sample1, sample2]\n";
 
+    private static final String CONFIGURATION_WITH_REST_PORT =
+            "host: " + HttpServletRequestStub.HOST + "\n" +
+            "port: " + HttpServletRequestStub.PORT + "\n" +
+            "restPort: " + REST_PORT + "\n" +
+            "queries:\n" + "" +
+            "- groups:\n" +
+            "    prefix: new_\n" +
+            "    key: name\n" +
+            "    values: [sample1, sample2]\n";
+
     private static final String ADDED_CONFIGURATION =
             "host: localhost\n" +
             "port: 7001\n" +
@@ -156,6 +168,20 @@ private String asString(HttpEntity entity) throws IOException {
         return new String(result);
     }
 
+    @Test
+    public void afterUploadWithNewRestPort_useItInQueryUrl() throws Exception {
+        servlet.doPost(createUploadRequest(createEncodedForm("replace", CONFIGURATION_WITH_REST_PORT)), response);
+
+        assertThat(LiveConfiguration.getAuthenticationUrl(), containsString(Integer.toString(REST_PORT)));
+    }
+
+    @Test
+    public void afterUsingRestPortAndReplaceWithoutIt_queryUrlUsesDefaultPort() throws Exception {
+        servlet.doPost(createUploadRequest(createEncodedForm("replace", CONFIGURATION_WITH_REST_PORT)), response);
+        servlet.doPost(createUploadRequest(createEncodedForm("replace", CONFIGURATION)), response);
+
+        assertThat(LiveConfiguration.getAuthenticationUrl(), containsString(Integer.toString(HttpServletRequestStub.PORT)));
+    }
 
     @Test
     public void afterUploadWithAppend_useBothConfiguration() throws Exception {

src/test/java/io/prometheus/wls/rest/domain/ExporterConfigTest.java

@@ -246,6 +246,23 @@ public void includeSnakeCaseTrueSettingInToString() {
             "      key: applicationName\n" +
             "      values: [pendingRequests, completedRequests, stuckThreadCount]\n";
 
+    @Test
+    public void includeRestPortSettingInToString() {
+        ExporterConfig config = loadFromString(REST_PORT_CONFIG);
+
+        assertThat(config.toString(), equalToIgnoringWhiteSpace(REST_PORT_CONFIG));
+    }
+
+    private static final String REST_PORT_CONFIG =
+            "restPort: 1234\n" +
+            "queries:\n" +
+            "- applicationRuntimes:\n" +
+            "    key: name\n" +
+            "    workManagerRuntimes:\n" +
+            "      prefix: workmanager_\n" +
+            "      key: applicationName\n" +
+            "      values: [pendingRequests, completedRequests, stuckThreadCount]\n";
+
     @Test
     public void afterAppend_configHasOriginalDestination() {
         ExporterConfig config = getAppendedConfiguration(SERVLET_CONFIG, WORK_MANAGER_CONFIG);
@@ -279,6 +296,12 @@ public void afterAppend_configHasOriginalSnakeCase() {
         assertThat(getAppendedConfiguration(WORK_MANAGER_CONFIG, SERVLET_CONFIG).getMetricsNameSnakeCase(), is(true));
      }
 
+    @Test
+    public void afterAppend_configHasOriginalRestPort() {
+        assertThat(getAppendedConfiguration(SERVLET_CONFIG, REST_PORT_CONFIG).getRestPort(), nullValue());
+        assertThat(getAppendedConfiguration(REST_PORT_CONFIG, SERVLET_CONFIG).getRestPort(), equalTo(1234));
+     }
+
     @Test
     public void afterAppend_configHasOriginalQuery() {
         ExporterConfig config = getAppendedConfiguration(SERVLET_CONFIG, WORK_MANAGER_CONFIG);
@@ -328,6 +351,12 @@ public void afterReplace_configHasChangedSnakeCase() {
         assertThat(getReplacedConfiguration(WORK_MANAGER_CONFIG, SERVLET_CONFIG).getMetricsNameSnakeCase(), is(false));
      }
 
+    @Test
+    public void afterReplace_configHasChangedRestPort() {
+        assertThat(getReplacedConfiguration(SERVLET_CONFIG, REST_PORT_CONFIG).getRestPort(), equalTo(1234));
+        assertThat(getReplacedConfiguration(REST_PORT_CONFIG, SERVLET_CONFIG).getRestPort(), nullValue());
+     }
+
     @Test
     public void afterReplace_configHasChangedDomainQualifier() {
         assertThat(getReplacedConfiguration(SERVLET_CONFIG, DOMAIN_QUALIFIER_CONFIG).useDomainQualifier(), is(true));
@@ -568,7 +597,7 @@ private JsonObject getJsonResponse(String jsonString) {
 
     @SuppressWarnings("unused")
     static class QueryHierarchyMatcher extends TypeSafeDiagnosingMatcher<ExporterConfig> {
-        private String[] selectorKeys;
+        private final String[] selectorKeys;
 
         private QueryHierarchyMatcher(String[] selectorKeys) {
             this.selectorKeys = selectorKeys;