Remove superfluous package

community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/BoltQuerySource.java

@@ -19,7 +19,7 @@
  */
 package org.neo4j.bolt.v1.runtime;
 
-public class BoltQuerySource
+class BoltQuerySource
 {
     final String principalName;
     final String clientName;

community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/BoltStateMachine.java

@@ -27,8 +27,6 @@
 
 import org.neo4j.bolt.security.auth.AuthenticationException;
 import org.neo4j.bolt.security.auth.AuthenticationResult;
-import org.neo4j.bolt.v1.runtime.cypher.StatementMetadata;
-import org.neo4j.bolt.v1.runtime.cypher.StatementProcessor;
 import org.neo4j.bolt.v1.runtime.spi.BoltResult;
 import org.neo4j.function.ThrowingConsumer;
 import org.neo4j.graphdb.security.AuthorizationExpiredException;

community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/cypher/CypherAdapterStream.java → community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/CypherAdapterStream.java

@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.bolt.v1.runtime.cypher;
+package org.neo4j.bolt.v1.runtime;
 
 import java.time.Clock;
 import java.util.ArrayList;
@@ -35,7 +35,7 @@
 import org.neo4j.graphdb.QueryStatistics;
 import org.neo4j.graphdb.Result;
 
-public class CypherAdapterStream extends BoltResult
+class CypherAdapterStream extends BoltResult
 {
     private final Result delegate;
     private final String[] fieldNames;

community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/cypher/ExecutionPlanConverter.java → community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/ExecutionPlanConverter.java

@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.bolt.v1.runtime.cypher;
+package org.neo4j.bolt.v1.runtime;
 
 import org.neo4j.graphdb.ExecutionPlanDescription;
 

community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/cypher/StatementMetadata.java → community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/StatementMetadata.java

@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.bolt.v1.runtime.cypher;
+package org.neo4j.bolt.v1.runtime;
 
 /**
  * Metadata that becomes available as soon as a statement is started, and is sent to the client before the result
  * stream is sent.
  */
-public interface StatementMetadata
+interface StatementMetadata
 {
     String[] fieldNames();
 }

community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/cypher/StatementProcessor.java → community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/StatementProcessor.java

@@ -17,9 +17,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.bolt.v1.runtime.cypher;
+package org.neo4j.bolt.v1.runtime;
 
-import org.neo4j.bolt.v1.runtime.BoltQuerySource;
 import org.neo4j.bolt.v1.runtime.spi.BoltResult;
 import org.neo4j.function.ThrowingConsumer;
 import org.neo4j.kernel.api.exceptions.KernelException;
@@ -39,8 +38,5 @@ public interface StatementProcessor
 
     boolean hasTransaction();
 
-    // NOTE: if this interface moved to the parent package, BoltQuerySource could be package-private
-    // in fact, this entire `cypher` package does not really seem to server a special purpose, and could be merged
-    // with its parent package.
     void setQuerySource( BoltQuerySource querySource );
 }

community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/TransactionStateMachine.java

@@ -24,8 +24,6 @@
 
 import org.neo4j.bolt.security.auth.AuthenticationResult;
 import org.neo4j.bolt.v1.runtime.bookmarking.Bookmark;
-import org.neo4j.bolt.v1.runtime.cypher.StatementMetadata;
-import org.neo4j.bolt.v1.runtime.cypher.StatementProcessor;
 import org.neo4j.bolt.v1.runtime.spi.BoltResult;
 import org.neo4j.bolt.v1.runtime.spi.BookmarkResult;
 import org.neo4j.cypher.InvalidSemanticsException;

community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/TransactionStateMachineSPI.java

@@ -24,7 +24,6 @@
 import java.util.Map;
 
 import org.neo4j.bolt.v1.runtime.TransactionStateMachine.BoltResultHandle;
-import org.neo4j.bolt.v1.runtime.cypher.CypherAdapterStream;
 import org.neo4j.bolt.v1.runtime.spi.BoltResult;
 import org.neo4j.function.ThrowingAction;
 import org.neo4j.graphdb.Result;

community/bolt/src/test/java/org/neo4j/bolt/testing/BoltMatchers.java

@@ -25,7 +25,7 @@
 import org.neo4j.bolt.security.auth.AuthenticationException;
 import org.neo4j.bolt.v1.runtime.BoltConnectionFatality;
 import org.neo4j.bolt.v1.runtime.BoltStateMachine;
-import org.neo4j.bolt.v1.runtime.cypher.StatementProcessor;
+import org.neo4j.bolt.v1.runtime.StatementProcessor;
 import org.neo4j.bolt.v1.runtime.spi.Record;
 import org.neo4j.function.ThrowingAction;
 import org.neo4j.function.ThrowingBiConsumer;
@@ -36,7 +36,6 @@
 
 import static java.lang.String.format;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.lessThan;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;

community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/cypher/CypherAdapterStreamTest.java → community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/CypherAdapterStreamTest.java

@@ -17,9 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.bolt.v1.runtime.cypher;
+package org.neo4j.bolt.v1.runtime;
 
 import org.junit.Test;
+
+import org.neo4j.bolt.v1.runtime.CypherAdapterStream;
 import org.neo4j.bolt.v1.runtime.spi.Record;
 import org.neo4j.bolt.v1.runtime.spi.BoltResult;
 import org.neo4j.graphdb.ExecutionPlanDescription;

community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_2/pipes/ActualCostCalculationTest.scala

@@ -42,8 +42,8 @@ import org.neo4j.kernel.api.security.SecurityContext
 import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge
 import org.neo4j.kernel.impl.coreapi.{InternalTransaction, PropertyContainerLocker}
 import org.neo4j.kernel.impl.query.Neo4jTransactionalContextFactory
-import org.neo4j.test.TestGraphDatabaseFactory
 import org.neo4j.kernel.impl.query.clientsession.ClientSessionInfo
+import org.neo4j.test.TestGraphDatabaseFactory
 
 import scala.collection.mutable
 import scala.collection.mutable.ListBuffer