-
Notifications
You must be signed in to change notification settings - Fork 382
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
#6569 maven cell magic #6665
Merged
Merged
#6569 maven cell magic #6665
Changes from 6 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
4cb0cc3
#6565 additional logging for other clojure kernel tests
4f92d3d
#6569 mvn cell magic part 1
23019c9
#6569 mvn cell magic part 2
6b9d3fe
Revert "#6565 additional logging for other clojure kernel tests"
124ad9d
#6569 cr changes - banners for new files, fixed typo
4dd1279
Merge remote-tracking branch 'origin/master' into lmitusinski/6569
50dc638
#6569 added examples and description for mvn cell magic
1d7c353
#6569 fixed mvn cell magic additional repos bug
97162d8
#6569 removed dependecy conflict message
3723707
#6569 tablesaw and spark demos classpath example update
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
114 changes: 114 additions & 0 deletions
114
.../twosigma/beakerx/kernel/magic/command/functionality/ClassPathAddMvnCellMagicCommand.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,114 @@ | ||
| /* | ||
| * Copyright 2017 TWO SIGMA OPEN SOURCE, LLC | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| *import static org.assertj.core.api.Assertions.assertThat; | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package com.twosigma.beakerx.kernel.magic.command.functionality; | ||
|
|
||
| import com.twosigma.beakerx.kernel.KernelFunctionality; | ||
| import com.twosigma.beakerx.kernel.magic.command.MagicCommandExecutionParam; | ||
| import com.twosigma.beakerx.kernel.magic.command.MavenJarResolver; | ||
| import com.twosigma.beakerx.kernel.magic.command.PomFactory; | ||
| import com.twosigma.beakerx.kernel.magic.command.outcome.MagicCommandOutcomeItem; | ||
| import com.twosigma.beakerx.kernel.magic.command.outcome.MagicCommandOutput; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.Arrays; | ||
| import java.util.List; | ||
|
|
||
| public class ClassPathAddMvnCellMagicCommand extends ClasspathMagicCommand{ | ||
|
|
||
| public static final String ADD = "add"; | ||
| public static final String MVN = "mvn"; | ||
| public static final String CLASSPATH_ADD_MVN_CELL = "%" + CLASSPATH + " " + ADD + " " + MVN; | ||
| public static final String MVN_CELL_FORMAT_ERROR_MESSAGE = | ||
| "Wrong command format, should be " + CLASSPATH_ADD_MVN_CELL + "\n" | ||
| + " group name version or group:name:version" + "\n" | ||
| + " group name version or group:name:version"; | ||
| private static final String SPLIT_LINE_REGEX = "\\r?\\n"; | ||
|
|
||
| private MavenJarResolver.ResolverParams commandParams; | ||
| private PomFactory pomFactory; | ||
|
|
||
| public ClassPathAddMvnCellMagicCommand(MavenJarResolver.ResolverParams commandParams, KernelFunctionality kernel) { | ||
| super(kernel); | ||
| this.commandParams = commandParams; | ||
| this.pomFactory = new PomFactory(); | ||
| } | ||
|
|
||
| @Override | ||
| public String getMagicCommandName() { | ||
| return CLASSPATH_ADD_MVN_CELL; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean matchCommand(String command) { | ||
| String[] commandParts = MagicCommandUtils.splitPath(command); | ||
| return commandParts.length >= 3 | ||
| && commandParts[0].equals("%" + CLASSPATH) | ||
| && commandParts[1].equals(ADD) | ||
| && commandParts[2].equals(MVN); | ||
| } | ||
|
|
||
| @Override | ||
| public MagicCommandOutcomeItem execute(MagicCommandExecutionParam param) { | ||
| String command = param.getCommand(); | ||
| String commandCodeBlock = param.getCommandCodeBlock(); | ||
| if (commandCodeBlock != null){ | ||
| command += "\n" + commandCodeBlock; | ||
| } | ||
| String[] commandLines = command.split(SPLIT_LINE_REGEX); | ||
| unifyMvnLineFormat(commandLines); | ||
| if (!validateCommandLines(commandLines)){ | ||
| return new MagicCommandOutput(MagicCommandOutput.Status.ERROR, MVN_CELL_FORMAT_ERROR_MESSAGE); | ||
| } | ||
| List<MavenJarResolver.Dependency> dependencies = | ||
| getDepsFromCommand(Arrays.copyOfRange(commandLines, 1, commandLines.length)); | ||
| MavenJarResolver mavenJarResolver = new MavenJarResolver(commandParams, pomFactory); | ||
| MvnLoggerWidget mvnLoggerWidget = new MvnLoggerWidget(param.getCode().getMessage()); | ||
| MavenJarResolver.AddMvnCommandResult result = mavenJarResolver.retrieve(dependencies, mvnLoggerWidget); | ||
|
|
||
| if (result.isJarRetrieved()) { | ||
| return handleAddedJars(mavenJarResolver.getPathToMavenRepo() + "/*"); | ||
| } | ||
| return new MagicCommandOutput(MagicCommandOutput.Status.ERROR, result.getErrorMessage()); | ||
| } | ||
|
|
||
| private List<MavenJarResolver.Dependency> getDepsFromCommand(String[] lines) { | ||
| List<MavenJarResolver.Dependency> dependencies = new ArrayList<>(); | ||
| for (String line : lines) { | ||
| String[] dependencyData = MagicCommandUtils.splitPath(line); | ||
| dependencies.add(new MavenJarResolver.Dependency(dependencyData[0], dependencyData[1], dependencyData[2])); | ||
| } | ||
| return dependencies; | ||
| } | ||
|
|
||
| private boolean validateCommandLines(String[] commandLines) { | ||
| boolean isValid = false; | ||
| for (int i = 1; i < commandLines.length; i++) { | ||
| if (MagicCommandUtils.splitPath(commandLines[i]).length == 3){ | ||
| isValid = true; | ||
| } else { | ||
| isValid = false; | ||
| break; | ||
| } | ||
| } | ||
| return isValid; | ||
| } | ||
|
|
||
| private void unifyMvnLineFormat(String[] mvnLines){ | ||
| for (int i = 0; i < mvnLines.length; i++) { | ||
| mvnLines[i] = mvnLines[i].replace(":"," "); | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
all files need banner