fix: merge error

stellio-hub · Jun 17, 2024 · 9195e61 · 9195e61
1 parent 9ad916c
commit 9195e61
Showing 1 changed file with 0 additions and 16 deletions.
diff --git a/search-service/src/main/kotlin/com/egm/stellio/search/web/EntityOperationHandler.kt b/search-service/src/main/kotlin/com/egm/stellio/search/web/EntityOperationHandler.kt
@@ -370,8 +370,6 @@ class EntityOperationHandler(
                 ?: batchEntityPreparation.right()
         }
 
-<<<<<<< HEAD
-=======
     private suspend fun prepareEntitiesFromRequestBody(
         requestBody: Mono<String>,
         httpHeaders: HttpHeaders,
@@ -385,7 +383,6 @@ class EntityOperationHandler(
         expandAndPrepareBatchOfEntities(body, context, httpHeaders.contentType).bind()
     }
 
->>>>>>> d1935841 (fix(EntityOperationHandler): change function name to prepareEntitiesFromRequestBody)
     private suspend fun doBatchCreation(
         entitiesToCreate: List<JsonLdNgsiLdEntity>,
         batchOperationResult: BatchOperationResult,
@@ -440,17 +437,4 @@ class EntityOperationHandler(
             )
         }
     }
-
-    private suspend fun getNgsiLdEntities(
-        requestBody: Mono<String>,
-        httpHeaders: HttpHeaders,
-    ): Either<APIException, BatchEntityPreparation> = either {
-        val body = requestBody.awaitFirst().deserializeAsList()
-            .checkNamesAreNgsiLdSupported().bind()
-            .checkContentIsNgsiLdSupported().bind()
-        checkBatchRequestBody(body).bind()
-        checkContentType(httpHeaders, body).bind()
-        val context = getContextFromLinkHeader(httpHeaders.getOrEmpty(HttpHeaders.LINK)).bind()
-        return@either expandAndPrepareBatchOfEntities(body, context, httpHeaders.contentType).bind()
-    }
 }