1 files changed, 11 insertions, 4 deletions

diff --git a/ex1/src/main/java/reflection/api/ReflectionInvestigator.java b/ex1/src/main/java/reflection/api/ReflectionInvestigator.java
index 27e7b44..e16d3d5 100644
--- a/ex1/src/main/java/reflection/api/ReflectionInvestigator.java
+++ b/ex1/src/main/java/reflection/api/ReflectionInvestigator.java
@@ -74,9 +74,16 @@ public class ReflectionInvestigator implements Investigator {
 
   @Override
   public Set<String> getNamesOfAllFieldsIncludingInheritanceChain() {
-    return Stream.of(classInfo.getDeclaredFields())
-        .map(f -> f.getName())
-        .collect(Collectors.toSet());
+    var fields = new HashSet<String>();
+    var cursor = classInfo;
+    while (cursor != null) {
+      fields.addAll(
+          Stream.of(classInfo.getDeclaredFields())
+              .map(f -> f.getName())
+              .collect(Collectors.toSet()));
+      cursor = cursor.getSuperclass();
+    }
+    return fields;
   }
 
   @Override
@@ -109,7 +116,7 @@ public class ReflectionInvestigator implements Investigator {
   @Override
   public Object elevateMethodAndInvoke(String name, Class<?>[] parametersTypes, Object... args) {
     try {
-      var method = classInfo.getMethod(name, parametersTypes);
+      var method = classInfo.getDeclaredMethod(name, parametersTypes);
       method.setAccessible(true);
       return method.invoke(subjectInstance, args);
     } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {