Skip to content

Set baseImportPath to . when config parent is empty #814

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.

Sign up for GitHub

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

Merged
JordonPhillips merged 2 commits into from
Jun 1, 2021
Merged

Set baseImportPath to . when config parent is empty #814

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba4d06d
Set baseImportPath to . when config parent is empty
JordonPhillips Jun 1, 2021
d556eae
Print more detailed info on null pointer exceptions
JordonPhillips Jun 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion smithy-build/src/main/java/software/amazon/smithy/build/model/ConfigLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
package software.amazon.smithy.build.model;

import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.List;
import java.util.Map;
import java.util.Optional;
Expand Down Expand Up @@ -44,7 +45,11 @@ private ConfigLoader() {}
static SmithyBuildConfig load(Path path) {
try {
String content = IoUtils.readUtf8File(path);
return load(path.getParent(), loadWithJson(path, content).expectObjectNode());
Path baseImportPath = path.getParent();
if (baseImportPath == null) {
baseImportPath = Paths.get(".");
}
return load(baseImportPath, loadWithJson(path, content).expectObjectNode());
} catch (ModelSyntaxException e) {
throw new SmithyBuildException(e);
}
Expand Down
6 changes: 6 additions & 0 deletions smithy-cli/src/main/java/software/amazon/smithy/cli/Cli.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,12 @@ private void printException(String[] args, Throwable throwable) {
setUseAnsiColors(false);
}

if (throwable instanceof NullPointerException) {
Colors.BOLD_RED.out("A null pointer exception occurred while running the Smithy CLI. The --stacktrace "
+ "argument can be used to get more information. Please open an issue with the Smithy team "
+ "on GitHub so this can be investigated: https://github.com/awslabs/smithy/issues");
}

Colors.BOLD_RED.out(throwable.getMessage());
if (hasArgument(args, STACKTRACE)) {
StringWriter sw = new StringWriter();
Expand Down