[facade-jira] Make basic auth config not mandatory for JIRA config (#5751)

Author: uarlouski

vividus-facade-jira/src/main/java/org/vividus/jira/databind/JiraConfigurationDeserializer.java

@@ -61,17 +61,20 @@ public JiraConfiguration deserialize(JsonParser parser, DeserializationContext c
         {
             HttpClientConfig httpClientConfig = codec.treeToValue(httpNode, HttpClientConfig.class);
             configuration.setHttpClientConfig(httpClientConfig);
-
-            JsonNode authNode = httpNode.get("auth");
-            BasicAuthConfig authConfig = new BasicAuthConfig();
-            authConfig.setUsername(asText(authNode, "username"));
-            authConfig.setPassword(asText(authNode, "password"));
-            authConfig.setPreemptiveAuthEnabled(Optional.ofNullable(authNode.get("preemptive-auth-enabled"))
-                    .map(JsonNode::asBoolean).orElse(false));
             HttpContextConfig contextConfig = new HttpContextConfig();
-            contextConfig.setOrigin(endpoint);
-            contextConfig.setAuth(authConfig);
             httpClientConfig.setHttpContextConfig(Map.of("jira", contextConfig));
+
+            JsonNode authNode = httpNode.get("auth");
+            if (authNode != null)
+            {
+                BasicAuthConfig authConfig = new BasicAuthConfig();
+                authConfig.setUsername(asText(authNode, "username"));
+                authConfig.setPassword(asText(authNode, "password"));
+                authConfig.setPreemptiveAuthEnabled(Optional.ofNullable(authNode.get("preemptive-auth-enabled"))
+                        .map(JsonNode::asBoolean).orElse(false));
+                contextConfig.setOrigin(endpoint);
+                contextConfig.setAuth(authConfig);
+            }
         }
 
         return configuration;

vividus-facade-jira/src/test/java/org/vividus/jira/databind/JiraConfigurationDeserializerTests.java

@@ -36,10 +36,12 @@
 
 class JiraConfigurationDeserializerTests
 {
+    private static final String JIRA_KEY = "jira";
+
     @Test
     void shouldDeserialize() throws IOException
     {
-        JsonParser parser = new JavaPropsFactory().createParser("""
+        JiraConfiguration configuration = deserialize("""
                 project-key-regex=VVDS
                 endpoint=https://jira.vividus.com
                 fields-mapping.test-case-type=customfield_00001
@@ -48,10 +50,6 @@ void shouldDeserialize() throws IOException
                 http.auth.password=052ddff802a174847345
                 http.socket-timeout=1
                 """);
-        parser.setCodec(new JavaPropsMapper().setPropertyNamingStrategy(PropertyNamingStrategies.KEBAB_CASE));
-
-        JiraConfigurationDeserializer deserializer = new JiraConfigurationDeserializer();
-        JiraConfiguration configuration = deserializer.deserialize(parser, null);
 
         assertEquals("VVDS", configuration.getProjectKeyRegex().pattern());
         String endpoint = "https://jira.vividus.com";
@@ -64,7 +62,7 @@ void shouldDeserialize() throws IOException
         assertEquals(1, http.getSocketTimeout());
         Map<String, HttpContextConfig> contextConfigs = http.getHttpContextConfig();
         assertNotNull(contextConfigs);
-        HttpContextConfig contextConfig = contextConfigs.get("jira");
+        HttpContextConfig contextConfig = contextConfigs.get(JIRA_KEY);
         assertNotNull(contextConfig);
         BasicAuthConfig config = contextConfig.getAuth();
         assertNotNull(config);
@@ -74,17 +72,39 @@ void shouldDeserialize() throws IOException
     }
 
     @Test
-    void shouldDeserializeEmpty() throws IOException
+    void shouldDeserializeWithoutAuth() throws IOException
     {
-        JsonParser parser = new JavaPropsFactory().createParser("");
-        parser.setCodec(new JavaPropsMapper().setPropertyNamingStrategy(PropertyNamingStrategies.KEBAB_CASE));
+        JiraConfiguration configuration = deserialize("""
+                http.socket-timeout=1
+                """);
 
-        JiraConfigurationDeserializer deserializer = new JiraConfigurationDeserializer();
-        JiraConfiguration configuration = deserializer.deserialize(parser, null);
+        HttpClientConfig http = configuration.getHttpClientConfig();
+        assertNotNull(http);
+        assertEquals(1, http.getSocketTimeout());
+        Map<String, HttpContextConfig> contextConfigs = http.getHttpContextConfig();
+        assertNotNull(contextConfigs);
+        HttpContextConfig contextConfig = contextConfigs.get(JIRA_KEY);
+        assertNotNull(contextConfig);
+        assertNull(contextConfig.getAuth());
+    }
+
+    @Test
+    void shouldDeserializeEmpty() throws IOException
+    {
+        JiraConfiguration configuration = deserialize("");
 
         assertNull(configuration.getProjectKeyRegex());
         assertNull(configuration.getEndpoint());
         assertNull(configuration.getFieldsMapping());
         assertNull(configuration.getHttpClientConfig());
     }
+
+    private JiraConfiguration deserialize(String input) throws IOException
+    {
+        JsonParser parser = new JavaPropsFactory().createParser(input);
+        parser.setCodec(new JavaPropsMapper().setPropertyNamingStrategy(PropertyNamingStrategies.KEBAB_CASE));
+
+        JiraConfigurationDeserializer deserializer = new JiraConfigurationDeserializer();
+        return deserializer.deserialize(parser, null);
+    }
 }

vividus-http-client/src/main/resources/org/vividus/http/client/defaults.properties

@@ -19,7 +19,7 @@ http.service-unavailable-retry.max-retries=1
 http.service-unavailable-retry.retry-interval=PT1S
 http.service-unavailable-retry.status-codes=
 
-http.auth.origin=*
-http.auth.username=
-http.auth.password=
-http.auth.preemptive-auth-enabled=false
+http.context.003e952c9a.origin=*
+http.context.003e952c9a.auth.username=
+http.context.003e952c9a.auth.password=
+http.context.003e952c9a.auth.preemptive-auth-enabled=false