You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hop.apache.org by ha...@apache.org on 2021/11/30 15:33:02 UTC
[incubator-hop] branch master updated (a900983 -> 90ac52d)
This is an automated email from the ASF dual-hosted git repository.
hansva pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-hop.git.
from a900983 Merge pull request #1198 from sramazzina/HOP-3402
new a50b0b4 HOP-3447 : Neo4j Graph Output : add support for self relationships HOP-3439 : Graph Output: support multiple relationships between 2 nodes
new 426a069 HOP-3447 : Neo4j Graph Output : add support for self relationships HOP-3439 : Graph Output: support multiple relationships between 2 nodes HOP-2878 : Neo4j Graph Output: support models with multiple node labels
new 90ac52d Merge pull request #1203 from mattcasters/master
The 3199 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../pipeline/transforms/neo4j-graphoutput.adoc | 29 +-
.../neo4j/datasets/node-mapping-all-golden.csv | 25 +
.../neo4j/datasets/node-mapping-first-golden.csv | 25 +
.../datasets/node-mapping-using-value-golden.csv | 9 +
.../neo4j/datasets/rel-mapping-all-golden.csv | 10 +
.../neo4j/datasets/rel-mapping-none-golden.csv | 7 +
.../datasets/rel-mapping-using-value-golden.csv | 4 +
.../neo4j/datasets/self-relationship-golden.csv | 4 +
.../neo4j/datasets/self-relationship2-golden.csv | 6 +
.../metadata/dataset/node-mapping-all-golden.json | 32 +
.../dataset/node-mapping-first-golden.json | 32 +
.../dataset/node-mapping-using-value-golden.json | 24 +
.../metadata/dataset/rel-mapping-all-golden.json | 40 +
.../metadata/dataset/rel-mapping-none-golden.json | 32 +
.../dataset/rel-mapping-using-value-golden.json | 40 +
.../metadata/dataset/self-relationship-golden.json | 48 +
.../dataset/self-relationship2-golden.json | 48 +
.../neo4j/metadata/neo4j-graph-model/AB.json | 98 ++
.../metadata/neo4j-graph-model/NodeLabels.json | 40 +
.../neo4j/metadata/neo4j-graph-model/Self.json | 52 +
.../neo4j/metadata/neo4j-graph-model/Self2.json | 52 +
...ph-output-validation-node-mapping-all UNIT.json | 38 +
...-output-validation-node-mapping-first UNIT.json | 38 +
...t-validation-node-mapping-using-value UNIT.json | 33 +
...t-validation-relationship-mapping-all UNIT.json | 43 +
...-validation-relationship-mapping-none UNIT.json | 38 +
...tion-relationship-mapping-using-value UNIT.json | 40 +
...h-output-validation-self-relationship UNIT.json | 48 +
...-output-validation-self-relationship2 UNIT.json | 48 +
.../main-neo4j-graph-output-node-mapping-all.hwf | 153 +++
.../main-neo4j-graph-output-node-mapping-first.hwf | 153 +++
...neo4j-graph-output-node-mapping-using-value.hwf | 153 +++
...neo4j-graph-output-relationship-mapping-all.hwf | 153 +++
...eo4j-graph-output-relationship-mapping-none.hwf | 153 +++
...aph-output-relationship-mapping-using-value.hwf | 153 +++
.../main-neo4j-graph-output-self-relationship.hwf | 153 +++
.../main-neo4j-graph-output-self-relationship2.hwf | 153 +++
.../neo4j-graph-output-build-node-mapping-all.hpl | 241 ++++
...neo4j-graph-output-build-node-mapping-first.hpl | 212 ++++
...graph-output-build-node-mapping-using-value.hpl | 219 ++++
...graph-output-build-relationship-mapping-all.hpl | 217 ++++
...raph-output-build-relationship-mapping-none.hpl | 226 ++++
...tput-build-relationship-mapping-using-value.hpl | 232 ++++
.../neo4j-graph-output-build-self-relationship.hpl | 259 ++++
...neo4j-graph-output-build-self-relationship2.hpl | 274 ++++
...4j-graph-output-validation-node-mapping-all.hpl | 209 ++++
...-graph-output-validation-node-mapping-first.hpl | 206 ++++
...-output-validation-node-mapping-using-value.hpl | 115 ++
...-output-validation-relationship-mapping-all.hpl | 124 ++
...output-validation-relationship-mapping-none.hpl | 118 ++
...validation-relationship-mapping-using-value.hpl | 124 ++
...j-graph-output-validation-self-relationship.hpl | 135 ++
...-graph-output-validation-self-relationship2.hpl | 135 ++
plugins/tech/neo4j/pom.xml | 2 +-
.../org/apache/hop/neo4j/model/GraphModel.java | 32 +-
.../apache/hop/neo4j/model/GraphModelEditor.java | 35 +-
.../java/org/apache/hop/neo4j/model/GraphNode.java | 31 +-
.../apache/hop/neo4j/model/GraphRelationship.java | 44 +-
.../SolutionsWorkbenchImporter.java} | 4 +-
.../neo4j/transforms/graph/FieldModelMapping.java | 99 +-
.../hop/neo4j/transforms/graph/GraphOutput.java | 1302 ++++++++++++--------
.../neo4j/transforms/graph/GraphOutputData.java | 15 +-
.../neo4j/transforms/graph/GraphOutputDialog.java | 410 +++++-
.../neo4j/transforms/graph/GraphOutputMeta.java | 183 ++-
.../neo4j/transforms/graph/ModelTargetHint.java | 80 ++
.../hop/neo4j/transforms/graph/NodeMapping.java | 189 +++
.../neo4j/transforms/graph/NodeMappingType.java | 81 ++
.../transforms/graph/RelationshipMapping.java | 216 ++++
.../transforms/graph/RelationshipMappingType.java | 82 ++
.../hop/neo4j/transforms/graph/SelectedNode.java | 106 ++
.../transforms/graph/SelectedRelationship.java | 106 ++
.../neo4j/model/messages/messages_en_US.properties | 2 +-
.../graph/messages/messages_en_US.properties | 14 +-
.../transforms/graph/GraphOutputMetaTest.java | 76 ++
.../neo4j/src/test/resources/transform1.snippet | 46 +
75 files changed, 7700 insertions(+), 708 deletions(-)
create mode 100644 integration-tests/neo4j/datasets/node-mapping-all-golden.csv
create mode 100644 integration-tests/neo4j/datasets/node-mapping-first-golden.csv
create mode 100644 integration-tests/neo4j/datasets/node-mapping-using-value-golden.csv
create mode 100644 integration-tests/neo4j/datasets/rel-mapping-all-golden.csv
create mode 100644 integration-tests/neo4j/datasets/rel-mapping-none-golden.csv
create mode 100644 integration-tests/neo4j/datasets/rel-mapping-using-value-golden.csv
create mode 100644 integration-tests/neo4j/datasets/self-relationship-golden.csv
create mode 100644 integration-tests/neo4j/datasets/self-relationship2-golden.csv
create mode 100644 integration-tests/neo4j/metadata/dataset/node-mapping-all-golden.json
create mode 100644 integration-tests/neo4j/metadata/dataset/node-mapping-first-golden.json
create mode 100644 integration-tests/neo4j/metadata/dataset/node-mapping-using-value-golden.json
create mode 100644 integration-tests/neo4j/metadata/dataset/rel-mapping-all-golden.json
create mode 100644 integration-tests/neo4j/metadata/dataset/rel-mapping-none-golden.json
create mode 100644 integration-tests/neo4j/metadata/dataset/rel-mapping-using-value-golden.json
create mode 100644 integration-tests/neo4j/metadata/dataset/self-relationship-golden.json
create mode 100644 integration-tests/neo4j/metadata/dataset/self-relationship2-golden.json
create mode 100644 integration-tests/neo4j/metadata/neo4j-graph-model/AB.json
create mode 100644 integration-tests/neo4j/metadata/neo4j-graph-model/NodeLabels.json
create mode 100644 integration-tests/neo4j/metadata/neo4j-graph-model/Self.json
create mode 100644 integration-tests/neo4j/metadata/neo4j-graph-model/Self2.json
create mode 100644 integration-tests/neo4j/metadata/unit-test/neo4j-graph-output-validation-node-mapping-all UNIT.json
create mode 100644 integration-tests/neo4j/metadata/unit-test/neo4j-graph-output-validation-node-mapping-first UNIT.json
create mode 100644 integration-tests/neo4j/metadata/unit-test/neo4j-graph-output-validation-node-mapping-using-value UNIT.json
create mode 100644 integration-tests/neo4j/metadata/unit-test/neo4j-graph-output-validation-relationship-mapping-all UNIT.json
create mode 100644 integration-tests/neo4j/metadata/unit-test/neo4j-graph-output-validation-relationship-mapping-none UNIT.json
create mode 100644 integration-tests/neo4j/metadata/unit-test/neo4j-graph-output-validation-relationship-mapping-using-value UNIT.json
create mode 100644 integration-tests/neo4j/metadata/unit-test/neo4j-graph-output-validation-self-relationship UNIT.json
create mode 100644 integration-tests/neo4j/metadata/unit-test/neo4j-graph-output-validation-self-relationship2 UNIT.json
create mode 100644 integration-tests/neo4j/tests/neo4j-graph-output/main-neo4j-graph-output-node-mapping-all.hwf
create mode 100644 integration-tests/neo4j/tests/neo4j-graph-output/main-neo4j-graph-output-node-mapping-first.hwf
create mode 100644 integration-tests/neo4j/tests/neo4j-graph-output/main-neo4j-graph-output-node-mapping-using-value.hwf
create mode 100644 integration-tests/neo4j/tests/neo4j-graph-output/main-neo4j-graph-output-relationship-mapping-all.hwf
create mode 100644 integration-tests/neo4j/tests/neo4j-graph-output/main-neo4j-graph-output-relationship-mapping-none.hwf
create mode 100644 integration-tests/neo4j/tests/neo4j-graph-output/main-neo4j-graph-output-relationship-mapping-using-value.hwf
create mode 100644 integration-tests/neo4j/tests/neo4j-graph-output/main-neo4j-graph-output-self-relationship.hwf
create mode 100644 integration-tests/neo4j/tests/neo4j-graph-output/main-neo4j-graph-output-self-relationship2.hwf
create mode 100644 integration-tests/neo4j/tests/neo4j-graph-output/neo4j-graph-output-build-node-mapping-all.hpl
create mode 100644 integration-tests/neo4j/tests/neo4j-graph-output/neo4j-graph-output-build-node-mapping-first.hpl
create mode 100644 integration-tests/neo4j/tests/neo4j-graph-output/neo4j-graph-output-build-node-mapping-using-value.hpl
create mode 100644 integration-tests/neo4j/tests/neo4j-graph-output/neo4j-graph-output-build-relationship-mapping-all.hpl
create mode 100644 integration-tests/neo4j/tests/neo4j-graph-output/neo4j-graph-output-build-relationship-mapping-none.hpl
create mode 100644 integration-tests/neo4j/tests/neo4j-graph-output/neo4j-graph-output-build-relationship-mapping-using-value.hpl
create mode 100644 integration-tests/neo4j/tests/neo4j-graph-output/neo4j-graph-output-build-self-relationship.hpl
create mode 100644 integration-tests/neo4j/tests/neo4j-graph-output/neo4j-graph-output-build-self-relationship2.hpl
create mode 100644 integration-tests/neo4j/tests/neo4j-graph-output/neo4j-graph-output-validation-node-mapping-all.hpl
create mode 100644 integration-tests/neo4j/tests/neo4j-graph-output/neo4j-graph-output-validation-node-mapping-first.hpl
create mode 100644 integration-tests/neo4j/tests/neo4j-graph-output/neo4j-graph-output-validation-node-mapping-using-value.hpl
create mode 100644 integration-tests/neo4j/tests/neo4j-graph-output/neo4j-graph-output-validation-relationship-mapping-all.hpl
create mode 100644 integration-tests/neo4j/tests/neo4j-graph-output/neo4j-graph-output-validation-relationship-mapping-none.hpl
create mode 100644 integration-tests/neo4j/tests/neo4j-graph-output/neo4j-graph-output-validation-relationship-mapping-using-value.hpl
create mode 100644 integration-tests/neo4j/tests/neo4j-graph-output/neo4j-graph-output-validation-self-relationship.hpl
create mode 100644 integration-tests/neo4j/tests/neo4j-graph-output/neo4j-graph-output-validation-self-relationship2.hpl
rename plugins/tech/neo4j/src/main/java/org/apache/hop/neo4j/model/{cw/CypherWorkbenchImporter.java => sw/SolutionsWorkbenchImporter.java} (99%)
create mode 100644 plugins/tech/neo4j/src/main/java/org/apache/hop/neo4j/transforms/graph/ModelTargetHint.java
create mode 100644 plugins/tech/neo4j/src/main/java/org/apache/hop/neo4j/transforms/graph/NodeMapping.java
create mode 100644 plugins/tech/neo4j/src/main/java/org/apache/hop/neo4j/transforms/graph/NodeMappingType.java
create mode 100644 plugins/tech/neo4j/src/main/java/org/apache/hop/neo4j/transforms/graph/RelationshipMapping.java
create mode 100644 plugins/tech/neo4j/src/main/java/org/apache/hop/neo4j/transforms/graph/RelationshipMappingType.java
create mode 100644 plugins/tech/neo4j/src/main/java/org/apache/hop/neo4j/transforms/graph/SelectedNode.java
create mode 100644 plugins/tech/neo4j/src/main/java/org/apache/hop/neo4j/transforms/graph/SelectedRelationship.java
create mode 100644 plugins/tech/neo4j/src/test/java/org/apache/hop/neo4j/transforms/graph/GraphOutputMetaTest.java
create mode 100644 plugins/tech/neo4j/src/test/resources/transform1.snippet