From 04758283fbad49df13d2b12d67afdc9eeefbc384 Mon Sep 17 00:00:00 2001 From: Jack Matthews <6348088+jackmatt2@users.noreply.github.com> Date: Thu, 16 Feb 2023 20:00:38 +1100 Subject: [PATCH 1/2] #patch: #146 allow updateSnapshot=false for legacy compatibility --- .../snapshots/config/PropertyResolvingSnapshotConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-snapshot-testing-core/src/main/java/au/com/origin/snapshots/config/PropertyResolvingSnapshotConfig.java b/java-snapshot-testing-core/src/main/java/au/com/origin/snapshots/config/PropertyResolvingSnapshotConfig.java index 3acab87a..38f9f9f6 100644 --- a/java-snapshot-testing-core/src/main/java/au/com/origin/snapshots/config/PropertyResolvingSnapshotConfig.java +++ b/java-snapshot-testing-core/src/main/java/au/com/origin/snapshots/config/PropertyResolvingSnapshotConfig.java @@ -39,7 +39,7 @@ public Optional updateSnapshot() { String updateSnapshot = SnapshotProperties.getOrThrow("update-snapshot"); if ("all".equals(updateSnapshot)) { return Optional.of(""); - } else if ("none".equals(updateSnapshot)) { + } else if ("none".equals(updateSnapshot) || "false".equals(updateSnapshot)) { return Optional.empty(); } return Optional.of(updateSnapshot); From 6f43908991f3a7497d0e3106defce8cd1327b5bf Mon Sep 17 00:00:00 2001 From: Jack Matthews <6348088+jackmatt2@users.noreply.github.com> Date: Thu, 16 Feb 2023 20:04:53 +1100 Subject: [PATCH 2/2] fix --- .../snapshots/config/PropertyResolvingSnapshotConfig.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/java-snapshot-testing-core/src/main/java/au/com/origin/snapshots/config/PropertyResolvingSnapshotConfig.java b/java-snapshot-testing-core/src/main/java/au/com/origin/snapshots/config/PropertyResolvingSnapshotConfig.java index 38f9f9f6..05d4a8aa 100644 --- a/java-snapshot-testing-core/src/main/java/au/com/origin/snapshots/config/PropertyResolvingSnapshotConfig.java +++ b/java-snapshot-testing-core/src/main/java/au/com/origin/snapshots/config/PropertyResolvingSnapshotConfig.java @@ -32,6 +32,9 @@ public Optional updateSnapshot() { LoggingHelper.deprecatedV5( log, "Passing -PupdateSnapshot will be removed in a future release. Consider using snapshot.properties 'update-snapshot' toggle instead"); + if ("false".equals(legacyFlag.get())) { + return Optional.empty(); + } return legacyFlag; } @@ -39,7 +42,7 @@ public Optional updateSnapshot() { String updateSnapshot = SnapshotProperties.getOrThrow("update-snapshot"); if ("all".equals(updateSnapshot)) { return Optional.of(""); - } else if ("none".equals(updateSnapshot) || "false".equals(updateSnapshot)) { + } else if ("none".equals(updateSnapshot)) { return Optional.empty(); } return Optional.of(updateSnapshot);