Skip to content

Commit 58e5115

Browse files
JanHolgerJanHolger
committed
code formatting
1 parent ec71992 commit 58e5115

File tree

12 files changed

+178
-155
lines changed

12 files changed

+178
-155
lines changed

‎.github/workflows/maven-deploy.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: Maven Deploy
2-
on: [push]
2+
on: [ push ]
33
jobs:
44
build:
55
runs-on: ubuntu-latest

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

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package org.javawebstack.abstractdata;
22

3-
import com.google.gson.Gson;
43
import com.google.gson.JsonArray;
54
import com.google.gson.JsonElement;
65

@@ -50,11 +49,11 @@ public AbstractArray add(AbstractElement element) {
5049
return this;
5150
}
5251

53-
public AbstractArray(){
52+
public AbstractArray() {
5453
elements = new ArrayList<>();
5554
}
5655

57-
public AbstractArray(Object[] objects){
56+
public AbstractArray(Object[] objects) {
5857
this();
5958
for (Object o : objects) {
6059
if (o instanceof AbstractElement)
@@ -64,7 +63,7 @@ public AbstractArray(Object[] objects){
6463
}
6564
}
6665

67-
public AbstractArray(Collection<Object> abstractElements){
66+
public AbstractArray(Collection<Object> abstractElements) {
6867
this(abstractElements.toArray());
6968
}
7069

@@ -94,55 +93,55 @@ public AbstractArray setNull(int i) {
9493
return set(i, AbstractNull.INSTANCE);
9594
}
9695

97-
public AbstractArray set(int i, AbstractElement element){
98-
if(element == null)
96+
public AbstractArray set(int i, AbstractElement element) {
97+
if (element == null)
9998
return setNull(i);
10099
while (elements.size() <= i)
101100
addNull();
102101
elements.set(i, element);
103102
return this;
104103
}
105104

106-
public AbstractArray set(int i, Number value){
107-
if(value == null)
105+
public AbstractArray set(int i, Number value) {
106+
if (value == null)
108107
return setNull(i);
109108
return set(i, new AbstractPrimitive(value));
110109
}
111110

112-
public AbstractArray set(int i, Boolean value){
113-
if(value == null)
111+
public AbstractArray set(int i, Boolean value) {
112+
if (value == null)
114113
return setNull(i);
115114
return set(i, new AbstractPrimitive(value));
116115
}
117116

118-
public AbstractArray set(int i, String value){
119-
if(value == null)
117+
public AbstractArray set(int i, String value) {
118+
if (value == null)
120119
return setNull(i);
121120
return set(i, new AbstractPrimitive(value));
122121
}
123122

124-
public AbstractArray remove(int i){
123+
public AbstractArray remove(int i) {
125124
elements.remove(i);
126125
return this;
127126
}
128127

129-
public AbstractElement[] toArray(){
128+
public AbstractElement[] toArray() {
130129
return elements.toArray(new AbstractElement[0]);
131130
}
132131

133-
public AbstractElement get(int i){
132+
public AbstractElement get(int i) {
134133
return elements.get(i);
135134
}
136135

137-
public Stream<AbstractElement> stream(){
136+
public Stream<AbstractElement> stream() {
138137
return elements.stream();
139138
}
140139

141140
public int size() {
142141
return elements.size();
143142
}
144143

145-
public boolean contains(Object o){
144+
public boolean contains(Object o) {
146145
for (AbstractElement element : elements) {
147146
if (o instanceof AbstractElement ? ((AbstractElement) o).toAbstractObject().equals(element.toAbstractObject()) : element.toAbstractObject().equals(o))
148147
return true;
@@ -171,33 +170,33 @@ public Object toAbstractObject() {
171170
return list;
172171
}
173172

174-
public static AbstractArray fromJson(JsonArray array){
173+
public static AbstractArray fromJson(JsonArray array) {
175174
AbstractArray a = new AbstractArray();
176175
array.forEach(e -> a.add(AbstractElement.fromJson(e)));
177176
return a;
178177
}
179178

180179

181-
public static AbstractArray fromArray(Object[] objects){
180+
public static AbstractArray fromArray(Object[] objects) {
182181
return new AbstractArray(objects);
183182
}
184183

185-
public static AbstractArray fromList(Collection collection){
184+
public static AbstractArray fromList(Collection collection) {
186185
return new AbstractArray(collection);
187186
}
188187

189188
public Type getType() {
190189
return Type.ARRAY;
191190
}
192191

193-
public AbstractObject object(){
192+
public AbstractObject object() {
194193
AbstractObject o = new AbstractObject();
195-
for(int i=0; i<size(); i++)
194+
for (int i = 0; i < size(); i++)
196195
o.set(String.valueOf(i), get(i));
197196
return o;
198197
}
199198

200-
public Map<String[], Object> toTree(){
199+
public Map<String[], Object> toTree() {
201200
return object().toTree();
202201
}
203202

‎src/main/java/org/javawebstack/abstractdata/AbstractElement.java‎

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -74,72 +74,74 @@ default Number number() {
7474
}
7575

7676
JsonElement toJson();
77-
default String toJsonString(boolean pretty){
78-
if(pretty)
77+
78+
default String toJsonString(boolean pretty) {
79+
if (pretty)
7980
return new GsonBuilder().setPrettyPrinting().create().toJson(toJson());
8081
return new Gson().toJson(toJson());
8182
}
82-
default String toJsonString(){
83+
84+
default String toJsonString() {
8385
return toJsonString(false);
8486
}
8587

8688
Object toAbstractObject();
8789

88-
default String toYaml(boolean pretty){
90+
default String toYaml(boolean pretty) {
8991
Yaml yaml;
90-
if(pretty){
92+
if (pretty) {
9193
DumperOptions options = new DumperOptions();
9294
options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
9395
options.setPrettyFlow(true);
9496
yaml = new Yaml(options);
95-
}else{
97+
} else {
9698
yaml = new Yaml();
9799
}
98100
return yaml.dump(toAbstractObject());
99101
}
100102

101-
default String toYaml(){
103+
default String toYaml() {
102104
return toYaml(true);
103105
}
104106

105-
static AbstractElement fromYaml(String source, boolean singleRoot){
107+
static AbstractElement fromYaml(String source, boolean singleRoot) {
106108
Yaml yaml = new Yaml();
107109
Object object = yaml.load(source);
108-
if(singleRoot && object instanceof List){
110+
if (singleRoot && object instanceof List) {
109111
List<Object> list = (List<Object>) object;
110-
if(list.size() == 0){
112+
if (list.size() == 0) {
111113
object = new HashMap<>();
112-
}else{
114+
} else {
113115
object = list.get(0);
114116
}
115117
}
116118
return fromAbstractObject(object);
117119
}
118120

119-
static AbstractElement fromYaml(String source){
121+
static AbstractElement fromYaml(String source) {
120122
return fromYaml(source, false);
121123
}
122124

123-
static AbstractElement fromAbstractObject(Object object){
124-
if(object == null)
125+
static AbstractElement fromAbstractObject(Object object) {
126+
if (object == null)
125127
return AbstractNull.INSTANCE;
126-
if(object instanceof List){
128+
if (object instanceof List) {
127129
List<Object> list = (List<Object>) object;
128130
AbstractArray array = new AbstractArray();
129131
list.forEach(e -> array.add(fromAbstractObject(e)));
130132
return array;
131133
}
132-
if(object instanceof Map){
134+
if (object instanceof Map) {
133135
Map<String, Object> map = (Map<String, Object>) object;
134136
AbstractObject graphObject = new AbstractObject();
135-
map.forEach((k,v) -> graphObject.set(k, fromAbstractObject(v)));
137+
map.forEach((k, v) -> graphObject.set(k, fromAbstractObject(v)));
136138
return graphObject;
137139
}
138-
if(object instanceof Number)
140+
if (object instanceof Number)
139141
return new AbstractPrimitive((Number) object);
140-
if(object instanceof String)
142+
if (object instanceof String)
141143
return new AbstractPrimitive((String) object);
142-
if(object instanceof Boolean)
144+
if (object instanceof Boolean)
143145
return new AbstractPrimitive((Boolean) object);
144146
return AbstractNull.INSTANCE;
145147
}

‎src/main/java/org/javawebstack/abstractdata/AbstractMapper.java‎

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

3-
import com.google.gson.*;
3+
import com.google.gson.ExclusionStrategy;
4+
import com.google.gson.FieldAttributes;
5+
import com.google.gson.Gson;
6+
import com.google.gson.GsonBuilder;
47
import com.google.gson.annotations.Expose;
58
import org.javawebstack.abstractdata.util.GsonAbstractDataAdapter;
69

@@ -11,7 +14,7 @@ public class AbstractMapper {
1114
private String dateFormat = "yyyy-MM-dd HH:mm:ss";
1215
private boolean exposeRequired = false;
1316

14-
public AbstractMapper setNamingPolicy(NamingPolicy namingPolicy){
17+
public AbstractMapper setNamingPolicy(NamingPolicy namingPolicy) {
1518
this.namingPolicy = namingPolicy;
1619
gson = null;
1720
return this;
@@ -41,8 +44,8 @@ public String getDateFormat() {
4144
return dateFormat;
4245
}
4346

44-
private Gson gson(){
45-
if(gson != null)
47+
private Gson gson() {
48+
if (gson != null)
4649
return gson;
4750
GsonBuilder builder = new GsonBuilder()
4851
.registerTypeAdapter(AbstractElement.class, new GsonAbstractDataAdapter<>())
@@ -51,32 +54,34 @@ private Gson gson(){
5154
.registerTypeAdapter(AbstractPrimitive.class, new GsonAbstractDataAdapter<>())
5255
.registerTypeAdapter(AbstractNull.class, new GsonAbstractDataAdapter<>())
5356
.setFieldNamingPolicy(namingPolicy.getGsonPolicy());
54-
if(dateFormat != null)
57+
if (dateFormat != null)
5558
builder.setDateFormat(dateFormat);
56-
if(exposeRequired){
59+
if (exposeRequired) {
5760
builder.excludeFieldsWithoutExposeAnnotation();
58-
}else{
61+
} else {
5962
builder.setExclusionStrategies(new ExclusionStrategy() {
6063
public boolean shouldSkipField(FieldAttributes fieldAttributes) {
6164
return fieldAttributes.getAnnotation(Expose.class) != null && !fieldAttributes.getAnnotation(Expose.class).serialize();
6265
}
63-
public boolean shouldSkipClass(Class<?> aClass) { return false; }
66+
67+
public boolean shouldSkipClass(Class<?> aClass) {
68+
return false;
69+
}
6470
});
6571
}
6672
gson = builder.create();
6773
return gson;
6874
}
6975

70-
public AbstractElement toAbstract(Object object){
76+
public AbstractElement toAbstract(Object object) {
7177
return AbstractElement.fromJson(gson().toJsonTree(object));
7278
}
7379

74-
public <T> T fromAbstract(AbstractElement element, Class<T> type){
75-
if(element == null)
80+
public <T> T fromAbstract(AbstractElement element, Class<T> type) {
81+
if (element == null)
7682
return null;
7783
return gson().fromJson(element.toJson(), type);
7884
}
7985

8086

81-
8287
}

‎src/main/java/org/javawebstack/abstractdata/AbstractNull.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ public class AbstractNull implements AbstractElement {
1010

1111
public static final AbstractNull INSTANCE = new AbstractNull();
1212

13-
private AbstractNull(){}
13+
private AbstractNull() {
14+
}
1415

1516
public boolean isNull() {
1617
return true;

0 commit comments

Comments
 (0)