Skip to content

Commit

Permalink
Upgrade KHipster to support version 7 (#276)
Browse files Browse the repository at this point in the history 
* finished first cut for 7.0.0 release

* feat: upgrade the entity generator to v7 beta

* feat: upgrade server generator to v7

* feat: upgrader server generator to v7

* feat: update configuration to v7

* feat: migrate web/rest to v7

* feat: upgrade security to v7.0

* migrate repository tov v7 beta

* migrate service to v7 beta

* feat: upgrade config test directory to version 7

* migrate cucumber to v7

* feat: migrate gateway to v7

* feat: migrate repository test to v7

* feat: migrate security/jwt to v7

* feat: migrate cookie token extractor to v7

* feat: migrate security to v7

* feat: migrate mapper to v7

* feat: migrate service and test service to v7

* feat: migrate rest resources to v7

* feat: migrate Cassandra config test utils to v7

* fix: type configuration fixes

* feat: migrate test and test integration scripts to v7

* migrate workflows to v7 step 1

* migrate tests and integration scripts

* feat: migrate files to v7

* fix: use proper generic import

* feat: upgrade other files to v7

* feat: update expected-files to v7

* feat: update app spec to v7

* feat: test updates and remove import static

* add missing jhi_clone path

* fix: lint fixes

* fix ejs lint error

* fix: remove duplicate sonar analysis

* fix template lint issues

* feat: fix build issues

* fix: entity server unit test

* fix: failing test case because of missing prettier transform

* remove withAudit configuration

* feat: add postWriting in server configuration

* rename primaryKeyType to primaryKey.type

* rename JHipsterBlockHoundIntegration

* compilation fixes

* fix: some more bugs

* fix: add fun modifier for functions

* fix: remove extra braces and use proper field accessor

* fix: add a line break between package and import

* fix: add secondary constructor for the UserDTO

* fix: use proper variable declaration in patch_tempalte

* fix di and type selection

* fix: add variable name

* fix: migrate entity generator to v7 and few other fixes

* fix: make converters as an object

* fix: remove trailing commas

* fix: remove return type reference

* fix: use kotlin class reference

* fix: infer type

* fix build file issue

* fix: template string

* fix: mongodb kafka app generation

* fix: enity configuration and lint issues

* remove couchbase and fix kapt

* fix: react ci build issues

* lint fix

* fix generated services and entities

* fix react builds and remove couchbase builds

* make authorities proper

* Upgrade kotlin to latest version

* fix test failures in react default application

* lint fixes and failing unit test fixes

* fix: add a proper script folder

* fix: update cloned path for angular ci

* revert change

* fix more type issues

* Update EntityResourceIT.kt.ejs

* fix react ci tests

* Update PublicUserResource.kt.ejs

* webflux fixes

* feat/webflux fixes for v7 migration

* few more fixes

* fix cucumber tests

* replace proper cassandra version variable

* fix: workflow and kotlinify

* feat: add support for --pk-type

part of jhipster/generator-jhipster#13296

* Add support to `@MapstructExpression`

Refer jhipster/generator-jhipster#13195

* fix: Replace deprecated `StringUtils.isEmpty()` by `ObjectUtils.isEmpty()` and cover its usage with tests

Refer jhipster/generator-jhipster#13369

* chore: Change from 'idx in' to 'item of' for fields and relationships at server templates.

Refer jhipster/generator-jhipster#13382

* fix: Neo4j relation rework

Refer jhipster/generator-jhipster#13106

* fix: Swagger UI for reactive applications

Refer jhipster/generator-jhipster#13409

* fix: sonar code smells

Refer jhipster/generator-jhipster#13408

* chore: typo updates

* feat: Add custom claim converter in a microservice with oauth2

Refer jhipster/generator-jhipster#12609

* fix: import fixes for custom claim converter test

* fix: Fix reactive tests by assigning @NotNull a default message

Refer: jhipster/generator-jhipster#13483

* fix: R2DBC with OAuth

Refer jhipster/generator-jhipster#13485

* fix: Remove Transactional when using no db

Refer:  jhipster/generator-jhipster#13489

* fix: Ensure /websocket/tracker/ cant bypass

Refer: jhipster/generator-jhipster#13440

* fix: Fix R2DBC with OAuth

Refer: jhipster/generator-jhipster#13493

* chore: fix minor code smells

* fix: Broken Swagger with Microservice

Refer: jhipster/generator-jhipster#13446

* fix: minor updates

Refer: jhipster/generator-jhipster#13495

* fix: Change save template to use precedence

Refer: jhipster/generator-jhipster#12802:
jhipster/generator-jhipster#12802

* fix: add where clause from data jpa criteria when reactive

Refer: jhipster/generator-jhipster#13515

* fix: update dependencies and linting fixes

* fix: Update build pipeline versions

* fix: Angular workflow

* fix: copy error

* fix: missing otherEntityRelationshipNamePlural variable

* fix: ci script

* fix: remove unsupported hr language

* fix: more angular ci fixes

* fix: more angular ci fixes

* fix: move CustomClaimConverter to security package

* fix: expected files

* fix: ci to use installed version of jhipster

* rename webpack profile to webapp

* fix: refactor ci test

* fix: scripts path

* fix use proper path

* fix: add script level JHI_HOME

* fix: use correct  kotlin-samples folder

* chore: [ci] update chmod

* fix: missing variable and correct file location

* chore: [CI] add JHI_SCRIPTS location

* chore: [CI] add JHI_CLONED_SCRIPTS location

* chore: [CI] add HOME location

* chore: [CI] add HOME location

* Use tilde for home folder

* remove 13-replace-jhipster-version script

* temp: check scripts folder

* fix: use local scripts

* chore: [CI] add default work directory

* fix: use leading comma

* chore: [CI] remove additional app test

* minor fixes

* fix: use proper primary key name

* fix: replace id with primaryKey.type

* chore: [CI] add react workflow

* chore: [CI] upgrade angular workflow

* chore: [CI] add webflux workflow

* fix: entityResource

* chore: [CI] more workflow changes

* chore: [CI] Remove prettier check

* chore: [CI] fix react and webflux workflow

* fix: add UUID import for cassandra

* chore: [CI] use proper script for webflux

* fix: use apply instead of constructor params

* fix: change the constructor params

* fix: add UUIDFilter import for entity criteria

* fix: make queryservice to use properly typed filter

* fix: tests to have proper primarykey reference

* fix: use proper type for filter in EntityQueryService

* fix: type issues

* fix: redis configuration of test containers

* fix: generator entity spec test

* fix: entity post fix

* chore: [Test] Lint fixes

* chore: remove maven cucumber tests

* fix: sql webflux issues

* fix: use property accessor instead of getter

* chore: CI remove kafka test case

* fix: remove string utils

* Update EntityRepositoryInternalImpl_reactive.kt.ejs

* fix: add test fixes and other converters

* feat: migrate templates to v7

* lint fixes

* fix: update dependencies

* update package lock with npm v7

* fix: mocha tests

* lint fixes

* fix: double ejs tags

* fix: removed extra ejs tag

* fix: refactor missing type definition

* fix: use proper class variable

* fix: import repository always

* fix: clean up tests

* fix: use proper variable

* fix: remove mock builder standalone setup

* fix: reactive templates

* fix: remove reactive block

* fix: reactive modify server open api filter

* fix: reactive gateway

* fix: more reactive fixes

* fix: reactive file generation

* fix: no return in save template

* fix more reactive test

* fix: remove deprecated size configuration

* fix row mapper type checks

* fix: tests in custom claim converter

* fix: custom claim converter test

* fix: columnConverter for webflux r2dbc

* fix: extra parentheis

* fix: null checks

* fix: use empty Set instead of null

* fix: tests and persistence constructor

* fix: add coroutines lib for webflux

* fix: add kotlin extensions library

* fix: add reactor dependencies for maven

* fix: remove mariadb converter issue

* fix: webflux build and jdk version

* fix: generator unit test

* fix: install generator after npm ci

* fix: change reactive containers for psql

* fix: remove tc in the database url

* fix: remove reactive sql tests

* chore: remove azure pipelines
  • Loading branch information
@sendilkumarn
sendilkumarn committed Apr 18, 2021
1 parent 3de23d0 commit 515afa2
Show file tree
Hide file tree
Showing 288 changed files with 24,845 additions and 18,282 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"no-plusplus": "off",
"no-unused-expressions": [2, { "allowShortCircuit": true, "allowTernary": true }],
"prefer-destructuring": "off",

"consistent-return": "off",
"no-multi-assign": "off",
"no-param-reassign": "off",
"no-shadow": "off"
Expand Down
259 changes: 195 additions & 64 deletions .github/workflows/angular.yml
View file

Large diffs are not rendered by default.

78 changes: 0 additions & 78 deletions .github/workflows/applications.yml
View file

This file was deleted.

93 changes: 46 additions & 47 deletions .github/workflows/codeql-analysis.yml
View file
Original file line number Diff line number Diff line change
@@ -1,51 +1,50 @@
name: "Code scanning - action"
name: 'Code scanning - action'

on:
push:
pull_request:
schedule:
- cron: '0 1 * * 0'
push:
pull_request:
schedule:
- cron: '0 1 * * 0'

jobs:
CodeQL-Build:

runs-on: ubuntu-latest

steps:
- name: Checkout repository
uses: actions/checkout@v2
with:
# We must fetch at least the immediate parents so that if this is
# a pull request then we can checkout the head.
fetch-depth: 2

# If this run was triggered by a pull request event, then checkout
# the head of the pull request instead of the merge commit.
- run: git checkout HEAD^2
if: ${{ github.event_name == 'pull_request' }}

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
# Override language selection by uncommenting this and choosing your languages
# with:
# languages: go, javascript, csharp, python, cpp, java

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v1

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl

# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language

#- run: |
# make bootstrap
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
CodeQL-Build:
runs-on: ubuntu-latest

steps:
- name: Checkout repository
uses: actions/checkout@v2
with:
# We must fetch at least the immediate parents so that if this is
# a pull request then we can checkout the head.
fetch-depth: 2

# If this run was triggered by a pull request event, then checkout
# the head of the pull request instead of the merge commit.
- run: git checkout HEAD^2
if: ${{ github.event_name == 'pull_request' }}

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
# Override language selection by uncommenting this and choosing your languages
# with:
# languages: go, javascript, csharp, python, cpp, java

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v1

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl

# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language

#- run: |
# make bootstrap
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
75 changes: 44 additions & 31 deletions .github/workflows/generator.yml
View file
Original file line number Diff line number Diff line change
@@ -1,43 +1,56 @@
name: KHipster Generator CI
#
# Copyright 2013-2021 the original author or authors from the JHipster project.
#
# This file is part of the JHipster project, see https://www.jhipster.tech/
# for more information.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

name: Generator
on: [push, pull_request]
env:
JHI_RUN_APP: 1
JHI_PROTRACTOR: 0
JHI_JDK: 11
JHI_LIB_REPO: https://github.com/jhipster/jhipster.git
JHI_LIB_BRANCH: release
JHI_GEN_REPO: https://github.com/jhipster/generator-jhipster.git
JHI_GEN_BRANCH: v6.10.5
SPRING_OUTPUT_ANSI_ENABLED: ALWAYS
SPRING_JPA_SHOW_SQL: false
JHI_DISABLE_WEBPACK_LOGS: true
JHI_E2E_HEADLESS: true
JHI_SCRIPTS: $HOME/generator-jhipster/test-integration/scripts
KOTLIN_JHI_SCRIPTS: ${{ github.workspace }}/test-integration/scripts
JHI_GITHUB_CI: true
JHI_APP: ''
jobs:
kotlin-hipster:
name: KHipster generator unit test suite
generator-jhipster:
name: npm test
runs-on: ${{ matrix.os }}
if: >-
!contains(github.event.head_commit.message, '[ci skip]') &&
!contains(github.event.head_commit.message, '[skip ci]') &&
!contains(github.event.pull_request.title, '[skip ci]') &&
!contains(github.event.pull_request.title, '[ci skip]') &&
(github.event.pull_request.draft == false || !contains(github.event.pull_request.labels.*.name, 'pr: skip-ci'))
timeout-minutes: 20
strategy:
fail-fast: false
matrix:
node_version: [14.15.0]
os: [ubuntu-latest]
node_version: [14.16.0]
os: [ubuntu-20.04]
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
- uses: actions/setup-node@v2.1.5
with:
node-version: ${{ matrix.node_version }}
- name: 'install required npm version'
run: npm install -g npm@$(node -e "console.log(require('generator-jhipster/generators/generator-constants').NPM_VERSION);")
- name: 'install npm@${{ matrix.npm_version }}'
run: npm install -g npm@${{ matrix.npm_version }}
- run: git --no-pager log -n 10 --graph --pretty='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue) <%an>%Creset' --abbrev-commit
shell: bash
- name: Config git variables
run: $KOTLIN_JHI_SCRIPTS/04-git-config.sh
- name: Install and execute unit tests
run: $KOTLIN_JHI_SCRIPTS/10-install-jhipster-kotlin.sh
env:
JHI_SCRIPTS: ./test-integration/scripts
run: $JHI_SCRIPTS/04-git-config.sh
shell: bash
- run: npm ci
- run: npm i -g .
- run: npm test
if: >-
!contains(github.event.head_commit.message, '[ci skip]') &&
!contains(github.event.head_commit.message, '[skip ci]') &&
!contains(github.event.pull_request.title, '[skip ci]') &&
!contains(github.event.pull_request.title, '[ci skip]') &&
(github.event.pull_request.draft == false || !contains(github.event.pull_request.labels.*.name, 'pr: skip-ci'))
Loading

0 comments on commit 515afa2

Please sign in to comment.