This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 1011449029 ISIS-3197: minor post merge refactoring (2)
1011449029 is described below
commit 1011449029a653bf4359df3099a4a3875c07691e
Author: Andi Huber <ahu...@apache.org>
AuthorDate: Thu Sep 1 17:53:46 2022 +0200
ISIS-3197: minor post merge refactoring (2)
- makes datatables.net a bit easier to maintain
---
bom/pom.xml | 2 +-
.../DatatablesCssBootstrap5ReferenceWkt.java | 3 ++-
.../datatables/DatatablesCssReferenceWkt.java | 3 ++-
...sCssReferenceWkt.java => DatatablesDotNet.java} | 27 +++++++---------------
...DatatablesJavaScriptBootstrap5ReferenceWkt.java | 3 ++-
.../DatatablesJavaScriptReferenceWkt.java | 3 ++-
.../DatatablesJavaScriptResourceReferenceInit.java | 16 +++++++------
7 files changed, 26 insertions(+), 31 deletions(-)
diff --git a/bom/pom.xml b/bom/pom.xml
index a67a0a4c54..11d317b69f 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -348,7 +348,7 @@ It is therefore a copy of org.apache:apache, with
customisations clearly identif
<datanucleus-maven-plugin.version>6.0.0-release</datanucleus-maven-plugin.version>
<datanucleus-rdbms.version>6.0.1</datanucleus-rdbms.version>
- <datatables.version>1.12.1</datatables.version>
+ <datatables.version>1.12.1</datatables.version> <!-- keep in sync with
DatatablesDotNet -->
<docx4j.version>11.3.2</docx4j.version>
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/datatables/DatatablesCssBootstrap5ReferenceWkt.java
b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/datatables/DatatablesCssBootstrap5ReferenceWkt.java
index 81af0f3fd3..162a1c8a78 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/datatables/DatatablesCssBootstrap5ReferenceWkt.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/datatables/DatatablesCssBootstrap5ReferenceWkt.java
@@ -44,5 +44,6 @@ public class DatatablesCssBootstrap5ReferenceWkt extends
WebjarsCssResourceRefer
super(RESOURCE);
}
- private static final String RESOURCE =
"datatables/1.12.1/css/dataTables.bootstrap5.min.css";
+ private static final String RESOURCE = DatatablesDotNet.formatWithVersion(
+ "datatables/%s/css/dataTables.bootstrap5.min.css");
}
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/datatables/DatatablesCssReferenceWkt.java
b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/datatables/DatatablesCssReferenceWkt.java
index f7ba0bf2fe..c145cf95e8 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/datatables/DatatablesCssReferenceWkt.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/datatables/DatatablesCssReferenceWkt.java
@@ -44,5 +44,6 @@ public class DatatablesCssReferenceWkt extends
WebjarsCssResourceReference {
super(RESOURCE);
}
- private static final String RESOURCE =
"datatables/1.12.1/css/jquery.dataTables.min.css";
+ private static final String RESOURCE = DatatablesDotNet.formatWithVersion(
+ "datatables/%s/css/jquery.dataTables.min.css");
}
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/datatables/DatatablesCssReferenceWkt.java
b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/datatables/DatatablesDotNet.java
similarity index 55%
copy from
viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/datatables/DatatablesCssReferenceWkt.java
copy to
viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/datatables/DatatablesDotNet.java
index f7ba0bf2fe..d9baec1122 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/datatables/DatatablesCssReferenceWkt.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/datatables/DatatablesDotNet.java
@@ -15,34 +15,23 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
*/
package org.apache.isis.viewer.wicket.ui.pages.common.datatables;
-import org.apache.wicket.markup.head.CssHeaderItem;
-
import lombok.Getter;
+import lombok.RequiredArgsConstructor;
import lombok.experimental.Accessors;
-import
de.agilecoders.wicket.webjars.request.resource.WebjarsCssResourceReference;
+@RequiredArgsConstructor
+enum DatatablesDotNet {
-public class DatatablesCssReferenceWkt extends WebjarsCssResourceReference {
- private static final long serialVersionUID = 1L;
+ VERSION("1.12.1");
- @Getter(lazy = true) @Accessors(fluent = true)
- private static final DatatablesCssReferenceWkt instance =
- new DatatablesCssReferenceWkt();
-
- public static CssHeaderItem asHeaderItem() {
- return
CssHeaderItem.forReference(DatatablesCssReferenceWkt.instance());
- }
+ @Getter @Accessors(fluent = true)
+ private final String literal;
- /**
- * Private constructor.
- */
- private DatatablesCssReferenceWkt() {
- super(RESOURCE);
+ public static String formatWithVersion(final String format) {
+ return String.format(format, VERSION.literal());
}
- private static final String RESOURCE =
"datatables/1.12.1/css/jquery.dataTables.min.css";
}
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/datatables/DatatablesJavaScriptBootstrap5ReferenceWkt.java
b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/datatables/DatatablesJavaScriptBootstrap5ReferenceWkt.java
index cfba077a2b..9b78b3c027 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/datatables/DatatablesJavaScriptBootstrap5ReferenceWkt.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/datatables/DatatablesJavaScriptBootstrap5ReferenceWkt.java
@@ -45,5 +45,6 @@ public class DatatablesJavaScriptBootstrap5ReferenceWkt
extends WebjarsJavaScrip
super(RESOURCE);
}
- private static final String RESOURCE =
"datatables/1.12.1/js/dataTables.bootstrap5.min.js";
+ private static final String RESOURCE = DatatablesDotNet.formatWithVersion(
+ "datatables/%s/js/dataTables.bootstrap5.min.js");
}
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/datatables/DatatablesJavaScriptReferenceWkt.java
b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/datatables/DatatablesJavaScriptReferenceWkt.java
index adc751a45f..ce87b66616 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/datatables/DatatablesJavaScriptReferenceWkt.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/datatables/DatatablesJavaScriptReferenceWkt.java
@@ -45,5 +45,6 @@ public class DatatablesJavaScriptReferenceWkt extends
WebjarsJavaScriptResourceR
super(RESOURCE);
}
- private static final String RESOURCE =
"datatables/1.12.1/js/jquery.dataTables.min.js";
+ private static final String RESOURCE = DatatablesDotNet.formatWithVersion(
+ "datatables/%s/js/jquery.dataTables.min.js");
}
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/datatables/DatatablesJavaScriptResourceReferenceInit.java
b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/datatables/DatatablesJavaScriptResourceReferenceInit.java
index 1174248df7..a3b7367575 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/datatables/DatatablesJavaScriptResourceReferenceInit.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/datatables/DatatablesJavaScriptResourceReferenceInit.java
@@ -25,7 +25,6 @@ import java.io.Reader;
import static java.nio.charset.StandardCharsets.UTF_8;
import org.apache.wicket.markup.head.JavaScriptContentHeaderItem;
-import org.apache.wicket.markup.head.JavaScriptReferenceHeaderItem;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;
import org.springframework.util.FileCopyUtils;
@@ -43,7 +42,8 @@ public class DatatablesJavaScriptResourceReferenceInit
extends JavaScriptContent
private static DatatablesJavaScriptResourceReferenceInit instance = null;
- public static final DatatablesJavaScriptResourceReferenceInit
instance(IsisConfiguration configuration) {
+ public static final DatatablesJavaScriptResourceReferenceInit instance(
+ final IsisConfiguration configuration) {
if (instance == null) {
String javascript = readResource(configuration);
instance = new
DatatablesJavaScriptResourceReferenceInit(javascript, ID);
@@ -51,20 +51,22 @@ public class DatatablesJavaScriptResourceReferenceInit
extends JavaScriptContent
return instance;
}
- private DatatablesJavaScriptResourceReferenceInit(CharSequence javaScript,
String id) {
+ private DatatablesJavaScriptResourceReferenceInit(final CharSequence
javaScript, final String id) {
super(javaScript, id);
}
- private static String readResource(IsisConfiguration configuration) {
- String options =
configuration.getViewer().getWicket().getTable().getDecoration().getDataTablesNet().getOptions().orElse("");
+ private static String readResource(final IsisConfiguration configuration) {
+ String options =
configuration.getViewer().getWicket().getTable().getDecoration()
+ .getDataTablesNet().getOptions().orElse("");
return readScript().replace("$PLACEHOLDER$", options);
}
private static String readScript() {
- return asString(new ClassPathResource("dataTables.init.js.template",
DatatablesJavaScriptResourceReferenceInit.class));
+ return asString(new ClassPathResource("dataTables.init.js.template",
+ DatatablesJavaScriptResourceReferenceInit.class));
}
- private static String asString(Resource resource) {
+ private static String asString(final Resource resource) {
try (Reader reader = new InputStreamReader(resource.getInputStream(),
UTF_8)) {
return FileCopyUtils.copyToString(reader);
} catch (IOException e) {
