{"action":"created","comment":{"url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/pulls/comments/44066960","id":44066960,"diff_hunk":"@@ -29,40 +33,50 @@\n     @Resource\n     SchedulePlanServiceImpl schedulePlanService;\n     \n+    private Study study;\n+    \n+    @Before\n+    public void before() {\n+        study = new DynamoStudy();\n+        study.setIdentifier(\"test-study\");\n+        study.setTaskIdentifiers(Sets.newHashSet(\"AAA\", \"BBB\", \"CCC\"));\n+    }\n+    \n     @Test\n     public void schedulePlansAreFilteredByAppVersion() {\n-        StudyIdentifier studyId = new StudyIdentifierImpl(\"test-study\");\n         SchedulePlan savedPlan = null;\n         try {\n-            SchedulePlan plan = TestUtils.getABTestSchedulePlan(TestConstants.TEST_STUDY);\n+            SchedulePlan plan = TestUtils.getABTestSchedulePlan(TEST_STUDY);\n             plan.setGuid(null);\n             plan.setVersion(null);\n             plan.setMinAppVersion(14);\n             plan.setMaxAppVersion(15);\n-            plan.setStudyKey(studyId.getIdentifier());\n-            savedPlan = schedulePlanService.createSchedulePlan(plan);\n+            plan.setStudyKey(study.getIdentifier());\n+            savedPlan = schedulePlanService.createSchedulePlan(study, plan);\n             \n-            int baseCount = schedulePlanService.getSchedulePlans(ClientInfo.UNKNOWN_CLIENT, studyId).size();\n+            int baseCount = schedulePlanService.getSchedulePlans(ClientInfo.UNKNOWN_CLIENT, study).size();\n             \n             // This is not high enough for the app version, nothing returned.\n             ClientInfo clientInfo = ClientInfo.fromUserAgentCache(\"TestApp/13 TestSDK/8\");\n-            List<SchedulePlan> plans = schedulePlanService.getSchedulePlans(clientInfo, studyId);\n+            List<SchedulePlan> plans = schedulePlanService.getSchedulePlans(clientInfo, study);\n             assertEquals(baseCount-1, plans.size());\n             \n             // Right in the range, the plan is returned\n             clientInfo = ClientInfo.fromUserAgentCache(\"TestApp/14 TestSDK/8\");\n-            plans = schedulePlanService.getSchedulePlans(clientInfo, new StudyIdentifierImpl(\"test-study\"));\n+            plans = schedulePlanService.getSchedulePlans(clientInfo, study);\n             assertEquals(baseCount, plans.size());\n             \n             clientInfo = ClientInfo.fromUserAgentCache(\"TestApp/15 TestSDK/8\");\n-            plans = schedulePlanService.getSchedulePlans(clientInfo, new StudyIdentifierImpl(\"test-study\"));\n+            plans = schedulePlanService.getSchedulePlans(clientInfo, study);\n             assertEquals(baseCount, plans.size());\n             \n             // Finally, this is outside the upper-bound, so the plan will not be returned\n             clientInfo = ClientInfo.fromUserAgentCache(\"TestApp/16 TestSDK/40\");\n-            plans = schedulePlanService.getSchedulePlans(clientInfo, new StudyIdentifierImpl(\"test-study\"));\n+            plans = schedulePlanService.getSchedulePlans(clientInfo, study);\n             assertEquals(baseCount-1, plans.size());\n             \n+        } catch(Exception e) {\n+            e.printStackTrace();","path":"test/org/sagebionetworks/bridge/services/SchedulePlanServiceTest.java","position":89,"original_position":89,"commit_id":"00508ebef8afd9dababf455a8a41969d106ae742","original_commit_id":"00508ebef8afd9dababf455a8a41969d106ae742","user":{"login":"DwayneJengSage","id":9541190,"avatar_url":"https://avatars.githubusercontent.com/u/9541190?v=3","gravatar_id":"","url":"https://api.github.com/users/DwayneJengSage","html_url":"https://github.com/DwayneJengSage","followers_url":"https://api.github.com/users/DwayneJengSage/followers","following_url":"https://api.github.com/users/DwayneJengSage/following{/other_user}","gists_url":"https://api.github.com/users/DwayneJengSage/gists{/gist_id}","starred_url":"https://api.github.com/users/DwayneJengSage/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/DwayneJengSage/subscriptions","organizations_url":"https://api.github.com/users/DwayneJengSage/orgs","repos_url":"https://api.github.com/users/DwayneJengSage/repos","events_url":"https://api.github.com/users/DwayneJengSage/events{/privacy}","received_events_url":"https://api.github.com/users/DwayneJengSage/received_events","type":"User","site_admin":false},"body":"Incidentally, it might be worth null-checking savedPlan in the finally blocks. I suspect that's why the finally blocks are throwing.","created_at":"2015-11-05T20:47:57Z","updated_at":"2015-11-05T20:47:57Z","html_url":"https://github.com/Sage-Bionetworks/BridgePF/pull/896#discussion_r44066960","pull_request_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/pulls/896","_links":{"self":{"href":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/pulls/comments/44066960"},"html":{"href":"https://github.com/Sage-Bionetworks/BridgePF/pull/896#discussion_r44066960"},"pull_request":{"href":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/pulls/896"}}},"pull_request":{"url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/pulls/896","id":49722681,"html_url":"https://github.com/Sage-Bionetworks/BridgePF/pull/896","diff_url":"https://github.com/Sage-Bionetworks/BridgePF/pull/896.diff","patch_url":"https://github.com/Sage-Bionetworks/BridgePF/pull/896.patch","issue_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/issues/896","number":896,"state":"open","locked":false,"title":"Study enumerations","user":{"login":"alxdarksage","id":5589085,"avatar_url":"https://avatars.githubusercontent.com/u/5589085?v=3","gravatar_id":"","url":"https://api.github.com/users/alxdarksage","html_url":"https://github.com/alxdarksage","followers_url":"https://api.github.com/users/alxdarksage/followers","following_url":"https://api.github.com/users/alxdarksage/following{/other_user}","gists_url":"https://api.github.com/users/alxdarksage/gists{/gist_id}","starred_url":"https://api.github.com/users/alxdarksage/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/alxdarksage/subscriptions","organizations_url":"https://api.github.com/users/alxdarksage/orgs","repos_url":"https://api.github.com/users/alxdarksage/repos","events_url":"https://api.github.com/users/alxdarksage/events{/privacy}","received_events_url":"https://api.github.com/users/alxdarksage/received_events","type":"User","site_admin":false},"body":"- adds study identifier enumeration to study;\r\n- adds data group enumeration to study;\r\n- validate that studies only reference declared task identifiers;\r\n- cleans up static imports and redundant declarations of StudyIdentifiers. ","created_at":"2015-11-04T17:56:54Z","updated_at":"2015-11-05T20:47:57Z","closed_at":null,"merged_at":null,"merge_commit_sha":"3a3a236f2c13b7bc3ddd3aed46d95e1ceed59fb5","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/pulls/896/commits","review_comments_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/pulls/896/comments","review_comment_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/pulls/comments{/number}","comments_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/issues/896/comments","statuses_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/statuses/00508ebef8afd9dababf455a8a41969d106ae742","head":{"label":"alxdarksage:study-enumerations","ref":"study-enumerations","sha":"00508ebef8afd9dababf455a8a41969d106ae742","user":{"login":"alxdarksage","id":5589085,"avatar_url":"https://avatars.githubusercontent.com/u/5589085?v=3","gravatar_id":"","url":"https://api.github.com/users/alxdarksage","html_url":"https://github.com/alxdarksage","followers_url":"https://api.github.com/users/alxdarksage/followers","following_url":"https://api.github.com/users/alxdarksage/following{/other_user}","gists_url":"https://api.github.com/users/alxdarksage/gists{/gist_id}","starred_url":"https://api.github.com/users/alxdarksage/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/alxdarksage/subscriptions","organizations_url":"https://api.github.com/users/alxdarksage/orgs","repos_url":"https://api.github.com/users/alxdarksage/repos","events_url":"https://api.github.com/users/alxdarksage/events{/privacy}","received_events_url":"https://api.github.com/users/alxdarksage/received_events","type":"User","site_admin":false},"repo":{"id":45479946,"name":"BridgePF","full_name":"alxdarksage/BridgePF","owner":{"login":"alxdarksage","id":5589085,"avatar_url":"https://avatars.githubusercontent.com/u/5589085?v=3","gravatar_id":"","url":"https://api.github.com/users/alxdarksage","html_url":"https://github.com/alxdarksage","followers_url":"https://api.github.com/users/alxdarksage/followers","following_url":"https://api.github.com/users/alxdarksage/following{/other_user}","gists_url":"https://api.github.com/users/alxdarksage/gists{/gist_id}","starred_url":"https://api.github.com/users/alxdarksage/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/alxdarksage/subscriptions","organizations_url":"https://api.github.com/users/alxdarksage/orgs","repos_url":"https://api.github.com/users/alxdarksage/repos","events_url":"https://api.github.com/users/alxdarksage/events{/privacy}","received_events_url":"https://api.github.com/users/alxdarksage/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/alxdarksage/BridgePF","description":"Server software for Bridge-based mobile applications","fork":true,"url":"https://api.github.com/repos/alxdarksage/BridgePF","forks_url":"https://api.github.com/repos/alxdarksage/BridgePF/forks","keys_url":"https://api.github.com/repos/alxdarksage/BridgePF/keys{/key_id}","collaborators_url":"https://api.github.com/repos/alxdarksage/BridgePF/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/alxdarksage/BridgePF/teams","hooks_url":"https://api.github.com/repos/alxdarksage/BridgePF/hooks","issue_events_url":"https://api.github.com/repos/alxdarksage/BridgePF/issues/events{/number}","events_url":"https://api.github.com/repos/alxdarksage/BridgePF/events","assignees_url":"https://api.github.com/repos/alxdarksage/BridgePF/assignees{/user}","branches_url":"https://api.github.com/repos/alxdarksage/BridgePF/branches{/branch}","tags_url":"https://api.github.com/repos/alxdarksage/BridgePF/tags","blobs_url":"https://api.github.com/repos/alxdarksage/BridgePF/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/alxdarksage/BridgePF/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/alxdarksage/BridgePF/git/refs{/sha}","trees_url":"https://api.github.com/repos/alxdarksage/BridgePF/git/trees{/sha}","statuses_url":"https://api.github.com/repos/alxdarksage/BridgePF/statuses/{sha}","languages_url":"https://api.github.com/repos/alxdarksage/BridgePF/languages","stargazers_url":"https://api.github.com/repos/alxdarksage/BridgePF/stargazers","contributors_url":"https://api.github.com/repos/alxdarksage/BridgePF/contributors","subscribers_url":"https://api.github.com/repos/alxdarksage/BridgePF/subscribers","subscription_url":"https://api.github.com/repos/alxdarksage/BridgePF/subscription","commits_url":"https://api.github.com/repos/alxdarksage/BridgePF/commits{/sha}","git_commits_url":"https://api.github.com/repos/alxdarksage/BridgePF/git/commits{/sha}","comments_url":"https://api.github.com/repos/alxdarksage/BridgePF/comments{/number}","issue_comment_url":"https://api.github.com/repos/alxdarksage/BridgePF/issues/comments{/number}","contents_url":"https://api.github.com/repos/alxdarksage/BridgePF/contents/{+path}","compare_url":"https://api.github.com/repos/alxdarksage/BridgePF/compare/{base}...{head}","merges_url":"https://api.github.com/repos/alxdarksage/BridgePF/merges","archive_url":"https://api.github.com/repos/alxdarksage/BridgePF/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/alxdarksage/BridgePF/downloads","issues_url":"https://api.github.com/repos/alxdarksage/BridgePF/issues{/number}","pulls_url":"https://api.github.com/repos/alxdarksage/BridgePF/pulls{/number}","milestones_url":"https://api.github.com/repos/alxdarksage/BridgePF/milestones{/number}","notifications_url":"https://api.github.com/repos/alxdarksage/BridgePF/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/alxdarksage/BridgePF/labels{/name}","releases_url":"https://api.github.com/repos/alxdarksage/BridgePF/releases{/id}","created_at":"2015-11-03T16:35:11Z","updated_at":"2015-11-03T16:35:16Z","pushed_at":"2015-11-05T20:07:58Z","git_url":"git://github.com/alxdarksage/BridgePF.git","ssh_url":"git@github.com:alxdarksage/BridgePF.git","clone_url":"https://github.com/alxdarksage/BridgePF.git","svn_url":"https://github.com/alxdarksage/BridgePF","homepage":"","size":77614,"stargazers_count":0,"watchers_count":0,"language":"Java","has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"develop"}},"base":{"label":"Sage-Bionetworks:develop","ref":"develop","sha":"7c89c001fe0404328334ae9452a45be4a01d4e88","user":{"login":"Sage-Bionetworks","id":1250897,"avatar_url":"https://avatars.githubusercontent.com/u/1250897?v=3","gravatar_id":"","url":"https://api.github.com/users/Sage-Bionetworks","html_url":"https://github.com/Sage-Bionetworks","followers_url":"https://api.github.com/users/Sage-Bionetworks/followers","following_url":"https://api.github.com/users/Sage-Bionetworks/following{/other_user}","gists_url":"https://api.github.com/users/Sage-Bionetworks/gists{/gist_id}","starred_url":"https://api.github.com/users/Sage-Bionetworks/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Sage-Bionetworks/subscriptions","organizations_url":"https://api.github.com/users/Sage-Bionetworks/orgs","repos_url":"https://api.github.com/users/Sage-Bionetworks/repos","events_url":"https://api.github.com/users/Sage-Bionetworks/events{/privacy}","received_events_url":"https://api.github.com/users/Sage-Bionetworks/received_events","type":"Organization","site_admin":false},"repo":{"id":18604783,"name":"BridgePF","full_name":"Sage-Bionetworks/BridgePF","owner":{"login":"Sage-Bionetworks","id":1250897,"avatar_url":"https://avatars.githubusercontent.com/u/1250897?v=3","gravatar_id":"","url":"https://api.github.com/users/Sage-Bionetworks","html_url":"https://github.com/Sage-Bionetworks","followers_url":"https://api.github.com/users/Sage-Bionetworks/followers","following_url":"https://api.github.com/users/Sage-Bionetworks/following{/other_user}","gists_url":"https://api.github.com/users/Sage-Bionetworks/gists{/gist_id}","starred_url":"https://api.github.com/users/Sage-Bionetworks/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Sage-Bionetworks/subscriptions","organizations_url":"https://api.github.com/users/Sage-Bionetworks/orgs","repos_url":"https://api.github.com/users/Sage-Bionetworks/repos","events_url":"https://api.github.com/users/Sage-Bionetworks/events{/privacy}","received_events_url":"https://api.github.com/users/Sage-Bionetworks/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/Sage-Bionetworks/BridgePF","description":"Server software for Bridge-based mobile applications","fork":false,"url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF","forks_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/forks","keys_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/keys{/key_id}","collaborators_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/teams","hooks_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/hooks","issue_events_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/issues/events{/number}","events_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/events","assignees_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/assignees{/user}","branches_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/branches{/branch}","tags_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/tags","blobs_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/git/refs{/sha}","trees_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/git/trees{/sha}","statuses_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/statuses/{sha}","languages_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/languages","stargazers_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/stargazers","contributors_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/contributors","subscribers_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/subscribers","subscription_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/subscription","commits_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/commits{/sha}","git_commits_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/git/commits{/sha}","comments_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/comments{/number}","issue_comment_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/issues/comments{/number}","contents_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/contents/{+path}","compare_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/compare/{base}...{head}","merges_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/merges","archive_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/downloads","issues_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/issues{/number}","pulls_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/pulls{/number}","milestones_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/milestones{/number}","notifications_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/labels{/name}","releases_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/releases{/id}","created_at":"2014-04-09T16:38:46Z","updated_at":"2015-08-30T22:35:59Z","pushed_at":"2015-11-05T16:20:20Z","git_url":"git://github.com/Sage-Bionetworks/BridgePF.git","ssh_url":"git@github.com:Sage-Bionetworks/BridgePF.git","clone_url":"https://github.com/Sage-Bionetworks/BridgePF.git","svn_url":"https://github.com/Sage-Bionetworks/BridgePF","homepage":"","size":77614,"stargazers_count":4,"watchers_count":4,"language":"Java","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":14,"mirror_url":null,"open_issues_count":2,"forks":14,"open_issues":2,"watchers":4,"default_branch":"develop"}},"_links":{"self":{"href":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/pulls/896"},"html":{"href":"https://github.com/Sage-Bionetworks/BridgePF/pull/896"},"issue":{"href":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/issues/896"},"comments":{"href":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/issues/896/comments"},"review_comments":{"href":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/pulls/896/comments"},"review_comment":{"href":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/pulls/896/commits"},"statuses":{"href":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/statuses/00508ebef8afd9dababf455a8a41969d106ae742"}}}}