parameterized map controller and web engine fields. added new layer event. added deprecated javadocs

Author: makbn

jlmap-api/src/main/java/io/github/makbn/jlmap/JLMapController.java

@@ -127,7 +127,7 @@ default void checkMapState() {
         }
     }
 
-    private @Nullable <T extends LeafletLayer> T getLayerInternal(@NonNull Class<T> layerClass) {
+    private @Nullable <M extends LeafletLayer> M getLayerInternal(@NonNull Class<M> layerClass) {
         return getLayers().entrySet()
                 .stream()
                 .filter(entry -> layerClass.isAssignableFrom(entry.getKey()))

jlmap-api/src/main/java/io/github/makbn/jlmap/listener/OnJLObjectActionListener.java

@@ -10,18 +10,27 @@
  */
 public interface OnJLObjectActionListener<T extends JLObject<?>> extends OnJLActionListener<T> {
 
+    /**
+     * try to override and use {@link #onAction(JLObject, Event)}
+     * @deprecated this method will be removed with the next minor version
+     */
     @Deprecated(forRemoval = true)
     default void click(T t, JLAction action) {
         // NO-OP
     }
 
+    /**
+     * try to override and use {@link #onAction(JLObject, Event)}
+     * @deprecated this method will be removed with the next minor version
+     */
     @Deprecated(forRemoval = true)
     default void move(T t, JLAction action) {
         // NO-OP
     }
 
     /**
      * try to override and use {@link #onAction(JLObject, Event)}
+     * @deprecated this method added for the transition period and will be removed with the next minor version
      */
     @Deprecated(forRemoval = true)
     void onActionReceived(T t, Event event);

jlmap-fx/src/main/java/io/github/makbn/jlmap/fx/demo/LeafletTestJFX.java

@@ -128,12 +128,7 @@ public void onActionReceived(Event event) {
     }
 
     private OnJLObjectActionListener<JLMarker> getListener() {
-        return new OnJLObjectActionListener<>() {
-            @Override
-            public void onActionReceived(JLMarker jlMarker, Event event) {
-                log.info("object {} event for marker:{}", event.action(), jlMarker);
-            }
-        };
+        return (jlMarker, event) -> log.info("object {} event for marker:{}", event.action(), jlMarker);
     }
 
     private void addMultiPolyline(JLMapView map) {

jlmap-vaadin/pom.xml

@@ -60,7 +60,6 @@
             </plugin>
         </plugins>
         <sourceDirectory>src/main/java</sourceDirectory>
-        <!--<testSourceDirectory>src/test/java</testSourceDirectory>-->
     </build>
 
     <dependencyManagement>

jlmap-vaadin/src/main/java/io/github/makbn/jlmap/vaadin/layer/JLVaadinGeoJsonLayer.java

@@ -22,8 +22,6 @@
  */
 @FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = true)
 public class JLVaadinGeoJsonLayer extends JLVaadinLayer implements LeafletGeoJsonLayerInt {
-    private static final String MEMBER_PREFIX = "geoJson";
-
     JLGeoJsonURL fromUrl;
     JLGeoJsonFile fromFile;
     JLGeoJsonContent fromContent;

jlmap-vaadin/src/main/java/io/github/makbn/jlmap/vaadin/layer/JLVaadinLayer.java

@@ -1,5 +1,6 @@
 package io.github.makbn.jlmap.vaadin.layer;
 
+import com.vaadin.flow.component.page.PendingJavaScriptResult;
 import io.github.makbn.jlmap.JLMapCallbackHandler;
 import io.github.makbn.jlmap.engine.JLWebEngine;
 import io.github.makbn.jlmap.layer.leaflet.LeafletLayer;
@@ -19,11 +20,11 @@
 
 @FieldDefaults(level = AccessLevel.PROTECTED, makeFinal = true)
 public abstract class JLVaadinLayer implements LeafletLayer {
-    JLWebEngine engine;
+    JLWebEngine<PendingJavaScriptResult> engine;
     JLMapCallbackHandler callbackHandler;
     String componentSessionId = "_" + UUID.randomUUID().toString().replace("-", "") + "_";
 
-    protected JLVaadinLayer(JLWebEngine engine, JLMapCallbackHandler callbackHandler) {
+    protected JLVaadinLayer(JLWebEngine<PendingJavaScriptResult> engine, JLMapCallbackHandler callbackHandler) {
         this.engine = engine;
         this.callbackHandler = callbackHandler;
     }