From 6917b46e386cd110880688c648e2a0f8d5178608 Mon Sep 17 00:00:00 2001 From: Naftoli Gugenheim <98384+nafg@users.noreply.github.com> Date: Fri, 8 Dec 2023 05:13:20 -0500 Subject: [PATCH] codegen: Don't test scala2-only generator traits. CirceJsonCodecModels and MonocleLensesModels are removed from CodeGeneration --- .../src/test/resources/entity/Models.scala | 9 +++------ .../scala/slick/additions/codegen/CodeGeneration.scala | 6 +----- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/slick-additions-codegen/src/test/resources/entity/Models.scala b/slick-additions-codegen/src/test/resources/entity/Models.scala index 8275333..7c067ab 100644 --- a/slick-additions-codegen/src/test/resources/entity/Models.scala +++ b/slick-additions-codegen/src/test/resources/entity/Models.scala @@ -1,9 +1,7 @@ package entity -import slick.additions.entity.Lookup, io.circe.generic.JsonCodec, - monocle.macros.Lenses -@JsonCodec @Lenses case class ColorsRow(name: String) -object ColorsRow -@JsonCodec @Lenses case class PeopleRow( +import slick.additions.entity.Lookup +case class ColorsRow(name: String) +case class PeopleRow( first: String, last: String, city: String = "New York", @@ -28,4 +26,3 @@ object ColorsRow col23: Option[Int] = None, col24: Option[Int] = None ) -object PeopleRow diff --git a/slick-additions-codegen/src/test/scala/slick/additions/codegen/CodeGeneration.scala b/slick-additions-codegen/src/test/scala/slick/additions/codegen/CodeGeneration.scala index 7b318dc..a6051e1 100644 --- a/slick-additions-codegen/src/test/scala/slick/additions/codegen/CodeGeneration.scala +++ b/slick-additions-codegen/src/test/scala/slick/additions/codegen/CodeGeneration.scala @@ -1,9 +1,5 @@ package slick.additions.codegen -import slick.additions.codegen.extra.circe.CirceJsonCodecModelsCodeGenerator -import slick.additions.codegen.extra.monocle.MonocleLensesModelsCodeGenerator - - case class CodeGeneration(generator: BaseCodeGenerator, rules: GenerationRules) { def pkgName = rules.packageName val filename: String = s"${pkgName}/${rules.container}.scala" @@ -19,7 +15,7 @@ object CodeGeneration new TestGenerationRules("TableModules", "entity") with EntityGenerationRules ), CodeGeneration( - new KeylessModelsCodeGenerator with MonocleLensesModelsCodeGenerator with CirceJsonCodecModelsCodeGenerator, + new KeylessModelsCodeGenerator, new TestGenerationRules("Models", "entity") with EntityGenerationRules ) )