fix: restore Java 8 dependency and test compatibility

Author: loong10k

pom.xml

@@ -61,7 +61,7 @@
         <!-- Dependency versions -->
         <commons-exec.version>1.4.0</commons-exec.version>
         <commons-lang.version>2.6</commons-lang.version>
-        <jackson.version>2.17.2</jackson.version>
+        <jackson.version>2.18.9</jackson.version>
         <junit-jupiter.version>5.11.4</junit-jupiter.version>
         <junit.version>4.13.2</junit.version>
         <lombok.version>1.18.46</lombok.version>

src/test/java/io/github/easy4j/opencode/Java8Collections.java

@@ -0,0 +1,37 @@
+package io.github.easy4j.opencode;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * JDK 8 测试集合工厂，替代 JDK 9 引入的集合静态工厂。
+ */
+public final class Java8Collections {
+
+    private Java8Collections() {
+    }
+
+    @SafeVarargs
+    public static <T> List<T> list(T... values) {
+        return Collections.unmodifiableList(Arrays.asList(values));
+    }
+
+    @SuppressWarnings("unchecked")
+    public static <K, V> Map<K, V> map(Object... values) {
+        Map<K, V> result = new LinkedHashMap<>();
+        for (int index = 0; index < values.length; index += 2) {
+            result.put((K) values[index], (V) values[index + 1]);
+        }
+        return Collections.unmodifiableMap(result);
+    }
+
+    @SafeVarargs
+    public static <T> Set<T> set(T... values) {
+        return Collections.unmodifiableSet(new LinkedHashSet<>(Arrays.asList(values)));
+    }
+}

src/test/java/io/github/easy4j/opencode/OpenCodeClientTest.java

@@ -3,6 +3,10 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.github.easy4j.opencode.api.OpenCodeHttpClient;
 import io.github.easy4j.opencode.api.OpenCodeSseClient;
+import io.github.easy4j.opencode.api.model.Agent;
+import io.github.easy4j.opencode.api.model.HealthStatus;
+import io.github.easy4j.opencode.api.model.OpenCodeConfig;
+import io.github.easy4j.opencode.api.model.Session;
 import io.github.easy4j.opencode.cli.OpenCodeCli;
 import io.github.easy4j.opencode.cli.OpenCodeCliExecutor;
 import io.github.easy4j.opencode.cli.OpenCodeCliResult;
@@ -14,6 +18,7 @@
 import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
+import java.util.List;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
@@ -131,7 +136,7 @@ void shouldDelegateHealthToHttpClient() {
         OpenCodeHttpClient httpClient = new OpenCodeHttpClient(httpConfig, new ObjectMapper(), null);
         OpenCodeClient client = new OpenCodeClient(config, httpClient, null, null);
 
-        var health = client.health();
+        HealthStatus health = client.health();
         assertNotNull(health);
         assertTrue(health.getHealthy());
         client.close();
@@ -149,7 +154,7 @@ void shouldDelegateListSessions() {
         OpenCodeHttpClient httpClient = new OpenCodeHttpClient(httpConfig, new ObjectMapper(), null);
         OpenCodeClient client = new OpenCodeClient(config, httpClient, null, null);
 
-        var sessions = client.listSessions();
+        List<Session> sessions = client.listSessions();
         assertNotNull(sessions);
         assertEquals(1, sessions.size());
         client.close();
@@ -167,7 +172,7 @@ void shouldDelegateListAgents() {
         OpenCodeHttpClient httpClient = new OpenCodeHttpClient(httpConfig, new ObjectMapper(), null);
         OpenCodeClient client = new OpenCodeClient(config, httpClient, null, null);
 
-        var agents = client.listAgents();
+        List<Agent> agents = client.listAgents();
         assertNotNull(agents);
         assertEquals(1, agents.size());
         client.close();
@@ -185,7 +190,7 @@ void shouldDelegateGetConfig() {
         OpenCodeHttpClient httpClient = new OpenCodeHttpClient(httpConfig, new ObjectMapper(), null);
         OpenCodeClient client = new OpenCodeClient(config, httpClient, null, null);
 
-        var codeConfig = client.getOpenCodeConfig();
+        OpenCodeConfig codeConfig = client.getOpenCodeConfig();
         assertNotNull(codeConfig);
         assertEquals("dark", codeConfig.getTheme());
         client.close();

src/test/java/io/github/easy4j/opencode/api/OpenCodeSseClientTest.java

@@ -6,19 +6,20 @@
 import io.github.easy4j.opencode.api.sse.SseQueueSubscription;
 import io.github.easy4j.opencode.api.sse.SseSubscription;
 import okhttp3.mockwebserver.MockResponse;
+import okhttp3.mockwebserver.RecordedRequest;
 import okhttp3.mockwebserver.MockWebServer;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.util.Collections;
-import java.util.Set;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
+import static io.github.easy4j.opencode.Java8Collections.set;
 import static org.junit.jupiter.api.Assertions.*;
 
 /**
@@ -75,7 +76,7 @@ void shouldSubscribeWithContext() throws InterruptedException {
         Thread.sleep(500);
         assertNotNull(received.get());
 
-        var request = server.takeRequest(2, TimeUnit.SECONDS);
+        RecordedRequest request = server.takeRequest(2, TimeUnit.SECONDS);
         assertNotNull(request);
         assertEquals("/data/project", request.getHeader("X-OpenCode-Directory"));
         subscription.cancel();
@@ -121,7 +122,7 @@ void shouldFilterByEventTypes() throws InterruptedException {
 
         AtomicReference<SseEvent> received = new AtomicReference<>();
         SseSubscription subscription = sseClient.subscribeEventTypes(
-                Set.of("wanted"), received::set);
+                set("wanted"), received::set);
 
         Thread.sleep(500);
         assertNotNull(received.get());
@@ -197,7 +198,7 @@ public void onEvent(SseEvent event) {
         Thread.sleep(500);
         assertNotNull(received.get());
 
-        var request = server.takeRequest(2, TimeUnit.SECONDS);
+        RecordedRequest request = server.takeRequest(2, TimeUnit.SECONDS);
         assertNotNull(request);
         assertEquals("/data/proj", request.getHeader("X-OpenCode-Directory"));
         subscription.cancel();

src/test/java/io/github/easy4j/opencode/api/event/EventHandlerTest.java

@@ -3,8 +3,7 @@
 import io.github.easy4j.opencode.api.sse.SseEvent;
 import org.junit.jupiter.api.Test;
 
-import java.util.Map;
-
+import static io.github.easy4j.opencode.Java8Collections.map;
 import static org.junit.jupiter.api.Assertions.*;
 
 /**
@@ -17,14 +16,14 @@ void shouldNotThrowOnDefaultMethods() {
         EventHandler handler = new EventHandler() {};
         SseEvent event = new SseEvent();
         event.setType("test");
-        event.setProperties(Map.of());
+        event.setProperties(map());
 
         // All default methods should be no-op and not throw
         assertDoesNotThrow(() -> handler.onEvent(event));
         assertDoesNotThrow(() -> handler.onSessionIdle("sess-1", event));
         assertDoesNotThrow(() -> handler.onSessionError("sess-1", "error", event));
         assertDoesNotThrow(() -> handler.onTextDelta("delta", event));
-        assertDoesNotThrow(() -> handler.onToolCall("bash", Map.of(), event));
+        assertDoesNotThrow(() -> handler.onToolCall("bash", map(), event));
         assertDoesNotThrow(() -> handler.onToolResult("use-1", "output", event));
         assertDoesNotThrow(() -> handler.onMessage("msg-1", "assistant", event));
         assertDoesNotThrow(() -> handler.onSessionStatus("sess-1", "idle", event));

src/test/java/io/github/easy4j/opencode/api/model/ModelClassesTest.java

@@ -7,9 +7,9 @@
 import org.junit.jupiter.api.Test;
 
 import java.util.Collections;
-import java.util.List;
-import java.util.Map;
 
+import static io.github.easy4j.opencode.Java8Collections.list;
+import static io.github.easy4j.opencode.Java8Collections.map;
 import static org.junit.jupiter.api.Assertions.*;
 
 /**
@@ -83,7 +83,7 @@ void shouldCreateChatRequestWithAllFields() {
         req.setModel("anthropic/claude-sonnet-4-5");
         req.setMessages(Collections.singletonList(ChatMessage.user("hi")));
         req.setStream(true);
-        req.setStreamOptions(Map.of("include_usage", true));
+        req.setStreamOptions(map("include_usage", true));
         req.setAgent("coder");
         req.setSystem("system prompt");
         req.setMaxTokens(1024);
@@ -223,7 +223,7 @@ void shouldCreateCommand() {
         cmd.setName("/help");
         cmd.setDescription("Show help");
         cmd.setTemplate("help {{arg}}");
-        cmd.setArgs(List.of("arg"));
+        cmd.setArgs(list("arg"));
         cmd.setAgent("coder");
         assertEquals("/help", cmd.getName());
         assertEquals("Show help", cmd.getDescription());
@@ -240,7 +240,7 @@ void shouldCreateCommand() {
     void shouldCreateEvent() {
         SseEvent event = new SseEvent();
         event.setType("session.idle");
-        event.setProperties(Map.of("sessionID", "sess-1"));
+        event.setProperties(map("sessionID", "sess-1"));
         assertEquals("session.idle", event.getType());
         assertEquals("sess-1", event.getProperties().get("sessionID"));
     }
@@ -309,10 +309,10 @@ void shouldCreateFileNode() {
     void shouldCreateFileSearchResult() {
         FileSearchResult result = new FileSearchResult();
         result.setPath("src/Main.java");
-        result.setLines(List.of("public class Main {}"));
+        result.setLines(list("public class Main {}"));
         result.setLineNumber(1);
         result.setAbsoluteOffset(0);
-        result.setSubmatches(List.of());
+        result.setSubmatches(list());
         assertEquals("src/Main.java", result.getPath());
         assertEquals(1, result.getLineNumber());
     }
@@ -355,7 +355,7 @@ void shouldCreateLspStatus() {
         lsp.setName("Eclipse JDT");
         lsp.setRoot("/project");
         lsp.setStatus("running");
-        lsp.setDiagnostics(List.of());
+        lsp.setDiagnostics(list());
         assertEquals("jdtls", lsp.getId());
         assertEquals("running", lsp.getStatus());
     }
@@ -369,8 +369,8 @@ void shouldCreateMcpStatus() {
         McpStatus mcp = new McpStatus();
         mcp.setName("github");
         mcp.setStatus("connected");
-        mcp.setConfig(Map.of("url", "http://localhost"));
-        mcp.setTools(List.of("tool1"));
+        mcp.setConfig(map("url", "http://localhost"));
+        mcp.setTools(list("tool1"));
         assertEquals("github", mcp.getName());
         assertEquals("connected", mcp.getStatus());
         assertEquals(1, mcp.getTools().size());
@@ -403,7 +403,7 @@ void shouldCreateMessageInfo() {
         Message msg = new Message();
         msg.setId("msg-1");
         info.setInfo(msg);
-        info.setParts(List.of());
+        info.setParts(list());
         assertEquals("msg-1", info.getInfo().getId());
         assertTrue(info.getParts().isEmpty());
     }
@@ -424,15 +424,15 @@ void shouldCreateOpenCodeConfig() {
         cfg.setUsername("user");
         cfg.setShare("public");
         cfg.setAutoshare(true);
-        cfg.setMode(Map.of("k", "v"));
-        cfg.setProvider_(Map.of("k", "v"));
-        cfg.setProviders(Map.of("k", "v"));
-        cfg.setAgent_(Map.of("k", "v"));
-        cfg.setAgents(Map.of("k", "v"));
-        cfg.setPermission(Map.of("k", "v"));
-        cfg.setTools(Map.of("k", "v"));
-        cfg.setExperimental(Map.of("k", "v"));
-        cfg.setExtra(Map.of("k", "v"));
+        cfg.setMode(map("k", "v"));
+        cfg.setProvider_(map("k", "v"));
+        cfg.setProviders(map("k", "v"));
+        cfg.setAgent_(map("k", "v"));
+        cfg.setAgents(map("k", "v"));
+        cfg.setPermission(map("k", "v"));
+        cfg.setTools(map("k", "v"));
+        cfg.setExperimental(map("k", "v"));
+        cfg.setExtra(map("k", "v"));
         assertEquals("dark", cfg.getTheme());
         assertEquals("anthropic/claude-sonnet-4-5", cfg.getModel());
         assertEquals("coder", cfg.getAgent());
@@ -498,8 +498,8 @@ void shouldCreatePermissionRequest() {
         pr.setSessionID("sess-1");
         pr.setPermission("bash");
         pr.setDescription("run ls");
-        pr.setMetadata(Map.of("command", "ls"));
-        pr.setPatterns(List.of("ls *"));
+        pr.setMetadata(map("command", "ls"));
+        pr.setPatterns(list("ls *"));
         assertEquals("perm-1", pr.getId());
         assertEquals("bash", pr.getPermission());
         assertEquals(1, pr.getPatterns().size());
@@ -518,7 +518,7 @@ void shouldCreateProject() {
         project.setWorktree("/project");
         project.setVcsDir("/project/.git");
         project.setVcs("git");
-        project.setSandboxes(List.of("sandbox1"));
+        project.setSandboxes(list("sandbox1"));
         project.setCreatedAt("2025-01-01");
         assertEquals("proj-1", project.getId());
         assertEquals("my-project", project.getName());
@@ -550,7 +550,7 @@ void shouldCreatePromptRequestOfTextWithModel() {
     @Test
     void shouldSetAllPromptRequestFields() {
         PromptRequest req = new PromptRequest();
-        req.setParts(List.of());
+        req.setParts(list());
         req.setModel(new PromptRequest.ModelRef("anthropic", "claude-sonnet-4-5"));
         req.setAgent("coder");
         req.setNoReply(true);
@@ -577,7 +577,7 @@ void shouldExtractTextContent() {
         toolPart.setText("ignored");
 
         PromptResult result = new PromptResult();
-        result.setParts(List.of(textPart, textPart2, toolPart));
+        result.setParts(list(textPart, textPart2, toolPart));
         assertEquals("hello world", result.getTextContent());
     }
 
@@ -593,7 +593,7 @@ void shouldReturnEmptyStringWhenNoTextParts() {
         toolPart.setType("tool_use");
         toolPart.setText("data");
         PromptResult result = new PromptResult();
-        result.setParts(List.of(toolPart));
+        result.setParts(list(toolPart));
         assertEquals("", result.getTextContent());
     }
 
@@ -608,9 +608,9 @@ void shouldCreateProvider() {
         p.setName("Anthropic");
         p.setDescription("AI provider");
         p.setSource("builtin");
-        p.setAuthMethods(List.of());
-        p.setModels(Map.of());
-        p.setOptions(Map.of());
+        p.setAuthMethods(list());
+        p.setModels(map());
+        p.setOptions(map());
         assertEquals("anthropic", p.getId());
         assertEquals("Anthropic", p.getName());
     }
@@ -642,9 +642,9 @@ void shouldCreateProviderAuthMethod() {
         ProviderAuthMethod method = new ProviderAuthMethod();
         method.setLabel("API Key");
         method.setType("api-key");
-        method.setSchema(Map.of("type", "string"));
-        method.setPrefill(Map.of());
-        method.setPromptOptions(List.of());
+        method.setSchema(map("type", "string"));
+        method.setPrefill(map());
+        method.setPromptOptions(list());
         assertEquals("API Key", method.getLabel());
         assertEquals("api-key", method.getType());
     }
@@ -656,10 +656,10 @@ void shouldCreateProviderAuthMethod() {
     @Test
     void shouldCreateProviderList() {
         ProviderList list = new ProviderList();
-        list.setAll(List.of());
-        list.setDefaults(Map.of("default", "anthropic/claude-sonnet-4-5"));
-        list.setDefault_(Map.of("default", "anthropic/claude-sonnet-4-5"));
-        list.setConnected(List.of("anthropic"));
+        list.setAll(list());
+        list.setDefaults(map("default", "anthropic/claude-sonnet-4-5"));
+        list.setDefault_(map("default", "anthropic/claude-sonnet-4-5"));
+        list.setConnected(list("anthropic"));
         assertTrue(list.getAll().isEmpty());
         assertEquals(1, list.getConnected().size());
     }
@@ -679,7 +679,7 @@ void shouldCreateQuestionRequest() {
         opt.setLabel("Option A");
         opt.setDescription("First option");
         opt.setPreview("preview");
-        qr.setOptions(List.of(opt));
+        qr.setOptions(list(opt));
         assertEquals("q-1", qr.getId());
         assertEquals(1, qr.getOptions().size());
         assertEquals("Option A", qr.getOptions().get(0).getLabel());
@@ -697,7 +697,7 @@ void shouldCreateSession() {
         s.setParentId(null);
         s.setCreatedAt("2025-01-01");
         s.setUpdatedAt("2025-01-02");
-        s.setMetadata(Map.of("key", "val"));
+        s.setMetadata(map("key", "val"));
         assertEquals("sess-1", s.getId());
         assertEquals("my-session", s.getTitle());
     }
@@ -759,7 +759,7 @@ void shouldCreateSymbol() {
         sym.setContainerName("io.github.easy4j.opencode");
         sym.setLocation("OpenCodeClient.java:50");
         sym.setUri("file:///project/OpenCodeClient.java");
-        sym.setRange(Map.of());
+        sym.setRange(map());
         assertEquals("OpenCodeClient", sym.getName());
         assertEquals("class", sym.getKind());
     }