-
Notifications
You must be signed in to change notification settings - Fork 23
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
feat: add jbang and gav output formats #306
Closed
Closed
Changes from all commits
Commits
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,18 +1,21 @@ | ||
package it.mulders.mcs.search; | ||
|
||
import java.util.Arrays; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Could you please revert the reordering of imports? |
||
import java.util.stream.Collectors; | ||
|
||
import it.mulders.mcs.search.printer.BuildrOutput; | ||
import it.mulders.mcs.search.printer.CoordinatePrinter; | ||
import it.mulders.mcs.search.printer.GavOutput; | ||
import it.mulders.mcs.search.printer.GradleGroovyOutput; | ||
import it.mulders.mcs.search.printer.GradleGroovyShortOutput; | ||
import it.mulders.mcs.search.printer.GradleKotlinOutput; | ||
import it.mulders.mcs.search.printer.GrapeOutput; | ||
import it.mulders.mcs.search.printer.IvyXmlOutput; | ||
import it.mulders.mcs.search.printer.JBangOutput; | ||
import it.mulders.mcs.search.printer.LeiningenOutput; | ||
import it.mulders.mcs.search.printer.PomXmlOutput; | ||
import it.mulders.mcs.search.printer.SbtOutput; | ||
|
||
import java.util.Arrays; | ||
|
||
public enum FormatType { | ||
MAVEN("maven", new PomXmlOutput()), | ||
GRADLE("gradle", new GradleGroovyOutput()), | ||
|
@@ -22,7 +25,9 @@ public enum FormatType { | |
IVY("ivy", new IvyXmlOutput()), | ||
GRAPE("grape", new GrapeOutput()), | ||
LEININGEN("leiningen", new LeiningenOutput()), | ||
BUILDR("buildr", new BuildrOutput()); | ||
BUILDR("buildr", new BuildrOutput()), | ||
JBANG("jbang", new JBangOutput()), | ||
GAV("gav", new GavOutput()); | ||
|
||
private final String label; | ||
private final CoordinatePrinter printer; | ||
|
@@ -36,18 +41,27 @@ public CoordinatePrinter getPrinter() { | |
return printer; | ||
} | ||
|
||
static String commaSeparatedLabels() { | ||
return Arrays.stream(values()) | ||
.map(type -> type.label) | ||
.collect(Collectors.joining(", ")); | ||
} | ||
|
||
public static CoordinatePrinter providePrinter(final String text) { | ||
if (text == null) { | ||
return Constants.DEFAULT_PRINTER; | ||
} | ||
if (text.isBlank()) { | ||
throw new UnsupportedFormatException("Empty format type is not allowed."); | ||
throw new UnsupportedFormatException("Empty format type is not allowed. Use on of %s" | ||
.formatted(commaSeparatedLabels())); | ||
} | ||
|
||
|
||
return Arrays.stream(values()) | ||
.filter(type -> type.label.equals(text.trim())) | ||
.map(FormatType::getPrinter) | ||
.findFirst() | ||
.orElseThrow(() -> new UnsupportedFormatException("Format type '%s' is not supported.".formatted(text))); | ||
.orElseThrow(() -> new UnsupportedFormatException("Format type '%s' is not supported. Use one of %s" | ||
.formatted(text, commaSeparatedLabels()))); | ||
} | ||
} |
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
12 changes: 12 additions & 0 deletions
12
src/main/java/it/mulders/mcs/search/printer/GavOutput.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,12 @@ | ||
package it.mulders.mcs.search.printer; | ||
|
||
public final class GavOutput implements CoordinatePrinter { | ||
|
||
@Override | ||
public String provideCoordinates(final String group, final String artifact, final String version, String packaging) { | ||
if("jar".equals(packaging)) | ||
return "%s:%s:%s".formatted(group, artifact, version); | ||
else | ||
return "%s:%s:%s@%s".formatted(group, artifact, version, packaging); | ||
} | ||
} |
12 changes: 12 additions & 0 deletions
12
src/main/java/it/mulders/mcs/search/printer/JBangOutput.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,12 @@ | ||
package it.mulders.mcs.search.printer; | ||
|
||
public final class JBangOutput implements CoordinatePrinter { | ||
|
||
@Override | ||
public String provideCoordinates(final String group, final String artifact, final String version, String packaging) { | ||
if("jar".equals(packaging)) | ||
return "//DEPS %s:%s:%s".formatted(group, artifact, version); | ||
else | ||
return "//DEPS %s:%s:%s@%s".formatted(group, artifact, version, packaging); | ||
} | ||
} |
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.
Could you please revert the reordering of imports?