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

#1454 - GUI for Template Set Management #1592

Draft
wants to merge 292 commits into
base: master
Choose a base branch
from
Draft
Changes from 1 commit
Commits
Show all changes
292 commits
Select commit Hold shift + click to select a range
60040f8
removed search button, fixed functionality of clear search button
Nov 30, 2022
3c6955c
#1454 Possible to show Details of searched Template Set
NelsonNew Dec 3, 2022
2946849
added Design specifications for the GUI, debugged loadDetails
Dec 7, 2022
c68b053
#1454 Completed HomePageTest
NelsonNew Dec 9, 2022
bf1f2f2
#1454 Completed HomePageTest 2.0
NelsonNew Dec 9, 2022
c1a8480
#1454 Completed SearchTest + More Test Todo´s
NelsonNew Dec 11, 2022
3fbd87b
adjusted heigh for search results, changed appearance of search menu,…
Dec 13, 2022
c1578ca
added dark theme functionality, changed detail page appearance
Dec 14, 2022
c95a9df
1517 discovery of template sets (#1585)
Zylesto Dec 16, 2022
55c16d9
#1454 Added custom type FlatIcon for easier icon access | Responsive …
NelsonNew Dec 19, 2022
26f3bc9
#1454 Style Changes
NelsonNew Dec 20, 2022
4ad1a8f
Merge branch 'template-set-deployables' into 1454-gui-templatesets
NelsonNew Dec 21, 2022
d37de66
custom title bar with buttons to close the application, change window…
Dec 22, 2022
3c13c13
#1454 Make use of ArtifactRetriever
NelsonNew Jan 2, 2023
0176c1a
#1619 cleanup docs
maybeec Jan 2, 2023
edaed0e
#1619 upgrade all sources to jdk 11
maybeec Jan 2, 2023
0ddc3bc
#1619 fix plugins build to run on jdk 11
maybeec Jan 2, 2023
f4794fd
Merge branch 'master' into template-set-deployables
maybeec Jan 2, 2023
f1ad8d7
Merge branch 'master' into template-set-deployables
maybeec Jan 3, 2023
0d61fda
spelling corrections
maybeec Jan 3, 2023
1d8997a
Merge branch 'master' into template-set-deployables
maybeec Jan 3, 2023
efd512e
Added correct settings URL for cobigen setup
maybeec Jan 3, 2023
5e1a7e3
Merge branch 'master' into template-set-deployables
maybeec Jan 3, 2023
f73d720
Fix merge error
maybeec Jan 3, 2023
58d9eed
#1454 templateset files read from a temporary folder
Ali7223 Jan 3, 2023
f12ac48
Merge branch 'template-set-deployables' into 1454-gui-templatesets
maybeec Jan 4, 2023
4f9da87
Removed xvfb-action
maybeec Jan 4, 2023
fbb5331
trying to fix strange execution problem in GHA
maybeec Jan 4, 2023
1ded60f
Also resolve and cache dependencies for tycho
maybeec Jan 4, 2023
dc72408
fix build on windows
maybeec Jan 4, 2023
b597945
fixed 2018-12 target + fixed eclipse test + fixed M2E compatibility
maybeec Jan 4, 2023
9c2e04e
#1454 implemented installTemplateSet button functionality
Ali7223 Jan 5, 2023
e4f9a00
removed unnecessary junit headless dependency failing on sonar run
maybeec Jan 5, 2023
efdc183
upgraded openapi parser to latest version of networknt
maybeec Jan 5, 2023
b76c231
upgraded openapi parser to latest version of networknt
maybeec Jan 5, 2023
9dbe233
Revert "upgraded openapi parser to latest version of networknt"
maybeec Jan 5, 2023
9aed99a
Revert "upgraded openapi parser to latest version of networknt"
maybeec Jan 5, 2023
eb8c1c1
Merge branch 'master' into template-set-deployables
maybeec Jan 5, 2023
03d219b
removed stupid non-used testdata
maybeec Jan 6, 2023
49ae604
store workflow status for sonar analysis
maybeec Jan 6, 2023
556cff8
store workflow status for sonar analysis
maybeec Jan 6, 2023
199c84d
fix workflow
maybeec Jan 6, 2023
4e097f8
added maven repository cache for faster execution (#1625)
EduardKrieger Jan 6, 2023
e7ad216
trying to flatten CI/CD to speed up
maybeec Jan 7, 2023
8ab4a8d
fixing dependency caching + fixing build component script + fixing ma…
maybeec Jan 7, 2023
f4a9ebc
fix dependency caching
maybeec Jan 7, 2023
f339117
fix build script
maybeec Jan 7, 2023
81e95c3
automatically enable debug mode + better matrix parameter view on git…
maybeec Jan 8, 2023
2c1db7f
fixing detection of GHA debug mode
maybeec Jan 8, 2023
72d89a8
debug test execution
maybeec Jan 9, 2023
86122c8
enabled new enableCrossOsArchive of github cache
maybeec Jan 9, 2023
357a938
Workaround for actions/cache#1059
maybeec Jan 9, 2023
d939f03
fix workflow
maybeec Jan 9, 2023
81c4d15
fix workflow
maybeec Jan 9, 2023
e6a2a72
fix workflow
maybeec Jan 9, 2023
e8e0ce4
set java 17 for windows build
maybeec Jan 9, 2023
fc6fc18
actions/cache#1059 workaround - trying to locate m2 repo in working d…
maybeec Jan 11, 2023
35ac03e
add logging out env to understand temporary debug mode detection
maybeec Jan 11, 2023
f854bf1
fixed automated maven debug log on runner debug + trying to fix maven…
maybeec Jan 11, 2023
fbda14e
try to fix maven cache location consolidation accross OS
maybeec Jan 11, 2023
67fdce9
trying different local repository setting
maybeec Jan 12, 2023
dd94bab
fixing cache mismatches
maybeec Jan 12, 2023
e28e03b
fixing checkout on windows
maybeec Jan 12, 2023
8918a9f
more cache debugging!
maybeec Jan 12, 2023
3e655e1
more cache debugging!
maybeec Jan 12, 2023
67de615
more cache debugging
maybeec Jan 12, 2023
0fbb14c
fixing odd cache path
maybeec Jan 12, 2023
c10ccce
new try for cross-os build-config
maybeec Jan 12, 2023
a6949e0
new try for cross-os build-config
maybeec Jan 12, 2023
715a962
new try for cross-os build-config
maybeec Jan 12, 2023
ed9670c
new try for cross-os build-config
maybeec Jan 12, 2023
be0cd10
new try for cross-os build-config
maybeec Jan 12, 2023
f9e8152
trying to fix maven repo cache
maybeec Jan 12, 2023
d9758cb
splitting dependency resolution and plugin resolution
maybeec Jan 12, 2023
033d462
enabling batch processing and fixing maven settings
maybeec Jan 12, 2023
e4843bd
built just once on linux + restore also p2 for tests + removed debugging
maybeec Jan 12, 2023
65891b7
trying to fix tests by providing test settings.xml in home folder
maybeec Jan 12, 2023
b498c23
Fix settings overwriting
maybeec Jan 12, 2023
b971f77
enable xvfb run for linux for eclipse tests + fixing settings.xml ove…
maybeec Jan 13, 2023
c8c7898
fix settings.xml overwriting
maybeec Jan 13, 2023
9ff3ba5
try fixing settings.xml rewrite
maybeec Jan 13, 2023
10ffe53
Merge branch 'master' into template-set-deployables
maybeec Jan 23, 2023
1140415
Merge branch 'template-set-deployables' into flattened-cicd
maybeec Jan 23, 2023
8e435a4
changing path to be static on cache declaration
maybeec Jan 23, 2023
2208391
removed coverage report to be executed everytime
maybeec Jan 23, 2023
2ee9c2c
#1454 WiP ProcessTemplateSetTest
NelsonNew Jan 24, 2023
c66cdab
fixing m-m-m NlsBundle Exception on CLI tests
maybeec Jan 24, 2023
3e65ddf
fixing -h option for right color coding
maybeec Jan 24, 2023
40bd436
fixing p2 compiler issues
maybeec Jan 24, 2023
62eb061
debugging + cleanup
maybeec Jan 25, 2023
85e44ba
workaround for https://github.com/m-m-m/code/issues/43
maybeec Jan 26, 2023
94cd277
disabled debug logging + readme update
maybeec Jan 27, 2023
2260ee6
fixed a bug in findTemplates (#1630)
EduardKrieger Jan 27, 2023
5f0588b
try fixing unnecessary timeout on windows
maybeec Jan 27, 2023
ee0316f
minor changes
sarahffm Feb 23, 2023
925de2c
#1454 adjusted retrieval of template set xml download links
jan-vcapgemini Mar 1, 2023
7e43176
Revert "#1454 adjusted retrieval of template set xml download links"
jan-vcapgemini Mar 1, 2023
cce187d
#1454 made first test functional
jan-vcapgemini Mar 3, 2023
258a63f
#1454 added missing test resource
jan-vcapgemini Mar 3, 2023
81175fd
#1454 adjusted test
jan-vcapgemini Mar 3, 2023
a410cdc
#1454 made test functional
jan-vcapgemini Mar 3, 2023
5046295
Merge branch 'template-set-deployables' into 1454-gui-templatesets
jan-vcapgemini Mar 3, 2023
b2b328e
Merge branch 'master' into template-set-deployables
maybeec Mar 13, 2023
514b1e6
#1495 Combine template and configuration files into template set file…
KHucklenbroich Mar 13, 2023
5140c84
Merge branch 'template-set-deployables' into 1454-gui-templatesets
jan-vcapgemini Mar 13, 2023
b871dba
#1454 replaced ArtifactReader with TemplateSetReader
jan-vcapgemini Mar 14, 2023
1fc60d6
#1454 added artifact cache folder
jan-vcapgemini Mar 14, 2023
48a2b32
#1454 added missing dependency
jan-vcapgemini Mar 14, 2023
776aee9
#1454 renamed artifact cache
jan-vcapgemini Mar 14, 2023
a956637
#1454 added 2nd template set artifact to test
jan-vcapgemini Mar 14, 2023
6225a90
#1454 added temporary test cobigen home
jan-vcapgemini Mar 15, 2023
19992cc
#1454 fixed temporary test paths
jan-vcapgemini Mar 15, 2023
d5b63dd
#1454 connect ArtifactRetriever with GUI
jan-vcapgemini Mar 15, 2023
48671ff
#1554 added compareTo for MavenCoordinates to compare versions;
EduardKrieger Mar 15, 2023
781727d
#1454 made refresh button functional
jan-vcapgemini Mar 15, 2023
340b569
added TODO
jan-vcapgemini Mar 16, 2023
a53b75d
added TODO
jan-vcapgemini Mar 16, 2023
485d5a4
fixed eclipse tests freezes
jan-vcapgemini Mar 17, 2023
9148d62
1622 Restore and fixed adaptTemplatesTest on eclipse (#1641)
cedricarnauld123 Mar 17, 2023
2e794bd
#1622 fixed eclipse adapt monolithic templates test
jan-vcapgemini Mar 17, 2023
a01765e
added TODO
jan-vcapgemini Mar 17, 2023
faee4f1
added TODO
jan-vcapgemini Mar 17, 2023
a32120b
temporarily disabled upgrader test in eclipse
jan-vcapgemini Mar 17, 2023
cd38c95
added TODO
jan-vcapgemini Mar 17, 2023
2b1360d
applied proper reformat
jan-vcapgemini Mar 17, 2023
ead77d6
applied proper reformat
jan-vcapgemini Mar 17, 2023
3b92e6f
applied proper reformat
jan-vcapgemini Mar 17, 2023
8318b2a
applied proper reformat
jan-vcapgemini Mar 17, 2023
e15f077
applied proper reformat
jan-vcapgemini Mar 17, 2023
587f983
added method to change CobiGen home
jan-vcapgemini Mar 17, 2023
5ca8f21
added TODO
jan-vcapgemini Mar 17, 2023
177f9d3
adjusted javadoc
jan-vcapgemini Mar 17, 2023
f41220b
added TODO
jan-vcapgemini Mar 17, 2023
694b0c9
applied proper reformat
jan-vcapgemini Mar 17, 2023
bfb5536
refactored AbstractContextConfigurationReader
jan-vcapgemini Mar 17, 2023
f75dfe7
made fields private
jan-vcapgemini Mar 17, 2023
91edfcc
made fields private
jan-vcapgemini Mar 17, 2023
2c440e2
added TODO
jan-vcapgemini Mar 17, 2023
9d7ca6d
cleanup
jan-vcapgemini Mar 17, 2023
21b3f71
removed unused interfaces
jan-vcapgemini Mar 17, 2023
167a978
adjusted template set documentation
jan-vcapgemini Mar 17, 2023
35f5d1a
updated google guava to 31.1-jre
jan-vcapgemini Mar 17, 2023
472ea6e
made CobiGenFactory tests functional
jan-vcapgemini Mar 17, 2023
b3dc966
moved template-set.xml into correct folder
jan-vcapgemini Mar 17, 2023
9112b26
applied proper reformat
jan-vcapgemini Mar 17, 2023
65b988e
added test path check to CobiGenPaths
jan-vcapgemini Mar 20, 2023
9625a53
added TODO
jan-vcapgemini Mar 21, 2023
f251ea3
applied proper reformat
jan-vcapgemini Mar 21, 2023
edc17c7
removed unused test resource files
jan-vcapgemini Mar 21, 2023
7c1c6af
cleanup of ConfigurationFinder
jan-vcapgemini Mar 21, 2023
0f8b48b
moved method beneath constructor
jan-vcapgemini Mar 21, 2023
654499f
adjusted javadocs
jan-vcapgemini Mar 21, 2023
b264377
removed unused files
jan-vcapgemini Mar 21, 2023
d522e05
fixed PostPoneUtil tests
jan-vcapgemini Mar 22, 2023
abbac3e
removed extra isZipFile check
jan-vcapgemini Mar 22, 2023
28d91bc
cleanup
jan-vcapgemini Mar 22, 2023
0b79b14
adjusted template set upgrade documentation
jan-vcapgemini Mar 22, 2023
af182c4
1495 fixed working branch adapt templates feature (#1645)
quantumfate Mar 22, 2023
ef61c78
added missing test resource file
jan-vcapgemini Mar 24, 2023
cd5a294
#1638 implemented download jar process (from properties) (#1653)
jan-vcapgemini Mar 28, 2023
9f31845
fixed template installation tests
jan-vcapgemini Mar 29, 2023
fcfc0e8
adjusted javadoc of test
jan-vcapgemini Mar 29, 2023
3314e71
removed unnecessary test and resources
jan-vcapgemini Mar 29, 2023
151698e
renamed method and adjusted javadoc
jan-vcapgemini Mar 29, 2023
0c07125
adjusted javadoc
jan-vcapgemini Mar 29, 2023
fb9ba81
adjusted javadoc
jan-vcapgemini Mar 29, 2023
540abee
removed empty newline
jan-vcapgemini Mar 29, 2023
39aa279
applied rest of refactoring
jan-vcapgemini Mar 29, 2023
0c28780
added fallback if no repositories were found
jan-vcapgemini Mar 30, 2023
da1f980
added issue links to TODOs
jan-vcapgemini Mar 31, 2023
52f4f85
fixed template set file tree
jan-vcapgemini Mar 31, 2023
bc64317
adjusted javadoc of ConfigurationFinder
jan-vcapgemini Mar 31, 2023
d68fc46
adjusted javadocs
jan-vcapgemini Mar 31, 2023
4bf5ca9
added issue to TODO
jan-vcapgemini Mar 31, 2023
217c8a4
added issue to TODO
jan-vcapgemini Mar 31, 2023
beb7248
removed unused fields
jan-vcapgemini Mar 31, 2023
1a081e2
added javadoc descriptions for constants
jan-vcapgemini Mar 31, 2023
f163973
added issue to TODO
jan-vcapgemini Mar 31, 2023
64683ab
adjusted javadocs
jan-vcapgemini Mar 31, 2023
27dced6
added issue to TODO
jan-vcapgemini Mar 31, 2023
07e7ad8
fixed download by properties
jan-vcapgemini Mar 31, 2023
b045ea2
removed unused class variable
jan-vcapgemini Mar 31, 2023
b34d7e6
prepared template set version conflict test
jan-vcapgemini Mar 31, 2023
82d0ad4
cleanup of unnecessary condition
jan-vcapgemini Mar 31, 2023
ac2efa9
Simple fixes
NelsonNew Apr 1, 2023
e79d214
applied requested changes
jan-vcapgemini Apr 3, 2023
a5757ff
added TODO and link to issue
jan-vcapgemini Apr 3, 2023
75adfe4
implemented requested changes
jan-vcapgemini Apr 3, 2023
a51ee91
implemented requested changes
jan-vcapgemini Apr 3, 2023
b5574a1
added issue to TODO
jan-vcapgemini Apr 3, 2023
c5e9d33
removed unused field
jan-vcapgemini Apr 3, 2023
b98e202
moved getters under constructor
jan-vcapgemini Apr 3, 2023
ae0c108
Typo fix
NelsonNew Apr 3, 2023
0611e0f
Finished sentence
NelsonNew Apr 3, 2023
5113482
#1667 Made template set root directories accessible for the reader
jan-vcapgemini Apr 3, 2023
b421049
added TODOs with linked issues
jan-vcapgemini Apr 3, 2023
a25b371
implemented requested changes
jan-vcapgemini Apr 3, 2023
01ef924
implemented requested changes
jan-vcapgemini Apr 3, 2023
950aaa7
implemented requested changes
jan-vcapgemini Apr 3, 2023
28f53b0
#1670 hotfix
jan-vcapgemini Apr 4, 2023
6a1e6f9
added TODO with link to issue
jan-vcapgemini Apr 4, 2023
ad76aea
#1668 added issue to TODO
jan-vcapgemini Apr 4, 2023
980e893
#1671 added link to issue to TODO
jan-vcapgemini Apr 4, 2023
02bdb62
adjusted javadoc
jan-vcapgemini Apr 4, 2023
26b6c2c
added issue to TODOs
jan-vcapgemini Apr 5, 2023
2012d11
sonatype-lift fixes
jan-vcapgemini Apr 5, 2023
28ce188
removed commented code
jan-vcapgemini Apr 5, 2023
f54e6c3
added TODO with link to issue
jan-vcapgemini Apr 5, 2023
e3469e8
added TODO with link to issue
jan-vcapgemini Apr 5, 2023
f3de717
added TODO with link to issue
jan-vcapgemini Apr 5, 2023
f7f16ec
added TODO with link to issue
jan-vcapgemini Apr 5, 2023
677ea7c
sonatype-lift changes
jan-vcapgemini Apr 6, 2023
4d728ba
sonatype-lift changes
jan-vcapgemini Apr 6, 2023
f3a4399
sonatype-lift changes
jan-vcapgemini Apr 6, 2023
ed156b2
added comment
jan-vcapgemini Apr 6, 2023
79f94e8
added TODO and link to issue
jan-vcapgemini Apr 6, 2023
587b2e9
fixed typo
jan-vcapgemini Apr 6, 2023
08e7892
sonatype-lift changes, hotfix
jan-vcapgemini Apr 6, 2023
5af0844
fixed openapi-parser version
jan-vcapgemini Apr 6, 2023
1b49fb0
added TODO and link to issue
jan-vcapgemini Apr 6, 2023
c4ce99d
adjusted javadoc
jan-vcapgemini Apr 6, 2023
6ae0954
added missing javadocs
jan-vcapgemini Apr 6, 2023
3ef6f64
added TODO and link to issue
jan-vcapgemini Apr 6, 2023
deb68b6
removed unused files
jan-vcapgemini Apr 6, 2023
ee90c8b
adjusted javadoc
jan-vcapgemini Apr 6, 2023
5983e65
added TODO and link to issue
jan-vcapgemini Apr 6, 2023
c0c39c4
added TODO and link to issue
jan-vcapgemini Apr 6, 2023
e82340a
cleanup
jan-vcapgemini Apr 6, 2023
2a96c00
adjusted javadoc of test
jan-vcapgemini Apr 6, 2023
52ba0fb
added javadoc description
jan-vcapgemini Apr 6, 2023
a2a4137
adjusted javadoc
jan-vcapgemini Apr 6, 2023
676ac3e
cleanup
jan-vcapgemini Apr 6, 2023
d57a660
fix deploy script to allow local updatesite builds
maybeec Apr 9, 2023
5c64a1e
fix eclipse e2e test classpath
maybeec Apr 9, 2023
ba8f1b9
adjusted javadocs
jan-vcapgemini Apr 11, 2023
d091ce0
added TODO and link to issue
jan-vcapgemini Apr 11, 2023
ebd5dec
generating platform definition based on local plugins build.
maybeec Apr 11, 2023
bb245f1
removed 2nd initialization of CobiGen
jan-vcapgemini Apr 13, 2023
682538e
Merge branch 'master' into template-set-deployables
jan-vcapgemini Apr 13, 2023
7c4d31b
spellcheck fixes
jan-vcapgemini Apr 13, 2023
35ca10a
fixed last spellcheck issues
jan-vcapgemini Apr 13, 2023
603c105
cleanup and fixing eclipse import issues with m2e
maybeec Apr 14, 2023
de4177b
Revert "cleanup and fixing eclipse import issues with m2e"
jan-vcapgemini Apr 17, 2023
58cf2c9
Revert "generating platform definition based on local plugins build."
jan-vcapgemini Apr 17, 2023
5821c9d
Revert "fix eclipse e2e test classpath"
jan-vcapgemini Apr 17, 2023
8d68916
Fixed elif syntax
maybeec Apr 17, 2023
8f9e0f3
Merge branch 'template-set-deployables' into 1454-gui-templatesets
jan-vcapgemini Apr 19, 2023
9dd6349
Merge branch 'master' into 1454-gui-templatesets
jan-vcapgemini Apr 19, 2023
ca2f325
#1545 fixed merge issues
jan-vcapgemini Apr 19, 2023
0065086
Merge branch 'master' into 1454-gui-templatesets
jan-vcapgemini Jul 19, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Prev Previous commit
Next Next commit
#1495 Combine template and configuration files into template set files (
#1597)

* #1495 All changes in one commit

* #1495 Resolved merge conflicts

* #1495 Resolved conflicts

* #1495 applied stash

* #1495 deleted obsolete classes

* #1495 removed useless method

* #1495 Fixed templates.xml upgrader tests

* trigger map will be loaded correctly

* #1495 Fix for core-systemtests

* #1495 Removed duplicates

* fixed tests

* Revert "fixed tests"

This reverts commit da30dda.

* added cli test

* #1495 new core tests for tempalate-set.xml

* #1495 Implemented a specifier for the reader

* Revert "#1495 Implemented a specifier for the reader"

This reverts commit 0edc655.

* #1495 Changed templateSetConfiguration schema structure

* #1495 Fixed TemplateSetConfigurationReader to read the new templateSetConfiguration.xsd
added new Core tests and test resources

* fixed install templates test

* #1495 Added new test for Templatescan

* #1495 Deleted unnecessary resources

* Merged context.xml and templates.xml into template-set.xml for:
- crud-openapi-java-server-app
- crud-openapi-net
- crud-typescript-angular-client-app
- kafka-documentation
- named-queries
- openapi-documentation
- rest-documentation
- security-permissions
- testdata-builder

* #1495 Merged context.xml and templates.xml to template-set.xml

* #1495 Fixed template-scan issue

* #1495 Fixed syntax errors in template-set.xml Files

* #1495 Fixed Templatescan not finding the templates location

* #1495 TemplateSetReader combination test
added new constructors to template and context readers
cleaned up TemplateSetConfigurationReader
added templates and context configuration getters to TemplateSetConfigurationReader
changed all versioned imports to default io
initialized templates and context readers in TemplateSetConfiguration readConfiguration method
removed template set detection in templates and context configuration

* #1495 re-added template set condition
created templates and context configuration readers in template set readConfiguration method
added configFilePath to TemplatesConfiguration constructor
initialized templates and context configuration readers in template set readConfiguration method
cleaned up template set template scan test

* #1495 added more tests + resources
cleaned up test resources

* #1495 fixes
added ConfigurationHolder to TemplateSetConfiguration
added javadocs
fixed configFilePath in TemplatesConfigurationReader for template-sets
added templateSetConfigurationFile to TemplatesConfigurationReader
fixed templates subfolder being used for rootTemplateFolder
added a 2nd template-set to GenerationTestTemplateSetsXml

* #1495 removed unused method

* #1495 adjusted readConfiguration
removed readConfiguration call from TemplateSetConfigurationReader
added readConfiguration to TemplateSetConfiguration
filled maps of triggers and templates in TemplateSetConfiguration readConfiguration method
reformatted and adjusted test resource template-set.xmls

* #1495 fixed create and generate
replaced triggers in ContextConfiguration readConfiguration with template set triggers
added extra check to getConfigLocationForTrigger (checks if template set is available)
added getter for triggers to TemplateSetConfiguration
temporary fix for missing templateFolder in trigger
renamed test

* #1495 Added TemplateSetConfiguration directly into the configuraion holder
#	cobigen-cli/cli-systemtest/src/test/java/com/devonfw/cobigen/cli/systemtest/GenerateCommandIT.java
#	cobigen/cobigen-core-api/src/main/java/com/devonfw/cobigen/api/constants/ConfigurationConstants.java
#	cobigen/cobigen-core/pom.xml
#	cobigen/cobigen-core/src/main/resources/schema/v6.0/templateSetConfiguration.xsd

* #1495 fixed tests
added wip hack for template_scan conflict with "templates/templates" paths
moved "template/templates" root path creation into extra method initializeTemplateSetTemplatesRoot
fixed templateScan paths in test resources (jar file too)

* #1495 replaced mocked java plug-in
added testdata_builder template-set to core-systemtest resources
replaced mocked java plug-in with real input class

* #1495 Made the ConfigurationHolder a singleton and some other refactors

* #1495 removed ConfigurationFactory
moved retrieveTemplatesConfiguration and retrieveTemplateSetConfiguration to ConfigurationHolder

* #1495 removed singleeton again because this pattern didn't make sense here in the first place

* #1495 Lots of optimizations and cleanup
moved detection of template set from ContextConfiguration to ConfigurationHolder
added lots of javadoc comments
cleaned up AbstractContextConfiguration
replaced TemplateSetConfiguration in ContextConfiguration with ConfigurationHolder
added new Map rootTemplateFolders to ConfigurationHolder (replaces triggerConfigLocations?)

* #1495 added 2nd template to overrideMerge test

* #1495 more optimizations and cleanups
moved isTemplateSet check from TemplatesConfiguration to ConfigurationHolder
added new templatesConfigurations getter to ConfigurationHolder
cleaned up ContextConfiguration constructor (made sure that triggers won't be loaded again)
added a getter for increments to TemplateSetConfiguration

* #1495 initialized proper templates list
added templatesConfigurations to TemplateSetConfiguration
passed properly initialized TemplatesConfigurations to getMatchingTemplates if we are in template set

* #1495 more optimizations and cleanups
removed Context and TemplatesConfigurationReaders from TemplateSetConfigurationReader
initialized Context and TemplatesConfigurationReaders in TemplateSetConfiguration
removed retrieveTemplatesConfiguration method (moved logic into readTemplatesConfiguration)

* #1495 fixed template_scan root folder lookup

* #1495 added and cleaned up tests
added new classLoadingTemplateSetTest and resources
added new testTemplateSetCorrectDestinationResolution test and resources
reduced current test resource complexity
renamed testReadTwoTemplateSetXml to testReadMultipleTemplateSetXmls

* #1495 refactored loadTemplateSetFilesAdapted
moved retrieval of template set root folders to new method

* #1495 fixed conflict with templateRoot and utilsLocation
added new retrieveTemplateSetUtilsLocationForTrigger method

* #1495 fixed callClassLoadingTemplateSetTest
added proper resources

* #1495 added variableAssignments
added variableAssignments to ClassLoading template set system test
re-added fileSystemDependentPath handling to getConfigurationLocationforTrigger
fixed ClassLoading template set system test

* #1495
Some refactors

* #1495 Fixed error from previous push

* #1495 fixed fileSystem conflict replaced 2nd if condition with else fixed unit tests changed templateSetFiles field (might be unnecessary)

* #1495 disabled templates generation integration test

* #1495 added example template-set integration test
added example template-set integration test for crud-java-server-app template set
moved functions.ftl into root template folder of crud-java-server-app

* #1495 refactoring

* #1495 added a test for version conflict detection
some cleanup
added test resources

* #1495 removed static call

* #1495 more optimizations and fixes
split adapted and downloaded paths
removed duplicated methods from TemplateSetConfigurationReader (can be found in TemplateSetConfigurationManager)
fixed typos
added getter for configuration locations to TemplateSetConfigurationManager
removed file system creation and isZipFile check in ContextConfiguration retrieveConfigRootByTrigger and retrieveTemplateSetUtilsLocaitonByTrigger

* #1495 added example template-set integration test
added example template-set integration test for crud-openapi-java-server-app template set
moved functions.ftl and makros.ftl into root template folder of crud-openapi-java-server-app

* #1495 cleanup and test fixes
removed unnecessary templateSetFiles field
removed getTemplateSetFiles and addTemplateSetFiles methods
fixed TemplateSetConfigurationReader check if configurations were found (added downloaded template set paths check)
fixed template set reader unit tests

* #1495 fixed makros and functions
moved makros and functions into templates folder

* #1495 disabled version conflict test

* #1495 fixed github workflow
enabled enableCrossOsArchive for eclipse-test cache restore

* #1495 implemented requested changes
reverted changes on AccumulationType Matcher

* #1495 implemented requested changes
removed unused imports

* #1495 implemented requested changes
changed version float number
adjusted javadoc

* #1495 implemented requested changes
adjusted TemplateSetConfiguration initial release description

* #1495 implemented requested changes
adjusted/enhanced javadocs
fixed typos
removed links to Path

* #1495 implemented requested changes
changed throws from generic Exception to more specific ones
adjusted javadocs

* #1495 implemented requested changes
changed compare to equals (sonatype issue fixed)

* #1496 removed resource build
removed src/main/templates dependency

* #1495
updated javadoc for templateSetConfigurations

* added import that was lost in a merge

* #1495 renamed test resources and changed folder structure

* cleaning up the ressources and changing the structure to the new template set structure

* adjusted ressources after merge

* #1495 finallized test folder structure

* #1495 fixed template set test structure
moved templates and config files into src/main/resources

* #1495 fixed template set resolving
replaced src/main/templates with src/main/resources in TemplateSetConfigurationManager
removed template resource folder inside downloaded template set detection
removed initializeTemplateSetTemplatesRoot (will be handled by ts_scan configuration now)

* #1495 fixed template set tests
fixed template set resource configurations
disabled testTemplateSetsDuplicatedThrowsError test
added templates folder to each template set test resource configuration (fixes template_scan conflict)
added downloaded projects to test resources and built them in core pom.xml (removes dependency on binaries)
removed binaries from test resources
added test resource jars to .gitignore

* #1495 fixed template set projects
moved functions and makros into src/main/resources

* #1495 fixed cli tests
added downloaded test project and automatic build
replaced src/main/templates with src/main/resources

* #1495 fixed template set resource folder
fixed template set resource folder in crud-java-server-app template set test

* #1495 optimized template set tests
renamed single template set tests
removed unnecessary file copy operations in setupDevtemplates method
added test data builder test
added crud angular client app test

* #1495 fixed conflicted class load template set test

* #1495 added crud openapi net test to template set

* #1495 fixed template set jars

* #1495 adjusted GenerationIT system test
added template set jar test projects to system test
made sure that generation of all template sets (including downloaded jars) gets tested
added generated jars to .gitignore

* #1495 fixed plugin loading and jar pathing
added OpenApi test resource and test
renamed GenerationIT tests
added OpenApi dependency to core-systemtest and root pom

* #1495 resolved TODO
renamed src/main/resources constant to MAVEN_CONFIGURATION_RESOURCE_FOLDER

* #1495 resolved TODO
added javadoc for templateSetConfigurationFile
removed throws declaration

* #1495 modularized old monolithic template tests
added individual templateSet tests and resources to each templateSet project

* #1495 added missing typescript templateSet test

* #1495 resolved TODO
removed unused loadConfig method

* #1495 resolved TODOs
removed FileNotFoundException
made templateSetPaths private
removed TODOs which are not needed anymore

* #1495 resolved TODO
added extra condition for optional template folders in template sets
removed todo

* #1495 Fixed folder structure in crud-java-ea-uml

* added missing jars to ignore

* #1495 temporarily disabled test

* #1495 temporarily disabled tests

---------

Co-authored-by: MansourD <96188427+mdukhan@users.noreply.github.com>
Co-authored-by: MansourD <mansour.dukhan@capgemini.com>
Co-authored-by: EduardKrieger <eduard.krieger@capgemini.com>
Co-authored-by: Lurian <lurian-code@protonmail.com>
Co-authored-by: jan-vcapgemini <jan-vincent.hoelzle@capgemini.com>
Co-authored-by: Malte Brunnlieb <maybeec@users.noreply.github.com>
Co-authored-by: cedricarnauld123 <cedricarnauld2@gmail.com>
  • Loading branch information
8 people authored Mar 13, 2023
commit 514b1e66e012a2268544f1a75953c1d6564c175f
9 changes: 8 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -33,4 +33,11 @@ objectdb

#Intellij
.idea
*.iml
*.iml
/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets_downloaded/template-sets/downloaded/crud-java-server-app-test.jar
/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets/template-sets/downloaded/crud-java-server-app-test.jar
/cobigen-cli/cli-systemtest/src/test/resources/testdata/templatesproject/template-sets/downloaded/crud-java-server-app-test.jar
/cobigen/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTestTemplateSetsXml/template-sets/downloaded/downloaded-template-set1-test-test.jar
/cobigen/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTestTemplateSetsXml/template-sets/downloaded/downloaded-template-set2-test-test.jar
cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTestTemplateSetsXml/template-sets/downloaded/downloaded-template-set2-test-test.jar
cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTestTemplateSetsXml/template-sets/downloaded/downloaded-template-set1-test-test.jar
20 changes: 20 additions & 0 deletions cobigen-cli/cli-systemtest/pom.xml
Original file line number Diff line number Diff line change
@@ -12,6 +12,7 @@
<properties>
<maven.test.path>src\test\resources\testdata\localmavenproject\maven.project</maven.test.path>
<maven.test.templates.path>src\test\resources\testdata\templatesproject\templates-devon4j</maven.test.templates.path>
<maven.test.templateset.downloaded.path>src\test\resources\testdata\templatesproject\template-sets/downloaded/crud-java-server-app</maven.test.templateset.downloaded.path>
</properties>

<dependencies>
@@ -111,6 +112,25 @@
</arguments>
</configuration>
</execution>
<execution>
<id>Install test template set downloaded project</id>
<phase>test-compile</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>mvn</executable>
<workingDirectory>${maven.test.templateset.downloaded.path}</workingDirectory>
<arguments>
<argument>install</argument>
<!-- https://stackoverflow.com/a/66801171 -->
<argument>-Djansi.force=true</argument>
<argument>-Djansi.passthrough=true</argument>
<argument>-B</argument>
<argument>-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn</argument>
</arguments>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
Original file line number Diff line number Diff line change
@@ -98,7 +98,7 @@ public static void determineDevTemplatesPath() throws URISyntaxException, IOExce
for (Path path : devTemplateSets) {
if (Files.isDirectory(path)) {
Path resourcesFolder = path.resolve("src/main/resources");
Path templatesFolder = path.resolve(ConfigurationConstants.TEMPLATE_RESOURCE_FOLDER);
Path templatesFolder = path.resolve(ConfigurationConstants.MAVEN_CONFIGURATION_RESOURCE_FOLDER);
if (Files.exists(resourcesFolder) && !Files.exists(templatesFolder)) {
try {
Files.move(resourcesFolder, templatesFolder);
Original file line number Diff line number Diff line change
@@ -6,6 +6,7 @@
import java.nio.file.Files;
import java.nio.file.Path;

import org.junit.Ignore;
import org.junit.Test;

import com.devonfw.cobigen.api.constants.ConfigurationConstants;
@@ -22,6 +23,7 @@ public class AdaptTemplatesCommandIT extends AbstractCliTest {
* @throws Exception test fails
*/
@Test
@Ignore // TODO: re-enable when template set adaptation is implemented
public void adaptTemplateSetTest() throws Exception {

Path cliSystemTestPath = new File(
Loading