From 8d536a54d3d115afa3da9adfc6af956274a62e34 Mon Sep 17 00:00:00 2001 From: John Plaisted Date: Mon, 31 Aug 2020 16:45:38 -0700 Subject: [PATCH] Break dependency of metadata-dao on metadata-models. This also breaks a few others transitively. --- .../com/linkedin/metadata/dao/EbeanLocalDAOTest.java | 3 +-- .../linkedin/metadata/dao/ImmutableLocalDAOTest.java | 3 +-- .../com/linkedin/metadata/dao/BaseLocalDAOTest.java | 3 +-- .../linkedin/metadata/dao/utils/ModelUtilsTest.java | 4 ++-- .../BaseSingleAspectEntitySimpleKeyResourceTest.java | 3 +-- .../restli/BaseVersionedAspectResourceTest.java | 2 +- .../pegasus/com/linkedin/common/CommonTestAspect.pdl | 7 +++++++ .../java/com/linkedin/metadata/utils}/AuditStamps.java | 10 +++++++--- 8 files changed, 21 insertions(+), 14 deletions(-) create mode 100644 metadata-testing/metadata-test-models/src/main/pegasus/com/linkedin/common/CommonTestAspect.pdl rename metadata-testing/{metadata-models-test-utils/src/main/java/com/linkedin/metadata/testing => metadata-test-utils/src/main/java/com/linkedin/metadata/utils}/AuditStamps.java (76%) diff --git a/metadata-dao-impl/ebean-dao/src/test/java/com/linkedin/metadata/dao/EbeanLocalDAOTest.java b/metadata-dao-impl/ebean-dao/src/test/java/com/linkedin/metadata/dao/EbeanLocalDAOTest.java index 676dfa82e7..285bc2c979 100644 --- a/metadata-dao-impl/ebean-dao/src/test/java/com/linkedin/metadata/dao/EbeanLocalDAOTest.java +++ b/metadata-dao-impl/ebean-dao/src/test/java/com/linkedin/metadata/dao/EbeanLocalDAOTest.java @@ -62,8 +62,7 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import static com.linkedin.metadata.dao.utils.RegisteredUrnPathExtractors.*; -import static com.linkedin.metadata.testing.AuditStamps.*; -import static com.linkedin.metadata.utils.TestUtils.*; +import static com.linkedin.metadata.utils.AuditStamps.*; import static com.linkedin.testing.TestUtils.*; import static org.mockito.Mockito.*; import static org.testng.Assert.*; diff --git a/metadata-dao-impl/ebean-dao/src/test/java/com/linkedin/metadata/dao/ImmutableLocalDAOTest.java b/metadata-dao-impl/ebean-dao/src/test/java/com/linkedin/metadata/dao/ImmutableLocalDAOTest.java index bde34bd07c..1b65fc09ca 100644 --- a/metadata-dao-impl/ebean-dao/src/test/java/com/linkedin/metadata/dao/ImmutableLocalDAOTest.java +++ b/metadata-dao-impl/ebean-dao/src/test/java/com/linkedin/metadata/dao/ImmutableLocalDAOTest.java @@ -11,8 +11,7 @@ import java.util.Optional; import org.json.simple.parser.ParseException; import org.testng.annotations.Test; -import static com.linkedin.metadata.testing.AuditStamps.*; -import static com.linkedin.metadata.utils.TestUtils.*; +import static com.linkedin.metadata.utils.AuditStamps.*; import static com.linkedin.testing.TestUtils.*; import static org.testng.Assert.*; diff --git a/metadata-dao/src/test/java/com/linkedin/metadata/dao/BaseLocalDAOTest.java b/metadata-dao/src/test/java/com/linkedin/metadata/dao/BaseLocalDAOTest.java index cf8cb39e1d..fa981e417f 100644 --- a/metadata-dao/src/test/java/com/linkedin/metadata/dao/BaseLocalDAOTest.java +++ b/metadata-dao/src/test/java/com/linkedin/metadata/dao/BaseLocalDAOTest.java @@ -25,8 +25,7 @@ import org.mockito.stubbing.OngoingStubbing; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import static com.linkedin.metadata.testing.AuditStamps.*; -import static com.linkedin.metadata.utils.TestUtils.*; +import static com.linkedin.metadata.utils.AuditStamps.*; import static org.mockito.Mockito.*; import static org.testng.Assert.*; diff --git a/metadata-dao/src/test/java/com/linkedin/metadata/dao/utils/ModelUtilsTest.java b/metadata-dao/src/test/java/com/linkedin/metadata/dao/utils/ModelUtilsTest.java index 55e4bd1941..124b07702b 100644 --- a/metadata-dao/src/test/java/com/linkedin/metadata/dao/utils/ModelUtilsTest.java +++ b/metadata-dao/src/test/java/com/linkedin/metadata/dao/utils/ModelUtilsTest.java @@ -1,7 +1,7 @@ package com.linkedin.metadata.dao.utils; import com.google.common.collect.ImmutableSet; -import com.linkedin.common.Ownership; +import com.linkedin.common.CommonTestAspect; import com.linkedin.common.urn.Urn; import com.linkedin.testing.EntityFoo; import com.linkedin.testing.EntityUnion; @@ -281,7 +281,7 @@ public class ModelUtilsTest { boolean result = ModelUtils.isCommonAspect(AspectFoo.class); assertFalse(result); - result = ModelUtils.isCommonAspect(Ownership.class); + result = ModelUtils.isCommonAspect(CommonTestAspect.class); assertTrue(result); } diff --git a/metadata-restli-resource/src/test/java/com/linkedin/metadata/restli/BaseSingleAspectEntitySimpleKeyResourceTest.java b/metadata-restli-resource/src/test/java/com/linkedin/metadata/restli/BaseSingleAspectEntitySimpleKeyResourceTest.java index e757c54eb2..8756e42083 100644 --- a/metadata-restli-resource/src/test/java/com/linkedin/metadata/restli/BaseSingleAspectEntitySimpleKeyResourceTest.java +++ b/metadata-restli-resource/src/test/java/com/linkedin/metadata/restli/BaseSingleAspectEntitySimpleKeyResourceTest.java @@ -36,8 +36,7 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import static com.linkedin.metadata.dao.BaseReadDAO.LATEST_VERSION; -import static com.linkedin.metadata.testing.AuditStamps.*; -import static com.linkedin.metadata.utils.TestUtils.*; +import static com.linkedin.metadata.utils.AuditStamps.*; import static com.linkedin.testing.TestUtils.*; import static org.mockito.Mockito.*; import static org.testng.Assert.*; diff --git a/metadata-restli-resource/src/test/java/com/linkedin/metadata/restli/BaseVersionedAspectResourceTest.java b/metadata-restli-resource/src/test/java/com/linkedin/metadata/restli/BaseVersionedAspectResourceTest.java index 3acfa84a52..f076ea1fd9 100644 --- a/metadata-restli-resource/src/test/java/com/linkedin/metadata/restli/BaseVersionedAspectResourceTest.java +++ b/metadata-restli-resource/src/test/java/com/linkedin/metadata/restli/BaseVersionedAspectResourceTest.java @@ -27,7 +27,7 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import static com.linkedin.metadata.dao.BaseReadDAO.*; -import static com.linkedin.metadata.testing.AuditStamps.*; +import static com.linkedin.metadata.utils.AuditStamps.*; import static com.linkedin.testing.TestUtils.*; import static org.mockito.Mockito.*; import static org.testng.Assert.*; diff --git a/metadata-testing/metadata-test-models/src/main/pegasus/com/linkedin/common/CommonTestAspect.pdl b/metadata-testing/metadata-test-models/src/main/pegasus/com/linkedin/common/CommonTestAspect.pdl new file mode 100644 index 0000000000..cf820fdc9e --- /dev/null +++ b/metadata-testing/metadata-test-models/src/main/pegasus/com/linkedin/common/CommonTestAspect.pdl @@ -0,0 +1,7 @@ +namespace com.linkedin.common + +/** + * For unit tests + */ +record CommonTestAspect { +} \ No newline at end of file diff --git a/metadata-testing/metadata-models-test-utils/src/main/java/com/linkedin/metadata/testing/AuditStamps.java b/metadata-testing/metadata-test-utils/src/main/java/com/linkedin/metadata/utils/AuditStamps.java similarity index 76% rename from metadata-testing/metadata-models-test-utils/src/main/java/com/linkedin/metadata/testing/AuditStamps.java rename to metadata-testing/metadata-test-utils/src/main/java/com/linkedin/metadata/utils/AuditStamps.java index 0b868d2aa5..c8d78d0e21 100644 --- a/metadata-testing/metadata-models-test-utils/src/main/java/com/linkedin/metadata/testing/AuditStamps.java +++ b/metadata-testing/metadata-test-utils/src/main/java/com/linkedin/metadata/utils/AuditStamps.java @@ -1,8 +1,8 @@ -package com.linkedin.metadata.testing; +package com.linkedin.metadata.utils; import com.linkedin.common.AuditStamp; -import com.linkedin.common.urn.CorpuserUrn; import com.linkedin.common.urn.Urn; +import java.net.URISyntaxException; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -24,7 +24,11 @@ public final class AuditStamps { @Nonnull public static AuditStamp makeAuditStamp(@Nonnull String actorLdap, long time) { - return makeAuditStamp(new CorpuserUrn(actorLdap), null, time); + try { + return makeAuditStamp(new Urn("urn:li:testActor:" + actorLdap), null, time); + } catch (URISyntaxException e) { + throw new RuntimeException(e); + } } @Nonnull