From ec270c713515cf08d11a5bbb11ebd05d42a8feb9 Mon Sep 17 00:00:00 2001 From: heqiang <531364804@qq.com> Date: Tue, 28 Mar 2023 00:27:29 +0800 Subject: [PATCH] Use diamond operator in examples in reference manual Closes gh-30204 --- framework-docs/src/docs/asciidoc/core/core-appendix.adoc | 2 +- .../src/docs/asciidoc/core/core-expressions.adoc | 6 +++--- framework-docs/src/docs/asciidoc/data-access.adoc | 8 ++++---- framework-docs/src/docs/asciidoc/web/webmvc.adoc | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/framework-docs/src/docs/asciidoc/core/core-appendix.adoc b/framework-docs/src/docs/asciidoc/core/core-appendix.adoc index 3ff45c4a1e..0477c35aad 100644 --- a/framework-docs/src/docs/asciidoc/core/core-appendix.adoc +++ b/framework-docs/src/docs/asciidoc/core/core-appendix.adoc @@ -1300,7 +1300,7 @@ listing shows our custom `BeanDefinitionParser` implementation: } private static void parseChildComponents(List childElements, BeanDefinitionBuilder factory) { - ManagedList children = new ManagedList(childElements.size()); + ManagedList children = new ManagedList<>(childElements.size()); for (Element element : childElements) { children.add(parseComponentElement(element)); } diff --git a/framework-docs/src/docs/asciidoc/core/core-expressions.adoc b/framework-docs/src/docs/asciidoc/core/core-expressions.adoc index fde497091f..6d22a97e00 100644 --- a/framework-docs/src/docs/asciidoc/core/core-expressions.adoc +++ b/framework-docs/src/docs/asciidoc/core/core-expressions.adoc @@ -293,7 +293,7 @@ being placed in it. The following example shows how to do so: .Java ---- class Simple { - public List booleanList = new ArrayList(); + public List booleanList = new ArrayList<>(); } Simple simple = new Simple(); @@ -1478,7 +1478,7 @@ show how to use the `#this` and `#root` variables: .Java ---- // create an array of integers - List primes = new ArrayList(); + List primes = new ArrayList<>(); primes.addAll(Arrays.asList(2,3,5,7,11,13,17)); // create parser and set variable 'primes' as the array of integers @@ -2122,7 +2122,7 @@ This section lists the classes used in the examples throughout this chapter. public static String Advisors = "advisors"; public static String President = "president"; - private List members = new ArrayList(); + private List members = new ArrayList<>(); private Map officers = new HashMap(); public List getMembers() { diff --git a/framework-docs/src/docs/asciidoc/data-access.adoc b/framework-docs/src/docs/asciidoc/data-access.adoc index 9b853f3662..25bdbc5096 100644 --- a/framework-docs/src/docs/asciidoc/data-access.adoc +++ b/framework-docs/src/docs/asciidoc/data-access.adoc @@ -4528,7 +4528,7 @@ JDBC `?` placeholders: } public int[] batchUpdate(final List actors) { - List batch = new ArrayList(); + List batch = new ArrayList<>(); for (Actor actor : actors) { Object[] values = new Object[] { actor.getFirstName(), actor.getLastName(), actor.getId()}; @@ -4692,7 +4692,7 @@ example uses only one configuration method (we show examples of multiple methods } public void add(Actor actor) { - Map parameters = new HashMap(3); + Map parameters = new HashMap<>(3); parameters.put("id", actor.getId()); parameters.put("first_name", actor.getFirstName()); parameters.put("last_name", actor.getLastName()); @@ -4750,7 +4750,7 @@ listing shows how it works: } public void add(Actor actor) { - Map parameters = new HashMap(2); + Map parameters = new HashMap<>(2); parameters.put("first_name", actor.getFirstName()); parameters.put("last_name", actor.getLastName()); Number newId = insertActor.executeAndReturnKey(parameters); @@ -4810,7 +4810,7 @@ You can limit the columns for an insert by specifying a list of column names wit } public void add(Actor actor) { - Map parameters = new HashMap(2); + Map parameters = new HashMap<>(2); parameters.put("first_name", actor.getFirstName()); parameters.put("last_name", actor.getLastName()); Number newId = insertActor.executeAndReturnKey(parameters); diff --git a/framework-docs/src/docs/asciidoc/web/webmvc.adoc b/framework-docs/src/docs/asciidoc/web/webmvc.adoc index b34994e648..fee3f1ccf0 100644 --- a/framework-docs/src/docs/asciidoc/web/webmvc.adoc +++ b/framework-docs/src/docs/asciidoc/web/webmvc.adoc @@ -743,7 +743,7 @@ or to render a JSON response, as the following example shows: @RequestMapping(path = "/error") public Map handle(HttpServletRequest request) { - Map map = new HashMap(); + Map map = new HashMap<>(); map.put("status", request.getAttribute("jakarta.servlet.error.status_code")); map.put("reason", request.getAttribute("jakarta.servlet.error.message")); return map; @@ -4393,7 +4393,7 @@ return value with `DeferredResult`, as the following example shows: @GetMapping("/quotes") @ResponseBody public DeferredResult quotes() { - DeferredResult deferredResult = new DeferredResult(); + DeferredResult deferredResult = new DeferredResult<>(); // Save the deferredResult somewhere.. return deferredResult; }