apply spotless

Author: lalepee

dataset/src/integrationTest/kotlin/com/cosmotech/dataset/service/DatasetServiceIntegrationTest.kt

@@ -1302,63 +1302,64 @@ class DatasetServiceIntegrationTest() : CsmTestBase() {
         exception.message)
   }
 
-    @Test
-    fun `test deleteDatasetPart FILE`() {
-
-        val datasetCreateRequest = DatasetCreateRequest(name = "Dataset Test")
-
-        val createDataset =
-            datasetApiService.createDataset(
-                organizationSaved.id, workspaceSaved.id, datasetCreateRequest, arrayOf())
-
-        assertTrue(createDataset.parts.isEmpty())
-
-        val resourceTestFile = resourceLoader.getResource("classpath:/$CUSTOMER_SOURCE_FILE_NAME").file
-
-        val fileToSend = FileInputStream(resourceTestFile)
-
-        val mockMultipartFile =
-            MockMultipartFile(
-                "file",
-                CUSTOMER_SOURCE_FILE_NAME,
-                MediaType.MULTIPART_FORM_DATA_VALUE,
-                IOUtils.toByteArray(fileToSend))
-
-        val datasetPartName = "Customer list"
-        val datasetPartDescription = "List of customers"
-        val datasetPartTags = mutableListOf("part", "public", "customers")
-
-        val createDatasetPart =
-            datasetApiService.createDatasetPart(
-                organizationSaved.id,
-                workspaceSaved.id,
-                createDataset.id,
-                mockMultipartFile,
-                DatasetPartCreateRequest(
-                    name = datasetPartName,
-                    sourceName = CUSTOMER_SOURCE_FILE_NAME,
-                    description = datasetPartDescription,
-                    tags = datasetPartTags,
-                    type = DatasetPartTypeEnum.File))
-
-        assertNotNull(createDatasetPart)
-        datasetApiService.deleteDatasetPart(
-            organizationSaved.id, workspaceSaved.id, createDataset.id, createDatasetPart.id)
+  @Test
+  fun `test deleteDatasetPart FILE`() {
+
+    val datasetCreateRequest = DatasetCreateRequest(name = "Dataset Test")
+
+    val createDataset =
+        datasetApiService.createDataset(
+            organizationSaved.id, workspaceSaved.id, datasetCreateRequest, arrayOf())
 
-        val retrievedDataset =
-            datasetApiService.getDataset(organizationSaved.id, workspaceSaved.id, createDataset.id)
+    assertTrue(createDataset.parts.isEmpty())
 
-        assertTrue(retrievedDataset.parts.isEmpty())
+    val resourceTestFile = resourceLoader.getResource("classpath:/$CUSTOMER_SOURCE_FILE_NAME").file
 
-        val deletedFileKeyPath =
-            retrievedDataset.organizationId +
-                    "/${retrievedDataset.workspaceId}" +
-                    "/${retrievedDataset.id}" +
-                    "/${createDatasetPart.id}" +
-                    "/${createDatasetPart.sourceName}"
+    val fileToSend = FileInputStream(resourceTestFile)
+
+    val mockMultipartFile =
+        MockMultipartFile(
+            "file",
+            CUSTOMER_SOURCE_FILE_NAME,
+            MediaType.MULTIPART_FORM_DATA_VALUE,
+            IOUtils.toByteArray(fileToSend))
+
+    val datasetPartName = "Customer list"
+    val datasetPartDescription = "List of customers"
+    val datasetPartTags = mutableListOf("part", "public", "customers")
+
+    val createDatasetPart =
+        datasetApiService.createDatasetPart(
+            organizationSaved.id,
+            workspaceSaved.id,
+            createDataset.id,
+            mockMultipartFile,
+            DatasetPartCreateRequest(
+                name = datasetPartName,
+                sourceName = CUSTOMER_SOURCE_FILE_NAME,
+                description = datasetPartDescription,
+                tags = datasetPartTags,
+                type = DatasetPartTypeEnum.File))
+
+    assertNotNull(createDatasetPart)
+    datasetApiService.deleteDatasetPart(
+        organizationSaved.id, workspaceSaved.id, createDataset.id, createDatasetPart.id)
+
+    val retrievedDataset =
+        datasetApiService.getDataset(organizationSaved.id, workspaceSaved.id, createDataset.id)
+
+    assertTrue(retrievedDataset.parts.isEmpty())
+
+    val deletedFileKeyPath =
+        retrievedDataset.organizationId +
+            "/${retrievedDataset.workspaceId}" +
+            "/${retrievedDataset.id}" +
+            "/${createDatasetPart.id}" +
+            "/${createDatasetPart.sourceName}"
+
+    assertFalse(s3Template.objectExists(csmPlatformProperties.s3.bucketName, deletedFileKeyPath))
+  }
 
-        assertFalse(s3Template.objectExists(csmPlatformProperties.s3.bucketName, deletedFileKeyPath))
-    }
   @Test
   fun `test deleteDatasetPart DB`() {
 

dataset/src/main/kotlin/com/cosmotech/dataset/part/services/RelationalDatasetPartManagementService.kt

@@ -55,7 +55,6 @@ class RelationalDatasetPartManagementService(
 
     inputStream.bufferedReader().use { reader ->
       val headers = validateHeaders(reader)
-      val values = constructValues(headers)
 
       writerJdbcTemplate.dataSource!!.connection.use { connection ->
         try {
@@ -67,7 +66,9 @@ class RelationalDatasetPartManagementService(
           }
 
           if (!tableExists) {
-            val prepareStatement = connection.prepareStatement("CREATE TABLE IF NOT EXISTS $tableName ${constructValues(headers)};")
+            val prepareStatement =
+                connection.prepareStatement(
+                    "CREATE TABLE IF NOT EXISTS $tableName ${constructSQLColumnsValues(headers)};")
             prepareStatement.execute()
           }
           val insertedRows =
@@ -100,7 +101,7 @@ class RelationalDatasetPartManagementService(
     return headers
   }
 
-  private fun constructValues(headers: List<String>): String =
+  private fun constructSQLColumnsValues(headers: List<String>): String =
       headers.joinToString(
           separator = "\" TEXT, \"", prefix = "(\"", postfix = "\" TEXT)", transform = String::trim)