separate if condition into private method

mate-academy · Aug 8, 2023 · 07cb1f8 · 07cb1f8
1 parent 60eb872
commit 07cb1f8
Showing 1 changed file with 24 additions and 20 deletions.
diff --git a/src/main/java/mate.academy/lib/Injector.java b/src/main/java/mate.academy/lib/Injector.java
@@ -26,29 +26,33 @@ public static Injector getInjector() {
     public Object getInstance(Class<?> interfaceClazz) {
         Object clazzImplementationInstance = null;
         Class<?> clazz = findImplementation(interfaceClazz);
-        if (clazz.isAnnotationPresent(Component.class)) {
-            Field[] fields = clazz.getDeclaredFields();
-            for (Field field : fields) {
-                if (field.isAnnotationPresent(Inject.class)) {
-                    Object fieldInstance = getInstance(field.getType());
-                    clazzImplementationInstance = createNewInstance(clazz);
-                    try {
-                        field.setAccessible(true);
-                        field.set(clazzImplementationInstance, fieldInstance);
-                    } catch (IllegalAccessException e) {
-                        throw new RuntimeException("Can't initialize field value. "
-                                + "Class; " + clazz.getName() + ". Field " + field.getName());
-                    }
-                }
-            }
-            if (clazzImplementationInstance == null) {
+        checkIfAnnotationPresent(interfaceClazz, clazz);
+        Field[] fields = clazz.getDeclaredFields();
+        for (Field field : fields) {
+            if (field.isAnnotationPresent(Inject.class)) {
+                Object fieldInstance = getInstance(field.getType());
                 clazzImplementationInstance = createNewInstance(clazz);
+                try {
+                    field.setAccessible(true);
+                    field.set(clazzImplementationInstance, fieldInstance);
+                } catch (IllegalAccessException e) {
+                    throw new RuntimeException("Can't initialize field value. "
+                            + "Class; " + clazz.getName() + ". Field " + field.getName());
+                }
             }
-            return clazzImplementationInstance;
         }
-        throw new RuntimeException("Provided class "
-                + interfaceClazz.getName()
-                + " is not marked with Component annotation");
+        if (clazzImplementationInstance == null) {
+            clazzImplementationInstance = createNewInstance(clazz);
+        }
+        return clazzImplementationInstance;
+    }
+
+    private void checkIfAnnotationPresent(Class<?> interfaceClazz, Class<?> clazz) {
+        if (!clazz.isAnnotationPresent(Component.class)) {
+            throw new RuntimeException("Provided class "
+                    + interfaceClazz.getName()
+                    + " is not marked with Component annotation");
+        }
     }
 
     private Object createNewInstance(Class<?> clazz) {