Add generic types for component and mediator

pcastornii · pcastornii · commit 7ca3da4288c2 · 2025-12-18T20:38:49.000+02:00
diff --git a/README.md b/README.md
@@ -320,39 +320,35 @@ public interface FooMediator extends ChildMediator {
 `ComponentViewModel` class:
 
 ```java
-public class FooViewModel extends AbstractChildViewModel {
+public class FooViewModel extends AbstractChildViewModel<FooMediator> {
 
-    public void addBar() {
+    public FooViewModel() {
+        ...
+    }
+
+    public void doSomething() {
         var bar = new BarViewModel();
         ... // set up the bar
         getMediator().addBar(bar);
     }
 
-
-    @Override
-    public FooMediator getMediator() {
-        return (FooMediator) super.getMediator();
-    }
-
     ...
 }
 ```
 
 `ComponentView` class:
 
 ```java
-public class FooView extends AbstractChildView<FooViewModel> {
+public class FooView extends AbstractChildView<FooViewModel, FooComponent> {
 
     public FooView(FooViewModel viewModel) {
         ...
     }
 
-    ...
-
-    @Override
-    public FooComponent getComponent() {
-        return (FooComponent) super.getComponent();
+    protected void initialize() {
+        logger.debug("{} View is initializing", getComponent().getLogPrefix());
     }
+    ...
 }
 ```
 
@@ -380,7 +376,7 @@ public class FooComponent extends AbstractChildComponent<FooView> {
     ...
 
     @Override
-    public FooMediator createMediator() {
+    protected FooMediator createMediator() {
         return new FooComponent.Mediator(); // the mediator is created at the beginning of initialization
     }
 }
diff --git a/mvvm4fx-core/src/main/java/com/techsenger/mvvm4fx/core/AbstractChildComponent.java b/mvvm4fx-core/src/main/java/com/techsenger/mvvm4fx/core/AbstractChildComponent.java
@@ -23,7 +23,7 @@
  *
  * @author Pavel Castornii
  */
-public abstract class AbstractChildComponent<T extends AbstractChildView<?>> extends AbstractParentComponent<T>
+public abstract class AbstractChildComponent<T extends AbstractChildView<?, ?>> extends AbstractParentComponent<T>
         implements ChildComponent<T> {
 
     protected abstract class Mediator extends AbstractParentComponent.Mediator implements ChildMediator {
diff --git a/mvvm4fx-core/src/main/java/com/techsenger/mvvm4fx/core/AbstractChildView.java b/mvvm4fx-core/src/main/java/com/techsenger/mvvm4fx/core/AbstractChildView.java
@@ -20,15 +20,10 @@
  *
  * @author Pavel Castornii
  */
-public abstract class AbstractChildView<T extends AbstractChildViewModel> extends AbstractParentView<T>
-        implements ChildView<T> {
+public abstract class AbstractChildView<T extends AbstractChildViewModel<?>, S extends AbstractChildComponent<?>>
+        extends AbstractParentView<T, S> implements ChildView<T, S> {
 
     public AbstractChildView(T viewModel) {
         super(viewModel);
     }
-
-    @Override
-    public AbstractChildComponent<?> getComponent() {
-        return (AbstractChildComponent<?>) super.getComponent();
-    }
 }
diff --git a/mvvm4fx-core/src/main/java/com/techsenger/mvvm4fx/core/AbstractChildViewModel.java b/mvvm4fx-core/src/main/java/com/techsenger/mvvm4fx/core/AbstractChildViewModel.java
@@ -20,14 +20,10 @@
  *
  * @author Pavel Castornii
  */
-public abstract class AbstractChildViewModel extends AbstractParentViewModel implements ChildViewModel {
+public abstract class AbstractChildViewModel<M extends ChildMediator> extends AbstractParentViewModel<M>
+        implements ChildViewModel<M> {
 
     public AbstractChildViewModel() {
         super();
     }
-
-    @Override
-    public ChildMediator getMediator() {
-        return (ChildMediator) super.getMediator();
-    }
 }
diff --git a/mvvm4fx-core/src/main/java/com/techsenger/mvvm4fx/core/AbstractComponent.java b/mvvm4fx-core/src/main/java/com/techsenger/mvvm4fx/core/AbstractComponent.java
@@ -28,7 +28,7 @@
  *
  * @author Pavel Castornii
  */
-public abstract class AbstractComponent<T extends AbstractComponentView<?>> implements Component<T> {
+public abstract class AbstractComponent<T extends AbstractComponentView<?, ?>> implements Component<T> {
 
     private static final Logger logger = LoggerFactory.getLogger(AbstractComponent.class);
 
diff --git a/mvvm4fx-core/src/main/java/com/techsenger/mvvm4fx/core/AbstractComponentView.java b/mvvm4fx-core/src/main/java/com/techsenger/mvvm4fx/core/AbstractComponentView.java
@@ -16,20 +16,16 @@
 
 package com.techsenger.mvvm4fx.core;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 /**
  *
  * @author Pavel Castornii
  */
-public abstract class AbstractComponentView<T extends AbstractComponentViewModel> implements ComponentView<T> {
-
-    private static final Logger logger = LoggerFactory.getLogger(AbstractComponentView.class);
+public abstract class AbstractComponentView<T extends AbstractComponentViewModel<?>, S extends AbstractComponent<?>>
+        implements ComponentView<T, S> {
 
     private final T viewModel;
 
-    private AbstractComponent<?> component;
+    private S component;
 
     public AbstractComponentView(T viewModel) {
         this.viewModel = viewModel;
@@ -41,7 +37,7 @@ public T getViewModel() {
     }
 
     @Override
-    public AbstractComponent<?> getComponent() {
+    public S getComponent() {
         return component;
     }
 
@@ -113,6 +109,6 @@ protected void unbind() { }
     protected void unbuild() { }
 
     void setComponent(AbstractComponent<?> component) {
-        this.component = component;
+        this.component = (S) component;
     }
 }
diff --git a/mvvm4fx-core/src/main/java/com/techsenger/mvvm4fx/core/AbstractComponentViewModel.java b/mvvm4fx-core/src/main/java/com/techsenger/mvvm4fx/core/AbstractComponentViewModel.java
@@ -27,13 +27,13 @@
  *
  * @author Pavel Castornii
  */
-public abstract class AbstractComponentViewModel implements ComponentViewModel {
+public abstract class AbstractComponentViewModel<T extends ComponentMediator> implements ComponentViewModel<T> {
 
     private static final Logger logger = LoggerFactory.getLogger(AbstractComponentViewModel.class);
 
-    private ComponentMediator mediator;
+    private T mediator;
 
-    public ComponentMediator getMediator() {
+    public T getMediator() {
         return this.mediator;
     }
 
@@ -108,6 +108,6 @@ protected void initialize() { }
     protected void deinitialize() { }
 
     protected void setMediator(ComponentMediator mediator) {
-        this.mediator = mediator;
+        this.mediator = (T) mediator;
     }
 }
diff --git a/mvvm4fx-core/src/main/java/com/techsenger/mvvm4fx/core/AbstractParentComponent.java b/mvvm4fx-core/src/main/java/com/techsenger/mvvm4fx/core/AbstractParentComponent.java
@@ -25,7 +25,7 @@
  *
  * @author Pavel Castornii
  */
-public abstract class AbstractParentComponent<T extends AbstractParentView<?>> extends AbstractComponent<T>
+public abstract class AbstractParentComponent<T extends AbstractParentView<?, ?>> extends AbstractComponent<T>
         implements ParentComponent<T> {
 
     protected abstract class Mediator extends AbstractComponent.Mediator implements ParentMediator {
diff --git a/mvvm4fx-core/src/main/java/com/techsenger/mvvm4fx/core/AbstractParentView.java b/mvvm4fx-core/src/main/java/com/techsenger/mvvm4fx/core/AbstractParentView.java
@@ -20,16 +20,11 @@
  *
  * @author Pavel Castornii
  */
-public abstract class AbstractParentView<T extends AbstractParentViewModel> extends AbstractComponentView<T>
-        implements ParentView<T> {
+public abstract class AbstractParentView<T extends AbstractParentViewModel<?>, S extends AbstractParentComponent<?>>
+        extends AbstractComponentView<T, S> implements ParentView<T, S> {
 
 
     public AbstractParentView(T viewModel) {
         super(viewModel);
     }
-
-    @Override
-    public AbstractParentComponent<?> getComponent() {
-        return (AbstractParentComponent<?>) super.getComponent();
-    }
 }
diff --git a/mvvm4fx-core/src/main/java/com/techsenger/mvvm4fx/core/AbstractParentViewModel.java b/mvvm4fx-core/src/main/java/com/techsenger/mvvm4fx/core/AbstractParentViewModel.java
@@ -20,15 +20,10 @@
  *
  * @author Pavel Castornii
  */
-public abstract class AbstractParentViewModel extends AbstractComponentViewModel implements ParentViewModel {
+public abstract class AbstractParentViewModel<T extends ParentMediator> extends AbstractComponentViewModel<T>
+        implements ParentViewModel<T> {
 
     public AbstractParentViewModel() {
         super();
     }
-
-
-    @Override
-    public ParentMediator getMediator() {
-        return (ParentMediator) super.getMediator();
-    }
 }
diff --git a/mvvm4fx-core/src/main/java/com/techsenger/mvvm4fx/core/ChildComponent.java b/mvvm4fx-core/src/main/java/com/techsenger/mvvm4fx/core/ChildComponent.java
@@ -22,7 +22,7 @@
  *
  * @author Pavel Castornii
  */
-public interface ChildComponent<T extends ChildView<?>> extends ParentComponent<T> {
+public interface ChildComponent<T extends ChildView<?, ?>> extends ParentComponent<T> {
 
     /**
      * Returns the property representing the parent component of this component. The property holds a reference to the
diff --git a/mvvm4fx-core/src/main/java/com/techsenger/mvvm4fx/core/ChildView.java b/mvvm4fx-core/src/main/java/com/techsenger/mvvm4fx/core/ChildView.java
@@ -21,7 +21,7 @@
  *
  * @author Pavel Castornii
  */
-public interface ChildView<T extends ChildViewModel> extends ParentView<T> {
+public interface ChildView<T extends ChildViewModel<?>, S extends ChildComponent<?>> extends ParentView<T, S> {
 
     /**
      * Requests focus. Child component implements this method via selecting FX node that will request focus.
@@ -34,7 +34,4 @@ public interface ChildView<T extends ChildViewModel> extends ParentView<T> {
      * @return
      */
     Object getNode();
-
-    @Override
-    ChildComponent<?> getComponent();
 }
diff --git a/mvvm4fx-core/src/main/java/com/techsenger/mvvm4fx/core/ChildViewModel.java b/mvvm4fx-core/src/main/java/com/techsenger/mvvm4fx/core/ChildViewModel.java
@@ -20,8 +20,6 @@
  *
  * @author Pavel Castornii
  */
-public interface ChildViewModel extends ParentViewModel {
+public interface ChildViewModel<T extends ChildMediator> extends ParentViewModel<T> {
 
-    @Override
-    ChildMediator getMediator();
 }
diff --git a/mvvm4fx-core/src/main/java/com/techsenger/mvvm4fx/core/Component.java b/mvvm4fx-core/src/main/java/com/techsenger/mvvm4fx/core/Component.java
@@ -20,7 +20,7 @@
  *
  * @author Pavel Castornii
  */
-public interface Component<T extends ComponentView<?>> extends ComponentDescriptor {
+public interface Component<T extends ComponentView<?, ?>> extends ComponentDescriptor {
 
     /**
      * Returns the view of the component.
diff --git a/mvvm4fx-core/src/main/java/com/techsenger/mvvm4fx/core/ComponentView.java b/mvvm4fx-core/src/main/java/com/techsenger/mvvm4fx/core/ComponentView.java
@@ -20,7 +20,7 @@
  *
  * @author Pavel Castornii
  */
-public interface ComponentView<T extends ComponentViewModel> {
+public interface ComponentView<T extends ComponentViewModel<?>, S extends Component<?>> {
 
     /**
      * Returns the view model.
@@ -34,5 +34,5 @@ public interface ComponentView<T extends ComponentViewModel> {
      *
      * @return
      */
-    Component<?> getComponent();
+    S getComponent();
 }
diff --git a/mvvm4fx-core/src/main/java/com/techsenger/mvvm4fx/core/ComponentViewModel.java b/mvvm4fx-core/src/main/java/com/techsenger/mvvm4fx/core/ComponentViewModel.java
@@ -20,7 +20,7 @@
  *
  * @author Pavel Castornii
  */
-public interface ComponentViewModel {
+public interface ComponentViewModel<T extends ComponentMediator> {
 
-    ComponentMediator getMediator();
+    T getMediator();
 }
diff --git a/mvvm4fx-core/src/main/java/com/techsenger/mvvm4fx/core/ParentComponent.java b/mvvm4fx-core/src/main/java/com/techsenger/mvvm4fx/core/ParentComponent.java
@@ -22,7 +22,7 @@
  *
  * @author Pavel Castornii
  */
-public interface ParentComponent<T extends ParentView<?>> extends Component<T> {
+public interface ParentComponent<T extends ParentView<?, ?>> extends Component<T> {
 
     /**
      * Returns an unmodifiable list of child components.
diff --git a/mvvm4fx-core/src/main/java/com/techsenger/mvvm4fx/core/ParentView.java b/mvvm4fx-core/src/main/java/com/techsenger/mvvm4fx/core/ParentView.java
@@ -20,8 +20,6 @@
  *
  * @author Pavel Castornii
  */
-public interface ParentView<T extends ParentViewModel> extends ComponentView<T> {
+public interface ParentView<T extends ParentViewModel<?>, S extends Component<?>> extends ComponentView<T, S> {
 
-    @Override
-    ParentComponent<?> getComponent();
 }
diff --git a/mvvm4fx-core/src/main/java/com/techsenger/mvvm4fx/core/ParentViewModel.java b/mvvm4fx-core/src/main/java/com/techsenger/mvvm4fx/core/ParentViewModel.java
@@ -20,8 +20,6 @@
  *
  * @author Pavel Castornii
  */
-public interface ParentViewModel extends ComponentViewModel {
+public interface ParentViewModel<T extends ParentMediator> extends ComponentViewModel<T> {
 
-    @Override
-    ParentMediator getMediator();
 }
diff --git a/mvvm4fx-demo/src/main/java/com/techsenger/mvvm4fx/demo/Demo.java b/mvvm4fx-demo/src/main/java/com/techsenger/mvvm4fx/demo/Demo.java
@@ -31,10 +31,10 @@ public void start(Stage stage) throws Exception {
         var service = new PersonService();
         var viewModel = new PersonRegistryViewModel(service);
         var view = new PersonRegistryView(stage, viewModel);
-        var component = new PersonRegistry(view);
+        var component = new PersonRegistryComponent(view);
         component.initialize();
-        //just to show that every component must be deinitialized,
-        //it has no effect on the demo application
+        // just to show that every component must be deinitialized,
+        // it has no effect on the demo application
         stage.setOnCloseRequest(e -> component.deinitialize());
     }
 
diff --git a/mvvm4fx-demo/src/main/java/com/techsenger/mvvm4fx/demo/PersonDialogComponent.java b/mvvm4fx-demo/src/main/java/com/techsenger/mvvm4fx/demo/PersonDialogComponent.java
@@ -23,19 +23,19 @@
  *
  * @author Pavel Castornii
  */
-public class PersonDialog extends AbstractParentComponent<PersonDialogView> {
+public class PersonDialogComponent extends AbstractParentComponent<PersonDialogView> {
 
-    public PersonDialog(PersonDialogView view) {
+    public PersonDialogComponent(PersonDialogView view) {
         super(view);
     }
 
     @Override
-    protected Mediator createMediator() {
-        return new AbstractParentComponent.Mediator() { };
+    public ComponentName getName() {
+        return DemoComponentNames.PERSON_DIALOG;
     }
 
     @Override
-    public ComponentName getName() {
-        return DemoComponentNames.PERSON_DIALOG;
+    protected Mediator createMediator() {
+        return new AbstractParentComponent.Mediator() { };
     }
 }
diff --git a/mvvm4fx-demo/src/main/java/com/techsenger/mvvm4fx/demo/PersonDialogView.java b/mvvm4fx-demo/src/main/java/com/techsenger/mvvm4fx/demo/PersonDialogView.java
@@ -38,7 +38,7 @@
  *
  * @author Pavel Castornii
  */
-public class PersonDialogView extends AbstractParentView<PersonDialogViewModel> {
+public class PersonDialogView extends AbstractParentView<PersonDialogViewModel, PersonDialogComponent> {
 
     private final Stage stage;
 
diff --git a/mvvm4fx-demo/src/main/java/com/techsenger/mvvm4fx/demo/PersonDialogViewModel.java b/mvvm4fx-demo/src/main/java/com/techsenger/mvvm4fx/demo/PersonDialogViewModel.java
@@ -17,6 +17,7 @@
 package com.techsenger.mvvm4fx.demo;
 
 import com.techsenger.mvvm4fx.core.AbstractParentViewModel;
+import com.techsenger.mvvm4fx.core.ParentMediator;
 import com.techsenger.mvvm4fx.demo.model.Person;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
@@ -27,7 +28,7 @@
  *
  * @author Pavel Castornii
  */
-public class PersonDialogViewModel extends AbstractParentViewModel {
+public class PersonDialogViewModel extends AbstractParentViewModel<ParentMediator> {
 
     private final StringProperty title = new SimpleStringProperty("New Person");
 
diff --git a/mvvm4fx-demo/src/main/java/com/techsenger/mvvm4fx/demo/PersonRegistryComponent.java b/mvvm4fx-demo/src/main/java/com/techsenger/mvvm4fx/demo/PersonRegistryComponent.java
diff --git a/mvvm4fx-demo/src/main/java/com/techsenger/mvvm4fx/demo/PersonRegistryView.java b/mvvm4fx-demo/src/main/java/com/techsenger/mvvm4fx/demo/PersonRegistryView.java
diff --git a/mvvm4fx-demo/src/main/java/com/techsenger/mvvm4fx/demo/PersonRegistryViewModel.java b/mvvm4fx-demo/src/main/java/com/techsenger/mvvm4fx/demo/PersonRegistryViewModel.java

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`*`
`24`	`24`	`* @author Pavel Castornii`
`25`	`25`	`*/`
`26`		`-public abstract class AbstractChildComponent<T extends AbstractChildView<?>> extends AbstractParentComponent<T>`
	`26`	`+public abstract class AbstractChildComponent<T extends AbstractChildView<?, ?>> extends AbstractParentComponent<T>`
`27`	`27`	`implements ChildComponent<T> {`
`28`	`28`
`29`	`29`	`protected abstract class Mediator extends AbstractParentComponent.Mediator implements ChildMediator {`
Original file line number	Diff line number	Diff line change
`@@ -20,15 +20,10 @@`
`20`	`20`	`*`
`21`	`21`	`* @author Pavel Castornii`
`22`	`22`	`*/`
`23`		`-public abstract class AbstractChildView<T extends AbstractChildViewModel> extends AbstractParentView<T>`
`24`		`- implements ChildView<T> {`
	`23`	`+public abstract class AbstractChildView<T extends AbstractChildViewModel<?>, S extends AbstractChildComponent<?>>`
	`24`	`+ extends AbstractParentView<T, S> implements ChildView<T, S> {`
`25`	`25`
`26`	`26`	`public AbstractChildView(T viewModel) {`
`27`	`27`	`super(viewModel);`
`28`	`28`	`}`
`29`		`-`
`30`		`- @Override`
`31`		`- public AbstractChildComponent<?> getComponent() {`
`32`		`- return (AbstractChildComponent<?>) super.getComponent();`
`33`		`- }`
`34`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,14 +20,10 @@`
`20`	`20`	`*`
`21`	`21`	`* @author Pavel Castornii`
`22`	`22`	`*/`
`23`		`-public abstract class AbstractChildViewModel extends AbstractParentViewModel implements ChildViewModel {`
	`23`	`+public abstract class AbstractChildViewModel<M extends ChildMediator> extends AbstractParentViewModel<M>`
	`24`	`+ implements ChildViewModel<M> {`
`24`	`25`
`25`	`26`	`public AbstractChildViewModel() {`
`26`	`27`	`super();`
`27`	`28`	`}`
`28`		`-`
`29`		`- @Override`
`30`		`- public ChildMediator getMediator() {`
`31`		`- return (ChildMediator) super.getMediator();`
`32`		`- }`
`33`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`*`
`29`	`29`	`* @author Pavel Castornii`
`30`	`30`	`*/`
`31`		`-public abstract class AbstractComponent<T extends AbstractComponentView<?>> implements Component<T> {`
	`31`	`+public abstract class AbstractComponent<T extends AbstractComponentView<?, ?>> implements Component<T> {`
`32`	`32`
`33`	`33`	`private static final Logger logger = LoggerFactory.getLogger(AbstractComponent.class);`
`34`	`34`
Original file line number	Diff line number	Diff line change
`@@ -27,13 +27,13 @@`
`27`	`27`	`*`
`28`	`28`	`* @author Pavel Castornii`
`29`	`29`	`*/`
`30`		`-public abstract class AbstractComponentViewModel implements ComponentViewModel {`
	`30`	`+public abstract class AbstractComponentViewModel<T extends ComponentMediator> implements ComponentViewModel<T> {`
`31`	`31`
`32`	`32`	`private static final Logger logger = LoggerFactory.getLogger(AbstractComponentViewModel.class);`
`33`	`33`
`34`		`- private ComponentMediator mediator;`
	`34`	`+ private T mediator;`
`35`	`35`
`36`		`- public ComponentMediator getMediator() {`
	`36`	`+ public T getMediator() {`
`37`	`37`	`return this.mediator;`
`38`	`38`	`}`
`39`	`39`
`@@ -108,6 +108,6 @@ protected void initialize() { }`
`108`	`108`	`protected void deinitialize() { }`
`109`	`109`
`110`	`110`	`protected void setMediator(ComponentMediator mediator) {`
`111`		`- this.mediator = mediator;`
	`111`	`+ this.mediator = (T) mediator;`
`112`	`112`	`}`
`113`	`113`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`*`
`26`	`26`	`* @author Pavel Castornii`
`27`	`27`	`*/`
`28`		`-public abstract class AbstractParentComponent<T extends AbstractParentView<?>> extends AbstractComponent<T>`
	`28`	`+public abstract class AbstractParentComponent<T extends AbstractParentView<?, ?>> extends AbstractComponent<T>`
`29`	`29`	`implements ParentComponent<T> {`
`30`	`30`
`31`	`31`	`protected abstract class Mediator extends AbstractComponent.Mediator implements ParentMediator {`
Original file line number	Diff line number	Diff line change
`@@ -20,16 +20,11 @@`
`20`	`20`	`*`
`21`	`21`	`* @author Pavel Castornii`
`22`	`22`	`*/`
`23`		`-public abstract class AbstractParentView<T extends AbstractParentViewModel> extends AbstractComponentView<T>`
`24`		`- implements ParentView<T> {`
	`23`	`+public abstract class AbstractParentView<T extends AbstractParentViewModel<?>, S extends AbstractParentComponent<?>>`
	`24`	`+ extends AbstractComponentView<T, S> implements ParentView<T, S> {`
`25`	`25`
`26`	`26`
`27`	`27`	`public AbstractParentView(T viewModel) {`
`28`	`28`	`super(viewModel);`
`29`	`29`	`}`
`30`		`-`
`31`		`- @Override`
`32`		`- public AbstractParentComponent<?> getComponent() {`
`33`		`- return (AbstractParentComponent<?>) super.getComponent();`
`34`		`- }`
`35`	`30`	`}`