yujunjun/datahub
2
0
Fork 0
mirror of https://github.com/datahub-project/datahub.git synced 2025-12-04 22:52:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Break dependency of metadata-dao on metadata-models.

Browse Source 
This also breaks a few others transitively.
This commit is contained in:
John Plaisted 2020-08-31 16:45:38 -07:00
parent e4ce0376d2
commit 8d536a54d3
8 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
metadata-dao-impl/ebean-dao/src/test/java/com/linkedin/metadata/dao/EbeanLocalDAOTest.java
View File

@ -62,8 +62,7 @@ import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import static com.linkedin.metadata.dao.utils.RegisteredUrnPathExtractors.*; import static com.linkedin.metadata.dao.utils.RegisteredUrnPathExtractors.*;
import static com.linkedin.metadata.testing.AuditStamps.*; import static com.linkedin.metadata.utils.AuditStamps.*;
import static com.linkedin.metadata.utils.TestUtils.*;
import static com.linkedin.testing.TestUtils.*; import static com.linkedin.testing.TestUtils.*;
import static org.mockito.Mockito.*; import static org.mockito.Mockito.*;
import static org.testng.Assert.*; import static org.testng.Assert.*;

3
metadata-dao-impl/ebean-dao/src/test/java/com/linkedin/metadata/dao/ImmutableLocalDAOTest.java
View File

@ -11,8 +11,7 @@ import java.util.Optional;
import org.json.simple.parser.ParseException; import org.json.simple.parser.ParseException;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import static com.linkedin.metadata.testing.AuditStamps.*; import static com.linkedin.metadata.utils.AuditStamps.*;
import static com.linkedin.metadata.utils.TestUtils.*;
import static com.linkedin.testing.TestUtils.*; import static com.linkedin.testing.TestUtils.*;
import static org.testng.Assert.*; import static org.testng.Assert.*;

3
metadata-dao/src/test/java/com/linkedin/metadata/dao/BaseLocalDAOTest.java
View File

@ -25,8 +25,7 @@ import org.mockito.stubbing.OngoingStubbing;
import org.testng.annotations.BeforeMethod; import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import static com.linkedin.metadata.testing.AuditStamps.*; import static com.linkedin.metadata.utils.AuditStamps.*;
import static com.linkedin.metadata.utils.TestUtils.*;
import static org.mockito.Mockito.*; import static org.mockito.Mockito.*;
import static org.testng.Assert.*; import static org.testng.Assert.*;

4
metadata-dao/src/test/java/com/linkedin/metadata/dao/utils/ModelUtilsTest.java
View File

@ -1,7 +1,7 @@
package com.linkedin.metadata.dao.utils; package com.linkedin.metadata.dao.utils;
import com.google.common.collect.ImmutableSet; 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.common.urn.Urn;
import com.linkedin.testing.EntityFoo; import com.linkedin.testing.EntityFoo;
import com.linkedin.testing.EntityUnion; import com.linkedin.testing.EntityUnion;
@ -281,7 +281,7 @@ public class ModelUtilsTest {
boolean result = ModelUtils.isCommonAspect(AspectFoo.class); boolean result = ModelUtils.isCommonAspect(AspectFoo.class);
assertFalse(result); assertFalse(result);
result = ModelUtils.isCommonAspect(Ownership.class); result = ModelUtils.isCommonAspect(CommonTestAspect.class);
assertTrue(result); assertTrue(result);
} }

3
metadata-restli-resource/src/test/java/com/linkedin/metadata/restli/BaseSingleAspectEntitySimpleKeyResourceTest.java
View File

@ -36,8 +36,7 @@ import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import static com.linkedin.metadata.dao.BaseReadDAO.LATEST_VERSION; import static com.linkedin.metadata.dao.BaseReadDAO.LATEST_VERSION;
import static com.linkedin.metadata.testing.AuditStamps.*; import static com.linkedin.metadata.utils.AuditStamps.*;
import static com.linkedin.metadata.utils.TestUtils.*;
import static com.linkedin.testing.TestUtils.*; import static com.linkedin.testing.TestUtils.*;
import static org.mockito.Mockito.*; import static org.mockito.Mockito.*;
import static org.testng.Assert.*; import static org.testng.Assert.*;

2
metadata-restli-resource/src/test/java/com/linkedin/metadata/restli/BaseVersionedAspectResourceTest.java
View File

@ -27,7 +27,7 @@ import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import static com.linkedin.metadata.dao.BaseReadDAO.*; 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 com.linkedin.testing.TestUtils.*;
import static org.mockito.Mockito.*; import static org.mockito.Mockito.*;
import static org.testng.Assert.*; import static org.testng.Assert.*;

7
metadata-testing/metadata-test-models/src/main/pegasus/com/linkedin/common/CommonTestAspect.pdl Normal file
View File

@ -0,0 +1,7 @@
namespace com.linkedin.common
/**
* For unit tests
*/
record CommonTestAspect {
}

10
metadata-testing/metadata-models-test-utils/src/main/java/com/linkedin/metadata/testing/AuditStamps.java → metadata-testing/metadata-test-utils/src/main/java/com/linkedin/metadata/utils/AuditStamps.java
View File

@ -1,8 +1,8 @@
package com.linkedin.metadata.testing; package com.linkedin.metadata.utils;
import com.linkedin.common.AuditStamp; import com.linkedin.common.AuditStamp;
import com.linkedin.common.urn.CorpuserUrn;
import com.linkedin.common.urn.Urn; import com.linkedin.common.urn.Urn;
import java.net.URISyntaxException;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
import javax.annotation.Nullable; import javax.annotation.Nullable;
@ -24,7 +24,11 @@ public final class AuditStamps {
@Nonnull @Nonnull
public static AuditStamp makeAuditStamp(@Nonnull String actorLdap, long time) { 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 @Nonnull