diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/JDKSpecSamplesClient.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/JDKSpecSamplesClient.java index fcd592ab..ca24d090 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/JDKSpecSamplesClient.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/JDKSpecSamplesClient.java @@ -16,68 +16,6 @@ import dev.rsdlang.sample.client.BinaryTypesService; import dev.rsdlang.sample.client.BodyParameterTypesService; import dev.rsdlang.sample.client.HeaderParameterTypesService; -import dev.rsdlang.sample.client.impl.model.json._BlobImpl; -import dev.rsdlang.sample.client.impl.model.json._FileImpl; -import dev.rsdlang.sample.client.impl.model.json.CyclicNodeADataImpl; -import dev.rsdlang.sample.client.impl.model.json.CyclicNodeBDataImpl; -import dev.rsdlang.sample.client.impl.model.json.EnumInlineRecordDataImpl; -import dev.rsdlang.sample.client.impl.model.json.EnumRecordDataImpl; -import dev.rsdlang.sample.client.impl.model.json.ErrorDataDataImpl; -import dev.rsdlang.sample.client.impl.model.json.MixedResultDataImpl; -import dev.rsdlang.sample.client.impl.model.json.MixinRecordDataImpl; -import dev.rsdlang.sample.client.impl.model.json.PatchableEnumInlineRecordDataImpl; -import dev.rsdlang.sample.client.impl.model.json.PatchableEnumInlineRecordPatchImpl; -import dev.rsdlang.sample.client.impl.model.json.PatchableEnumRecordDataImpl; -import dev.rsdlang.sample.client.impl.model.json.PatchableEnumRecordPatchImpl; -import dev.rsdlang.sample.client.impl.model.json.PatchableRecord_Basic_List_NullDataImpl; -import dev.rsdlang.sample.client.impl.model.json.PatchableRecord_Basic_List_NullPatchImpl; -import dev.rsdlang.sample.client.impl.model.json.PatchableRecord_Basic_List_Optional_NullDataImpl; -import dev.rsdlang.sample.client.impl.model.json.PatchableRecord_Basic_List_Optional_NullPatchImpl; -import dev.rsdlang.sample.client.impl.model.json.PatchableRecord_Basic_List_OptionalDataImpl; -import dev.rsdlang.sample.client.impl.model.json.PatchableRecord_Basic_List_OptionalPatchImpl; -import dev.rsdlang.sample.client.impl.model.json.PatchableRecord_Basic_ListDataImpl; -import dev.rsdlang.sample.client.impl.model.json.PatchableRecord_Basic_ListPatchImpl; -import dev.rsdlang.sample.client.impl.model.json.PatchableRecord_Basic_NullDataImpl; -import dev.rsdlang.sample.client.impl.model.json.PatchableRecord_Basic_NullPatchImpl; -import dev.rsdlang.sample.client.impl.model.json.PatchableRecord_Basic_Optional_NullDataImpl; -import dev.rsdlang.sample.client.impl.model.json.PatchableRecord_Basic_Optional_NullPatchImpl; -import dev.rsdlang.sample.client.impl.model.json.PatchableRecord_Basic_OptionalDataImpl; -import dev.rsdlang.sample.client.impl.model.json.PatchableRecord_Basic_OptionalPatchImpl; -import dev.rsdlang.sample.client.impl.model.json.PatchableRecord_BasicDataImpl; -import dev.rsdlang.sample.client.impl.model.json.PatchableRecord_BasicPatchImpl; -import dev.rsdlang.sample.client.impl.model.json.PatchableRecordDataImpl; -import dev.rsdlang.sample.client.impl.model.json.PatchableRecordOfRecordsDataImpl; -import dev.rsdlang.sample.client.impl.model.json.PatchableRecordOfRecordsPatchImpl; -import dev.rsdlang.sample.client.impl.model.json.PatchableRecordPatchImpl; -import dev.rsdlang.sample.client.impl.model.json.PatchableRecordWithUnionDataImpl; -import dev.rsdlang.sample.client.impl.model.json.PatchableRecordWithUnionPatchImpl; -import dev.rsdlang.sample.client.impl.model.json.PatchableScalarRecord_SubstitutionDataImpl; -import dev.rsdlang.sample.client.impl.model.json.PatchableScalarRecord_SubstitutionPatchImpl; -import dev.rsdlang.sample.client.impl.model.json.PatchableScalarRecordDataImpl; -import dev.rsdlang.sample.client.impl.model.json.PatchableScalarRecordPatchImpl; -import dev.rsdlang.sample.client.impl.model.json.PatchableUnionADataImpl; -import dev.rsdlang.sample.client.impl.model.json.PatchableUnionAPatchImpl; -import dev.rsdlang.sample.client.impl.model.json.PatchableUnionBDataImpl; -import dev.rsdlang.sample.client.impl.model.json.PatchableUnionBPatchImpl; -import dev.rsdlang.sample.client.impl.model.json.RecordOfRecordsDataImpl; -import dev.rsdlang.sample.client.impl.model.json.RecordWithUnionsDataImpl; -import dev.rsdlang.sample.client.impl.model.json.ScalarRecord_SubstitutionDataImpl; -import dev.rsdlang.sample.client.impl.model.json.ScalarRecordDataImpl; -import dev.rsdlang.sample.client.impl.model.json.SimpleRecord_Basic_List_NullDataImpl; -import dev.rsdlang.sample.client.impl.model.json.SimpleRecord_Basic_List_Optional_NullDataImpl; -import dev.rsdlang.sample.client.impl.model.json.SimpleRecord_Basic_List_OptionalDataImpl; -import dev.rsdlang.sample.client.impl.model.json.SimpleRecord_Basic_ListDataImpl; -import dev.rsdlang.sample.client.impl.model.json.SimpleRecord_Basic_NullDataImpl; -import dev.rsdlang.sample.client.impl.model.json.SimpleRecord_Basic_Optional_NullDataImpl; -import dev.rsdlang.sample.client.impl.model.json.SimpleRecord_Basic_OptionalDataImpl; -import dev.rsdlang.sample.client.impl.model.json.SimpleRecord_BasicDataImpl; -import dev.rsdlang.sample.client.impl.model.json.SimpleRecord_KeyVersion_Int_IntDataImpl; -import dev.rsdlang.sample.client.impl.model.json.SimpleRecord_KeyVersionDataImpl; -import dev.rsdlang.sample.client.impl.model.json.SimpleRecordDataImpl; -import dev.rsdlang.sample.client.impl.model.json.TreeNodeDataImpl; -import dev.rsdlang.sample.client.impl.model.json.UnionADataImpl; -import dev.rsdlang.sample.client.impl.model.json.UnionBDataImpl; -import dev.rsdlang.sample.client.impl.model.json.UploadMixedResultDataImpl; import dev.rsdlang.sample.client.jdkhttp.impl.BinaryTypesServiceImpl; import dev.rsdlang.sample.client.jdkhttp.impl.BodyParameterTypesServiceImpl; import dev.rsdlang.sample.client.jdkhttp.impl.HeaderParameterTypesServiceImpl; @@ -99,6 +37,68 @@ import dev.rsdlang.sample.client.model.EnumInlineRecord; import dev.rsdlang.sample.client.model.EnumRecord; import dev.rsdlang.sample.client.model.ErrorData; +import dev.rsdlang.sample.client.model.impl.json._BlobImpl; +import dev.rsdlang.sample.client.model.impl.json._FileImpl; +import dev.rsdlang.sample.client.model.impl.json.CyclicNodeADataImpl; +import dev.rsdlang.sample.client.model.impl.json.CyclicNodeBDataImpl; +import dev.rsdlang.sample.client.model.impl.json.EnumInlineRecordDataImpl; +import dev.rsdlang.sample.client.model.impl.json.EnumRecordDataImpl; +import dev.rsdlang.sample.client.model.impl.json.ErrorDataDataImpl; +import dev.rsdlang.sample.client.model.impl.json.MixedResultDataImpl; +import dev.rsdlang.sample.client.model.impl.json.MixinRecordDataImpl; +import dev.rsdlang.sample.client.model.impl.json.PatchableEnumInlineRecordDataImpl; +import dev.rsdlang.sample.client.model.impl.json.PatchableEnumInlineRecordPatchImpl; +import dev.rsdlang.sample.client.model.impl.json.PatchableEnumRecordDataImpl; +import dev.rsdlang.sample.client.model.impl.json.PatchableEnumRecordPatchImpl; +import dev.rsdlang.sample.client.model.impl.json.PatchableRecord_Basic_List_NullDataImpl; +import dev.rsdlang.sample.client.model.impl.json.PatchableRecord_Basic_List_NullPatchImpl; +import dev.rsdlang.sample.client.model.impl.json.PatchableRecord_Basic_List_Optional_NullDataImpl; +import dev.rsdlang.sample.client.model.impl.json.PatchableRecord_Basic_List_Optional_NullPatchImpl; +import dev.rsdlang.sample.client.model.impl.json.PatchableRecord_Basic_List_OptionalDataImpl; +import dev.rsdlang.sample.client.model.impl.json.PatchableRecord_Basic_List_OptionalPatchImpl; +import dev.rsdlang.sample.client.model.impl.json.PatchableRecord_Basic_ListDataImpl; +import dev.rsdlang.sample.client.model.impl.json.PatchableRecord_Basic_ListPatchImpl; +import dev.rsdlang.sample.client.model.impl.json.PatchableRecord_Basic_NullDataImpl; +import dev.rsdlang.sample.client.model.impl.json.PatchableRecord_Basic_NullPatchImpl; +import dev.rsdlang.sample.client.model.impl.json.PatchableRecord_Basic_Optional_NullDataImpl; +import dev.rsdlang.sample.client.model.impl.json.PatchableRecord_Basic_Optional_NullPatchImpl; +import dev.rsdlang.sample.client.model.impl.json.PatchableRecord_Basic_OptionalDataImpl; +import dev.rsdlang.sample.client.model.impl.json.PatchableRecord_Basic_OptionalPatchImpl; +import dev.rsdlang.sample.client.model.impl.json.PatchableRecord_BasicDataImpl; +import dev.rsdlang.sample.client.model.impl.json.PatchableRecord_BasicPatchImpl; +import dev.rsdlang.sample.client.model.impl.json.PatchableRecordDataImpl; +import dev.rsdlang.sample.client.model.impl.json.PatchableRecordOfRecordsDataImpl; +import dev.rsdlang.sample.client.model.impl.json.PatchableRecordOfRecordsPatchImpl; +import dev.rsdlang.sample.client.model.impl.json.PatchableRecordPatchImpl; +import dev.rsdlang.sample.client.model.impl.json.PatchableRecordWithUnionDataImpl; +import dev.rsdlang.sample.client.model.impl.json.PatchableRecordWithUnionPatchImpl; +import dev.rsdlang.sample.client.model.impl.json.PatchableScalarRecord_SubstitutionDataImpl; +import dev.rsdlang.sample.client.model.impl.json.PatchableScalarRecord_SubstitutionPatchImpl; +import dev.rsdlang.sample.client.model.impl.json.PatchableScalarRecordDataImpl; +import dev.rsdlang.sample.client.model.impl.json.PatchableScalarRecordPatchImpl; +import dev.rsdlang.sample.client.model.impl.json.PatchableUnionADataImpl; +import dev.rsdlang.sample.client.model.impl.json.PatchableUnionAPatchImpl; +import dev.rsdlang.sample.client.model.impl.json.PatchableUnionBDataImpl; +import dev.rsdlang.sample.client.model.impl.json.PatchableUnionBPatchImpl; +import dev.rsdlang.sample.client.model.impl.json.RecordOfRecordsDataImpl; +import dev.rsdlang.sample.client.model.impl.json.RecordWithUnionsDataImpl; +import dev.rsdlang.sample.client.model.impl.json.ScalarRecord_SubstitutionDataImpl; +import dev.rsdlang.sample.client.model.impl.json.ScalarRecordDataImpl; +import dev.rsdlang.sample.client.model.impl.json.SimpleRecord_Basic_List_NullDataImpl; +import dev.rsdlang.sample.client.model.impl.json.SimpleRecord_Basic_List_Optional_NullDataImpl; +import dev.rsdlang.sample.client.model.impl.json.SimpleRecord_Basic_List_OptionalDataImpl; +import dev.rsdlang.sample.client.model.impl.json.SimpleRecord_Basic_ListDataImpl; +import dev.rsdlang.sample.client.model.impl.json.SimpleRecord_Basic_NullDataImpl; +import dev.rsdlang.sample.client.model.impl.json.SimpleRecord_Basic_Optional_NullDataImpl; +import dev.rsdlang.sample.client.model.impl.json.SimpleRecord_Basic_OptionalDataImpl; +import dev.rsdlang.sample.client.model.impl.json.SimpleRecord_BasicDataImpl; +import dev.rsdlang.sample.client.model.impl.json.SimpleRecord_KeyVersion_Int_IntDataImpl; +import dev.rsdlang.sample.client.model.impl.json.SimpleRecord_KeyVersionDataImpl; +import dev.rsdlang.sample.client.model.impl.json.SimpleRecordDataImpl; +import dev.rsdlang.sample.client.model.impl.json.TreeNodeDataImpl; +import dev.rsdlang.sample.client.model.impl.json.UnionADataImpl; +import dev.rsdlang.sample.client.model.impl.json.UnionBDataImpl; +import dev.rsdlang.sample.client.model.impl.json.UploadMixedResultDataImpl; import dev.rsdlang.sample.client.model.MixedResult; import dev.rsdlang.sample.client.model.MixinRecord; import dev.rsdlang.sample.client.model.PatchableEnumInlineRecord; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/BaseUtils.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/BaseUtils.java index b04d38e8..fe24acb4 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/BaseUtils.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/BaseUtils.java @@ -16,9 +16,9 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import dev.rsdlang.sample.client.impl.model.json._JsonUtils; -import dev.rsdlang.sample.client.impl.model.json._JsonUtils.TypeInfo; import dev.rsdlang.sample.client.model._Base; +import dev.rsdlang.sample.client.model.impl.json._JsonUtils; +import dev.rsdlang.sample.client.model.impl.json._JsonUtils.TypeInfo; public class BaseUtils { private record SearchParam(String key, Object value) { diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/BinaryTypesServiceImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/BinaryTypesServiceImpl.java index b2974293..41793dfa 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/BinaryTypesServiceImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/BinaryTypesServiceImpl.java @@ -12,18 +12,18 @@ import jakarta.json.Json; import dev.rsdlang.sample.client.BinaryTypesService; -import dev.rsdlang.sample.client.impl.model.json._BaseDataImpl; -import dev.rsdlang.sample.client.impl.model.json._JsonUtils; -import dev.rsdlang.sample.client.impl.model.json.BinaryTypesSingleBodyAdditionDataImpl; -import dev.rsdlang.sample.client.impl.model.json.BinaryTypesUploadMixedDataImpl; -import dev.rsdlang.sample.client.impl.model.json.BinaryTypesUploadMixedNilDataImpl; -import dev.rsdlang.sample.client.impl.model.json.BinaryTypesUploadMixedOptDataImpl; -import dev.rsdlang.sample.client.impl.model.json.BinaryTypesUploadMixedOptNilDataImpl; -import dev.rsdlang.sample.client.impl.model.json.ErrorDataDataImpl; -import dev.rsdlang.sample.client.impl.model.json.MixedResultDataImpl; -import dev.rsdlang.sample.client.impl.model.json.UploadMixedResultDataImpl; import dev.rsdlang.sample.client.jdkhttp.JDKSpecSamplesClient; import dev.rsdlang.sample.client.model.ErrorData; +import dev.rsdlang.sample.client.model.impl.json._BaseDataImpl; +import dev.rsdlang.sample.client.model.impl.json._JsonUtils; +import dev.rsdlang.sample.client.model.impl.json.BinaryTypesSingleBodyAdditionDataImpl; +import dev.rsdlang.sample.client.model.impl.json.BinaryTypesUploadMixedDataImpl; +import dev.rsdlang.sample.client.model.impl.json.BinaryTypesUploadMixedNilDataImpl; +import dev.rsdlang.sample.client.model.impl.json.BinaryTypesUploadMixedOptDataImpl; +import dev.rsdlang.sample.client.model.impl.json.BinaryTypesUploadMixedOptNilDataImpl; +import dev.rsdlang.sample.client.model.impl.json.ErrorDataDataImpl; +import dev.rsdlang.sample.client.model.impl.json.MixedResultDataImpl; +import dev.rsdlang.sample.client.model.impl.json.UploadMixedResultDataImpl; import dev.rsdlang.sample.client.model.MixedResult; import dev.rsdlang.sample.client.model.RSDBlob; import dev.rsdlang.sample.client.model.RSDFile; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/BodyParameterTypesServiceImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/BodyParameterTypesServiceImpl.java index 435dbb63..6c88ac90 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/BodyParameterTypesServiceImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/BodyParameterTypesServiceImpl.java @@ -16,17 +16,17 @@ import jakarta.json.Json; import dev.rsdlang.sample.client.BodyParameterTypesService; -import dev.rsdlang.sample.client.impl.model.json._BaseDataImpl; -import dev.rsdlang.sample.client.impl.model.json._JsonUtils; -import dev.rsdlang.sample.client.impl.model.json.BodyParameterTypesMultiBodyParamDataImpl; -import dev.rsdlang.sample.client.impl.model.json.BodyParameterTypesMultiBodyParamFirstDataImpl; -import dev.rsdlang.sample.client.impl.model.json.BodyParameterTypesMultiBodyParamNilDataImpl; -import dev.rsdlang.sample.client.impl.model.json.BodyParameterTypesMultiBodyParamOptDataImpl; -import dev.rsdlang.sample.client.impl.model.json.BodyParameterTypesMultiBodyParamOptNilDataImpl; -import dev.rsdlang.sample.client.impl.model.json.PatchableRecordDataImpl; -import dev.rsdlang.sample.client.impl.model.json.SimpleRecordDataImpl; -import dev.rsdlang.sample.client.impl.model.json.UnionDataImpl; import dev.rsdlang.sample.client.jdkhttp.JDKSpecSamplesClient; +import dev.rsdlang.sample.client.model.impl.json._BaseDataImpl; +import dev.rsdlang.sample.client.model.impl.json._JsonUtils; +import dev.rsdlang.sample.client.model.impl.json.BodyParameterTypesMultiBodyParamDataImpl; +import dev.rsdlang.sample.client.model.impl.json.BodyParameterTypesMultiBodyParamFirstDataImpl; +import dev.rsdlang.sample.client.model.impl.json.BodyParameterTypesMultiBodyParamNilDataImpl; +import dev.rsdlang.sample.client.model.impl.json.BodyParameterTypesMultiBodyParamOptDataImpl; +import dev.rsdlang.sample.client.model.impl.json.BodyParameterTypesMultiBodyParamOptNilDataImpl; +import dev.rsdlang.sample.client.model.impl.json.PatchableRecordDataImpl; +import dev.rsdlang.sample.client.model.impl.json.SimpleRecordDataImpl; +import dev.rsdlang.sample.client.model.impl.json.UnionDataImpl; import dev.rsdlang.sample.client.model.NilResult; import dev.rsdlang.sample.client.model.PatchableRecord; import dev.rsdlang.sample.client.model.SampleEnum; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/HeaderParameterTypesServiceImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/HeaderParameterTypesServiceImpl.java index c55eb649..ce7627b6 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/HeaderParameterTypesServiceImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/HeaderParameterTypesServiceImpl.java @@ -16,8 +16,8 @@ import java.util.Objects; import dev.rsdlang.sample.client.HeaderParameterTypesService; -import dev.rsdlang.sample.client.impl.model.json.SimpleRecordDataImpl; import dev.rsdlang.sample.client.jdkhttp.JDKSpecSamplesClient; +import dev.rsdlang.sample.client.model.impl.json.SimpleRecordDataImpl; import dev.rsdlang.sample.client.model.NilResult; import dev.rsdlang.sample.client.model.SampleEnum; import dev.rsdlang.sample.client.model.SimpleRecord; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/JDKHttpClientResponseUtils.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/JDKHttpClientResponseUtils.java index c3241f0d..62a475a1 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/JDKHttpClientResponseUtils.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/JDKHttpClientResponseUtils.java @@ -18,9 +18,9 @@ import jakarta.json.JsonObject; -import dev.rsdlang.sample.client.impl.model.json._BlobImpl; -import dev.rsdlang.sample.client.impl.model.json._FileImpl; -import dev.rsdlang.sample.client.impl.model.json._JsonUtils; +import dev.rsdlang.sample.client.model.impl.json._BlobImpl; +import dev.rsdlang.sample.client.model.impl.json._FileImpl; +import dev.rsdlang.sample.client.model.impl.json._JsonUtils; import dev.rsdlang.sample.client.model.RSDBlob; import dev.rsdlang.sample.client.model.RSDFile; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/ListBodyParameterTypesServiceImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/ListBodyParameterTypesServiceImpl.java index 46c4a668..b28bd3b8 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/ListBodyParameterTypesServiceImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/ListBodyParameterTypesServiceImpl.java @@ -16,15 +16,15 @@ import jakarta.json.Json; -import dev.rsdlang.sample.client.impl.model.json._BaseDataImpl; -import dev.rsdlang.sample.client.impl.model.json._JsonUtils; -import dev.rsdlang.sample.client.impl.model.json.ListBodyParameterTypesListMultiBodyParamDataImpl; -import dev.rsdlang.sample.client.impl.model.json.ListBodyParameterTypesListMultiBodyParamNilDataImpl; -import dev.rsdlang.sample.client.impl.model.json.ListBodyParameterTypesListMultiBodyParamOptDataImpl; -import dev.rsdlang.sample.client.impl.model.json.ListBodyParameterTypesListMultiBodyParamOptNilDataImpl; -import dev.rsdlang.sample.client.impl.model.json.SimpleRecordDataImpl; import dev.rsdlang.sample.client.jdkhttp.JDKSpecSamplesClient; import dev.rsdlang.sample.client.ListBodyParameterTypesService; +import dev.rsdlang.sample.client.model.impl.json._BaseDataImpl; +import dev.rsdlang.sample.client.model.impl.json._JsonUtils; +import dev.rsdlang.sample.client.model.impl.json.ListBodyParameterTypesListMultiBodyParamDataImpl; +import dev.rsdlang.sample.client.model.impl.json.ListBodyParameterTypesListMultiBodyParamNilDataImpl; +import dev.rsdlang.sample.client.model.impl.json.ListBodyParameterTypesListMultiBodyParamOptDataImpl; +import dev.rsdlang.sample.client.model.impl.json.ListBodyParameterTypesListMultiBodyParamOptNilDataImpl; +import dev.rsdlang.sample.client.model.impl.json.SimpleRecordDataImpl; import dev.rsdlang.sample.client.model.NilResult; import dev.rsdlang.sample.client.model.SampleEnum; import dev.rsdlang.sample.client.model.SimpleRecord; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/ListHeaderParameterTypesServiceImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/ListHeaderParameterTypesServiceImpl.java index c46bac5f..69b2ba07 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/ListHeaderParameterTypesServiceImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/ListHeaderParameterTypesServiceImpl.java @@ -14,9 +14,9 @@ import java.util.List; import java.util.Objects; -import dev.rsdlang.sample.client.impl.model.json.SimpleRecordDataImpl; import dev.rsdlang.sample.client.jdkhttp.JDKSpecSamplesClient; import dev.rsdlang.sample.client.ListHeaderParameterTypesService; +import dev.rsdlang.sample.client.model.impl.json.SimpleRecordDataImpl; import dev.rsdlang.sample.client.model.NilResult; import dev.rsdlang.sample.client.model.SampleEnum; import dev.rsdlang.sample.client.model.SimpleRecord; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/ListQueryParameterTypesServiceImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/ListQueryParameterTypesServiceImpl.java index 4dc1c8f6..f334ac54 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/ListQueryParameterTypesServiceImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/ListQueryParameterTypesServiceImpl.java @@ -13,9 +13,9 @@ import java.util.List; import java.util.Objects; -import dev.rsdlang.sample.client.impl.model.json.SimpleRecordDataImpl; import dev.rsdlang.sample.client.jdkhttp.JDKSpecSamplesClient; import dev.rsdlang.sample.client.ListQueryParameterTypesService; +import dev.rsdlang.sample.client.model.impl.json.SimpleRecordDataImpl; import dev.rsdlang.sample.client.model.SampleEnum; import dev.rsdlang.sample.client.model.SimpleRecord; import dev.rsdlang.sample.client.model.ZoneId; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/ListSampleServiceServiceImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/ListSampleServiceServiceImpl.java index c1ace226..e709f22d 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/ListSampleServiceServiceImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/ListSampleServiceServiceImpl.java @@ -12,9 +12,9 @@ import java.time.ZonedDateTime; import java.util.List; -import dev.rsdlang.sample.client.impl.model.json.SimpleRecordDataImpl; import dev.rsdlang.sample.client.jdkhttp.JDKSpecSamplesClient; import dev.rsdlang.sample.client.ListSampleServiceService; +import dev.rsdlang.sample.client.model.impl.json.SimpleRecordDataImpl; import dev.rsdlang.sample.client.model.SampleEnum; import dev.rsdlang.sample.client.model.SimpleRecord; import dev.rsdlang.sample.client.model.ZoneId; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/QueryParameterTypesServiceImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/QueryParameterTypesServiceImpl.java index 3930c9a1..9815c97b 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/QueryParameterTypesServiceImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/QueryParameterTypesServiceImpl.java @@ -12,8 +12,8 @@ import java.time.ZonedDateTime; import java.util.Objects; -import dev.rsdlang.sample.client.impl.model.json.SimpleRecordDataImpl; import dev.rsdlang.sample.client.jdkhttp.JDKSpecSamplesClient; +import dev.rsdlang.sample.client.model.impl.json.SimpleRecordDataImpl; import dev.rsdlang.sample.client.model.NilResult; import dev.rsdlang.sample.client.model.SampleEnum; import dev.rsdlang.sample.client.model.SimpleRecord; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/SampleServiceServiceImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/SampleServiceServiceImpl.java index 93d14b1e..1c8a4963 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/SampleServiceServiceImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/SampleServiceServiceImpl.java @@ -12,11 +12,11 @@ import java.time.ZonedDateTime; import java.util.Objects; -import dev.rsdlang.sample.client.impl.model.json.ErrorDataDataImpl; -import dev.rsdlang.sample.client.impl.model.json.SimpleRecordDataImpl; -import dev.rsdlang.sample.client.impl.model.json.UnionDataImpl; import dev.rsdlang.sample.client.jdkhttp.JDKSpecSamplesClient; import dev.rsdlang.sample.client.model.ErrorData; +import dev.rsdlang.sample.client.model.impl.json.ErrorDataDataImpl; +import dev.rsdlang.sample.client.model.impl.json.SimpleRecordDataImpl; +import dev.rsdlang.sample.client.model.impl.json.UnionDataImpl; import dev.rsdlang.sample.client.model.SampleEnum; import dev.rsdlang.sample.client.model.SimpleRecord; import dev.rsdlang.sample.client.model.Union; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/ScalarSubstition_ServiceServiceImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/ScalarSubstition_ServiceServiceImpl.java index 363ece2d..7710bb16 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/ScalarSubstition_ServiceServiceImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/ScalarSubstition_ServiceServiceImpl.java @@ -10,8 +10,8 @@ import java.util.List; import java.util.Objects; -import dev.rsdlang.sample.client.impl.model.json._JsonUtils; import dev.rsdlang.sample.client.jdkhttp.JDKSpecSamplesClient; +import dev.rsdlang.sample.client.model.impl.json._JsonUtils; import dev.rsdlang.sample.client.model.NilResult; import dev.rsdlang.sample.client.MyRange; import dev.rsdlang.sample.client.RSDException; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/BinaryTypesSingleBodyAdditionDataImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/BinaryTypesSingleBodyAdditionDataImpl.java similarity index 87% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/BinaryTypesSingleBodyAdditionDataImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/BinaryTypesSingleBodyAdditionDataImpl.java index b68f80ae..c2050359 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/BinaryTypesSingleBodyAdditionDataImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/BinaryTypesSingleBodyAdditionDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import jakarta.json.JsonObject; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/BinaryTypesUploadMixedDataImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/BinaryTypesUploadMixedDataImpl.java similarity index 94% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/BinaryTypesUploadMixedDataImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/BinaryTypesUploadMixedDataImpl.java index 219f3393..537011b8 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/BinaryTypesUploadMixedDataImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/BinaryTypesUploadMixedDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import java.util.List; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/BinaryTypesUploadMixedNilDataImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/BinaryTypesUploadMixedNilDataImpl.java similarity index 95% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/BinaryTypesUploadMixedNilDataImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/BinaryTypesUploadMixedNilDataImpl.java index 85f56be9..10e24d9e 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/BinaryTypesUploadMixedNilDataImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/BinaryTypesUploadMixedNilDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import java.util.List; import java.util.Optional; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/BinaryTypesUploadMixedOptDataImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/BinaryTypesUploadMixedOptDataImpl.java similarity index 95% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/BinaryTypesUploadMixedOptDataImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/BinaryTypesUploadMixedOptDataImpl.java index 3f278e02..19487447 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/BinaryTypesUploadMixedOptDataImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/BinaryTypesUploadMixedOptDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import java.util.List; import java.util.Optional; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/BinaryTypesUploadMixedOptNilDataImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/BinaryTypesUploadMixedOptNilDataImpl.java similarity index 95% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/BinaryTypesUploadMixedOptNilDataImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/BinaryTypesUploadMixedOptNilDataImpl.java index bc1b2136..921ecb45 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/BinaryTypesUploadMixedOptNilDataImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/BinaryTypesUploadMixedOptNilDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import java.util.List; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/BodyParameterTypesMultiBodyParamDataImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/BodyParameterTypesMultiBodyParamDataImpl.java similarity index 92% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/BodyParameterTypesMultiBodyParamDataImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/BodyParameterTypesMultiBodyParamDataImpl.java index 8a045bfc..aab069cf 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/BodyParameterTypesMultiBodyParamDataImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/BodyParameterTypesMultiBodyParamDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import jakarta.json.JsonObject; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/BodyParameterTypesMultiBodyParamFirstDataImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/BodyParameterTypesMultiBodyParamFirstDataImpl.java similarity index 92% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/BodyParameterTypesMultiBodyParamFirstDataImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/BodyParameterTypesMultiBodyParamFirstDataImpl.java index fa26c862..e24b511e 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/BodyParameterTypesMultiBodyParamFirstDataImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/BodyParameterTypesMultiBodyParamFirstDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import java.util.Optional; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/BodyParameterTypesMultiBodyParamNilDataImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/BodyParameterTypesMultiBodyParamNilDataImpl.java similarity index 93% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/BodyParameterTypesMultiBodyParamNilDataImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/BodyParameterTypesMultiBodyParamNilDataImpl.java index 016d94ca..aeaa6767 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/BodyParameterTypesMultiBodyParamNilDataImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/BodyParameterTypesMultiBodyParamNilDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import java.util.Optional; import java.util.OptionalInt; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/BodyParameterTypesMultiBodyParamOptDataImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/BodyParameterTypesMultiBodyParamOptDataImpl.java similarity index 93% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/BodyParameterTypesMultiBodyParamOptDataImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/BodyParameterTypesMultiBodyParamOptDataImpl.java index 895e50ad..6fd8c0fb 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/BodyParameterTypesMultiBodyParamOptDataImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/BodyParameterTypesMultiBodyParamOptDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import java.util.Optional; import java.util.OptionalInt; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/BodyParameterTypesMultiBodyParamOptNilDataImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/BodyParameterTypesMultiBodyParamOptNilDataImpl.java similarity index 93% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/BodyParameterTypesMultiBodyParamOptNilDataImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/BodyParameterTypesMultiBodyParamOptNilDataImpl.java index 27326327..4ee238ee 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/BodyParameterTypesMultiBodyParamOptNilDataImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/BodyParameterTypesMultiBodyParamOptNilDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import jakarta.json.JsonObject; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/CyclicNodeADataImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/CyclicNodeADataImpl.java similarity index 97% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/CyclicNodeADataImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/CyclicNodeADataImpl.java index be4f177c..15bd4762 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/CyclicNodeADataImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/CyclicNodeADataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import java.util.function.Function; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/CyclicNodeBDataImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/CyclicNodeBDataImpl.java similarity index 97% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/CyclicNodeBDataImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/CyclicNodeBDataImpl.java index 47af16ab..4152dbdb 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/CyclicNodeBDataImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/CyclicNodeBDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import java.util.function.Function; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/EnumInlineRecordDataImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/EnumInlineRecordDataImpl.java similarity index 98% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/EnumInlineRecordDataImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/EnumInlineRecordDataImpl.java index 3d1976f7..9bb7040a 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/EnumInlineRecordDataImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/EnumInlineRecordDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import java.util.List; import java.util.Optional; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/EnumRecordDataImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/EnumRecordDataImpl.java similarity index 98% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/EnumRecordDataImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/EnumRecordDataImpl.java index 36707dd3..64275157 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/EnumRecordDataImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/EnumRecordDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import java.util.List; import java.util.Optional; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/ErrorDataDataImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/ErrorDataDataImpl.java similarity index 95% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/ErrorDataDataImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/ErrorDataDataImpl.java index 59c8cbb1..d2a7f417 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/ErrorDataDataImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/ErrorDataDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import jakarta.json.Json; import jakarta.json.JsonObject; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/ListBodyParameterTypesListMultiBodyParamDataImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/ListBodyParameterTypesListMultiBodyParamDataImpl.java similarity index 92% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/ListBodyParameterTypesListMultiBodyParamDataImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/ListBodyParameterTypesListMultiBodyParamDataImpl.java index df15705b..2950d64d 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/ListBodyParameterTypesListMultiBodyParamDataImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/ListBodyParameterTypesListMultiBodyParamDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import java.util.List; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/ListBodyParameterTypesListMultiBodyParamNilDataImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/ListBodyParameterTypesListMultiBodyParamNilDataImpl.java similarity index 93% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/ListBodyParameterTypesListMultiBodyParamNilDataImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/ListBodyParameterTypesListMultiBodyParamNilDataImpl.java index 14052978..438fe870 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/ListBodyParameterTypesListMultiBodyParamNilDataImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/ListBodyParameterTypesListMultiBodyParamNilDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import java.util.List; import java.util.Optional; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/ListBodyParameterTypesListMultiBodyParamOptDataImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/ListBodyParameterTypesListMultiBodyParamOptDataImpl.java similarity index 93% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/ListBodyParameterTypesListMultiBodyParamOptDataImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/ListBodyParameterTypesListMultiBodyParamOptDataImpl.java index 7be9e806..afa11d88 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/ListBodyParameterTypesListMultiBodyParamOptDataImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/ListBodyParameterTypesListMultiBodyParamOptDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import java.util.List; import java.util.Optional; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/ListBodyParameterTypesListMultiBodyParamOptNilDataImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/ListBodyParameterTypesListMultiBodyParamOptNilDataImpl.java similarity index 93% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/ListBodyParameterTypesListMultiBodyParamOptNilDataImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/ListBodyParameterTypesListMultiBodyParamOptNilDataImpl.java index 913b9ad0..5be1296f 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/ListBodyParameterTypesListMultiBodyParamOptNilDataImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/ListBodyParameterTypesListMultiBodyParamOptNilDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import java.util.List; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/MixedResultDataImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/MixedResultDataImpl.java similarity index 98% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/MixedResultDataImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/MixedResultDataImpl.java index 78f17900..fe095e25 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/MixedResultDataImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/MixedResultDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import java.util.function.Function; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/MixinRecordDataImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/MixinRecordDataImpl.java similarity index 98% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/MixinRecordDataImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/MixinRecordDataImpl.java index a931e2b0..0f00dc24 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/MixinRecordDataImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/MixinRecordDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import java.util.function.Function; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableEnumInlineRecordDataImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableEnumInlineRecordDataImpl.java similarity index 98% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableEnumInlineRecordDataImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableEnumInlineRecordDataImpl.java index 2e93acf4..76c6bcf0 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableEnumInlineRecordDataImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableEnumInlineRecordDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import java.util.List; import java.util.Optional; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableEnumInlineRecordPatchImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableEnumInlineRecordPatchImpl.java similarity index 99% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableEnumInlineRecordPatchImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableEnumInlineRecordPatchImpl.java index 0cc8bb05..758e49b2 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableEnumInlineRecordPatchImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableEnumInlineRecordPatchImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import java.util.List; import java.util.Optional; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableEnumRecordDataImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableEnumRecordDataImpl.java similarity index 98% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableEnumRecordDataImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableEnumRecordDataImpl.java index d328e1ef..a32ccf11 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableEnumRecordDataImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableEnumRecordDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import java.util.List; import java.util.Optional; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableEnumRecordPatchImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableEnumRecordPatchImpl.java similarity index 99% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableEnumRecordPatchImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableEnumRecordPatchImpl.java index ad2d4f21..0007ff0e 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableEnumRecordPatchImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableEnumRecordPatchImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import java.util.List; import java.util.Optional; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableRecordDataImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableRecordDataImpl.java similarity index 96% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableRecordDataImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableRecordDataImpl.java index b0f06510..314bc36d 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableRecordDataImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableRecordDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import jakarta.json.Json; import jakarta.json.JsonObject; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableRecordOfRecordsDataImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableRecordOfRecordsDataImpl.java similarity index 99% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableRecordOfRecordsDataImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableRecordOfRecordsDataImpl.java index 66fc1644..7f81c51b 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableRecordOfRecordsDataImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableRecordOfRecordsDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import java.util.function.Function; import java.util.List; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableRecordOfRecordsPatchImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableRecordOfRecordsPatchImpl.java similarity index 99% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableRecordOfRecordsPatchImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableRecordOfRecordsPatchImpl.java index e1f69128..a628ea54 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableRecordOfRecordsPatchImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableRecordOfRecordsPatchImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import java.util.function.Function; import java.util.List; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableRecordPatchImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableRecordPatchImpl.java similarity index 96% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableRecordPatchImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableRecordPatchImpl.java index 2e655c7d..e100e4f3 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableRecordPatchImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableRecordPatchImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import java.util.Optional; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableRecordWithUnionDataImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableRecordWithUnionDataImpl.java similarity index 99% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableRecordWithUnionDataImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableRecordWithUnionDataImpl.java index 0fbc9310..03f888eb 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableRecordWithUnionDataImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableRecordWithUnionDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import java.util.function.Function; import java.util.List; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableRecordWithUnionPatchImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableRecordWithUnionPatchImpl.java similarity index 99% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableRecordWithUnionPatchImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableRecordWithUnionPatchImpl.java index 9189d974..2b3988f5 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableRecordWithUnionPatchImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableRecordWithUnionPatchImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import java.util.function.Function; import java.util.List; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableRecord_BasicDataImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableRecord_BasicDataImpl.java similarity index 99% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableRecord_BasicDataImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableRecord_BasicDataImpl.java index 14d17aa4..d47a434d 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableRecord_BasicDataImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableRecord_BasicDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableRecord_BasicPatchImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableRecord_BasicPatchImpl.java similarity index 98% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableRecord_BasicPatchImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableRecord_BasicPatchImpl.java index a250f6d1..7e953610 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableRecord_BasicPatchImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableRecord_BasicPatchImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableRecord_Basic_ListDataImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableRecord_Basic_ListDataImpl.java similarity index 99% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableRecord_Basic_ListDataImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableRecord_Basic_ListDataImpl.java index f7f15d90..37cf8778 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableRecord_Basic_ListDataImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableRecord_Basic_ListDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableRecord_Basic_ListPatchImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableRecord_Basic_ListPatchImpl.java similarity index 99% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableRecord_Basic_ListPatchImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableRecord_Basic_ListPatchImpl.java index d5c027b1..ffc92573 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableRecord_Basic_ListPatchImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableRecord_Basic_ListPatchImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableRecord_Basic_List_NullDataImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableRecord_Basic_List_NullDataImpl.java similarity index 99% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableRecord_Basic_List_NullDataImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableRecord_Basic_List_NullDataImpl.java index f15b6969..0f6c24c7 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableRecord_Basic_List_NullDataImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableRecord_Basic_List_NullDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableRecord_Basic_List_NullPatchImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableRecord_Basic_List_NullPatchImpl.java similarity index 99% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableRecord_Basic_List_NullPatchImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableRecord_Basic_List_NullPatchImpl.java index 2411a4e5..320e74f7 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableRecord_Basic_List_NullPatchImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableRecord_Basic_List_NullPatchImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableRecord_Basic_List_OptionalDataImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableRecord_Basic_List_OptionalDataImpl.java similarity index 99% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableRecord_Basic_List_OptionalDataImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableRecord_Basic_List_OptionalDataImpl.java index 40ee9bb4..12372f45 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableRecord_Basic_List_OptionalDataImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableRecord_Basic_List_OptionalDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableRecord_Basic_List_OptionalPatchImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableRecord_Basic_List_OptionalPatchImpl.java similarity index 99% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableRecord_Basic_List_OptionalPatchImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableRecord_Basic_List_OptionalPatchImpl.java index 76f10955..b9bfbf86 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableRecord_Basic_List_OptionalPatchImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableRecord_Basic_List_OptionalPatchImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableRecord_Basic_List_Optional_NullDataImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableRecord_Basic_List_Optional_NullDataImpl.java similarity index 99% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableRecord_Basic_List_Optional_NullDataImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableRecord_Basic_List_Optional_NullDataImpl.java index 1d3248d8..a601399f 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableRecord_Basic_List_Optional_NullDataImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableRecord_Basic_List_Optional_NullDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableRecord_Basic_List_Optional_NullPatchImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableRecord_Basic_List_Optional_NullPatchImpl.java similarity index 99% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableRecord_Basic_List_Optional_NullPatchImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableRecord_Basic_List_Optional_NullPatchImpl.java index fb0c9cd8..91cb4e56 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableRecord_Basic_List_Optional_NullPatchImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableRecord_Basic_List_Optional_NullPatchImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableRecord_Basic_NullDataImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableRecord_Basic_NullDataImpl.java similarity index 99% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableRecord_Basic_NullDataImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableRecord_Basic_NullDataImpl.java index 9acaff99..596de7f7 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableRecord_Basic_NullDataImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableRecord_Basic_NullDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableRecord_Basic_NullPatchImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableRecord_Basic_NullPatchImpl.java similarity index 99% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableRecord_Basic_NullPatchImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableRecord_Basic_NullPatchImpl.java index cfce1eb0..56bee3f4 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableRecord_Basic_NullPatchImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableRecord_Basic_NullPatchImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableRecord_Basic_OptionalDataImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableRecord_Basic_OptionalDataImpl.java similarity index 99% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableRecord_Basic_OptionalDataImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableRecord_Basic_OptionalDataImpl.java index 1c3997d9..ae8af9bc 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableRecord_Basic_OptionalDataImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableRecord_Basic_OptionalDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableRecord_Basic_OptionalPatchImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableRecord_Basic_OptionalPatchImpl.java similarity index 99% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableRecord_Basic_OptionalPatchImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableRecord_Basic_OptionalPatchImpl.java index d46be1cd..c92ca60c 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableRecord_Basic_OptionalPatchImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableRecord_Basic_OptionalPatchImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableRecord_Basic_Optional_NullDataImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableRecord_Basic_Optional_NullDataImpl.java similarity index 99% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableRecord_Basic_Optional_NullDataImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableRecord_Basic_Optional_NullDataImpl.java index f9823bcd..b9f897d8 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableRecord_Basic_Optional_NullDataImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableRecord_Basic_Optional_NullDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableRecord_Basic_Optional_NullPatchImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableRecord_Basic_Optional_NullPatchImpl.java similarity index 99% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableRecord_Basic_Optional_NullPatchImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableRecord_Basic_Optional_NullPatchImpl.java index fdcbafeb..a76fd37a 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableRecord_Basic_Optional_NullPatchImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableRecord_Basic_Optional_NullPatchImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableScalarRecordDataImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableScalarRecordDataImpl.java similarity index 98% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableScalarRecordDataImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableScalarRecordDataImpl.java index 89f97afe..c4e4592d 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableScalarRecordDataImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableScalarRecordDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import java.util.List; import java.util.Optional; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableScalarRecordPatchImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableScalarRecordPatchImpl.java similarity index 99% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableScalarRecordPatchImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableScalarRecordPatchImpl.java index acfd7c08..b03ebd68 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableScalarRecordPatchImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableScalarRecordPatchImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import java.util.List; import java.util.Optional; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableScalarRecord_SubstitutionDataImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableScalarRecord_SubstitutionDataImpl.java similarity index 98% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableScalarRecord_SubstitutionDataImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableScalarRecord_SubstitutionDataImpl.java index 081d30d1..e50e1b55 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableScalarRecord_SubstitutionDataImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableScalarRecord_SubstitutionDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import java.util.List; import java.util.Optional; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableScalarRecord_SubstitutionPatchImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableScalarRecord_SubstitutionPatchImpl.java similarity index 99% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableScalarRecord_SubstitutionPatchImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableScalarRecord_SubstitutionPatchImpl.java index cc0e9e40..4868297f 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableScalarRecord_SubstitutionPatchImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableScalarRecord_SubstitutionPatchImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import java.util.List; import java.util.Optional; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableUnionADataImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableUnionADataImpl.java similarity index 97% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableUnionADataImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableUnionADataImpl.java index 0b2fd667..90d0cd03 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableUnionADataImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableUnionADataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import jakarta.json.Json; import jakarta.json.JsonObject; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableUnionAPatchImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableUnionAPatchImpl.java similarity index 97% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableUnionAPatchImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableUnionAPatchImpl.java index 00de3712..2a3c8126 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableUnionAPatchImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableUnionAPatchImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import java.util.Optional; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableUnionBDataImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableUnionBDataImpl.java similarity index 97% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableUnionBDataImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableUnionBDataImpl.java index fbfd35da..5feba2d6 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableUnionBDataImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableUnionBDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import jakarta.json.Json; import jakarta.json.JsonObject; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableUnionBPatchImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableUnionBPatchImpl.java similarity index 97% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableUnionBPatchImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableUnionBPatchImpl.java index 387fb43e..977c930c 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableUnionBPatchImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableUnionBPatchImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import java.util.Optional; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableUnionDataImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableUnionDataImpl.java similarity index 93% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableUnionDataImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableUnionDataImpl.java index 0e7237b5..a7048262 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableUnionDataImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableUnionDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import jakarta.json.JsonObject; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableUnionPatchImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableUnionPatchImpl.java similarity index 94% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableUnionPatchImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableUnionPatchImpl.java index 7583bd6c..ccf61199 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/PatchableUnionPatchImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/PatchableUnionPatchImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import jakarta.json.JsonObject; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/RecordOfRecordsDataImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/RecordOfRecordsDataImpl.java similarity index 99% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/RecordOfRecordsDataImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/RecordOfRecordsDataImpl.java index c270ed8b..34bb0d35 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/RecordOfRecordsDataImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/RecordOfRecordsDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import java.util.function.Function; import java.util.List; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/RecordWithUnionsDataImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/RecordWithUnionsDataImpl.java similarity index 99% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/RecordWithUnionsDataImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/RecordWithUnionsDataImpl.java index 77803fe0..93e6bac2 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/RecordWithUnionsDataImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/RecordWithUnionsDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import java.util.function.Function; import java.util.List; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/ScalarRecordDataImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/ScalarRecordDataImpl.java similarity index 98% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/ScalarRecordDataImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/ScalarRecordDataImpl.java index 9e29bc67..50a94f6a 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/ScalarRecordDataImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/ScalarRecordDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import java.util.List; import java.util.Optional; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/ScalarRecord_SubstitutionDataImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/ScalarRecord_SubstitutionDataImpl.java similarity index 98% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/ScalarRecord_SubstitutionDataImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/ScalarRecord_SubstitutionDataImpl.java index 3f3a4b18..704ea8f9 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/ScalarRecord_SubstitutionDataImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/ScalarRecord_SubstitutionDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import java.util.List; import java.util.Optional; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/SimpleRecordDataImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/SimpleRecordDataImpl.java similarity index 96% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/SimpleRecordDataImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/SimpleRecordDataImpl.java index 5fa25771..3e0b37a5 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/SimpleRecordDataImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/SimpleRecordDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import jakarta.json.Json; import jakarta.json.JsonObject; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/SimpleRecord_BasicDataImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/SimpleRecord_BasicDataImpl.java similarity index 98% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/SimpleRecord_BasicDataImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/SimpleRecord_BasicDataImpl.java index fdb6337b..177f9494 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/SimpleRecord_BasicDataImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/SimpleRecord_BasicDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/SimpleRecord_Basic_ListDataImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/SimpleRecord_Basic_ListDataImpl.java similarity index 99% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/SimpleRecord_Basic_ListDataImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/SimpleRecord_Basic_ListDataImpl.java index a4ce8019..d6fcb470 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/SimpleRecord_Basic_ListDataImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/SimpleRecord_Basic_ListDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/SimpleRecord_Basic_List_NullDataImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/SimpleRecord_Basic_List_NullDataImpl.java similarity index 99% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/SimpleRecord_Basic_List_NullDataImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/SimpleRecord_Basic_List_NullDataImpl.java index eb4f07c5..68c2ad15 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/SimpleRecord_Basic_List_NullDataImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/SimpleRecord_Basic_List_NullDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/SimpleRecord_Basic_List_OptionalDataImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/SimpleRecord_Basic_List_OptionalDataImpl.java similarity index 99% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/SimpleRecord_Basic_List_OptionalDataImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/SimpleRecord_Basic_List_OptionalDataImpl.java index 2bc7b81b..5aba6106 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/SimpleRecord_Basic_List_OptionalDataImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/SimpleRecord_Basic_List_OptionalDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/SimpleRecord_Basic_List_Optional_NullDataImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/SimpleRecord_Basic_List_Optional_NullDataImpl.java similarity index 99% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/SimpleRecord_Basic_List_Optional_NullDataImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/SimpleRecord_Basic_List_Optional_NullDataImpl.java index 97810a19..7093d2e2 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/SimpleRecord_Basic_List_Optional_NullDataImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/SimpleRecord_Basic_List_Optional_NullDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/SimpleRecord_Basic_NullDataImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/SimpleRecord_Basic_NullDataImpl.java similarity index 99% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/SimpleRecord_Basic_NullDataImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/SimpleRecord_Basic_NullDataImpl.java index 63a8ab4b..ea30a9ad 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/SimpleRecord_Basic_NullDataImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/SimpleRecord_Basic_NullDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/SimpleRecord_Basic_OptionalDataImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/SimpleRecord_Basic_OptionalDataImpl.java similarity index 99% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/SimpleRecord_Basic_OptionalDataImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/SimpleRecord_Basic_OptionalDataImpl.java index f68c74d6..d1c35fdf 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/SimpleRecord_Basic_OptionalDataImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/SimpleRecord_Basic_OptionalDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/SimpleRecord_Basic_Optional_NullDataImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/SimpleRecord_Basic_Optional_NullDataImpl.java similarity index 99% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/SimpleRecord_Basic_Optional_NullDataImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/SimpleRecord_Basic_Optional_NullDataImpl.java index af0e8384..e02a043d 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/SimpleRecord_Basic_Optional_NullDataImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/SimpleRecord_Basic_Optional_NullDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/SimpleRecord_KeyVersionDataImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/SimpleRecord_KeyVersionDataImpl.java similarity index 96% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/SimpleRecord_KeyVersionDataImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/SimpleRecord_KeyVersionDataImpl.java index 148bba3e..183f3f53 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/SimpleRecord_KeyVersionDataImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/SimpleRecord_KeyVersionDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import jakarta.json.Json; import jakarta.json.JsonObject; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/SimpleRecord_KeyVersion_Int_IntDataImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/SimpleRecord_KeyVersion_Int_IntDataImpl.java similarity index 96% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/SimpleRecord_KeyVersion_Int_IntDataImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/SimpleRecord_KeyVersion_Int_IntDataImpl.java index bd2eb304..c600f30d 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/SimpleRecord_KeyVersion_Int_IntDataImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/SimpleRecord_KeyVersion_Int_IntDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import jakarta.json.Json; import jakarta.json.JsonObject; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/TreeNodeDataImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/TreeNodeDataImpl.java similarity index 96% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/TreeNodeDataImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/TreeNodeDataImpl.java index 14257ed3..a21c211e 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/TreeNodeDataImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/TreeNodeDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import java.util.List; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/UnionADataImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/UnionADataImpl.java similarity index 96% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/UnionADataImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/UnionADataImpl.java index 3983d047..83de5060 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/UnionADataImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/UnionADataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import jakarta.json.Json; import jakarta.json.JsonObject; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/UnionBDataImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/UnionBDataImpl.java similarity index 96% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/UnionBDataImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/UnionBDataImpl.java index 0baf5a8b..ba9be6ba 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/UnionBDataImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/UnionBDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import jakarta.json.Json; import jakarta.json.JsonObject; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/UnionDataImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/UnionDataImpl.java similarity index 93% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/UnionDataImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/UnionDataImpl.java index 91dde099..e4055056 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/UnionDataImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/UnionDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import jakarta.json.JsonObject; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/UploadMixedResultDataImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/UploadMixedResultDataImpl.java similarity index 98% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/UploadMixedResultDataImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/UploadMixedResultDataImpl.java index 989a71a8..af35643c 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/UploadMixedResultDataImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/UploadMixedResultDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import java.util.function.Function; import java.util.List; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/_BaseDataImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/_BaseDataImpl.java similarity index 80% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/_BaseDataImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/_BaseDataImpl.java index 61adc0ac..8ae96aff 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/_BaseDataImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/_BaseDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import jakarta.json.JsonObject; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/_BlobImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/_BlobImpl.java similarity index 96% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/_BlobImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/_BlobImpl.java index 1bd5f0c8..df24efa8 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/_BlobImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/_BlobImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import java.io.InputStream; import java.io.IOException; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/_ChangeSupport.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/_ChangeSupport.java similarity index 98% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/_ChangeSupport.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/_ChangeSupport.java index 4610a6df..e9b82b06 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/_ChangeSupport.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/_ChangeSupport.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import java.util.function.Function; import java.util.List; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/_FileImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/_FileImpl.java similarity index 94% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/_FileImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/_FileImpl.java index 83e8c3b3..52b7597c 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/_FileImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/_FileImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import java.nio.file.Path; import java.util.function.Consumer; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/_JsonUtils.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/_JsonUtils.java similarity index 99% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/_JsonUtils.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/_JsonUtils.java index 293f4957..6594c6d9 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/_JsonUtils.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/_JsonUtils.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import java.io.InputStream; import java.io.InputStreamReader; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/_NillableImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/_NillableImpl.java similarity index 97% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/_NillableImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/_NillableImpl.java index eaeca890..02691c7c 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/_NillableImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/_NillableImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import java.util.function.Consumer; import java.util.function.Function; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/_StreamBlobImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/_StreamBlobImpl.java similarity index 95% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/_StreamBlobImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/_StreamBlobImpl.java index 6e089a73..802a238a 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/_StreamBlobImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/_StreamBlobImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import java.io.InputStream; import java.util.Optional; diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/_StreamFileImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/_StreamFileImpl.java similarity index 93% rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/_StreamFileImpl.java rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/_StreamFileImpl.java index 555386f8..ebd11bee 100644 --- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/impl/model/json/_StreamFileImpl.java +++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/model/impl/json/_StreamFileImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.client.impl.model.json; +package dev.rsdlang.sample.client.model.impl.json; import java.io.InputStream; import java.util.Objects; diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/CyclicNodeA.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/CyclicNodeA.java similarity index 91% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/CyclicNodeA.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/CyclicNodeA.java index ae88db41..effc9f85 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/CyclicNodeA.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/CyclicNodeA.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.service.model; +package dev.rsdlang.sample.server.model; import java.util.function.Function; diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/CyclicNodeB.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/CyclicNodeB.java similarity index 91% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/CyclicNodeB.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/CyclicNodeB.java index 2b28a998..b8fadec4 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/CyclicNodeB.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/CyclicNodeB.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.service.model; +package dev.rsdlang.sample.server.model; import java.util.function.Function; diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/EnumInlineRecord.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/EnumInlineRecord.java similarity index 96% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/EnumInlineRecord.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/EnumInlineRecord.java index 9635d3ce..b12d282f 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/EnumInlineRecord.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/EnumInlineRecord.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.service.model; +package dev.rsdlang.sample.server.model; import java.util.List; import java.util.Optional; diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/EnumRecord.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/EnumRecord.java similarity index 95% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/EnumRecord.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/EnumRecord.java index 82754064..17ac1df6 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/EnumRecord.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/EnumRecord.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.service.model; +package dev.rsdlang.sample.server.model; import java.util.List; import java.util.Optional; diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/ErrorData.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/ErrorData.java similarity index 85% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/ErrorData.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/ErrorData.java index eba0a31b..7b03a36e 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/ErrorData.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/ErrorData.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.service.model; +package dev.rsdlang.sample.server.model; public interface ErrorData { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/MixedResult.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/MixedResult.java similarity index 96% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/MixedResult.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/MixedResult.java index f68f45a8..6066be7a 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/MixedResult.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/MixedResult.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.service.model; +package dev.rsdlang.sample.server.model; import java.util.function.Function; diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/MixinRecord.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/MixinRecord.java similarity index 75% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/MixinRecord.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/MixinRecord.java index fd88b1b7..8fbd949f 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/MixinRecord.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/MixinRecord.java @@ -1,12 +1,12 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.service.model; +package dev.rsdlang.sample.server.model; import java.util.function.Function; -import dev.rsdlang.sample.server.service.model.mixins.RecordMixinMixin; -import dev.rsdlang.sample.server.service.model.mixins.SimpleMixin2Mixin; -import dev.rsdlang.sample.server.service.model.mixins.SimpleMixinMixin; -import dev.rsdlang.sample.server.service.model.mixins.UnionMixinMixin; +import dev.rsdlang.sample.server.model.mixins.RecordMixinMixin; +import dev.rsdlang.sample.server.model.mixins.SimpleMixin2Mixin; +import dev.rsdlang.sample.server.model.mixins.SimpleMixinMixin; +import dev.rsdlang.sample.server.model.mixins.UnionMixinMixin; public interface MixinRecord { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/NilResult.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/NilResult.java similarity index 65% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/NilResult.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/NilResult.java index 73e4dbf4..a092e122 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/NilResult.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/NilResult.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.service.model; +package dev.rsdlang.sample.server.model; public enum NilResult { UNDEFINED, diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/PatchableEnumInlineRecord.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/PatchableEnumInlineRecord.java similarity index 98% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/PatchableEnumInlineRecord.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/PatchableEnumInlineRecord.java index c2c60419..e54148fd 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/PatchableEnumInlineRecord.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/PatchableEnumInlineRecord.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.service.model; +package dev.rsdlang.sample.server.model; import java.util.List; import java.util.Optional; diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/PatchableEnumRecord.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/PatchableEnumRecord.java similarity index 98% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/PatchableEnumRecord.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/PatchableEnumRecord.java index 88a5ec21..6667c9ce 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/PatchableEnumRecord.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/PatchableEnumRecord.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.service.model; +package dev.rsdlang.sample.server.model; import java.util.List; import java.util.Optional; diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/PatchableRecord.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/PatchableRecord.java similarity index 94% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/PatchableRecord.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/PatchableRecord.java index 0cb1ab16..dca686b8 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/PatchableRecord.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/PatchableRecord.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.service.model; +package dev.rsdlang.sample.server.model; import java.util.Optional; diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/PatchableRecordOfRecords.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/PatchableRecordOfRecords.java similarity index 93% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/PatchableRecordOfRecords.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/PatchableRecordOfRecords.java index 7c50d4a8..90dfe399 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/PatchableRecordOfRecords.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/PatchableRecordOfRecords.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.service.model; +package dev.rsdlang.sample.server.model; import java.util.function.Function; import java.util.List; @@ -103,13 +103,13 @@ public interface List_Opt_NullMergeChange extends List_Opt_NullChange, _Base.Lis public String version(); - public Optional value(); + public Optional value(); - public _Base.Nillable value_Null(); + public _Base.Nillable value_Null(); - public _Base.Nillable value_Opt(); + public _Base.Nillable value_Opt(); - public _Base.Nillable value_Opt_Null(); + public _Base.Nillable value_Opt_Null(); public Optional list(); diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/PatchableRecordWithUnion.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/PatchableRecordWithUnion.java similarity index 93% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/PatchableRecordWithUnion.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/PatchableRecordWithUnion.java index 4d18f8d1..f787540b 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/PatchableRecordWithUnion.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/PatchableRecordWithUnion.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.service.model; +package dev.rsdlang.sample.server.model; import java.util.function.Function; import java.util.List; @@ -103,13 +103,13 @@ public interface List_Opt_NullMergeChange extends List_Opt_NullChange, _Base.Lis public String version(); - public Optional value(); + public Optional value(); - public _Base.Nillable value_Null(); + public _Base.Nillable value_Null(); - public _Base.Nillable value_Opt(); + public _Base.Nillable value_Opt(); - public _Base.Nillable value_Opt_Null(); + public _Base.Nillable value_Opt_Null(); public Optional list(); diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/PatchableRecord_Basic.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/PatchableRecord_Basic.java similarity index 98% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/PatchableRecord_Basic.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/PatchableRecord_Basic.java index 98830422..0081bf04 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/PatchableRecord_Basic.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/PatchableRecord_Basic.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.service.model; +package dev.rsdlang.sample.server.model; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/PatchableRecord_Basic_List.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/PatchableRecord_Basic_List.java similarity index 99% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/PatchableRecord_Basic_List.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/PatchableRecord_Basic_List.java index 9a2e982e..5df0cec5 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/PatchableRecord_Basic_List.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/PatchableRecord_Basic_List.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.service.model; +package dev.rsdlang.sample.server.model; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/PatchableRecord_Basic_List_Null.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/PatchableRecord_Basic_List_Null.java similarity index 99% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/PatchableRecord_Basic_List_Null.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/PatchableRecord_Basic_List_Null.java index 4e0fe603..2c3289fa 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/PatchableRecord_Basic_List_Null.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/PatchableRecord_Basic_List_Null.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.service.model; +package dev.rsdlang.sample.server.model; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/PatchableRecord_Basic_List_Optional.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/PatchableRecord_Basic_List_Optional.java similarity index 99% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/PatchableRecord_Basic_List_Optional.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/PatchableRecord_Basic_List_Optional.java index 0bbdda63..c75d7287 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/PatchableRecord_Basic_List_Optional.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/PatchableRecord_Basic_List_Optional.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.service.model; +package dev.rsdlang.sample.server.model; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/PatchableRecord_Basic_List_Optional_Null.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/PatchableRecord_Basic_List_Optional_Null.java similarity index 99% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/PatchableRecord_Basic_List_Optional_Null.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/PatchableRecord_Basic_List_Optional_Null.java index 38694c3c..5b0b1599 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/PatchableRecord_Basic_List_Optional_Null.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/PatchableRecord_Basic_List_Optional_Null.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.service.model; +package dev.rsdlang.sample.server.model; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/PatchableRecord_Basic_Null.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/PatchableRecord_Basic_Null.java similarity index 98% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/PatchableRecord_Basic_Null.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/PatchableRecord_Basic_Null.java index 706d67b7..cb9fd9e0 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/PatchableRecord_Basic_Null.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/PatchableRecord_Basic_Null.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.service.model; +package dev.rsdlang.sample.server.model; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/PatchableRecord_Basic_Optional.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/PatchableRecord_Basic_Optional.java similarity index 98% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/PatchableRecord_Basic_Optional.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/PatchableRecord_Basic_Optional.java index d357be81..550f5cb7 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/PatchableRecord_Basic_Optional.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/PatchableRecord_Basic_Optional.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.service.model; +package dev.rsdlang.sample.server.model; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/PatchableRecord_Basic_Optional_Null.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/PatchableRecord_Basic_Optional_Null.java similarity index 98% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/PatchableRecord_Basic_Optional_Null.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/PatchableRecord_Basic_Optional_Null.java index 1fdb3098..374f292f 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/PatchableRecord_Basic_Optional_Null.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/PatchableRecord_Basic_Optional_Null.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.service.model; +package dev.rsdlang.sample.server.model; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/PatchableScalarRecord.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/PatchableScalarRecord.java similarity index 98% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/PatchableScalarRecord.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/PatchableScalarRecord.java index 443a642e..b0a5eaa9 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/PatchableScalarRecord.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/PatchableScalarRecord.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.service.model; +package dev.rsdlang.sample.server.model; import java.util.List; import java.util.Optional; diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/PatchableScalarRecord_Substitution.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/PatchableScalarRecord_Substitution.java similarity index 98% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/PatchableScalarRecord_Substitution.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/PatchableScalarRecord_Substitution.java index a36982bc..13272fa4 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/PatchableScalarRecord_Substitution.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/PatchableScalarRecord_Substitution.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.service.model; +package dev.rsdlang.sample.server.model; import java.util.List; import java.util.Optional; diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/PatchableUnion.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/PatchableUnion.java similarity index 91% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/PatchableUnion.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/PatchableUnion.java index d24cc203..2e4fa2ed 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/PatchableUnion.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/PatchableUnion.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.service.model; +package dev.rsdlang.sample.server.model; import java.util.Optional; diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/PatchableUnionA.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/PatchableUnionA.java similarity index 95% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/PatchableUnionA.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/PatchableUnionA.java index 49663509..a607603d 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/PatchableUnionA.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/PatchableUnionA.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.service.model; +package dev.rsdlang.sample.server.model; import java.util.Optional; diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/PatchableUnionB.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/PatchableUnionB.java similarity index 95% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/PatchableUnionB.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/PatchableUnionB.java index 15ff5030..ac622c1f 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/PatchableUnionB.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/PatchableUnionB.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.service.model; +package dev.rsdlang.sample.server.model; import java.util.Optional; diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/RSDBlob.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/RSDBlob.java similarity index 97% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/RSDBlob.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/RSDBlob.java index 1c3a3842..91d0cb74 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/RSDBlob.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/RSDBlob.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.service.model; +package dev.rsdlang.sample.server.model; import java.io.InputStream; import java.util.Optional; diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/RSDFile.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/RSDFile.java similarity index 68% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/RSDFile.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/RSDFile.java index a4f7454f..eaf049d9 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/RSDFile.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/RSDFile.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.service.model; +package dev.rsdlang.sample.server.model; public interface RSDFile extends RSDBlob { public String filename(); diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/RecordOfRecords.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/RecordOfRecords.java similarity index 97% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/RecordOfRecords.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/RecordOfRecords.java index ae2f5d37..6ff579a7 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/RecordOfRecords.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/RecordOfRecords.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.service.model; +package dev.rsdlang.sample.server.model; import java.util.function.Function; import java.util.List; diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/RecordWithUnions.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/RecordWithUnions.java similarity index 97% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/RecordWithUnions.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/RecordWithUnions.java index 657c7406..6fee0e0f 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/RecordWithUnions.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/RecordWithUnions.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.service.model; +package dev.rsdlang.sample.server.model; import java.util.function.Function; import java.util.List; diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/SampleEnum.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/SampleEnum.java similarity index 59% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/SampleEnum.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/SampleEnum.java index 52c6a3d3..6440431b 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/SampleEnum.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/SampleEnum.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.service.model; +package dev.rsdlang.sample.server.model; public enum SampleEnum { A, diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/SampleEnumWithCustValue.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/SampleEnumWithCustValue.java similarity index 63% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/SampleEnumWithCustValue.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/SampleEnumWithCustValue.java index 89e30fe2..7e755bb0 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/SampleEnumWithCustValue.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/SampleEnumWithCustValue.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.service.model; +package dev.rsdlang.sample.server.model; public enum SampleEnumWithCustValue { A, diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/ScalarRecord.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/ScalarRecord.java similarity index 95% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/ScalarRecord.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/ScalarRecord.java index 43a0c1aa..48794569 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/ScalarRecord.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/ScalarRecord.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.service.model; +package dev.rsdlang.sample.server.model; import java.util.List; import java.util.Optional; diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/ScalarRecord_Substitution.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/ScalarRecord_Substitution.java similarity index 95% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/ScalarRecord_Substitution.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/ScalarRecord_Substitution.java index 35a6828f..13663a01 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/ScalarRecord_Substitution.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/ScalarRecord_Substitution.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.service.model; +package dev.rsdlang.sample.server.model; import java.util.List; import java.util.Optional; diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/SimpleRecord.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/SimpleRecord.java similarity index 89% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/SimpleRecord.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/SimpleRecord.java index 278bf593..46f16d40 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/SimpleRecord.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/SimpleRecord.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.service.model; +package dev.rsdlang.sample.server.model; public interface SimpleRecord { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/SimpleRecord_Basic.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/SimpleRecord_Basic.java similarity index 96% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/SimpleRecord_Basic.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/SimpleRecord_Basic.java index 755217d2..752e04f6 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/SimpleRecord_Basic.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/SimpleRecord_Basic.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.service.model; +package dev.rsdlang.sample.server.model; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/SimpleRecord_Basic_List.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/SimpleRecord_Basic_List.java similarity index 97% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/SimpleRecord_Basic_List.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/SimpleRecord_Basic_List.java index 7920ee29..f5aaa1a3 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/SimpleRecord_Basic_List.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/SimpleRecord_Basic_List.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.service.model; +package dev.rsdlang.sample.server.model; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/SimpleRecord_Basic_List_Null.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/SimpleRecord_Basic_List_Null.java similarity index 97% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/SimpleRecord_Basic_List_Null.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/SimpleRecord_Basic_List_Null.java index d5e8f23b..562527de 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/SimpleRecord_Basic_List_Null.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/SimpleRecord_Basic_List_Null.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.service.model; +package dev.rsdlang.sample.server.model; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/SimpleRecord_Basic_List_Optional.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/SimpleRecord_Basic_List_Optional.java similarity index 97% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/SimpleRecord_Basic_List_Optional.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/SimpleRecord_Basic_List_Optional.java index d200a9cc..a352c1b5 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/SimpleRecord_Basic_List_Optional.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/SimpleRecord_Basic_List_Optional.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.service.model; +package dev.rsdlang.sample.server.model; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/SimpleRecord_Basic_List_Optional_Null.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/SimpleRecord_Basic_List_Optional_Null.java similarity index 97% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/SimpleRecord_Basic_List_Optional_Null.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/SimpleRecord_Basic_List_Optional_Null.java index c3f3ebba..82afd796 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/SimpleRecord_Basic_List_Optional_Null.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/SimpleRecord_Basic_List_Optional_Null.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.service.model; +package dev.rsdlang.sample.server.model; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/SimpleRecord_Basic_Null.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/SimpleRecord_Basic_Null.java similarity index 97% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/SimpleRecord_Basic_Null.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/SimpleRecord_Basic_Null.java index 6410e47a..4f29d28d 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/SimpleRecord_Basic_Null.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/SimpleRecord_Basic_Null.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.service.model; +package dev.rsdlang.sample.server.model; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/SimpleRecord_Basic_Optional.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/SimpleRecord_Basic_Optional.java similarity index 97% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/SimpleRecord_Basic_Optional.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/SimpleRecord_Basic_Optional.java index 23837c1e..a46f65da 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/SimpleRecord_Basic_Optional.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/SimpleRecord_Basic_Optional.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.service.model; +package dev.rsdlang.sample.server.model; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/SimpleRecord_Basic_Optional_Null.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/SimpleRecord_Basic_Optional_Null.java similarity index 97% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/SimpleRecord_Basic_Optional_Null.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/SimpleRecord_Basic_Optional_Null.java index f1fc8daa..07b810fb 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/SimpleRecord_Basic_Optional_Null.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/SimpleRecord_Basic_Optional_Null.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.service.model; +package dev.rsdlang.sample.server.model; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/SimpleRecord_KeyVersion.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/SimpleRecord_KeyVersion.java similarity index 88% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/SimpleRecord_KeyVersion.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/SimpleRecord_KeyVersion.java index 50445ce6..782e6cfb 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/SimpleRecord_KeyVersion.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/SimpleRecord_KeyVersion.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.service.model; +package dev.rsdlang.sample.server.model; public interface SimpleRecord_KeyVersion { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/SimpleRecord_KeyVersion_Int_Int.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/SimpleRecord_KeyVersion_Int_Int.java similarity index 89% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/SimpleRecord_KeyVersion_Int_Int.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/SimpleRecord_KeyVersion_Int_Int.java index 0a10d32e..57c9befd 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/SimpleRecord_KeyVersion_Int_Int.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/SimpleRecord_KeyVersion_Int_Int.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.service.model; +package dev.rsdlang.sample.server.model; public interface SimpleRecord_KeyVersion_Int_Int { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/TreeNode.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/TreeNode.java similarity index 89% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/TreeNode.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/TreeNode.java index aa08130e..610703fc 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/TreeNode.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/TreeNode.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.service.model; +package dev.rsdlang.sample.server.model; import java.util.List; diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/Union.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/Union.java similarity index 82% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/Union.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/Union.java index b5353354..0bf5fc24 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/Union.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/Union.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.service.model; +package dev.rsdlang.sample.server.model; public interface Union { public interface Builder { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/UnionA.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/UnionA.java similarity index 88% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/UnionA.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/UnionA.java index 7e896bc2..42e59b8b 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/UnionA.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/UnionA.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.service.model; +package dev.rsdlang.sample.server.model; public interface UnionA { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/UnionB.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/UnionB.java similarity index 88% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/UnionB.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/UnionB.java index 19b5dc98..c1743a68 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/UnionB.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/UnionB.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.service.model; +package dev.rsdlang.sample.server.model; public interface UnionB { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/UploadMixedResult.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/UploadMixedResult.java similarity index 96% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/UploadMixedResult.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/UploadMixedResult.java index e936413c..3691d321 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/UploadMixedResult.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/UploadMixedResult.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.service.model; +package dev.rsdlang.sample.server.model; import java.util.function.Function; import java.util.List; diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/ZoneId.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/ZoneId.java similarity index 82% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/ZoneId.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/ZoneId.java index dca1a380..796bde73 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/ZoneId.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/ZoneId.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.service.model; +package dev.rsdlang.sample.server.model; public record ZoneId(String value) { public static ZoneId of(String value) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/_Base.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/_Base.java similarity index 99% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/_Base.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/_Base.java index 7714c6a1..02e7129c 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/_Base.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/_Base.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.service.model; +package dev.rsdlang.sample.server.model; import java.util.function.Consumer; import java.util.function.Function; diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/CyclicNodeADataImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/CyclicNodeADataImpl.java similarity index 90% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/CyclicNodeADataImpl.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/CyclicNodeADataImpl.java index df0449a5..631031f9 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/CyclicNodeADataImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/CyclicNodeADataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.impl.model.json; +package dev.rsdlang.sample.server.model.impl.json; import java.util.function.Function; @@ -7,8 +7,8 @@ import jakarta.json.JsonObject; import jakarta.json.JsonObjectBuilder; -import dev.rsdlang.sample.server.service.model.CyclicNodeA; -import dev.rsdlang.sample.server.service.model.CyclicNodeB; +import dev.rsdlang.sample.server.model.CyclicNodeA; +import dev.rsdlang.sample.server.model.CyclicNodeB; public class CyclicNodeADataImpl extends _BaseDataImpl implements CyclicNodeA.Data { CyclicNodeADataImpl(JsonObject data) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/CyclicNodeBDataImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/CyclicNodeBDataImpl.java similarity index 90% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/CyclicNodeBDataImpl.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/CyclicNodeBDataImpl.java index 943ddb07..cd09dde0 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/CyclicNodeBDataImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/CyclicNodeBDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.impl.model.json; +package dev.rsdlang.sample.server.model.impl.json; import java.util.function.Function; @@ -7,8 +7,8 @@ import jakarta.json.JsonObject; import jakarta.json.JsonObjectBuilder; -import dev.rsdlang.sample.server.service.model.CyclicNodeA; -import dev.rsdlang.sample.server.service.model.CyclicNodeB; +import dev.rsdlang.sample.server.model.CyclicNodeA; +import dev.rsdlang.sample.server.model.CyclicNodeB; public class CyclicNodeBDataImpl extends _BaseDataImpl implements CyclicNodeB.Data { CyclicNodeBDataImpl(JsonObject data) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/EnumInlineRecordDataImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/EnumInlineRecordDataImpl.java similarity index 95% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/EnumInlineRecordDataImpl.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/EnumInlineRecordDataImpl.java index cfb5dd1e..33d1bd32 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/EnumInlineRecordDataImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/EnumInlineRecordDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.impl.model.json; +package dev.rsdlang.sample.server.model.impl.json; import java.util.List; import java.util.Optional; @@ -8,8 +8,8 @@ import jakarta.json.JsonObject; import jakarta.json.JsonObjectBuilder; -import dev.rsdlang.sample.server.service.model._Base; -import dev.rsdlang.sample.server.service.model.EnumInlineRecord; +import dev.rsdlang.sample.server.model._Base; +import dev.rsdlang.sample.server.model.EnumInlineRecord; public class EnumInlineRecordDataImpl extends _BaseDataImpl implements EnumInlineRecord.Data { EnumInlineRecordDataImpl(JsonObject data) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/EnumRecordDataImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/EnumRecordDataImpl.java similarity index 94% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/EnumRecordDataImpl.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/EnumRecordDataImpl.java index b7477a0d..51f640fd 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/EnumRecordDataImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/EnumRecordDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.impl.model.json; +package dev.rsdlang.sample.server.model.impl.json; import java.util.List; import java.util.Optional; @@ -8,9 +8,9 @@ import jakarta.json.JsonObject; import jakarta.json.JsonObjectBuilder; -import dev.rsdlang.sample.server.service.model._Base; -import dev.rsdlang.sample.server.service.model.EnumRecord; -import dev.rsdlang.sample.server.service.model.SampleEnum; +import dev.rsdlang.sample.server.model._Base; +import dev.rsdlang.sample.server.model.EnumRecord; +import dev.rsdlang.sample.server.model.SampleEnum; public class EnumRecordDataImpl extends _BaseDataImpl implements EnumRecord.Data { EnumRecordDataImpl(JsonObject data) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/ErrorDataDataImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/ErrorDataDataImpl.java similarity index 90% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/ErrorDataDataImpl.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/ErrorDataDataImpl.java index 20b7194d..1a229272 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/ErrorDataDataImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/ErrorDataDataImpl.java @@ -1,11 +1,11 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.impl.model.json; +package dev.rsdlang.sample.server.model.impl.json; import jakarta.json.Json; import jakarta.json.JsonObject; import jakarta.json.JsonObjectBuilder; -import dev.rsdlang.sample.server.service.model.ErrorData; +import dev.rsdlang.sample.server.model.ErrorData; public class ErrorDataDataImpl extends _BaseDataImpl implements ErrorData.Data { ErrorDataDataImpl(JsonObject data) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/MixedResultDataImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/MixedResultDataImpl.java similarity index 95% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/MixedResultDataImpl.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/MixedResultDataImpl.java index c1171c21..475ff09b 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/MixedResultDataImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/MixedResultDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.impl.model.json; +package dev.rsdlang.sample.server.model.impl.json; import java.util.function.Function; @@ -7,8 +7,8 @@ import jakarta.json.JsonObject; import jakarta.json.JsonObjectBuilder; -import dev.rsdlang.sample.server.service.model.MixedResult; -import dev.rsdlang.sample.server.service.model.SimpleRecord; +import dev.rsdlang.sample.server.model.MixedResult; +import dev.rsdlang.sample.server.model.SimpleRecord; public class MixedResultDataImpl extends _BaseDataImpl implements MixedResult.Data { MixedResultDataImpl(JsonObject data) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/MixinRecordDataImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/MixinRecordDataImpl.java similarity index 89% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/MixinRecordDataImpl.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/MixinRecordDataImpl.java index 20993fc8..7044ebd6 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/MixinRecordDataImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/MixinRecordDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.impl.model.json; +package dev.rsdlang.sample.server.model.impl.json; import java.util.function.Function; @@ -7,11 +7,11 @@ import jakarta.json.JsonObject; import jakarta.json.JsonObjectBuilder; -import dev.rsdlang.sample.server.service.model.MixinRecord; -import dev.rsdlang.sample.server.service.model.SimpleRecord; -import dev.rsdlang.sample.server.service.model.Union; -import dev.rsdlang.sample.server.service.model.UnionA; -import dev.rsdlang.sample.server.service.model.UnionB; +import dev.rsdlang.sample.server.model.MixinRecord; +import dev.rsdlang.sample.server.model.SimpleRecord; +import dev.rsdlang.sample.server.model.Union; +import dev.rsdlang.sample.server.model.UnionA; +import dev.rsdlang.sample.server.model.UnionB; public class MixinRecordDataImpl extends _BaseDataImpl implements MixinRecord.Data { MixinRecordDataImpl(JsonObject data) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableEnumInlineRecordDataImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableEnumInlineRecordDataImpl.java similarity index 95% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableEnumInlineRecordDataImpl.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableEnumInlineRecordDataImpl.java index 5f2ff434..0f915f22 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableEnumInlineRecordDataImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableEnumInlineRecordDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.impl.model.json; +package dev.rsdlang.sample.server.model.impl.json; import java.util.List; import java.util.Optional; @@ -8,8 +8,8 @@ import jakarta.json.JsonObject; import jakarta.json.JsonObjectBuilder; -import dev.rsdlang.sample.server.service.model._Base; -import dev.rsdlang.sample.server.service.model.PatchableEnumInlineRecord; +import dev.rsdlang.sample.server.model._Base; +import dev.rsdlang.sample.server.model.PatchableEnumInlineRecord; public class PatchableEnumInlineRecordDataImpl extends _BaseDataImpl implements PatchableEnumInlineRecord.Data { PatchableEnumInlineRecordDataImpl(JsonObject data) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableEnumInlineRecordPatchImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableEnumInlineRecordPatchImpl.java similarity index 97% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableEnumInlineRecordPatchImpl.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableEnumInlineRecordPatchImpl.java index 2d629937..1b4c598d 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableEnumInlineRecordPatchImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableEnumInlineRecordPatchImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.impl.model.json; +package dev.rsdlang.sample.server.model.impl.json; import java.util.List; import java.util.Optional; @@ -9,8 +9,8 @@ import jakarta.json.JsonObjectBuilder; import jakarta.json.JsonString; -import dev.rsdlang.sample.server.service.model._Base; -import dev.rsdlang.sample.server.service.model.PatchableEnumInlineRecord; +import dev.rsdlang.sample.server.model._Base; +import dev.rsdlang.sample.server.model.PatchableEnumInlineRecord; public class PatchableEnumInlineRecordPatchImpl extends _BaseDataImpl implements PatchableEnumInlineRecord.Patch { static class ListSetChangeImpl extends _ChangeSupport.ValueElementsChange implements ListSetChange { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableEnumRecordDataImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableEnumRecordDataImpl.java similarity index 95% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableEnumRecordDataImpl.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableEnumRecordDataImpl.java index 46b95e7e..edc12e1e 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableEnumRecordDataImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableEnumRecordDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.impl.model.json; +package dev.rsdlang.sample.server.model.impl.json; import java.util.List; import java.util.Optional; @@ -8,9 +8,9 @@ import jakarta.json.JsonObject; import jakarta.json.JsonObjectBuilder; -import dev.rsdlang.sample.server.service.model._Base; -import dev.rsdlang.sample.server.service.model.PatchableEnumRecord; -import dev.rsdlang.sample.server.service.model.SampleEnum; +import dev.rsdlang.sample.server.model._Base; +import dev.rsdlang.sample.server.model.PatchableEnumRecord; +import dev.rsdlang.sample.server.model.SampleEnum; public class PatchableEnumRecordDataImpl extends _BaseDataImpl implements PatchableEnumRecord.Data { PatchableEnumRecordDataImpl(JsonObject data) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableEnumRecordPatchImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableEnumRecordPatchImpl.java similarity index 97% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableEnumRecordPatchImpl.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableEnumRecordPatchImpl.java index 7ef0a7c3..9f54fd80 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableEnumRecordPatchImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableEnumRecordPatchImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.impl.model.json; +package dev.rsdlang.sample.server.model.impl.json; import java.util.List; import java.util.Optional; @@ -9,9 +9,9 @@ import jakarta.json.JsonObjectBuilder; import jakarta.json.JsonString; -import dev.rsdlang.sample.server.service.model._Base; -import dev.rsdlang.sample.server.service.model.PatchableEnumRecord; -import dev.rsdlang.sample.server.service.model.SampleEnum; +import dev.rsdlang.sample.server.model._Base; +import dev.rsdlang.sample.server.model.PatchableEnumRecord; +import dev.rsdlang.sample.server.model.SampleEnum; public class PatchableEnumRecordPatchImpl extends _BaseDataImpl implements PatchableEnumRecord.Patch { static class ListSetChangeImpl extends _ChangeSupport.ValueElementsChange implements ListSetChange { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableRecordDataImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableRecordDataImpl.java similarity index 93% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableRecordDataImpl.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableRecordDataImpl.java index eed62ca3..5f9455c9 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableRecordDataImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableRecordDataImpl.java @@ -1,11 +1,11 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.impl.model.json; +package dev.rsdlang.sample.server.model.impl.json; import jakarta.json.Json; import jakarta.json.JsonObject; import jakarta.json.JsonObjectBuilder; -import dev.rsdlang.sample.server.service.model.PatchableRecord; +import dev.rsdlang.sample.server.model.PatchableRecord; public class PatchableRecordDataImpl extends _BaseDataImpl implements PatchableRecord.Data { PatchableRecordDataImpl(JsonObject data) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableRecordOfRecordsDataImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableRecordOfRecordsDataImpl.java similarity index 96% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableRecordOfRecordsDataImpl.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableRecordOfRecordsDataImpl.java index 9f118631..8a524e0f 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableRecordOfRecordsDataImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableRecordOfRecordsDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.impl.model.json; +package dev.rsdlang.sample.server.model.impl.json; import java.util.function.Function; import java.util.List; @@ -9,9 +9,9 @@ import jakarta.json.JsonObject; import jakarta.json.JsonObjectBuilder; -import dev.rsdlang.sample.server.service.model._Base; -import dev.rsdlang.sample.server.service.model.PatchableRecord_Basic; -import dev.rsdlang.sample.server.service.model.PatchableRecordOfRecords; +import dev.rsdlang.sample.server.model._Base; +import dev.rsdlang.sample.server.model.PatchableRecord_Basic; +import dev.rsdlang.sample.server.model.PatchableRecordOfRecords; public class PatchableRecordOfRecordsDataImpl extends _BaseDataImpl implements PatchableRecordOfRecords.Data { PatchableRecordOfRecordsDataImpl(JsonObject data) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableRecordOfRecordsPatchImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableRecordOfRecordsPatchImpl.java similarity index 98% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableRecordOfRecordsPatchImpl.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableRecordOfRecordsPatchImpl.java index 2d23602e..81cbc849 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableRecordOfRecordsPatchImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableRecordOfRecordsPatchImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.impl.model.json; +package dev.rsdlang.sample.server.model.impl.json; import java.util.function.Function; import java.util.List; @@ -10,9 +10,9 @@ import jakarta.json.JsonObjectBuilder; import jakarta.json.JsonString; -import dev.rsdlang.sample.server.service.model._Base; -import dev.rsdlang.sample.server.service.model.PatchableRecord_Basic; -import dev.rsdlang.sample.server.service.model.PatchableRecordOfRecords; +import dev.rsdlang.sample.server.model._Base; +import dev.rsdlang.sample.server.model.PatchableRecord_Basic; +import dev.rsdlang.sample.server.model.PatchableRecordOfRecords; public class PatchableRecordOfRecordsPatchImpl extends _BaseDataImpl implements PatchableRecordOfRecords.Patch { static class ListSetChangeImpl extends _ChangeSupport.ObjectElementsChange implements ListSetChange { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableRecordPatchImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableRecordPatchImpl.java similarity index 92% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableRecordPatchImpl.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableRecordPatchImpl.java index c3e438dc..f95e0717 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableRecordPatchImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableRecordPatchImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.impl.model.json; +package dev.rsdlang.sample.server.model.impl.json; import java.util.Optional; @@ -7,7 +7,7 @@ import jakarta.json.JsonObject; import jakarta.json.JsonObjectBuilder; -import dev.rsdlang.sample.server.service.model.PatchableRecord; +import dev.rsdlang.sample.server.model.PatchableRecord; public class PatchableRecordPatchImpl extends _BaseDataImpl implements PatchableRecord.Patch { PatchableRecordPatchImpl(JsonObject data) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableRecordWithUnionDataImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableRecordWithUnionDataImpl.java similarity index 94% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableRecordWithUnionDataImpl.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableRecordWithUnionDataImpl.java index eeadd2a9..ed94a946 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableRecordWithUnionDataImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableRecordWithUnionDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.impl.model.json; +package dev.rsdlang.sample.server.model.impl.json; import java.util.function.Function; import java.util.List; @@ -9,11 +9,11 @@ import jakarta.json.JsonObject; import jakarta.json.JsonObjectBuilder; -import dev.rsdlang.sample.server.service.model._Base; -import dev.rsdlang.sample.server.service.model.PatchableRecordWithUnion; -import dev.rsdlang.sample.server.service.model.PatchableUnion; -import dev.rsdlang.sample.server.service.model.PatchableUnionA; -import dev.rsdlang.sample.server.service.model.PatchableUnionB; +import dev.rsdlang.sample.server.model._Base; +import dev.rsdlang.sample.server.model.PatchableRecordWithUnion; +import dev.rsdlang.sample.server.model.PatchableUnion; +import dev.rsdlang.sample.server.model.PatchableUnionA; +import dev.rsdlang.sample.server.model.PatchableUnionB; public class PatchableRecordWithUnionDataImpl extends _BaseDataImpl implements PatchableRecordWithUnion.Data { PatchableRecordWithUnionDataImpl(JsonObject data) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableRecordWithUnionPatchImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableRecordWithUnionPatchImpl.java similarity index 97% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableRecordWithUnionPatchImpl.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableRecordWithUnionPatchImpl.java index ef9fca0e..ef3a6548 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableRecordWithUnionPatchImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableRecordWithUnionPatchImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.impl.model.json; +package dev.rsdlang.sample.server.model.impl.json; import java.util.function.Function; import java.util.List; @@ -10,11 +10,11 @@ import jakarta.json.JsonObjectBuilder; import jakarta.json.JsonString; -import dev.rsdlang.sample.server.service.model._Base; -import dev.rsdlang.sample.server.service.model.PatchableRecordWithUnion; -import dev.rsdlang.sample.server.service.model.PatchableUnion; -import dev.rsdlang.sample.server.service.model.PatchableUnionA; -import dev.rsdlang.sample.server.service.model.PatchableUnionB; +import dev.rsdlang.sample.server.model._Base; +import dev.rsdlang.sample.server.model.PatchableRecordWithUnion; +import dev.rsdlang.sample.server.model.PatchableUnion; +import dev.rsdlang.sample.server.model.PatchableUnionA; +import dev.rsdlang.sample.server.model.PatchableUnionB; public class PatchableRecordWithUnionPatchImpl extends _BaseDataImpl implements PatchableRecordWithUnion.Patch { static class ListSetChangeImpl extends _ChangeSupport.ObjectElementsChange implements ListSetChange { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableRecord_BasicDataImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableRecord_BasicDataImpl.java similarity index 97% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableRecord_BasicDataImpl.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableRecord_BasicDataImpl.java index bf9c6374..0049a6e8 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableRecord_BasicDataImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableRecord_BasicDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.impl.model.json; +package dev.rsdlang.sample.server.model.impl.json; import java.time.LocalDate; import java.time.LocalDateTime; @@ -11,7 +11,7 @@ import jakarta.json.JsonObject; import jakarta.json.JsonObjectBuilder; -import dev.rsdlang.sample.server.service.model.PatchableRecord_Basic; +import dev.rsdlang.sample.server.model.PatchableRecord_Basic; public class PatchableRecord_BasicDataImpl extends _BaseDataImpl implements PatchableRecord_Basic.Data { PatchableRecord_BasicDataImpl(JsonObject data) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableRecord_BasicPatchImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableRecord_BasicPatchImpl.java similarity index 97% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableRecord_BasicPatchImpl.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableRecord_BasicPatchImpl.java index f4618ef7..354accc9 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableRecord_BasicPatchImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableRecord_BasicPatchImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.impl.model.json; +package dev.rsdlang.sample.server.model.impl.json; import java.time.LocalDate; import java.time.LocalDateTime; @@ -15,7 +15,7 @@ import jakarta.json.JsonObject; import jakarta.json.JsonObjectBuilder; -import dev.rsdlang.sample.server.service.model.PatchableRecord_Basic; +import dev.rsdlang.sample.server.model.PatchableRecord_Basic; public class PatchableRecord_BasicPatchImpl extends _BaseDataImpl implements PatchableRecord_Basic.Patch { PatchableRecord_BasicPatchImpl(JsonObject data) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableRecord_Basic_ListDataImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableRecord_Basic_ListDataImpl.java similarity index 97% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableRecord_Basic_ListDataImpl.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableRecord_Basic_ListDataImpl.java index 0347cbcf..06c6a6ba 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableRecord_Basic_ListDataImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableRecord_Basic_ListDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.impl.model.json; +package dev.rsdlang.sample.server.model.impl.json; import java.time.LocalDate; import java.time.LocalDateTime; @@ -12,7 +12,7 @@ import jakarta.json.JsonObject; import jakarta.json.JsonObjectBuilder; -import dev.rsdlang.sample.server.service.model.PatchableRecord_Basic_List; +import dev.rsdlang.sample.server.model.PatchableRecord_Basic_List; public class PatchableRecord_Basic_ListDataImpl extends _BaseDataImpl implements PatchableRecord_Basic_List.Data { PatchableRecord_Basic_ListDataImpl(JsonObject data) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableRecord_Basic_ListPatchImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableRecord_Basic_ListPatchImpl.java similarity index 99% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableRecord_Basic_ListPatchImpl.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableRecord_Basic_ListPatchImpl.java index 0bbc6377..ab534497 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableRecord_Basic_ListPatchImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableRecord_Basic_ListPatchImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.impl.model.json; +package dev.rsdlang.sample.server.model.impl.json; import java.time.LocalDate; import java.time.LocalDateTime; @@ -16,7 +16,7 @@ import jakarta.json.JsonString; import jakarta.json.JsonValue; -import dev.rsdlang.sample.server.service.model.PatchableRecord_Basic_List; +import dev.rsdlang.sample.server.model.PatchableRecord_Basic_List; public class PatchableRecord_Basic_ListPatchImpl extends _BaseDataImpl implements PatchableRecord_Basic_List.Patch { static class ValueBooleanSetChangeImpl extends _ChangeSupport.ValueElementsChange implements ValueBooleanSetChange { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableRecord_Basic_List_NullDataImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableRecord_Basic_List_NullDataImpl.java similarity index 98% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableRecord_Basic_List_NullDataImpl.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableRecord_Basic_List_NullDataImpl.java index 754fe3e5..4eca9c3f 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableRecord_Basic_List_NullDataImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableRecord_Basic_List_NullDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.impl.model.json; +package dev.rsdlang.sample.server.model.impl.json; import java.time.LocalDate; import java.time.LocalDateTime; @@ -13,7 +13,7 @@ import jakarta.json.JsonObject; import jakarta.json.JsonObjectBuilder; -import dev.rsdlang.sample.server.service.model.PatchableRecord_Basic_List_Null; +import dev.rsdlang.sample.server.model.PatchableRecord_Basic_List_Null; public class PatchableRecord_Basic_List_NullDataImpl extends _BaseDataImpl implements PatchableRecord_Basic_List_Null.Data { PatchableRecord_Basic_List_NullDataImpl(JsonObject data) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableRecord_Basic_List_NullPatchImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableRecord_Basic_List_NullPatchImpl.java similarity index 99% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableRecord_Basic_List_NullPatchImpl.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableRecord_Basic_List_NullPatchImpl.java index e20fe1a1..51b4fe2c 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableRecord_Basic_List_NullPatchImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableRecord_Basic_List_NullPatchImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.impl.model.json; +package dev.rsdlang.sample.server.model.impl.json; import java.time.LocalDate; import java.time.LocalDateTime; @@ -15,8 +15,8 @@ import jakarta.json.JsonString; import jakarta.json.JsonValue; -import dev.rsdlang.sample.server.service.model._Base; -import dev.rsdlang.sample.server.service.model.PatchableRecord_Basic_List_Null; +import dev.rsdlang.sample.server.model._Base; +import dev.rsdlang.sample.server.model.PatchableRecord_Basic_List_Null; public class PatchableRecord_Basic_List_NullPatchImpl extends _BaseDataImpl implements PatchableRecord_Basic_List_Null.Patch { static class ValueBooleanSetChangeImpl extends _ChangeSupport.ValueElementsChange implements ValueBooleanSetChange { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableRecord_Basic_List_OptionalDataImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableRecord_Basic_List_OptionalDataImpl.java similarity index 97% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableRecord_Basic_List_OptionalDataImpl.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableRecord_Basic_List_OptionalDataImpl.java index 0bfd8d96..dc4fb402 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableRecord_Basic_List_OptionalDataImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableRecord_Basic_List_OptionalDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.impl.model.json; +package dev.rsdlang.sample.server.model.impl.json; import java.time.LocalDate; import java.time.LocalDateTime; @@ -13,7 +13,7 @@ import jakarta.json.JsonObject; import jakarta.json.JsonObjectBuilder; -import dev.rsdlang.sample.server.service.model.PatchableRecord_Basic_List_Optional; +import dev.rsdlang.sample.server.model.PatchableRecord_Basic_List_Optional; public class PatchableRecord_Basic_List_OptionalDataImpl extends _BaseDataImpl implements PatchableRecord_Basic_List_Optional.Data { PatchableRecord_Basic_List_OptionalDataImpl(JsonObject data) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableRecord_Basic_List_OptionalPatchImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableRecord_Basic_List_OptionalPatchImpl.java similarity index 99% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableRecord_Basic_List_OptionalPatchImpl.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableRecord_Basic_List_OptionalPatchImpl.java index 962fe1ad..cdc0a022 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableRecord_Basic_List_OptionalPatchImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableRecord_Basic_List_OptionalPatchImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.impl.model.json; +package dev.rsdlang.sample.server.model.impl.json; import java.time.LocalDate; import java.time.LocalDateTime; @@ -15,8 +15,8 @@ import jakarta.json.JsonString; import jakarta.json.JsonValue; -import dev.rsdlang.sample.server.service.model._Base; -import dev.rsdlang.sample.server.service.model.PatchableRecord_Basic_List_Optional; +import dev.rsdlang.sample.server.model._Base; +import dev.rsdlang.sample.server.model.PatchableRecord_Basic_List_Optional; public class PatchableRecord_Basic_List_OptionalPatchImpl extends _BaseDataImpl implements PatchableRecord_Basic_List_Optional.Patch { static class ValueBooleanSetChangeImpl extends _ChangeSupport.ValueElementsChange implements ValueBooleanSetChange { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableRecord_Basic_List_Optional_NullDataImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableRecord_Basic_List_Optional_NullDataImpl.java similarity index 97% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableRecord_Basic_List_Optional_NullDataImpl.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableRecord_Basic_List_Optional_NullDataImpl.java index 027e43bb..7f6bdd36 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableRecord_Basic_List_Optional_NullDataImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableRecord_Basic_List_Optional_NullDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.impl.model.json; +package dev.rsdlang.sample.server.model.impl.json; import java.time.LocalDate; import java.time.LocalDateTime; @@ -12,8 +12,8 @@ import jakarta.json.JsonObject; import jakarta.json.JsonObjectBuilder; -import dev.rsdlang.sample.server.service.model._Base; -import dev.rsdlang.sample.server.service.model.PatchableRecord_Basic_List_Optional_Null; +import dev.rsdlang.sample.server.model._Base; +import dev.rsdlang.sample.server.model.PatchableRecord_Basic_List_Optional_Null; public class PatchableRecord_Basic_List_Optional_NullDataImpl extends _BaseDataImpl implements PatchableRecord_Basic_List_Optional_Null.Data { PatchableRecord_Basic_List_Optional_NullDataImpl(JsonObject data) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableRecord_Basic_List_Optional_NullPatchImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableRecord_Basic_List_Optional_NullPatchImpl.java similarity index 99% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableRecord_Basic_List_Optional_NullPatchImpl.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableRecord_Basic_List_Optional_NullPatchImpl.java index 8e0725a0..3f4e2c3e 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableRecord_Basic_List_Optional_NullPatchImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableRecord_Basic_List_Optional_NullPatchImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.impl.model.json; +package dev.rsdlang.sample.server.model.impl.json; import java.time.LocalDate; import java.time.LocalDateTime; @@ -15,8 +15,8 @@ import jakarta.json.JsonString; import jakarta.json.JsonValue; -import dev.rsdlang.sample.server.service.model._Base; -import dev.rsdlang.sample.server.service.model.PatchableRecord_Basic_List_Optional_Null; +import dev.rsdlang.sample.server.model._Base; +import dev.rsdlang.sample.server.model.PatchableRecord_Basic_List_Optional_Null; public class PatchableRecord_Basic_List_Optional_NullPatchImpl extends _BaseDataImpl implements PatchableRecord_Basic_List_Optional_Null.Patch { static class ValueBooleanSetChangeImpl extends _ChangeSupport.ValueElementsChange implements ValueBooleanSetChange { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableRecord_Basic_NullDataImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableRecord_Basic_NullDataImpl.java similarity index 98% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableRecord_Basic_NullDataImpl.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableRecord_Basic_NullDataImpl.java index 53542eb9..fcd0ea85 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableRecord_Basic_NullDataImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableRecord_Basic_NullDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.impl.model.json; +package dev.rsdlang.sample.server.model.impl.json; import java.time.LocalDate; import java.time.LocalDateTime; @@ -15,7 +15,7 @@ import jakarta.json.JsonObject; import jakarta.json.JsonObjectBuilder; -import dev.rsdlang.sample.server.service.model.PatchableRecord_Basic_Null; +import dev.rsdlang.sample.server.model.PatchableRecord_Basic_Null; public class PatchableRecord_Basic_NullDataImpl extends _BaseDataImpl implements PatchableRecord_Basic_Null.Data { PatchableRecord_Basic_NullDataImpl(JsonObject data) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableRecord_Basic_NullPatchImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableRecord_Basic_NullPatchImpl.java similarity index 97% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableRecord_Basic_NullPatchImpl.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableRecord_Basic_NullPatchImpl.java index 71d5d17b..a8b07c62 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableRecord_Basic_NullPatchImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableRecord_Basic_NullPatchImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.impl.model.json; +package dev.rsdlang.sample.server.model.impl.json; import java.time.LocalDate; import java.time.LocalDateTime; @@ -11,8 +11,8 @@ import jakarta.json.JsonObject; import jakarta.json.JsonObjectBuilder; -import dev.rsdlang.sample.server.service.model._Base; -import dev.rsdlang.sample.server.service.model.PatchableRecord_Basic_Null; +import dev.rsdlang.sample.server.model._Base; +import dev.rsdlang.sample.server.model.PatchableRecord_Basic_Null; public class PatchableRecord_Basic_NullPatchImpl extends _BaseDataImpl implements PatchableRecord_Basic_Null.Patch { PatchableRecord_Basic_NullPatchImpl(JsonObject data) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableRecord_Basic_OptionalDataImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableRecord_Basic_OptionalDataImpl.java similarity index 97% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableRecord_Basic_OptionalDataImpl.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableRecord_Basic_OptionalDataImpl.java index ee0faa9b..6c8ac995 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableRecord_Basic_OptionalDataImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableRecord_Basic_OptionalDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.impl.model.json; +package dev.rsdlang.sample.server.model.impl.json; import java.time.LocalDate; import java.time.LocalDateTime; @@ -15,7 +15,7 @@ import jakarta.json.JsonObject; import jakarta.json.JsonObjectBuilder; -import dev.rsdlang.sample.server.service.model.PatchableRecord_Basic_Optional; +import dev.rsdlang.sample.server.model.PatchableRecord_Basic_Optional; public class PatchableRecord_Basic_OptionalDataImpl extends _BaseDataImpl implements PatchableRecord_Basic_Optional.Data { PatchableRecord_Basic_OptionalDataImpl(JsonObject data) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableRecord_Basic_OptionalPatchImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableRecord_Basic_OptionalPatchImpl.java similarity index 97% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableRecord_Basic_OptionalPatchImpl.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableRecord_Basic_OptionalPatchImpl.java index 9a2d5ac0..663a0285 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableRecord_Basic_OptionalPatchImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableRecord_Basic_OptionalPatchImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.impl.model.json; +package dev.rsdlang.sample.server.model.impl.json; import java.time.LocalDate; import java.time.LocalDateTime; @@ -11,8 +11,8 @@ import jakarta.json.JsonObject; import jakarta.json.JsonObjectBuilder; -import dev.rsdlang.sample.server.service.model._Base; -import dev.rsdlang.sample.server.service.model.PatchableRecord_Basic_Optional; +import dev.rsdlang.sample.server.model._Base; +import dev.rsdlang.sample.server.model.PatchableRecord_Basic_Optional; public class PatchableRecord_Basic_OptionalPatchImpl extends _BaseDataImpl implements PatchableRecord_Basic_Optional.Patch { PatchableRecord_Basic_OptionalPatchImpl(JsonObject data) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableRecord_Basic_Optional_NullDataImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableRecord_Basic_Optional_NullDataImpl.java similarity index 97% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableRecord_Basic_Optional_NullDataImpl.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableRecord_Basic_Optional_NullDataImpl.java index 53443bb9..dbdf43b3 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableRecord_Basic_Optional_NullDataImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableRecord_Basic_Optional_NullDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.impl.model.json; +package dev.rsdlang.sample.server.model.impl.json; import java.time.LocalDate; import java.time.LocalDateTime; @@ -11,8 +11,8 @@ import jakarta.json.JsonObject; import jakarta.json.JsonObjectBuilder; -import dev.rsdlang.sample.server.service.model._Base; -import dev.rsdlang.sample.server.service.model.PatchableRecord_Basic_Optional_Null; +import dev.rsdlang.sample.server.model._Base; +import dev.rsdlang.sample.server.model.PatchableRecord_Basic_Optional_Null; public class PatchableRecord_Basic_Optional_NullDataImpl extends _BaseDataImpl implements PatchableRecord_Basic_Optional_Null.Data { PatchableRecord_Basic_Optional_NullDataImpl(JsonObject data) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableRecord_Basic_Optional_NullPatchImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableRecord_Basic_Optional_NullPatchImpl.java similarity index 97% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableRecord_Basic_Optional_NullPatchImpl.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableRecord_Basic_Optional_NullPatchImpl.java index 22f987fc..adf59821 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableRecord_Basic_Optional_NullPatchImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableRecord_Basic_Optional_NullPatchImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.impl.model.json; +package dev.rsdlang.sample.server.model.impl.json; import java.time.LocalDate; import java.time.LocalDateTime; @@ -11,8 +11,8 @@ import jakarta.json.JsonObject; import jakarta.json.JsonObjectBuilder; -import dev.rsdlang.sample.server.service.model._Base; -import dev.rsdlang.sample.server.service.model.PatchableRecord_Basic_Optional_Null; +import dev.rsdlang.sample.server.model._Base; +import dev.rsdlang.sample.server.model.PatchableRecord_Basic_Optional_Null; public class PatchableRecord_Basic_Optional_NullPatchImpl extends _BaseDataImpl implements PatchableRecord_Basic_Optional_Null.Patch { PatchableRecord_Basic_Optional_NullPatchImpl(JsonObject data) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableScalarRecordDataImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableScalarRecordDataImpl.java similarity index 94% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableScalarRecordDataImpl.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableScalarRecordDataImpl.java index 16480592..dc54d2fd 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableScalarRecordDataImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableScalarRecordDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.impl.model.json; +package dev.rsdlang.sample.server.model.impl.json; import java.util.List; import java.util.Optional; @@ -8,9 +8,9 @@ import jakarta.json.JsonObject; import jakarta.json.JsonObjectBuilder; -import dev.rsdlang.sample.server.service.model._Base; -import dev.rsdlang.sample.server.service.model.PatchableScalarRecord; -import dev.rsdlang.sample.server.service.model.ZoneId; +import dev.rsdlang.sample.server.model._Base; +import dev.rsdlang.sample.server.model.PatchableScalarRecord; +import dev.rsdlang.sample.server.model.ZoneId; public class PatchableScalarRecordDataImpl extends _BaseDataImpl implements PatchableScalarRecord.Data { PatchableScalarRecordDataImpl(JsonObject data) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableScalarRecordPatchImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableScalarRecordPatchImpl.java similarity index 97% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableScalarRecordPatchImpl.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableScalarRecordPatchImpl.java index ead9dd35..50fe3cf3 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableScalarRecordPatchImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableScalarRecordPatchImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.impl.model.json; +package dev.rsdlang.sample.server.model.impl.json; import java.util.List; import java.util.Optional; @@ -9,9 +9,9 @@ import jakarta.json.JsonObjectBuilder; import jakarta.json.JsonString; -import dev.rsdlang.sample.server.service.model._Base; -import dev.rsdlang.sample.server.service.model.PatchableScalarRecord; -import dev.rsdlang.sample.server.service.model.ZoneId; +import dev.rsdlang.sample.server.model._Base; +import dev.rsdlang.sample.server.model.PatchableScalarRecord; +import dev.rsdlang.sample.server.model.ZoneId; public class PatchableScalarRecordPatchImpl extends _BaseDataImpl implements PatchableScalarRecord.Patch { static class ListSetChangeImpl extends _ChangeSupport.ValueElementsChange implements ListSetChange { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableScalarRecord_SubstitutionDataImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableScalarRecord_SubstitutionDataImpl.java similarity index 96% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableScalarRecord_SubstitutionDataImpl.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableScalarRecord_SubstitutionDataImpl.java index c23f79c2..52de445a 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableScalarRecord_SubstitutionDataImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableScalarRecord_SubstitutionDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.impl.model.json; +package dev.rsdlang.sample.server.model.impl.json; import java.util.List; import java.util.Optional; @@ -8,9 +8,9 @@ import jakarta.json.JsonObject; import jakarta.json.JsonObjectBuilder; +import dev.rsdlang.sample.server.model._Base; +import dev.rsdlang.sample.server.model.PatchableScalarRecord_Substitution; import dev.rsdlang.sample.server.MyRange; -import dev.rsdlang.sample.server.service.model._Base; -import dev.rsdlang.sample.server.service.model.PatchableScalarRecord_Substitution; public class PatchableScalarRecord_SubstitutionDataImpl extends _BaseDataImpl implements PatchableScalarRecord_Substitution.Data { PatchableScalarRecord_SubstitutionDataImpl(JsonObject data) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableScalarRecord_SubstitutionPatchImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableScalarRecord_SubstitutionPatchImpl.java similarity index 98% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableScalarRecord_SubstitutionPatchImpl.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableScalarRecord_SubstitutionPatchImpl.java index 5000031e..eea1ad4d 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableScalarRecord_SubstitutionPatchImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableScalarRecord_SubstitutionPatchImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.impl.model.json; +package dev.rsdlang.sample.server.model.impl.json; import java.util.List; import java.util.Optional; @@ -9,9 +9,9 @@ import jakarta.json.JsonObjectBuilder; import jakarta.json.JsonString; +import dev.rsdlang.sample.server.model._Base; +import dev.rsdlang.sample.server.model.PatchableScalarRecord_Substitution; import dev.rsdlang.sample.server.MyRange; -import dev.rsdlang.sample.server.service.model._Base; -import dev.rsdlang.sample.server.service.model.PatchableScalarRecord_Substitution; public class PatchableScalarRecord_SubstitutionPatchImpl extends _BaseDataImpl implements PatchableScalarRecord_Substitution.Patch { static class ListSetChangeImpl extends _ChangeSupport.ValueElementsChange implements ListSetChange { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableUnionADataImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableUnionADataImpl.java similarity index 94% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableUnionADataImpl.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableUnionADataImpl.java index dafa759c..8d3b0cbd 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableUnionADataImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableUnionADataImpl.java @@ -1,11 +1,11 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.impl.model.json; +package dev.rsdlang.sample.server.model.impl.json; import jakarta.json.Json; import jakarta.json.JsonObject; import jakarta.json.JsonObjectBuilder; -import dev.rsdlang.sample.server.service.model.PatchableUnionA; +import dev.rsdlang.sample.server.model.PatchableUnionA; public class PatchableUnionADataImpl extends _BaseDataImpl implements PatchableUnionA.Data { PatchableUnionADataImpl(JsonObject data) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableUnionAPatchImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableUnionAPatchImpl.java similarity index 93% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableUnionAPatchImpl.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableUnionAPatchImpl.java index 3ac61099..1aeb7fad 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableUnionAPatchImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableUnionAPatchImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.impl.model.json; +package dev.rsdlang.sample.server.model.impl.json; import java.util.Optional; @@ -7,7 +7,7 @@ import jakarta.json.JsonObject; import jakarta.json.JsonObjectBuilder; -import dev.rsdlang.sample.server.service.model.PatchableUnionA; +import dev.rsdlang.sample.server.model.PatchableUnionA; public class PatchableUnionAPatchImpl extends _BaseDataImpl implements PatchableUnionA.Patch { PatchableUnionAPatchImpl(JsonObject data) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableUnionBDataImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableUnionBDataImpl.java similarity index 94% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableUnionBDataImpl.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableUnionBDataImpl.java index b8dc269d..0993f221 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableUnionBDataImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableUnionBDataImpl.java @@ -1,11 +1,11 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.impl.model.json; +package dev.rsdlang.sample.server.model.impl.json; import jakarta.json.Json; import jakarta.json.JsonObject; import jakarta.json.JsonObjectBuilder; -import dev.rsdlang.sample.server.service.model.PatchableUnionB; +import dev.rsdlang.sample.server.model.PatchableUnionB; public class PatchableUnionBDataImpl extends _BaseDataImpl implements PatchableUnionB.Data { PatchableUnionBDataImpl(JsonObject data) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableUnionBPatchImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableUnionBPatchImpl.java similarity index 93% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableUnionBPatchImpl.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableUnionBPatchImpl.java index 3f48c841..760a4f14 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableUnionBPatchImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableUnionBPatchImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.impl.model.json; +package dev.rsdlang.sample.server.model.impl.json; import java.util.Optional; @@ -7,7 +7,7 @@ import jakarta.json.JsonObject; import jakarta.json.JsonObjectBuilder; -import dev.rsdlang.sample.server.service.model.PatchableUnionB; +import dev.rsdlang.sample.server.model.PatchableUnionB; public class PatchableUnionBPatchImpl extends _BaseDataImpl implements PatchableUnionB.Patch { PatchableUnionBPatchImpl(JsonObject data) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableUnionDataImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableUnionDataImpl.java similarity index 86% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableUnionDataImpl.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableUnionDataImpl.java index 06d028ce..53cb1303 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableUnionDataImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableUnionDataImpl.java @@ -1,9 +1,9 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.impl.model.json; +package dev.rsdlang.sample.server.model.impl.json; import jakarta.json.JsonObject; -import dev.rsdlang.sample.server.service.model.PatchableUnion; +import dev.rsdlang.sample.server.model.PatchableUnion; public abstract class PatchableUnionDataImpl implements PatchableUnion.Data { public static boolean isSupportedType(JsonObject obj) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableUnionPatchImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableUnionPatchImpl.java similarity index 86% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableUnionPatchImpl.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableUnionPatchImpl.java index 772a099d..c34bc985 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/PatchableUnionPatchImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/PatchableUnionPatchImpl.java @@ -1,9 +1,9 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.impl.model.json; +package dev.rsdlang.sample.server.model.impl.json; import jakarta.json.JsonObject; -import dev.rsdlang.sample.server.service.model.PatchableUnion; +import dev.rsdlang.sample.server.model.PatchableUnion; public abstract class PatchableUnionPatchImpl implements PatchableUnion.Patch { public static boolean isSupportedType(JsonObject obj) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/RecordOfRecordsDataImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/RecordOfRecordsDataImpl.java similarity index 95% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/RecordOfRecordsDataImpl.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/RecordOfRecordsDataImpl.java index f872c5f1..22c8bd5e 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/RecordOfRecordsDataImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/RecordOfRecordsDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.impl.model.json; +package dev.rsdlang.sample.server.model.impl.json; import java.util.function.Function; import java.util.List; @@ -9,9 +9,9 @@ import jakarta.json.JsonObject; import jakarta.json.JsonObjectBuilder; -import dev.rsdlang.sample.server.service.model._Base; -import dev.rsdlang.sample.server.service.model.RecordOfRecords; -import dev.rsdlang.sample.server.service.model.SimpleRecord_Basic; +import dev.rsdlang.sample.server.model._Base; +import dev.rsdlang.sample.server.model.RecordOfRecords; +import dev.rsdlang.sample.server.model.SimpleRecord_Basic; public class RecordOfRecordsDataImpl extends _BaseDataImpl implements RecordOfRecords.Data { RecordOfRecordsDataImpl(JsonObject data) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/RecordWithUnionsDataImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/RecordWithUnionsDataImpl.java similarity index 94% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/RecordWithUnionsDataImpl.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/RecordWithUnionsDataImpl.java index 78fa2c5b..ad29a0d3 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/RecordWithUnionsDataImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/RecordWithUnionsDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.impl.model.json; +package dev.rsdlang.sample.server.model.impl.json; import java.util.function.Function; import java.util.List; @@ -9,11 +9,11 @@ import jakarta.json.JsonObject; import jakarta.json.JsonObjectBuilder; -import dev.rsdlang.sample.server.service.model._Base; -import dev.rsdlang.sample.server.service.model.RecordWithUnions; -import dev.rsdlang.sample.server.service.model.Union; -import dev.rsdlang.sample.server.service.model.UnionA; -import dev.rsdlang.sample.server.service.model.UnionB; +import dev.rsdlang.sample.server.model._Base; +import dev.rsdlang.sample.server.model.RecordWithUnions; +import dev.rsdlang.sample.server.model.Union; +import dev.rsdlang.sample.server.model.UnionA; +import dev.rsdlang.sample.server.model.UnionB; public class RecordWithUnionsDataImpl extends _BaseDataImpl implements RecordWithUnions.Data { RecordWithUnionsDataImpl(JsonObject data) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/ScalarRecordDataImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/ScalarRecordDataImpl.java similarity index 94% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/ScalarRecordDataImpl.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/ScalarRecordDataImpl.java index 0a2c169e..74bd3d55 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/ScalarRecordDataImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/ScalarRecordDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.impl.model.json; +package dev.rsdlang.sample.server.model.impl.json; import java.util.List; import java.util.Optional; @@ -8,9 +8,9 @@ import jakarta.json.JsonObject; import jakarta.json.JsonObjectBuilder; -import dev.rsdlang.sample.server.service.model._Base; -import dev.rsdlang.sample.server.service.model.ScalarRecord; -import dev.rsdlang.sample.server.service.model.ZoneId; +import dev.rsdlang.sample.server.model._Base; +import dev.rsdlang.sample.server.model.ScalarRecord; +import dev.rsdlang.sample.server.model.ZoneId; public class ScalarRecordDataImpl extends _BaseDataImpl implements ScalarRecord.Data { ScalarRecordDataImpl(JsonObject data) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/ScalarRecord_SubstitutionDataImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/ScalarRecord_SubstitutionDataImpl.java similarity index 95% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/ScalarRecord_SubstitutionDataImpl.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/ScalarRecord_SubstitutionDataImpl.java index 5ed66197..bb4964a5 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/ScalarRecord_SubstitutionDataImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/ScalarRecord_SubstitutionDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.impl.model.json; +package dev.rsdlang.sample.server.model.impl.json; import java.util.List; import java.util.Optional; @@ -8,9 +8,9 @@ import jakarta.json.JsonObject; import jakarta.json.JsonObjectBuilder; +import dev.rsdlang.sample.server.model._Base; +import dev.rsdlang.sample.server.model.ScalarRecord_Substitution; import dev.rsdlang.sample.server.MyRange; -import dev.rsdlang.sample.server.service.model._Base; -import dev.rsdlang.sample.server.service.model.ScalarRecord_Substitution; public class ScalarRecord_SubstitutionDataImpl extends _BaseDataImpl implements ScalarRecord_Substitution.Data { ScalarRecord_SubstitutionDataImpl(JsonObject data) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/SimpleRecordDataImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/SimpleRecordDataImpl.java similarity index 93% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/SimpleRecordDataImpl.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/SimpleRecordDataImpl.java index 0e489d44..cb87ff8c 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/SimpleRecordDataImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/SimpleRecordDataImpl.java @@ -1,11 +1,11 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.impl.model.json; +package dev.rsdlang.sample.server.model.impl.json; import jakarta.json.Json; import jakarta.json.JsonObject; import jakarta.json.JsonObjectBuilder; -import dev.rsdlang.sample.server.service.model.SimpleRecord; +import dev.rsdlang.sample.server.model.SimpleRecord; public class SimpleRecordDataImpl extends _BaseDataImpl implements SimpleRecord.Data { SimpleRecordDataImpl(JsonObject data) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/SimpleRecord_BasicDataImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/SimpleRecord_BasicDataImpl.java similarity index 97% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/SimpleRecord_BasicDataImpl.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/SimpleRecord_BasicDataImpl.java index 1f39546c..a9b0da4a 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/SimpleRecord_BasicDataImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/SimpleRecord_BasicDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.impl.model.json; +package dev.rsdlang.sample.server.model.impl.json; import java.time.LocalDate; import java.time.LocalDateTime; @@ -11,7 +11,7 @@ import jakarta.json.JsonObject; import jakarta.json.JsonObjectBuilder; -import dev.rsdlang.sample.server.service.model.SimpleRecord_Basic; +import dev.rsdlang.sample.server.model.SimpleRecord_Basic; public class SimpleRecord_BasicDataImpl extends _BaseDataImpl implements SimpleRecord_Basic.Data { SimpleRecord_BasicDataImpl(JsonObject data) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/SimpleRecord_Basic_ListDataImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/SimpleRecord_Basic_ListDataImpl.java similarity index 97% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/SimpleRecord_Basic_ListDataImpl.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/SimpleRecord_Basic_ListDataImpl.java index 2e7d59fe..5bb5d8b6 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/SimpleRecord_Basic_ListDataImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/SimpleRecord_Basic_ListDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.impl.model.json; +package dev.rsdlang.sample.server.model.impl.json; import java.time.LocalDate; import java.time.LocalDateTime; @@ -12,7 +12,7 @@ import jakarta.json.JsonObject; import jakarta.json.JsonObjectBuilder; -import dev.rsdlang.sample.server.service.model.SimpleRecord_Basic_List; +import dev.rsdlang.sample.server.model.SimpleRecord_Basic_List; public class SimpleRecord_Basic_ListDataImpl extends _BaseDataImpl implements SimpleRecord_Basic_List.Data { SimpleRecord_Basic_ListDataImpl(JsonObject data) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/SimpleRecord_Basic_List_NullDataImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/SimpleRecord_Basic_List_NullDataImpl.java similarity index 97% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/SimpleRecord_Basic_List_NullDataImpl.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/SimpleRecord_Basic_List_NullDataImpl.java index 1a8213b6..9dac4038 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/SimpleRecord_Basic_List_NullDataImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/SimpleRecord_Basic_List_NullDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.impl.model.json; +package dev.rsdlang.sample.server.model.impl.json; import java.time.LocalDate; import java.time.LocalDateTime; @@ -13,7 +13,7 @@ import jakarta.json.JsonObject; import jakarta.json.JsonObjectBuilder; -import dev.rsdlang.sample.server.service.model.SimpleRecord_Basic_List_Null; +import dev.rsdlang.sample.server.model.SimpleRecord_Basic_List_Null; public class SimpleRecord_Basic_List_NullDataImpl extends _BaseDataImpl implements SimpleRecord_Basic_List_Null.Data { SimpleRecord_Basic_List_NullDataImpl(JsonObject data) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/SimpleRecord_Basic_List_OptionalDataImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/SimpleRecord_Basic_List_OptionalDataImpl.java similarity index 97% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/SimpleRecord_Basic_List_OptionalDataImpl.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/SimpleRecord_Basic_List_OptionalDataImpl.java index 1f4af71f..fd1ac2b1 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/SimpleRecord_Basic_List_OptionalDataImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/SimpleRecord_Basic_List_OptionalDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.impl.model.json; +package dev.rsdlang.sample.server.model.impl.json; import java.time.LocalDate; import java.time.LocalDateTime; @@ -13,7 +13,7 @@ import jakarta.json.JsonObject; import jakarta.json.JsonObjectBuilder; -import dev.rsdlang.sample.server.service.model.SimpleRecord_Basic_List_Optional; +import dev.rsdlang.sample.server.model.SimpleRecord_Basic_List_Optional; public class SimpleRecord_Basic_List_OptionalDataImpl extends _BaseDataImpl implements SimpleRecord_Basic_List_Optional.Data { SimpleRecord_Basic_List_OptionalDataImpl(JsonObject data) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/SimpleRecord_Basic_List_Optional_NullDataImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/SimpleRecord_Basic_List_Optional_NullDataImpl.java similarity index 97% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/SimpleRecord_Basic_List_Optional_NullDataImpl.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/SimpleRecord_Basic_List_Optional_NullDataImpl.java index a17df89a..82b1f713 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/SimpleRecord_Basic_List_Optional_NullDataImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/SimpleRecord_Basic_List_Optional_NullDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.impl.model.json; +package dev.rsdlang.sample.server.model.impl.json; import java.time.LocalDate; import java.time.LocalDateTime; @@ -12,8 +12,8 @@ import jakarta.json.JsonObject; import jakarta.json.JsonObjectBuilder; -import dev.rsdlang.sample.server.service.model._Base; -import dev.rsdlang.sample.server.service.model.SimpleRecord_Basic_List_Optional_Null; +import dev.rsdlang.sample.server.model._Base; +import dev.rsdlang.sample.server.model.SimpleRecord_Basic_List_Optional_Null; public class SimpleRecord_Basic_List_Optional_NullDataImpl extends _BaseDataImpl implements SimpleRecord_Basic_List_Optional_Null.Data { SimpleRecord_Basic_List_Optional_NullDataImpl(JsonObject data) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/SimpleRecord_Basic_NullDataImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/SimpleRecord_Basic_NullDataImpl.java similarity index 97% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/SimpleRecord_Basic_NullDataImpl.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/SimpleRecord_Basic_NullDataImpl.java index 212345a9..353d9406 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/SimpleRecord_Basic_NullDataImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/SimpleRecord_Basic_NullDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.impl.model.json; +package dev.rsdlang.sample.server.model.impl.json; import java.time.LocalDate; import java.time.LocalDateTime; @@ -15,7 +15,7 @@ import jakarta.json.JsonObject; import jakarta.json.JsonObjectBuilder; -import dev.rsdlang.sample.server.service.model.SimpleRecord_Basic_Null; +import dev.rsdlang.sample.server.model.SimpleRecord_Basic_Null; public class SimpleRecord_Basic_NullDataImpl extends _BaseDataImpl implements SimpleRecord_Basic_Null.Data { SimpleRecord_Basic_NullDataImpl(JsonObject data) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/SimpleRecord_Basic_OptionalDataImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/SimpleRecord_Basic_OptionalDataImpl.java similarity index 97% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/SimpleRecord_Basic_OptionalDataImpl.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/SimpleRecord_Basic_OptionalDataImpl.java index a294497d..170e15ed 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/SimpleRecord_Basic_OptionalDataImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/SimpleRecord_Basic_OptionalDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.impl.model.json; +package dev.rsdlang.sample.server.model.impl.json; import java.time.LocalDate; import java.time.LocalDateTime; @@ -15,7 +15,7 @@ import jakarta.json.JsonObject; import jakarta.json.JsonObjectBuilder; -import dev.rsdlang.sample.server.service.model.SimpleRecord_Basic_Optional; +import dev.rsdlang.sample.server.model.SimpleRecord_Basic_Optional; public class SimpleRecord_Basic_OptionalDataImpl extends _BaseDataImpl implements SimpleRecord_Basic_Optional.Data { SimpleRecord_Basic_OptionalDataImpl(JsonObject data) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/SimpleRecord_Basic_Optional_NullDataImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/SimpleRecord_Basic_Optional_NullDataImpl.java similarity index 96% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/SimpleRecord_Basic_Optional_NullDataImpl.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/SimpleRecord_Basic_Optional_NullDataImpl.java index 6fbfc8b4..f79da0ec 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/SimpleRecord_Basic_Optional_NullDataImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/SimpleRecord_Basic_Optional_NullDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.impl.model.json; +package dev.rsdlang.sample.server.model.impl.json; import java.time.LocalDate; import java.time.LocalDateTime; @@ -11,8 +11,8 @@ import jakarta.json.JsonObject; import jakarta.json.JsonObjectBuilder; -import dev.rsdlang.sample.server.service.model._Base; -import dev.rsdlang.sample.server.service.model.SimpleRecord_Basic_Optional_Null; +import dev.rsdlang.sample.server.model._Base; +import dev.rsdlang.sample.server.model.SimpleRecord_Basic_Optional_Null; public class SimpleRecord_Basic_Optional_NullDataImpl extends _BaseDataImpl implements SimpleRecord_Basic_Optional_Null.Data { SimpleRecord_Basic_Optional_NullDataImpl(JsonObject data) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/SimpleRecord_KeyVersionDataImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/SimpleRecord_KeyVersionDataImpl.java similarity index 91% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/SimpleRecord_KeyVersionDataImpl.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/SimpleRecord_KeyVersionDataImpl.java index bc45489f..ead52a6b 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/SimpleRecord_KeyVersionDataImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/SimpleRecord_KeyVersionDataImpl.java @@ -1,11 +1,11 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.impl.model.json; +package dev.rsdlang.sample.server.model.impl.json; import jakarta.json.Json; import jakarta.json.JsonObject; import jakarta.json.JsonObjectBuilder; -import dev.rsdlang.sample.server.service.model.SimpleRecord_KeyVersion; +import dev.rsdlang.sample.server.model.SimpleRecord_KeyVersion; public class SimpleRecord_KeyVersionDataImpl extends _BaseDataImpl implements SimpleRecord_KeyVersion.Data { SimpleRecord_KeyVersionDataImpl(JsonObject data) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/SimpleRecord_KeyVersion_Int_IntDataImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/SimpleRecord_KeyVersion_Int_IntDataImpl.java similarity index 91% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/SimpleRecord_KeyVersion_Int_IntDataImpl.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/SimpleRecord_KeyVersion_Int_IntDataImpl.java index 4a2ff0dc..212b296d 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/SimpleRecord_KeyVersion_Int_IntDataImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/SimpleRecord_KeyVersion_Int_IntDataImpl.java @@ -1,11 +1,11 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.impl.model.json; +package dev.rsdlang.sample.server.model.impl.json; import jakarta.json.Json; import jakarta.json.JsonObject; import jakarta.json.JsonObjectBuilder; -import dev.rsdlang.sample.server.service.model.SimpleRecord_KeyVersion_Int_Int; +import dev.rsdlang.sample.server.model.SimpleRecord_KeyVersion_Int_Int; public class SimpleRecord_KeyVersion_Int_IntDataImpl extends _BaseDataImpl implements SimpleRecord_KeyVersion_Int_Int.Data { SimpleRecord_KeyVersion_Int_IntDataImpl(JsonObject data) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/TreeNodeDataImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/TreeNodeDataImpl.java similarity index 92% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/TreeNodeDataImpl.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/TreeNodeDataImpl.java index e839aeb4..e1ebcf2a 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/TreeNodeDataImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/TreeNodeDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.impl.model.json; +package dev.rsdlang.sample.server.model.impl.json; import java.util.List; @@ -7,7 +7,7 @@ import jakarta.json.JsonObject; import jakarta.json.JsonObjectBuilder; -import dev.rsdlang.sample.server.service.model.TreeNode; +import dev.rsdlang.sample.server.model.TreeNode; public class TreeNodeDataImpl extends _BaseDataImpl implements TreeNode.Data { TreeNodeDataImpl(JsonObject data) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/UnionADataImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/UnionADataImpl.java similarity index 92% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/UnionADataImpl.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/UnionADataImpl.java index d2530511..23520e40 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/UnionADataImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/UnionADataImpl.java @@ -1,11 +1,11 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.impl.model.json; +package dev.rsdlang.sample.server.model.impl.json; import jakarta.json.Json; import jakarta.json.JsonObject; import jakarta.json.JsonObjectBuilder; -import dev.rsdlang.sample.server.service.model.UnionA; +import dev.rsdlang.sample.server.model.UnionA; public class UnionADataImpl extends _BaseDataImpl implements UnionA.Data { UnionADataImpl(JsonObject data) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/UnionBDataImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/UnionBDataImpl.java similarity index 92% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/UnionBDataImpl.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/UnionBDataImpl.java index e25ba2c6..92def428 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/UnionBDataImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/UnionBDataImpl.java @@ -1,11 +1,11 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.impl.model.json; +package dev.rsdlang.sample.server.model.impl.json; import jakarta.json.Json; import jakarta.json.JsonObject; import jakarta.json.JsonObjectBuilder; -import dev.rsdlang.sample.server.service.model.UnionB; +import dev.rsdlang.sample.server.model.UnionB; public class UnionBDataImpl extends _BaseDataImpl implements UnionB.Data { UnionBDataImpl(JsonObject data) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/UnionDataImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/UnionDataImpl.java similarity index 86% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/UnionDataImpl.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/UnionDataImpl.java index 34941e14..49870918 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/UnionDataImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/UnionDataImpl.java @@ -1,9 +1,9 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.impl.model.json; +package dev.rsdlang.sample.server.model.impl.json; import jakarta.json.JsonObject; -import dev.rsdlang.sample.server.service.model.Union; +import dev.rsdlang.sample.server.model.Union; public abstract class UnionDataImpl implements Union.Data { public static boolean isSupportedType(JsonObject obj) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/UploadMixedResultDataImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/UploadMixedResultDataImpl.java similarity index 94% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/UploadMixedResultDataImpl.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/UploadMixedResultDataImpl.java index 99826767..ca4aa8a9 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/UploadMixedResultDataImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/UploadMixedResultDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.impl.model.json; +package dev.rsdlang.sample.server.model.impl.json; import java.util.function.Function; import java.util.List; @@ -8,9 +8,9 @@ import jakarta.json.JsonObject; import jakarta.json.JsonObjectBuilder; -import dev.rsdlang.sample.server.service.model._Base; -import dev.rsdlang.sample.server.service.model.SimpleRecord; -import dev.rsdlang.sample.server.service.model.UploadMixedResult; +import dev.rsdlang.sample.server.model._Base; +import dev.rsdlang.sample.server.model.SimpleRecord; +import dev.rsdlang.sample.server.model.UploadMixedResult; public class UploadMixedResultDataImpl extends _BaseDataImpl implements UploadMixedResult.Data { UploadMixedResultDataImpl(JsonObject data) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/_BaseDataImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/_BaseDataImpl.java similarity index 80% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/_BaseDataImpl.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/_BaseDataImpl.java index 6f65cfaa..8e6a1453 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/_BaseDataImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/_BaseDataImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.impl.model.json; +package dev.rsdlang.sample.server.model.impl.json; import jakarta.json.JsonObject; diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/_BlobImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/_BlobImpl.java similarity index 93% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/_BlobImpl.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/_BlobImpl.java index a238b247..67c7ab72 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/_BlobImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/_BlobImpl.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.impl.model.json; +package dev.rsdlang.sample.server.model.impl.json; import java.io.InputStream; import java.io.IOException; @@ -8,7 +8,7 @@ import java.util.function.Consumer; import java.util.Optional; -import dev.rsdlang.sample.server.service.model.RSDBlob; +import dev.rsdlang.sample.server.model.RSDBlob; public class _BlobImpl implements RSDBlob { private final Path file; diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/_ChangeSupport.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/_ChangeSupport.java similarity index 96% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/_ChangeSupport.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/_ChangeSupport.java index 63a5c345..b7313ea0 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/_ChangeSupport.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/_ChangeSupport.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.impl.model.json; +package dev.rsdlang.sample.server.model.impl.json; import java.util.function.Function; import java.util.List; @@ -7,7 +7,7 @@ import jakarta.json.JsonObject; import jakarta.json.JsonValue; -import dev.rsdlang.sample.server.service.model._Base; +import dev.rsdlang.sample.server.model._Base; public class _ChangeSupport { public static T of(JsonObject o, String descProperty, Function setFactory, Function deltaFactory) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/_FileImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/_FileImpl.java similarity index 88% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/_FileImpl.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/_FileImpl.java index b29461e7..b58cc509 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/_FileImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/_FileImpl.java @@ -1,11 +1,11 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.impl.model.json; +package dev.rsdlang.sample.server.model.impl.json; import java.nio.file.Path; import java.util.function.Consumer; import java.util.Objects; -import dev.rsdlang.sample.server.service.model.RSDFile; +import dev.rsdlang.sample.server.model.RSDFile; public class _FileImpl extends _BlobImpl implements RSDFile { private final String filename; diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/_JsonUtils.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/_JsonUtils.java similarity index 99% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/_JsonUtils.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/_JsonUtils.java index bf622704..11e53b74 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/_JsonUtils.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/_JsonUtils.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.impl.model.json; +package dev.rsdlang.sample.server.model.impl.json; import java.io.InputStream; import java.io.InputStreamReader; @@ -37,7 +37,7 @@ import jakarta.json.stream.JsonGenerator; import at.bestsolution.msgpack.json.MsgpackJson; -import dev.rsdlang.sample.server.service.model._Base; +import dev.rsdlang.sample.server.model._Base; import org.msgpack.core.MessagePack; import org.msgpack.core.MessagePacker; import org.msgpack.core.MessagePackException; diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/_NillableImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/_NillableImpl.java similarity index 94% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/_NillableImpl.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/_NillableImpl.java index cf1e8079..d299a17e 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/_NillableImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/_NillableImpl.java @@ -1,12 +1,12 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.impl.model.json; +package dev.rsdlang.sample.server.model.impl.json; import java.util.function.Consumer; import java.util.function.Function; import java.util.function.Supplier; import java.util.Optional; -import dev.rsdlang.sample.server.service.model._Base; +import dev.rsdlang.sample.server.model._Base; public class _NillableImpl implements _Base.Nillable { private static _NillableImpl UNDEFINED = new _NillableImpl<>(null); diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/_StreamBlobImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/_StreamBlobImpl.java similarity index 90% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/_StreamBlobImpl.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/_StreamBlobImpl.java index 5b474847..b4146c7f 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/_StreamBlobImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/_StreamBlobImpl.java @@ -1,10 +1,10 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.impl.model.json; +package dev.rsdlang.sample.server.model.impl.json; import java.io.InputStream; import java.util.Optional; -import dev.rsdlang.sample.server.service.model.RSDBlob; +import dev.rsdlang.sample.server.model.RSDBlob; public class _StreamBlobImpl implements RSDBlob { private final String mimeType; diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/_StreamFileImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/_StreamFileImpl.java similarity index 86% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/_StreamFileImpl.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/_StreamFileImpl.java index bfa9c4cb..76e2773d 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/impl/model/json/_StreamFileImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/impl/json/_StreamFileImpl.java @@ -1,10 +1,10 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.impl.model.json; +package dev.rsdlang.sample.server.model.impl.json; import java.io.InputStream; import java.util.Objects; -import dev.rsdlang.sample.server.service.model.RSDFile; +import dev.rsdlang.sample.server.model.RSDFile; public class _StreamFileImpl extends _StreamBlobImpl implements RSDFile { private final String filename; diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/mixins/RecordMixinMixin.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/mixins/RecordMixinMixin.java new file mode 100644 index 00000000..ccdd2a8d --- /dev/null +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/mixins/RecordMixinMixin.java @@ -0,0 +1,9 @@ +// Generated by RSD - Do not modify +package dev.rsdlang.sample.server.model.mixins; + +import dev.rsdlang.sample.server.model.SimpleRecord; + +public interface RecordMixinMixin { + public SimpleRecord.Data myRecord(); + +} diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/mixins/SimpleMixin2Mixin.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/mixins/SimpleMixin2Mixin.java similarity index 66% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/mixins/SimpleMixin2Mixin.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/mixins/SimpleMixin2Mixin.java index ec979a9a..5d8b4ad8 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/mixins/SimpleMixin2Mixin.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/mixins/SimpleMixin2Mixin.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.service.model.mixins; +package dev.rsdlang.sample.server.model.mixins; public interface SimpleMixin2Mixin { public String mValueString2(); diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/mixins/SimpleMixinMixin.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/mixins/SimpleMixinMixin.java similarity index 65% rename from dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/mixins/SimpleMixinMixin.java rename to dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/mixins/SimpleMixinMixin.java index c598e6bd..003ba73a 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/mixins/SimpleMixinMixin.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/mixins/SimpleMixinMixin.java @@ -1,5 +1,5 @@ // Generated by RSD - Do not modify -package dev.rsdlang.sample.server.service.model.mixins; +package dev.rsdlang.sample.server.model.mixins; public interface SimpleMixinMixin { public String mValueString(); diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/mixins/UnionMixinMixin.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/mixins/UnionMixinMixin.java new file mode 100644 index 00000000..c4d71474 --- /dev/null +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/model/mixins/UnionMixinMixin.java @@ -0,0 +1,9 @@ +// Generated by RSD - Do not modify +package dev.rsdlang.sample.server.model.mixins; + +import dev.rsdlang.sample.server.model.Union; + +public interface UnionMixinMixin { + public Union.Data myUnion(); + +} diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/BinaryTypesResource.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/BinaryTypesResource.java index d4d0f7e8..ae577b90 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/BinaryTypesResource.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/BinaryTypesResource.java @@ -19,17 +19,17 @@ import jakarta.ws.rs.PUT; import jakarta.ws.rs.QueryParam; -import dev.rsdlang.sample.server.impl.model.json._JsonUtils; -import dev.rsdlang.sample.server.impl.model.json._NillableImpl; +import dev.rsdlang.sample.server.model.impl.json._JsonUtils; +import dev.rsdlang.sample.server.model.impl.json._NillableImpl; +import dev.rsdlang.sample.server.model.RSDBlob; +import dev.rsdlang.sample.server.model.RSDFile; +import dev.rsdlang.sample.server.model.SimpleRecord; import dev.rsdlang.sample.server.rest.model.BinaryTypesSingleBodyAdditionDataImpl; import dev.rsdlang.sample.server.rest.model.BinaryTypesUploadMixedDataImpl; import dev.rsdlang.sample.server.rest.model.BinaryTypesUploadMixedNilDataImpl; import dev.rsdlang.sample.server.rest.model.BinaryTypesUploadMixedOptDataImpl; import dev.rsdlang.sample.server.rest.model.BinaryTypesUploadMixedOptNilDataImpl; import dev.rsdlang.sample.server.service.BinaryTypesService; -import dev.rsdlang.sample.server.service.model.RSDBlob; -import dev.rsdlang.sample.server.service.model.RSDFile; -import dev.rsdlang.sample.server.service.model.SimpleRecord; import dev.rsdlang.sample.server.service.SampleErrorWithValueException; import org.jboss.resteasy.reactive.multipart.FileUpload; import org.jboss.resteasy.reactive.RestForm; diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/BinaryTypesResourceResponseBuilder.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/BinaryTypesResourceResponseBuilder.java index c0ec2d80..eabd509c 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/BinaryTypesResourceResponseBuilder.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/BinaryTypesResourceResponseBuilder.java @@ -9,13 +9,13 @@ import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response.ResponseBuilder; -import dev.rsdlang.sample.server.impl.model.json._JsonUtils; -import dev.rsdlang.sample.server.service.model._Base; -import dev.rsdlang.sample.server.service.model.MixedResult; -import dev.rsdlang.sample.server.service.model.RSDBlob; -import dev.rsdlang.sample.server.service.model.RSDFile; -import dev.rsdlang.sample.server.service.model.SimpleRecord; -import dev.rsdlang.sample.server.service.model.UploadMixedResult; +import dev.rsdlang.sample.server.model._Base; +import dev.rsdlang.sample.server.model.impl.json._JsonUtils; +import dev.rsdlang.sample.server.model.MixedResult; +import dev.rsdlang.sample.server.model.RSDBlob; +import dev.rsdlang.sample.server.model.RSDFile; +import dev.rsdlang.sample.server.model.SimpleRecord; +import dev.rsdlang.sample.server.model.UploadMixedResult; @Singleton public class BinaryTypesResourceResponseBuilder { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/BodyParameterTypesResource.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/BodyParameterTypesResource.java index d5eda2c5..dab0913f 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/BodyParameterTypesResource.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/BodyParameterTypesResource.java @@ -15,18 +15,18 @@ import jakarta.ws.rs.POST; import jakarta.ws.rs.Produces; -import dev.rsdlang.sample.server.impl.model.json._JsonUtils; +import dev.rsdlang.sample.server.model.impl.json._JsonUtils; +import dev.rsdlang.sample.server.model.PatchableRecord; +import dev.rsdlang.sample.server.model.SampleEnum; +import dev.rsdlang.sample.server.model.SimpleRecord; +import dev.rsdlang.sample.server.model.Union; +import dev.rsdlang.sample.server.model.ZoneId; import dev.rsdlang.sample.server.rest.model.BodyParameterTypesMultiBodyParamDataImpl; import dev.rsdlang.sample.server.rest.model.BodyParameterTypesMultiBodyParamFirstDataImpl; import dev.rsdlang.sample.server.rest.model.BodyParameterTypesMultiBodyParamNilDataImpl; import dev.rsdlang.sample.server.rest.model.BodyParameterTypesMultiBodyParamOptDataImpl; import dev.rsdlang.sample.server.rest.model.BodyParameterTypesMultiBodyParamOptNilDataImpl; import dev.rsdlang.sample.server.service.BodyParameterTypesService; -import dev.rsdlang.sample.server.service.model.PatchableRecord; -import dev.rsdlang.sample.server.service.model.SampleEnum; -import dev.rsdlang.sample.server.service.model.SimpleRecord; -import dev.rsdlang.sample.server.service.model.Union; -import dev.rsdlang.sample.server.service.model.ZoneId; @ApplicationScoped @Path("/api/bodyparametertypes") diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/BodyParameterTypesResourceResponseBuilder.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/BodyParameterTypesResourceResponseBuilder.java index 58254927..d2c42a24 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/BodyParameterTypesResourceResponseBuilder.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/BodyParameterTypesResourceResponseBuilder.java @@ -15,15 +15,15 @@ import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response.ResponseBuilder; -import dev.rsdlang.sample.server.impl.model.json._JsonUtils; +import dev.rsdlang.sample.server.model._Base; +import dev.rsdlang.sample.server.model.impl.json._JsonUtils; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model.PatchableRecord; +import dev.rsdlang.sample.server.model.SampleEnum; +import dev.rsdlang.sample.server.model.SimpleRecord; +import dev.rsdlang.sample.server.model.Union; +import dev.rsdlang.sample.server.model.ZoneId; import dev.rsdlang.sample.server.service.BodyParameterTypesService; -import dev.rsdlang.sample.server.service.model._Base; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model.PatchableRecord; -import dev.rsdlang.sample.server.service.model.SampleEnum; -import dev.rsdlang.sample.server.service.model.SimpleRecord; -import dev.rsdlang.sample.server.service.model.Union; -import dev.rsdlang.sample.server.service.model.ZoneId; @Singleton public class BodyParameterTypesResourceResponseBuilder { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/HeaderParameterTypesResource.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/HeaderParameterTypesResource.java index 199c6195..bd1598b4 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/HeaderParameterTypesResource.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/HeaderParameterTypesResource.java @@ -17,11 +17,11 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.QueryParam; -import dev.rsdlang.sample.server.impl.model.json._JsonUtils; +import dev.rsdlang.sample.server.model.impl.json._JsonUtils; +import dev.rsdlang.sample.server.model.SampleEnum; +import dev.rsdlang.sample.server.model.SimpleRecord; +import dev.rsdlang.sample.server.model.ZoneId; import dev.rsdlang.sample.server.service.HeaderParameterTypesService; -import dev.rsdlang.sample.server.service.model.SampleEnum; -import dev.rsdlang.sample.server.service.model.SimpleRecord; -import dev.rsdlang.sample.server.service.model.ZoneId; @ApplicationScoped @Path("/api/headerparametertypes") diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/HeaderParameterTypesResourceResponseBuilder.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/HeaderParameterTypesResourceResponseBuilder.java index 506dddea..b1657b3d 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/HeaderParameterTypesResourceResponseBuilder.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/HeaderParameterTypesResourceResponseBuilder.java @@ -16,13 +16,13 @@ import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response.ResponseBuilder; -import dev.rsdlang.sample.server.impl.model.json._JsonUtils; +import dev.rsdlang.sample.server.model._Base; +import dev.rsdlang.sample.server.model.impl.json._JsonUtils; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model.SampleEnum; +import dev.rsdlang.sample.server.model.SimpleRecord; +import dev.rsdlang.sample.server.model.ZoneId; import dev.rsdlang.sample.server.service.HeaderParameterTypesService; -import dev.rsdlang.sample.server.service.model._Base; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model.SampleEnum; -import dev.rsdlang.sample.server.service.model.SimpleRecord; -import dev.rsdlang.sample.server.service.model.ZoneId; @Singleton public class HeaderParameterTypesResourceResponseBuilder { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/ListBodyParameterTypesResource.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/ListBodyParameterTypesResource.java index 81af8b97..ce60eddc 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/ListBodyParameterTypesResource.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/ListBodyParameterTypesResource.java @@ -14,15 +14,15 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.PUT; -import dev.rsdlang.sample.server.impl.model.json._JsonUtils; +import dev.rsdlang.sample.server.model.impl.json._JsonUtils; +import dev.rsdlang.sample.server.model.SampleEnum; +import dev.rsdlang.sample.server.model.SimpleRecord; +import dev.rsdlang.sample.server.model.ZoneId; import dev.rsdlang.sample.server.rest.model.ListBodyParameterTypesListMultiBodyParamDataImpl; import dev.rsdlang.sample.server.rest.model.ListBodyParameterTypesListMultiBodyParamNilDataImpl; import dev.rsdlang.sample.server.rest.model.ListBodyParameterTypesListMultiBodyParamOptDataImpl; import dev.rsdlang.sample.server.rest.model.ListBodyParameterTypesListMultiBodyParamOptNilDataImpl; import dev.rsdlang.sample.server.service.ListBodyParameterTypesService; -import dev.rsdlang.sample.server.service.model.SampleEnum; -import dev.rsdlang.sample.server.service.model.SimpleRecord; -import dev.rsdlang.sample.server.service.model.ZoneId; @ApplicationScoped @Path("/api/listbodyparametertypes") diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/ListBodyParameterTypesResourceResponseBuilder.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/ListBodyParameterTypesResourceResponseBuilder.java index 3e1c1f55..bc8b4dae 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/ListBodyParameterTypesResourceResponseBuilder.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/ListBodyParameterTypesResourceResponseBuilder.java @@ -13,13 +13,13 @@ import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response.ResponseBuilder; -import dev.rsdlang.sample.server.impl.model.json._JsonUtils; +import dev.rsdlang.sample.server.model._Base; +import dev.rsdlang.sample.server.model.impl.json._JsonUtils; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model.SampleEnum; +import dev.rsdlang.sample.server.model.SimpleRecord; +import dev.rsdlang.sample.server.model.ZoneId; import dev.rsdlang.sample.server.service.ListBodyParameterTypesService; -import dev.rsdlang.sample.server.service.model._Base; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model.SampleEnum; -import dev.rsdlang.sample.server.service.model.SimpleRecord; -import dev.rsdlang.sample.server.service.model.ZoneId; @Singleton public class ListBodyParameterTypesResourceResponseBuilder { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/ListHeaderParameterTypesResource.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/ListHeaderParameterTypesResource.java index 198042aa..8b44f6aa 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/ListHeaderParameterTypesResource.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/ListHeaderParameterTypesResource.java @@ -13,11 +13,11 @@ import jakarta.ws.rs.Path; import jakarta.ws.rs.Produces; -import dev.rsdlang.sample.server.impl.model.json._JsonUtils; +import dev.rsdlang.sample.server.model.impl.json._JsonUtils; +import dev.rsdlang.sample.server.model.SampleEnum; +import dev.rsdlang.sample.server.model.SimpleRecord; +import dev.rsdlang.sample.server.model.ZoneId; import dev.rsdlang.sample.server.service.ListHeaderParameterTypesService; -import dev.rsdlang.sample.server.service.model.SampleEnum; -import dev.rsdlang.sample.server.service.model.SimpleRecord; -import dev.rsdlang.sample.server.service.model.ZoneId; @ApplicationScoped @Path("/api/listheaderparametertypes") diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/ListHeaderParameterTypesResourceResponseBuilder.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/ListHeaderParameterTypesResourceResponseBuilder.java index 54659b60..0a4472ee 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/ListHeaderParameterTypesResourceResponseBuilder.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/ListHeaderParameterTypesResourceResponseBuilder.java @@ -13,13 +13,13 @@ import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response.ResponseBuilder; -import dev.rsdlang.sample.server.impl.model.json._JsonUtils; +import dev.rsdlang.sample.server.model._Base; +import dev.rsdlang.sample.server.model.impl.json._JsonUtils; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model.SampleEnum; +import dev.rsdlang.sample.server.model.SimpleRecord; +import dev.rsdlang.sample.server.model.ZoneId; import dev.rsdlang.sample.server.service.ListHeaderParameterTypesService; -import dev.rsdlang.sample.server.service.model._Base; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model.SampleEnum; -import dev.rsdlang.sample.server.service.model.SimpleRecord; -import dev.rsdlang.sample.server.service.model.ZoneId; @Singleton public class ListHeaderParameterTypesResourceResponseBuilder { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/ListQueryParameterTypesResource.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/ListQueryParameterTypesResource.java index ea3675a5..322fcf60 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/ListQueryParameterTypesResource.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/ListQueryParameterTypesResource.java @@ -14,11 +14,11 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.QueryParam; -import dev.rsdlang.sample.server.impl.model.json._JsonUtils; +import dev.rsdlang.sample.server.model.impl.json._JsonUtils; +import dev.rsdlang.sample.server.model.SampleEnum; +import dev.rsdlang.sample.server.model.SimpleRecord; +import dev.rsdlang.sample.server.model.ZoneId; import dev.rsdlang.sample.server.service.ListQueryParameterTypesService; -import dev.rsdlang.sample.server.service.model.SampleEnum; -import dev.rsdlang.sample.server.service.model.SimpleRecord; -import dev.rsdlang.sample.server.service.model.ZoneId; @ApplicationScoped @Path("/api/listqueryparametertypes") diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/ListQueryParameterTypesResourceResponseBuilder.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/ListQueryParameterTypesResourceResponseBuilder.java index f3642b13..2b02c5e3 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/ListQueryParameterTypesResourceResponseBuilder.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/ListQueryParameterTypesResourceResponseBuilder.java @@ -12,11 +12,11 @@ import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response.ResponseBuilder; -import dev.rsdlang.sample.server.impl.model.json._JsonUtils; +import dev.rsdlang.sample.server.model.impl.json._JsonUtils; +import dev.rsdlang.sample.server.model.SampleEnum; +import dev.rsdlang.sample.server.model.SimpleRecord; +import dev.rsdlang.sample.server.model.ZoneId; import dev.rsdlang.sample.server.service.ListQueryParameterTypesService; -import dev.rsdlang.sample.server.service.model.SampleEnum; -import dev.rsdlang.sample.server.service.model.SimpleRecord; -import dev.rsdlang.sample.server.service.model.ZoneId; @Singleton public class ListQueryParameterTypesResourceResponseBuilder { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/ListSampleServiceResourceResponseBuilder.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/ListSampleServiceResourceResponseBuilder.java index 55261c51..97d3dfef 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/ListSampleServiceResourceResponseBuilder.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/ListSampleServiceResourceResponseBuilder.java @@ -12,10 +12,10 @@ import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response.ResponseBuilder; -import dev.rsdlang.sample.server.impl.model.json._JsonUtils; -import dev.rsdlang.sample.server.service.model.SampleEnum; -import dev.rsdlang.sample.server.service.model.SimpleRecord; -import dev.rsdlang.sample.server.service.model.ZoneId; +import dev.rsdlang.sample.server.model.impl.json._JsonUtils; +import dev.rsdlang.sample.server.model.SampleEnum; +import dev.rsdlang.sample.server.model.SimpleRecord; +import dev.rsdlang.sample.server.model.ZoneId; @Singleton public class ListSampleServiceResourceResponseBuilder { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/PathParameterTypeServiceResource.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/PathParameterTypeServiceResource.java index c2900179..67772cf5 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/PathParameterTypeServiceResource.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/PathParameterTypeServiceResource.java @@ -14,8 +14,8 @@ import jakarta.ws.rs.PathParam; import jakarta.ws.rs.Produces; -import dev.rsdlang.sample.server.service.model.SampleEnum; -import dev.rsdlang.sample.server.service.model.ZoneId; +import dev.rsdlang.sample.server.model.SampleEnum; +import dev.rsdlang.sample.server.model.ZoneId; import dev.rsdlang.sample.server.service.PathParameterTypeServiceService; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/PathParameterTypeServiceResourceResponseBuilder.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/PathParameterTypeServiceResourceResponseBuilder.java index 5e1a0efd..c328f643 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/PathParameterTypeServiceResourceResponseBuilder.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/PathParameterTypeServiceResourceResponseBuilder.java @@ -11,9 +11,9 @@ import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response.ResponseBuilder; -import dev.rsdlang.sample.server.impl.model.json._JsonUtils; -import dev.rsdlang.sample.server.service.model.SampleEnum; -import dev.rsdlang.sample.server.service.model.ZoneId; +import dev.rsdlang.sample.server.model.impl.json._JsonUtils; +import dev.rsdlang.sample.server.model.SampleEnum; +import dev.rsdlang.sample.server.model.ZoneId; @Singleton public class PathParameterTypeServiceResourceResponseBuilder { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/QueryParameterTypesResource.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/QueryParameterTypesResource.java index 08f7ae8f..1be93504 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/QueryParameterTypesResource.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/QueryParameterTypesResource.java @@ -14,10 +14,10 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.QueryParam; -import dev.rsdlang.sample.server.impl.model.json._JsonUtils; -import dev.rsdlang.sample.server.service.model.SampleEnum; -import dev.rsdlang.sample.server.service.model.SimpleRecord; -import dev.rsdlang.sample.server.service.model.ZoneId; +import dev.rsdlang.sample.server.model.impl.json._JsonUtils; +import dev.rsdlang.sample.server.model.SampleEnum; +import dev.rsdlang.sample.server.model.SimpleRecord; +import dev.rsdlang.sample.server.model.ZoneId; import dev.rsdlang.sample.server.service.QueryParameterTypesService; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/QueryParameterTypesResourceResponseBuilder.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/QueryParameterTypesResourceResponseBuilder.java index a78f9551..cfec6a2c 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/QueryParameterTypesResourceResponseBuilder.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/QueryParameterTypesResourceResponseBuilder.java @@ -15,11 +15,11 @@ import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response.ResponseBuilder; -import dev.rsdlang.sample.server.impl.model.json._JsonUtils; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model.SampleEnum; -import dev.rsdlang.sample.server.service.model.SimpleRecord; -import dev.rsdlang.sample.server.service.model.ZoneId; +import dev.rsdlang.sample.server.model.impl.json._JsonUtils; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model.SampleEnum; +import dev.rsdlang.sample.server.model.SimpleRecord; +import dev.rsdlang.sample.server.model.ZoneId; @Singleton public class QueryParameterTypesResourceResponseBuilder { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/RestBuilderFactory.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/RestBuilderFactory.java index b0566dda..13caedef 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/RestBuilderFactory.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/RestBuilderFactory.java @@ -7,122 +7,122 @@ import jakarta.inject.Singleton; import jakarta.json.JsonObject; -import dev.rsdlang.sample.server.impl.model.json._BlobImpl; -import dev.rsdlang.sample.server.impl.model.json._FileImpl; -import dev.rsdlang.sample.server.impl.model.json._StreamBlobImpl; -import dev.rsdlang.sample.server.impl.model.json._StreamFileImpl; -import dev.rsdlang.sample.server.impl.model.json.CyclicNodeADataImpl; -import dev.rsdlang.sample.server.impl.model.json.CyclicNodeBDataImpl; -import dev.rsdlang.sample.server.impl.model.json.EnumInlineRecordDataImpl; -import dev.rsdlang.sample.server.impl.model.json.EnumRecordDataImpl; -import dev.rsdlang.sample.server.impl.model.json.ErrorDataDataImpl; -import dev.rsdlang.sample.server.impl.model.json.MixedResultDataImpl; -import dev.rsdlang.sample.server.impl.model.json.MixinRecordDataImpl; -import dev.rsdlang.sample.server.impl.model.json.PatchableEnumInlineRecordDataImpl; -import dev.rsdlang.sample.server.impl.model.json.PatchableEnumInlineRecordPatchImpl; -import dev.rsdlang.sample.server.impl.model.json.PatchableEnumRecordDataImpl; -import dev.rsdlang.sample.server.impl.model.json.PatchableEnumRecordPatchImpl; -import dev.rsdlang.sample.server.impl.model.json.PatchableRecord_Basic_List_NullDataImpl; -import dev.rsdlang.sample.server.impl.model.json.PatchableRecord_Basic_List_NullPatchImpl; -import dev.rsdlang.sample.server.impl.model.json.PatchableRecord_Basic_List_Optional_NullDataImpl; -import dev.rsdlang.sample.server.impl.model.json.PatchableRecord_Basic_List_Optional_NullPatchImpl; -import dev.rsdlang.sample.server.impl.model.json.PatchableRecord_Basic_List_OptionalDataImpl; -import dev.rsdlang.sample.server.impl.model.json.PatchableRecord_Basic_List_OptionalPatchImpl; -import dev.rsdlang.sample.server.impl.model.json.PatchableRecord_Basic_ListDataImpl; -import dev.rsdlang.sample.server.impl.model.json.PatchableRecord_Basic_ListPatchImpl; -import dev.rsdlang.sample.server.impl.model.json.PatchableRecord_Basic_NullDataImpl; -import dev.rsdlang.sample.server.impl.model.json.PatchableRecord_Basic_NullPatchImpl; -import dev.rsdlang.sample.server.impl.model.json.PatchableRecord_Basic_Optional_NullDataImpl; -import dev.rsdlang.sample.server.impl.model.json.PatchableRecord_Basic_Optional_NullPatchImpl; -import dev.rsdlang.sample.server.impl.model.json.PatchableRecord_Basic_OptionalDataImpl; -import dev.rsdlang.sample.server.impl.model.json.PatchableRecord_Basic_OptionalPatchImpl; -import dev.rsdlang.sample.server.impl.model.json.PatchableRecord_BasicDataImpl; -import dev.rsdlang.sample.server.impl.model.json.PatchableRecord_BasicPatchImpl; -import dev.rsdlang.sample.server.impl.model.json.PatchableRecordDataImpl; -import dev.rsdlang.sample.server.impl.model.json.PatchableRecordOfRecordsDataImpl; -import dev.rsdlang.sample.server.impl.model.json.PatchableRecordOfRecordsPatchImpl; -import dev.rsdlang.sample.server.impl.model.json.PatchableRecordPatchImpl; -import dev.rsdlang.sample.server.impl.model.json.PatchableRecordWithUnionDataImpl; -import dev.rsdlang.sample.server.impl.model.json.PatchableRecordWithUnionPatchImpl; -import dev.rsdlang.sample.server.impl.model.json.PatchableScalarRecord_SubstitutionDataImpl; -import dev.rsdlang.sample.server.impl.model.json.PatchableScalarRecord_SubstitutionPatchImpl; -import dev.rsdlang.sample.server.impl.model.json.PatchableScalarRecordDataImpl; -import dev.rsdlang.sample.server.impl.model.json.PatchableScalarRecordPatchImpl; -import dev.rsdlang.sample.server.impl.model.json.PatchableUnionADataImpl; -import dev.rsdlang.sample.server.impl.model.json.PatchableUnionAPatchImpl; -import dev.rsdlang.sample.server.impl.model.json.PatchableUnionBDataImpl; -import dev.rsdlang.sample.server.impl.model.json.PatchableUnionBPatchImpl; -import dev.rsdlang.sample.server.impl.model.json.PatchableUnionDataImpl; -import dev.rsdlang.sample.server.impl.model.json.PatchableUnionPatchImpl; -import dev.rsdlang.sample.server.impl.model.json.RecordOfRecordsDataImpl; -import dev.rsdlang.sample.server.impl.model.json.RecordWithUnionsDataImpl; -import dev.rsdlang.sample.server.impl.model.json.ScalarRecord_SubstitutionDataImpl; -import dev.rsdlang.sample.server.impl.model.json.ScalarRecordDataImpl; -import dev.rsdlang.sample.server.impl.model.json.SimpleRecord_Basic_List_NullDataImpl; -import dev.rsdlang.sample.server.impl.model.json.SimpleRecord_Basic_List_Optional_NullDataImpl; -import dev.rsdlang.sample.server.impl.model.json.SimpleRecord_Basic_List_OptionalDataImpl; -import dev.rsdlang.sample.server.impl.model.json.SimpleRecord_Basic_ListDataImpl; -import dev.rsdlang.sample.server.impl.model.json.SimpleRecord_Basic_NullDataImpl; -import dev.rsdlang.sample.server.impl.model.json.SimpleRecord_Basic_Optional_NullDataImpl; -import dev.rsdlang.sample.server.impl.model.json.SimpleRecord_Basic_OptionalDataImpl; -import dev.rsdlang.sample.server.impl.model.json.SimpleRecord_BasicDataImpl; -import dev.rsdlang.sample.server.impl.model.json.SimpleRecord_KeyVersion_Int_IntDataImpl; -import dev.rsdlang.sample.server.impl.model.json.SimpleRecord_KeyVersionDataImpl; -import dev.rsdlang.sample.server.impl.model.json.SimpleRecordDataImpl; -import dev.rsdlang.sample.server.impl.model.json.TreeNodeDataImpl; -import dev.rsdlang.sample.server.impl.model.json.UnionADataImpl; -import dev.rsdlang.sample.server.impl.model.json.UnionBDataImpl; -import dev.rsdlang.sample.server.impl.model.json.UnionDataImpl; -import dev.rsdlang.sample.server.impl.model.json.UploadMixedResultDataImpl; +import dev.rsdlang.sample.server.model._Base; +import dev.rsdlang.sample.server.model.CyclicNodeA; +import dev.rsdlang.sample.server.model.CyclicNodeB; +import dev.rsdlang.sample.server.model.EnumInlineRecord; +import dev.rsdlang.sample.server.model.EnumRecord; +import dev.rsdlang.sample.server.model.ErrorData; +import dev.rsdlang.sample.server.model.impl.json._BlobImpl; +import dev.rsdlang.sample.server.model.impl.json._FileImpl; +import dev.rsdlang.sample.server.model.impl.json._StreamBlobImpl; +import dev.rsdlang.sample.server.model.impl.json._StreamFileImpl; +import dev.rsdlang.sample.server.model.impl.json.CyclicNodeADataImpl; +import dev.rsdlang.sample.server.model.impl.json.CyclicNodeBDataImpl; +import dev.rsdlang.sample.server.model.impl.json.EnumInlineRecordDataImpl; +import dev.rsdlang.sample.server.model.impl.json.EnumRecordDataImpl; +import dev.rsdlang.sample.server.model.impl.json.ErrorDataDataImpl; +import dev.rsdlang.sample.server.model.impl.json.MixedResultDataImpl; +import dev.rsdlang.sample.server.model.impl.json.MixinRecordDataImpl; +import dev.rsdlang.sample.server.model.impl.json.PatchableEnumInlineRecordDataImpl; +import dev.rsdlang.sample.server.model.impl.json.PatchableEnumInlineRecordPatchImpl; +import dev.rsdlang.sample.server.model.impl.json.PatchableEnumRecordDataImpl; +import dev.rsdlang.sample.server.model.impl.json.PatchableEnumRecordPatchImpl; +import dev.rsdlang.sample.server.model.impl.json.PatchableRecord_Basic_List_NullDataImpl; +import dev.rsdlang.sample.server.model.impl.json.PatchableRecord_Basic_List_NullPatchImpl; +import dev.rsdlang.sample.server.model.impl.json.PatchableRecord_Basic_List_Optional_NullDataImpl; +import dev.rsdlang.sample.server.model.impl.json.PatchableRecord_Basic_List_Optional_NullPatchImpl; +import dev.rsdlang.sample.server.model.impl.json.PatchableRecord_Basic_List_OptionalDataImpl; +import dev.rsdlang.sample.server.model.impl.json.PatchableRecord_Basic_List_OptionalPatchImpl; +import dev.rsdlang.sample.server.model.impl.json.PatchableRecord_Basic_ListDataImpl; +import dev.rsdlang.sample.server.model.impl.json.PatchableRecord_Basic_ListPatchImpl; +import dev.rsdlang.sample.server.model.impl.json.PatchableRecord_Basic_NullDataImpl; +import dev.rsdlang.sample.server.model.impl.json.PatchableRecord_Basic_NullPatchImpl; +import dev.rsdlang.sample.server.model.impl.json.PatchableRecord_Basic_Optional_NullDataImpl; +import dev.rsdlang.sample.server.model.impl.json.PatchableRecord_Basic_Optional_NullPatchImpl; +import dev.rsdlang.sample.server.model.impl.json.PatchableRecord_Basic_OptionalDataImpl; +import dev.rsdlang.sample.server.model.impl.json.PatchableRecord_Basic_OptionalPatchImpl; +import dev.rsdlang.sample.server.model.impl.json.PatchableRecord_BasicDataImpl; +import dev.rsdlang.sample.server.model.impl.json.PatchableRecord_BasicPatchImpl; +import dev.rsdlang.sample.server.model.impl.json.PatchableRecordDataImpl; +import dev.rsdlang.sample.server.model.impl.json.PatchableRecordOfRecordsDataImpl; +import dev.rsdlang.sample.server.model.impl.json.PatchableRecordOfRecordsPatchImpl; +import dev.rsdlang.sample.server.model.impl.json.PatchableRecordPatchImpl; +import dev.rsdlang.sample.server.model.impl.json.PatchableRecordWithUnionDataImpl; +import dev.rsdlang.sample.server.model.impl.json.PatchableRecordWithUnionPatchImpl; +import dev.rsdlang.sample.server.model.impl.json.PatchableScalarRecord_SubstitutionDataImpl; +import dev.rsdlang.sample.server.model.impl.json.PatchableScalarRecord_SubstitutionPatchImpl; +import dev.rsdlang.sample.server.model.impl.json.PatchableScalarRecordDataImpl; +import dev.rsdlang.sample.server.model.impl.json.PatchableScalarRecordPatchImpl; +import dev.rsdlang.sample.server.model.impl.json.PatchableUnionADataImpl; +import dev.rsdlang.sample.server.model.impl.json.PatchableUnionAPatchImpl; +import dev.rsdlang.sample.server.model.impl.json.PatchableUnionBDataImpl; +import dev.rsdlang.sample.server.model.impl.json.PatchableUnionBPatchImpl; +import dev.rsdlang.sample.server.model.impl.json.PatchableUnionDataImpl; +import dev.rsdlang.sample.server.model.impl.json.PatchableUnionPatchImpl; +import dev.rsdlang.sample.server.model.impl.json.RecordOfRecordsDataImpl; +import dev.rsdlang.sample.server.model.impl.json.RecordWithUnionsDataImpl; +import dev.rsdlang.sample.server.model.impl.json.ScalarRecord_SubstitutionDataImpl; +import dev.rsdlang.sample.server.model.impl.json.ScalarRecordDataImpl; +import dev.rsdlang.sample.server.model.impl.json.SimpleRecord_Basic_List_NullDataImpl; +import dev.rsdlang.sample.server.model.impl.json.SimpleRecord_Basic_List_Optional_NullDataImpl; +import dev.rsdlang.sample.server.model.impl.json.SimpleRecord_Basic_List_OptionalDataImpl; +import dev.rsdlang.sample.server.model.impl.json.SimpleRecord_Basic_ListDataImpl; +import dev.rsdlang.sample.server.model.impl.json.SimpleRecord_Basic_NullDataImpl; +import dev.rsdlang.sample.server.model.impl.json.SimpleRecord_Basic_Optional_NullDataImpl; +import dev.rsdlang.sample.server.model.impl.json.SimpleRecord_Basic_OptionalDataImpl; +import dev.rsdlang.sample.server.model.impl.json.SimpleRecord_BasicDataImpl; +import dev.rsdlang.sample.server.model.impl.json.SimpleRecord_KeyVersion_Int_IntDataImpl; +import dev.rsdlang.sample.server.model.impl.json.SimpleRecord_KeyVersionDataImpl; +import dev.rsdlang.sample.server.model.impl.json.SimpleRecordDataImpl; +import dev.rsdlang.sample.server.model.impl.json.TreeNodeDataImpl; +import dev.rsdlang.sample.server.model.impl.json.UnionADataImpl; +import dev.rsdlang.sample.server.model.impl.json.UnionBDataImpl; +import dev.rsdlang.sample.server.model.impl.json.UnionDataImpl; +import dev.rsdlang.sample.server.model.impl.json.UploadMixedResultDataImpl; +import dev.rsdlang.sample.server.model.MixedResult; +import dev.rsdlang.sample.server.model.MixinRecord; +import dev.rsdlang.sample.server.model.PatchableEnumInlineRecord; +import dev.rsdlang.sample.server.model.PatchableEnumRecord; +import dev.rsdlang.sample.server.model.PatchableRecord; +import dev.rsdlang.sample.server.model.PatchableRecord_Basic; +import dev.rsdlang.sample.server.model.PatchableRecord_Basic_List; +import dev.rsdlang.sample.server.model.PatchableRecord_Basic_List_Null; +import dev.rsdlang.sample.server.model.PatchableRecord_Basic_List_Optional; +import dev.rsdlang.sample.server.model.PatchableRecord_Basic_List_Optional_Null; +import dev.rsdlang.sample.server.model.PatchableRecord_Basic_Null; +import dev.rsdlang.sample.server.model.PatchableRecord_Basic_Optional; +import dev.rsdlang.sample.server.model.PatchableRecord_Basic_Optional_Null; +import dev.rsdlang.sample.server.model.PatchableRecordOfRecords; +import dev.rsdlang.sample.server.model.PatchableRecordWithUnion; +import dev.rsdlang.sample.server.model.PatchableScalarRecord; +import dev.rsdlang.sample.server.model.PatchableScalarRecord_Substitution; +import dev.rsdlang.sample.server.model.PatchableUnion; +import dev.rsdlang.sample.server.model.PatchableUnionA; +import dev.rsdlang.sample.server.model.PatchableUnionB; +import dev.rsdlang.sample.server.model.RecordOfRecords; +import dev.rsdlang.sample.server.model.RecordWithUnions; +import dev.rsdlang.sample.server.model.RSDBlob; +import dev.rsdlang.sample.server.model.RSDFile; +import dev.rsdlang.sample.server.model.ScalarRecord; +import dev.rsdlang.sample.server.model.ScalarRecord_Substitution; +import dev.rsdlang.sample.server.model.SimpleRecord; +import dev.rsdlang.sample.server.model.SimpleRecord_Basic; +import dev.rsdlang.sample.server.model.SimpleRecord_Basic_List; +import dev.rsdlang.sample.server.model.SimpleRecord_Basic_List_Null; +import dev.rsdlang.sample.server.model.SimpleRecord_Basic_List_Optional; +import dev.rsdlang.sample.server.model.SimpleRecord_Basic_List_Optional_Null; +import dev.rsdlang.sample.server.model.SimpleRecord_Basic_Null; +import dev.rsdlang.sample.server.model.SimpleRecord_Basic_Optional; +import dev.rsdlang.sample.server.model.SimpleRecord_Basic_Optional_Null; +import dev.rsdlang.sample.server.model.SimpleRecord_KeyVersion; +import dev.rsdlang.sample.server.model.SimpleRecord_KeyVersion_Int_Int; +import dev.rsdlang.sample.server.model.TreeNode; +import dev.rsdlang.sample.server.model.Union; +import dev.rsdlang.sample.server.model.UnionA; +import dev.rsdlang.sample.server.model.UnionB; +import dev.rsdlang.sample.server.model.UploadMixedResult; import dev.rsdlang.sample.server.service.BuilderFactory; -import dev.rsdlang.sample.server.service.model._Base; -import dev.rsdlang.sample.server.service.model.CyclicNodeA; -import dev.rsdlang.sample.server.service.model.CyclicNodeB; -import dev.rsdlang.sample.server.service.model.EnumInlineRecord; -import dev.rsdlang.sample.server.service.model.EnumRecord; -import dev.rsdlang.sample.server.service.model.ErrorData; -import dev.rsdlang.sample.server.service.model.MixedResult; -import dev.rsdlang.sample.server.service.model.MixinRecord; -import dev.rsdlang.sample.server.service.model.PatchableEnumInlineRecord; -import dev.rsdlang.sample.server.service.model.PatchableEnumRecord; -import dev.rsdlang.sample.server.service.model.PatchableRecord; -import dev.rsdlang.sample.server.service.model.PatchableRecord_Basic; -import dev.rsdlang.sample.server.service.model.PatchableRecord_Basic_List; -import dev.rsdlang.sample.server.service.model.PatchableRecord_Basic_List_Null; -import dev.rsdlang.sample.server.service.model.PatchableRecord_Basic_List_Optional; -import dev.rsdlang.sample.server.service.model.PatchableRecord_Basic_List_Optional_Null; -import dev.rsdlang.sample.server.service.model.PatchableRecord_Basic_Null; -import dev.rsdlang.sample.server.service.model.PatchableRecord_Basic_Optional; -import dev.rsdlang.sample.server.service.model.PatchableRecord_Basic_Optional_Null; -import dev.rsdlang.sample.server.service.model.PatchableRecordOfRecords; -import dev.rsdlang.sample.server.service.model.PatchableRecordWithUnion; -import dev.rsdlang.sample.server.service.model.PatchableScalarRecord; -import dev.rsdlang.sample.server.service.model.PatchableScalarRecord_Substitution; -import dev.rsdlang.sample.server.service.model.PatchableUnion; -import dev.rsdlang.sample.server.service.model.PatchableUnionA; -import dev.rsdlang.sample.server.service.model.PatchableUnionB; -import dev.rsdlang.sample.server.service.model.RecordOfRecords; -import dev.rsdlang.sample.server.service.model.RecordWithUnions; -import dev.rsdlang.sample.server.service.model.RSDBlob; -import dev.rsdlang.sample.server.service.model.RSDFile; -import dev.rsdlang.sample.server.service.model.ScalarRecord; -import dev.rsdlang.sample.server.service.model.ScalarRecord_Substitution; -import dev.rsdlang.sample.server.service.model.SimpleRecord; -import dev.rsdlang.sample.server.service.model.SimpleRecord_Basic; -import dev.rsdlang.sample.server.service.model.SimpleRecord_Basic_List; -import dev.rsdlang.sample.server.service.model.SimpleRecord_Basic_List_Null; -import dev.rsdlang.sample.server.service.model.SimpleRecord_Basic_List_Optional; -import dev.rsdlang.sample.server.service.model.SimpleRecord_Basic_List_Optional_Null; -import dev.rsdlang.sample.server.service.model.SimpleRecord_Basic_Null; -import dev.rsdlang.sample.server.service.model.SimpleRecord_Basic_Optional; -import dev.rsdlang.sample.server.service.model.SimpleRecord_Basic_Optional_Null; -import dev.rsdlang.sample.server.service.model.SimpleRecord_KeyVersion; -import dev.rsdlang.sample.server.service.model.SimpleRecord_KeyVersion_Int_Int; -import dev.rsdlang.sample.server.service.model.TreeNode; -import dev.rsdlang.sample.server.service.model.Union; -import dev.rsdlang.sample.server.service.model.UnionA; -import dev.rsdlang.sample.server.service.model.UnionB; -import dev.rsdlang.sample.server.service.model.UploadMixedResult; @Singleton public class RestBuilderFactory implements BuilderFactory { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/SampleServiceResourceResponseBuilder.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/SampleServiceResourceResponseBuilder.java index f5e0db10..a7871d75 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/SampleServiceResourceResponseBuilder.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/SampleServiceResourceResponseBuilder.java @@ -11,10 +11,10 @@ import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response.ResponseBuilder; -import dev.rsdlang.sample.server.impl.model.json._JsonUtils; -import dev.rsdlang.sample.server.service.model.SampleEnum; -import dev.rsdlang.sample.server.service.model.SimpleRecord; -import dev.rsdlang.sample.server.service.model.ZoneId; +import dev.rsdlang.sample.server.model.impl.json._JsonUtils; +import dev.rsdlang.sample.server.model.SampleEnum; +import dev.rsdlang.sample.server.model.SimpleRecord; +import dev.rsdlang.sample.server.model.ZoneId; @Singleton public class SampleServiceResourceResponseBuilder { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/ScalarSubstition_ServiceResource.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/ScalarSubstition_ServiceResource.java index fb699dfa..91246533 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/ScalarSubstition_ServiceResource.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/ScalarSubstition_ServiceResource.java @@ -16,7 +16,7 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.QueryParam; -import dev.rsdlang.sample.server.impl.model.json._JsonUtils; +import dev.rsdlang.sample.server.model.impl.json._JsonUtils; import dev.rsdlang.sample.server.MyRange; import dev.rsdlang.sample.server.service.SampleErrorScalarSubException; import dev.rsdlang.sample.server.service.ScalarSubstition_ServiceService; diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/ScalarSubstition_ServiceResourceResponseBuilder.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/ScalarSubstition_ServiceResourceResponseBuilder.java index 05cad81a..bcfed158 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/ScalarSubstition_ServiceResourceResponseBuilder.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/ScalarSubstition_ServiceResourceResponseBuilder.java @@ -8,10 +8,10 @@ import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response.ResponseBuilder; -import dev.rsdlang.sample.server.impl.model.json._JsonUtils; +import dev.rsdlang.sample.server.model._Base; +import dev.rsdlang.sample.server.model.impl.json._JsonUtils; +import dev.rsdlang.sample.server.model.NilResult; import dev.rsdlang.sample.server.MyRange; -import dev.rsdlang.sample.server.service.model._Base; -import dev.rsdlang.sample.server.service.model.NilResult; @Singleton public class ScalarSubstition_ServiceResourceResponseBuilder { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/_RestUtils.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/_RestUtils.java index 535d021e..ade934d8 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/_RestUtils.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/_RestUtils.java @@ -26,11 +26,11 @@ import jakarta.ws.rs.core.StreamingOutput; import jakarta.ws.rs.WebApplicationException; -import dev.rsdlang.sample.server.impl.model.json._JsonUtils; -import dev.rsdlang.sample.server.impl.model.json._NillableImpl; -import dev.rsdlang.sample.server.service.model._Base; -import dev.rsdlang.sample.server.service.model.RSDBlob; -import dev.rsdlang.sample.server.service.model.RSDFile; +import dev.rsdlang.sample.server.model._Base; +import dev.rsdlang.sample.server.model.impl.json._JsonUtils; +import dev.rsdlang.sample.server.model.impl.json._NillableImpl; +import dev.rsdlang.sample.server.model.RSDBlob; +import dev.rsdlang.sample.server.model.RSDFile; import dev.rsdlang.sample.server.service.RSDException; public class _RestUtils { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/model/BinaryTypesSingleBodyAdditionDataImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/model/BinaryTypesSingleBodyAdditionDataImpl.java index cb3e4dfd..ce0e8d47 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/model/BinaryTypesSingleBodyAdditionDataImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/model/BinaryTypesSingleBodyAdditionDataImpl.java @@ -3,8 +3,8 @@ import jakarta.json.JsonObject; -import dev.rsdlang.sample.server.impl.model.json._BaseDataImpl; -import dev.rsdlang.sample.server.impl.model.json._JsonUtils; +import dev.rsdlang.sample.server.model.impl.json._BaseDataImpl; +import dev.rsdlang.sample.server.model.impl.json._JsonUtils; public class BinaryTypesSingleBodyAdditionDataImpl extends _BaseDataImpl { public BinaryTypesSingleBodyAdditionDataImpl(JsonObject data) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/model/BinaryTypesUploadMixedDataImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/model/BinaryTypesUploadMixedDataImpl.java index 8e05691b..9e584983 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/model/BinaryTypesUploadMixedDataImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/model/BinaryTypesUploadMixedDataImpl.java @@ -5,10 +5,10 @@ import jakarta.json.JsonObject; -import dev.rsdlang.sample.server.impl.model.json._BaseDataImpl; -import dev.rsdlang.sample.server.impl.model.json._JsonUtils; -import dev.rsdlang.sample.server.impl.model.json.SimpleRecordDataImpl; -import dev.rsdlang.sample.server.service.model.SimpleRecord; +import dev.rsdlang.sample.server.model.impl.json._BaseDataImpl; +import dev.rsdlang.sample.server.model.impl.json._JsonUtils; +import dev.rsdlang.sample.server.model.impl.json.SimpleRecordDataImpl; +import dev.rsdlang.sample.server.model.SimpleRecord; public class BinaryTypesUploadMixedDataImpl extends _BaseDataImpl { public BinaryTypesUploadMixedDataImpl(JsonObject data) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/model/BinaryTypesUploadMixedNilDataImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/model/BinaryTypesUploadMixedNilDataImpl.java index e432299b..e0b308a9 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/model/BinaryTypesUploadMixedNilDataImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/model/BinaryTypesUploadMixedNilDataImpl.java @@ -7,10 +7,10 @@ import jakarta.json.JsonObject; -import dev.rsdlang.sample.server.impl.model.json._BaseDataImpl; -import dev.rsdlang.sample.server.impl.model.json._JsonUtils; -import dev.rsdlang.sample.server.impl.model.json.SimpleRecordDataImpl; -import dev.rsdlang.sample.server.service.model.SimpleRecord; +import dev.rsdlang.sample.server.model.impl.json._BaseDataImpl; +import dev.rsdlang.sample.server.model.impl.json._JsonUtils; +import dev.rsdlang.sample.server.model.impl.json.SimpleRecordDataImpl; +import dev.rsdlang.sample.server.model.SimpleRecord; public class BinaryTypesUploadMixedNilDataImpl extends _BaseDataImpl { public BinaryTypesUploadMixedNilDataImpl(JsonObject data) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/model/BinaryTypesUploadMixedOptDataImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/model/BinaryTypesUploadMixedOptDataImpl.java index ac3ae6b4..6bb1e79f 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/model/BinaryTypesUploadMixedOptDataImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/model/BinaryTypesUploadMixedOptDataImpl.java @@ -7,10 +7,10 @@ import jakarta.json.JsonObject; -import dev.rsdlang.sample.server.impl.model.json._BaseDataImpl; -import dev.rsdlang.sample.server.impl.model.json._JsonUtils; -import dev.rsdlang.sample.server.impl.model.json.SimpleRecordDataImpl; -import dev.rsdlang.sample.server.service.model.SimpleRecord; +import dev.rsdlang.sample.server.model.impl.json._BaseDataImpl; +import dev.rsdlang.sample.server.model.impl.json._JsonUtils; +import dev.rsdlang.sample.server.model.impl.json.SimpleRecordDataImpl; +import dev.rsdlang.sample.server.model.SimpleRecord; public class BinaryTypesUploadMixedOptDataImpl extends _BaseDataImpl { public BinaryTypesUploadMixedOptDataImpl(JsonObject data) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/model/BinaryTypesUploadMixedOptNilDataImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/model/BinaryTypesUploadMixedOptNilDataImpl.java index 30d147c8..976b7060 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/model/BinaryTypesUploadMixedOptNilDataImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/model/BinaryTypesUploadMixedOptNilDataImpl.java @@ -5,11 +5,11 @@ import jakarta.json.JsonObject; -import dev.rsdlang.sample.server.impl.model.json._BaseDataImpl; -import dev.rsdlang.sample.server.impl.model.json._JsonUtils; -import dev.rsdlang.sample.server.impl.model.json.SimpleRecordDataImpl; -import dev.rsdlang.sample.server.service.model._Base; -import dev.rsdlang.sample.server.service.model.SimpleRecord; +import dev.rsdlang.sample.server.model._Base; +import dev.rsdlang.sample.server.model.impl.json._BaseDataImpl; +import dev.rsdlang.sample.server.model.impl.json._JsonUtils; +import dev.rsdlang.sample.server.model.impl.json.SimpleRecordDataImpl; +import dev.rsdlang.sample.server.model.SimpleRecord; public class BinaryTypesUploadMixedOptNilDataImpl extends _BaseDataImpl { public BinaryTypesUploadMixedOptNilDataImpl(JsonObject data) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/model/BodyParameterTypesMultiBodyParamDataImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/model/BodyParameterTypesMultiBodyParamDataImpl.java index 80dbc768..eb389dc3 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/model/BodyParameterTypesMultiBodyParamDataImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/model/BodyParameterTypesMultiBodyParamDataImpl.java @@ -3,10 +3,10 @@ import jakarta.json.JsonObject; -import dev.rsdlang.sample.server.impl.model.json._BaseDataImpl; -import dev.rsdlang.sample.server.impl.model.json._JsonUtils; -import dev.rsdlang.sample.server.impl.model.json.SimpleRecordDataImpl; -import dev.rsdlang.sample.server.service.model.SimpleRecord; +import dev.rsdlang.sample.server.model.impl.json._BaseDataImpl; +import dev.rsdlang.sample.server.model.impl.json._JsonUtils; +import dev.rsdlang.sample.server.model.impl.json.SimpleRecordDataImpl; +import dev.rsdlang.sample.server.model.SimpleRecord; public class BodyParameterTypesMultiBodyParamDataImpl extends _BaseDataImpl { public BodyParameterTypesMultiBodyParamDataImpl(JsonObject data) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/model/BodyParameterTypesMultiBodyParamFirstDataImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/model/BodyParameterTypesMultiBodyParamFirstDataImpl.java index 70258bbf..e1e0e9df 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/model/BodyParameterTypesMultiBodyParamFirstDataImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/model/BodyParameterTypesMultiBodyParamFirstDataImpl.java @@ -5,10 +5,10 @@ import jakarta.json.JsonObject; -import dev.rsdlang.sample.server.impl.model.json._BaseDataImpl; -import dev.rsdlang.sample.server.impl.model.json._JsonUtils; -import dev.rsdlang.sample.server.impl.model.json.SimpleRecordDataImpl; -import dev.rsdlang.sample.server.service.model.SimpleRecord; +import dev.rsdlang.sample.server.model.impl.json._BaseDataImpl; +import dev.rsdlang.sample.server.model.impl.json._JsonUtils; +import dev.rsdlang.sample.server.model.impl.json.SimpleRecordDataImpl; +import dev.rsdlang.sample.server.model.SimpleRecord; public class BodyParameterTypesMultiBodyParamFirstDataImpl extends _BaseDataImpl { public BodyParameterTypesMultiBodyParamFirstDataImpl(JsonObject data) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/model/BodyParameterTypesMultiBodyParamNilDataImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/model/BodyParameterTypesMultiBodyParamNilDataImpl.java index a2685360..13dec251 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/model/BodyParameterTypesMultiBodyParamNilDataImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/model/BodyParameterTypesMultiBodyParamNilDataImpl.java @@ -6,10 +6,10 @@ import jakarta.json.JsonObject; -import dev.rsdlang.sample.server.impl.model.json._BaseDataImpl; -import dev.rsdlang.sample.server.impl.model.json._JsonUtils; -import dev.rsdlang.sample.server.impl.model.json.SimpleRecordDataImpl; -import dev.rsdlang.sample.server.service.model.SimpleRecord; +import dev.rsdlang.sample.server.model.impl.json._BaseDataImpl; +import dev.rsdlang.sample.server.model.impl.json._JsonUtils; +import dev.rsdlang.sample.server.model.impl.json.SimpleRecordDataImpl; +import dev.rsdlang.sample.server.model.SimpleRecord; public class BodyParameterTypesMultiBodyParamNilDataImpl extends _BaseDataImpl { public BodyParameterTypesMultiBodyParamNilDataImpl(JsonObject data) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/model/BodyParameterTypesMultiBodyParamOptDataImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/model/BodyParameterTypesMultiBodyParamOptDataImpl.java index 75de7e8b..9ea8c924 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/model/BodyParameterTypesMultiBodyParamOptDataImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/model/BodyParameterTypesMultiBodyParamOptDataImpl.java @@ -6,10 +6,10 @@ import jakarta.json.JsonObject; -import dev.rsdlang.sample.server.impl.model.json._BaseDataImpl; -import dev.rsdlang.sample.server.impl.model.json._JsonUtils; -import dev.rsdlang.sample.server.impl.model.json.SimpleRecordDataImpl; -import dev.rsdlang.sample.server.service.model.SimpleRecord; +import dev.rsdlang.sample.server.model.impl.json._BaseDataImpl; +import dev.rsdlang.sample.server.model.impl.json._JsonUtils; +import dev.rsdlang.sample.server.model.impl.json.SimpleRecordDataImpl; +import dev.rsdlang.sample.server.model.SimpleRecord; public class BodyParameterTypesMultiBodyParamOptDataImpl extends _BaseDataImpl { public BodyParameterTypesMultiBodyParamOptDataImpl(JsonObject data) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/model/BodyParameterTypesMultiBodyParamOptNilDataImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/model/BodyParameterTypesMultiBodyParamOptNilDataImpl.java index b5bad1de..803c6656 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/model/BodyParameterTypesMultiBodyParamOptNilDataImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/model/BodyParameterTypesMultiBodyParamOptNilDataImpl.java @@ -3,11 +3,11 @@ import jakarta.json.JsonObject; -import dev.rsdlang.sample.server.impl.model.json._BaseDataImpl; -import dev.rsdlang.sample.server.impl.model.json._JsonUtils; -import dev.rsdlang.sample.server.impl.model.json.SimpleRecordDataImpl; -import dev.rsdlang.sample.server.service.model._Base; -import dev.rsdlang.sample.server.service.model.SimpleRecord; +import dev.rsdlang.sample.server.model._Base; +import dev.rsdlang.sample.server.model.impl.json._BaseDataImpl; +import dev.rsdlang.sample.server.model.impl.json._JsonUtils; +import dev.rsdlang.sample.server.model.impl.json.SimpleRecordDataImpl; +import dev.rsdlang.sample.server.model.SimpleRecord; public class BodyParameterTypesMultiBodyParamOptNilDataImpl extends _BaseDataImpl { public BodyParameterTypesMultiBodyParamOptNilDataImpl(JsonObject data) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/model/ListBodyParameterTypesListMultiBodyParamDataImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/model/ListBodyParameterTypesListMultiBodyParamDataImpl.java index 06943715..9bc49e49 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/model/ListBodyParameterTypesListMultiBodyParamDataImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/model/ListBodyParameterTypesListMultiBodyParamDataImpl.java @@ -5,10 +5,10 @@ import jakarta.json.JsonObject; -import dev.rsdlang.sample.server.impl.model.json._BaseDataImpl; -import dev.rsdlang.sample.server.impl.model.json._JsonUtils; -import dev.rsdlang.sample.server.impl.model.json.SimpleRecordDataImpl; -import dev.rsdlang.sample.server.service.model.SimpleRecord; +import dev.rsdlang.sample.server.model.impl.json._BaseDataImpl; +import dev.rsdlang.sample.server.model.impl.json._JsonUtils; +import dev.rsdlang.sample.server.model.impl.json.SimpleRecordDataImpl; +import dev.rsdlang.sample.server.model.SimpleRecord; public class ListBodyParameterTypesListMultiBodyParamDataImpl extends _BaseDataImpl { public ListBodyParameterTypesListMultiBodyParamDataImpl(JsonObject data) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/model/ListBodyParameterTypesListMultiBodyParamNilDataImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/model/ListBodyParameterTypesListMultiBodyParamNilDataImpl.java index e3d06212..15f228e5 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/model/ListBodyParameterTypesListMultiBodyParamNilDataImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/model/ListBodyParameterTypesListMultiBodyParamNilDataImpl.java @@ -6,10 +6,10 @@ import jakarta.json.JsonObject; -import dev.rsdlang.sample.server.impl.model.json._BaseDataImpl; -import dev.rsdlang.sample.server.impl.model.json._JsonUtils; -import dev.rsdlang.sample.server.impl.model.json.SimpleRecordDataImpl; -import dev.rsdlang.sample.server.service.model.SimpleRecord; +import dev.rsdlang.sample.server.model.impl.json._BaseDataImpl; +import dev.rsdlang.sample.server.model.impl.json._JsonUtils; +import dev.rsdlang.sample.server.model.impl.json.SimpleRecordDataImpl; +import dev.rsdlang.sample.server.model.SimpleRecord; public class ListBodyParameterTypesListMultiBodyParamNilDataImpl extends _BaseDataImpl { public ListBodyParameterTypesListMultiBodyParamNilDataImpl(JsonObject data) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/model/ListBodyParameterTypesListMultiBodyParamOptDataImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/model/ListBodyParameterTypesListMultiBodyParamOptDataImpl.java index 17a7e08d..434a74c1 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/model/ListBodyParameterTypesListMultiBodyParamOptDataImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/model/ListBodyParameterTypesListMultiBodyParamOptDataImpl.java @@ -6,10 +6,10 @@ import jakarta.json.JsonObject; -import dev.rsdlang.sample.server.impl.model.json._BaseDataImpl; -import dev.rsdlang.sample.server.impl.model.json._JsonUtils; -import dev.rsdlang.sample.server.impl.model.json.SimpleRecordDataImpl; -import dev.rsdlang.sample.server.service.model.SimpleRecord; +import dev.rsdlang.sample.server.model.impl.json._BaseDataImpl; +import dev.rsdlang.sample.server.model.impl.json._JsonUtils; +import dev.rsdlang.sample.server.model.impl.json.SimpleRecordDataImpl; +import dev.rsdlang.sample.server.model.SimpleRecord; public class ListBodyParameterTypesListMultiBodyParamOptDataImpl extends _BaseDataImpl { public ListBodyParameterTypesListMultiBodyParamOptDataImpl(JsonObject data) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/model/ListBodyParameterTypesListMultiBodyParamOptNilDataImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/model/ListBodyParameterTypesListMultiBodyParamOptNilDataImpl.java index 56fc3d1e..3a25fb8e 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/model/ListBodyParameterTypesListMultiBodyParamOptNilDataImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/model/ListBodyParameterTypesListMultiBodyParamOptNilDataImpl.java @@ -5,11 +5,11 @@ import jakarta.json.JsonObject; -import dev.rsdlang.sample.server.impl.model.json._BaseDataImpl; -import dev.rsdlang.sample.server.impl.model.json._JsonUtils; -import dev.rsdlang.sample.server.impl.model.json.SimpleRecordDataImpl; -import dev.rsdlang.sample.server.service.model._Base; -import dev.rsdlang.sample.server.service.model.SimpleRecord; +import dev.rsdlang.sample.server.model._Base; +import dev.rsdlang.sample.server.model.impl.json._BaseDataImpl; +import dev.rsdlang.sample.server.model.impl.json._JsonUtils; +import dev.rsdlang.sample.server.model.impl.json.SimpleRecordDataImpl; +import dev.rsdlang.sample.server.model.SimpleRecord; public class ListBodyParameterTypesListMultiBodyParamOptNilDataImpl extends _BaseDataImpl { public ListBodyParameterTypesListMultiBodyParamOptNilDataImpl(JsonObject data) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/utils/CustListSampleServiceResourceResponseBuilder.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/utils/CustListSampleServiceResourceResponseBuilder.java index b2f04312..eb734a5e 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/utils/CustListSampleServiceResourceResponseBuilder.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/utils/CustListSampleServiceResourceResponseBuilder.java @@ -4,7 +4,7 @@ import dev.rsdlang.sample.server.Headers; import dev.rsdlang.sample.server.rest.ListSampleServiceResourceResponseBuilder; -import dev.rsdlang.sample.server.service.model.ZoneId; +import dev.rsdlang.sample.server.model.ZoneId; import jakarta.annotation.Priority; import jakarta.enterprise.inject.Alternative; import jakarta.inject.Inject; @@ -177,7 +177,7 @@ public ResponseBuilder listScalar(List $result, String contentType) { } @Override - public ResponseBuilder listEnum(List $result, + public ResponseBuilder listEnum(List $result, String contentType) { if (headers.isUnknownStatus()) { return Response.status(400).entity("Sample Invalid response").type(MediaType.TEXT_PLAIN); @@ -190,7 +190,7 @@ public ResponseBuilder listEnum(List $result, + public ResponseBuilder listSimpleRecord(List $result, String contentType) { if (headers.isUnknownStatus()) { return Response.status(400).entity("Sample Invalid response").type(MediaType.TEXT_PLAIN); diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/utils/CustSampleServiceResourceResponseBuilder.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/utils/CustSampleServiceResourceResponseBuilder.java index e803c46c..443f017b 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/utils/CustSampleServiceResourceResponseBuilder.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/rest/utils/CustSampleServiceResourceResponseBuilder.java @@ -8,9 +8,9 @@ import dev.rsdlang.sample.server.Headers; import dev.rsdlang.sample.server.rest.SampleServiceResourceResponseBuilder; -import dev.rsdlang.sample.server.service.model.SampleEnum; -import dev.rsdlang.sample.server.service.model.ZoneId; -import dev.rsdlang.sample.server.service.model.SimpleRecord.Data; +import dev.rsdlang.sample.server.model.SampleEnum; +import dev.rsdlang.sample.server.model.ZoneId; +import dev.rsdlang.sample.server.model.SimpleRecord.Data; import jakarta.annotation.Priority; import jakarta.enterprise.inject.Alternative; import jakarta.inject.Inject; diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/BinaryTypesService.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/BinaryTypesService.java index 92fcb403..eceae8ff 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/BinaryTypesService.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/BinaryTypesService.java @@ -5,12 +5,12 @@ import java.util.Optional; import java.util.OptionalInt; -import dev.rsdlang.sample.server.service.model._Base; -import dev.rsdlang.sample.server.service.model.MixedResult; -import dev.rsdlang.sample.server.service.model.RSDBlob; -import dev.rsdlang.sample.server.service.model.RSDFile; -import dev.rsdlang.sample.server.service.model.SimpleRecord; -import dev.rsdlang.sample.server.service.model.UploadMixedResult; +import dev.rsdlang.sample.server.model._Base; +import dev.rsdlang.sample.server.model.MixedResult; +import dev.rsdlang.sample.server.model.RSDBlob; +import dev.rsdlang.sample.server.model.RSDFile; +import dev.rsdlang.sample.server.model.SimpleRecord; +import dev.rsdlang.sample.server.model.UploadMixedResult; public interface BinaryTypesService { public int uploadFile(BuilderFactory _factory, RSDFile data); diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/BodyParameterTypesService.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/BodyParameterTypesService.java index 31578635..bcb3f659 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/BodyParameterTypesService.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/BodyParameterTypesService.java @@ -11,13 +11,13 @@ import java.util.OptionalInt; import java.util.OptionalLong; -import dev.rsdlang.sample.server.service.model._Base; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model.PatchableRecord; -import dev.rsdlang.sample.server.service.model.SampleEnum; -import dev.rsdlang.sample.server.service.model.SimpleRecord; -import dev.rsdlang.sample.server.service.model.Union; -import dev.rsdlang.sample.server.service.model.ZoneId; +import dev.rsdlang.sample.server.model._Base; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model.PatchableRecord; +import dev.rsdlang.sample.server.model.SampleEnum; +import dev.rsdlang.sample.server.model.SimpleRecord; +import dev.rsdlang.sample.server.model.Union; +import dev.rsdlang.sample.server.model.ZoneId; public interface BodyParameterTypesService { public enum SimpleInlineEnumBodyParam_Result$ { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/BuilderFactory.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/BuilderFactory.java index d2a130f9..46cf80fe 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/BuilderFactory.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/BuilderFactory.java @@ -4,9 +4,9 @@ import java.io.InputStream; import java.nio.file.Path; -import dev.rsdlang.sample.server.service.model._Base; -import dev.rsdlang.sample.server.service.model.RSDBlob; -import dev.rsdlang.sample.server.service.model.RSDFile; +import dev.rsdlang.sample.server.model._Base; +import dev.rsdlang.sample.server.model.RSDBlob; +import dev.rsdlang.sample.server.model.RSDFile; public interface BuilderFactory { public > T builder(Class type); diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/HeaderParameterTypesService.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/HeaderParameterTypesService.java index 013f2d6e..46e9dbb1 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/HeaderParameterTypesService.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/HeaderParameterTypesService.java @@ -12,11 +12,11 @@ import java.util.OptionalInt; import java.util.OptionalLong; -import dev.rsdlang.sample.server.service.model._Base; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model.SampleEnum; -import dev.rsdlang.sample.server.service.model.SimpleRecord; -import dev.rsdlang.sample.server.service.model.ZoneId; +import dev.rsdlang.sample.server.model._Base; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model.SampleEnum; +import dev.rsdlang.sample.server.model.SimpleRecord; +import dev.rsdlang.sample.server.model.ZoneId; public interface HeaderParameterTypesService { public enum SimpleInlineEnumHeaderParam_Result$ { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/ListBodyParameterTypesService.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/ListBodyParameterTypesService.java index f5bdd131..f20f6fea 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/ListBodyParameterTypesService.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/ListBodyParameterTypesService.java @@ -9,11 +9,11 @@ import java.util.List; import java.util.Optional; -import dev.rsdlang.sample.server.service.model._Base; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model.SampleEnum; -import dev.rsdlang.sample.server.service.model.SimpleRecord; -import dev.rsdlang.sample.server.service.model.ZoneId; +import dev.rsdlang.sample.server.model._Base; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model.SampleEnum; +import dev.rsdlang.sample.server.model.SimpleRecord; +import dev.rsdlang.sample.server.model.ZoneId; public interface ListBodyParameterTypesService { public enum ListInlineEnumBodyParam_Result$ { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/ListHeaderParameterTypesService.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/ListHeaderParameterTypesService.java index 1f29c1db..a1b4e270 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/ListHeaderParameterTypesService.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/ListHeaderParameterTypesService.java @@ -9,11 +9,11 @@ import java.util.List; import java.util.Optional; -import dev.rsdlang.sample.server.service.model._Base; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model.SampleEnum; -import dev.rsdlang.sample.server.service.model.SimpleRecord; -import dev.rsdlang.sample.server.service.model.ZoneId; +import dev.rsdlang.sample.server.model._Base; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model.SampleEnum; +import dev.rsdlang.sample.server.model.SimpleRecord; +import dev.rsdlang.sample.server.model.ZoneId; public interface ListHeaderParameterTypesService { public enum ListInlineEnumHeaderParam_Result$ { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/ListQueryParameterTypesService.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/ListQueryParameterTypesService.java index 888bb84b..a3e6c40e 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/ListQueryParameterTypesService.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/ListQueryParameterTypesService.java @@ -8,9 +8,9 @@ import java.time.ZonedDateTime; import java.util.List; -import dev.rsdlang.sample.server.service.model.SampleEnum; -import dev.rsdlang.sample.server.service.model.SimpleRecord; -import dev.rsdlang.sample.server.service.model.ZoneId; +import dev.rsdlang.sample.server.model.SampleEnum; +import dev.rsdlang.sample.server.model.SimpleRecord; +import dev.rsdlang.sample.server.model.ZoneId; public interface ListQueryParameterTypesService { public enum ListInlineEnumQueryParam_Result$ { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/ListSampleServiceService.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/ListSampleServiceService.java index bc030d1c..80f97666 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/ListSampleServiceService.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/ListSampleServiceService.java @@ -8,9 +8,9 @@ import java.time.ZonedDateTime; import java.util.List; -import dev.rsdlang.sample.server.service.model.SampleEnum; -import dev.rsdlang.sample.server.service.model.SimpleRecord; -import dev.rsdlang.sample.server.service.model.ZoneId; +import dev.rsdlang.sample.server.model.SampleEnum; +import dev.rsdlang.sample.server.model.SimpleRecord; +import dev.rsdlang.sample.server.model.ZoneId; public interface ListSampleServiceService { public List listBoolean(BuilderFactory _factory); diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/PathParameterTypeServiceService.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/PathParameterTypeServiceService.java index 9ab8c017..281f435d 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/PathParameterTypeServiceService.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/PathParameterTypeServiceService.java @@ -7,8 +7,8 @@ import java.time.OffsetDateTime; import java.time.ZonedDateTime; -import dev.rsdlang.sample.server.service.model.SampleEnum; -import dev.rsdlang.sample.server.service.model.ZoneId; +import dev.rsdlang.sample.server.model.SampleEnum; +import dev.rsdlang.sample.server.model.ZoneId; public interface PathParameterTypeServiceService { public boolean simpleBooleanPathParam(BuilderFactory _factory, boolean pathBoolean); diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/QueryParameterTypesService.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/QueryParameterTypesService.java index c8b903b6..901506c3 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/QueryParameterTypesService.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/QueryParameterTypesService.java @@ -11,10 +11,10 @@ import java.util.OptionalInt; import java.util.OptionalLong; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model.SampleEnum; -import dev.rsdlang.sample.server.service.model.SimpleRecord; -import dev.rsdlang.sample.server.service.model.ZoneId; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model.SampleEnum; +import dev.rsdlang.sample.server.model.SimpleRecord; +import dev.rsdlang.sample.server.model.ZoneId; public interface QueryParameterTypesService { public boolean simpleBooleanQueryParam(BuilderFactory _factory, boolean queryValue); diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/SampleErrorEnumException.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/SampleErrorEnumException.java index 64bf6475..f02d454f 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/SampleErrorEnumException.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/SampleErrorEnumException.java @@ -1,7 +1,7 @@ // Generated by RSD - Do not modify package dev.rsdlang.sample.server.service; -import dev.rsdlang.sample.server.service.model.SampleEnum; +import dev.rsdlang.sample.server.model.SampleEnum; public class SampleErrorEnumException extends RSDException.RSDStructuredDataException { private final SampleEnum data; diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/SampleErrorScalarException.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/SampleErrorScalarException.java index 6b8848f4..258a35ec 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/SampleErrorScalarException.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/SampleErrorScalarException.java @@ -1,7 +1,7 @@ // Generated by RSD - Do not modify package dev.rsdlang.sample.server.service; -import dev.rsdlang.sample.server.service.model.ZoneId; +import dev.rsdlang.sample.server.model.ZoneId; public class SampleErrorScalarException extends RSDException.RSDStructuredDataException { private final ZoneId data; diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/SampleErrorUnionException.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/SampleErrorUnionException.java index 0ee52b43..abec8615 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/SampleErrorUnionException.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/SampleErrorUnionException.java @@ -1,7 +1,7 @@ // Generated by RSD - Do not modify package dev.rsdlang.sample.server.service; -import dev.rsdlang.sample.server.service.model.Union; +import dev.rsdlang.sample.server.model.Union; public class SampleErrorUnionException extends RSDException.RSDStructuredDataException { private final Union.Data data; diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/SampleErrorWithValueException.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/SampleErrorWithValueException.java index 92d4fe2f..5f828e48 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/SampleErrorWithValueException.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/SampleErrorWithValueException.java @@ -1,7 +1,7 @@ // Generated by RSD - Do not modify package dev.rsdlang.sample.server.service; -import dev.rsdlang.sample.server.service.model.ErrorData; +import dev.rsdlang.sample.server.model.ErrorData; public class SampleErrorWithValueException extends RSDException.RSDStructuredDataException { private final ErrorData.Data data; diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/SampleServiceService.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/SampleServiceService.java index b15e610a..44eacd60 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/SampleServiceService.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/SampleServiceService.java @@ -7,9 +7,9 @@ import java.time.OffsetDateTime; import java.time.ZonedDateTime; -import dev.rsdlang.sample.server.service.model.SampleEnum; -import dev.rsdlang.sample.server.service.model.SimpleRecord; -import dev.rsdlang.sample.server.service.model.ZoneId; +import dev.rsdlang.sample.server.model.SampleEnum; +import dev.rsdlang.sample.server.model.SimpleRecord; +import dev.rsdlang.sample.server.model.ZoneId; public interface SampleServiceService { public boolean getBoolean(BuilderFactory _factory); diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/ScalarSubstition_ServiceService.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/ScalarSubstition_ServiceService.java index 5349f499..a03b6c8f 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/ScalarSubstition_ServiceService.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/ScalarSubstition_ServiceService.java @@ -4,9 +4,9 @@ import java.util.List; import java.util.Optional; +import dev.rsdlang.sample.server.model._Base; +import dev.rsdlang.sample.server.model.NilResult; import dev.rsdlang.sample.server.MyRange; -import dev.rsdlang.sample.server.service.model._Base; -import dev.rsdlang.sample.server.service.model.NilResult; public interface ScalarSubstition_ServiceService { public MyRange get(BuilderFactory _factory); diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/DownloadBlobHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/DownloadBlobHandlerImpl.java index 503dc483..313e62b3 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/DownloadBlobHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/DownloadBlobHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BinaryTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.RSDBlob; +import dev.rsdlang.sample.server.model.RSDBlob; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/DownloadFileHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/DownloadFileHandlerImpl.java index 1a4109d3..9335f7bd 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/DownloadFileHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/DownloadFileHandlerImpl.java @@ -4,7 +4,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BinaryTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.RSDFile; +import dev.rsdlang.sample.server.model.RSDFile; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/MixedHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/MixedHandlerImpl.java index 2df94807..853e45e3 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/MixedHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/MixedHandlerImpl.java @@ -3,9 +3,9 @@ import jakarta.enterprise.context.ApplicationScoped; import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BinaryTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.MixedResult; -import dev.rsdlang.sample.server.service.model.RSDBlob; -import dev.rsdlang.sample.server.service.model.SimpleRecord.Data; +import dev.rsdlang.sample.server.model.MixedResult; +import dev.rsdlang.sample.server.model.RSDBlob; +import dev.rsdlang.sample.server.model.SimpleRecord.Data; @ApplicationScoped public class MixedHandlerImpl implements BinaryTypesServiceImpl.MixedHandler { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/SingleBodyAdditionHandlerIml.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/SingleBodyAdditionHandlerIml.java index 0f796d83..0e512580 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/SingleBodyAdditionHandlerIml.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/SingleBodyAdditionHandlerIml.java @@ -2,7 +2,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BinaryTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.RSDBlob; +import dev.rsdlang.sample.server.model.RSDBlob; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/TwoBinariesAdditionHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/TwoBinariesAdditionHandlerImpl.java index a0a8ae56..d9e410ab 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/TwoBinariesAdditionHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/TwoBinariesAdditionHandlerImpl.java @@ -4,8 +4,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BinaryTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.RSDBlob; -import dev.rsdlang.sample.server.service.model.RSDFile; +import dev.rsdlang.sample.server.model.RSDBlob; +import dev.rsdlang.sample.server.model.RSDFile; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadBlobHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadBlobHandlerImpl.java index 128cb194..ef19bd14 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadBlobHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadBlobHandlerImpl.java @@ -2,7 +2,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BinaryTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.RSDBlob; +import dev.rsdlang.sample.server.model.RSDBlob; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadBlobListHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadBlobListHandlerImpl.java index bfaa1c5f..4c695ac0 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadBlobListHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadBlobListHandlerImpl.java @@ -4,7 +4,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BinaryTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.RSDBlob; +import dev.rsdlang.sample.server.model.RSDBlob; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadBlobListNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadBlobListNilHandlerImpl.java index 14a3d9f6..84d84aed 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadBlobListNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadBlobListNilHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BinaryTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.RSDBlob; +import dev.rsdlang.sample.server.model.RSDBlob; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadBlobListOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadBlobListOptHandlerImpl.java index bc315ae3..583b69b9 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadBlobListOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadBlobListOptHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BinaryTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.RSDBlob; +import dev.rsdlang.sample.server.model.RSDBlob; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadBlobListOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadBlobListOptNilHandlerImpl.java index 52846802..8ee1de5e 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadBlobListOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadBlobListOptNilHandlerImpl.java @@ -4,8 +4,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BinaryTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.RSDBlob; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.RSDBlob; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadBlobNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadBlobNilHandlerImpl.java index a9540cc4..d9e91dd1 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadBlobNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadBlobNilHandlerImpl.java @@ -4,7 +4,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BinaryTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.RSDBlob; +import dev.rsdlang.sample.server.model.RSDBlob; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadBlobOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadBlobOptHandlerImpl.java index 9a0f56fc..e6e421d1 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadBlobOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadBlobOptHandlerImpl.java @@ -4,7 +4,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BinaryTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.RSDBlob; +import dev.rsdlang.sample.server.model.RSDBlob; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadBlobOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadBlobOptNilHandlerImpl.java index 3c81198f..d13773ba 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadBlobOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadBlobOptNilHandlerImpl.java @@ -2,8 +2,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BinaryTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.RSDBlob; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.RSDBlob; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadFileHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadFileHandlerImpl.java index cbb56204..62ecaa10 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadFileHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadFileHandlerImpl.java @@ -2,7 +2,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BinaryTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.RSDFile; +import dev.rsdlang.sample.server.model.RSDFile; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadFileListHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadFileListHandlerImpl.java index 776862ce..836d3da3 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadFileListHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadFileListHandlerImpl.java @@ -4,7 +4,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BinaryTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.RSDFile; +import dev.rsdlang.sample.server.model.RSDFile; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadFileListNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadFileListNilHandlerImpl.java index 702559c4..aad21ff0 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadFileListNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadFileListNilHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BinaryTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.RSDFile; +import dev.rsdlang.sample.server.model.RSDFile; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadFileListOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadFileListOptHandlerImpl.java index 20f14242..a3d64eb7 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadFileListOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadFileListOptHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BinaryTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.RSDFile; +import dev.rsdlang.sample.server.model.RSDFile; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadFileListOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadFileListOptNilHandlerImpl.java index ab6cb65b..3af46c9c 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadFileListOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadFileListOptNilHandlerImpl.java @@ -4,8 +4,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BinaryTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.RSDFile; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.RSDFile; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadFileNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadFileNilHandlerImpl.java index 6539b763..b2752499 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadFileNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadFileNilHandlerImpl.java @@ -4,7 +4,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BinaryTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.RSDFile; +import dev.rsdlang.sample.server.model.RSDFile; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadFileOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadFileOptHandlerImpl.java index b59a70a3..5afcfac4 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadFileOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadFileOptHandlerImpl.java @@ -4,7 +4,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BinaryTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.RSDFile; +import dev.rsdlang.sample.server.model.RSDFile; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadFileOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadFileOptNilHandlerImpl.java index fa1aca39..8771278f 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadFileOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadFileOptNilHandlerImpl.java @@ -2,8 +2,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BinaryTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.RSDFile; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.RSDFile; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadMixedHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadMixedHandlerImpl.java index 07665af3..b80137e5 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadMixedHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadMixedHandlerImpl.java @@ -5,10 +5,10 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BinaryTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.RSDBlob; -import dev.rsdlang.sample.server.service.model.RSDFile; -import dev.rsdlang.sample.server.service.model.SimpleRecord; -import dev.rsdlang.sample.server.service.model.UploadMixedResult; +import dev.rsdlang.sample.server.model.RSDBlob; +import dev.rsdlang.sample.server.model.RSDFile; +import dev.rsdlang.sample.server.model.SimpleRecord; +import dev.rsdlang.sample.server.model.UploadMixedResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadMixedNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadMixedNilHandlerImpl.java index 5d5260bc..c1a3757a 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadMixedNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadMixedNilHandlerImpl.java @@ -6,10 +6,10 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BinaryTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.RSDBlob; -import dev.rsdlang.sample.server.service.model.RSDFile; -import dev.rsdlang.sample.server.service.model.SimpleRecord; -import dev.rsdlang.sample.server.service.model.UploadMixedResult; +import dev.rsdlang.sample.server.model.RSDBlob; +import dev.rsdlang.sample.server.model.RSDFile; +import dev.rsdlang.sample.server.model.SimpleRecord; +import dev.rsdlang.sample.server.model.UploadMixedResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadMixedOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadMixedOptHandlerImpl.java index 7f554cc7..f439c579 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadMixedOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadMixedOptHandlerImpl.java @@ -6,10 +6,10 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BinaryTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.RSDBlob; -import dev.rsdlang.sample.server.service.model.RSDFile; -import dev.rsdlang.sample.server.service.model.SimpleRecord; -import dev.rsdlang.sample.server.service.model.UploadMixedResult; +import dev.rsdlang.sample.server.model.RSDBlob; +import dev.rsdlang.sample.server.model.RSDFile; +import dev.rsdlang.sample.server.model.SimpleRecord; +import dev.rsdlang.sample.server.model.UploadMixedResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadMixedOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadMixedOptNilHandlerImpl.java index edaebdc6..01fe6585 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadMixedOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/binary/UploadMixedOptNilHandlerImpl.java @@ -4,11 +4,11 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BinaryTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.RSDBlob; -import dev.rsdlang.sample.server.service.model.RSDFile; -import dev.rsdlang.sample.server.service.model.SimpleRecord; -import dev.rsdlang.sample.server.service.model.UploadMixedResult.Data; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.RSDBlob; +import dev.rsdlang.sample.server.model.RSDFile; +import dev.rsdlang.sample.server.model.SimpleRecord; +import dev.rsdlang.sample.server.model.UploadMixedResult.Data; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/MultiBodyParamFirstHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/MultiBodyParamFirstHandlerImpl.java index 9059e7fe..39b80e43 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/MultiBodyParamFirstHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/MultiBodyParamFirstHandlerImpl.java @@ -4,7 +4,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.SimpleRecord; +import dev.rsdlang.sample.server.model.SimpleRecord; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/MultiBodyParamHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/MultiBodyParamHandlerImpl.java index 8d4d0300..95c5a21b 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/MultiBodyParamHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/MultiBodyParamHandlerImpl.java @@ -2,7 +2,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.SimpleRecord; +import dev.rsdlang.sample.server.model.SimpleRecord; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/MultiBodyParamNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/MultiBodyParamNilHandlerImpl.java index ffa47d7d..5a02b7d4 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/MultiBodyParamNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/MultiBodyParamNilHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.SimpleRecord; +import dev.rsdlang.sample.server.model.SimpleRecord; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/MultiBodyParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/MultiBodyParamOptHandlerImpl.java index 81066101..af3d1866 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/MultiBodyParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/MultiBodyParamOptHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.SimpleRecord.Data; +import dev.rsdlang.sample.server.model.SimpleRecord.Data; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/MultiBodyParamOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/MultiBodyParamOptNilHandlerImpl.java index c9aabc6a..8d7819dd 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/MultiBodyParamOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/MultiBodyParamOptNilHandlerImpl.java @@ -4,8 +4,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.SimpleRecord.Data; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.SimpleRecord.Data; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/PatchableRecordBodyParamHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/PatchableRecordBodyParamHandlerImpl.java index 21c7a446..e6a2b944 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/PatchableRecordBodyParamHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/PatchableRecordBodyParamHandlerImpl.java @@ -2,7 +2,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.PatchableRecord; +import dev.rsdlang.sample.server.model.PatchableRecord; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/PatchableRecordBodyParamNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/PatchableRecordBodyParamNilHandlerImpl.java index 37519ecd..86afb08b 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/PatchableRecordBodyParamNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/PatchableRecordBodyParamNilHandlerImpl.java @@ -4,7 +4,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.PatchableRecord; +import dev.rsdlang.sample.server.model.PatchableRecord; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/PatchableRecordBodyParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/PatchableRecordBodyParamOptHandlerImpl.java index c9cd3350..7cbcacbc 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/PatchableRecordBodyParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/PatchableRecordBodyParamOptHandlerImpl.java @@ -4,9 +4,9 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.PatchableRecord; -import dev.rsdlang.sample.server.service.model.PatchableRecord.Data; -import dev.rsdlang.sample.server.service.model.PatchableRecord.Patch; +import dev.rsdlang.sample.server.model.PatchableRecord; +import dev.rsdlang.sample.server.model.PatchableRecord.Data; +import dev.rsdlang.sample.server.model.PatchableRecord.Patch; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/PatchableRecordBodyParamOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/PatchableRecordBodyParamOptNilHandlerImpl.java index 08efcf31..629ceee4 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/PatchableRecordBodyParamOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/PatchableRecordBodyParamOptNilHandlerImpl.java @@ -4,8 +4,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.PatchableRecord; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.PatchableRecord; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/RecordBodyParamHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/RecordBodyParamHandlerImpl.java index 401d75bb..c013296e 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/RecordBodyParamHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/RecordBodyParamHandlerImpl.java @@ -2,7 +2,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.SimpleRecord; +import dev.rsdlang.sample.server.model.SimpleRecord; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/RecordBodyParamNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/RecordBodyParamNilHandlerImpl.java index d8a9c7fa..ad8d24ec 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/RecordBodyParamNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/RecordBodyParamNilHandlerImpl.java @@ -4,8 +4,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model.SimpleRecord.Data; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model.SimpleRecord.Data; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/RecordBodyParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/RecordBodyParamOptHandlerImpl.java index c9885ab2..af212fb1 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/RecordBodyParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/RecordBodyParamOptHandlerImpl.java @@ -4,8 +4,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model.SimpleRecord.Data; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model.SimpleRecord.Data; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/RecordBodyParamOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/RecordBodyParamOptNilHandlerImpl.java index 6d6596df..0aff6485 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/RecordBodyParamOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/RecordBodyParamOptNilHandlerImpl.java @@ -2,9 +2,9 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model.SimpleRecord.Data; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model.SimpleRecord.Data; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleBooleanBodyParamNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleBooleanBodyParamNilHandlerImpl.java index 2b1d1ec2..54e8a7dc 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleBooleanBodyParamNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleBooleanBodyParamNilHandlerImpl.java @@ -4,7 +4,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleBooleanBodyParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleBooleanBodyParamOptHandlerImpl.java index 8b34ea3b..58104bca 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleBooleanBodyParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleBooleanBodyParamOptHandlerImpl.java @@ -4,7 +4,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleBooleanBodyParamOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleBooleanBodyParamOptNilHandlerImpl.java index d79bdaed..b178faad 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleBooleanBodyParamOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleBooleanBodyParamOptNilHandlerImpl.java @@ -2,8 +2,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleDoubleBodyParamNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleDoubleBodyParamNilHandlerImpl.java index be07b3aa..7e980e09 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleDoubleBodyParamNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleDoubleBodyParamNilHandlerImpl.java @@ -4,7 +4,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleDoubleBodyParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleDoubleBodyParamOptHandlerImpl.java index 198620bd..46eb7d74 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleDoubleBodyParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleDoubleBodyParamOptHandlerImpl.java @@ -4,7 +4,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleDoubleBodyParamOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleDoubleBodyParamOptNilHandlerImpl.java index 67844de9..34c74256 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleDoubleBodyParamOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleDoubleBodyParamOptNilHandlerImpl.java @@ -2,8 +2,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleEnumBodyParamHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleEnumBodyParamHandlerImpl.java index d8aaf392..35110f13 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleEnumBodyParamHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleEnumBodyParamHandlerImpl.java @@ -2,7 +2,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.SampleEnum; +import dev.rsdlang.sample.server.model.SampleEnum; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleEnumBodyParamNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleEnumBodyParamNilHandlerImpl.java index 4fa97fbe..094046eb 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleEnumBodyParamNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleEnumBodyParamNilHandlerImpl.java @@ -4,8 +4,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model.SampleEnum; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model.SampleEnum; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleEnumBodyParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleEnumBodyParamOptHandlerImpl.java index 809c4a03..97c91149 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleEnumBodyParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleEnumBodyParamOptHandlerImpl.java @@ -4,8 +4,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model.SampleEnum; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model.SampleEnum; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleEnumBodyParamOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleEnumBodyParamOptNilHandlerImpl.java index 195e2569..b8579b77 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleEnumBodyParamOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleEnumBodyParamOptNilHandlerImpl.java @@ -2,9 +2,9 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model.SampleEnum; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model.SampleEnum; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleFloatBodyParamNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleFloatBodyParamNilHandlerImpl.java index 297d153a..c1fd7afc 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleFloatBodyParamNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleFloatBodyParamNilHandlerImpl.java @@ -4,7 +4,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleFloatBodyParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleFloatBodyParamOptHandlerImpl.java index 06603812..21598fa2 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleFloatBodyParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleFloatBodyParamOptHandlerImpl.java @@ -4,7 +4,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleFloatBodyParamOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleFloatBodyParamOptNilHandlerImpl.java index 003d0560..1a36cdbb 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleFloatBodyParamOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleFloatBodyParamOptNilHandlerImpl.java @@ -2,8 +2,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleInlineEnumBodyParamNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleInlineEnumBodyParamNilHandlerImpl.java index 72cbedd8..5ceb05b7 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleInlineEnumBodyParamNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleInlineEnumBodyParamNilHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.service.BodyParameterTypesService.SimpleInlineEnumBodyParamNil_BodyEnum_Param$; import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleInlineEnumBodyParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleInlineEnumBodyParamOptHandlerImpl.java index 961a56b4..e2ec6b70 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleInlineEnumBodyParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleInlineEnumBodyParamOptHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.service.BodyParameterTypesService.SimpleInlineEnumBodyParamOpt_BodyEnum_Param$; import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleInlineEnumBodyParamOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleInlineEnumBodyParamOptNilHandlerImpl.java index 6717f554..8f1b6dad 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleInlineEnumBodyParamOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleInlineEnumBodyParamOptNilHandlerImpl.java @@ -3,8 +3,8 @@ import dev.rsdlang.sample.server.service.BodyParameterTypesService.SimpleInlineEnumBodyParamOptNil_BodyEnum_Param$; import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleIntBodyParamNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleIntBodyParamNilHandlerImpl.java index 23fc7e65..d274acee 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleIntBodyParamNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleIntBodyParamNilHandlerImpl.java @@ -4,7 +4,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleIntBodyParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleIntBodyParamOptHandlerImpl.java index f9992b58..5327aebd 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleIntBodyParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleIntBodyParamOptHandlerImpl.java @@ -4,7 +4,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleIntBodyParamOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleIntBodyParamOptNilHandlerImpl.java index e6f3125e..c2e8c25d 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleIntBodyParamOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleIntBodyParamOptNilHandlerImpl.java @@ -2,8 +2,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleLocalDateBodyParamNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleLocalDateBodyParamNilHandlerImpl.java index 214a4fb0..50934573 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleLocalDateBodyParamNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleLocalDateBodyParamNilHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleLocalDateBodyParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleLocalDateBodyParamOptHandlerImpl.java index 01c01e7f..38d6d643 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleLocalDateBodyParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleLocalDateBodyParamOptHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleLocalDateBodyParamOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleLocalDateBodyParamOptNilHandlerImpl.java index 44e01648..7bf0b64a 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleLocalDateBodyParamOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleLocalDateBodyParamOptNilHandlerImpl.java @@ -4,8 +4,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleLocalDateTimeBodyParamNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleLocalDateTimeBodyParamNilHandlerImpl.java index e492698f..759edc31 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleLocalDateTimeBodyParamNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleLocalDateTimeBodyParamNilHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped @@ -13,7 +13,8 @@ public class SimpleLocalDateTimeBodyParamNilHandlerImpl implements BodyParameterTypesServiceImpl.SimpleLocalDateTimeBodyParamNilHandler { @Override - public NilResult simpleLocalDateTimeBodyParamNil(BuilderFactory _factory, Optional bodyLocalDateTime) { + public NilResult simpleLocalDateTimeBodyParamNil(BuilderFactory _factory, + Optional bodyLocalDateTime) { return bodyLocalDateTime.isPresent() ? NilResult.DEFINED : NilResult.NULL; } diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleLocalDateTimeBodyParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleLocalDateTimeBodyParamOptHandlerImpl.java index 78f9e6dd..8566d38a 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleLocalDateTimeBodyParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleLocalDateTimeBodyParamOptHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped @@ -13,7 +13,8 @@ public class SimpleLocalDateTimeBodyParamOptHandlerImpl implements BodyParameterTypesServiceImpl.SimpleLocalDateTimeBodyParamOptHandler { @Override - public NilResult simpleLocalDateTimeBodyParamOpt(BuilderFactory _factory, Optional bodyLocalDateTime) { + public NilResult simpleLocalDateTimeBodyParamOpt(BuilderFactory _factory, + Optional bodyLocalDateTime) { return bodyLocalDateTime.isPresent() ? NilResult.DEFINED : NilResult.UNDEFINED; } diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleLocalDateTimeBodyParamOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleLocalDateTimeBodyParamOptNilHandlerImpl.java index 876934f9..cd047f2c 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleLocalDateTimeBodyParamOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleLocalDateTimeBodyParamOptNilHandlerImpl.java @@ -4,8 +4,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleLocalTimeBodyParamNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleLocalTimeBodyParamNilHandlerImpl.java index 5f117099..9d6028a5 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleLocalTimeBodyParamNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleLocalTimeBodyParamNilHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleLocalTimeBodyParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleLocalTimeBodyParamOptHandlerImpl.java index c1f35f1a..c59e9c15 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleLocalTimeBodyParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleLocalTimeBodyParamOptHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleLocalTimeBodyParamOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleLocalTimeBodyParamOptNilHandlerImpl.java index ae8ea0ba..53c938ad 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleLocalTimeBodyParamOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleLocalTimeBodyParamOptNilHandlerImpl.java @@ -4,8 +4,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleLongBodyParamNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleLongBodyParamNilHandlerImpl.java index c8ea89b0..291f8bc3 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleLongBodyParamNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleLongBodyParamNilHandlerImpl.java @@ -4,7 +4,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleLongBodyParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleLongBodyParamOptHandlerImpl.java index 288691a7..36e49bc8 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleLongBodyParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleLongBodyParamOptHandlerImpl.java @@ -4,7 +4,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleLongBodyParamOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleLongBodyParamOptNilHandlerImpl.java index 5ac70e7a..370e91e6 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleLongBodyParamOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleLongBodyParamOptNilHandlerImpl.java @@ -2,8 +2,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleOffsetDateTimeBodyParamNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleOffsetDateTimeBodyParamNilHandlerImpl.java index a8f0d712..930eb866 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleOffsetDateTimeBodyParamNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleOffsetDateTimeBodyParamNilHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped @@ -13,7 +13,8 @@ public class SimpleOffsetDateTimeBodyParamNilHandlerImpl implements BodyParameterTypesServiceImpl.SimpleOffsetDateTimeBodyParamNilHandler { @Override - public NilResult simpleOffsetDateTimeBodyParamNil(BuilderFactory _factory, Optional bodyOffsetDateTime) { + public NilResult simpleOffsetDateTimeBodyParamNil(BuilderFactory _factory, + Optional bodyOffsetDateTime) { return bodyOffsetDateTime.isPresent() ? NilResult.DEFINED : NilResult.NULL; } diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleOffsetDateTimeBodyParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleOffsetDateTimeBodyParamOptHandlerImpl.java index 2cb7daf2..688fd92f 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleOffsetDateTimeBodyParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleOffsetDateTimeBodyParamOptHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped @@ -13,7 +13,8 @@ public class SimpleOffsetDateTimeBodyParamOptHandlerImpl implements BodyParameterTypesServiceImpl.SimpleOffsetDateTimeBodyParamOptHandler { @Override - public NilResult simpleOffsetDateTimeBodyParamOpt(BuilderFactory _factory, Optional bodyOffsetDateTime) { + public NilResult simpleOffsetDateTimeBodyParamOpt(BuilderFactory _factory, + Optional bodyOffsetDateTime) { return bodyOffsetDateTime.isPresent() ? NilResult.DEFINED : NilResult.UNDEFINED; } diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleOffsetDateTimeBodyParamOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleOffsetDateTimeBodyParamOptNilHandlerImpl.java index b90791c5..2aa5423d 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleOffsetDateTimeBodyParamOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleOffsetDateTimeBodyParamOptNilHandlerImpl.java @@ -4,8 +4,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped @@ -13,7 +13,8 @@ public class SimpleOffsetDateTimeBodyParamOptNilHandlerImpl implements BodyParameterTypesServiceImpl.SimpleOffsetDateTimeBodyParamOptNilHandler { @Override - public NilResult simpleOffsetDateTimeBodyParamOptNil(BuilderFactory _factory, Nillable bodyOffsetDateTime) { + public NilResult simpleOffsetDateTimeBodyParamOptNil(BuilderFactory _factory, + Nillable bodyOffsetDateTime) { if (bodyOffsetDateTime.isNull()) { return NilResult.NULL; } else if (bodyOffsetDateTime.isUndefined()) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleScalarBodyParamHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleScalarBodyParamHandlerImpl.java index 6768cd43..2d4a9bb7 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleScalarBodyParamHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleScalarBodyParamHandlerImpl.java @@ -2,7 +2,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.ZoneId; +import dev.rsdlang.sample.server.model.ZoneId; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleScalarBodyParamNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleScalarBodyParamNilHandlerImpl.java index b6479ce9..f75d17f6 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleScalarBodyParamNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleScalarBodyParamNilHandlerImpl.java @@ -4,8 +4,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model.ZoneId; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model.ZoneId; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleScalarBodyParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleScalarBodyParamOptHandlerImpl.java index cd1b2709..ca558107 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleScalarBodyParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleScalarBodyParamOptHandlerImpl.java @@ -4,8 +4,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model.ZoneId; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model.ZoneId; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleScalarBodyParamOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleScalarBodyParamOptNilHandlerImpl.java index caa8df81..fbe6c9c7 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleScalarBodyParamOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleScalarBodyParamOptNilHandlerImpl.java @@ -2,9 +2,9 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model.ZoneId; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model.ZoneId; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleShortBodyParamNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleShortBodyParamNilHandlerImpl.java index b730eaf0..36d1477a 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleShortBodyParamNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleShortBodyParamNilHandlerImpl.java @@ -4,7 +4,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleShortBodyParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleShortBodyParamOptHandlerImpl.java index 8124236b..5463f6ad 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleShortBodyParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleShortBodyParamOptHandlerImpl.java @@ -4,7 +4,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleShortBodyParamOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleShortBodyParamOptNilHandlerImpl.java index 5ec3be22..6bcbf87e 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleShortBodyParamOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleShortBodyParamOptNilHandlerImpl.java @@ -2,8 +2,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleStringBodyParamNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleStringBodyParamNilHandlerImpl.java index 0c51ddd3..df18ea19 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleStringBodyParamNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleStringBodyParamNilHandlerImpl.java @@ -4,7 +4,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleStringBodyParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleStringBodyParamOptHandlerImpl.java index 38894aef..a1b769bb 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleStringBodyParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleStringBodyParamOptHandlerImpl.java @@ -4,7 +4,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleStringBodyParamOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleStringBodyParamOptNilHandlerImpl.java index cc1621bc..400c9a60 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleStringBodyParamOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleStringBodyParamOptNilHandlerImpl.java @@ -2,8 +2,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleZonedDateTimeBodyParamNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleZonedDateTimeBodyParamNilHandlerImpl.java index 4e2c46a0..b7bea004 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleZonedDateTimeBodyParamNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleZonedDateTimeBodyParamNilHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped @@ -13,7 +13,8 @@ public class SimpleZonedDateTimeBodyParamNilHandlerImpl implements BodyParameterTypesServiceImpl.SimpleZonedDateTimeBodyParamNilHandler { @Override - public NilResult simpleZonedDateTimeBodyParamNil(BuilderFactory _factory, Optional bodyZonedDateTime) { + public NilResult simpleZonedDateTimeBodyParamNil(BuilderFactory _factory, + Optional bodyZonedDateTime) { return bodyZonedDateTime.isPresent() ? NilResult.DEFINED : NilResult.NULL; } diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleZonedDateTimeBodyParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleZonedDateTimeBodyParamOptHandlerImpl.java index 6cd9dfb9..5b5a7796 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleZonedDateTimeBodyParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleZonedDateTimeBodyParamOptHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped @@ -13,7 +13,8 @@ public class SimpleZonedDateTimeBodyParamOptHandlerImpl implements BodyParameterTypesServiceImpl.SimpleZonedDateTimeBodyParamOptHandler { @Override - public NilResult simpleZonedDateTimeBodyParamOpt(BuilderFactory _factory, Optional bodyZonedDateTime) { + public NilResult simpleZonedDateTimeBodyParamOpt(BuilderFactory _factory, + Optional bodyZonedDateTime) { return bodyZonedDateTime.isPresent() ? NilResult.DEFINED : NilResult.UNDEFINED; } diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleZonedDateTimeBodyParamOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleZonedDateTimeBodyParamOptNilHandlerImpl.java index a2340970..a544415f 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleZonedDateTimeBodyParamOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/SimpleZonedDateTimeBodyParamOptNilHandlerImpl.java @@ -4,8 +4,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/UnionBodyParamHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/UnionBodyParamHandlerImpl.java index 0d70615c..adba140f 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/UnionBodyParamHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/UnionBodyParamHandlerImpl.java @@ -2,7 +2,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.Union; +import dev.rsdlang.sample.server.model.Union; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/UnionBodyParamNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/UnionBodyParamNilHandlerImpl.java index 54092070..5286444a 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/UnionBodyParamNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/UnionBodyParamNilHandlerImpl.java @@ -4,8 +4,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model.Union.Data; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model.Union.Data; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/UnionBodyParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/UnionBodyParamOptHandlerImpl.java index 50c526d1..92ee99e5 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/UnionBodyParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/UnionBodyParamOptHandlerImpl.java @@ -4,8 +4,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model.Union.Data; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model.Union.Data; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/UnionBodyParamOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/UnionBodyParamOptNilHandlerImpl.java index 14a8b047..2127e353 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/UnionBodyParamOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/body/UnionBodyParamOptNilHandlerImpl.java @@ -2,9 +2,9 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.BodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model.Union.Data; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model.Union.Data; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/MixHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/MixHandlerImpl.java index bbfd40b5..8be7a17b 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/MixHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/MixHandlerImpl.java @@ -2,7 +2,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.HeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.SimpleRecord.Data; +import dev.rsdlang.sample.server.model.SimpleRecord.Data; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/MultiHeaderParamNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/MultiHeaderParamNilHandlerImpl.java index 043e42f9..cda74123 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/MultiHeaderParamNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/MultiHeaderParamNilHandlerImpl.java @@ -6,7 +6,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.HeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/MultiHeaderParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/MultiHeaderParamOptHandlerImpl.java index e1cac060..8134ebd0 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/MultiHeaderParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/MultiHeaderParamOptHandlerImpl.java @@ -6,7 +6,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.HeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/MultiHeaderParamOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/MultiHeaderParamOptNilHandlerImpl.java index 7624ac7e..8d5abf7f 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/MultiHeaderParamOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/MultiHeaderParamOptNilHandlerImpl.java @@ -4,8 +4,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.HeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped @@ -15,8 +15,10 @@ public class MultiHeaderParamOptNilHandlerImpl @Override public List multiHeaderParamOptNil(BuilderFactory _factory, Nillable valueA, Nillable valueB) { - var resultA = valueA.isNull() ? NilResult.NULL : (valueA.isUndefined() ? NilResult.UNDEFINED : NilResult.DEFINED); - var resultB = valueB.isNull() ? NilResult.NULL : (valueB.isUndefined() ? NilResult.UNDEFINED : NilResult.DEFINED); + var resultA = valueA.isNull() ? NilResult.NULL + : (valueA.isUndefined() ? NilResult.UNDEFINED : NilResult.DEFINED); + var resultB = valueB.isNull() ? NilResult.NULL + : (valueB.isUndefined() ? NilResult.UNDEFINED : NilResult.DEFINED); return List.of(resultA, resultB); } diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/RecordHeaderParamHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/RecordHeaderParamHandlerImpl.java index 6f467948..c40906a6 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/RecordHeaderParamHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/RecordHeaderParamHandlerImpl.java @@ -2,7 +2,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.HeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.SimpleRecord; +import dev.rsdlang.sample.server.model.SimpleRecord; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/RecordHeaderParamNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/RecordHeaderParamNilHandlerImpl.java index 696375c6..9477f454 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/RecordHeaderParamNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/RecordHeaderParamNilHandlerImpl.java @@ -4,8 +4,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.HeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model.SimpleRecord.Data; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model.SimpleRecord.Data; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/RecordHeaderParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/RecordHeaderParamOptHandlerImpl.java index 08177ded..7a0391fc 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/RecordHeaderParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/RecordHeaderParamOptHandlerImpl.java @@ -4,8 +4,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.HeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model.SimpleRecord.Data; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model.SimpleRecord.Data; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/RecordHeaderParamOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/RecordHeaderParamOptNilHandlerImpl.java index 35a33c78..80253d6e 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/RecordHeaderParamOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/RecordHeaderParamOptNilHandlerImpl.java @@ -2,9 +2,9 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.HeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model.SimpleRecord.Data; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model.SimpleRecord.Data; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleBooleanHeaderParamNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleBooleanHeaderParamNilHandlerImpl.java index 75805562..99361a2e 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleBooleanHeaderParamNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleBooleanHeaderParamNilHandlerImpl.java @@ -4,7 +4,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.HeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleBooleanHeaderParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleBooleanHeaderParamOptHandlerImpl.java index 3786c697..cdcc9802 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleBooleanHeaderParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleBooleanHeaderParamOptHandlerImpl.java @@ -4,7 +4,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.HeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleBooleanHeaderParamOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleBooleanHeaderParamOptNilHandlerImpl.java index dac2ab74..9b0b9d39 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleBooleanHeaderParamOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleBooleanHeaderParamOptNilHandlerImpl.java @@ -2,8 +2,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.HeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleDoubleHeaderParamNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleDoubleHeaderParamNilHandlerImpl.java index 340fe3d1..29612895 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleDoubleHeaderParamNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleDoubleHeaderParamNilHandlerImpl.java @@ -4,7 +4,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.HeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleDoubleHeaderParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleDoubleHeaderParamOptHandlerImpl.java index a8a42a06..d141a73e 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleDoubleHeaderParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleDoubleHeaderParamOptHandlerImpl.java @@ -4,7 +4,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.HeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleDoubleHeaderParamOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleDoubleHeaderParamOptNilHandlerImpl.java index 997e57c3..8348b0d1 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleDoubleHeaderParamOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleDoubleHeaderParamOptNilHandlerImpl.java @@ -2,8 +2,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.HeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleEnumHeaderParamHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleEnumHeaderParamHandlerImpl.java index a7c1cace..b06e59d1 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleEnumHeaderParamHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleEnumHeaderParamHandlerImpl.java @@ -2,7 +2,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.HeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.SampleEnum; +import dev.rsdlang.sample.server.model.SampleEnum; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleEnumHeaderParamNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleEnumHeaderParamNilHandlerImpl.java index 3c83e3c2..854324de 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleEnumHeaderParamNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleEnumHeaderParamNilHandlerImpl.java @@ -4,8 +4,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.HeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model.SampleEnum; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model.SampleEnum; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleEnumHeaderParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleEnumHeaderParamOptHandlerImpl.java index 22d64122..76fb9a74 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleEnumHeaderParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleEnumHeaderParamOptHandlerImpl.java @@ -4,8 +4,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.HeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model.SampleEnum; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model.SampleEnum; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleEnumHeaderParamOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleEnumHeaderParamOptNilHandlerImpl.java index b71f904e..08be02bb 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleEnumHeaderParamOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleEnumHeaderParamOptNilHandlerImpl.java @@ -2,9 +2,9 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.HeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model.SampleEnum; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model.SampleEnum; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleFloatHeaderParamNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleFloatHeaderParamNilHandlerImpl.java index 86d7693c..0b0530fe 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleFloatHeaderParamNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleFloatHeaderParamNilHandlerImpl.java @@ -4,7 +4,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.HeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleFloatHeaderParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleFloatHeaderParamOptHandlerImpl.java index 993f6d7c..76d60608 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleFloatHeaderParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleFloatHeaderParamOptHandlerImpl.java @@ -4,7 +4,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.HeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleFloatHeaderParamOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleFloatHeaderParamOptNilHandlerImpl.java index 1c057e8d..6994b748 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleFloatHeaderParamOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleFloatHeaderParamOptNilHandlerImpl.java @@ -2,8 +2,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.HeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleInlineEnumHeaderParamNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleInlineEnumHeaderParamNilHandlerImpl.java index 44b38386..0306b90e 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleInlineEnumHeaderParamNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleInlineEnumHeaderParamNilHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.HeaderParameterTypesService.SimpleInlineEnumHeaderParamNil_HeaderValue_Param$; import dev.rsdlang.sample.server.service.impl.HeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleInlineEnumHeaderParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleInlineEnumHeaderParamOptHandlerImpl.java index 854b540d..fcf06eb3 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleInlineEnumHeaderParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleInlineEnumHeaderParamOptHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.HeaderParameterTypesService.SimpleInlineEnumHeaderParamOpt_HeaderValue_Param$; import dev.rsdlang.sample.server.service.impl.HeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleInlineEnumHeaderParamOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleInlineEnumHeaderParamOptNilHandlerImpl.java index 2f7efcaa..17b2929f 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleInlineEnumHeaderParamOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleInlineEnumHeaderParamOptNilHandlerImpl.java @@ -3,8 +3,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.HeaderParameterTypesService.SimpleInlineEnumHeaderParamOptNil_HeaderValue_Param$; import dev.rsdlang.sample.server.service.impl.HeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleIntHeaderParamNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleIntHeaderParamNilHandlerImpl.java index c28bab44..16548935 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleIntHeaderParamNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleIntHeaderParamNilHandlerImpl.java @@ -4,7 +4,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.HeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleIntHeaderParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleIntHeaderParamOptHandlerImpl.java index 218972a1..ab2ea3f1 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleIntHeaderParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleIntHeaderParamOptHandlerImpl.java @@ -4,7 +4,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.HeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleIntHeaderParamOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleIntHeaderParamOptNilHandlerImpl.java index 300f4bf8..445f445a 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleIntHeaderParamOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleIntHeaderParamOptNilHandlerImpl.java @@ -2,8 +2,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.HeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleLocalDateHeaderParamNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleLocalDateHeaderParamNilHandlerImpl.java index 6ab0bcc5..90fdbbc4 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleLocalDateHeaderParamNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleLocalDateHeaderParamNilHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.HeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleLocalDateHeaderParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleLocalDateHeaderParamOptHandlerImpl.java index 01588c1f..84bf36db 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleLocalDateHeaderParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleLocalDateHeaderParamOptHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.HeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleLocalDateHeaderParamOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleLocalDateHeaderParamOptNilHandlerImpl.java index afea8305..a944dd9e 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleLocalDateHeaderParamOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleLocalDateHeaderParamOptNilHandlerImpl.java @@ -4,8 +4,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.HeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleLocalDateTimeHeaderParamNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleLocalDateTimeHeaderParamNilHandlerImpl.java index 7391c62a..3ee68a6a 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleLocalDateTimeHeaderParamNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleLocalDateTimeHeaderParamNilHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.HeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleLocalDateTimeHeaderParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleLocalDateTimeHeaderParamOptHandlerImpl.java index 460e7860..6a5d2cc6 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleLocalDateTimeHeaderParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleLocalDateTimeHeaderParamOptHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.HeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleLocalDateTimeHeaderParamOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleLocalDateTimeHeaderParamOptNilHandlerImpl.java index aa31a4be..e1c4f403 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleLocalDateTimeHeaderParamOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleLocalDateTimeHeaderParamOptNilHandlerImpl.java @@ -4,8 +4,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.HeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped @@ -13,7 +13,8 @@ public class SimpleLocalDateTimeHeaderParamOptNilHandlerImpl implements HeaderParameterTypesServiceImpl.SimpleLocalDateTimeHeaderParamOptNilHandler { @Override - public NilResult simpleLocalDateTimeHeaderParamOptNil(BuilderFactory _factory, Nillable headerValue) { + public NilResult simpleLocalDateTimeHeaderParamOptNil(BuilderFactory _factory, + Nillable headerValue) { if (headerValue.isUndefined()) { return NilResult.UNDEFINED; } else if (headerValue.isNull()) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleLocalTimeHeaderParamNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleLocalTimeHeaderParamNilHandlerImpl.java index 387af1b0..00797d25 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleLocalTimeHeaderParamNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleLocalTimeHeaderParamNilHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.HeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleLocalTimeHeaderParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleLocalTimeHeaderParamOptHandlerImpl.java index fbdd3c61..92acdeb3 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleLocalTimeHeaderParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleLocalTimeHeaderParamOptHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.HeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleLocalTimeHeaderParamOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleLocalTimeHeaderParamOptNilHandlerImpl.java index ff526b30..b12a7170 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleLocalTimeHeaderParamOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleLocalTimeHeaderParamOptNilHandlerImpl.java @@ -4,8 +4,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.HeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleLongHeaderParamNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleLongHeaderParamNilHandlerImpl.java index c867a0f3..3293af0f 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleLongHeaderParamNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleLongHeaderParamNilHandlerImpl.java @@ -4,7 +4,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.HeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleLongHeaderParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleLongHeaderParamOptHandlerImpl.java index 688f94f4..c3a63cae 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleLongHeaderParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleLongHeaderParamOptHandlerImpl.java @@ -4,7 +4,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.HeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleLongHeaderParamOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleLongHeaderParamOptNilHandlerImpl.java index c3b46f19..5918f359 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleLongHeaderParamOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleLongHeaderParamOptNilHandlerImpl.java @@ -2,8 +2,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.HeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleOffsetDateTimeHeaderParamNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleOffsetDateTimeHeaderParamNilHandlerImpl.java index 3fec4e48..26870904 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleOffsetDateTimeHeaderParamNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleOffsetDateTimeHeaderParamNilHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.HeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleOffsetDateTimeHeaderParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleOffsetDateTimeHeaderParamOptHandlerImpl.java index 74737a35..e135498c 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleOffsetDateTimeHeaderParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleOffsetDateTimeHeaderParamOptHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.HeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleOffsetDateTimeHeaderParamOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleOffsetDateTimeHeaderParamOptNilHandlerImpl.java index a7314bb4..41e85e02 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleOffsetDateTimeHeaderParamOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleOffsetDateTimeHeaderParamOptNilHandlerImpl.java @@ -4,8 +4,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.HeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped @@ -13,7 +13,8 @@ public class SimpleOffsetDateTimeHeaderParamOptNilHandlerImpl implements HeaderParameterTypesServiceImpl.SimpleOffsetDateTimeHeaderParamOptNilHandler { @Override - public NilResult simpleOffsetDateTimeHeaderParamOptNil(BuilderFactory _factory, Nillable headerValue) { + public NilResult simpleOffsetDateTimeHeaderParamOptNil(BuilderFactory _factory, + Nillable headerValue) { if (headerValue.isNull()) { return NilResult.NULL; } else if (headerValue.isUndefined()) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleScalarHeaderParamHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleScalarHeaderParamHandlerImpl.java index 3c3d106a..d34bb5e5 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleScalarHeaderParamHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleScalarHeaderParamHandlerImpl.java @@ -2,7 +2,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.HeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.ZoneId; +import dev.rsdlang.sample.server.model.ZoneId; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleScalarHeaderParamNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleScalarHeaderParamNilHandlerImpl.java index fd557e7a..9d958ebd 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleScalarHeaderParamNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleScalarHeaderParamNilHandlerImpl.java @@ -4,8 +4,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.HeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model.ZoneId; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model.ZoneId; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleScalarHeaderParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleScalarHeaderParamOptHandlerImpl.java index 6cd7d5b2..1103a264 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleScalarHeaderParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleScalarHeaderParamOptHandlerImpl.java @@ -4,8 +4,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.HeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model.ZoneId; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model.ZoneId; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleScalarHeaderParamOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleScalarHeaderParamOptNilHandlerImpl.java index 5d9bd931..56643f14 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleScalarHeaderParamOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleScalarHeaderParamOptNilHandlerImpl.java @@ -2,9 +2,9 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.HeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model.ZoneId; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model.ZoneId; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleShortHeaderParamNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleShortHeaderParamNilHandlerImpl.java index 38fa85c0..65a4a2fd 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleShortHeaderParamNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleShortHeaderParamNilHandlerImpl.java @@ -4,7 +4,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.HeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleShortHeaderParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleShortHeaderParamOptHandlerImpl.java index 7a7c77e7..fe59efaf 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleShortHeaderParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleShortHeaderParamOptHandlerImpl.java @@ -4,7 +4,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.HeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleShortHeaderParamOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleShortHeaderParamOptNilHandlerImpl.java index 22dcc005..076340ca 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleShortHeaderParamOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleShortHeaderParamOptNilHandlerImpl.java @@ -2,8 +2,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.HeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleStringHeaderParamNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleStringHeaderParamNilHandlerImpl.java index 4dd331c5..25717ab4 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleStringHeaderParamNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleStringHeaderParamNilHandlerImpl.java @@ -4,7 +4,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.HeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleStringHeaderParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleStringHeaderParamOptHandlerImpl.java index 66e742ff..a0618f92 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleStringHeaderParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleStringHeaderParamOptHandlerImpl.java @@ -4,7 +4,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.HeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleStringHeaderParamOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleStringHeaderParamOptNilHandlerImpl.java index 32131151..a0d0e045 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleStringHeaderParamOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleStringHeaderParamOptNilHandlerImpl.java @@ -2,8 +2,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.HeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleZonedDateTimeHeaderParamNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleZonedDateTimeHeaderParamNilHandlerImpl.java index 776f4e20..652d0545 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleZonedDateTimeHeaderParamNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleZonedDateTimeHeaderParamNilHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.HeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleZonedDateTimeHeaderParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleZonedDateTimeHeaderParamOptHandlerImpl.java index ed2118d9..71188758 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleZonedDateTimeHeaderParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleZonedDateTimeHeaderParamOptHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.HeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleZonedDateTimeHeaderParamOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleZonedDateTimeHeaderParamOptNilHandlerImpl.java index 42f91b9d..c0c22b8b 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleZonedDateTimeHeaderParamOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/header/SimpleZonedDateTimeHeaderParamOptNilHandlerImpl.java @@ -4,8 +4,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.HeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped @@ -13,7 +13,8 @@ public class SimpleZonedDateTimeHeaderParamOptNilHandlerImpl implements HeaderParameterTypesServiceImpl.SimpleZonedDateTimeHeaderParamOptNilHandler { @Override - public NilResult simpleZonedDateTimeHeaderParamOptNil(BuilderFactory _factory, Nillable headerValue) { + public NilResult simpleZonedDateTimeHeaderParamOptNil(BuilderFactory _factory, + Nillable headerValue) { if (headerValue.isUndefined()) { return NilResult.UNDEFINED; } else if (headerValue.isNull()) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListBooleanBodyParamNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListBooleanBodyParamNilHandlerImpl.java index 295c8153..30b74014 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListBooleanBodyParamNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListBooleanBodyParamNilHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListBodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListBooleanBodyParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListBooleanBodyParamOptHandlerImpl.java index 3008ade7..3ce42528 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListBooleanBodyParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListBooleanBodyParamOptHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListBodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListBooleanBodyParamOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListBooleanBodyParamOptNilHandlerImpl.java index c79e4f3a..01e9c2eb 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListBooleanBodyParamOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListBooleanBodyParamOptNilHandlerImpl.java @@ -4,8 +4,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListBodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListDoubleBodyParamNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListDoubleBodyParamNilHandlerImpl.java index 6f937101..3bf90ef6 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListDoubleBodyParamNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListDoubleBodyParamNilHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListBodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListDoubleBodyParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListDoubleBodyParamOptHandlerImpl.java index 5f2f5d36..66e03f76 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListDoubleBodyParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListDoubleBodyParamOptHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListBodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListDoubleBodyParamOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListDoubleBodyParamOptNilHandlerImpl.java index 32136ca5..fe3a5826 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListDoubleBodyParamOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListDoubleBodyParamOptNilHandlerImpl.java @@ -4,8 +4,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListBodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListEnumBodyParamHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListEnumBodyParamHandlerImpl.java index 1cdd2697..e942fb21 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListEnumBodyParamHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListEnumBodyParamHandlerImpl.java @@ -4,7 +4,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListBodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.SampleEnum; +import dev.rsdlang.sample.server.model.SampleEnum; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListEnumBodyParamNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListEnumBodyParamNilHandlerImpl.java index 5dc2c01a..31d51779 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListEnumBodyParamNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListEnumBodyParamNilHandlerImpl.java @@ -5,8 +5,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListBodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model.SampleEnum; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model.SampleEnum; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListEnumBodyParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListEnumBodyParamOptHandlerImpl.java index 63d21da6..5e3ea74a 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListEnumBodyParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListEnumBodyParamOptHandlerImpl.java @@ -5,8 +5,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListBodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model.SampleEnum; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model.SampleEnum; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListEnumBodyParamOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListEnumBodyParamOptNilHandlerImpl.java index cd0e9886..7183937b 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListEnumBodyParamOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListEnumBodyParamOptNilHandlerImpl.java @@ -4,9 +4,9 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListBodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model.SampleEnum; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model.SampleEnum; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListFloatBodyParamNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListFloatBodyParamNilHandlerImpl.java index 8927a6b7..c8f90d9d 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListFloatBodyParamNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListFloatBodyParamNilHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListBodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListFloatBodyParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListFloatBodyParamOptHandlerImpl.java index 3283ed4c..19a25482 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListFloatBodyParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListFloatBodyParamOptHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListBodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListFloatBodyParamOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListFloatBodyParamOptNilHandlerImpl.java index e3d39844..bce07094 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListFloatBodyParamOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListFloatBodyParamOptNilHandlerImpl.java @@ -4,8 +4,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListBodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListInlineEnumBodyParamNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListInlineEnumBodyParamNilHandlerImpl.java index f90f7065..51b8b107 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListInlineEnumBodyParamNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListInlineEnumBodyParamNilHandlerImpl.java @@ -6,7 +6,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.ListBodyParameterTypesService.ListInlineEnumBodyParamNil_BodyEnum_Param$; import dev.rsdlang.sample.server.service.impl.ListBodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListInlineEnumBodyParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListInlineEnumBodyParamOptHandlerImpl.java index 8fe1e8af..126d8cb4 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListInlineEnumBodyParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListInlineEnumBodyParamOptHandlerImpl.java @@ -6,7 +6,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.ListBodyParameterTypesService.ListInlineEnumBodyParamOpt_BodyEnum_Param$; import dev.rsdlang.sample.server.service.impl.ListBodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListInlineEnumBodyParamOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListInlineEnumBodyParamOptNilHandlerImpl.java index 67b4a09d..07d7f985 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListInlineEnumBodyParamOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListInlineEnumBodyParamOptNilHandlerImpl.java @@ -5,8 +5,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.ListBodyParameterTypesService.ListInlineEnumBodyParamOptNil_BodyEnum_Param$; import dev.rsdlang.sample.server.service.impl.ListBodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListIntBodyParamNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListIntBodyParamNilHandlerImpl.java index 5f6fd2ed..04b60b8e 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListIntBodyParamNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListIntBodyParamNilHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListBodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListIntBodyParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListIntBodyParamOptHandlerImpl.java index 4be466df..0c709ff4 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListIntBodyParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListIntBodyParamOptHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListBodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListIntBodyParamOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListIntBodyParamOptNilHandlerImpl.java index 44ad9a94..3ce29d7e 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListIntBodyParamOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListIntBodyParamOptNilHandlerImpl.java @@ -4,8 +4,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListBodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListLocalDateBodyParamNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListLocalDateBodyParamNilHandlerImpl.java index 6f6d9685..5e8b66b3 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListLocalDateBodyParamNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListLocalDateBodyParamNilHandlerImpl.java @@ -6,7 +6,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListBodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListLocalDateBodyParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListLocalDateBodyParamOptHandlerImpl.java index 96783426..d30a6adf 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListLocalDateBodyParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListLocalDateBodyParamOptHandlerImpl.java @@ -6,7 +6,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListBodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListLocalDateBodyParamOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListLocalDateBodyParamOptNilHandlerImpl.java index 3be9f346..c3c2e8fd 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListLocalDateBodyParamOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListLocalDateBodyParamOptNilHandlerImpl.java @@ -5,8 +5,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListBodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListLocalDateTimeBodyParamNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListLocalDateTimeBodyParamNilHandlerImpl.java index 4a3c1d83..17d5c530 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListLocalDateTimeBodyParamNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListLocalDateTimeBodyParamNilHandlerImpl.java @@ -6,7 +6,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListBodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListLocalDateTimeBodyParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListLocalDateTimeBodyParamOptHandlerImpl.java index 26ac8b95..72f26af9 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListLocalDateTimeBodyParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListLocalDateTimeBodyParamOptHandlerImpl.java @@ -6,7 +6,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListBodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListLocalDateTimeBodyParamOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListLocalDateTimeBodyParamOptNilHandlerImpl.java index 3c9de2b2..3105e196 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListLocalDateTimeBodyParamOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListLocalDateTimeBodyParamOptNilHandlerImpl.java @@ -5,8 +5,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListBodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListLocalTimeBodyParamNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListLocalTimeBodyParamNilHandlerImpl.java index 4bca30a0..af29d1a4 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListLocalTimeBodyParamNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListLocalTimeBodyParamNilHandlerImpl.java @@ -6,7 +6,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListBodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListLocalTimeBodyParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListLocalTimeBodyParamOptHandlerImpl.java index e5b3c97a..a502c636 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListLocalTimeBodyParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListLocalTimeBodyParamOptHandlerImpl.java @@ -6,7 +6,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListBodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListLocalTimeBodyParamOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListLocalTimeBodyParamOptNilHandlerImpl.java index 0eb8a27c..e7cd4cd8 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListLocalTimeBodyParamOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListLocalTimeBodyParamOptNilHandlerImpl.java @@ -5,8 +5,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListBodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListLongBodyParamNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListLongBodyParamNilHandlerImpl.java index addefa9e..c77cce53 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListLongBodyParamNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListLongBodyParamNilHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListBodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListLongBodyParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListLongBodyParamOptHandlerImpl.java index 7ecf3fbf..b155a8f0 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListLongBodyParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListLongBodyParamOptHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListBodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListLongBodyParamOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListLongBodyParamOptNilHandlerImpl.java index 003185ad..4505ca44 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListLongBodyParamOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListLongBodyParamOptNilHandlerImpl.java @@ -4,8 +4,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListBodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListMultiBodyParamHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListMultiBodyParamHandlerImpl.java index 73fbbc7a..578103d3 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListMultiBodyParamHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListMultiBodyParamHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListBodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.SimpleRecord.Data; +import dev.rsdlang.sample.server.model.SimpleRecord.Data; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListMultiBodyParamNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListMultiBodyParamNilHandlerImpl.java index 96ccc392..95ce1f81 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListMultiBodyParamNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListMultiBodyParamNilHandlerImpl.java @@ -5,8 +5,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListBodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model.SimpleRecord.Data; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model.SimpleRecord.Data; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListMultiBodyParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListMultiBodyParamOptHandlerImpl.java index 1f942d5b..a79371d7 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListMultiBodyParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListMultiBodyParamOptHandlerImpl.java @@ -5,8 +5,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListBodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model.SimpleRecord.Data; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model.SimpleRecord.Data; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListMultiBodyParamOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListMultiBodyParamOptNilHandlerImpl.java index 291cb853..df7f44d7 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListMultiBodyParamOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListMultiBodyParamOptNilHandlerImpl.java @@ -4,9 +4,9 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListBodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model.SimpleRecord.Data; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model.SimpleRecord.Data; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListOffsetDateTimeBodyParamNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListOffsetDateTimeBodyParamNilHandlerImpl.java index 89abc40a..9eaeb18d 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListOffsetDateTimeBodyParamNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListOffsetDateTimeBodyParamNilHandlerImpl.java @@ -6,7 +6,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListBodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped @@ -14,7 +14,8 @@ public class ListOffsetDateTimeBodyParamNilHandlerImpl implements ListBodyParameterTypesServiceImpl.ListOffsetDateTimeBodyParamNilHandler { @Override - public NilResult listOffsetDateTimeBodyParamNil(BuilderFactory _factory, Optional> bodyOffsetDateTime) { + public NilResult listOffsetDateTimeBodyParamNil(BuilderFactory _factory, + Optional> bodyOffsetDateTime) { return bodyOffsetDateTime.isPresent() ? NilResult.DEFINED : NilResult.NULL; } diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListOffsetDateTimeBodyParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListOffsetDateTimeBodyParamOptHandlerImpl.java index 1868d591..68fbd3dc 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListOffsetDateTimeBodyParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListOffsetDateTimeBodyParamOptHandlerImpl.java @@ -6,7 +6,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListBodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped @@ -14,7 +14,8 @@ public class ListOffsetDateTimeBodyParamOptHandlerImpl implements ListBodyParameterTypesServiceImpl.ListOffsetDateTimeBodyParamOptHandler { @Override - public NilResult listOffsetDateTimeBodyParamOpt(BuilderFactory _factory, Optional> bodyOffsetDateTime) { + public NilResult listOffsetDateTimeBodyParamOpt(BuilderFactory _factory, + Optional> bodyOffsetDateTime) { return bodyOffsetDateTime.isPresent() ? NilResult.DEFINED : NilResult.UNDEFINED; } diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListOffsetDateTimeBodyParamOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListOffsetDateTimeBodyParamOptNilHandlerImpl.java index 579f1eb6..2d062d70 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListOffsetDateTimeBodyParamOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListOffsetDateTimeBodyParamOptNilHandlerImpl.java @@ -5,8 +5,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListBodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped @@ -14,7 +14,8 @@ public class ListOffsetDateTimeBodyParamOptNilHandlerImpl implements ListBodyParameterTypesServiceImpl.ListOffsetDateTimeBodyParamOptNilHandler { @Override - public NilResult listOffsetDateTimeBodyParamOptNil(BuilderFactory _factory, Nillable> bodyOffsetDateTime) { + public NilResult listOffsetDateTimeBodyParamOptNil(BuilderFactory _factory, + Nillable> bodyOffsetDateTime) { if (bodyOffsetDateTime.isNull()) { return NilResult.NULL; } else if (bodyOffsetDateTime.isUndefined()) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListRecordBodyParamHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListRecordBodyParamHandlerImpl.java index 88f7cd48..6336a95a 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListRecordBodyParamHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListRecordBodyParamHandlerImpl.java @@ -4,7 +4,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListBodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.SimpleRecord.Data; +import dev.rsdlang.sample.server.model.SimpleRecord.Data; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListRecordBodyParamNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListRecordBodyParamNilHandlerImpl.java index 48023d0a..e35474b4 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListRecordBodyParamNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListRecordBodyParamNilHandlerImpl.java @@ -5,8 +5,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListBodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model.SimpleRecord.Data; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model.SimpleRecord.Data; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListRecordBodyParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListRecordBodyParamOptHandlerImpl.java index 3250434e..b034507a 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListRecordBodyParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListRecordBodyParamOptHandlerImpl.java @@ -5,8 +5,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListBodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model.SimpleRecord.Data; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model.SimpleRecord.Data; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListRecordBodyParamOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListRecordBodyParamOptNilHandlerImpl.java index 998be6ef..9fd5980c 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListRecordBodyParamOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListRecordBodyParamOptNilHandlerImpl.java @@ -4,9 +4,9 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListBodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model.SimpleRecord.Data; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model.SimpleRecord.Data; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListScalarBodyParamHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListScalarBodyParamHandlerImpl.java index 0830ebcc..6aa5b290 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListScalarBodyParamHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListScalarBodyParamHandlerImpl.java @@ -4,7 +4,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListBodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.ZoneId; +import dev.rsdlang.sample.server.model.ZoneId; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListScalarBodyParamNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListScalarBodyParamNilHandlerImpl.java index 69ffe103..5a9a6203 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListScalarBodyParamNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListScalarBodyParamNilHandlerImpl.java @@ -5,8 +5,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListBodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model.ZoneId; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model.ZoneId; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListScalarBodyParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListScalarBodyParamOptHandlerImpl.java index 559996c9..2d0bdd09 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListScalarBodyParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListScalarBodyParamOptHandlerImpl.java @@ -5,8 +5,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListBodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model.ZoneId; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model.ZoneId; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListScalarBodyParamOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListScalarBodyParamOptNilHandlerImpl.java index 62ddae04..9dc7ad04 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListScalarBodyParamOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListScalarBodyParamOptNilHandlerImpl.java @@ -4,9 +4,9 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListBodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model.ZoneId; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model.ZoneId; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListShortBodyParamNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListShortBodyParamNilHandlerImpl.java index 04dcea66..1bbcb1af 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListShortBodyParamNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListShortBodyParamNilHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListBodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListShortBodyParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListShortBodyParamOptHandlerImpl.java index dc9b2315..5b278a1a 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListShortBodyParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListShortBodyParamOptHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListBodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListShortBodyParamOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListShortBodyParamOptNilHandlerImpl.java index 6510de1c..f4008f33 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListShortBodyParamOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListShortBodyParamOptNilHandlerImpl.java @@ -4,8 +4,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListBodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListStringBodyParamNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListStringBodyParamNilHandlerImpl.java index 9e241d4e..e12b5afe 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListStringBodyParamNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListStringBodyParamNilHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListBodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListStringBodyParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListStringBodyParamOptHandlerImpl.java index e439aefe..1332dfc5 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListStringBodyParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListStringBodyParamOptHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListBodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListStringBodyParamOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListStringBodyParamOptNilHandlerImpl.java index 9f6ca2cb..5bff4e74 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListStringBodyParamOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListStringBodyParamOptNilHandlerImpl.java @@ -4,8 +4,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListBodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListZonedDateTimeBodyParamNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListZonedDateTimeBodyParamNilHandlerImpl.java index 27664828..9a1eb015 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListZonedDateTimeBodyParamNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListZonedDateTimeBodyParamNilHandlerImpl.java @@ -6,7 +6,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListBodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListZonedDateTimeBodyParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListZonedDateTimeBodyParamOptHandlerImpl.java index f77c20ef..8a9b94ad 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListZonedDateTimeBodyParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListZonedDateTimeBodyParamOptHandlerImpl.java @@ -6,7 +6,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListBodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListZonedDateTimeBodyParamOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListZonedDateTimeBodyParamOptNilHandlerImpl.java index 79e88788..d1ab1a19 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListZonedDateTimeBodyParamOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listbody/ListZonedDateTimeBodyParamOptNilHandlerImpl.java @@ -5,8 +5,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListBodyParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListBooleanHeaderParamNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListBooleanHeaderParamNilHandlerImpl.java index 382496c5..8d9448f7 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListBooleanHeaderParamNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListBooleanHeaderParamNilHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListHeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListBooleanHeaderParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListBooleanHeaderParamOptHandlerImpl.java index ca51622e..c703c8df 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListBooleanHeaderParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListBooleanHeaderParamOptHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListHeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListBooleanHeaderParamOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListBooleanHeaderParamOptNilHandlerImpl.java index 69289474..eb91a2f5 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListBooleanHeaderParamOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListBooleanHeaderParamOptNilHandlerImpl.java @@ -4,8 +4,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListHeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListDoubleHeaderParamNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListDoubleHeaderParamNilHandlerImpl.java index f1d1ecb3..e02f60dc 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListDoubleHeaderParamNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListDoubleHeaderParamNilHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListHeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListDoubleHeaderParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListDoubleHeaderParamOptHandlerImpl.java index b5001754..e2b0c8ad 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListDoubleHeaderParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListDoubleHeaderParamOptHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListHeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListDoubleHeaderParamOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListDoubleHeaderParamOptNilHandlerImpl.java index e76dd107..91b7047f 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListDoubleHeaderParamOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListDoubleHeaderParamOptNilHandlerImpl.java @@ -4,8 +4,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListHeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListEnumHeaderParamHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListEnumHeaderParamHandlerImpl.java index f4d3ce14..3a62f3da 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListEnumHeaderParamHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListEnumHeaderParamHandlerImpl.java @@ -4,7 +4,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListHeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.SampleEnum; +import dev.rsdlang.sample.server.model.SampleEnum; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListEnumHeaderParamNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListEnumHeaderParamNilHandlerImpl.java index f4d8b48e..a2019445 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListEnumHeaderParamNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListEnumHeaderParamNilHandlerImpl.java @@ -5,8 +5,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListHeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model.SampleEnum; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model.SampleEnum; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListEnumHeaderParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListEnumHeaderParamOptHandlerImpl.java index efdce9b5..db80e72b 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListEnumHeaderParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListEnumHeaderParamOptHandlerImpl.java @@ -5,8 +5,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListHeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model.SampleEnum; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model.SampleEnum; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListEnumHeaderParamOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListEnumHeaderParamOptNilHandlerImpl.java index a97660ec..4d924b38 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListEnumHeaderParamOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListEnumHeaderParamOptNilHandlerImpl.java @@ -4,9 +4,9 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListHeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model.SampleEnum; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model.SampleEnum; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListFloatHeaderParamNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListFloatHeaderParamNilHandlerImpl.java index defcc11c..7239a707 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListFloatHeaderParamNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListFloatHeaderParamNilHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListHeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListFloatHeaderParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListFloatHeaderParamOptHandlerImpl.java index e75c9163..5b2746cb 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListFloatHeaderParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListFloatHeaderParamOptHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListHeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListFloatHeaderParamOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListFloatHeaderParamOptNilHandlerImpl.java index 2517168a..2ba7721e 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListFloatHeaderParamOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListFloatHeaderParamOptNilHandlerImpl.java @@ -4,8 +4,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListHeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListInlineEnumHeaderParamNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListInlineEnumHeaderParamNilHandlerImpl.java index 1ffa9a97..674241fe 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListInlineEnumHeaderParamNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListInlineEnumHeaderParamNilHandlerImpl.java @@ -6,7 +6,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.ListHeaderParameterTypesService.ListInlineEnumHeaderParamNil_HeaderValue_Param$; import dev.rsdlang.sample.server.service.impl.ListHeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListInlineEnumHeaderParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListInlineEnumHeaderParamOptHandlerImpl.java index 283ce1b1..a24f58dd 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListInlineEnumHeaderParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListInlineEnumHeaderParamOptHandlerImpl.java @@ -6,7 +6,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.ListHeaderParameterTypesService.ListInlineEnumHeaderParamOpt_HeaderValue_Param$; import dev.rsdlang.sample.server.service.impl.ListHeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListInlineEnumHeaderParamOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListInlineEnumHeaderParamOptNilHandlerImpl.java index 794ab8db..39d34982 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListInlineEnumHeaderParamOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListInlineEnumHeaderParamOptNilHandlerImpl.java @@ -5,8 +5,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.ListHeaderParameterTypesService.ListInlineEnumHeaderParamOptNil_HeaderValue_Param$; import dev.rsdlang.sample.server.service.impl.ListHeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListIntHeaderParamNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListIntHeaderParamNilHandlerImpl.java index 8ffdad05..cf394c16 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListIntHeaderParamNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListIntHeaderParamNilHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListHeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListIntHeaderParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListIntHeaderParamOptHandlerImpl.java index 8356d16b..26c393b7 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListIntHeaderParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListIntHeaderParamOptHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListHeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListIntHeaderParamOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListIntHeaderParamOptNilHandlerImpl.java index 6dbd3d39..604cef19 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListIntHeaderParamOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListIntHeaderParamOptNilHandlerImpl.java @@ -4,8 +4,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListHeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListLocalDateHeaderParamNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListLocalDateHeaderParamNilHandlerImpl.java index b910b277..08513a28 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListLocalDateHeaderParamNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListLocalDateHeaderParamNilHandlerImpl.java @@ -6,7 +6,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListHeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListLocalDateHeaderParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListLocalDateHeaderParamOptHandlerImpl.java index 966d8bbf..d5b5c47b 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListLocalDateHeaderParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListLocalDateHeaderParamOptHandlerImpl.java @@ -6,7 +6,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListHeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListLocalDateHeaderParamOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListLocalDateHeaderParamOptNilHandlerImpl.java index 100e21e3..6ced826e 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListLocalDateHeaderParamOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListLocalDateHeaderParamOptNilHandlerImpl.java @@ -5,8 +5,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListHeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListLocalDateTimeHeaderParamNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListLocalDateTimeHeaderParamNilHandlerImpl.java index d8769447..5e671b23 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListLocalDateTimeHeaderParamNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListLocalDateTimeHeaderParamNilHandlerImpl.java @@ -6,7 +6,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListHeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped @@ -14,7 +14,8 @@ public class ListLocalDateTimeHeaderParamNilHandlerImpl implements ListHeaderParameterTypesServiceImpl.ListLocalDateTimeHeaderParamNilHandler { @Override - public NilResult listLocalDateTimeHeaderParamNil(BuilderFactory _factory, Optional> headerValue) { + public NilResult listLocalDateTimeHeaderParamNil(BuilderFactory _factory, + Optional> headerValue) { return headerValue.isPresent() ? NilResult.DEFINED : NilResult.NULL; } diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListLocalDateTimeHeaderParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListLocalDateTimeHeaderParamOptHandlerImpl.java index bf21fac6..911fc1f3 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListLocalDateTimeHeaderParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListLocalDateTimeHeaderParamOptHandlerImpl.java @@ -6,7 +6,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListHeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped @@ -14,7 +14,8 @@ public class ListLocalDateTimeHeaderParamOptHandlerImpl implements ListHeaderParameterTypesServiceImpl.ListLocalDateTimeHeaderParamOptHandler { @Override - public NilResult listLocalDateTimeHeaderParamOpt(BuilderFactory _factory, Optional> headerValue) { + public NilResult listLocalDateTimeHeaderParamOpt(BuilderFactory _factory, + Optional> headerValue) { return headerValue.isPresent() ? NilResult.DEFINED : NilResult.UNDEFINED; } diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListLocalDateTimeHeaderParamOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListLocalDateTimeHeaderParamOptNilHandlerImpl.java index be6b8ce2..4149958f 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListLocalDateTimeHeaderParamOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListLocalDateTimeHeaderParamOptNilHandlerImpl.java @@ -5,8 +5,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListHeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListLocalTimeHeaderParamNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListLocalTimeHeaderParamNilHandlerImpl.java index b1aedf9e..4181a398 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListLocalTimeHeaderParamNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListLocalTimeHeaderParamNilHandlerImpl.java @@ -6,7 +6,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListHeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListLocalTimeHeaderParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListLocalTimeHeaderParamOptHandlerImpl.java index 11359312..be44dd5e 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListLocalTimeHeaderParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListLocalTimeHeaderParamOptHandlerImpl.java @@ -6,7 +6,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListHeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListLocalTimeHeaderParamOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListLocalTimeHeaderParamOptNilHandlerImpl.java index 2d3865c6..6e7c5535 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListLocalTimeHeaderParamOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListLocalTimeHeaderParamOptNilHandlerImpl.java @@ -5,8 +5,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListHeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListLongHeaderParamNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListLongHeaderParamNilHandlerImpl.java index 1bf85108..b5b0880a 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListLongHeaderParamNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListLongHeaderParamNilHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListHeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListLongHeaderParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListLongHeaderParamOptHandlerImpl.java index f5b8e1d4..b5a4c341 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListLongHeaderParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListLongHeaderParamOptHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListHeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListLongHeaderParamOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListLongHeaderParamOptNilHandlerImpl.java index 0c534cf2..cc2f33fe 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListLongHeaderParamOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListLongHeaderParamOptNilHandlerImpl.java @@ -4,8 +4,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListHeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListMultiHeaderParamHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListMultiHeaderParamHandlerImpl.java index eeac642c..4868aa76 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListMultiHeaderParamHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListMultiHeaderParamHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListHeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.SimpleRecord.Data; +import dev.rsdlang.sample.server.model.SimpleRecord.Data; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListMultiHeaderParamNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListMultiHeaderParamNilHandlerImpl.java index 2f20c7ff..2c36ee01 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListMultiHeaderParamNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListMultiHeaderParamNilHandlerImpl.java @@ -5,8 +5,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListHeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model.SimpleRecord.Data; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model.SimpleRecord.Data; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListMultiHeaderParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListMultiHeaderParamOptHandlerImpl.java index 0ff732a4..d0a76533 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListMultiHeaderParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListMultiHeaderParamOptHandlerImpl.java @@ -5,8 +5,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListHeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model.SimpleRecord.Data; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model.SimpleRecord.Data; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListMultiHeaderParamOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListMultiHeaderParamOptNilHandlerImpl.java index 18fa0454..1a0ee266 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListMultiHeaderParamOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListMultiHeaderParamOptNilHandlerImpl.java @@ -4,9 +4,9 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListHeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model.SimpleRecord.Data; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model.SimpleRecord.Data; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListOffsetDateTimeHeaderParamNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListOffsetDateTimeHeaderParamNilHandlerImpl.java index 6cbd875d..0a91bc67 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListOffsetDateTimeHeaderParamNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListOffsetDateTimeHeaderParamNilHandlerImpl.java @@ -6,7 +6,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListHeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped @@ -14,7 +14,8 @@ public class ListOffsetDateTimeHeaderParamNilHandlerImpl implements ListHeaderParameterTypesServiceImpl.ListOffsetDateTimeHeaderParamNilHandler { @Override - public NilResult listOffsetDateTimeHeaderParamNil(BuilderFactory _factory, Optional> headerValue) { + public NilResult listOffsetDateTimeHeaderParamNil(BuilderFactory _factory, + Optional> headerValue) { return headerValue.isPresent() ? NilResult.DEFINED : NilResult.NULL; } diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListOffsetDateTimeHeaderParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListOffsetDateTimeHeaderParamOptHandlerImpl.java index 5a93b1d4..dfa74a04 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListOffsetDateTimeHeaderParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListOffsetDateTimeHeaderParamOptHandlerImpl.java @@ -6,7 +6,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListHeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped @@ -14,7 +14,8 @@ public class ListOffsetDateTimeHeaderParamOptHandlerImpl implements ListHeaderParameterTypesServiceImpl.ListOffsetDateTimeHeaderParamOptHandler { @Override - public NilResult listOffsetDateTimeHeaderParamOpt(BuilderFactory _factory, Optional> headerValue) { + public NilResult listOffsetDateTimeHeaderParamOpt(BuilderFactory _factory, + Optional> headerValue) { return headerValue.isPresent() ? NilResult.DEFINED : NilResult.UNDEFINED; } diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListOffsetDateTimeHeaderParamOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListOffsetDateTimeHeaderParamOptNilHandlerImpl.java index 92903b76..5b3e35c9 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListOffsetDateTimeHeaderParamOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListOffsetDateTimeHeaderParamOptNilHandlerImpl.java @@ -5,8 +5,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListHeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped @@ -14,7 +14,8 @@ public class ListOffsetDateTimeHeaderParamOptNilHandlerImpl implements ListHeaderParameterTypesServiceImpl.ListOffsetDateTimeHeaderParamOptNilHandler { @Override - public NilResult listOffsetDateTimeHeaderParamOptNil(BuilderFactory _factory, Nillable> headerValue) { + public NilResult listOffsetDateTimeHeaderParamOptNil(BuilderFactory _factory, + Nillable> headerValue) { if (headerValue.isNull()) { return NilResult.NULL; } else if (headerValue.isUndefined()) { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListRecordHeaderParamHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListRecordHeaderParamHandlerImpl.java index d0ffbdad..231b005f 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListRecordHeaderParamHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListRecordHeaderParamHandlerImpl.java @@ -4,7 +4,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListHeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.SimpleRecord.Data; +import dev.rsdlang.sample.server.model.SimpleRecord.Data; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListRecordHeaderParamNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListRecordHeaderParamNilHandlerImpl.java index bdee496c..a4e37e83 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListRecordHeaderParamNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListRecordHeaderParamNilHandlerImpl.java @@ -5,8 +5,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListHeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model.SimpleRecord.Data; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model.SimpleRecord.Data; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListRecordHeaderParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListRecordHeaderParamOptHandlerImpl.java index fcbd659b..43b78755 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListRecordHeaderParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListRecordHeaderParamOptHandlerImpl.java @@ -5,8 +5,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListHeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model.SimpleRecord.Data; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model.SimpleRecord.Data; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListRecordHeaderParamOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListRecordHeaderParamOptNilHandlerImpl.java index 4ef19adb..79323ab4 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListRecordHeaderParamOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListRecordHeaderParamOptNilHandlerImpl.java @@ -4,9 +4,9 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListHeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model.SimpleRecord.Data; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model.SimpleRecord.Data; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListScalarHeaderParamHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListScalarHeaderParamHandlerImpl.java index 4072460e..269b3d08 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListScalarHeaderParamHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListScalarHeaderParamHandlerImpl.java @@ -4,7 +4,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListHeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.ZoneId; +import dev.rsdlang.sample.server.model.ZoneId; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListScalarHeaderParamNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListScalarHeaderParamNilHandlerImpl.java index 17a6d6c1..989f1289 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListScalarHeaderParamNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListScalarHeaderParamNilHandlerImpl.java @@ -5,8 +5,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListHeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model.ZoneId; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model.ZoneId; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListScalarHeaderParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListScalarHeaderParamOptHandlerImpl.java index ea21dc20..ff755532 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListScalarHeaderParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListScalarHeaderParamOptHandlerImpl.java @@ -5,8 +5,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListHeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model.ZoneId; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model.ZoneId; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListScalarHeaderParamOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListScalarHeaderParamOptNilHandlerImpl.java index f7c92dfc..82795b26 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListScalarHeaderParamOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListScalarHeaderParamOptNilHandlerImpl.java @@ -4,9 +4,9 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListHeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model.ZoneId; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model.ZoneId; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListShortHeaderParamNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListShortHeaderParamNilHandlerImpl.java index 9ea637df..d4163c41 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListShortHeaderParamNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListShortHeaderParamNilHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListHeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListShortHeaderParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListShortHeaderParamOptHandlerImpl.java index 5c1674b2..fe479b36 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListShortHeaderParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListShortHeaderParamOptHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListHeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListShortHeaderParamOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListShortHeaderParamOptNilHandlerImpl.java index f0e426e5..5044e390 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListShortHeaderParamOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListShortHeaderParamOptNilHandlerImpl.java @@ -4,8 +4,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListHeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListStringHeaderParamNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListStringHeaderParamNilHandlerImpl.java index eb28510b..057a33a2 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListStringHeaderParamNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListStringHeaderParamNilHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListHeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListStringHeaderParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListStringHeaderParamOptHandlerImpl.java index 9f7d7121..2d55d149 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListStringHeaderParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListStringHeaderParamOptHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListHeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListStringHeaderParamOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListStringHeaderParamOptNilHandlerImpl.java index bbd4b7d2..24dcde39 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListStringHeaderParamOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListStringHeaderParamOptNilHandlerImpl.java @@ -4,8 +4,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListHeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListZonedDateTimeHeaderParamNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListZonedDateTimeHeaderParamNilHandlerImpl.java index 72f3589c..d6463653 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListZonedDateTimeHeaderParamNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListZonedDateTimeHeaderParamNilHandlerImpl.java @@ -6,7 +6,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListHeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped @@ -14,7 +14,8 @@ public class ListZonedDateTimeHeaderParamNilHandlerImpl implements ListHeaderParameterTypesServiceImpl.ListZonedDateTimeHeaderParamNilHandler { @Override - public NilResult listZonedDateTimeHeaderParamNil(BuilderFactory _factory, Optional> headerValue) { + public NilResult listZonedDateTimeHeaderParamNil(BuilderFactory _factory, + Optional> headerValue) { return headerValue.isPresent() ? NilResult.DEFINED : NilResult.NULL; } diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListZonedDateTimeHeaderParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListZonedDateTimeHeaderParamOptHandlerImpl.java index df03545d..f962a595 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListZonedDateTimeHeaderParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListZonedDateTimeHeaderParamOptHandlerImpl.java @@ -6,7 +6,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListHeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped @@ -14,7 +14,8 @@ public class ListZonedDateTimeHeaderParamOptHandlerImpl implements ListHeaderParameterTypesServiceImpl.ListZonedDateTimeHeaderParamOptHandler { @Override - public NilResult listZonedDateTimeHeaderParamOpt(BuilderFactory _factory, Optional> headerValue) { + public NilResult listZonedDateTimeHeaderParamOpt(BuilderFactory _factory, + Optional> headerValue) { return headerValue.isPresent() ? NilResult.DEFINED : NilResult.UNDEFINED; } diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListZonedDateTimeHeaderParamOptNilHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListZonedDateTimeHeaderParamOptNilHandlerImpl.java index 06f2a54a..0b713764 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListZonedDateTimeHeaderParamOptNilHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listheader/ListZonedDateTimeHeaderParamOptNilHandlerImpl.java @@ -5,8 +5,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListHeaderParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listquery/ListEnumQueryParamHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listquery/ListEnumQueryParamHandlerImpl.java index 6f2fba42..904088a3 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listquery/ListEnumQueryParamHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listquery/ListEnumQueryParamHandlerImpl.java @@ -4,7 +4,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListQueryParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.SampleEnum; +import dev.rsdlang.sample.server.model.SampleEnum; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listquery/ListMultiQueryParamHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listquery/ListMultiQueryParamHandlerImpl.java index 96816406..5e11bc4b 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listquery/ListMultiQueryParamHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listquery/ListMultiQueryParamHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListQueryParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.SimpleRecord; +import dev.rsdlang.sample.server.model.SimpleRecord; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listquery/ListRecordQueryParamHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listquery/ListRecordQueryParamHandlerImpl.java index 1353a3e3..a9b2be53 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listquery/ListRecordQueryParamHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listquery/ListRecordQueryParamHandlerImpl.java @@ -4,7 +4,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListQueryParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.SimpleRecord; +import dev.rsdlang.sample.server.model.SimpleRecord; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listquery/ListScalarQueryParamHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listquery/ListScalarQueryParamHandlerImpl.java index 1213a43d..0b7eb7eb 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listquery/ListScalarQueryParamHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listquery/ListScalarQueryParamHandlerImpl.java @@ -4,7 +4,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListQueryParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.ZoneId; +import dev.rsdlang.sample.server.model.ZoneId; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listsample/ListEnumHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listsample/ListEnumHandlerImpl.java index 60de61ea..4a935758 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listsample/ListEnumHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listsample/ListEnumHandlerImpl.java @@ -4,7 +4,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListSampleServiceServiceImpl; -import dev.rsdlang.sample.server.service.model.SampleEnum; +import dev.rsdlang.sample.server.model.SampleEnum; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listsample/ListScalarHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listsample/ListScalarHandlerImpl.java index fe6b315e..61d69149 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listsample/ListScalarHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listsample/ListScalarHandlerImpl.java @@ -4,7 +4,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListSampleServiceServiceImpl; -import dev.rsdlang.sample.server.service.model.ZoneId; +import dev.rsdlang.sample.server.model.ZoneId; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listsample/ListSimpleRecordHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listsample/ListSimpleRecordHandlerImpl.java index 4c5c1790..8ef0b824 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listsample/ListSimpleRecordHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listsample/ListSimpleRecordHandlerImpl.java @@ -4,7 +4,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ListSampleServiceServiceImpl; -import dev.rsdlang.sample.server.service.model.SimpleRecord; +import dev.rsdlang.sample.server.model.SimpleRecord; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listsample/ListSimpleRecordWithErrorHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listsample/ListSimpleRecordWithErrorHandlerImpl.java index 30a8608f..f548a716 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listsample/ListSimpleRecordWithErrorHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/listsample/ListSimpleRecordWithErrorHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.SampleErrorException; import dev.rsdlang.sample.server.service.impl.ListSampleServiceServiceImpl; -import dev.rsdlang.sample.server.service.model.SimpleRecord.Data; +import dev.rsdlang.sample.server.model.SimpleRecord.Data; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/path/SimpleEnumPathParamHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/path/SimpleEnumPathParamHandlerImpl.java index c5fc8ae4..01d74b9a 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/path/SimpleEnumPathParamHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/path/SimpleEnumPathParamHandlerImpl.java @@ -2,7 +2,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.PathParameterTypeServiceServiceImpl; -import dev.rsdlang.sample.server.service.model.SampleEnum; +import dev.rsdlang.sample.server.model.SampleEnum; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/path/SimpleScalarPathParamHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/path/SimpleScalarPathParamHandlerImpl.java index 728db6c9..4d1c4509 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/path/SimpleScalarPathParamHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/path/SimpleScalarPathParamHandlerImpl.java @@ -2,7 +2,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.PathParameterTypeServiceServiceImpl; -import dev.rsdlang.sample.server.service.model.ZoneId; +import dev.rsdlang.sample.server.model.ZoneId; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/query/RecordQueryParamHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/query/RecordQueryParamHandlerImpl.java index 2334c9c8..619a83e2 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/query/RecordQueryParamHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/query/RecordQueryParamHandlerImpl.java @@ -2,7 +2,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.QueryParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.SimpleRecord; +import dev.rsdlang.sample.server.model.SimpleRecord; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/query/RecordQueryParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/query/RecordQueryParamOptHandlerImpl.java index fe86a489..b614ac79 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/query/RecordQueryParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/query/RecordQueryParamOptHandlerImpl.java @@ -4,8 +4,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.QueryParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model.SimpleRecord.Data; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model.SimpleRecord.Data; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/query/SimpleBooleanQueryParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/query/SimpleBooleanQueryParamOptHandlerImpl.java index d0d085f8..b60db77c 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/query/SimpleBooleanQueryParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/query/SimpleBooleanQueryParamOptHandlerImpl.java @@ -4,7 +4,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.QueryParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/query/SimpleDoubleQueryParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/query/SimpleDoubleQueryParamOptHandlerImpl.java index 5b6515bd..7174de27 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/query/SimpleDoubleQueryParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/query/SimpleDoubleQueryParamOptHandlerImpl.java @@ -4,7 +4,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.QueryParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/query/SimpleEnumQueryParamHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/query/SimpleEnumQueryParamHandlerImpl.java index cb750221..2c4e6000 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/query/SimpleEnumQueryParamHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/query/SimpleEnumQueryParamHandlerImpl.java @@ -2,7 +2,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.QueryParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.SampleEnum; +import dev.rsdlang.sample.server.model.SampleEnum; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/query/SimpleEnumQueryParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/query/SimpleEnumQueryParamOptHandlerImpl.java index 073cc80f..632ba3f3 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/query/SimpleEnumQueryParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/query/SimpleEnumQueryParamOptHandlerImpl.java @@ -4,8 +4,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.QueryParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model.SampleEnum; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model.SampleEnum; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/query/SimpleFloatQueryParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/query/SimpleFloatQueryParamOptHandlerImpl.java index 13c995c8..f4ab5005 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/query/SimpleFloatQueryParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/query/SimpleFloatQueryParamOptHandlerImpl.java @@ -4,7 +4,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.QueryParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/query/SimpleIntQueryParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/query/SimpleIntQueryParamOptHandlerImpl.java index 16ee965f..7571cab6 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/query/SimpleIntQueryParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/query/SimpleIntQueryParamOptHandlerImpl.java @@ -4,7 +4,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.QueryParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/query/SimpleLocalDateQueryParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/query/SimpleLocalDateQueryParamOptHandlerImpl.java index 448a3547..f1934a08 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/query/SimpleLocalDateQueryParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/query/SimpleLocalDateQueryParamOptHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.QueryParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/query/SimpleLocalDateTimeQueryParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/query/SimpleLocalDateTimeQueryParamOptHandlerImpl.java index b609e1a5..95cbc9fd 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/query/SimpleLocalDateTimeQueryParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/query/SimpleLocalDateTimeQueryParamOptHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.QueryParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/query/SimpleLocalTimeQueryParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/query/SimpleLocalTimeQueryParamOptHandlerImpl.java index a0089616..661898bb 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/query/SimpleLocalTimeQueryParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/query/SimpleLocalTimeQueryParamOptHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.QueryParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/query/SimpleLongQueryParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/query/SimpleLongQueryParamOptHandlerImpl.java index a894edd6..0ec6604f 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/query/SimpleLongQueryParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/query/SimpleLongQueryParamOptHandlerImpl.java @@ -4,7 +4,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.QueryParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/query/SimpleOffsetDateTimeQueryParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/query/SimpleOffsetDateTimeQueryParamOptHandlerImpl.java index b7ef70fb..ffe4c858 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/query/SimpleOffsetDateTimeQueryParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/query/SimpleOffsetDateTimeQueryParamOptHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.QueryParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/query/SimpleScalarQueryParamHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/query/SimpleScalarQueryParamHandlerImpl.java index 91f864ec..ff4a671c 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/query/SimpleScalarQueryParamHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/query/SimpleScalarQueryParamHandlerImpl.java @@ -2,7 +2,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.QueryParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.ZoneId; +import dev.rsdlang.sample.server.model.ZoneId; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/query/SimpleScalarQueryParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/query/SimpleScalarQueryParamOptHandlerImpl.java index 6cffeced..f3868de9 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/query/SimpleScalarQueryParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/query/SimpleScalarQueryParamOptHandlerImpl.java @@ -4,8 +4,8 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.QueryParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model.ZoneId; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model.ZoneId; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/query/SimpleShortQueryParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/query/SimpleShortQueryParamOptHandlerImpl.java index a5f733ed..f4fb2745 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/query/SimpleShortQueryParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/query/SimpleShortQueryParamOptHandlerImpl.java @@ -4,7 +4,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.QueryParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/query/SimpleStringQueryParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/query/SimpleStringQueryParamOptHandlerImpl.java index 4c4f9d8a..ac6a371e 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/query/SimpleStringQueryParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/query/SimpleStringQueryParamOptHandlerImpl.java @@ -4,7 +4,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.QueryParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/query/SimpleZonedDateTimeQueryParamOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/query/SimpleZonedDateTimeQueryParamOptHandlerImpl.java index 5e914975..3c43e606 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/query/SimpleZonedDateTimeQueryParamOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/query/SimpleZonedDateTimeQueryParamOptHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.QueryParameterTypesServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/sample/GetEnumHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/sample/GetEnumHandlerImpl.java index 52f6e2d5..5ea5eb40 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/sample/GetEnumHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/sample/GetEnumHandlerImpl.java @@ -2,7 +2,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.SampleServiceServiceImpl; -import dev.rsdlang.sample.server.service.model.SampleEnum; +import dev.rsdlang.sample.server.model.SampleEnum; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/sample/GetScalarHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/sample/GetScalarHandlerImpl.java index d30e90d6..6032b149 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/sample/GetScalarHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/sample/GetScalarHandlerImpl.java @@ -2,7 +2,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.SampleServiceServiceImpl; -import dev.rsdlang.sample.server.service.model.ZoneId; +import dev.rsdlang.sample.server.model.ZoneId; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/sample/GetSimpleErrorEnumHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/sample/GetSimpleErrorEnumHandlerImpl.java index 8fa9d746..526cb61a 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/sample/GetSimpleErrorEnumHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/sample/GetSimpleErrorEnumHandlerImpl.java @@ -3,7 +3,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.SampleErrorEnumException; import dev.rsdlang.sample.server.service.impl.SampleServiceServiceImpl; -import dev.rsdlang.sample.server.service.model.SampleEnum; +import dev.rsdlang.sample.server.model.SampleEnum; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/sample/GetSimpleErrorScalarHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/sample/GetSimpleErrorScalarHandlerImpl.java index 5228f401..d2f165c0 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/sample/GetSimpleErrorScalarHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/sample/GetSimpleErrorScalarHandlerImpl.java @@ -3,7 +3,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.SampleErrorScalarException; import dev.rsdlang.sample.server.service.impl.SampleServiceServiceImpl; -import dev.rsdlang.sample.server.service.model.ZoneId; +import dev.rsdlang.sample.server.model.ZoneId; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/sample/GetSimpleErrorUnionHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/sample/GetSimpleErrorUnionHandlerImpl.java index 84942e3c..a5e350ed 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/sample/GetSimpleErrorUnionHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/sample/GetSimpleErrorUnionHandlerImpl.java @@ -3,7 +3,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.SampleErrorUnionException; import dev.rsdlang.sample.server.service.impl.SampleServiceServiceImpl; -import dev.rsdlang.sample.server.service.model.UnionA; +import dev.rsdlang.sample.server.model.UnionA; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/sample/GetSimpleErrorWithValueHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/sample/GetSimpleErrorWithValueHandlerImpl.java index d1fbdd5f..ae0f19f0 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/sample/GetSimpleErrorWithValueHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/sample/GetSimpleErrorWithValueHandlerImpl.java @@ -3,7 +3,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.SampleErrorWithValueException; import dev.rsdlang.sample.server.service.impl.SampleServiceServiceImpl; -import dev.rsdlang.sample.server.service.model.ErrorData; +import dev.rsdlang.sample.server.model.ErrorData; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/sample/GetSimpleRecordHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/sample/GetSimpleRecordHandlerImpl.java index bf8c3ebb..7cf57df4 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/sample/GetSimpleRecordHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/sample/GetSimpleRecordHandlerImpl.java @@ -2,7 +2,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.SampleServiceServiceImpl; -import dev.rsdlang.sample.server.service.model.SimpleRecord; +import dev.rsdlang.sample.server.model.SimpleRecord; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/sample/GetSimpleRecordWithErrorHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/sample/GetSimpleRecordWithErrorHandlerImpl.java index ab4bcc64..dc21ef09 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/sample/GetSimpleRecordWithErrorHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/sample/GetSimpleRecordWithErrorHandlerImpl.java @@ -3,7 +3,7 @@ import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.SampleErrorException; import dev.rsdlang.sample.server.service.impl.SampleServiceServiceImpl; -import dev.rsdlang.sample.server.service.model.SimpleRecord.Data; +import dev.rsdlang.sample.server.model.SimpleRecord.Data; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/scalarsub/HeaderListNullHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/scalarsub/HeaderListNullHandlerImpl.java index a7d5b001..a4429b9f 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/scalarsub/HeaderListNullHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/scalarsub/HeaderListNullHandlerImpl.java @@ -6,7 +6,7 @@ import dev.rsdlang.sample.server.MyRange; import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ScalarSubstition_ServiceServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/scalarsub/HeaderListOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/scalarsub/HeaderListOptHandlerImpl.java index 5c5f70f0..7044fe73 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/scalarsub/HeaderListOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/scalarsub/HeaderListOptHandlerImpl.java @@ -6,7 +6,7 @@ import dev.rsdlang.sample.server.MyRange; import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ScalarSubstition_ServiceServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/scalarsub/HeaderListOptNullHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/scalarsub/HeaderListOptNullHandlerImpl.java index b6117198..aace03d1 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/scalarsub/HeaderListOptNullHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/scalarsub/HeaderListOptNullHandlerImpl.java @@ -5,8 +5,8 @@ import dev.rsdlang.sample.server.MyRange; import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ScalarSubstition_ServiceServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/scalarsub/HeaderNullHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/scalarsub/HeaderNullHandlerImpl.java index 445d4ef0..2a0a9aca 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/scalarsub/HeaderNullHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/scalarsub/HeaderNullHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.MyRange; import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ScalarSubstition_ServiceServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/scalarsub/HeaderOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/scalarsub/HeaderOptHandlerImpl.java index 2f822a82..609552bf 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/scalarsub/HeaderOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/scalarsub/HeaderOptHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.MyRange; import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ScalarSubstition_ServiceServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/scalarsub/HeaderOptNullHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/scalarsub/HeaderOptNullHandlerImpl.java index 94c8d948..a2e1db4b 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/scalarsub/HeaderOptNullHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/scalarsub/HeaderOptNullHandlerImpl.java @@ -3,8 +3,8 @@ import dev.rsdlang.sample.server.MyRange; import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ScalarSubstition_ServiceServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/scalarsub/PostListNullHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/scalarsub/PostListNullHandlerImpl.java index bb88ff03..d944e1e9 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/scalarsub/PostListNullHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/scalarsub/PostListNullHandlerImpl.java @@ -6,7 +6,7 @@ import dev.rsdlang.sample.server.MyRange; import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ScalarSubstition_ServiceServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/scalarsub/PostListOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/scalarsub/PostListOptHandlerImpl.java index 592b4f00..353ed701 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/scalarsub/PostListOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/scalarsub/PostListOptHandlerImpl.java @@ -6,7 +6,7 @@ import dev.rsdlang.sample.server.MyRange; import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ScalarSubstition_ServiceServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/scalarsub/PostListOptNullHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/scalarsub/PostListOptNullHandlerImpl.java index 79aa6264..aa0aae69 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/scalarsub/PostListOptNullHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/scalarsub/PostListOptNullHandlerImpl.java @@ -5,8 +5,8 @@ import dev.rsdlang.sample.server.MyRange; import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ScalarSubstition_ServiceServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/scalarsub/PostNullHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/scalarsub/PostNullHandlerImpl.java index d7babf4d..936f1cae 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/scalarsub/PostNullHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/scalarsub/PostNullHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.MyRange; import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ScalarSubstition_ServiceServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/scalarsub/PostOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/scalarsub/PostOptHandlerImpl.java index aeebe059..95b9f869 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/scalarsub/PostOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/scalarsub/PostOptHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.MyRange; import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ScalarSubstition_ServiceServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/scalarsub/PostOptNullHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/scalarsub/PostOptNullHandlerImpl.java index 37ed7647..6d640a31 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/scalarsub/PostOptNullHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/scalarsub/PostOptNullHandlerImpl.java @@ -3,8 +3,8 @@ import dev.rsdlang.sample.server.MyRange; import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ScalarSubstition_ServiceServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/scalarsub/QueryListNullHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/scalarsub/QueryListNullHandlerImpl.java index 549aa280..1833999f 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/scalarsub/QueryListNullHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/scalarsub/QueryListNullHandlerImpl.java @@ -6,7 +6,7 @@ import dev.rsdlang.sample.server.MyRange; import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ScalarSubstition_ServiceServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/scalarsub/QueryListOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/scalarsub/QueryListOptHandlerImpl.java index 97046a83..84ad59fc 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/scalarsub/QueryListOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/scalarsub/QueryListOptHandlerImpl.java @@ -6,7 +6,7 @@ import dev.rsdlang.sample.server.MyRange; import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ScalarSubstition_ServiceServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/scalarsub/QueryListOptNullHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/scalarsub/QueryListOptNullHandlerImpl.java index 8922db5c..f99a6fff 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/scalarsub/QueryListOptNullHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/scalarsub/QueryListOptNullHandlerImpl.java @@ -5,8 +5,8 @@ import dev.rsdlang.sample.server.MyRange; import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ScalarSubstition_ServiceServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/scalarsub/QueryNullHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/scalarsub/QueryNullHandlerImpl.java index dcd2d8d4..fca2d024 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/scalarsub/QueryNullHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/scalarsub/QueryNullHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.MyRange; import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ScalarSubstition_ServiceServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/scalarsub/QueryOptHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/scalarsub/QueryOptHandlerImpl.java index 0573afe4..3a7894b6 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/scalarsub/QueryOptHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/scalarsub/QueryOptHandlerImpl.java @@ -5,7 +5,7 @@ import dev.rsdlang.sample.server.MyRange; import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ScalarSubstition_ServiceServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; +import dev.rsdlang.sample.server.model.NilResult; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/scalarsub/QueryOptNullHandlerImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/scalarsub/QueryOptNullHandlerImpl.java index c455d770..fa96bc94 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/scalarsub/QueryOptNullHandlerImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/handler/scalarsub/QueryOptNullHandlerImpl.java @@ -3,8 +3,8 @@ import dev.rsdlang.sample.server.MyRange; import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.impl.ScalarSubstition_ServiceServiceImpl; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model._Base.Nillable; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model._Base.Nillable; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/impl/BinaryTypesServiceImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/impl/BinaryTypesServiceImpl.java index 94cf94bd..d0a618a4 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/impl/BinaryTypesServiceImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/impl/BinaryTypesServiceImpl.java @@ -7,14 +7,14 @@ import jakarta.enterprise.context.ApplicationScoped; +import dev.rsdlang.sample.server.model._Base; +import dev.rsdlang.sample.server.model.MixedResult; +import dev.rsdlang.sample.server.model.RSDBlob; +import dev.rsdlang.sample.server.model.RSDFile; +import dev.rsdlang.sample.server.model.SimpleRecord; +import dev.rsdlang.sample.server.model.UploadMixedResult; import dev.rsdlang.sample.server.service.BinaryTypesService; import dev.rsdlang.sample.server.service.BuilderFactory; -import dev.rsdlang.sample.server.service.model._Base; -import dev.rsdlang.sample.server.service.model.MixedResult; -import dev.rsdlang.sample.server.service.model.RSDBlob; -import dev.rsdlang.sample.server.service.model.RSDFile; -import dev.rsdlang.sample.server.service.model.SimpleRecord; -import dev.rsdlang.sample.server.service.model.UploadMixedResult; import dev.rsdlang.sample.server.service.SampleErrorWithValueException; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/impl/BodyParameterTypesServiceImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/impl/BodyParameterTypesServiceImpl.java index c514d0f8..03a0e2fa 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/impl/BodyParameterTypesServiceImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/impl/BodyParameterTypesServiceImpl.java @@ -13,15 +13,15 @@ import jakarta.enterprise.context.ApplicationScoped; +import dev.rsdlang.sample.server.model._Base; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model.PatchableRecord; +import dev.rsdlang.sample.server.model.SampleEnum; +import dev.rsdlang.sample.server.model.SimpleRecord; +import dev.rsdlang.sample.server.model.Union; +import dev.rsdlang.sample.server.model.ZoneId; import dev.rsdlang.sample.server.service.BodyParameterTypesService; import dev.rsdlang.sample.server.service.BuilderFactory; -import dev.rsdlang.sample.server.service.model._Base; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model.PatchableRecord; -import dev.rsdlang.sample.server.service.model.SampleEnum; -import dev.rsdlang.sample.server.service.model.SimpleRecord; -import dev.rsdlang.sample.server.service.model.Union; -import dev.rsdlang.sample.server.service.model.ZoneId; @ApplicationScoped public class BodyParameterTypesServiceImpl implements BodyParameterTypesService { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/impl/HeaderParameterTypesServiceImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/impl/HeaderParameterTypesServiceImpl.java index c389ffb9..d89d5276 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/impl/HeaderParameterTypesServiceImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/impl/HeaderParameterTypesServiceImpl.java @@ -14,13 +14,13 @@ import jakarta.enterprise.context.ApplicationScoped; +import dev.rsdlang.sample.server.model._Base; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model.SampleEnum; +import dev.rsdlang.sample.server.model.SimpleRecord; +import dev.rsdlang.sample.server.model.ZoneId; import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.HeaderParameterTypesService; -import dev.rsdlang.sample.server.service.model._Base; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model.SampleEnum; -import dev.rsdlang.sample.server.service.model.SimpleRecord; -import dev.rsdlang.sample.server.service.model.ZoneId; @ApplicationScoped public class HeaderParameterTypesServiceImpl implements HeaderParameterTypesService { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/impl/ListBodyParameterTypesServiceImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/impl/ListBodyParameterTypesServiceImpl.java index c2d59dee..105f1ad0 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/impl/ListBodyParameterTypesServiceImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/impl/ListBodyParameterTypesServiceImpl.java @@ -11,13 +11,13 @@ import jakarta.enterprise.context.ApplicationScoped; +import dev.rsdlang.sample.server.model._Base; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model.SampleEnum; +import dev.rsdlang.sample.server.model.SimpleRecord; +import dev.rsdlang.sample.server.model.ZoneId; import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.ListBodyParameterTypesService; -import dev.rsdlang.sample.server.service.model._Base; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model.SampleEnum; -import dev.rsdlang.sample.server.service.model.SimpleRecord; -import dev.rsdlang.sample.server.service.model.ZoneId; @ApplicationScoped public class ListBodyParameterTypesServiceImpl implements ListBodyParameterTypesService { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/impl/ListHeaderParameterTypesServiceImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/impl/ListHeaderParameterTypesServiceImpl.java index b0e9237f..bbfbddf9 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/impl/ListHeaderParameterTypesServiceImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/impl/ListHeaderParameterTypesServiceImpl.java @@ -11,13 +11,13 @@ import jakarta.enterprise.context.ApplicationScoped; +import dev.rsdlang.sample.server.model._Base; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model.SampleEnum; +import dev.rsdlang.sample.server.model.SimpleRecord; +import dev.rsdlang.sample.server.model.ZoneId; import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.ListHeaderParameterTypesService; -import dev.rsdlang.sample.server.service.model._Base; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model.SampleEnum; -import dev.rsdlang.sample.server.service.model.SimpleRecord; -import dev.rsdlang.sample.server.service.model.ZoneId; @ApplicationScoped public class ListHeaderParameterTypesServiceImpl implements ListHeaderParameterTypesService { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/impl/ListQueryParameterTypesServiceImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/impl/ListQueryParameterTypesServiceImpl.java index 62d2ac3b..51d0dca4 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/impl/ListQueryParameterTypesServiceImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/impl/ListQueryParameterTypesServiceImpl.java @@ -10,11 +10,11 @@ import jakarta.enterprise.context.ApplicationScoped; +import dev.rsdlang.sample.server.model.SampleEnum; +import dev.rsdlang.sample.server.model.SimpleRecord; +import dev.rsdlang.sample.server.model.ZoneId; import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.ListQueryParameterTypesService; -import dev.rsdlang.sample.server.service.model.SampleEnum; -import dev.rsdlang.sample.server.service.model.SimpleRecord; -import dev.rsdlang.sample.server.service.model.ZoneId; @ApplicationScoped public class ListQueryParameterTypesServiceImpl implements ListQueryParameterTypesService { diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/impl/ListSampleServiceServiceImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/impl/ListSampleServiceServiceImpl.java index 7716e419..b5216ff7 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/impl/ListSampleServiceServiceImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/impl/ListSampleServiceServiceImpl.java @@ -10,11 +10,11 @@ import jakarta.enterprise.context.ApplicationScoped; +import dev.rsdlang.sample.server.model.SampleEnum; +import dev.rsdlang.sample.server.model.SimpleRecord; +import dev.rsdlang.sample.server.model.ZoneId; import dev.rsdlang.sample.server.service.BuilderFactory; import dev.rsdlang.sample.server.service.ListSampleServiceService; -import dev.rsdlang.sample.server.service.model.SampleEnum; -import dev.rsdlang.sample.server.service.model.SimpleRecord; -import dev.rsdlang.sample.server.service.model.ZoneId; import dev.rsdlang.sample.server.service.SampleErrorException; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/impl/PathParameterTypeServiceServiceImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/impl/PathParameterTypeServiceServiceImpl.java index f653ca52..660bbc71 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/impl/PathParameterTypeServiceServiceImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/impl/PathParameterTypeServiceServiceImpl.java @@ -9,9 +9,9 @@ import jakarta.enterprise.context.ApplicationScoped; +import dev.rsdlang.sample.server.model.SampleEnum; +import dev.rsdlang.sample.server.model.ZoneId; import dev.rsdlang.sample.server.service.BuilderFactory; -import dev.rsdlang.sample.server.service.model.SampleEnum; -import dev.rsdlang.sample.server.service.model.ZoneId; import dev.rsdlang.sample.server.service.PathParameterTypeServiceService; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/impl/QueryParameterTypesServiceImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/impl/QueryParameterTypesServiceImpl.java index 32f8add7..1a11bf08 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/impl/QueryParameterTypesServiceImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/impl/QueryParameterTypesServiceImpl.java @@ -13,11 +13,11 @@ import jakarta.enterprise.context.ApplicationScoped; +import dev.rsdlang.sample.server.model.NilResult; +import dev.rsdlang.sample.server.model.SampleEnum; +import dev.rsdlang.sample.server.model.SimpleRecord; +import dev.rsdlang.sample.server.model.ZoneId; import dev.rsdlang.sample.server.service.BuilderFactory; -import dev.rsdlang.sample.server.service.model.NilResult; -import dev.rsdlang.sample.server.service.model.SampleEnum; -import dev.rsdlang.sample.server.service.model.SimpleRecord; -import dev.rsdlang.sample.server.service.model.ZoneId; import dev.rsdlang.sample.server.service.QueryParameterTypesService; @ApplicationScoped diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/impl/SampleServiceServiceImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/impl/SampleServiceServiceImpl.java index e785e896..e5c249ce 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/impl/SampleServiceServiceImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/impl/SampleServiceServiceImpl.java @@ -9,10 +9,10 @@ import jakarta.enterprise.context.ApplicationScoped; +import dev.rsdlang.sample.server.model.SampleEnum; +import dev.rsdlang.sample.server.model.SimpleRecord; +import dev.rsdlang.sample.server.model.ZoneId; import dev.rsdlang.sample.server.service.BuilderFactory; -import dev.rsdlang.sample.server.service.model.SampleEnum; -import dev.rsdlang.sample.server.service.model.SimpleRecord; -import dev.rsdlang.sample.server.service.model.ZoneId; import dev.rsdlang.sample.server.service.SampleError2Exception; import dev.rsdlang.sample.server.service.SampleErrorBooleanException; import dev.rsdlang.sample.server.service.SampleErrorEnumException; diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/impl/ScalarSubstition_ServiceServiceImpl.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/impl/ScalarSubstition_ServiceServiceImpl.java index e1de92f1..42ab3f68 100644 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/impl/ScalarSubstition_ServiceServiceImpl.java +++ b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/impl/ScalarSubstition_ServiceServiceImpl.java @@ -6,10 +6,10 @@ import jakarta.enterprise.context.ApplicationScoped; +import dev.rsdlang.sample.server.model._Base; +import dev.rsdlang.sample.server.model.NilResult; import dev.rsdlang.sample.server.MyRange; import dev.rsdlang.sample.server.service.BuilderFactory; -import dev.rsdlang.sample.server.service.model._Base; -import dev.rsdlang.sample.server.service.model.NilResult; import dev.rsdlang.sample.server.service.SampleErrorScalarSubException; import dev.rsdlang.sample.server.service.ScalarSubstition_ServiceService; diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/mixins/RecordMixinMixin.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/mixins/RecordMixinMixin.java deleted file mode 100644 index 02c5a66b..00000000 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/mixins/RecordMixinMixin.java +++ /dev/null @@ -1,9 +0,0 @@ -// Generated by RSD - Do not modify -package dev.rsdlang.sample.server.service.model.mixins; - -import dev.rsdlang.sample.server.service.model.SimpleRecord; - -public interface RecordMixinMixin { - public SimpleRecord.Data myRecord(); - -} diff --git a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/mixins/UnionMixinMixin.java b/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/mixins/UnionMixinMixin.java deleted file mode 100644 index c24b7067..00000000 --- a/dsl/java-test/java-quarkus/src/main/java/dev/rsdlang/sample/server/service/model/mixins/UnionMixinMixin.java +++ /dev/null @@ -1,9 +0,0 @@ -// Generated by RSD - Do not modify -package dev.rsdlang.sample.server.service.model.mixins; - -import dev.rsdlang.sample.server.service.model.Union; - -public interface UnionMixinMixin { - public Union.Data myUnion(); - -} diff --git a/dsl/packages/cli/src/java-base/base-utils.ts b/dsl/packages/cli/src/java-base/base-utils.ts index f2dcbbf3..f1ed788b 100644 --- a/dsl/packages/cli/src/java-base/base-utils.ts +++ b/dsl/packages/cli/src/java-base/base-utils.ts @@ -20,8 +20,8 @@ export function generateBaseUtilsContent( fqn('java.util.Base64'); fqn('java.util.HexFormat'); - fqn(`${artifactConfig.rootPackageName}.impl.model.json._JsonUtils`); - fqn(`${artifactConfig.rootPackageName}.impl.model.json._JsonUtils.TypeInfo`); + fqn(`${artifactConfig.rootPackageName}.model.impl.json._JsonUtils`); + fqn(`${artifactConfig.rootPackageName}.model.impl.json._JsonUtils.TypeInfo`); fqn(`${artifactConfig.rootPackageName}.model._Base`); const compilationContent = toNodeTree(` diff --git a/dsl/packages/cli/src/java-client-api/error.ts b/dsl/packages/cli/src/java-client-api/error.ts index c7365174..35f861f2 100644 --- a/dsl/packages/cli/src/java-client-api/error.ts +++ b/dsl/packages/cli/src/java-client-api/error.ts @@ -22,7 +22,7 @@ export function generateError( generateCompilationUnit( packageName, importCollector, - generateSource(t, artifactConfig, packageName, importCollector.importType.bind(importCollector)), + generateSource(t, artifactConfig, importCollector.importType.bind(importCollector)), ), '\t', ), @@ -33,17 +33,21 @@ export function generateError( function generateSource( t: MResolvedError, artifactConfig: JavaClientAPIGeneratorConfig, - packageName: string, fqn: (type: string) => string, ): CompositeGeneratorNode { const node = new CompositeGeneratorNode(); if (t.resolvedContentType) { - const type = toAPIType(t.resolvedContentType, artifactConfig.nativeTypeSubstitues, packageName + '.model', fqn); + const type = toAPIType( + t.resolvedContentType, + artifactConfig.nativeTypeSubstitues, + artifactConfig.rootPackageName + '.model', + fqn, + ); const objectType = toAPIType( t.resolvedContentType, artifactConfig.nativeTypeSubstitues, - packageName + '.model', + artifactConfig.rootPackageName + '.model', fqn, { objectType: true }, ); diff --git a/dsl/packages/cli/src/java-rest-client-jdk/base.ts b/dsl/packages/cli/src/java-rest-client-jdk/base.ts index 59a7139a..3d0d8d25 100644 --- a/dsl/packages/cli/src/java-rest-client-jdk/base.ts +++ b/dsl/packages/cli/src/java-rest-client-jdk/base.ts @@ -9,7 +9,7 @@ import { import { generateBaseDTOContent } from '../java-model-json/base.js'; export function generateBase(artifactConfig: JavaRestClientJDKGeneratorConfig): Artifact { - const packageName = `${artifactConfig.rootPackageName}.impl.model.json`; + const packageName = `${artifactConfig.rootPackageName}.model.impl.json`; const importCollector = new JavaImportsCollector(packageName); const fqn = importCollector.importType.bind(importCollector); diff --git a/dsl/packages/cli/src/java-rest-client-jdk/client.ts b/dsl/packages/cli/src/java-rest-client-jdk/client.ts index 0a74c991..c5694f4b 100644 --- a/dsl/packages/cli/src/java-rest-client-jdk/client.ts +++ b/dsl/packages/cli/src/java-rest-client-jdk/client.ts @@ -152,7 +152,7 @@ export function generateClient( clBody.indent(staticBody => { m.elements.filter(isMResolvedRecordType).forEach(e => { const type = fqn(`${basePackage}.model.${e.name}`); - const implType = fqn(`${artifactConfig.rootPackageName}.impl.model.json.${e.name}DataImpl`); + const implType = fqn(`${artifactConfig.rootPackageName}.model.impl.json.${e.name}DataImpl`); staticBody.append(`registerBuilderCreator(${type}.DataBuilder.class, ${implType}.DataBuilderImpl::new);`, NL); }); @@ -161,7 +161,7 @@ export function generateClient( .filter(t => t.patchable) .forEach((e, idx) => { const type = fqn(`${basePackage}.model.${e.name}`); - const implType = fqn(`${artifactConfig.rootPackageName}.impl.model.json.${e.name}PatchImpl`); + const implType = fqn(`${artifactConfig.rootPackageName}.model.impl.json.${e.name}PatchImpl`); if (idx === 0) { staticBody.append(NL); } @@ -343,7 +343,7 @@ export function generateClient( ); clBody.indent(mBody => { mBody.append( - `return ${fqn(`${artifactConfig.rootPackageName}.impl.model.json._BlobImpl`)}.of(file, mimeType);`, + `return ${fqn(`${artifactConfig.rootPackageName}.model.impl.json._BlobImpl`)}.of(file, mimeType);`, NL, ); }); @@ -358,7 +358,7 @@ export function generateClient( ); clBody.indent(mBody => { mBody.append( - `return ${fqn(`${artifactConfig.rootPackageName}.impl.model.json._FileImpl`)}.of(file, mimeType, filename);`, + `return ${fqn(`${artifactConfig.rootPackageName}.model.impl.json._FileImpl`)}.of(file, mimeType, filename);`, NL, ); }); diff --git a/dsl/packages/cli/src/java-rest-client-jdk/json-utils.ts b/dsl/packages/cli/src/java-rest-client-jdk/json-utils.ts index 883b8491..392f633e 100644 --- a/dsl/packages/cli/src/java-rest-client-jdk/json-utils.ts +++ b/dsl/packages/cli/src/java-rest-client-jdk/json-utils.ts @@ -9,7 +9,7 @@ import { import { generateJsonUtilsContent } from '../java-model-json/json-utils.js'; export function generateJsonUtils(artifactConfig: JavaRestClientJDKGeneratorConfig): Artifact { - const packageName = `${artifactConfig.rootPackageName}.impl.model.json`; + const packageName = `${artifactConfig.rootPackageName}.model.impl.json`; const importCollector = new JavaImportsCollector(packageName); const fqn = importCollector.importType.bind(importCollector); diff --git a/dsl/packages/cli/src/java-rest-client-jdk/listchange.ts b/dsl/packages/cli/src/java-rest-client-jdk/listchange.ts index b09b85ed..e89f1dc5 100644 --- a/dsl/packages/cli/src/java-rest-client-jdk/listchange.ts +++ b/dsl/packages/cli/src/java-rest-client-jdk/listchange.ts @@ -9,7 +9,7 @@ import { import { generateChangeSupportContent } from '../java-model-json/listchange-impl.js'; export function generateChangeSupport(artifactConfig: JavaRestClientJDKGeneratorConfig): Artifact[] { - const packageName = `${artifactConfig.rootPackageName}.impl.model.json`; + const packageName = `${artifactConfig.rootPackageName}.model.impl.json`; const rv: Artifact[] = []; { diff --git a/dsl/packages/cli/src/java-rest-client-jdk/nillable-impl.ts b/dsl/packages/cli/src/java-rest-client-jdk/nillable-impl.ts index f276e3a6..152606ff 100644 --- a/dsl/packages/cli/src/java-rest-client-jdk/nillable-impl.ts +++ b/dsl/packages/cli/src/java-rest-client-jdk/nillable-impl.ts @@ -9,7 +9,7 @@ import { import { generateNillableContent } from '../java-model-json/nillable-impl.js'; export function generateNillable(artifactConfig: JavaRestClientJDKGeneratorConfig): Artifact { - const packageName = `${artifactConfig.rootPackageName}.impl.model.json`; + const packageName = `${artifactConfig.rootPackageName}.model.impl.json`; const importCollector = new JavaImportsCollector(packageName); const fqn = importCollector.importType.bind(importCollector); diff --git a/dsl/packages/cli/src/java-rest-client-jdk/record.ts b/dsl/packages/cli/src/java-rest-client-jdk/record.ts index ae00b169..959be928 100644 --- a/dsl/packages/cli/src/java-rest-client-jdk/record.ts +++ b/dsl/packages/cli/src/java-rest-client-jdk/record.ts @@ -15,7 +15,7 @@ export function generateRecord( model: MResolvedRSDModel, artifactConfig: JavaRestClientJDKGeneratorConfig, ): Artifact[] { - const packageName = `${artifactConfig.rootPackageName}.impl.model.json`; + const packageName = `${artifactConfig.rootPackageName}.model.impl.json`; const result: Artifact[] = []; diff --git a/dsl/packages/cli/src/java-rest-client-jdk/response-utils.ts b/dsl/packages/cli/src/java-rest-client-jdk/response-utils.ts index 01cd1a6c..4d932308 100644 --- a/dsl/packages/cli/src/java-rest-client-jdk/response-utils.ts +++ b/dsl/packages/cli/src/java-rest-client-jdk/response-utils.ts @@ -32,17 +32,17 @@ export function generateJDKHttpClientResponseUtils( importCollector.importType('java.nio.file.Files'); importCollector.importType('java.nio.file.Path'); importCollector.importType('java.nio.file.StandardCopyOption'); - importCollector.importType(`${artifactConfig.rootPackageName}.impl.model.json._BlobImpl`); + importCollector.importType(`${artifactConfig.rootPackageName}.model.impl.json._BlobImpl`); importCollector.importType(`${artifactConfig.rootPackageName}.model.RSDBlob`); if (hasFileStreamResult(model)) { - importCollector.importType(`${artifactConfig.rootPackageName}.impl.model.json._FileImpl`); + importCollector.importType(`${artifactConfig.rootPackageName}.model.impl.json._FileImpl`); importCollector.importType(`${artifactConfig.rootPackageName}.model.RSDFile`); } } importCollector.importType('jakarta.json.JsonObject'); - importCollector.importType(`${artifactConfig.rootPackageName}.impl.model.json._JsonUtils`); + importCollector.importType(`${artifactConfig.rootPackageName}.model.impl.json._JsonUtils`); const compilationContent = toNodeTree(` public class JDKHttpClientResponseUtils { diff --git a/dsl/packages/cli/src/java-rest-client-jdk/service.ts b/dsl/packages/cli/src/java-rest-client-jdk/service.ts index 2859417e..99cfa268 100644 --- a/dsl/packages/cli/src/java-rest-client-jdk/service.ts +++ b/dsl/packages/cli/src/java-rest-client-jdk/service.ts @@ -489,7 +489,7 @@ function generateStreamBody( } }); if (hasNonStreamBodyParams) { - const typeName = fqn(`${artifactConfig.rootPackageName}.impl.model.json.${s.name}${toFirstUpper(o.name)}DataImpl`); + const typeName = fqn(`${artifactConfig.rootPackageName}.model.impl.json.${s.name}${toFirstUpper(o.name)}DataImpl`); methodBody.append( `$formDataBuilder.addBytes("_rsdPayload", BaseUtils.ofObject(new ${typeName}($jsonPayload.build()), false, this.contentType(), ${typeName}.class), this.contentType());`, NL, @@ -528,15 +528,15 @@ function jsonPayloadEntry( ): string { const key = p.meta?.rest?.name ?? p.name; if (p.variant === 'record' || p.variant === 'union') { - const _JsonUtils = fqn(`${artifactConfig.rootPackageName}.impl.model.json._JsonUtils`); - const _BaseDataImpl = fqn(`${artifactConfig.rootPackageName}.impl.model.json._BaseDataImpl`); + const _JsonUtils = fqn(`${artifactConfig.rootPackageName}.model.impl.json._JsonUtils`); + const _BaseDataImpl = fqn(`${artifactConfig.rootPackageName}.model.impl.json._BaseDataImpl`); return p.array ? `$jsonPayload.add("${key}", ${_JsonUtils}.toJsonValueArray(${p.name}, i -> ((${_BaseDataImpl}) i).data));` : `$jsonPayload.add("${key}", ((${_BaseDataImpl}) ${p.name}).data);`; } if (p.array) { if (isMBuiltinNumericType(p.type) || p.type === 'boolean') { - const _JsonUtils = fqn(`${artifactConfig.rootPackageName}.impl.model.json._JsonUtils`); + const _JsonUtils = fqn(`${artifactConfig.rootPackageName}.model.impl.json._JsonUtils`); if (p.type === 'boolean') return `$jsonPayload.add("${key}", ${_JsonUtils}.toJsonBooleanArray(${p.name}));`; if (p.type === 'double') return `$jsonPayload.add("${key}", ${_JsonUtils}.toJsonDoubleArray(${p.name}));`; if (p.type === 'float') return `$jsonPayload.add("${key}", ${_JsonUtils}.toJsonFloatArray(${p.name}));`; @@ -581,7 +581,7 @@ function appendEmptyBody( fqn: (type: string) => string, ) { const BodyPublishers = fqn('java.net.http.HttpRequest.BodyPublishers'); - const _JsonUtils = fqn(`${artifactConfig.rootPackageName}.impl.model.json._JsonUtils`); + const _JsonUtils = fqn(`${artifactConfig.rootPackageName}.model.impl.json._JsonUtils`); const defaultContent = multiBodyParam ? `${_JsonUtils}.encodeEmptyObject($contentType)` : `${_JsonUtils}.encodeEmptyValue($contentType)`; @@ -598,7 +598,7 @@ function appendSingleParamBody( const suffix = param.array ? 'List' : ''; const optionalEmpty = param.optional && !param.nullable - ? `${fqn(`${artifactConfig.rootPackageName}.impl.model.json._JsonUtils`)}.encodeEmptyValue($contentType)` + ? `${fqn(`${artifactConfig.rootPackageName}.model.impl.json._JsonUtils`)}.encodeEmptyValue($contentType)` : null; let baseCall: string; @@ -640,9 +640,9 @@ function appendMultiParamBody( methodBody.append(`var $builder = ${Json}.createObjectBuilder();`, NL); bodyParams.forEach(p => { if (p.variant === 'record' || p.variant === 'union') { - const _BaseDataImpl = fqn(`${artifactConfig.rootPackageName}.impl.model.json._BaseDataImpl`); + const _BaseDataImpl = fqn(`${artifactConfig.rootPackageName}.model.impl.json._BaseDataImpl`); if (p.array) { - const _JsonUtils = fqn(`${artifactConfig.rootPackageName}.impl.model.json._JsonUtils`); + const _JsonUtils = fqn(`${artifactConfig.rootPackageName}.model.impl.json._JsonUtils`); appendBuilderAssignment( methodBody, p, @@ -662,7 +662,7 @@ function appendMultiParamBody( methodBody.append('throw new UnsupportedOperationException();', NL); } }); - const typeName = fqn(`${artifactConfig.rootPackageName}.impl.model.json.${s.name}${toFirstUpper(o.name)}DataImpl`); + const typeName = fqn(`${artifactConfig.rootPackageName}.model.impl.json.${s.name}${toFirstUpper(o.name)}DataImpl`); methodBody.append( `var $body = ${BodyPublishers}.ofByteArray(BaseUtils.ofObject(new ${typeName}($builder.build()), false, this.contentType(), ${typeName}.class));`, NL, @@ -824,7 +824,7 @@ function handleOkResult( node.append('var $rv = JDKHttpClientResponseUtils.mapBlob($response);', NL); } } else if (type.variant === 'record' || type.variant === 'union') { - const modelPkg = `${artifactConfig.rootPackageName}.impl.model.json`; + const modelPkg = `${artifactConfig.rootPackageName}.model.impl.json`; const modelType = fqn(`${modelPkg}.${type.type}DataImpl`); if (type.array) { node.append( @@ -901,7 +901,7 @@ function handleErrorResult( if (resolvedError?.contentType && resolvedError.resolvedContentType) { const type = resolvedError.resolvedContentType; if (isMResolvedUnionType(type) || isMResolvedRecordType(type)) { - const modelPkg = `${artifactConfig.rootPackageName}.impl.model.json`; + const modelPkg = `${artifactConfig.rootPackageName}.model.impl.json`; const modelType = fqn(`${modelPkg}.${resolvedError.contentType}DataImpl`); const apiType = toAPIType( resolvedError.resolvedContentType, @@ -1031,7 +1031,7 @@ function generateServiceData( o: MResolvedOperation, artifactConfig: JavaRestClientJDKGeneratorConfig, ): Artifact { - const packageName = `${artifactConfig.rootPackageName}.impl.model.json`; + const packageName = `${artifactConfig.rootPackageName}.model.impl.json`; const importCollector = new JavaImportsCollector(packageName); const fqn = importCollector.importType.bind(importCollector); diff --git a/dsl/packages/cli/src/java-rest-client-jdk/stream-impl.ts b/dsl/packages/cli/src/java-rest-client-jdk/stream-impl.ts index b1651f66..f265e703 100644 --- a/dsl/packages/cli/src/java-rest-client-jdk/stream-impl.ts +++ b/dsl/packages/cli/src/java-rest-client-jdk/stream-impl.ts @@ -21,7 +21,7 @@ export function generateStreamImpls( ): Artifact[] { const rv: Artifact[] = []; if (hasStream(model)) { - const packageName = `${artifactConfig.rootPackageName}.impl.model.json`; + const packageName = `${artifactConfig.rootPackageName}.model.impl.json`; { const importCollector = new JavaImportsCollector(packageName); const fqn = importCollector.importType.bind(importCollector); diff --git a/dsl/packages/cli/src/java-rest-client-jdk/union.ts b/dsl/packages/cli/src/java-rest-client-jdk/union.ts index 2e83ca70..06a47ded 100644 --- a/dsl/packages/cli/src/java-rest-client-jdk/union.ts +++ b/dsl/packages/cli/src/java-rest-client-jdk/union.ts @@ -11,7 +11,7 @@ import { generateUnionContent } from '../java-model-json/union.js'; import { generateUnionPatchContent } from '../java-model-json/union-patch.js'; export function generateUnion(t: MResolvedUnionType, artifactConfig: JavaRestClientJDKGeneratorConfig): Artifact[] { - const packageName = `${artifactConfig.rootPackageName}.impl.model.json`; + const packageName = `${artifactConfig.rootPackageName}.model.impl.json`; const result: Artifact[] = []; { diff --git a/dsl/packages/cli/src/java-server-jakarta-ws/base.ts b/dsl/packages/cli/src/java-server-jakarta-ws/base.ts index c637039f..5372501d 100644 --- a/dsl/packages/cli/src/java-server-jakarta-ws/base.ts +++ b/dsl/packages/cli/src/java-server-jakarta-ws/base.ts @@ -9,7 +9,7 @@ import { import { generateBaseDTOContent } from '../java-model-json/base.js'; export function generateBase(artifactConfig: JavaServerJakartaWSGeneratorConfig): Artifact { - const packageName = `${artifactConfig.rootPackageName}.impl.model.json`; + const packageName = `${artifactConfig.rootPackageName}.model.impl.json`; const importCollector = new JavaImportsCollector(packageName); const fqn = importCollector.importType.bind(importCollector); diff --git a/dsl/packages/cli/src/java-server-jakarta-ws/builder-factory.ts b/dsl/packages/cli/src/java-server-jakarta-ws/builder-factory.ts index db6e29c0..e1804d68 100644 --- a/dsl/packages/cli/src/java-server-jakarta-ws/builder-factory.ts +++ b/dsl/packages/cli/src/java-server-jakarta-ws/builder-factory.ts @@ -41,7 +41,7 @@ function generateDTOBuilderFactoryContent( const Singleton = fqn('jakarta.inject.Singleton'); const DTOBuilderFactory = fqn(`${artifactConfig.rootPackageName}.service.BuilderFactory`); - const Base = fqn(`${artifactConfig.rootPackageName}.service.model._Base`); + const Base = fqn(`${artifactConfig.rootPackageName}.model._Base`); const JsonObject = fqn('jakarta.json.JsonObject'); node.append(`@${Singleton}`, NL); @@ -53,7 +53,7 @@ function generateDTOBuilderFactoryContent( mBody.append(generateBuilderMethodBody(model, artifactConfig, fqn)); }); body.append('}', NL, NL); - body.append(`public T of(Class type, ${JsonObject} data) {`, NL); + body.append(`public T of(Class type, ${JsonObject} data) {`, NL); body.indent(mBody => { mBody.append(generateOfMethodBody(model, artifactConfig, fqn)); }); @@ -62,22 +62,22 @@ function generateDTOBuilderFactoryContent( if (hasStream(model)) { body.appendNewLine(); body.append( - `public ${fqn(`${artifactConfig.rootPackageName}.service.model.RSDBlob`)} createBlob(${fqn('java.nio.file.Path')} file, String mimeType) {`, + `public ${fqn(`${artifactConfig.rootPackageName}.model.RSDBlob`)} createBlob(${fqn('java.nio.file.Path')} file, String mimeType) {`, NL, ); body.indent(mBody => { - const BlobImpl = fqn(`${artifactConfig.rootPackageName}.impl.model.json._BlobImpl`); + const BlobImpl = fqn(`${artifactConfig.rootPackageName}.model.impl.json._BlobImpl`); mBody.append(`return ${BlobImpl}.of(file, mimeType);`, NL); }); body.append('}', NL); body.appendNewLine(); body.append( - `public ${fqn(`${artifactConfig.rootPackageName}.service.model.RSDBlob`)} createBlob(${fqn('java.io.InputStream')} stream, String mimeType) {`, + `public ${fqn(`${artifactConfig.rootPackageName}.model.RSDBlob`)} createBlob(${fqn('java.io.InputStream')} stream, String mimeType) {`, NL, ); body.indent(mBody => { - const StreamBlobImpl = fqn(`${artifactConfig.rootPackageName}.impl.model.json._StreamBlobImpl`); + const StreamBlobImpl = fqn(`${artifactConfig.rootPackageName}.model.impl.json._StreamBlobImpl`); mBody.append(`return ${StreamBlobImpl}.of(stream, mimeType);`, NL); }); body.append('}', NL); @@ -85,25 +85,25 @@ function generateDTOBuilderFactoryContent( if (hasFileStream(model)) { body.appendNewLine(); body.append( - `public ${fqn(`${artifactConfig.rootPackageName}.service.model.RSDFile`)} createFile(${fqn( + `public ${fqn(`${artifactConfig.rootPackageName}.model.RSDFile`)} createFile(${fqn( 'java.nio.file.Path', )} file, String mimeType, String filename) {`, NL, ); body.indent(mBody => { - const FileImpl = fqn(`${artifactConfig.rootPackageName}.impl.model.json._FileImpl`); + const FileImpl = fqn(`${artifactConfig.rootPackageName}.model.impl.json._FileImpl`); mBody.append(`return ${FileImpl}.of(file, mimeType, filename);`, NL); }); body.append('}', NL); body.appendNewLine(); body.append( - `public ${fqn(`${artifactConfig.rootPackageName}.service.model.RSDFile`)} createFile(${fqn( + `public ${fqn(`${artifactConfig.rootPackageName}.model.RSDFile`)} createFile(${fqn( 'java.io.InputStream', )} data, String mimeType, String filename) {`, NL, ); body.indent(mBody => { - const StreamFileImpl = fqn(`${artifactConfig.rootPackageName}.impl.model.json._StreamFileImpl`); + const StreamFileImpl = fqn(`${artifactConfig.rootPackageName}.model.impl.json._StreamFileImpl`); mBody.append(`return ${StreamFileImpl}.of(data, mimeType, filename);`, NL); }); body.append('}', NL); @@ -122,15 +122,15 @@ function generateBuilderMethodBody( ) { const mBody = new CompositeGeneratorNode(); model.elements.filter(isMResolvedRecordType).forEach(t => { - const InterfaceType = fqn(`${artifactConfig.rootPackageName}.service.model.${t.name}`); - const ImplType = fqn(`${artifactConfig.rootPackageName}.impl.model.json.${t.name}DataImpl`); + const InterfaceType = fqn(`${artifactConfig.rootPackageName}.model.${t.name}`); + const ImplType = fqn(`${artifactConfig.rootPackageName}.model.impl.json.${t.name}DataImpl`); mBody.append(`if (type == ${InterfaceType}.DataBuilder.class) {`, NL); mBody.indent(block => { block.append(`return type.cast(${ImplType}.builder());`, NL); }); mBody.append('}', NL); if (t.patchable) { - const PatchImplType = fqn(`${artifactConfig.rootPackageName}.impl.model.json.${t.name}PatchImpl`); + const PatchImplType = fqn(`${artifactConfig.rootPackageName}.model.impl.json.${t.name}PatchImpl`); mBody.append(`if (type == ${InterfaceType}.PatchBuilder.class) {`, NL); mBody.indent(block => { block.append(`return type.cast(${PatchImplType}.builder());`, NL); @@ -152,16 +152,16 @@ function generateOfMethodBody( .filter(isMResolvedRecordType) //.filter(t => t.resolved.unions.length !== 1) .forEach(t => { - const InterfaceType = fqn(`${artifactConfig.rootPackageName}.service.model.${t.name}`); - const ImplType = fqn(`${artifactConfig.rootPackageName}.impl.model.json.${t.name}DataImpl`); + const InterfaceType = fqn(`${artifactConfig.rootPackageName}.model.${t.name}`); + const ImplType = fqn(`${artifactConfig.rootPackageName}.model.impl.json.${t.name}DataImpl`); mBody.append(`if (type == ${InterfaceType}.Data.class) {`, NL); mBody.indent(block => { block.append(`return type.cast(${ImplType}.of(data));`, NL); }); mBody.append('}', NL); if (t.patchable) { - const InterfaceType = fqn(`${artifactConfig.rootPackageName}.service.model.${t.name}`); - const ImplType = fqn(`${artifactConfig.rootPackageName}.impl.model.json.${t.name}PatchImpl`); + const InterfaceType = fqn(`${artifactConfig.rootPackageName}.model.${t.name}`); + const ImplType = fqn(`${artifactConfig.rootPackageName}.model.impl.json.${t.name}PatchImpl`); mBody.append(`if (type == ${InterfaceType}.Patch.class) {`, NL); mBody.indent(block => { block.append(`return type.cast(${ImplType}.of(data));`, NL); @@ -170,16 +170,16 @@ function generateOfMethodBody( } }); model.elements.filter(isMResolvedUnionType).forEach(u => { - const InterfaceType = fqn(`${artifactConfig.rootPackageName}.service.model.${u.name}`); - const ImplType = fqn(`${artifactConfig.rootPackageName}.impl.model.json.${u.name}DataImpl`); + const InterfaceType = fqn(`${artifactConfig.rootPackageName}.model.${u.name}`); + const ImplType = fqn(`${artifactConfig.rootPackageName}.model.impl.json.${u.name}DataImpl`); mBody.append(`if (type == ${InterfaceType}.Data.class) {`, NL); mBody.indent(block => { block.append(`return type.cast(${ImplType}.of(data));`, NL); }); mBody.append('}', NL); if (u.resolved.records.find(r => r.patchable)) { - const InterfaceType = fqn(`${artifactConfig.rootPackageName}.service.model.${u.name}`); - const ImplType = fqn(`${artifactConfig.rootPackageName}.impl.model.json.${u.name}PatchImpl`); + const InterfaceType = fqn(`${artifactConfig.rootPackageName}.model.${u.name}`); + const ImplType = fqn(`${artifactConfig.rootPackageName}.model.impl.json.${u.name}PatchImpl`); mBody.append(`if (type == ${InterfaceType}.Patch.class) {`, NL); mBody.indent(block => { block.append(`return type.cast(${ImplType}.of(data));`, NL); diff --git a/dsl/packages/cli/src/java-server-jakarta-ws/json-utils.ts b/dsl/packages/cli/src/java-server-jakarta-ws/json-utils.ts index 0d1a8e1e..34da7e44 100644 --- a/dsl/packages/cli/src/java-server-jakarta-ws/json-utils.ts +++ b/dsl/packages/cli/src/java-server-jakarta-ws/json-utils.ts @@ -9,14 +9,14 @@ import { import { generateJsonUtilsContent } from '../java-model-json/json-utils.js'; export function generateJsonUtils(artifactConfig: JavaServerJakartaWSGeneratorConfig): Artifact { - const packageName = `${artifactConfig.rootPackageName}.impl.model.json`; + const packageName = `${artifactConfig.rootPackageName}.model.impl.json`; const importCollector = new JavaImportsCollector(packageName); const fqn = importCollector.importType.bind(importCollector); const node = generateJsonUtilsContent( fqn, - `${artifactConfig.rootPackageName}.service.model`, + `${artifactConfig.rootPackageName}.model`, artifactConfig.contentTypeEncodings, ); diff --git a/dsl/packages/cli/src/java-server-jakarta-ws/listchange.ts b/dsl/packages/cli/src/java-server-jakarta-ws/listchange.ts index 30b95686..0c0f296d 100644 --- a/dsl/packages/cli/src/java-server-jakarta-ws/listchange.ts +++ b/dsl/packages/cli/src/java-server-jakarta-ws/listchange.ts @@ -9,7 +9,7 @@ import { import { generateChangeSupportContent } from '../java-model-json/listchange-impl.js'; export function generateChangeSupport(artifactConfig: JavaServerJakartaWSGeneratorConfig): Artifact[] { - const packageName = `${artifactConfig.rootPackageName}.impl.model.json`; + const packageName = `${artifactConfig.rootPackageName}.model.impl.json`; const rv: Artifact[] = []; { @@ -21,7 +21,7 @@ export function generateChangeSupport(artifactConfig: JavaServerJakartaWSGenerat generateCompilationUnit( packageName, importCollector, - generateChangeSupportContent(`${artifactConfig.rootPackageName}.service.model`), + generateChangeSupportContent(`${artifactConfig.rootPackageName}.model`), ), '\t', ), diff --git a/dsl/packages/cli/src/java-server-jakarta-ws/nillable-impl.ts b/dsl/packages/cli/src/java-server-jakarta-ws/nillable-impl.ts index cbeebf11..c49b30ee 100644 --- a/dsl/packages/cli/src/java-server-jakarta-ws/nillable-impl.ts +++ b/dsl/packages/cli/src/java-server-jakarta-ws/nillable-impl.ts @@ -9,12 +9,12 @@ import { import { generateNillableContent } from '../java-model-json/nillable-impl.js'; export function generateNillable(artifactConfig: JavaServerJakartaWSGeneratorConfig): Artifact { - const packageName = `${artifactConfig.rootPackageName}.impl.model.json`; + const packageName = `${artifactConfig.rootPackageName}.model.impl.json`; const importCollector = new JavaImportsCollector(packageName); const fqn = importCollector.importType.bind(importCollector); - const node = generateNillableContent(fqn, `${artifactConfig.rootPackageName}.service.model`); + const node = generateNillableContent(fqn, `${artifactConfig.rootPackageName}.model`); return { name: '_NillableImpl.java', content: toString(generateCompilationUnit(packageName, importCollector, node), '\t'), diff --git a/dsl/packages/cli/src/java-server-jakarta-ws/record.ts b/dsl/packages/cli/src/java-server-jakarta-ws/record.ts index 21238779..72fb7ccb 100644 --- a/dsl/packages/cli/src/java-server-jakarta-ws/record.ts +++ b/dsl/packages/cli/src/java-server-jakarta-ws/record.ts @@ -15,7 +15,7 @@ export function generateRecord( model: MResolvedRSDModel, artifactConfig: JavaServerJakartaWSGeneratorConfig, ): Artifact[] { - const packageName = `${artifactConfig.rootPackageName}.impl.model.json`; + const packageName = `${artifactConfig.rootPackageName}.model.impl.json`; const result: Artifact[] = []; { @@ -32,7 +32,7 @@ export function generateRecord( t, model, artifactConfig.nativeTypeSubstitues, - `${artifactConfig.rootPackageName}.service.model`, + `${artifactConfig.rootPackageName}.model`, fqn, ), ), @@ -56,7 +56,7 @@ export function generateRecord( t, model, artifactConfig.nativeTypeSubstitues, - `${artifactConfig.rootPackageName}.service.model`, + `${artifactConfig.rootPackageName}.model`, fqn, ), ), diff --git a/dsl/packages/cli/src/java-server-jakarta-ws/resource.ts b/dsl/packages/cli/src/java-server-jakarta-ws/resource.ts index 9c479138..f3e8e109 100644 --- a/dsl/packages/cli/src/java-server-jakarta-ws/resource.ts +++ b/dsl/packages/cli/src/java-server-jakarta-ws/resource.ts @@ -208,7 +208,7 @@ function _generateResource( cBody.append(`public ${fqn('jakarta.ws.rs.core.Response')} ${o.name}(${params.join(', ')}) {`, NL); cBody.indent(mBody => { if (o.parameters.some(p => p.variant !== 'stream' && p.meta?.rest?.source === undefined)) { - const _JsonUtils = fqn(`${artifactConfig.rootPackageName}.impl.model.json._JsonUtils`); + const _JsonUtils = fqn(`${artifactConfig.rootPackageName}.model.impl.json._JsonUtils`); const Type = fqn(`${packageName}.model.${s.name}${toFirstUpper(o.name)}DataImpl`); mBody.append( `var $payloadJson = ${_JsonUtils}.parseValue($_payload.filePath(), $_payload.contentType(), ${_JsonUtils}.TypeInfo.value(${Type}.class)).asJsonObject();`, @@ -227,14 +227,14 @@ function _generateResource( if (p.type === 'file') { if (p.array) { if (p.optional && p.nullable) { - const type = `${fqn('java.util.List')}<${fqn(`${artifactConfig.rootPackageName}.service.model.RSDFile`)}>`; + const type = `${fqn('java.util.List')}<${fqn(`${artifactConfig.rootPackageName}.model.RSDFile`)}>`; mBody.append( - `var ${p.name} = _data == null || _data.isEmpty() ? ($is${toFirstUpper(p.name)}Null ? _NillableImpl.<${type}>nill() : _NillableImpl.<${type}>undefined()) : ${fqn(`${artifactConfig.rootPackageName}.impl.model.json._NillableImpl`)}.of(_data.stream().map($e -> builderFactory.createFile($e.filePath(), $e.contentType(), $e.fileName())).toList());`, + `var ${p.name} = _data == null || _data.isEmpty() ? ($is${toFirstUpper(p.name)}Null ? ${fqn(`${artifactConfig.rootPackageName}.model.impl.json._NillableImpl`)}.<${type}>nill() : ${fqn(`${artifactConfig.rootPackageName}.model.impl.json._NillableImpl`)}.<${type}>undefined()) : ${fqn(`${artifactConfig.rootPackageName}.model.impl.json._NillableImpl`)}.of(_data.stream().map($e -> builderFactory.createFile($e.filePath(), $e.contentType(), $e.fileName())).toList());`, NL, ); } else if (p.optional || p.nullable) { mBody.append( - `var ${p.name} = _data == null || _data.isEmpty() ? ${fqn('java.util.Optional')}.<${fqn('java.util.List')}<${fqn(`${artifactConfig.rootPackageName}.service.model.RSDFile`)}>>empty() : ${fqn('java.util.Optional')}.of(_data.stream().map($e -> builderFactory.createFile($e.filePath(), $e.contentType(), $e.fileName())).toList());`, + `var ${p.name} = _data == null || _data.isEmpty() ? ${fqn('java.util.Optional')}.<${fqn('java.util.List')}<${fqn(`${artifactConfig.rootPackageName}.model.RSDFile`)}>>empty() : ${fqn('java.util.Optional')}.of(_data.stream().map($e -> builderFactory.createFile($e.filePath(), $e.contentType(), $e.fileName())).toList());`, NL, ); } else { @@ -245,15 +245,15 @@ function _generateResource( } } else { if (p.optional && p.nullable) { - const nillType = fqn(`${artifactConfig.rootPackageName}.impl.model.json._NillableImpl`); - const type = fqn(`${artifactConfig.rootPackageName}.service.model.RSDFile`); + const nillType = fqn(`${artifactConfig.rootPackageName}.model.impl.json._NillableImpl`); + const type = fqn(`${artifactConfig.rootPackageName}.model.RSDFile`); mBody.append( `var ${p.name} = _${p.name} == null ? ($is${toFirstUpper(p.name)}Null ? ${nillType}.<${type}>nill() : ${nillType}.<${type}>undefined()) : ${nillType}.of(builderFactory.createFile(_${p.name}.filePath(), _${p.name}.contentType(), _${p.name}.fileName()));`, NL, ); } else if (p.optional || p.nullable) { mBody.append( - `var ${p.name} = _${p.name} != null ? ${fqn('java.util.Optional')}.of(builderFactory.createFile(_${p.name}.filePath(), _${p.name}.contentType(), _${p.name}.fileName())) : Optional.<${fqn(`${artifactConfig.rootPackageName}.service.model.RSDFile`)}>empty();`, + `var ${p.name} = _${p.name} != null ? ${fqn('java.util.Optional')}.of(builderFactory.createFile(_${p.name}.filePath(), _${p.name}.contentType(), _${p.name}.fileName())) : Optional.<${fqn(`${artifactConfig.rootPackageName}.model.RSDFile`)}>empty();`, NL, ); } else { @@ -266,14 +266,14 @@ function _generateResource( } else { if (p.array) { if (p.optional && p.nullable) { - const type = `${fqn('java.util.List')}<${fqn(`${artifactConfig.rootPackageName}.service.model.RSDBlob`)}>`; + const type = `${fqn('java.util.List')}<${fqn(`${artifactConfig.rootPackageName}.model.RSDBlob`)}>`; mBody.append( - `var ${p.name} = _data == null || _data.isEmpty() ? ($is${toFirstUpper(p.name)}Null ? _NillableImpl.<${type}>nill() : _NillableImpl.<${type}>undefined()) : ${fqn(`${artifactConfig.rootPackageName}.impl.model.json._NillableImpl`)}.of(_data.stream().map($e -> builderFactory.createBlob($e.filePath(), $e.contentType())).toList());`, + `var ${p.name} = _data == null || _data.isEmpty() ? ($is${toFirstUpper(p.name)}Null ? _NillableImpl.<${type}>nill() : _NillableImpl.<${type}>undefined()) : ${fqn(`${artifactConfig.rootPackageName}.model.impl.json._NillableImpl`)}.of(_data.stream().map($e -> builderFactory.createBlob($e.filePath(), $e.contentType())).toList());`, NL, ); } else if (p.optional || p.nullable) { mBody.append( - `var ${p.name} = _data == null || _data.isEmpty() ? ${fqn('java.util.Optional')}.<${fqn('java.util.List')}<${fqn(`${artifactConfig.rootPackageName}.service.model.RSDBlob`)}>>empty() : ${fqn('java.util.Optional')}.of(_data.stream().map($e -> builderFactory.createBlob($e.filePath(), $e.contentType())).toList());`, + `var ${p.name} = _data == null || _data.isEmpty() ? ${fqn('java.util.Optional')}.<${fqn('java.util.List')}<${fqn(`${artifactConfig.rootPackageName}.model.RSDBlob`)}>>empty() : ${fqn('java.util.Optional')}.of(_data.stream().map($e -> builderFactory.createBlob($e.filePath(), $e.contentType())).toList());`, NL, ); } else { @@ -284,15 +284,15 @@ function _generateResource( } } else { if (p.optional && p.nullable) { - const nillType = fqn(`${artifactConfig.rootPackageName}.impl.model.json._NillableImpl`); - const type = fqn(`${artifactConfig.rootPackageName}.service.model.RSDBlob`); + const nillType = fqn(`${artifactConfig.rootPackageName}.model.impl.json._NillableImpl`); + const type = fqn(`${artifactConfig.rootPackageName}.model.RSDBlob`); mBody.append( `var ${p.name} = _${p.name} == null ? ($is${toFirstUpper(p.name)}Null ? ${nillType}.<${type}>nill() : ${nillType}.<${type}>undefined()) : ${nillType}.of(builderFactory.createBlob(_${p.name}.filePath(), _${p.name}.contentType()));`, NL, ); } else if (p.optional || p.nullable) { mBody.append( - `var ${p.name} = _${p.name} != null ? ${fqn('java.util.Optional')}.of(builderFactory.createBlob(_${p.name}.filePath(), _${p.name}.contentType())) : Optional.<${fqn(`${artifactConfig.rootPackageName}.service.model.RSDBlob`)}>empty();`, + `var ${p.name} = _${p.name} != null ? ${fqn('java.util.Optional')}.of(builderFactory.createBlob(_${p.name}.filePath(), _${p.name}.contentType())) : Optional.<${fqn(`${artifactConfig.rootPackageName}.model.RSDBlob`)}>empty();`, NL, ); } else { @@ -498,7 +498,7 @@ function generateResourceMethod( } }); if (multiBody) { - const _JsonUtils = fqn(`${artifactConfig.rootPackageName}.impl.model.json._JsonUtils`); + const _JsonUtils = fqn(`${artifactConfig.rootPackageName}.model.impl.json._JsonUtils`); const Type = fqn(`${packageName}.model.${s.name}${toFirstUpper(o.name)}DataImpl`); mBody.append(`var dto = ${_JsonUtils}.parseObject(data, ${contentTypeText}, ${Type}::new, ${Type}.class);`, NL); } @@ -540,8 +540,8 @@ function enumParameter( asJSON: boolean, contentTypeText: string, ) { - const t = fqn(`${artifactConfig.rootPackageName}.service.model.${p.type}`); - const _Util = asJSON ? fqn(`${artifactConfig.rootPackageName}.impl.model.json._JsonUtils`) : '_RestUtils'; + const t = fqn(`${artifactConfig.rootPackageName}.model.${p.type}`); + const _Util = asJSON ? fqn(`${artifactConfig.rootPackageName}.model.impl.json._JsonUtils`) : '_RestUtils'; const node = new CompositeGeneratorNode(); if (p.array) { if (asJSON) { @@ -603,7 +603,7 @@ function builtinParameter( asJSON: boolean, contentTypeText: string, ) { - const _Util = asJSON ? fqn(`${artifactConfig.rootPackageName}.impl.model.json._JsonUtils`) : '_RestUtils'; + const _Util = asJSON ? fqn(`${artifactConfig.rootPackageName}.model.impl.json._JsonUtils`) : '_RestUtils'; const node = new CompositeGeneratorNode(); if (p.array) { if (asJSON) { @@ -716,11 +716,11 @@ function recordUnionParameter( const type = computeParameterAPIType( p, artifactConfig.nativeTypeSubstitues, - `${artifactConfig.rootPackageName}.service.model`, + `${artifactConfig.rootPackageName}.model`, fqn, true, ); - const _JsonUtils = fqn(`${artifactConfig.rootPackageName}.impl.model.json._JsonUtils`); + const _JsonUtils = fqn(`${artifactConfig.rootPackageName}.model.impl.json._JsonUtils`); const node = new CompositeGeneratorNode(); if (p.array) { if (asJSON) { @@ -877,7 +877,7 @@ function inlineEnumParameter( contentTypeText: string, ) { const t = `${Service}.` + toFirstUpper(o.name) + '_' + toFirstUpper(p.name) + '_Param$'; - const _Util = asJSON ? fqn(`${artifactConfig.rootPackageName}.impl.model.json._JsonUtils`) : '_RestUtils'; + const _Util = asJSON ? fqn(`${artifactConfig.rootPackageName}.model.impl.json._JsonUtils`) : '_RestUtils'; const node = new CompositeGeneratorNode(); if (p.array) { if (asJSON) { @@ -932,9 +932,9 @@ function scalarParameter( if (artifactConfig.nativeTypeSubstitues && type in artifactConfig.nativeTypeSubstitues) { t = resolveType(type, artifactConfig.nativeTypeSubstitues, fqn, false); } else { - t = fqn(`${artifactConfig.rootPackageName}.service.model.${type}`); + t = fqn(`${artifactConfig.rootPackageName}.model.${type}`); } - const _Util = asJSON ? fqn(`${artifactConfig.rootPackageName}.impl.model.json._JsonUtils`) : '_RestUtils'; + const _Util = asJSON ? fqn(`${artifactConfig.rootPackageName}.model.impl.json._JsonUtils`) : '_RestUtils'; const node = new CompositeGeneratorNode(); if (p.array) { if (asJSON) { @@ -1112,7 +1112,7 @@ function generateServiceData( const fqn = importCollector.importType.bind(importCollector); const JsonObject = fqn('jakarta.json.JsonObject'); - const _BaseDataImpl = fqn(`${artifactConfig.rootPackageName}.impl.model.json._BaseDataImpl`); + const _BaseDataImpl = fqn(`${artifactConfig.rootPackageName}.model.impl.json._BaseDataImpl`); const node = new CompositeGeneratorNode(); node.append(`public class ${s.name}${toFirstUpper(o.name)}DataImpl extends ${_BaseDataImpl} {`, NL); @@ -1131,14 +1131,14 @@ function generateServiceData( ? computeParameterAPITypeNG( p, artifactConfig.nativeTypeSubstitues, - `${artifactConfig.rootPackageName}.service.model`, + `${artifactConfig.rootPackageName}.model`, fqn, o.name, ) : computeParameterAPITypeNG( p, artifactConfig.nativeTypeSubstitues, - `${artifactConfig.rootPackageName}.service.model`, + `${artifactConfig.rootPackageName}.model`, fqn, ); classBody.append(`public ${type} ${p.name}() {`, NL); @@ -1148,7 +1148,7 @@ function generateServiceData( p, artifactConfig, artifactConfig.nativeTypeSubstitues, - `${artifactConfig.rootPackageName}.service.model`, + `${artifactConfig.rootPackageName}.model`, fqn, o, ), @@ -1178,7 +1178,7 @@ function generateParameterContent( let mapper: string; const array = prop.array; - const _JsonUtils = fqn(`${artifactConfig.rootPackageName}.impl.model.json._JsonUtils`); + const _JsonUtils = fqn(`${artifactConfig.rootPackageName}.model.impl.json._JsonUtils`); if (isMBuiltinType(prop.type)) { if (array) { @@ -1267,7 +1267,7 @@ function generateParameterContent( } } else { const type = fqn( - `${artifactConfig.rootPackageName}.impl.model.json.${prop.patch ? `${prop.type}PatchImpl` : `${prop.type}DataImpl`}`, + `${artifactConfig.rootPackageName}.model.impl.json.${prop.patch ? `${prop.type}PatchImpl` : `${prop.type}DataImpl`}`, ); if (array) { if (prop.optional && prop.nullable) { diff --git a/dsl/packages/cli/src/java-server-jakarta-ws/response-builder.ts b/dsl/packages/cli/src/java-server-jakarta-ws/response-builder.ts index 0048b948..826a415b 100644 --- a/dsl/packages/cli/src/java-server-jakarta-ws/response-builder.ts +++ b/dsl/packages/cli/src/java-server-jakarta-ws/response-builder.ts @@ -26,7 +26,7 @@ export function generateResponseBuilder( generateCompilationUnit( packageName, importCollector, - generateContent(s, model, artifactConfig, `${artifactConfig.rootPackageName}.service.model`, fqn), + generateContent(s, model, artifactConfig, `${artifactConfig.rootPackageName}.model`, fqn), ), '\t', ), @@ -70,7 +70,7 @@ function generateContent( methodBody.append(`return _RestUtils.toStreamResponse(${code.toFixed()}, $result);`, NL); } } else { - const JsonUtils = fqn(`${artifactConfig.rootPackageName}.impl.model.json._JsonUtils`); + const JsonUtils = fqn(`${artifactConfig.rootPackageName}.model.impl.json._JsonUtils`); const content = toNodeTree(` return ${Response}.status(${code.toFixed()}) .type($contentType) @@ -104,7 +104,7 @@ function toParameter( } if (parameter.optional && parameter.nullable) { - t = fqn(`${artifactConfig.rootPackageName}.service.model._Base`) + `.Nillable<${t}>`; + t = fqn(`${artifactConfig.rootPackageName}.model._Base`) + `.Nillable<${t}>`; } else if (parameter.optional || parameter.nullable) { t = fqn('java.util.Optional') + `<${t}>`; } @@ -115,14 +115,14 @@ function toParameter( let type = computeParameterAPIType( parameter, artifactConfig.nativeTypeSubstitues, - `${artifactConfig.rootPackageName}.service.model`, + `${artifactConfig.rootPackageName}.model`, fqn, false, methodName, ); if (parameter.optional && parameter.nullable) { - type = fqn(`${artifactConfig.rootPackageName}.service.model._Base`) + `.Nillable<${type}>`; + type = fqn(`${artifactConfig.rootPackageName}.model._Base`) + `.Nillable<${type}>`; } else if (parameter.optional || parameter.nullable) { if (!parameter.array && parameter.type === 'int') { type = fqn('java.util.OptionalInt'); @@ -145,7 +145,7 @@ function toResultType( methodName: string, serviceName: string, ) { - const dtoPkg = `${artifactConfig.rootPackageName}.service.model`; + const dtoPkg = `${artifactConfig.rootPackageName}.model`; if (type === undefined) { return 'void'; } diff --git a/dsl/packages/cli/src/java-server-jakarta-ws/rest-utils.ts b/dsl/packages/cli/src/java-server-jakarta-ws/rest-utils.ts index 8778c72d..4bd37e61 100644 --- a/dsl/packages/cli/src/java-server-jakarta-ws/rest-utils.ts +++ b/dsl/packages/cli/src/java-server-jakarta-ws/rest-utils.ts @@ -71,7 +71,7 @@ function generateStreamResultHelper( fqn: (type: string) => string, ) { const StreamingOutput = fqn('jakarta.ws.rs.core.StreamingOutput'); - const _Blob = fqn(`${artifactConfig.rootPackageName}.service.model.RSDBlob`); + const _Blob = fqn(`${artifactConfig.rootPackageName}.model.RSDBlob`); fqn('java.io.OutputStream'); fqn('java.io.IOException'); fqn('jakarta.ws.rs.WebApplicationException'); @@ -98,7 +98,7 @@ function generateStreamResultHelper( ); mBody.append('var builder = Response.status(status).entity(new FileStreamingOutput()).type(mediaType);', NL); if (hasFileStreamResult(model)) { - fqn(`${artifactConfig.rootPackageName}.service.model.RSDFile`); + fqn(`${artifactConfig.rootPackageName}.model.RSDFile`); mBody.append('if (blob instanceof RSDFile f) {', NL); mBody.indent(block => { block.append('var fileName = f.filename().replace("\\"", "");', NL); @@ -122,7 +122,7 @@ function toResponse( packageName: string, fqn: (type: string) => string, ) { - fqn(`${artifactConfig.rootPackageName}.impl.model.json._JsonUtils`); + fqn(`${artifactConfig.rootPackageName}.model.impl.json._JsonUtils`); fqn(`${artifactConfig.rootPackageName}.service.RSDException`); fqn('jakarta.ws.rs.core.Response'); fqn('jakarta.ws.rs.core.MediaType'); @@ -162,8 +162,8 @@ function parseFunctions(artifactConfig: JavaServerJakartaWSGeneratorConfig, fqn: fqn('java.util.regex.Pattern'); fqn('java.io.InputStream'); fqn('java.io.ByteArrayInputStream'); - fqn(`${artifactConfig.rootPackageName}.service.model._Base`); - fqn(`${artifactConfig.rootPackageName}.impl.model.json._NillableImpl`); + fqn(`${artifactConfig.rootPackageName}.model._Base`); + fqn(`${artifactConfig.rootPackageName}.model.impl.json._NillableImpl`); return toNodeTree(` private static final Pattern SPLIT_COMMA_PATTERN = Pattern.compile(","); private static final Pattern UNESCAPE_PATTERN = Pattern.compile("\\\\\\\\u([0-9a-fA-F]{4})"); diff --git a/dsl/packages/cli/src/java-server-jakarta-ws/stream-impl.ts b/dsl/packages/cli/src/java-server-jakarta-ws/stream-impl.ts index 9a8fae0d..46542b05 100644 --- a/dsl/packages/cli/src/java-server-jakarta-ws/stream-impl.ts +++ b/dsl/packages/cli/src/java-server-jakarta-ws/stream-impl.ts @@ -21,7 +21,7 @@ export function generateStreamImpls( ): Artifact[] { const rv: Artifact[] = []; if (hasStream(model)) { - const packageName = `${artifactConfig.rootPackageName}.impl.model.json`; + const packageName = `${artifactConfig.rootPackageName}.model.impl.json`; { const importCollector = new JavaImportsCollector(packageName); const fqn = importCollector.importType.bind(importCollector); @@ -31,7 +31,7 @@ export function generateStreamImpls( generateCompilationUnit( packageName, importCollector, - generateBlobImpl(`${artifactConfig.rootPackageName}.service.model`, fqn), + generateBlobImpl(`${artifactConfig.rootPackageName}.model`, fqn), ), '\t', ), @@ -48,7 +48,7 @@ export function generateStreamImpls( generateCompilationUnit( packageName, importCollector, - generateStreamBlobImpl(`${artifactConfig.rootPackageName}.service.model`, fqn), + generateStreamBlobImpl(`${artifactConfig.rootPackageName}.model`, fqn), ), '\t', ), @@ -66,7 +66,7 @@ export function generateStreamImpls( generateCompilationUnit( packageName, importCollector, - generateFileImpl(`${artifactConfig.rootPackageName}.service.model`, fqn), + generateFileImpl(`${artifactConfig.rootPackageName}.model`, fqn), ), '\t', ), @@ -83,7 +83,7 @@ export function generateStreamImpls( generateCompilationUnit( packageName, importCollector, - generateStreamFileImpl(`${artifactConfig.rootPackageName}.service.model`, fqn), + generateStreamFileImpl(`${artifactConfig.rootPackageName}.model`, fqn), ), '\t', ), diff --git a/dsl/packages/cli/src/java-server-jakarta-ws/union.ts b/dsl/packages/cli/src/java-server-jakarta-ws/union.ts index ae69e0a0..eb188cbd 100644 --- a/dsl/packages/cli/src/java-server-jakarta-ws/union.ts +++ b/dsl/packages/cli/src/java-server-jakarta-ws/union.ts @@ -12,7 +12,7 @@ import { generateUnionContent } from '../java-model-json/union.js'; import { generateUnionPatchContent } from '../java-model-json/union-patch.js'; export function generateUnion(t: MResolvedUnionType, artifactConfig: JavaServerJakartaWSGeneratorConfig): Artifact[] { - const packageName = `${artifactConfig.rootPackageName}.impl.model.json`; + const packageName = `${artifactConfig.rootPackageName}.model.impl.json`; const result: Artifact[] = []; { @@ -25,12 +25,7 @@ export function generateUnion(t: MResolvedUnionType, artifactConfig: JavaServerJ generateCompilationUnit( packageName, importCollector, - generateUnionContent( - t, - artifactConfig.nativeTypeSubstitues, - `${artifactConfig.rootPackageName}.service.model`, - fqn, - ), + generateUnionContent(t, artifactConfig.nativeTypeSubstitues, `${artifactConfig.rootPackageName}.model`, fqn), ), '\t', ), @@ -51,7 +46,7 @@ export function generateUnion(t: MResolvedUnionType, artifactConfig: JavaServerJ generateUnionPatchContent( t, artifactConfig.nativeTypeSubstitues, - `${artifactConfig.rootPackageName}.service.model`, + `${artifactConfig.rootPackageName}.model`, fqn, ), ), diff --git a/dsl/packages/cli/src/java-server/base-dto.ts b/dsl/packages/cli/src/java-server/base-dto.ts index 34b52673..f32c543d 100644 --- a/dsl/packages/cli/src/java-server/base-dto.ts +++ b/dsl/packages/cli/src/java-server/base-dto.ts @@ -5,7 +5,7 @@ import { generateCompilationUnit, JavaImportsCollector, JavaServerGeneratorConfi import { generateBaseContent } from '../java-model-api/base.js'; export function generateBaseDTO(artifactConfig: JavaServerGeneratorConfig): Artifact { - const packageName = `${artifactConfig.rootPackageName}.service.model`; + const packageName = `${artifactConfig.rootPackageName}.model`; const importCollector = new JavaImportsCollector(packageName); const fqn = importCollector.importType.bind(importCollector); diff --git a/dsl/packages/cli/src/java-server/builder-factory.ts b/dsl/packages/cli/src/java-server/builder-factory.ts index 45209a21..917a98a5 100644 --- a/dsl/packages/cli/src/java-server/builder-factory.ts +++ b/dsl/packages/cli/src/java-server/builder-factory.ts @@ -22,7 +22,11 @@ export function generateDTOBuilderFactory( return { name: 'BuilderFactory.java', content: toString( - generateCompilationUnit(packageName, importCollector, generateDTOBuilderFactoryContent(model, packageName, fqn)), + generateCompilationUnit( + packageName, + importCollector, + generateDTOBuilderFactoryContent(model, artifactConfig.rootPackageName, fqn), + ), '\t', ), path: toPath(artifactConfig.targetFolder, packageName), diff --git a/dsl/packages/cli/src/java-server/enum.ts b/dsl/packages/cli/src/java-server/enum.ts index 5508eda1..444d364f 100644 --- a/dsl/packages/cli/src/java-server/enum.ts +++ b/dsl/packages/cli/src/java-server/enum.ts @@ -6,7 +6,7 @@ import { MEnumType } from '../model.js'; import { generateEnumContent } from '../java-model-api/enum.js'; export function generateEnum(t: MEnumType, artifactConfig: JavaServerGeneratorConfig): Artifact { - const packageName = `${artifactConfig.rootPackageName}.service.model`; + const packageName = `${artifactConfig.rootPackageName}.model`; const node = generateEnumContent(t); diff --git a/dsl/packages/cli/src/java-server/mixin.ts b/dsl/packages/cli/src/java-server/mixin.ts index bc825e8d..b4c9af12 100644 --- a/dsl/packages/cli/src/java-server/mixin.ts +++ b/dsl/packages/cli/src/java-server/mixin.ts @@ -5,7 +5,7 @@ import { MResolvedMixinType } from '../model.js'; import { generateMixinContent as generateMixinContent_ } from '../java-model-api/mixin.js'; export function generateMixin(t: MResolvedMixinType, artifactConfig: JavaServerGeneratorConfig): Artifact { - const basePackageName = `${artifactConfig.rootPackageName}.service.model`; + const basePackageName = `${artifactConfig.rootPackageName}.model`; const packageName = `${basePackageName}.mixins`; const importCollector = new JavaImportsCollector(packageName); diff --git a/dsl/packages/cli/src/java-server/record.ts b/dsl/packages/cli/src/java-server/record.ts index 8f8ec886..c383f03a 100644 --- a/dsl/packages/cli/src/java-server/record.ts +++ b/dsl/packages/cli/src/java-server/record.ts @@ -9,7 +9,7 @@ export function generateRecord( model: MResolvedRSDModel, artifactConfig: JavaServerGeneratorConfig, ): Artifact | undefined { - const packageName = `${artifactConfig.rootPackageName}.service.model`; + const packageName = `${artifactConfig.rootPackageName}.model`; const importCollector = new JavaImportsCollector(packageName); const fqn = importCollector.importType.bind(importCollector); diff --git a/dsl/packages/cli/src/java-server/scalar.ts b/dsl/packages/cli/src/java-server/scalar.ts index 5a306275..ad83101c 100644 --- a/dsl/packages/cli/src/java-server/scalar.ts +++ b/dsl/packages/cli/src/java-server/scalar.ts @@ -9,7 +9,7 @@ export function generateScalar(t: MScalarType, artifactConfig: JavaServerGenerat return undefined; } - const packageName = `${artifactConfig.rootPackageName}.service.model`; + const packageName = `${artifactConfig.rootPackageName}.model`; const importCollector = new JavaImportsCollector(packageName); diff --git a/dsl/packages/cli/src/java-server/service.ts b/dsl/packages/cli/src/java-server/service.ts index f1e59230..1625ee3a 100644 --- a/dsl/packages/cli/src/java-server/service.ts +++ b/dsl/packages/cli/src/java-server/service.ts @@ -131,14 +131,14 @@ function toParameter( let type = computeParameterAPIType( parameter, artifactConfig.nativeTypeSubstitues, - `${artifactConfig.rootPackageName}.service.model`, + `${artifactConfig.rootPackageName}.model`, fqn, false, methodName, ); if (parameter.optional && parameter.nullable) { - type = fqn(`${artifactConfig.rootPackageName}.service.model._Base`) + `.Nillable<${type}>`; + type = fqn(`${artifactConfig.rootPackageName}.model._Base`) + `.Nillable<${type}>`; } else if (parameter.optional || parameter.nullable) { if (!parameter.array && parameter.type === 'int') { type = fqn('java.util.OptionalInt'); @@ -160,7 +160,7 @@ function toResultType( fqn: (type: string) => string, methodName: string, ) { - const dtoPkg = `${artifactConfig.rootPackageName}.service.model`; + const dtoPkg = `${artifactConfig.rootPackageName}.model`; if (type === undefined) { return 'void'; } diff --git a/dsl/packages/cli/src/java-server/stream-dto.ts b/dsl/packages/cli/src/java-server/stream-dto.ts index 076e69ae..907b3fa7 100644 --- a/dsl/packages/cli/src/java-server/stream-dto.ts +++ b/dsl/packages/cli/src/java-server/stream-dto.ts @@ -9,7 +9,7 @@ export function generateStreamDTO(artifactConfig: JavaServerGeneratorConfig, mod const artifacts: Artifact[] = []; if (hasStream(model)) { - const packageName = `${artifactConfig.rootPackageName}.service.model`; + const packageName = `${artifactConfig.rootPackageName}.model`; { const importCollector = new JavaImportsCollector(packageName); diff --git a/dsl/packages/cli/src/java-server/union.ts b/dsl/packages/cli/src/java-server/union.ts index 0c6e4997..a13d3714 100644 --- a/dsl/packages/cli/src/java-server/union.ts +++ b/dsl/packages/cli/src/java-server/union.ts @@ -1,17 +1,12 @@ import { toString } from 'langium/generate'; -import { - JavaImportsCollector, - JavaClientAPIGeneratorConfig, - generateCompilationUnit, - toPath, -} from '../java-gen-utils.js'; +import { JavaImportsCollector, JavaServerGeneratorConfig, generateCompilationUnit, toPath } from '../java-gen-utils.js'; import { MResolvedUnionType } from '../model.js'; import { Artifact } from '../artifact-generator.js'; import { generateUnionContent as generateUnionContent_ } from '../java-model-api/union.js'; -export function generateUnion(t: MResolvedUnionType, artifactConfig: JavaClientAPIGeneratorConfig): Artifact { - const packageName = `${artifactConfig.rootPackageName}.service.model`; +export function generateUnion(t: MResolvedUnionType, artifactConfig: JavaServerGeneratorConfig): Artifact { + const packageName = `${artifactConfig.rootPackageName}.model`; const importCollector = new JavaImportsCollector(packageName); const fqn = importCollector.importType.bind(importCollector);