From 56287e4d2ffe0b10921ca231b64bd5bbd9520272 Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Sun, 19 Jun 2016 09:29:15 +0200 Subject: [PATCH] #28 - Project lookup by String now also considers keys. --- .../org/springframework/data/release/model/Projects.java | 7 ++++--- .../data/release/model/ProjectUnitTests.java | 8 ++++++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/release-tools/src/main/java/org/springframework/data/release/model/Projects.java b/release-tools/src/main/java/org/springframework/data/release/model/Projects.java index f6701bb..be0a3c3 100644 --- a/release-tools/src/main/java/org/springframework/data/release/model/Projects.java +++ b/release-tools/src/main/java/org/springframework/data/release/model/Projects.java @@ -52,7 +52,7 @@ public class Projects { ELASTICSEARCH = new Project("DATAES", "Elasticsearch", Arrays.asList(COMMONS)); KEY_VALUE = new Project("DATAKV", "KeyValue", Arrays.asList(COMMONS)); REDIS = new Project("DATAREDIS", "Redis", Arrays.asList(COMMONS, KEY_VALUE)); - GEMFIRE = new Project("SGF", "Gemfire", Arrays.asList(COMMONS)); + GEMFIRE = new Project("SGF", "Gemfire", Arrays.asList(COMMONS)).withSkipTests(true); REST = new Project("DATAREST", "REST", Arrays.asList(COMMONS, JPA, MONGO_DB, NEO4J, GEMFIRE, SOLR, CASSANDRA, KEY_VALUE), ArtifactCoordinates.NONE @@ -90,7 +90,8 @@ public class Projects { public static Project byName(String name) { return PROJECTS.stream().// - filter(project -> project.getName().equalsIgnoreCase(name)).// - findFirst().orElseThrow(() -> new IllegalArgumentException("No project named %s available!")); + filter(project -> project.getName().equalsIgnoreCase(name) || project.getKey().toString().equals(name)).// + findFirst() + .orElseThrow(() -> new IllegalArgumentException(String.format("No project named %s available!", name))); } } diff --git a/release-tools/src/test/java/org/springframework/data/release/model/ProjectUnitTests.java b/release-tools/src/test/java/org/springframework/data/release/model/ProjectUnitTests.java index 2e53c91..08addb2 100644 --- a/release-tools/src/test/java/org/springframework/data/release/model/ProjectUnitTests.java +++ b/release-tools/src/test/java/org/springframework/data/release/model/ProjectUnitTests.java @@ -42,4 +42,12 @@ public class ProjectUnitTests { assertThat(projects.get(0), is(Projects.BUILD)); assertThat(projects.get(1), is(Projects.COMMONS)); } + + /** + * @see #28 + */ + @Test + public void findsProjectByKey() { + assertThat(Projects.byName("DATACMNS"), is(Projects.COMMONS)); + } }