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.

Sign up for GitHub

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

Jump to bottom

[KOGITO-3972] Make TemplateGenerator use KogitoBuildContext #934

Merged
merged 65 commits into from
Dec 21, 2020
Merged

[KOGITO-3972] Make TemplateGenerator use KogitoBuildContext #934

merged 65 commits into from
Dec 21, 2020

Conversation

danielezonca
Copy link
Contributor

@danielezonca danielezonca commented Dec 12, 2020 •
edited
Loading

https://issues.redhat.com/browse/KOGITO-3972

Details

  • Updated TemaplateGenerator to use KogitoBuildContext instead of DependencyInjectorAnnotator
  • Removed ConfigGenerator and replaced with ApplicationConfigGenerator (it was an intermediate step now removed)
  • Created AbstractConfigGenerator to simplify *ConfigGenerator impl
  • All *ConfigGenerators now extends AbstractConfigGenerator
  • Update all TemplateGenerator usages to only be used as delegate
  • JavaKogitoBuildContext for non-DI context (and avoid null context)
  • DependencyInjectionAnnotator reference inside KogitoBuildContext to prevent inconsistent configuration (i.e. Quarkus but no DI or Java but with DI)
  • Removed all withDependencyInjectionAnnotator methods because no more needed
  • Created a common hasDI() method inside KogitoBuildContext and removed all custom useInjection() methods

To be merged after https://github.com/kiegroup/kogito-runtimes/pull/929 Merged

@danielezonca
WIP
05cbcd5
@danielezonca
[KOGITO-3974] PredictionModels and DecisionModels are now using templ…
706005c 
…ates + Created AbstractPredictionModels and AbstractDecisionModels with common code
@danielezonca
Merge branch 'decisionmodels-predictionmodels-inject' into applicatio…
493c6d4 
…n-config-refactoring

# Conflicts:
#	api/kogito-api/src/main/java/org/kie/kogito/StaticApplication.java
#	kogito-codegen/src/main/java/org/kie/kogito/codegen/ApplicationContainerGenerator.java
#	kogito-codegen/src/main/resources/class-templates/ApplicationTemplate.java
#	kogito-codegen/src/main/resources/class-templates/CdiApplicationTemplate.java
#	kogito-codegen/src/main/resources/class-templates/DecisionContainerTemplate.java
#	kogito-codegen/src/main/resources/class-templates/SpringApplicationTemplate.java
@danielezonca
[KOGITO-3975] WIP, compile but integration broken tests
ccff35b
@danielezonca
[KOGITO-3975] Fix tests
fa17449
@danielezonca
[KOGITO-3974] Revert ApplicationContainerGenerator changes and postpo…
ccc8b27 
…ne ApplicationTemplate to a different PR
@danielezonca
Merge branch 'decisionmodels-predictionmodels-inject' into applicatio…
5bbbbbe 
…n-config-refactoring

# Conflicts:
#	kogito-codegen/src/main/java/org/kie/kogito/codegen/ApplicationContainerGenerator.java
#	kogito-codegen/src/main/resources/class-templates/ApplicationTemplate.java
@danielezonca
[KOGITO-3975] Minor
8421369
@danielezonca
[KOGITO-3974] Fix missing conf use case
0b300a4
@danielezonca
Merge branch 'decisionmodels-predictionmodels-inject' into applicatio…
a841c41 
…n-config-refactoring

# Conflicts:
#	api/kogito-api/src/main/java/org/kie/kogito/StaticApplication.java
@danielezonca
[KOGITO-3975] Fix missing conf use case
3aaaaff
@danielezonca
Merge remote-tracking branch 'upstream/master' into application-confi…
0015e0e 
…g-refactoring
@danielezonca
Merge remote-tracking branch 'upstream/master' into decisionmodels-pr…
2c60dcc 
…edictionmodels-inject
@danielezonca
[KOGITO-3974] Fix test
6756417
@danielezonca
Merge branch 'decisionmodels-predictionmodels-inject' into applicatio…
0f1d3c6 
…n-config-refactoring

# Conflicts:
#	kogito-codegen/src/test/java/org/kie/kogito/codegen/ApplicationGeneratorTest.java
@danielezonca
Merge remote-tracking branch 'upstream/master' into decisionmodels-pr…
34c7201 
…edictionmodels-inject
@danielezonca
[KOGITO-3974] Reviewed DecisionModels/PredictionModels templates to m…
2e24f8c 
…ove all the code to abstract
@danielezonca
[KOGITO-3974] Fix test
2e8130a
@danielezonca
Merge remote-tracking branch 'upstream/master' into application-confi…
6771682 
…g-refactoring
@danielezonca
Merge branch 'decisionmodels-predictionmodels-inject' into applicatio…
e076e1c 
…n-config-refactoring

# Conflicts:
#	drools/kogito-dmn/src/main/java/org/kie/kogito/dmn/AbstractDecisionModels.java
@danielezonca
[KOGITO-3975] update
cc3199d
@danielezonca
[KOGITO-3975] Minor
21e6d6f
@danielezonca
[KOGITO-3972] Updated TemplatedGenerator to use KogitoBuildContext + …
01fccfe 
…Now TemplatedGenerator is only used as delegator + Created AbstractConfigGenerator to simplify ConfigGenerator logic
@danielezonca
[KOGITO-3972] Fix DMN hot reload
533c4ba
@danielezonca
Fix DMN hot reload
574cf92
@danielezonca
Moved packageName, annotator and addonsConfig to AbstractGenerator + …
2a46411 
…Renamed ApplicationGenerator.withGenerator as ApplicationGenerator.registerAndInitGenerator
@danielezonca
Merge remote-tracking branch 'upstream/master' into decisionmodels-pr…
ece772c 
…edictionmodels-inject
@danielezonca
Added comment
3769ea2
@danielezonca
Fix tests
b5212fe
@danielezonca
Merge remote-tracking branch 'upstream/master' into application-confi…
def5ad8 
…g-refactoring
@danielezonca danielezonca mentioned this pull request Dec 16, 2020
Merged
@danielezonca
Merge remote-tracking branch 'upstream/master' into templategenerator…
40b9259 
…-kogitobuildcontext

# Conflicts:
#	kogito-codegen/src/main/java/org/kie/kogito/codegen/ApplicationContainerGenerator.java
#	kogito-codegen/src/test/java/org/kie/kogito/codegen/ApplicationGeneratorTest.java
@danielezonca danielezonca marked this pull request as ready for review December 16, 2020 23:11
@evacchi
Copy link
Contributor

evacchi commented Dec 17, 2020

Update all TemplateGenerator usages to only be used as delegate

you can probably make it final then! I haven't look at the whole PR yet, but looks great. We can probably avoid a few instanceof now, but I understand that this is to keep the changes minimal

@danielezonca
Copy link
Contributor Author

jenkins retest this please

@danielezonca
Copy link
Contributor Author

Update all TemplateGenerator usages to only be used as delegate

you can probably make it final then! I haven't look at the whole PR yet, but looks great. We can probably avoid a few instanceof now, but I understand that this is to keep the changes minimal

Done, now TemplateGenerator is final :)

@danielezonca
Copy link
Contributor Author

jenkins retest this please

1 similar comment
@danielezonca
Copy link
Contributor Author

jenkins retest this please

@danielezonca
Copy link
Contributor Author

jenkins retest this please

2 similar comments
@danielezonca
Copy link
Contributor Author

jenkins retest this please

@danielezonca
Copy link
Contributor Author

jenkins retest this please

@danielezonca
Copy link
Contributor Author

jenkins retest this please

1 similar comment
@danielezonca
Copy link
Contributor Author

jenkins retest this please

@sonarqubecloud
Copy link

Kudos, SonarCloud Quality Gate passed!

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 5 Code Smells

85.6% 85.6% Coverage
0.0% 0.0% Duplication

MarianMacik
MarianMacik approved these changes Dec 21, 2020
View reviewed changes
Copy link
Member

@MarianMacik MarianMacik left a comment

Choose a reason for hiding this comment

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

Looks good to me.

@danielezonca danielezonca merged commit a59a15e into apache:master Dec 21, 2020
@danielezonca danielezonca deleted the templategenerator-kogitobuildcontext branch January 14, 2021 23:25
@kie-ci1 kie-ci1 mentioned this pull request Jan 28, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MarianMacik MarianMacik MarianMacik approved these changes

@evacchi evacchi evacchi approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@danielezonca @evacchi @MarianMacik