Skip to content

some code clean up #67

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

Merged
merged 2 commits into from
Dec 29, 2016
Merged

some code clean up #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ede241
remove unused import(s)
agebhar1 Dec 28, 2016
c213b77
remove unused field(s)
agebhar1 Dec 28, 2016
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
1 change: 0 additions & 1 deletion core/src/main/java/org/everit/json/schema/ArraySchema.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

import org.everit.json.schema.internal.JSONPrinter;
import org.json.JSONArray;
import org.json.JSONWriter;

import java.util.*;
import java.util.function.Consumer;
Expand Down
1 change: 0 additions & 1 deletion core/src/main/java/org/everit/json/schema/EnumSchema.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
package org.everit.json.schema;

import org.everit.json.schema.internal.JSONPrinter;
import org.json.JSONWriter;

import java.util.Collections;
import java.util.HashSet;
Expand Down
1 change: 0 additions & 1 deletion core/src/main/java/org/everit/json/schema/FormatValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

import org.everit.json.schema.internal.*;

import java.util.Objects;
import java.util.Optional;

import static java.util.Objects.requireNonNull;
Expand Down
1 change: 0 additions & 1 deletion core/src/main/java/org/everit/json/schema/internal/JSONPrinter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import org.json.JSONWriter;

import java.io.Writer;
import java.util.HashMap;
import java.util.Map;

import static java.util.Objects.requireNonNull;
Expand Down
1 change: 0 additions & 1 deletion core/src/main/java/org/everit/json/schema/loader/LoadingState.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import org.everit.json.schema.FormatValidator;
import org.everit.json.schema.ReferenceSchema;
import org.everit.json.schema.Schema;
import org.everit.json.schema.SchemaException;
import org.everit.json.schema.loader.internal.TypeBasedMultiplexer;
import org.json.JSONObject;
Expand Down
2 changes: 0 additions & 2 deletions core/src/main/java/org/everit/json/schema/loader/ObjectSchemaLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
package org.everit.json.schema.loader;

import org.everit.json.schema.ObjectSchema;
import org.everit.json.schema.SchemaException;
import org.json.JSONArray;
import org.json.JSONObject;

import java.util.Arrays;
import java.util.function.Consumer;
import java.util.stream.IntStream;

import static java.util.Objects.requireNonNull;
Expand Down
1 change: 0 additions & 1 deletion core/src/main/java/org/everit/json/schema/loader/internal/JSONPointer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@

import java.io.*;
import java.nio.charset.Charset;
import java.util.Objects;
import java.util.function.Supplier;

import static java.util.Objects.requireNonNull;
Expand Down
3 changes: 0 additions & 3 deletions core/src/test/java/org/everit/json/schema/ArraySchemaTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,8 @@
import nl.jqno.equalsverifier.Warning;
import org.everit.json.schema.loader.SchemaLoader;
import org.json.JSONObject;
import org.json.JSONTokener;
import org.junit.Ignore;
import org.junit.Test;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;

Expand Down
1 change: 0 additions & 1 deletion core/src/test/java/org/everit/json/schema/CombinedSchemaTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import org.junit.Assert;
import org.junit.Test;

import java.util.Arrays;
import java.util.List;

import static java.util.Arrays.asList;
Expand Down
2 changes: 0 additions & 2 deletions core/src/test/java/org/everit/json/schema/NumberSchemaTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,8 @@
import nl.jqno.equalsverifier.Warning;
import org.everit.json.schema.loader.SchemaLoader;
import org.json.JSONObject;
import org.junit.Ignore;
import org.junit.Test;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;

public class NumberSchemaTest {
Expand Down
1 change: 0 additions & 1 deletion core/src/test/java/org/everit/json/schema/PointerBubblingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

import org.everit.json.schema.loader.SchemaLoader;
import org.json.JSONObject;
import org.json.JSONTokener;
import org.junit.Assert;
import org.junit.Test;

Expand Down
1 change: 0 additions & 1 deletion core/src/test/java/org/everit/json/schema/ValidationExceptionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
package org.everit.json.schema;

import org.json.JSONObject;
import org.json.JSONTokener;
import org.junit.Assert;
import org.junit.Test;

Expand Down
1 change: 0 additions & 1 deletion core/src/test/java/org/everit/json/schema/internal/JSONPrinterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import org.json.JSONObject;
import org.json.JSONWriter;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;

import java.io.StringWriter;
Expand Down
1 change: 0 additions & 1 deletion core/src/test/java/org/everit/json/schema/loader/CustomFormatValidatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import org.everit.json.schema.ResourceLoader;
import org.everit.json.schema.ValidationException;
import org.json.JSONObject;
import org.json.JSONTokener;
import org.junit.Assert;
import org.junit.Test;

Expand Down
1 change: 0 additions & 1 deletion core/src/test/java/org/everit/json/schema/loader/ResolutionScopeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
import org.everit.json.schema.ResourceLoader;
import org.everit.json.schema.loader.internal.DefaultSchemaClient;
import org.json.JSONObject;
import org.json.JSONTokener;
import org.junit.Test;

import java.io.InputStream;
Expand Down
1 change: 0 additions & 1 deletion core/src/test/java/org/everit/json/schema/loader/SchemaLoaderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.util.Arrays;
import java.util.Map;
import java.util.Optional;

import static org.junit.Assert.assertEquals;
Expand Down
1 change: 0 additions & 1 deletion tests/src/test/java/org/everit/json/schema/IssueServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import javax.servlet.http.HttpServletResponse;
import java.io.*;
import java.util.Arrays;
import java.util.Objects;

import static java.util.Objects.requireNonNull;

Expand Down
3 changes: 0 additions & 3 deletions tests/src/test/java/org/everit/json/schema/IssueTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/
package org.everit.json.schema;

import org.eclipse.jetty.server.Server;
import org.everit.json.schema.loader.SchemaLoader;
import org.json.JSONArray;
import org.json.JSONException;
Expand Down Expand Up @@ -54,8 +53,6 @@ public static List<Object[]> params() {

private final File issueDir;

private Server server;

private ServletSupport servletSupport;

private List<String> validationFailureList;
Expand Down
3 changes: 0 additions & 3 deletions tests/src/test/java/org/everit/json/schema/RelativeURITest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/
package org.everit.json.schema;

import org.eclipse.jetty.server.Server;
import org.everit.json.schema.loader.SchemaLoader;
import org.json.JSONObject;
import org.json.JSONTokener;
Expand All @@ -25,8 +24,6 @@

public class RelativeURITest {

private Server server;

@Test
public void test() throws URISyntaxException {
ServletSupport.withDocumentRoot("/org/everit/json/schema/relative-uri/")
Expand Down
1 change: 0 additions & 1 deletion tests/src/test/java/org/everit/json/schema/ServletSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@

import java.io.File;
import java.net.URISyntaxException;
import java.util.Objects;

import static java.util.Objects.requireNonNull;

Expand Down