Merge branch 'refactoring-1.6.x' into master-1.6.x

* refactoring-1.6.x:
  update the tcc transaction dubbo, remove tccJavassist and tccJdk.
  update the TransactionContextEditor
  fix sample error.
  add CompensableTransactionFilter, remove TccJavassist.
  add dubbo filter

# Conflicts:
#	tcc-transaction-dubbo/src/main/java/org/mengyun/tcctransaction/dubbo/filter/CompensableTransactionFilter.java
#	tcc-transaction-dubbo/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.Filter

pom.xml

@@ -16,7 +16,7 @@
     <properties>
 
         <java.version>1.8</java.version>
-        <revision>1.6.3</revision>
+        <revision>1.7.0</revision>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <maven.compiler.source>${java.version}</maven.compiler.source>

tcc-transaction-admin-web/src/App.js

@@ -1,7 +1,6 @@
-import React from 'react';
 import {Provider} from 'react-redux';
 import {Layout, Menu} from 'antd';
-import {Link, BrowserRouter as Router, Route, Switch} from 'react-router-dom';
+import {BrowserRouter as Router, Link, Route, Switch} from 'react-router-dom';
 import 'antd/dist/antd.css';
 import './App.css';
 import Domain from './pages/tcc/domain/index';

tcc-transaction-admin-web/src/App.test.js

@@ -1,5 +1,4 @@
-import React from 'react';
-import { render } from '@testing-library/react';
+import {render} from '@testing-library/react';
 import App from './App';
 
 test('renders learn react link', () => {

tcc-transaction-admin-web/src/common/constants.js

@@ -1,4 +1,3 @@
-import React from 'react';
 import {Button, Modal} from 'antd';
 import ReactJson from 'react-json-view';
 

tcc-transaction-admin-web/src/components/DeletedKey.js

@@ -1,7 +1,6 @@
-import React from 'react';
-import { Space, Table, Button } from 'antd';
-import { columns as originColumns } from '../common/constants';
-import { restore } from '../common/api';
+import {Button, Space, Table} from 'antd';
+import {columns as originColumns} from '../common/constants';
+import {restore} from '../common/api';
 
 const columns = originColumns.concat({
   title: 'Operation',
@@ -31,4 +30,4 @@ const DeletedKey = ({ data }) => {
 }
 
 
-export default DeletedKey;
+export default DeletedKey;

tcc-transaction-admin-web/src/components/Normal.js

@@ -1,6 +1,5 @@
-import React from 'react';
-import { Button, Table, Space } from 'antd';
-import { columns as originColumns } from '../common/constants';
+import {Button, Space, Table} from 'antd';
+import {columns as originColumns} from '../common/constants';
 import * as api from '../common/api';
 
 const columns = originColumns.concat({
@@ -50,4 +49,4 @@ const Normal = ({ data }) => {
   )
 }
 
-export default Normal
+export default Normal

tcc-transaction-admin-web/src/components/SearchBox.js

@@ -1,5 +1,5 @@
-import React, { useState } from 'react';
-import { Button, Cascader } from 'antd';
+import {useState} from 'react';
+import {Button, Cascader} from 'antd';
 
 const SearchBox = ({
   onChange,
@@ -13,7 +13,7 @@ const SearchBox = ({
   };
 
   const handleAdd = () => {}
-  
+
   return (
     <div className="search-box">
       <Cascader
@@ -33,4 +33,4 @@ const SearchBox = ({
   )
 }
 
-export default SearchBox;
+export default SearchBox;

tcc-transaction-admin-web/src/index.js

@@ -1,4 +1,3 @@
-import React from 'react';
 import ReactDOM from 'react-dom';
 import './index.css';
 import App from './App';

tcc-transaction-admin-web/src/pages/agg/Degrade.js

@@ -1,6 +1,6 @@
-import React, { useState, useEffect } from 'react';
-import { Switch, Row, Col, Divider } from 'antd';
-import { getDegradeList, degrade } from '../../api/agg';
+import {useEffect, useState} from 'react';
+import {Col, Divider, Row, Switch} from 'antd';
+import {degrade, getDegradeList} from '../../api/agg';
 
 const Page = () => {
   const [domains, setDomains] = useState([]);
@@ -36,7 +36,7 @@ const Page = () => {
   return (
     <>
       <div className="tab-3-body">
-        
+
         <Row>
           <Col flex="auto" style={{ paddingLeft: 12, fontWeight: 'bolder' }}>Domain</Col>
           <Col flex="200px" style={{ fontWeight: 'bolder' }}>状态</Col>
@@ -65,10 +65,10 @@ const Page = () => {
         }
       </div>
       <div>
-        
+
       </div>
     </>
   )
 }
 
-export default Page;
+export default Page;

tcc-transaction-admin-web/src/pages/agg/Normal.js

@@ -1,5 +1,5 @@
-import React, { useEffect, useState } from 'react';
-import { Table, Button, Cascader, Modal, message, Form } from 'antd';
+import {useEffect, useState} from 'react';
+import {Button, Cascader, Form, message, Modal, Table} from 'antd';
 import ReactJson from 'react-json-view';
 import * as api from '../../api/agg';
 import CreateModal from './modal';
@@ -202,4 +202,4 @@ const Normal = () => {
   );
 }
 
-export default Normal;
+export default Normal;

tcc-transaction-admin-web/src/pages/agg/index.js

@@ -1,6 +1,5 @@
-import React from 'react';
-import { Layout, Menu } from 'antd';
-import { Switch, Route, Link } from 'react-router-dom';
+import {Layout, Menu} from 'antd';
+import {Link, Route, Switch} from 'react-router-dom';
 import Normal from './Normal';
 import Degrade from './Degrade';
 
@@ -31,4 +30,4 @@ const Page = () => (
   </Layout>
 )
 
-export default Page;
+export default Page;

tcc-transaction-admin-web/src/pages/agg/modal.js

@@ -1,5 +1,5 @@
 import React from "react";
-import { Form, Input, message, Modal } from "antd";
+import {Form, Input, message, Modal} from "antd";
 import * as api from "../../api/agg";
 
 

tcc-transaction-admin-web/src/pages/tcc/Degrade.js

@@ -1,6 +1,6 @@
-import React, { useState, useEffect } from 'react';
-import { Switch, Row, Col, Divider } from 'antd';
-import { getDegradeList, degrade } from '../../common/api';
+import {useEffect, useState} from 'react';
+import {Col, Divider, Row, Switch} from 'antd';
+import {degrade, getDegradeList} from '../../common/api';
 
 const Page = () => {
   const [domains, setDomains] = useState([]);
@@ -64,10 +64,10 @@ const Page = () => {
         }
       </div>
       <div>
-        
+
       </div>
     </>
   )
 }
 
-export default Page;
+export default Page;

tcc-transaction-admin-web/src/pages/tcc/domain/DrawerDomainList.jsx

@@ -1,8 +1,8 @@
 import React from "react";
-import { useDispatch, useSelector } from "react-redux";
-import { Domain } from "../../../store/actions/domain";
+import {useDispatch, useSelector} from "react-redux";
+import {Domain} from "../../../store/actions/domain";
 import * as api from "../../../common/api";
-import { Row, Col, Button, Popconfirm, message } from "antd";
+import {Button, Col, message, Popconfirm, Row} from "antd";
 
 const DrawerDomainList = () => {
   const { domainData } = useSelector(

tcc-transaction-admin-web/src/pages/tcc/domain/SearchBox.jsx

@@ -1,5 +1,5 @@
 import React, {useState} from 'react';
-import {Button, Form, Select, Drawer} from 'antd';
+import {Button, Drawer, Form, Select} from 'antd';
 import {useDispatch, useSelector} from 'react-redux';
 import {Domain} from '../../../store/actions/domain';
 import DrawerDomainList from './DrawerDomainList';

tcc-transaction-admin-web/src/pages/tcc/domain/index.jsx

@@ -1,4 +1,4 @@
-import React, {useState, useEffect} from 'react';
+import React, {useEffect, useState} from 'react';
 import {Tabs} from 'antd';
 import * as api from '../../../common/api';
 import SearchBox from './SearchBox';

tcc-transaction-admin-web/src/pages/tcc/index.js

@@ -1,6 +1,5 @@
-import React from 'react';
-import { Layout, Menu } from 'antd';
-import { Switch, Route, Link } from 'react-router-dom';
+import {Layout, Menu} from 'antd';
+import {Link, Route, Switch} from 'react-router-dom';
 // @ts-ignore
 import Domain from './domain';
 import Degrade from './Degrade';

tcc-transaction-api/src/main/java/org/mengyun/tcctransaction/api/Compensable.java

@@ -4,7 +4,6 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import java.lang.reflect.Method;
 
 /**
  * Created by changmingxie on 10/25/15.
@@ -19,72 +18,9 @@
 
     public String cancelMethod() default "";
 
-    public Class<? extends TransactionContextEditor> transactionContextEditor() default DefaultTransactionContextEditor.class;
-
     public boolean asyncConfirm() default false;
 
     public boolean asyncCancel() default false;
 
-    class NullableTransactionContextEditor implements TransactionContextEditor {
-
-        @Override
-        public TransactionContext get(Object target, Method method, Object[] args) {
-            return null;
-        }
-
-        @Override
-        public void set(TransactionContext transactionContext, Object target, Method method, Object[] args) {
-
-        }
-    }
-
-    class DefaultTransactionContextEditor implements TransactionContextEditor {
-
-        public static int getTransactionContextParamPosition(Class<?>[] parameterTypes) {
-
-            int position = -1;
-
-            for (int i = 0; i < parameterTypes.length; i++) {
-                if (parameterTypes[i].equals(org.mengyun.tcctransaction.api.TransactionContext.class)) {
-                    position = i;
-                    break;
-                }
-            }
-            return position;
-        }
-
-        public static TransactionContext getTransactionContextFromArgs(Object[] args) {
-
-            TransactionContext transactionContext = null;
-
-            for (Object arg : args) {
-                if (arg != null && org.mengyun.tcctransaction.api.TransactionContext.class.isAssignableFrom(arg.getClass())) {
-
-                    transactionContext = (org.mengyun.tcctransaction.api.TransactionContext) arg;
-                }
-            }
-
-            return transactionContext;
-        }
-
-        @Override
-        public TransactionContext get(Object target, Method method, Object[] args) {
-            int position = getTransactionContextParamPosition(method.getParameterTypes());
-
-            if (position >= 0) {
-                return (TransactionContext) args[position];
-            }
-
-            return null;
-        }
-
-        @Override
-        public void set(TransactionContext transactionContext, Object target, Method method, Object[] args) {
-
-            int position = getTransactionContextParamPosition(method.getParameterTypes());
-            if (position >= 0) {
-                args[position] = transactionContext;
-            }
-        }
-    }
+    public Class<? extends TransactionContextEditor> transactionContextEditor() default NullableTransactionContextEditor.class;
 }

tcc-transaction-api/src/main/java/org/mengyun/tcctransaction/api/EnableTcc.java

@@ -0,0 +1,12 @@
+package org.mengyun.tcctransaction.api;
+
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.METHOD})
+public @interface EnableTcc {
+}

tcc-transaction-api/src/main/java/org/mengyun/tcctransaction/api/NullableTransactionContextEditor.java

@@ -0,0 +1,16 @@
+package org.mengyun.tcctransaction.api;
+
+import java.lang.reflect.Method;
+
+public class NullableTransactionContextEditor  implements TransactionContextEditor {
+
+    @Override
+    public TransactionContext get(Object target, Method method, Object[] args) {
+        return null;
+    }
+
+    @Override
+    public void set(TransactionContext transactionContext, Object target, Method method, Object[] args) {
+
+    }
+}

tcc-transaction-api/src/main/java/org/mengyun/tcctransaction/api/ParameterTransactionContextEditor.java

@@ -0,0 +1,59 @@
+package org.mengyun.tcctransaction.api;
+
+import java.lang.reflect.Method;
+
+public class ParameterTransactionContextEditor implements TransactionContextEditor {
+
+    public static int getTransactionContextParamPosition(Class<?>[] parameterTypes) {
+
+        int position = -1;
+
+        for (int i = 0; i < parameterTypes.length; i++) {
+            if (parameterTypes[i].equals(org.mengyun.tcctransaction.api.TransactionContext.class)) {
+                position = i;
+                break;
+            }
+        }
+        return position;
+    }
+
+    public static boolean hasTransactionContextParameter(Class<?>[] parameterTypes) {
+        return getTransactionContextParamPosition(parameterTypes) >= 0;
+    }
+
+    public static TransactionContext getTransactionContextFromArgs(Object[] args) {
+
+        TransactionContext transactionContext = null;
+
+        for (Object arg : args) {
+            if (arg != null && org.mengyun.tcctransaction.api.TransactionContext.class.isAssignableFrom(arg.getClass())) {
+
+                transactionContext = (org.mengyun.tcctransaction.api.TransactionContext) arg;
+            }
+        }
+
+        return transactionContext;
+    }
+
+    @Override
+    public TransactionContext get(Object target, Method method, Object[] args) {
+        int position = getTransactionContextParamPosition(method.getParameterTypes());
+
+        if (position >= 0) {
+            return (TransactionContext) args[position];
+        } else {
+            throw new RuntimeException("No TransactionContext parameter exist while get TransactionContext with ParameterTransactionContextEditor!");
+        }
+    }
+
+    @Override
+    public void set(TransactionContext transactionContext, Object target, Method method, Object[] args) {
+
+        int position = getTransactionContextParamPosition(method.getParameterTypes());
+        if (position >= 0) {
+            args[position] = transactionContext;
+        } else {
+            throw new RuntimeException("No TransactionContext parameter exist while set TransactionContext with ParameterTransactionContextEditor!");
+        }
+    }
+}