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<DocPropertyMapping> properties = new Stack<DocPropertyMapping>();
+  private final Stack<DocPropertyMapping> properties = new Stack<>();
 
-  private final Map<String,DocPropertyMapping> map = new LinkedHashMap<String,DocPropertyMapping>();
+  private final Map<String,DocPropertyMapping> 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<String,String> sortableMap = new LinkedHashMap<String, String>();
+    private Map<String,String> 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<DocPropertyMapping> children = new ArrayList<DocPropertyMapping>();
+  private List<DocPropertyMapping> children = new ArrayList<>();
 
   /**
    * Construct ROOT.