Merge pull request #150 from qq254963746/develop

Develop

Author: qq254963746

lts-core/src/main/java/com/lts/core/compiler/support/JavassistCompiler.java

@@ -50,7 +50,7 @@ public Class<?> doCompile(String name, String source) throws Throwable {
                 }
             }
         }
-        String[] packages = importPackages.toArray(new String[0]);
+        String[] packages = importPackages.toArray(new String[importPackages.size()]);
         matcher = EXTENDS_PATTERN.matcher(source);
         CtClass cls;
         if (matcher.find()) {

lts-core/src/main/java/com/lts/core/compiler/support/JdkCompiler.java

@@ -63,8 +63,8 @@ public Class<?> doCompile(String name, String sourceCode) throws Throwable {
         javaFileManager.putFileForInput(StandardLocation.SOURCE_PATH, packageName, 
                                         className + ClassUtils.JAVA_EXTENSION, javaFileObject);
         Boolean result = compiler.getTask(null, javaFileManager, diagnosticCollector, options, 
-                                          null, Arrays.asList(new JavaFileObject[]{javaFileObject})).call();
-        if (result == null || ! result.booleanValue()) {
+                                          null, Collections.singletonList(javaFileObject)).call();
+        if (result == null || !result) {
             throw new IllegalStateException("Compilation failed. class: " + name + ", diagnostics: " + diagnosticCollector);
         }
         return classLoader.loadClass(name);
@@ -214,13 +214,6 @@ public Iterable<JavaFileObject> list(Location location, String packageName, Set<
                 throws IOException {
             Iterable<JavaFileObject> result = super.list(location, packageName, kinds, recurse);
 
-            ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
-            List<URL> urlList = new ArrayList<URL>();
-            Enumeration<URL> e = contextClassLoader.getResources("com");
-            while (e.hasMoreElements()) {
-                urlList.add(e.nextElement());
-            }
-
             ArrayList<JavaFileObject> files = new ArrayList<JavaFileObject>();
 
             if (location == StandardLocation.CLASS_PATH && kinds.contains(Kind.CLASS)) {

lts-core/src/main/java/com/lts/remoting/codec/DefaultCodec.java

@@ -65,7 +65,7 @@ public RemotingCommand decode(ByteBuffer byteBuffer) throws Exception {
     public ByteBuffer encode(RemotingCommand remotingCommand) throws Exception {
 
         RemotingSerializable serializable =
-                getRemotingSerializable(remotingCommand.getSerializableTypeId());
+                getRemotingSerializable(remotingCommand.getSid());
 
         // header length size
         int length = 4;

lts-core/src/main/java/com/lts/remoting/protocol/RemotingCommand.java

@@ -22,7 +22,7 @@ public class RemotingCommand implements Serializable{
     private int opaque;
     private int flag = 0;
     private String remark;
-    private int serializableTypeId = -1;
+    private int sid = -1;   // serializableTypeId
     /**
      * body
      */
@@ -118,12 +118,12 @@ public void setRemark(String remark) {
         this.remark = remark;
     }
 
-    public int getSerializableTypeId() {
-        return serializableTypeId;
+    public int getSid() {
+        return sid;
     }
 
-    public void setSerializableTypeId(int serializableTypeId) {
-        this.serializableTypeId = serializableTypeId;
+    public void setSid(int sid) {
+        this.sid = sid;
     }
 
     @Override
@@ -135,7 +135,7 @@ public String toString() {
                 ", opaque=" + opaque +
                 ", flag=" + flag +
                 ", remark='" + remark + '\'' +
-                ", serializableTypeId='" + serializableTypeId + '\'' +
+                ", sid='" + sid + '\'' +
                 ", body=" + JSONUtils.toJSONString(body) +
                 '}';
     }