Skip to content

Commit

Permalink
Remove IntPredicates
Browse files Browse the repository at this point in the history
  • Loading branch information
@davidegrohmann
davidegrohmann committed Dec 10, 2015
1 parent 72a564f commit 4ed8be2
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 84 deletions.
53 changes: 0 additions & 53 deletions community/function/src/main/java/org/neo4j/function/IntPredicates.java
View file

This file was deleted.

60 changes: 30 additions & 30 deletions community/import-tool/src/test/java/org/neo4j/tooling/ImportToolTest.java
View file
Expand Up @@ -70,7 +70,6 @@
import static org.junit.Assert.assertThat; import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail; import static org.junit.Assert.fail;
import static org.neo4j.function.IntPredicates.alwaysTrue;
import static org.neo4j.graphdb.Label.label; import static org.neo4j.graphdb.Label.label;
import static org.neo4j.graphdb.RelationshipType.withName; import static org.neo4j.graphdb.RelationshipType.withName;
import static org.neo4j.helpers.ArrayUtil.join; import static org.neo4j.helpers.ArrayUtil.join;
Expand All @@ -88,6 +87,7 @@ public class ImportToolTest
{ {
private static final int RELATIONSHIP_COUNT = 10_000; private static final int RELATIONSHIP_COUNT = 10_000;
private static final int NODE_COUNT = 100; private static final int NODE_COUNT = 100;
private static final IntPredicate TRUE = i -> true;


@Rule @Rule
public final EmbeddedDatabaseRule dbRule = new EmbeddedDatabaseRule( getClass() ).startLazily(); public final EmbeddedDatabaseRule dbRule = new EmbeddedDatabaseRule( getClass() ).startLazily();
Expand Down Expand Up @@ -125,8 +125,8 @@ public void shouldImportWithAsManyDefaultsAsAvailable() throws Exception
// WHEN // WHEN
importTool( importTool(
"--into", dbRule.getStoreDirAbsolutePath(), "--into", dbRule.getStoreDirAbsolutePath(),
"--nodes", nodeData( true, config, nodeIds, alwaysTrue() ).getAbsolutePath(), "--nodes", nodeData( true, config, nodeIds, TRUE ).getAbsolutePath(),
"--relationships", relationshipData( true, config, nodeIds, alwaysTrue(), true ).getAbsolutePath() ); "--relationships", relationshipData( true, config, nodeIds, TRUE, true ).getAbsolutePath() );


// THEN // THEN
verifyData(); verifyData();
Expand All @@ -146,10 +146,10 @@ public void shouldImportWithHeadersBeingInSeparateFiles() throws Exception
"--array-delimiter", String.valueOf( config.arrayDelimiter() ), "--array-delimiter", String.valueOf( config.arrayDelimiter() ),
"--nodes", "--nodes",
nodeHeader( config ).getAbsolutePath() + MULTI_FILE_DELIMITER + nodeHeader( config ).getAbsolutePath() + MULTI_FILE_DELIMITER +
nodeData( false, config, nodeIds, alwaysTrue() ).getAbsolutePath(), nodeData( false, config, nodeIds, TRUE ).getAbsolutePath(),
"--relationships", "--relationships",
relationshipHeader( config ).getAbsolutePath() + MULTI_FILE_DELIMITER + relationshipHeader( config ).getAbsolutePath() + MULTI_FILE_DELIMITER +
relationshipData( false, config, nodeIds, alwaysTrue(), true ).getAbsolutePath() ); relationshipData( false, config, nodeIds, TRUE, true ).getAbsolutePath() );


// THEN // THEN
verifyData(); verifyData();
Expand All @@ -171,10 +171,10 @@ public void shouldFailIfHeaderHasLessColumnsThanData() throws Exception
"--delimiter", "TAB", "--delimiter", "TAB",
"--array-delimiter", String.valueOf( config.arrayDelimiter() ), "--array-delimiter", String.valueOf( config.arrayDelimiter() ),
"--nodes", nodeHeader( config ).getAbsolutePath() + MULTI_FILE_DELIMITER + "--nodes", nodeHeader( config ).getAbsolutePath() + MULTI_FILE_DELIMITER +
nodeData( false, config, nodeIds, alwaysTrue(), Charset.defaultCharset(), extraColumns ) nodeData( false, config, nodeIds, TRUE, Charset.defaultCharset(), extraColumns )
.getAbsolutePath(), .getAbsolutePath(),
"--relationships", relationshipHeader( config ).getAbsolutePath() + MULTI_FILE_DELIMITER + "--relationships", relationshipHeader( config ).getAbsolutePath() + MULTI_FILE_DELIMITER +
relationshipData( false, config, nodeIds, alwaysTrue(), true ).getAbsolutePath() ); relationshipData( false, config, nodeIds, TRUE, true ).getAbsolutePath() );


fail( "Should have thrown exception" ); fail( "Should have thrown exception" );
} }
Expand Down Expand Up @@ -203,10 +203,10 @@ public void shouldWarnIfHeaderHasLessColumnsThanDataWhenToldTo() throws Exceptio
"--delimiter", "TAB", "--delimiter", "TAB",
"--array-delimiter", String.valueOf( config.arrayDelimiter() ), "--array-delimiter", String.valueOf( config.arrayDelimiter() ),
"--nodes", nodeHeader( config ).getAbsolutePath() + MULTI_FILE_DELIMITER + "--nodes", nodeHeader( config ).getAbsolutePath() + MULTI_FILE_DELIMITER +
nodeData( false, config, nodeIds, alwaysTrue(), Charset.defaultCharset(), extraColumns ) nodeData( false, config, nodeIds, TRUE, Charset.defaultCharset(), extraColumns )
.getAbsolutePath(), .getAbsolutePath(),
"--relationships", relationshipHeader( config ).getAbsolutePath() + MULTI_FILE_DELIMITER + "--relationships", relationshipHeader( config ).getAbsolutePath() + MULTI_FILE_DELIMITER +
relationshipData( false, config, nodeIds, alwaysTrue(), true ).getAbsolutePath() ); relationshipData( false, config, nodeIds, TRUE, true ).getAbsolutePath() );


// THEN // THEN
String badContents = FileUtils.readTextFile( bad, Charset.defaultCharset() ); String badContents = FileUtils.readTextFile( bad, Charset.defaultCharset() );
Expand Down Expand Up @@ -275,7 +275,7 @@ public void shouldImportSplitInputFiles() throws Exception
nodeData( false, config, nodeIds, lines( NODE_COUNT * 3 / 4, NODE_COUNT ) ).getAbsolutePath(), nodeData( false, config, nodeIds, lines( NODE_COUNT * 3 / 4, NODE_COUNT ) ).getAbsolutePath(),
"--relationships", "--relationships",
relationshipHeader( config ).getAbsolutePath() + MULTI_FILE_DELIMITER + relationshipHeader( config ).getAbsolutePath() + MULTI_FILE_DELIMITER +
relationshipData( false, config, nodeIds, alwaysTrue(), true ).getAbsolutePath() ); relationshipData( false, config, nodeIds, TRUE, true ).getAbsolutePath() );


// THEN // THEN
verifyData(); verifyData();
Expand Down Expand Up @@ -339,7 +339,7 @@ public void shouldImportOnlyNodes() throws Exception
// WHEN // WHEN
importTool( importTool(
"--into", dbRule.getStoreDirAbsolutePath(), "--into", dbRule.getStoreDirAbsolutePath(),
"--nodes", nodeData( true, config, nodeIds, alwaysTrue() ).getAbsolutePath() ); "--nodes", nodeData( true, config, nodeIds, TRUE ).getAbsolutePath() );
// no relationships // no relationships


// THEN // THEN
Expand Down Expand Up @@ -376,11 +376,11 @@ public void shouldImportGroupsOfOverlappingIds() throws Exception
importTool( importTool(
"--into", dbRule.getStoreDirAbsolutePath(), "--into", dbRule.getStoreDirAbsolutePath(),
"--nodes", nodeHeader( config, groupOne ) + MULTI_FILE_DELIMITER + "--nodes", nodeHeader( config, groupOne ) + MULTI_FILE_DELIMITER +
nodeData( false, config, groupOneNodeIds, alwaysTrue() ), nodeData( false, config, groupOneNodeIds, TRUE ),
"--nodes", nodeHeader( config, groupTwo ) + MULTI_FILE_DELIMITER + "--nodes", nodeHeader( config, groupTwo ) + MULTI_FILE_DELIMITER +
nodeData( false, config, groupTwoNodeIds, alwaysTrue() ), nodeData( false, config, groupTwoNodeIds, TRUE ),
"--relationships", relationshipHeader( config, groupOne, groupTwo, true ) + MULTI_FILE_DELIMITER + "--relationships", relationshipHeader( config, groupOne, groupTwo, true ) + MULTI_FILE_DELIMITER +
relationshipData( false, config, rels.iterator(), alwaysTrue(), true ) ); relationshipData( false, config, rels.iterator(), TRUE, true ) );


// THEN // THEN
GraphDatabaseService db = dbRule.getGraphDatabaseService(); GraphDatabaseService db = dbRule.getGraphDatabaseService();
Expand Down Expand Up @@ -412,9 +412,9 @@ public void shouldNotBeAbleToMixSpecifiedAndUnspecifiedGroups() throws Exception
importTool( importTool(
"--into", dbRule.getStoreDirAbsolutePath(), "--into", dbRule.getStoreDirAbsolutePath(),
"--nodes", nodeHeader( config, "MyGroup" ).getAbsolutePath() + MULTI_FILE_DELIMITER + "--nodes", nodeHeader( config, "MyGroup" ).getAbsolutePath() + MULTI_FILE_DELIMITER +
nodeData( false, config, groupOneNodeIds, alwaysTrue() ).getAbsolutePath(), nodeData( false, config, groupOneNodeIds, TRUE ).getAbsolutePath(),
"--nodes", nodeHeader( config ).getAbsolutePath() + MULTI_FILE_DELIMITER + "--nodes", nodeHeader( config ).getAbsolutePath() + MULTI_FILE_DELIMITER +
nodeData( false, config, groupTwoNodeIds, alwaysTrue() ).getAbsolutePath() ); nodeData( false, config, groupTwoNodeIds, TRUE ).getAbsolutePath() );
fail( "Should have failed" ); fail( "Should have failed" );
} }
catch ( Exception e ) catch ( Exception e )
Expand All @@ -434,10 +434,10 @@ public void shouldImportWithoutTypeSpecifiedInRelationshipHeaderbutWithDefaultTy
// WHEN // WHEN
importTool( importTool(
"--into", dbRule.getStoreDirAbsolutePath(), "--into", dbRule.getStoreDirAbsolutePath(),
"--nodes", nodeData( true, config, nodeIds, alwaysTrue() ).getAbsolutePath(), "--nodes", nodeData( true, config, nodeIds, TRUE ).getAbsolutePath(),
// there will be no :TYPE specified in the header of the relationships below // there will be no :TYPE specified in the header of the relationships below
"--relationships:" + type, "--relationships:" + type,
relationshipData( true, config, nodeIds, alwaysTrue(), false ).getAbsolutePath() ); relationshipData( true, config, nodeIds, TRUE, false ).getAbsolutePath() );


// THEN // THEN
verifyData(); verifyData();
Expand Down Expand Up @@ -515,7 +515,7 @@ public void shouldLogRelationshipsReferringToMissingNode() throws Exception
// GIVEN // GIVEN
List<String> nodeIds = asList( "a", "b", "c" ); List<String> nodeIds = asList( "a", "b", "c" );
Configuration config = Configuration.COMMAS; Configuration config = Configuration.COMMAS;
File nodeData = nodeData( true, config, nodeIds, alwaysTrue() ); File nodeData = nodeData( true, config, nodeIds, TRUE );
List<RelationshipDataLine> relationships = Arrays.asList( List<RelationshipDataLine> relationships = Arrays.asList(
// header line 1 of file1 // header line 1 of file1
relationship( "a", "b", "TYPE", "aa" ), // line 2 of file1 relationship( "a", "b", "TYPE", "aa" ), // line 2 of file1
Expand Down Expand Up @@ -551,7 +551,7 @@ public void shouldFailIfTooManyBadRelationships() throws Exception
// GIVEN // GIVEN
List<String> nodeIds = asList( "a", "b", "c" ); List<String> nodeIds = asList( "a", "b", "c" );
Configuration config = Configuration.COMMAS; Configuration config = Configuration.COMMAS;
File nodeData = nodeData( true, config, nodeIds, alwaysTrue() ); File nodeData = nodeData( true, config, nodeIds, TRUE );
List<RelationshipDataLine> relationships = Arrays.asList( List<RelationshipDataLine> relationships = Arrays.asList(
// header line 1 of file1 // header line 1 of file1
relationship( "a", "b", "TYPE" ), // line 2 of file1 relationship( "a", "b", "TYPE" ), // line 2 of file1
Expand Down Expand Up @@ -587,7 +587,7 @@ public void shouldBeAbleToDisableSkippingOfBadRelationships() throws Exception
// GIVEN // GIVEN
List<String> nodeIds = asList( "a", "b", "c" ); List<String> nodeIds = asList( "a", "b", "c" );
Configuration config = Configuration.COMMAS; Configuration config = Configuration.COMMAS;
File nodeData = nodeData( true, config, nodeIds, alwaysTrue() ); File nodeData = nodeData( true, config, nodeIds, TRUE );


List<RelationshipDataLine> relationships = Arrays.asList( List<RelationshipDataLine> relationships = Arrays.asList(
// header line 1 of file1 // header line 1 of file1
Expand Down Expand Up @@ -629,8 +629,8 @@ public void shouldHandleAdditiveLabelsWithSpaces() throws Exception
importTool( importTool(
"--into", dbRule.getStoreDirAbsolutePath(), "--into", dbRule.getStoreDirAbsolutePath(),
"--nodes:My First Label:My Other Label", "--nodes:My First Label:My Other Label",
nodeData( true, config, nodeIds, alwaysTrue() ).getAbsolutePath(), nodeData( true, config, nodeIds, TRUE ).getAbsolutePath(),
"--relationships", relationshipData( true, config, nodeIds, alwaysTrue(), true ).getAbsolutePath() ); "--relationships", relationshipData( true, config, nodeIds, TRUE, true ).getAbsolutePath() );


// THEN // THEN
verifyData( node -> { verifyData( node -> {
Expand All @@ -651,8 +651,8 @@ public void shouldImportFromInputDataEncodedWithSpecificCharset() throws Excepti
importTool( importTool(
"--into", dbRule.getStoreDirAbsolutePath(), "--into", dbRule.getStoreDirAbsolutePath(),
"--input-encoding", charset.name(), "--input-encoding", charset.name(),
"--nodes", nodeData( true, config, nodeIds, alwaysTrue(), charset ).getAbsolutePath(), "--nodes", nodeData( true, config, nodeIds, TRUE, charset ).getAbsolutePath(),
"--relationships", relationshipData( true, config, nodeIds, alwaysTrue(), true, charset ) "--relationships", relationshipData( true, config, nodeIds, TRUE, true, charset )
.getAbsolutePath() ); .getAbsolutePath() );


// THEN // THEN
Expand All @@ -672,7 +672,7 @@ public void shouldDisallowImportWithoutNodesInput() throws Exception
importTool( importTool(
"--into", dbRule.getStoreDirAbsolutePath(), "--into", dbRule.getStoreDirAbsolutePath(),
"--relationships", "--relationships",
relationshipData( true, config, nodeIds, alwaysTrue(), true ).getAbsolutePath() ); relationshipData( true, config, nodeIds, TRUE, true ).getAbsolutePath() );
fail( "Should have failed" ); fail( "Should have failed" );
} }
catch ( IllegalArgumentException e ) catch ( IllegalArgumentException e )
Expand All @@ -693,9 +693,9 @@ public void shouldBeAbleToImportAnonymousNodes() throws Exception
// WHEN // WHEN
importTool( importTool(
"--into", dbRule.getStoreDirAbsolutePath(), "--into", dbRule.getStoreDirAbsolutePath(),
"--nodes", nodeData( true, config, nodeIds, alwaysTrue() ).getAbsolutePath(), "--nodes", nodeData( true, config, nodeIds, TRUE ).getAbsolutePath(),
"--relationships", relationshipData( true, config, relationshipData.iterator(), "--relationships", relationshipData( true, config, relationshipData.iterator(),
alwaysTrue(), true ).getAbsolutePath() ); TRUE, true ).getAbsolutePath() );


// THEN // THEN
GraphDatabaseService db = dbRule.getGraphDatabaseService(); GraphDatabaseService db = dbRule.getGraphDatabaseService();
Expand Down Expand Up @@ -775,9 +775,9 @@ private void shouldPrintReferenceLinkAsPartOfErrorMessage( List<String> nodeIds,
// WHEN // WHEN
importTool( importTool(
"--into", dbRule.getStoreDirAbsolutePath(), "--into", dbRule.getStoreDirAbsolutePath(),
"--nodes", nodeData( true, config, nodeIds, alwaysTrue() ).getAbsolutePath(), "--nodes", nodeData( true, config, nodeIds, TRUE ).getAbsolutePath(),
"--relationships", relationshipData( true, config, relationshipDataLines, "--relationships", relationshipData( true, config, relationshipDataLines,
alwaysTrue(), true ).getAbsolutePath() ); TRUE, true ).getAbsolutePath() );
fail( " Should fail during import." ); fail( " Should fail during import." );
} }
catch ( Exception e ) catch ( Exception e )
Expand Down
1 change: 0 additions & 1 deletion ...ive-collections/src/main/java/org/neo4j/collection/primitive/PrimitiveIntCollections.java
View file
Expand Up @@ -25,7 +25,6 @@
import java.util.function.IntPredicate; import java.util.function.IntPredicate;


import org.neo4j.collection.primitive.base.Empty; import org.neo4j.collection.primitive.base.Empty;
import org.neo4j.function.IntPredicates;
import org.neo4j.function.primitive.FunctionFromPrimitiveInt; import org.neo4j.function.primitive.FunctionFromPrimitiveInt;
import org.neo4j.function.primitive.PrimitiveIntPredicate; import org.neo4j.function.primitive.PrimitiveIntPredicate;


Expand Down

0 comments on commit 4ed8be2

Please sign in to comment.