From 263e3d5764ccdb96a16a2ed1905e6324dea54283 Mon Sep 17 00:00:00 2001 From: Bobby Sharp Date: Tue, 23 Apr 2024 15:22:55 -0400 Subject: [PATCH] fix compile issues --- .../org/folio/fqm/repository/ResultSetRepositoryTest.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/test/java/org/folio/fqm/repository/ResultSetRepositoryTest.java b/src/test/java/org/folio/fqm/repository/ResultSetRepositoryTest.java index 0b54060b..0e3f7e35 100644 --- a/src/test/java/org/folio/fqm/repository/ResultSetRepositoryTest.java +++ b/src/test/java/org/folio/fqm/repository/ResultSetRepositoryTest.java @@ -33,14 +33,9 @@ void setup() { DSLContext context = DSL.using(new MockConnection( new ResultSetRepositoryTestDataProvider()), SQLDialect.POSTGRES); -<<<<<<< HEAD EntityTypeRepository entityTypeRepository = new EntityTypeRepository(readerContext, context, new ObjectMapper()); - this.repo = new ResultSetRepository(context, entityTypeRepository); -======= - EntityTypeRepository entityTypeRepository = new EntityTypeRepository(context, new ObjectMapper()); - EntityTypeFlatteningService entityTypeFlatteningService = new EntityTypeFlatteningService(entityTypeRepository); + EntityTypeFlatteningService entityTypeFlatteningService = new EntityTypeFlatteningService(entityTypeRepository, new ObjectMapper()); this.repo = new ResultSetRepository(context, entityTypeFlatteningService); ->>>>>>> ea7045f (MODFQMMGR-230: Update mod-fqm-manager to support nested entity types) } @Test