Skip to content

Commit a7f8250

Browse files
committed
apply spotless
1 parent bc9d704 commit a7f8250

File tree

2 files changed

+57
-54
lines changed

2 files changed

+57
-54
lines changed

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

Lines changed: 54 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1302,63 +1302,64 @@ class DatasetServiceIntegrationTest() : CsmTestBase() {
13021302
exception.message)
13031303
}
13041304

1305-
@Test
1306-
fun `test deleteDatasetPart FILE`() {
1307-
1308-
val datasetCreateRequest = DatasetCreateRequest(name = "Dataset Test")
1309-
1310-
val createDataset =
1311-
datasetApiService.createDataset(
1312-
organizationSaved.id, workspaceSaved.id, datasetCreateRequest, arrayOf())
1313-
1314-
assertTrue(createDataset.parts.isEmpty())
1315-
1316-
val resourceTestFile = resourceLoader.getResource("classpath:/$CUSTOMER_SOURCE_FILE_NAME").file
1317-
1318-
val fileToSend = FileInputStream(resourceTestFile)
1319-
1320-
val mockMultipartFile =
1321-
MockMultipartFile(
1322-
"file",
1323-
CUSTOMER_SOURCE_FILE_NAME,
1324-
MediaType.MULTIPART_FORM_DATA_VALUE,
1325-
IOUtils.toByteArray(fileToSend))
1326-
1327-
val datasetPartName = "Customer list"
1328-
val datasetPartDescription = "List of customers"
1329-
val datasetPartTags = mutableListOf("part", "public", "customers")
1330-
1331-
val createDatasetPart =
1332-
datasetApiService.createDatasetPart(
1333-
organizationSaved.id,
1334-
workspaceSaved.id,
1335-
createDataset.id,
1336-
mockMultipartFile,
1337-
DatasetPartCreateRequest(
1338-
name = datasetPartName,
1339-
sourceName = CUSTOMER_SOURCE_FILE_NAME,
1340-
description = datasetPartDescription,
1341-
tags = datasetPartTags,
1342-
type = DatasetPartTypeEnum.File))
1343-
1344-
assertNotNull(createDatasetPart)
1345-
datasetApiService.deleteDatasetPart(
1346-
organizationSaved.id, workspaceSaved.id, createDataset.id, createDatasetPart.id)
1305+
@Test
1306+
fun `test deleteDatasetPart FILE`() {
1307+
1308+
val datasetCreateRequest = DatasetCreateRequest(name = "Dataset Test")
1309+
1310+
val createDataset =
1311+
datasetApiService.createDataset(
1312+
organizationSaved.id, workspaceSaved.id, datasetCreateRequest, arrayOf())
13471313

1348-
val retrievedDataset =
1349-
datasetApiService.getDataset(organizationSaved.id, workspaceSaved.id, createDataset.id)
1314+
assertTrue(createDataset.parts.isEmpty())
13501315

1351-
assertTrue(retrievedDataset.parts.isEmpty())
1316+
val resourceTestFile = resourceLoader.getResource("classpath:/$CUSTOMER_SOURCE_FILE_NAME").file
13521317

1353-
val deletedFileKeyPath =
1354-
retrievedDataset.organizationId +
1355-
"/${retrievedDataset.workspaceId}" +
1356-
"/${retrievedDataset.id}" +
1357-
"/${createDatasetPart.id}" +
1358-
"/${createDatasetPart.sourceName}"
1318+
val fileToSend = FileInputStream(resourceTestFile)
1319+
1320+
val mockMultipartFile =
1321+
MockMultipartFile(
1322+
"file",
1323+
CUSTOMER_SOURCE_FILE_NAME,
1324+
MediaType.MULTIPART_FORM_DATA_VALUE,
1325+
IOUtils.toByteArray(fileToSend))
1326+
1327+
val datasetPartName = "Customer list"
1328+
val datasetPartDescription = "List of customers"
1329+
val datasetPartTags = mutableListOf("part", "public", "customers")
1330+
1331+
val createDatasetPart =
1332+
datasetApiService.createDatasetPart(
1333+
organizationSaved.id,
1334+
workspaceSaved.id,
1335+
createDataset.id,
1336+
mockMultipartFile,
1337+
DatasetPartCreateRequest(
1338+
name = datasetPartName,
1339+
sourceName = CUSTOMER_SOURCE_FILE_NAME,
1340+
description = datasetPartDescription,
1341+
tags = datasetPartTags,
1342+
type = DatasetPartTypeEnum.File))
1343+
1344+
assertNotNull(createDatasetPart)
1345+
datasetApiService.deleteDatasetPart(
1346+
organizationSaved.id, workspaceSaved.id, createDataset.id, createDatasetPart.id)
1347+
1348+
val retrievedDataset =
1349+
datasetApiService.getDataset(organizationSaved.id, workspaceSaved.id, createDataset.id)
1350+
1351+
assertTrue(retrievedDataset.parts.isEmpty())
1352+
1353+
val deletedFileKeyPath =
1354+
retrievedDataset.organizationId +
1355+
"/${retrievedDataset.workspaceId}" +
1356+
"/${retrievedDataset.id}" +
1357+
"/${createDatasetPart.id}" +
1358+
"/${createDatasetPart.sourceName}"
1359+
1360+
assertFalse(s3Template.objectExists(csmPlatformProperties.s3.bucketName, deletedFileKeyPath))
1361+
}
13591362

1360-
assertFalse(s3Template.objectExists(csmPlatformProperties.s3.bucketName, deletedFileKeyPath))
1361-
}
13621363
@Test
13631364
fun `test deleteDatasetPart DB`() {
13641365

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,9 @@ class RelationalDatasetPartManagementService(
6767
}
6868

6969
if (!tableExists) {
70-
val prepareStatement = connection.prepareStatement("CREATE TABLE IF NOT EXISTS $tableName ${constructValues(headers)};")
70+
val prepareStatement =
71+
connection.prepareStatement(
72+
"CREATE TABLE IF NOT EXISTS $tableName ${constructValues(headers)};")
7173
prepareStatement.execute()
7274
}
7375
val insertedRows =

0 commit comments

Comments
 (0)