From 71316d3f40507b9ba583946bbcb8da940c317ba5 Mon Sep 17 00:00:00 2001 From: John Tims Date: Fri, 20 Mar 2015 14:23:16 -0400 Subject: [PATCH] Fix typos --- .../com/querydsl/apt/ExtendedTypeFactory.java | 17 +++++++++-------- .../com/querydsl/apt/domain/CollectionTest.java | 2 +- .../querydsl/apt/domain/SecurableEntity.java | 6 +++--- .../querydsl/collections/PathComparator.java | 2 +- .../java/com/querydsl/core/EmptyMetadata.java | 2 +- .../com/querydsl/core/alias/AliasFactory.java | 2 +- .../com/querydsl/core/alias/ManagedObject.java | 2 +- .../core/support/DetachableAdapter.java | 2 +- .../querydsl/core/types/TemplateFactory.java | 8 ++++---- .../com/querydsl/core/types/expr/Wildcard.java | 6 +++--- .../core/QueryMetadaSerializationTest.java | 2 +- ...initeLoop.java => TemplateInfiniteLoop.java} | 2 +- .../querydsl/core/types/path/MapPathTest.java | 2 +- querydsl-docs/etc/jpa2_comparison.txt | 14 +++++++------- .../src/main/docbook/css/highlight.css | 4 ++-- .../en-US/content/general/creating-queries.xml | 2 +- .../docbook/en-US/content/tutorials/jpa.xml | 4 ++-- .../docbook/en-US/content/tutorials/scala.xml | 2 +- .../docbook/en-US/content/tutorials/spatial.xml | 4 ++-- .../docbook/en-US/content/tutorials/sql.xml | 10 +++++----- .../docbook/ko-KR/content/tutorials/mongodb.xml | 2 +- .../docbook/ko-KR/content/tutorials/scala.xml | 4 ++-- .../com/querydsl/jdo/models/company/Office.java | 2 +- .../com/querydsl/jdo/models/fitness/Gym.java | 4 ++-- .../querydsl/jdo/models/fitness/Wardrobe.java | 4 ++-- .../main/java/com/querydsl/jpa/Conversions.java | 16 ++++++++-------- .../jpa/ExpressionSerializationTest.java | 1 - .../com/querydsl/jpa/JPAQueryMixinTest.java | 2 +- .../querydsl/mongodb/MongodbExpressions.java | 2 +- .../main/java/com/querydsl/mongodb/Point.java | 2 +- .../querydsl/mongodb/GeoSpatialQueryTest.java | 2 +- .../com/querydsl/mongodb/MongodbQueryTest.java | 10 +++++----- .../spatial/jts/JTSPolygonExpression.java | 8 ++++---- .../com/querydsl/spatial/path/GeometryPath.java | 2 +- .../querydsl/spatial/path/GeometryPathTest.java | 2 +- .../sql/codegen/ExtendedBeanSerializer.java | 2 +- .../querydsl/sql/codegen/MetaDataExporter.java | 2 +- .../sql/codegen/ant/AntMetaDataExporter.java | 4 ++-- .../sql/spatial/AbstractConverterTest.java | 2 +- .../querydsl/sql/RelationalPathExtractor.java | 2 +- .../java/com/querydsl/sql/SQLExpressions.java | 2 +- .../java/com/querydsl/sql/SQLTemplates.java | 2 +- .../test/java/com/querydsl/sql/Connections.java | 4 ++-- .../test/java/com/querydsl/sql/MergeBase.java | 2 +- 44 files changed, 90 insertions(+), 90 deletions(-) rename querydsl-core/src/test/java/com/querydsl/core/types/{TermplateInfiniteLoop.java => TemplateInfiniteLoop.java} (96%) diff --git a/querydsl-apt/src/main/java/com/querydsl/apt/ExtendedTypeFactory.java b/querydsl-apt/src/main/java/com/querydsl/apt/ExtendedTypeFactory.java index 108ac21bc..21529dfb2 100644 --- a/querydsl-apt/src/main/java/com/querydsl/apt/ExtendedTypeFactory.java +++ b/querydsl-apt/src/main/java/com/querydsl/apt/ExtendedTypeFactory.java @@ -13,18 +13,19 @@ */ package com.querydsl.apt; +import java.lang.annotation.Annotation; +import java.util.*; + import javax.annotation.Nullable; import javax.annotation.processing.ProcessingEnvironment; import javax.lang.model.element.ElementKind; import javax.lang.model.element.Modifier; import javax.lang.model.element.TypeElement; import javax.lang.model.type.*; -import java.lang.annotation.Annotation; -import java.util.*; import com.mysema.codegen.model.*; -import com.querydsl.core.annotations.QueryExclude; import com.querydsl.codegen.*; +import com.querydsl.core.annotations.QueryExclude; /** * ExtendedTypeFactory is a factory for APT inspection based Type creation @@ -135,12 +136,12 @@ public final class ExtendedTypeFactory { } @Override - public Type visitWildcard(WildcardType wildardType, Boolean p) { - if (wildardType.getExtendsBound() != null) { - Type type = visit(wildardType.getExtendsBound(), p); + public Type visitWildcard(WildcardType wildcardType, Boolean p) { + if (wildcardType.getExtendsBound() != null) { + Type type = visit(wildcardType.getExtendsBound(), p); return new TypeExtends(type); - } else if (wildardType.getSuperBound() != null) { - Type type = visit(wildardType.getSuperBound(), p); + } else if (wildcardType.getSuperBound() != null) { + Type type = visit(wildcardType.getSuperBound(), p); return new TypeSuper(type); } else { return null; diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/CollectionTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/CollectionTest.java index de858d9e6..fb4c27690 100644 --- a/querydsl-apt/src/test/java/com/querydsl/apt/domain/CollectionTest.java +++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/CollectionTest.java @@ -46,7 +46,7 @@ public class CollectionTest { Collection collection2; - Collection> collectionOfCOllection; + Collection> collectionOfCollection; Collection> collectionOfSet; diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/SecurableEntity.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/SecurableEntity.java index 2c05bba3a..a06b15f9d 100644 --- a/querydsl-apt/src/test/java/com/querydsl/apt/domain/SecurableEntity.java +++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/SecurableEntity.java @@ -8,8 +8,8 @@ import javax.persistence.Id; import javax.persistence.TableGenerator; /** - * This is an example of using system ACL function. Note, field id is must, - * abstract function getId must also implemented. + * This is an example of using system ACL function. Note, field id is required, + * abstract function getId must also be implemented. */ @Entity public class SecurableEntity extends AbstractSecurable { @@ -28,4 +28,4 @@ public class SecurableEntity extends AbstractSecurable { // return getSecurableEntityId(); // } -} \ No newline at end of file +} diff --git a/querydsl-collections/src/main/java/com/querydsl/collections/PathComparator.java b/querydsl-collections/src/main/java/com/querydsl/collections/PathComparator.java index c88d7897f..5fbc6778d 100644 --- a/querydsl-collections/src/main/java/com/querydsl/collections/PathComparator.java +++ b/querydsl-collections/src/main/java/com/querydsl/collections/PathComparator.java @@ -46,7 +46,7 @@ public class PathComparator> implements Comparator @Override public int compare(T leftBean, T rightBean) { if(leftBean == rightBean) { - return 0; // Reference to the seme object should always result in '0' + return 0; // Reference to the same object should always result in '0' } else if (leftBean == null) { return -1; // Whenever the reference varies and left is null, right is not null } else if (rightBean == null) { diff --git a/querydsl-core/src/main/java/com/querydsl/core/EmptyMetadata.java b/querydsl-core/src/main/java/com/querydsl/core/EmptyMetadata.java index 2291fcda5..5d00ebbf5 100644 --- a/querydsl-core/src/main/java/com/querydsl/core/EmptyMetadata.java +++ b/querydsl-core/src/main/java/com/querydsl/core/EmptyMetadata.java @@ -24,7 +24,7 @@ import com.querydsl.core.types.ParamExpression; import com.querydsl.core.types.Predicate; /** - * EmptyMetadata provides a immutable empty QueryMetadata instace + * EmptyMetadata provides an immutable empty QueryMetadata instance * * @author tiwe * diff --git a/querydsl-core/src/main/java/com/querydsl/core/alias/AliasFactory.java b/querydsl-core/src/main/java/com/querydsl/core/alias/AliasFactory.java index 55a5d9fed..a9b54180d 100644 --- a/querydsl-core/src/main/java/com/querydsl/core/alias/AliasFactory.java +++ b/querydsl-core/src/main/java/com/querydsl/core/alias/AliasFactory.java @@ -140,7 +140,7 @@ public class AliasFactory { } /** - * Get the current thread bound expression without reseting it + * Get the current thread bound expression without resetting it * * @param * @return diff --git a/querydsl-core/src/main/java/com/querydsl/core/alias/ManagedObject.java b/querydsl-core/src/main/java/com/querydsl/core/alias/ManagedObject.java index 2884f32e0..7ed228f61 100644 --- a/querydsl-core/src/main/java/com/querydsl/core/alias/ManagedObject.java +++ b/querydsl-core/src/main/java/com/querydsl/core/alias/ManagedObject.java @@ -16,7 +16,7 @@ package com.querydsl.core.alias; import com.querydsl.core.types.EntityPath; /** - * MagagedObject is a tagging interface for CGLIB alias proxies + * ManagedObject is a tagging interface for CGLIB alias proxies * */ public interface ManagedObject { diff --git a/querydsl-core/src/main/java/com/querydsl/core/support/DetachableAdapter.java b/querydsl-core/src/main/java/com/querydsl/core/support/DetachableAdapter.java index 109c91792..37418a5d5 100644 --- a/querydsl-core/src/main/java/com/querydsl/core/support/DetachableAdapter.java +++ b/querydsl-core/src/main/java/com/querydsl/core/support/DetachableAdapter.java @@ -37,7 +37,7 @@ import com.querydsl.core.types.query.StringSubQuery; import com.querydsl.core.types.query.TimeSubQuery; /** - * DetachableAdapter is an apadater implementation for the Detachable interface + * DetachableAdapter is an adapter implementation for the Detachable interface * * @author tiwe * diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/TemplateFactory.java b/querydsl-core/src/main/java/com/querydsl/core/types/TemplateFactory.java index c6fe53509..6ce6a7a83 100644 --- a/querydsl-core/src/main/java/com/querydsl/core/types/TemplateFactory.java +++ b/querydsl-core/src/main/java/com/querydsl/core/types/TemplateFactory.java @@ -123,8 +123,8 @@ public class TemplateFactory { if (arg instanceof Constant) { return ConstantImpl.create(apply(arg.toString()).toString()); } else if (arg instanceof Expression) { - Expression concated = OperationImpl.create(String.class, Ops.CONCAT, PERCENT, (Expression)arg); - return OperationImpl.create(String.class, Ops.LOWER, concated); + Expression concatenated = OperationImpl.create(String.class, Ops.CONCAT, PERCENT, (Expression)arg); + return OperationImpl.create(String.class, Ops.LOWER, concatenated); } else { return "%" + escapeForLike(String.valueOf(arg).toLowerCase(Locale.ENGLISH)); } @@ -138,8 +138,8 @@ public class TemplateFactory { if (arg instanceof Constant) { return ConstantImpl.create(apply(arg.toString()).toString()); } else if (arg instanceof Expression) { - Expression concated = OperationImpl.create(String.class, Ops.CONCAT, PERCENT, (Expression)arg); - return OperationImpl.create(String.class, Ops.CONCAT, concated, PERCENT); + Expression concatenated = OperationImpl.create(String.class, Ops.CONCAT, PERCENT, (Expression)arg); + return OperationImpl.create(String.class, Ops.CONCAT, concatenated, PERCENT); } else { return "%" + escapeForLike(String.valueOf(arg)) + "%"; } diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/expr/Wildcard.java b/querydsl-core/src/main/java/com/querydsl/core/types/expr/Wildcard.java index 401438a8b..f03bf765b 100644 --- a/querydsl-core/src/main/java/com/querydsl/core/types/expr/Wildcard.java +++ b/querydsl-core/src/main/java/com/querydsl/core/types/expr/Wildcard.java @@ -26,7 +26,7 @@ import com.querydsl.core.types.TemplateExpressionImpl; public final class Wildcard { /** - * Wilcard expression (*) for all columns + * Wildcard expression (*) for all columns */ public static final Expression all = TemplateExpressionImpl.create(Object[].class, "*"); @@ -36,12 +36,12 @@ public final class Wildcard { public static final NumberExpression count = NumberOperation.create(Long.class, Ops.AggOps.COUNT_ALL_AGG); /** - * Wilcard count distinct expression ((count(distinct *)) + * Wildcard count distinct expression (count(distinct *)) */ public static final NumberExpression countDistinct = NumberOperation.create(Long.class, Ops.AggOps.COUNT_DISTINCT_ALL_AGG); /** - * Wilcard count distinct expression ((count(distinct *)) + * Wildcard count expression (count(*)) */ public static final NumberExpression countAsInt = NumberOperation.create(Integer.class, Ops.AggOps.COUNT_ALL_AGG); diff --git a/querydsl-core/src/test/java/com/querydsl/core/QueryMetadaSerializationTest.java b/querydsl-core/src/test/java/com/querydsl/core/QueryMetadaSerializationTest.java index 8d7d7f192..d4529a22a 100644 --- a/querydsl-core/src/test/java/com/querydsl/core/QueryMetadaSerializationTest.java +++ b/querydsl-core/src/test/java/com/querydsl/core/QueryMetadaSerializationTest.java @@ -65,7 +65,7 @@ public class QueryMetadaSerializationTest { } @Test - public void FullySerizable() { + public void FullySerializable() { Set> checked = new HashSet>(); checked.addAll(Arrays.>asList(Collection.class, List.class, Set.class, Map.class, Object.class, String.class, Class.class)); diff --git a/querydsl-core/src/test/java/com/querydsl/core/types/TermplateInfiniteLoop.java b/querydsl-core/src/test/java/com/querydsl/core/types/TemplateInfiniteLoop.java similarity index 96% rename from querydsl-core/src/test/java/com/querydsl/core/types/TermplateInfiniteLoop.java rename to querydsl-core/src/test/java/com/querydsl/core/types/TemplateInfiniteLoop.java index 60aadd8e6..2b5e73f05 100644 --- a/querydsl-core/src/test/java/com/querydsl/core/types/TermplateInfiniteLoop.java +++ b/querydsl-core/src/test/java/com/querydsl/core/types/TemplateInfiniteLoop.java @@ -3,7 +3,7 @@ package com.querydsl.core.types; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -public class TermplateInfiniteLoop { +public class TemplateInfiniteLoop { static String templates[] = createTemplates(); diff --git a/querydsl-core/src/test/java/com/querydsl/core/types/path/MapPathTest.java b/querydsl-core/src/test/java/com/querydsl/core/types/path/MapPathTest.java index b35432922..c342f15e6 100644 --- a/querydsl-core/src/test/java/com/querydsl/core/types/path/MapPathTest.java +++ b/querydsl-core/src/test/java/com/querydsl/core/types/path/MapPathTest.java @@ -31,7 +31,7 @@ public class MapPathTest { } @Test - public void GetKeytType() { + public void GetKeyType() { assertEquals(String.class, mapPath.getKeyType()); } diff --git a/querydsl-docs/etc/jpa2_comparison.txt b/querydsl-docs/etc/jpa2_comparison.txt index 2f4e47d4a..562192a93 100644 --- a/querydsl-docs/etc/jpa2_comparison.txt +++ b/querydsl-docs/etc/jpa2_comparison.txt @@ -205,9 +205,9 @@ QPerson men = new QPerson("men"); QPerson women = new QPerson("women"); query.from(men, women).where( men.gender.eq(Gender.MALE), - men.relationshipStatus.eq(RelationshipStatsu.SINGLE), + men.relationshipStatus.eq(RelationshipStatus.SINGLE), women.gender.eq(Gender.FEMALE), - women.relationshipStatsu.eq(RelationshipStatsu.SINGLE)); + women.relationshipStatus.eq(RelationshipStatus.SINGLE)); [/code] [b]Fetch joins[/b] @@ -234,7 +234,7 @@ List employees = query.from(employee).join(employee.address).fetch() [code] CriteriaQuery query = builder.createQuery(Employee.class); Root emp = query.from(Employee.class); -emp.fetch(Empoyee_.phones, JoinType.LEFT); +emp.fetch(Employee_.phones, JoinType.LEFT); query.select(emp).distinct(true); List employees = em.createQuery( query).getResultList(); [/code] @@ -255,11 +255,11 @@ List employees = query.from(employee) CriteriaQuery query = builder.createQuery(Employee.class); Root emp = query.from(Employee.class); Subquery sq = query.subquery(Project.class); -Root projecti sq.from(Project.class); -Join sqEmp = project.join(Project_.employees); +Root project sq.from(Project.class); +Join sqEmp = project.join(Project_.employees); sq.select(project) .where(cb.equals(sqEmp, emp), - cb.eqauls(project.get(Project_.name), + cb.equals(project.get(Project_.name), cb.parameter(String.class,"project"))); criteria.add(cb.exists()); [/code] @@ -276,4 +276,4 @@ query.from(employee).where( .where(emp.eq(employee), project.name.eq("some name")) .list(project).exists() ).list(employee); -[/code] \ No newline at end of file +[/code] diff --git a/querydsl-docs/src/main/docbook/css/highlight.css b/querydsl-docs/src/main/docbook/css/highlight.css index 2c94b7407..b9db70d4a 100644 --- a/querydsl-docs/src/main/docbook/css/highlight.css +++ b/querydsl-docs/src/main/docbook/css/highlight.css @@ -1,5 +1,5 @@ /* - code highlight CSS resemblign the Eclipse IDE default color schema + code highlight CSS resembling the Eclipse IDE default color schema @author Costin Leau */ @@ -36,4 +36,4 @@ .hl-annotation { font-style: normal; -} \ No newline at end of file +} diff --git a/querydsl-docs/src/main/docbook/en-US/content/general/creating-queries.xml b/querydsl-docs/src/main/docbook/en-US/content/general/creating-queries.xml index 5588651ad..374d87d14 100644 --- a/querydsl-docs/src/main/docbook/en-US/content/general/creating-queries.xml +++ b/querydsl-docs/src/main/docbook/en-US/content/general/creating-queries.xml @@ -227,7 +227,7 @@ QBankAccount bankAccount = account.as(QBankAccount.class); Select literals - Literals can be selected by refering to them via Constant expressions. Here is a simple example + Literals can be selected by referring to them via Constant expressions. Here is a simple example For Hibernate based Delete usage, use the HibernateDeleteClause instead. DML clauses in JPA don't take JPA level cascade rules into account and don't provide - finegrained second level cache interaction. + fine-grained second level cache interaction. @@ -542,7 +542,7 @@ new JPAUpdateClause(session, customer).where(customer.name.eq("Bob")) For Hibernate based Update usage, use the HibernateUpdateClause instead. DML clauses in JPA don't take JPA level cascade rules into account and don't provide - finegrained second level cache interaction. + fine-grained second level cache interaction. diff --git a/querydsl-docs/src/main/docbook/en-US/content/tutorials/scala.xml b/querydsl-docs/src/main/docbook/en-US/content/tutorials/scala.xml index 24266a95d..39eb847c0 100644 --- a/querydsl-docs/src/main/docbook/en-US/content/tutorials/scala.xml +++ b/querydsl-docs/src/main/docbook/en-US/content/tutorials/scala.xml @@ -38,7 +38,7 @@ expr eq "Ben" expr === "Ben" expr ne "Ben" expr !== "Ben" expr append "X" expr + "X" expr isEmpty expr is empty -expr isNotEmpoty expr not empty +expr isNotEmpty expr not empty // boolean left and right left && right diff --git a/querydsl-docs/src/main/docbook/en-US/content/tutorials/spatial.xml b/querydsl-docs/src/main/docbook/en-US/content/tutorials/spatial.xml index b62eda16e..fdb9b4195 100644 --- a/querydsl-docs/src/main/docbook/en-US/content/tutorials/spatial.xml +++ b/querydsl-docs/src/main/docbook/en-US/content/tutorials/spatial.xml @@ -126,7 +126,7 @@ Geometry point = Wkt.fromWkt("Point(2 2)"); query.where(table.geo.distance(point).lt(5.0)); ]]> - In addition to straight distance between geometries spherical and spherodial distance are provided via + In addition to straight distance between geometries spherical and spheroidal distance are provided via distanceSphere and distanceSpheroid. @@ -183,4 +183,4 @@ NumberExpression pointX = point.x(); // x() is not available on Geometry - \ No newline at end of file + diff --git a/querydsl-docs/src/main/docbook/en-US/content/tutorials/sql.xml b/querydsl-docs/src/main/docbook/en-US/content/tutorials/sql.xml index 697d02d3f..4c10d8528 100644 --- a/querydsl-docs/src/main/docbook/en-US/content/tutorials/sql.xml +++ b/querydsl-docs/src/main/docbook/en-US/content/tutorials/sql.xml @@ -171,7 +171,7 @@ targetFolder - target folder where source filder should be generated + target folder where source folder should be generated namingStrategyClass @@ -929,7 +929,7 @@ new SQLUpdateClause(conn, configuration, survey) Without where @@ -1129,7 +1129,7 @@ configuration.register(new UtilDateType()); (Gender.class)); ]]> @@ -1151,7 +1151,7 @@ configuration.registerNumeric(5,2,Float.class); SQLListener is a listener interface that can be used to listen to queries and DML clause. SQLListener instances can be registered either on the configuration and on the query/clause level via the addListener method. - Use cases for listeners are data synchronization, logging, cacheing and validation. + Use cases for listeners are data synchronization, logging, caching and validation. diff --git a/querydsl-docs/src/main/docbook/ko-KR/content/tutorials/mongodb.xml b/querydsl-docs/src/main/docbook/ko-KR/content/tutorials/mongodb.xml index a5c7c6b60..7effd7e2b 100644 --- a/querydsl-docs/src/main/docbook/ko-KR/content/tutorials/mongodb.xml +++ b/querydsl-docs/src/main/docbook/ko-KR/content/tutorials/mongodb.xml @@ -182,7 +182,7 @@ query 공간(Geospatial) 쿼리 - near(Douyble[]) 메서드를 이용해서 공간 검색을 할 수 있다. + near(Double[]) 메서드를 이용해서 공간 검색을 할 수 있다. - 다음과 같이 Employee 또는 QEmployee의 companio 객체를 사용할 수 있다. + 다음과 같이 Employee 또는 QEmployee의 companion 객체를 사용할 수 있다. wardrobes; // store Wardrobe in values private Map wardrobes2; // store Wardrobe in keys private Map wardrobesInverse; // store Wardrobe in values @@ -53,7 +53,7 @@ public class Gym { private String stringValue; public Gym() { - // this must be initialized in the constructor. dont change it + // this must be initialized in the constructor. don't change it wardrobes = new HashMap(); equipments = new HashMap(); partners = new HashMap(); diff --git a/querydsl-jdo/src/test/java/com/querydsl/jdo/models/fitness/Wardrobe.java b/querydsl-jdo/src/test/java/com/querydsl/jdo/models/fitness/Wardrobe.java index 6a94675a4..be359d983 100644 --- a/querydsl-jdo/src/test/java/com/querydsl/jdo/models/fitness/Wardrobe.java +++ b/querydsl-jdo/src/test/java/com/querydsl/jdo/models/fitness/Wardrobe.java @@ -25,7 +25,7 @@ import com.querydsl.core.annotations.QueryEntity; */ @QueryEntity public class Wardrobe { - // this must be initialized in the constructor. dont change it + // this must be initialized in the constructor. don't change it private List clothes; private String model; private Gym gym; @@ -33,7 +33,7 @@ public class Wardrobe { private String stringValue; public Wardrobe() { - // this must be initialized in the constructor. dont change it + // this must be initialized in the constructor. don't change it clothes = new ArrayList(); } diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/Conversions.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/Conversions.java index d48a45214..55b885ded 100644 --- a/querydsl-jpa/src/main/java/com/querydsl/jpa/Conversions.java +++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/Conversions.java @@ -45,10 +45,10 @@ public final class Conversions { if (isAggSumWithConversion(expr) || isCountAggConversion(expr)) { return new NumberConversion(expr); } else if (expr instanceof FactoryExpression) { - FactoryExpression factorye = (FactoryExpression)expr; - for (Expression e : factorye.getArgs()) { + FactoryExpression factoryExpr = (FactoryExpression)expr; + for (Expression e : factoryExpr.getArgs()) { if (isAggSumWithConversion(e) || isCountAggConversion(expr)) { - return new NumberConversions(factorye); + return new NumberConversions(factoryExpr); } } } @@ -86,10 +86,10 @@ public final class Conversions { } else if (Enum.class.isAssignableFrom(expr.getType())) { return new EnumConversion(expr); } else if (expr instanceof FactoryExpression) { - FactoryExpression factorye = (FactoryExpression)expr; + FactoryExpression factoryExpr = (FactoryExpression)expr; boolean numberConversions = false; boolean hasEntityPath = false; - for (Expression e : factorye.getArgs()) { + for (Expression e : factoryExpr.getArgs()) { if (isEntityPathAndNeedsWrapping(e)) { hasEntityPath = true; } else if (Number.class.isAssignableFrom(e.getType())) { @@ -99,12 +99,12 @@ public final class Conversions { } } if (hasEntityPath) { - factorye = createEntityPathConversions(factorye); + factoryExpr = createEntityPathConversions(factoryExpr); } if (numberConversions) { - factorye = new NumberConversions(factorye); + factoryExpr = new NumberConversions(factoryExpr); } - return factorye; + return factoryExpr; } return expr; } diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/ExpressionSerializationTest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/ExpressionSerializationTest.java index f0670029c..9dc9d26ed 100644 --- a/querydsl-jpa/src/test/java/com/querydsl/jpa/ExpressionSerializationTest.java +++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/ExpressionSerializationTest.java @@ -15,7 +15,6 @@ public class ExpressionSerializationTest { @Test public void Serialize() throws Exception { - //QAdress.adress.name.eq("test" Expression expr = QCat.cat.name.eq("test"); Expression expr2 = serialize(expr); diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/JPAQueryMixinTest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/JPAQueryMixinTest.java index efe0738df..aa7f9c942 100644 --- a/querydsl-jpa/src/test/java/com/querydsl/jpa/JPAQueryMixinTest.java +++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/JPAQueryMixinTest.java @@ -180,7 +180,7 @@ public class JPAQueryMixinTest { } @Test - public void OrderBy_Embeddable_Colllection() { + public void OrderBy_Embeddable_Collection() { QBookVersion bookVersion = QBookVersion.bookVersion; QBookMark bookMark = new QBookMark("bookVersion_definition_bookMarks"); mixin.from(bookVersion); diff --git a/querydsl-mongodb/src/main/java/com/querydsl/mongodb/MongodbExpressions.java b/querydsl-mongodb/src/main/java/com/querydsl/mongodb/MongodbExpressions.java index 544eb6412..bc3581a31 100644 --- a/querydsl-mongodb/src/main/java/com/querydsl/mongodb/MongodbExpressions.java +++ b/querydsl-mongodb/src/main/java/com/querydsl/mongodb/MongodbExpressions.java @@ -29,7 +29,7 @@ public final class MongodbExpressions { private MongodbExpressions() {} /** - * Finds the closest points relative to the given location and orders the results with decreasing promimity + * Finds the closest points relative to the given location and orders the results with decreasing proximity * * @param expr * @param latVal latitude diff --git a/querydsl-mongodb/src/main/java/com/querydsl/mongodb/Point.java b/querydsl-mongodb/src/main/java/com/querydsl/mongodb/Point.java index b6055fd90..63a421da5 100644 --- a/querydsl-mongodb/src/main/java/com/querydsl/mongodb/Point.java +++ b/querydsl-mongodb/src/main/java/com/querydsl/mongodb/Point.java @@ -41,7 +41,7 @@ public class Point extends ArrayPath { } /** - * Finds the closest points relative to the given location and orders the results with decreasing promimity + * Finds the closest points relative to the given location and orders the results with decreasing proximity * * @param latVal latitude * @param longVal longitude diff --git a/querydsl-mongodb/src/test/java/com/querydsl/mongodb/GeoSpatialQueryTest.java b/querydsl-mongodb/src/test/java/com/querydsl/mongodb/GeoSpatialQueryTest.java index 9f5be428f..0bcd67b67 100644 --- a/querydsl-mongodb/src/test/java/com/querydsl/mongodb/GeoSpatialQueryTest.java +++ b/querydsl-mongodb/src/test/java/com/querydsl/mongodb/GeoSpatialQueryTest.java @@ -50,7 +50,7 @@ public class GeoSpatialQueryTest { @Before public void before() { ds.delete(ds.createQuery(GeoEntity.class)); - ds.getCollection(GeoEntity.class).ensureIndex(new BasicDBObject("location","2d"));; + ds.getCollection(GeoEntity.class).ensureIndex(new BasicDBObject("location","2d")); } @Test diff --git a/querydsl-mongodb/src/test/java/com/querydsl/mongodb/MongodbQueryTest.java b/querydsl-mongodb/src/test/java/com/querydsl/mongodb/MongodbQueryTest.java index 01d3a8bcb..5cf9b9cde 100644 --- a/querydsl-mongodb/src/test/java/com/querydsl/mongodb/MongodbQueryTest.java +++ b/querydsl-mongodb/src/test/java/com/querydsl/mongodb/MongodbQueryTest.java @@ -32,14 +32,14 @@ import com.mongodb.MongoException; import com.mongodb.ReadPreference; import com.querydsl.core.NonUniqueResultException; import com.querydsl.core.SearchResults; -import com.querydsl.mongodb.domain.*; -import com.querydsl.mongodb.domain.User.Gender; -import com.querydsl.mongodb.morphia.MorphiaQuery; +import com.querydsl.core.testutil.ExternalDB; import com.querydsl.core.types.EntityPath; import com.querydsl.core.types.OrderSpecifier; import com.querydsl.core.types.Predicate; import com.querydsl.core.types.path.StringPath; -import com.querydsl.core.testutil.ExternalDB; +import com.querydsl.mongodb.domain.*; +import com.querydsl.mongodb.domain.User.Gender; +import com.querydsl.mongodb.morphia.MorphiaQuery; @Category(ExternalDB.class) public class MongodbQueryTest { @@ -287,7 +287,7 @@ public class MongodbQueryTest { assertQuery(user.lastName.eq("Jantunen"), user.firstName.desc(), u1, u2); assertQuery(user.firstName.eq("Jaana").and(user.lastName.eq("Aakkonen")), u3); - //This shoud produce 'and' also + //This should produce 'and' also assertQuery(where(user.firstName.eq("Jaana"), user.lastName.eq("Aakkonen")), u3); assertQuery(user.firstName.ne("Jaana"), u2, u1); diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSPolygonExpression.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSPolygonExpression.java index b7f73309a..589a62fb6 100644 --- a/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSPolygonExpression.java +++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSPolygonExpression.java @@ -40,7 +40,7 @@ public abstract class JTSPolygonExpression extends JTSSurface private volatile NumberExpression numInteriorRing; @Nullable - private volatile JTSLineStringExpression exterorRing; + private volatile JTSLineStringExpression exteriorRing; public JTSPolygonExpression(Expression mixin) { super(mixin); @@ -52,10 +52,10 @@ public abstract class JTSPolygonExpression extends JTSSurface * @return */ public JTSLineStringExpression exteriorRing() { - if (exterorRing == null) { - exterorRing = JTSLineStringOperation.create(LineString.class, SpatialOps.EXTERIOR_RING, mixin); + if (exteriorRing == null) { + exteriorRing = JTSLineStringOperation.create(LineString.class, SpatialOps.EXTERIOR_RING, mixin); } - return exterorRing; + return exteriorRing; } /** diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/path/GeometryPath.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/path/GeometryPath.java index aa4d6ed8b..90fc41516 100644 --- a/querydsl-spatial/src/main/java/com/querydsl/spatial/path/GeometryPath.java +++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/path/GeometryPath.java @@ -139,7 +139,7 @@ public class GeometryPath extends GeometryExpression impl return polygon; } - public PolyhedralSurfacePath asPolygHedralSurface() { + public PolyhedralSurfacePath asPolyHedralSurface() { if (polyhedralSurface == null) { polyhedralSurface = new PolyhedralSurfacePath(pathMixin.getMetadata()); } diff --git a/querydsl-spatial/src/test/java/com/querydsl/spatial/path/GeometryPathTest.java b/querydsl-spatial/src/test/java/com/querydsl/spatial/path/GeometryPathTest.java index 290d3a438..87bcdfa1a 100644 --- a/querydsl-spatial/src/test/java/com/querydsl/spatial/path/GeometryPathTest.java +++ b/querydsl-spatial/src/test/java/com/querydsl/spatial/path/GeometryPathTest.java @@ -27,6 +27,6 @@ public class GeometryPathTest { assertEquals(new MultiPolygonPath("geometry"), geometry.asMultiPolygon()); assertEquals(new PointPath("geometry"), geometry.asPoint()); assertEquals(new PolygonPath("geometry"), geometry.asPolygon()); - assertEquals(new PolyhedralSurfacePath("geometry"), geometry.asPolygHedralSurface()); + assertEquals(new PolyhedralSurfacePath("geometry"), geometry.asPolyHedralSurface()); } } diff --git a/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/ExtendedBeanSerializer.java b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/ExtendedBeanSerializer.java index 8552c6c9f..972831e4f 100644 --- a/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/ExtendedBeanSerializer.java +++ b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/ExtendedBeanSerializer.java @@ -30,7 +30,7 @@ import com.querydsl.sql.Column; import com.querydsl.sql.codegen.support.PrimaryKeyData; /** - * ExtendedBeanSerialzier outputs primary key based equals, hashCode and toString implementations + * ExtendedBeanSerializer outputs primary key based equals, hashCode and toString implementations * * @author tiwe * diff --git a/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/MetaDataExporter.java b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/MetaDataExporter.java index ba4c7f4e7..9b0991524 100644 --- a/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/MetaDataExporter.java +++ b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/MetaDataExporter.java @@ -517,7 +517,7 @@ public class MetaDataExporter { /** * Override the NamingStrategy (default: new DefaultNamingStrategy()) * - * @param namingStrategy namingstrategy to override (default: new DefaultNamingStrategy()) + * @param namingStrategy naming strategy to override (default: new DefaultNamingStrategy()) */ public void setNamingStrategy(NamingStrategy namingStrategy) { module.bind(NamingStrategy.class, namingStrategy); diff --git a/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/ant/AntMetaDataExporter.java b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/ant/AntMetaDataExporter.java index 8c797e9e6..305b99a9a 100644 --- a/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/ant/AntMetaDataExporter.java +++ b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/ant/AntMetaDataExporter.java @@ -106,7 +106,7 @@ public class AntMetaDataExporter extends Task { private String targetFolder; /** - * namingstrategy class to override (default: DefaultNamingStrategy) + * naming strategy class to override (default: DefaultNamingStrategy) */ private String namingStrategyClass; @@ -638,4 +638,4 @@ public class AntMetaDataExporter extends Task { public void setSourceEncoding(String sourceEncoding) { this.sourceEncoding = sourceEncoding; } -} \ No newline at end of file +} diff --git a/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/AbstractConverterTest.java b/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/AbstractConverterTest.java index 0be2775b8..fd17d8cf2 100644 --- a/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/AbstractConverterTest.java +++ b/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/AbstractConverterTest.java @@ -48,7 +48,7 @@ public abstract class AbstractConverterTest { data.add(new LineString(createSequence(crs, (Point)data.get(i), (Point)data.get(i)))); } - // polgyon + // polygon // TODO // multipoint diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/RelationalPathExtractor.java b/querydsl-sql/src/main/java/com/querydsl/sql/RelationalPathExtractor.java index 66dbe3cdb..251382c27 100644 --- a/querydsl-sql/src/main/java/com/querydsl/sql/RelationalPathExtractor.java +++ b/querydsl-sql/src/main/java/com/querydsl/sql/RelationalPathExtractor.java @@ -32,7 +32,7 @@ import com.querydsl.core.types.TemplateExpression; import com.querydsl.core.types.Visitor; /** - * RelationalPathExtractor extracts RelationlPath instances from expressions and queries + * RelationalPathExtractor extracts RelationalPath instances from expressions and queries * * @author tiwe * diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/SQLExpressions.java b/querydsl-sql/src/main/java/com/querydsl/sql/SQLExpressions.java index a2e2fa3dd..a2c3000f0 100644 --- a/querydsl-sql/src/main/java/com/querydsl/sql/SQLExpressions.java +++ b/querydsl-sql/src/main/java/com/querydsl/sql/SQLExpressions.java @@ -109,7 +109,7 @@ public final class SQLExpressions { public static final Expression all = Wildcard.all; /** - * Wilcard count expression + * Wildcard count expression */ public static final Expression countAll = Wildcard.count; diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/SQLTemplates.java b/querydsl-sql/src/main/java/com/querydsl/sql/SQLTemplates.java index 445e44555..59fe571e2 100644 --- a/querydsl-sql/src/main/java/com/querydsl/sql/SQLTemplates.java +++ b/querydsl-sql/src/main/java/com/querydsl/sql/SQLTemplates.java @@ -214,7 +214,7 @@ public class SQLTemplates extends Templates { private String leftJoin = "\nleft join "; - private String rightJoin = "\nright join ";; + private String rightJoin = "\nright join "; private String limitTemplate = "\nlimit {0}"; diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/Connections.java b/querydsl-sql/src/test/java/com/querydsl/sql/Connections.java index e532e8277..7fcfb4b13 100644 --- a/querydsl-sql/src/test/java/com/querydsl/sql/Connections.java +++ b/querydsl-sql/src/test/java/com/querydsl/sql/Connections.java @@ -966,7 +966,7 @@ public final class Connections { stmt.execute("create table SURVEY(ID int auto_increment, " + "NAME varchar(30)," + "NAME2 varchar(30)," + - "constraint suryey_pk primary key(ID))"); + "constraint survey_pk primary key(ID))"); stmt.execute("insert into SURVEY values (1,'Hello World','Hello');"); // test @@ -1195,4 +1195,4 @@ public final class Connections { } private Connections() {} -} \ No newline at end of file +} diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/MergeBase.java b/querydsl-sql/src/test/java/com/querydsl/sql/MergeBase.java index c42c0f750..0000e7159 100644 --- a/querydsl-sql/src/test/java/com/querydsl/sql/MergeBase.java +++ b/querydsl-sql/src/test/java/com/querydsl/sql/MergeBase.java @@ -190,7 +190,7 @@ public class MergeBase extends AbstractBaseTest{ @Test @IncludeIn(H2) - public void Merge_With_TempateExpression_In_Batch() { + public void Merge_With_TemplateExpression_In_Batch() { SQLMergeClause merge = merge(survey) .keys(survey.id) .set(survey.id, 5)