CodeCow/querydsl
1
0
Fork 0
mirror of https://github.com/querydsl/querydsl.git synced 2026-07-03 21:07:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1215 from johnktims/master

Browse Source 
Fix typo in ParameterizedExpression interface
This commit is contained in:
Timo Westkämper 2015-02-21 10:26:38 +02:00
commit f2a9723a53
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
querydsl-core/src/main/java/com/querydsl/core/alias/PropertyAccessInvocationHandler.java
View File

@ -32,7 +32,7 @@ import net.sf.cglib.proxy.MethodProxy;
import com.google.common.collect.ImmutableList;
import com.querydsl.core.types.Expression;
import com.querydsl.core.types.ParametrizedExpression;
import com.querydsl.core.types.ParameterizedExpression;
import com.querydsl.core.types.Path;
import com.querydsl.core.types.PathMetadata;
import com.querydsl.core.types.PathMetadataFactory;
@ -109,7 +109,7 @@ public class PropertyAccessInvocationHandler implements MethodInterceptor {
rv = propToObj.get(propKey);
} else {
PathMetadata pm = createListAccessPath((Path<?>) hostExpression, (Integer) args[0]);
Class<?> elementType = ((ParametrizedExpression<?>) hostExpression).getParameter(0);
Class<?> elementType = ((ParameterizedExpression<?>) hostExpression).getParameter(0);
rv = newInstance(elementType, elementType, proxy, propKey, pm);
}
aliasFactory.setCurrent(propToExpr.get(propKey));
@ -120,7 +120,7 @@ public class PropertyAccessInvocationHandler implements MethodInterceptor {
rv = propToObj.get(propKey);
} else {
PathMetadata pm = createMapAccessPath((Path<?>)hostExpression, args[0]);
Class<?> valueType = ((ParametrizedExpression<?>) hostExpression).getParameter(1);
Class<?> valueType = ((ParameterizedExpression<?>) hostExpression).getParameter(1);
rv = newInstance(valueType, valueType, proxy, propKey, pm);
}
aliasFactory.setCurrent(propToExpr.get(propKey));

2
querydsl-core/src/main/java/com/querydsl/core/types/CollectionExpression.java
View File

@ -24,6 +24,6 @@ import java.util.Collection;
* @param <E> element type
* @see java.util.Collection
*/
public interface CollectionExpression<T extends Collection<E>, E> extends ParametrizedExpression<T> {
public interface CollectionExpression<T extends Collection<E>, E> extends ParameterizedExpression<T> {
}

2
querydsl-core/src/main/java/com/querydsl/core/types/MapExpression.java
View File

@ -24,6 +24,6 @@ import java.util.Map;
* @param <V> value type
* @see java.util.Map
*/
public interface MapExpression<K, V> extends ParametrizedExpression<Map<K,V>> {
public interface MapExpression<K, V> extends ParameterizedExpression<Map<K,V>> {
}

2
querydsl-core/src/main/java/com/querydsl/core/types/Operator.java
View File

@ -17,7 +17,7 @@ import java.io.Serializable;
/**
* Operator represents operator symbols.
* <p>Implementations should enums for automatic instance management.</p>
* <p>Implementations should be enums for automatic instance management.</p>
*
* @author tiwe
*/

8
querydsl-core/src/main/java/com/querydsl/core/types/ParametrizedExpression.java → querydsl-core/src/main/java/com/querydsl/core/types/ParameterizedExpression.java
View File

@ -1,6 +1,6 @@
/*
* Copyright 2011, Mysema Ltd
*
*
* 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
@ -14,13 +14,13 @@
package com.querydsl.core.types;
/**
* ParametrizedExpression is a common interface for expressions with generic type parameters
*
* ParameterizedExpression is a common interface for expressions with generic type parameters
*
* @author tiwe
*
* @param <T> expression type
*/
public interface ParametrizedExpression<T> extends Expression<T> {
public interface ParameterizedExpression<T> extends Expression<T> {
/**
* @param index

2
querydsl-jpa/src/main/java/com/querydsl/jpa/JPAMapAccessVisitor.java
View File

@ -30,7 +30,7 @@ class JPAMapAccessVisitor extends ReplaceVisitor<Void> {
if (replacement == null) {
// join parent as path123 on key(path123) = ...
Path parent = pathMetadata.getParent();
ParametrizedExpression parExpr = (ParametrizedExpression) parent;
ParameterizedExpression parExpr = (ParameterizedExpression) parent;
replacement = new PathImpl(parExpr.getParameter(1),
ExpressionUtils.createRootVariable(parent));
metadata.addJoin(JoinType.JOIN, ExpressionUtils.as(parent, replacement));