diff --git a/README.md b/README.md
index e452787b..57d691bf 100644
--- a/README.md
+++ b/README.md
@@ -240,3 +240,19 @@ Usage example:
Awaitility.setDefaultConditionEvaluationListener(new AllureAwaitilityListener());
```
+## Java-diff-utils
+This library provides advanced data logging in allure when using `java-diff-utils`.
+For more usage example look into module `allure-java-diff-utils`
+
+```xml
+
+ io.qameta.allure
+ allure-java-diff-utils
+ $LATEST_VERSION
+
+```
+
+Usage example:
+```java
+new AllureDiff().diff("my first line\nmy second line", "my first line");
+```
\ No newline at end of file
diff --git a/allure-java-diff-utils/build.gradle.kts b/allure-java-diff-utils/build.gradle.kts
new file mode 100644
index 00000000..1453c66f
--- /dev/null
+++ b/allure-java-diff-utils/build.gradle.kts
@@ -0,0 +1,28 @@
+description = "Allure java-diff-utils integration"
+
+val javaDiffUtils = "4.15"
+
+dependencies {
+ api(project(":allure-attachments"))
+ implementation("io.github.java-diff-utils:java-diff-utils:$javaDiffUtils")
+ testImplementation("javax.annotation:javax.annotation-api")
+ testImplementation("org.assertj:assertj-core")
+ testImplementation("org.junit.jupiter:junit-jupiter-api")
+ testImplementation("org.junit.jupiter:junit-jupiter-params")
+ testImplementation("org.slf4j:slf4j-simple")
+ testImplementation(project(":allure-java-commons-test"))
+ testImplementation(project(":allure-junit-platform"))
+ testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
+}
+
+tasks.jar {
+ manifest {
+ attributes(mapOf(
+ "Automatic-Module-Name" to "io.qameta.allure.diff"
+ ))
+ }
+}
+
+tasks.test {
+ useJUnitPlatform()
+}
\ No newline at end of file
diff --git a/allure-java-diff-utils/examples/diff-two-jsons.html b/allure-java-diff-utils/examples/diff-two-jsons.html
new file mode 100644
index 00000000..5e75d80e
--- /dev/null
+++ b/allure-java-diff-utils/examples/diff-two-jsons.html
@@ -0,0 +1,262 @@
+
+
+
+ Diff
+
+
+
+
+
+
+
+
+
+
+
+
+
3
+
3
+
"name": "John Doe",
+
+
+
4
+
4
+
"email": "john.doe@example.com",
+
+
+
5
+
5
+
"isActive": true,
+
+
+
+
+
+
+
10
+
10
+
"address": {
+
+
+
11
+
-
+
"street": "123 Main St",
+
+
+
13
+
-
+
"zipcode": "10001"
+
+
+
-
+
11
+
"city": "New York",
+
+
+
+
-
+
12
+
"zipcode": "10001",
+
+
+
+
-
+
13
+
"additional": "test"
+
+
+
+
+
+
1
+
1
+
my first line
+
+
+
2
+
-
+
my second line
+
+
+
+
1
+
1
+
<?xml version="1.0" encoding="UTF-8"?>
+
+
+
2
+
2
+
<user id="123">
+
+
+
3
+
3
+
<name>John Doe</name>
+
+
+
4
+
4
+
<email>john.doe@example.com</email>
+
+
+
5
+
5
+
<isActive>true</isActive>
+
+
+
+
7
+
7
+
<role>admin</role>
+
+
+
8
+
8
+
<role>user</role>
+
+
+
+
+
11
+
-
+
<street>123 Main St</street>
+
+
+
13
+
-
+
<zipcode>10001</zipcode>
+
+
+
-
+
11
+
<city>New York</city>
+
+
+
+
-
+
12
+
<zipcode>10001</zipcode>
+
+
+
+
-
+
13
+
<additional>test</additional>
+
+
+
+
+ * Provides a visual comparison of differences between original and revised text content,
+ * highlighting additions, removals, and unchanged lines.
+ *
+ */
+public class AllureDiff {
+
+ private String diffTemplatePath = "diff-template.ftl";
+
+ /**
+ * Set allure template file path. Default is 'diff-template.ftl' in 'resources/tpl/diff-template.ftl'.
+ *
+ * @param diffTemplatePath what the path to ftl template
+ */
+ public void setDiffTemplatePath(final String diffTemplatePath) {
+ this.diffTemplatePath = diffTemplatePath;
+ }
+
+ /**
+ * Computes the differences between two strings and generates an Allure report attachment.
+ *
+ * @param original The original text content
+ * @param revised The revised text content
+ * @return Diff result containing both the patch and Allure attachment
+ * @throws IllegalArgumentException if there's an error processing the diff
+ */
+ public Patch diff(final String original, final String revised) {
+ final List originalLines = splitInputString(original);
+ final List revisedLines = splitInputString(revised);
+
+ final Patch patch = DiffUtils.diff(originalLines, revisedLines);
+ final List> deltas = patch.getDeltas();
+
+ final List diffLines = new ArrayList<>();
+ int origLine = 1;
+ int revLine = 1;
+ int deltaIndex = 0;
+
+ while (origLine <= originalLines.size() || revLine <= revisedLines.size()) {
+ final AbstractDelta currentDelta = deltaIndex < deltas.size() ? deltas.get(deltaIndex) : null;
+
+ if (currentDelta != null && isDeltaPosition(currentDelta, origLine, revLine)) {
+ // Process deleted lines
+ for (String line : currentDelta.getSource().getLines()) {
+ diffLines.add(new AllureDiffLine(line, AllureDiffType.REMOVED, origLine++, -1));
+ }
+ // Process inserted lines
+ for (String line : currentDelta.getTarget().getLines()) {
+ diffLines.add(new AllureDiffLine(line, AllureDiffType.ADDED, -1, revLine++));
+ }
+ origLine += currentDelta.getSource().size();
+ revLine += currentDelta.getTarget().size();
+ deltaIndex++;
+ } else {
+ processUnchangedOrDivergedLines(originalLines, revisedLines, diffLines, origLine, revLine);
+ origLine++;
+ revLine++;
+ }
+ }
+
+ final AttachmentProcessor processor = new DefaultAttachmentProcessor();
+ processor.addAttachment(new AllureDiffModel(diffLines), new FreemarkerAttachmentRenderer(diffTemplatePath));
+
+ return patch;
+ }
+
+ /**
+ * Split the input string to lines.
+ *
+ * @param input any String
+ * @return list of lines from input string
+ */
+ private static List splitInputString(final String input) {
+ return Arrays.asList((input == null ? "" : input).split("\\R"));
+ }
+
+ /**
+ * Checks if the current position matches the delta's expected position.
+ *
+ * @param delta The delta to check
+ * @param origLine Current original line number
+ * @param revLine Current revised line number
+ * @return true if the current position matches the delta's position
+ */
+ private static boolean isDeltaPosition(final AbstractDelta delta,
+ final int origLine,
+ final int revLine) {
+ return delta.getSource().getPosition() + 1 == origLine
+ && delta.getTarget().getPosition() + 1 == revLine;
+ }
+
+ /**
+ * Processes lines that are either unchanged or diverged (unexpected differences).
+ *
+ * @param originalLines Original text lines
+ * @param revisedLines Revised text lines
+ * @param diffLines List to accumulate diff lines
+ * @param origLine Current original line number
+ * @param revLine Current revised line number
+ */
+ private static void processUnchangedOrDivergedLines(final List originalLines,
+ final List revisedLines,
+ final List diffLines,
+ final int origLine,
+ final int revLine) {
+ final String orig = getLine(originalLines, origLine);
+ final String rev = getLine(revisedLines, revLine);
+ if (orig != null && orig.equals(rev)) {
+ diffLines.add(new AllureDiffLine(orig, AllureDiffType.UNCHANGED, origLine, revLine));
+ } else {
+ if (orig != null) {
+ diffLines.add(new AllureDiffLine(orig, AllureDiffType.REMOVED, origLine, -1));
+ }
+ if (rev != null) {
+ diffLines.add(new AllureDiffLine(rev, AllureDiffType.ADDED, -1, revLine));
+ }
+ }
+ }
+
+ /**
+ * Safely retrieves a line from the text content.
+ *
+ * @param lines List of text lines
+ * @param lineNumber 1-based line number to retrieve
+ * @return The line content or null if out of bounds
+ */
+ private static String getLine(final List lines, final int lineNumber) {
+ return lineNumber <= lines.size() ? lines.get(lineNumber - 1) : null;
+ }
+
+ /**
+ * Represents the type of difference for a line in the comparison.
+ */
+ public enum AllureDiffType {
+ /**
+ * Line was added in the revised text.
+ */
+ ADDED,
+ /**
+ * Line was removed from the original text.
+ */
+ REMOVED,
+ /**
+ * Line is unchanged between versions.
+ */
+ UNCHANGED
+ }
+
+ /**
+ * Represents a single line in the diff comparison.
+ */
+ public static class AllureDiffLine {
+ private final String text;
+ private final AllureDiff.AllureDiffType type;
+ private final int originalLine;
+ private final int revisedLine;
+
+ /**
+ * Represents a single line in the diff comparison.
+ *
+ * @param text The text content of the line
+ * @param type The type of difference (ADDED/REMOVED/UNCHANGED)
+ * @param originalLine Original line number (-1 if line was added)
+ * @param revisedLine Revised line number (-1 if line was removed)
+ */
+ public AllureDiffLine(final String text,
+ final AllureDiffType type,
+ final int originalLine,
+ final int revisedLine) {
+ this.text = text;
+ this.type = type;
+ this.originalLine = originalLine;
+ this.revisedLine = revisedLine;
+ }
+
+ /**
+ * Get the text content of the line. Using only in FTL.
+ *
+ * @return what actually String contains
+ */
+ public String text() {
+ return text;
+ }
+
+ /**
+ * Get the type of difference (ADDED/REMOVED/UNCHANGED). Using only in FTL.
+ *
+ * @return what diff type String contatins
+ */
+ public AllureDiffType type() {
+ return type;
+ }
+
+ /**
+ * Get original line number (-1 if line was added). Using only in FTL.
+ *
+ * @return what the original line number
+ */
+ public int originalLine() {
+ return originalLine;
+ }
+
+ /**
+ * Get revised line number (-1 if line was removed). Using only in FTL.
+ *
+ * @return what the revised line number
+ */
+ public int revisedLine() {
+ return revisedLine;
+ }
+ }
+
+ /**
+ * Data model for the Allure attachment containing diff results. Using only in FTL.
+ */
+ public static class AllureDiffModel implements AttachmentData {
+ private final List rows;
+
+ /**
+ * Default constructor for data model for the Allure attachment containing diff results.
+ *
+ * @param rows List of diff lines to display in the report
+ */
+ public AllureDiffModel(final List rows) {
+ this.rows = rows;
+ }
+
+ /**
+ * Getting all rows with inner data model of diff representation. Using only in FTL.
+ *
+ * @return List of AllureDiffLine.
+ */
+ public List rows() {
+ return rows;
+ }
+
+ /**
+ * Get attachment name.
+ *
+ * @return attachment name
+ */
+ @Override
+ public String getName() {
+ return "Diff";
+ }
+ }
+}
diff --git a/allure-java-diff-utils/src/main/resources/tpl/diff-template.ftl b/allure-java-diff-utils/src/main/resources/tpl/diff-template.ftl
new file mode 100644
index 00000000..8660be41
--- /dev/null
+++ b/allure-java-diff-utils/src/main/resources/tpl/diff-template.ftl
@@ -0,0 +1,188 @@
+<#ftl output_format="HTML">
+<#-- @ftlvariable name="data" type="io.qameta.allure.diff.AllureDiff.AllureDiffModel" -->
+
+
+
+ Diff
+
+
+
+
+
+
+<#assign hasChanges = false>
+<#list data.rows() as line>
+ <#if line.type().name() != "UNCHANGED">
+ <#assign hasChanges = true>
+ <#break>
+
+
+
+<#if !hasChanges>
+
+
+
+
+ <#list data.rows() as line>
+
+
<#if line.originalLine() != -1>${line.originalLine()}<#else>-
+
<#if line.revisedLine() != -1>${line.revisedLine()}<#else>-
+
${line.text()}
+
+
+