Merge pull request #870 from b2ihealthcare/issue/mrcm_import_branch

MRCM import branch

Author: cmark

snomed/com.b2international.snowowl.snomed.core.rest.tests/src/com/b2international/snowowl/snomed/core/io/MrcmImportExportTest.java

@@ -55,7 +55,7 @@ public void _01_importTest() throws Exception {
 		final Path path = PlatformUtil.toAbsolutePath(MrcmImportExportTest.class, "mrcm_import_test.json");
 
 		try (final InputStream stream = Files.newInputStream(path, StandardOpenOption.READ)) {
-			Services.service(MrcmImporter.class).doImport(Services.getAuthorizationToken(), RestExtensions.USER, stream);
+			Services.service(MrcmImporter.class).doImport(Services.getAuthorizationToken(), RestExtensions.USER, IBranchPath.MAIN_BRANCH, stream);
 		} 
 
 		// verify content

snomed/com.b2international.snowowl.snomed.datastore/src/com/b2international/snowowl/snomed/core/mrcm/io/MrcmCommand.java

@@ -71,6 +71,9 @@ private static final class ImportCommand extends Command {
 		@Parameters(paramLabel = "FILE", description = "The JSON file with MRCM rules to import")
 		String file;
 
+		@Parameters(paramLabel = "BRANCH", description = "The branch to import MRCM rules to")
+		String branch;
+		
 		@Override
 		public void run(CommandLineStream out) {
 			final User user = out.authenticate(getBus());
@@ -81,7 +84,7 @@ public void run(CommandLineStream out) {
 			}
 
 			try (final InputStream content = Files.newInputStream(Paths.get(file), StandardOpenOption.READ)) {
-				ApplicationContext.getServiceForClass(MrcmImporter.class).doImport(user, content);
+				ApplicationContext.getServiceForClass(MrcmImporter.class).doImport(user, branch, content);
 			} catch (IOException e) {
 				out.println("Failed to import MRCM JSON file: " + file);
 			}			

snomed/com.b2international.snowowl.snomed.datastore/src/com/b2international/snowowl/snomed/core/mrcm/io/MrcmImporter.java

@@ -31,8 +31,8 @@ public interface MrcmImporter {
 	 * @param user - the author of the import
 	 * @param source - the MRCM file to process and import.
 	 */
-	void doImport(User user, InputStream source);
+	void doImport(User user, String branch, InputStream source);
 
-	void doImport(String authorizationToken, String username, InputStream source);
+	void doImport(String authorizationToken, String username, String branch, InputStream source);
 
 }

snomed/com.b2international.snowowl.snomed.datastore/src/com/b2international/snowowl/snomed/core/mrcm/io/MrcmJsonImporter.java

@@ -52,9 +52,8 @@ public MrcmJsonImporter(Provider<IEventBus> bus) {
 	}
 
 	@Override
-	public void doImport(String authorizationToken, String username, InputStream source) {
+	public void doImport(String authorizationToken, String username, String branch, InputStream source) {
 
-		final String branch = Branch.MAIN_PATH;
 		ObjectMapper mapper = ApplicationContext.getServiceForClass(ObjectMapper.class);
 
 		final IEventBus bus = new AuthorizedEventBus(this.bus.get(), ImmutableMap.of(AuthorizedRequest.AUTHORIZATION_HEADER, authorizationToken));
@@ -95,9 +94,9 @@ public void doImport(String authorizationToken, String username, InputStream sou
 	}
 
 	@Override
-	public void doImport(User user, InputStream source) {
+	public void doImport(User user, String branch, InputStream source) {
 		String authorizationToken = ApplicationContext.getServiceForClass(JWTGenerator.class).generate(user);
-		doImport(authorizationToken, user.getUsername(), source);
+		doImport(authorizationToken, user.getUsername(), branch, source);
 	}
 
 }