Merge branch 'master' into binding

jsonx-org · Sep 29, 2023 · 03d7cce · 03d7cce
2 parents 61351a9 + f41b70e
commit 03d7cce
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/binding/src/test/java/org/jsonx/LibraryTest.java b/binding/src/test/java/org/jsonx/LibraryTest.java
@@ -100,7 +100,7 @@ public void testAddress() throws DecodeException, IOException {
 
   @Test
   public void testStaff() throws DecodeException, IOException {
-    final List<Employee> staff = new ArrayList<>();
+    final ArrayList<Employee> staff = new ArrayList<>();
     for (int i = 0; i < 12; ++i) // [N]
       staff.add(createEmployee());
 
@@ -167,7 +167,7 @@ public void testLibrary() throws DecodeException, IOException {
     final Library library = new Library();
     library.setAddress(Optional.of(createAddress()));
     library.setHandicap(true);
-    final List<List<String>> schedule = new ArrayList<>();
+    final ArrayList<List<String>> schedule = new ArrayList<>();
     for (final String[] slot : new String[][] {{"07:00", "17:00"}, {"08:00", "18:00"}, {"09:00", "19:00"},
       {"10:00", "20:00"}, {"11:00", "21:00"}, {"12:00", "22:00"}, {"13:00", "23:00"}})
       schedule.add(Arrays.asList(slot));

diff --git a/generator/src/main/java/org/jsonx/ArrayModel.java b/generator/src/main/java/org/jsonx/ArrayModel.java
@@ -593,7 +593,7 @@ private static int writeElementAnnotations(final List<? super AnnotationType> an
     if (reference instanceof ArrayModel) {
       final ArrayModel arrayModel = (ArrayModel)reference;
       int offset = 1;
-      final List<AnnotationType> inner = new ArrayList<>();
+      final ArrayList<AnnotationType> inner = new ArrayList<>();
       if (arrayModel.classType() == null) {
         final ArrayList<Member> members = arrayModel.members;
         final int size = members.size();

diff --git a/sample/bank/src/main/java/org/jsonx/sample/bank/BankSample.java b/sample/bank/src/main/java/org/jsonx/sample/bank/BankSample.java
@@ -17,7 +17,6 @@
 package org.jsonx.sample.bank;
 
 import java.util.ArrayList;
-import java.util.List;
 
 import org.jsonx.JxEncoder;
 
@@ -28,8 +27,8 @@ public static void main(final String[] args) {
     }
   }
 
-  private static List<Message> createMessages() {
-    final List<Message> messages = new ArrayList<>();
+  private static ArrayList<Message> createMessages() {
+    final ArrayList<Message> messages = new ArrayList<>();
 
     final Swift swift = new Swift();
     swift.setType("swift");