Revision 2401
org.gvsig.tools/library/trunk/org.gvsig.tools/org.gvsig.tools.util/org.gvsig.tools.util.impl/src/main/java/org/gvsig/json/serializers/TagsSerializer.java | ||
---|---|---|
50 | 50 |
if( name.equals(ATTRIBUTE_NAME_CLASS) ) { |
51 | 51 |
continue; |
52 | 52 |
} |
53 |
tags.set(name, manager.toObject(name, source));
|
|
53 |
tags.set(name, manager.toObject(source, name));
|
|
54 | 54 |
} |
55 | 55 |
} |
56 | 56 |
|
org.gvsig.tools/library/trunk/org.gvsig.tools/org.gvsig.tools.util/org.gvsig.tools.util.impl/src/main/java/org/gvsig/json/JsonManagerImpl.java | ||
---|---|---|
9 | 9 |
import java.util.HashMap; |
10 | 10 |
import java.util.Iterator; |
11 | 11 |
import java.util.Map; |
12 |
import java.util.Objects; |
|
12 | 13 |
import javax.json.JsonArray; |
13 | 14 |
import javax.json.JsonNumber; |
14 | 15 |
import javax.json.JsonObject; |
... | ... | |
149 | 150 |
} |
150 | 151 |
} |
151 | 152 |
|
152 |
@Override |
|
153 |
public String toString(JsonObject obj) { |
|
154 |
return this.toString((JsonStructure) obj); |
|
155 |
} |
|
156 |
|
|
157 |
@Override |
|
158 |
public String toString(JsonArray array) { |
|
159 |
return this.toString((JsonStructure) array); |
|
160 |
} |
|
161 |
|
|
162 |
@Override |
|
163 |
public String toString(JsonStructure obj) { |
|
153 |
private String toString(JsonStructure obj) { |
|
164 | 154 |
StringWriter sw = new StringWriter(); |
165 | 155 |
JsonWriterFactory writerFactory = javax.json.Json.createWriterFactory( |
166 | 156 |
Collections.singletonMap(JsonGenerator.PRETTY_PRINTING, true) |
... | ... | |
171 | 161 |
String s = sw.toString(); |
172 | 162 |
return s; |
173 | 163 |
} |
164 |
|
|
165 |
@Override |
|
166 |
public String toString(JsonValue value) { |
|
167 |
if( value == null ) { |
|
168 |
return Objects.toString(null); |
|
169 |
} |
|
170 |
switch (value.getValueType()) { |
|
171 |
case ARRAY: |
|
172 |
case OBJECT: |
|
173 |
return this.toString((JsonStructure)value); |
|
174 |
case FALSE: |
|
175 |
case NUMBER: |
|
176 |
case STRING: |
|
177 |
case TRUE: |
|
178 |
case NULL: |
|
179 |
default: |
|
180 |
return value.toString(); |
|
181 |
} |
|
182 |
} |
|
174 | 183 |
|
184 |
|
|
175 | 185 |
@Override |
176 |
public Object toObject(String name, JsonObject json) {
|
|
186 |
public Object toObject(JsonObject json, String name) {
|
|
177 | 187 |
JsonValue value = json.get(name); |
178 | 188 |
return toObject(value); |
179 | 189 |
} |
180 | 190 |
|
181 | 191 |
@Override |
182 |
public Object toObject(int index, JsonArray json) {
|
|
192 |
public Object toObject(JsonArray json, int index) {
|
|
183 | 193 |
JsonValue value = json.get(index); |
184 | 194 |
return toObject(value); |
185 | 195 |
} |
186 | 196 |
|
187 |
@Override |
|
188 |
public Object toObject(JsonObject json) { |
|
189 |
return this.toObject(json, null); |
|
190 |
} |
|
191 |
|
|
192 |
@Override |
|
193 |
public Object toObject(JsonObject json, Object defaultValue) { |
|
197 |
private Object createObject(JsonObject json, Object defaultValue) { |
|
194 | 198 |
if (json == null) { |
195 | 199 |
return defaultValue; |
196 | 200 |
} |
... | ... | |
283 | 287 |
|
284 | 288 |
@Override |
285 | 289 |
public Object toObject(JsonValue value) { |
290 |
return this.toObjectOrDefault(value, null); |
|
291 |
} |
|
292 |
|
|
293 |
@Override |
|
294 |
public Object toObjectOrDefault(JsonValue value, Object defaultValue) { |
|
286 | 295 |
if( value == null ) { |
287 |
return null;
|
|
296 |
return defaultValue;
|
|
288 | 297 |
} |
289 | 298 |
switch (value.getValueType()) { |
290 | 299 |
case ARRAY: |
... | ... | |
312 | 321 |
} |
313 | 322 |
|
314 | 323 |
case OBJECT: |
315 |
return this.toObject((JsonObject) value, value);
|
|
324 |
return this.createObject((JsonObject) value, defaultValue);
|
|
316 | 325 |
|
317 | 326 |
case STRING: |
318 | 327 |
return ((JsonString) value).getString(); |
319 | 328 |
case TRUE: |
320 |
return false;
|
|
329 |
return true;
|
|
321 | 330 |
case NULL: |
331 |
return null; |
|
322 | 332 |
default: |
323 |
return null;
|
|
333 |
return defaultValue;
|
|
324 | 334 |
} |
325 | 335 |
} |
326 | 336 |
|
... | ... | |
345 | 355 |
} |
346 | 356 |
|
347 | 357 |
@Override |
348 |
public Map toHashMap(JsonObject json) {
|
|
358 |
public Map toMap(JsonObject json) { |
|
349 | 359 |
if( json == null ) { |
350 | 360 |
return null; |
351 | 361 |
} |
org.gvsig.tools/library/trunk/org.gvsig.tools/org.gvsig.tools.util/org.gvsig.tools.util.api/src/main/java/org/gvsig/json/JsonManager.java | ||
---|---|---|
44 | 44 |
|
45 | 45 |
public JsonArray createArray(String json); |
46 | 46 |
|
47 |
public String toString(JsonObject obj); |
|
48 |
|
|
49 |
public String toString(JsonArray array); |
|
50 |
|
|
51 |
public String toString(JsonStructure obj); |
|
47 |
public String toString(JsonValue obj); |
|
52 | 48 |
|
53 | 49 |
public Object toObject(JsonValue value); |
54 | 50 |
|
55 |
public Object toObject(String name, JsonObject json);
|
|
51 |
public Object toObjectOrDefault(JsonValue value, Object defaultValue);
|
|
56 | 52 |
|
57 |
public Object toObject(int index, JsonArray json); |
|
53 |
public Object toObject(JsonObject json, String name); |
|
54 |
|
|
55 |
public Object toObject(JsonArray json, int index); |
|
58 | 56 |
|
59 |
public Object toObject(JsonObject json); |
|
60 |
|
|
61 |
public Object toObject(JsonObject json, Object defaultValue); |
|
62 |
|
|
63 | 57 |
public Object[] toArray(JsonArray jsonArray, Object[]a); |
64 | 58 |
|
65 | 59 |
public Iterable<Object> toIterable(final JsonArray jsonArray); |
... | ... | |
68 | 62 |
|
69 | 63 |
public DynObject addAll(DynObject target, JsonObject json); |
70 | 64 |
|
71 |
public Map toHashMap(JsonObject json);
|
|
65 |
public Map toMap(JsonObject json); |
|
72 | 66 |
|
73 | 67 |
public JsonPathContext createJSonPathContext(JsonStructure jsonObject); |
74 | 68 |
|
org.gvsig.tools/library/trunk/org.gvsig.tools/org.gvsig.tools.util/org.gvsig.tools.util.api/src/main/java/org/gvsig/json/Json.java | ||
---|---|---|
104 | 104 |
return array; |
105 | 105 |
} |
106 | 106 |
|
107 |
public static String toString(JsonObject obj) {
|
|
107 |
public static String toString(JsonValue obj) {
|
|
108 | 108 |
JsonManager manager = ToolsUtilLocator.getJsonManager(); |
109 | 109 |
String json = manager.toString(obj); |
110 | 110 |
return json; |
111 | 111 |
} |
112 | 112 |
|
113 |
public static String toString(JsonArray array) { |
|
114 |
JsonManager manager = ToolsUtilLocator.getJsonManager(); |
|
115 |
String json = manager.toString(array); |
|
116 |
return json; |
|
117 |
} |
|
118 |
|
|
119 |
public static String toString(JsonStructure obj) { |
|
120 |
JsonManager manager = ToolsUtilLocator.getJsonManager(); |
|
121 |
String json = manager.toString(obj); |
|
122 |
return json; |
|
123 |
} |
|
124 |
|
|
125 |
public static Object toObject(String name, JsonObject json) { |
|
126 |
JsonManager manager = ToolsUtilLocator.getJsonManager(); |
|
127 |
return manager.toObject(name,json); |
|
128 |
} |
|
129 |
|
|
130 | 113 |
public static Object toObject(JsonValue value) { |
131 | 114 |
JsonManager manager = ToolsUtilLocator.getJsonManager(); |
132 | 115 |
return manager.toObject(value); |
133 | 116 |
} |
134 | 117 |
|
135 |
public static Object toObject(int index, JsonArray json) {
|
|
118 |
public static Object toObject(JsonArray json, int index) {
|
|
136 | 119 |
JsonManager manager = ToolsUtilLocator.getJsonManager(); |
137 |
return manager.toObject(index,json);
|
|
120 |
return manager.toObject(json, index);
|
|
138 | 121 |
} |
139 | 122 |
|
140 | 123 |
public static Object toObject(JsonObject json, String name) { |
... | ... | |
145 | 128 |
return null; |
146 | 129 |
} |
147 | 130 |
JsonManager manager = ToolsUtilLocator.getJsonManager(); |
148 |
return manager.toObject(json.getJsonObject(name));
|
|
131 |
return manager.toObject(json,name);
|
|
149 | 132 |
} |
150 | 133 |
|
151 |
public static Object toObject(JsonObject json) { |
|
152 |
JsonManager manager = ToolsUtilLocator.getJsonManager(); |
|
153 |
return manager.toObject(json); |
|
154 |
} |
|
155 |
|
|
156 | 134 |
public static Object toObject(String json) { |
157 | 135 |
JsonManager manager = ToolsUtilLocator.getJsonManager(); |
158 | 136 |
JsonObject jsonObject = manager.createObject(json); |
... | ... | |
186 | 164 |
return manager.addAll(target, json); |
187 | 165 |
} |
188 | 166 |
|
189 |
public static Map toHashMap(JsonObject json, String name) {
|
|
167 |
public static Map toMap(JsonObject json, String name) { |
|
190 | 168 |
if( json == null ) { |
191 | 169 |
return null; |
192 | 170 |
} |
... | ... | |
194 | 172 |
return null; |
195 | 173 |
} |
196 | 174 |
JsonManager manager = ToolsUtilLocator.getJsonManager(); |
197 |
return manager.toHashMap(json.getJsonObject(name));
|
|
175 |
return manager.toMap(json.getJsonObject(name)); |
|
198 | 176 |
} |
199 | 177 |
|
200 |
public static Map toHashMap(JsonObject json) {
|
|
178 |
public static Map toMap(JsonObject json) { |
|
201 | 179 |
JsonManager manager = ToolsUtilLocator.getJsonManager(); |
202 |
return manager.toHashMap(json);
|
|
180 |
return manager.toMap(json); |
|
203 | 181 |
} |
204 | 182 |
|
205 | 183 |
} |
Also available in: Unified diff