Skip to content

Commit 88e9109

Browse files
vim89vim89
committed
fixed most of the problematic one-letter variable names
1 parent 1075e8b commit 88e9109

18 files changed

Lines changed: 162 additions & 161 deletions

File tree

‎modules/connectors-gcs/src/main/scala/com/flowforge/connectors/gcs/GcsFileSystemConnector.scala‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ class GcsFileSystemConnector[F[_]: EffectSystem](
2424
val bucket = if (idx >= 0) rest.substring(0, idx) else rest
2525
val key = if (idx >= 0) rest.substring(idx + 1) else ""
2626
if (bucket.nonEmpty) Right(GsUri(bucket, key))
27-
else Left(FileSystemError.MetadataError(path, "Invalid GCS URI: missing bucket"))
28-
} else Left(FileSystemError.MetadataError(path, "Invalid GCS URI: must start with gs://"))
27+
else Left(FileSystemError.metadataError(path, "Invalid GCS URI: missing bucket"))
28+
} else Left(FileSystemError.metadataError(path, "Invalid GCS URI: must start with gs://"))
2929

3030
private def toPath(ds: DataSource): String = ds match {
3131
case g: DataSource.GcsSource => g.path
@@ -47,15 +47,15 @@ class GcsFileSystemConnector[F[_]: EffectSystem](
4747
F.handleError {
4848
F.blocking {
4949
val blob = storage.get(bucket, key)
50-
if (blob == null) FileSystemResult.failure(FileSystemError.FileNotFound(g.path))
50+
if (blob == null) FileSystemResult.failure(FileSystemError.fileNotFound(g.path))
5151
else FileSystemResult.success(blob.getContent())
5252
}
53-
}(t => FileSystemResult.failure(FileSystemError.ReadError(g.path, t.getMessage)))
53+
}(t => FileSystemResult.failure(FileSystemError.readError(g.path, t.getMessage)))
5454
}
5555
case other =>
5656
F.pure(
5757
FileSystemResult.failure(
58-
FileSystemError.ReadError(toPath(other), "Unsupported source type for GCS connector"),
58+
FileSystemError.readError(toPath(other), "Unsupported source type for GCS connector"),
5959
),
6060
)
6161
}
@@ -71,12 +71,12 @@ class GcsFileSystemConnector[F[_]: EffectSystem](
7171
storage.create(blobInfo, data)
7272
FileSystemResult.success(WriteMetadata(path = g.path, bytesWritten = data.length.toLong))
7373
}
74-
}(t => FileSystemResult.failure(FileSystemError.WriteError(g.path, t.getMessage)))
74+
}(t => FileSystemResult.failure(FileSystemError.writeError(g.path, t.getMessage)))
7575
}
7676
case other =>
7777
F.pure(
7878
FileSystemResult.failure(
79-
FileSystemError.WriteError(toPath(other), "Unsupported sink type for GCS connector"),
79+
FileSystemError.writeError(toPath(other), "Unsupported sink type for GCS connector"),
8080
),
8181
)
8282
}
@@ -106,7 +106,7 @@ class GcsFileSystemConnector[F[_]: EffectSystem](
106106
}
107107
FileSystemResult.success(files)
108108
}
109-
}(t => FileSystemResult.failure(FileSystemError.ListError(path, t.getMessage)))
109+
}(t => FileSystemResult.failure(FileSystemError.listError(path, t.getMessage)))
110110
}
111111

112112
def exists(path: String): F[Boolean] =
@@ -126,7 +126,7 @@ class GcsFileSystemConnector[F[_]: EffectSystem](
126126
storage.create(info, Array.emptyByteArray)
127127
FileSystemResult.success(())
128128
}
129-
}(t => FileSystemResult.failure(FileSystemError.CreateDirectoryError(path, t.getMessage)))
129+
}(t => FileSystemResult.failure(FileSystemError.createDirectoryError(path, t.getMessage)))
130130
}
131131

132132
def delete(path: String, recursive: Boolean = false): F[FileSystemResult[Unit]] =
@@ -147,10 +147,10 @@ class GcsFileSystemConnector[F[_]: EffectSystem](
147147
} else {
148148
val ok = storage.delete(b, key)
149149
if (ok) FileSystemResult.success(())
150-
else FileSystemResult.failure(FileSystemError.DeleteError(path, "Not found"))
150+
else FileSystemResult.failure(FileSystemError.deleteError(path, "Not found"))
151151
}
152152
}
153-
}(t => FileSystemResult.failure(FileSystemError.DeleteError(path, t.getMessage)))
153+
}(t => FileSystemResult.failure(FileSystemError.deleteError(path, t.getMessage)))
154154
}
155155

156156
def getMetadata(path: String): F[FileSystemResult[FileMetadata]] =
@@ -160,7 +160,7 @@ class GcsFileSystemConnector[F[_]: EffectSystem](
160160
F.handleError {
161161
F.blocking {
162162
val blob = storage.get(b, key)
163-
if (blob == null) FileSystemResult.failure(FileSystemError.FileNotFound(path))
163+
if (blob == null) FileSystemResult.failure(FileSystemError.fileNotFound(path))
164164
else {
165165
val size = Option(blob.getSize).map(_.longValue()).getOrElse(0L)
166166
val updateTime = Option(blob.getUpdateTime).map(_.longValue()).getOrElse(0L)
@@ -175,7 +175,7 @@ class GcsFileSystemConnector[F[_]: EffectSystem](
175175
)
176176
}
177177
}
178-
}(t => FileSystemResult.failure(FileSystemError.MetadataError(path, t.getMessage)))
178+
}(t => FileSystemResult.failure(FileSystemError.metadataError(path, t.getMessage)))
179179
}
180180

181181
def streamRead(source: DataSource): F[List[Array[Byte]]] =

‎modules/connectors/src/main/scala/com/flowforge/connectors/filesystem/FileSystemConnector.scala‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ class LocalFileSystemConnector[F[_]: EffectSystem] extends FileSystemConnector[F
131131
bytes <- effectSystem.delay(Files.readAllBytes(path))
132132
} yield FileSystemResult.success(bytes)
133133
} { error =>
134-
FileSystemResult.failure(FileSystemError.ReadError(location, error.getMessage))
134+
FileSystemResult.failure(FileSystemError.readError(location, error.getMessage))
135135
}
136136
}
137137

@@ -150,7 +150,7 @@ class LocalFileSystemConnector[F[_]: EffectSystem] extends FileSystemConnector[F
150150
)
151151
} yield FileSystemResult.success(metadata)
152152
} { error =>
153-
FileSystemResult.failure(FileSystemError.WriteError(location, error.getMessage))
153+
FileSystemResult.failure(FileSystemError.writeError(location, error.getMessage))
154154
}
155155
}
156156

@@ -178,7 +178,7 @@ class LocalFileSystemConnector[F[_]: EffectSystem] extends FileSystemConnector[F
178178
}
179179
} yield FileSystemResult.success(files)
180180
} { error =>
181-
FileSystemResult.failure(FileSystemError.ListError(path, error.getMessage))
181+
FileSystemResult.failure(FileSystemError.listError(path, error.getMessage))
182182
}
183183

184184
def exists(path: String): F[Boolean] =
@@ -191,7 +191,7 @@ class LocalFileSystemConnector[F[_]: EffectSystem] extends FileSystemConnector[F
191191
FileSystemResult.success(())
192192
}
193193
} { error =>
194-
FileSystemResult.failure(FileSystemError.CreateDirectoryError(path, error.getMessage))
194+
FileSystemResult.failure(FileSystemError.createDirectoryError(path, error.getMessage))
195195
}
196196

197197
def delete(path: String, recursive: Boolean = false): F[FileSystemResult[Unit]] =
@@ -211,7 +211,7 @@ class LocalFileSystemConnector[F[_]: EffectSystem] extends FileSystemConnector[F
211211
}
212212
} yield FileSystemResult.success(())
213213
} { error =>
214-
FileSystemResult.failure(FileSystemError.DeleteError(path, error.getMessage))
214+
FileSystemResult.failure(FileSystemError.deleteError(path, error.getMessage))
215215
}
216216

217217
def getMetadata(path: String): F[FileSystemResult[FileMetadata]] =
@@ -230,7 +230,7 @@ class LocalFileSystemConnector[F[_]: EffectSystem] extends FileSystemConnector[F
230230
)
231231
} yield FileSystemResult.success(metadata)
232232
} { error =>
233-
FileSystemResult.failure(FileSystemError.MetadataError(path, error.getMessage))
233+
FileSystemResult.failure(FileSystemError.metadataError(path, error.getMessage))
234234
}
235235

236236
def streamRead(source: DataSource): F[List[Array[Byte]]] = {
@@ -320,7 +320,7 @@ class HDFSFileSystemConnector[F[_]: EffectSystem](
320320
effectSystem.bracket(acquire) { fs =>
321321
effectSystem.blocking {
322322
val path = new org.apache.hadoop.fs.Path(location)
323-
if (!fs.exists(path)) FileSystemResult.failure(FileSystemError.FileNotFound(location))
323+
if (!fs.exists(path)) FileSystemResult.failure(FileSystemError.fileNotFound(location))
324324
else {
325325
val inputStream = fs.open(path)
326326
val bytes = inputStream.readAllBytes()
@@ -329,7 +329,7 @@ class HDFSFileSystemConnector[F[_]: EffectSystem](
329329
}
330330
}
331331
}(fs => effectSystem.blocking(fs.close()).void)
332-
}(error => FileSystemResult.failure(FileSystemError.ReadError(location, error.getMessage)))
332+
}(error => FileSystemResult.failure(FileSystemError.readError(location, error.getMessage)))
333333
}
334334

335335
def write(sink: DataSink, data: Array[Byte]): F[FileSystemResult[WriteMetadata]] = {
@@ -350,7 +350,7 @@ class HDFSFileSystemConnector[F[_]: EffectSystem](
350350
)
351351
}
352352
}(fs => effectSystem.blocking(fs.close()).void)
353-
}(error => FileSystemResult.failure(FileSystemError.WriteError(location, error.getMessage)))
353+
}(error => FileSystemResult.failure(FileSystemError.writeError(location, error.getMessage)))
354354
}
355355

356356
def listFiles(path: String): F[FileSystemResult[List[FileMetadata]]] =
@@ -361,7 +361,7 @@ class HDFSFileSystemConnector[F[_]: EffectSystem](
361361
try {
362362
val hadoopPath = new org.apache.hadoop.fs.Path(path)
363363
if (!fs.exists(hadoopPath) || !fs.isDirectory(hadoopPath)) {
364-
FileSystemResult.failure(FileSystemError.DirectoryNotFound(path))
364+
FileSystemResult.failure(FileSystemError.directoryNotFound(path))
365365
} else {
366366
val fileStatuses = fs.listStatus(hadoopPath)
367367
val metadata = fileStatuses.map { status =>
@@ -379,7 +379,7 @@ class HDFSFileSystemConnector[F[_]: EffectSystem](
379379
fs.close()
380380
}
381381
} { error =>
382-
FileSystemResult.failure(FileSystemError.ListError(path, error.getMessage))
382+
FileSystemResult.failure(FileSystemError.listError(path, error.getMessage))
383383
}
384384

385385
def exists(path: String): F[Boolean] =
@@ -406,14 +406,14 @@ class HDFSFileSystemConnector[F[_]: EffectSystem](
406406
FileSystemResult.success(())
407407
} else {
408408
FileSystemResult.failure(
409-
FileSystemError.CreateDirectoryError(path, "Failed to create directory"),
409+
FileSystemError.createDirectoryError(path, "Failed to create directory"),
410410
)
411411
}
412412
} finally
413413
fs.close()
414414
}
415415
} { error =>
416-
FileSystemResult.failure(FileSystemError.CreateDirectoryError(path, error.getMessage))
416+
FileSystemResult.failure(FileSystemError.createDirectoryError(path, error.getMessage))
417417
}
418418

419419
def delete(path: String, recursive: Boolean = false): F[FileSystemResult[Unit]] =
@@ -427,13 +427,13 @@ class HDFSFileSystemConnector[F[_]: EffectSystem](
427427
if (success) {
428428
FileSystemResult.success(())
429429
} else {
430-
FileSystemResult.failure(FileSystemError.DeleteError(path, "Failed to delete"))
430+
FileSystemResult.failure(FileSystemError.deleteError(path, "Failed to delete"))
431431
}
432432
} finally
433433
fs.close()
434434
}
435435
} { error =>
436-
FileSystemResult.failure(FileSystemError.DeleteError(path, error.getMessage))
436+
FileSystemResult.failure(FileSystemError.deleteError(path, error.getMessage))
437437
}
438438

439439
def getMetadata(path: String): F[FileSystemResult[FileMetadata]] =
@@ -444,7 +444,7 @@ class HDFSFileSystemConnector[F[_]: EffectSystem](
444444
try {
445445
val hadoopPath = new org.apache.hadoop.fs.Path(path)
446446
if (!fs.exists(hadoopPath)) {
447-
FileSystemResult.failure(FileSystemError.FileNotFound(path))
447+
FileSystemResult.failure(FileSystemError.fileNotFound(path))
448448
} else {
449449
val status = fs.getFileStatus(hadoopPath)
450450
val metadata = FileMetadata(
@@ -460,7 +460,7 @@ class HDFSFileSystemConnector[F[_]: EffectSystem](
460460
fs.close()
461461
}
462462
} { error =>
463-
FileSystemResult.failure(FileSystemError.MetadataError(path, error.getMessage))
463+
FileSystemResult.failure(FileSystemError.metadataError(path, error.getMessage))
464464
}
465465

466466
def streamRead(source: DataSource): F[List[Array[Byte]]] = {
@@ -586,14 +586,14 @@ class GCSConnector[F[_]: EffectSystem](
586586
val storage = createStorageClient()
587587
val blob = storage.get(bucket, key)
588588
if (blob == null || !blob.exists()) {
589-
FileSystemResult.failure(FileSystemError.FileNotFound(gcsPath))
589+
FileSystemResult.failure(FileSystemError.fileNotFound(gcsPath))
590590
} else {
591591
val bytes = blob.getContent()
592592
FileSystemResult.success(bytes)
593593
}
594594
}
595595
} { error =>
596-
FileSystemResult.failure(FileSystemError.ReadError(gcsPath, error.getMessage))
596+
FileSystemResult.failure(FileSystemError.readError(gcsPath, error.getMessage))
597597
}
598598
}
599599

@@ -619,7 +619,7 @@ class GCSConnector[F[_]: EffectSystem](
619619
)
620620
}
621621
} { error =>
622-
FileSystemResult.failure(FileSystemError.WriteError(gcsPath, error.getMessage))
622+
FileSystemResult.failure(FileSystemError.writeError(gcsPath, error.getMessage))
623623
}
624624
}
625625

@@ -646,7 +646,7 @@ class GCSConnector[F[_]: EffectSystem](
646646
FileSystemResult.success(metadata)
647647
}
648648
} { error =>
649-
FileSystemResult.failure(FileSystemError.ListError(path, error.getMessage))
649+
FileSystemResult.failure(FileSystemError.listError(path, error.getMessage))
650650
}
651651
}
652652

@@ -679,7 +679,7 @@ class GCSConnector[F[_]: EffectSystem](
679679
FileSystemResult.success(())
680680
}
681681
} { error =>
682-
FileSystemResult.failure(FileSystemError.CreateDirectoryError(path, error.getMessage))
682+
FileSystemResult.failure(FileSystemError.createDirectoryError(path, error.getMessage))
683683
}
684684
}
685685

@@ -701,7 +701,7 @@ class GCSConnector[F[_]: EffectSystem](
701701
if (!success) {
702702
return effectSystem.pure(
703703
FileSystemResult.failure(
704-
FileSystemError.DeleteError(path, "File not found or already deleted"),
704+
FileSystemError.deleteError(path, "File not found or already deleted"),
705705
),
706706
)
707707
}
@@ -710,7 +710,7 @@ class GCSConnector[F[_]: EffectSystem](
710710
FileSystemResult.success(())
711711
}
712712
} { error =>
713-
FileSystemResult.failure(FileSystemError.DeleteError(path, error.getMessage))
713+
FileSystemResult.failure(FileSystemError.deleteError(path, error.getMessage))
714714
}
715715
}
716716

@@ -723,7 +723,7 @@ class GCSConnector[F[_]: EffectSystem](
723723
val blob = storage.get(bucket, key)
724724

725725
if (blob == null || !blob.exists()) {
726-
FileSystemResult.failure(FileSystemError.FileNotFound(path))
726+
FileSystemResult.failure(FileSystemError.fileNotFound(path))
727727
} else {
728728
val metadata = FileMetadata(
729729
name = blob.getName,
@@ -736,7 +736,7 @@ class GCSConnector[F[_]: EffectSystem](
736736
}
737737
}
738738
} { error =>
739-
FileSystemResult.failure(FileSystemError.MetadataError(path, error.getMessage))
739+
FileSystemResult.failure(FileSystemError.metadataError(path, error.getMessage))
740740
}
741741
}
742742

@@ -923,7 +923,7 @@ class S3Connector[F[_]: EffectSystem](
923923
s3Client.close()
924924
}
925925
} { error =>
926-
FileSystemResult.failure(FileSystemError.ListError(path, error.getMessage))
926+
FileSystemResult.failure(FileSystemError.listError(path, error.getMessage))
927927
}
928928
}
929929
@@ -964,7 +964,7 @@ class S3Connector[F[_]: EffectSystem](
964964
s3Client.close()
965965
}
966966
} { error =>
967-
FileSystemResult.failure(FileSystemError.CreateDirectoryError(path, error.getMessage))
967+
FileSystemResult.failure(FileSystemError.createDirectoryError(path, error.getMessage))
968968
}
969969
}
970970
@@ -1001,7 +1001,7 @@ class S3Connector[F[_]: EffectSystem](
10011001
s3Client.close()
10021002
}
10031003
} { error =>
1004-
FileSystemResult.failure(FileSystemError.DeleteError(path, error.getMessage))
1004+
FileSystemResult.failure(FileSystemError.deleteError(path, error.getMessage))
10051005
}
10061006
}
10071007
@@ -1029,7 +1029,7 @@ class S3Connector[F[_]: EffectSystem](
10291029
s3Client.close()
10301030
}
10311031
} { error =>
1032-
FileSystemResult.failure(FileSystemError.MetadataError(path, error.getMessage))
1032+
FileSystemResult.failure(FileSystemError.metadataError(path, error.getMessage))
10331033
}
10341034
}
10351035

0 commit comments

Comments
 (0)