Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings
This repository was archived by the owner on Nov 7, 2024. It is now read-only.

Commit 9e9ccba

Browse files
authored
Merge pull request #69 from lukasj/iss56
fixes #56: EMPTY_JSON_OBJECT and EMPTY_JSON_ARRAY should be immutable
2 parents 4688cac + 93d2c56 commit 9e9ccba

File tree

5 files changed

+373
-8
lines changed

5 files changed

+373
-8
lines changed
Lines changed: 136 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,136 @@
1+
/*
2+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3+
*
4+
* Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved.
5+
*
6+
* The contents of this file are subject to the terms of either the GNU
7+
* General Public License Version 2 only ("GPL") or the Common Development
8+
* and Distribution License("CDDL") (collectively, the "License"). You
9+
* may not use this file except in compliance with the License. You can
10+
* obtain a copy of the License at
11+
* https://oss.oracle.com/licenses/CDDL+GPL-1.1
12+
* or LICENSE.txt. See the License for the specific
13+
* language governing permissions and limitations under the License.
14+
*
15+
* When distributing the software, include this License Header Notice in each
16+
* file and include the License file at LICENSE.txt.
17+
*
18+
* GPL Classpath Exception:
19+
* Oracle designates this particular file as subject to the "Classpath"
20+
* exception as provided by Oracle in the GPL Version 2 section of the License
21+
* file that accompanied this code.
22+
*
23+
* Modifications:
24+
* If applicable, add the following below the License Header, with the fields
25+
* enclosed by brackets [] replaced by your own identifying information:
26+
* "Portions Copyright [year] [name of copyright owner]"
27+
*
28+
* Contributor(s):
29+
* If you wish your version of this file to be governed by only the CDDL or
30+
* only the GPL Version 2, indicate your decision by adding "[Contributor]
31+
* elects to include this software in this distribution under the [CDDL or GPL
32+
* Version 2] license." If you don't indicate a single choice of license, a
33+
* recipient has the option to distribute your version of this file under
34+
* either the CDDL, the GPL Version 2 or to extend the choice of license to
35+
* its licensees as provided above. However, if you add GPL Version 2 code
36+
* and therefore, elected the GPL Version 2 license, then the option applies
37+
* only if the new code is made subject to such option by the copyright
38+
* holder.
39+
*/
40+
package javax.json;
41+
42+
import java.io.Serializable;
43+
import java.util.AbstractList;
44+
import java.util.Collections;
45+
import java.util.List;
46+
import java.util.RandomAccess;
47+
48+
/**
49+
* Private implementation of immutable {@link JsonArray}.
50+
*
51+
* @author Lukas Jungmann
52+
*/
53+
final class EmptyArray extends AbstractList<JsonValue> implements JsonArray, Serializable, RandomAccess {
54+
55+
private static final long serialVersionUID = 7295439472061642859L;
56+
57+
@Override
58+
public JsonValue get(int index) {
59+
throw new IndexOutOfBoundsException("Index: " + index);
60+
}
61+
62+
@Override
63+
public int size() {
64+
return 0;
65+
}
66+
67+
@Override
68+
public JsonObject getJsonObject(int index) {
69+
return (JsonObject) get(index);
70+
}
71+
72+
@Override
73+
public JsonArray getJsonArray(int index) {
74+
return (JsonArray) get(index);
75+
}
76+
77+
@Override
78+
public JsonNumber getJsonNumber(int index) {
79+
return (JsonNumber) get(index);
80+
}
81+
82+
@Override
83+
public JsonString getJsonString(int index) {
84+
return (JsonString) get(index);
85+
}
86+
87+
@Override
88+
public <T extends JsonValue> List<T> getValuesAs(Class<T> clazz) {
89+
return Collections.emptyList();
90+
}
91+
92+
@Override
93+
public String getString(int index) {
94+
return getJsonString(index).getString();
95+
}
96+
97+
@Override
98+
public String getString(int index, String defaultValue) {
99+
return defaultValue;
100+
}
101+
102+
@Override
103+
public int getInt(int index) {
104+
return getJsonNumber(index).intValue();
105+
}
106+
107+
@Override
108+
public int getInt(int index, int defaultValue) {
109+
return defaultValue;
110+
}
111+
112+
@Override
113+
public boolean getBoolean(int index) {
114+
return get(index) == JsonValue.TRUE;
115+
}
116+
117+
@Override
118+
public boolean getBoolean(int index, boolean defaultValue) {
119+
return defaultValue;
120+
}
121+
122+
@Override
123+
public boolean isNull(int index) {
124+
return get(index) == JsonValue.NULL;
125+
}
126+
127+
@Override
128+
public ValueType getValueType() {
129+
return ValueType.ARRAY;
130+
}
131+
132+
// Preserves singleton property
133+
private Object readResolve() {
134+
return JsonValue.EMPTY_JSON_ARRAY;
135+
}
136+
}
Lines changed: 126 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,126 @@
1+
/*
2+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3+
*
4+
* Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved.
5+
*
6+
* The contents of this file are subject to the terms of either the GNU
7+
* General Public License Version 2 only ("GPL") or the Common Development
8+
* and Distribution License("CDDL") (collectively, the "License"). You
9+
* may not use this file except in compliance with the License. You can
10+
* obtain a copy of the License at
11+
* https://oss.oracle.com/licenses/CDDL+GPL-1.1
12+
* or LICENSE.txt. See the License for the specific
13+
* language governing permissions and limitations under the License.
14+
*
15+
* When distributing the software, include this License Header Notice in each
16+
* file and include the License file at LICENSE.txt.
17+
*
18+
* GPL Classpath Exception:
19+
* Oracle designates this particular file as subject to the "Classpath"
20+
* exception as provided by Oracle in the GPL Version 2 section of the License
21+
* file that accompanied this code.
22+
*
23+
* Modifications:
24+
* If applicable, add the following below the License Header, with the fields
25+
* enclosed by brackets [] replaced by your own identifying information:
26+
* "Portions Copyright [year] [name of copyright owner]"
27+
*
28+
* Contributor(s):
29+
* If you wish your version of this file to be governed by only the CDDL or
30+
* only the GPL Version 2, indicate your decision by adding "[Contributor]
31+
* elects to include this software in this distribution under the [CDDL or GPL
32+
* Version 2] license." If you don't indicate a single choice of license, a
33+
* recipient has the option to distribute your version of this file under
34+
* either the CDDL, the GPL Version 2 or to extend the choice of license to
35+
* its licensees as provided above. However, if you add GPL Version 2 code
36+
* and therefore, elected the GPL Version 2 license, then the option applies
37+
* only if the new code is made subject to such option by the copyright
38+
* holder.
39+
*/
40+
41+
package javax.json;
42+
43+
import java.io.Serializable;
44+
import java.util.AbstractMap;
45+
import java.util.Collections;
46+
import java.util.Set;
47+
48+
/**
49+
* Private implementation of immutable {@link JsonObject}.
50+
*
51+
* @author Lukas Jungmann
52+
*/
53+
final class EmptyObject extends AbstractMap<String, JsonValue> implements JsonObject, Serializable {
54+
55+
private static final long serialVersionUID = -1461653546889072583L;
56+
57+
@Override
58+
public Set<Entry<String, JsonValue>> entrySet() {
59+
return Collections.<Entry<String, JsonValue>>emptySet();
60+
}
61+
62+
@Override
63+
public JsonArray getJsonArray(String name) {
64+
return (JsonArray) get(name);
65+
}
66+
67+
@Override
68+
public JsonObject getJsonObject(String name) {
69+
return (JsonObject) get(name);
70+
}
71+
72+
@Override
73+
public JsonNumber getJsonNumber(String name) {
74+
return (JsonNumber) get(name);
75+
}
76+
77+
@Override
78+
public JsonString getJsonString(String name) {
79+
return (JsonString) get(name);
80+
}
81+
82+
@Override
83+
public String getString(String name) {
84+
return getJsonString(name).getString();
85+
}
86+
87+
@Override
88+
public String getString(String name, String defaultValue) {
89+
return defaultValue;
90+
}
91+
92+
@Override
93+
public int getInt(String name) {
94+
return getJsonNumber(name).intValue();
95+
}
96+
97+
@Override
98+
public int getInt(String name, int defaultValue) {
99+
return defaultValue;
100+
}
101+
102+
@Override
103+
public boolean getBoolean(String name) {
104+
throw new NullPointerException();
105+
}
106+
107+
@Override
108+
public boolean getBoolean(String name, boolean defaultValue) {
109+
return defaultValue;
110+
}
111+
112+
@Override
113+
public boolean isNull(String name) {
114+
throw new NullPointerException();
115+
}
116+
117+
@Override
118+
public ValueType getValueType() {
119+
return ValueType.OBJECT;
120+
}
121+
122+
// Preserves singleton property
123+
private Object readResolve() {
124+
return JsonValue.EMPTY_JSON_OBJECT;
125+
}
126+
}

‎api/src/main/java/javax/json/JsonArray.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ default <T, K extends JsonValue> List<T> getValuesAs(Function<K, T> func) {
291291
*
292292
* @param index index of the JSON null value
293293
* @return return true if the value at the specified location is
294-
* {@code JsonValue.NUL}, otherwise false
294+
* {@code JsonValue.NULL}, otherwise false
295295
* @throws IndexOutOfBoundsException if the index is out of range
296296
*/
297297
boolean isNull(int index);

‎api/src/main/java/javax/json/JsonValue.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,29 +43,29 @@
4343
/**
4444
* <code>JsonValue</code> represents an immutable JSON value.
4545
*
46-
*
46+
*
4747
* <p>A JSON value is one of the following:
4848
* an object ({@link JsonObject}), an array ({@link JsonArray}),
4949
* a number ({@link JsonNumber}), a string ({@link JsonString}),
50-
* {@code true} ({@link JsonValue#TRUE JsonValue.TRUE}), {@code false}
50+
* {@code true} ({@link JsonValue#TRUE JsonValue.TRUE}), {@code false}
5151
* ({@link JsonValue#FALSE JsonValue.FALSE}),
5252
* or {@code null} ({@link JsonValue#NULL JsonValue.NULL}).
5353
*/
5454
public interface JsonValue {
5555

5656
/**
5757
* The empty JSON object.
58-
*
58+
*
5959
* @since 1.1
6060
*/
61-
static final JsonObject EMPTY_JSON_OBJECT = Json.createObjectBuilder().build();
61+
static final JsonObject EMPTY_JSON_OBJECT = newEmptyObject();
6262

6363
/**
6464
* The empty JSON array.
65-
*
65+
*
6666
* @since 1.1
6767
*/
68-
static final JsonArray EMPTY_JSON_ARRAY = Json.createArrayBuilder().build();
68+
static final JsonArray EMPTY_JSON_ARRAY = newEmptyArray();
6969

7070
/**
7171
* Indicates the type of a {@link JsonValue} object.

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /