From 87bb3d7956e831044a4fdce641e2847da00faa5f Mon Sep 17 00:00:00 2001 From: Yanbo Zhao <ybzhao.p3k@gmail.com> Date: Thu, 8 Aug 2024 10:05:57 -0700 Subject: [PATCH] fix: ambiguous reference to overload methods (#395) * fix: ambiguous reference to overload methods * revert old API code change --- .../dao/EbeanLocalRelationshipQueryDAO.java | 6 ++--- .../EbeanLocalRelationshipQueryDAOTest.java | 22 +++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dao-impl/ebean-dao/src/main/java/com/linkedin/metadata/dao/EbeanLocalRelationshipQueryDAO.java b/dao-impl/ebean-dao/src/main/java/com/linkedin/metadata/dao/EbeanLocalRelationshipQueryDAO.java index 7c7752d89..91f78bf82 100644 --- a/dao-impl/ebean-dao/src/main/java/com/linkedin/metadata/dao/EbeanLocalRelationshipQueryDAO.java +++ b/dao-impl/ebean-dao/src/main/java/com/linkedin/metadata/dao/EbeanLocalRelationshipQueryDAO.java @@ -145,7 +145,7 @@ public <SRC_SNAPSHOT extends RecordTemplate, DEST_SNAPSHOT extends RecordTemplat @Nonnull Class<RELATIONSHIP> relationshipType, @Nonnull LocalRelationshipFilter relationshipFilter, int offset, int count) { validateEntityFilter(sourceEntityFilter, sourceEntityClass); validateEntityFilter(destinationEntityFilter, destinationEntityClass); - validateRelationshipFilter(relationshipFilter); + validateEntityFilter(relationshipFilter, relationshipType); String destTableName = null; if (destinationEntityClass != null) { @@ -175,7 +175,7 @@ public <SRC_SNAPSHOT extends RecordTemplate, DEST_SNAPSHOT extends RecordTemplat } /** - * Finds a list of relationships of a specific type based on the given filters if applicable. + * Finds a list of relationships of a specific type (Urn) based on the given filters if applicable. * * @param sourceEntityUrn urn of the source entity to query * @param sourceEntityFilter the filter to apply to the source entity when querying (not applicable to non-MG entities) @@ -188,7 +188,7 @@ public <SRC_SNAPSHOT extends RecordTemplate, DEST_SNAPSHOT extends RecordTemplat * @return A list of relationship records. */ @Nonnull - public <RELATIONSHIP extends RecordTemplate> List<RELATIONSHIP> findRelationships( + public <RELATIONSHIP extends RecordTemplate> List<RELATIONSHIP> findRelationshipsV2( @Nullable Urn sourceEntityUrn, @Nullable LocalRelationshipFilter sourceEntityFilter, @Nullable Urn destinationEntityUrn, @Nullable LocalRelationshipFilter destinationEntityFilter, @Nonnull Class<RELATIONSHIP> relationshipType, @Nonnull LocalRelationshipFilter relationshipFilter, diff --git a/dao-impl/ebean-dao/src/test/java/com/linkedin/metadata/dao/localrelationship/EbeanLocalRelationshipQueryDAOTest.java b/dao-impl/ebean-dao/src/test/java/com/linkedin/metadata/dao/localrelationship/EbeanLocalRelationshipQueryDAOTest.java index 765bc05fb..58d3231b0 100644 --- a/dao-impl/ebean-dao/src/test/java/com/linkedin/metadata/dao/localrelationship/EbeanLocalRelationshipQueryDAOTest.java +++ b/dao-impl/ebean-dao/src/test/java/com/linkedin/metadata/dao/localrelationship/EbeanLocalRelationshipQueryDAOTest.java @@ -309,7 +309,7 @@ public void testFindOneRelationshipWithEntityUrn() throws Exception { new AspectField().setAspect(AspectFoo.class.getCanonicalName()).setPath("/value")); LocalRelationshipFilter destFilter = new LocalRelationshipFilter().setCriteria(new LocalRelationshipCriterionArray(filterCriterion)); - List<ReportsTo> reportsToAlice = _localRelationshipQueryDAO.findRelationships( + List<ReportsTo> reportsToAlice = _localRelationshipQueryDAO.findRelationshipsV2( null, null, fooEntityUrn, destFilter, ReportsTo.class, new LocalRelationshipFilter().setCriteria(new LocalRelationshipCriterionArray()).setDirection(RelationshipDirection.UNDIRECTED), -1, -1); @@ -327,7 +327,7 @@ ReportsTo.class, new LocalRelationshipFilter().setCriteria(new LocalRelationship deletionSQL.setParameter("source", jack.toString()); deletionSQL.execute(); - reportsToAlice = _localRelationshipQueryDAO.findRelationships( + reportsToAlice = _localRelationshipQueryDAO.findRelationshipsV2( null, null, fooEntityUrn, destFilter, ReportsTo.class, new LocalRelationshipFilter().setCriteria(new LocalRelationshipCriterionArray()).setDirection(RelationshipDirection.UNDIRECTED), -1, -1); @@ -379,7 +379,7 @@ public void testFindOneRelationshipWithFilterWithEntityUrn() throws Exception { new UrnField()); LocalRelationshipFilter filterUrn = new LocalRelationshipFilter().setCriteria(new LocalRelationshipCriterionArray(filterUrnCriterion)); - List<ConsumeFrom> consumeFromSamza = _localRelationshipQueryDAO.findRelationships(barEntityUrn, filterUrn, fooEntityUrn, null, + List<ConsumeFrom> consumeFromSamza = _localRelationshipQueryDAO.findRelationshipsV2(barEntityUrn, filterUrn, fooEntityUrn, null, ConsumeFrom.class, new LocalRelationshipFilter().setCriteria(new LocalRelationshipCriterionArray()).setDirection(RelationshipDirection.UNDIRECTED), -1, -1); @@ -394,7 +394,7 @@ public void testFindOneRelationshipWithFilterWithEntityUrn() throws Exception { LocalRelationshipFilter filterRelationship = new LocalRelationshipFilter().setCriteria( new LocalRelationshipCriterionArray(filterRelationshipCriterion)).setDirection(RelationshipDirection.UNDIRECTED); - List<ConsumeFrom> consumeFromSamzaInNearline = _localRelationshipQueryDAO.findRelationships(barEntityUrn, filterUrn, fooEntityUrn, null, + List<ConsumeFrom> consumeFromSamzaInNearline = _localRelationshipQueryDAO.findRelationshipsV2(barEntityUrn, filterUrn, fooEntityUrn, null, ConsumeFrom.class, filterRelationship, -1, -1); @@ -454,7 +454,7 @@ public void testFindOneRelationshipForCrewUsage() throws Exception { LocalRelationshipFilter filterUrn = new LocalRelationshipFilter().setCriteria(new LocalRelationshipCriterionArray(filterUrnCriterion)); // test owned by of crew1 can be found - List<OwnedBy> ownedByCrew1 = _localRelationshipQueryDAO.findRelationships(null, null, crewEntityUrn, filterUrn, + List<OwnedBy> ownedByCrew1 = _localRelationshipQueryDAO.findRelationshipsV2(null, null, crewEntityUrn, filterUrn, OwnedBy.class, new LocalRelationshipFilter().setCriteria(new LocalRelationshipCriterionArray()).setDirection(RelationshipDirection.UNDIRECTED), -1, -1); @@ -468,7 +468,7 @@ OwnedBy.class, new LocalRelationshipFilter().setCriteria(new LocalRelationshipCr LocalRelationshipFilter filterUrn2 = new LocalRelationshipFilter().setCriteria(new LocalRelationshipCriterionArray(filterUrnCriterion2)); // test owned by of crew2 can be found - List<OwnedBy> ownedByCrew2 = _localRelationshipQueryDAO.findRelationships(null, null, crewEntityUrn, filterUrn2, + List<OwnedBy> ownedByCrew2 = _localRelationshipQueryDAO.findRelationshipsV2(null, null, crewEntityUrn, filterUrn2, OwnedBy.class, new LocalRelationshipFilter().setCriteria(new LocalRelationshipCriterionArray()).setDirection(RelationshipDirection.UNDIRECTED), -1, -1); @@ -516,7 +516,7 @@ public void testFindOneRelationshipWithFilterOnSourceEntityForCrewUsage() throws LocalRelationshipFilter filterUrn1 = new LocalRelationshipFilter().setCriteria(new LocalRelationshipCriterionArray(filterUrnCriterion1)); // test owned by of crew can be filtered by source entity, e.g. only include kafka - List<OwnedBy> ownedByCrew1 = _localRelationshipQueryDAO.findRelationships(fooEntityUrn, filterUrn1, crewEntityUrn, filterUrn, + List<OwnedBy> ownedByCrew1 = _localRelationshipQueryDAO.findRelationshipsV2(fooEntityUrn, filterUrn1, crewEntityUrn, filterUrn, OwnedBy.class, new LocalRelationshipFilter().setCriteria(new LocalRelationshipCriterionArray()).setDirection(RelationshipDirection.UNDIRECTED), -1, -1); @@ -540,7 +540,7 @@ public void testFindOneRelationshipWithNonUrnFilterOnSourceEntityForCrewUsage() // non-mg entity cannot be filtered by non-urn filter. This will throw an exception. assertThrows(IllegalArgumentException.class, () -> { - _localRelationshipQueryDAO.findRelationships(fooEntityUrn, filterUrn1, crewEntityUrn, filterUrn, + _localRelationshipQueryDAO.findRelationshipsV2(fooEntityUrn, filterUrn1, crewEntityUrn, filterUrn, OwnedBy.class, new LocalRelationshipFilter().setCriteria(new LocalRelationshipCriterionArray()).setDirection(RelationshipDirection.UNDIRECTED), -1, -1); }); @@ -589,7 +589,7 @@ void testFindRelationshipsWithEntityUrnOffsetAndCount() throws Exception { new AspectField().setAspect(AspectFoo.class.getCanonicalName()).setPath("/value")); LocalRelationshipFilter filter = new LocalRelationshipFilter().setCriteria(new LocalRelationshipCriterionArray(filterCriterion)); - List<ReportsTo> reportsToAlice = _localRelationshipQueryDAO.findRelationships( + List<ReportsTo> reportsToAlice = _localRelationshipQueryDAO.findRelationshipsV2( null, null, fooEntityUrn, filter, ReportsTo.class, new LocalRelationshipFilter().setCriteria(new LocalRelationshipCriterionArray()).setDirection(RelationshipDirection.UNDIRECTED), -1, 3); @@ -597,7 +597,7 @@ ReportsTo.class, new LocalRelationshipFilter().setCriteria(new LocalRelationship // Asserts only 3 reports-to relationships are returned assertEquals(reportsToAlice.size(), 3); - reportsToAlice = _localRelationshipQueryDAO.findRelationships( + reportsToAlice = _localRelationshipQueryDAO.findRelationshipsV2( null, null, fooEntityUrn, filter, ReportsTo.class, new LocalRelationshipFilter().setCriteria(new LocalRelationshipCriterionArray()).setDirection(RelationshipDirection.UNDIRECTED), 2, 10); @@ -608,7 +608,7 @@ ReportsTo.class, new LocalRelationshipFilter().setCriteria(new LocalRelationship Set<FooUrn> expected = ImmutableSet.of(lisa, rose, jenny); assertEquals(actual, expected); - reportsToAlice = _localRelationshipQueryDAO.findRelationships( + reportsToAlice = _localRelationshipQueryDAO.findRelationshipsV2( null, null, fooEntityUrn, filter, ReportsTo.class, new LocalRelationshipFilter().setCriteria(new LocalRelationshipCriterionArray()).setDirection(RelationshipDirection.UNDIRECTED), 2, -1);