Refactor port

Author: pcastornii

patternfx-demo/src/main/java/com/techsenger/patternfx/demo/mvp/DialogPort.java

@@ -26,4 +26,6 @@
 public interface DialogPort extends ParentPort {
 
     Person getResult();
+
+    void deinitialize();
 }

patternfx-demo/src/main/java/com/techsenger/patternfx/demo/mvp/DialogPresenter.java

@@ -27,15 +27,8 @@
  *
  * @author Pavel Castornii
  */
-public class DialogPresenter<T extends DialogView> extends AbstractParentPresenter<T, ParentComposer> {
-
-    protected class Port extends AbstractParentPresenter<T, ParentComposer>.Port implements DialogPort {
-
-        @Override
-        public Person getResult() {
-            return DialogPresenter.this.result;
-        }
-    }
+public class DialogPresenter<T extends DialogView> extends AbstractParentPresenter<T, ParentComposer>
+        implements DialogPort {
 
     private String firstName;
 
@@ -50,8 +43,8 @@ public DialogPresenter(T view) {
     }
 
     @Override
-    public Port getPort() {
-        return (Port) super.getPort();
+    public Person getResult() {
+        return DialogPresenter.this.result;
     }
 
     @Override
@@ -81,15 +74,6 @@ protected boolean onOk() {
         return true;
     }
 
-    protected Person getResult() {
-        return result;
-    }
-
-    @Override
-    protected Port createPort() {
-        return new DialogPresenter.Port();
-    }
-
     private boolean checkIfValid() {
         var v = getView();
         var firstNameValid = PersonValidator.isFirstNameValid(this.result.getFirstName());

patternfx-demo/src/main/java/com/techsenger/patternfx/demo/mvp/RegistryFxView.java

@@ -50,15 +50,15 @@ public DialogPort showDialog() {
             var p = new DialogPresenter<>(v);
             p.initialize();
             v.getDialog().showAndWait();
-            return p.getPort();
+            return p;
         }
 
         @Override
         public ReportPort getReport() {
             if (view.getReport() == null) {
                 return null;
             }
-            return view.getReport().getPresenter().getPort();
+            return view.getReport().getPresenter();
         }
 
         @Override

patternfx-demo/src/main/java/com/techsenger/patternfx/demo/mvp/RegistryPresenter.java

@@ -110,9 +110,4 @@ private void updateReport() {
             report.refresh(persons);
         }
     }
-
-    @Override
-    protected Port createPort() {
-        return new AbstractParentPresenter.Port();
-    }
 }

patternfx-demo/src/main/java/com/techsenger/patternfx/demo/mvp/ReportPresenter.java

@@ -27,39 +27,21 @@
  *
  * @author Pavel Castornii
  */
-public class ReportPresenter extends AbstractChildPresenter<ReportView, ChildComposer> {
-
-    private final class Port extends AbstractChildPresenter<ReportView, ChildComposer>.Port implements ReportPort {
-
-        @Override
-        public void refresh(List<Person> persons) {
-            ReportPresenter.this.refresh(persons);
-        }
-
-    }
+public class ReportPresenter extends AbstractChildPresenter<ReportView, ChildComposer> implements ReportPort {
 
     public ReportPresenter(ReportView view) {
         super(view);
     }
 
     @Override
-    protected Descriptor createDescriptor() {
-        return new Descriptor(DemoNames.PERSON_REPORT);
-    }
-
-    @Override
-    public Port getPort() {
-        return (Port) super.getPort();
-    }
-
-    @Override
-    protected Port createPort() {
-        return new ReportPresenter.Port();
-    }
-
-    private void refresh(List<Person> persons) {
+    public void refresh(List<Person> persons) {
         double average = persons.stream().mapToDouble(Person::getAge).average().orElse(0.0);
         getView().setAverageAge(String.valueOf(average));
         getView().setTotalPeople(String.valueOf(persons.size()));
     }
+
+    @Override
+    protected Descriptor createDescriptor() {
+        return new Descriptor(DemoNames.PERSON_REPORT);
+    }
 }

patternfx-mvp/src/main/java/com/techsenger/patternfx/mvp/AbstractChildFxView.java

@@ -36,7 +36,7 @@ public ParentPort getParent() {
             if (parent == null) {
                 return null;
             }
-            return parent.getPresenter().getPort();
+            return parent.getPresenter();
         }
     }
 

patternfx-mvp/src/main/java/com/techsenger/patternfx/mvp/AbstractChildPresenter.java

@@ -23,27 +23,12 @@
 public abstract class AbstractChildPresenter<V extends ChildView, C extends ChildComposer>
         extends AbstractParentPresenter<V, C> implements ChildPresenter<V, C> {
 
-    protected class Port extends AbstractParentPresenter<V, C>.Port implements ChildPort {
-
-        public Port() {
-            // empty
-        }
-
-        @Override
-        public ParentPort getParent() {
-            return getComposer().getParent();
-        }
-    }
-
     public AbstractChildPresenter(V view) {
         super(view);
     }
 
     @Override
-    public Port getPort() {
-        return (Port) super.getPort();
+    public ParentPort getParent() {
+        return getComposer().getParent();
     }
-
-    @Override
-    protected abstract Port createPort();
 }

patternfx-mvp/src/main/java/com/techsenger/patternfx/mvp/AbstractParentFxView.java

@@ -44,7 +44,7 @@ public void compose(ComposeParameters params) {
 
         @Override
         public List<? extends ChildPort> getChildren() {
-            return view.getChildren().stream().map(v -> v.getPresenter().getPort()).collect(Collectors.toList());
+            return view.getChildren().stream().map(v -> v.getPresenter()).collect(Collectors.toList());
         }
 
         @Override
@@ -58,7 +58,7 @@ protected List<ParentFxView<?>> getChildren(ParentFxView<?> parent) {
 
                 @Override
                 protected ParentPort map(ParentFxView<?> value) {
-                    return value.getPresenter().getPort();
+                    return value.getPresenter();
                 }
             };
         }
@@ -74,7 +74,7 @@ protected List<ParentFxView<?>> getChildren(ParentFxView<?> parent) {
 
                 @Override
                 protected ParentPort map(ParentFxView<?> value) {
-                    return value.getPresenter().getPort();
+                    return value.getPresenter();
                 }
             };
         }

patternfx-mvp/src/main/java/com/techsenger/patternfx/mvp/AbstractParentPresenter.java

@@ -29,49 +29,12 @@ public abstract class AbstractParentPresenter<V extends ParentView, C extends Pa
 
     private static final Logger logger = LoggerFactory.getLogger(AbstractParentPresenter.class);
 
-    protected class Port implements ParentPort {
-
-        private final AbstractParentPresenter<?, ?> presenter = AbstractParentPresenter.this;
-
-        public Port() {
-            // empty
-        }
-
-        @Override
-        public void requestFocus() {
-            getView().requestFocus();
-        }
-
-        @Override
-        public Descriptor getDescriptor() {
-            return presenter.getDescriptor();
-        }
-
-        @Override
-        public void initialize() {
-            presenter.initialize();
-        }
-
-        @Override
-        public void deinitialize() {
-            presenter.deinitialize();
-        }
-
-        @Override
-        public List<? extends ChildPort> getChildren() {
-            return getComposer().getChildren();
-        }
-    }
-
-    private final Port port;
-
     private C composer;
 
     private ComposeParameters parameters;
 
     public AbstractParentPresenter(V view) {
         super(view);
-        this.port = createPort();
         this.parameters = createParameters();
     }
 
@@ -80,11 +43,6 @@ public C getComposer() {
         return this.composer;
     }
 
-    @Override
-    public Port getPort() {
-        return this.port;
-    }
-
     @Override
     public void deinitializeTree() {
         if (logger.isDebugEnabled()) {
@@ -93,10 +51,22 @@ public void deinitializeTree() {
         }
         var iterator = composer.breadthFirstIterator();
         while (iterator.hasNext()) {
-            iterator.next().deinitialize();
+            var port = iterator.next();
+            var presenter = (ParentPresenter<?, ?>) port;
+            presenter.deinitialize();
         }
     }
 
+    @Override
+    public List<? extends ChildPort> getChildren() {
+        return getComposer().getChildren();
+    }
+
+    @Override
+    public void requestFocus() {
+        getView().requestFocus();
+    }
+
     @Override
     protected void postInitialize() {
         super.postInitialize();
@@ -108,10 +78,6 @@ protected void setComposer(ParentComposer composer) {
         this.composer = (C) composer;
     }
 
-    protected Port createPort() {
-        return new Port();
-    }
-
     /**
     * Creates the parameters to be passed to {@link ParentComposer#compose(ComposerParameters)} during the static
     * composition phase. After composition completes, the instance is set to {@code null} and is no longer accessible.

patternfx-mvp/src/main/java/com/techsenger/patternfx/mvp/ChildPresenter.java

@@ -20,8 +20,6 @@
  *
  * @author Pavel Castornii
  */
-public interface ChildPresenter<V extends ChildView, C extends ChildComposer> extends ParentPresenter<V, C> {
+public interface ChildPresenter<V extends ChildView, C extends ChildComposer> extends ParentPresenter<V, C>, ChildPort {
 
-    @Override
-    ChildPort getPort();
 }