Merge pull request #182 from scireum/ili/cast-fix

Sirius Bump + Cast Fix
scireum · Apr 7, 2020 · 2f59f75 · 2f59f75
2 parents 37f5177 + 980cf9f
commit 2f59f75
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 19 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.scireum</groupId>
         <artifactId>sirius-parent</artifactId>
-        <version>3.14</version>
+        <version>7.0.1</version>
     </parent>
     <artifactId>sirius-search</artifactId>
     <version>11.12.3</version>
@@ -17,9 +17,9 @@
     </description>
 
     <properties>
-        <sirius.kernel>13.18</sirius.kernel>
-        <sirius.web>25.1</sirius.web>
-        <sirius.db>10.3</sirius.db>
+        <sirius.kernel>dev-16.4</sirius.kernel>
+        <sirius.web>dev-26.3.4</sirius.web>
+        <sirius.db>dev-14.3</sirius.db>
     </properties>
 
     <repositories>

diff --git a/src/main/resources/templates/index-health-indices.html.pasta b/src/main/resources/templates/index-health-indices.html.pasta
@@ -5,25 +5,25 @@
 <i:arg name="indexMetaData" type="java.util.Map"/>
 
 <i:for type="org.elasticsearch.cluster.health.ClusterIndexHealth" var="indexHealth"
-       items="@clusterHealth.getIndices().as(java.util.Map.class).values().as(java.util.Collection.class)">
+       items="@clusterHealth.getIndices().values()">
     <table class="table table-striped">
         <tr>
-            <td class="@clusterHealth.getIndices().get(indexHealth.getIndex()).as(org.elasticsearch.cluster.health.ClusterIndexHealth.class).getStatus().toString()"
+            <td class="@clusterHealth.getIndices().get(indexHealth.getIndex()).getStatus().toString()"
                 style="vertical-align:middle">
                 @indexHealth.getIndex()
             </td>
             <td>
                 <i:for type="java.util.Map$Entry"
                        var="shardRouting"
-                       items="@allShardRoutings.as(java.util.Map.class).get(indexHealth.getIndex()).as(java.util.Map.class).entrySet()">
+                       items="@allShardRoutings.get(indexHealth.getIndex()).entrySet()">
                     <i:for type="org.elasticsearch.cluster.routing.ShardRouting" var="routing"
-                           items="@shardRouting.getValue().as(java.util.List.class)">
+                           items="@shardRouting.getValue()">
                         <i:local name="shardId" value="@toUserString(call.generateLocalId())"/>
                         <i:invoke template="/templates/index-health-infowindow.html.pasta" id="@shardId"
                                   titleKey="IndexHealth.shardRouting"
                                   content="@toXContent(routing)"/>
                         <a class="@routing.state().toString()" style="width:40px; height:40px; border: 3px solid black; display:inline-block; text-align:center;
-                                      cursor:pointer" data-toggle="modal" data-target="#@shardId.as(String.class)">
+                                      cursor:pointer" data-toggle="modal" data-target="#@shardId">
                             <p style="font-size:35px; position:relative; bottom:8px; color: #000000;">
                                 @shardRouting.getKey()</p>
                         </a>
@@ -34,10 +34,10 @@
             <i:local name="metaDataId" value="@toUserString(call.generateLocalId())"/>
             <i:invoke template="/templates/index-health-infowindow.html.pasta" id="@statusId"
                       titleKey="IndexHealth.indexStatus"
-                      content="@indexStatusMap.get(indexHealth.getIndex()).as(String.class)"/>
+                      content="@indexStatusMap.get(indexHealth.getIndex())"/>
             <i:invoke template="/templates/index-health-infowindow.html.pasta" id="@metaDataId"
                       titleKey="IndexHealth.indexMetadata"
-                      content="@indexMetaData.get(indexHealth.getIndex()).as(String.class)"/>
+                      content="@indexMetaData.get(indexHealth.getIndex())"/>
             <td class="align-right" style="vertical-align:middle">
                 <div class="dropdown" style="float:right">
                     <button class="btn btn-default dropdown-toggle" type="button"
@@ -58,16 +58,16 @@
             <td colspan="2" style="overflow: hidden">
                 Status
             </td>
-            <td class="@clusterHealth.getIndices().get(indexHealth.getIndex()).as(org.elasticsearch.cluster.health.ClusterIndexHealth.class).getStatus().toString() align-right"
+            <td class="@clusterHealth.getIndices().get(indexHealth.getIndex()).getStatus().toString() align-right"
                 style="overflow: hidden">
-                @clusterHealth.getIndices().get(indexHealth.getIndex()).as(org.elasticsearch.cluster.health.ClusterIndexHealth.class).getStatus().toString()
+                @clusterHealth.getIndices().get(indexHealth.getIndex()).getStatus().toString()
             </td>
         </tr>
         <tr>
             <td colspan="2" style="overflow: hidden">
                 # Shards
             </td>
-            <td class="@clusterHealth.getIndices().get(indexHealth.getIndex()).as(org.elasticsearch.cluster.health.ClusterIndexHealth.class).getStatus().toString() align-right"
+            <td class="@clusterHealth.getIndices().get(indexHealth.getIndex()).getStatus().toString() align-right"
                 style="overflow: hidden">
                 @indexHealth.getNumberOfShards()
             </td>
@@ -76,7 +76,7 @@
             <td colspan="2" style="overflow: hidden">
                 # Replicas
             </td>
-            <td class="@clusterHealth.getIndices().get(indexHealth.getIndex()).as(org.elasticsearch.cluster.health.ClusterIndexHealth.class).getStatus().toString() align-right"
+            <td class="@clusterHealth.getIndices().get(indexHealth.getIndex()).getStatus().toString() align-right"
                 style="overflow: hidden">
                 @indexHealth.getNumberOfReplicas()
             </td>
@@ -85,7 +85,7 @@
             <td colspan="2" style="overflow: hidden">
                 # Docs
             </td>
-            <td class="@clusterHealth.getIndices().get(indexHealth.getIndex()).as(org.elasticsearch.cluster.health.ClusterIndexHealth.class).getStatus().toString() align-right"
+            <td class="@clusterHealth.getIndices().get(indexHealth.getIndex()).getStatus().toString() align-right"
                 style="overflow: hidden">
                 @toUserString(indicesStats.getIndex(indexHealth.getIndex()).getPrimaries().getDocs().getCount())
             </td>
@@ -94,7 +94,7 @@
             <td colspan="2" style="overflow: hidden">
                 Size
             </td>
-            <td class="@clusterHealth.getIndices().get(indexHealth.getIndex()).as(org.elasticsearch.cluster.health.ClusterIndexHealth.class).getStatus().toString() align-right"
+            <td class="@clusterHealth.getIndices().get(indexHealth.getIndex()).getStatus().toString() align-right"
                 style="overflow: hidden">
                 @formatSize(indicesStats.getIndex(indexHealth.getIndex()).getPrimaries().getTotalMemory().getBytes())
             </td>

diff --git a/src/main/resources/templates/index-health-node.html.pasta b/src/main/resources/templates/index-health-node.html.pasta
@@ -11,10 +11,10 @@
             <i:local name="nodeInfoId" value="@toUserString(call.generateLocalId())"/>
             <i:invoke template="/templates/index-health-infowindow.html.pasta" id="@nodeStatId"
                       titleKey="IndexHealth.nodeStats"
-                      content="@nodeStatsMap.get(nodeStats.getNode().getName()).as(String.class)"/>
+                      content="@nodeStatsMap.get(nodeStats.getNode().getName())"/>
             <i:invoke template="/templates/index-health-infowindow.html.pasta" id="@nodeInfoId"
                       titleKey="IndexHealth.nodeInfo"
-                      content="@nodeInfoMap.get(nodeStats.getNode().getName()).as(String.class)"/>
+                      content="@nodeInfoMap.get(nodeStats.getNode().getName())"/>
 
             <td style="vertical-align:middle">
                 @nodeStats.getNode().getName()