Skip to content

Commit 23e46ae

Browse files
authored
In the vent that the domainDSLBuilder fails for any reason, it is better if we do this after we do cleanup on the src/main/domain files so we don't have files hanging around that would otherwise get cleaned up. (#168)
1 parent 402e530 commit 23e46ae

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

build.savant

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -88,12 +88,6 @@ target(name: "generateDomain", description: "Generates all of the json files for
8888
clientLibrary.generateDomainJson(srcDir: "build/src/fusionauth-jwt/io/fusionauth/jwt/domain/", outDir: "src/main/domain")
8989
clientLibrary.generateDomainJson(srcDir: "build/src/fusionauth-jwt/io/fusionauth/jwks/domain/", outDir: "src/main/domain")
9090

91-
// Run the DomainDSLBuilder as well, ideally we would try and switch to this DSL to build the domain objects at some point.
92-
// - The DomainDSLBuilder uses ASM the goal is to build a more complete DSL so we can optionally collapse extensions and polymorphic
93-
// classes in order to simplify all client domains that we build. For example some languages don't support polymorphic classes,
94-
// and it also complicates Deserialization for our IdPs etc. Simplifying of collapsing the domain may be useful.
95-
domainDSLBuilder()
96-
9791
// Note this is fairly brittle because if the class moves this doesn't get updated.
9892
[
9993
"io.fusionauth.api.domain.annotation.InternalUse.json",
@@ -112,6 +106,12 @@ target(name: "generateDomain", description: "Generates all of the json files for
112106
"io.fusionauth.jwt.domain.Type.json"
113107
]
114108
.forEach({ Files.deleteIfExists(Paths.get("src/main/domain").resolve(it)) })
109+
110+
// Run the DomainDSLBuilder as well, ideally we would try and switch to this DSL to build the domain objects at some point.
111+
// - The DomainDSLBuilder uses ASM the goal is to build a more complete DSL so we can optionally collapse extensions and polymorphic
112+
// classes in order to simplify all client domains that we build. For example some languages don't support polymorphic classes,
113+
// and it also complicates Deserialization for our IdPs etc. Simplifying of collapsing the domain may be useful.
114+
domainDSLBuilder()
115115
}
116116

117117
target(name: "idea", description: "Updates the IntelliJ IDEA module file") {

0 commit comments

Comments
 (0)