Merge branch '2.18'

FasterXML · Jun 18, 2024 · 43c0490 · 43c0490
2 parents 2559926 + 9d8747e
commit 43c0490
Showing 1 changed file with 14 additions and 16 deletions.
diff --git a/json/src/test/java/tools/jackson/jaxrs/json/dw/SimpleEndpointTestBase.java b/json/src/test/java/tools/jackson/jaxrs/json/dw/SimpleEndpointTestBase.java
@@ -79,24 +79,22 @@ public ExtendedPoint(int x, int y, int z) {
         }
     }
 
-	protected static abstract class Page<E> {
+    protected static abstract class Page<E> {
 
-		public static final String PREV_PAGE_REL = "prev";
-		public static final String NEXT_PAGE_REL = "next";
+        public static final String PREV_PAGE_REL = "prev";
+        public static final String NEXT_PAGE_REL = "next";
 
-		public final Link getPreviousPageLink() {
-			return getLink(PREV_PAGE_REL);
-		}
-
-		public final Link getNextPageLink() {
-			return getLink(NEXT_PAGE_REL);
-		}
-
-		public abstract List<E> getEntities();
+        public final Link getPreviousPageLink() {
+            return getLink(PREV_PAGE_REL);
+        }
 
-		public abstract Link getLink(String rel);
+        public final Link getNextPageLink() {
+            return getLink(NEXT_PAGE_REL);
+        }
 
-	}
+        public abstract List<E> getEntities();
+        public abstract Link getLink(String rel);
+    }
 
     @JsonPropertyOrder({ "entities", "links" })
     @JsonAutoDetect(fieldVisibility = Visibility.ANY, creatorVisibility = Visibility.ANY, getterVisibility = Visibility.NONE, isGetterVisibility = Visibility.NONE, setterVisibility = Visibility.NONE)
@@ -142,11 +140,11 @@ public Link deserialize(JsonParser p, DeserializationContext deserializationCont
 	    }
 	}
 
-	private final List<E> entities;
+	private List<E> entities;
 
 	@JsonSerialize(contentUsing = JsonLinkSerializer.class)
 	@JsonDeserialize(contentUsing = JsonLinkDeserializer.class)
-	private final List<Link> links;
+	private List<Link> links;
 
 	protected PageImpl() {
 	    this.entities = new ArrayList<>();