diff --git a/core/pom.xml b/core/pom.xml
index a80b74c58..f53a48784 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -92,10 +92,10 @@
io.github.dfa1.vortex.fbsgen.Main
--out
${project.basedir}/src/main/java/io/github/dfa1/vortex/fbs
- ${project.basedir}/src/main/flatbuffers/vortex-array/array.fbs
- ${project.basedir}/src/main/flatbuffers/vortex-dtype/dtype.fbs
- ${project.basedir}/src/main/flatbuffers/vortex-file/footer.fbs
- ${project.basedir}/src/main/flatbuffers/vortex-layout/layout.fbs
+ ${project.basedir}/src/main/fbs/array.fbs
+ ${project.basedir}/src/main/fbs/dtype.fbs
+ ${project.basedir}/src/main/fbs/footer.fbs
+ ${project.basedir}/src/main/fbs/layout.fbs
diff --git a/core/src/main/flatbuffers/vortex-array/array.fbs b/core/src/main/fbs/array.fbs
similarity index 100%
rename from core/src/main/flatbuffers/vortex-array/array.fbs
rename to core/src/main/fbs/array.fbs
diff --git a/core/src/main/flatbuffers/vortex-dtype/dtype.fbs b/core/src/main/fbs/dtype.fbs
similarity index 100%
rename from core/src/main/flatbuffers/vortex-dtype/dtype.fbs
rename to core/src/main/fbs/dtype.fbs
diff --git a/core/src/main/flatbuffers/vortex-file/footer.fbs b/core/src/main/fbs/footer.fbs
similarity index 98%
rename from core/src/main/flatbuffers/vortex-file/footer.fbs
rename to core/src/main/fbs/footer.fbs
index dad4de6d2..aa43a3005 100644
--- a/core/src/main/flatbuffers/vortex-file/footer.fbs
+++ b/core/src/main/fbs/footer.fbs
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: Apache-2.0
// SPDX-FileCopyrightText: Copyright the Vortex contributors
-include "vortex-array/array.fbs";
-include "vortex-layout/layout.fbs";
+include "array.fbs";
+include "layout.fbs";
namespace io.github.dfa1.vortex.fbs;
diff --git a/core/src/main/flatbuffers/vortex-layout/layout.fbs b/core/src/main/fbs/layout.fbs
similarity index 100%
rename from core/src/main/flatbuffers/vortex-layout/layout.fbs
rename to core/src/main/fbs/layout.fbs
diff --git a/fbs-gen/src/test/java/io/github/dfa1/vortex/fbsgen/CodeGenTest.java b/fbs-gen/src/test/java/io/github/dfa1/vortex/fbsgen/CodeGenTest.java
index 5438bd852..be7a598b4 100644
--- a/fbs-gen/src/test/java/io/github/dfa1/vortex/fbsgen/CodeGenTest.java
+++ b/fbs-gen/src/test/java/io/github/dfa1/vortex/fbsgen/CodeGenTest.java
@@ -95,10 +95,10 @@ void emitsEnumConstantsOverUnderlyingType() throws IOException {
private static void generate(Path out) throws IOException {
Path root = repoRoot();
List files = List.of(
- parse(root.resolve("core/src/main/flatbuffers/vortex-array/array.fbs")),
- parse(root.resolve("core/src/main/flatbuffers/vortex-dtype/dtype.fbs")),
- parse(root.resolve("core/src/main/flatbuffers/vortex-file/footer.fbs")),
- parse(root.resolve("core/src/main/flatbuffers/vortex-layout/layout.fbs"))
+ parse(root.resolve("core/src/main/fbs/array.fbs")),
+ parse(root.resolve("core/src/main/fbs/dtype.fbs")),
+ parse(root.resolve("core/src/main/fbs/footer.fbs")),
+ parse(root.resolve("core/src/main/fbs/layout.fbs"))
);
new CodeGen(new TypeRegistry(files)).emit(out);
}
diff --git a/fbs-gen/src/test/java/io/github/dfa1/vortex/fbsgen/ParserTest.java b/fbs-gen/src/test/java/io/github/dfa1/vortex/fbsgen/ParserTest.java
index f3ecf1d7a..9741ef104 100644
--- a/fbs-gen/src/test/java/io/github/dfa1/vortex/fbsgen/ParserTest.java
+++ b/fbs-gen/src/test/java/io/github/dfa1/vortex/fbsgen/ParserTest.java
@@ -21,10 +21,10 @@ class VortexSchemas {
/// not a synthetic subset.
@ParameterizedTest
@ValueSource(strings = {
- "core/src/main/flatbuffers/vortex-array/array.fbs",
- "core/src/main/flatbuffers/vortex-dtype/dtype.fbs",
- "core/src/main/flatbuffers/vortex-file/footer.fbs",
- "core/src/main/flatbuffers/vortex-layout/layout.fbs"
+ "core/src/main/fbs/array.fbs",
+ "core/src/main/fbs/dtype.fbs",
+ "core/src/main/fbs/footer.fbs",
+ "core/src/main/fbs/layout.fbs"
})
void parsesEveryVortexSchema(String relPath) throws IOException {
// Given
@@ -39,7 +39,7 @@ void parsesEveryVortexSchema(String relPath) throws IOException {
void parsesDtypeUnionAndTable() throws IOException {
// Given — dtype.fbs is the richest: enum-with-underlying, a 12-member union,
// and tables that reference each other recursively.
- Ast.SchemaFile sut = parse(repoRoot().resolve("core/src/main/flatbuffers/vortex-dtype/dtype.fbs"));
+ Ast.SchemaFile sut = parse(repoRoot().resolve("core/src/main/fbs/dtype.fbs"));
// Then — the underlying-typed enum is captured with all 11 PType values.
Ast.EnumDecl ptype = (Ast.EnumDecl) declNamed(sut, "PType");
@@ -62,7 +62,7 @@ void parsesDtypeUnionAndTable() throws IOException {
void parsesArrayStructVectorAndDefaults() throws IOException {
// Given — array.fbs exercises a struct (inline), vectors, an enum field,
// and `bool = null` three-state defaults.
- Ast.SchemaFile sut = parse(repoRoot().resolve("core/src/main/flatbuffers/vortex-array/array.fbs"));
+ Ast.SchemaFile sut = parse(repoRoot().resolve("core/src/main/fbs/array.fbs"));
// Then — Buffer is a struct, and its compression field references the enum.
Ast.StructDecl buffer = (Ast.StructDecl) declNamed(sut, "Buffer");
@@ -82,10 +82,10 @@ void parsesArrayStructVectorAndDefaults() throws IOException {
@Test
void capturesIncludesAndRootTypes() throws IOException {
// Given — footer.fbs includes the other schemas and declares three root types.
- Ast.SchemaFile sut = parse(repoRoot().resolve("core/src/main/flatbuffers/vortex-file/footer.fbs"));
+ Ast.SchemaFile sut = parse(repoRoot().resolve("core/src/main/fbs/footer.fbs"));
// Then
- assertThat(sut.includes()).containsExactly("vortex-array/array.fbs", "vortex-layout/layout.fbs");
+ assertThat(sut.includes()).containsExactly("array.fbs", "layout.fbs");
assertThat(sut.rootTypes()).containsExactly("FileStatistics", "Footer", "Postscript");
}
}