-# ClientFrankfurt
+# designer-client
This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 8.3.9.
"version": 1,
"newProjectRoot": "projects",
"projects": {
- "client-frankfurt": {
+ "designer-client": {
"projectType": "application",
"schematics": {},
"root": "",
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
- "outputPath": "dist/client-frankfurt",
+ "outputPath": "dist/designer-client",
"index": "src/index.html",
"main": "src/main.ts",
"polyfills": "src/polyfills.ts",
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
- "browserTarget": "client-frankfurt:build"
+ "browserTarget": "designer-client:build"
},
"configurations": {
"production": {
- "browserTarget": "client-frankfurt:build:production"
+ "browserTarget": "designer-client:build:production"
}
}
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
- "browserTarget": "client-frankfurt:build"
+ "browserTarget": "designer-client:build"
}
},
"test": {
"builder": "@angular-devkit/build-angular:protractor",
"options": {
"protractorConfig": "e2e/protractor.conf.js",
- "devServerTarget": "client-frankfurt:serve"
+ "devServerTarget": "designer-client:serve"
},
"configurations": {
"production": {
- "devServerTarget": "client-frankfurt:serve:production"
+ "devServerTarget": "designer-client:serve:production"
}
}
}
}
}
},
- "defaultProject": "client-frankfurt"
+ "defaultProject": "designer-client"
}
\ No newline at end of file
it('should display welcome message', () => {
page.navigateTo();
- expect(page.getTitleText()).toEqual('client-frankfurt app is running!');
+ expect(page.getTitleText()).toEqual('designer-client app is running!');
});
afterEach(async () => {
clearContext: false // leave Jasmine Spec Runner output visible in browser
},
coverageIstanbulReporter: {
- dir: require('path').join(__dirname, './coverage/client-frankfurt'),
+ dir: require('path').join(__dirname, './coverage/designer-client'),
reports: ['html', 'lcovonly', 'text-summary'],
fixWebpackSourcePaths: true
},
{
- "name": "client-frankfurt",
+ "name": "designer-client",
"version": "0.0.0",
"scripts": {
"ng": "ng",
expect(app).toBeTruthy();
});
- it(`should have as title 'client-frankfurt'`, () => {
+ it(`should have as title 'designer-client'`, () => {
const fixture = TestBed.createComponent(AppComponent);
const app = fixture.debugElement.componentInstance;
- expect(app.title).toEqual('client-frankfurt');
+ expect(app.title).toEqual('designer-client');
});
it('should render title', () => {
const fixture = TestBed.createComponent(AppComponent);
fixture.detectChanges();
const compiled = fixture.debugElement.nativeElement;
- expect(compiled.querySelector('.content span').textContent).toContain('client-frankfurt app is running!');
+ expect(compiled.querySelector('.content span').textContent).toContain('designer-client app is running!');
});
});
})
export class AppComponent {
- title = 'client-frankfurt';
+ title = 'designer-client';
}
package org.onap.ccsdk.cds.blueprintsprocessor.actuator.indicator
+import kotlinx.coroutines.runBlocking
import org.onap.ccsdk.cds.blueprintsprocessor.healthapi.domain.HealthApiResponse
import org.onap.ccsdk.cds.blueprintsprocessor.healthapi.domain.HealthCheckStatus
import org.onap.ccsdk.cds.blueprintsprocessor.healthapi.service.health.BluePrintProcessorHealthCheck
+import org.slf4j.LoggerFactory
import org.springframework.boot.actuate.health.AbstractHealthIndicator
import org.springframework.boot.actuate.health.Health
import org.springframework.stereotype.Component
*/
@Component
open class BluePrintCustomIndicator(private val bluePrintProcessorHealthCheck: BluePrintProcessorHealthCheck) :
- AbstractHealthIndicator() {
+ AbstractHealthIndicator() {
+
+ private var logger = LoggerFactory.getLogger(BluePrintCustomIndicator::class.java)
@Throws(Exception::class)
override fun doHealthCheck(builder: Health.Builder) {
- var result: HealthApiResponse? = bluePrintProcessorHealthCheck!!.retrieveEndpointExecutionStatus()
- if (result?.status == HealthCheckStatus.UP) {
- builder.up()
- } else {
- builder.down()
+ runBlocking {
+ var result: HealthApiResponse? = null
+ try {
+ result = bluePrintProcessorHealthCheck!!.retrieveEndpointExecutionStatus()
+ if (result?.status == HealthCheckStatus.UP) {
+ builder.up()
+ } else {
+ builder.down()
+ }
+ builder.withDetail("Services", result?.checks)
+ } catch (exception: IllegalArgumentException) {
+ logger.error(exception.message)
+ }
}
- builder.withDetail("Services", result?.checks)
}
}
@PropertySource("classpath:application.properties")
open class HealthCheckProperties {
- @Value("\${blueprintprocessor.healthcheck.baseUrl}")
+ @Value("\${blueprintprocessor.healthcheck.baseUrl:}")
private val bluePrintProcessorBaseURL: String? = null
- @Value("#{'\${blueprintprocessor.healthcheck.mapping-service-name-with-service-link}'.split(']')}")
+ @Value("#{'\${blueprintprocessor.healthcheck.mapping-service-name-with-service-link:}'.split(']')}")
private val blueprintprocessorServiceMapping: List<String>? = null
- @Value("\${cdslistener.healthcheck.baseUrl}")
+ @Value("\${cdslistener.healthcheck.baseUrl:}")
private val cdsListenerBaseURL: String? = null
- @Value("#{'\${cdslistener.healthcheck.mapping-service-name-with-service-link}'.split(']')}")
+ @Value("#{'\${cdslistener.healthcheck.mapping-service-name-with-service-link:}'.split(']')}")
private val cdsListenerServiceMapping: List<String>? = null
open fun getBluePrintBaseURL(): String? {