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

Remove all manual array copying code

Browse Source 
Additionally, use Guava's splitter to split Strings
This commit is contained in:
Ruben Dijkstra 2014-09-25 19:00:43 +02:00 committed by Ruben Dijkstra
parent 0640aa1895
commit 8417375e70
6 changed files with 31 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
querydsl-apt/src/main/java/com/mysema/query/apt/DefaultConfiguration.java
View File

@ -13,14 +13,18 @@
*/
package com.mysema.query.apt;
import static com.mysema.query.apt.APTOptions.*;
import java.lang.annotation.Annotation;
import java.util.*;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.annotation.processing.RoundEnvironment;
import javax.lang.model.element.*;
import javax.lang.model.type.TypeMirror;
import java.lang.annotation.Annotation;
import java.util.*;
import com.google.common.base.Splitter;
import com.google.common.base.Strings;
import com.mysema.codegen.model.ClassType;
import com.mysema.query.annotations.Config;
@ -29,7 +33,6 @@ import com.mysema.query.annotations.QueryType;
import com.mysema.query.codegen.*;
import com.mysema.query.types.Expression;
import com.mysema.util.Annotations;
import static com.mysema.query.apt.APTOptions.*;
/**
* DefaultConfiguration is a simple implementation of the {@link Configuration} interface
@ -39,7 +42,7 @@ import static com.mysema.query.apt.APTOptions.*;
*/
public class DefaultConfiguration implements Configuration {
private static final String DEFAULT_SEPARATOR = ",";
private static final Splitter DEFAULT_SPLITTER = Splitter.on(",");
private boolean unknownAsEmbedded;
@ -145,36 +148,32 @@ public class DefaultConfiguration implements Configuration {
if (options.containsKey(QUERYDSL_EXCLUDED_PACKAGES)) {
String packageString = options.get(QUERYDSL_EXCLUDED_PACKAGES);
if (!Strings.isNullOrEmpty(packageString)) {
for (String packageName : packageString.split(DEFAULT_SEPARATOR)) {
excludedPackages.add(packageName);
}
List<String> packages = DEFAULT_SPLITTER.splitToList(packageString);
excludedPackages.addAll(packages);
}
}
if (options.containsKey(QUERYDSL_EXCLUDED_CLASSES)) {
String classString = options.get(QUERYDSL_EXCLUDED_CLASSES);
if (!Strings.isNullOrEmpty(classString)) {
for (String className : classString.split(DEFAULT_SEPARATOR)) {
excludedClasses.add(className);
}
List<String> classes = DEFAULT_SPLITTER.splitToList(classString);
excludedClasses.addAll(classes);
}
}
if (options.containsKey(QUERYDSL_INCLUDED_PACKAGES)) {
String packageString = options.get(QUERYDSL_INCLUDED_PACKAGES);
if (!Strings.isNullOrEmpty(packageString)) {
for (String packageName : packageString.split(DEFAULT_SEPARATOR)) {
includedPackages.add(packageName);
}
List<String> packages = DEFAULT_SPLITTER.splitToList(packageString);
includedPackages.addAll(packages);
}
}
if (options.containsKey(QUERYDSL_INCLUDED_CLASSES)) {
String classString = options.get(QUERYDSL_INCLUDED_CLASSES);
if (!Strings.isNullOrEmpty(classString)) {
for (String className : classString.split(DEFAULT_SEPARATOR)) {
includedClasses.add(className);
}
List<String> classes = DEFAULT_SPLITTER.splitToList(classString);
includedClasses.addAll(classes);
}
}

20
querydsl-core/src/main/java/com/mysema/util/ReflectionUtils.java
View File

@ -13,20 +13,8 @@
*/
package com.mysema.util;
import java.lang.reflect.AnnotatedElement;
import java.lang.reflect.Array;
import java.lang.reflect.Field;
import java.lang.reflect.GenericArrayType;
import java.lang.reflect.Method;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.lang.reflect.TypeVariable;
import java.lang.reflect.WildcardType;
import java.util.ArrayDeque;
import java.util.Arrays;
import java.util.Deque;
import java.util.HashSet;
import java.util.Set;
import java.lang.reflect.*;
import java.util.*;
import javax.annotation.Nullable;
@ -163,9 +151,7 @@ public final class ReflectionUtils {
Set<Field> fields = new HashSet<Field>();
Class<?> c = cl;
while (c != null) {
for (Field field : c.getDeclaredFields()) {
fields.add(field);
}
fields.addAll(Arrays.asList(c.getDeclaredFields()));
c = c.getSuperclass();
}
return fields;

16
querydsl-mongodb/src/test/java/com/mysema/query/mongodb/MongodbSerializerTest.java
View File

@ -20,9 +20,6 @@ import java.util.Arrays;
import java.util.Date;
import java.util.List;
import org.junit.Before;
import org.junit.Test;
import com.mongodb.BasicDBList;
import com.mongodb.BasicDBObject;
import com.mongodb.DBObject;
@ -31,11 +28,10 @@ import com.mysema.query.mongodb.domain.QUser;
import com.mysema.query.mongodb.morphia.MorphiaSerializer;
import com.mysema.query.types.Expression;
import com.mysema.query.types.OrderSpecifier;
import com.mysema.query.types.path.DatePath;
import com.mysema.query.types.path.DateTimePath;
import com.mysema.query.types.path.NumberPath;
import com.mysema.query.types.path.PathBuilder;
import com.mysema.query.types.path.StringPath;
import com.mysema.query.types.path.*;
import org.junit.Before;
import org.junit.Test;
public class MongodbSerializerTest {
@ -239,9 +235,7 @@ public class MongodbSerializerTest {
public static BasicDBList dblist(Object... contents) {
BasicDBList list = new BasicDBList();
for (Object o : contents) {
list.add(o);
}
list.addAll(Arrays.asList(contents));
return list;
}

5
querydsl-sql-codegen/src/main/java/com/mysema/query/sql/support/PrimaryKeyData.java
View File

@ -14,6 +14,7 @@
package com.mysema.query.sql.support;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
/**
@ -32,9 +33,7 @@ public class PrimaryKeyData {
public PrimaryKeyData(String name, String[] c) {
this.name = name;
for (String column : c) {
columns.add(column);
}
columns.addAll(Arrays.asList(c));
}
public void add(String column) {

8
querydsl-sql/src/main/java/com/mysema/query/sql/dml/SQLMergeClause.java
View File

@ -13,10 +13,11 @@
*/
package com.mysema.query.sql.dml;
import javax.annotation.Nullable;
import java.sql.*;
import java.util.*;
import javax.annotation.Nullable;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Maps;
import com.mysema.query.*;
@ -26,6 +27,7 @@ import com.mysema.query.sql.*;
import com.mysema.query.sql.types.Null;
import com.mysema.query.types.*;
import com.mysema.util.ResultSetAdapter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -485,9 +487,7 @@ public class SQLMergeClause extends AbstractSQLClause<SQLMergeClause> implements
* @return
*/
public SQLMergeClause keys(Path<?>... paths) {
for (Path<?> path : paths) {
keys.add(path);
}
keys.addAll(Arrays.asList(paths));
return this;
}

5
querydsl-sql/src/test/java/com/mysema/query/ddl/PrimaryKeyData.java
View File

@ -6,6 +6,7 @@
package com.mysema.query.ddl;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
/**
@ -24,9 +25,7 @@ public class PrimaryKeyData {
public PrimaryKeyData(String name, String[] c) {
this.name = name;
for (String column : c) {
columns.add(column);
}
columns.addAll(Arrays.asList(c));
}
public void add(String column) {