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/causeway.git
The following commit(s) were added to refs/heads/master by this push:
new 58b65dbb01 CAUSEWAY-3807: Migrate Asciidoctorj from 2.5.13 to 3.0.0
58b65dbb01 is described below
commit 58b65dbb01bca7aa9afdb1f1b1dd05f48473e58a
Author: andi-huber <[email protected]>
AuthorDate: Mon Aug 26 18:38:41 2024 +0200
CAUSEWAY-3807: Migrate Asciidoctorj from 2.5.13 to 3.0.0
---
bom/pom.xml | 2 +-
.../asciidoc/applib/src/main/java/module-info.java | 2 +-
.../applib/CausewayModuleValAsciidocApplib.java | 3 +-
.../asciidoc/builder/ast/ContentNodeAbstract.java | 74 ----------------------
.../asciidoc/builder/ast/SimpleBlock.java | 12 ----
.../asciidoc/builder/ast/SimpleDocument.java | 28 +++++---
.../asciidoc/builder/ast/SimpleList.java | 7 --
.../asciidoc/builder/ast/SimpleSection.java | 26 +++-----
.../asciidoc/builder/ast/SimpleStructuralNode.java | 24 -------
9 files changed, 33 insertions(+), 145 deletions(-)
diff --git a/bom/pom.xml b/bom/pom.xml
index ebee408a96..bfd5c354d9 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -87,7 +87,7 @@ It is therefore a copy of org.apache:apache, with
customisations clearly identif
<!-- LIBRARY DEPENDENCIES -->
<archunit.version>1.3.0</archunit.version>
- <asciidoctorj.version>2.5.13</asciidoctorj.version>
+ <asciidoctorj.version>3.0.0</asciidoctorj.version>
<asm.version>9.7</asm.version> <!-- keep in sync with
org.eclipse.persistence:org.eclipse.persistence.asm -->
<approvaltests.version>24.4.0</approvaltests.version>
diff --git a/valuetypes/asciidoc/applib/src/main/java/module-info.java
b/valuetypes/asciidoc/applib/src/main/java/module-info.java
index 24cb1ef2a9..7d26b391df 100644
--- a/valuetypes/asciidoc/applib/src/main/java/module-info.java
+++ b/valuetypes/asciidoc/applib/src/main/java/module-info.java
@@ -21,7 +21,6 @@ module org.apache.causeway.valuetypes.asciidoc.applib {
exports org.apache.causeway.valuetypes.asciidoc.applib.value;
exports org.apache.causeway.valuetypes.asciidoc.applib.jaxb;
- requires asciidoctorj.api;
requires java.inject;
requires java.xml.bind;
requires lombok;
@@ -32,4 +31,5 @@ module org.apache.causeway.valuetypes.asciidoc.applib {
requires org.apache.causeway.core.config;
requires spring.boot.autoconfigure;
requires java.net.http;
+ requires org.asciidoctor.asciidoctorj.api;
}
\ No newline at end of file
diff --git
a/valuetypes/asciidoc/applib/src/main/java/org/apache/causeway/valuetypes/asciidoc/applib/CausewayModuleValAsciidocApplib.java
b/valuetypes/asciidoc/applib/src/main/java/org/apache/causeway/valuetypes/asciidoc/applib/CausewayModuleValAsciidocApplib.java
index 1ab3ab4375..978cc7dfdb 100644
---
a/valuetypes/asciidoc/applib/src/main/java/org/apache/causeway/valuetypes/asciidoc/applib/CausewayModuleValAsciidocApplib.java
+++
b/valuetypes/asciidoc/applib/src/main/java/org/apache/causeway/valuetypes/asciidoc/applib/CausewayModuleValAsciidocApplib.java
@@ -138,7 +138,7 @@ public class CausewayModuleValAsciidocApplib {
}
@Override
- public void process(final Document document, final PreprocessorReader
reader) {
+ public Reader process(final Document document, final
PreprocessorReader reader) {
var state = State.DISABLED;
@@ -174,6 +174,7 @@ public class CausewayModuleValAsciidocApplib {
}
reader.restoreLines(processedLines);
+ return reader;
}
}
diff --git
a/valuetypes/asciidoc/builder/src/main/java/org/apache/causeway/valuetypes/asciidoc/builder/ast/ContentNodeAbstract.java
b/valuetypes/asciidoc/builder/src/main/java/org/apache/causeway/valuetypes/asciidoc/builder/ast/ContentNodeAbstract.java
index 8934a03d60..e147743e32 100644
---
a/valuetypes/asciidoc/builder/src/main/java/org/apache/causeway/valuetypes/asciidoc/builder/ast/ContentNodeAbstract.java
+++
b/valuetypes/asciidoc/builder/src/main/java/org/apache/causeway/valuetypes/asciidoc/builder/ast/ContentNodeAbstract.java
@@ -46,44 +46,6 @@ public abstract class ContentNodeAbstract implements
ContentNode {
@Getter private final List<String> roles = new ArrayList<>();
@Getter @Setter private String reftext;
- @Override
- public String id() {
- return getId();
- }
-
- @Override
- public String context() {
- return getContext();
- }
-
- @Override
- public ContentNode parent() {
- return getParent();
- }
-
- @Override
- public Document document() {
- return getDocument();
- }
-
- @Override
- @Deprecated
- public Object getAttr(Object name, Object defaultValue, boolean inherit) {
- return getAttribute(name, defaultValue, inherit);
- }
-
- @Override
- @Deprecated
- public Object getAttr(Object name, Object defaultValue) {
- return getAttribute(name, defaultValue);
- }
-
- @Override
- @Deprecated
- public Object getAttr(Object name) {
- return getAttribute(name);
- }
-
@Override
public Object getAttribute(Object name, Object defaultValue, boolean
inherit) {
return attributes.getOrDefault(name, defaultValue);
@@ -99,18 +61,6 @@ public abstract class ContentNodeAbstract implements
ContentNode {
return attributes.get(name);
}
- @Override
- @Deprecated
- public boolean isAttr(Object name, Object expected, boolean inherit) {
- return isAttribute(name, expected, inherit);
- }
-
- @Override
- @Deprecated
- public boolean isAttr(Object name, Object expected) {
- return isAttribute(name, expected);
- }
-
@Override
public boolean isAttribute(Object name, Object expected, boolean inherit) {
return Boolean.TRUE == getAttribute(name, expected, inherit);
@@ -121,18 +71,6 @@ public abstract class ContentNodeAbstract implements
ContentNode {
return Boolean.TRUE == getAttribute(name, expected);
}
- @Override
- @Deprecated
- public boolean hasAttr(Object name) {
- return hasAttribute(name);
- }
-
- @Override
- @Deprecated
- public boolean hasAttr(Object name, boolean inherited) {
- return hasAttribute(name, inherited);
- }
-
@Override
public boolean hasAttribute(Object name) {
return getAttribute(name)!=null;
@@ -143,12 +81,6 @@ public abstract class ContentNodeAbstract implements
ContentNode {
return getAttribute(name, inherited)!=null;
}
- @Override
- @Deprecated
- public boolean setAttr(Object name, Object value, boolean overwrite) {
- return setAttribute(name, value, overwrite);
- }
-
@Override
public boolean setAttribute(Object name, Object value, boolean overwrite) {
val key = (String)name;
@@ -169,12 +101,6 @@ public abstract class ContentNodeAbstract implements
ContentNode {
return !_Strings.isNullOrEmpty(getRole());
}
- @Override
- @Deprecated
- public String role() {
- return getRole();
- }
-
@Override
public boolean hasRole(String role) {
return roles.contains(role);
diff --git
a/valuetypes/asciidoc/builder/src/main/java/org/apache/causeway/valuetypes/asciidoc/builder/ast/SimpleBlock.java
b/valuetypes/asciidoc/builder/src/main/java/org/apache/causeway/valuetypes/asciidoc/builder/ast/SimpleBlock.java
index 37162dd8fb..4e6c51c95d 100644
---
a/valuetypes/asciidoc/builder/src/main/java/org/apache/causeway/valuetypes/asciidoc/builder/ast/SimpleBlock.java
+++
b/valuetypes/asciidoc/builder/src/main/java/org/apache/causeway/valuetypes/asciidoc/builder/ast/SimpleBlock.java
@@ -33,24 +33,12 @@ public class SimpleBlock extends SimpleStructuralNode
implements Block {
@Getter private final List<String> lines = new ArrayList<>();
- @Override
- @Deprecated
- public List<String> lines() {
- return getLines();
- }
-
@Override
public void setLines(List<String> lines) {
this.lines.clear();
this.lines.addAll(lines);
}
- @Override
- @Deprecated
- public String source() {
- return getSource();
- }
-
@Override
public String getSource() {
return lines.stream().collect(Collectors.joining("\n"));
diff --git
a/valuetypes/asciidoc/builder/src/main/java/org/apache/causeway/valuetypes/asciidoc/builder/ast/SimpleDocument.java
b/valuetypes/asciidoc/builder/src/main/java/org/apache/causeway/valuetypes/asciidoc/builder/ast/SimpleDocument.java
index 23609979fe..d43282de2a 100644
---
a/valuetypes/asciidoc/builder/src/main/java/org/apache/causeway/valuetypes/asciidoc/builder/ast/SimpleDocument.java
+++
b/valuetypes/asciidoc/builder/src/main/java/org/apache/causeway/valuetypes/asciidoc/builder/ast/SimpleDocument.java
@@ -41,20 +41,20 @@ public class SimpleDocument extends SimpleStructuralNode
implements Document {
@Getter private final Map<Object, Object> options = new HashMap<>();
@Getter @Setter private boolean sourcemap;
- @Override
- public String doctitle() {
- return getDoctitle();
- }
+// @Override
+// public String doctitle() {
+// return getDoctitle();
+// }
@Override
public boolean isBasebackend(String backend) {
return false;
}
- @Override
- public boolean basebackend(String backend) {
- return false;
- }
+// @Override
+// public boolean basebackend(String backend) {
+// return false;
+// }
@Override
public int getAndIncrementCounter(String name) {
@@ -81,5 +81,17 @@ public class SimpleDocument extends SimpleStructuralNode
implements Document {
return null;
}
+ @Override
+ public String getSource() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public List<String> getSourceLines() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
}
diff --git
a/valuetypes/asciidoc/builder/src/main/java/org/apache/causeway/valuetypes/asciidoc/builder/ast/SimpleList.java
b/valuetypes/asciidoc/builder/src/main/java/org/apache/causeway/valuetypes/asciidoc/builder/ast/SimpleList.java
index 7473db2b0d..16ff9d4397 100644
---
a/valuetypes/asciidoc/builder/src/main/java/org/apache/causeway/valuetypes/asciidoc/builder/ast/SimpleList.java
+++
b/valuetypes/asciidoc/builder/src/main/java/org/apache/causeway/valuetypes/asciidoc/builder/ast/SimpleList.java
@@ -22,8 +22,6 @@ import java.util.List;
import org.asciidoctor.ast.StructuralNode;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
-
import lombok.ToString;
@ToString(callSuper = true)
@@ -39,9 +37,4 @@ public class SimpleList extends SimpleStructuralNode
implements org.asciidoctor.
return !getItems().isEmpty();
}
- @Override
- public String render() {
- throw _Exceptions.notImplemented();
- }
-
}
diff --git
a/valuetypes/asciidoc/builder/src/main/java/org/apache/causeway/valuetypes/asciidoc/builder/ast/SimpleSection.java
b/valuetypes/asciidoc/builder/src/main/java/org/apache/causeway/valuetypes/asciidoc/builder/ast/SimpleSection.java
index bb948d86a5..97972ffec6 100644
---
a/valuetypes/asciidoc/builder/src/main/java/org/apache/causeway/valuetypes/asciidoc/builder/ast/SimpleSection.java
+++
b/valuetypes/asciidoc/builder/src/main/java/org/apache/causeway/valuetypes/asciidoc/builder/ast/SimpleSection.java
@@ -25,45 +25,37 @@ import lombok.ToString;
@ToString(callSuper = true)
public class SimpleSection extends SimpleStructuralNode implements Section {
- @Override public int index() {
- return getIndex();
- }
@Override public int getIndex() {
// TODO Auto-generated method stub
return 0;
}
- @Override public int number() {
- return getNumber();
+ @Override
+ public String getNumeral() {
+ // TODO Auto-generated method stub
+ return null;
}
- @Override public int getNumber() {
+
+ @Override
+ public String getSectnum() {
// TODO Auto-generated method stub
- return 0;
+ return null;
}
@Override
- public String getNumeral() {
+ public String getSectnum(String delimiter) {
// TODO Auto-generated method stub
return null;
}
- @Override public String sectname() {
- return getSectionName();
- }
@Override public String getSectionName() {
return "section";
}
- @Override public boolean special() {
- return isSpecial();
- }
@Override public boolean isSpecial() {
return false;
}
- @Override public boolean numbered() {
- return isNumbered();
- }
@Override public boolean isNumbered() {
return false;
}
diff --git
a/valuetypes/asciidoc/builder/src/main/java/org/apache/causeway/valuetypes/asciidoc/builder/ast/SimpleStructuralNode.java
b/valuetypes/asciidoc/builder/src/main/java/org/apache/causeway/valuetypes/asciidoc/builder/ast/SimpleStructuralNode.java
index 0a3cdf8c5d..7c8ac1b646 100644
---
a/valuetypes/asciidoc/builder/src/main/java/org/apache/causeway/valuetypes/asciidoc/builder/ast/SimpleStructuralNode.java
+++
b/valuetypes/asciidoc/builder/src/main/java/org/apache/causeway/valuetypes/asciidoc/builder/ast/SimpleStructuralNode.java
@@ -41,35 +41,11 @@ public class SimpleStructuralNode extends
ContentNodeAbstract implements Structu
@Getter @Setter private int level;
@Getter @Setter private String convert;
- @Override
- @Deprecated
- public String title() {
- return getTitle();
- }
-
- @Override
- @Deprecated
- public String style() {
- return getStyle();
- }
-
- @Override
- @Deprecated
- public List<StructuralNode> blocks() {
- return getBlocks();
- }
-
@Override
public void append(StructuralNode block) {
getBlocks().add(block);
}
- @Override
- @Deprecated
- public Object content() {
- return getContent();
- }
-
@Override
public String convert() {
return getConvert();
