Skip to content

Schema as resource on the classpath #18

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
jameswang-us merged 1 commit into from
Oct 16, 2025
Merged

Schema as resource on the classpath #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 7 additions & 5 deletions envvars-lib/src/main/java/com/optum/envvars/mapdata/EnvVarsMapDataEngine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,13 @@ public EnvVarsMapDataEngine(EnvVarsSchemaReader envVarsSchemaReader, EnvVarsStat
final Object schemaAsObject = rawSourceMap.get("schema");
if (envVarsSchemaReader!=null && schemaAsObject!=null) {
final String schemaAsString = schemaAsObject.toString();
final URL schemaUrl;
try {
schemaUrl = new URL(schemaAsString);
} catch (MalformedURLException e) {
throw new EnvVarsException("Unable to load EnvVars schema from: " + schemaAsString);
URL schemaUrl = getClass().getClassLoader().getResource(schemaAsString);
if (schemaUrl == null) {
try {
schemaUrl = new URL(schemaAsString);
} catch (MalformedURLException e) {
throw new EnvVarsException("Unable to load EnvVars schema from: " + schemaAsString);
}
}
this.envVarsStaticSchema = envVarsSchemaReader.buildFromURL(schemaUrl);
} else {
Expand Down
7 changes: 6 additions & 1 deletion envvars-yaml/src/main/java/com/optum/envvars/schema/yaml/YamlEnvVarsSchemaReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,16 @@ public EnvVarsStaticSchema buildFromString(String schemaString, String definitio
public EnvVarsStaticSchema buildFromURL(URL url) throws EnvVarsException {
final YamlLoadWrapper<SchemaYaml> yamlLoadWrapper = YamlLoadWrapper.fromURL(yaml, url);
final SchemaYaml schemaYaml = yamlLoadWrapper.load();
System.out.println("Schema Definitions for " + url + ": " + schemaYaml.definitions);

EnvVarsDefinitions envVarsDefinitions = new EnvVarsDefinitions();
for(String definition : schemaYaml.definitions) {
try {
EnvVarsDefinitions definitionsFromURL = new YamlEnvVarsDefinitionsReader().getFromURL(new URL(definition));
URL definitionUrl = getClass().getClassLoader().getResource(definition);
if (definitionUrl == null) {
definitionUrl = new URL(definition);
}
EnvVarsDefinitions definitionsFromURL = new YamlEnvVarsDefinitionsReader().getFromURL(definitionUrl);
envVarsDefinitions.put(definitionsFromURL);
} catch (MalformedURLException e) {
throw new EnvVarsException("Bad URL in Schema Definition: " + definition);
Expand Down
Loading