Skip to content

Commit 911c459

Browse files
authored
Use diamond operator where possible (#3458)
Fixes #3458 Auto-cherry-pick to 1.0.x Signed-off-by: Yanming Zhou <[email protected]>
1 parent 2122c65 commit 911c459

File tree

29 files changed

+61
-62
lines changed

29 files changed

+61
-62
lines changed

auto-configurations/mcp/spring-ai-autoconfigure-mcp-client/src/main/java/org/springframework/ai/mcp/client/autoconfigure/properties/McpStdioClientProperties.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,9 @@ public Map<String, Parameters> getConnections() {
7575

7676
private Map<String, ServerParameters> resourceToServerParameters() {
7777
try {
78-
Map<String, Map<String, Parameters>> stdioConnection = new ObjectMapper().readValue(
79-
this.serversConfiguration.getInputStream(),
80-
new TypeReference<Map<String, Map<String, Parameters>>>() {
81-
});
78+
Map<String, Map<String, Parameters>> stdioConnection = new ObjectMapper()
79+
.readValue(this.serversConfiguration.getInputStream(), new TypeReference<>() {
80+
});
8281

8382
Map<String, Parameters> mcpServerJsonConfig = stdioConnection.entrySet().iterator().next().getValue();
8483

auto-configurations/vector-stores/spring-ai-autoconfigure-vector-store-mongodb-atlas/src/main/java/org/springframework/ai/vectorstore/mongodb/autoconfigure/MongoDBAtlasVectorStoreAutoConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ MongoDBAtlasVectorStore vectorStore(MongoTemplate mongoTemplate, EmbeddingModel
9191

9292
@Bean
9393
public Converter<MimeType, String> mimeTypeToStringConverter() {
94-
return new Converter<MimeType, String>() {
94+
return new Converter<>() {
9595

9696
@Override
9797
public String convert(MimeType source) {
@@ -102,7 +102,7 @@ public String convert(MimeType source) {
102102

103103
@Bean
104104
public Converter<String, MimeType> stringToMimeTypeConverter() {
105-
return new Converter<String, MimeType>() {
105+
return new Converter<>() {
106106

107107
@Override
108108
public MimeType convert(String source) {

document-readers/pdf-reader/src/main/java/org/springframework/ai/reader/pdf/layout/ForkPDFLayoutTextStripper.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public class ForkPDFLayoutTextStripper extends PDFTextStripper {
5858
public ForkPDFLayoutTextStripper() throws IOException {
5959
super();
6060
this.previousTextPosition = null;
61-
this.textLineList = new ArrayList<TextLine>();
61+
this.textLineList = new ArrayList<>();
6262
}
6363

6464
/**
@@ -71,7 +71,7 @@ public void processPage(PDPage page) throws IOException {
7171
this.setCurrentPageWidth(pageRectangle.getWidth() * 1.4);
7272
super.processPage(page);
7373
this.previousTextPosition = null;
74-
this.textLineList = new ArrayList<TextLine>();
74+
this.textLineList = new ArrayList<>();
7575
}
7676
}
7777

@@ -128,7 +128,7 @@ private void writeLine(final List<TextPosition> textPositionList) {
128128
}
129129

130130
private void iterateThroughTextList(Iterator<TextPosition> textIterator) {
131-
List<TextPosition> textPositionList = new ArrayList<TextPosition>();
131+
List<TextPosition> textPositionList = new ArrayList<>();
132132

133133
while (textIterator.hasNext()) {
134134
TextPosition textPosition = (TextPosition) textIterator.next();

document-readers/pdf-reader/src/main/java/org/springframework/ai/reader/pdf/layout/PDFLayoutTextStripperByArea.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@
3939
*/
4040
public class PDFLayoutTextStripperByArea extends ForkPDFLayoutTextStripper {
4141

42-
private final List<String> regions = new ArrayList<String>();
42+
private final List<String> regions = new ArrayList<>();
4343

44-
private final Map<String, Rectangle2D> regionArea = new HashMap<String, Rectangle2D>();
44+
private final Map<String, Rectangle2D> regionArea = new HashMap<>();
4545

46-
private final Map<String, ArrayList<List<TextPosition>>> regionCharacterList = new HashMap<String, ArrayList<List<TextPosition>>>();
46+
private final Map<String, ArrayList<List<TextPosition>>> regionCharacterList = new HashMap<>();
4747

48-
private final Map<String, StringWriter> regionText = new HashMap<String, StringWriter>();
48+
private final Map<String, StringWriter> regionText = new HashMap<>();
4949

5050
/**
5151
* Constructor.
@@ -113,8 +113,8 @@ public void extractRegions(PDPage page) throws IOException {
113113
setStartPage(getCurrentPageNo());
114114
setEndPage(getCurrentPageNo());
115115
// reset the stored text for the region so this class can be reused.
116-
ArrayList<List<TextPosition>> regionCharactersByArticle = new ArrayList<List<TextPosition>>();
117-
regionCharactersByArticle.add(new ArrayList<TextPosition>());
116+
ArrayList<List<TextPosition>> regionCharactersByArticle = new ArrayList<>();
117+
regionCharactersByArticle.add(new ArrayList<>());
118118
this.regionCharacterList.put(regionName, regionCharactersByArticle);
119119
this.regionText.put(regionName, new StringWriter());
120120
}

models/spring-ai-anthropic/src/test/java/org/springframework/ai/anthropic/EventParsingTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public void readEvents() throws IOException {
4444
String json = new DefaultResourceLoader().getResource("classpath:/sample_events.json")
4545
.getContentAsString(Charset.defaultCharset());
4646

47-
List<StreamEvent> events = new ObjectMapper().readerFor(new TypeReference<List<StreamEvent>>() {
47+
List<StreamEvent> events = new ObjectMapper().readerFor(new TypeReference<>() {
4848

4949
}).readValue(json);
5050

models/spring-ai-anthropic/src/test/java/org/springframework/ai/anthropic/client/AnthropicChatClientIT.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ void listOutputConverterBean() {
110110
List<ActorsFilms> actorsFilms = ChatClient.create(this.chatModel).prompt()
111111
.user("Generate the filmography of 5 movies for Tom Hanks and Bill Murray.")
112112
.call()
113-
.entity(new ParameterizedTypeReference<List<ActorsFilms>>() {
113+
.entity(new ParameterizedTypeReference<>() {
114114
});
115115
// @formatter:on
116116

@@ -143,7 +143,7 @@ void mapOutputConverter() {
143143
.user(u -> u.text("Provide me a List of {subject}")
144144
.param("subject", "an array of numbers from 1 to 9 under they key name 'numbers'"))
145145
.call()
146-
.entity(new ParameterizedTypeReference<Map<String, Object>>() {
146+
.entity(new ParameterizedTypeReference<>() {
147147
});
148148
// @formatter:on
149149

models/spring-ai-bedrock-converse/src/test/java/org/springframework/ai/bedrock/converse/BedrockConverseChatClientIT.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ void listOutputConverterString() {
8888
.user(u -> u.text("List five {subject}")
8989
.param("subject", "ice cream flavors"))
9090
.call()
91-
.entity(new ParameterizedTypeReference<List<String>>() { });
91+
.entity(new ParameterizedTypeReference<>() { });
9292
// @formatter:on
9393

9494
logger.info(collection.toString());
@@ -102,7 +102,7 @@ void listOutputConverterBean() {
102102
List<ActorsFilms> actorsFilms = ChatClient.create(this.chatModel).prompt()
103103
.user("Generate the filmography of 5 movies for Tom Hanks and Bill Murray.")
104104
.call()
105-
.entity(new ParameterizedTypeReference<List<ActorsFilms>>() {
105+
.entity(new ParameterizedTypeReference<>() {
106106
});
107107
// @formatter:on
108108

@@ -135,7 +135,7 @@ void mapOutputConverter() {
135135
.user(u -> u.text("Provide me a List of {subject}")
136136
.param("subject", "an array of numbers from 1 to 9 under they key name 'numbers'"))
137137
.call()
138-
.entity(new ParameterizedTypeReference<Map<String, Object>>() {
138+
.entity(new ParameterizedTypeReference<>() {
139139
});
140140
// @formatter:on
141141

models/spring-ai-huggingface/src/main/java/org/springframework/ai/huggingface/HuggingfaceChatModel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ public ChatResponse call(Prompt prompt) {
101101
String generatedText = generateResponse.getGeneratedText();
102102
AllOfGenerateResponseDetails allOfGenerateResponseDetails = generateResponse.getDetails();
103103
Map<String, Object> detailsMap = this.objectMapper.convertValue(allOfGenerateResponseDetails,
104-
new TypeReference<Map<String, Object>>() {
104+
new TypeReference<>() {
105105

106106
});
107107
Generation generation = new Generation(new AssistantMessage(generatedText, detailsMap));

models/spring-ai-mistral-ai/src/test/java/org/springframework/ai/mistralai/MistralAiChatClientIT.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ void listOutputConverterBean() {
123123
List<ActorsFilms> actorsFilms = ChatClient.create(this.chatModel).prompt()
124124
.user("Generate the filmography of 5 movies for Tom Hanks and Bill Murray.")
125125
.call()
126-
.entity(new ParameterizedTypeReference<List<ActorsFilms>>() {
126+
.entity(new ParameterizedTypeReference<>() {
127127
});
128128
// @formatter:on
129129

@@ -156,7 +156,7 @@ void mapOutputConverter() {
156156
.user(u -> u.text("Provide me a List of {subject}")
157157
.param("subject", "an array of numbers from 1 to 9 under they key name 'numbers'"))
158158
.call()
159-
.entity(new ParameterizedTypeReference<Map<String, Object>>() {
159+
.entity(new ParameterizedTypeReference<>() {
160160
});
161161
// @formatter:on
162162

models/spring-ai-openai/src/test/java/org/springframework/ai/openai/chat/OpenAiChatModelTypeReferenceBeanOutputConverterIT.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class OpenAiChatModelTypeReferenceBeanOutputConverterIT extends AbstractIT {
4949
void typeRefOutputConverterRecords() {
5050

5151
BeanOutputConverter<List<ActorsFilmsRecord>> outputConverter = new BeanOutputConverter<>(
52-
new ParameterizedTypeReference<List<ActorsFilmsRecord>>() {
52+
new ParameterizedTypeReference<>() {
5353

5454
});
5555

@@ -78,7 +78,7 @@ void typeRefOutputConverterRecords() {
7878
void typeRefStreamOutputConverterRecords() {
7979

8080
BeanOutputConverter<List<ActorsFilmsRecord>> outputConverter = new BeanOutputConverter<>(
81-
new ParameterizedTypeReference<List<ActorsFilmsRecord>>() {
81+
new ParameterizedTypeReference<>() {
8282

8383
});
8484

0 commit comments

Comments
 (0)