Skip to content

Commit b9f15e8

Browse files
gavinkinggavinking
committed
remove makeCopy() method, since it was annotated @remove
Signed-off-by: Gavin King <[email protected]>
1 parent 9e745b4 commit b9f15e8

16 files changed

+0
-203
lines changed

‎hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmBagJoin.java

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,10 @@
1717
import org.hibernate.query.criteria.JpaCollectionJoin;
1818
import org.hibernate.query.criteria.JpaExpression;
1919
import org.hibernate.query.criteria.JpaPredicate;
20-
import org.hibernate.query.hql.spi.SqmCreationProcessingState;
2120
import org.hibernate.query.sqm.NodeBuilder;
22-
import org.hibernate.query.sqm.SemanticQueryWalker;
2321
import org.hibernate.query.sqm.tree.SqmCopyContext;
2422
import org.hibernate.query.sqm.tree.SqmJoinType;
25-
import org.hibernate.query.sqm.tree.from.SqmAttributeJoin;
2623
import org.hibernate.query.sqm.tree.from.SqmFrom;
27-
import org.hibernate.spi.NavigablePath;
2824

2925
import jakarta.persistence.criteria.Expression;
3026
import jakarta.persistence.criteria.Predicate;
@@ -163,15 +159,4 @@ public <S extends E> SqmTreatedBagJoin<O,E,S> treatAs(EntityDomainType<S> treatT
163159
return treat;
164160
}
165161

166-
@Override
167-
public SqmAttributeJoin<O, E> makeCopy(SqmCreationProcessingState creationProcessingState) {
168-
return new SqmBagJoin<>(
169-
creationProcessingState.getPathRegistry().findFromByPath( getLhs().getNavigablePath() ),
170-
getAttribute(),
171-
getExplicitAlias(),
172-
getSqmJoinType(),
173-
isFetched(),
174-
nodeBuilder()
175-
);
176-
}
177162
}

‎hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedBagJoin.java

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
package org.hibernate.query.sqm.tree.domain;
88

99
import org.hibernate.metamodel.model.domain.BagPersistentAttribute;
10-
import org.hibernate.query.hql.spi.SqmCreationProcessingState;
11-
import org.hibernate.query.hql.spi.SqmPathRegistry;
1210
import org.hibernate.query.sqm.NodeBuilder;
1311
import org.hibernate.query.sqm.SemanticQueryWalker;
1412
import org.hibernate.query.sqm.tree.SqmCopyContext;
@@ -100,19 +98,4 @@ public SqmRoot<O> getCorrelatedRoot() {
10098
return correlatedRootJoin;
10199
}
102100

103-
@Override
104-
public SqmCorrelatedBagJoin<O, T> makeCopy(SqmCreationProcessingState creationProcessingState) {
105-
final SqmPathRegistry pathRegistry = creationProcessingState.getPathRegistry();
106-
return new SqmCorrelatedBagJoin<>(
107-
pathRegistry.findFromByPath( getLhs().getNavigablePath() ),
108-
getAttribute(),
109-
getExplicitAlias(),
110-
getSqmJoinType(),
111-
isFetched(),
112-
nodeBuilder(),
113-
pathRegistry.findFromByPath( correlatedRootJoin.getNavigablePath() ),
114-
pathRegistry.findFromByPath( correlationParent.getNavigablePath() )
115-
);
116-
}
117-
118101
}

‎hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedListJoin.java

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
package org.hibernate.query.sqm.tree.domain;
88

99
import org.hibernate.metamodel.model.domain.ListPersistentAttribute;
10-
import org.hibernate.query.hql.spi.SqmCreationProcessingState;
11-
import org.hibernate.query.hql.spi.SqmPathRegistry;
1210
import org.hibernate.query.sqm.NodeBuilder;
1311
import org.hibernate.query.sqm.SemanticQueryWalker;
1412
import org.hibernate.query.sqm.tree.SqmCopyContext;
@@ -95,21 +93,6 @@ public SqmRoot<O> getCorrelatedRoot() {
9593
return correlatedRootJoin;
9694
}
9795

98-
@Override
99-
public SqmCorrelatedListJoin<O, T> makeCopy(SqmCreationProcessingState creationProcessingState) {
100-
final SqmPathRegistry pathRegistry = creationProcessingState.getPathRegistry();
101-
return new SqmCorrelatedListJoin<>(
102-
pathRegistry.findFromByPath( getLhs().getNavigablePath() ),
103-
getAttribute(),
104-
getExplicitAlias(),
105-
getSqmJoinType(),
106-
isFetched(),
107-
nodeBuilder(),
108-
pathRegistry.findFromByPath( correlatedRootJoin.getNavigablePath() ),
109-
pathRegistry.findFromByPath( correlationParent.getNavigablePath() )
110-
);
111-
}
112-
11396
@Override
11497
public <X> X accept(SemanticQueryWalker<X> walker) {
11598
return walker.visitCorrelatedListJoin( this );

‎hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedMapJoin.java

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
package org.hibernate.query.sqm.tree.domain;
88

99
import org.hibernate.metamodel.model.domain.MapPersistentAttribute;
10-
import org.hibernate.query.hql.spi.SqmCreationProcessingState;
11-
import org.hibernate.query.hql.spi.SqmPathRegistry;
1210
import org.hibernate.query.sqm.NodeBuilder;
1311
import org.hibernate.query.sqm.SemanticQueryWalker;
1412
import org.hibernate.query.sqm.tree.SqmCopyContext;
@@ -95,21 +93,6 @@ public SqmRoot<L> getCorrelatedRoot() {
9593
return correlatedRootJoin;
9694
}
9795

98-
@Override
99-
public SqmCorrelatedMapJoin<L, K, V> makeCopy(SqmCreationProcessingState creationProcessingState) {
100-
final SqmPathRegistry pathRegistry = creationProcessingState.getPathRegistry();
101-
return new SqmCorrelatedMapJoin<>(
102-
pathRegistry.findFromByPath( getLhs().getNavigablePath() ),
103-
getAttribute(),
104-
getExplicitAlias(),
105-
getSqmJoinType(),
106-
isFetched(),
107-
nodeBuilder(),
108-
pathRegistry.findFromByPath( correlatedRootJoin.getNavigablePath() ),
109-
pathRegistry.findFromByPath( correlationParent.getNavigablePath() )
110-
);
111-
}
112-
11396
@Override
11497
public <X> X accept(SemanticQueryWalker<X> walker) {
11598
return walker.visitCorrelatedMapJoin( this );

‎hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedSetJoin.java

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
package org.hibernate.query.sqm.tree.domain;
88

99
import org.hibernate.metamodel.model.domain.SetPersistentAttribute;
10-
import org.hibernate.query.hql.spi.SqmCreationProcessingState;
11-
import org.hibernate.query.hql.spi.SqmPathRegistry;
1210
import org.hibernate.query.sqm.NodeBuilder;
1311
import org.hibernate.query.sqm.SemanticQueryWalker;
1412
import org.hibernate.query.sqm.tree.SqmCopyContext;
@@ -95,21 +93,6 @@ public SqmRoot<O> getCorrelatedRoot() {
9593
return correlatedRootJoin;
9694
}
9795

98-
@Override
99-
public SqmCorrelatedSetJoin<O, T> makeCopy(SqmCreationProcessingState creationProcessingState) {
100-
final SqmPathRegistry pathRegistry = creationProcessingState.getPathRegistry();
101-
return new SqmCorrelatedSetJoin<>(
102-
pathRegistry.findFromByPath( getLhs().getNavigablePath() ),
103-
getAttribute(),
104-
getExplicitAlias(),
105-
getSqmJoinType(),
106-
isFetched(),
107-
nodeBuilder(),
108-
pathRegistry.findFromByPath( correlatedRootJoin.getNavigablePath() ),
109-
pathRegistry.findFromByPath( correlationParent.getNavigablePath() )
110-
);
111-
}
112-
11396
@Override
11497
public <X> X accept(SemanticQueryWalker<X> walker) {
11598
return walker.visitCorrelatedSetJoin( this );

‎hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedSingularJoin.java

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
package org.hibernate.query.sqm.tree.domain;
88

99
import org.hibernate.metamodel.model.domain.SingularPersistentAttribute;
10-
import org.hibernate.query.hql.spi.SqmCreationProcessingState;
11-
import org.hibernate.query.hql.spi.SqmPathRegistry;
1210
import org.hibernate.query.sqm.NodeBuilder;
1311
import org.hibernate.query.sqm.SemanticQueryWalker;
1412
import org.hibernate.query.sqm.tree.SqmCopyContext;
@@ -95,21 +93,6 @@ public SqmRoot<O> getCorrelatedRoot() {
9593
return correlatedRootJoin;
9694
}
9795

98-
@Override
99-
public SqmCorrelatedSingularJoin<O, T> makeCopy(SqmCreationProcessingState creationProcessingState) {
100-
final SqmPathRegistry pathRegistry = creationProcessingState.getPathRegistry();
101-
return new SqmCorrelatedSingularJoin<>(
102-
pathRegistry.findFromByPath( getLhs().getNavigablePath() ),
103-
getAttribute(),
104-
getExplicitAlias(),
105-
getSqmJoinType(),
106-
isFetched(),
107-
nodeBuilder(),
108-
pathRegistry.findFromByPath( correlatedRootJoin.getNavigablePath() ),
109-
pathRegistry.findFromByPath( correlationParent.getNavigablePath() )
110-
);
111-
}
112-
11396
@Override
11497
public <X> X accept(SemanticQueryWalker<X> walker) {
11598
return walker.visitCorrelatedSingularJoin( this );

‎hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmListJoin.java

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,10 @@
1717
import org.hibernate.query.criteria.JpaExpression;
1818
import org.hibernate.query.criteria.JpaListJoin;
1919
import org.hibernate.query.criteria.JpaPredicate;
20-
import org.hibernate.query.hql.spi.SqmCreationProcessingState;
2120
import org.hibernate.query.sqm.NodeBuilder;
2221
import org.hibernate.query.sqm.SqmPathSource;
2322
import org.hibernate.query.sqm.tree.SqmCopyContext;
2423
import org.hibernate.query.sqm.tree.SqmJoinType;
25-
import org.hibernate.query.sqm.tree.from.SqmAttributeJoin;
2624
import org.hibernate.query.sqm.tree.from.SqmFrom;
2725

2826
import jakarta.persistence.criteria.Expression;
@@ -168,16 +166,4 @@ public <S extends E> SqmTreatedListJoin<O,E,S> treatAs(EntityDomainType<S> treat
168166
return treat;
169167
}
170168

171-
@Override
172-
public SqmAttributeJoin<O, E> makeCopy(SqmCreationProcessingState creationProcessingState) {
173-
return new SqmListJoin<>(
174-
creationProcessingState.getPathRegistry().findFromByPath( getLhs().getNavigablePath() ),
175-
getAttribute(),
176-
getExplicitAlias(),
177-
getSqmJoinType(),
178-
isFetched(),
179-
nodeBuilder()
180-
);
181-
}
182-
183169
}

‎hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmMapJoin.java

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import org.hibernate.query.criteria.JpaExpression;
1616
import org.hibernate.query.criteria.JpaMapJoin;
1717
import org.hibernate.query.criteria.JpaPredicate;
18-
import org.hibernate.query.hql.spi.SqmCreationProcessingState;
1918
import org.hibernate.query.sqm.NodeBuilder;
2019
import org.hibernate.query.sqm.SemanticQueryWalker;
2120
import org.hibernate.query.sqm.SqmPathSource;
@@ -185,16 +184,4 @@ public <S extends V> SqmTreatedMapJoin<L, K, V, S> treatAs(EntityDomainType<S> t
185184
return treat;
186185
}
187186

188-
@Override
189-
public SqmMapJoin<L, K, V> makeCopy(SqmCreationProcessingState creationProcessingState) {
190-
return new SqmMapJoin<>(
191-
creationProcessingState.getPathRegistry().findFromByPath( getLhs().getNavigablePath() ),
192-
getAttribute(),
193-
getExplicitAlias(),
194-
getSqmJoinType(),
195-
isFetched(),
196-
nodeBuilder()
197-
);
198-
}
199-
200187
}

‎hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmSetJoin.java

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import org.hibernate.query.criteria.JpaExpression;
1818
import org.hibernate.query.criteria.JpaPredicate;
1919
import org.hibernate.query.criteria.JpaSetJoin;
20-
import org.hibernate.query.hql.spi.SqmCreationProcessingState;
2120
import org.hibernate.query.sqm.NodeBuilder;
2221
import org.hibernate.query.sqm.tree.SqmCopyContext;
2322
import org.hibernate.query.sqm.tree.SqmJoinType;
@@ -167,15 +166,4 @@ public <X, Y> SqmAttributeJoin<X, Y> fetch(String attributeName) {
167166
}
168167

169168

170-
@Override
171-
public SqmAttributeJoin<O, E> makeCopy(SqmCreationProcessingState creationProcessingState) {
172-
return new SqmSetJoin<>(
173-
creationProcessingState.getPathRegistry().findFromByPath( getLhs().getNavigablePath() ),
174-
getModel(),
175-
getExplicitAlias(),
176-
getSqmJoinType(),
177-
isFetched(),
178-
nodeBuilder()
179-
);
180-
}
181169
}

‎hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmSingularJoin.java

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,18 @@
88

99
import java.util.Locale;
1010

11-
import org.hibernate.metamodel.model.domain.EmbeddableDomainType;
1211
import org.hibernate.metamodel.model.domain.EntityDomainType;
1312
import org.hibernate.metamodel.model.domain.ManagedDomainType;
1413
import org.hibernate.metamodel.model.domain.SingularPersistentAttribute;
1514
import org.hibernate.metamodel.model.domain.TreatableDomainType;
1615
import org.hibernate.query.sqm.SemanticQueryWalker;
1716
import org.hibernate.spi.NavigablePath;
18-
import org.hibernate.query.hql.spi.SqmCreationProcessingState;
1917
import org.hibernate.query.sqm.NodeBuilder;
20-
import org.hibernate.query.sqm.SemanticQueryWalker;
2118
import org.hibernate.query.sqm.SqmJoinable;
2219
import org.hibernate.query.sqm.tree.SqmCopyContext;
2320
import org.hibernate.query.sqm.tree.SqmJoinType;
24-
import org.hibernate.query.sqm.tree.from.SqmAttributeJoin;
2521
import org.hibernate.query.sqm.tree.from.SqmFrom;
2622
import org.hibernate.query.sqm.tree.from.SqmTreatedAttributeJoin;
27-
import org.hibernate.spi.NavigablePath;
2823

2924
/**
3025
* @author Steve Ebersole
@@ -158,15 +153,4 @@ public String toString() {
158153
);
159154
}
160155

161-
@Override
162-
public SqmAttributeJoin<O, T> makeCopy(SqmCreationProcessingState creationProcessingState) {
163-
return new SqmSingularJoin<>(
164-
creationProcessingState.getPathRegistry().findFromByPath( getLhs().getNavigablePath() ),
165-
getAttribute(),
166-
getExplicitAlias(),
167-
getSqmJoinType(),
168-
isFetched(),
169-
nodeBuilder()
170-
);
171-
}
172156
}

0 commit comments

Comments
 (0)