🎯 Add unified shared types across databases and OpenAPI sources

bleep.yaml

@@ -283,6 +283,31 @@ projects:
     folder: ./testers/openapi/scala/spring
     isTestProject: true
     sources: ./testapi
+  testers/combined/java:
+    dependencies:
+    - com.fasterxml.jackson.core:jackson-annotations:2.17.2
+    - com.fasterxml.jackson.core:jackson-databind:2.17.2
+    - com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.17.2
+    - com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.17.2
+    - com.novocode:junit-interface:0.11
+    - io.smallrye.reactive:mutiny:2.6.1
+    - io.smallrye.reactive:mutiny-zero-flow-adapters:1.0.0
+    - jakarta.validation:jakarta.validation-api:3.0.2
+    - jakarta.ws.rs:jakarta.ws.rs-api:3.1.0
+    - junit:junit:4.13.2
+    - org.mariadb.jdbc:mariadb-java-client:3.5.0
+    - org.postgresql:postgresql:42.7.3
+    dependsOn: foundations-jdbc-dsl
+    isTestProject: true
+    java:
+      options: -proc:none
+    platform:
+      name: jvm
+    sources:
+    - ./generated-and-checked-in/shared
+    - ./generated-and-checked-in/postgres
+    - ./generated-and-checked-in/mariadb
+    - ./generated-and-checked-in/api
   testers/oracle/java:
     dependencies:
     - com.fasterxml.jackson.core:jackson-annotations:2.17.2
@@ -543,6 +568,9 @@ scripts:
     main: scripts.GeneratedMariaDb
     project: typr-scripts
     sourceGlobs: ../mariadb_sql
+  generate-combined-test:
+    main: scripts.GenerateCombinedTest
+    project: typr-scripts
   generate-openapi-test:
     main: scripts.GenerateOpenApiTest
     project: typr-scripts

site-in/patterns/multi-repo.md

@@ -142,7 +142,7 @@ object DomainInsert extends TestDomainInsert {
 val testInsert = new TestInsert(new Random(1), DomainInsert)
 
 val businessentityRow = testInsert.personBusinessentity()
-val personRow = testInsert.personPerson(businessentityRow.businessentityid, persontype = "SC", FirstName("name"))
+val personRow = testInsert.personPerson(businessentityRow.businessentityid, persontype = "SC", firstname = FirstName(Name("name")))
 val countryregionRow = testInsert.personCountryregion(CountryregionId("NOR"))
 val salesterritoryRow = testInsert.salesSalesterritory(countryregionRow.countryregioncode)
 val stateprovinceRow = testInsert.personStateprovince(countryregionRow.countryregioncode, salesterritoryRow.territoryid)

site/showcase-generated

@@ -0,0 +1 @@
+../showcase-generated

snapshot-tests/java-sql/DSLTest/allCombinesBooleanExpressions.sql

@@ -1,2 +1,2 @@
 select personperson0."businessentityid", personperson0."persontype", personperson0."namestyle", personperson0."title", personperson0."firstname", personperson0."middlename", personperson0."lastname", personperson0."suffix", personperson0."emailpromotion", personperson0."additionalcontactinfo", personperson0."demographics", personperson0."rowguid", personperson0."modifieddate"
-from (select * from "person"."person" personperson0 where ((((personperson0)."persontype"  = ?::bpchar) AND ((personperson0)."firstname"  = ?)) AND ((personperson0)."lastname"  = ?::"public"."Name"))) personperson0
+from (select * from "person"."person" personperson0 where ((((personperson0)."persontype"  = ?::bpchar) AND ((personperson0)."firstname"  = ?::"public"."Name")) AND ((personperson0)."lastname"  = ?::"public"."Name"))) personperson0

testers/combined/java/generated-and-checked-in/api/combined/api/api/CustomersApi.java

@@ -0,0 +1,30 @@
+/**
+ * File has been automatically generated by `typo`.
+ *
+ * <p>IF YOU CHANGE THIS FILE YOUR CHANGES WILL BE OVERWRITTEN.
+ */
+package combined.api.api;
+
+import combined.api.model.Customer;
+import combined.api.model.CustomerCreate;
+import combined.api.model.CustomerUpdate;
+import io.smallrye.mutiny.Uni;
+import java.util.List;
+import java.util.Optional;
+
+public interface CustomersApi {
+  /** Create a new customer */
+  Uni<Customer> createCustomer(CustomerCreate body);
+
+  /** Get customer by ID */
+  Uni<Customer> getCustomer(Long customerId);
+
+  /** List all customers */
+  Uni<List<Customer>> listCustomers(
+
+      /** Filter by active status */
+      Optional<Boolean> isActive);
+
+  /** Update customer */
+  Uni<Customer> updateCustomer(Long customerId, CustomerUpdate body);
+}

testers/combined/java/generated-and-checked-in/api/combined/api/api/CustomersApiServer.java

@@ -0,0 +1,58 @@
+/**
+ * File has been automatically generated by `typo`.
+ *
+ * <p>IF YOU CHANGE THIS FILE YOUR CHANGES WILL BE OVERWRITTEN.
+ */
+package combined.api.api;
+
+import combined.api.model.Customer;
+import combined.api.model.CustomerCreate;
+import combined.api.model.CustomerUpdate;
+import io.smallrye.mutiny.Uni;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MediaType;
+import java.util.List;
+import java.util.Optional;
+
+@Path("/customers")
+public interface CustomersApiServer extends CustomersApi {
+  /** Create a new customer */
+  @Override
+  @POST
+  @Path("")
+  @Consumes(value = {MediaType.APPLICATION_JSON})
+  @Produces(value = {MediaType.APPLICATION_JSON})
+  Uni<Customer> createCustomer(CustomerCreate body);
+
+  /** Get customer by ID */
+  @Override
+  @GET
+  @Path("/{customerId}")
+  @Produces(value = {MediaType.APPLICATION_JSON})
+  Uni<Customer> getCustomer(@PathParam("customerId") Long customerId);
+
+  /** List all customers */
+  @Override
+  @GET
+  @Path("")
+  @Produces(value = {MediaType.APPLICATION_JSON})
+  Uni<List<Customer>> listCustomers(
+
+      /** Filter by active status */
+      @QueryParam("isActive") Optional<Boolean> isActive);
+
+  /** Update customer */
+  @Override
+  @PUT
+  @Path("/{customerId}")
+  @Consumes(value = {MediaType.APPLICATION_JSON})
+  @Produces(value = {MediaType.APPLICATION_JSON})
+  Uni<Customer> updateCustomer(@PathParam("customerId") Long customerId, CustomerUpdate body);
+}

testers/combined/java/generated-and-checked-in/api/combined/api/api/EmployeesApi.java

@@ -0,0 +1,22 @@
+/**
+ * File has been automatically generated by `typo`.
+ *
+ * <p>IF YOU CHANGE THIS FILE YOUR CHANGES WILL BE OVERWRITTEN.
+ */
+package combined.api.api;
+
+import combined.api.model.Employee;
+import io.smallrye.mutiny.Uni;
+import java.util.List;
+import java.util.Optional;
+
+public interface EmployeesApi {
+  /** Get employee by ID */
+  Uni<Employee> getEmployee(Integer employeeId);
+
+  /** List all employees */
+  Uni<List<Employee>> listEmployees(
+
+      /** Filter by active status */
+      Optional<Boolean> isActive);
+}

testers/combined/java/generated-and-checked-in/api/combined/api/api/EmployeesApiServer.java

@@ -0,0 +1,37 @@
+/**
+ * File has been automatically generated by `typo`.
+ *
+ * <p>IF YOU CHANGE THIS FILE YOUR CHANGES WILL BE OVERWRITTEN.
+ */
+package combined.api.api;
+
+import combined.api.model.Employee;
+import io.smallrye.mutiny.Uni;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MediaType;
+import java.util.List;
+import java.util.Optional;
+
+@Path("/employees")
+public interface EmployeesApiServer extends EmployeesApi {
+  /** Get employee by ID */
+  @Override
+  @GET
+  @Path("/{employeeId}")
+  @Produces(value = {MediaType.APPLICATION_JSON})
+  Uni<Employee> getEmployee(@PathParam("employeeId") Integer employeeId);
+
+  /** List all employees */
+  @Override
+  @GET
+  @Path("")
+  @Produces(value = {MediaType.APPLICATION_JSON})
+  Uni<List<Employee>> listEmployees(
+
+      /** Filter by active status */
+      @QueryParam("isActive") Optional<Boolean> isActive);
+}

testers/combined/java/generated-and-checked-in/api/combined/api/api/ProductsApi.java

@@ -0,0 +1,20 @@
+/**
+ * File has been automatically generated by `typo`.
+ *
+ * <p>IF YOU CHANGE THIS FILE YOUR CHANGES WILL BE OVERWRITTEN.
+ */
+package combined.api.api;
+
+import combined.api.model.Product;
+import io.smallrye.mutiny.Uni;
+import java.util.List;
+import java.util.Optional;
+
+public interface ProductsApi {
+  /** List all products from both databases */
+  Uni<List<Product>> listProducts(
+      /** Filter by data source */
+      Optional<String> source,
+      /** Filter by active status */
+      Optional<Boolean> isActive);
+}