You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by on...@apache.org on 2020/11/03 16:37:31 UTC
[geode] branch support/1.13 updated: GEODE-8496: fix rest
management test after dependency bump (#5547)
This is an automated email from the ASF dual-hosted git repository.
onichols pushed a commit to branch support/1.13
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/support/1.13 by this push:
new fdaa2be GEODE-8496: fix rest management test after dependency bump (#5547)
fdaa2be is described below
commit fdaa2be509d0a86de63f576f35b300d8f2aa6817
Author: Jinmei Liao <ji...@pivotal.io>
AuthorDate: Wed Sep 23 15:05:59 2020 -0700
GEODE-8496: fix rest management test after dependency bump (#5547)
(cherry picked from commit c49389e99ca801d70f2f2c46a98c960ebad9b872)
---
.../rest/ListIndexManagementDUnitTest.java | 3 ++-
.../geode/management/configuration/Index.java | 4 +++-
.../geode/management/configuration/IndexTest.java | 24 ++++++++++------------
3 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/ListIndexManagementDUnitTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/ListIndexManagementDUnitTest.java
index 96d5ace..2573346 100644
--- a/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/ListIndexManagementDUnitTest.java
+++ b/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/ListIndexManagementDUnitTest.java
@@ -184,7 +184,8 @@ public class ListIndexManagementDUnitTest {
public void getIndex_fails_when_region_name_is_missing_from_filter() {
indexConfig.setName("index1");
assertThatThrownBy(() -> cms.get(indexConfig))
- .hasMessageContaining("Error while extracting response for type");
+ .isInstanceOf(IllegalArgumentException.class)
+ .hasMessageContaining("Unable to construct the URI with the current configuration");
}
@Test
diff --git a/geode-management/src/main/java/org/apache/geode/management/configuration/Index.java b/geode-management/src/main/java/org/apache/geode/management/configuration/Index.java
index 6e73740..32a2bf7 100644
--- a/geode-management/src/main/java/org/apache/geode/management/configuration/Index.java
+++ b/geode-management/src/main/java/org/apache/geode/management/configuration/Index.java
@@ -103,8 +103,10 @@ public class Index extends AbstractConfiguration<IndexInfo> implements RegionSco
@Override
public Links getLinks() {
String regionName = getRegionName();
+ // /indexes/indexName is not implemented in controller anymore. region name is required for the
+ // self link
if (StringUtils.isBlank(regionName)) {
- return new Links(getId(), INDEXES);
+ return new Links(null, INDEXES);
}
Links links = new Links(getId(), Region.REGION_CONFIG_ENDPOINT + "/" + regionName + INDEXES);
links.addLink("region", Region.REGION_CONFIG_ENDPOINT + "/" + regionName);
diff --git a/geode-management/src/test/java/org/apache/geode/management/configuration/IndexTest.java b/geode-management/src/test/java/org/apache/geode/management/configuration/IndexTest.java
index 075fbae..c836570 100644
--- a/geode-management/src/test/java/org/apache/geode/management/configuration/IndexTest.java
+++ b/geode-management/src/test/java/org/apache/geode/management/configuration/IndexTest.java
@@ -64,22 +64,20 @@ public class IndexTest {
@Test
public void getEndPoint() {
- assertSoftly(softly -> {
- assertThat(index.getLinks().getList()).isEqualTo("/indexes");
+ assertThat(index.getLinks().getList()).isEqualTo("/indexes");
- index.setName("testSelf");
- softly.assertThat(index.getLinks().getSelf()).as("only name defined - self")
- .isEqualTo("/indexes/testSelf");
- softly.assertThat(index.getLinks().getList()).as("only name defined - list")
- .isEqualTo("/indexes");
+ index.setName("testSelf");
+ assertThat(index.getLinks().getSelf()).as("only name defined - self")
+ .isNull();
+ assertThat(index.getLinks().getList()).as("only name defined - list")
+ .isEqualTo("/indexes");
- index.setRegionPath("/regionPath");
- softly.assertThat(index.getLinks().getSelf()).as("region and name defined - self")
- .isEqualTo("/regions/regionPath/indexes/testSelf");
- softly.assertThat(index.getLinks().getList()).as("region and name defined - list")
- .isEqualTo("/regions/regionPath/indexes");
+ index.setRegionPath(SEPARATOR + "regionPath");
+ assertThat(index.getLinks().getSelf()).as("region and name defined - self")
+ .isEqualTo("/regions/regionPath/indexes/testSelf");
+ assertThat(index.getLinks().getList()).as("region and name defined - list")
+ .isEqualTo("/regions/regionPath/indexes");
- });
}
@Test