ATLAS-2909: ChangeMarker updated during initialization.
Project: http://git-wip-us.apache.org/repos/asf/atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/1eb99543 Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/1eb99543 Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/1eb99543 Branch: refs/heads/master Commit: 1eb995434cb00d228eb403f47799fadc8dd58c08 Parents: 7ffbec1 Author: Ashutosh Mestry <ames...@hortonworks.com> Authored: Sun Oct 7 22:59:00 2018 -0700 Committer: Ashutosh Mestry <ames...@hortonworks.com> Committed: Thu Oct 11 17:21:31 2018 -0700 ---------------------------------------------------------------------- .../apache/atlas/repository/impexp/AtlasServerService.java | 9 ++------- .../repository/store/graph/v2/AtlasTypeDefGraphStoreV2.java | 2 +- .../apache/atlas/repository/impexp/ExportServiceTest.java | 4 +--- .../src/main/java/org/apache/atlas/RequestContext.java | 5 +++++ 4 files changed, 9 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/atlas/blob/1eb99543/repository/src/main/java/org/apache/atlas/repository/impexp/AtlasServerService.java ---------------------------------------------------------------------- diff --git a/repository/src/main/java/org/apache/atlas/repository/impexp/AtlasServerService.java b/repository/src/main/java/org/apache/atlas/repository/impexp/AtlasServerService.java index 13a8cd9..8859a9d 100644 --- a/repository/src/main/java/org/apache/atlas/repository/impexp/AtlasServerService.java +++ b/repository/src/main/java/org/apache/atlas/repository/impexp/AtlasServerService.java @@ -88,13 +88,8 @@ public class AtlasServerService { } @GraphTransaction - public AtlasServer save(AtlasServer server) { - - try { - return dataAccess.save(server); - } catch (AtlasBaseException e) { - return server; - } + public AtlasServer save(AtlasServer server) throws AtlasBaseException { + return dataAccess.save(server); } @GraphTransaction http://git-wip-us.apache.org/repos/asf/atlas/blob/1eb99543/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/AtlasTypeDefGraphStoreV2.java ---------------------------------------------------------------------- diff --git a/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/AtlasTypeDefGraphStoreV2.java b/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/AtlasTypeDefGraphStoreV2.java index bcdc7a8..3421331 100644 --- a/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/AtlasTypeDefGraphStoreV2.java +++ b/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/AtlasTypeDefGraphStoreV2.java @@ -524,7 +524,7 @@ public class AtlasTypeDefGraphStoreV2 extends AtlasTypeDefGraphStore { } private String getCurrentUser() { - String ret = RequestContext.get().getUser(); + String ret = RequestContext.getCurrentUser(); if (StringUtils.isBlank(ret)) { ret = System.getProperty("user.name"); http://git-wip-us.apache.org/repos/asf/atlas/blob/1eb99543/repository/src/test/java/org/apache/atlas/repository/impexp/ExportServiceTest.java ---------------------------------------------------------------------- diff --git a/repository/src/test/java/org/apache/atlas/repository/impexp/ExportServiceTest.java b/repository/src/test/java/org/apache/atlas/repository/impexp/ExportServiceTest.java index 9f72f1b..18e7c41 100644 --- a/repository/src/test/java/org/apache/atlas/repository/impexp/ExportServiceTest.java +++ b/repository/src/test/java/org/apache/atlas/repository/impexp/ExportServiceTest.java @@ -95,13 +95,11 @@ public class ExportServiceTest extends ExportImportTestBase { public void setupTest() throws IOException, AtlasBaseException { RequestContext.clear(); RequestContext.get().setUser(TestUtilsV2.TEST_USER, null); - ZipFileResourceTestUtils.loadBaseModel(typeDefStore, typeRegistry); + basicSetup(typeDefStore, typeRegistry); } @BeforeClass public void setupSampleData() throws AtlasBaseException { - entityStore = new AtlasEntityStoreV2(deleteHandler, typeRegistry, mockChangeNotifier, graphMapper);; - AtlasTypesDef sampleTypes = TestUtilsV2.defineDeptEmployeeTypes(); AtlasTypesDef typesToCreate = AtlasTypeDefStoreInitializer.getTypesToCreate(sampleTypes, typeRegistry); http://git-wip-us.apache.org/repos/asf/atlas/blob/1eb99543/server-api/src/main/java/org/apache/atlas/RequestContext.java ---------------------------------------------------------------------- diff --git a/server-api/src/main/java/org/apache/atlas/RequestContext.java b/server-api/src/main/java/org/apache/atlas/RequestContext.java index 25a35ce..9a9bba6 100644 --- a/server-api/src/main/java/org/apache/atlas/RequestContext.java +++ b/server-api/src/main/java/org/apache/atlas/RequestContext.java @@ -93,6 +93,11 @@ public class RequestContext { CURRENT_CONTEXT.remove(); } + public static String getCurrentUser() { + RequestContext context = CURRENT_CONTEXT.get(); + return context != null ? context.getUser() : null; + } + public String getUser() { return user; }
