Move package v1.internal to internal

o We should fan out to versions inside internal; not outside of it
o Rename {Standard|Simple} -> Internal

Author: boggle

driver/src/main/java/org/neo4j/driver/v1/internal/AsValue.java renamed to driver/src/main/java/org/neo4j/driver/internal/AsValue.java

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.neo4j.driver.v1.internal;
+package org.neo4j.driver.internal;
 
 import org.neo4j.driver.v1.Value;
 

driver/src/main/java/org/neo4j/driver/v1/internal/Identities.java renamed to driver/src/main/java/org/neo4j/driver/internal/Identities.java

@@ -16,14 +16,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.neo4j.driver.v1.internal;
+package org.neo4j.driver.internal;
 
 import org.neo4j.driver.v1.Identity;
 
 public class Identities
 {
     public static Identity identity( long raw )
     {
-        return new SimpleIdentity( raw );
+        return new InternalIdentity( raw );
     }
 }

driver/src/main/java/org/neo4j/driver/v1/internal/SimpleEntity.java renamed to driver/src/main/java/org/neo4j/driver/internal/InternalEntity.java

@@ -16,28 +16,28 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.neo4j.driver.v1.internal;
+package org.neo4j.driver.internal;
 
 import java.util.Map;
 
+import org.neo4j.driver.internal.util.Extract;
+import org.neo4j.driver.internal.util.Iterables;
+import org.neo4j.driver.internal.value.MapValue;
 import org.neo4j.driver.v1.Entity;
 import org.neo4j.driver.v1.Function;
 import org.neo4j.driver.v1.Identity;
 import org.neo4j.driver.v1.Property;
 import org.neo4j.driver.v1.Value;
 import org.neo4j.driver.v1.Values;
-import org.neo4j.driver.v1.internal.util.Extract;
-import org.neo4j.driver.v1.internal.util.Iterables;
-import org.neo4j.driver.v1.internal.value.MapValue;
 
 import static org.neo4j.driver.v1.Values.valueAsIs;
 
-public abstract class SimpleEntity implements Entity, AsValue
+public abstract class InternalEntity implements Entity, AsValue
 {
     private final Identity id;
     private final Map<String,Value> properties;
 
-    public SimpleEntity( Identity id, Map<String,Value> properties )
+    public InternalEntity( Identity id, Map<String, Value> properties )
     {
         this.id = id;
         this.properties = properties;
@@ -52,7 +52,7 @@ public Identity identity()
     @Override
     public Property property( String key )
     {
-        return SimpleProperty.of( key, value( key ) );
+        return InternalProperty.of( key, value( key ) );
     }
 
     public int propertyCount()
@@ -77,7 +77,7 @@ public boolean equals( Object o )
             return false;
         }
 
-        SimpleEntity that = (SimpleEntity) o;
+        InternalEntity that = (InternalEntity) o;
 
         return id.equals( that.id );
 

driver/src/main/java/org/neo4j/driver/v1/internal/SimpleField.java renamed to driver/src/main/java/org/neo4j/driver/internal/InternalField.java

@@ -16,15 +16,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.neo4j.driver.v1.internal;
+package org.neo4j.driver.internal;
 
 import org.neo4j.driver.v1.Field;
 
-public class SimpleField<V> extends SimpleProperty<V> implements Field<V>
+public class InternalField<V> extends InternalProperty<V> implements Field<V>
 {
     private final int index;
 
-    public SimpleField( String key, int index, V value )
+    public InternalField( String key, int index, V value )
     {
         super( key, value );
         this.index = index;
@@ -38,6 +38,6 @@ public int index()
 
     public static <V> Field<V> of( String key, int index, V value )
     {
-        return new SimpleField<>( key, index, value );
+        return new InternalField<>( key, index, value );
     }
 }

driver/src/main/java/org/neo4j/driver/v1/internal/SimpleIdentity.java renamed to driver/src/main/java/org/neo4j/driver/internal/InternalIdentity.java

@@ -16,17 +16,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.neo4j.driver.v1.internal;
+package org.neo4j.driver.internal;
 
+import org.neo4j.driver.internal.value.IdentityValue;
 import org.neo4j.driver.v1.Identity;
 import org.neo4j.driver.v1.Value;
-import org.neo4j.driver.v1.internal.value.IdentityValue;
 
-public class SimpleIdentity implements Identity, AsValue
+public class InternalIdentity implements Identity, AsValue
 {
     private final long raw;
 
-    public SimpleIdentity( long raw )
+    public InternalIdentity( long raw )
     {
         this.raw = raw;
     }
@@ -55,7 +55,7 @@ public boolean equals( Object o )
             return false;
         }
 
-        SimpleIdentity that = (SimpleIdentity) o;
+        InternalIdentity that = (InternalIdentity) o;
 
         return raw == that.raw;
 

driver/src/main/java/org/neo4j/driver/v1/internal/SimpleNode.java renamed to driver/src/main/java/org/neo4j/driver/internal/InternalNode.java

@@ -16,35 +16,35 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.neo4j.driver.v1.internal;
+package org.neo4j.driver.internal;
 
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
 
+import org.neo4j.driver.internal.value.NodeValue;
 import org.neo4j.driver.v1.Identity;
 import org.neo4j.driver.v1.Node;
 import org.neo4j.driver.v1.Value;
-import org.neo4j.driver.v1.internal.value.NodeValue;
 
 /**
  * {@link Node} implementation that directly contains labels and properties.
  */
-public class SimpleNode extends SimpleEntity implements Node
+public class InternalNode extends InternalEntity implements Node
 {
     private final Collection<String> labels;
 
-    public SimpleNode( long id )
+    public InternalNode( long id )
     {
         this( id, Collections.<String>emptyList(), Collections.<String,Value>emptyMap() );
     }
 
-    public SimpleNode( long id, Collection<String> labels, Map<String,Value> properties )
+    public InternalNode( long id, Collection<String> labels, Map<String, Value> properties )
     {
         this( Identities.identity( id ), labels, properties );
     }
 
-    public SimpleNode( Identity identity, Collection<String> labels, Map<String,Value> properties )
+    public InternalNode( Identity identity, Collection<String> labels, Map<String, Value> properties )
     {
         super( identity, properties );
         this.labels = labels;
@@ -90,7 +90,7 @@ public boolean equals( Object o )
             return false;
         }
 
-        SimpleNode that = (SimpleNode) o;
+        InternalNode that = (InternalNode) o;
 
         return !(labels != null ? !labels.equals( that.labels ) : that.labels != null);
 

driver/src/main/java/org/neo4j/driver/v1/internal/SimplePath.java renamed to driver/src/main/java/org/neo4j/driver/internal/InternalPath.java

@@ -16,25 +16,25 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.neo4j.driver.v1.internal;
+package org.neo4j.driver.internal;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 
+import org.neo4j.driver.internal.value.PathValue;
 import org.neo4j.driver.v1.Entity;
 import org.neo4j.driver.v1.Node;
 import org.neo4j.driver.v1.Path;
 import org.neo4j.driver.v1.Relationship;
 import org.neo4j.driver.v1.Value;
-import org.neo4j.driver.v1.internal.value.PathValue;
 
 /**
  * {@link Path} implementation that directly contains all nodes and relationships.
  */
-public class SimplePath implements Path, AsValue
+public class InternalPath implements Path, AsValue
 {
     public static class SelfContainedSegment implements Segment
     {
@@ -111,7 +111,7 @@ private static boolean isEndpoint( Node node, Relationship relationship )
     private final List<Relationship> relationships;
     private final List<Segment> segments;
 
-    public SimplePath( List<Entity> alternatingNodeAndRel )
+    public InternalPath( List<Entity> alternatingNodeAndRel )
     {
         nodes = newList( alternatingNodeAndRel.size() / 2 + 1 );
         relationships = newList( alternatingNodeAndRel.size() / 2 );
@@ -184,12 +184,12 @@ public SimplePath( List<Entity> alternatingNodeAndRel )
         buildSegments();
     }
 
-    public SimplePath( Entity... alternatingNodeAndRel )
+    public InternalPath( Entity... alternatingNodeAndRel )
     {
         this( Arrays.asList( alternatingNodeAndRel ) );
     }
 
-    public SimplePath( List<Segment> segments, List<Node> nodes, List<Relationship> relationships )
+    public InternalPath( List<Segment> segments, List<Node> nodes, List<Relationship> relationships )
     {
         this.segments = segments;
         this.nodes = nodes;
@@ -267,7 +267,7 @@ public boolean equals( Object o )
             return false;
         }
 
-        SimplePath segments1 = (SimplePath) o;
+        InternalPath segments1 = (InternalPath) o;
 
         return segments.equals( segments1.segments );
 

driver/src/main/java/org/neo4j/driver/v1/internal/SimpleProperty.java renamed to driver/src/main/java/org/neo4j/driver/internal/InternalProperty.java

@@ -16,16 +16,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.neo4j.driver.v1.internal;
+package org.neo4j.driver.internal;
 
 import org.neo4j.driver.v1.Property;
 
-public class SimpleProperty<V> implements Property<V>
+public class InternalProperty<V> implements Property<V>
 {
     private final String key;
     private final V value;
 
-    protected SimpleProperty( String key, V value )
+    protected InternalProperty( String key, V value )
     {
         this.key = key;
         this.value = value;
@@ -43,7 +43,7 @@ public V value()
 
     public static <V> Property<V> of( String key, V value )
     {
-        return new SimpleProperty<>( key, value );
+        return new InternalProperty<>( key, value );
     }
 
     @Override
@@ -58,7 +58,7 @@ public boolean equals( Object o )
             return false;
         }
 
-        SimpleProperty<?> that = (SimpleProperty<?>) o;
+        InternalProperty<?> that = (InternalProperty<?>) o;
 
         return key.equals( that.key ) && value.equals( that.value );
     }

driver/src/main/java/org/neo4j/driver/v1/internal/SimpleRecord.java renamed to driver/src/main/java/org/neo4j/driver/internal/InternalRecord.java

@@ -16,27 +16,27 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.neo4j.driver.v1.internal;
+package org.neo4j.driver.internal;
 
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
+import org.neo4j.driver.internal.util.Extract;
 import org.neo4j.driver.v1.Function;
 import org.neo4j.driver.v1.Record;
 import org.neo4j.driver.v1.Value;
 import org.neo4j.driver.v1.Values;
-import org.neo4j.driver.v1.internal.util.Extract;
 
 import static org.neo4j.driver.v1.Values.valueAsIs;
 
-public class SimpleRecord extends SimpleRecordAccessor implements Record
+public class InternalRecord extends InternalRecordAccessor implements Record
 {
     private final List<String> keys;
     private final Map<String, Integer> keyIndexLookup;
     private final Value[] values;
 
-    public SimpleRecord( List<String> keys, Map<String, Integer> keyIndexLookup, Value[] values )
+    public InternalRecord( List<String> keys, Map<String, Integer> keyIndexLookup, Value[] values )
     {
         this.keys = keys;
         this.keyIndexLookup = keyIndexLookup;

driver/src/main/java/org/neo4j/driver/v1/internal/SimpleRecordAccessor.java renamed to driver/src/main/java/org/neo4j/driver/internal/InternalRecordAccessor.java

@@ -16,19 +16,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.neo4j.driver.v1.internal;
+package org.neo4j.driver.internal;
 
 import java.util.List;
 
+import org.neo4j.driver.internal.util.Extract;
 import org.neo4j.driver.v1.Field;
 import org.neo4j.driver.v1.Function;
 import org.neo4j.driver.v1.RecordAccessor;
 import org.neo4j.driver.v1.Value;
-import org.neo4j.driver.v1.internal.util.Extract;
 
 import static org.neo4j.driver.v1.Values.valueAsIs;
 
-public abstract class SimpleRecordAccessor implements RecordAccessor
+public abstract class InternalRecordAccessor implements RecordAccessor
 {
     @Override
     public int fieldCount()

driver/src/main/java/org/neo4j/driver/v1/internal/SimpleRelationship.java renamed to driver/src/main/java/org/neo4j/driver/internal/InternalRelationship.java

@@ -16,42 +16,42 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.neo4j.driver.v1.internal;
+package org.neo4j.driver.internal;
 
 import java.util.Collections;
 import java.util.Map;
 
+import org.neo4j.driver.internal.value.RelationshipValue;
 import org.neo4j.driver.v1.Identity;
 import org.neo4j.driver.v1.Relationship;
 import org.neo4j.driver.v1.Value;
-import org.neo4j.driver.v1.internal.value.RelationshipValue;
 
 /**
  * {@link Relationship} implementation that directly contains type and properties
  * along with {@link Identity} values for start and end nodes.
  */
-public class SimpleRelationship extends SimpleEntity implements Relationship
+public class InternalRelationship extends InternalEntity implements Relationship
 {
     private Identity start;
     private Identity end;
     private final String type;
 
-    public SimpleRelationship( long id, long start, long end, String type )
+    public InternalRelationship( long id, long start, long end, String type )
     {
         this( Identities.identity( id ), Identities.identity( start ),
                 Identities.identity( end ), type,
                 Collections.<String,Value>emptyMap() );
     }
 
-    public SimpleRelationship( long id, long start, long end, String type,
-            Map<String,Value> properties )
+    public InternalRelationship( long id, long start, long end, String type,
+                                 Map<String, Value> properties )
     {
         this( Identities.identity( id ), Identities.identity( start ),
                 Identities.identity( end ), type, properties );
     }
 
-    public SimpleRelationship( Identity id, Identity start, Identity end, String type,
-            Map<String,Value> properties )
+    public InternalRelationship( Identity id, Identity start, Identity end, String type,
+                                 Map<String, Value> properties )
     {
         super( id, properties );
         this.start = start;