Wrong name and type on findById generation

[roneliocronapp]

Overview of the issue

When you specify a type other than "Long", the JDL utility overrides the method to "Long" instead of preserving the entered type.

Motivation for or Use Case

Since jhipster supports name definition for primary keys, the name provided must be in all generated code.

Note that some parts have the given name and others are not.

Reproduce the error

Create a jdl file with:

entity CategoriaServico {
@id codigo Long
descricao String required maxlength(50)
}

run jhipster jdl src/main/resources/config/entities.jdl --force

Related issues

Suggest a Fix

JHipster Version(s)

JHipster configuration

INFO! Using JHipster version installed locally in current project's node_modules
7.2.0

JHipster configuration, a .yo-rc.json file generated in the root folder

.yo-rc.json file

{
  "generator-jhipster": {
    "applicationType": "monolith",
    "baseName": "ggg",
    "jhipsterVersion": "7.2.0",
    "skipClient": false,
    "skipServer": false,
    "skipUserManagement": false,
    "skipCheckLengthOfIdentifier": false,
    "skipFakeData": false,
    "jhiPrefix": "jhi",
    "entitySuffix": "",
    "dtoSuffix": "DTO",
    "testFrameworks": [],
    "blueprints": [],
    "otherModules": [],
    "pages": [],
    "creationTimestamp": 1633183789805,
    "serviceDiscoveryType": "no",
    "reactive": true,
    "authenticationType": "jwt",
    "packageName": "com.ggg.backend",
    "serverPort": "8080",
    "cacheProvider": "no",
    "enableHibernateCache": false,
    "databaseType": "sql",
    "devDatabaseType": "postgresql",
    "prodDatabaseType": "postgresql",
    "buildTool": "maven",
    "serverSideOptions": ["enableSwaggerCodegen:true"],
    "websocket": false,
    "searchEngine": false,
    "messageBroker": false,
    "enableSwaggerCodegen": true,
    "clientFramework": "angularX",
    "withAdminUi": true,
    "clientTheme": "litera",
    "clientThemeVariant": "primary",
    "enableTranslation": true,
    "nativeLanguage": "pt-br",
    "jwtSecretKey": "YourJWTSecretKeyWasReplacedByThisMeaninglessTextByTheJHipsterInfoCommandForObviousSecurityReasons",
    "devServerPort": 4200,
    "clientPackageManager": "npm",
    "languages": ["pt-br", "es"],
    "enableGradleEnterprise": false,
    "entities": ["CategoriaServico", "ChatMessagem", "PlanoServico"],
    "lastLiquibaseTimestamp": 1633267155000
  }
}

JDL for the Entity configuration(s) entityName.json files generated in the .jhipster directory

JDL entity definitions

entity CategoriaServico {
  codigo Long
  descricao String required maxlength(50)
}
entity ChatMessagem {
  codigo UUID
  servicoCodigo UUID required
  usuarioEnviado UUID required
  usuarioRecebido UUID required
  mensagem TextBlob
  dataCadastro LocalDate
}
entity PlanoServico {
  codigo Long
  descricao String required maxlength(50)
  taxaServico Double required
}

Environment and Tools

openjdk version "11.0.10" 2021-01-19
OpenJDK Runtime Environment AdoptOpenJDK (build 11.0.10+9)
OpenJDK 64-Bit Server VM AdoptOpenJDK (build 11.0.10+9, mixed mode)

Entity configuration(s) CategoriaServico.json files generated in the .jhipster directory

{
  "name": "CategoriaServico",
  "fields": [
    {
      "fieldName": "codigo",
      "fieldType": "Long",
      "options": {
        "id": true
      }
    },
    {
      "fieldName": "descricao",
      "fieldType": "String",
      "fieldValidateRules": ["required", "maxlength"],
      "fieldValidateRulesMaxlength": "50"
    }
  ],
  "relationships": [],
  "entityTableName": "categoria_servico",
  "dto": "no",
  "pagination": "no",
  "service": "no",
  "jpaMetamodelFiltering": false,
  "fluentMethods": true,
  "readOnly": false,
  "embedded": false,
  "applications": "*",
  "changelogDate": "20211003021605"
}

Browsers and Operating System

• Checking this box is mandatory (this is just to show you read everything)

[roneliocronapp]

I noticed that this problem only occurs when I use "webflux" options.

Primary key with UUID type is always reverted to "Long"

Primary key with custom name is always reverted to "id"

[swarajsaaj]

This seems because of hardcoding in following instead of using primaryKey.type:-

generator-jhipster/generators/entity-server/templates/src/main/java/package/repository/EntityRepository_reactive.java.ejs

Lines 138 to 144 in 67d1fa1

	Flux<<%= persistClass %>> findAll();
	@Override
	Mono<<%= persistClass %>> findById(Long id);
	@Override
	<S extends <%= persistClass %>> Mono<S> save(S entity);

and

generator-jhipster/generators/entity-server/templates/src/main/java/package/repository/EntityRepositoryInternalImpl_reactive.java.ejs

Lines 150 to 154 in 67d1fa1

	@Override
	public Mono<<%= persistClass %>> findById(<%= primaryKey.type %> id) {
	return createQuery(null, where("id").is(id)).one();
	}

This should be fixed, will need to check what impact does it have.

[ronelio]

OK. I forked and made some changes. That worked!

I'll do more tests and post the result.

[swarajsaaj]

Would you like to do a pull request? :)

[ronelio]

Fixed some hard-coded references, but I've seen many others at tables join scripts.

I'll keeping coding and fix what I have found.

[swarajsaaj]

I think #16603 fixes this issue.