Skip to content

Commit 060d6cd

Browse files
codeboyzhoucodeboyzhou
committed
refactor(#652): remove test usages of deprecated constructor for the Resource class
1 parent dd63728 commit 060d6cd

4 files changed

Lines changed: 98 additions & 26 deletions

File tree

‎mcp-core/src/main/java/io/modelcontextprotocol/server/McpServerFeatures.java‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,13 @@ public static Builder builder() {
334334
*
335335
* <pre>{@code
336336
* new McpServerFeatures.AsyncResourceSpecification(
337-
* new Resource("docs", "Documentation files", "text/markdown"),
337+
* Resource.builder()
338+
* .uri("docs")
339+
* .name("Documentation files")
340+
* .title("Documentation files")
341+
* .mimeType("text/markdown")
342+
* .description("Markdown documentation files")
343+
* .build(),
338344
* (exchange, request) -> Mono.fromSupplier(() -> readFile(request.getPath()))
339345
* .map(ReadResourceResult::new))
340346
* }</pre>
@@ -607,7 +613,13 @@ public static Builder builder() {
607613
*
608614
* <pre>{@code
609615
* new McpServerFeatures.SyncResourceSpecification(
610-
* new Resource("docs", "Documentation files", "text/markdown"),
616+
* Resource.builder()
617+
* .uri("docs")
618+
* .name("Documentation files")
619+
* .title("Documentation files")
620+
* .mimeType("text/markdown")
621+
* .description("Markdown documentation files")
622+
* .build(),
611623
* (exchange, request) -> {
612624
* String content = readFile(request.getPath());
613625
* return new ReadResourceResult(content);

‎mcp-core/src/test/java/io/modelcontextprotocol/server/AbstractMcpAsyncServerTests.java‎

Lines changed: 28 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -333,8 +333,13 @@ void testAddResource() {
333333
.capabilities(ServerCapabilities.builder().resources(true, false).build())
334334
.build();
335335

336-
Resource resource = new Resource(TEST_RESOURCE_URI, "Test Resource", "text/plain", "Test resource description",
337-
null);
336+
Resource resource = Resource.builder()
337+
.uri(TEST_RESOURCE_URI)
338+
.name("Test Resource")
339+
.title("Test Resource")
340+
.mimeType("text/plain")
341+
.description("Test resource description")
342+
.build();
338343
McpServerFeatures.AsyncResourceSpecification specification = new McpServerFeatures.AsyncResourceSpecification(
339344
resource, (exchange, req) -> Mono.just(new ReadResourceResult(List.of())));
340345

@@ -362,8 +367,13 @@ void testAddResourceWithoutCapability() {
362367
// Create a server without resource capabilities
363368
McpAsyncServer serverWithoutResources = prepareAsyncServerBuilder().serverInfo("test-server", "1.0.0").build();
364369

365-
Resource resource = new Resource(TEST_RESOURCE_URI, "Test Resource", "text/plain", "Test resource description",
366-
null);
370+
Resource resource = Resource.builder()
371+
.uri(TEST_RESOURCE_URI)
372+
.name("Test Resource")
373+
.title("Test Resource")
374+
.mimeType("text/plain")
375+
.description("Test resource description")
376+
.build();
367377
McpServerFeatures.AsyncResourceSpecification specification = new McpServerFeatures.AsyncResourceSpecification(
368378
resource, (exchange, req) -> Mono.just(new ReadResourceResult(List.of())));
369379

@@ -390,8 +400,13 @@ void testListResources() {
390400
.capabilities(ServerCapabilities.builder().resources(true, false).build())
391401
.build();
392402

393-
Resource resource = new Resource(TEST_RESOURCE_URI, "Test Resource", "text/plain", "Test resource description",
394-
null);
403+
Resource resource = Resource.builder()
404+
.uri(TEST_RESOURCE_URI)
405+
.name("Test Resource")
406+
.title("Test Resource")
407+
.mimeType("text/plain")
408+
.description("Test resource description")
409+
.build();
395410
McpServerFeatures.AsyncResourceSpecification specification = new McpServerFeatures.AsyncResourceSpecification(
396411
resource, (exchange, req) -> Mono.just(new ReadResourceResult(List.of())));
397412

@@ -409,8 +424,13 @@ void testRemoveResource() {
409424
.capabilities(ServerCapabilities.builder().resources(true, false).build())
410425
.build();
411426

412-
Resource resource = new Resource(TEST_RESOURCE_URI, "Test Resource", "text/plain", "Test resource description",
413-
null);
427+
Resource resource = Resource.builder()
428+
.uri(TEST_RESOURCE_URI)
429+
.name("Test Resource")
430+
.title("Test Resource")
431+
.mimeType("text/plain")
432+
.description("Test resource description")
433+
.build();
414434
McpServerFeatures.AsyncResourceSpecification specification = new McpServerFeatures.AsyncResourceSpecification(
415435
resource, (exchange, req) -> Mono.just(new ReadResourceResult(List.of())));
416436

‎mcp-test/src/main/java/io/modelcontextprotocol/server/AbstractMcpAsyncServerTests.java‎

Lines changed: 28 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -337,8 +337,13 @@ void testAddResource() {
337337
.capabilities(ServerCapabilities.builder().resources(true, false).build())
338338
.build();
339339

340-
Resource resource = new Resource(TEST_RESOURCE_URI, "Test Resource", "text/plain", "Test resource description",
341-
null);
340+
Resource resource = Resource.builder()
341+
.uri(TEST_RESOURCE_URI)
342+
.name("Test Resource")
343+
.title("Test Resource")
344+
.mimeType("text/plain")
345+
.description("Test resource description")
346+
.build();
342347
McpServerFeatures.AsyncResourceSpecification specification = new McpServerFeatures.AsyncResourceSpecification(
343348
resource, (exchange, req) -> Mono.just(new ReadResourceResult(List.of())));
344349

@@ -366,8 +371,13 @@ void testAddResourceWithoutCapability() {
366371
// Create a server without resource capabilities
367372
McpAsyncServer serverWithoutResources = prepareAsyncServerBuilder().serverInfo("test-server", "1.0.0").build();
368373

369-
Resource resource = new Resource(TEST_RESOURCE_URI, "Test Resource", "text/plain", "Test resource description",
370-
null);
374+
Resource resource = Resource.builder()
375+
.uri(TEST_RESOURCE_URI)
376+
.name("Test Resource")
377+
.title("Test Resource")
378+
.mimeType("text/plain")
379+
.description("Test resource description")
380+
.build();
371381
McpServerFeatures.AsyncResourceSpecification specification = new McpServerFeatures.AsyncResourceSpecification(
372382
resource, (exchange, req) -> Mono.just(new ReadResourceResult(List.of())));
373383

@@ -394,8 +404,13 @@ void testListResources() {
394404
.capabilities(ServerCapabilities.builder().resources(true, false).build())
395405
.build();
396406

397-
Resource resource = new Resource(TEST_RESOURCE_URI, "Test Resource", "text/plain", "Test resource description",
398-
null);
407+
Resource resource = Resource.builder()
408+
.uri(TEST_RESOURCE_URI)
409+
.name("Test Resource")
410+
.title("Test Resource")
411+
.mimeType("text/plain")
412+
.description("Test resource description")
413+
.build();
399414
McpServerFeatures.AsyncResourceSpecification specification = new McpServerFeatures.AsyncResourceSpecification(
400415
resource, (exchange, req) -> Mono.just(new ReadResourceResult(List.of())));
401416

@@ -413,8 +428,13 @@ void testRemoveResource() {
413428
.capabilities(ServerCapabilities.builder().resources(true, false).build())
414429
.build();
415430

416-
Resource resource = new Resource(TEST_RESOURCE_URI, "Test Resource", "text/plain", "Test resource description",
417-
null);
431+
Resource resource = Resource.builder()
432+
.uri(TEST_RESOURCE_URI)
433+
.name("Test Resource")
434+
.title("Test Resource")
435+
.mimeType("text/plain")
436+
.description("Test resource description")
437+
.build();
418438
McpServerFeatures.AsyncResourceSpecification specification = new McpServerFeatures.AsyncResourceSpecification(
419439
resource, (exchange, req) -> Mono.just(new ReadResourceResult(List.of())));
420440

‎mcp-test/src/main/java/io/modelcontextprotocol/server/AbstractMcpSyncServerTests.java‎

Lines changed: 28 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -318,8 +318,13 @@ void testAddResource() {
318318
.capabilities(ServerCapabilities.builder().resources(true, false).build())
319319
.build();
320320

321-
Resource resource = new Resource(TEST_RESOURCE_URI, "Test Resource", "text/plain", "Test resource description",
322-
null);
321+
Resource resource = Resource.builder()
322+
.uri(TEST_RESOURCE_URI)
323+
.name("Test Resource")
324+
.title("Test Resource")
325+
.mimeType("text/plain")
326+
.description("Test resource description")
327+
.build();
323328
McpServerFeatures.SyncResourceSpecification specification = new McpServerFeatures.SyncResourceSpecification(
324329
resource, (exchange, req) -> new ReadResourceResult(List.of()));
325330

@@ -345,8 +350,13 @@ void testAddResourceWithNullSpecification() {
345350
void testAddResourceWithoutCapability() {
346351
var serverWithoutResources = prepareSyncServerBuilder().serverInfo("test-server", "1.0.0").build();
347352

348-
Resource resource = new Resource(TEST_RESOURCE_URI, "Test Resource", "text/plain", "Test resource description",
349-
null);
353+
Resource resource = Resource.builder()
354+
.uri(TEST_RESOURCE_URI)
355+
.name("Test Resource")
356+
.title("Test Resource")
357+
.mimeType("text/plain")
358+
.description("Test resource description")
359+
.build();
350360
McpServerFeatures.SyncResourceSpecification specification = new McpServerFeatures.SyncResourceSpecification(
351361
resource, (exchange, req) -> new ReadResourceResult(List.of()));
352362

@@ -370,8 +380,13 @@ void testListResources() {
370380
.capabilities(ServerCapabilities.builder().resources(true, false).build())
371381
.build();
372382

373-
Resource resource = new Resource(TEST_RESOURCE_URI, "Test Resource", "text/plain", "Test resource description",
374-
null);
383+
Resource resource = Resource.builder()
384+
.uri(TEST_RESOURCE_URI)
385+
.name("Test Resource")
386+
.title("Test Resource")
387+
.mimeType("text/plain")
388+
.description("Test resource description")
389+
.build();
375390
McpServerFeatures.SyncResourceSpecification specification = new McpServerFeatures.SyncResourceSpecification(
376391
resource, (exchange, req) -> new ReadResourceResult(List.of()));
377392

@@ -390,8 +405,13 @@ void testRemoveResource() {
390405
.capabilities(ServerCapabilities.builder().resources(true, false).build())
391406
.build();
392407

393-
Resource resource = new Resource(TEST_RESOURCE_URI, "Test Resource", "text/plain", "Test resource description",
394-
null);
408+
Resource resource = Resource.builder()
409+
.uri(TEST_RESOURCE_URI)
410+
.name("Test Resource")
411+
.title("Test Resource")
412+
.mimeType("text/plain")
413+
.description("Test resource description")
414+
.build();
395415
McpServerFeatures.SyncResourceSpecification specification = new McpServerFeatures.SyncResourceSpecification(
396416
resource, (exchange, req) -> new ReadResourceResult(List.of()));
397417

0 commit comments

Comments
 (0)