Remove unused code, make dev ui properties immutable, hide empty tables

apache · Jul 20, 2021 · e9ff622 · e9ff622
1 parent 4d03167
commit e9ff622
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 36 deletions.
diff --git a/...kus/deployment/src/main/java/org/optaplanner/quarkus/deployment/OptaPlannerProcessor.java b/...kus/deployment/src/main/java/org/optaplanner/quarkus/deployment/OptaPlannerProcessor.java
@@ -224,10 +224,6 @@ SolverConfigBuildStep recordAndRegisterBeans(OptaPlannerRecorder recorder, Recor
                         GizmoMemberAccessorEntityEnhancer.getDroolsInitializer(recorderContext)))
                 .done());
 
-        StringWriter effectiveSolverConfigXMLWriter = new StringWriter();
-        SolverConfigIO solverConfigIO = new SolverConfigIO();
-        solverConfigIO.write(solverConfig, effectiveSolverConfigXMLWriter);
-
         syntheticBeanBuildItemBuildProducer.produce(SyntheticBeanBuildItem.configure(SolverManagerConfig.class)
                 .scope(Singleton.class)
                 .defaultBean()

diff --git a/...us-integration/optaplanner-quarkus/deployment/src/main/resources/dev-templates/model.html b/...us-integration/optaplanner-quarkus/deployment/src/main/resources/dev-templates/model.html
@@ -38,9 +38,10 @@
     <div class="card-header bg-primary text-light">Solution: {info:solverConfigProperties.optaPlannerModelProperties.solutionClass}</div>
     <div class="card-body">
     {#for entityClass in info:solverConfigProperties.optaPlannerModelProperties.entityClassList}
-    <div class="card h-100 shadow">
+        <div class="card h-100 shadow">
         <div class="card-header">Entity: {entityClass}</div>
         <div class="card-body">
+            {#if !info:solverConfigProperties.optaPlannerModelProperties.entityClassToGenuineVariableListMap.get(entityClass).isEmpty()}
             <table class="table table-striped">
                 <thead class="thead-dark">
                     <tr>
@@ -53,6 +54,8 @@
                 {/for}
                 </tbody>
             </table>
+            {/if}
+            {#if !info:solverConfigProperties.optaPlannerModelProperties.entityClassToShadowVariableListMap.get(entityClass).isEmpty()}
             <table class="table table-striped">
                 <thead class="thead-dark">
                 <tr>
@@ -65,6 +68,7 @@
                 {/for}
                 </tbody>
             </table>
+            {/if}
         </div>
     </div>
     {/for}

diff --git a/...gration/optaplanner-quarkus/deployment/src/main/resources/dev-templates/solverConfig.html b/...gration/optaplanner-quarkus/deployment/src/main/resources/dev-templates/solverConfig.html
@@ -15,33 +15,10 @@
 -->
 {#include main}
 
-{#style}
-.solver-config {
-white-space: pre-wrap;
-}
-{/style}
-
 {#title}Solver Configuration{/title}
-
-<!--
-  ~ Copyright 2021 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ 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.
-  -->
-
 {#body}
-<div class="solver-config">
-    {info:solverConfigProperties.effectiveSolverConfig}
-</div>
+<pre>
+{info:solverConfigProperties.effectiveSolverConfig}
+</pre>
 {/body}
 {/include}
diff --git a/...integration-test/src/test/java/org/optaplanner/quarkus/it/devui/OptaPlannerDevUITest.java b/...integration-test/src/test/java/org/optaplanner/quarkus/it/devui/OptaPlannerDevUITest.java
@@ -57,7 +57,7 @@ public void testSolverConfigPage() throws ParserConfigurationException, SAXExcep
         Node node = xmlParser.parseText(body);
         String solverConfig = ((Node) (node.getAt(QName.valueOf("body"))
                 .getAt(QName.valueOf("div"))
-                .getAt(QName.valueOf("div"))
+                .getAt(QName.valueOf("pre"))
                 .get(0))).text();
         assertThat(solverConfig).isEqualToIgnoringWhitespace(
                 "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"

diff --git a/...arkus/runtime/src/main/java/org/optaplanner/quarkus/devui/OptaPlannerDevUIProperties.java b/...arkus/runtime/src/main/java/org/optaplanner/quarkus/devui/OptaPlannerDevUIProperties.java
@@ -19,9 +19,9 @@
 import java.util.List;
 
 public class OptaPlannerDevUIProperties {
-    OptaPlannerModelProperties optaPlannerModelProperties;
-    String effectiveSolverConfigXML;
-    List<String> constraintList;
+    private final OptaPlannerModelProperties optaPlannerModelProperties;
+    private final String effectiveSolverConfigXML;
+    private final List<String> constraintList;
 
     public OptaPlannerDevUIProperties(OptaPlannerModelProperties optaPlannerModelProperties, String effectiveSolverConfigXML,
             List<String> constraintList) {

diff --git a/...ntime/src/main/java/org/optaplanner/quarkus/devui/OptaPlannerDevUIPropertiesSupplier.java b/...ntime/src/main/java/org/optaplanner/quarkus/devui/OptaPlannerDevUIPropertiesSupplier.java
@@ -39,7 +39,7 @@
 import io.quarkus.arc.Arc;
 
 public class OptaPlannerDevUIPropertiesSupplier implements Supplier<OptaPlannerDevUIProperties> {
-    String effectiveSolverConfigXml;
+    private String effectiveSolverConfigXml;
 
     public OptaPlannerDevUIPropertiesSupplier() {
         this.effectiveSolverConfigXml = null;
@@ -49,6 +49,7 @@ public OptaPlannerDevUIPropertiesSupplier(String effectiveSolverConfigXml) {
         this.effectiveSolverConfigXml = effectiveSolverConfigXml;
     }
 
+    // Needed for Quarkus Dev UI serialization
     public String getEffectiveSolverConfigXml() {
         return effectiveSolverConfigXml;
     }