Switched the shortcut methods to the new query method (issue #3)

Author: JanHolger

src/main/java/org/javawebstack/abstractdata/AbstractArray.java

@@ -18,6 +18,54 @@ public AbstractArray array() {
         return this;
     }
 
+    public AbstractObject object(String key) {
+        return query(key).object();
+    }
+
+    public AbstractArray array(String key) {
+        return query(key).array();
+    }
+
+    public AbstractPrimitive primitive(String key) {
+        return query(key).primitive();
+    }
+
+    public String string(String key) {
+        return query(key).string();
+    }
+
+    public Boolean bool(String key) {
+        return query(key).bool();
+    }
+
+    public Number number(String key) {
+        return query(key).number();
+    }
+
+    public AbstractObject object(String key, AbstractObject orElse) {
+        return query(key, orElse).object();
+    }
+
+    public AbstractArray array(String key, AbstractArray orElse) {
+        return query(key, orElse).array();
+    }
+
+    public AbstractPrimitive primitive(String key, AbstractPrimitive orElse) {
+        return query(key, orElse).primitive();
+    }
+
+    public String string(String key, String orElse) {
+        return query(key, new AbstractPrimitive(orElse)).string();
+    }
+
+    public Boolean bool(String key, Boolean orElse) {
+        return query(key, new AbstractPrimitive(orElse)).bool();
+    }
+
+    public Number number(String key, Number orElse) {
+        return query(key, new AbstractPrimitive(orElse)).number();
+    }
+
     public AbstractObject object(int index) {
         return get(index).object();
     }
@@ -42,6 +90,30 @@ public Number number(int index) {
         return get(index).number();
     }
 
+    public AbstractObject object(int index, AbstractObject orElse) {
+        return get(index, orElse).object();
+    }
+
+    public AbstractArray array(int index, AbstractArray orElse) {
+        return get(index, orElse).array();
+    }
+
+    public AbstractPrimitive primitive(int index, AbstractPrimitive orElse) {
+        return get(index, orElse).primitive();
+    }
+
+    public String string(int index, String orElse) {
+        return get(index, new AbstractPrimitive(orElse)).string();
+    }
+
+    public Boolean bool(int index, Boolean orElse) {
+        return get(index, new AbstractPrimitive(orElse)).bool();
+    }
+
+    public Number number(int index, Number orElse) {
+        return get(index, new AbstractPrimitive(orElse)).number();
+    }
+
     public AbstractArray add(AbstractElement element) {
         if (element == null)
             element = AbstractNull.INSTANCE;
@@ -155,6 +227,11 @@ public AbstractElement query(String query) {
         }
     }
 
+    public AbstractElement query(String query, AbstractElement orElse) {
+        AbstractElement value = query(query);
+        return (value != null && !value.isNull()) ? value : orElse;
+    }
+
     public Stream<AbstractElement> stream() {
         return elements.stream();
     }

src/main/java/org/javawebstack/abstractdata/AbstractObject.java

@@ -82,6 +82,11 @@ public AbstractElement query(String query) {
         return null;
     }
 
+    public AbstractElement query(String query, AbstractElement orElse) {
+        AbstractElement value = query(query);
+        return (value != null && !value.isNull()) ? value : orElse;
+    }
+
     public boolean has(String key) {
         return entries.containsKey(key);
     }
@@ -101,51 +106,51 @@ public AbstractArray array() {
     }
 
     public AbstractObject object(String key) {
-        return get(key).object();
+        return query(key).object();
     }
 
     public AbstractObject object(String key, AbstractObject orElse) {
-        return get(key, orElse).object();
+        return query(key, orElse).object();
     }
 
     public AbstractArray array(String key) {
-        return get(key).array();
+        return query(key).array();
     }
 
     public AbstractArray array(String key, AbstractArray orElse) {
-        return get(key, orElse).array();
+        return query(key, orElse).array();
     }
 
     public AbstractPrimitive primitive(String key) {
-        return get(key).primitive();
+        return query(key).primitive();
     }
 
     public AbstractPrimitive primitive(String key, AbstractPrimitive orElse) {
-        return get(key, orElse).primitive();
+        return query(key, orElse).primitive();
     }
 
     public String string(String key) {
-        return get(key).string();
+        return query(key).string();
     }
 
     public String string(String key, String orElse) {
-        return get(key, new AbstractPrimitive(orElse)).string();
+        return query(key, new AbstractPrimitive(orElse)).string();
     }
 
     public Boolean bool(String key) {
-        return get(key).bool();
+        return query(key).bool();
     }
 
     public Boolean bool(String key, Boolean orElse) {
-        return get(key, new AbstractPrimitive(orElse)).bool();
+        return query(key, new AbstractPrimitive(orElse)).bool();
     }
 
     public Number number(String key) {
-        return get(key).number();
+        return query(key).number();
     }
 
     public Number number(String key, Number orElse) {
-        return get(key, new AbstractPrimitive(orElse)).number();
+        return query(key, new AbstractPrimitive(orElse)).number();
     }
 
     public JsonElement toJson() {