diff --git a/pom.xml b/pom.xml index d15ad64..ee644b0 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ 1.18.0-SNAPSHOT - 1.16.0 + 1.18.0-SNAPSHOT 2.9.0 1.8.10.RELEASE 2.10 diff --git a/src/main/java/io/gravitee/repository/redis/management/RedisPageRepository.java b/src/main/java/io/gravitee/repository/redis/management/RedisPageRepository.java index 70eb8c2..6611ea7 100644 --- a/src/main/java/io/gravitee/repository/redis/management/RedisPageRepository.java +++ b/src/main/java/io/gravitee/repository/redis/management/RedisPageRepository.java @@ -18,7 +18,6 @@ import io.gravitee.repository.exceptions.TechnicalException; import io.gravitee.repository.management.api.PageRepository; import io.gravitee.repository.management.model.Page; -import io.gravitee.repository.management.model.PageConfiguration; import io.gravitee.repository.management.model.PageSource; import io.gravitee.repository.management.model.PageType; import io.gravitee.repository.redis.management.internal.PageRedisRepository; @@ -141,10 +140,7 @@ private Page convert(RedisPage redisPage) { page.setSource(pageSource); } - PageConfiguration configuration = new PageConfiguration(); - configuration.setTryIt(redisPage.isConfigurationTryIt()); - configuration.setTryItURL(redisPage.getConfigurationTryItURL()); - page.setConfiguration(configuration); + page.setConfiguration(redisPage.getConfiguration()); return page; } @@ -169,10 +165,7 @@ private RedisPage convert(Page page) { redisPage.setSourceConfiguration(page.getSource().getConfiguration()); } - if (page.getConfiguration() != null) { - redisPage.setConfigurationTryIt(page.getConfiguration().isTryIt()); - redisPage.setConfigurationTryItURL(page.getConfiguration().getTryItURL()); - } + redisPage.setConfiguration(page.getConfiguration()); return redisPage; } } diff --git a/src/main/java/io/gravitee/repository/redis/management/model/RedisPage.java b/src/main/java/io/gravitee/repository/redis/management/model/RedisPage.java index 6e55ab5..601057a 100644 --- a/src/main/java/io/gravitee/repository/redis/management/model/RedisPage.java +++ b/src/main/java/io/gravitee/repository/redis/management/model/RedisPage.java @@ -16,6 +16,7 @@ package io.gravitee.repository.redis.management.model; import java.util.List; +import java.util.Map; import java.util.Objects; /** @@ -36,8 +37,7 @@ public class RedisPage { private long updatedAt; private String sourceType; private String sourceConfiguration; - private boolean configurationTryIt; - private String configurationTryItURL; + private Map configuration; private boolean homepage; private List excludedGroups; @@ -137,20 +137,12 @@ public void setSourceConfiguration(String sourceConfiguration) { this.sourceConfiguration = sourceConfiguration; } - public boolean isConfigurationTryIt() { - return configurationTryIt; + public Map getConfiguration() { + return configuration; } - public void setConfigurationTryIt(boolean configurationTryIt) { - this.configurationTryIt = configurationTryIt; - } - - public String getConfigurationTryItURL() { - return configurationTryItURL; - } - - public void setConfigurationTryItURL(String configurationTryItURL) { - this.configurationTryItURL = configurationTryItURL; + public void setConfiguration(Map configuration) { + this.configuration = configuration; } public boolean isHomepage() {