From 3486d39fe7c61800d6cf33e42d881d03936d99b9 Mon Sep 17 00:00:00 2001 From: Jordan Doyle Date: Mon, 13 Apr 2015 01:27:52 +0100 Subject: [PATCH] Never ended up using setField with method chaining as I originally intended so the return isn't needed --- src/main/java/wf/doyle/blockbuster/file/FileReader.java | 11 +++++------ src/test/java/wf/doyle/blockbuster/AppTest.java | 5 ++--- target/classes/wf/doyle/blockbuster/file/FileReader.class | Bin 8798 -> 8756 bytes target/test-classes/wf/doyle/blockbuster/AppTest.class | Bin 1626 -> 1440 bytes 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/main/java/wf/doyle/blockbuster/file/FileReader.java b/src/main/java/wf/doyle/blockbuster/file/FileReader.java index 7b5a0b8..f83e87f 100644 --- a/src/main/java/wf/doyle/blockbuster/file/FileReader.java +++ b/src/main/java/wf/doyle/blockbuster/file/FileReader.java @@ -203,9 +203,8 @@ public class FileReader { * instance to set the value in * @param data * data to set the value as - * @return instance of LibraryItem */ - public static LibraryItem setField(Field f, LibraryItem instance, String data) + public static void setField(Field f, LibraryItem instance, String data) { try { @@ -218,7 +217,7 @@ public class FileReader { f.setAccessible(true); f.set(instance, val); - return instance; + return; } } catch(NumberFormatException nfe) @@ -232,7 +231,7 @@ public class FileReader { f.setAccessible(true); f.set(instance, b); - return instance; + return; } f.setAccessible(true); @@ -243,7 +242,7 @@ public class FileReader { App.LOGGER.error("Couldn't set value of " + f.getName() + " in " + instance.getClass().getName(), e); } - return instance; + return; } /** @@ -292,7 +291,7 @@ public class FileReader { Field field = getField(this.lineContains[key].trim(), itemClass); - item = setField(field, item, value); + FileReader.setField(field, item, value); } // add this storage class to our main array diff --git a/src/test/java/wf/doyle/blockbuster/AppTest.java b/src/test/java/wf/doyle/blockbuster/AppTest.java index b953dcd..130ffed 100644 --- a/src/test/java/wf/doyle/blockbuster/AppTest.java +++ b/src/test/java/wf/doyle/blockbuster/AppTest.java @@ -24,13 +24,12 @@ public class AppTest { Assert.assertNotNull(f); - LibraryItem i = FileReader.setField(f, item, "testCase"); + FileReader.setField(f, item, "testCase"); try { - Assert.assertEquals(f.get(i), "testCase"); + Assert.assertEquals(f.get(item), "testCase"); } catch(Exception e) { Assert.fail("Getting value of String using reflection failed"); - e.printStackTrace(System.err); } } } diff --git a/target/classes/wf/doyle/blockbuster/file/FileReader.class b/target/classes/wf/doyle/blockbuster/file/FileReader.class index e9b051d..f180e10 100644 Binary files a/target/classes/wf/doyle/blockbuster/file/FileReader.class and b/target/classes/wf/doyle/blockbuster/file/FileReader.class differ diff --git a/target/test-classes/wf/doyle/blockbuster/AppTest.class b/target/test-classes/wf/doyle/blockbuster/AppTest.class index f01aa7b..226d3f3 100644 Binary files a/target/test-classes/wf/doyle/blockbuster/AppTest.class and b/target/test-classes/wf/doyle/blockbuster/AppTest.class differ -- libgit2 1.7.2