From 54d7a6fb42b4fbd3f4fe909bb47d1ea94d55d65b Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Sat, 5 Nov 2016 23:04:33 +1300 Subject: [PATCH] Refactor - clean up docstore api mapping, diamond operator only --- .../docstore/api/mapping/DocMappingBuilder.java | 6 +++--- .../docstore/api/mapping/DocPropertyMapping.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/avaje/ebeanservice/docstore/api/mapping/DocMappingBuilder.java b/src/main/java/com/avaje/ebeanservice/docstore/api/mapping/DocMappingBuilder.java index 9f3ab7d23..434f7cc3f 100644 --- a/src/main/java/com/avaje/ebeanservice/docstore/api/mapping/DocMappingBuilder.java +++ b/src/main/java/com/avaje/ebeanservice/docstore/api/mapping/DocMappingBuilder.java @@ -18,9 +18,9 @@ public class DocMappingBuilder { private final DocStore docStore; - private final Stack properties = new Stack(); + private final Stack properties = new Stack<>(); - private final Map map = new LinkedHashMap(); + private final Map map = new LinkedHashMap<>(); /** * Create with the document structure paths and docStore deployment annotation. @@ -124,7 +124,7 @@ public class DocMappingBuilder { */ private static class SortableVisitor extends DocPropertyAdapter { - private Map sortableMap = new LinkedHashMap(); + private Map sortableMap = new LinkedHashMap<>(); @Override public void visitProperty(DocPropertyMapping property) { diff --git a/src/main/java/com/avaje/ebeanservice/docstore/api/mapping/DocPropertyMapping.java b/src/main/java/com/avaje/ebeanservice/docstore/api/mapping/DocPropertyMapping.java index 24681d85e..515aeb601 100644 --- a/src/main/java/com/avaje/ebeanservice/docstore/api/mapping/DocPropertyMapping.java +++ b/src/main/java/com/avaje/ebeanservice/docstore/api/mapping/DocPropertyMapping.java @@ -16,7 +16,7 @@ public class DocPropertyMapping { private DocPropertyOptions options; - private List children = new ArrayList(); + private List children = new ArrayList<>(); /** * Construct ROOT.