This is an automated email from the ASF dual-hosted git repository. pzampino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git
commit 34723fd546e1c996904614fb35eb37ca740dd789 Author: pzampino <[email protected]> AuthorDate: Sat Jul 20 22:10:31 2019 -0400 KNOX-1928 - CM discovery - Multiple of same url are added to descriptor --- .../model/atlas/AtlasUIServiceModelGenerator.java | 39 ---------------------- .../ranger/RangerUIAPIServiceModelGenerator.java | 38 --------------------- .../cm/model/solr/SolrUIServiceModelGenerator.java | 38 --------------------- ...way.topology.discovery.cm.ServiceModelGenerator | 3 -- 4 files changed, 118 deletions(-) diff --git a/gateway-discovery-cm/src/main/java/org/apache/knox/gateway/topology/discovery/cm/model/atlas/AtlasUIServiceModelGenerator.java b/gateway-discovery-cm/src/main/java/org/apache/knox/gateway/topology/discovery/cm/model/atlas/AtlasUIServiceModelGenerator.java deleted file mode 100644 index 43f389a..0000000 --- a/gateway-discovery-cm/src/main/java/org/apache/knox/gateway/topology/discovery/cm/model/atlas/AtlasUIServiceModelGenerator.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with this - * work for additional information regarding copyright ownership. The ASF - * licenses this file to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package org.apache.knox.gateway.topology.discovery.cm.model.atlas; - -import com.cloudera.api.swagger.client.ApiException; -import com.cloudera.api.swagger.model.ApiConfigList; -import com.cloudera.api.swagger.model.ApiRole; -import com.cloudera.api.swagger.model.ApiService; -import com.cloudera.api.swagger.model.ApiServiceConfig; -import org.apache.knox.gateway.topology.discovery.cm.ServiceModel; - -public class AtlasUIServiceModelGenerator extends AtlasAPIServiceModelGenerator { - private static final String SERVICE = "ATLAS-API"; // TODO: PJZ: Should this really be -API? - - @Override - public ServiceModel generateService(ApiService service, - ApiServiceConfig serviceConfig, - ApiRole role, - ApiConfigList roleConfig) throws ApiException { - return new ServiceModel(ServiceModel.Type.UI, - SERVICE, - super.generateService(service, serviceConfig, role, roleConfig).getServiceUrl()); - } - -} diff --git a/gateway-discovery-cm/src/main/java/org/apache/knox/gateway/topology/discovery/cm/model/ranger/RangerUIAPIServiceModelGenerator.java b/gateway-discovery-cm/src/main/java/org/apache/knox/gateway/topology/discovery/cm/model/ranger/RangerUIAPIServiceModelGenerator.java deleted file mode 100644 index b635547..0000000 --- a/gateway-discovery-cm/src/main/java/org/apache/knox/gateway/topology/discovery/cm/model/ranger/RangerUIAPIServiceModelGenerator.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with this - * work for additional information regarding copyright ownership. The ASF - * licenses this file to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package org.apache.knox.gateway.topology.discovery.cm.model.ranger; - -import com.cloudera.api.swagger.model.ApiConfigList; -import com.cloudera.api.swagger.model.ApiRole; -import com.cloudera.api.swagger.model.ApiService; -import com.cloudera.api.swagger.model.ApiServiceConfig; -import org.apache.knox.gateway.topology.discovery.cm.ServiceModel; - -public class RangerUIAPIServiceModelGenerator extends RangerServiceModelGenerator { - private static final String SERVICE = "RANGER"; - - @Override - public ServiceModel generateService(ApiService service, - ApiServiceConfig serviceConfig, - ApiRole role, - ApiConfigList roleConfig) { - return new ServiceModel(ServiceModel.Type.UI, - SERVICE, - super.generateService(service, serviceConfig, role, roleConfig).getServiceUrl()); - } - -} diff --git a/gateway-discovery-cm/src/main/java/org/apache/knox/gateway/topology/discovery/cm/model/solr/SolrUIServiceModelGenerator.java b/gateway-discovery-cm/src/main/java/org/apache/knox/gateway/topology/discovery/cm/model/solr/SolrUIServiceModelGenerator.java deleted file mode 100644 index 301ba0f..0000000 --- a/gateway-discovery-cm/src/main/java/org/apache/knox/gateway/topology/discovery/cm/model/solr/SolrUIServiceModelGenerator.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with this - * work for additional information regarding copyright ownership. The ASF - * licenses this file to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package org.apache.knox.gateway.topology.discovery.cm.model.solr; - -import com.cloudera.api.swagger.model.ApiConfigList; -import com.cloudera.api.swagger.model.ApiRole; -import com.cloudera.api.swagger.model.ApiService; -import com.cloudera.api.swagger.model.ApiServiceConfig; -import org.apache.knox.gateway.topology.discovery.cm.ServiceModel; - -public class SolrUIServiceModelGenerator extends SolrServiceModelGenerator { - private static final String SERVICE = "SOLR"; - - @Override - public ServiceModel generateService(ApiService service, - ApiServiceConfig serviceConfig, - ApiRole role, - ApiConfigList roleConfig) { - String serviceUrl = super.generateService(service, serviceConfig, role, roleConfig).getServiceUrl(); - return new ServiceModel(ServiceModel.Type.UI, SERVICE, serviceUrl); - } - - -} diff --git a/gateway-discovery-cm/src/main/resources/META-INF/services/org.apache.knox.gateway.topology.discovery.cm.ServiceModelGenerator b/gateway-discovery-cm/src/main/resources/META-INF/services/org.apache.knox.gateway.topology.discovery.cm.ServiceModelGenerator index b4f485c..699f4b2 100644 --- a/gateway-discovery-cm/src/main/resources/META-INF/services/org.apache.knox.gateway.topology.discovery.cm.ServiceModelGenerator +++ b/gateway-discovery-cm/src/main/resources/META-INF/services/org.apache.knox.gateway.topology.discovery.cm.ServiceModelGenerator @@ -18,7 +18,6 @@ org.apache.knox.gateway.topology.discovery.cm.model.atlas.AtlasServiceModelGenerator org.apache.knox.gateway.topology.discovery.cm.model.atlas.AtlasAPIServiceModelGenerator -org.apache.knox.gateway.topology.discovery.cm.model.atlas.AtlasUIServiceModelGenerator org.apache.knox.gateway.topology.discovery.cm.model.hbase.HBaseUIServiceModelGenerator org.apache.knox.gateway.topology.discovery.cm.model.hbase.WebHBaseServiceModelGenerator org.apache.knox.gateway.topology.discovery.cm.model.hdfs.NameNodeServiceModelGenerator @@ -33,9 +32,7 @@ org.apache.knox.gateway.topology.discovery.cm.model.oozie.OozieServiceModelGener org.apache.knox.gateway.topology.discovery.cm.model.oozie.OozieUIServiceModelGenerator org.apache.knox.gateway.topology.discovery.cm.model.ranger.RangerServiceModelGenerator org.apache.knox.gateway.topology.discovery.cm.model.ranger.RangerUIServiceModelGenerator -org.apache.knox.gateway.topology.discovery.cm.model.ranger.RangerUIAPIServiceModelGenerator org.apache.knox.gateway.topology.discovery.cm.model.solr.SolrServiceModelGenerator -org.apache.knox.gateway.topology.discovery.cm.model.solr.SolrUIServiceModelGenerator org.apache.knox.gateway.topology.discovery.cm.model.spark.SparkHistoryUIServiceModelGenerator org.apache.knox.gateway.topology.discovery.cm.model.yarn.JobHistoryUIServiceModelGenerator org.apache.knox.gateway.topology.discovery.cm.model.yarn.ResourceManagerUIServiceModelGenerator
