Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move JSONString out of split package #167

Closed
wants to merge 1 commit into from
Closed

Move JSONString out of split package #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/main/java/org/skyscreamer/jsonassert/JSONCompare.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
import org.json.JSONString;
import org.skyscreamer.jsonassert.comparator.DefaultComparator;
import org.skyscreamer.jsonassert.comparator.JSONComparator;

Expand Down Expand Up @@ -95,7 +94,7 @@ public static JSONCompareResult compareJSON(JSONArray expected, JSONArray actual

/**
* Compares {@link JSONString} provided to the expected {@code JSONString}, checking that the
* {@link org.json.JSONString#toJSONString()} are equal.
* {@link JSONString#toJSONString()} are equal.
*
* @param expected Expected {@code JSONstring}
* @param actual {@code JSONstring} to compare
Expand Down
1 change: 0 additions & 1 deletion src/main/java/org/skyscreamer/jsonassert/JSONParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
import org.json.JSONString;

/**
* Simple JSON parsing utility.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/json/JSONString.java → ...rg/skyscreamer/jsonassert/JSONString.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* limitations under the License.
*/

package org.json;
package org.skyscreamer.jsonassert;

/**
* The JSONString interface allows a toJSONString() method so that a class can change
Expand Down