Skip to content

Commit

Permalink
fix: Move the connection parameters to a more suitable place in the c…
Browse files Browse the repository at this point in the history
…onfig file. (#65)

* Removed some verbose debug logging.

* fix: issues/44 - application.yml is changed, now the solace config is under spring/cloud/stream/binders.

* fix: application.yml is changed, now the solace config is under spring/cloud/stream/binders.
  • Loading branch information
damaru-inc authored Oct 2, 2020
1 parent cd44c46 commit e152040
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 6 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -138,3 +138,4 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d

This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!


18 changes: 12 additions & 6 deletions filters/all.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const scsLib = new ScsLib();
// Library versions
const SOLACE_SPRING_CLOUD_VERSION = '1.1.1';
const SPRING_BOOT_VERSION = '2.3.2.RELEASE';
const SPRING_CLOUD_VERSION = 'Hoxton.SR7';
const SPRING_CLOUD_VERSION = 'Hoxton.SR8';
const SPRING_CLOUD_STREAM_VERSION = '3.0.7.RELEASE';

// Connection defaults. SOLACE_DEFAULT applies to msgVpn, username and password.
Expand Down Expand Up @@ -107,10 +107,11 @@ function appProperties([asyncapi, params]) {
let doc = {};
doc.spring = {};
doc.spring.cloud = {};
doc.spring.cloud.stream = {};
let scs = doc.spring.cloud.stream;
scs.function = {};
scs.function.definition = getFunctionDefinitions(asyncapi, params);
let cloud = doc.spring.cloud
cloud.function = {};
cloud.function.definition = getFunctionDefinitions(asyncapi, params);
cloud.stream = {};
let scs = cloud.stream;
scs.bindings = getBindings(asyncapi, params);

if (params.binder === 'solace') {
Expand All @@ -123,7 +124,12 @@ function appProperties([asyncapi, params]) {

if (isApplication(params)) {
if (params.binder === 'solace') {
doc.solace = getSolace(params);
scs.binders = {};
scs.binders['solace-binder'] = {};
let sb = scs.binders['solace-binder'];
sb.type = 'solace'
sb.environment = {};
sb.environment.solace = getSolace(params);
}

doc.logging = {};
Expand Down
File renamed without changes.

0 comments on commit e152040

Please sign in to comment.