You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2023/10/09 14:42:03 UTC
[commons-rdf] branch master updated: Use Checkstyle to validate import order
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-rdf.git
The following commit(s) were added to refs/heads/master by this push:
new 9c304d94 Use Checkstyle to validate import order
9c304d94 is described below
commit 9c304d941cb2e30d083ed9adfd486f874a8eef3c
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Oct 9 10:41:58 2023 -0400
Use Checkstyle to validate import order
---
.../java/org/apache/commons/rdf/experimental/RDFParser.java | 2 +-
.../org/apache/commons/rdf/api/AbstractBlankNodeTest.java | 4 ++--
.../java/org/apache/commons/rdf/api/AbstractDatasetTest.java | 7 ++++++-
.../java/org/apache/commons/rdf/api/AbstractRDFTest.java | 5 ++++-
.../java/org/apache/commons/rdf/api/DefaultGraphTest.java | 4 +++-
.../java/org/apache/commons/rdf/api/DefaultQuadTest.java | 3 ++-
.../java/org/apache/commons/rdf/api/DummyDatasetTest.java | 4 +++-
.../test/java/org/apache/commons/rdf/api/DummyGraphTest.java | 4 +++-
.../test/java/org/apache/commons/rdf/api/DummyIRITest.java | 3 ++-
.../test/java/org/apache/commons/rdf/api/DummyQuadTest.java | 3 ++-
.../java/org/apache/commons/rdf/api/DummyTripleTest.java | 2 +-
.../test/java/org/apache/commons/rdf/api/RDFSyntaxTest.java | 3 ++-
.../src/main/java/org/apache/commons/rdf/jena/JenaRDF.java | 2 +-
.../org/apache/commons/rdf/jena/GeneralizedRDFQuadTest.java | 4 +++-
.../java/org/apache/commons/rdf/jsonldjava/JsonLdRDF.java | 2 +-
.../apache/commons/rdf/jsonldjava/JsonLdComparisonTest.java | 5 ++++-
.../src/main/java/org/apache/commons/rdf/rdf4j/RDF4J.java | 2 +-
.../commons/rdf/rdf4j/impl/AbstractRepositoryGraphLike.java | 2 +-
.../apache/commons/rdf/rdf4j/impl/InternalRDF4JFactory.java | 2 +-
.../org/apache/commons/rdf/rdf4j/impl/ModelGraphImpl.java | 2 +-
.../main/java/org/apache/commons/rdf/rdf4j/package-info.java | 4 ----
.../java/org/apache/commons/rdf/rdf4j/MemoryGraphTest.java | 2 +-
.../apache/commons/rdf/rdf4j/RDF4JMethodOverloadsTest.java | 5 ++---
.../main/java/org/apache/commons/rdf/simple/GraphImpl.java | 12 +++++++++---
.../src/main/java/org/apache/commons/rdf/simple/IRIImpl.java | 4 ++--
.../main/java/org/apache/commons/rdf/simple/QuadImpl.java | 6 +++---
.../main/java/org/apache/commons/rdf/simple/SimpleRDF.java | 2 +-
.../main/java/org/apache/commons/rdf/simple/TripleImpl.java | 4 ++--
.../src/main/java/org/apache/commons/rdf/simple/Types.java | 4 ++--
.../commons/rdf/simple/experimental/AbstractRDFParser.java | 2 +-
.../org/apache/commons/rdf/simple/SimpleDatasetTest.java | 2 +-
.../rdf/simple/experimental/AbstractRDFParserTest.java | 3 ++-
src/conf/checkstyle.xml | 6 ++++++
33 files changed, 76 insertions(+), 45 deletions(-)
diff --git a/commons-rdf-api/src/main/java/org/apache/commons/rdf/experimental/RDFParser.java b/commons-rdf-api/src/main/java/org/apache/commons/rdf/experimental/RDFParser.java
index 25019236..a0b80d3e 100644
--- a/commons-rdf-api/src/main/java/org/apache/commons/rdf/experimental/RDFParser.java
+++ b/commons-rdf-api/src/main/java/org/apache/commons/rdf/experimental/RDFParser.java
@@ -30,9 +30,9 @@ import org.apache.commons.rdf.api.Dataset;
import org.apache.commons.rdf.api.Graph;
import org.apache.commons.rdf.api.IRI;
import org.apache.commons.rdf.api.Quad;
+import org.apache.commons.rdf.api.RDF;
import org.apache.commons.rdf.api.RDFSyntax;
import org.apache.commons.rdf.api.RDFTerm;
-import org.apache.commons.rdf.api.RDF;
import org.apache.commons.rdf.api.Triple;
/**
diff --git a/commons-rdf-api/src/test/java/org/apache/commons/rdf/api/AbstractBlankNodeTest.java b/commons-rdf-api/src/test/java/org/apache/commons/rdf/api/AbstractBlankNodeTest.java
index e091a0ba..7938d9e9 100644
--- a/commons-rdf-api/src/test/java/org/apache/commons/rdf/api/AbstractBlankNodeTest.java
+++ b/commons-rdf-api/src/test/java/org/apache/commons/rdf/api/AbstractBlankNodeTest.java
@@ -17,11 +17,11 @@
*/
package org.apache.commons.rdf.api;
-import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
+import org.junit.Test;
+
/**
* Abstract test class for the BlankNode interface.
*/
diff --git a/commons-rdf-api/src/test/java/org/apache/commons/rdf/api/AbstractDatasetTest.java b/commons-rdf-api/src/test/java/org/apache/commons/rdf/api/AbstractDatasetTest.java
index e931afcf..1e3b1ffb 100644
--- a/commons-rdf-api/src/test/java/org/apache/commons/rdf/api/AbstractDatasetTest.java
+++ b/commons-rdf-api/src/test/java/org/apache/commons/rdf/api/AbstractDatasetTest.java
@@ -17,7 +17,12 @@
*/
package org.apache.commons.rdf.api;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.util.ArrayList;
import java.util.HashSet;
diff --git a/commons-rdf-api/src/test/java/org/apache/commons/rdf/api/AbstractRDFTest.java b/commons-rdf-api/src/test/java/org/apache/commons/rdf/api/AbstractRDFTest.java
index 5c5e233d..c5b3d56d 100644
--- a/commons-rdf-api/src/test/java/org/apache/commons/rdf/api/AbstractRDFTest.java
+++ b/commons-rdf-api/src/test/java/org/apache/commons/rdf/api/AbstractRDFTest.java
@@ -17,7 +17,10 @@
*/
package org.apache.commons.rdf.api;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotSame;
import java.util.Locale;
import java.util.Objects;
diff --git a/commons-rdf-api/src/test/java/org/apache/commons/rdf/api/DefaultGraphTest.java b/commons-rdf-api/src/test/java/org/apache/commons/rdf/api/DefaultGraphTest.java
index 6109d81a..c4122b20 100644
--- a/commons-rdf-api/src/test/java/org/apache/commons/rdf/api/DefaultGraphTest.java
+++ b/commons-rdf-api/src/test/java/org/apache/commons/rdf/api/DefaultGraphTest.java
@@ -17,7 +17,9 @@
*/
package org.apache.commons.rdf.api;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import org.junit.Test;
diff --git a/commons-rdf-api/src/test/java/org/apache/commons/rdf/api/DefaultQuadTest.java b/commons-rdf-api/src/test/java/org/apache/commons/rdf/api/DefaultQuadTest.java
index 9f18277d..e894b8d1 100644
--- a/commons-rdf-api/src/test/java/org/apache/commons/rdf/api/DefaultQuadTest.java
+++ b/commons-rdf-api/src/test/java/org/apache/commons/rdf/api/DefaultQuadTest.java
@@ -17,7 +17,8 @@
*/
package org.apache.commons.rdf.api;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
import java.util.Objects;
diff --git a/commons-rdf-api/src/test/java/org/apache/commons/rdf/api/DummyDatasetTest.java b/commons-rdf-api/src/test/java/org/apache/commons/rdf/api/DummyDatasetTest.java
index 6b36cc3a..b633f8fd 100644
--- a/commons-rdf-api/src/test/java/org/apache/commons/rdf/api/DummyDatasetTest.java
+++ b/commons-rdf-api/src/test/java/org/apache/commons/rdf/api/DummyDatasetTest.java
@@ -17,7 +17,9 @@
*/
package org.apache.commons.rdf.api;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import org.junit.Test;
diff --git a/commons-rdf-api/src/test/java/org/apache/commons/rdf/api/DummyGraphTest.java b/commons-rdf-api/src/test/java/org/apache/commons/rdf/api/DummyGraphTest.java
index fb05a2be..39bee0e5 100644
--- a/commons-rdf-api/src/test/java/org/apache/commons/rdf/api/DummyGraphTest.java
+++ b/commons-rdf-api/src/test/java/org/apache/commons/rdf/api/DummyGraphTest.java
@@ -17,7 +17,9 @@
*/
package org.apache.commons.rdf.api;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import org.junit.Test;
diff --git a/commons-rdf-api/src/test/java/org/apache/commons/rdf/api/DummyIRITest.java b/commons-rdf-api/src/test/java/org/apache/commons/rdf/api/DummyIRITest.java
index c40e0d75..f47b5428 100644
--- a/commons-rdf-api/src/test/java/org/apache/commons/rdf/api/DummyIRITest.java
+++ b/commons-rdf-api/src/test/java/org/apache/commons/rdf/api/DummyIRITest.java
@@ -17,7 +17,8 @@
*/
package org.apache.commons.rdf.api;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
import org.junit.Test;
diff --git a/commons-rdf-api/src/test/java/org/apache/commons/rdf/api/DummyQuadTest.java b/commons-rdf-api/src/test/java/org/apache/commons/rdf/api/DummyQuadTest.java
index c9cceaf4..30b42c18 100644
--- a/commons-rdf-api/src/test/java/org/apache/commons/rdf/api/DummyQuadTest.java
+++ b/commons-rdf-api/src/test/java/org/apache/commons/rdf/api/DummyQuadTest.java
@@ -17,7 +17,8 @@
*/
package org.apache.commons.rdf.api;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import java.util.Objects;
diff --git a/commons-rdf-api/src/test/java/org/apache/commons/rdf/api/DummyTripleTest.java b/commons-rdf-api/src/test/java/org/apache/commons/rdf/api/DummyTripleTest.java
index d4e8d239..efed20bf 100644
--- a/commons-rdf-api/src/test/java/org/apache/commons/rdf/api/DummyTripleTest.java
+++ b/commons-rdf-api/src/test/java/org/apache/commons/rdf/api/DummyTripleTest.java
@@ -17,7 +17,7 @@
*/
package org.apache.commons.rdf.api;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
import java.util.Objects;
diff --git a/commons-rdf-api/src/test/java/org/apache/commons/rdf/api/RDFSyntaxTest.java b/commons-rdf-api/src/test/java/org/apache/commons/rdf/api/RDFSyntaxTest.java
index 1cd59d36..7a6786c3 100644
--- a/commons-rdf-api/src/test/java/org/apache/commons/rdf/api/RDFSyntaxTest.java
+++ b/commons-rdf-api/src/test/java/org/apache/commons/rdf/api/RDFSyntaxTest.java
@@ -17,7 +17,8 @@
*/
package org.apache.commons.rdf.api;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
import java.util.Optional;
diff --git a/commons-rdf-jena/src/main/java/org/apache/commons/rdf/jena/JenaRDF.java b/commons-rdf-jena/src/main/java/org/apache/commons/rdf/jena/JenaRDF.java
index a7511c70..d99925c1 100644
--- a/commons-rdf-jena/src/main/java/org/apache/commons/rdf/jena/JenaRDF.java
+++ b/commons-rdf-jena/src/main/java/org/apache/commons/rdf/jena/JenaRDF.java
@@ -29,9 +29,9 @@ import org.apache.commons.rdf.api.IRI;
import org.apache.commons.rdf.api.Literal;
import org.apache.commons.rdf.api.Quad;
import org.apache.commons.rdf.api.QuadLike;
+import org.apache.commons.rdf.api.RDF;
import org.apache.commons.rdf.api.RDFSyntax;
import org.apache.commons.rdf.api.RDFTerm;
-import org.apache.commons.rdf.api.RDF;
import org.apache.commons.rdf.api.Triple;
import org.apache.commons.rdf.api.TripleLike;
import org.apache.commons.rdf.jena.impl.InternalJenaFactory;
diff --git a/commons-rdf-jena/src/test/java/org/apache/commons/rdf/jena/GeneralizedRDFQuadTest.java b/commons-rdf-jena/src/test/java/org/apache/commons/rdf/jena/GeneralizedRDFQuadTest.java
index 5877b825..75806262 100644
--- a/commons-rdf-jena/src/test/java/org/apache/commons/rdf/jena/GeneralizedRDFQuadTest.java
+++ b/commons-rdf-jena/src/test/java/org/apache/commons/rdf/jena/GeneralizedRDFQuadTest.java
@@ -17,7 +17,9 @@
*/
package org.apache.commons.rdf.jena;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import org.apache.commons.rdf.api.BlankNode;
import org.apache.commons.rdf.api.RDFTerm;
diff --git a/commons-rdf-jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDF.java b/commons-rdf-jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDF.java
index f01251c9..31d975bf 100644
--- a/commons-rdf-jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDF.java
+++ b/commons-rdf-jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDF.java
@@ -27,8 +27,8 @@ import org.apache.commons.rdf.api.Dataset;
import org.apache.commons.rdf.api.Graph;
import org.apache.commons.rdf.api.IRI;
import org.apache.commons.rdf.api.Literal;
-import org.apache.commons.rdf.api.RDFTerm;
import org.apache.commons.rdf.api.RDF;
+import org.apache.commons.rdf.api.RDFTerm;
import org.apache.commons.rdf.api.Triple;
import org.apache.commons.rdf.simple.Types;
diff --git a/commons-rdf-jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdComparisonTest.java b/commons-rdf-jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdComparisonTest.java
index 742a5e5b..5819ac39 100644
--- a/commons-rdf-jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdComparisonTest.java
+++ b/commons-rdf-jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdComparisonTest.java
@@ -17,7 +17,10 @@
*/
package org.apache.commons.rdf.jsonldjava;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertTrue;
import java.util.Optional;
diff --git a/commons-rdf-rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4J.java b/commons-rdf-rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4J.java
index 6a2a057b..7dcfc279 100644
--- a/commons-rdf-rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4J.java
+++ b/commons-rdf-rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4J.java
@@ -31,8 +31,8 @@ import org.apache.commons.rdf.api.BlankNodeOrIRI;
import org.apache.commons.rdf.api.Dataset;
import org.apache.commons.rdf.api.Graph;
import org.apache.commons.rdf.api.Quad;
-import org.apache.commons.rdf.api.RDFTerm;
import org.apache.commons.rdf.api.RDF;
+import org.apache.commons.rdf.api.RDFTerm;
import org.apache.commons.rdf.api.Triple;
import org.apache.commons.rdf.api.TripleLike;
import org.apache.commons.rdf.rdf4j.impl.InternalRDF4JFactory;
diff --git a/commons-rdf-rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/AbstractRepositoryGraphLike.java b/commons-rdf-rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/AbstractRepositoryGraphLike.java
index 21eef049..2276c59f 100644
--- a/commons-rdf-rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/AbstractRepositoryGraphLike.java
+++ b/commons-rdf-rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/AbstractRepositoryGraphLike.java
@@ -21,8 +21,8 @@ import java.util.Optional;
import java.util.UUID;
import org.apache.commons.rdf.api.TripleLike;
-import org.apache.commons.rdf.rdf4j.RDF4JGraphLike;
import org.apache.commons.rdf.rdf4j.RDF4J;
+import org.apache.commons.rdf.rdf4j.RDF4JGraphLike;
import org.eclipse.rdf4j.model.Model;
import org.eclipse.rdf4j.model.Statement;
import org.eclipse.rdf4j.repository.Repository;
diff --git a/commons-rdf-rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/InternalRDF4JFactory.java b/commons-rdf-rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/InternalRDF4JFactory.java
index 6bf685a6..9e49bd24 100644
--- a/commons-rdf-rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/InternalRDF4JFactory.java
+++ b/commons-rdf-rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/InternalRDF4JFactory.java
@@ -20,6 +20,7 @@ package org.apache.commons.rdf.rdf4j.impl;
import java.util.UUID;
import org.apache.commons.rdf.api.BlankNode;
+import org.apache.commons.rdf.rdf4j.RDF4J;
import org.apache.commons.rdf.rdf4j.RDF4JBlankNode;
import org.apache.commons.rdf.rdf4j.RDF4JDataset;
import org.apache.commons.rdf.rdf4j.RDF4JGraph;
@@ -27,7 +28,6 @@ import org.apache.commons.rdf.rdf4j.RDF4JIRI;
import org.apache.commons.rdf.rdf4j.RDF4JLiteral;
import org.apache.commons.rdf.rdf4j.RDF4JQuad;
import org.apache.commons.rdf.rdf4j.RDF4JTerm;
-import org.apache.commons.rdf.rdf4j.RDF4J;
import org.apache.commons.rdf.rdf4j.RDF4JTriple;
import org.eclipse.rdf4j.model.BNode;
import org.eclipse.rdf4j.model.IRI;
diff --git a/commons-rdf-rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/ModelGraphImpl.java b/commons-rdf-rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/ModelGraphImpl.java
index 683f42cc..7827712c 100644
--- a/commons-rdf-rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/ModelGraphImpl.java
+++ b/commons-rdf-rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/ModelGraphImpl.java
@@ -29,9 +29,9 @@ import org.apache.commons.rdf.api.IRI;
import org.apache.commons.rdf.api.RDFTerm;
import org.apache.commons.rdf.api.Triple;
import org.apache.commons.rdf.rdf4j.ClosableIterable;
+import org.apache.commons.rdf.rdf4j.RDF4J;
import org.apache.commons.rdf.rdf4j.RDF4JBlankNodeOrIRI;
import org.apache.commons.rdf.rdf4j.RDF4JGraph;
-import org.apache.commons.rdf.rdf4j.RDF4J;
import org.apache.commons.rdf.rdf4j.RDF4JTriple;
import org.eclipse.rdf4j.model.Model;
import org.eclipse.rdf4j.model.Resource;
diff --git a/commons-rdf-rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/package-info.java b/commons-rdf-rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/package-info.java
index 03ed0a7e..dbe0dd1b 100644
--- a/commons-rdf-rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/package-info.java
+++ b/commons-rdf-rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/package-info.java
@@ -42,7 +42,3 @@
* adapted {@link org.apache.commons.rdf.rdf4j.RDF4JGraph}
*/
package org.apache.commons.rdf.rdf4j;
-
-// Imports for Javadoc, do not remove
-import org.apache.commons.rdf.api.Dataset;
-import org.apache.commons.rdf.api.Graph;
diff --git a/commons-rdf-rdf4j/src/test/java/org/apache/commons/rdf/rdf4j/MemoryGraphTest.java b/commons-rdf-rdf4j/src/test/java/org/apache/commons/rdf/rdf4j/MemoryGraphTest.java
index 597c7d7b..42fb1dc7 100644
--- a/commons-rdf-rdf4j/src/test/java/org/apache/commons/rdf/rdf4j/MemoryGraphTest.java
+++ b/commons-rdf-rdf4j/src/test/java/org/apache/commons/rdf/rdf4j/MemoryGraphTest.java
@@ -23,8 +23,8 @@ import org.apache.commons.rdf.api.Dataset;
import org.apache.commons.rdf.api.IRI;
import org.apache.commons.rdf.api.Literal;
import org.apache.commons.rdf.api.Quad;
-import org.apache.commons.rdf.api.RDFTerm;
import org.apache.commons.rdf.api.RDF;
+import org.apache.commons.rdf.api.RDFTerm;
import org.eclipse.rdf4j.repository.Repository;
import org.eclipse.rdf4j.repository.sail.SailRepository;
import org.eclipse.rdf4j.sail.Sail;
diff --git a/commons-rdf-rdf4j/src/test/java/org/apache/commons/rdf/rdf4j/RDF4JMethodOverloadsTest.java b/commons-rdf-rdf4j/src/test/java/org/apache/commons/rdf/rdf4j/RDF4JMethodOverloadsTest.java
index ae48ba87..628bc580 100644
--- a/commons-rdf-rdf4j/src/test/java/org/apache/commons/rdf/rdf4j/RDF4JMethodOverloadsTest.java
+++ b/commons-rdf-rdf4j/src/test/java/org/apache/commons/rdf/rdf4j/RDF4JMethodOverloadsTest.java
@@ -17,6 +17,8 @@
*/
package org.apache.commons.rdf.rdf4j;
+import static org.junit.Assert.assertEquals;
+
import org.eclipse.rdf4j.model.BNode;
import org.eclipse.rdf4j.model.IRI;
import org.eclipse.rdf4j.model.Literal;
@@ -24,11 +26,8 @@ import org.eclipse.rdf4j.model.Resource;
import org.eclipse.rdf4j.model.Value;
import org.eclipse.rdf4j.model.ValueFactory;
import org.eclipse.rdf4j.model.impl.SimpleValueFactory;
-
import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-
public class RDF4JMethodOverloadsTest {
@Test
diff --git a/commons-rdf-simple/src/main/java/org/apache/commons/rdf/simple/GraphImpl.java b/commons-rdf-simple/src/main/java/org/apache/commons/rdf/simple/GraphImpl.java
index 7ec7589a..ac4f7dc9 100644
--- a/commons-rdf-simple/src/main/java/org/apache/commons/rdf/simple/GraphImpl.java
+++ b/commons-rdf-simple/src/main/java/org/apache/commons/rdf/simple/GraphImpl.java
@@ -17,15 +17,21 @@
*/
package org.apache.commons.rdf.simple;
-import org.apache.commons.rdf.api.*;
-import org.apache.commons.rdf.simple.SimpleRDF.SimpleRDFTerm;
-
import java.util.HashSet;
import java.util.Set;
import java.util.function.Predicate;
import java.util.stream.Collectors;
import java.util.stream.Stream;
+import org.apache.commons.rdf.api.BlankNode;
+import org.apache.commons.rdf.api.BlankNodeOrIRI;
+import org.apache.commons.rdf.api.Graph;
+import org.apache.commons.rdf.api.IRI;
+import org.apache.commons.rdf.api.Literal;
+import org.apache.commons.rdf.api.RDFTerm;
+import org.apache.commons.rdf.api.Triple;
+import org.apache.commons.rdf.simple.SimpleRDF.SimpleRDFTerm;
+
/**
* A simple, memory-based implementation of Graph.
* <p>
diff --git a/commons-rdf-simple/src/main/java/org/apache/commons/rdf/simple/IRIImpl.java b/commons-rdf-simple/src/main/java/org/apache/commons/rdf/simple/IRIImpl.java
index 114eef1e..ebdbf7bb 100644
--- a/commons-rdf-simple/src/main/java/org/apache/commons/rdf/simple/IRIImpl.java
+++ b/commons-rdf-simple/src/main/java/org/apache/commons/rdf/simple/IRIImpl.java
@@ -17,10 +17,10 @@
*/
package org.apache.commons.rdf.simple;
-import org.apache.commons.rdf.api.IRI;
-
import java.net.URI;
+import org.apache.commons.rdf.api.IRI;
+
/**
* A simple implementation of IRI.
*/
diff --git a/commons-rdf-simple/src/main/java/org/apache/commons/rdf/simple/QuadImpl.java b/commons-rdf-simple/src/main/java/org/apache/commons/rdf/simple/QuadImpl.java
index 51bef698..c8815592 100644
--- a/commons-rdf-simple/src/main/java/org/apache/commons/rdf/simple/QuadImpl.java
+++ b/commons-rdf-simple/src/main/java/org/apache/commons/rdf/simple/QuadImpl.java
@@ -17,15 +17,15 @@
*/
package org.apache.commons.rdf.simple;
+import java.util.Objects;
+import java.util.Optional;
+
import org.apache.commons.rdf.api.BlankNodeOrIRI;
import org.apache.commons.rdf.api.IRI;
import org.apache.commons.rdf.api.Quad;
import org.apache.commons.rdf.api.RDFTerm;
import org.apache.commons.rdf.api.Triple;
-import java.util.Objects;
-import java.util.Optional;
-
/**
* A simple implementation of Quad.
*/
diff --git a/commons-rdf-simple/src/main/java/org/apache/commons/rdf/simple/SimpleRDF.java b/commons-rdf-simple/src/main/java/org/apache/commons/rdf/simple/SimpleRDF.java
index 9ea2555b..28af6fb4 100644
--- a/commons-rdf-simple/src/main/java/org/apache/commons/rdf/simple/SimpleRDF.java
+++ b/commons-rdf-simple/src/main/java/org/apache/commons/rdf/simple/SimpleRDF.java
@@ -26,8 +26,8 @@ import org.apache.commons.rdf.api.Graph;
import org.apache.commons.rdf.api.IRI;
import org.apache.commons.rdf.api.Literal;
import org.apache.commons.rdf.api.Quad;
-import org.apache.commons.rdf.api.RDFTerm;
import org.apache.commons.rdf.api.RDF;
+import org.apache.commons.rdf.api.RDFTerm;
import org.apache.commons.rdf.api.Triple;
/**
diff --git a/commons-rdf-simple/src/main/java/org/apache/commons/rdf/simple/TripleImpl.java b/commons-rdf-simple/src/main/java/org/apache/commons/rdf/simple/TripleImpl.java
index ef527ce8..f7a9eeb9 100644
--- a/commons-rdf-simple/src/main/java/org/apache/commons/rdf/simple/TripleImpl.java
+++ b/commons-rdf-simple/src/main/java/org/apache/commons/rdf/simple/TripleImpl.java
@@ -17,13 +17,13 @@
*/
package org.apache.commons.rdf.simple;
+import java.util.Objects;
+
import org.apache.commons.rdf.api.BlankNodeOrIRI;
import org.apache.commons.rdf.api.IRI;
import org.apache.commons.rdf.api.RDFTerm;
import org.apache.commons.rdf.api.Triple;
-import java.util.Objects;
-
/**
* A simple implementation of Triple.
*/
diff --git a/commons-rdf-simple/src/main/java/org/apache/commons/rdf/simple/Types.java b/commons-rdf-simple/src/main/java/org/apache/commons/rdf/simple/Types.java
index 650c2e11..dd309fcd 100644
--- a/commons-rdf-simple/src/main/java/org/apache/commons/rdf/simple/Types.java
+++ b/commons-rdf-simple/src/main/java/org/apache/commons/rdf/simple/Types.java
@@ -17,13 +17,13 @@
*/
package org.apache.commons.rdf.simple;
-import org.apache.commons.rdf.api.IRI;
-
import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.Optional;
import java.util.Set;
+import org.apache.commons.rdf.api.IRI;
+
/**
* Types from the RDF and XML Schema vocabularies.
*/
diff --git a/commons-rdf-simple/src/main/java/org/apache/commons/rdf/simple/experimental/AbstractRDFParser.java b/commons-rdf-simple/src/main/java/org/apache/commons/rdf/simple/experimental/AbstractRDFParser.java
index 40cbcb25..d799f870 100644
--- a/commons-rdf-simple/src/main/java/org/apache/commons/rdf/simple/experimental/AbstractRDFParser.java
+++ b/commons-rdf-simple/src/main/java/org/apache/commons/rdf/simple/experimental/AbstractRDFParser.java
@@ -32,8 +32,8 @@ import org.apache.commons.rdf.api.Dataset;
import org.apache.commons.rdf.api.Graph;
import org.apache.commons.rdf.api.IRI;
import org.apache.commons.rdf.api.Quad;
-import org.apache.commons.rdf.api.RDFSyntax;
import org.apache.commons.rdf.api.RDF;
+import org.apache.commons.rdf.api.RDFSyntax;
import org.apache.commons.rdf.experimental.RDFParser;
import org.apache.commons.rdf.simple.SimpleRDF;
diff --git a/commons-rdf-simple/src/test/java/org/apache/commons/rdf/simple/SimpleDatasetTest.java b/commons-rdf-simple/src/test/java/org/apache/commons/rdf/simple/SimpleDatasetTest.java
index 630ab07c..a5eab4fd 100644
--- a/commons-rdf-simple/src/test/java/org/apache/commons/rdf/simple/SimpleDatasetTest.java
+++ b/commons-rdf-simple/src/test/java/org/apache/commons/rdf/simple/SimpleDatasetTest.java
@@ -17,7 +17,7 @@
*/
package org.apache.commons.rdf.simple;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertTrue;
import org.apache.commons.rdf.api.AbstractDatasetTest;
import org.apache.commons.rdf.api.RDF;
diff --git a/commons-rdf-simple/src/test/java/org/apache/commons/rdf/simple/experimental/AbstractRDFParserTest.java b/commons-rdf-simple/src/test/java/org/apache/commons/rdf/simple/experimental/AbstractRDFParserTest.java
index 5113f226..8e2cf986 100644
--- a/commons-rdf-simple/src/test/java/org/apache/commons/rdf/simple/experimental/AbstractRDFParserTest.java
+++ b/commons-rdf-simple/src/test/java/org/apache/commons/rdf/simple/experimental/AbstractRDFParserTest.java
@@ -22,6 +22,7 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assume.assumeNotNull;
+
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -32,9 +33,9 @@ import java.util.concurrent.TimeUnit;
import org.apache.commons.rdf.api.Graph;
import org.apache.commons.rdf.api.IRI;
import org.apache.commons.rdf.api.Literal;
+import org.apache.commons.rdf.api.RDF;
import org.apache.commons.rdf.api.RDFSyntax;
import org.apache.commons.rdf.api.RDFTerm;
-import org.apache.commons.rdf.api.RDF;
import org.apache.commons.rdf.api.Triple;
import org.apache.commons.rdf.experimental.RDFParser;
import org.apache.commons.rdf.simple.DummyRDFParserBuilder;
diff --git a/src/conf/checkstyle.xml b/src/conf/checkstyle.xml
index fe5f4f13..f81c7716 100644
--- a/src/conf/checkstyle.xml
+++ b/src/conf/checkstyle.xml
@@ -174,6 +174,12 @@ limitations under the License.
<!-- Required for SuppressionCommentFilter below -->
<module name="FileContentsHolder"/>
+ <module name="ImportOrder">
+ <property name="option" value="top"/>
+ <property name="groups" value="java,javax,org"/>
+ <property name="ordered" value="true"/>
+ <property name="separated" value="true"/>
+ </module>
</module>