forked from neo4j/neo4j-ogm
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
neo4jGH-952: Fix entity filtering when mapping query results.
- Loading branch information
Showing
10 changed files
with
468 additions
and
28 deletions.
There are no files selected for viewing
69 changes: 69 additions & 0 deletions
69
core/src/main/java/org/neo4j/ogm/context/EntityFilter.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,69 @@ | ||
| /* | ||
| * Copyright (c) 2002-2023 "Neo4j," | ||
| * Neo4j Sweden AB [http://neo4j.com] | ||
| * | ||
| * This file is part of Neo4j. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.neo4j.ogm.context; | ||
|
|
||
| import java.util.Optional; | ||
|
|
||
| import org.neo4j.ogm.model.GraphModel; | ||
| import org.neo4j.ogm.model.Node; | ||
| import org.neo4j.ogm.response.model.DefaultGraphModel; | ||
| import org.neo4j.ogm.response.model.NodeModel; | ||
|
|
||
| /** | ||
| * Filter for entities to check whether nodes/relationships should be included in the mapping result. | ||
| * | ||
| * @author Niels Oertel | ||
| */ | ||
| interface EntityFilter { | ||
|
|
||
| /** | ||
| * Include any entity. | ||
| */ | ||
| EntityFilter INCLUDE_ALWAYS = (graphModel, nativeId, isNode) -> true; | ||
|
|
||
| /** | ||
| * Include all relationships but only nodes which are not generated. | ||
| */ | ||
| EntityFilter WITHOUT_GENERATED_NODES = (graphModel, nativeId, isNode) -> { | ||
| if (!isNode) { | ||
| return true; | ||
| } else { | ||
| Optional<Node> node = ((DefaultGraphModel) graphModel).findNode(nativeId); | ||
| if (!node.isPresent()) { | ||
| return true; // this should actually never happen but to keep existing behaviour, we are not throwing an exception | ||
| } | ||
| return node.map(n -> !((NodeModel) n).isGeneratedNode()).get(); | ||
| } | ||
| }; | ||
|
|
||
| /** | ||
| * Check if an object with given native id should be included in the mapping result. | ||
| * | ||
| * @param graphModel | ||
| * The graph model. | ||
| * @param nativeObjectId | ||
| * The object's native id. | ||
| * @param isNode | ||
| * True if the object is a node, false if relationship. | ||
| * | ||
| * @return True if the object should be included. | ||
| */ | ||
| boolean shouldIncludeModelObject(GraphModel graphModel, long nativeObjectId, boolean isNode); | ||
|
|
||
| } |
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
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
48 changes: 48 additions & 0 deletions
48
...-ogm-tests/neo4j-ogm-integration-tests/src/test/java/org/neo4j/ogm/domain/gh952/Book.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,48 @@ | ||
| package org.neo4j.ogm.domain.gh952; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.Collections; | ||
| import java.util.List; | ||
|
|
||
| import org.neo4j.ogm.annotation.GeneratedValue; | ||
| import org.neo4j.ogm.annotation.Id; | ||
| import org.neo4j.ogm.annotation.NodeEntity; | ||
|
|
||
| @NodeEntity(Book.LABEL) | ||
| public class Book { | ||
|
|
||
| public static final String LABEL = "Book"; | ||
|
|
||
| @Id | ||
| @GeneratedValue(strategy = UuidGenerationStrategy.class) | ||
| private String uuid; | ||
|
|
||
| private String title; | ||
|
|
||
| private List<Human> readBy = List.of(); | ||
|
|
||
| public String getUuid() { | ||
| return uuid; | ||
| } | ||
|
|
||
| public void setUuid(String uuid) { | ||
| this.uuid = uuid; | ||
| } | ||
|
|
||
| public String getTitle() { | ||
| return title; | ||
| } | ||
|
|
||
| public void setTitle(String title) { | ||
| this.title = title; | ||
| } | ||
|
|
||
| public List<Human> getReadBy() { | ||
| return Collections.unmodifiableList(readBy); | ||
| } | ||
|
|
||
| public void setReadBy(List<Human> readBy) { | ||
| this.readBy = new ArrayList<>(readBy); | ||
| } | ||
|
|
||
| } |
62 changes: 62 additions & 0 deletions
62
...s/neo4j-ogm-integration-tests/src/test/java/org/neo4j/ogm/domain/gh952/BookWasReadBy.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,62 @@ | ||
| package org.neo4j.ogm.domain.gh952; | ||
|
|
||
| import java.time.Instant; | ||
|
|
||
| import org.neo4j.ogm.annotation.EndNode; | ||
| import org.neo4j.ogm.annotation.GeneratedValue; | ||
| import org.neo4j.ogm.annotation.Id; | ||
| import org.neo4j.ogm.annotation.RelationshipEntity; | ||
| import org.neo4j.ogm.annotation.StartNode; | ||
| import org.neo4j.ogm.annotation.typeconversion.DateLong; | ||
|
|
||
| @RelationshipEntity("READ_BY") | ||
| public class BookWasReadBy { | ||
|
|
||
| public static final String TYPE = "READ_BY"; | ||
|
|
||
| @Id | ||
| @GeneratedValue(strategy = UuidGenerationStrategy.class) | ||
| private String uuid; | ||
|
|
||
| @DateLong | ||
| private Instant date; | ||
|
|
||
| @StartNode | ||
| private Book book; | ||
|
|
||
| @EndNode | ||
| private Human human; | ||
|
|
||
| public String getUuid() { | ||
| return uuid; | ||
| } | ||
|
|
||
| public void setUuid(String uuid) { | ||
| this.uuid = uuid; | ||
| } | ||
|
|
||
| public Instant getDate() { | ||
| return date; | ||
| } | ||
|
|
||
| public void setDate(Instant date) { | ||
| this.date = date; | ||
| } | ||
|
|
||
| public Book getBook() { | ||
| return book; | ||
| } | ||
|
|
||
| public void setBook(Book book) { | ||
| this.book = book; | ||
| } | ||
|
|
||
| public Human getHuman() { | ||
| return human; | ||
| } | ||
|
|
||
| public void setHuman(Human human) { | ||
| this.human = human; | ||
| } | ||
|
|
||
| } |
50 changes: 50 additions & 0 deletions
50
...ogm-tests/neo4j-ogm-integration-tests/src/test/java/org/neo4j/ogm/domain/gh952/Human.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,50 @@ | ||
| package org.neo4j.ogm.domain.gh952; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.Collections; | ||
| import java.util.List; | ||
|
|
||
| import org.neo4j.ogm.annotation.GeneratedValue; | ||
| import org.neo4j.ogm.annotation.Id; | ||
| import org.neo4j.ogm.annotation.NodeEntity; | ||
| import org.neo4j.ogm.annotation.Relationship; | ||
|
|
||
| @NodeEntity(Human.LABEL) | ||
| public class Human { | ||
|
|
||
| public static final String LABEL = "Human"; | ||
|
|
||
| @Id | ||
| @GeneratedValue(strategy = UuidGenerationStrategy.class) | ||
| private String uuid; | ||
|
|
||
| private String name; | ||
|
|
||
| @Relationship(type = HumanIsParentOf.TYPE, direction = Relationship.OUTGOING) | ||
| private List<HumanIsParentOf> children; | ||
|
|
||
| public String getUuid() { | ||
| return uuid; | ||
| } | ||
|
|
||
| public void setUuid(String uuid) { | ||
| this.uuid = uuid; | ||
| } | ||
|
|
||
| public String getName() { | ||
| return name; | ||
| } | ||
|
|
||
| public void setName(String name) { | ||
| this.name = name; | ||
| } | ||
|
|
||
| public List<HumanIsParentOf> getChildren() { | ||
| return Collections.unmodifiableList(children); | ||
| } | ||
|
|
||
| public void setChildren(List<HumanIsParentOf> children) { | ||
| this.children = new ArrayList<>(children); | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.