Skip to content

Commit 311fcba

Browse files
JulianStitzryukzak
JulianStitz
authored and
ryukzak
committed
Add Mustache-based template generator, including support for custom hooks, debugging options, and schema-driven rendering configurations.
Provide example mustache templates to generate basic java types. Ensure `ListElementInformationMixin` compliance in ListElementInformationMixinProvider. Add utility rendering support in Mustache generator and implement `HttpClient` template for Java. Refactor Mustache generator to unify resource and complex type view models, enhance template support, and eliminate unused `titleCase`. Refactor Mustache generator to support parent-child relationships for complex types and resources. Enhance schema handling with URI-based references, add child type support to ViewModel generation, and update templates accordingly. Add `@JsonTypeName` for improved polymorphic support in nested type templates Add filtering support to Mustache generator with `FilterType`, enabling whitelists/blacklists for resources and complex types. Refactor Mustache templates to unify resource and complex type handling by introducing `inner_resource_or_complex_type`. Update config.json, enhance polymorphic support, and add builder pattern support. Enhance builder pattern in Mustache templates by introducing `ReentrantLock` for thread safety, refining `ArrayList` initialization, and adding default constructors to builders and resource classes. Update type-handling annotations and improve polymorphic support. Introduce advanced builder pattern and feature support in Mustache templates. Add hashCode/equals, optional fields, wither methods, and improved polymorphic handling. Enhance ViewModel generation with detailed field/property flags and support for child/parent relationships. Update Maven config for spotless plugin and test dependencies. Add comprehensive `ResourceTest`. Refactor Mustache Java templates to improve type handling and introduce date/time getter support. Update `config.json` mappings and streamline field getter logic using reusable templates. Enhance Mustache Java templates with stricter `JsonAutoDetect` visibility for serialization control, refine `List.copyOf` logic for optional arrays, and update `ResourceTest` to include nested input serialization. Refactor Mustache Java templates to enhance builder methods with improved support for array handling and input validation. Update imports for `Arrays` and adjust `ResourceTest` to refine task input serialization. Enhance Mustache Java templates with improved support for `builder` feature. Refactor `config.json` and templates for `wither` integration. Update `ResourceTest` imports and task input handling. Refine Maven configuration to include `maven-source-plugin`. Optimize ViewModel generation with `NamedViewModel` ownership and streamlined primitive handling. Refactor Mustache Java templates to replace `builder()` with `toBuilder()` in `wither` methods for consistency and improved reusability. Update Mustache Java templates to enhance `toBuilder()` generation with conditional handling for child elements. Update Mustache Java templates to add configurable `ResourceTest` generation and improve `type` handling in `config.json`. Refactor Mustache Java templates to define `ResourceName` constants in resource classes, streamline `resourceClass` handling in `resource_names.mustache`, and update `config.json` paths for improved resource organization. Enhance Mustache Java templates to add reusable extension filtering methods and integrate them into relevant resource and complex type templates. Refactor Mustache Java templates to streamline `builder` handling by removing `wither` methods, introducing `final` modifiers for `toBuilder()` methods, and updating `config.json`. Enhance `ResourceTest` to include extension handling and additional validation. Refactor Mustache Java templates to improve builder method generation by introducing reusable element handling for primitives and adjusting `config.json`. Update `ResourceTest` with new JSON serialization and extension handling. Remove outdated templates and refine field getter logic. Update `ResourceTest` to refine description handling, add assertion for description equality, and adjust import order. Refactor Mustache Java templates to enhance builder methods with support for primitive array elements, improve field getter handling, and streamline serialization logic. Refactor Mustache Java templates and `config.json` to introduce `Primitive` type support, enhancing builder handling, serialization, and array element processing. Update `ResourceTest` to align with new primitive behaviors and add null safety checks for extension methods. Refactor Mustache Java templates and `config.json` to introduce `Utils` class, adding equality methods for `OffsetDateTime` and lists, enhancing serialization and hash code handling. Update `ResourceTest` for `LocalDateTime` support and improve JSON serialization. Add `jackson-datatype-jsr310` dependency in `pom.xml`. Enhance Mustache Java templates to add `CodeableConcept` behavior with `findFirstCodingBySystem` and `findCodingsBySystem` methods, refine `toBuilder()` handling, and integrate reusable behavior for complex types. Make `findFirstCodingBySystem`, `findCodingsBySystem`, `findFirstExtensionByURL`, and `findExtensionsByURL` methods final in Mustache Java templates for improved immutability. Add `toString` support to Mustache Java templates by updating `config.json` and integrating reusable `ToStringHelper` utility in `utils.mustache`. Include feature usage in relevant templates. Add `toString` implementation to Mustache Java templates using `ToStringHelper`. Update `ResourceTest` with additional `toString` assertions and refine `utils.mustache` helper methods. Extend `toString` template in Mustache Java to include primitive fields. Configure Eclipse-based formatter for Mustache Java templates and update spotless plugin in `pom.xml`. Refactor templates to enhance null-safety annotations and streamline field declaration style. Add reference handling in Mustache Java templates and `config.json`. Enhance `ResourceTest` with additional assertions and update `ResourceName` with utility methods for improved resource referencing. Refactor `toString` implementation in Mustache Java templates to use `Collectors.joining`, improving code readability and reducing iteration logic. Remove Eclipse-based formatter configuration and switch to Google Java Format in `pom.xml`. Update templates for streamlined annotation usage and add `toReference` method for resource references. Refactor Mustache Java templates to remove redundant `final` modifiers, enhance clarity in private methods, and simplify `toString` implementation for improved readability. Add dependency handling in Mustache Java templates and `config.json`. Update `ViewModelFactory` to collect and process resource and complex type dependencies. Refactor Mustache Java templates to organize into `model` directory structure. Update `config.json` paths and add separate `pom.xml` files for `model` and `client-spring` modules. Simplify `sdk-parent` configuration with module-based dependency management. Remove `client-spring` module and its `pom.xml` from Mustache Java templates. Update parent `pom.xml` to reflect module removal.
1 parent 790395b commit 311fcba

54 files changed

Lines changed: 2924 additions & 0 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎mustache/languages/java/config.json‎

Lines changed: 183 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,183 @@
1+
{
2+
"debug": "OFF",
3+
"hooks": {
4+
"afterGenerate": [
5+
{"cmd": "mvn","args": ["spotless:apply","--batch-mode", "--no-transfer-progress"]},
6+
{"cmd": "mvn","args": ["clean","test", "--batch-mode","--no-transfer-progress"]}
7+
]
8+
},
9+
"renderings": {
10+
"utility": [
11+
{
12+
"source":"model/utils/utils.mustache",
13+
"path": "model/src/main/java/de/solutio/fhir/models/",
14+
"fileNameFormat":"Utils.java",
15+
"properties": {
16+
"package": "de.solutio.fhir.models"
17+
}
18+
},
19+
{
20+
"source":"model/utils/resource_names.mustache",
21+
"path": "model/src/main/java/de/solutio/fhir/models",
22+
"fileNameFormat":"ResourceName.java",
23+
"properties": {
24+
"package": "de.solutio.fhir.models",
25+
"resourcePackage": "de.solutio.fhir.models.resources"
26+
}
27+
},
28+
{
29+
"source":"model/utils/primitive.mustache",
30+
"path": "model/src/main/java/de/solutio/fhir/models",
31+
"fileNameFormat":"Primitive.java",
32+
"properties": {
33+
"package": "de.solutio.fhir.models",
34+
"complexTypePackage": "de.solutio.fhir.models.complex_types"
35+
}
36+
}
37+
],
38+
"resource": [
39+
{
40+
"source":"model/resource_or_complex_type.mustache",
41+
"path": "model/src/main/java/de/solutio/fhir/models/resources",
42+
"fileNameFormat":"%s.java",
43+
"properties": {
44+
"package": "de.solutio.fhir.models.resources",
45+
"complexTypePackage": "de.solutio.fhir.models.complex_types",
46+
"resourcePackage": "de.solutio.fhir.models.resources",
47+
"additional_imports": [
48+
"de.solutio.fhir.models.Primitive",
49+
"de.solutio.fhir.models.ResourceName",
50+
"de.solutio.fhir.models.Utils"
51+
],
52+
"features": {
53+
"hash_code_equals": true,
54+
"builder": true,
55+
"to_string": true
56+
}
57+
}
58+
}
59+
],
60+
"complexType": [
61+
{
62+
"source":"model/resource_or_complex_type.mustache",
63+
"path": "model/src/main/java/de/solutio/fhir/models/complex_types",
64+
"fileNameFormat":"%s.java",
65+
"properties": {
66+
"package": "de.solutio.fhir.models.complex_types",
67+
"complexTypePackage": "de.solutio.fhir.models.complex_types",
68+
"resourcePackage": "de.solutio.fhir.models.resources",
69+
"additional_imports": [
70+
"de.solutio.fhir.models.Primitive",
71+
"de.solutio.fhir.models.ResourceName",
72+
"de.solutio.fhir.models.Utils"
73+
],
74+
"features": {
75+
"hash_code_equals": true,
76+
"builder": true,
77+
"to_string": true
78+
}
79+
}
80+
}
81+
]
82+
},
83+
"nameTransformations": {
84+
"common": [
85+
{"pattern": "^(?<number>\\d+)(?<rest>.*)$", "format": "_$<number>$<rest>"}
86+
],
87+
"enumValue": [
88+
{"pattern": "^<=$", "format": "LESS_OR_EQUAL"},
89+
{"pattern": "^>=$", "format": "GREATER_OR_EQUAL"},
90+
{"pattern": "^<$", "format": "LESS"},
91+
{"pattern": "^=$", "format": "EQUAL"},
92+
{"pattern": "^>$", "format": "GREATER"}
93+
],
94+
"type": [
95+
{"pattern": "^(?<name>.*)$", "format": "$<name>DTO"}
96+
],
97+
"field": [
98+
{"pattern": "^addItem$", "format": "addedItem"},
99+
{"pattern": "^for$", "format": "forReference"}
100+
]
101+
},
102+
"keywords": [
103+
"abstract",
104+
"assert",
105+
"boolean",
106+
"break",
107+
"byte",
108+
"case",
109+
"catch",
110+
"char",
111+
"class",
112+
"const",
113+
"continue",
114+
"default",
115+
"do",
116+
"double",
117+
"else",
118+
"enum",
119+
"extends",
120+
"final",
121+
"finally",
122+
"float",
123+
"for",
124+
"goto",
125+
"if",
126+
"implements",
127+
"import",
128+
"instanceof",
129+
"int",
130+
"interface",
131+
"long",
132+
"native",
133+
"new",
134+
"package",
135+
"private",
136+
"protected",
137+
"public",
138+
"return",
139+
"short",
140+
"static",
141+
"strictfp",
142+
"super",
143+
"switch",
144+
"synchronized",
145+
"this",
146+
"throw",
147+
"throws",
148+
"transient",
149+
"try",
150+
"void",
151+
"volatile",
152+
"while",
153+
"true",
154+
"false",
155+
"null"
156+
],
157+
"typeMap":{
158+
"boolean": "Boolean",
159+
"instant": "OffsetDateTime",
160+
"time": "LocalTime",
161+
"date": "String",
162+
"dateTime": "OffsetDateTime",
163+
164+
"decimal": "BigDecimal",
165+
"integer": "Integer",
166+
"unsignedInt": "Long",
167+
"positiveInt": "Long",
168+
"integer64": "Long",
169+
"base64Binary": "String",
170+
171+
"uri": "URI",
172+
"url": "URI",
173+
"canonical": "String",
174+
"oid": "String",
175+
"uuid": "UUID",
176+
177+
"string": "String",
178+
"code": "String",
179+
"markdown": "String",
180+
"id": "String",
181+
"xhtml": "String"
182+
}
183+
}

‎mustache/languages/java/static/model/pom.xml‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
<parent>
7+
<groupId>de.solutio.fhir</groupId>
8+
<artifactId>sdk-parent</artifactId>
9+
<version>0.0.0-SNAPSHOT</version>
10+
<relativePath>../pom.xml</relativePath>
11+
</parent>
12+
<artifactId>model</artifactId>
13+
<name>&gt; ${project.artifactId}</name>
14+
15+
<dependencies>
16+
<!-- JACKSON -->
17+
<dependency>
18+
<groupId>com.fasterxml.jackson.core</groupId>
19+
<artifactId>jackson-databind</artifactId>
20+
</dependency>
21+
<dependency>
22+
<groupId>com.fasterxml.jackson.datatype</groupId>
23+
<artifactId>jackson-datatype-jsr310</artifactId>
24+
</dependency>
25+
<dependency>
26+
<groupId>com.fasterxml.jackson.core</groupId>
27+
<artifactId>jackson-annotations</artifactId>
28+
</dependency>
29+
30+
<!-- ANNOTATIONS -->
31+
<dependency>
32+
<groupId>jakarta.annotation</groupId>
33+
<artifactId>jakarta.annotation-api</artifactId>
34+
</dependency>
35+
<dependency>
36+
<groupId>jakarta.validation</groupId>
37+
<artifactId>jakarta.validation-api</artifactId>
38+
</dependency>
39+
40+
<!-- TEST -->
41+
<dependency>
42+
<groupId>org.junit.jupiter</groupId>
43+
<artifactId>junit-jupiter-api</artifactId>
44+
<scope>test</scope>
45+
</dependency>
46+
<dependency>
47+
<groupId>org.junit.jupiter</groupId>
48+
<artifactId>junit-jupiter-engine</artifactId>
49+
<scope>test</scope>
50+
</dependency>
51+
<dependency>
52+
<groupId>org.assertj</groupId>
53+
<artifactId>assertj-core</artifactId>
54+
<scope>test</scope>
55+
</dependency>
56+
</dependencies>
57+
58+
<build>
59+
<plugins>
60+
<plugin>
61+
<groupId>com.diffplug.spotless</groupId>
62+
<artifactId>spotless-maven-plugin</artifactId>
63+
</plugin>
64+
<plugin>
65+
<groupId>org.apache.maven.plugins</groupId>
66+
<artifactId>maven-source-plugin</artifactId>
67+
</plugin>
68+
</plugins>
69+
</build>
70+
</project>

‎mustache/languages/java/static/model/src/test/java/de/solutio/fhir/models/resources/ResourceTest.java‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
package de.solutio.fhir.models.resources;
2+
import static de.solutio.fhir.models.complex_types.CodeableConceptDTO.codeableConceptDtoBuilder;
3+
import static de.solutio.fhir.models.complex_types.ElementDTO.elementDtoBuilder;
4+
import static de.solutio.fhir.models.complex_types.ExtensionDTO.extensionDtoBuilder;
5+
import static de.solutio.fhir.models.complex_types.ReferenceDTO.referenceDtoBuilder;
6+
import static de.solutio.fhir.models.resources.TaskDTO.TaskInputDTO.taskInputDtoBuilder;
7+
import static de.solutio.fhir.models.resources.TaskDTO.TaskIntentDTO;
8+
import static de.solutio.fhir.models.resources.TaskDTO.TaskStatusDTO;
9+
import static de.solutio.fhir.models.resources.TaskDTO.taskDtoBuilder;
10+
import static org.assertj.core.api.Assertions.assertThat;
11+
12+
import com.fasterxml.jackson.core.JsonProcessingException;
13+
import com.fasterxml.jackson.databind.ObjectMapper;
14+
import de.solutio.fhir.models.ResourceName;
15+
import de.solutio.fhir.models.complex_types.ReferenceDTO;
16+
import java.net.URI;
17+
import java.time.LocalDateTime;
18+
import java.util.List;
19+
import java.util.UUID;
20+
import org.junit.jupiter.api.Test;
21+
class ResourceTest {
22+
@Test
23+
public void test() throws JsonProcessingException {
24+
final ObjectMapper objectMapper = new ObjectMapper();
25+
objectMapper.findAndRegisterModules();
26+
final TaskDTO task = taskDtoBuilder()
27+
.description("some description")
28+
.requester(referenceDtoBuilder().reference("123").type(URI.create("Practitioner")).build())
29+
.forReference(referenceDtoBuilder().reference("Patient/123").build())
30+
.addInsurance(referenceDtoBuilder().reference(ResourceName.ORGANIZATION_DTO, "123").build())
31+
.addBasedOn(referenceDtoBuilder().reference(ResourceName.TASK_DTO, UUID.randomUUID()).build())
32+
.authoredOn(
33+
LocalDateTime.now(),
34+
elementDtoBuilder()
35+
.extension(
36+
extensionDtoBuilder().url(URI.create("https://www.google.com")).build())
37+
.build())
38+
.intent(TaskIntentDTO.PLAN)
39+
.status(TaskStatusDTO.REQUESTED)
40+
.input(taskInputDtoBuilder().type(codeableConceptDtoBuilder().build()).build())
41+
.build();
42+
assertThat(task.toString()).isNotBlank();
43+
final String json = objectMapper.writeValueAsString(task);
44+
assertThat(json).isNotBlank();
45+
final TaskDTO read = objectMapper.readValue(json, TaskDTO.class);
46+
assertThat(read).isEqualTo(task);
47+
assertThat(read.toString()).isNotBlank();
48+
final TaskDTO taskWithExtension = task.toBuilder()
49+
._description(
50+
elementDtoBuilder()
51+
.extension(
52+
extensionDtoBuilder().url(URI.create("https://www.google.com")).build())
53+
.build())
54+
.extension(extensionDtoBuilder().url(URI.create("https://www.google.com")).build())
55+
.build();
56+
assertThat(taskWithExtension.description()).isEqualTo(task.description());
57+
assertThat(taskWithExtension.intent()).isEqualTo(task.intent());
58+
assertThat(taskWithExtension.status()).isEqualTo(task.status());
59+
assertThat(taskWithExtension.toString()).isNotBlank();
60+
final String jsonWithExtension = objectMapper.writeValueAsString(taskWithExtension);
61+
final TaskDTO readWithExtension = objectMapper.readValue(jsonWithExtension, TaskDTO.class);
62+
assertThat(readWithExtension).isEqualTo(taskWithExtension);
63+
assertThat(readWithExtension.toString()).isNotBlank();
64+
assertThat(readWithExtension.forReference().flatMap(ReferenceDTO::findReferencedResourceName)).hasValue(ResourceName.PATIENT_DTO);
65+
assertThat(readWithExtension.requester().flatMap(ReferenceDTO::findReferencedResourceName)).hasValue(ResourceName.PRACTITIONER_DTO);
66+
assertThat(readWithExtension.insurance().map(List::getFirst).flatMap(ReferenceDTO::findReferencedResourceName)).hasValue(ResourceName.ORGANIZATION_DTO);
67+
assertThat(readWithExtension.basedOn().map(List::getFirst).flatMap(ReferenceDTO::findReferencedResourceName)).hasValue(ResourceName.TASK_DTO);
68+
}
69+
}

0 commit comments

Comments
 (0)