Merge branch 'release/1.0.4'

Author: vegegoku

domino-history-client/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.dominokit</groupId>
         <artifactId>domino-history</artifactId>
-        <version>1.0.3</version>
+        <version>1.0.4</version>
     </parent>
     <packaging>gwt-lib</packaging>
     <modelVersion>4.0.0</modelVersion>

domino-history-client/src/main/java/org/dominokit/domino/client/history/StateHistory.java

@@ -411,10 +411,15 @@ public void invoke() {
    */
   @Override
   public void fireCurrentStateHistory(String title) {
-
     fireStateInternal(StateToken.of(windowToken()).title(title).data(stateData(windowState())));
   }
 
+  @Override
+  public void reload() {
+    Location location = Js.uncheckedCast(DomGlobal.location);
+    location.reload();
+  }
+
   private void fireStateInternal(StateToken stateToken) {
     EffectiveToken effectiveToken = new EffectiveToken(rootPath, stateToken);
     replaceState(effectiveToken);

domino-history-jvm/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>domino-history</artifactId>
         <groupId>org.dominokit</groupId>
-        <version>1.0.3</version>
+        <version>1.0.4</version>
     </parent>
     <packaging>jar</packaging>
     <modelVersion>4.0.0</modelVersion>

domino-history-jvm/src/main/java/org/dominokit/domino/client/history/JVMHistory.java

@@ -384,6 +384,11 @@ public void invoke() {
     }
   }
 
+  @Override
+  public void reload() {
+    fireCurrentStateHistory();
+  }
+
   private class JVMState implements State {
 
     private final HistoryState historyState;

domino-history-shared/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>domino-history</artifactId>
         <groupId>org.dominokit</groupId>
-        <version>1.0.3</version>
+        <version>1.0.4</version>
     </parent>
     <packaging>gwt-lib</packaging>
     <modelVersion>4.0.0</modelVersion>

domino-history-shared/src/main/java/org/dominokit/domino/history/DominoHistory.java

@@ -159,6 +159,8 @@ default boolean isInformOnPopState() {
 
   void removeInterceptor(HistoryInterceptor interceptor);
 
+  void reload();
+
   /** A functional interface to define a listener to be called when url state is changed. */
   interface StateListener {
     /**

domino-history-shared/src/main/java/org/dominokit/domino/history/HistoryToken.java

@@ -155,6 +155,15 @@ public interface HistoryToken {
    */
   HistoryToken replaceAllPaths(String newPath);
 
+  /**
+   * Remove all paths that appear after the specified path element
+   *
+   * @param offsetPath the path to remove its tailing paths, the specified offsetPath won't be
+   *     removed.
+   * @return {@link HistoryToken} with its path part being ends with the specified offsetPath.
+   */
+  HistoryToken removePathTail(String offsetPath);
+
   /**
    * Removes the whole path part of the {@link HistoryToken}
    *

domino-history-shared/src/main/java/org/dominokit/domino/history/StateHistoryToken.java

@@ -514,6 +514,21 @@ public HistoryToken replaceAllPaths(String newPath) {
     return this;
   }
 
+  /**
+   * Remove all paths that appear after the specified path element
+   *
+   * @param offsetPath the path to remove its tailing paths, the specified offsetPath won't be
+   *     removed.
+   * @return {@link HistoryToken} with its path part being ends with the specified offsetPath.
+   */
+  @Override
+  public HistoryToken removePathTail(String offsetPath) {
+    while (!endsWithPath(offsetPath)) {
+      removeLastPath();
+    }
+    return this;
+  }
+
   /**
    * Replace the whole token fragment part with the newFragment
    *

domino-history-shared/src/main/java/org/dominokit/domino/history/TokenFilter.java

@@ -366,7 +366,11 @@ class ContainsFragmentFilter implements TokenFilter {
 
     @Override
     public boolean filter(HistoryToken token) {
-      return token.fragment().contains(matchingPart);
+      String unHashed = TokenUtil.unHashFragment(this.matchingPart);
+      if (unHashed.isEmpty()) {
+        return false;
+      }
+      return token.fragment().contains(unHashed);
     }
 
     @Override
@@ -380,7 +384,7 @@ public NormalizedToken normalizeToken(String rootPath, String token) {
   }
 
   /**
-   * A token filter that will return <b>true</b> only if the history token fargment part is an exact
+   * A token filter that will return <b>true</b> only if the history token fragment part is an exact
    * match of the specified part.
    */
   class ExactFragmentFilter implements TokenFilter {
@@ -392,7 +396,11 @@ class ExactFragmentFilter implements TokenFilter {
 
     @Override
     public boolean filter(HistoryToken token) {
-      return token.fragment().equals(matchingPart);
+      String unHashed = TokenUtil.unHashFragment(this.matchingPart);
+      if (unHashed.isEmpty()) {
+        return false;
+      }
+      return token.fragment().equals(unHashed);
     }
 
     @Override
@@ -414,7 +422,11 @@ class StartsWithFragmentFilter implements TokenFilter {
 
     @Override
     public boolean filter(HistoryToken token) {
-      return token.fragment().startsWith(prefix);
+      String unHashed = TokenUtil.unHashFragment(this.prefix);
+      if (unHashed.isEmpty()) {
+        return false;
+      }
+      return token.fragment().startsWith(unHashed);
     }
 
     @Override
@@ -436,7 +448,11 @@ class EndsWithFragmentFilter implements TokenFilter {
 
     @Override
     public boolean filter(HistoryToken token) {
-      return token.fragment().endsWith(postfix);
+      String unHashed = TokenUtil.unHashFragment(this.postfix);
+      if (unHashed.isEmpty()) {
+        return false;
+      }
+      return token.fragment().endsWith(unHashed);
     }
 
     @Override

domino-history-shared/src/main/java/org/dominokit/domino/history/TokenUtil.java

@@ -0,0 +1,31 @@
+/*
+ * Copyright © 2019 Dominokit
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.dominokit.domino.history;
+
+public class TokenUtil {
+
+  public static String unHashFragment(String fragment) {
+    if (fragment.contains("#")) {
+      int lastHashIndex = fragment.lastIndexOf("#");
+      if (fragment.length() > lastHashIndex + 1) {
+        return fragment.substring(lastHashIndex + 1);
+      } else {
+        return "";
+      }
+    }
+    return fragment;
+  }
+}