[knox] branch master updated: KNOX-2289 - Passing GatewayServer.getGatewayServices() to SimpleDescriptorHandler.handle() as it needs it to provision encryption query string password (#288)

[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 58d8479  KNOX-2289 - Passing GatewayServer.getGatewayServices() to 
SimpleDescriptorHandler.handle() as it needs it to provision encryption query 
string password (#288)
58d8479 is described below

commit 58d8479b2ac8f3609178b744fbd839784823737f
Author: Sandor Molnar <smol...@apache.org>
AuthorDate: Thu Mar 12 17:59:23 2020 +0100

    KNOX-2289 - Passing GatewayServer.getGatewayServices() to 
SimpleDescriptorHandler.handle() as it needs it to provision encryption query 
string password (#288)
---
 .../knox/gateway/services/topology/impl/DefaultTopologyService.java   | 4 ----
 .../knox/gateway/services/topology/monitor/DescriptorsMonitor.java    | 3 ++-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git 
a/gateway-server/src/main/java/org/apache/knox/gateway/services/topology/impl/DefaultTopologyService.java
 
b/gateway-server/src/main/java/org/apache/knox/gateway/services/topology/impl/DefaultTopologyService.java
index c616a31..411307e 100644
--- 
a/gateway-server/src/main/java/org/apache/knox/gateway/services/topology/impl/DefaultTopologyService.java
+++ 
b/gateway-server/src/main/java/org/apache/knox/gateway/services/topology/impl/DefaultTopologyService.java
@@ -789,10 +789,6 @@ public class DefaultTopologyService extends 
FileAlterationListenerAdaptor implem
 
 
   /**
-   * Change handler for simple descriptors
-   */
-
-  /**
    * Listener for Ambari config change events, which will trigger 
re-generation (including re-discovery) of the
    * affected topologies.
    */
diff --git 
a/gateway-server/src/main/java/org/apache/knox/gateway/services/topology/monitor/DescriptorsMonitor.java
 
b/gateway-server/src/main/java/org/apache/knox/gateway/services/topology/monitor/DescriptorsMonitor.java
index 9c67e37..1823b45 100644
--- 
a/gateway-server/src/main/java/org/apache/knox/gateway/services/topology/monitor/DescriptorsMonitor.java
+++ 
b/gateway-server/src/main/java/org/apache/knox/gateway/services/topology/monitor/DescriptorsMonitor.java
@@ -29,6 +29,7 @@ import java.util.Map;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.io.monitor.FileAlterationListenerAdaptor;
 import org.apache.knox.gateway.GatewayMessages;
+import org.apache.knox.gateway.GatewayServer;
 import org.apache.knox.gateway.config.GatewayConfig;
 import org.apache.knox.gateway.i18n.messages.MessagesFactory;
 import org.apache.knox.gateway.services.security.AliasService;
@@ -92,7 +93,7 @@ public class DescriptorsMonitor extends 
FileAlterationListenerAdaptor implements
   public void onFileChange(File file) {
     try {
       // When a simple descriptor has been created or modified, generate the 
new topology descriptor
-      Map<String, File> result = SimpleDescriptorHandler.handle(gatewayConfig, 
file, topologiesDir, aliasService);
+      Map<String, File> result = SimpleDescriptorHandler.handle(gatewayConfig, 
file, topologiesDir, aliasService, GatewayServer.getGatewayServices());
       
LOG.generatedTopologyForDescriptorChange(result.get(SimpleDescriptorHandler.RESULT_TOPOLOGY).getName(),
 file.getName());
 
       // Add the provider config reference relationship for handling updates 
to the provider config