From 59f878ea634b24bd36b0fc5746eafbc06cd60215 Mon Sep 17 00:00:00 2001 From: Andrei Shakirin Date: Wed, 20 Jul 2022 15:49:21 +0200 Subject: [PATCH 1/2] Fixed maven repository condition --- .../NoRepositoryExistsCondition.java | 18 +++++++++--------- .../NoRepositoryExistsConditionTest.java | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/components/sbm-core/src/main/java/org/springframework/sbm/build/migration/conditions/NoRepositoryExistsCondition.java b/components/sbm-core/src/main/java/org/springframework/sbm/build/migration/conditions/NoRepositoryExistsCondition.java index 5769ee0e5..74060d570 100644 --- a/components/sbm-core/src/main/java/org/springframework/sbm/build/migration/conditions/NoRepositoryExistsCondition.java +++ b/components/sbm-core/src/main/java/org/springframework/sbm/build/migration/conditions/NoRepositoryExistsCondition.java @@ -39,17 +39,17 @@ public String getDescription() { public boolean evaluate(ProjectContext context) { // if name is set and repo - return context.getBuildFile().getRepositories().stream() - .anyMatch(r -> !urlsAreEqual(r) || (!snapshotsSettingsEqual(r) || !releaseSettingsEqual(r))); + return !context.getBuildFile().getRepositories().stream() + .anyMatch(this::urlsAreEqual); // || (!snapshotsSettingsEqual(r) || !releaseSettingsEqual(r))); } - private boolean releaseSettingsEqual(RepositoryDefinition r) { - return (releasesEnabled == null && r.getReleasesEnabled() == null) || (releasesEnabled != null && r.getReleasesEnabled() != null && (releasesEnabled.equals(r.getReleasesEnabled()))); - } - - private boolean snapshotsSettingsEqual(RepositoryDefinition r) { - return (snapshotsEnabled == null && r.getSnapshotsEnabled() == null) || (snapshotsEnabled != null && r.getSnapshotsEnabled() != null && snapshotsEnabled.equals(r.getSnapshotsEnabled())); - } +// private boolean releaseSettingsEqual(RepositoryDefinition r) { +// return (releasesEnabled == null && r.getReleasesEnabled() == null) || (releasesEnabled != null && r.getReleasesEnabled() != null && (releasesEnabled.equals(r.getReleasesEnabled()))); +// } +// +// private boolean snapshotsSettingsEqual(RepositoryDefinition r) { +// return (snapshotsEnabled == null && r.getSnapshotsEnabled() == null) || (snapshotsEnabled != null && r.getSnapshotsEnabled() != null && snapshotsEnabled.equals(r.getSnapshotsEnabled())); +// } private boolean urlsAreEqual(RepositoryDefinition r) { return r.getUrl() != null && r.getUrl().equals(url); diff --git a/components/sbm-core/src/test/java/org/springframework/sbm/build/migration/conditions/NoRepositoryExistsConditionTest.java b/components/sbm-core/src/test/java/org/springframework/sbm/build/migration/conditions/NoRepositoryExistsConditionTest.java index 16b8475df..4c7d6d06a 100644 --- a/components/sbm-core/src/test/java/org/springframework/sbm/build/migration/conditions/NoRepositoryExistsConditionTest.java +++ b/components/sbm-core/src/test/java/org/springframework/sbm/build/migration/conditions/NoRepositoryExistsConditionTest.java @@ -86,7 +86,7 @@ void repositoryWithSameUrlAndSnapshotsFalseAndReleasesNotSet() { noRepositoryExistsCondition.setUrl("https://repo.spring.io/milestone"); boolean noRepositoryExists = noRepositoryExistsCondition.evaluate(context); - assertThat(noRepositoryExists).isTrue(); + assertThat(noRepositoryExists).isFalse(); } @Test @@ -185,7 +185,7 @@ void repositoryWithSameUrlAndSnapshotsNotSetAndReleasesFalse() { noRepositoryExistsCondition.setUrl("https://repo.spring.io/milestone"); boolean noRepositoryExists = noRepositoryExistsCondition.evaluate(context); - assertThat(noRepositoryExists).isTrue(); + assertThat(noRepositoryExists).isFalse(); } @Test From 940e976d3c6ee052ea31e64475545137f3bc92fe Mon Sep 17 00:00:00 2001 From: Andrei Shakirin Date: Wed, 20 Jul 2022 15:51:09 +0200 Subject: [PATCH 2/2] Removed comments --- .../conditions/NoRepositoryExistsCondition.java | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/components/sbm-core/src/main/java/org/springframework/sbm/build/migration/conditions/NoRepositoryExistsCondition.java b/components/sbm-core/src/main/java/org/springframework/sbm/build/migration/conditions/NoRepositoryExistsCondition.java index 74060d570..94437619e 100644 --- a/components/sbm-core/src/main/java/org/springframework/sbm/build/migration/conditions/NoRepositoryExistsCondition.java +++ b/components/sbm-core/src/main/java/org/springframework/sbm/build/migration/conditions/NoRepositoryExistsCondition.java @@ -40,17 +40,9 @@ public boolean evaluate(ProjectContext context) { // if name is set and repo return !context.getBuildFile().getRepositories().stream() - .anyMatch(this::urlsAreEqual); // || (!snapshotsSettingsEqual(r) || !releaseSettingsEqual(r))); + .anyMatch(this::urlsAreEqual); } -// private boolean releaseSettingsEqual(RepositoryDefinition r) { -// return (releasesEnabled == null && r.getReleasesEnabled() == null) || (releasesEnabled != null && r.getReleasesEnabled() != null && (releasesEnabled.equals(r.getReleasesEnabled()))); -// } -// -// private boolean snapshotsSettingsEqual(RepositoryDefinition r) { -// return (snapshotsEnabled == null && r.getSnapshotsEnabled() == null) || (snapshotsEnabled != null && r.getSnapshotsEnabled() != null && snapshotsEnabled.equals(r.getSnapshotsEnabled())); -// } - private boolean urlsAreEqual(RepositoryDefinition r) { return r.getUrl() != null && r.getUrl().equals(url); }