generator-jhipster 8.1.0 → 8.2.0

package/dist/generators/spring-data-relational/support/oracle-reserved-keywords.js

@@ -0,0 +1,504 @@
+/**
+ * Copyright 2013-2024 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.
+ */
+export const oracleReservedKeywords = [
+    'ACCESS',
+    'ACCOUNT',
+    'ACTIVATE',
+    'ADD',
+    'ADMIN',
+    'ADVISE',
+    'AFTER',
+    'ALL',
+    'ALL_ROWS',
+    'ALLOCATE',
+    'ALTER',
+    'ANALYZE',
+    'AND',
+    'ANY',
+    'ARCHIVE',
+    'ARCHIVELOG',
+    'ARRAY',
+    'AS',
+    'ASC',
+    'AT',
+    'AUDIT',
+    'AUTHENTICATED',
+    'AUTHORIZATION',
+    'AUTOEXTEND',
+    'AUTOMATIC',
+    'BACKUP',
+    'BECOME',
+    'BEFORE',
+    'BEGIN',
+    'BETWEEN',
+    'BFILE',
+    'BITMAP',
+    'BLOB',
+    'BLOCK',
+    'BODY',
+    'BY',
+    'CACHE',
+    'CACHE_INSTANCES',
+    'CANCEL',
+    'CASCADE',
+    'CAST',
+    'CFILE',
+    'CHAINED',
+    'CHANGE',
+    'CHAR',
+    'CHAR_CS',
+    'CHARACTER',
+    'CHECK',
+    'CHECKPOINT',
+    'CHOOSE',
+    'CHUNK',
+    'CLEAR',
+    'CLOB',
+    'CLONE',
+    'CLOSE',
+    'CLOSE_CACHED_OPEN_CURSORS',
+    'CLUSTER',
+    'COALESCE',
+    'COLUMN',
+    'COLUMNS',
+    'COMMENT',
+    'COMMIT',
+    'COMMITTED',
+    'COMPATIBILITY',
+    'COMPILE',
+    'COMPLETE',
+    'COMPOSITE_LIMIT',
+    'COMPRESS',
+    'COMPUTE',
+    'CONNECT',
+    'CONNECT_TIME',
+    'CONSTRAINT',
+    'CONSTRAINTS',
+    'CONTENTS',
+    'CONTINUE',
+    'CONTROLFILE',
+    'CONVERT',
+    'COST',
+    'CPU_PER_CALL',
+    'CPU_PER_SESSION',
+    'CREATE',
+    'CURRENT',
+    'CURRENT_SCHEMA',
+    'CURREN_USER',
+    'CURSOR',
+    'CYCLE',
+    ' ',
+    'DANGLING',
+    'DATABASE',
+    'DATAFILE',
+    'DATAFILES',
+    'DATAOBJNO',
+    'DATE',
+    'DBA',
+    'DBHIGH',
+    'DBLOW',
+    'DBMAC',
+    'DEALLOCATE',
+    'DEBUG',
+    'DEC',
+    'DECIMAL',
+    'DECLARE',
+    'DEFAULT',
+    'DEFERRABLE',
+    'DEFERRED',
+    'DEGREE',
+    'DELETE',
+    'DEREF',
+    'DESC',
+    'DIRECTORY',
+    'DISABLE',
+    'DISCONNECT',
+    'DISMOUNT',
+    'DISTINCT',
+    'DISTRIBUTED',
+    'DML',
+    'DOUBLE',
+    'DROP',
+    'DUMP',
+    'EACH',
+    'ELSE',
+    'ENABLE',
+    'END',
+    'ENFORCE',
+    'ENTRY',
+    'ESCAPE',
+    'EXCEPT',
+    'EXCEPTIONS',
+    'EXCHANGE',
+    'EXCLUDING',
+    'EXCLUSIVE',
+    'EXECUTE',
+    'EXISTS',
+    'EXPIRE',
+    'EXPLAIN',
+    'EXTENT',
+    'EXTENTS',
+    'EXTERNALLY',
+    'FAILED_LOGIN_ATTEMPTS',
+    'FALSE',
+    'FAST',
+    'FILE',
+    'FIRST_ROWS',
+    'FLAGGER',
+    'FLOAT',
+    'FLOB',
+    'FLUSH',
+    'FOR',
+    'FORCE',
+    'FOREIGN',
+    'FREELIST',
+    'FREELISTS',
+    'FROM',
+    'FULL',
+    'FUNCTION',
+    'GLOBAL',
+    'GLOBALLY',
+    'GLOBAL_NAME',
+    'GRANT',
+    'GROUP',
+    'GROUPS',
+    'HASH',
+    'HASHKEYS',
+    'HAVING',
+    'HEADER',
+    'HEAP',
+    'IDENTIFIED',
+    'IDGENERATORS',
+    'IDLE_TIME',
+    'IF',
+    'IMMEDIATE',
+    'IN',
+    'INCLUDING',
+    'INCREMENT',
+    'INDEX',
+    'INDEXED',
+    'INDEXES',
+    'INDICATOR',
+    'IND_PARTITION',
+    'INITIAL',
+    'INITIALLY',
+    'INITRANS',
+    'INSERT',
+    'INSTANCE',
+    'INSTANCES',
+    'INSTEAD',
+    'INT',
+    'INTEGER',
+    'INTERMEDIATE',
+    'INTERSECT',
+    'INTO',
+    'IS',
+    'ISOLATION',
+    'ISOLATION_LEVEL',
+    'KEEP',
+    'KEY',
+    'KILL',
+    'LABEL',
+    'LAYER',
+    'LESS',
+    'LEVEL',
+    'LIBRARY',
+    'LIKE',
+    'LIMIT',
+    'LINK',
+    'LIST',
+    'LOB',
+    'LOCAL',
+    'LOCK',
+    'LOCKED',
+    'LOG',
+    'LOGFILE',
+    'LOGGING',
+    'LOGICAL_READS_PER_CALL',
+    'LOGICAL_READS_PER_SESSION',
+    'LONG',
+    'MANAGE',
+    'MASTER',
+    'MAX',
+    'MAXARCHLOGS',
+    'MAXDATAFILES',
+    'MAXEXTENTS',
+    'MAXINSTANCES',
+    'MAXLOGFILES',
+    'MAXLOGHISTORY',
+    'MAXLOGMEMBERS',
+    'MAXSIZE',
+    'MAXTRANS',
+    'MAXVALUE',
+    'MIN',
+    'MEMBER',
+    'MINIMUM',
+    'MINEXTENTS',
+    'MINUS',
+    'MINVALUE',
+    'MLSLABEL',
+    'MLS_LABEL_FORMAT',
+    'MODE',
+    'MODIFY',
+    'MOUNT',
+    'MOVE',
+    'MTS_DISPATCHERS',
+    'MULTISET',
+    'NATIONAL',
+    'NCHAR',
+    'NCHAR_CS',
+    'NCLOB',
+    'NEEDED',
+    'NESTED',
+    'NETWORK',
+    'NEW',
+    'NEXT',
+    'NOARCHIVELOG',
+    'NOAUDIT',
+    'NOCACHE',
+    'NOCOMPRESS',
+    'NOCYCLE',
+    'NOFORCE',
+    'NOLOGGING',
+    'NOMAXVALUE',
+    'NOMINVALUE',
+    'NONE',
+    'NOORDER',
+    'NOOVERRIDE',
+    'NOPARALLEL',
+    'NOPARALLEL',
+    'NOREVERSE',
+    'NORMAL',
+    'NOSORT',
+    'NOT',
+    'NOTHING',
+    'NOWAIT',
+    'NULL',
+    'NUMBER',
+    'NUMERIC',
+    'NVARCHAR2',
+    'OBJECT',
+    'OBJNO',
+    'OBJNO_REUSE',
+    'OF',
+    'OFF',
+    'OFFLINE',
+    'OID',
+    'OIDINDEX',
+    'OLD',
+    'ON',
+    'ONLINE',
+    'ONLY',
+    'OPCODE',
+    'OPEN',
+    'OPTIMAL',
+    'OPTIMIZER_GOAL',
+    'OPTION',
+    'OR',
+    'ORDER',
+    'ORGANIZATION',
+    'OSLABEL',
+    'OVERFLOW',
+    'OWN',
+    'PACKAGE',
+    'PARALLEL',
+    'PARTITION',
+    'PASSWORD',
+    'PASSWORD_GRACE_TIME',
+    'PASSWORD_LIFE_TIME',
+    'PASSWORD_LOCK_TIME',
+    'PASSWORD_REUSE_MAX',
+    'PASSWORD_REUSE_TIME',
+    'PASSWORD_VERIFY_FUNCTION',
+    'PCTFREE',
+    'PCTINCREASE',
+    'PCTTHRESHOLD',
+    'PCTUSED',
+    'PCTVERSION',
+    'PERCENT',
+    'PERMANENT',
+    'PLAN',
+    'PLSQL_DEBUG',
+    'POST_TRANSACTION',
+    'PRECISION',
+    'PRESERVE',
+    'PRIMARY',
+    'PRIOR',
+    'PRIVATE',
+    'PRIVATE_SGA',
+    'PRIVILEGE',
+    'PRIVILEGES',
+    'PROCEDURE',
+    'PROFILE',
+    'PUBLIC',
+    'PURGE',
+    'QUEUE',
+    'QUOTA',
+    'RANGE',
+    'RAW',
+    'RBA',
+    'READ',
+    'READUP',
+    'REAL',
+    'REBUILD',
+    'RECOVER',
+    'RECOVERABLE',
+    'RECOVERY',
+    'REF',
+    'REFERENCES',
+    'REFERENCING',
+    'REFRESH',
+    'RENAME',
+    'REPLACE',
+    'RESET',
+    'RESETLOGS',
+    'RESIZE',
+    'RESOURCE',
+    'RESTRICTED',
+    'RETURN',
+    'RETURNING',
+    'REUSE',
+    'REVERSE',
+    'REVOKE',
+    'ROLE',
+    'ROLES',
+    'ROLLBACK',
+    'ROW',
+    'ROWID',
+    'ROWNUM',
+    'ROWS',
+    'RULE',
+    'SAMPLE',
+    'SAVEPOINT',
+    'SB4',
+    'SCAN_INSTANCES',
+    'SCHEMA',
+    'SCN',
+    'SCOPE',
+    'SD_ALL',
+    'SD_INHIBIT',
+    'SD_SHOW',
+    'SEGMENT',
+    'SEG_BLOCK',
+    'SEG_FILE',
+    'SELECT',
+    'SEQUENCE',
+    'SERIALIZABLE',
+    'SESSION',
+    'SESSION_CACHED_CURSORS',
+    'SESSIONS_PER_USER',
+    'SET',
+    'SHARE',
+    'SHARED',
+    'SHARED_POOL',
+    'SHRINK',
+    'SIZE',
+    'SKIP',
+    'SKIP_UNUSABLE_INDEXES',
+    'SMALLINT',
+    'SNAPSHOT',
+    'SOME',
+    'SORT',
+    'SPECIFICATION',
+    'SPLIT',
+    'SQL_TRACE',
+    'STANDBY',
+    'START',
+    'STATEMENT_ID',
+    'STATISTICS',
+    'STOP',
+    'STORAGE',
+    'STORE',
+    'STRUCTURE',
+    'SUCCESSFUL',
+    'SWITCH',
+    'SYS_OP_ENFORCE_NOT_NULL$',
+    'SYS_OP_NTCIMG$',
+    'SYNONYM',
+    'SYSDATE',
+    'SYSDBA',
+    'SYSOPER',
+    'SYSTEM',
+    'TABLE',
+    'TABLES',
+    'TABLESPACE',
+    'TABLESPACE_NO',
+    'TABNO',
+    'TEMPORARY',
+    'THAN',
+    'THE',
+    'THEN',
+    'THREAD',
+    'TIMESTAMP',
+    'TIME',
+    'TO',
+    'TOPLEVEL',
+    'TRACE',
+    'TRACING',
+    'TRANSACTION',
+    'TRANSITIONAL',
+    'TRIGGER',
+    'TRIGGERS',
+    'TRUE',
+    'TRUNCATE',
+    'TX',
+    'TYPE',
+    'UB2',
+    'UBA',
+    'UID',
+    'UNARCHIVED',
+    'UNDO',
+    'UNION',
+    'UNIQUE',
+    'UNLIMITED',
+    'UNLOCK',
+    'UNRECOVERABLE',
+    'UNTIL',
+    'UNUSABLE',
+    'UNUSED',
+    'UPDATABLE',
+    'UPDATE',
+    'USAGE',
+    'USE',
+    'USER',
+    'USING',
+    'VALIDATE',
+    'VALIDATION',
+    'VALUE',
+    'VALUES',
+    'VARCHAR',
+    'VARCHAR2',
+    'VARYING',
+    'VIEW',
+    'WHEN',
+    'WHENEVER',
+    'WHERE',
+    'WITH',
+    'WITHOUT',
+    'WORK',
+    'WRITE',
+    'WRITEDOWN',
+    'WRITEUP',
+    'XID',
+    'YEAR',
+    'ZONE',
+];
+export const isReservedOracleKeyword = (keyword) => {
+    return oracleReservedKeywords.includes(keyword.toUpperCase());
+};

package/dist/generators/spring-data-relational/support/postgresql-reserved-keywords.js

@@ -0,0 +1,121 @@
+/**
+ * Copyright 2013-2024 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.
+ */
+export const postgresqlReservedKeywords = [
+    'ALL',
+    'ANALYSE',
+    'ANALYZE',
+    'AND',
+    'ANY',
+    'ARRAY',
+    'AS',
+    'ASC',
+    'ASYMMETRIC',
+    'AUTHORIZATION',
+    'BINARY',
+    'BOTH',
+    'CASE',
+    'CAST',
+    'CHECK',
+    'COLLATE',
+    'COLLATION',
+    'COLUMN',
+    'CONCURRENTLY',
+    'CONSTRAINT',
+    'CREATE',
+    'CROSS',
+    'CURRENT_CATALOG',
+    'CURRENT_DATE',
+    'CURRENT_ROLE',
+    'CURRENT_SCHEMA',
+    'CURRENT_TIME',
+    'CURRENT_TIMESTAMP',
+    'CURRENT_USER',
+    'DEFAULT',
+    'DEFERRABLE',
+    'DESC',
+    'DISTINCT',
+    'DO',
+    'ELSE',
+    'END',
+    'EXCEPT',
+    'FALSE',
+    'FETCH',
+    'FOR',
+    'FOREIGN',
+    'FROM',
+    'FULL',
+    'GRANT',
+    'GROUP',
+    'HAVING',
+    'ILIKE',
+    'IN',
+    'INITIALLY',
+    'INNER',
+    'INTERSECT',
+    'INTO',
+    'IS',
+    'ISNULL',
+    'JOIN',
+    'LATERAL',
+    'LEADING',
+    'LEFT',
+    'LIKE',
+    'LIMIT',
+    'LOCALTIME',
+    'LOCALTIMESTAMP',
+    'NATURAL',
+    'NOT',
+    'NOTNULL',
+    'NULL',
+    'OFFSET',
+    'ON',
+    'ONLY',
+    'OR',
+    'ORDER',
+    'OUTER',
+    'OVERLAPS',
+    'PLACING',
+    'PRIMARY',
+    'REFERENCES',
+    'RETURNING',
+    'RIGHT',
+    'SELECT',
+    'SESSION_USER',
+    'SIMILAR',
+    'SOME',
+    'SYMMETRIC',
+    'TABLE',
+    'THEN',
+    'TO',
+    'TRAILING',
+    'TRUE',
+    'UNION',
+    'UNIQUE',
+    'USER',
+    'USING',
+    'VARIADIC',
+    'VERBOSE',
+    'WHEN',
+    'WHERE',
+    'WINDOW',
+    'WITH',
+];
+export const isReservedPostgresqlKeyword = (keyword) => {
+    return postgresqlReservedKeywords.includes(keyword.toUpperCase());
+};

package/dist/generators/spring-data-relational/templates/src/main/java/_package_/_entityPackage_/domain/_persistClass_.java.jhi.hibernate_cache.ejs

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2023 the original author or authors from the JHipster project.
+ Copyright 2013-2024 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.

package/dist/generators/spring-data-relational/templates/src/main/java/_package_/_entityPackage_/domain/_persistClass_.java.jhi.jakarta_lifecycle_events.ejs

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2023 the original author or authors from the JHipster project.
+ Copyright 2013-2024 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.

package/dist/generators/spring-data-relational/templates/src/main/java/_package_/_entityPackage_/domain/_persistClass_.java.jhi.jakarta_persistence.ejs

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2023 the original author or authors from the JHipster project.
+ Copyright 2013-2024 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.
@@ -84,7 +84,7 @@ import org.hibernate.type.SqlTypes;
     @NotNull
       <%_ } _%>
   <%_ } else if (relationship.relationshipManyToMany) { -%>
-    @ManyToMany(fetch = FetchType.LAZY<% if (!relationship.ownerSide) { %>, mappedBy = "<%= relationship.otherEntityRelationshipNamePlural %>"<% } %>)
+    @ManyToMany(fetch = FetchType.LAZY<% if (!relationship.ownerSide) { %>, mappedBy = "<%= relationship.otherRelationship.propertyName %>"<% } %>)
       <%_ if (relationship.ownerSide) { _%>
         <%_ if (relationship.relationshipValidate && relationship.relationshipRequired) { _%>
     @NotNull

package/dist/generators/spring-data-relational/templates/src/main/java/_package_/_entityPackage_/domain/_persistClass_.java.jhi.spring_data_persistable.ejs

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2023 the original author or authors from the JHipster project.
+ Copyright 2013-2024 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.
@@ -28,7 +28,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 <&_ } -&>
 
 <&_ if (fragment.annotationSection) { -&>
-@JsonIgnoreProperties(value = { "new" })
+@JsonIgnoreProperties(value = { "new"<% if (primaryKey.name !== 'id') { %>, "id"<% } %> })
 <&_ } -&>
 
 <&_ if (fragment.additionalInterfacesSection) { -&>

package/dist/generators/spring-data-relational/templates/src/main/java/_package_/_entityPackage_/domain/_persistClass_.java.jhi.spring_data_reactive.ejs

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2023 the original author or authors from the JHipster project.
+ Copyright 2013-2024 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.

package/dist/generators/spring-data-relational/templates/src/main/java/_package_/_entityPackage_/domain/_persistClass_Callback.java.ejs

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2023 the original author or authors from the JHipster project.
+ Copyright 2013-2024 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.