java: refactor DynamicCodeGen.java

3 files changed, 10 insertions, 4 deletions

diff --git a/java/src/main/java/org/msgpack/util/codegen/BasicConstants.java b/java/src/main/java/org/msgpack/util/codegen/BasicConstants.java
index f169bcd..1e84843 100644
--- a/java/src/main/java/org/msgpack/util/codegen/BasicConstants.java
+++ b/java/src/main/java/org/msgpack/util/codegen/BasicConstants.java
@@ -85,6 +85,10 @@ public interface BasicConstants {
 	String VARIABLE_NAME_TEMPLATES = "_$$_templates";
 
 	String VARIABLE_NAME_TEMPLATES0 = "_$$_tmpls";
+	
+	String VARIABLE_NAME_CLIENT = "_$$_client";
+	
+	String VARIABLE_NAME_CLIENT0 = "_$$_c";
 
 	String METHOD_NAME_VALUEOF = "valueOf";
 
@@ -127,6 +131,8 @@ public interface BasicConstants {
 	String METHOD_NAME_MSGCONVERT = "messageConvert";
 
 	String METHOD_NAME_SETTEMPLATES = "setTemplates";
+	
+	String METHOD_NAME_SETCLIENT = "setClient";
 
 	String METHOD_NAME_PACK = "pack";
 
diff --git a/java/src/main/java/org/msgpack/util/codegen/DynamicCodeGen.java b/java/src/main/java/org/msgpack/util/codegen/DynamicCodeGen.java
index 909bef6..ee5667d 100644
--- a/java/src/main/java/org/msgpack/util/codegen/DynamicCodeGen.java
+++ b/java/src/main/java/org/msgpack/util/codegen/DynamicCodeGen.java
@@ -38,7 +38,7 @@ import org.msgpack.annotation.MessagePackOrdinalEnum;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class DynamicCodeGen extends DynamicCodeGenBase implements Constants {
+class DynamicCodeGen extends DynamicCodeGenBase implements Constants {
 
 	private static Logger LOG = LoggerFactory.getLogger(DynamicCodeGen.class);
 
diff --git a/java/src/main/java/org/msgpack/util/codegen/DynamicCodeGenBase.java b/java/src/main/java/org/msgpack/util/codegen/DynamicCodeGenBase.java
index af7c909..6fa6abc 100644
--- a/java/src/main/java/org/msgpack/util/codegen/DynamicCodeGenBase.java
+++ b/java/src/main/java/org/msgpack/util/codegen/DynamicCodeGenBase.java
@@ -134,7 +134,7 @@ public class DynamicCodeGenBase implements BasicConstants {
 		sb.append(name);
 	}
 
-	static int getArrayDim(Class<?> type) {
+	protected int getArrayDim(Class<?> type) {
 		if (type.isArray()) {
 			return 1 + getArrayDim(type.getComponentType());
 		} else {
@@ -142,7 +142,7 @@ public class DynamicCodeGenBase implements BasicConstants {
 		}
 	}
 
-	static Class<?> getArrayBaseType(Class<?> type) {
+	protected Class<?> getArrayBaseType(Class<?> type) {
 		if (type.isArray()) {
 			return getArrayBaseType(type.getComponentType());
 		} else {
@@ -150,7 +150,7 @@ public class DynamicCodeGenBase implements BasicConstants {
 		}
 	}
 	
-	public String arrayTypeToString(Class<?> type) {
+	protected String arrayTypeToString(Class<?> type) {
 		StringBuilder sb = new StringBuilder();
 		int dim = getArrayDim(type);
 		Class<?> t = getArrayBaseType(type);