You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by is...@apache.org on 2022/06/21 20:13:34 UTC
[airavata-custos] branch berametal updated: merging integration services
This is an automated email from the ASF dual-hosted git repository.
isjarana pushed a commit to branch berametal
in repository https://gitbox.apache.org/repos/asf/airavata-custos.git
The following commit(s) were added to refs/heads/berametal by this push:
new 768a4989 merging integration services
new 46bfa926 Merge pull request #283 from isururanawaka/berametalWithMerge
768a4989 is described below
commit 768a4989267427565b24ce93902628f4ea244be2
Author: Isuru Ranawaka <ir...@gmail.com>
AuthorDate: Tue Jun 21 16:11:06 2022 -0400
merging integration services
---
.../services/api/CoreServicesServer.java | 2 +-
custos-integration-services-server/pom.xml | 183 +++++++++++++++++++++
.../services/api/IntegrationServicesServer.java | 84 ++++++++++
.../src/main/resources/application.properties | 86 ++++++++++
.../AgentManagementServiceInitializer.java | 180 ++++++++++----------
... AgentManagementClientAuthInterceptorImpl.java} | 8 +-
...tor.java => AgentManagementInputValidator.java} | 4 +-
...TenantRestrictedOperationsInterceptorImpl.java} | 8 +-
...=> AgentManagementUserAuthInterceptorImpl.java} | 6 +-
.../GroupManagementServiceInitializer.java | 162 +++++++++---------
... GroupManagementClientAuthInterceptorImpl.java} | 8 +-
...tor.java => GroupManagementInputValidator.java} | 4 +-
.../IdentityManagementServiceInitializer.java | 172 +++++++++----------
...=> IdentityManagementAgentAuthInterceptor.java} | 8 +-
... => IdentityManagementAuthInterceptorImpl.java} | 8 +-
....java => IdentityManagementInputValidator.java} | 4 +-
.../LogManagementServiceInitializer.java | 162 +++++++++---------
....java => LogManagementAuthInterceptorImpl.java} | 6 +-
...dator.java => LogManagementInputValidator.java} | 4 +-
.../ResourceSecretManagementInitializer.java | 166 +++++++++----------
...sourceSecretManagementAuthInterceptorImpl.java} | 6 +-
...=> ResourceSecretManagementInputValidator.java} | 4 +-
.../SharingManagementServiceInitializer.java | 166 +++++++++----------
...a => SharingManagementAuthInterceptorImpl.java} | 8 +-
...r.java => SharingManagementInputValidator.java} | 4 +-
.../TenantManagementServiceInitializer.java | 178 ++++++++++----------
...va => TenantManagementAuthInterceptorImpl.java} | 8 +-
...antManagementDynamicRegistrationValidator.java} | 8 +-
...or.java => TenantManagementInputValidator.java} | 4 +-
...TenantRestrictedOperationsInterceptorImpl.java} | 8 +-
.../UserManagementServiceInitializer.java | 172 +++++++++----------
...java => UserManagementAuthInterceptorImpl.java} | 6 +-
...ator.java => UserManagementInputValidator.java} | 5 +-
...TenantRestrictedOperationsInterceptorImpl.java} | 8 +-
pom.xml | 1 +
35 files changed, 1102 insertions(+), 749 deletions(-)
diff --git a/custos-core-services-server/src/main/java/org/apache/custos/core/services/api/CoreServicesServer.java b/custos-core-services-server/src/main/java/org/apache/custos/integration/services/api/CoreServicesServer.java
similarity index 99%
rename from custos-core-services-server/src/main/java/org/apache/custos/core/services/api/CoreServicesServer.java
rename to custos-core-services-server/src/main/java/org/apache/custos/integration/services/api/CoreServicesServer.java
index 3299aab9..9624f17f 100644
--- a/custos-core-services-server/src/main/java/org/apache/custos/core/services/api/CoreServicesServer.java
+++ b/custos-core-services-server/src/main/java/org/apache/custos/integration/services/api/CoreServicesServer.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.custos.core.services.api;
+package org.apache.custos.integration.services.api;
import io.grpc.ServerInterceptor;
import org.apache.custos.agent.profile.validator.AgentInputValidator;
import org.apache.custos.cluster.management.validator.ClusterManagementInputValidator;
diff --git a/custos-integration-services-server/pom.xml b/custos-integration-services-server/pom.xml
new file mode 100644
index 00000000..44aa6a32
--- /dev/null
+++ b/custos-integration-services-server/pom.xml
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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.
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <artifactId>custos</artifactId>
+ <groupId>org.apache.custos</groupId>
+ <version>1.1-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>custos-integration-services-server</artifactId>
+
+ <properties>
+ <maven.compiler.source>11</maven.compiler.source>
+ <maven.compiler.target>11</maven.compiler.target>
+ </properties>
+
+
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-actuator</artifactId>
+ </dependency>
+
+
+
+ <dependency>
+ <groupId>io.github.lognet</groupId>
+ <artifactId>grpc-spring-boot-starter</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-stub</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-protobuf</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-netty</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-data-jpa</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.persistence</groupId>
+ <artifactId>persistence-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.custos</groupId>
+ <artifactId>agent-management-service</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.custos</groupId>
+ <artifactId>group-management-service</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.custos</groupId>
+ <artifactId>identity-management-service</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.custos</groupId>
+ <artifactId>log-management-service</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.custos</groupId>
+ <artifactId>resource-secret-management-service</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.custos</groupId>
+ <artifactId>sharing-management-service</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.custos</groupId>
+ <artifactId>tenant-management-service</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.custos</groupId>
+ <artifactId>user-management-service</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot</artifactId>
+ <version>2.2.0.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
+
+ </dependencies>
+
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.spotify</groupId>
+ <artifactId>dockerfile-maven-plugin</artifactId>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>com.deviceinsight.helm</groupId>
+ <artifactId>helm-maven-plugin</artifactId>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>custos-package</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <tarLongFileMode>posix</tarLongFileMode>
+ <finalName>${artifactId}-${project.version}</finalName>
+ <descriptors>
+ <descriptor>src/main/dist/${artifactId}-assembly.xml</descriptor>
+ </descriptors>
+ <attach>false</attach>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
\ No newline at end of file
diff --git a/custos-integration-services-server/src/main/java/org/apache/custos/integration/services/api/IntegrationServicesServer.java b/custos-integration-services-server/src/main/java/org/apache/custos/integration/services/api/IntegrationServicesServer.java
new file mode 100644
index 00000000..ebda5d6b
--- /dev/null
+++ b/custos-integration-services-server/src/main/java/org/apache/custos/integration/services/api/IntegrationServicesServer.java
@@ -0,0 +1,84 @@
+/*
+ * 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.custos.integration.services.api;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
+
+
+@SpringBootApplication
+@EnableJpaAuditing
+@EnableJpaRepositories(basePackages = "org.apache.custos")
+@ComponentScan(basePackages = "org.apache.custos")
+@EntityScan(basePackages = "org.apache.custos")
+public class IntegrationServicesServer {
+ public static void main(String[] args) {
+ SpringApplication.run(IntegrationServicesServer.class, args);
+ }
+
+
+//
+// @Bean
+// public Stack<Validator> getInterceptorSet(AgentInputValidator inputValidator,
+// ClusterManagementInputValidator clusterManagementInputValidator,
+// CredentialStoreInputValidator credentialStoreInputValidator,
+// CustosLoggingInputValidator custosLoggingInputValidator,
+// FederatedAuthenticationInputValidator federatedAuthenticationInputValidator,
+// IAMInputValidator iamInputValidator,
+// IdentityInputValidator identityInputValidator,
+// ResourceSecretInputValidator resourceSecretInputValidator,
+// SharingInputValidator sharingInputValidator,
+// TenantProfileInputValidator tenantProfileInputValidator,
+// UserProfileInputValidator userProfileInputValidator) {
+// Stack<Validator> interceptors = new Stack<>();
+// interceptors.add(inputValidator);
+// interceptors.add(clusterManagementInputValidator);
+// interceptors.add(credentialStoreInputValidator);
+// interceptors.add(custosLoggingInputValidator);
+// interceptors.add(federatedAuthenticationInputValidator);
+// interceptors.add(iamInputValidator);
+// interceptors.add(identityInputValidator);
+// interceptors.add(resourceSecretInputValidator);
+// interceptors.add(sharingInputValidator);
+// interceptors.add(tenantProfileInputValidator);
+// interceptors.add(userProfileInputValidator);
+//
+// return interceptors;
+// }
+//
+//
+//
+//
+// @Bean
+// @GRpcGlobalInterceptor
+// ServerInterceptor validationInterceptor(Stack<Validator> validators){
+// return new ServiceInterceptor(validators);
+// }
+//
+// @Bean
+// public MessageProducer registerMessageProducer(@Value("${core.messaging.service.broker.url}") String borkerURL,
+// @Value("${core.messaging.service.publisher.id}") String publisherId) {
+// return new MessageProducer(borkerURL, publisherId);
+// }
+}
diff --git a/custos-integration-services-server/src/main/resources/application.properties b/custos-integration-services-server/src/main/resources/application.properties
new file mode 100644
index 00000000..5b8cb5a3
--- /dev/null
+++ b/custos-integration-services-server/src/main/resources/application.properties
@@ -0,0 +1,86 @@
+#
+# 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.
+#
+
+grpc.port=7000
+server.port=8080
+##spring.zipkin.baseUrl=http://149.165.169.49:9411/
+spring.application.name=agentProfileCoreService
+##spring.sleuth.sampler.probability=1
+spring.main.allow-bean-definition-overriding=true
+management.security.enabled=false
+management.endpoints.web.exposure.include=*
+management.endpoint.metrics.enabled=true
+spring.jmx.enabled=true
+
+
+## Hibernate Properties
+# The SQL dialect makes Hibernate generate better SQL for the chosen database
+spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5InnoDBDialect
+spring.jpa.properties.hibernate.enable_lazy_load_no_trans=true
+# Hibernate ddl auto (create, create-drop, validate, update)
+spring.jpa.hibernate.ddl-auto = update
+spring.profiles.active=@spring.profiles.active@
+logging.level.root=INFO
+
+
+ciLogon.admin.client.id=${cilogon.production.id}
+ciLogon.admin.client.secret=${cilogon.production.sec}
+ciLogon.admin.auth.endpoint=https://test.cilogon.org/oauth2/oidc-cm
+
+
+iam.server.client.id=admin-cli
+iam.server.truststore.path=/home/ubuntu/keystore/keycloak-client-truststore.pkcs12
+iam.server.truststore.password=keycloak
+iam.server.url=https://keycloak.custos.scigap.org:31000/auth/
+iam.server.admin.username=${iam.dev.username}
+iam.server.admin.password=${iam.dev.password}
+iam.server.super.admin.realm.id=master
+iam.federated.cilogon.authorization.endpoint=https://cilogon.org/authorize
+iam.federated.cilogon.token.endpoint=https://cilogon.org/oauth2/token
+iam.federated.cilogon.token.userinfo.endpoint=https://cilogon.org/oauth2/userinfo
+iam.federated.cilogon.issuer=https://cilogon.org
+iam.federated.cilogon.jwksUri=https://cilogon.org/oauth2/certs
+introspection.endpoint=https://custos.scigap.org:32036/identity-management/v1.0.0/token/introspect
+issuer=https://custos.scigap.org/
+authorization.endpoint=https://custos.scigap.org/apiserver/identity-management/v1.0.0/authorize
+token.endpoint=https://custos.scigap.org/apiserver/identity-management/v1.0.0/token
+end.session.endpoint=https://custos.scigap.org/apiserver/identity-management/v1.0.0/logout
+user.info.endpoint=https://custos.scigap.org/apiserver/user-management/v1.0.0/userinfo
+jwks_uri=https://custos.scigap.org/apiserver/identity-management/v1.0.0/certs
+registration.endpoint=https://custos.scigap.org/apiserver/tenant-management/v1.0.0/oauth2/tenant
+cluster.management.core.service.dns.name=cluster-management-core-service.keycloak.svc.cluster.local
+cluster.management.core.service.port=7000
+
+
+custos.identity.auth.cache.enabled=true
+custos.identity.auth.cache.size=1024
+
+
+
+core.messaging.service.broker.url=custos07.sciencegateways.iu.edu:9092
+core.messaging.service.publisher.id=custosEventPublisher
+mail.smtp.auth=true
+mail.smtp.starttls.enable=true
+mail.smtp.host=smtp.gmail.com
+mail.smtp.port=587
+mail.smtp.ssl.trust=smtp.gmail.com
+mail.sender.username=custosemailagent@gmail.com
+mail.sender.password=${custos.email.password}
+user.profile.core.service.dns.name=user-profile-core-service.custos.svc.cluster.local
+user.profile.core.service.port=7000
diff --git a/custos-integration-services/agent-management-service-parent/agent-management-service/src/main/java/org/apache/custos/agent/management/AgentManagementServiceInitializer.java b/custos-integration-services/agent-management-service-parent/agent-management-service/src/main/java/org/apache/custos/agent/management/AgentManagementServiceInitializer.java
index bc17b84e..31195944 100644
--- a/custos-integration-services/agent-management-service-parent/agent-management-service/src/main/java/org/apache/custos/agent/management/AgentManagementServiceInitializer.java
+++ b/custos-integration-services/agent-management-service-parent/agent-management-service/src/main/java/org/apache/custos/agent/management/AgentManagementServiceInitializer.java
@@ -1,90 +1,90 @@
-/*
- * 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.custos.agent.management;
-
-import brave.Tracing;
-import brave.grpc.GrpcTracing;
-import io.grpc.ClientInterceptor;
-import io.grpc.ServerInterceptor;
-import org.apache.custos.agent.management.interceptors.ClientAuthInterceptorImpl;
-import org.apache.custos.agent.management.interceptors.InputValidator;
-import org.apache.custos.agent.management.interceptors.SuperTenantRestrictedOperationsInterceptorImpl;
-import org.apache.custos.agent.management.interceptors.UserAuthInterceptorImpl;
-import org.apache.custos.integration.core.interceptor.IntegrationServiceInterceptor;
-import org.apache.custos.integration.core.interceptor.ServiceInterceptor;
-import org.apache.custos.integration.services.commons.interceptors.LoggingInterceptor;
-import org.lognet.springboot.grpc.GRpcGlobalInterceptor;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
-
-import java.util.Stack;
-
-@SpringBootApplication
-@ComponentScan(basePackages = "org.apache.custos")
-public class AgentManagementServiceInitializer {
-
- public static void main(String[] args) {
- SpringApplication.run(AgentManagementServiceInitializer.class, args);
- }
-
- @Bean
- public GrpcTracing grpcTracing(Tracing tracing) {
- // Tracing tracing1 = Tracing.newBuilder().build();
- return GrpcTracing.create(tracing);
- }
-
- //We also create a client-side interceptor and put that in the context, this interceptor can then be injected into gRPC clients and
- //then applied to the managed channel.
- @Bean
- ClientInterceptor grpcClientSleuthInterceptor(GrpcTracing grpcTracing) {
- return grpcTracing.newClientInterceptor();
- }
-
- @Bean
- @GRpcGlobalInterceptor
- ServerInterceptor grpcServerSleuthInterceptor(GrpcTracing grpcTracing) {
- return grpcTracing.newServerInterceptor();
- }
-
- @Bean
- public Stack<IntegrationServiceInterceptor> getInterceptorSet(InputValidator inputValidator,
- ClientAuthInterceptorImpl authInterceptor,
- UserAuthInterceptorImpl userAuthInterceptor,
- SuperTenantRestrictedOperationsInterceptorImpl superTenantRestrictedOperationsInterceptor,
- LoggingInterceptor loggingInterceptor) {
- Stack<IntegrationServiceInterceptor> interceptors = new Stack<>();
- interceptors.add(inputValidator);
- interceptors.add(authInterceptor);
- interceptors.add(userAuthInterceptor);
- interceptors.add(superTenantRestrictedOperationsInterceptor);
- interceptors.add(loggingInterceptor);
-
-
- return interceptors;
- }
-
- @Bean
- @GRpcGlobalInterceptor
- ServerInterceptor validationInterceptor(Stack<IntegrationServiceInterceptor> integrationServiceInterceptors) {
- return new ServiceInterceptor(integrationServiceInterceptors);
- }
-}
+///*
+// * 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.custos.agent.management;
+//
+//import brave.Tracing;
+//import brave.grpc.GrpcTracing;
+//import io.grpc.ClientInterceptor;
+//import io.grpc.ServerInterceptor;
+//import org.apache.custos.agent.management.interceptors.ClientAuthInterceptorImpl;
+//import org.apache.custos.agent.management.interceptors.InputValidator;
+//import org.apache.custos.agent.management.interceptors.SuperTenantRestrictedOperationsInterceptorImpl;
+//import org.apache.custos.agent.management.interceptors.UserAuthInterceptorImpl;
+//import org.apache.custos.integration.core.interceptor.IntegrationServiceInterceptor;
+//import org.apache.custos.integration.core.interceptor.ServiceInterceptor;
+//import org.apache.custos.integration.services.commons.interceptors.LoggingInterceptor;
+//import org.lognet.springboot.grpc.GRpcGlobalInterceptor;
+//import org.springframework.boot.SpringApplication;
+//import org.springframework.boot.autoconfigure.SpringBootApplication;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.ComponentScan;
+//
+//import java.util.Stack;
+//
+//@SpringBootApplication
+//@ComponentScan(basePackages = "org.apache.custos")
+//public class AgentManagementServiceInitializer {
+//
+// public static void main(String[] args) {
+// SpringApplication.run(AgentManagementServiceInitializer.class, args);
+// }
+//
+// @Bean
+// public GrpcTracing grpcTracing(Tracing tracing) {
+// // Tracing tracing1 = Tracing.newBuilder().build();
+// return GrpcTracing.create(tracing);
+// }
+//
+// //We also create a client-side interceptor and put that in the context, this interceptor can then be injected into gRPC clients and
+// //then applied to the managed channel.
+// @Bean
+// ClientInterceptor grpcClientSleuthInterceptor(GrpcTracing grpcTracing) {
+// return grpcTracing.newClientInterceptor();
+// }
+//
+// @Bean
+// @GRpcGlobalInterceptor
+// ServerInterceptor grpcServerSleuthInterceptor(GrpcTracing grpcTracing) {
+// return grpcTracing.newServerInterceptor();
+// }
+//
+// @Bean
+// public Stack<IntegrationServiceInterceptor> getInterceptorSet(InputValidator inputValidator,
+// ClientAuthInterceptorImpl authInterceptor,
+// UserAuthInterceptorImpl userAuthInterceptor,
+// SuperTenantRestrictedOperationsInterceptorImpl superTenantRestrictedOperationsInterceptor,
+// LoggingInterceptor loggingInterceptor) {
+// Stack<IntegrationServiceInterceptor> interceptors = new Stack<>();
+// interceptors.add(inputValidator);
+// interceptors.add(authInterceptor);
+// interceptors.add(userAuthInterceptor);
+// interceptors.add(superTenantRestrictedOperationsInterceptor);
+// interceptors.add(loggingInterceptor);
+//
+//
+// return interceptors;
+// }
+//
+// @Bean
+// @GRpcGlobalInterceptor
+// ServerInterceptor validationInterceptor(Stack<IntegrationServiceInterceptor> integrationServiceInterceptors) {
+// return new ServiceInterceptor(integrationServiceInterceptors);
+// }
+//}
diff --git a/custos-integration-services/agent-management-service-parent/agent-management-service/src/main/java/org/apache/custos/agent/management/interceptors/ClientAuthInterceptorImpl.java b/custos-integration-services/agent-management-service-parent/agent-management-service/src/main/java/org/apache/custos/agent/management/interceptors/AgentManagementClientAuthInterceptorImpl.java
similarity index 83%
rename from custos-integration-services/agent-management-service-parent/agent-management-service/src/main/java/org/apache/custos/agent/management/interceptors/ClientAuthInterceptorImpl.java
rename to custos-integration-services/agent-management-service-parent/agent-management-service/src/main/java/org/apache/custos/agent/management/interceptors/AgentManagementClientAuthInterceptorImpl.java
index 3218e299..6b6a82af 100644
--- a/custos-integration-services/agent-management-service-parent/agent-management-service/src/main/java/org/apache/custos/agent/management/interceptors/ClientAuthInterceptorImpl.java
+++ b/custos-integration-services/agent-management-service-parent/agent-management-service/src/main/java/org/apache/custos/agent/management/interceptors/AgentManagementClientAuthInterceptorImpl.java
@@ -34,12 +34,12 @@ import org.springframework.stereotype.Component;
* Methods which authenticates based only on client are implemented here.
*/
@Component
-public class ClientAuthInterceptorImpl extends AuthInterceptor {
- private static final Logger LOGGER = LoggerFactory.getLogger(ClientAuthInterceptorImpl.class);
+public class AgentManagementClientAuthInterceptorImpl extends AuthInterceptor {
+ private static final Logger LOGGER = LoggerFactory.getLogger(AgentManagementClientAuthInterceptorImpl.class);
@Autowired
- public ClientAuthInterceptorImpl(CredentialStoreServiceClient credentialStoreServiceClient,
- TenantProfileClient tenantProfileClient, IdentityClient identityClient) {
+ public AgentManagementClientAuthInterceptorImpl(CredentialStoreServiceClient credentialStoreServiceClient,
+ TenantProfileClient tenantProfileClient, IdentityClient identityClient) {
super(credentialStoreServiceClient, tenantProfileClient, identityClient);
}
diff --git a/custos-integration-services/agent-management-service-parent/agent-management-service/src/main/java/org/apache/custos/agent/management/interceptors/InputValidator.java b/custos-integration-services/agent-management-service-parent/agent-management-service/src/main/java/org/apache/custos/agent/management/interceptors/AgentManagementInputValidator.java
similarity index 94%
rename from custos-integration-services/agent-management-service-parent/agent-management-service/src/main/java/org/apache/custos/agent/management/interceptors/InputValidator.java
rename to custos-integration-services/agent-management-service-parent/agent-management-service/src/main/java/org/apache/custos/agent/management/interceptors/AgentManagementInputValidator.java
index 495b9fb2..ad5d1787 100644
--- a/custos-integration-services/agent-management-service-parent/agent-management-service/src/main/java/org/apache/custos/agent/management/interceptors/InputValidator.java
+++ b/custos-integration-services/agent-management-service-parent/agent-management-service/src/main/java/org/apache/custos/agent/management/interceptors/AgentManagementInputValidator.java
@@ -31,9 +31,9 @@ import org.springframework.stereotype.Component;
* This class validates the request input parameters
*/
@Component
-public class InputValidator implements IntegrationServiceInterceptor {
+public class AgentManagementInputValidator implements IntegrationServiceInterceptor {
- private static final Logger LOGGER = LoggerFactory.getLogger(InputValidator.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(AgentManagementInputValidator.class);
/**
* Input parameter validater
diff --git a/custos-integration-services/agent-management-service-parent/agent-management-service/src/main/java/org/apache/custos/agent/management/interceptors/SuperTenantRestrictedOperationsInterceptorImpl.java b/custos-integration-services/agent-management-service-parent/agent-management-service/src/main/java/org/apache/custos/agent/management/interceptors/AgentManagementSuperTenantRestrictedOperationsInterceptorImpl.java
similarity index 84%
rename from custos-integration-services/agent-management-service-parent/agent-management-service/src/main/java/org/apache/custos/agent/management/interceptors/SuperTenantRestrictedOperationsInterceptorImpl.java
rename to custos-integration-services/agent-management-service-parent/agent-management-service/src/main/java/org/apache/custos/agent/management/interceptors/AgentManagementSuperTenantRestrictedOperationsInterceptorImpl.java
index 9bb051b0..9b845dc3 100644
--- a/custos-integration-services/agent-management-service-parent/agent-management-service/src/main/java/org/apache/custos/agent/management/interceptors/SuperTenantRestrictedOperationsInterceptorImpl.java
+++ b/custos-integration-services/agent-management-service-parent/agent-management-service/src/main/java/org/apache/custos/agent/management/interceptors/AgentManagementSuperTenantRestrictedOperationsInterceptorImpl.java
@@ -33,15 +33,15 @@ import org.springframework.stereotype.Component;
import java.util.Optional;
@Component
-public class SuperTenantRestrictedOperationsInterceptorImpl extends AuthInterceptor {
+public class AgentManagementSuperTenantRestrictedOperationsInterceptorImpl extends AuthInterceptor {
- private static final Logger LOGGER = LoggerFactory.getLogger(SuperTenantRestrictedOperationsInterceptorImpl.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(AgentManagementSuperTenantRestrictedOperationsInterceptorImpl.class);
private CredentialStoreServiceClient credentialStoreServiceClient;
- public SuperTenantRestrictedOperationsInterceptorImpl(CredentialStoreServiceClient credentialStoreServiceClient,
- TenantProfileClient tenantProfileClient, IdentityClient identityClient) {
+ public AgentManagementSuperTenantRestrictedOperationsInterceptorImpl(CredentialStoreServiceClient credentialStoreServiceClient,
+ TenantProfileClient tenantProfileClient, IdentityClient identityClient) {
super(credentialStoreServiceClient, tenantProfileClient, identityClient);
this.credentialStoreServiceClient = credentialStoreServiceClient;
}
diff --git a/custos-integration-services/agent-management-service-parent/agent-management-service/src/main/java/org/apache/custos/agent/management/interceptors/UserAuthInterceptorImpl.java b/custos-integration-services/agent-management-service-parent/agent-management-service/src/main/java/org/apache/custos/agent/management/interceptors/AgentManagementUserAuthInterceptorImpl.java
similarity index 96%
rename from custos-integration-services/agent-management-service-parent/agent-management-service/src/main/java/org/apache/custos/agent/management/interceptors/UserAuthInterceptorImpl.java
rename to custos-integration-services/agent-management-service-parent/agent-management-service/src/main/java/org/apache/custos/agent/management/interceptors/AgentManagementUserAuthInterceptorImpl.java
index b93035d6..bdcfe17e 100644
--- a/custos-integration-services/agent-management-service-parent/agent-management-service/src/main/java/org/apache/custos/agent/management/interceptors/UserAuthInterceptorImpl.java
+++ b/custos-integration-services/agent-management-service-parent/agent-management-service/src/main/java/org/apache/custos/agent/management/interceptors/AgentManagementUserAuthInterceptorImpl.java
@@ -43,13 +43,13 @@ import java.util.Optional;
* Methods authenticates users access tokens are implemented here
*/
@Component
-public class UserAuthInterceptorImpl extends AuthInterceptor {
- private static final Logger LOGGER = LoggerFactory.getLogger(ClientAuthInterceptorImpl.class);
+public class AgentManagementUserAuthInterceptorImpl extends AuthInterceptor {
+ private static final Logger LOGGER = LoggerFactory.getLogger(AgentManagementClientAuthInterceptorImpl.class);
private CredentialStoreServiceClient credentialStoreServiceClient;
@Autowired
- public UserAuthInterceptorImpl(CredentialStoreServiceClient credentialStoreServiceClient, TenantProfileClient tenantProfileClient, IdentityClient identityClient) {
+ public AgentManagementUserAuthInterceptorImpl(CredentialStoreServiceClient credentialStoreServiceClient, TenantProfileClient tenantProfileClient, IdentityClient identityClient) {
super(credentialStoreServiceClient, tenantProfileClient, identityClient);
this.credentialStoreServiceClient = credentialStoreServiceClient;
}
diff --git a/custos-integration-services/group-management-service-parent/group-management-service/src/main/java/org/apache/custos/group/management/GroupManagementServiceInitializer.java b/custos-integration-services/group-management-service-parent/group-management-service/src/main/java/org/apache/custos/group/management/GroupManagementServiceInitializer.java
index 41203592..9db2ae7d 100644
--- a/custos-integration-services/group-management-service-parent/group-management-service/src/main/java/org/apache/custos/group/management/GroupManagementServiceInitializer.java
+++ b/custos-integration-services/group-management-service-parent/group-management-service/src/main/java/org/apache/custos/group/management/GroupManagementServiceInitializer.java
@@ -1,81 +1,81 @@
-/*
- * 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.custos.group.management;
-
-import brave.Tracing;
-import brave.grpc.GrpcTracing;
-import io.grpc.ClientInterceptor;
-import io.grpc.ServerInterceptor;
-import org.apache.custos.group.management.interceptors.ClientAuthInterceptorImpl;
-import org.apache.custos.group.management.interceptors.InputValidator;
-import org.apache.custos.integration.core.interceptor.IntegrationServiceInterceptor;
-import org.apache.custos.integration.core.interceptor.ServiceInterceptor;
-import org.apache.custos.integration.services.commons.interceptors.LoggingInterceptor;
-import org.lognet.springboot.grpc.GRpcGlobalInterceptor;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
-
-import java.util.Stack;
-
-@SpringBootApplication
-@ComponentScan(basePackages = "org.apache.custos")
-public class GroupManagementServiceInitializer {
- public static void main(String[] args) {
- SpringApplication.run(GroupManagementServiceInitializer.class, args);
- }
-
- @Bean
- public GrpcTracing grpcTracing(Tracing tracing) {
- // Tracing tracing1 = Tracing.newBuilder().build();
- return GrpcTracing.create(tracing);
- }
-
- //We also create a client-side interceptor and put that in the context, this interceptor can then be injected into gRPC clients and
- //then applied to the managed channel.
- @Bean
- ClientInterceptor grpcClientSleuthInterceptor(GrpcTracing grpcTracing) {
- return grpcTracing.newClientInterceptor();
- }
-
- @Bean
- @GRpcGlobalInterceptor
- ServerInterceptor grpcServerSleuthInterceptor(GrpcTracing grpcTracing) {
- return grpcTracing.newServerInterceptor();
- }
-
- @Bean
- public Stack<IntegrationServiceInterceptor> getInterceptorSet(InputValidator inputValidator,
- ClientAuthInterceptorImpl authInterceptor,
- LoggingInterceptor loggingInterceptor) {
- Stack<IntegrationServiceInterceptor> interceptors = new Stack<>();
- interceptors.add(inputValidator);
- interceptors.add(authInterceptor);
- interceptors.add(loggingInterceptor);
- return interceptors;
- }
-
- @Bean
- @GRpcGlobalInterceptor
- ServerInterceptor validationInterceptor(Stack<IntegrationServiceInterceptor> integrationServiceInterceptors) {
- return new ServiceInterceptor(integrationServiceInterceptors);
- }
-}
+///*
+// * 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.custos.group.management;
+//
+//import brave.Tracing;
+//import brave.grpc.GrpcTracing;
+//import io.grpc.ClientInterceptor;
+//import io.grpc.ServerInterceptor;
+//import org.apache.custos.group.management.interceptors.ClientAuthInterceptorImpl;
+//import org.apache.custos.group.management.interceptors.InputValidator;
+//import org.apache.custos.integration.core.interceptor.IntegrationServiceInterceptor;
+//import org.apache.custos.integration.core.interceptor.ServiceInterceptor;
+//import org.apache.custos.integration.services.commons.interceptors.LoggingInterceptor;
+//import org.lognet.springboot.grpc.GRpcGlobalInterceptor;
+//import org.springframework.boot.SpringApplication;
+//import org.springframework.boot.autoconfigure.SpringBootApplication;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.ComponentScan;
+//
+//import java.util.Stack;
+//
+//@SpringBootApplication
+//@ComponentScan(basePackages = "org.apache.custos")
+//public class GroupManagementServiceInitializer {
+// public static void main(String[] args) {
+// SpringApplication.run(GroupManagementServiceInitializer.class, args);
+// }
+//
+// @Bean
+// public GrpcTracing grpcTracing(Tracing tracing) {
+// // Tracing tracing1 = Tracing.newBuilder().build();
+// return GrpcTracing.create(tracing);
+// }
+//
+// //We also create a client-side interceptor and put that in the context, this interceptor can then be injected into gRPC clients and
+// //then applied to the managed channel.
+// @Bean
+// ClientInterceptor grpcClientSleuthInterceptor(GrpcTracing grpcTracing) {
+// return grpcTracing.newClientInterceptor();
+// }
+//
+// @Bean
+// @GRpcGlobalInterceptor
+// ServerInterceptor grpcServerSleuthInterceptor(GrpcTracing grpcTracing) {
+// return grpcTracing.newServerInterceptor();
+// }
+//
+// @Bean
+// public Stack<IntegrationServiceInterceptor> getInterceptorSet(InputValidator inputValidator,
+// ClientAuthInterceptorImpl authInterceptor,
+// LoggingInterceptor loggingInterceptor) {
+// Stack<IntegrationServiceInterceptor> interceptors = new Stack<>();
+// interceptors.add(inputValidator);
+// interceptors.add(authInterceptor);
+// interceptors.add(loggingInterceptor);
+// return interceptors;
+// }
+//
+// @Bean
+// @GRpcGlobalInterceptor
+// ServerInterceptor validationInterceptor(Stack<IntegrationServiceInterceptor> integrationServiceInterceptors) {
+// return new ServiceInterceptor(integrationServiceInterceptors);
+// }
+//}
diff --git a/custos-integration-services/group-management-service-parent/group-management-service/src/main/java/org/apache/custos/group/management/interceptors/ClientAuthInterceptorImpl.java b/custos-integration-services/group-management-service-parent/group-management-service/src/main/java/org/apache/custos/group/management/interceptors/GroupManagementClientAuthInterceptorImpl.java
similarity index 95%
rename from custos-integration-services/group-management-service-parent/group-management-service/src/main/java/org/apache/custos/group/management/interceptors/ClientAuthInterceptorImpl.java
rename to custos-integration-services/group-management-service-parent/group-management-service/src/main/java/org/apache/custos/group/management/interceptors/GroupManagementClientAuthInterceptorImpl.java
index d576b03c..dc0a74fe 100644
--- a/custos-integration-services/group-management-service-parent/group-management-service/src/main/java/org/apache/custos/group/management/interceptors/ClientAuthInterceptorImpl.java
+++ b/custos-integration-services/group-management-service-parent/group-management-service/src/main/java/org/apache/custos/group/management/interceptors/GroupManagementClientAuthInterceptorImpl.java
@@ -40,12 +40,12 @@ import java.util.Optional;
* Methods which authenticates based only on client are implemented here.
*/
@Component
-public class ClientAuthInterceptorImpl extends MultiTenantAuthInterceptor {
- private static final Logger LOGGER = LoggerFactory.getLogger(ClientAuthInterceptorImpl.class);
+public class GroupManagementClientAuthInterceptorImpl extends MultiTenantAuthInterceptor {
+ private static final Logger LOGGER = LoggerFactory.getLogger(GroupManagementClientAuthInterceptorImpl.class);
@Autowired
- public ClientAuthInterceptorImpl(CredentialStoreServiceClient credentialStoreServiceClient,
- TenantProfileClient tenantProfileClient, IdentityClient identityClient) {
+ public GroupManagementClientAuthInterceptorImpl(CredentialStoreServiceClient credentialStoreServiceClient,
+ TenantProfileClient tenantProfileClient, IdentityClient identityClient) {
super(credentialStoreServiceClient, tenantProfileClient, identityClient);
}
diff --git a/custos-integration-services/group-management-service-parent/group-management-service/src/main/java/org/apache/custos/group/management/interceptors/InputValidator.java b/custos-integration-services/group-management-service-parent/group-management-service/src/main/java/org/apache/custos/group/management/interceptors/GroupManagementInputValidator.java
similarity index 95%
rename from custos-integration-services/group-management-service-parent/group-management-service/src/main/java/org/apache/custos/group/management/interceptors/InputValidator.java
rename to custos-integration-services/group-management-service-parent/group-management-service/src/main/java/org/apache/custos/group/management/interceptors/GroupManagementInputValidator.java
index 4cd6079d..1e43fd02 100644
--- a/custos-integration-services/group-management-service-parent/group-management-service/src/main/java/org/apache/custos/group/management/interceptors/InputValidator.java
+++ b/custos-integration-services/group-management-service-parent/group-management-service/src/main/java/org/apache/custos/group/management/interceptors/GroupManagementInputValidator.java
@@ -31,9 +31,9 @@ import org.springframework.stereotype.Component;
* This class validates the request input parameters
*/
@Component
-public class InputValidator implements IntegrationServiceInterceptor {
+public class GroupManagementInputValidator implements IntegrationServiceInterceptor {
- private static final Logger LOGGER = LoggerFactory.getLogger(InputValidator.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(GroupManagementInputValidator.class);
/**
* Input parameter validater
diff --git a/custos-integration-services/identity-management-service-parent/identity-management-service/src/main/java/org/apache/custos/identity/management/IdentityManagementServiceInitializer.java b/custos-integration-services/identity-management-service-parent/identity-management-service/src/main/java/org/apache/custos/identity/management/IdentityManagementServiceInitializer.java
index e1e56d00..859053ca 100644
--- a/custos-integration-services/identity-management-service-parent/identity-management-service/src/main/java/org/apache/custos/identity/management/IdentityManagementServiceInitializer.java
+++ b/custos-integration-services/identity-management-service-parent/identity-management-service/src/main/java/org/apache/custos/identity/management/IdentityManagementServiceInitializer.java
@@ -1,86 +1,86 @@
-/*
- * 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.custos.identity.management;
-
-import brave.Tracing;
-import brave.grpc.GrpcTracing;
-import io.grpc.ClientInterceptor;
-import io.grpc.ServerInterceptor;
-import org.apache.custos.identity.management.interceptors.AgentAuthInterceptor;
-import org.apache.custos.identity.management.interceptors.AuthInterceptorImpl;
-import org.apache.custos.identity.management.interceptors.InputValidator;
-import org.apache.custos.integration.core.interceptor.IntegrationServiceInterceptor;
-import org.apache.custos.integration.core.interceptor.ServiceInterceptor;
-import org.apache.custos.integration.services.commons.interceptors.LoggingInterceptor;
-import org.lognet.springboot.grpc.GRpcGlobalInterceptor;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
-
-import java.util.Stack;
-
-@SpringBootApplication
-@ComponentScan(basePackages = "org.apache.custos")
-public class IdentityManagementServiceInitializer {
-
- public static void main(String[] args) {
- SpringApplication.run(IdentityManagementServiceInitializer.class, args);
- }
-
- @Bean
- public GrpcTracing grpcTracing(Tracing tracing) {
- // Tracing tracing1 = Tracing.newBuilder().build();
- return GrpcTracing.create(tracing);
- }
-
- //We also create a client-side interceptor and put that in the context, this interceptor can then be injected into gRPC clients and
- //then applied to the managed channel.
- @Bean
- ClientInterceptor grpcClientSleuthInterceptor(GrpcTracing grpcTracing) {
- return grpcTracing.newClientInterceptor();
- }
-
- @Bean
- @GRpcGlobalInterceptor
- ServerInterceptor grpcServerSleuthInterceptor(GrpcTracing grpcTracing) {
- return grpcTracing.newServerInterceptor();
- }
-
- @Bean
- public Stack<IntegrationServiceInterceptor> getInterceptorSet(AuthInterceptorImpl authInterceptor, InputValidator validator,
- AgentAuthInterceptor agentAuthInterceptor, LoggingInterceptor loggingInterceptor) {
- Stack<IntegrationServiceInterceptor> interceptors = new Stack<>();
- interceptors.add(validator);
- interceptors.add(authInterceptor);
- interceptors.add(agentAuthInterceptor);
- interceptors.add(loggingInterceptor);
-
- return interceptors;
- }
-
- @Bean
- @GRpcGlobalInterceptor
- ServerInterceptor validationInterceptor(Stack<IntegrationServiceInterceptor> integrationServiceInterceptors) {
- return new ServiceInterceptor(integrationServiceInterceptors);
- }
-
-
-}
+///*
+// * 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.custos.identity.management;
+//
+//import brave.Tracing;
+//import brave.grpc.GrpcTracing;
+//import io.grpc.ClientInterceptor;
+//import io.grpc.ServerInterceptor;
+//import org.apache.custos.identity.management.interceptors.IdentityManagementAgentAuthInterceptor;
+//import org.apache.custos.identity.management.interceptors.IdentityManagementAuthInterceptorImpl;
+//import org.apache.custos.identity.management.interceptors.IdentityManagementInputValidator;
+//import org.apache.custos.integration.core.interceptor.IntegrationServiceInterceptor;
+//import org.apache.custos.integration.core.interceptor.ServiceInterceptor;
+//import org.apache.custos.integration.services.commons.interceptors.LoggingInterceptor;
+//import org.lognet.springboot.grpc.GRpcGlobalInterceptor;
+//import org.springframework.boot.SpringApplication;
+//import org.springframework.boot.autoconfigure.SpringBootApplication;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.ComponentScan;
+//
+//import java.util.Stack;
+//
+//@SpringBootApplication
+//@ComponentScan(basePackages = "org.apache.custos")
+//public class IdentityManagementServiceInitializer {
+//
+// public static void main(String[] args) {
+// SpringApplication.run(IdentityManagementServiceInitializer.class, args);
+// }
+//
+// @Bean
+// public GrpcTracing grpcTracing(Tracing tracing) {
+// // Tracing tracing1 = Tracing.newBuilder().build();
+// return GrpcTracing.create(tracing);
+// }
+//
+// //We also create a client-side interceptor and put that in the context, this interceptor can then be injected into gRPC clients and
+// //then applied to the managed channel.
+// @Bean
+// ClientInterceptor grpcClientSleuthInterceptor(GrpcTracing grpcTracing) {
+// return grpcTracing.newClientInterceptor();
+// }
+//
+// @Bean
+// @GRpcGlobalInterceptor
+// ServerInterceptor grpcServerSleuthInterceptor(GrpcTracing grpcTracing) {
+// return grpcTracing.newServerInterceptor();
+// }
+//
+// @Bean
+// public Stack<IntegrationServiceInterceptor> getInterceptorSet(IdentityManagementAuthInterceptorImpl authInterceptor, IdentityManagementInputValidator validator,
+// IdentityManagementAgentAuthInterceptor identityManagementAgentAuthInterceptor, LoggingInterceptor loggingInterceptor) {
+// Stack<IntegrationServiceInterceptor> interceptors = new Stack<>();
+// interceptors.add(validator);
+// interceptors.add(authInterceptor);
+// interceptors.add(identityManagementAgentAuthInterceptor);
+// interceptors.add(loggingInterceptor);
+//
+// return interceptors;
+// }
+//
+// @Bean
+// @GRpcGlobalInterceptor
+// ServerInterceptor validationInterceptor(Stack<IntegrationServiceInterceptor> integrationServiceInterceptors) {
+// return new ServiceInterceptor(integrationServiceInterceptors);
+// }
+//
+//
+//}
diff --git a/custos-integration-services/identity-management-service-parent/identity-management-service/src/main/java/org/apache/custos/identity/management/interceptors/AgentAuthInterceptor.java b/custos-integration-services/identity-management-service-parent/identity-management-service/src/main/java/org/apache/custos/identity/management/interceptors/IdentityManagementAgentAuthInterceptor.java
similarity index 91%
rename from custos-integration-services/identity-management-service-parent/identity-management-service/src/main/java/org/apache/custos/identity/management/interceptors/AgentAuthInterceptor.java
rename to custos-integration-services/identity-management-service-parent/identity-management-service/src/main/java/org/apache/custos/identity/management/interceptors/IdentityManagementAgentAuthInterceptor.java
index 0f3d37a8..1fb89505 100644
--- a/custos-integration-services/identity-management-service-parent/identity-management-service/src/main/java/org/apache/custos/identity/management/interceptors/AgentAuthInterceptor.java
+++ b/custos-integration-services/identity-management-service-parent/identity-management-service/src/main/java/org/apache/custos/identity/management/interceptors/IdentityManagementAgentAuthInterceptor.java
@@ -38,12 +38,12 @@ import java.util.Optional;
* Responsible for authorize agent specific methods
*/
@Component
-public class AgentAuthInterceptor extends AuthInterceptor {
+public class IdentityManagementAgentAuthInterceptor extends AuthInterceptor {
- private static final Logger LOGGER = LoggerFactory.getLogger(AgentAuthInterceptor.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(IdentityManagementAgentAuthInterceptor.class);
- public AgentAuthInterceptor(CredentialStoreServiceClient credentialStoreServiceClient,
- TenantProfileClient tenantProfileClient, IdentityClient identityClient) {
+ public IdentityManagementAgentAuthInterceptor(CredentialStoreServiceClient credentialStoreServiceClient,
+ TenantProfileClient tenantProfileClient, IdentityClient identityClient) {
super(credentialStoreServiceClient, tenantProfileClient, identityClient);
}
diff --git a/custos-integration-services/identity-management-service-parent/identity-management-service/src/main/java/org/apache/custos/identity/management/interceptors/AuthInterceptorImpl.java b/custos-integration-services/identity-management-service-parent/identity-management-service/src/main/java/org/apache/custos/identity/management/interceptors/IdentityManagementAuthInterceptorImpl.java
similarity index 95%
rename from custos-integration-services/identity-management-service-parent/identity-management-service/src/main/java/org/apache/custos/identity/management/interceptors/AuthInterceptorImpl.java
rename to custos-integration-services/identity-management-service-parent/identity-management-service/src/main/java/org/apache/custos/identity/management/interceptors/IdentityManagementAuthInterceptorImpl.java
index 1691f30e..ddcb0ddc 100644
--- a/custos-integration-services/identity-management-service-parent/identity-management-service/src/main/java/org/apache/custos/identity/management/interceptors/AuthInterceptorImpl.java
+++ b/custos-integration-services/identity-management-service-parent/identity-management-service/src/main/java/org/apache/custos/identity/management/interceptors/IdentityManagementAuthInterceptorImpl.java
@@ -44,13 +44,13 @@ import java.util.Optional;
* Responsible for managing auth flow
*/
@Component
-public class AuthInterceptorImpl extends MultiTenantAuthInterceptor {
+public class IdentityManagementAuthInterceptorImpl extends MultiTenantAuthInterceptor {
- private static final Logger LOGGER = LoggerFactory.getLogger(AuthInterceptorImpl.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(IdentityManagementAuthInterceptorImpl.class);
@Autowired
- public AuthInterceptorImpl(CredentialStoreServiceClient credentialStoreServiceClient,
- TenantProfileClient tenantProfileClient, IdentityClient identityClient) {
+ public IdentityManagementAuthInterceptorImpl(CredentialStoreServiceClient credentialStoreServiceClient,
+ TenantProfileClient tenantProfileClient, IdentityClient identityClient) {
super(credentialStoreServiceClient, tenantProfileClient, identityClient);
}
diff --git a/custos-integration-services/identity-management-service-parent/identity-management-service/src/main/java/org/apache/custos/identity/management/interceptors/InputValidator.java b/custos-integration-services/identity-management-service-parent/identity-management-service/src/main/java/org/apache/custos/identity/management/interceptors/IdentityManagementInputValidator.java
similarity index 97%
rename from custos-integration-services/identity-management-service-parent/identity-management-service/src/main/java/org/apache/custos/identity/management/interceptors/InputValidator.java
rename to custos-integration-services/identity-management-service-parent/identity-management-service/src/main/java/org/apache/custos/identity/management/interceptors/IdentityManagementInputValidator.java
index 379d4c34..51d39d65 100644
--- a/custos-integration-services/identity-management-service-parent/identity-management-service/src/main/java/org/apache/custos/identity/management/interceptors/InputValidator.java
+++ b/custos-integration-services/identity-management-service-parent/identity-management-service/src/main/java/org/apache/custos/identity/management/interceptors/IdentityManagementInputValidator.java
@@ -32,9 +32,9 @@ import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
@Component
-public class InputValidator implements IntegrationServiceInterceptor {
+public class IdentityManagementInputValidator implements IntegrationServiceInterceptor {
- private static final Logger LOGGER = LoggerFactory.getLogger(InputValidator.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(IdentityManagementInputValidator.class);
@Override
public <ReqT> ReqT intercept(String method, Metadata headers, ReqT msg) {
diff --git a/custos-integration-services/log-management-service-parent/log-management-service/src/main/java/org/apache/custos/log/management/LogManagementServiceInitializer.java b/custos-integration-services/log-management-service-parent/log-management-service/src/main/java/org/apache/custos/log/management/LogManagementServiceInitializer.java
index 94e87c4c..2b52ac03 100644
--- a/custos-integration-services/log-management-service-parent/log-management-service/src/main/java/org/apache/custos/log/management/LogManagementServiceInitializer.java
+++ b/custos-integration-services/log-management-service-parent/log-management-service/src/main/java/org/apache/custos/log/management/LogManagementServiceInitializer.java
@@ -1,81 +1,81 @@
-/*
- * 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.custos.log.management;
-
-import brave.Tracing;
-import brave.grpc.GrpcTracing;
-import io.grpc.ClientInterceptor;
-import io.grpc.ServerInterceptor;
-import org.apache.custos.integration.core.interceptor.IntegrationServiceInterceptor;
-import org.apache.custos.integration.core.interceptor.ServiceInterceptor;
-import org.apache.custos.integration.services.commons.interceptors.LoggingInterceptor;
-import org.apache.custos.log.management.interceptors.AuthInterceptorImpl;
-import org.apache.custos.log.management.interceptors.InputValidator;
-import org.lognet.springboot.grpc.GRpcGlobalInterceptor;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
-
-import java.util.Stack;
-
-@SpringBootApplication
-@ComponentScan(basePackages = "org.apache.custos")
-public class LogManagementServiceInitializer {
- public static void main(String[] args) {
- SpringApplication.run(LogManagementServiceInitializer.class, args);
- }
-
- @Bean
- public GrpcTracing grpcTracing(Tracing tracing) {
- // Tracing tracing1 = Tracing.newBuilder().build();
- return GrpcTracing.create(tracing);
- }
-
- //We also create a client-side interceptor and put that in the context, this interceptor can then be injected into gRPC clients and
- //then applied to the managed channel.
- @Bean
- ClientInterceptor grpcClientSleuthInterceptor(GrpcTracing grpcTracing) {
- return grpcTracing.newClientInterceptor();
- }
-
- @Bean
- @GRpcGlobalInterceptor
- ServerInterceptor grpcServerSleuthInterceptor(GrpcTracing grpcTracing) {
- return grpcTracing.newServerInterceptor();
- }
-
- @Bean
- public Stack<IntegrationServiceInterceptor> getInterceptorSet(InputValidator inputValidator,
- AuthInterceptorImpl userAuthInterceptor,
- LoggingInterceptor loggingInterceptor) {
- Stack<IntegrationServiceInterceptor> interceptors = new Stack<>();
- interceptors.add(inputValidator);
- interceptors.add(userAuthInterceptor);
- interceptors.add(loggingInterceptor);
- return interceptors;
- }
-
- @Bean
- @GRpcGlobalInterceptor
- ServerInterceptor validationInterceptor(Stack<IntegrationServiceInterceptor> integrationServiceInterceptors) {
- return new ServiceInterceptor(integrationServiceInterceptors);
- }
-}
+///*
+// * 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.custos.log.management;
+//
+//import brave.Tracing;
+//import brave.grpc.GrpcTracing;
+//import io.grpc.ClientInterceptor;
+//import io.grpc.ServerInterceptor;
+//import org.apache.custos.integration.core.interceptor.IntegrationServiceInterceptor;
+//import org.apache.custos.integration.core.interceptor.ServiceInterceptor;
+//import org.apache.custos.integration.services.commons.interceptors.LoggingInterceptor;
+//import org.apache.custos.log.management.interceptors.LogManagementAuthInterceptorImpl;
+//import org.apache.custos.log.management.interceptors.LogManagementInputValidator;
+//import org.lognet.springboot.grpc.GRpcGlobalInterceptor;
+//import org.springframework.boot.SpringApplication;
+//import org.springframework.boot.autoconfigure.SpringBootApplication;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.ComponentScan;
+//
+//import java.util.Stack;
+//
+//@SpringBootApplication
+//@ComponentScan(basePackages = "org.apache.custos")
+//public class LogManagementServiceInitializer {
+// public static void main(String[] args) {
+// SpringApplication.run(LogManagementServiceInitializer.class, args);
+// }
+//
+// @Bean
+// public GrpcTracing grpcTracing(Tracing tracing) {
+// // Tracing tracing1 = Tracing.newBuilder().build();
+// return GrpcTracing.create(tracing);
+// }
+//
+// //We also create a client-side interceptor and put that in the context, this interceptor can then be injected into gRPC clients and
+// //then applied to the managed channel.
+// @Bean
+// ClientInterceptor grpcClientSleuthInterceptor(GrpcTracing grpcTracing) {
+// return grpcTracing.newClientInterceptor();
+// }
+//
+// @Bean
+// @GRpcGlobalInterceptor
+// ServerInterceptor grpcServerSleuthInterceptor(GrpcTracing grpcTracing) {
+// return grpcTracing.newServerInterceptor();
+// }
+//
+// @Bean
+// public Stack<IntegrationServiceInterceptor> getInterceptorSet(LogManagementInputValidator logManagementInputValidator,
+// LogManagementAuthInterceptorImpl userAuthInterceptor,
+// LoggingInterceptor loggingInterceptor) {
+// Stack<IntegrationServiceInterceptor> interceptors = new Stack<>();
+// interceptors.add(logManagementInputValidator);
+// interceptors.add(userAuthInterceptor);
+// interceptors.add(loggingInterceptor);
+// return interceptors;
+// }
+//
+// @Bean
+// @GRpcGlobalInterceptor
+// ServerInterceptor validationInterceptor(Stack<IntegrationServiceInterceptor> integrationServiceInterceptors) {
+// return new ServiceInterceptor(integrationServiceInterceptors);
+// }
+//}
diff --git a/custos-integration-services/log-management-service-parent/log-management-service/src/main/java/org/apache/custos/log/management/interceptors/AuthInterceptorImpl.java b/custos-integration-services/log-management-service-parent/log-management-service/src/main/java/org/apache/custos/log/management/interceptors/LogManagementAuthInterceptorImpl.java
similarity index 94%
rename from custos-integration-services/log-management-service-parent/log-management-service/src/main/java/org/apache/custos/log/management/interceptors/AuthInterceptorImpl.java
rename to custos-integration-services/log-management-service-parent/log-management-service/src/main/java/org/apache/custos/log/management/interceptors/LogManagementAuthInterceptorImpl.java
index 1356f360..cbd9fcd2 100644
--- a/custos-integration-services/log-management-service-parent/log-management-service/src/main/java/org/apache/custos/log/management/interceptors/AuthInterceptorImpl.java
+++ b/custos-integration-services/log-management-service-parent/log-management-service/src/main/java/org/apache/custos/log/management/interceptors/LogManagementAuthInterceptorImpl.java
@@ -41,11 +41,11 @@ import java.util.Optional;
* Methods authenticates users access tokens are implemented here
*/
@Component
-public class AuthInterceptorImpl extends MultiTenantAuthInterceptor {
- private static final Logger LOGGER = LoggerFactory.getLogger(AuthInterceptorImpl.class);
+public class LogManagementAuthInterceptorImpl extends MultiTenantAuthInterceptor {
+ private static final Logger LOGGER = LoggerFactory.getLogger(LogManagementAuthInterceptorImpl.class);
@Autowired
- public AuthInterceptorImpl(CredentialStoreServiceClient credentialStoreServiceClient, TenantProfileClient tenantProfileClient, IdentityClient identityClient) {
+ public LogManagementAuthInterceptorImpl(CredentialStoreServiceClient credentialStoreServiceClient, TenantProfileClient tenantProfileClient, IdentityClient identityClient) {
super(credentialStoreServiceClient, tenantProfileClient, identityClient);
}
diff --git a/custos-integration-services/log-management-service-parent/log-management-service/src/main/java/org/apache/custos/log/management/interceptors/InputValidator.java b/custos-integration-services/log-management-service-parent/log-management-service/src/main/java/org/apache/custos/log/management/interceptors/LogManagementInputValidator.java
similarity index 94%
rename from custos-integration-services/log-management-service-parent/log-management-service/src/main/java/org/apache/custos/log/management/interceptors/InputValidator.java
rename to custos-integration-services/log-management-service-parent/log-management-service/src/main/java/org/apache/custos/log/management/interceptors/LogManagementInputValidator.java
index ea23a1f2..92ca9f7a 100644
--- a/custos-integration-services/log-management-service-parent/log-management-service/src/main/java/org/apache/custos/log/management/interceptors/InputValidator.java
+++ b/custos-integration-services/log-management-service-parent/log-management-service/src/main/java/org/apache/custos/log/management/interceptors/LogManagementInputValidator.java
@@ -31,9 +31,9 @@ import org.springframework.stereotype.Component;
* This class validates the request input parameters
*/
@Component
-public class InputValidator implements IntegrationServiceInterceptor {
+public class LogManagementInputValidator implements IntegrationServiceInterceptor {
- private static final Logger LOGGER = LoggerFactory.getLogger(InputValidator.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(LogManagementInputValidator.class);
/**
* Input parameter validater
diff --git a/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/src/main/java/org/apache/custos/resource/secret/management/ResourceSecretManagementInitializer.java b/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/src/main/java/org/apache/custos/resource/secret/management/ResourceSecretManagementInitializer.java
index 8018d959..568a9ceb 100644
--- a/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/src/main/java/org/apache/custos/resource/secret/management/ResourceSecretManagementInitializer.java
+++ b/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/src/main/java/org/apache/custos/resource/secret/management/ResourceSecretManagementInitializer.java
@@ -1,83 +1,83 @@
-/*
- * 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.custos.resource.secret.management;
-
-import brave.Tracing;
-import brave.grpc.GrpcTracing;
-import io.grpc.ClientInterceptor;
-import io.grpc.ServerInterceptor;
-import org.apache.custos.integration.core.interceptor.IntegrationServiceInterceptor;
-import org.apache.custos.integration.core.interceptor.ServiceInterceptor;
-import org.apache.custos.integration.services.commons.interceptors.LoggingInterceptor;
-import org.apache.custos.resource.secret.management.interceptors.AuthInterceptorImpl;
-import org.apache.custos.resource.secret.management.interceptors.InputValidator;
-import org.lognet.springboot.grpc.GRpcGlobalInterceptor;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
-
-import java.util.Stack;
-
-@SpringBootApplication
-@ComponentScan(basePackages = "org.apache.custos")
-public class ResourceSecretManagementInitializer {
-
- public static void main(String[] args) {
- SpringApplication.run(ResourceSecretManagementInitializer.class, args);
- }
-
- @Bean
- public GrpcTracing grpcTracing(Tracing tracing) {
- // Tracing tracing1 = Tracing.newBuilder().build();
- return GrpcTracing.create(tracing);
- }
-
- //We also create a client-side interceptor and put that in the context, this interceptor can then be injected into gRPC clients and
- //then applied to the managed channel.
- @Bean
- ClientInterceptor grpcClientSleuthInterceptor(GrpcTracing grpcTracing) {
- return grpcTracing.newClientInterceptor();
- }
-
- @Bean
- @GRpcGlobalInterceptor
- ServerInterceptor grpcServerSleuthInterceptor(GrpcTracing grpcTracing) {
- return grpcTracing.newServerInterceptor();
- }
-
- @Bean
- public Stack<IntegrationServiceInterceptor> getInterceptorSet(InputValidator validator,
- AuthInterceptorImpl authInterceptor,
- LoggingInterceptor loggingInterceptor) {
- Stack<IntegrationServiceInterceptor> interceptors = new Stack<>();
- interceptors.add(validator);
- interceptors.add(authInterceptor);
- interceptors.add(loggingInterceptor);
-
- return interceptors;
- }
-
- @Bean
- @GRpcGlobalInterceptor
- ServerInterceptor validationInterceptor(Stack<IntegrationServiceInterceptor> integrationServiceInterceptors) {
- return new ServiceInterceptor(integrationServiceInterceptors);
- }
-}
+///*
+// * 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.custos.resource.secret.management;
+//
+//import brave.Tracing;
+//import brave.grpc.GrpcTracing;
+//import io.grpc.ClientInterceptor;
+//import io.grpc.ServerInterceptor;
+//import org.apache.custos.integration.core.interceptor.IntegrationServiceInterceptor;
+//import org.apache.custos.integration.core.interceptor.ServiceInterceptor;
+//import org.apache.custos.integration.services.commons.interceptors.LoggingInterceptor;
+//import org.apache.custos.resource.secret.management.interceptors.ResourceSecretManagementAuthInterceptorImpl;
+//import org.apache.custos.resource.secret.management.interceptors.ResourceSecretManagementInputValidator;
+//import org.lognet.springboot.grpc.GRpcGlobalInterceptor;
+//import org.springframework.boot.SpringApplication;
+//import org.springframework.boot.autoconfigure.SpringBootApplication;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.ComponentScan;
+//
+//import java.util.Stack;
+//
+//@SpringBootApplication
+//@ComponentScan(basePackages = "org.apache.custos")
+//public class ResourceSecretManagementInitializer {
+//
+// public static void main(String[] args) {
+// SpringApplication.run(ResourceSecretManagementInitializer.class, args);
+// }
+//
+// @Bean
+// public GrpcTracing grpcTracing(Tracing tracing) {
+// // Tracing tracing1 = Tracing.newBuilder().build();
+// return GrpcTracing.create(tracing);
+// }
+//
+// //We also create a client-side interceptor and put that in the context, this interceptor can then be injected into gRPC clients and
+// //then applied to the managed channel.
+// @Bean
+// ClientInterceptor grpcClientSleuthInterceptor(GrpcTracing grpcTracing) {
+// return grpcTracing.newClientInterceptor();
+// }
+//
+// @Bean
+// @GRpcGlobalInterceptor
+// ServerInterceptor grpcServerSleuthInterceptor(GrpcTracing grpcTracing) {
+// return grpcTracing.newServerInterceptor();
+// }
+//
+// @Bean
+// public Stack<IntegrationServiceInterceptor> getInterceptorSet(ResourceSecretManagementInputValidator validator,
+// ResourceSecretManagementAuthInterceptorImpl authInterceptor,
+// LoggingInterceptor loggingInterceptor) {
+// Stack<IntegrationServiceInterceptor> interceptors = new Stack<>();
+// interceptors.add(validator);
+// interceptors.add(authInterceptor);
+// interceptors.add(loggingInterceptor);
+//
+// return interceptors;
+// }
+//
+// @Bean
+// @GRpcGlobalInterceptor
+// ServerInterceptor validationInterceptor(Stack<IntegrationServiceInterceptor> integrationServiceInterceptors) {
+// return new ServiceInterceptor(integrationServiceInterceptors);
+// }
+//}
diff --git a/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/src/main/java/org/apache/custos/resource/secret/management/interceptors/AuthInterceptorImpl.java b/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/src/main/java/org/apache/custos/resource/secret/management/interceptors/ResourceSecretManagementAuthInterceptorImpl.java
similarity index 96%
rename from custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/src/main/java/org/apache/custos/resource/secret/management/interceptors/AuthInterceptorImpl.java
rename to custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/src/main/java/org/apache/custos/resource/secret/management/interceptors/ResourceSecretManagementAuthInterceptorImpl.java
index 362c9a1a..315597c1 100644
--- a/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/src/main/java/org/apache/custos/resource/secret/management/interceptors/AuthInterceptorImpl.java
+++ b/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/src/main/java/org/apache/custos/resource/secret/management/interceptors/ResourceSecretManagementAuthInterceptorImpl.java
@@ -40,11 +40,11 @@ import java.util.Optional;
* Methods which authenticates based only on client are implemented here.
*/
@Component
-public class AuthInterceptorImpl extends MultiTenantAuthInterceptor {
- private static final Logger LOGGER = LoggerFactory.getLogger(AuthInterceptorImpl.class);
+public class ResourceSecretManagementAuthInterceptorImpl extends MultiTenantAuthInterceptor {
+ private static final Logger LOGGER = LoggerFactory.getLogger(ResourceSecretManagementAuthInterceptorImpl.class);
@Autowired
- public AuthInterceptorImpl(CredentialStoreServiceClient credentialStoreServiceClient, TenantProfileClient tenantProfileClient, IdentityClient identityClient) {
+ public ResourceSecretManagementAuthInterceptorImpl(CredentialStoreServiceClient credentialStoreServiceClient, TenantProfileClient tenantProfileClient, IdentityClient identityClient) {
super(credentialStoreServiceClient, tenantProfileClient, identityClient);
}
diff --git a/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/src/main/java/org/apache/custos/resource/secret/management/interceptors/InputValidator.java b/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/src/main/java/org/apache/custos/resource/secret/management/interceptors/ResourceSecretManagementInputValidator.java
similarity index 97%
rename from custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/src/main/java/org/apache/custos/resource/secret/management/interceptors/InputValidator.java
rename to custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/src/main/java/org/apache/custos/resource/secret/management/interceptors/ResourceSecretManagementInputValidator.java
index ce7f2d8d..6a76902f 100644
--- a/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/src/main/java/org/apache/custos/resource/secret/management/interceptors/InputValidator.java
+++ b/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/src/main/java/org/apache/custos/resource/secret/management/interceptors/ResourceSecretManagementInputValidator.java
@@ -35,9 +35,9 @@ import org.springframework.stereotype.Component;
* This class validates the request input parameters
*/
@Component
-public class InputValidator implements IntegrationServiceInterceptor {
+public class ResourceSecretManagementInputValidator implements IntegrationServiceInterceptor {
- private static final Logger LOGGER = LoggerFactory.getLogger(InputValidator.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(ResourceSecretManagementInputValidator.class);
/**
* Input parameter validater
diff --git a/custos-integration-services/sharing-management-service-parent/sharing-management-service/src/main/java/org/apache/custos/sharing/management/SharingManagementServiceInitializer.java b/custos-integration-services/sharing-management-service-parent/sharing-management-service/src/main/java/org/apache/custos/sharing/management/SharingManagementServiceInitializer.java
index f8f5dd1e..b7711cd6 100644
--- a/custos-integration-services/sharing-management-service-parent/sharing-management-service/src/main/java/org/apache/custos/sharing/management/SharingManagementServiceInitializer.java
+++ b/custos-integration-services/sharing-management-service-parent/sharing-management-service/src/main/java/org/apache/custos/sharing/management/SharingManagementServiceInitializer.java
@@ -1,83 +1,83 @@
-/*
- * 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.custos.sharing.management;
-
-import brave.Tracing;
-import brave.grpc.GrpcTracing;
-import io.grpc.ClientInterceptor;
-import io.grpc.ServerInterceptor;
-import org.apache.custos.integration.core.interceptor.IntegrationServiceInterceptor;
-import org.apache.custos.integration.core.interceptor.ServiceInterceptor;
-import org.apache.custos.integration.services.commons.interceptors.LoggingInterceptor;
-import org.apache.custos.sharing.management.interceptors.AuthInterceptorImpl;
-import org.apache.custos.sharing.management.interceptors.InputValidator;
-import org.lognet.springboot.grpc.GRpcGlobalInterceptor;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
-
-import java.util.Stack;
-
-@SpringBootApplication
-@ComponentScan(basePackages = "org.apache.custos")
-public class SharingManagementServiceInitializer {
- public static void main(String[] args) {
- SpringApplication.run(SharingManagementServiceInitializer.class, args);
- }
-
- @Bean
- public GrpcTracing grpcTracing(Tracing tracing) {
- // Tracing tracing1 = Tracing.newBuilder().build();
- return GrpcTracing.create(tracing);
- }
-
- //We also create a client-side interceptor and put that in the context, this interceptor can then be injected into gRPC clients and
- //then applied to the managed channel.
- @Bean
- ClientInterceptor grpcClientSleuthInterceptor(GrpcTracing grpcTracing) {
- return grpcTracing.newClientInterceptor();
- }
-
- @Bean
- @GRpcGlobalInterceptor
- ServerInterceptor grpcServerSleuthInterceptor(GrpcTracing grpcTracing) {
- return grpcTracing.newServerInterceptor();
- }
-
- @Bean
- public Stack<IntegrationServiceInterceptor> getInterceptorSet(AuthInterceptorImpl authInterceptor,
-
- InputValidator validator,
- LoggingInterceptor loggingInterceptor) {
- Stack<IntegrationServiceInterceptor> interceptors = new Stack<>();
- interceptors.add(validator);
- interceptors.add(authInterceptor);
- interceptors.add(loggingInterceptor);
- return interceptors;
- }
-
- @Bean
- @GRpcGlobalInterceptor
- ServerInterceptor validationInterceptor(Stack<IntegrationServiceInterceptor> integrationServiceInterceptors) {
- return new ServiceInterceptor(integrationServiceInterceptors);
- }
-
-}
+///*
+// * 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.custos.sharing.management;
+//
+//import brave.Tracing;
+//import brave.grpc.GrpcTracing;
+//import io.grpc.ClientInterceptor;
+//import io.grpc.ServerInterceptor;
+//import org.apache.custos.integration.core.interceptor.IntegrationServiceInterceptor;
+//import org.apache.custos.integration.core.interceptor.ServiceInterceptor;
+//import org.apache.custos.integration.services.commons.interceptors.LoggingInterceptor;
+//import org.apache.custos.sharing.management.interceptors.SharingManagementAuthInterceptorImpl;
+//import org.apache.custos.sharing.management.interceptors.SharingManagementInputValidator;
+//import org.lognet.springboot.grpc.GRpcGlobalInterceptor;
+//import org.springframework.boot.SpringApplication;
+//import org.springframework.boot.autoconfigure.SpringBootApplication;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.ComponentScan;
+//
+//import java.util.Stack;
+//
+//@SpringBootApplication
+//@ComponentScan(basePackages = "org.apache.custos")
+//public class SharingManagementServiceInitializer {
+// public static void main(String[] args) {
+// SpringApplication.run(SharingManagementServiceInitializer.class, args);
+// }
+//
+// @Bean
+// public GrpcTracing grpcTracing(Tracing tracing) {
+// // Tracing tracing1 = Tracing.newBuilder().build();
+// return GrpcTracing.create(tracing);
+// }
+//
+// //We also create a client-side interceptor and put that in the context, this interceptor can then be injected into gRPC clients and
+// //then applied to the managed channel.
+// @Bean
+// ClientInterceptor grpcClientSleuthInterceptor(GrpcTracing grpcTracing) {
+// return grpcTracing.newClientInterceptor();
+// }
+//
+// @Bean
+// @GRpcGlobalInterceptor
+// ServerInterceptor grpcServerSleuthInterceptor(GrpcTracing grpcTracing) {
+// return grpcTracing.newServerInterceptor();
+// }
+//
+// @Bean
+// public Stack<IntegrationServiceInterceptor> getInterceptorSet(SharingManagementAuthInterceptorImpl authInterceptor,
+//
+// SharingManagementInputValidator validator,
+// LoggingInterceptor loggingInterceptor) {
+// Stack<IntegrationServiceInterceptor> interceptors = new Stack<>();
+// interceptors.add(validator);
+// interceptors.add(authInterceptor);
+// interceptors.add(loggingInterceptor);
+// return interceptors;
+// }
+//
+// @Bean
+// @GRpcGlobalInterceptor
+// ServerInterceptor validationInterceptor(Stack<IntegrationServiceInterceptor> integrationServiceInterceptors) {
+// return new ServiceInterceptor(integrationServiceInterceptors);
+// }
+//
+//}
diff --git a/custos-integration-services/sharing-management-service-parent/sharing-management-service/src/main/java/org/apache/custos/sharing/management/interceptors/AuthInterceptorImpl.java b/custos-integration-services/sharing-management-service-parent/sharing-management-service/src/main/java/org/apache/custos/sharing/management/interceptors/SharingManagementAuthInterceptorImpl.java
similarity index 94%
rename from custos-integration-services/sharing-management-service-parent/sharing-management-service/src/main/java/org/apache/custos/sharing/management/interceptors/AuthInterceptorImpl.java
rename to custos-integration-services/sharing-management-service-parent/sharing-management-service/src/main/java/org/apache/custos/sharing/management/interceptors/SharingManagementAuthInterceptorImpl.java
index 64a1185b..b23583c9 100644
--- a/custos-integration-services/sharing-management-service-parent/sharing-management-service/src/main/java/org/apache/custos/sharing/management/interceptors/AuthInterceptorImpl.java
+++ b/custos-integration-services/sharing-management-service-parent/sharing-management-service/src/main/java/org/apache/custos/sharing/management/interceptors/SharingManagementAuthInterceptorImpl.java
@@ -37,14 +37,14 @@ import java.util.Optional;
* This validates custos credentials
*/
@Component
-public class AuthInterceptorImpl extends MultiTenantAuthInterceptor {
+public class SharingManagementAuthInterceptorImpl extends MultiTenantAuthInterceptor {
- private static final Logger LOGGER = LoggerFactory.getLogger(AuthInterceptorImpl.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(SharingManagementAuthInterceptorImpl.class);
private CredentialStoreServiceClient credentialStoreServiceClient;
- public AuthInterceptorImpl(CredentialStoreServiceClient credentialStoreServiceClient,
- TenantProfileClient tenantProfileClient, IdentityClient identityClient) {
+ public SharingManagementAuthInterceptorImpl(CredentialStoreServiceClient credentialStoreServiceClient,
+ TenantProfileClient tenantProfileClient, IdentityClient identityClient) {
super(credentialStoreServiceClient, tenantProfileClient, identityClient);
this.credentialStoreServiceClient = credentialStoreServiceClient;
}
diff --git a/custos-integration-services/sharing-management-service-parent/sharing-management-service/src/main/java/org/apache/custos/sharing/management/interceptors/InputValidator.java b/custos-integration-services/sharing-management-service-parent/sharing-management-service/src/main/java/org/apache/custos/sharing/management/interceptors/SharingManagementInputValidator.java
similarity index 96%
rename from custos-integration-services/sharing-management-service-parent/sharing-management-service/src/main/java/org/apache/custos/sharing/management/interceptors/InputValidator.java
rename to custos-integration-services/sharing-management-service-parent/sharing-management-service/src/main/java/org/apache/custos/sharing/management/interceptors/SharingManagementInputValidator.java
index 44d50855..4c8e6f4f 100644
--- a/custos-integration-services/sharing-management-service-parent/sharing-management-service/src/main/java/org/apache/custos/sharing/management/interceptors/InputValidator.java
+++ b/custos-integration-services/sharing-management-service-parent/sharing-management-service/src/main/java/org/apache/custos/sharing/management/interceptors/SharingManagementInputValidator.java
@@ -33,9 +33,9 @@ import org.springframework.stereotype.Component;
* This class validates the request input parameters
*/
@Component
-public class InputValidator implements IntegrationServiceInterceptor {
+public class SharingManagementInputValidator implements IntegrationServiceInterceptor {
- private static final Logger LOGGER = LoggerFactory.getLogger(InputValidator.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(SharingManagementInputValidator.class);
/**
* Input parameter validater
diff --git a/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/java/org/apache/custos/tenant/management/TenantManagementServiceInitializer.java b/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/java/org/apache/custos/tenant/management/TenantManagementServiceInitializer.java
index 0cb128a0..487fe9c2 100644
--- a/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/java/org/apache/custos/tenant/management/TenantManagementServiceInitializer.java
+++ b/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/java/org/apache/custos/tenant/management/TenantManagementServiceInitializer.java
@@ -1,89 +1,89 @@
-/*
- * 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.custos.tenant.management;
-
-import brave.Tracing;
-import brave.grpc.GrpcTracing;
-import io.grpc.ClientInterceptor;
-import io.grpc.ServerInterceptor;
-import org.apache.custos.integration.core.interceptor.IntegrationServiceInterceptor;
-import org.apache.custos.integration.core.interceptor.ServiceInterceptor;
-import org.apache.custos.integration.services.commons.interceptors.LoggingInterceptor;
-import org.apache.custos.tenant.management.interceptors.AuthInterceptorImpl;
-import org.apache.custos.tenant.management.interceptors.DynamicRegistrationValidator;
-import org.apache.custos.tenant.management.interceptors.InputValidator;
-import org.apache.custos.tenant.management.interceptors.SuperTenantRestrictedOperationsInterceptorImpl;
-import org.lognet.springboot.grpc.GRpcGlobalInterceptor;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
-
-import java.util.*;
-
-
-@SpringBootApplication
-@ComponentScan(basePackages = "org.apache.custos")
-public class TenantManagementServiceInitializer {
- public static void main(String[] args) {
- SpringApplication.run(TenantManagementServiceInitializer.class, args);
- }
-
- @Bean
- public GrpcTracing grpcTracing(Tracing tracing) {
- // Tracing tracing1 = Tracing.newBuilder().build();
- return GrpcTracing.create(tracing);
- }
-
- //We also create a client-side interceptor and put that in the context, this interceptor can then be injected into gRPC clients and
- //then applied to the managed channel.
- @Bean
- ClientInterceptor grpcClientSleuthInterceptor(GrpcTracing grpcTracing) {
- return grpcTracing.newClientInterceptor();
- }
-
- @Bean
- @GRpcGlobalInterceptor
- ServerInterceptor grpcServerSleuthInterceptor(GrpcTracing grpcTracing) {
- return grpcTracing.newServerInterceptor();
- }
-
- @Bean
- public Stack<IntegrationServiceInterceptor> getInterceptorSet(AuthInterceptorImpl authInterceptor,
- DynamicRegistrationValidator registrationValidator,
- InputValidator validator, SuperTenantRestrictedOperationsInterceptorImpl adminOperationsInterceptor,
- LoggingInterceptor loggingInterceptor) {
- Stack<IntegrationServiceInterceptor> interceptors = new Stack<>();
- interceptors.add(validator);
- interceptors.add(authInterceptor);
- interceptors.add(adminOperationsInterceptor);
- interceptors.add(registrationValidator);
- interceptors.add(loggingInterceptor);
-
- return interceptors;
- }
-
- @Bean
- @GRpcGlobalInterceptor
- ServerInterceptor validationInterceptor(Stack<IntegrationServiceInterceptor> integrationServiceInterceptors) {
- return new ServiceInterceptor(integrationServiceInterceptors);
- }
-
-}
+///*
+// * 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.custos.tenant.management;
+//
+//import brave.Tracing;
+//import brave.grpc.GrpcTracing;
+//import io.grpc.ClientInterceptor;
+//import io.grpc.ServerInterceptor;
+//import org.apache.custos.integration.core.interceptor.IntegrationServiceInterceptor;
+//import org.apache.custos.integration.core.interceptor.ServiceInterceptor;
+//import org.apache.custos.integration.services.commons.interceptors.LoggingInterceptor;
+//import org.apache.custos.tenant.management.interceptors.AuthInterceptorImpl;
+//import org.apache.custos.tenant.management.interceptors.DynamicRegistrationValidator;
+//import org.apache.custos.tenant.management.interceptors.InputValidator;
+//import org.apache.custos.tenant.management.interceptors.SuperTenantRestrictedOperationsInterceptorImpl;
+//import org.lognet.springboot.grpc.GRpcGlobalInterceptor;
+//import org.springframework.boot.SpringApplication;
+//import org.springframework.boot.autoconfigure.SpringBootApplication;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.ComponentScan;
+//
+//import java.util.*;
+//
+//
+//@SpringBootApplication
+//@ComponentScan(basePackages = "org.apache.custos")
+//public class TenantManagementServiceInitializer {
+// public static void main(String[] args) {
+// SpringApplication.run(TenantManagementServiceInitializer.class, args);
+// }
+//
+// @Bean
+// public GrpcTracing grpcTracing(Tracing tracing) {
+// // Tracing tracing1 = Tracing.newBuilder().build();
+// return GrpcTracing.create(tracing);
+// }
+//
+// //We also create a client-side interceptor and put that in the context, this interceptor can then be injected into gRPC clients and
+// //then applied to the managed channel.
+// @Bean
+// ClientInterceptor grpcClientSleuthInterceptor(GrpcTracing grpcTracing) {
+// return grpcTracing.newClientInterceptor();
+// }
+//
+// @Bean
+// @GRpcGlobalInterceptor
+// ServerInterceptor grpcServerSleuthInterceptor(GrpcTracing grpcTracing) {
+// return grpcTracing.newServerInterceptor();
+// }
+//
+// @Bean
+// public Stack<IntegrationServiceInterceptor> getInterceptorSet(AuthInterceptorImpl authInterceptor,
+// DynamicRegistrationValidator registrationValidator,
+// InputValidator validator, SuperTenantRestrictedOperationsInterceptorImpl adminOperationsInterceptor,
+// LoggingInterceptor loggingInterceptor) {
+// Stack<IntegrationServiceInterceptor> interceptors = new Stack<>();
+// interceptors.add(validator);
+// interceptors.add(authInterceptor);
+// interceptors.add(adminOperationsInterceptor);
+// interceptors.add(registrationValidator);
+// interceptors.add(loggingInterceptor);
+//
+// return interceptors;
+// }
+//
+// @Bean
+// @GRpcGlobalInterceptor
+// ServerInterceptor validationInterceptor(Stack<IntegrationServiceInterceptor> integrationServiceInterceptors) {
+// return new ServiceInterceptor(integrationServiceInterceptors);
+// }
+//
+//}
diff --git a/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/java/org/apache/custos/tenant/management/interceptors/AuthInterceptorImpl.java b/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/java/org/apache/custos/tenant/management/interceptors/TenantManagementAuthInterceptorImpl.java
similarity index 98%
rename from custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/java/org/apache/custos/tenant/management/interceptors/AuthInterceptorImpl.java
rename to custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/java/org/apache/custos/tenant/management/interceptors/TenantManagementAuthInterceptorImpl.java
index 65a41e28..982e9969 100644
--- a/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/java/org/apache/custos/tenant/management/interceptors/AuthInterceptorImpl.java
+++ b/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/java/org/apache/custos/tenant/management/interceptors/TenantManagementAuthInterceptorImpl.java
@@ -51,14 +51,14 @@ import java.util.Optional;
* This validates custos credentials
*/
@Component
-public class AuthInterceptorImpl extends AuthInterceptor {
+public class TenantManagementAuthInterceptorImpl extends AuthInterceptor {
- private static final Logger LOGGER = LoggerFactory.getLogger(AuthInterceptorImpl.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(TenantManagementAuthInterceptorImpl.class);
private CredentialStoreServiceClient credentialStoreServiceClient;
- public AuthInterceptorImpl(CredentialStoreServiceClient credentialStoreServiceClient,
- TenantProfileClient tenantProfileClient, IdentityClient identityClient) {
+ public TenantManagementAuthInterceptorImpl(CredentialStoreServiceClient credentialStoreServiceClient,
+ TenantProfileClient tenantProfileClient, IdentityClient identityClient) {
super(credentialStoreServiceClient, tenantProfileClient, identityClient);
this.credentialStoreServiceClient = credentialStoreServiceClient;
}
diff --git a/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/java/org/apache/custos/tenant/management/interceptors/DynamicRegistrationValidator.java b/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/java/org/apache/custos/tenant/management/interceptors/TenantManagementDynamicRegistrationValidator.java
similarity index 94%
rename from custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/java/org/apache/custos/tenant/management/interceptors/DynamicRegistrationValidator.java
rename to custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/java/org/apache/custos/tenant/management/interceptors/TenantManagementDynamicRegistrationValidator.java
index 3c793b24..1a235744 100644
--- a/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/java/org/apache/custos/tenant/management/interceptors/DynamicRegistrationValidator.java
+++ b/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/java/org/apache/custos/tenant/management/interceptors/TenantManagementDynamicRegistrationValidator.java
@@ -41,15 +41,15 @@ import java.util.Optional;
* This class validates the conditions that should be satisfied by the Dynamic Registration Protocol
*/
@Component
-public class DynamicRegistrationValidator extends AuthInterceptor {
+public class TenantManagementDynamicRegistrationValidator extends AuthInterceptor {
- private static final Logger LOGGER = LoggerFactory.getLogger(DynamicRegistrationValidator.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(TenantManagementDynamicRegistrationValidator.class);
private CredentialStoreServiceClient credentialStoreServiceClient;
private TenantProfileClient tenantProfileClient;
- public DynamicRegistrationValidator(CredentialStoreServiceClient credentialStoreServiceClient,
- TenantProfileClient tenantProfileClient, IdentityClient identityClient) {
+ public TenantManagementDynamicRegistrationValidator(CredentialStoreServiceClient credentialStoreServiceClient,
+ TenantProfileClient tenantProfileClient, IdentityClient identityClient) {
super(credentialStoreServiceClient, tenantProfileClient, identityClient);
this.credentialStoreServiceClient = credentialStoreServiceClient;
this.tenantProfileClient = tenantProfileClient;
diff --git a/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/java/org/apache/custos/tenant/management/interceptors/InputValidator.java b/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/java/org/apache/custos/tenant/management/interceptors/TenantManagementInputValidator.java
similarity index 98%
rename from custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/java/org/apache/custos/tenant/management/interceptors/InputValidator.java
rename to custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/java/org/apache/custos/tenant/management/interceptors/TenantManagementInputValidator.java
index 7909689f..cc8c58ad 100644
--- a/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/java/org/apache/custos/tenant/management/interceptors/InputValidator.java
+++ b/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/java/org/apache/custos/tenant/management/interceptors/TenantManagementInputValidator.java
@@ -41,9 +41,9 @@ import java.util.List;
* This class validates the request input parameters
*/
@Component
-public class InputValidator implements IntegrationServiceInterceptor {
+public class TenantManagementInputValidator implements IntegrationServiceInterceptor {
- private static final Logger LOGGER = LoggerFactory.getLogger(InputValidator.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(TenantManagementInputValidator.class);
/**
* Input parameter validater
diff --git a/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/java/org/apache/custos/tenant/management/interceptors/SuperTenantRestrictedOperationsInterceptorImpl.java b/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/java/org/apache/custos/tenant/management/interceptors/TenantManagementSuperTenantRestrictedOperationsInterceptorImpl.java
similarity index 91%
rename from custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/java/org/apache/custos/tenant/management/interceptors/SuperTenantRestrictedOperationsInterceptorImpl.java
rename to custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/java/org/apache/custos/tenant/management/interceptors/TenantManagementSuperTenantRestrictedOperationsInterceptorImpl.java
index 189e86b7..25f01263 100644
--- a/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/java/org/apache/custos/tenant/management/interceptors/SuperTenantRestrictedOperationsInterceptorImpl.java
+++ b/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/java/org/apache/custos/tenant/management/interceptors/TenantManagementSuperTenantRestrictedOperationsInterceptorImpl.java
@@ -35,15 +35,15 @@ import org.springframework.stereotype.Component;
import java.util.Optional;
@Component
-public class SuperTenantRestrictedOperationsInterceptorImpl extends AuthInterceptor {
+public class TenantManagementSuperTenantRestrictedOperationsInterceptorImpl extends AuthInterceptor {
- private static final Logger LOGGER = LoggerFactory.getLogger(SuperTenantRestrictedOperationsInterceptorImpl.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(TenantManagementSuperTenantRestrictedOperationsInterceptorImpl.class);
private CredentialStoreServiceClient credentialStoreServiceClient;
- public SuperTenantRestrictedOperationsInterceptorImpl(CredentialStoreServiceClient credentialStoreServiceClient,
- TenantProfileClient tenantProfileClient, IdentityClient identityClient) {
+ public TenantManagementSuperTenantRestrictedOperationsInterceptorImpl(CredentialStoreServiceClient credentialStoreServiceClient,
+ TenantProfileClient tenantProfileClient, IdentityClient identityClient) {
super(credentialStoreServiceClient, tenantProfileClient, identityClient);
this.credentialStoreServiceClient = credentialStoreServiceClient;
}
diff --git a/custos-integration-services/user-management-service-parent/user-management-service/src/main/java/org/apache/custos/user/management/UserManagementServiceInitializer.java b/custos-integration-services/user-management-service-parent/user-management-service/src/main/java/org/apache/custos/user/management/UserManagementServiceInitializer.java
index a67c6ec0..04620f72 100644
--- a/custos-integration-services/user-management-service-parent/user-management-service/src/main/java/org/apache/custos/user/management/UserManagementServiceInitializer.java
+++ b/custos-integration-services/user-management-service-parent/user-management-service/src/main/java/org/apache/custos/user/management/UserManagementServiceInitializer.java
@@ -1,86 +1,86 @@
-/*
- * 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.custos.user.management;
-
-import brave.Tracing;
-import brave.grpc.GrpcTracing;
-import io.grpc.ClientInterceptor;
-import io.grpc.ServerInterceptor;
-import org.apache.custos.integration.core.interceptor.IntegrationServiceInterceptor;
-import org.apache.custos.integration.core.interceptor.ServiceInterceptor;
-import org.apache.custos.integration.services.commons.interceptors.LoggingInterceptor;
-import org.apache.custos.user.management.interceptors.AuthInterceptorImpl;
-import org.apache.custos.user.management.interceptors.InputValidator;
-import org.apache.custos.user.management.interceptors.SuperTenantRestrictedOperationsInterceptorImpl;
-import org.lognet.springboot.grpc.GRpcGlobalInterceptor;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
-
-import java.util.Stack;
-
-@SpringBootApplication
-@ComponentScan(basePackages = "org.apache.custos")
-public class UserManagementServiceInitializer {
- public static void main(String[] args) {
- SpringApplication.run(UserManagementServiceInitializer.class, args);
- }
-
- @Bean
- public GrpcTracing grpcTracing(Tracing tracing) {
- // Tracing tracing1 = Tracing.newBuilder().build();
- return GrpcTracing.create(tracing);
- }
-
- //We also create a client-side interceptor and put that in the context, this interceptor can then be injected into gRPC clients and
- //then applied to the managed channel.
- @Bean
- ClientInterceptor grpcClientSleuthInterceptor(GrpcTracing grpcTracing) {
- return grpcTracing.newClientInterceptor();
- }
-
- @Bean
- @GRpcGlobalInterceptor
- ServerInterceptor grpcServerSleuthInterceptor(GrpcTracing grpcTracing) {
- return grpcTracing.newServerInterceptor();
- }
-
- @Bean
- public Stack<IntegrationServiceInterceptor> getInterceptorSet(InputValidator inputValidator,
- AuthInterceptorImpl userAuthInterceptor,
- SuperTenantRestrictedOperationsInterceptorImpl superTenantRestrictedOperationsInterceptor,
- LoggingInterceptor loggingInterceptor) {
- Stack<IntegrationServiceInterceptor> interceptors = new Stack<>();
- interceptors.add(inputValidator);
- interceptors.add(userAuthInterceptor);
- interceptors.add(superTenantRestrictedOperationsInterceptor);
- interceptors.add(loggingInterceptor);
-
-
- return interceptors;
- }
-
- @Bean
- @GRpcGlobalInterceptor
- ServerInterceptor validationInterceptor(Stack<IntegrationServiceInterceptor> integrationServiceInterceptors) {
- return new ServiceInterceptor(integrationServiceInterceptors);
- }
-}
+///*
+// * 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.custos.user.management;
+//
+//import brave.Tracing;
+//import brave.grpc.GrpcTracing;
+//import io.grpc.ClientInterceptor;
+//import io.grpc.ServerInterceptor;
+//import org.apache.custos.integration.core.interceptor.IntegrationServiceInterceptor;
+//import org.apache.custos.integration.core.interceptor.ServiceInterceptor;
+//import org.apache.custos.integration.services.commons.interceptors.LoggingInterceptor;
+//import org.apache.custos.user.management.interceptors.AuthInterceptorImpl;
+//import org.apache.custos.user.management.interceptors.InputValidator;
+//import org.apache.custos.user.management.interceptors.SuperTenantRestrictedOperationsInterceptorImpl;
+//import org.lognet.springboot.grpc.GRpcGlobalInterceptor;
+//import org.springframework.boot.SpringApplication;
+//import org.springframework.boot.autoconfigure.SpringBootApplication;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.ComponentScan;
+//
+//import java.util.Stack;
+//
+//@SpringBootApplication
+//@ComponentScan(basePackages = "org.apache.custos")
+//public class UserManagementServiceInitializer {
+// public static void main(String[] args) {
+// SpringApplication.run(UserManagementServiceInitializer.class, args);
+// }
+//
+// @Bean
+// public GrpcTracing grpcTracing(Tracing tracing) {
+// // Tracing tracing1 = Tracing.newBuilder().build();
+// return GrpcTracing.create(tracing);
+// }
+//
+// //We also create a client-side interceptor and put that in the context, this interceptor can then be injected into gRPC clients and
+// //then applied to the managed channel.
+// @Bean
+// ClientInterceptor grpcClientSleuthInterceptor(GrpcTracing grpcTracing) {
+// return grpcTracing.newClientInterceptor();
+// }
+//
+// @Bean
+// @GRpcGlobalInterceptor
+// ServerInterceptor grpcServerSleuthInterceptor(GrpcTracing grpcTracing) {
+// return grpcTracing.newServerInterceptor();
+// }
+//
+// @Bean
+// public Stack<IntegrationServiceInterceptor> getInterceptorSet(InputValidator inputValidator,
+// AuthInterceptorImpl userAuthInterceptor,
+// SuperTenantRestrictedOperationsInterceptorImpl superTenantRestrictedOperationsInterceptor,
+// LoggingInterceptor loggingInterceptor) {
+// Stack<IntegrationServiceInterceptor> interceptors = new Stack<>();
+// interceptors.add(inputValidator);
+// interceptors.add(userAuthInterceptor);
+// interceptors.add(superTenantRestrictedOperationsInterceptor);
+// interceptors.add(loggingInterceptor);
+//
+//
+// return interceptors;
+// }
+//
+// @Bean
+// @GRpcGlobalInterceptor
+// ServerInterceptor validationInterceptor(Stack<IntegrationServiceInterceptor> integrationServiceInterceptors) {
+// return new ServiceInterceptor(integrationServiceInterceptors);
+// }
+//}
diff --git a/custos-integration-services/user-management-service-parent/user-management-service/src/main/java/org/apache/custos/user/management/interceptors/AuthInterceptorImpl.java b/custos-integration-services/user-management-service-parent/user-management-service/src/main/java/org/apache/custos/user/management/interceptors/UserManagementAuthInterceptorImpl.java
similarity index 98%
rename from custos-integration-services/user-management-service-parent/user-management-service/src/main/java/org/apache/custos/user/management/interceptors/AuthInterceptorImpl.java
rename to custos-integration-services/user-management-service-parent/user-management-service/src/main/java/org/apache/custos/user/management/interceptors/UserManagementAuthInterceptorImpl.java
index b4351ccc..b0743f87 100644
--- a/custos-integration-services/user-management-service-parent/user-management-service/src/main/java/org/apache/custos/user/management/interceptors/AuthInterceptorImpl.java
+++ b/custos-integration-services/user-management-service-parent/user-management-service/src/main/java/org/apache/custos/user/management/interceptors/UserManagementAuthInterceptorImpl.java
@@ -44,13 +44,13 @@ import java.util.Optional;
* Methods authenticates users access tokens are implemented here
*/
@Component
-public class AuthInterceptorImpl extends MultiTenantAuthInterceptor {
- private static final Logger LOGGER = LoggerFactory.getLogger(AuthInterceptorImpl.class);
+public class UserManagementAuthInterceptorImpl extends MultiTenantAuthInterceptor {
+ private static final Logger LOGGER = LoggerFactory.getLogger(UserManagementAuthInterceptorImpl.class);
private CredentialStoreServiceClient credentialStoreServiceClient;
@Autowired
- public AuthInterceptorImpl(CredentialStoreServiceClient credentialStoreServiceClient, TenantProfileClient tenantProfileClient, IdentityClient identityClient) {
+ public UserManagementAuthInterceptorImpl(CredentialStoreServiceClient credentialStoreServiceClient, TenantProfileClient tenantProfileClient, IdentityClient identityClient) {
super(credentialStoreServiceClient, tenantProfileClient, identityClient);
this.credentialStoreServiceClient = credentialStoreServiceClient;
}
diff --git a/custos-integration-services/user-management-service-parent/user-management-service/src/main/java/org/apache/custos/user/management/interceptors/InputValidator.java b/custos-integration-services/user-management-service-parent/user-management-service/src/main/java/org/apache/custos/user/management/interceptors/UserManagementInputValidator.java
similarity index 95%
rename from custos-integration-services/user-management-service-parent/user-management-service/src/main/java/org/apache/custos/user/management/interceptors/InputValidator.java
rename to custos-integration-services/user-management-service-parent/user-management-service/src/main/java/org/apache/custos/user/management/interceptors/UserManagementInputValidator.java
index a5d46aba..1d51b2e3 100644
--- a/custos-integration-services/user-management-service-parent/user-management-service/src/main/java/org/apache/custos/user/management/interceptors/InputValidator.java
+++ b/custos-integration-services/user-management-service-parent/user-management-service/src/main/java/org/apache/custos/user/management/interceptors/UserManagementInputValidator.java
@@ -20,7 +20,6 @@
package org.apache.custos.user.management.interceptors;
-import com.fasterxml.jackson.databind.ObjectMapper;
import io.grpc.Metadata;
import org.apache.custos.integration.core.exceptions.MissingParameterException;
import org.apache.custos.integration.core.interceptor.IntegrationServiceInterceptor;
@@ -33,9 +32,9 @@ import org.springframework.stereotype.Component;
* This class validates the request input parameters
*/
@Component
-public class InputValidator implements IntegrationServiceInterceptor {
+public class UserManagementInputValidator implements IntegrationServiceInterceptor {
- private static final Logger LOGGER = LoggerFactory.getLogger(InputValidator.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(UserManagementInputValidator.class);
/**
* Input parameter validater
diff --git a/custos-integration-services/user-management-service-parent/user-management-service/src/main/java/org/apache/custos/user/management/interceptors/SuperTenantRestrictedOperationsInterceptorImpl.java b/custos-integration-services/user-management-service-parent/user-management-service/src/main/java/org/apache/custos/user/management/interceptors/UserManagementSuperTenantRestrictedOperationsInterceptorImpl.java
similarity index 84%
rename from custos-integration-services/user-management-service-parent/user-management-service/src/main/java/org/apache/custos/user/management/interceptors/SuperTenantRestrictedOperationsInterceptorImpl.java
rename to custos-integration-services/user-management-service-parent/user-management-service/src/main/java/org/apache/custos/user/management/interceptors/UserManagementSuperTenantRestrictedOperationsInterceptorImpl.java
index ae10d969..1c78420d 100644
--- a/custos-integration-services/user-management-service-parent/user-management-service/src/main/java/org/apache/custos/user/management/interceptors/SuperTenantRestrictedOperationsInterceptorImpl.java
+++ b/custos-integration-services/user-management-service-parent/user-management-service/src/main/java/org/apache/custos/user/management/interceptors/UserManagementSuperTenantRestrictedOperationsInterceptorImpl.java
@@ -33,15 +33,15 @@ import org.springframework.stereotype.Component;
import java.util.Optional;
@Component
-public class SuperTenantRestrictedOperationsInterceptorImpl extends AuthInterceptor {
+public class UserManagementSuperTenantRestrictedOperationsInterceptorImpl extends AuthInterceptor {
- private static final Logger LOGGER = LoggerFactory.getLogger(SuperTenantRestrictedOperationsInterceptorImpl.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(UserManagementSuperTenantRestrictedOperationsInterceptorImpl.class);
private CredentialStoreServiceClient credentialStoreServiceClient;
- public SuperTenantRestrictedOperationsInterceptorImpl(CredentialStoreServiceClient credentialStoreServiceClient,
- TenantProfileClient tenantProfileClient, IdentityClient identityClient) {
+ public UserManagementSuperTenantRestrictedOperationsInterceptorImpl(CredentialStoreServiceClient credentialStoreServiceClient,
+ TenantProfileClient tenantProfileClient, IdentityClient identityClient) {
super(credentialStoreServiceClient, tenantProfileClient, identityClient);
this.credentialStoreServiceClient = credentialStoreServiceClient;
}
diff --git a/pom.xml b/pom.xml
index 3524d9ff..8c4fe6b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,6 +45,7 @@
<module>custos-tests</module>
<module>custos-external-services-distributions</module>
<module>custos-core-services-server</module>
+ <module>custos-integration-services-server</module>
</modules>
<dependencyManagement>