Fixed sonar and added tests

Author: vishalmysore

src/main/java/io/github/vishalmysore/a2ui/A2UIAware.java

@@ -35,9 +35,9 @@ default Map<String, Object> createRootColumn(String rootId, List<String> childId
 
         Map<String, Object> rootComponent = new HashMap<>();
         Map<String, Object> columnProps = new HashMap<>();
-        columnProps.put("children", new HashMap<String, Object>() {{
-            put("explicitList", childIds);
-        }});
+        Map<String, Object> childrenMap = new HashMap<>();
+        childrenMap.put("explicitList", childIds);
+        columnProps.put("children", childrenMap);
         rootComponent.put("Column", columnProps);
         root.put("component", rootComponent);
 
@@ -67,9 +67,9 @@ default Map<String, Object> createTextComponent(String id, String text, String u
 
         Map<String, Object> textComponent = new HashMap<>();
         Map<String, Object> textProps = new HashMap<>();
-        textProps.put("text", new HashMap<String, Object>() {{
-            put("literalString", text);
-        }});
+        Map<String, Object> textMap = new HashMap<>();
+        textMap.put("literalString", text);
+        textProps.put("text", textMap);
 
         if (usageHint != null && !usageHint.isEmpty()) {
             textProps.put("usageHint", usageHint);
@@ -184,14 +184,14 @@ default Map<String, Object> createTextFieldComponent(String id, String label, St
         Map<String, Object> textFieldProps = new HashMap<>();
 
         // Label is required for TextField
-        textFieldProps.put("label", new HashMap<String, Object>() {{
-            put("literalString", label);
-        }});
+        Map<String, Object> labelMap = new HashMap<>();
+        labelMap.put("literalString", label);
+        textFieldProps.put("label", labelMap);
 
         // Bind text to data model path (A2UI v0.8 uses 'text' property for TextField)
-        textFieldProps.put("text", new HashMap<String, Object>() {{
-            put("path", dataPath);
-        }});
+        Map<String, Object> textMap = new HashMap<>();
+        textMap.put("path", dataPath);
+        textFieldProps.put("text", textMap);
 
         textFieldComponent.put("TextField", textFieldProps);
         component.put("component", textFieldComponent);
@@ -228,9 +228,9 @@ default Map<String, Object> createButtonComponent(String id, String buttonText,
             for (Map.Entry<String, String> binding : contextBindings.entrySet()) {
                 Map<String, Object> contextItem = new HashMap<>();
                 contextItem.put("key", binding.getKey());
-                contextItem.put("value", new HashMap<String, Object>() {{
-                    put("path", binding.getValue());
-                }});
+                Map<String, Object> valueMap = new HashMap<>();
+                valueMap.put("path", binding.getValue());
+                contextItem.put("value", valueMap);
                 context.add(contextItem);
             }
             action.put("context", context);
@@ -332,9 +332,9 @@ default Map<String, Object> createImageComponent(String id, String url, String f
         Map<String, Object> imageComponent = new HashMap<>();
         Map<String, Object> imageProps = new HashMap<>();
 
-        imageProps.put("url", new HashMap<String, Object>() {{
-            put("literalString", url);
-        }});
+        Map<String, Object> urlMap = new HashMap<>();
+        urlMap.put("literalString", url);
+        imageProps.put("url", urlMap);
 
         if (fit != null) {
             imageProps.put("fit", fit);
@@ -359,13 +359,13 @@ default Map<String, Object> createCheckBoxComponent(String id, String label, Str
         Map<String, Object> checkBoxComponent = new HashMap<>();
         Map<String, Object> checkBoxProps = new HashMap<>();
 
-        checkBoxProps.put("label", new HashMap<String, Object>() {{
-            put("literalString", label);
-        }});
+        Map<String, Object> labelMap = new HashMap<>();
+        labelMap.put("literalString", label);
+        checkBoxProps.put("label", labelMap);
 
-        checkBoxProps.put("value", new HashMap<String, Object>() {{
-            put("path", dataPath);
-        }});
+        Map<String, Object> valueMap = new HashMap<>();
+        valueMap.put("path", dataPath);
+        checkBoxProps.put("value", valueMap);
 
         checkBoxComponent.put("CheckBox", checkBoxProps);
         component.put("component", checkBoxComponent);
@@ -384,13 +384,13 @@ default Map<String, Object> createSliderComponent(String id, String label, Strin
         Map<String, Object> sliderComponent = new HashMap<>();
         Map<String, Object> sliderProps = new HashMap<>();
 
-        sliderProps.put("label", new HashMap<String, Object>() {{
-            put("literalString", label);
-        }});
+        Map<String, Object> labelMap = new HashMap<>();
+        labelMap.put("literalString", label);
+        sliderProps.put("label", labelMap);
 
-        sliderProps.put("value", new HashMap<String, Object>() {{
-            put("path", dataPath);
-        }});
+        Map<String, Object> valueMap = new HashMap<>();
+        valueMap.put("path", dataPath);
+        sliderProps.put("value", valueMap);
 
         if (minValue != null) {
             sliderProps.put("minValue", minValue);
@@ -434,9 +434,9 @@ default Map<String, Object> createRowComponent(String id, List<String> childIds,
         Map<String, Object> rowComponent = new HashMap<>();
         Map<String, Object> rowProps = new HashMap<>();
 
-        rowProps.put("children", new HashMap<String, Object>() {{
-            put("explicitList", childIds);
-        }});
+        Map<String, Object> childrenMap = new HashMap<>();
+        childrenMap.put("explicitList", childIds);
+        rowProps.put("children", childrenMap);
 
         if (alignment != null) {
             rowProps.put("alignment", alignment);
@@ -496,10 +496,10 @@ default Map<String, Object> createListComponent(String id, String dataPath, Stri
         Map<String, Object> listComponent = new HashMap<>();
         Map<String, Object> listProps = new HashMap<>();
 
-        listProps.put("children", new HashMap<String, Object>() {{
-            put("path", dataPath);
-            put("componentId", templateComponentId);
-        }});
+        Map<String, Object> childrenMap = new HashMap<>();
+        childrenMap.put("path", dataPath);
+        childrenMap.put("componentId", templateComponentId);
+        listProps.put("children", childrenMap);
 
         listComponent.put("List", listProps);
         component.put("component", listComponent);
@@ -519,9 +519,9 @@ default Map<String, Object> createLoadingComponent(String id, String message) {
         Map<String, Object> columnProps = new HashMap<>();
 
         List<String> childIds = Arrays.asList("loading_icon", "loading_text");
-        columnProps.put("children", new HashMap<String, Object>() {{
-            put("explicitList", childIds);
-        }});
+        Map<String, Object> childrenMap = new HashMap<>();
+        childrenMap.put("explicitList", childIds);
+        columnProps.put("children", childrenMap);
         columnProps.put("alignment", "center");
         columnProps.put("distribution", "center");
 
@@ -580,18 +580,18 @@ default Map<String, Object> createChoicePickerComponent(String id, String label,
         Map<String, Object> choiceComponent = new HashMap<>();
         Map<String, Object> choiceProps = new HashMap<>();
 
-        choiceProps.put("label", new HashMap<String, Object>() {{
-            put("literalString", label);
-        }});
+        Map<String, Object> labelMap = new HashMap<>();
+        labelMap.put("literalString", label);
+        choiceProps.put("label", labelMap);
 
         List<Map<String, Object>> optionList = new ArrayList<>();
         for (Map<String, String> option : options) {
-            optionList.add(new HashMap<String, Object>() {{
-                put("value", option.get("value"));
-                put("label", new HashMap<String, Object>() {{
-                    put("literalString", option.get("label"));
-                }});
-            }});
+            Map<String, Object> optionMap = new HashMap<>();
+            optionMap.put("value", option.get("value"));
+            Map<String, Object> optionLabelMap = new HashMap<>();
+            optionLabelMap.put("literalString", option.get("label"));
+            optionMap.put("label", optionLabelMap);
+            optionList.add(optionMap);
         }
         choiceProps.put("options", optionList);
 
@@ -615,9 +615,9 @@ default Map<String, Object> createVideoComponent(String id, String url, String u
         Map<String, Object> videoComponent = new HashMap<>();
         Map<String, Object> videoProps = new HashMap<>();
 
-        videoProps.put("url", new HashMap<String, Object>() {{
-            put("literalString", url);
-        }});
+        Map<String, Object> urlMap = new HashMap<>();
+        urlMap.put("literalString", url);
+        videoProps.put("url", urlMap);
 
         if (usageHint != null) {
             videoProps.put("usageHint", usageHint);
@@ -639,14 +639,14 @@ default Map<String, Object> createAudioPlayerComponent(String id, String url, St
         Map<String, Object> audioComponent = new HashMap<>();
         Map<String, Object> audioProps = new HashMap<>();
 
-        audioProps.put("url", new HashMap<String, Object>() {{
-            put("literalString", url);
-        }});
+        Map<String, Object> urlMap = new HashMap<>();
+        urlMap.put("literalString", url);
+        audioProps.put("url", urlMap);
 
         if (description != null) {
-            audioProps.put("description", new HashMap<String, Object>() {{
-                put("literalString", description);
-            }});
+            Map<String, Object> descriptionMap = new HashMap<>();
+            descriptionMap.put("literalString", description);
+            audioProps.put("description", descriptionMap);
         }
 
         audioComponent.put("AudioPlayer", audioProps);
@@ -667,12 +667,12 @@ default Map<String, Object> createTabsComponent(String id, List<Map<String, Obje
 
         List<Map<String, Object>> items = new ArrayList<>();
         for (Map<String, Object> tab : tabItems) {
-            items.add(new HashMap<String, Object>() {{
-                put("title", new HashMap<String, Object>() {{
-                    put("literalString", tab.get("title"));
-                }});
-                put("child", tab.get("child"));
-            }});
+            Map<String, Object> itemMap = new HashMap<>();
+            Map<String, Object> titleMap = new HashMap<>();
+            titleMap.put("literalString", tab.get("title"));
+            itemMap.put("title", titleMap);
+            itemMap.put("child", tab.get("child"));
+            items.add(itemMap);
         }
         tabsProps.put("tabItems", items);
 
@@ -712,14 +712,14 @@ default Map<String, Object> createDateTimeInputComponent(String id, String label
         Map<String, Object> dateTimeComponent = new HashMap<>();
         Map<String, Object> dateTimeProps = new HashMap<>();
 
-        dateTimeProps.put("label", new HashMap<String, Object>() {{
-            put("literalString", label);
-        }});
+        Map<String, Object> labelMap = new HashMap<>();
+        labelMap.put("literalString", label);
+        dateTimeProps.put("label", labelMap);
 
         if (dataPath != null) {
-            dateTimeProps.put("value", new HashMap<String, Object>() {{
-                put("path", dataPath);
-            }});
+            Map<String, Object> valueMap = new HashMap<>();
+            valueMap.put("path", dataPath);
+            dateTimeProps.put("value", valueMap);
         }
 
         if (enableDate != null) {

src/test/java/io/github/vishalmysore/a2a/domain/A2UIClientCapabilitiesTest.java

@@ -0,0 +1,63 @@
+package io.github.vishalmysore.a2a.domain;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class A2UIClientCapabilitiesTest {
+
+    @Test
+    public void testNoArgsConstructor() {
+        A2UIClientCapabilities capabilities = new A2UIClientCapabilities();
+        assertNotNull(capabilities);
+        assertNull(capabilities.getSupportedCatalogIds());
+        assertNull(capabilities.getInlineCatalogs());
+    }
+
+    @Test
+    public void testAllArgsConstructor() {
+        List<String> catalogIds = Arrays.asList("catalog1", "catalog2");
+        List<Map<String, Object>> inlineCatalogs = Arrays.asList(new HashMap<>());
+        A2UIClientCapabilities capabilities = new A2UIClientCapabilities(catalogIds, inlineCatalogs);
+        assertEquals(catalogIds, capabilities.getSupportedCatalogIds());
+        assertEquals(inlineCatalogs, capabilities.getInlineCatalogs());
+    }
+
+    @Test
+    public void testSettersAndGetters() {
+        A2UIClientCapabilities capabilities = new A2UIClientCapabilities();
+        List<String> catalogIds = Arrays.asList("test1", "test2");
+        capabilities.setSupportedCatalogIds(catalogIds);
+        List<Map<String, Object>> inlineCatalogs = Arrays.asList(new HashMap<>());
+        capabilities.setInlineCatalogs(inlineCatalogs);
+
+        assertEquals(catalogIds, capabilities.getSupportedCatalogIds());
+        assertEquals(inlineCatalogs, capabilities.getInlineCatalogs());
+    }
+
+    @Test
+    public void testToString() {
+        List<String> catalogIds = Arrays.asList("catalog");
+        A2UIClientCapabilities capabilities = new A2UIClientCapabilities(catalogIds, null);
+        String toString = capabilities.toString();
+        assertNotNull(toString);
+        assertTrue(toString.contains("catalog"));
+    }
+
+    @Test
+    public void testEqualsAndHashCode() {
+        List<String> catalogIds = Arrays.asList("catalog");
+        A2UIClientCapabilities cap1 = new A2UIClientCapabilities(catalogIds, null);
+        A2UIClientCapabilities cap2 = new A2UIClientCapabilities(catalogIds, null);
+        A2UIClientCapabilities cap3 = new A2UIClientCapabilities(Arrays.asList("different"), null);
+
+        assertEquals(cap1, cap2);
+        assertNotEquals(cap1, cap3);
+        assertEquals(cap1.hashCode(), cap2.hashCode());
+        assertNotEquals(cap1.hashCode(), cap3.hashCode());
+    }
+}

src/test/java/io/github/vishalmysore/a2a/domain/AgentExtensionTest.java

@@ -0,0 +1,68 @@
+package io.github.vishalmysore.a2a.domain;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class AgentExtensionTest {
+
+    @Test
+    public void testNoArgsConstructor() {
+        AgentExtension extension = new AgentExtension();
+        assertNotNull(extension);
+        assertNull(extension.getUri());
+        assertNull(extension.getDescription());
+        assertFalse(extension.isRequired());
+        assertNull(extension.getParams());
+    }
+
+    @Test
+    public void testAllArgsConstructor() {
+        Map<String, Object> params = new HashMap<>();
+        params.put("key", "value");
+        AgentExtension extension = new AgentExtension("uri", "description", true, params);
+        assertEquals("uri", extension.getUri());
+        assertEquals("description", extension.getDescription());
+        assertTrue(extension.isRequired());
+        assertEquals(params, extension.getParams());
+    }
+
+    @Test
+    public void testSettersAndGetters() {
+        AgentExtension extension = new AgentExtension();
+        extension.setUri("testUri");
+        extension.setDescription("testDescription");
+        extension.setRequired(true);
+        Map<String, Object> params = new HashMap<>();
+        params.put("test", "value");
+        extension.setParams(params);
+
+        assertEquals("testUri", extension.getUri());
+        assertEquals("testDescription", extension.getDescription());
+        assertTrue(extension.isRequired());
+        assertEquals(params, extension.getParams());
+    }
+
+    @Test
+    public void testToString() {
+        AgentExtension extension = new AgentExtension("uri", "desc", false, null);
+        String toString = extension.toString();
+        assertNotNull(toString);
+        assertTrue(toString.contains("uri"));
+        assertTrue(toString.contains("desc"));
+    }
+
+    @Test
+    public void testEqualsAndHashCode() {
+        AgentExtension ext1 = new AgentExtension("uri", "desc", true, null);
+        AgentExtension ext2 = new AgentExtension("uri", "desc", true, null);
+        AgentExtension ext3 = new AgentExtension("different", "desc", true, null);
+
+        assertEquals(ext1, ext2);
+        assertNotEquals(ext1, ext3);
+        assertEquals(ext1.hashCode(), ext2.hashCode());
+        assertNotEquals(ext1.hashCode(), ext3.hashCode());
+    }
+}