Skip to content

Commit 1d927d8

Browse files
JanHolgerJanHolger
committed
Refactored Graph to AbstractData
1 parent bf526d6 commit 1d927d8

File tree

13 files changed

+250
-123
lines changed

13 files changed

+250
-123
lines changed

‎pom.xml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66

77
<groupId>org.javawebstack</groupId>
8-
<artifactId>Graph</artifactId>
8+
<artifactId>AbstractData</artifactId>
99
<version>1.0-SNAPSHOT</version>
1010

1111
<dependencies>
@@ -14,11 +14,6 @@
1414
<artifactId>gson</artifactId>
1515
<version>2.8.6</version>
1616
</dependency>
17-
<dependency>
18-
<groupId>org.javawebstack</groupId>
19-
<artifactId>QueryString</artifactId>
20-
<version>1.0-SNAPSHOT</version>
21-
</dependency>
2217
<dependency>
2318
<groupId>org.yaml</groupId>
2419
<artifactId>snakeyaml</artifactId>

src/main/java/org/javawebstack/graph/GraphArray.java renamed to src/main/java/org/javawebstack/abstractdata/AbstractArray.java

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.javawebstack.graph;
1+
package org.javawebstack.abstractdata;
22

33
import com.google.gson.JsonArray;
44
import com.google.gson.JsonElement;
@@ -9,98 +9,98 @@
99
import java.util.Map;
1010
import java.util.stream.Stream;
1111

12-
public class GraphArray implements GraphElement, Iterable<GraphElement> {
12+
public class AbstractArray implements AbstractElement, Iterable<AbstractElement> {
1313

14-
private final List<GraphElement> elements = new ArrayList<>();
14+
private final List<AbstractElement> elements = new ArrayList<>();
1515

1616
public boolean isArray() {
1717
return true;
1818
}
1919

20-
public GraphArray array() {
20+
public AbstractArray array() {
2121
return this;
2222
}
2323

24-
public GraphArray add(GraphElement element) {
24+
public AbstractArray add(AbstractElement element) {
2525
if (element == null)
26-
element = GraphNull.INSTANCE;
26+
element = AbstractNull.INSTANCE;
2727
elements.add(element);
2828
return this;
2929
}
3030

31-
public GraphArray addNull() {
32-
return add(GraphNull.INSTANCE);
31+
public AbstractArray addNull() {
32+
return add(AbstractNull.INSTANCE);
3333
}
3434

35-
public GraphArray add(Number value) {
35+
public AbstractArray add(Number value) {
3636
if (value == null)
3737
return addNull();
38-
return add(new GraphPrimitive(value));
38+
return add(new AbstractPrimitive(value));
3939
}
4040

41-
public GraphArray add(Boolean value) {
41+
public AbstractArray add(Boolean value) {
4242
if (value == null)
4343
return addNull();
44-
return add(new GraphPrimitive(value));
44+
return add(new AbstractPrimitive(value));
4545
}
4646

47-
public GraphArray add(String value) {
47+
public AbstractArray add(String value) {
4848
if (value == null)
4949
return addNull();
50-
return add(new GraphPrimitive(value));
50+
return add(new AbstractPrimitive(value));
5151
}
5252

53-
public GraphArray setNull(int i){
54-
elements.set(i, GraphNull.INSTANCE);
53+
public AbstractArray setNull(int i){
54+
elements.set(i, AbstractNull.INSTANCE);
5555
return this;
5656
}
5757

58-
public GraphArray set(int i, GraphElement element){
58+
public AbstractArray set(int i, AbstractElement element){
5959
elements.set(i, element);
6060
return this;
6161
}
6262

63-
public GraphArray set(int i, Number value){
63+
public AbstractArray set(int i, Number value){
6464
if(value == null)
6565
return setNull(i);
66-
return set(i, new GraphPrimitive(value));
66+
return set(i, new AbstractPrimitive(value));
6767
}
6868

69-
public GraphArray set(int i, Boolean value){
69+
public AbstractArray set(int i, Boolean value){
7070
if(value == null)
7171
return setNull(i);
72-
return set(i, new GraphPrimitive(value));
72+
return set(i, new AbstractPrimitive(value));
7373
}
7474

75-
public GraphArray set(int i, String value){
75+
public AbstractArray set(int i, String value){
7676
if(value == null)
7777
return setNull(i);
78-
return set(i, new GraphPrimitive(value));
78+
return set(i, new AbstractPrimitive(value));
7979
}
8080

81-
public GraphArray remove(int i){
81+
public AbstractArray remove(int i){
8282
elements.remove(i);
8383
return this;
8484
}
8585

86-
public GraphElement get(int i){
86+
public AbstractElement get(int i){
8787
return elements.get(i);
8888
}
8989

90-
public Stream<GraphElement> stream(){
90+
public Stream<AbstractElement> stream(){
9191
return elements.stream();
9292
}
9393

9494
public int size() {
9595
return elements.size();
9696
}
9797

98-
public GraphArray clear() {
98+
public AbstractArray clear() {
9999
elements.clear();
100100
return this;
101101
}
102102

103-
public Iterator<GraphElement> iterator() {
103+
public Iterator<AbstractElement> iterator() {
104104
return elements.iterator();
105105
}
106106

@@ -116,18 +116,18 @@ public Object toAbstractObject() {
116116
return list;
117117
}
118118

119-
public static GraphArray fromJson(JsonArray array){
120-
GraphArray a = new GraphArray();
121-
array.forEach(e -> a.add(GraphElement.fromJson(e)));
119+
public static AbstractArray fromJson(JsonArray array){
120+
AbstractArray a = new AbstractArray();
121+
array.forEach(e -> a.add(AbstractElement.fromJson(e)));
122122
return a;
123123
}
124124

125125
public Type getType() {
126126
return Type.ARRAY;
127127
}
128128

129-
public GraphObject object(){
130-
GraphObject o = new GraphObject();
129+
public AbstractObject object(){
130+
AbstractObject o = new AbstractObject();
131131
for(int i=0; i<size(); i++)
132132
o.set(String.valueOf(i), get(i));
133133
return o;

src/main/java/org/javawebstack/graph/GraphElement.java renamed to src/main/java/org/javawebstack/abstractdata/AbstractElement.java

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
package org.javawebstack.graph;
1+
package org.javawebstack.abstractdata;
22

33
import com.google.gson.Gson;
44
import com.google.gson.GsonBuilder;
55
import com.google.gson.JsonElement;
6-
import org.javawebstack.querystring.QueryString;
6+
import org.javawebstack.abstractdata.util.QueryString;
77
import org.yaml.snakeyaml.DumperOptions;
88
import org.yaml.snakeyaml.Yaml;
99

1010
import java.util.HashMap;
1111
import java.util.List;
1212
import java.util.Map;
1313

14-
public interface GraphElement {
14+
public interface AbstractElement {
1515
Type getType();
1616

1717
default boolean isPrimitive() {
@@ -42,15 +42,15 @@ default boolean isString() {
4242
return false;
4343
}
4444

45-
default GraphPrimitive primitive() {
45+
default AbstractPrimitive primitive() {
4646
return null;
4747
}
4848

49-
default GraphArray array() {
49+
default AbstractArray array() {
5050
return null;
5151
}
5252

53-
default GraphObject object() {
53+
default AbstractObject object() {
5454
return null;
5555
}
5656

@@ -101,7 +101,7 @@ default String toYaml(){
101101
return toYaml(true);
102102
}
103103

104-
static GraphElement fromYaml(String source, boolean singleRoot){
104+
static AbstractElement fromYaml(String source, boolean singleRoot){
105105
Yaml yaml = new Yaml();
106106
Object object = yaml.load(source);
107107
if(singleRoot && object instanceof List){
@@ -115,32 +115,32 @@ static GraphElement fromYaml(String source, boolean singleRoot){
115115
return fromAbstractObject(object);
116116
}
117117

118-
static GraphElement fromYaml(String source){
118+
static AbstractElement fromYaml(String source){
119119
return fromYaml(source, false);
120120
}
121121

122-
static GraphElement fromAbstractObject(Object object){
122+
static AbstractElement fromAbstractObject(Object object){
123123
if(object == null)
124-
return GraphNull.INSTANCE;
124+
return AbstractNull.INSTANCE;
125125
if(object instanceof List){
126126
List<Object> list = (List<Object>) object;
127-
GraphArray array = new GraphArray();
127+
AbstractArray array = new AbstractArray();
128128
list.forEach(e -> array.add(fromAbstractObject(e)));
129129
return array;
130130
}
131131
if(object instanceof Map){
132132
Map<String, Object> map = (Map<String, Object>) object;
133-
GraphObject graphObject = new GraphObject();
133+
AbstractObject graphObject = new AbstractObject();
134134
map.forEach((k,v) -> graphObject.set(k, fromAbstractObject(v)));
135135
return graphObject;
136136
}
137137
if(object instanceof Number)
138-
return new GraphPrimitive((Number) object);
138+
return new AbstractPrimitive((Number) object);
139139
if(object instanceof String)
140-
return new GraphPrimitive((String) object);
140+
return new AbstractPrimitive((String) object);
141141
if(object instanceof Boolean)
142-
return new GraphPrimitive((Boolean) object);
143-
return GraphNull.INSTANCE;
142+
return new AbstractPrimitive((Boolean) object);
143+
return AbstractNull.INSTANCE;
144144
}
145145

146146
default QueryString toFormData() {
@@ -157,52 +157,52 @@ default String toFormDataString() {
157157

158158
Map<String[], Object> toTree();
159159

160-
static GraphElement fromJson(JsonElement element) {
160+
static AbstractElement fromJson(JsonElement element) {
161161
if (element == null)
162162
return null;
163163
if (element.isJsonArray())
164-
return GraphArray.fromJson(element.getAsJsonArray());
164+
return AbstractArray.fromJson(element.getAsJsonArray());
165165
if (element.isJsonObject())
166-
return GraphObject.fromJson(element.getAsJsonObject());
166+
return AbstractObject.fromJson(element.getAsJsonObject());
167167
if (element.isJsonPrimitive())
168-
return GraphPrimitive.fromJson(element.getAsJsonPrimitive());
169-
return GraphNull.INSTANCE;
168+
return AbstractPrimitive.fromJson(element.getAsJsonPrimitive());
169+
return AbstractNull.INSTANCE;
170170
}
171171

172-
static GraphElement fromJson(String json) {
172+
static AbstractElement fromJson(String json) {
173173
return fromJson(new Gson().fromJson(json, JsonElement.class));
174174
}
175175

176-
static GraphElement fromTree(Map<String[], Object> tree) {
177-
GraphObject object = new GraphObject();
176+
static AbstractElement fromTree(Map<String[], Object> tree) {
177+
AbstractObject object = new AbstractObject();
178178
for (String[] key : tree.keySet()) {
179-
GraphObject current = object;
179+
AbstractObject current = object;
180180
Object value = tree.get(key);
181181
int offset = 0;
182182
while (key.length - offset > 1) {
183183
if (current.has(key[offset])) {
184184
current = current.get(key[offset]).object();
185185
} else {
186-
GraphObject n = new GraphObject();
186+
AbstractObject n = new AbstractObject();
187187
current.set(key[offset], n);
188188
current = n;
189189
}
190190
offset++;
191191
}
192-
current.set(key[offset], GraphPrimitive.from(value));
192+
current.set(key[offset], AbstractPrimitive.from(value));
193193
}
194194
return object;
195195
}
196196

197-
static GraphElement fromFormData(Map<String, String> formData) {
197+
static AbstractElement fromFormData(Map<String, String> formData) {
198198
return fromFormData(new QueryString(formData));
199199
}
200200

201-
static GraphElement fromFormData(QueryString formData) {
201+
static AbstractElement fromFormData(QueryString formData) {
202202
return fromTree(formData.toTree());
203203
}
204204

205-
static GraphElement fromFormData(String formData) {
205+
static AbstractElement fromFormData(String formData) {
206206
return fromFormData(new QueryString(formData));
207207
}
208208

src/main/java/org/javawebstack/graph/GraphMapper.java renamed to src/main/java/org/javawebstack/abstractdata/AbstractMapper.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
package org.javawebstack.graph;
1+
package org.javawebstack.abstractdata;
22

33
import com.google.gson.*;
44
import com.google.gson.annotations.Expose;
55

6-
public class GraphMapper {
6+
public class AbstractMapper {
77

88
private Gson gson;
99
private NamingPolicy namingPolicy = NamingPolicy.NONE;
1010
private String dateFormat = "yyyy-MM-dd HH:mm:ss";
1111
private boolean exposeRequired = false;
1212

13-
public GraphMapper setNamingPolicy(NamingPolicy namingPolicy){
13+
public AbstractMapper setNamingPolicy(NamingPolicy namingPolicy){
1414
this.namingPolicy = namingPolicy;
1515
gson = null;
1616
return this;
@@ -20,7 +20,7 @@ public NamingPolicy getNamingPolicy() {
2020
return namingPolicy;
2121
}
2222

23-
public GraphMapper setExposeRequired(boolean exposeRequired) {
23+
public AbstractMapper setExposeRequired(boolean exposeRequired) {
2424
this.exposeRequired = exposeRequired;
2525
gson = null;
2626
return this;
@@ -30,7 +30,7 @@ public boolean isExposeRequired() {
3030
return exposeRequired;
3131
}
3232

33-
public GraphMapper setDateFormat(String dateFormat) {
33+
public AbstractMapper setDateFormat(String dateFormat) {
3434
this.dateFormat = dateFormat;
3535
gson = null;
3636
return this;
@@ -61,11 +61,11 @@ public boolean shouldSkipField(FieldAttributes fieldAttributes) {
6161
return gson;
6262
}
6363

64-
public GraphElement toGraph(Object object){
65-
return GraphElement.fromJson(gson().toJsonTree(object));
64+
public AbstractElement toAbstract(Object object){
65+
return AbstractElement.fromJson(gson().toJsonTree(object));
6666
}
6767

68-
public <T> T fromGraph(GraphElement element, Class<T> type){
68+
public <T> T fromAbstract(AbstractElement element, Class<T> type){
6969
if(element == null)
7070
return null;
7171
return gson().fromJson(element.toJson(), type);

0 commit comments

Comments
 (0)