Skip to content

Commit

Permalink
1502 config upgrade (#1528)
Browse files Browse the repository at this point in the history
* Adjust documentation (#1491)

* fixed some types and links and corrected some parts of the documentation

* adjust angular client guide

* fixed typo

* fixed requested changes

* changed eclipse repository to https

* implemented draft for template set upgrader

* trigger getting converted to xml

* context will be splitted, pom generation in progress

* removed useless fields

* removed some comments

* implemented some test

* upgrader implemented

* added backup folder for old templates

* added ignore to templatesetupgradetests

* added ignore to templatesetupgradetests

* chaanged upgrading process and changed the tests of the upgrade

* test for sucessful backup

* changed test to use multiple context files

* #1502 changed context version of reader test files to lates compatible

* changed context version in the jars from the test files

* reworked upgrade step to work with the upgrade prozess to 3.0

* #1502 fixed latest context version in javaplugin integration test

* #1502 fixed some more context versions in tests

* moved template upgrade process out of the abstract class

* implemented requested changes

* removed some files

* the requested changes have been added

* changed use of validate process for the readers

* removed log

* removed import

* #1502 added tags to template sets

* used correct formatting for few files

* #1502 addressed requested changes

* #1502 replaced generic exceptions with CobigenRuntimeExceptions

* #1502 applied proper code reformat

* #1502 fixed template set upgrader and tests
refactored context configuration validation into a new method validateContextConfigurationFile
set all template directories to proper path using ConfigurationConstants
added context configuration file exists and schema validation to testTemplateSetUpgradeCopyOfTemplates test

* #1502 fixed template set upgrader and tests
set all template directories to proper path using ConfigurationConstants

* #1502 fixed template set upgrader and tests
added exception to fail message

Co-authored-by: GuentherJulian <[email protected]>
Co-authored-by: Malte Brunnlieb <[email protected]>
Co-authored-by: Julian Günther <[email protected]>
Co-authored-by: MikeSchumacher <[email protected]>
Co-authored-by: jan-vcapgemini <[email protected]>
  • Loading branch information
6 people authored Jul 4, 2022
1 parent 54f0bca commit 51af790
Show file tree
Hide file tree
Showing 116 changed files with 3,097 additions and 422 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.1">
<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="3.0">

<trigger id="crud_java_server_app" type="java" templateFolder="crud_java_server_app">
<containerMatcher type="package" value="((.+\.)?([^\.]+))\.([^\.]+)\.dataaccess\.api"
Expand All @@ -11,4 +11,7 @@
<variableAssignment type="regex" key="entityName" value="5"/>
</matcher>
</trigger>
<tags>
<tag name="bla" />
</tags>
</contextConfiguration>
30 changes: 0 additions & 30 deletions cobigen-eclipse/cobigen-eclipse-feature/.project

This file was deleted.

35 changes: 0 additions & 35 deletions cobigen-eclipse/cobigen-eclipse-test/.classpath

This file was deleted.

34 changes: 0 additions & 34 deletions cobigen-eclipse/cobigen-eclipse-test/.project

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.1">
<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="3.0">
<trigger id="test" type="java" templateFolder="templates">
<matcher type="fqn" value=".*">
</matcher>
</trigger>
<tags>
<tag name="bla" />
</tags>
</contextConfiguration>
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.1">
<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="3.0">
<trigger id="test" type="java" templateFolder="templates">
<containerMatcher type="package" value=".*" />
<matcher type="fqn" value=".*">
</matcher>
</trigger>
<tags>
<tag name="bla" />
</tags>
</contextConfiguration>
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.1">
<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="3.0">
<trigger id="trigger1" type="java" templateFolder="templates1">
<matcher type="fqn" value=".*">
</matcher>
Expand All @@ -8,4 +8,7 @@
<matcher type="fqn" value=".*">
</matcher>
</trigger>
<tags>
<tag name="bla" />
</tags>
</contextConfiguration>
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.1">
<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="3.0">

<trigger id="crud_openapi_java_server_app" type="openapi" templateFolder="templates">
<containerMatcher type="element" value="openAPIFile"/>
Expand Down Expand Up @@ -29,4 +29,7 @@
<variableAssignment type="property" key="entityName" value="name"/>
</matcher>
</trigger>
<tags>
<tag name="bla" />
</tags>
</contextConfiguration>
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.1">
<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="3.0">

<trigger id="testBasicGeneration" type="java" templateFolder="testBasicGeneration">
<matcher type="fqn" value="(.+)\.Input">
<variableAssignment type="regex" key="package" value="1"/>
</matcher>
</trigger>
<tags>
<tag name="bla" />
</tags>
</contextConfiguration>
25 changes: 0 additions & 25 deletions cobigen-eclipse/cobigen-eclipse-updatesite/.project

This file was deleted.

54 changes: 0 additions & 54 deletions cobigen-eclipse/cobigen-eclipse/.classpath

This file was deleted.

34 changes: 0 additions & 34 deletions cobigen-eclipse/cobigen-eclipse/.project

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.1">
<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="3.0">

<trigger id="test" type="java" templateFolder="templates1">
<matcher type="fqn" value=".*">
</matcher>
</trigger>

<tags>
<tag name="bla" />
</tags>

</contextConfiguration>
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.1">
<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="3.0">

<trigger id="crud_java_server_app" type="java" templateFolder="crud_java_server_app">
<containerMatcher type="package" value="((.+\.)?([^\.]+))\.([^\.]+)\.dataaccess\.api"
Expand All @@ -11,4 +11,7 @@
<variableAssignment type="regex" key="entityName" value="5"/>
</matcher>
</trigger>
<tags>
<tag name="bla" />
</tags>
</contextConfiguration>
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.1">
<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="3.0">

<tags>
<tag name="bla" />
</tags>
</contextConfiguration>
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.1">
<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="3.0">

<trigger id="test" type="java" templateFolder="templates1">
<matcher type="fqn" value=".*">
</matcher>
</trigger>

<tags>
<tag name="bla" />
</tags>

</contextConfiguration>
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.1">
<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="3.0">

<tags>
<tag name="bla" />
</tags>
</contextConfiguration>
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.1">
<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="3.0">

<trigger id="crud_java_server_app" type="java" templateFolder="crud_java_server_app">
<containerMatcher type="package" value="((.+\.)?([^\.]+))\.([^\.]+)\.dataaccess\.api" retrieveObjectsRecursively="false"/>
Expand All @@ -10,4 +10,7 @@
<variableAssignment type="regex" key="entityName" value="5"/>
</matcher>
</trigger>
<tags>
<tag name="bla" />
</tags>
</contextConfiguration>
Loading

0 comments on commit 51af790

Please sign in to comment.