You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@avro.apache.org by GitBox <gi...@apache.org> on 2021/03/25 18:54:57 UTC
[GitHub] [avro] kan-izh opened a new pull request #1157: AVRO-3095: Handle relative imports in resources
kan-izh opened a new pull request #1157:
URL: https://github.com/apache/avro/pull/1157
Make sure you have checked _all_ steps below.
### Jira
- [ ] My PR addresses the following [Avro Jira](https://issues.apache.org/jira/browse/AVRO/) issues and references them in the PR title. For example, "AVRO-1234: My Avro PR"
- https://issues.apache.org/jira/browse/AVRO-XXX
- In case you are adding a dependency, check if the license complies with the [ASF 3rd Party License Policy](https://www.apache.org/legal/resolved.html#category-x).
### Tests
- [ ] My PR adds the following unit tests __OR__ does not need testing for this extremely good reason:
### Commits
- [ ] My commits all reference Jira issues in their subject lines. In addition, my commits follow the guidelines from "[How to write a good git commit message](https://chris.beams.io/posts/git-commit/)":
1. Subject is separated from body by a blank line
1. Subject is limited to 50 characters (not including Jira issue reference)
1. Subject does not end with a period
1. Subject uses the imperative mood ("add", not "adding")
1. Body wraps at 72 characters
1. Body explains "what" and "why", not "how"
### Documentation
- [ ] In case of new functionality, my PR adds documentation that describes how to use it.
- All the public functions and the classes in the PR contain Javadoc that explain what it does
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [avro] martin-g commented on a change in pull request #1157: AVRO-3095: Handle relative imports in resources
Posted by GitBox <gi...@apache.org>.
martin-g commented on a change in pull request #1157:
URL: https://github.com/apache/avro/pull/1157#discussion_r723016811
##########
File path: lang/java/compiler/src/main/javacc/org/apache/avro/compiler/idl/idl.jj
##########
@@ -150,12 +164,15 @@ public class Idl implements Closeable {
throw error(key+" values must be textual: "+n, token);
return values;
}
-
+
private URL findFile(String importFile) throws IOException {
- File file = new File(this.inputDir, importFile);
+ URI uri = this.inputDir.resolve(importFile);
+ File file = "file".equals(uri.getScheme()) ? new File(uri.getPath()) : null;
URL result = null;
- if (file.exists())
- result = file.toURL();
+ if (file != null && file.exists())
+ result = file.toURI().toURL();
+ else if("classpath".equals(uri.getScheme()))
+ result = this.resourceLoader.getResource(uri.getPath().substring(1));
else if (this.resourceLoader != null)
Review comment:
The check here suggests that `this.resourceLoader` could be `null`. It seems now line 175 could lead to NullPointerException.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@avro.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [avro] RyanSkraba merged pull request #1157: AVRO-3095: Handle relative imports in resources
Posted by GitBox <gi...@apache.org>.
RyanSkraba merged pull request #1157:
URL: https://github.com/apache/avro/pull/1157
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscribe@avro.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org