From bffeb9ac7dfb3d74e90919fd6142d2cbc86a66d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= <timo.westkamper@gmail.com>
Date: Thu, 29 May 2014 20:19:30 +0300
Subject: [PATCH 1/2] Replace ImmutableMap with HashMap

---
 .../src/main/java/com/mysema/query/types/QMap.java  | 11 +++++------
 .../test/java/com/mysema/query/types/QMapTest.java  | 13 +++++++++----
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/querydsl-core/src/main/java/com/mysema/query/types/QMap.java b/querydsl-core/src/main/java/com/mysema/query/types/QMap.java
index 9ef3ba7fb..f5d837f3e 100644
--- a/querydsl-core/src/main/java/com/mysema/query/types/QMap.java
+++ b/querydsl-core/src/main/java/com/mysema/query/types/QMap.java
@@ -13,13 +13,12 @@
  */
 package com.mysema.query.types;
 
+import javax.annotation.Nullable;
 import java.util.List;
 import java.util.Map;
 
-import javax.annotation.Nullable;
-
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Maps;
 
 /**
  * QMap represents a projection of type Map
@@ -104,11 +103,11 @@ public class QMap extends ExpressionBase<Map<Expression<?>,?>> implements Factor
     @Override
     @Nullable
     public Map<Expression<?>, ?> newInstance(Object... args) {
-        ImmutableMap.Builder<Expression<?>,Object> builder = ImmutableMap.builder();
+        Map<Expression<?>, Object> map = Maps.newHashMap();
         for (int i = 0; i < args.length; i++) {
-            builder.put(this.args.get(i), args[i]);
+            map.put(this.args.get(i), args[i]);
         }
-        return builder.build();
+        return map;
     }
 
 }
diff --git a/querydsl-core/src/test/java/com/mysema/query/types/QMapTest.java b/querydsl-core/src/test/java/com/mysema/query/types/QMapTest.java
index 23383f046..56d0cf363 100644
--- a/querydsl-core/src/test/java/com/mysema/query/types/QMapTest.java
+++ b/querydsl-core/src/test/java/com/mysema/query/types/QMapTest.java
@@ -13,13 +13,12 @@
  */
 package com.mysema.query.types;
 
-import static org.junit.Assert.assertEquals;
-
 import java.util.Arrays;
 
-import org.junit.Test;
-
 import com.mysema.query.types.path.StringPath;
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 
 public class QMapTest {
 
@@ -81,4 +80,10 @@ public class QMapTest {
         assertEquals(expr.newInstance("str1", "str2").hashCode(), expr.newInstance("str1", "str2").hashCode());
     }
 
+    @Test
+    public void Null_Value() {
+        QMap expr = new QMap(str1, str2);
+        assertNotNull(expr.newInstance("str1", null));
+    }
+
 }

From 466c45cf7a4f00722318d77bf91978480d972fed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= <timo.westkamper@gmail.com>
Date: Thu, 29 May 2014 20:22:31 +0300
Subject: [PATCH 2/2] Remove bin/main/assembly.xml

---
 querydsl-root/bin/main/assembly.xml | 70 -----------------------------
 1 file changed, 70 deletions(-)
 delete mode 100644 querydsl-root/bin/main/assembly.xml

diff --git a/querydsl-root/bin/main/assembly.xml b/querydsl-root/bin/main/assembly.xml
deleted file mode 100644
index 8cac4e967..000000000
--- a/querydsl-root/bin/main/assembly.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" 
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-  <id>full-deps</id>
-  <formats>
-    <format>zip</format>
-  </formats>
-  <files>
-    <file>
-      <source>../querydsl-root/LICENSE.txt</source>
-      <outputDirectory>/</outputDirectory>
-    </file>	
-  </files>
-  
-  <fileSets>
-    <fileSet>
-      <directory>target</directory>
-      <includes>
-        <include>*.jar</include>
-      </includes>
-	  <excludes>
-	  	<exclude>*-tests.jar</exclude>
-	  	<exclude>*-one-jar.jar</exclude>
-	    <exclude>*-sources.jar</exclude>	
-	  </excludes>	
-	  <outputDirectory>/lib/all</outputDirectory>
-    </fileSet>
-
-    <fileSet>
-      <directory>target</directory>
-      <includes>
-        <include>*-one-jar.jar</include>
-      </includes>
-	  <outputDirectory>/lib/apt</outputDirectory>
-    </fileSet>
-
-	<fileSet>
-	  <directory>target</directory>
-	  <includes>
-	    <include>*-sources.jar</include>	
-	  </includes>	
-	  <outputDirectory>/src</outputDirectory>	  	
-	</fileSet>
-	
-	<fileSet>
-	  <directory>../querydsl-core/target</directory>
-	  <includes>
-	    <include>*-sources.jar</include>	
-	  </includes>	
-	  <excludes>
-	  	<exclude>*-test-sources.jar</exclude>
-	  </excludes>	
-	  <outputDirectory>/src</outputDirectory>	  	
-	</fileSet>	
-
-  </fileSets>
-  	  
-  <dependencySets>
-    <dependencySet>
-      <scope>compile</scope>
-      <outputDirectory>lib/all</outputDirectory>
-    </dependencySet>
-	<!--   	
-    <dependencySet>
-      <scope>provided</scope>
-      <outputDirectory>lib/all</outputDirectory>
-    </dependencySet>
-	-->
-  </dependencySets>
-</assembly>