This is an automated email from the ASF dual-hosted git repository.

ofuks pushed a commit to branch DLAB-1571
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git


The following commit(s) were added to refs/heads/DLAB-1571 by this push:
     new 083773e  billing rest service
083773e is described below

commit 083773ec31dcef12f6ca4346874d28ed8948faa2
Author: Oleh Fuks <[email protected]>
AuthorDate: Fri Apr 10 18:36:56 2020 +0300

    billing rest service
---
 infrastructure-provisioning/src/ssn/templates/ssn.yml   |  5 +++++
 .../main/java/com/epam/dlab/ServiceConfiguration.java   |  9 +++++++++
 .../java/com/epam/dlab/constants/ServiceConsts.java     | 17 +++++++++--------
 .../com/epam/dlab/backendapi/modules/DevModule.java     |  3 +++
 .../epam/dlab/backendapi/modules/ProductionModule.java  |  3 +++
 .../backendapi/service/impl/BillingServiceImpl.java     |  2 +-
 6 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/infrastructure-provisioning/src/ssn/templates/ssn.yml 
b/infrastructure-provisioning/src/ssn/templates/ssn.yml
index fffa7d2..7b18d26 100644
--- a/infrastructure-provisioning/src/ssn/templates/ssn.yml
+++ b/infrastructure-provisioning/src/ssn/templates/ssn.yml
@@ -62,5 +62,10 @@ provisioningService:
     timeout: 3s
     connectionTimeout: 3s
 
+billingService:
+  jerseyClient:
+    timeout: 4m
+    connectionTimeout: 3s
+
 # Log out user on inactivity
 inactiveUserTimeoutMillSec: 7200000
diff --git 
a/services/dlab-webapp-common/src/main/java/com/epam/dlab/ServiceConfiguration.java
 
b/services/dlab-webapp-common/src/main/java/com/epam/dlab/ServiceConfiguration.java
index 85d4318..3297abd 100644
--- 
a/services/dlab-webapp-common/src/main/java/com/epam/dlab/ServiceConfiguration.java
+++ 
b/services/dlab-webapp-common/src/main/java/com/epam/dlab/ServiceConfiguration.java
@@ -54,6 +54,11 @@ public class ServiceConfiguration extends Configuration {
 
     @Valid
     @NotNull
+    @JsonProperty(ServiceConsts.BILLING_SERVICE_NAME)
+    private RESTServiceFactory billingFactory = new RESTServiceFactory();
+
+    @Valid
+    @NotNull
     @JsonProperty(ServiceConsts.SECURITY_SERVICE_NAME)
     private RESTServiceFactory securityFactory;
 
@@ -85,6 +90,10 @@ public class ServiceConfiguration extends Configuration {
         return provisioningFactory;
     }
 
+    public RESTServiceFactory getBillingFactory() {
+        return billingFactory;
+    }
+
     public RESTServiceFactory getSecurityFactory() {
         return securityFactory;
     }
diff --git 
a/services/dlab-webapp-common/src/main/java/com/epam/dlab/constants/ServiceConsts.java
 
b/services/dlab-webapp-common/src/main/java/com/epam/dlab/constants/ServiceConsts.java
index d376665..e1bcf23 100644
--- 
a/services/dlab-webapp-common/src/main/java/com/epam/dlab/constants/ServiceConsts.java
+++ 
b/services/dlab-webapp-common/src/main/java/com/epam/dlab/constants/ServiceConsts.java
@@ -20,13 +20,14 @@
 package com.epam.dlab.constants;
 
 public final class ServiceConsts {
-       public static final String MONGO_NAME = "mongo";
-       public static final String PROVISIONING_SERVICE_NAME = 
"provisioningService";
-       public static final String MAVEN_SEARCH_API = "mavenSearchService";
-       public static final String SECURITY_SERVICE_NAME = "securityService";
-       public static final String SELF_SERVICE_NAME = "selfService";
-       public static final String PROVISIONING_USER_AGENT = 
"provisioning-service";
+    public static final String MONGO_NAME = "mongo";
+    public static final String PROVISIONING_SERVICE_NAME = 
"provisioningService";
+    public static final String BILLING_SERVICE_NAME = "billingService";
+    public static final String MAVEN_SEARCH_API = "mavenSearchService";
+    public static final String SECURITY_SERVICE_NAME = "securityService";
+    public static final String SELF_SERVICE_NAME = "selfService";
+    public static final String PROVISIONING_USER_AGENT = 
"provisioning-service";
 
-       private ServiceConsts() {
-       }
+    private ServiceConsts() {
+    }
 }
diff --git 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/modules/DevModule.java
 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/modules/DevModule.java
index 3c00111..9275319 100644
--- 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/modules/DevModule.java
+++ 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/modules/DevModule.java
@@ -132,6 +132,9 @@ public class DevModule extends 
ModuleBase<SelfServiceApplicationConfiguration> i
                
bind(RESTService.class).annotatedWith(Names.named(ServiceConsts.PROVISIONING_SERVICE_NAME))
                                
.toInstance(configuration.getProvisioningFactory()
                                                .build(environment, 
ServiceConsts.PROVISIONING_SERVICE_NAME));
+               
bind(RESTService.class).annotatedWith(Names.named(ServiceConsts.BILLING_SERVICE_NAME))
+                               .toInstance(configuration.getBillingFactory()
+                                               .build(environment, 
ServiceConsts.BILLING_SERVICE_NAME));
                
bind(ImageExploratoryService.class).to(ImageExploratoryServiceImpl.class);
                
bind(ImageExploratoryDao.class).to(ImageExploratoryDaoImpl.class);
                bind(BackupService.class).to(BackupServiceImpl.class);
diff --git 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/modules/ProductionModule.java
 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/modules/ProductionModule.java
index ce7ac26..d20adbf 100644
--- 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/modules/ProductionModule.java
+++ 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/modules/ProductionModule.java
@@ -123,6 +123,9 @@ public class ProductionModule extends 
ModuleBase<SelfServiceApplicationConfigura
                
bind(RESTService.class).annotatedWith(Names.named(ServiceConsts.PROVISIONING_SERVICE_NAME))
                                
.toInstance(configuration.getProvisioningFactory().build(environment, 
ServiceConsts
                                                .PROVISIONING_SERVICE_NAME));
+               
bind(RESTService.class).annotatedWith(Names.named(ServiceConsts.BILLING_SERVICE_NAME))
+                               .toInstance(configuration.getBillingFactory()
+                                               .build(environment, 
ServiceConsts.BILLING_SERVICE_NAME));
                
bind(ImageExploratoryService.class).to(ImageExploratoryServiceImpl.class);
                
bind(ImageExploratoryDao.class).to(ImageExploratoryDaoImpl.class);
                bind(BackupService.class).to(BackupServiceImpl.class);
diff --git 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/BillingServiceImpl.java
 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/BillingServiceImpl.java
index f8bd787..d92851b 100644
--- 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/BillingServiceImpl.java
+++ 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/BillingServiceImpl.java
@@ -84,7 +84,7 @@ public class BillingServiceImpl implements BillingService {
     @Inject
     public BillingServiceImpl(ProjectService projectService, EndpointService 
endpointService,
                               ExploratoryService exploratoryService, 
SelfServiceApplicationConfiguration configuration,
-                              @Named(ServiceConsts.PROVISIONING_SERVICE_NAME) 
RESTService provisioningService, ImageExploratoryDao imageExploratoryDao,
+                              @Named(ServiceConsts.BILLING_SERVICE_NAME) 
RESTService provisioningService, ImageExploratoryDao imageExploratoryDao,
                               BillingDAO billingDAO) {
         this.projectService = projectService;
         this.endpointService = endpointService;


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to