添加header支持

Author: 黄水清

maven2/pom.xml

@@ -6,7 +6,7 @@
   <groupId>com.caucho</groupId>
   <artifactId>hessian</artifactId>
   <packaging>jar</packaging>
-  <version>4.0.51.3</version>
+  <version>4.0.51.4</version>
   <name>hessian-${project.version}</name>
   <url>http://hessian.caucho.com</url>
   <description>当前修改版，与spring4集成，可调用hessian3.1.3服务</description>
@@ -47,10 +47,16 @@
             <artifactId>javax.servlet-api</artifactId>
             <version>3.1.0</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+            <version>4.3.14.RELEASE</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
     <properties>
-        <maven.compiler.source>1.6</maven.compiler.source>
-        <maven.compiler.target>1.6</maven.compiler.target>
+        <maven.compiler.source>1.7</maven.compiler.source>
+        <maven.compiler.target>1.7</maven.compiler.target>
         <skip_maven_deploy>false</skip_maven_deploy>
         <maven_deploy_plugin_version>2.8.2.3</maven_deploy_plugin_version>
     </properties>

src/com/caucho/hessian/client/HessianProxy.java

@@ -172,15 +172,17 @@ else if (methodName.equals("toString") && params.length == 0)
 
       is = getInputStream(conn);
 
+      
       if (log.isLoggable(Level.FINEST)) {
         PrintWriter dbg = new PrintWriter(new LogWriter(log));
         HessianDebugInputStream dIs
           = new HessianDebugInputStream(is, dbg);
 
-        dIs.startTop2();
+        dIs.startTop2(); //处理协议标记
 
         is = dIs;
       }
+      
 
       AbstractHessianInput in;
 

src/com/caucho/hessian/huang/HessianHeaderContext.java

@@ -0,0 +1,51 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.caucho.hessian.huang;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ *
+ * @author huang
+ */
+public class HessianHeaderContext {
+    private static final ThreadLocal<HessianHeaderContext> THREAD_LOCAL = new ThreadLocal<>();
+
+    private Map<String, String>                            headers      = new HashMap<>();
+
+    private HessianHeaderContext() {
+    }
+
+    public static HessianHeaderContext getContext() {
+        HessianHeaderContext context = THREAD_LOCAL.get();
+        if (context == null) {
+            context = new HessianHeaderContext();
+            THREAD_LOCAL.set(context);
+        }
+        return context;
+    }
+
+    public void addHeader(String name, String value) {
+        headers.put(name, value);
+    }
+
+    public String getHeader(String name) {
+        return headers.get(name);
+    }
+
+    public Map<String, String> getHeaders() {
+        return headers;
+    }
+
+    public static void close() {
+        HessianHeaderContext context = THREAD_LOCAL.get();
+        if (context != null) {
+            context.headers.clear();
+            THREAD_LOCAL.set(null);
+        }
+    }
+}

src/com/caucho/hessian/huang/HessianProxy.java

@@ -0,0 +1,37 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.caucho.hessian.huang;
+
+import com.caucho.hessian.client.HessianConnection;
+import com.caucho.hessian.client.HessianProxyFactory;
+import java.net.URL;
+import java.util.Map;
+
+/**
+ *
+ * @author huang
+ */
+public class HessianProxy extends com.caucho.hessian.client.HessianProxy {
+    protected HessianProxy(URL url, HessianProxyFactory factory) {
+        super(url, factory);
+    }
+
+    protected HessianProxy(URL url, HessianProxyFactory factory, Class<?> type) {
+        super(url, factory, type);
+    }
+
+    @Override
+    protected void addRequestHeaders(HessianConnection conn)
+    {
+        super.addRequestHeaders(conn);
+
+        // add Hessian Header
+        Map<String, String> headerMap = HessianHeaderContext.getContext().getHeaders();
+        for (Map.Entry<String, String> entry : headerMap.entrySet()) {
+            conn.addHeader(entry.getKey(), entry.getValue());
+        }
+    }
+}

src/com/caucho/hessian/huang/HessianProxyFactory.java

@@ -0,0 +1,31 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.caucho.hessian.huang;
+
+import com.caucho.hessian.io.HessianRemoteObject;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Proxy;
+import java.net.URL;
+
+/**
+ *
+ * @author huang
+ */
+public class HessianProxyFactory extends com.caucho.hessian.client.HessianProxyFactory {
+    @Override
+    public Object create(Class<?> api, URL url, ClassLoader loader)
+    {
+        if (api == null) {
+            throw new NullPointerException("api must not be null for HessianProxyFactory.create()");
+        }
+
+        InvocationHandler handler = new HessianProxy(url, this, api);
+
+        return Proxy.newProxyInstance(loader,
+                new Class[]{api, HessianRemoteObject.class},
+                handler);
+    }
+}

src/com/caucho/hessian/huang/HessianServiceExporter.java

@@ -0,0 +1,51 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.caucho.hessian.huang;
+
+import java.io.IOException;
+import java.util.Enumeration;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.web.HttpRequestMethodNotSupportedException;
+import org.springframework.web.util.NestedServletException;
+
+/**
+ *
+ * @author huang
+ */
+public class HessianServiceExporter extends org.springframework.remoting.caucho.HessianServiceExporter {
+    @Override
+    public void handleRequest(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+
+        if (!"POST".equals(request.getMethod())) {
+            throw new HttpRequestMethodNotSupportedException(request.getMethod(),
+                    new String[] {"POST"}, "HessianServiceExporter only supports POST requests");
+        }
+
+        handleHessianHeader(request);
+
+        response.setContentType(CONTENT_TYPE_HESSIAN);
+        try {
+            invoke(request.getInputStream(), response.getOutputStream());
+        } catch (Throwable ex) {
+            throw new NestedServletException("Hessian skeleton invocation failed", ex);
+        } finally {
+            HessianHeaderContext.close();
+        }
+    }
+
+    protected void handleHessianHeader(HttpServletRequest request) {
+        HessianHeaderContext context = HessianHeaderContext.getContext();
+        Enumeration enumeration = request.getHeaderNames();
+        while (enumeration.hasMoreElements()) {
+            String name = enumeration.nextElement().toString();
+            String value = request.getHeader(name);
+            context.addHeader(name, value);
+        }
+    }
+}

src/com/caucho/hessian/io/HessianDebugState.java

@@ -110,8 +110,15 @@ public void startStreaming()
   public void next(int ch)
     throws IOException
   {
-      _dbg.print(String.format("{\\x%02x}", ch));
-      _dbg.print(String.format("{\\d%03d}", ch));
+      if(ch>=0)
+      {
+        _dbg.print(String.format("{\\x%02x}", ch));
+        _dbg.print(String.format("{\\d%03d}", ch));
+      }
+//      else if(ch<-1)
+//      {
+//        log.warning(String.format("意外的序列值: ( {%d} )", ch));
+//      }
     _state = _state.next(ch);
   }