style: Use imports for qualified names in multiple files#953
Open
Aias00 wants to merge 2 commits intoagentscope-ai:mainfrom
Open
style: Use imports for qualified names in multiple files#953Aias00 wants to merge 2 commits intoagentscope-ai:mainfrom
Aias00 wants to merge 2 commits intoagentscope-ai:mainfrom
Conversation
Signed-off-by: liuhy <liuhongyu@apache.org>
Contributor
There was a problem hiding this comment.
Pull request overview
This PR primarily standardizes code style across the repository by replacing fully-qualified class names with explicit imports (tests and production code), improving readability and consistency.
Changes:
- Replaced many
java.*,reactor.*,org.mockito.*, and library fully-qualified references with imports. - Updated Quarkus/Spring/Mockito/Reactor-related tests to use imported types (e.g.,
Map,Properties,Retry,TimeUnit, etc.). - Refactored
NacosA2aRegistry.registerAgent(...)to delegate to a helper (but the helper is currently missing, causing a build break).
Reviewed changes
Copilot reviewed 108 out of 108 changed files in this pull request and generated 4 comments.
Show a summary per file
| File | Description |
|---|---|
| agentscope-extensions/agentscope-spring-boot-starters/agentscope-nacos-spring-boot-starter/src/test/java/io/agentscope/spring/boot/nacos/AgentscopeNacosPromptAutoConfigurationTest.java | Replace qualified Properties/AtomicReference usage with imports in tests. |
| agentscope-extensions/agentscope-spring-boot-starters/agentscope-a2a-spring-boot-starter/src/test/java/io/agentscope/spring/boot/a2a/controller/A2aJsonRpcControllerTest.java | Use imported Map types instead of qualified names in captors and assertions. |
| agentscope-extensions/agentscope-quarkus-extensions/agentscope-quarkus-extension/src/test/java/io/agentscope/quarkus/runtime/AgentScopeRecorderTest.java | Use imported @Recorder annotation in reflection check. |
| agentscope-extensions/agentscope-quarkus-extensions/agentscope-quarkus-extension-deployment/src/test/java/io/agentscope/quarkus/deployment/AgentScopeProcessorTest.java | Replace qualified Quarkus types/annotations with imports; simplify reflection checks. |
| agentscope-extensions/agentscope-quarkus-extensions/agentscope-quarkus-extension-deployment/src/test/java/io/agentscope/quarkus/deployment/AgentScopeProcessorSimpleTest.java | Use imported BuildProducer type in reflection lookup. |
| agentscope-extensions/agentscope-quarkus-extensions/agentscope-quarkus-extension-deployment/src/main/java/io/agentscope/quarkus/deployment/AgentScopeProcessor.java | Replace qualified model/runtime references with imports in Quarkus build steps. |
| agentscope-extensions/agentscope-extensions-training/src/test/java/io/agentscope/core/training/util/TrainingTestUtils.java | Replace qualified Mockito matchers with ArgumentMatchers import. |
| agentscope-extensions/agentscope-extensions-training/src/test/java/io/agentscope/core/training/runner/RunRegistryTest.java | Replace qualified Collections.synchronizedSet with imported Collections. |
| agentscope-extensions/agentscope-extensions-training/src/main/java/io/agentscope/core/training/strategy/TrainingContext.java | Import Function/Arrays to avoid qualified references in public API. |
| agentscope-extensions/agentscope-extensions-training/src/main/java/io/agentscope/core/training/runner/TrainingRunner.java | Import TrainingSelectionStrategy to avoid qualified type in builder API. |
| agentscope-extensions/agentscope-extensions-studio/src/test/java/io/agentscope/core/studio/StudioWebSocketClientTest.java | Replace many qualified types (Reactor/JSON/Socket/Mockito) with imports. |
| agentscope-extensions/agentscope-extensions-studio/src/test/java/io/agentscope/core/studio/StudioUserAgentTest.java | Replace qualified Msg/TextBlock/Reactor/Mockito/IO types with imports. |
| agentscope-extensions/agentscope-extensions-studio/src/test/java/io/agentscope/core/studio/StudioClientTest.java | Use imported Map for schema creation. |
| agentscope-extensions/agentscope-extensions-studio/src/main/java/io/agentscope/core/tracing/telemetry/TelemetryTracer.java | Use imported HashMap when copying headers. |
| agentscope-extensions/agentscope-extensions-skill-git-repository/src/main/java/io/agentscope/core/skill/repository/GitSkillRepository.java | Use imported TransportException in catch clause. |
| agentscope-extensions/agentscope-extensions-scheduler/agentscope-extensions-scheduler-quartz/src/test/java/io/agentscope/extensions/scheduler/quartz/QuartzFixedDelayIntegrationTest.java | Replace qualified Msg type with import in test model stub. |
| agentscope-extensions/agentscope-extensions-scheduler/agentscope-extensions-scheduler-quartz/src/test/java/io/agentscope/extensions/scheduler/quartz/QuartzAgentSchedulerTest.java | Import Quartz builders to avoid fully qualified builder calls. |
| agentscope-extensions/agentscope-extensions-scheduler/agentscope-extensions-scheduler-quartz/src/main/java/io/agentscope/extensions/scheduler/quartz/QuartzAgentScheduler.java | Import CronTrigger/SimpleTrigger/Scheduler for instanceof + builder API. |
| agentscope-extensions/agentscope-extensions-scheduler/agentscope-extensions-scheduler-quartz/src/main/java/io/agentscope/extensions/scheduler/quartz/AgentQuartzJob.java | Use imported Msg generic parameter. |
| agentscope-extensions/agentscope-extensions-reme/src/test/java/io/agentscope/core/memory/reme/ReMeLongTermMemoryTest.java | Import RecordedRequest for request capture assertions. |
| agentscope-extensions/agentscope-extensions-reme/src/test/java/io/agentscope/core/memory/reme/ReMeClientTest.java | Import TimeUnit for MockWebServer delay configuration. |
| agentscope-extensions/agentscope-extensions-rag-simple/src/test/java/io/agentscope/core/rag/store/QdrantStoreTest.java | Import JsonWithInt to shorten ListValue builder usage. |
| agentscope-extensions/agentscope-extensions-rag-simple/src/test/java/io/agentscope/core/rag/store/InMemoryStoreTest.java | Import ArrayList for test data setup. |
| agentscope-extensions/agentscope-extensions-rag-simple/src/test/java/io/agentscope/core/rag/reader/ExternalApiReaderTest.java | Import Files/Path for temp-file test setup. |
| agentscope-extensions/agentscope-extensions-rag-simple/src/test/java/io/agentscope/core/rag/knowledge/SimpleKnowledgeTest.java | Import ContentBlock/TextBlock to avoid qualified casts and signatures. |
| agentscope-extensions/agentscope-extensions-rag-simple/src/test/java/io/agentscope/core/rag/hook/GenericRAGHookTest.java | Import ContentBlock for embed signature. |
| agentscope-extensions/agentscope-extensions-rag-simple/src/test/java/io/agentscope/core/embedding/openai/OpenAITextEmbeddingEmbedTest.java | Import OpenAI client classes to shorten static mocking setup. |
| agentscope-extensions/agentscope-extensions-rag-simple/src/test/java/io/agentscope/core/embedding/EmbeddingUtilsTest.java | Import Retry for Reactor retry configuration. |
| agentscope-extensions/agentscope-extensions-rag-simple/src/main/java/io/agentscope/core/rag/store/QdrantStore.java | Import TextBlock and JsonWithInt for fallback parsing and list conversion. |
| agentscope-extensions/agentscope-extensions-rag-haystack/src/test/java/io/agentscope/core/rag/integration/haystack/HayStackDocumentConverterTest.java | Import HashMap to avoid qualified instantiation. |
| agentscope-extensions/agentscope-extensions-nacos/agentscope-extensions-nacos-a2a/src/main/java/io/agentscope/core/nacos/a2a/registry/NacosA2aRegistry.java | Replace qualified AgentCard usage and delegate registration logic to helper (currently missing). |
| agentscope-extensions/agentscope-extensions-mem0/src/test/java/io/agentscope/core/memory/mem0/Mem0ClientTest.java | Import TimeUnit for MockWebServer delay. |
| agentscope-extensions/agentscope-extensions-mem0/src/main/java/io/agentscope/core/memory/mem0/Mem0LongTermMemory.java | Import Duration for builder timeout. |
| agentscope-extensions/agentscope-extensions-higress/src/test/java/io/agentscope/extensions/higress/HigressToolSearchResultTest.java | Import ArrayList for test list construction. |
| agentscope-extensions/agentscope-extensions-higress/src/test/java/io/agentscope/extensions/higress/HigressMcpClientWrapperTest.java | Import Mockito for static calls. |
| agentscope-extensions/agentscope-extensions-chat-completions-web/src/test/java/io/agentscope/core/chat/completions/model/ChatCompletionsRequestTest.java | Remove qualified references within same-package types. |
| agentscope-extensions/agentscope-extensions-chat-completions-web/src/test/java/io/agentscope/core/chat/completions/model/ChatChoiceTest.java | Import List for tool call list creation. |
| agentscope-extensions/agentscope-extensions-chat-completions-web/src/main/java/io/agentscope/core/chat/completions/streaming/ChatCompletionsStreamingAdapter.java | Import AtomicBoolean for incremental reasoning tracking. |
| agentscope-extensions/agentscope-extensions-autocontext-memory/src/test/java/io/agentscope/core/memory/autocontext/AutoContextMemoryTest.java | Import reflection types and HashMap for test setup. |
| agentscope-extensions/agentscope-extensions-autocontext-memory/src/test/java/io/agentscope/core/memory/autocontext/AutoContextHookTest.java | Import HashMap for tool input creation. |
| agentscope-extensions/agentscope-extensions-a2a/agentscope-extensions-a2a-client/src/test/java/io/agentscope/core/a2a/agent/card/WellKnownAgentCardResolverTest.java | Import Field for reflection helper. |
| agentscope-extensions/agentscope-extensions-a2a/agentscope-extensions-a2a-client/src/test/java/io/agentscope/core/a2a/agent/A2aAgentTest.java | Import HashMap for mocked config. |
| agentscope-extensions/agentscope-extensions-a2a/agentscope-extensions-a2a-client/src/test/java/io/agentscope/core/a2a/agent/A2aAgentBuilderTest.java | Import Field/HashMap for reflection and config stubbing. |
| agentscope-examples/werewolf-hitl/src/main/java/io/agentscope/examples/werewolf/web/GameEventEmitter.java | Replace qualified List/Map with imports (console output remains non-English). |
| agentscope-examples/model-request-compression/src/main/java/io/agentscope/examples/compression/extra/CompressionUtils.java | Replace qualified Brotli/Zstd references with imports. |
| agentscope-examples/boba-tea-shop/business-mcp-server/src/main/java/io/agentscope/examples/bobatea/business/mapper/FeedbackMapper.java | Import LocalDateTime for mapper signature. |
| agentscope-examples/advanced/src/main/java/io/agentscope/examples/advanced/hitl/ObservationHook.java | Import Consumer and simplify method signature types. |
| agentscope-core/src/test/java/io/agentscope/core/tool/test/SampleTools.java | Import Duration for delayed Mono. |
| agentscope-core/src/test/java/io/agentscope/core/tool/multimodal/DashScopeMultiModalToolTest.java | Import Method for reflection access. |
| agentscope-core/src/test/java/io/agentscope/core/tool/mcp/McpContentConverterTest.java | Import InvocationTargetException for assertion. |
| agentscope-core/src/test/java/io/agentscope/core/tool/mcp/McpClientBuilderTest.java | Import reflection + HttpClient nested enums for customization tests. |
| agentscope-core/src/test/java/io/agentscope/core/tool/ToolkitTest.java | Import Type for converter signature. |
| agentscope-core/src/test/java/io/agentscope/core/tool/ToolMethodInvokerTest.java | Import CompletableFuture/Mono to avoid qualified return types. |
| agentscope-core/src/test/java/io/agentscope/core/tool/ToolGroupTest.java | Import HashSet for defensive copy tests. |
| agentscope-core/src/test/java/io/agentscope/core/tool/McpClientManagerTest.java | Import ArrayList to shorten schema construction. |
| agentscope-core/src/test/java/io/agentscope/core/skill/util/MarkdownSkillParserTest.java | Import HashMap for metadata map construction. |
| agentscope-core/src/test/java/io/agentscope/core/skill/repository/ClasspathSkillRepositoryTest.java | Import CRC32 for jar entry CRC calculation. |
| agentscope-core/src/test/java/io/agentscope/core/skill/SkillHookTest.java | Import Comparator and simplify Map.of usage. |
| agentscope-core/src/test/java/io/agentscope/core/session/SessionManagerTest.java | Import core message types used in persistence test. |
| agentscope-core/src/test/java/io/agentscope/core/rag/ReActAgentRAGConfigTest.java | Import ToolSchema/GenerateOptions for test model stub signature. |
| agentscope-core/src/test/java/io/agentscope/core/model/tts/DashScopeRealtimeTTSModelTest.java | Import TimeUnit for wait tests. |
| agentscope-core/src/test/java/io/agentscope/core/model/transport/websocket/OkHttpWebSocketTransportTest.java | Import Proxy and use Proxy.Type directly. |
| agentscope-core/src/test/java/io/agentscope/core/model/transport/websocket/JdkWebSocketTransportTest.java | Import InetSocketAddress for assertions. |
| agentscope-core/src/test/java/io/agentscope/core/model/transport/websocket/JdkWebSocketConnectionTest.java | Import ArgumentMatchers for sendBinary mocking. |
| agentscope-core/src/test/java/io/agentscope/core/model/OpenAIClientTest.java | Import concurrency types for concurrent request test. |
| agentscope-core/src/test/java/io/agentscope/core/model/OpenAIChatModelTest.java | Simplify cast to TextBlock using imports. |
| agentscope-core/src/test/java/io/agentscope/core/model/OllamaChatModelTest.java | Import ContentBlock for streaming output processing. |
| agentscope-core/src/test/java/io/agentscope/core/model/GLMApiDebugTest.java | Import ToolUseBlock and simplify tool choice construction. |
| agentscope-core/src/test/java/io/agentscope/core/model/DashScopeHttpClientTest.java | Import crypto/key types for encryption-related tests. |
| agentscope-core/src/test/java/io/agentscope/core/memory/LongTermMemoryToolsTest.java | Import MsgRole/Arrays and simplify role assertions. |
| agentscope-core/src/test/java/io/agentscope/core/memory/InMemoryMemoryNewApiTest.java | Import JsonSession in integration tests. |
| agentscope-core/src/test/java/io/agentscope/core/hook/TTSHookTest.java | Use imported List.of for event construction. |
| agentscope-core/src/test/java/io/agentscope/core/hook/HookStopAgentTest.java | Import Tool annotation to avoid qualified annotation usage. |
| agentscope-core/src/test/java/io/agentscope/core/formatter/openai/OpenAIResponseParserTest.java | Use imported OpenAI DTO types in tests. |
| agentscope-core/src/test/java/io/agentscope/core/formatter/openai/OpenAIConversationMergerTest.java | Import message/content types and reflection Field for test construction. |
| agentscope-core/src/test/java/io/agentscope/core/formatter/openai/OpenAIChatFormatterTest.java | Import OpenAI DTO types and simplify casts. |
| agentscope-core/src/test/java/io/agentscope/core/formatter/openai/DeepSeekFormatterTest.java | Import OpenAIFunction for tool-call preservation test. |
| agentscope-core/src/test/java/io/agentscope/core/formatter/ollama/OllamaMultiAgentFormatterTest.java | Replace qualified List.of usage with import. |
| agentscope-core/src/test/java/io/agentscope/core/formatter/gemini/GeminiMessageConverterTest.java | Import Base64 for encoded payload tests. |
| agentscope-core/src/test/java/io/agentscope/core/formatter/gemini/GeminiChatFormatterGroundTruthTest.java | Import LinkedHashMap for deterministic map ordering in ground-truth output. |
| agentscope-core/src/test/java/io/agentscope/core/formatter/anthropic/AnthropicResponseParserTest.java | Clean up imports and use shared mock helpers + assertInstanceOf. |
| agentscope-core/src/test/java/io/agentscope/core/formatter/anthropic/AnthropicMediaConverterTest.java | Import Source for custom-source test class. |
| agentscope-core/src/test/java/io/agentscope/core/formatter/anthropic/AnthropicChatFormatterTest.java | Import ContentBlock/Map and use shared mock helpers. |
| agentscope-core/src/test/java/io/agentscope/core/formatter/MediaUtilsTest.java | Import Base64 for decode validation. |
| agentscope-core/src/test/java/io/agentscope/core/e2e/providers/ModelProvider.java | Import HashSet for capability derivation. |
| agentscope-core/src/test/java/io/agentscope/core/e2e/PipelineE2ETest.java | Import ModelCapability to remove qualified enum reference. |
| agentscope-core/src/test/java/io/agentscope/core/e2e/ExecutionConfigE2ETest.java | Import Set for slow-model list constant. |
| agentscope-core/src/test/java/io/agentscope/core/agent/test/MockModel.java | Import Map and simplify list/map creations in mock responses. |
| agentscope-core/src/test/java/io/agentscope/core/agent/ReActAgentTimeoutTest.java | Import AtomicBoolean for model stub state. |
| agentscope-core/src/test/java/io/agentscope/core/agent/ReActAgentTest.java | Import hook/reactor/concurrency types for streaming hook tests. |
| agentscope-core/src/main/java/io/agentscope/core/tool/multimodal/DashScopeMultiModalTool.java | Import JDK HTTP client + JsonUtils + HashMap to shorten request construction. |
| agentscope-core/src/main/java/io/agentscope/core/plan/PlanNotebook.java | Import HashMap for map construction helpers. |
| agentscope-core/src/main/java/io/agentscope/core/model/tts/DashScopeTTSModel.java | Import URL/InputStream for audio download helper. |
| agentscope-core/src/main/java/io/agentscope/core/model/tts/AudioPlayer.java | Import TimeUnit for queue polling. |
| agentscope-core/src/main/java/io/agentscope/core/model/transport/websocket/JdkWebSocketTransport.java | Import Authenticator for proxy auth setup. |
| agentscope-core/src/main/java/io/agentscope/core/model/transport/OkHttpTransport.java | Import SSLSocketFactory for trust-all socket factory return type. |
| agentscope-core/src/main/java/io/agentscope/core/model/transport/JdkHttpTransport.java | Adjust imports; now uses fully-qualified BodyHandlers in execute/stream. |
| agentscope-core/src/main/java/io/agentscope/core/model/OpenAIClient.java | Import HttpTransportFactory and use it in default constructor. |
| agentscope-core/src/main/java/io/agentscope/core/model/ModelUtils.java | Import LoggerFactory for logger initialization. |
| agentscope-core/src/main/java/io/agentscope/core/model/GenerateOptions.java | Import BiConsumer for map merge helper signature. |
| agentscope-core/src/main/java/io/agentscope/core/model/DashScopeHttpClient.java | Import Base64/SecretKey and simplify encryption context types. |
| agentscope-core/src/main/java/io/agentscope/core/hook/TTSHook.java | Import Flux for audio stream getter signature. |
| agentscope-core/src/main/java/io/agentscope/core/formatter/openai/dto/OpenAIRequest.java | Use imported List in modalities accessors/builders. |
| agentscope-core/src/main/java/io/agentscope/core/formatter/ollama/OllamaMultiAgentFormatter.java | Import Collections/Matcher for image promotion parsing. |
| agentscope-core/src/main/java/io/agentscope/core/formatter/ollama/OllamaChatFormatter.java | Import URLSource for promoted-image source extraction. |
| agentscope-core/src/main/java/io/agentscope/core/formatter/gemini/GeminiChatFormatter.java | Import Function/Consumer for option application helpers. |
| agentscope-core/src/main/java/io/agentscope/core/formatter/anthropic/AnthropicToolsHelper.java | Add static imports for Anthropic ToolChoice factories and import Function. |
| agentscope-core/src/main/java/io/agentscope/core/formatter/anthropic/AnthropicResponseParser.java | Use var in loop to avoid qualified ContentBlock reference. |
Comment on lines
179
to
182
| try { | ||
| var response = client.send(jdkRequest, BodyHandlers.ofString()); | ||
| var response = | ||
| client.send(jdkRequest, java.net.http.HttpResponse.BodyHandlers.ofString()); | ||
| return buildHttpResponse(response); |
Comment on lines
201
to
204
| CompletableFuture<java.net.http.HttpResponse<InputStream>> future = | ||
| client.sendAsync(jdkRequest, BodyHandlers.ofInputStream()) | ||
| client.sendAsync( | ||
| jdkRequest, java.net.http.HttpResponse.BodyHandlers.ofInputStream()) | ||
| .thenApply( |
Comment on lines
163
to
+167
| System.out.println("\n════════════════════════════════"); | ||
| System.out.println("游戏初始化 - 玩家分配:"); | ||
| if (allPlayers instanceof java.util.List<?> list) { | ||
| if (allPlayers instanceof List<?> list) { | ||
| for (Object player : list) { | ||
| if (player instanceof java.util.Map<?, ?> map) { | ||
| if (player instanceof Map<?, ?> map) { |
Comment on lines
+66
to
+69
| NacosAgentRegistrationHelper.tryReleaseAgentCard( | ||
| a2aService, nacosAgentCard, a2aProperties); | ||
| NacosAgentRegistrationHelper.registerEndpoint( | ||
| a2aService, nacosAgentCard, a2aProperties); |
Codecov Report❌ Patch coverage is 📢 Thoughts on this report? Let us know! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
AgentScope-Java Version
[The version of AgentScope-Java you are working on, e.g. 1.0.9, check your pom.xml dependency version or run
mvn dependency:tree | grep agentscope-parent:pom(only mac/linux)]Description
[Please describe the background, purpose, changes made, and how to test this PR]
Checklist
Please check the following items before code is ready to be reviewed.
mvn spotless:applymvn test)