Repository navigation
Commit 351362c
committed
feat(metamodel): ADR-0036 Wave 3 JVM — field.uri, field.inet subtypes + @stringformat (Java + Kotlin)
Replicate the TS reference (ADR-0036 decision #2 / ADR-0037) Wave 3 on the
shared JVM metadata + the Java (codegen-spring) and Kotlin (codegen-kotlin)
codegen ports, byte-matching the cross-port goldens (expected-registry.json,
field-uri-inet-stringformat conformance fixture — neither modified here).
Metadata (shared by Java + Kotlin):
- field.uri — a URI/URL string. Bare scalar inheriting field.base; native JVM
binding java.net.URI; DB column text. New UriField class + registration.
- field.inet — an IP-address string (v4/v6). Bare scalar; native JVM binding
java.net.InetAddress; DB column Postgres-native inet. New InetField class.
- @stringformat on field.string — closed {email|hostname} string-typed attr
(mirrors @maxlength registration). allowedValues + description sourced from
spec/metamodel/field.json via applySpecDescriptions, so both ports' registry
manifests byte-match the golden with no hand-written descriptions.
- FilterOps op-bands: uri = string band (incl. like); inet = uuid band (no
like/ordering), in canonical subtype order after uuid.
Codegen — Java (codegen-spring):
- SpringTypeMapper: field.uri → java.net.URI, field.inet → java.net.InetAddress.
- SpringDtoGenerator: @stringformat:email → Jakarta @Email; hostname → a
codegen-owned canonical DNS-hostname @pattern (not author validator.regex).
Codegen — Kotlin (codegen-kotlin):
- KotlinTypeMapper: field.uri → java.net.URI + file-local uriColumn(...) Exposed
column; field.inet → java.net.InetAddress + inetColumn(...). Both backed by a
package-shared MetaInetUriColumnType.kt support file (internal custom
ColumnType<URI> over text + ColumnType<InetAddress> over native inet), emitted
once per package — mirrors the Wave 2 MetaInstantWithTimeZoneColumnType pattern.
- KotlinEntityGenerator: @stringformat:email → @field:Email; hostname → the same
canonical @field:Pattern hostname check (byte-identical regex to the Spring port).
OMDB (runtime persistence JDBC seam):
- field.uri ⇄ StringCodec (text column). field.inet ⇄ new InetCodec, binding the
String via setObject(.., Types.OTHER) so the driver coerces it into the native
inet column (mirrors UuidCodec); read back as String.
Tests: SpringTypeMapperTest (+4: uri/inet type mapping, @stringformat email/hostname
validation), KotlinTypeMapperTest (+2), KotlinExposedTableGeneratorTest (+1: custom
columns + shared support file). Both registry-conformance byte-matches green; the new
metamodel conformance fixture loads under strict mode in both ports.
The persistence-conformance roundtrip corpus does not yet carry uri/inet (the TS
reference did not add them), so Testcontainers roundtrips are not exercised for these
subtypes — CI-gated/not-applicable for this wave.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01GF9xLEQZaPus5Y6opk398n1 parent 4b90500 commit 351362c
14 files changed
Lines changed: 571 additions & 0 deletions
File tree
- server/java
- codegen-kotlin/src
- main/kotlin/com/metaobjects/generator/kotlin
- test/kotlin/com/metaobjects/generator/kotlin
- codegen-spring/src
- main/java/com/metaobjects/generator/spring
- test/java/com/metaobjects/generator/spring
- metadata/src/main/java/com/metaobjects
- field
- query
- omdb/src/main/java/com/metaobjects/manager/db/codec
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
327 | 327 | | |
328 | 328 | | |
329 | 329 | | |
| 330 | + | |
| 331 | + | |
| 332 | + | |
| 333 | + | |
| 334 | + | |
| 335 | + | |
| 336 | + | |
| 337 | + | |
| 338 | + | |
| 339 | + | |
| 340 | + | |
| 341 | + | |
| 342 | + | |
| 343 | + | |
| 344 | + | |
| 345 | + | |
330 | 346 | | |
331 | 347 | | |
332 | 348 | | |
| |||
382 | 398 | | |
383 | 399 | | |
384 | 400 | | |
| 401 | + | |
| 402 | + | |
| 403 | + | |
| 404 | + | |
| 405 | + | |
| 406 | + | |
| 407 | + | |
| 408 | + | |
| 409 | + | |
| 410 | + | |
385 | 411 | | |
386 | 412 | | |
387 | 413 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
63 | 63 | | |
64 | 64 | | |
65 | 65 | | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
66 | 73 | | |
67 | 74 | | |
68 | 75 | | |
| |||
100 | 107 | | |
101 | 108 | | |
102 | 109 | | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
103 | 116 | | |
104 | 117 | | |
105 | 118 | | |
| |||
110 | 123 | | |
111 | 124 | | |
112 | 125 | | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
| 169 | + | |
| 170 | + | |
| 171 | + | |
| 172 | + | |
| 173 | + | |
| 174 | + | |
113 | 175 | | |
114 | 176 | | |
115 | 177 | | |
| |||
627 | 689 | | |
628 | 690 | | |
629 | 691 | | |
| 692 | + | |
| 693 | + | |
| 694 | + | |
| 695 | + | |
| 696 | + | |
| 697 | + | |
| 698 | + | |
| 699 | + | |
| 700 | + | |
| 701 | + | |
| 702 | + | |
| 703 | + | |
| 704 | + | |
| 705 | + | |
| 706 | + | |
| 707 | + | |
| 708 | + | |
| 709 | + | |
| 710 | + | |
| 711 | + | |
| 712 | + | |
| 713 | + | |
| 714 | + | |
| 715 | + | |
| 716 | + | |
| 717 | + | |
| 718 | + | |
| 719 | + | |
| 720 | + | |
| 721 | + | |
| 722 | + | |
| 723 | + | |
| 724 | + | |
| 725 | + | |
| 726 | + | |
| 727 | + | |
| 728 | + | |
| 729 | + | |
| 730 | + | |
| 731 | + | |
| 732 | + | |
| 733 | + | |
| 734 | + | |
| 735 | + | |
| 736 | + | |
| 737 | + | |
| 738 | + | |
| 739 | + | |
| 740 | + | |
| 741 | + | |
| 742 | + | |
| 743 | + | |
| 744 | + | |
| 745 | + | |
| 746 | + | |
| 747 | + | |
| 748 | + | |
| 749 | + | |
| 750 | + | |
| 751 | + | |
| 752 | + | |
| 753 | + | |
| 754 | + | |
| 755 | + | |
| 756 | + | |
| 757 | + | |
| 758 | + | |
| 759 | + | |
| 760 | + | |
| 761 | + | |
| 762 | + | |
| 763 | + | |
| 764 | + | |
| 765 | + | |
| 766 | + | |
| 767 | + | |
| 768 | + | |
| 769 | + | |
| 770 | + | |
| 771 | + | |
| 772 | + | |
630 | 773 | | |
631 | 774 | | |
632 | 775 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
16 | 16 | | |
17 | 17 | | |
18 | 18 | | |
| 19 | + | |
| 20 | + | |
19 | 21 | | |
20 | 22 | | |
21 | 23 | | |
| |||
134 | 136 | | |
135 | 137 | | |
136 | 138 | | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
137 | 159 | | |
138 | 160 | | |
139 | 161 | | |
| |||
245 | 267 | | |
246 | 268 | | |
247 | 269 | | |
| 270 | + | |
| 271 | + | |
| 272 | + | |
| 273 | + | |
| 274 | + | |
| 275 | + | |
| 276 | + | |
| 277 | + | |
248 | 278 | | |
249 | 279 | | |
250 | 280 | | |
| |||
453 | 483 | | |
454 | 484 | | |
455 | 485 | | |
| 486 | + | |
| 487 | + | |
| 488 | + | |
| 489 | + | |
| 490 | + | |
| 491 | + | |
| 492 | + | |
| 493 | + | |
456 | 494 | | |
457 | 495 | | |
458 | 496 | | |
| |||
519 | 557 | | |
520 | 558 | | |
521 | 559 | | |
| 560 | + | |
| 561 | + | |
| 562 | + | |
| 563 | + | |
| 564 | + | |
| 565 | + | |
| 566 | + | |
| 567 | + | |
| 568 | + | |
| 569 | + | |
522 | 570 | | |
523 | 571 | | |
524 | 572 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
43 | 43 | | |
44 | 44 | | |
45 | 45 | | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
46 | 86 | | |
47 | 87 | | |
48 | 88 | | |
| |||
0 commit comments