This is an automated email from the ASF dual-hosted git repository.
smolnar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/knox.git
The following commit(s) were added to refs/heads/master by this push:
new 840af4f KNOX-2300 - Livy and Solr handled as both API and UI services
(#294)
840af4f is described below
commit 840af4f5de180dc53e2c28c5dbab01bef72a6ddb
Author: Sandor Molnar <[email protected]>
AuthorDate: Wed Mar 18 14:27:21 2020 +0100
KNOX-2300 - Livy and Solr handled as both API and UI services (#294)
---
.../src/main/resources/services/livy/0.4.0/service.xml | 2 +-
.../src/main/resources/services/solr/5.5.0/service.xml | 2 +-
.../src/main/resources/services/solr/6.0.0/service.xml | 2 +-
.../org/apache/knox/gateway/service/metadata/KnoxMetadataResource.java | 3 +++
.../java/org/apache/knox/gateway/service/metadata/ServiceModel.java | 2 +-
5 files changed, 7 insertions(+), 4 deletions(-)
diff --git
a/gateway-service-definitions/src/main/resources/services/livy/0.4.0/service.xml
b/gateway-service-definitions/src/main/resources/services/livy/0.4.0/service.xml
index ecac66d..128cd93 100644
---
a/gateway-service-definitions/src/main/resources/services/livy/0.4.0/service.xml
+++
b/gateway-service-definitions/src/main/resources/services/livy/0.4.0/service.xml
@@ -17,7 +17,7 @@
-->
<service role="LIVYSERVER" name="livy" version="0.4.0">
<metadata>
- <type>API</type>
+ <type>API_AND_UI</type>
<context>/livy</context>
<shortDesc>Livy Server</shortDesc>
<description>Apache Livy is a service that enables easy interaction
with a Spark cluster over a REST interface.</description>
diff --git
a/gateway-service-definitions/src/main/resources/services/solr/5.5.0/service.xml
b/gateway-service-definitions/src/main/resources/services/solr/5.5.0/service.xml
index 9784944..8d6cd67 100644
---
a/gateway-service-definitions/src/main/resources/services/solr/5.5.0/service.xml
+++
b/gateway-service-definitions/src/main/resources/services/solr/5.5.0/service.xml
@@ -17,7 +17,7 @@
-->
<service role="SOLRAPI" name="solr" version="5.5.0">
<metadata>
- <type>API</type>
+ <type>API_AND_UI</type>
<context>/solr</context>
<shortDesc>SOLR</shortDesc>
<description>Solr is a popular, blazing-fast, open source enterprise
search platform built on Apache Lucene™.</description>
diff --git
a/gateway-service-definitions/src/main/resources/services/solr/6.0.0/service.xml
b/gateway-service-definitions/src/main/resources/services/solr/6.0.0/service.xml
index c264c81..ee80a11 100644
---
a/gateway-service-definitions/src/main/resources/services/solr/6.0.0/service.xml
+++
b/gateway-service-definitions/src/main/resources/services/solr/6.0.0/service.xml
@@ -17,7 +17,7 @@
-->
<service role="SOLR" name="solr" version="6.0.0">
<metadata>
- <type>API</type>
+ <type>API_AND_UI</type>
<context>/solr</context>
<shortDesc>SOLR</shortDesc>
<description>Solr is a popular, blazing-fast, open source enterprise
search platform built on Apache Lucene™.</description>
diff --git
a/gateway-service-metadata/src/main/java/org/apache/knox/gateway/service/metadata/KnoxMetadataResource.java
b/gateway-service-metadata/src/main/java/org/apache/knox/gateway/service/metadata/KnoxMetadataResource.java
index 9c82b0f..1a89fb6 100644
---
a/gateway-service-metadata/src/main/java/org/apache/knox/gateway/service/metadata/KnoxMetadataResource.java
+++
b/gateway-service-metadata/src/main/java/org/apache/knox/gateway/service/metadata/KnoxMetadataResource.java
@@ -201,6 +201,9 @@ public class KnoxMetadataResource {
serviceUrl);
if (ServiceModel.Type.UI == serviceModel.getType()) {
uiServices.add(serviceModel);
+ } else if (ServiceModel.Type.API_AND_UI ==
serviceModel.getType()) {
+ uiServices.add(serviceModel);
+ apiServices.add(serviceModel);
} else {
apiServices.add(serviceModel);
}
diff --git
a/gateway-service-metadata/src/main/java/org/apache/knox/gateway/service/metadata/ServiceModel.java
b/gateway-service-metadata/src/main/java/org/apache/knox/gateway/service/metadata/ServiceModel.java
index 916b20c..135684e 100644
---
a/gateway-service-metadata/src/main/java/org/apache/knox/gateway/service/metadata/ServiceModel.java
+++
b/gateway-service-metadata/src/main/java/org/apache/knox/gateway/service/metadata/ServiceModel.java
@@ -44,7 +44,7 @@ public class ServiceModel implements Comparable<ServiceModel>
{
static final String HIVE_SERVICE_URL_TEMPLATE =
"jdbc:hive2://%s:%d/;ssl=true;transportMode=http;httpPath=%s/%s/hive";
public enum Type {
- API, UI, UNKNOWN
+ API, UI, API_AND_UI, UNKNOWN
};
private HttpServletRequest request;
