-
Notifications
You must be signed in to change notification settings - Fork 2.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #35822 from marko-bekhta/feat/i35598-check-embedda…
…ble-is-not-missing Check that embedded property types are marked as @embeddable
- Loading branch information
Showing
3 changed files
with
176 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
154 changes: 154 additions & 0 deletions
154
...uarkus/hibernate/orm/enhancer/HibernateEntityEnhancerMissingEmbeddableAnnotationTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,154 @@ | ||
| /* | ||
| * Hibernate, Relational Persistence for Idiomatic Java | ||
| * | ||
| * License: GNU Lesser General Public License (LGPL), version 2.1 or later. | ||
| * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>. | ||
| */ | ||
| package io.quarkus.hibernate.orm.enhancer; | ||
|
|
||
| import static org.assertj.core.api.Assertions.assertThat; | ||
| import static org.junit.jupiter.api.Assertions.fail; | ||
|
|
||
| import jakarta.persistence.Embeddable; | ||
| import jakarta.persistence.Embedded; | ||
| import jakarta.persistence.Entity; | ||
| import jakarta.persistence.GeneratedValue; | ||
| import jakarta.persistence.Id; | ||
|
|
||
| import org.junit.jupiter.api.Test; | ||
| import org.junit.jupiter.api.extension.RegisterExtension; | ||
|
|
||
| import io.quarkus.hibernate.orm.TransactionTestUtils; | ||
| import io.quarkus.test.QuarkusUnitTest; | ||
|
|
||
| /** | ||
| * Checks that a missing @Embeddable is reported as failure at the build stage rather than a cryptic error at the runtime. | ||
| * See https://github.com/quarkusio/quarkus/issues/35598 | ||
| */ | ||
| class HibernateEntityEnhancerMissingEmbeddableAnnotationTest { | ||
|
|
||
| @RegisterExtension | ||
| static QuarkusUnitTest runner = new QuarkusUnitTest() | ||
| .withApplicationRoot((jar) -> jar | ||
| .addClass(TransactionTestUtils.class) | ||
| .addClasses( | ||
| EntityWithEmbedded.class, | ||
| EntityWithEmbedded.EmbeddableMissingAnnotation.class, | ||
| EntityWithEmbedded.EmbeddableWithAnnotation.class)) | ||
| .withConfigurationResource("application.properties") | ||
| .assertException(ex -> assertThat(ex) | ||
| .isNotNull() | ||
| .hasMessageContainingAll( | ||
| EntityWithEmbedded.EmbeddableMissingAnnotation.class.getName(), | ||
| "is used as an embeddable but does not have an @Embeddable annotation")); | ||
|
|
||
| // Just test that the embedded non-ID works correctly over a persist/retrieve cycle | ||
| @Test | ||
| void test() throws Exception { | ||
| fail(); | ||
| } | ||
|
|
||
| @Entity | ||
| public static class EntityWithEmbedded { | ||
|
|
||
| @Id | ||
| @GeneratedValue | ||
| private Long id; | ||
|
|
||
| private String name; | ||
|
|
||
| @Embedded | ||
| private EmbeddableWithAnnotationExtended embedded; | ||
|
|
||
| public Long getId() { | ||
| return id; | ||
| } | ||
|
|
||
| public void setId(Long id) { | ||
| this.id = id; | ||
| } | ||
|
|
||
| public String getName() { | ||
| return name; | ||
| } | ||
|
|
||
| public void setName(String name) { | ||
| this.name = name; | ||
| } | ||
|
|
||
| public EmbeddableWithAnnotationExtended getEmbedded() { | ||
| return embedded; | ||
| } | ||
|
|
||
| public void setEmbedded(EmbeddableWithAnnotationExtended otherEmbedded) { | ||
| this.embedded = otherEmbedded; | ||
| } | ||
|
|
||
| // @Embeddable // is missing on this class | ||
| public static class EmbeddableMissingAnnotation { | ||
| private String string; | ||
|
|
||
| public EmbeddableMissingAnnotation() { | ||
| } | ||
|
|
||
| public EmbeddableMissingAnnotation(String string) { | ||
| this.string = string; | ||
| } | ||
|
|
||
| public String getString() { | ||
| return string; | ||
| } | ||
|
|
||
| public void setString(String string) { | ||
| this.string = string; | ||
| } | ||
| } | ||
|
|
||
| @Embeddable | ||
| public static class EmbeddableWithAnnotation { | ||
| private String text; | ||
|
|
||
| @Embedded | ||
| private EmbeddableMissingAnnotation embeddableMissingAnnotation; | ||
|
|
||
| protected EmbeddableWithAnnotation() { | ||
| // For Hibernate ORM only - it will change the property value through reflection | ||
| } | ||
|
|
||
| public EmbeddableWithAnnotation(String text) { | ||
| this.text = text; | ||
| this.embeddableMissingAnnotation = new EmbeddableMissingAnnotation(text); | ||
| } | ||
|
|
||
| public String getText() { | ||
| return text; | ||
| } | ||
|
|
||
| public void setText(String mutableProperty) { | ||
| this.text = mutableProperty; | ||
| } | ||
|
|
||
| public EmbeddableMissingAnnotation getEmbeddableMissingAnnotation() { | ||
| return embeddableMissingAnnotation; | ||
| } | ||
|
|
||
| public void setEmbeddableMissingAnnotation(EmbeddableMissingAnnotation embeddableMissingAnnotation) { | ||
| this.embeddableMissingAnnotation = embeddableMissingAnnotation; | ||
| } | ||
| } | ||
|
|
||
| @Embeddable | ||
| public static class EmbeddableWithAnnotationExtended extends EmbeddableWithAnnotation { | ||
| private Integer integer; | ||
|
|
||
| public Integer getInteger() { | ||
| return integer; | ||
| } | ||
|
|
||
| public void setInteger(Integer integer) { | ||
| this.integer = integer; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| } |