From 16cd6d969797db0509cfa7940dbd5a6492b8a033 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= Date: Sun, 5 Jan 2014 22:12:10 +0200 Subject: [PATCH] #614 Add license headers and javadocs --- .../group/AbstractGroupByTransformer.java | 13 ++++++ .../java/com/mysema/query/group/GAvg.java | 9 ++-- .../java/com/mysema/query/group/GMap.java | 32 ++++++++------- .../query/group/MixinGroupExpression.java | 41 ++++++++++++++----- 4 files changed, 65 insertions(+), 30 deletions(-) diff --git a/querydsl-core/src/main/java/com/mysema/query/group/AbstractGroupByTransformer.java b/querydsl-core/src/main/java/com/mysema/query/group/AbstractGroupByTransformer.java index 0529cee16..bb12fb489 100644 --- a/querydsl-core/src/main/java/com/mysema/query/group/AbstractGroupByTransformer.java +++ b/querydsl-core/src/main/java/com/mysema/query/group/AbstractGroupByTransformer.java @@ -1,3 +1,16 @@ +/* + * Copyright 2014, 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 + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.mysema.query.group; import java.util.ArrayList; diff --git a/querydsl-core/src/main/java/com/mysema/query/group/GAvg.java b/querydsl-core/src/main/java/com/mysema/query/group/GAvg.java index f37b4cc3a..e718beab7 100644 --- a/querydsl-core/src/main/java/com/mysema/query/group/GAvg.java +++ b/querydsl-core/src/main/java/com/mysema/query/group/GAvg.java @@ -1,6 +1,6 @@ /* * Copyright 2012, 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 @@ -39,18 +39,17 @@ public class GAvg> extends AbstractGroupExpress private BigDecimal sum = BigDecimal.ZERO; @Override - public void add(T t) { + public void add(T t) { count++; if (t != null) { - sum = sum.add(new BigDecimal(t.toString())); + sum = sum.add(new BigDecimal(t.toString())); } - } @Override public T get() { BigDecimal avg = sum.divide(BigDecimal.valueOf(count)); - return (T) MathUtils.cast(avg, (Class) getType()); + return MathUtils.cast(avg, (Class) getType()); } }; diff --git a/querydsl-core/src/main/java/com/mysema/query/group/GMap.java b/querydsl-core/src/main/java/com/mysema/query/group/GMap.java index a9c4ef4a7..5fe69db0d 100644 --- a/querydsl-core/src/main/java/com/mysema/query/group/GMap.java +++ b/querydsl-core/src/main/java/com/mysema/query/group/GMap.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 @@ -19,6 +19,10 @@ import java.util.Map; import com.mysema.commons.lang.Pair; +/** + * @param + * @param + */ class GMap extends AbstractGroupExpression, Map> { private static final long serialVersionUID = 7106389414200843920L; @@ -32,7 +36,7 @@ class GMap extends AbstractGroupExpression, Map> { return new GroupCollector, Map>() { private final Map map = new LinkedHashMap(); - + @Override public void add(Pair pair) { map.put(pair.getFirst(), pair.getSecond()); @@ -42,26 +46,26 @@ class GMap extends AbstractGroupExpression, Map> { public Map get() { return map; } - + }; } - + static class Mixin> extends AbstractGroupExpression, R> { private static final long serialVersionUID = 1939989270493531116L; private class GroupCollectorImpl implements GroupCollector, R> { - + private final GroupCollector, R> groupCollector; - + private final Map> keyCollectors = new LinkedHashMap>(); - + private final Map, GroupCollector> valueCollectors = new HashMap, GroupCollector>(); - + public GroupCollectorImpl() { this.groupCollector = mixin.createGroupCollector(); } - + @Override public void add(Pair pair) { K first = pair.getFirst(); @@ -75,7 +79,7 @@ class GMap extends AbstractGroupExpression, Map> { if (valueCollector == null) { valueCollector = valueExpression.createGroupCollector(); valueCollectors.put(keyCollector, valueCollector); - } + } V second = pair.getSecond(); valueCollector.add(second); } @@ -93,12 +97,12 @@ class GMap extends AbstractGroupExpression, Map> { } } - + private final GroupExpression, R> mixin; - + private final GroupExpression keyExpression; private final GroupExpression valueExpression; - + @SuppressWarnings({ "rawtypes", "unchecked" }) public Mixin(GroupExpression keyExpression, GroupExpression valueExpression, AbstractGroupExpression, R> mixin) { super((Class) mixin.getType(), QPair.create(keyExpression.getExpression(), valueExpression.getExpression())); @@ -111,7 +115,7 @@ class GMap extends AbstractGroupExpression, Map> { public GroupCollector, R> createGroupCollector() { return new GroupCollectorImpl(); } - + } } \ No newline at end of file diff --git a/querydsl-core/src/main/java/com/mysema/query/group/MixinGroupExpression.java b/querydsl-core/src/main/java/com/mysema/query/group/MixinGroupExpression.java index bc71bbf39..327e269e4 100644 --- a/querydsl-core/src/main/java/com/mysema/query/group/MixinGroupExpression.java +++ b/querydsl-core/src/main/java/com/mysema/query/group/MixinGroupExpression.java @@ -1,27 +1,46 @@ +/* + * Copyright 2014, 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 + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.mysema.query.group; +/** + * @param + * @param + * @param + */ public class MixinGroupExpression extends AbstractGroupExpression { - + private static final long serialVersionUID = -5419707469727395643L; private class GroupCollectorImpl implements GroupCollector { - + private final GroupCollector mixinGroupCollector; - + private GroupCollector groupCollector; - + public GroupCollectorImpl() { mixinGroupCollector = mixin.createGroupCollector(); } - + + @Override public void add(E input) { if (groupCollector == null) { groupCollector = groupExpression.createGroupCollector(); } groupCollector.add(input); } - - + + @Override public R get() { if (groupCollector != null) { @@ -35,9 +54,9 @@ public class MixinGroupExpression extends AbstractGroupExpression } private final GroupExpression mixin; - + private final GroupExpression groupExpression; - + @SuppressWarnings({ "unchecked", "rawtypes" }) public MixinGroupExpression(GroupExpression groupExpression, GroupExpression mixin) { super((Class) mixin.getType(), groupExpression.getExpression()); @@ -48,6 +67,6 @@ public class MixinGroupExpression extends AbstractGroupExpression @Override public GroupCollector createGroupCollector() { return new GroupCollectorImpl(); - } - + } + }