This is an automated email from the ASF dual-hosted git repository.
isjarana pushed a commit to branch baremetal
in repository https://gitbox.apache.org/repos/asf/airavata-custos.git
The following commit(s) were added to refs/heads/baremetal by this push:
new 82b9fa32 Add default values for clients
new 12dbc970 Merge pull request #295 from isururanawaka/berametalWithMerge
82b9fa32 is described below
commit 82b9fa3217c6acf533dfd9e6eec332749715f35f
Author: Isuru Ranawaka <[email protected]>
AuthorDate: Wed Aug 10 20:02:23 2022 -0400
Add default values for clients
---
.../org/apache/custos/agent/profile/client/AgentProfileClient.java | 4 ++--
.../custos/cluster/management/client/ClusterManagementClient.java | 4 ++--
.../credential/store/client/CredentialStoreServiceClient.java | 4 ++--
.../main/java/org/apache/custos/logging/client/LoggingClient.java | 4 ++--
.../authentication/client/FederatedAuthenticationClient.java | 4 ++--
.../org/apache/custos/iam/admin/client/IamAdminServiceClient.java | 6 +++---
.../main/java/org/apache/custos/identity/client/IdentityClient.java | 4 ++--
.../java/org/apache/custos/messaging/client/MessagingClient.java | 4 ++--
.../apache/custos/resource/secret/client/ResourceSecretClient.java | 4 ++--
.../main/java/org/apache/custos/sharing/client/SharingClient.java | 4 ++--
.../custos/tenant/profile/client/async/TenantProfileClient.java | 4 ++--
.../org/apache/custos/user/profile/client/UserProfileClient.java | 4 ++--
12 files changed, 25 insertions(+), 25 deletions(-)
diff --git
a/custos-core-services-client-stubs/agent-profile-core-service-client-stub/src/main/java/org/apache/custos/agent/profile/client/AgentProfileClient.java
b/custos-core-services-client-stubs/agent-profile-core-service-client-stub/src/main/java/org/apache/custos/agent/profile/client/AgentProfileClient.java
index 119dfc65..7729d6b5 100644
---
a/custos-core-services-client-stubs/agent-profile-core-service-client-stub/src/main/java/org/apache/custos/agent/profile/client/AgentProfileClient.java
+++
b/custos-core-services-client-stubs/agent-profile-core-service-client-stub/src/main/java/org/apache/custos/agent/profile/client/AgentProfileClient.java
@@ -46,8 +46,8 @@ public class AgentProfileClient {
public AgentProfileClient(List<ClientInterceptor> clientInterceptorList,
- @Value("${core.services.server.hostname}")
String serviceHost,
- @Value("${core.services.server.port}") int
servicePort) {
+
@Value("${core.services.server.hostname:localhost}") String serviceHost,
+ @Value("${core.services.server.port:7070}") int
servicePort) {
this.clientInterceptorList = clientInterceptorList;
managedChannel = ManagedChannelBuilder.forAddress(
serviceHost,
servicePort).usePlaintext(true).intercept(clientInterceptorList).build();
diff --git
a/custos-core-services-client-stubs/cluster-management-core-service-client-stub/src/main/java/org/apache/custos/cluster/management/client/ClusterManagementClient.java
b/custos-core-services-client-stubs/cluster-management-core-service-client-stub/src/main/java/org/apache/custos/cluster/management/client/ClusterManagementClient.java
index 7a7e0dbf..d5f59f55 100644
---
a/custos-core-services-client-stubs/cluster-management-core-service-client-stub/src/main/java/org/apache/custos/cluster/management/client/ClusterManagementClient.java
+++
b/custos-core-services-client-stubs/cluster-management-core-service-client-stub/src/main/java/org/apache/custos/cluster/management/client/ClusterManagementClient.java
@@ -41,8 +41,8 @@ public class ClusterManagementClient {
public ClusterManagementClient(List<ClientInterceptor>
clientInterceptorList,
- @Value("${core.services.server.hostname}")
String serviceHost,
- @Value("${core.services.server.port}") int
servicePort) {
+
@Value("${core.services.server.hostname:localhost}") String serviceHost,
+ @Value("${core.services.server.port:7070}")
int servicePort) {
this.clientInterceptorList = clientInterceptorList;
managedChannel = ManagedChannelBuilder.forAddress(
serviceHost,
servicePort).usePlaintext(true).intercept(clientInterceptorList).build();
diff --git
a/custos-core-services-client-stubs/credential-store-core-service-client-stubs/src/main/java/org/apache/custos/credential/store/client/CredentialStoreServiceClient.java
b/custos-core-services-client-stubs/credential-store-core-service-client-stubs/src/main/java/org/apache/custos/credential/store/client/CredentialStoreServiceClient.java
index 6b183ecf..c58b343d 100644
---
a/custos-core-services-client-stubs/credential-store-core-service-client-stubs/src/main/java/org/apache/custos/credential/store/client/CredentialStoreServiceClient.java
+++
b/custos-core-services-client-stubs/credential-store-core-service-client-stubs/src/main/java/org/apache/custos/credential/store/client/CredentialStoreServiceClient.java
@@ -45,8 +45,8 @@ public class CredentialStoreServiceClient {
public CredentialStoreServiceClient(List<ClientInterceptor>
clientInterceptorList,
-
@Value("${core.services.server.hostname}") String serviceHost,
- @Value("${core.services.server.port}")
int servicePort) {
+
@Value("${core.services.server.hostname:localhost}") String serviceHost,
+
@Value("${core.services.server.port:7070}") int servicePort) {
this.clientInterceptorList = clientInterceptorList;
managedChannel = ManagedChannelBuilder.forAddress(
serviceHost,
servicePort).usePlaintext(true).intercept(clientInterceptorList).build();
diff --git
a/custos-core-services-client-stubs/custos-logging-client-stub/src/main/java/org/apache/custos/logging/client/LoggingClient.java
b/custos-core-services-client-stubs/custos-logging-client-stub/src/main/java/org/apache/custos/logging/client/LoggingClient.java
index 1975f59c..fa151007 100644
---
a/custos-core-services-client-stubs/custos-logging-client-stub/src/main/java/org/apache/custos/logging/client/LoggingClient.java
+++
b/custos-core-services-client-stubs/custos-logging-client-stub/src/main/java/org/apache/custos/logging/client/LoggingClient.java
@@ -47,8 +47,8 @@ public class LoggingClient {
public LoggingClient(List<ClientInterceptor> clientInterceptorList,
- @Value("${core.services.server.hostname}") String
serviceHost,
- @Value("${core.services.server.port}") int
servicePort) {
+ @Value("${core.services.server.hostname:localhost}")
String serviceHost,
+ @Value("${core.services.server.port:7070}") int
servicePort) {
this.clientInterceptorList = clientInterceptorList;
managedChannel = ManagedChannelBuilder.forAddress(
serviceHost,
servicePort).usePlaintext(true).intercept(clientInterceptorList).build();
diff --git
a/custos-core-services-client-stubs/federated-authentication-core-service-client-stub/src/main/java/org/apache/custos/federated/authentication/client/FederatedAuthenticationClient.java
b/custos-core-services-client-stubs/federated-authentication-core-service-client-stub/src/main/java/org/apache/custos/federated/authentication/client/FederatedAuthenticationClient.java
index a7d7f786..29c638d0 100644
---
a/custos-core-services-client-stubs/federated-authentication-core-service-client-stub/src/main/java/org/apache/custos/federated/authentication/client/FederatedAuthenticationClient.java
+++
b/custos-core-services-client-stubs/federated-authentication-core-service-client-stub/src/main/java/org/apache/custos/federated/authentication/client/FederatedAuthenticationClient.java
@@ -44,8 +44,8 @@ public class FederatedAuthenticationClient {
public FederatedAuthenticationClient(List<ClientInterceptor>
clientInterceptorList,
-
@Value("${core.services.server.hostname}") String serviceHost,
-
@Value("${core.services.server.port}") int servicePort) {
+
@Value("${core.services.server.hostname:localhost}") String serviceHost,
+
@Value("${core.services.server.port:7070}") int servicePort) {
this.clientInterceptorList = clientInterceptorList;
managedChannel = ManagedChannelBuilder.forAddress(
serviceHost,
servicePort).usePlaintext(true).intercept(clientInterceptorList).build();
diff --git
a/custos-core-services-client-stubs/iam-admin-core-service-client-stub/src/main/java/org/apache/custos/iam/admin/client/IamAdminServiceClient.java
b/custos-core-services-client-stubs/iam-admin-core-service-client-stub/src/main/java/org/apache/custos/iam/admin/client/IamAdminServiceClient.java
index cdbea586..4a463e54 100644
---
a/custos-core-services-client-stubs/iam-admin-core-service-client-stub/src/main/java/org/apache/custos/iam/admin/client/IamAdminServiceClient.java
+++
b/custos-core-services-client-stubs/iam-admin-core-service-client-stub/src/main/java/org/apache/custos/iam/admin/client/IamAdminServiceClient.java
@@ -47,9 +47,9 @@ public class IamAdminServiceClient {
public IamAdminServiceClient(List<ClientInterceptor> clientInterceptorList,
- @Value("${core.services.server.hostname}")
String serviceHost,
- @Value("${core.services.server.port}") int
servicePort,
- @Value("${iam.server.url}") String url) {
+
@Value("${core.services.server.hostname:localhost}") String serviceHost,
+ @Value("${core.services.server.port:7070}")
int servicePort,
+
@Value("${iam.server.url:https://localhost/auth}";) String url) {
this.clientInterceptorList = clientInterceptorList;
managedChannel = ManagedChannelBuilder.forAddress(
serviceHost,
servicePort).usePlaintext(true).intercept(clientInterceptorList).build();
diff --git
a/custos-core-services-client-stubs/identity-core-service-client-stub/src/main/java/org/apache/custos/identity/client/IdentityClient.java
b/custos-core-services-client-stubs/identity-core-service-client-stub/src/main/java/org/apache/custos/identity/client/IdentityClient.java
index 51e7b90d..6e9ada43 100644
---
a/custos-core-services-client-stubs/identity-core-service-client-stub/src/main/java/org/apache/custos/identity/client/IdentityClient.java
+++
b/custos-core-services-client-stubs/identity-core-service-client-stub/src/main/java/org/apache/custos/identity/client/IdentityClient.java
@@ -45,8 +45,8 @@ public class IdentityClient {
public IdentityClient(List<ClientInterceptor> clientInterceptorList,
- @Value("${core.services.server.hostname}") String
serviceHost,
- @Value("${core.services.server.port}") int
servicePort) {
+ @Value("${core.services.server.hostname:localhost}")
String serviceHost,
+ @Value("${core.services.server.port:7070}") int
servicePort) {
this.clientInterceptorList = clientInterceptorList;
managedChannel = ManagedChannelBuilder.forAddress(
serviceHost,
servicePort).usePlaintext(true).intercept(clientInterceptorList).build();
diff --git
a/custos-core-services-client-stubs/messaging-core-service-client-stub/src/main/java/org/apache/custos/messaging/client/MessagingClient.java
b/custos-core-services-client-stubs/messaging-core-service-client-stub/src/main/java/org/apache/custos/messaging/client/MessagingClient.java
index 003aa6c1..f7bade66 100644
---
a/custos-core-services-client-stubs/messaging-core-service-client-stub/src/main/java/org/apache/custos/messaging/client/MessagingClient.java
+++
b/custos-core-services-client-stubs/messaging-core-service-client-stub/src/main/java/org/apache/custos/messaging/client/MessagingClient.java
@@ -46,8 +46,8 @@ public class MessagingClient {
public MessagingClient(List<ClientInterceptor> clientInterceptorList,
- @Value("${core.services.server.hostname}") String
serviceHost,
- @Value("${core.services.server.port}") int
servicePort) {
+
@Value("${core.services.server.hostname:localhost}") String serviceHost,
+ @Value("${core.services.server.port:7070}") int
servicePort) {
this.clientInterceptorList = clientInterceptorList;
managedChannel = ManagedChannelBuilder.forAddress(
serviceHost,
servicePort).usePlaintext(true).intercept(clientInterceptorList).build();
diff --git
a/custos-core-services-client-stubs/resource-secret-core-service-client-stub/src/main/java/org/apache/custos/resource/secret/client/ResourceSecretClient.java
b/custos-core-services-client-stubs/resource-secret-core-service-client-stub/src/main/java/org/apache/custos/resource/secret/client/ResourceSecretClient.java
index c2e4e34e..ee7e3d08 100644
---
a/custos-core-services-client-stubs/resource-secret-core-service-client-stub/src/main/java/org/apache/custos/resource/secret/client/ResourceSecretClient.java
+++
b/custos-core-services-client-stubs/resource-secret-core-service-client-stub/src/main/java/org/apache/custos/resource/secret/client/ResourceSecretClient.java
@@ -37,8 +37,8 @@ public class ResourceSecretClient {
private final List<ClientInterceptor> clientInterceptorList;
public ResourceSecretClient(List<ClientInterceptor> clientInterceptorList,
- @Value("${core.services.server.hostname}")
String serviceHost,
- @Value("${core.services.server.port}") int
servicePort) {
+
@Value("${core.services.server.hostname:localhost}") String serviceHost,
+ @Value("${core.services.server.port:7070}")
int servicePort) {
this.clientInterceptorList = clientInterceptorList;
managedChannel = ManagedChannelBuilder.forAddress(
serviceHost,
servicePort).usePlaintext(true).intercept(clientInterceptorList).build();
diff --git
a/custos-core-services-client-stubs/sharing-core-service-client-stub/src/main/java/org/apache/custos/sharing/client/SharingClient.java
b/custos-core-services-client-stubs/sharing-core-service-client-stub/src/main/java/org/apache/custos/sharing/client/SharingClient.java
index 5be38fe7..83131b32 100644
---
a/custos-core-services-client-stubs/sharing-core-service-client-stub/src/main/java/org/apache/custos/sharing/client/SharingClient.java
+++
b/custos-core-services-client-stubs/sharing-core-service-client-stub/src/main/java/org/apache/custos/sharing/client/SharingClient.java
@@ -42,8 +42,8 @@ public class SharingClient {
public SharingClient(List<ClientInterceptor> clientInterceptorList,
- @Value("${core.services.server.hostname}") String
serviceHost,
- @Value("${core.services.server.port}") int
servicePort) {
+ @Value("${core.services.server.hostname:localhost}")
String serviceHost,
+ @Value("${core.services.server.port:7070}") int
servicePort) {
this.clientInterceptorList = clientInterceptorList;
managedChannel = ManagedChannelBuilder.forAddress(
serviceHost,
servicePort).usePlaintext(true).intercept(clientInterceptorList).build();
diff --git
a/custos-core-services-client-stubs/tenant-profile-core-service-client-stub/src/main/java/org/apache/custos/tenant/profile/client/async/TenantProfileClient.java
b/custos-core-services-client-stubs/tenant-profile-core-service-client-stub/src/main/java/org/apache/custos/tenant/profile/client/async/TenantProfileClient.java
index e37d8beb..5e341b02 100644
---
a/custos-core-services-client-stubs/tenant-profile-core-service-client-stub/src/main/java/org/apache/custos/tenant/profile/client/async/TenantProfileClient.java
+++
b/custos-core-services-client-stubs/tenant-profile-core-service-client-stub/src/main/java/org/apache/custos/tenant/profile/client/async/TenantProfileClient.java
@@ -47,8 +47,8 @@ public class TenantProfileClient {
public TenantProfileClient(List<ClientInterceptor> clientInterceptorList,
- @Value("${core.services.server.hostname}")
String serviceHost,
- @Value("${core.services.server.port}") int
servicePort) {
+
@Value("${core.services.server.hostname:localhost}") String serviceHost,
+ @Value("${core.services.server.port:7070}") int
servicePort) {
this.clientInterceptorList = clientInterceptorList;
managedChannel = ManagedChannelBuilder.forAddress(
serviceHost,
servicePort).usePlaintext(true).intercept(clientInterceptorList).build();
diff --git
a/custos-core-services-client-stubs/user-profile-core-service-client-stub/src/main/java/org/apache/custos/user/profile/client/UserProfileClient.java
b/custos-core-services-client-stubs/user-profile-core-service-client-stub/src/main/java/org/apache/custos/user/profile/client/UserProfileClient.java
index b3d53daf..a5242d01 100644
---
a/custos-core-services-client-stubs/user-profile-core-service-client-stub/src/main/java/org/apache/custos/user/profile/client/UserProfileClient.java
+++
b/custos-core-services-client-stubs/user-profile-core-service-client-stub/src/main/java/org/apache/custos/user/profile/client/UserProfileClient.java
@@ -46,8 +46,8 @@ public class UserProfileClient {
public UserProfileClient(List<ClientInterceptor> clientInterceptorList,
- @Value("${core.services.server.hostname}") String
serviceHost,
- @Value("${core.services.server.port}") int
servicePort) {
+
@Value("${core.services.server.hostname:localhost}") String serviceHost,
+ @Value("${core.services.server.port:7070}") int
servicePort) {
this.clientInterceptorList = clientInterceptorList;
managedChannel = ManagedChannelBuilder.forAddress(
serviceHost,
servicePort).usePlaintext(true).intercept(clientInterceptorList).build();
