Skip to content

fix Openapi dir resolving #2941

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
predic8 merged 3 commits into from
May 22, 2026
Merged

fix Openapi dir resolving #2941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ba8ef0a
Handle file URIs in OpenAPI directory resolution and add test for rel…
christiangoerdes May 5, 2026
cad27de
Simplify OpenAPI directory resolution by reducing redundant code in `…
christiangoerdes May 12, 2026
fff6a30
Merge branch 'master' into openapi-dir-resolving
christiangoerdes May 12, 2026
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
2 changes: 1 addition & 1 deletion core/src/main/java/com/predic8/membrane/core/openapi/serviceproxy/OpenAPIRecordFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ private boolean toYesNo(OpenAPISpec.YesNoOpenAPIOption option) {
}

private File[] getOpenAPIFiles(String directoryName) {
File dir = new File(directoryName);
File dir = new File(pathFromFileURI(resolve(directoryName)));
if (!dir.exists() || !dir.isDirectory()) {
throw new ConfigurationException(format("Cannot open directory %s. Please check the OpenAPI configuration of your API.", dir.getAbsolutePath()));
}
Expand Down
14 changes: 13 additions & 1 deletion ...rc/test/java/com/predic8/membrane/core/openapi/serviceproxy/OpenAPIRecordFactoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,18 @@ void referencesDepth() {
assertNotNull(getMail(rec));
}

@Test
void readsDirectoryRelativeToBaseLocation() {
OpenAPISpec spec = new OpenAPISpec();
spec.setDir("paths");

Map<String, OpenAPIRecord> recs = factory.create(singletonList(spec));

assertEquals(3, recs.size());
assertTrue(recs.containsKey("api-b-path-foo-v1-0"));
assertTrue(recs.keySet().stream().anyMatch(id -> id.startsWith("api-a-path-foo-v1-0")));
}

@Test
void getUniqueIdNoCollision() {
assertEquals("customers-api-v1-0", factory.getUniqueId(new HashMap<>(), new OpenAPIRecord(getApi(this, "/openapi/specs/customers.yml"), null)));
Expand All @@ -134,4 +146,4 @@ void getUniqueIdCollision() {
recs.put("customers-api-v1-0", new OpenAPIRecord());
assertEquals("customers-api-v1-0-0", factory.getUniqueId(recs, new OpenAPIRecord(getApi(this, "/openapi/specs/customers.yml"), null)));
}
}
}
Loading