{"action":"created","comment":{"url":"https://api.github.com/repos/CONNECT-Solution/CONNECT/pulls/comments/39647209","id":39647209,"diff_hunk":"@@ -103,63 +112,54 @@ public void execute(InboundDocRetrieveOrchestratable message) {\n      */\n     public RetrieveDocumentSetResponseType sendToAdapter(InboundDocRetrieveOrchestratable message) {\n         RetrieveDocumentSetResponseType adapterResponse = proxy.retrieveDocumentSet(message.getRequest(),\n-                message.getAssertion());\n+            message.getAssertion());\n \n         try {\n             DocRetrieveFileUtils.getInstance().convertFileLocationToDataIfEnabled(adapterResponse);\n         } catch (Exception e) {\n             LOG.error(\"Failed to retrieve data from the file uri in the payload.\", e);\n             adapterResponse = MessageGenerator.getInstance().createRegistryResponseError(\n-                    \"Adapter Document Retrieve Processing\");\n+                \"Adapter Document Retrieve Processing\");\n         }\n         return adapterResponse;\n     }\n \n-    private void auditResponseMessage(RetrieveDocumentSetResponseType response, AssertionType assertion,\n-            String requestCommunityID) {\n-        gov.hhs.fha.nhinc.common.auditlog.DocRetrieveResponseMessageType message = new gov.hhs.fha.nhinc.common.auditlog.DocRetrieveResponseMessageType();\n-        message.setRetrieveDocumentSetResponse(response);\n-        message.setAssertion(assertion);\n-        LogEventRequestType auditLogMsg = auditLogger.logDocRetrieveResult(message,\n-                NhincConstants.AUDIT_LOG_INBOUND_DIRECTION, NhincConstants.AUDIT_LOG_ADAPTER_INTERFACE,\n-                requestCommunityID);\n-        if (auditLogMsg != null) {\n-            auditMessage(auditLogMsg, assertion);\n-        }\n-    }\n-\n     /**\n+     * Creates the log event for response.\n+     *\n      * @param message\n      */\n     public void auditInboundResponseMessage(InboundDocRetrieveOrchestratable message) {\n-        String requestCommunityID = HomeCommunityMap.getLocalHomeCommunityId();\n \n         LOG.debug(\"Calling audit log for doc retrieve response received from adapter (a0)\");\n-        auditResponseMessage(message.getResponse(), message.getAssertion(), requestCommunityID);\n-    }\n-\n-    private void auditRequestMessage(RetrieveDocumentSetRequestType request, AssertionType assertion,\n-            String requestCommunityID) {\n-        gov.hhs.fha.nhinc.common.auditlog.DocRetrieveMessageType message = new gov.hhs.fha.nhinc.common.auditlog.DocRetrieveMessageType();\n-        message.setRetrieveDocumentSetRequest(request);\n-        message.setAssertion(assertion);\n-        LogEventRequestType auditLogMsg = auditLogger.logDocRetrieve(message,\n-                NhincConstants.AUDIT_LOG_OUTBOUND_DIRECTION, NhincConstants.AUDIT_LOG_ADAPTER_INTERFACE,\n-                requestCommunityID);\n-        if (auditLogMsg != null) {\n-            auditMessage(auditLogMsg, assertion);\n-        }\n+        docRetrieveLogger.auditResponseMessage(message.getRequest(), message.getResponse(), message.getAssertion(), null, NhincConstants.AUDIT_LOG_INBOUND_DIRECTION, NhincConstants.AUDIT_LOG_ADAPTER_INTERFACE, Boolean.FALSE, message.getWebContextProperties(), NhincConstants.DOC_RETRIEVE_SERVICE_NAME);\n     }\n \n     /**\n+     * Creates the log event for request.\n+     *\n      * @param message\n-     * @return\n      */\n     public void auditOutboundRequestMessage(InboundDocRetrieveOrchestratable message) {\n-        String requestCommunityID = HomeCommunityMap.getLocalHomeCommunityId();\n \n         LOG.debug(\"Calling audit log for doc retrieve request (g0) sent to adapter (a0)\");\n-        auditRequestMessage(message.getRequest(), message.getAssertion(), requestCommunityID);\n+        docRetrieveLogger.auditRequestMessage(message.getRequest(), message.getAssertion(), null, NhincConstants.AUDIT_LOG_OUTBOUND_DIRECTION, NhincConstants.AUDIT_LOG_ADAPTER_INTERFACE, Boolean.FALSE, message.getWebContextProperties(), NhincConstants.DOC_RETRIEVE_SERVICE_NAME);\n+    }\n+\n+    protected NhinTargetSystemType getTargetNhinTargetSystemType(InboundDocRetrieveOrchestratable message) {\n+        NhinTargetSystemType nhinTargetSystem = MessageGeneratorUtils.getInstance().convertToNhinTargetSystemType(getTargetCommunityType(message));\n+        return nhinTargetSystem;","path":"Product/Production/Services/DocumentRetrieveCore/src/main/java/gov/hhs/fha/nhinc/docretrieve/nhin/InboundDocRetrieveStrategyImpl.java","position":137,"original_position":137,"commit_id":"f9ed5fa6561dd86d1fdcb3cb3b9b4d1504edecd4","original_commit_id":"f9ed5fa6561dd86d1fdcb3cb3b9b4d1504edecd4","user":{"login":"christophermay07","id":5454422,"avatar_url":"https://avatars.githubusercontent.com/u/5454422?v=3","gravatar_id":"","url":"https://api.github.com/users/christophermay07","html_url":"https://github.com/christophermay07","followers_url":"https://api.github.com/users/christophermay07/followers","following_url":"https://api.github.com/users/christophermay07/following{/other_user}","gists_url":"https://api.github.com/users/christophermay07/gists{/gist_id}","starred_url":"https://api.github.com/users/christophermay07/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/christophermay07/subscriptions","organizations_url":"https://api.github.com/users/christophermay07/orgs","repos_url":"https://api.github.com/users/christophermay07/repos","events_url":"https://api.github.com/users/christophermay07/events{/privacy}","received_events_url":"https://api.github.com/users/christophermay07/received_events","type":"User","site_admin":false},"body":"Don't declare and immediately return; instead, return directly.","created_at":"2015-09-16T15:48:32Z","updated_at":"2015-09-16T15:48:32Z","html_url":"https://github.com/CONNECT-Solution/CONNECT/pull/1133#discussion_r39647209","pull_request_url":"https://api.github.com/repos/CONNECT-Solution/CONNECT/pulls/1133","_links":{"self":{"href":"https://api.github.com/repos/CONNECT-Solution/CONNECT/pulls/comments/39647209"},"html":{"href":"https://github.com/CONNECT-Solution/CONNECT/pull/1133#discussion_r39647209"},"pull_request":{"href":"https://api.github.com/repos/CONNECT-Solution/CONNECT/pulls/1133"}}},"pull_request":{"url":"https://api.github.com/repos/CONNECT-Solution/CONNECT/pulls/1133","id":45178097,"html_url":"https://github.com/CONNECT-Solution/CONNECT/pull/1133","diff_url":"https://github.com/CONNECT-Solution/CONNECT/pull/1133.diff","patch_url":"https://github.com/CONNECT-Solution/CONNECT/pull/1133.patch","issue_url":"https://api.github.com/repos/CONNECT-Solution/CONNECT/issues/1133","number":1133,"state":"open","locked":false,"title":"FHAC-494 Fix ATNA audit logging issues for RD","user":{"login":"vdmehta06","id":13540181,"avatar_url":"https://avatars.githubusercontent.com/u/13540181?v=3","gravatar_id":"","url":"https://api.github.com/users/vdmehta06","html_url":"https://github.com/vdmehta06","followers_url":"https://api.github.com/users/vdmehta06/followers","following_url":"https://api.github.com/users/vdmehta06/following{/other_user}","gists_url":"https://api.github.com/users/vdmehta06/gists{/gist_id}","starred_url":"https://api.github.com/users/vdmehta06/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/vdmehta06/subscriptions","organizations_url":"https://api.github.com/users/vdmehta06/orgs","repos_url":"https://api.github.com/users/vdmehta06/repos","events_url":"https://api.github.com/users/vdmehta06/events{/privacy}","received_events_url":"https://api.github.com/users/vdmehta06/received_events","type":"User","site_admin":false},"body":"FHAC - 494 Fix ATNA audit logging issues for RD. Audit Logging for Retrieve Document generates 8 entries for Standard mode and it is tested using Jboss App server. I still have to test in Pass thru mode using Jboss server. Audit Logging for RD service is following the design spec with link - https://cgiinterop.atlassian.net/wiki/pages/viewpage.action?pageId=18776072 and followed Matt's design spec","created_at":"2015-09-16T14:27:03Z","updated_at":"2015-09-16T15:48:32Z","closed_at":null,"merged_at":null,"merge_commit_sha":"149418bfb7f3fd89630d1f43fb2b80fde51585c7","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/CONNECT-Solution/CONNECT/pulls/1133/commits","review_comments_url":"https://api.github.com/repos/CONNECT-Solution/CONNECT/pulls/1133/comments","review_comment_url":"https://api.github.com/repos/CONNECT-Solution/CONNECT/pulls/comments{/number}","comments_url":"https://api.github.com/repos/CONNECT-Solution/CONNECT/issues/1133/comments","statuses_url":"https://api.github.com/repos/CONNECT-Solution/CONNECT/statuses/f9ed5fa6561dd86d1fdcb3cb3b9b4d1504edecd4","head":{"label":"vdmehta06:FHAC-494","ref":"FHAC-494","sha":"f9ed5fa6561dd86d1fdcb3cb3b9b4d1504edecd4","user":{"login":"vdmehta06","id":13540181,"avatar_url":"https://avatars.githubusercontent.com/u/13540181?v=3","gravatar_id":"","url":"https://api.github.com/users/vdmehta06","html_url":"https://github.com/vdmehta06","followers_url":"https://api.github.com/users/vdmehta06/followers","following_url":"https://api.github.com/users/vdmehta06/following{/other_user}","gists_url":"https://api.github.com/users/vdmehta06/gists{/gist_id}","starred_url":"https://api.github.com/users/vdmehta06/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/vdmehta06/subscriptions","organizations_url":"https://api.github.com/users/vdmehta06/orgs","repos_url":"https://api.github.com/users/vdmehta06/repos","events_url":"https://api.github.com/users/vdmehta06/events{/privacy}","received_events_url":"https://api.github.com/users/vdmehta06/received_events","type":"User","site_admin":false},"repo":{"id":39899654,"name":"CONNECT","full_name":"vdmehta06/CONNECT","owner":{"login":"vdmehta06","id":13540181,"avatar_url":"https://avatars.githubusercontent.com/u/13540181?v=3","gravatar_id":"","url":"https://api.github.com/users/vdmehta06","html_url":"https://github.com/vdmehta06","followers_url":"https://api.github.com/users/vdmehta06/followers","following_url":"https://api.github.com/users/vdmehta06/following{/other_user}","gists_url":"https://api.github.com/users/vdmehta06/gists{/gist_id}","starred_url":"https://api.github.com/users/vdmehta06/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/vdmehta06/subscriptions","organizations_url":"https://api.github.com/users/vdmehta06/orgs","repos_url":"https://api.github.com/users/vdmehta06/repos","events_url":"https://api.github.com/users/vdmehta06/events{/privacy}","received_events_url":"https://api.github.com/users/vdmehta06/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/vdmehta06/CONNECT","description":"CONNECT Codebase (2.x, 3.x, 4.x)","fork":true,"url":"https://api.github.com/repos/vdmehta06/CONNECT","forks_url":"https://api.github.com/repos/vdmehta06/CONNECT/forks","keys_url":"https://api.github.com/repos/vdmehta06/CONNECT/keys{/key_id}","collaborators_url":"https://api.github.com/repos/vdmehta06/CONNECT/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/vdmehta06/CONNECT/teams","hooks_url":"https://api.github.com/repos/vdmehta06/CONNECT/hooks","issue_events_url":"https://api.github.com/repos/vdmehta06/CONNECT/issues/events{/number}","events_url":"https://api.github.com/repos/vdmehta06/CONNECT/events","assignees_url":"https://api.github.com/repos/vdmehta06/CONNECT/assignees{/user}","branches_url":"https://api.github.com/repos/vdmehta06/CONNECT/branches{/branch}","tags_url":"https://api.github.com/repos/vdmehta06/CONNECT/tags","blobs_url":"https://api.github.com/repos/vdmehta06/CONNECT/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/vdmehta06/CONNECT/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/vdmehta06/CONNECT/git/refs{/sha}","trees_url":"https://api.github.com/repos/vdmehta06/CONNECT/git/trees{/sha}","statuses_url":"https://api.github.com/repos/vdmehta06/CONNECT/statuses/{sha}","languages_url":"https://api.github.com/repos/vdmehta06/CONNECT/languages","stargazers_url":"https://api.github.com/repos/vdmehta06/CONNECT/stargazers","contributors_url":"https://api.github.com/repos/vdmehta06/CONNECT/contributors","subscribers_url":"https://api.github.com/repos/vdmehta06/CONNECT/subscribers","subscription_url":"https://api.github.com/repos/vdmehta06/CONNECT/subscription","commits_url":"https://api.github.com/repos/vdmehta06/CONNECT/commits{/sha}","git_commits_url":"https://api.github.com/repos/vdmehta06/CONNECT/git/commits{/sha}","comments_url":"https://api.github.com/repos/vdmehta06/CONNECT/comments{/number}","issue_comment_url":"https://api.github.com/repos/vdmehta06/CONNECT/issues/comments{/number}","contents_url":"https://api.github.com/repos/vdmehta06/CONNECT/contents/{+path}","compare_url":"https://api.github.com/repos/vdmehta06/CONNECT/compare/{base}...{head}","merges_url":"https://api.github.com/repos/vdmehta06/CONNECT/merges","archive_url":"https://api.github.com/repos/vdmehta06/CONNECT/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/vdmehta06/CONNECT/downloads","issues_url":"https://api.github.com/repos/vdmehta06/CONNECT/issues{/number}","pulls_url":"https://api.github.com/repos/vdmehta06/CONNECT/pulls{/number}","milestones_url":"https://api.github.com/repos/vdmehta06/CONNECT/milestones{/number}","notifications_url":"https://api.github.com/repos/vdmehta06/CONNECT/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/vdmehta06/CONNECT/labels{/name}","releases_url":"https://api.github.com/repos/vdmehta06/CONNECT/releases{/id}","created_at":"2015-07-29T15:00:05Z","updated_at":"2015-07-29T15:00:22Z","pushed_at":"2015-09-16T14:19:35Z","git_url":"git://github.com/vdmehta06/CONNECT.git","ssh_url":"git@github.com:vdmehta06/CONNECT.git","clone_url":"https://github.com/vdmehta06/CONNECT.git","svn_url":"https://github.com/vdmehta06/CONNECT","homepage":"http://www.connectopensource.org","size":1924721,"stargazers_count":0,"watchers_count":0,"language":"Java","has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":true,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"CONNECT_integration"}},"base":{"label":"CONNECT-Solution:CONNECT_integration","ref":"CONNECT_integration","sha":"77127d077a3468cf4e3f0007e7ed006cbee59d84","user":{"login":"CONNECT-Solution","id":1440978,"avatar_url":"https://avatars.githubusercontent.com/u/1440978?v=3","gravatar_id":"","url":"https://api.github.com/users/CONNECT-Solution","html_url":"https://github.com/CONNECT-Solution","followers_url":"https://api.github.com/users/CONNECT-Solution/followers","following_url":"https://api.github.com/users/CONNECT-Solution/following{/other_user}","gists_url":"https://api.github.com/users/CONNECT-Solution/gists{/gist_id}","starred_url":"https://api.github.com/users/CONNECT-Solution/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/CONNECT-Solution/subscriptions","organizations_url":"https://api.github.com/users/CONNECT-Solution/orgs","repos_url":"https://api.github.com/users/CONNECT-Solution/repos","events_url":"https://api.github.com/users/CONNECT-Solution/events{/privacy}","received_events_url":"https://api.github.com/users/CONNECT-Solution/received_events","type":"Organization","site_admin":false},"repo":{"id":3452904,"name":"CONNECT","full_name":"CONNECT-Solution/CONNECT","owner":{"login":"CONNECT-Solution","id":1440978,"avatar_url":"https://avatars.githubusercontent.com/u/1440978?v=3","gravatar_id":"","url":"https://api.github.com/users/CONNECT-Solution","html_url":"https://github.com/CONNECT-Solution","followers_url":"https://api.github.com/users/CONNECT-Solution/followers","following_url":"https://api.github.com/users/CONNECT-Solution/following{/other_user}","gists_url":"https://api.github.com/users/CONNECT-Solution/gists{/gist_id}","starred_url":"https://api.github.com/users/CONNECT-Solution/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/CONNECT-Solution/subscriptions","organizations_url":"https://api.github.com/users/CONNECT-Solution/orgs","repos_url":"https://api.github.com/users/CONNECT-Solution/repos","events_url":"https://api.github.com/users/CONNECT-Solution/events{/privacy}","received_events_url":"https://api.github.com/users/CONNECT-Solution/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/CONNECT-Solution/CONNECT","description":"CONNECT Codebase (2.x, 3.x, 4.x)","fork":false,"url":"https://api.github.com/repos/CONNECT-Solution/CONNECT","forks_url":"https://api.github.com/repos/CONNECT-Solution/CONNECT/forks","keys_url":"https://api.github.com/repos/CONNECT-Solution/CONNECT/keys{/key_id}","collaborators_url":"https://api.github.com/repos/CONNECT-Solution/CONNECT/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/CONNECT-Solution/CONNECT/teams","hooks_url":"https://api.github.com/repos/CONNECT-Solution/CONNECT/hooks","issue_events_url":"https://api.github.com/repos/CONNECT-Solution/CONNECT/issues/events{/number}","events_url":"https://api.github.com/repos/CONNECT-Solution/CONNECT/events","assignees_url":"https://api.github.com/repos/CONNECT-Solution/CONNECT/assignees{/user}","branches_url":"https://api.github.com/repos/CONNECT-Solution/CONNECT/branches{/branch}","tags_url":"https://api.github.com/repos/CONNECT-Solution/CONNECT/tags","blobs_url":"https://api.github.com/repos/CONNECT-Solution/CONNECT/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/CONNECT-Solution/CONNECT/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/CONNECT-Solution/CONNECT/git/refs{/sha}","trees_url":"https://api.github.com/repos/CONNECT-Solution/CONNECT/git/trees{/sha}","statuses_url":"https://api.github.com/repos/CONNECT-Solution/CONNECT/statuses/{sha}","languages_url":"https://api.github.com/repos/CONNECT-Solution/CONNECT/languages","stargazers_url":"https://api.github.com/repos/CONNECT-Solution/CONNECT/stargazers","contributors_url":"https://api.github.com/repos/CONNECT-Solution/CONNECT/contributors","subscribers_url":"https://api.github.com/repos/CONNECT-Solution/CONNECT/subscribers","subscription_url":"https://api.github.com/repos/CONNECT-Solution/CONNECT/subscription","commits_url":"https://api.github.com/repos/CONNECT-Solution/CONNECT/commits{/sha}","git_commits_url":"https://api.github.com/repos/CONNECT-Solution/CONNECT/git/commits{/sha}","comments_url":"https://api.github.com/repos/CONNECT-Solution/CONNECT/comments{/number}","issue_comment_url":"https://api.github.com/repos/CONNECT-Solution/CONNECT/issues/comments{/number}","contents_url":"https://api.github.com/repos/CONNECT-Solution/CONNECT/contents/{+path}","compare_url":"https://api.github.com/repos/CONNECT-Solution/CONNECT/compare/{base}...{head}","merges_url":"https://api.github.com/repos/CONNECT-Solution/CONNECT/merges","archive_url":"https://api.github.com/repos/CONNECT-Solution/CONNECT/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/CONNECT-Solution/CONNECT/downloads","issues_url":"https://api.github.com/repos/CONNECT-Solution/CONNECT/issues{/number}","pulls_url":"https://api.github.com/repos/CONNECT-Solution/CONNECT/pulls{/number}","milestones_url":"https://api.github.com/repos/CONNECT-Solution/CONNECT/milestones{/number}","notifications_url":"https://api.github.com/repos/CONNECT-Solution/CONNECT/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/CONNECT-Solution/CONNECT/labels{/name}","releases_url":"https://api.github.com/repos/CONNECT-Solution/CONNECT/releases{/id}","created_at":"2012-02-15T19:44:26Z","updated_at":"2015-08-10T00:27:23Z","pushed_at":"2015-09-16T14:27:04Z","git_url":"git://github.com/CONNECT-Solution/CONNECT.git","ssh_url":"git@github.com:CONNECT-Solution/CONNECT.git","clone_url":"https://github.com/CONNECT-Solution/CONNECT.git","svn_url":"https://github.com/CONNECT-Solution/CONNECT","homepage":"http://www.connectopensource.org","size":2275364,"stargazers_count":40,"watchers_count":40,"language":"Java","has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":true,"forks_count":78,"mirror_url":null,"open_issues_count":4,"forks":78,"open_issues":4,"watchers":40,"default_branch":"CONNECT_integration"}},"_links":{"self":{"href":"https://api.github.com/repos/CONNECT-Solution/CONNECT/pulls/1133"},"html":{"href":"https://github.com/CONNECT-Solution/CONNECT/pull/1133"},"issue":{"href":"https://api.github.com/repos/CONNECT-Solution/CONNECT/issues/1133"},"comments":{"href":"https://api.github.com/repos/CONNECT-Solution/CONNECT/issues/1133/comments"},"review_comments":{"href":"https://api.github.com/repos/CONNECT-Solution/CONNECT/pulls/1133/comments"},"review_comment":{"href":"https://api.github.com/repos/CONNECT-Solution/CONNECT/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/CONNECT-Solution/CONNECT/pulls/1133/commits"},"statuses":{"href":"https://api.github.com/repos/CONNECT-Solution/CONNECT/statuses/f9ed5fa6561dd86d1fdcb3cb3b9b4d1504edecd4"}}}}