Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
5 changed files
with
119 additions
and
36 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
56 changes: 56 additions & 0 deletions
56
...rocessor/src/main/java/org/neo4j/tooling/procedure/compilerutils/CustomNameExtractor.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| /* | ||
| * Copyright (c) 2002-2017 "Neo Technology," | ||
| * Network Engine for Objects in Lund AB [http://neotechnology.com] | ||
| * | ||
| * This file is part of Neo4j. | ||
| * | ||
| * Neo4j is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * 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.tooling.procedure.compilerutils; | ||
|
|
||
| import java.util.Optional; | ||
| import java.util.function.Supplier; | ||
|
|
||
| import org.neo4j.procedure.Procedure; | ||
| import org.neo4j.procedure.UserFunction; | ||
| import org.neo4j.procedure.UserAggregationFunction; | ||
|
|
||
| public class CustomNameExtractor | ||
| { | ||
| private CustomNameExtractor() | ||
| { | ||
|
|
||
| } | ||
|
|
||
| /** | ||
| * Extracts user-defined names, usually from a {@link Procedure}, {@link UserFunction} | ||
| * or {@link UserAggregationFunction}. | ||
| * | ||
| * As such, extracted strings are assumed to be non-null. | ||
| */ | ||
| public static Optional<String> getName(Supplier<String> nameSupplier, Supplier<String> valueSupplier) | ||
| { | ||
| String name = nameSupplier.get().trim(); | ||
| if ( !name.isEmpty() ) | ||
| { | ||
| return Optional.of( name ); | ||
| } | ||
| String value = valueSupplier.get().trim(); | ||
| if ( !value.isEmpty() ) | ||
| { | ||
| return Optional.of( value ); | ||
| } | ||
| return Optional.empty(); | ||
| } | ||
| } |
54 changes: 54 additions & 0 deletions
54
...ssor/src/test/java/org/neo4j/tooling/procedure/compilerutils/CustomNameExtractorTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| /* | ||
| * Copyright (c) 2002-2017 "Neo Technology," | ||
| * Network Engine for Objects in Lund AB [http://neotechnology.com] | ||
| * | ||
| * This file is part of Neo4j. | ||
| * | ||
| * Neo4j is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * 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.tooling.procedure.compilerutils; | ||
|
|
||
| import org.junit.Test; | ||
|
|
||
| import static org.assertj.core.api.Assertions.assertThat; | ||
|
|
||
| public class CustomNameExtractorTest | ||
| { | ||
|
|
||
| @Test | ||
| public void favours_name_over_value() | ||
| { | ||
| assertThat(CustomNameExtractor.getName( () -> "name", () -> "value" )).contains( "name" ); | ||
| assertThat(CustomNameExtractor.getName( () -> "name", () -> "" )).contains( "name" ); | ||
| assertThat(CustomNameExtractor.getName( () -> "name", () -> " " )).contains( "name" ); | ||
| assertThat(CustomNameExtractor.getName( () -> " name ", () -> " " )).contains( "name" ); | ||
| } | ||
|
|
||
| @Test | ||
| public void returns_value_if_trimmed_name_is_empty() | ||
| { | ||
| assertThat(CustomNameExtractor.getName( () -> "", () -> "value" )).contains( "value" ); | ||
| assertThat(CustomNameExtractor.getName( () -> " ", () -> "value" )).contains( "value" ); | ||
| assertThat(CustomNameExtractor.getName( () -> " ", () -> " value " )).contains( "value" ); | ||
| } | ||
|
|
||
| @Test | ||
| public void returns_nothing_if_none_defined() | ||
| { | ||
| assertThat(CustomNameExtractor.getName( () -> "", () -> "" )).isEmpty(); | ||
| assertThat(CustomNameExtractor.getName( () -> " ", () -> "" )).isEmpty(); | ||
| assertThat(CustomNameExtractor.getName( () -> "", () -> " " )).isEmpty(); | ||
| assertThat(CustomNameExtractor.getName( () -> " ", () -> " " )).isEmpty(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters