WriteStatus -> WriteResponse

Author: blootsvoets

src/main/java/org/radarcns/RestructureAvroRecords.java

@@ -298,7 +298,7 @@ private void writeRecord(GenericRecord record, String topicName, FileCacheStore
         java.nio.file.Path outputPath = userTopicDir.resolve(outputFileName);
 
         // Write data
-        FileCacheStore.WriteStatus response = cache.writeRecord(outputPath, record);
+        FileCacheStore.WriteResponse response = cache.writeRecord(outputPath, record);
 
         if (!response.isSuccessful()) {
             // Write was unsuccessful due to different number of columns,

src/main/java/org/radarcns/data/FileCacheStore.java

@@ -66,15 +66,15 @@ public FileCacheStore(RecordConverterFactory converterFactory, int maxFiles, boo
      * @return Integer value according to one of the response codes.
      * @throws IOException when failing to open a file or writing to it.
      */
-    public WriteStatus writeRecord(Path path, GenericRecord record) throws IOException {
+    public WriteResponse writeRecord(Path path, GenericRecord record) throws IOException {
         FileCache cache = caches.get(path);
         if (cache != null) {
             if(cache.writeRecord(record)){
-                return WriteStatus.CACHE_AND_WRITE;
+                return WriteResponse.CACHE_AND_WRITE;
             } else {
                 // This is the case when cache is used but write is unsuccessful
                 // because of different number columns in same topic
-                return WriteStatus.CACHE_AND_NO_WRITE;
+                return WriteResponse.CACHE_AND_NO_WRITE;
             }
         } else {
             ensureCapacity();
@@ -85,11 +85,11 @@ public WriteStatus writeRecord(Path path, GenericRecord record) throws IOExcepti
             cache = new FileCache(converterFactory, path, record, gzip, tmpDir);
             caches.put(path, cache);
             if (cache.writeRecord(record)) {
-                return WriteStatus.NO_CACHE_AND_WRITE;
+                return WriteResponse.NO_CACHE_AND_WRITE;
             } else {
                 // The file path was not in cache but the file exists and this write is
                 // unsuccessful because of different number of columns
-                return WriteStatus.NO_CACHE_AND_NO_WRITE;
+                return WriteResponse.NO_CACHE_AND_NO_WRITE;
             }
 
         }
@@ -141,7 +141,7 @@ public void close() throws IOException {
     }
 
     // Response codes for each write record case
-    public enum WriteStatus {
+    public enum WriteResponse {
         /** Cache hit and write was successful. */
         CACHE_AND_WRITE(true, true),
         /** Cache hit and write was unsuccessful because of a mismatch in number of columns. */
@@ -159,7 +159,7 @@ public enum WriteStatus {
          * @param cacheHit whether the cache was used to write.
          * @param successful whether the write was successful.
          */
-        WriteStatus(boolean cacheHit, boolean successful) {
+        WriteResponse(boolean cacheHit, boolean successful) {
             this.cacheHit = cacheHit;
             this.successful = successful;
         }

src/test/java/org/radarcns/data/FileCacheStoreTest.java

@@ -74,30 +74,30 @@ public void appendLine() throws IOException {
 
         try (FileCacheStore cache = new FileCacheStore(csvFactory, 2, false, false, doStage)) {
             record = new GenericRecordBuilder(simpleSchema).set("a", "something").build();
-            assertEquals(cache.writeRecord(f1, record), FileCacheStore.WriteStatus.NO_CACHE_AND_WRITE);
+            assertEquals(cache.writeRecord(f1, record), FileCacheStore.WriteResponse.NO_CACHE_AND_WRITE);
             record = new GenericRecordBuilder(simpleSchema).set("a", "somethingElse").build();
-            assertEquals(cache.writeRecord(f1, record), FileCacheStore.WriteStatus.CACHE_AND_WRITE);
+            assertEquals(cache.writeRecord(f1, record), FileCacheStore.WriteResponse.CACHE_AND_WRITE);
             record = new GenericRecordBuilder(simpleSchema).set("a", "something").build();
-            assertEquals(cache.writeRecord(f2, record), FileCacheStore.WriteStatus.NO_CACHE_AND_WRITE);
+            assertEquals(cache.writeRecord(f2, record), FileCacheStore.WriteResponse.NO_CACHE_AND_WRITE);
             record = new GenericRecordBuilder(simpleSchema).set("a", "third").build();
-            assertEquals(cache.writeRecord(f1, record), FileCacheStore.WriteStatus.CACHE_AND_WRITE);
+            assertEquals(cache.writeRecord(f1, record), FileCacheStore.WriteResponse.CACHE_AND_WRITE);
             record = new GenericRecordBuilder(simpleSchema).set("a", "f3").build();
-            assertEquals(cache.writeRecord(f3, record), FileCacheStore.WriteStatus.NO_CACHE_AND_WRITE);
+            assertEquals(cache.writeRecord(f3, record), FileCacheStore.WriteResponse.NO_CACHE_AND_WRITE);
             record = new GenericRecordBuilder(simpleSchema).set("a", "f2").build();
-            assertEquals(cache.writeRecord(f2, record), FileCacheStore.WriteStatus.NO_CACHE_AND_WRITE);
+            assertEquals(cache.writeRecord(f2, record), FileCacheStore.WriteResponse.NO_CACHE_AND_WRITE);
             record = new GenericRecordBuilder(simpleSchema).set("a", "f3").build();
-            assertEquals(cache.writeRecord(f3, record), FileCacheStore.WriteStatus.CACHE_AND_WRITE);
+            assertEquals(cache.writeRecord(f3, record), FileCacheStore.WriteResponse.CACHE_AND_WRITE);
             record = new GenericRecordBuilder(simpleSchema).set("a", "f4").build();
-            assertEquals(cache.writeRecord(f4, record), FileCacheStore.WriteStatus.NO_CACHE_AND_WRITE);
+            assertEquals(cache.writeRecord(f4, record), FileCacheStore.WriteResponse.NO_CACHE_AND_WRITE);
             record = new GenericRecordBuilder(simpleSchema).set("a", "f3").build();
-            assertEquals(cache.writeRecord(f3, record), FileCacheStore.WriteStatus.CACHE_AND_WRITE);
+            assertEquals(cache.writeRecord(f3, record), FileCacheStore.WriteResponse.CACHE_AND_WRITE);
             record = new GenericRecordBuilder(conflictSchema).set("a", "f3"). set("b", "conflict").build();
-            assertEquals(cache.writeRecord(f3, record), FileCacheStore.WriteStatus.CACHE_AND_NO_WRITE);
+            assertEquals(cache.writeRecord(f3, record), FileCacheStore.WriteResponse.CACHE_AND_NO_WRITE);
             record = new GenericRecordBuilder(conflictSchema).set("a", "f1"). set("b", "conflict").build();
             // Cannot write to file even though the file is not in cache since schema is different
-            assertEquals(cache.writeRecord(f1, record), FileCacheStore.WriteStatus.NO_CACHE_AND_NO_WRITE);
+            assertEquals(cache.writeRecord(f1, record), FileCacheStore.WriteResponse.NO_CACHE_AND_NO_WRITE);
             // Can write the same record to a new file
-            assertEquals(cache.writeRecord(newFile, record), FileCacheStore.WriteStatus.NO_CACHE_AND_WRITE);
+            assertEquals(cache.writeRecord(newFile, record), FileCacheStore.WriteResponse.NO_CACHE_AND_WRITE);
         }
 
         assertEquals("a\nsomething\nsomethingElse\nthird\n", new String(Files.readAllBytes(f1)));