From 856e101d7ef67b7f618fda8a9f0ac720b9437f07 Mon Sep 17 00:00:00 2001
From: emre <emre@hazelcast.com>
Date: Wed, 26 Feb 2020 13:28:18 +0300
Subject: [PATCH] Fix: namespace is not used in Java codec templates (incl.
 custom)

---
 java/codec-template.java.j2        | 4 ++++
 java/custom-codec-template.java.j2 | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/java/codec-template.java.j2 b/java/codec-template.java.j2
index e8c4f16e4..8fcdfc30b 100644
--- a/java/codec-template.java.j2
+++ b/java/codec-template.java.j2
@@ -53,7 +53,11 @@ package com.hazelcast.client.impl.protocol.codec;
 import com.hazelcast.client.impl.protocol.ClientMessage;
 import com.hazelcast.client.impl.protocol.Generated;
 import com.hazelcast.client.impl.protocol.codec.builtin.*;
+{% if namespace %}
+import {{ namespace }}.custom.*;
+{% else %}
 import com.hazelcast.client.impl.protocol.codec.custom.*;
+{% endif %}
 {% if method.events|length != 0 %}
 import com.hazelcast.logging.Logger;
 {% endif %}
diff --git a/java/custom-codec-template.java.j2 b/java/custom-codec-template.java.j2
index 183dad856..d3b5ca6da 100644
--- a/java/custom-codec-template.java.j2
+++ b/java/custom-codec-template.java.j2
@@ -45,7 +45,7 @@
  */
 
 {% if namespace %}
-package {{ namespace }};
+package {{ namespace }}.custom;
 {% else %}
 package com.hazelcast.client.impl.protocol.codec.custom;
 {% endif %}