From fc7d5753f6ec1f8182c29ac80dc9b89ebebead29 Mon Sep 17 00:00:00 2001 From: John Tims Date: Thu, 19 Feb 2015 14:48:33 -0500 Subject: [PATCH] Fix typo in ParameterizedExpression interface --- .../core/alias/PropertyAccessInvocationHandler.java | 6 +++--- .../com/querydsl/core/types/CollectionExpression.java | 2 +- .../main/java/com/querydsl/core/types/MapExpression.java | 2 +- ...trizedExpression.java => ParameterizedExpression.java} | 8 ++++---- .../main/java/com/querydsl/jpa/JPAMapAccessVisitor.java | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) rename querydsl-core/src/main/java/com/querydsl/core/types/{ParametrizedExpression.java => ParameterizedExpression.java} (82%) diff --git a/querydsl-core/src/main/java/com/querydsl/core/alias/PropertyAccessInvocationHandler.java b/querydsl-core/src/main/java/com/querydsl/core/alias/PropertyAccessInvocationHandler.java index 14ee88b3e..90e564bb6 100644 --- a/querydsl-core/src/main/java/com/querydsl/core/alias/PropertyAccessInvocationHandler.java +++ b/querydsl-core/src/main/java/com/querydsl/core/alias/PropertyAccessInvocationHandler.java @@ -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)); diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/CollectionExpression.java b/querydsl-core/src/main/java/com/querydsl/core/types/CollectionExpression.java index 7b995e4ec..97fde1a3d 100644 --- a/querydsl-core/src/main/java/com/querydsl/core/types/CollectionExpression.java +++ b/querydsl-core/src/main/java/com/querydsl/core/types/CollectionExpression.java @@ -24,6 +24,6 @@ import java.util.Collection; * @param element type * @see java.util.Collection */ -public interface CollectionExpression, E> extends ParametrizedExpression { +public interface CollectionExpression, E> extends ParameterizedExpression { } diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/MapExpression.java b/querydsl-core/src/main/java/com/querydsl/core/types/MapExpression.java index 138025999..ed651cadc 100644 --- a/querydsl-core/src/main/java/com/querydsl/core/types/MapExpression.java +++ b/querydsl-core/src/main/java/com/querydsl/core/types/MapExpression.java @@ -24,6 +24,6 @@ import java.util.Map; * @param value type * @see java.util.Map */ -public interface MapExpression extends ParametrizedExpression> { +public interface MapExpression extends ParameterizedExpression> { } diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/ParametrizedExpression.java b/querydsl-core/src/main/java/com/querydsl/core/types/ParameterizedExpression.java similarity index 82% rename from querydsl-core/src/main/java/com/querydsl/core/types/ParametrizedExpression.java rename to querydsl-core/src/main/java/com/querydsl/core/types/ParameterizedExpression.java index d234e3672..bda5ff6de 100644 --- a/querydsl-core/src/main/java/com/querydsl/core/types/ParametrizedExpression.java +++ b/querydsl-core/src/main/java/com/querydsl/core/types/ParameterizedExpression.java @@ -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 expression type */ -public interface ParametrizedExpression extends Expression { +public interface ParameterizedExpression extends Expression { /** * @param index diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/JPAMapAccessVisitor.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/JPAMapAccessVisitor.java index a44dce05e..79e61f6ef 100644 --- a/querydsl-jpa/src/main/java/com/querydsl/jpa/JPAMapAccessVisitor.java +++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/JPAMapAccessVisitor.java @@ -30,7 +30,7 @@ class JPAMapAccessVisitor extends ReplaceVisitor { 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));