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

Fix R2DBC with OAuth #13485

Merged
merged 3 commits into from
Jan 13, 2021
Merged

Fix R2DBC with OAuth #13485

merged 3 commits into from
Jan 13, 2021

Conversation

mraible
Copy link
Contributor

@mraible mraible commented Jan 13, 2021

Should fix #13467, eventually.


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

Status: Jan 12 21:56 MST, I get the following error when I try to view or edit a blog entity.

2021-01-12 21:50:30.846 ERROR 86651 --- [ctor-http-nio-3] o.z.problem.spring.common.AdviceTraits   : Internal Server Error

org.springframework.dao.IncorrectResultSizeDataAccessException: Query [SELECT e.id AS e_id, e.name AS e_name, e.handle AS e_handle, e.user_id AS e_user_id, e_user.id AS user_id, e_user.login AS user_login, e_user.first_name AS user_first_name, e_user.last_name AS user_last_name, e_user.email AS user_email, e_user.activated AS user_activated, e_user.lang_key AS user_lang_key, e_user.image_url AS user_image_url FROM blog e LEFT OUTER JOIN jhi_user AS e_user ON e.user_id = e_user.id] returned non unique result.
	at org.springframework.data.r2dbc.core.DefaultFetchSpec.lambda$one$0(DefaultFetchSpec.java:61)
	Suppressed: reactor.core.publisher.FluxOnAssembly$OnAssemblyException:
Assembly trace from producer [reactor.core.publisher.FluxFlatMap] :
	reactor.core.publisher.Flux.flatMap(Flux.java:4927)
	org.springframework.data.r2dbc.core.DefaultFetchSpec.one(DefaultFetchSpec.java:53)
Error has been observed at the following site(s):
	|_       Flux.flatMap ⇢ at org.springframework.data.r2dbc.core.DefaultFetchSpec.one(DefaultFetchSpec.java:53)
	|_          Flux.next ⇢ at org.springframework.data.r2dbc.core.DefaultFetchSpec.one(DefaultFetchSpec.java:65)
	|_ Mono.switchIfEmpty ⇢ at tech.jhipster.web.util.reactive.ResponseUtil.wrapOrNotFound(ResponseUtil.java:36)
	|_           Mono.map ⇢ at tech.jhipster.web.util.reactive.ResponseUtil.wrapOrNotFound(ResponseUtil.java:37)
	|_     Mono.usingWhen ⇢ at org.springframework.transaction.interceptor.TransactionAspectSupport$ReactiveTransactionSupport.lambda$null$3(TransactionAspectSupport.java:870)

Here's the JDL I'm testing with:

application {
  config {
    baseName blog
    applicationType monolith
    authenticationType oauth2
    packageName com.jhipster.demo.blog
    prodDatabaseType mysql
    buildTool maven
    clientFramework vue
    reactive true
    testFrameworks [cypress]
  }
  entities *
}

entity Blog {
  name String required minlength(3)
  handle String required minlength(2)
}

entity Post {
  title String required
  content TextBlob required
  date Instant required
}

entity Tag {
  name String required minlength(2)
}

relationship ManyToOne {
  Blog{user(login)} to User
  Post{blog(name)} to Blog
}

relationship ManyToMany {
  Post{tag(name)} to Tag{entry}
}

paginate Post, Tag with infinite-scroll

@mraible
Copy link
Contributor Author

mraible commented Jan 13, 2021

Related: When I tried to view the H2 database to run the query above, I found it returns an error.

Screen Shot 2021-01-12 at 10 14 09 PM

@pascalgrimaud pascalgrimaud merged commit 485b9d0 into jhipster:main Jan 13, 2021
@@ -389,7 +389,7 @@ relationships.forEach((relationship, idx) => {

<%_ if (databaseType === 'sql' && reactive) { _%>
@Column("<%= getColumnName(relationshipName) %>_id")
private Long <%= relationshipFieldName %>Id;
private <% if (relationshipFieldName === 'user' && authenticationType === 'oauth2') { %>String<% } else { %>Long<% } %> <%= relationshipFieldName %>Id;
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
private <% if (relationshipFieldName === 'user' && authenticationType === 'oauth2') { %>String<% } else { %>Long<% } %> <%= relationshipFieldName %>Id;
private <% relationship.otherEntity.primaryKey.type %> <%= relationshipFieldName %>Id;

@pascalgrimaud
Copy link
Member

Sorry @mshima : I merged it too quickly :)

@mshima
Copy link
Member

mshima commented Jan 13, 2021

@pascalgrimaud don't worry it’s just an improvement to support custom type otherwise it’s correct.

@mraible mraible deleted the reactive-r2dbc-oauth branch January 13, 2021 18:57
@mraible mraible mentioned this pull request Jan 13, 2021
5 tasks
@pascalgrimaud pascalgrimaud added this to the 7.0.0-beta.1 milestone Jan 16, 2021
@atomfrede
Copy link
Member

Related: When I tried to view the H2 database to run the query above, I found it returns an error.

Screen Shot 2021-01-12 at 10 14 09 PM

I think this is because the way we start the h2 console are only working in non reactive web environments. For micronaut we had a similar issues (as we are not running on spring) and started the h2 webserver manually instead of the h2 servlet. I guess we can do the same thing here for reactive part. See https://github.com/jhipster/generator-jhipster-micronaut/blob/59931d1c85ec36141622e18a288f68cd11b205c2/generators/server/templates/src/main/java/package/App.java.ejs#L108

@DanielFran
Copy link
Member

@atomfrede This seems a candidate to add to jhipster-bom like it is today for non reactive web environments

sendilkumarn added a commit to jhipster/jhipster-kotlin that referenced this pull request Feb 27, 2021
sendilkumarn added a commit to jhipster/jhipster-kotlin that referenced this pull request Apr 18, 2021
sendilkumarn added a commit to jhipster/jhipster-kotlin that referenced this pull request Apr 18, 2021
* 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
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.

Creating a blog app with reactive + MySQL doesn't compile
5 participants