Skip to content

Commit 100c389

Browse files
committed
Move package v1.internal to internal
o We should fan out to versions inside internal; not outside of it o Rename {Standard|Simple} -> Internal
1 parent d990b00 commit 100c389

File tree

153 files changed

+753
-730
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

153 files changed

+753
-730
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* See the License for the specific language governing permissions and
1717
* limitations under the License.
1818
*/
19-
package org.neo4j.driver.v1.internal;
19+
package org.neo4j.driver.internal;
2020

2121
import org.neo4j.driver.v1.Value;
2222

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
* See the License for the specific language governing permissions and
1717
* limitations under the License.
1818
*/
19-
package org.neo4j.driver.v1.internal;
19+
package org.neo4j.driver.internal;
2020

2121
import org.neo4j.driver.v1.Identity;
2222

2323
public class Identities
2424
{
2525
public static Identity identity( long raw )
2626
{
27-
return new SimpleIdentity( raw );
27+
return new InternalIdentity( raw );
2828
}
2929
}

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,28 +16,28 @@
1616
* See the License for the specific language governing permissions and
1717
* limitations under the License.
1818
*/
19-
package org.neo4j.driver.v1.internal;
19+
package org.neo4j.driver.internal;
2020

2121
import java.util.Map;
2222

23+
import org.neo4j.driver.internal.util.Extract;
24+
import org.neo4j.driver.internal.util.Iterables;
25+
import org.neo4j.driver.internal.value.MapValue;
2326
import org.neo4j.driver.v1.Entity;
2427
import org.neo4j.driver.v1.Function;
2528
import org.neo4j.driver.v1.Identity;
2629
import org.neo4j.driver.v1.Property;
2730
import org.neo4j.driver.v1.Value;
2831
import org.neo4j.driver.v1.Values;
29-
import org.neo4j.driver.v1.internal.util.Extract;
30-
import org.neo4j.driver.v1.internal.util.Iterables;
31-
import org.neo4j.driver.v1.internal.value.MapValue;
3232

3333
import static org.neo4j.driver.v1.Values.valueAsIs;
3434

35-
public abstract class SimpleEntity implements Entity, AsValue
35+
public abstract class InternalEntity implements Entity, AsValue
3636
{
3737
private final Identity id;
3838
private final Map<String,Value> properties;
3939

40-
public SimpleEntity( Identity id, Map<String,Value> properties )
40+
public InternalEntity( Identity id, Map<String, Value> properties )
4141
{
4242
this.id = id;
4343
this.properties = properties;
@@ -52,7 +52,7 @@ public Identity identity()
5252
@Override
5353
public Property property( String key )
5454
{
55-
return SimpleProperty.of( key, value( key ) );
55+
return InternalProperty.of( key, value( key ) );
5656
}
5757

5858
public int propertyCount()
@@ -77,7 +77,7 @@ public boolean equals( Object o )
7777
return false;
7878
}
7979

80-
SimpleEntity that = (SimpleEntity) o;
80+
InternalEntity that = (InternalEntity) o;
8181

8282
return id.equals( that.id );
8383

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@
1616
* See the License for the specific language governing permissions and
1717
* limitations under the License.
1818
*/
19-
package org.neo4j.driver.v1.internal;
19+
package org.neo4j.driver.internal;
2020

2121
import org.neo4j.driver.v1.Field;
2222

23-
public class SimpleField<V> extends SimpleProperty<V> implements Field<V>
23+
public class InternalField<V> extends InternalProperty<V> implements Field<V>
2424
{
2525
private final int index;
2626

27-
public SimpleField( String key, int index, V value )
27+
public InternalField( String key, int index, V value )
2828
{
2929
super( key, value );
3030
this.index = index;
@@ -38,6 +38,6 @@ public int index()
3838

3939
public static <V> Field<V> of( String key, int index, V value )
4040
{
41-
return new SimpleField<>( key, index, value );
41+
return new InternalField<>( key, index, value );
4242
}
4343
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,17 @@
1616
* See the License for the specific language governing permissions and
1717
* limitations under the License.
1818
*/
19-
package org.neo4j.driver.v1.internal;
19+
package org.neo4j.driver.internal;
2020

21+
import org.neo4j.driver.internal.value.IdentityValue;
2122
import org.neo4j.driver.v1.Identity;
2223
import org.neo4j.driver.v1.Value;
23-
import org.neo4j.driver.v1.internal.value.IdentityValue;
2424

25-
public class SimpleIdentity implements Identity, AsValue
25+
public class InternalIdentity implements Identity, AsValue
2626
{
2727
private final long raw;
2828

29-
public SimpleIdentity( long raw )
29+
public InternalIdentity( long raw )
3030
{
3131
this.raw = raw;
3232
}
@@ -55,7 +55,7 @@ public boolean equals( Object o )
5555
return false;
5656
}
5757

58-
SimpleIdentity that = (SimpleIdentity) o;
58+
InternalIdentity that = (InternalIdentity) o;
5959

6060
return raw == that.raw;
6161

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,35 +16,35 @@
1616
* See the License for the specific language governing permissions and
1717
* limitations under the License.
1818
*/
19-
package org.neo4j.driver.v1.internal;
19+
package org.neo4j.driver.internal;
2020

2121
import java.util.Collection;
2222
import java.util.Collections;
2323
import java.util.Map;
2424

25+
import org.neo4j.driver.internal.value.NodeValue;
2526
import org.neo4j.driver.v1.Identity;
2627
import org.neo4j.driver.v1.Node;
2728
import org.neo4j.driver.v1.Value;
28-
import org.neo4j.driver.v1.internal.value.NodeValue;
2929

3030
/**
3131
* {@link Node} implementation that directly contains labels and properties.
3232
*/
33-
public class SimpleNode extends SimpleEntity implements Node
33+
public class InternalNode extends InternalEntity implements Node
3434
{
3535
private final Collection<String> labels;
3636

37-
public SimpleNode( long id )
37+
public InternalNode( long id )
3838
{
3939
this( id, Collections.<String>emptyList(), Collections.<String,Value>emptyMap() );
4040
}
4141

42-
public SimpleNode( long id, Collection<String> labels, Map<String,Value> properties )
42+
public InternalNode( long id, Collection<String> labels, Map<String, Value> properties )
4343
{
4444
this( Identities.identity( id ), labels, properties );
4545
}
4646

47-
public SimpleNode( Identity identity, Collection<String> labels, Map<String,Value> properties )
47+
public InternalNode( Identity identity, Collection<String> labels, Map<String, Value> properties )
4848
{
4949
super( identity, properties );
5050
this.labels = labels;
@@ -90,7 +90,7 @@ public boolean equals( Object o )
9090
return false;
9191
}
9292

93-
SimpleNode that = (SimpleNode) o;
93+
InternalNode that = (InternalNode) o;
9494

9595
return !(labels != null ? !labels.equals( that.labels ) : that.labels != null);
9696

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,25 +16,25 @@
1616
* See the License for the specific language governing permissions and
1717
* limitations under the License.
1818
*/
19-
package org.neo4j.driver.v1.internal;
19+
package org.neo4j.driver.internal;
2020

2121
import java.util.ArrayList;
2222
import java.util.Arrays;
2323
import java.util.Collections;
2424
import java.util.Iterator;
2525
import java.util.List;
2626

27+
import org.neo4j.driver.internal.value.PathValue;
2728
import org.neo4j.driver.v1.Entity;
2829
import org.neo4j.driver.v1.Node;
2930
import org.neo4j.driver.v1.Path;
3031
import org.neo4j.driver.v1.Relationship;
3132
import org.neo4j.driver.v1.Value;
32-
import org.neo4j.driver.v1.internal.value.PathValue;
3333

3434
/**
3535
* {@link Path} implementation that directly contains all nodes and relationships.
3636
*/
37-
public class SimplePath implements Path, AsValue
37+
public class InternalPath implements Path, AsValue
3838
{
3939
public static class SelfContainedSegment implements Segment
4040
{
@@ -111,7 +111,7 @@ private static boolean isEndpoint( Node node, Relationship relationship )
111111
private final List<Relationship> relationships;
112112
private final List<Segment> segments;
113113

114-
public SimplePath( List<Entity> alternatingNodeAndRel )
114+
public InternalPath( List<Entity> alternatingNodeAndRel )
115115
{
116116
nodes = newList( alternatingNodeAndRel.size() / 2 + 1 );
117117
relationships = newList( alternatingNodeAndRel.size() / 2 );
@@ -184,12 +184,12 @@ public SimplePath( List<Entity> alternatingNodeAndRel )
184184
buildSegments();
185185
}
186186

187-
public SimplePath( Entity... alternatingNodeAndRel )
187+
public InternalPath( Entity... alternatingNodeAndRel )
188188
{
189189
this( Arrays.asList( alternatingNodeAndRel ) );
190190
}
191191

192-
public SimplePath( List<Segment> segments, List<Node> nodes, List<Relationship> relationships )
192+
public InternalPath( List<Segment> segments, List<Node> nodes, List<Relationship> relationships )
193193
{
194194
this.segments = segments;
195195
this.nodes = nodes;
@@ -267,7 +267,7 @@ public boolean equals( Object o )
267267
return false;
268268
}
269269

270-
SimplePath segments1 = (SimplePath) o;
270+
InternalPath segments1 = (InternalPath) o;
271271

272272
return segments.equals( segments1.segments );
273273

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@
1616
* See the License for the specific language governing permissions and
1717
* limitations under the License.
1818
*/
19-
package org.neo4j.driver.v1.internal;
19+
package org.neo4j.driver.internal;
2020

2121
import org.neo4j.driver.v1.Property;
2222

23-
public class SimpleProperty<V> implements Property<V>
23+
public class InternalProperty<V> implements Property<V>
2424
{
2525
private final String key;
2626
private final V value;
2727

28-
protected SimpleProperty( String key, V value )
28+
protected InternalProperty( String key, V value )
2929
{
3030
this.key = key;
3131
this.value = value;
@@ -43,7 +43,7 @@ public V value()
4343

4444
public static <V> Property<V> of( String key, V value )
4545
{
46-
return new SimpleProperty<>( key, value );
46+
return new InternalProperty<>( key, value );
4747
}
4848

4949
@Override
@@ -58,7 +58,7 @@ public boolean equals( Object o )
5858
return false;
5959
}
6060

61-
SimpleProperty<?> that = (SimpleProperty<?>) o;
61+
InternalProperty<?> that = (InternalProperty<?>) o;
6262

6363
return key.equals( that.key ) && value.equals( that.value );
6464
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,27 +16,27 @@
1616
* See the License for the specific language governing permissions and
1717
* limitations under the License.
1818
*/
19-
package org.neo4j.driver.v1.internal;
19+
package org.neo4j.driver.internal;
2020

2121
import java.util.Arrays;
2222
import java.util.List;
2323
import java.util.Map;
2424

25+
import org.neo4j.driver.internal.util.Extract;
2526
import org.neo4j.driver.v1.Function;
2627
import org.neo4j.driver.v1.Record;
2728
import org.neo4j.driver.v1.Value;
2829
import org.neo4j.driver.v1.Values;
29-
import org.neo4j.driver.v1.internal.util.Extract;
3030

3131
import static org.neo4j.driver.v1.Values.valueAsIs;
3232

33-
public class SimpleRecord extends SimpleRecordAccessor implements Record
33+
public class InternalRecord extends InternalRecordAccessor implements Record
3434
{
3535
private final List<String> keys;
3636
private final Map<String, Integer> keyIndexLookup;
3737
private final Value[] values;
3838

39-
public SimpleRecord( List<String> keys, Map<String, Integer> keyIndexLookup, Value[] values )
39+
public InternalRecord( List<String> keys, Map<String, Integer> keyIndexLookup, Value[] values )
4040
{
4141
this.keys = keys;
4242
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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,19 @@
1616
* See the License for the specific language governing permissions and
1717
* limitations under the License.
1818
*/
19-
package org.neo4j.driver.v1.internal;
19+
package org.neo4j.driver.internal;
2020

2121
import java.util.List;
2222

23+
import org.neo4j.driver.internal.util.Extract;
2324
import org.neo4j.driver.v1.Field;
2425
import org.neo4j.driver.v1.Function;
2526
import org.neo4j.driver.v1.RecordAccessor;
2627
import org.neo4j.driver.v1.Value;
27-
import org.neo4j.driver.v1.internal.util.Extract;
2828

2929
import static org.neo4j.driver.v1.Values.valueAsIs;
3030

31-
public abstract class SimpleRecordAccessor implements RecordAccessor
31+
public abstract class InternalRecordAccessor implements RecordAccessor
3232
{
3333
@Override
3434
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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,42 +16,42 @@
1616
* See the License for the specific language governing permissions and
1717
* limitations under the License.
1818
*/
19-
package org.neo4j.driver.v1.internal;
19+
package org.neo4j.driver.internal;
2020

2121
import java.util.Collections;
2222
import java.util.Map;
2323

24+
import org.neo4j.driver.internal.value.RelationshipValue;
2425
import org.neo4j.driver.v1.Identity;
2526
import org.neo4j.driver.v1.Relationship;
2627
import org.neo4j.driver.v1.Value;
27-
import org.neo4j.driver.v1.internal.value.RelationshipValue;
2828

2929
/**
3030
* {@link Relationship} implementation that directly contains type and properties
3131
* along with {@link Identity} values for start and end nodes.
3232
*/
33-
public class SimpleRelationship extends SimpleEntity implements Relationship
33+
public class InternalRelationship extends InternalEntity implements Relationship
3434
{
3535
private Identity start;
3636
private Identity end;
3737
private final String type;
3838

39-
public SimpleRelationship( long id, long start, long end, String type )
39+
public InternalRelationship( long id, long start, long end, String type )
4040
{
4141
this( Identities.identity( id ), Identities.identity( start ),
4242
Identities.identity( end ), type,
4343
Collections.<String,Value>emptyMap() );
4444
}
4545

46-
public SimpleRelationship( long id, long start, long end, String type,
47-
Map<String,Value> properties )
46+
public InternalRelationship( long id, long start, long end, String type,
47+
Map<String, Value> properties )
4848
{
4949
this( Identities.identity( id ), Identities.identity( start ),
5050
Identities.identity( end ), type, properties );
5151
}
5252

53-
public SimpleRelationship( Identity id, Identity start, Identity end, String type,
54-
Map<String,Value> properties )
53+
public InternalRelationship( Identity id, Identity start, Identity end, String type,
54+
Map<String, Value> properties )
5555
{
5656
super( id, properties );
5757
this.start = start;

0 commit comments

Comments
 (0)