Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Readd server configuration task. #16104

Merged
merged 4 commits into from
Aug 31, 2021
Merged

Conversation

mshima
Copy link
Member

@mshima mshima commented Aug 31, 2021

Closes #16103
Closes #16010.

Partially reverts #15846.


Please make sure the below checklist is followed for Pull Requests.

When you are still working on the PR, consider converting it to Draft (bellow reviewers) and adding skip-ci label, you can still see CI build result at your branch.

@mshima mshima changed the title Revert server configuration task. Readd server configuration task. Aug 31, 2021
@mshima mshima merged commit 5a45f1e into jhipster:main Aug 31, 2021
@mshima mshima deleted the skip_ci-database_type branch August 31, 2021 19:30

const databaseType = config.databaseType;
if (databaseType === NO_DATABASE) {
config.devDatabaseType = NO_DATABASE;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This one makes no sense

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Required to fix #16103.

config.enableHibernateCache = false;
config.skipUserManagement = true;
} else if ([MONGODB, NEO4J, COUCHBASE, CASSANDRA].includes(databaseType)) {
config.devDatabaseType = databaseType;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

devDatabasetype is always populated by defaultConfig.
Should be removed when #15815 (comment) is fixed.

@@ -558,4 +579,54 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
if (useBlueprints) return;
return this._end();
}

_configureServer(config = this.jhipsterConfig) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't it a derived thing? I would have let it in the gen-base derived props

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They are server configurations that depends on others configurations.
Otherwise we can have situations like #16103.
Situations like this will not happen in the modular implementation.

@pascalgrimaud pascalgrimaud added this to the 7.2.0 milestone Sep 11, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

When databaseType = no, dev and prod database types are still included in yo-rc.json
3 participants