Merge remote-tracking branch 'origin/master'

Author: JanHolger

README.md

@@ -1,2 +1,18 @@
-# AbstractData
+<p align="center"><img src="https://raw.githubusercontent.com/JavaWebStack/docs/master/docs/assets/img/icon.svg" width="100">
+<br><br>
+JWS Abstract Data Representation
+</p>
+
+![GitHub Workflow Status (branch)](https://img.shields.io/github/workflow/status/JavaWebStack/AbstractData/Maven%20Deploy/master)
+![GitHub](https://img.shields.io/github/license/JavaWebStack/AbstractData)
+![Maven metadata URL](https://img.shields.io/maven-metadata/v?metadataUrl=https%3A%2F%2Frepo.javawebstack.org%2Forg%2Fjavawebstack%2FAbstractData%2Fmaven-metadata.xml)
+![GitHub contributors](https://img.shields.io/github/contributors/JavaWebStack/AbstractData)
+![Lines of code](https://img.shields.io/tokei/lines/github/JavaWebStack/AbstractData)
+![Discord](https://img.shields.io/discord/815612319378833408?color=%237289DA&label=discord)
+![Twitter Follow](https://img.shields.io/twitter/follow/JavaWebStack?style=social)
+
+## Introduction
 A library to abstractly represent structured data and convert it from and to several formats
+
+## Documentation
+You can find the current docs on our [website](https://docs.javawebstack.org/framework). This is a work-in-progress project though so it's not yet complete.

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

@@ -1,17 +1,15 @@
 package org.javawebstack.abstractdata;
 
+import com.google.gson.Gson;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Stream;
 
 public class AbstractArray implements AbstractElement, Iterable<AbstractElement> {
 
-    private final List<AbstractElement> elements = new ArrayList<>();
+    private final List<AbstractElement> elements;
 
     public boolean isArray() {
         return true;
@@ -52,6 +50,24 @@ public AbstractArray add(AbstractElement element) {
         return this;
     }
 
+    public AbstractArray(){
+        elements = new ArrayList<>();
+    }
+
+    public AbstractArray(Object[] objects){
+        this();
+        for (Object o : objects) {
+            if (o instanceof AbstractElement)
+                elements.add((AbstractElement) o);
+            else
+                elements.add(AbstractElement.fromAbstractObject(o));
+        }
+    }
+
+    public AbstractArray(Collection<Object> abstractElements){
+        this(abstractElements.toArray());
+    }
+
     public AbstractArray addNull() {
         return add(AbstractNull.INSTANCE);
     }
@@ -110,6 +126,10 @@ public AbstractArray remove(int i){
         return this;
     }
 
+    public AbstractElement[] toArray(){
+        return elements.toArray(new AbstractElement[0]);
+    }
+
     public AbstractElement get(int i){
         return elements.get(i);
     }
@@ -122,6 +142,14 @@ public int size() {
         return elements.size();
     }
 
+    public boolean contains(Object o){
+        for (AbstractElement element : elements) {
+            if (o instanceof AbstractElement ? ((AbstractElement) o).toAbstractObject().equals(element.toAbstractObject()) : element.toAbstractObject().equals(o))
+                return true;
+        }
+        return false;
+    }
+
     public AbstractArray clear() {
         elements.clear();
         return this;
@@ -149,6 +177,15 @@ public static AbstractArray fromJson(JsonArray array){
         return a;
     }
 
+
+    public static AbstractArray fromArray(Object[] objects){
+        return new AbstractArray(objects);
+    }
+
+    public static AbstractArray fromList(Collection collection){
+        return new AbstractArray(collection);
+    }
+
     public Type getType() {
         return Type.ARRAY;
     }

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

@@ -167,6 +167,10 @@ public Set<String> keys(){
         return entries.keySet();
     }
 
+    public AbstractArray values(){
+        return AbstractArray.fromList(entries.values());
+    }
+
     public AbstractElement clone() {
         AbstractObject object = new AbstractObject();
         forEach((k, v) -> object.set(k, v.clone()));