Skip to content

Commit b77d5ae

Browse files
brmeyerbrmeyer
committed
HHH-6396 Remove org.hibernate.annotations.Entity
1 parent d779125 commit b77d5ae

File tree

17 files changed

+63
-205
lines changed

17 files changed

+63
-205
lines changed

‎hibernate-core/src/main/java/org/hibernate/annotations/Entity.java

Lines changed: 0 additions & 79 deletions
This file was deleted.

‎hibernate-core/src/main/java/org/hibernate/cfg/AnnotationBinder.java

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import java.util.Map;
3636
import java.util.Properties;
3737
import java.util.Set;
38+
3839
import javax.persistence.Basic;
3940
import javax.persistence.Cacheable;
4041
import javax.persistence.CollectionTable;
@@ -81,8 +82,6 @@
8182
import javax.persistence.UniqueConstraint;
8283
import javax.persistence.Version;
8384

84-
import org.jboss.logging.Logger;
85-
8685
import org.hibernate.AnnotationException;
8786
import org.hibernate.AssertionFailure;
8887
import org.hibernate.EntityMode;
@@ -170,6 +169,7 @@
170169
import org.hibernate.mapping.Subclass;
171170
import org.hibernate.mapping.ToOne;
172171
import org.hibernate.mapping.UnionSubclass;
172+
import org.jboss.logging.Logger;
173173

174174
/**
175175
* JSR 175 annotation binder which reads the annotations from classes, applies the
@@ -538,11 +538,8 @@ public static void bindClass(
538538

539539
PersistentClass persistentClass = makePersistentClass( inheritanceState, superEntity );
540540
Entity entityAnn = clazzToProcess.getAnnotation( Entity.class );
541-
org.hibernate.annotations.Entity hibEntityAnn = clazzToProcess.getAnnotation(
542-
org.hibernate.annotations.Entity.class
543-
);
544541
EntityBinder entityBinder = new EntityBinder(
545-
entityAnn, hibEntityAnn, clazzToProcess, persistentClass, mappings
542+
entityAnn, clazzToProcess, persistentClass, mappings
546543
);
547544
entityBinder.setInheritanceState( inheritanceState );
548545

@@ -1164,10 +1161,6 @@ private static boolean isEntityClassType(XClass clazzToProcess, AnnotatedClassTy
11641161
|| AnnotatedClassType.NONE.equals( classType ) //to be ignored
11651162
|| AnnotatedClassType.EMBEDDABLE.equals( classType ) //allow embeddable element declaration
11661163
) {
1167-
if ( AnnotatedClassType.NONE.equals( classType )
1168-
&& clazzToProcess.isAnnotationPresent( org.hibernate.annotations.Entity.class ) ) {
1169-
LOG.missingEntityAnnotation( clazzToProcess.getName() );
1170-
}
11711164
return false;
11721165
}
11731166

‎hibernate-core/src/main/java/org/hibernate/cfg/annotations/EntityBinder.java

Lines changed: 15 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,14 @@
2323
*/
2424
package org.hibernate.cfg.annotations;
2525

26+
import static org.hibernate.cfg.BinderHelper.toAliasEntityMap;
27+
import static org.hibernate.cfg.BinderHelper.toAliasTableMap;
28+
2629
import java.util.ArrayList;
2730
import java.util.HashMap;
2831
import java.util.Iterator;
2932
import java.util.List;
33+
3034
import javax.persistence.Access;
3135
import javax.persistence.Entity;
3236
import javax.persistence.JoinColumn;
@@ -35,8 +39,6 @@
3539
import javax.persistence.SecondaryTable;
3640
import javax.persistence.SecondaryTables;
3741

38-
import org.jboss.logging.Logger;
39-
4042
import org.hibernate.AnnotationException;
4143
import org.hibernate.AssertionFailure;
4244
import org.hibernate.EntityMode;
@@ -86,7 +88,6 @@
8688
import org.hibernate.engine.spi.ExecuteUpdateResultCheckStyle;
8789
import org.hibernate.engine.spi.FilterDefinition;
8890
import org.hibernate.internal.CoreMessageLogger;
89-
import org.hibernate.internal.util.ReflectHelper;
9091
import org.hibernate.internal.util.StringHelper;
9192
import org.hibernate.mapping.DependantValue;
9293
import org.hibernate.mapping.Join;
@@ -96,9 +97,7 @@
9697
import org.hibernate.mapping.Table;
9798
import org.hibernate.mapping.TableOwner;
9899
import org.hibernate.mapping.Value;
99-
100-
import static org.hibernate.cfg.BinderHelper.toAliasEntityMap;
101-
import static org.hibernate.cfg.BinderHelper.toAliasTableMap;
100+
import org.jboss.logging.Logger;
102101

103102

104103
/**
@@ -119,7 +118,6 @@ public class EntityBinder {
119118
private Boolean insertableDiscriminator;
120119
private boolean dynamicInsert;
121120
private boolean dynamicUpdate;
122-
private boolean explicitHibernateEntityAnnotation;
123121
private OptimisticLockType optimisticLockType;
124122
private PolymorphismType polymorphismType;
125123
private boolean selectBeforeUpdate;
@@ -152,59 +150,52 @@ public EntityBinder() {
152150

153151
public EntityBinder(
154152
Entity ejb3Ann,
155-
org.hibernate.annotations.Entity hibAnn,
156153
XClass annotatedClass,
157154
PersistentClass persistentClass,
158155
Mappings mappings) {
159156
this.mappings = mappings;
160157
this.persistentClass = persistentClass;
161158
this.annotatedClass = annotatedClass;
162159
bindEjb3Annotation( ejb3Ann );
163-
bindHibernateAnnotation( hibAnn );
160+
bindHibernateAnnotation();
164161
}
165162

166163
@SuppressWarnings("SimplifiableConditionalExpression")
167-
private void bindHibernateAnnotation(org.hibernate.annotations.Entity hibAnn) {
164+
private void bindHibernateAnnotation() {
168165
{
169166
final DynamicInsert dynamicInsertAnn = annotatedClass.getAnnotation( DynamicInsert.class );
170167
this.dynamicInsert = dynamicInsertAnn == null
171-
? ( hibAnn == null ? false : hibAnn.dynamicInsert() )
168+
? false
172169
: dynamicInsertAnn.value();
173170
}
174171

175172
{
176173
final DynamicUpdate dynamicUpdateAnn = annotatedClass.getAnnotation( DynamicUpdate.class );
177174
this.dynamicUpdate = dynamicUpdateAnn == null
178-
? ( hibAnn == null ? false : hibAnn.dynamicUpdate() )
175+
? false
179176
: dynamicUpdateAnn.value();
180177
}
181178

182179
{
183180
final SelectBeforeUpdate selectBeforeUpdateAnn = annotatedClass.getAnnotation( SelectBeforeUpdate.class );
184181
this.selectBeforeUpdate = selectBeforeUpdateAnn == null
185-
? ( hibAnn == null ? false : hibAnn.selectBeforeUpdate() )
182+
? false
186183
: selectBeforeUpdateAnn.value();
187184
}
188185

189186
{
190187
final OptimisticLocking optimisticLockingAnn = annotatedClass.getAnnotation( OptimisticLocking.class );
191188
this.optimisticLockType = optimisticLockingAnn == null
192-
? ( hibAnn == null ? OptimisticLockType.VERSION : hibAnn.optimisticLock() )
189+
? OptimisticLockType.VERSION
193190
: optimisticLockingAnn.type();
194191
}
195192

196193
{
197194
final Polymorphism polymorphismAnn = annotatedClass.getAnnotation( Polymorphism.class );
198195
this.polymorphismType = polymorphismAnn == null
199-
? ( hibAnn == null ? PolymorphismType.IMPLICIT : hibAnn.polymorphism() )
196+
? PolymorphismType.IMPLICIT
200197
: polymorphismAnn.type();
201198
}
202-
203-
if ( hibAnn != null ) {
204-
// used later in bind for logging
205-
explicitHibernateEntityAnnotation = true;
206-
//persister handled in bind
207-
}
208199
}
209200

210201
private void bindEjb3Annotation(Entity ejb3Ann) {
@@ -257,13 +248,6 @@ public void bindEntity() {
257248
if ( annotatedClass.isAnnotationPresent( Immutable.class ) ) {
258249
mutable = false;
259250
}
260-
else {
261-
org.hibernate.annotations.Entity entityAnn =
262-
annotatedClass.getAnnotation( org.hibernate.annotations.Entity.class );
263-
if ( entityAnn != null ) {
264-
mutable = entityAnn.mutable();
265-
}
266-
}
267251
rootClass.setMutable( mutable );
268252
rootClass.setExplicitPolymorphism( isExplicitPolymorphism( polymorphismType ) );
269253
if ( StringHelper.isNotEmpty( where ) ) rootClass.setWhere( where );
@@ -282,9 +266,6 @@ public void bindEntity() {
282266
}
283267
}
284268
else {
285-
if (explicitHibernateEntityAnnotation) {
286-
LOG.entityAnnotationOnNonRoot(annotatedClass.getName());
287-
}
288269
if (annotatedClass.isAnnotationPresent(Immutable.class)) {
289270
LOG.immutableAnnotationOnNonRoot(annotatedClass.getName());
290271
}
@@ -299,14 +280,9 @@ public void bindEntity() {
299280
persister = persisterAnn.impl();
300281
}
301282
else {
302-
org.hibernate.annotations.Entity entityAnn = annotatedClass.getAnnotation( org.hibernate.annotations.Entity.class );
303-
if ( entityAnn != null && !BinderHelper.isEmptyAnnotationValue( entityAnn.persister() ) ) {
304-
try {
305-
persister = ReflectHelper.classForName( entityAnn.persister() );
306-
}
307-
catch (ClassNotFoundException cnfe) {
308-
throw new AnnotationException( "Could not find persister class: " + persister );
309-
}
283+
Persister perAnn = annotatedClass.getAnnotation( Persister.class );
284+
if ( perAnn != null ) {
285+
persister = perAnn.impl();
310286
}
311287
}
312288
if ( persister != null ) {

0 commit comments

Comments
 (0)