[knox] branch master updated: KNOX-2299 - Fixed Hive JDBC URL on Knox Home page (#293)

[smolnar]

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 bef8b19  KNOX-2299 - Fixed Hive JDBC URL on Knox Home page (#293)
bef8b19 is described below

commit bef8b19e02a81b6580e4469ea64730e50eadf5bc
Author: Sandor Molnar <smol...@apache.org>
AuthorDate: Wed Mar 18 14:27:02 2020 +0100

    KNOX-2299 - Fixed Hive JDBC URL on Knox Home page (#293)
---
 .../java/org/apache/knox/gateway/service/metadata/ServiceModel.java   | 4 ++--
 .../org/apache/knox/gateway/service/metadata/ServiceModelTest.java    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

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 5d05762..916b20c 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
@@ -41,7 +41,7 @@ public class ServiceModel implements Comparable<ServiceModel> 
{
 
   static final String SERVICE_URL_TEMPLATE = "%s://%s:%s/%s/%s%s";
   static final String HIVE_SERVICE_NAME = "HIVE";
-  static final String HIVE_SERVICE_URL_TEMPLATE = 
"jdbc:hive2://%s:%d/;?hive.server2.transport.mode=http;hive.server2.thrift.http.path=/%s/%s%s";
+  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
@@ -120,7 +120,7 @@ public class ServiceModel implements 
Comparable<ServiceModel> {
   public String getServiceUrl() {
     String context = getContext();
     if (HIVE_SERVICE_NAME.equals(getServiceName())) {
-      return String.format(Locale.ROOT, HIVE_SERVICE_URL_TEMPLATE, 
request.getServerName(), request.getServerPort(), gatewayPath, topologyName, 
context);
+      return String.format(Locale.ROOT, HIVE_SERVICE_URL_TEMPLATE, 
request.getServerName(), request.getServerPort(), gatewayPath, topologyName);
     } else {
       final String backendUrlString = getBackendServiceUrl();
       if (context.indexOf("{{BACKEND_HOST}}") > -1) {
diff --git 
a/gateway-service-metadata/src/test/java/org/apache/knox/gateway/service/metadata/ServiceModelTest.java
 
b/gateway-service-metadata/src/test/java/org/apache/knox/gateway/service/metadata/ServiceModelTest.java
index c50132e..1505ee0 100644
--- 
a/gateway-service-metadata/src/test/java/org/apache/knox/gateway/service/metadata/ServiceModelTest.java
+++ 
b/gateway-service-metadata/src/test/java/org/apache/knox/gateway/service/metadata/ServiceModelTest.java
@@ -151,7 +151,7 @@ public class ServiceModelTest {
     serviceModel.setService(service);
     EasyMock.expect(service.getRole()).andReturn(HIVE_SERVICE_NAME).anyTimes();
     EasyMock.replay(service);
-    assertEquals(String.format(Locale.ROOT, HIVE_SERVICE_URL_TEMPLATE, 
SERVER_NAME, SERVER_PORT, gatewayPath, topologyName, "/hive/"), 
serviceModel.getServiceUrl());
+    assertEquals(String.format(Locale.ROOT, HIVE_SERVICE_URL_TEMPLATE, 
SERVER_NAME, SERVER_PORT, gatewayPath, topologyName), 
serviceModel.getServiceUrl());
   }
 
   public HttpServletRequest setUpHttpRequestMock() {