You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by hu...@apache.org on 2019/12/17 17:45:57 UTC
[dubbo-js] branch v3.0.0 updated: rename com.alibaba ->
org.apache.dubbo
This is an automated email from the ASF dual-hosted git repository.
hufeng pushed a commit to branch v3.0.0
in repository https://gitbox.apache.org/repos/asf/dubbo-js.git
The following commit(s) were added to refs/heads/v3.0.0 by this push:
new 9db9cff rename com.alibaba -> org.apache.dubbo
new 1f8b7f0 Merge pull request #179 from hufeng/v3.0.0
9db9cff is described below
commit 9db9cffaf27a47897b135c9e06bc81c1e6199af3
Author: hufeng <fe...@gmail.com>
AuthorDate: Wed Dec 18 01:41:10 2019 +0800
rename com.alibaba -> org.apache.dubbo
---
.travis.yml | 16 +++++++
README.md | 16 +++----
dubbo.json | 6 +--
examples/hello-egg/app/controller/home.ts | 6 +--
examples/hello-egg/app/dubbo/index.ts | 6 +--
.../apache}/dubbo/demo/BasicTypeProvider.ts | 2 +-
.../apache}/dubbo/demo/DemoProvider.ts | 2 +-
.../apache}/dubbo/demo/ErrorProvider.ts | 2 +-
.../{com/alibaba => org/apache}/dubbo/demo/Sex.ts | 0
.../apache}/dubbo/demo/TypeRequest.ts | 2 +-
.../apache}/dubbo/demo/UserRequest.ts | 4 +-
.../apache}/dubbo/demo/UserResponse.ts | 2 +-
examples/hello-egg/app/dubbo/service.ts | 6 +--
examples/hello-egg/dubbo.json | 2 +-
examples/hello-egg/typings/config/index.d.ts | 1 +
examples/hello-egg/typings/config/plugin.d.ts | 15 ++++---
examples/hello-koa/dubbo/dubbo-es6.ts | 10 ++---
examples/hello-koa/dubbo/dubbo.ts | 6 +--
examples/hello-koa/dubbo/service.ts | 10 ++---
.../apache}/dubbo/demo/BasicTypeProvider.java | 2 +-
.../apache}/dubbo/demo/CustomizeException.java | 2 +-
.../apache}/dubbo/demo/DemoProvider.java | 2 +-
.../apache}/dubbo/demo/ErrorProvider.java | 2 +-
.../alibaba => org/apache}/dubbo/demo/Sex.java | 2 +-
.../apache}/dubbo/demo/TypeRequest.java | 2 +-
.../apache}/dubbo/demo/UserRequest.java | 2 +-
.../apache}/dubbo/demo/UserResponse.java | 2 +-
.../apache}/dubbo/demo/consumer/Consumer.java | 4 +-
.../META-INF/spring/dubbo-demo-consumer.xml | 4 +-
java/dubbo-demo/dubbo-demo-provider/pom.xml | 2 +-
.../dubbo/demo/provider/BasicTypeProviderImpl.java | 6 +--
.../dubbo/demo/provider/DemoProviderImpl.java | 8 ++--
.../dubbo/demo/provider/ErrorProviderImpl.java | 6 +--
.../apache}/dubbo/demo/provider/Provider.java | 2 +-
.../apache}/dubbo/demo/provider/Provider1.java | 2 +-
.../META-INF/spring/dubbo-demo-provider.xml | 12 ++---
.../META-INF/spring/dubbo-demo-provider1.xml | 12 ++---
.../dubbo-invoker/src/__tests__/matcher-test.ts | 2 +-
packages/dubbo/README.md | 6 +--
.../dubbo/src/__tests__/directly-dubbo-test.ts | 6 +--
.../src/__tests__/dubbo-hessian-parameter-test.ts | 10 ++---
packages/dubbo/src/__tests__/dubbo-test.ts | 16 +++----
packages/dubbo/src/__tests__/dubbo-timeout-test.ts | 14 +++---
.../apache}/dubbo/demo/BasicTypeProvider.ts | 2 +-
.../apache}/dubbo/demo/DemoProvider.ts | 2 +-
.../apache}/dubbo/demo/ErrorProvider.ts | 2 +-
.../apache}/dubbo/demo/TypeRequest.ts | 2 +-
.../apache}/dubbo/demo/UserRequest.ts | 2 +-
.../apache}/dubbo/demo/UserResponse.ts | 2 +-
packages/dubbo/src/__tests__/setting-test.ts | 38 ++++++++--------
packages/dubbo/src/__tests__/zookeeper-test.ts | 12 ++---
packages/interpret-cli/src/cli.ts | 12 ++---
packages/interpret-cli/src/config.ts | 2 +-
packages/interpret-cli/src/ext/index.ts | 4 +-
.../interpret-cli/src/transfer/bean/to-field.ts | 2 +-
packages/interpret-cli/src/transfer/bean/to-vo.ts | 6 +--
.../transfer/bean/util/__tests__/transfer.test.ts | 51 ++++++++++++----------
.../src/transfer/bean/util/transfer.ts | 16 ++++---
packages/interpret-cli/src/transfer/to-import.ts | 9 ++--
packages/interpret-cli/src/transfer/to-method.ts | 2 +-
.../interpret-cli/src/transfer/to-typescript.ts | 12 ++---
packages/interpret-cli/src/typings.ts | 10 ++---
.../src/util/__tests__/type-parse-test.ts | 43 +++++++++---------
packages/interpret-cli/src/util/type-parse.ts | 20 ++++-----
packages/zone-context/Makefile | 16 +++++++
packages/zone-context/src/__tests__/index-test.ts | 17 ++++++++
packages/zone-context/src/index.ts | 17 ++++++++
67 files changed, 310 insertions(+), 233 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index f266f97..a32ba8f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,19 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License
+
dist: bionic
language: node_js
node_js:
diff --git a/README.md b/README.md
index 78786b5..e89380c 100644
--- a/README.md
+++ b/README.md
@@ -30,9 +30,9 @@ Below code snippet shows how to work with the typescript type definitions which
```typescript
// ===================== service.ts ==================
// generated by interpret tools
-import {BasicTypeProvider} from './providers/com/alibaba/dubbo/demo/BasicTypeProvider';
-import {DemoProvider} from './providers/com/alibaba/dubbo/demo/DemoProvider';
-import {ErrorProvider} from './providers/com/alibaba/dubbo/demo/ErrorProvider';
+import {BasicTypeProvider} from './providers/org/apache/dubbo/demo/BasicTypeProvider';
+import {DemoProvider} from './providers/org/apache/dubbo/demo/DemoProvider';
+import {ErrorProvider} from './providers/org/apache/dubbo/demo/ErrorProvider';
export default {
BasicTypeProvider,
@@ -41,12 +41,12 @@ export default {
};
// =============== dubbo.ts ========================
-import {Dubbo} from 'dubbo2.js';
+import {Dubbo} from 'dubbo-js';
import service from './service';
// create dubbo object
const dubbo = new Dubbo<typeof service>({
- application: {name: 'node-dubbo'},
+ application: {name: 'dubbo-js'},
// zookeeper address
register: 'localhost:2181',
service,
@@ -71,7 +71,7 @@ import {Dubbo} from 'dubbo-js';
const demoProvider = dubbo =>
dubbo.proxyService({
- dubboInterface: 'com.alibaba.dubbo.demo.DemoProvider',
+ dubboInterface: 'org.apache.dubbo.demo.DemoProvider',
version: '1.0.0',
methods: {
sayHello(name) {
@@ -84,10 +84,10 @@ const demoProvider = dubbo =>
getUserInfo() {
return [
- java.combine('com.alibaba.dubbo.demo.UserRequest', {
+ java.combine('org.apache.dubbo.demo.UserRequest', {
id: 1,
name: 'nodejs',
- email: 'node@qianmi.com',
+ email: 'node@test.com',
}),
];
},
diff --git a/dubbo.json b/dubbo.json
index 01ba0ea..79329e0 100644
--- a/dubbo.json
+++ b/dubbo.json
@@ -1,7 +1,7 @@
{
"output": "./packages/dubbo/src/__tests__/providers",
- "entry": "com.alibaba.dubbo.demo",
+ "entry": "org.apache.dubbo.demo",
"entryJarPath": "./java/dubbo-demo/dubbo-demo-api/target/dubbo-demo-api-2.5.7.jar",
"libDirPath": "./java/dubbo-demo/dubbo-demo-api/target/dependency/",
- "providerSuffix":"Service"
-}
\ No newline at end of file
+ "providerSuffix": "Service"
+}
diff --git a/examples/hello-egg/app/controller/home.ts b/examples/hello-egg/app/controller/home.ts
index 38b33ed..d2b482f 100644
--- a/examples/hello-egg/app/controller/home.ts
+++ b/examples/hello-egg/app/controller/home.ts
@@ -17,9 +17,9 @@
import {java} from 'dubbo-js';
import {Controller} from 'egg';
-import {Sex} from '../dubbo/providers/com/alibaba/dubbo/demo/Sex';
-import {TypeRequest} from '../dubbo/providers/com/alibaba/dubbo/demo/TypeRequest';
-import {UserRequest} from '../dubbo/providers/com/alibaba/dubbo/demo/UserRequest';
+import {Sex} from '../dubbo/providers/org/apache/dubbo/demo/Sex';
+import {TypeRequest} from '../dubbo/providers/org/apache/dubbo/demo/TypeRequest';
+import {UserRequest} from '../dubbo/providers/org/apache/dubbo/demo/UserRequest';
export default class HomeController extends Controller {
async index() {
diff --git a/examples/hello-egg/app/dubbo/index.ts b/examples/hello-egg/app/dubbo/index.ts
index da49a0c..caeaffb 100644
--- a/examples/hello-egg/app/dubbo/index.ts
+++ b/examples/hello-egg/app/dubbo/index.ts
@@ -29,14 +29,14 @@ declare module 'egg' {
const dubboSetting = setting
.match(
[
- 'com.alibaba.dubbo.demo.DemoProvider',
- 'com.alibaba.dubbo.demo.ErrorProvider',
+ 'org.apache.dubbo.demo.DemoProvider',
+ 'org.apache.dubbo.demo.ErrorProvider',
],
{
version: '1.0.0',
},
)
- .match('com.alibaba.dubbo.demo.BasicTypeProvider', {version: '2.0.0'});
+ .match('org.apache.dubbo.demo.BasicTypeProvider', {version: '2.0.0'});
export default (app: EggApplication) => {
// create a dubboo object
diff --git a/examples/hello-egg/app/dubbo/providers/com/alibaba/dubbo/demo/BasicTypeProvider.ts b/examples/hello-egg/app/dubbo/providers/org/apache/dubbo/demo/BasicTypeProvider.ts
similarity index 95%
rename from examples/hello-egg/app/dubbo/providers/com/alibaba/dubbo/demo/BasicTypeProvider.ts
rename to examples/hello-egg/app/dubbo/providers/org/apache/dubbo/demo/BasicTypeProvider.ts
index dd24711..a631de7 100644
--- a/examples/hello-egg/app/dubbo/providers/com/alibaba/dubbo/demo/BasicTypeProvider.ts
+++ b/examples/hello-egg/app/dubbo/providers/org/apache/dubbo/demo/BasicTypeProvider.ts
@@ -27,7 +27,7 @@ export const BasicTypeProviderWrapper = {testBasicType: argumentMap};
export function BasicTypeProvider(dubbo: Dubbo): IBasicTypeProvider {
return dubbo.proxyService<IBasicTypeProvider>({
- dubboInterface: 'com.alibaba.dubbo.demo.BasicTypeProvider',
+ dubboInterface: 'org.apache.dubbo.demo.BasicTypeProvider',
methods: BasicTypeProviderWrapper,
});
}
diff --git a/examples/hello-egg/app/dubbo/providers/com/alibaba/dubbo/demo/DemoProvider.ts b/examples/hello-egg/app/dubbo/providers/org/apache/dubbo/demo/DemoProvider.ts
similarity index 96%
rename from examples/hello-egg/app/dubbo/providers/com/alibaba/dubbo/demo/DemoProvider.ts
rename to examples/hello-egg/app/dubbo/providers/org/apache/dubbo/demo/DemoProvider.ts
index 6a712ab..d9c2923 100644
--- a/examples/hello-egg/app/dubbo/providers/com/alibaba/dubbo/demo/DemoProvider.ts
+++ b/examples/hello-egg/app/dubbo/providers/org/apache/dubbo/demo/DemoProvider.ts
@@ -35,7 +35,7 @@ export const DemoProviderWrapper = {
export function DemoProvider(dubbo: Dubbo): IDemoProvider {
return dubbo.proxyService<IDemoProvider>({
- dubboInterface: 'com.alibaba.dubbo.demo.DemoProvider',
+ dubboInterface: 'org.apache.dubbo.demo.DemoProvider',
methods: DemoProviderWrapper,
});
}
diff --git a/examples/hello-egg/app/dubbo/providers/com/alibaba/dubbo/demo/ErrorProvider.ts b/examples/hello-egg/app/dubbo/providers/org/apache/dubbo/demo/ErrorProvider.ts
similarity index 95%
rename from examples/hello-egg/app/dubbo/providers/com/alibaba/dubbo/demo/ErrorProvider.ts
rename to examples/hello-egg/app/dubbo/providers/org/apache/dubbo/demo/ErrorProvider.ts
index dadbb08..a256b13 100644
--- a/examples/hello-egg/app/dubbo/providers/com/alibaba/dubbo/demo/ErrorProvider.ts
+++ b/examples/hello-egg/app/dubbo/providers/org/apache/dubbo/demo/ErrorProvider.ts
@@ -26,7 +26,7 @@ export const ErrorProviderWrapper = {errorTest: argumentMap};
export function ErrorProvider(dubbo: Dubbo): IErrorProvider {
return dubbo.proxyService<IErrorProvider>({
- dubboInterface: 'com.alibaba.dubbo.demo.ErrorProvider',
+ dubboInterface: 'org.apache.dubbo.demo.ErrorProvider',
methods: ErrorProviderWrapper,
});
}
diff --git a/examples/hello-egg/app/dubbo/providers/com/alibaba/dubbo/demo/Sex.ts b/examples/hello-egg/app/dubbo/providers/org/apache/dubbo/demo/Sex.ts
similarity index 100%
rename from examples/hello-egg/app/dubbo/providers/com/alibaba/dubbo/demo/Sex.ts
rename to examples/hello-egg/app/dubbo/providers/org/apache/dubbo/demo/Sex.ts
diff --git a/examples/hello-egg/app/dubbo/providers/com/alibaba/dubbo/demo/TypeRequest.ts b/examples/hello-egg/app/dubbo/providers/org/apache/dubbo/demo/TypeRequest.ts
similarity index 96%
rename from examples/hello-egg/app/dubbo/providers/com/alibaba/dubbo/demo/TypeRequest.ts
rename to examples/hello-egg/app/dubbo/providers/org/apache/dubbo/demo/TypeRequest.ts
index b1b07d8..87d2e65 100644
--- a/examples/hello-egg/app/dubbo/providers/com/alibaba/dubbo/demo/TypeRequest.ts
+++ b/examples/hello-egg/app/dubbo/providers/org/apache/dubbo/demo/TypeRequest.ts
@@ -37,7 +37,7 @@ export class TypeRequest {
mapMapTransfer.set(java.String(mapKey), java.String(this.map[mapKey]));
}
return {
- $class: 'com.alibaba.dubbo.demo.TypeRequest',
+ $class: 'org.apache.dubbo.demo.TypeRequest',
$: {
bigDecimal: this.bigDecimal
? java.BigDecimal(this.bigDecimal.value)
diff --git a/examples/hello-egg/app/dubbo/providers/com/alibaba/dubbo/demo/UserRequest.ts b/examples/hello-egg/app/dubbo/providers/org/apache/dubbo/demo/UserRequest.ts
similarity index 91%
rename from examples/hello-egg/app/dubbo/providers/com/alibaba/dubbo/demo/UserRequest.ts
rename to examples/hello-egg/app/dubbo/providers/org/apache/dubbo/demo/UserRequest.ts
index 301a93d..081209b 100644
--- a/examples/hello-egg/app/dubbo/providers/com/alibaba/dubbo/demo/UserRequest.ts
+++ b/examples/hello-egg/app/dubbo/providers/org/apache/dubbo/demo/UserRequest.ts
@@ -40,9 +40,9 @@ export class UserRequest {
__fields2java() {
return {
- $class: 'com.alibaba.dubbo.demo.UserRequest',
+ $class: 'org.apache.dubbo.demo.UserRequest',
$: {
- sex: java['enum']('com.alibaba.dubbo.demo.Sex', Sex[this.sex]),
+ sex: java['enum']('org.apache.dubbo.demo.Sex', Sex[this.sex]),
name: java.String(this.name),
id: java.Integer(this.id),
email: java.String(this.email),
diff --git a/examples/hello-egg/app/dubbo/providers/com/alibaba/dubbo/demo/UserResponse.ts b/examples/hello-egg/app/dubbo/providers/org/apache/dubbo/demo/UserResponse.ts
similarity index 96%
rename from examples/hello-egg/app/dubbo/providers/com/alibaba/dubbo/demo/UserResponse.ts
rename to examples/hello-egg/app/dubbo/providers/org/apache/dubbo/demo/UserResponse.ts
index f8c8586..717ff20 100644
--- a/examples/hello-egg/app/dubbo/providers/com/alibaba/dubbo/demo/UserResponse.ts
+++ b/examples/hello-egg/app/dubbo/providers/org/apache/dubbo/demo/UserResponse.ts
@@ -37,7 +37,7 @@ export class UserResponse {
infoMapTransfer.set(java.String(mapKey), java.String(this.info[mapKey]));
}
return {
- $class: 'com.alibaba.dubbo.demo.UserResponse',
+ $class: 'org.apache.dubbo.demo.UserResponse',
$: {status: java.String(this.status), info: java.Map(infoMapTransfer)},
};
}
diff --git a/examples/hello-egg/app/dubbo/service.ts b/examples/hello-egg/app/dubbo/service.ts
index 6035533..91f9882 100644
--- a/examples/hello-egg/app/dubbo/service.ts
+++ b/examples/hello-egg/app/dubbo/service.ts
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-import {BasicTypeProvider} from './providers/com/alibaba/dubbo/demo/BasicTypeProvider';
-import {DemoProvider} from './providers/com/alibaba/dubbo/demo/DemoProvider';
-import {ErrorProvider} from './providers/com/alibaba/dubbo/demo/ErrorProvider';
+import {BasicTypeProvider} from './providers/org/apache/dubbo/demo/BasicTypeProvider';
+import {DemoProvider} from './providers/org/apache/dubbo/demo/DemoProvider';
+import {ErrorProvider} from './providers/org/apache/dubbo/demo/ErrorProvider';
export default {
DemoProvider,
diff --git a/examples/hello-egg/dubbo.json b/examples/hello-egg/dubbo.json
index e1c2374..1de8b5c 100644
--- a/examples/hello-egg/dubbo.json
+++ b/examples/hello-egg/dubbo.json
@@ -1,6 +1,6 @@
{
"output": "./app/dubbo/providers",
- "entry": "com.alibaba.dubbo.demo",
+ "entry": "org.apache.dubbo.demo",
"entryJarPath": "../../java/dubbo-demo/dubbo-demo-api/target/dubbo-demo-api-2.6.3.jar",
"libDirPath": "../../java/dubbo-demo/dubbo-demo-api/target/dependency",
"providerSuffix": "Provider"
diff --git a/examples/hello-egg/typings/config/index.d.ts b/examples/hello-egg/typings/config/index.d.ts
index 3d787de..ef605df 100644
--- a/examples/hello-egg/typings/config/index.d.ts
+++ b/examples/hello-egg/typings/config/index.d.ts
@@ -2,6 +2,7 @@
// Do not modify this file!!!!!!!!!
import 'egg';
+import {EggAppConfig} from 'egg';
import ExportConfigDefault from '../../config/config.default';
type ConfigDefault = ReturnType<typeof ExportConfigDefault>;
type NewEggAppConfig = ConfigDefault;
diff --git a/examples/hello-egg/typings/config/plugin.d.ts b/examples/hello-egg/typings/config/plugin.d.ts
index 4f2dda4..8174b11 100644
--- a/examples/hello-egg/typings/config/plugin.d.ts
+++ b/examples/hello-egg/typings/config/plugin.d.ts
@@ -2,18 +2,19 @@
// Do not modify this file!!!!!!!!!
import 'egg';
-import 'egg-development';
+import 'egg-onerror';
+import 'egg-session';
import 'egg-i18n';
-import 'egg-jsonp';
-import 'egg-logrotator';
+import 'egg-watcher';
import 'egg-multipart';
-import 'egg-onerror';
-import 'egg-schedule';
import 'egg-security';
-import 'egg-session';
+import 'egg-development';
+import 'egg-logrotator';
+import 'egg-schedule';
import 'egg-static';
+import 'egg-jsonp';
import 'egg-view';
-import 'egg-watcher';
+import {EggPluginItem} from 'egg';
declare module 'egg' {
interface EggPlugin {
onerror?: EggPluginItem;
diff --git a/examples/hello-koa/dubbo/dubbo-es6.ts b/examples/hello-koa/dubbo/dubbo-es6.ts
index 302473c..66b6b80 100644
--- a/examples/hello-koa/dubbo/dubbo-es6.ts
+++ b/examples/hello-koa/dubbo/dubbo-es6.ts
@@ -15,26 +15,26 @@
* limitations under the License.
*/
-import {Dubbo, setting, zk} from 'dubbo-js';
+import {Dubbo, setting} from 'dubbo-js';
import * as service from './service';
const dubboSetting = setting
.match(
[
- 'com.alibaba.dubbo.demo.DemoProvider',
- 'com.alibaba.dubbo.demo.ErrorProvider',
+ 'org.apache.dubbo.demo.DemoProvider',
+ 'org.apache.dubbo.demo.ErrorProvider',
],
{
version: '1.0.0',
},
)
- .match('com.alibaba.dubbo.demo.BasicTypeProvider', {version: '2.0.0'});
+ .match('org.apache.dubbo.demo.BasicTypeProvider', {version: '2.0.0'});
export default new Dubbo<typeof service>({
application: {name: 'dubbo-node-consumer1'},
service,
dubboSetting,
- register: zk('localhost:2181,localhost:2182,localhost:2183'),
+ register: 'localhost:2181,localhost:2182,localhost:2183',
});
//middleware
diff --git a/examples/hello-koa/dubbo/dubbo.ts b/examples/hello-koa/dubbo/dubbo.ts
index 6b8fad2..3d7623d 100644
--- a/examples/hello-koa/dubbo/dubbo.ts
+++ b/examples/hello-koa/dubbo/dubbo.ts
@@ -21,14 +21,14 @@ import * as service from './service';
const dubboSetting = setting
.match(
[
- 'com.alibaba.dubbo.demo.DemoProvider',
- 'com.alibaba.dubbo.demo.ErrorProvider',
+ 'org.apache.dubbo.demo.DemoProvider',
+ 'org.apache.dubbo.demo.ErrorProvider',
],
{
version: '1.0.0',
},
)
- .match('com.alibaba.dubbo.demo.BasicTypeProvider', {version: '2.0.0'});
+ .match('org.apache.dubbo.demo.BasicTypeProvider', {version: '2.0.0'});
const dubbo = new Dubbo<typeof service>({
application: {name: 'dubbo-node-consumer'},
diff --git a/examples/hello-koa/dubbo/service.ts b/examples/hello-koa/dubbo/service.ts
index de8b8f8..7e9106f 100644
--- a/examples/hello-koa/dubbo/service.ts
+++ b/examples/hello-koa/dubbo/service.ts
@@ -46,7 +46,7 @@ export interface IErrorProvider {
//========================provider=======================
export const demoProvider = (dubbo: Dubbo): IDemoProvider =>
dubbo.proxyService({
- dubboInterface: 'com.alibaba.dubbo.demo.DemoProvider',
+ dubboInterface: 'org.apache.dubbo.demo.DemoProvider',
methods: {
sayHello(name: string) {
return [java.String(name)];
@@ -58,7 +58,7 @@ export const demoProvider = (dubbo: Dubbo): IDemoProvider =>
getUserInfo() {
return [
- java.combine('com.alibaba.dubbo.demo.UserRequest', {
+ java.combine('org.apache.dubbo.demo.UserRequest', {
id: 1,
name: 'nodejs',
email: 'node@qianmi.com',
@@ -70,11 +70,11 @@ export const demoProvider = (dubbo: Dubbo): IDemoProvider =>
export const basicTypeProvider = (dubbo: Dubbo): IBasicTypeProvider =>
dubbo.proxyService({
- dubboInterface: 'com.alibaba.dubbo.demo.BasicTypeProvider',
+ dubboInterface: 'org.apache.dubbo.demo.BasicTypeProvider',
methods: {
testBasicType() {
return [
- java.combine('com.alibaba.dubbo.demo.TypeRequest', {
+ java.combine('org.apache.dubbo.demo.TypeRequest', {
map: java.Map({name: 'test'}),
bigDecimal: java.BigDecimal('1000.0000'),
}),
@@ -85,7 +85,7 @@ export const basicTypeProvider = (dubbo: Dubbo): IBasicTypeProvider =>
export const errorProvider = (dubbo: Dubbo): IErrorProvider =>
dubbo.proxyService({
- dubboInterface: 'com.alibaba.dubbo.demo.ErrorProvider',
+ dubboInterface: 'org.apache.dubbo.demo.ErrorProvider',
methods: {
errorTest() {
return [];
diff --git a/java/dubbo-demo/dubbo-demo-api/src/main/java/com/alibaba/dubbo/demo/BasicTypeProvider.java b/java/dubbo-demo/dubbo-demo-api/src/main/java/org/apache/dubbo/demo/BasicTypeProvider.java
similarity index 96%
rename from java/dubbo-demo/dubbo-demo-api/src/main/java/com/alibaba/dubbo/demo/BasicTypeProvider.java
rename to java/dubbo-demo/dubbo-demo-api/src/main/java/org/apache/dubbo/demo/BasicTypeProvider.java
index f612e12..ef698a3 100644
--- a/java/dubbo-demo/dubbo-demo-api/src/main/java/com/alibaba/dubbo/demo/BasicTypeProvider.java
+++ b/java/dubbo-demo/dubbo-demo-api/src/main/java/org/apache/dubbo/demo/BasicTypeProvider.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.alibaba.dubbo.demo;
+package org.apache.dubbo.demo;
public interface BasicTypeProvider {
TypeRequest testBasicType(TypeRequest request);
diff --git a/java/dubbo-demo/dubbo-demo-api/src/main/java/com/alibaba/dubbo/demo/CustomizeException.java b/java/dubbo-demo/dubbo-demo-api/src/main/java/org/apache/dubbo/demo/CustomizeException.java
similarity index 97%
rename from java/dubbo-demo/dubbo-demo-api/src/main/java/com/alibaba/dubbo/demo/CustomizeException.java
rename to java/dubbo-demo/dubbo-demo-api/src/main/java/org/apache/dubbo/demo/CustomizeException.java
index 1580cf1..971c0f7 100644
--- a/java/dubbo-demo/dubbo-demo-api/src/main/java/com/alibaba/dubbo/demo/CustomizeException.java
+++ b/java/dubbo-demo/dubbo-demo-api/src/main/java/org/apache/dubbo/demo/CustomizeException.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.alibaba.dubbo.demo;
+package org.apache.dubbo.demo;
public class CustomizeException extends Exception {
public CustomizeException() {
diff --git a/java/dubbo-demo/dubbo-demo-api/src/main/java/com/alibaba/dubbo/demo/DemoProvider.java b/java/dubbo-demo/dubbo-demo-api/src/main/java/org/apache/dubbo/demo/DemoProvider.java
similarity index 95%
rename from java/dubbo-demo/dubbo-demo-api/src/main/java/com/alibaba/dubbo/demo/DemoProvider.java
rename to java/dubbo-demo/dubbo-demo-api/src/main/java/org/apache/dubbo/demo/DemoProvider.java
index 581fce8..57875a4 100644
--- a/java/dubbo-demo/dubbo-demo-api/src/main/java/com/alibaba/dubbo/demo/DemoProvider.java
+++ b/java/dubbo-demo/dubbo-demo-api/src/main/java/org/apache/dubbo/demo/DemoProvider.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.alibaba.dubbo.demo;
+package org.apache.dubbo.demo;
public interface DemoProvider {
diff --git a/java/dubbo-demo/dubbo-demo-api/src/main/java/com/alibaba/dubbo/demo/ErrorProvider.java b/java/dubbo-demo/dubbo-demo-api/src/main/java/org/apache/dubbo/demo/ErrorProvider.java
similarity index 96%
rename from java/dubbo-demo/dubbo-demo-api/src/main/java/com/alibaba/dubbo/demo/ErrorProvider.java
rename to java/dubbo-demo/dubbo-demo-api/src/main/java/org/apache/dubbo/demo/ErrorProvider.java
index 2424d48..bdb1b36 100644
--- a/java/dubbo-demo/dubbo-demo-api/src/main/java/com/alibaba/dubbo/demo/ErrorProvider.java
+++ b/java/dubbo-demo/dubbo-demo-api/src/main/java/org/apache/dubbo/demo/ErrorProvider.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.alibaba.dubbo.demo;
+package org.apache.dubbo.demo;
public interface ErrorProvider {
void errorTest() throws CustomizeException;
diff --git a/java/dubbo-demo/dubbo-demo-api/src/main/java/com/alibaba/dubbo/demo/Sex.java b/java/dubbo-demo/dubbo-demo-api/src/main/java/org/apache/dubbo/demo/Sex.java
similarity index 96%
rename from java/dubbo-demo/dubbo-demo-api/src/main/java/com/alibaba/dubbo/demo/Sex.java
rename to java/dubbo-demo/dubbo-demo-api/src/main/java/org/apache/dubbo/demo/Sex.java
index b64965d..c8f6fae 100644
--- a/java/dubbo-demo/dubbo-demo-api/src/main/java/com/alibaba/dubbo/demo/Sex.java
+++ b/java/dubbo-demo/dubbo-demo-api/src/main/java/org/apache/dubbo/demo/Sex.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.alibaba.dubbo.demo;
+package org.apache.dubbo.demo;
public enum Sex {
male,female
diff --git a/java/dubbo-demo/dubbo-demo-api/src/main/java/com/alibaba/dubbo/demo/TypeRequest.java b/java/dubbo-demo/dubbo-demo-api/src/main/java/org/apache/dubbo/demo/TypeRequest.java
similarity index 97%
rename from java/dubbo-demo/dubbo-demo-api/src/main/java/com/alibaba/dubbo/demo/TypeRequest.java
rename to java/dubbo-demo/dubbo-demo-api/src/main/java/org/apache/dubbo/demo/TypeRequest.java
index e31182c..ca37f04 100644
--- a/java/dubbo-demo/dubbo-demo-api/src/main/java/com/alibaba/dubbo/demo/TypeRequest.java
+++ b/java/dubbo-demo/dubbo-demo-api/src/main/java/org/apache/dubbo/demo/TypeRequest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.alibaba.dubbo.demo;
+package org.apache.dubbo.demo;
import java.io.Serializable;
import java.math.BigDecimal;
diff --git a/java/dubbo-demo/dubbo-demo-api/src/main/java/com/alibaba/dubbo/demo/UserRequest.java b/java/dubbo-demo/dubbo-demo-api/src/main/java/org/apache/dubbo/demo/UserRequest.java
similarity index 98%
rename from java/dubbo-demo/dubbo-demo-api/src/main/java/com/alibaba/dubbo/demo/UserRequest.java
rename to java/dubbo-demo/dubbo-demo-api/src/main/java/org/apache/dubbo/demo/UserRequest.java
index 326cbdf..c9c0218 100644
--- a/java/dubbo-demo/dubbo-demo-api/src/main/java/com/alibaba/dubbo/demo/UserRequest.java
+++ b/java/dubbo-demo/dubbo-demo-api/src/main/java/org/apache/dubbo/demo/UserRequest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.alibaba.dubbo.demo;
+package org.apache.dubbo.demo;
import java.io.Serializable;
diff --git a/java/dubbo-demo/dubbo-demo-api/src/main/java/com/alibaba/dubbo/demo/UserResponse.java b/java/dubbo-demo/dubbo-demo-api/src/main/java/org/apache/dubbo/demo/UserResponse.java
similarity index 97%
rename from java/dubbo-demo/dubbo-demo-api/src/main/java/com/alibaba/dubbo/demo/UserResponse.java
rename to java/dubbo-demo/dubbo-demo-api/src/main/java/org/apache/dubbo/demo/UserResponse.java
index 890efe9..bfd937a 100644
--- a/java/dubbo-demo/dubbo-demo-api/src/main/java/com/alibaba/dubbo/demo/UserResponse.java
+++ b/java/dubbo-demo/dubbo-demo-api/src/main/java/org/apache/dubbo/demo/UserResponse.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.alibaba.dubbo.demo;
+package org.apache.dubbo.demo;
import java.io.Serializable;
import java.util.Map;
diff --git a/java/dubbo-demo/dubbo-demo-consumer/src/main/java/com/alibaba/dubbo/demo/consumer/Consumer.java b/java/dubbo-demo/dubbo-demo-consumer/src/main/java/org/apache/dubbo/demo/consumer/Consumer.java
similarity index 96%
rename from java/dubbo-demo/dubbo-demo-consumer/src/main/java/com/alibaba/dubbo/demo/consumer/Consumer.java
rename to java/dubbo-demo/dubbo-demo-consumer/src/main/java/org/apache/dubbo/demo/consumer/Consumer.java
index 1d959cb..56091a5 100644
--- a/java/dubbo-demo/dubbo-demo-consumer/src/main/java/com/alibaba/dubbo/demo/consumer/Consumer.java
+++ b/java/dubbo-demo/dubbo-demo-consumer/src/main/java/org/apache/dubbo/demo/consumer/Consumer.java
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.alibaba.dubbo.demo.consumer;
+package org.apache.dubbo.demo.consumer;
-import com.alibaba.dubbo.demo.DemoProvider;
+import org.apache.dubbo.demo.DemoProvider;
import org.springframework.context.support.ClassPathXmlApplicationContext;
/**
diff --git a/java/dubbo-demo/dubbo-demo-consumer/src/main/resources/META-INF/spring/dubbo-demo-consumer.xml b/java/dubbo-demo/dubbo-demo-consumer/src/main/resources/META-INF/spring/dubbo-demo-consumer.xml
index ace1cac..57881b5 100644
--- a/java/dubbo-demo/dubbo-demo-consumer/src/main/resources/META-INF/spring/dubbo-demo-consumer.xml
+++ b/java/dubbo-demo/dubbo-demo-consumer/src/main/resources/META-INF/spring/dubbo-demo-consumer.xml
@@ -29,8 +29,8 @@
<!-- 生成远程服务代理，可以和本地bean一样使用demoService -->
<dubbo:reference id="demoProvider" url="dubbo://localhost:20880" check="false"
- interface="com.alibaba.dubbo.demo.DemoProvider" version="1.0.0"/>
+ interface="org.apache.dubbo.demo.DemoProvider" version="1.0.0"/>
- <dubbo:reference id="basicTypeProvider" check="false" interface="com.alibaba.dubbo.demo.BasicTypeProvider"
+ <dubbo:reference id="basicTypeProvider" check="false" interface="org.apache.dubbo.demo.BasicTypeProvider"
version="2.0.0"/>
</beans>
\ No newline at end of file
diff --git a/java/dubbo-demo/dubbo-demo-provider/pom.xml b/java/dubbo-demo/dubbo-demo-provider/pom.xml
index 1591ca7..5163803 100644
--- a/java/dubbo-demo/dubbo-demo-provider/pom.xml
+++ b/java/dubbo-demo/dubbo-demo-provider/pom.xml
@@ -107,7 +107,7 @@
<configuration>
<archive>
<manifest>
- <mainClass>com.alibaba.dubbo.demo.provider.Provider</mainClass>
+ <mainClass>org.apache.dubbo.demo.provider.Provider</mainClass>
</manifest>
</archive>
<descriptorRefs>
diff --git a/java/dubbo-demo/dubbo-demo-provider/src/main/java/com/alibaba/dubbo/demo/provider/BasicTypeProviderImpl.java b/java/dubbo-demo/dubbo-demo-provider/src/main/java/org/apache/dubbo/demo/provider/BasicTypeProviderImpl.java
similarity index 88%
rename from java/dubbo-demo/dubbo-demo-provider/src/main/java/com/alibaba/dubbo/demo/provider/BasicTypeProviderImpl.java
rename to java/dubbo-demo/dubbo-demo-provider/src/main/java/org/apache/dubbo/demo/provider/BasicTypeProviderImpl.java
index e849368..182460e 100644
--- a/java/dubbo-demo/dubbo-demo-provider/src/main/java/com/alibaba/dubbo/demo/provider/BasicTypeProviderImpl.java
+++ b/java/dubbo-demo/dubbo-demo-provider/src/main/java/org/apache/dubbo/demo/provider/BasicTypeProviderImpl.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package com.alibaba.dubbo.demo.provider;
+package org.apache.dubbo.demo.provider;
-import com.alibaba.dubbo.demo.BasicTypeProvider;
-import com.alibaba.dubbo.demo.TypeRequest;
+import org.apache.dubbo.demo.BasicTypeProvider;
+import org.apache.dubbo.demo.TypeRequest;
public class BasicTypeProviderImpl implements BasicTypeProvider {
@Override
diff --git a/java/dubbo-demo/dubbo-demo-provider/src/main/java/com/alibaba/dubbo/demo/provider/DemoProviderImpl.java b/java/dubbo-demo/dubbo-demo-provider/src/main/java/org/apache/dubbo/demo/provider/DemoProviderImpl.java
similarity index 91%
rename from java/dubbo-demo/dubbo-demo-provider/src/main/java/com/alibaba/dubbo/demo/provider/DemoProviderImpl.java
rename to java/dubbo-demo/dubbo-demo-provider/src/main/java/org/apache/dubbo/demo/provider/DemoProviderImpl.java
index 1498693..d0ecfcb 100644
--- a/java/dubbo-demo/dubbo-demo-provider/src/main/java/com/alibaba/dubbo/demo/provider/DemoProviderImpl.java
+++ b/java/dubbo-demo/dubbo-demo-provider/src/main/java/org/apache/dubbo/demo/provider/DemoProviderImpl.java
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package com.alibaba.dubbo.demo.provider;
+package org.apache.dubbo.demo.provider;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
-import com.alibaba.dubbo.demo.DemoProvider;
-import com.alibaba.dubbo.demo.UserRequest;
-import com.alibaba.dubbo.demo.UserResponse;
+import org.apache.dubbo.demo.DemoProvider;
+import org.apache.dubbo.demo.UserRequest;
+import org.apache.dubbo.demo.UserResponse;
import com.alibaba.dubbo.rpc.RpcContext;
public class DemoProviderImpl implements DemoProvider {
diff --git a/java/dubbo-demo/dubbo-demo-provider/src/main/java/com/alibaba/dubbo/demo/provider/ErrorProviderImpl.java b/java/dubbo-demo/dubbo-demo-provider/src/main/java/org/apache/dubbo/demo/provider/ErrorProviderImpl.java
similarity index 87%
rename from java/dubbo-demo/dubbo-demo-provider/src/main/java/com/alibaba/dubbo/demo/provider/ErrorProviderImpl.java
rename to java/dubbo-demo/dubbo-demo-provider/src/main/java/org/apache/dubbo/demo/provider/ErrorProviderImpl.java
index c19b0d0..8bf1d7f 100644
--- a/java/dubbo-demo/dubbo-demo-provider/src/main/java/com/alibaba/dubbo/demo/provider/ErrorProviderImpl.java
+++ b/java/dubbo-demo/dubbo-demo-provider/src/main/java/org/apache/dubbo/demo/provider/ErrorProviderImpl.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package com.alibaba.dubbo.demo.provider;
+package org.apache.dubbo.demo.provider;
-import com.alibaba.dubbo.demo.CustomizeException;
-import com.alibaba.dubbo.demo.ErrorProvider;
+import org.apache.dubbo.demo.CustomizeException;
+import org.apache.dubbo.demo.ErrorProvider;
public class ErrorProviderImpl implements ErrorProvider {
@Override
diff --git a/java/dubbo-demo/dubbo-demo-provider/src/main/java/com/alibaba/dubbo/demo/provider/Provider.java b/java/dubbo-demo/dubbo-demo-provider/src/main/java/org/apache/dubbo/demo/provider/Provider.java
similarity index 97%
rename from java/dubbo-demo/dubbo-demo-provider/src/main/java/com/alibaba/dubbo/demo/provider/Provider.java
rename to java/dubbo-demo/dubbo-demo-provider/src/main/java/org/apache/dubbo/demo/provider/Provider.java
index d4f5d66..094394c 100644
--- a/java/dubbo-demo/dubbo-demo-provider/src/main/java/com/alibaba/dubbo/demo/provider/Provider.java
+++ b/java/dubbo-demo/dubbo-demo-provider/src/main/java/org/apache/dubbo/demo/provider/Provider.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package com.alibaba.dubbo.demo.provider;
+package org.apache.dubbo.demo.provider;
import org.springframework.context.support.ClassPathXmlApplicationContext;
diff --git a/java/dubbo-demo/dubbo-demo-provider/src/main/java/com/alibaba/dubbo/demo/provider/Provider1.java b/java/dubbo-demo/dubbo-demo-provider/src/main/java/org/apache/dubbo/demo/provider/Provider1.java
similarity index 96%
rename from java/dubbo-demo/dubbo-demo-provider/src/main/java/com/alibaba/dubbo/demo/provider/Provider1.java
rename to java/dubbo-demo/dubbo-demo-provider/src/main/java/org/apache/dubbo/demo/provider/Provider1.java
index 5965b12..6d8c9c5 100644
--- a/java/dubbo-demo/dubbo-demo-provider/src/main/java/com/alibaba/dubbo/demo/provider/Provider1.java
+++ b/java/dubbo-demo/dubbo-demo-provider/src/main/java/org/apache/dubbo/demo/provider/Provider1.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package com.alibaba.dubbo.demo.provider;
+package org.apache.dubbo.demo.provider;
import org.springframework.context.support.ClassPathXmlApplicationContext;
diff --git a/java/dubbo-demo/dubbo-demo-provider/src/main/resources/META-INF/spring/dubbo-demo-provider.xml b/java/dubbo-demo/dubbo-demo-provider/src/main/resources/META-INF/spring/dubbo-demo-provider.xml
index baf4b78..e20f26b 100644
--- a/java/dubbo-demo/dubbo-demo-provider/src/main/resources/META-INF/spring/dubbo-demo-provider.xml
+++ b/java/dubbo-demo/dubbo-demo-provider/src/main/resources/META-INF/spring/dubbo-demo-provider.xml
@@ -30,16 +30,16 @@
<dubbo:protocol name="dubbo" port="20880"/>
<!-- 和本地bean一样实现服务 -->
- <bean id="demoProvider" class="com.alibaba.dubbo.demo.provider.DemoProviderImpl"/>
- <bean id="basicTypeProvider" class="com.alibaba.dubbo.demo.provider.BasicTypeProviderImpl"/>
- <bean id="errorProvider" class="com.alibaba.dubbo.demo.provider.ErrorProviderImpl"/>
+ <bean id="demoProvider" class="org.apache.dubbo.demo.provider.DemoProviderImpl"/>
+ <bean id="basicTypeProvider" class="org.apache.dubbo.demo.provider.BasicTypeProviderImpl"/>
+ <bean id="errorProvider" class="org.apache.dubbo.demo.provider.ErrorProviderImpl"/>
<!-- 声明需要暴露的服务接口 -->
- <dubbo:service interface="com.alibaba.dubbo.demo.DemoProvider" ref="demoProvider" version="1.0.0" timeout="10000">
+ <dubbo:service interface="org.apache.dubbo.demo.DemoProvider" ref="demoProvider" version="1.0.0" timeout="10000">
<dubbo:method name="sayHello" timeout="8000"/>
</dubbo:service>
- <dubbo:service interface="com.alibaba.dubbo.demo.BasicTypeProvider" ref="basicTypeProvider" version="2.0.0"/>
- <dubbo:service interface="com.alibaba.dubbo.demo.ErrorProvider" ref="errorProvider" version="1.0.0"/>
+ <dubbo:service interface="org.apache.dubbo.demo.BasicTypeProvider" ref="basicTypeProvider" version="2.0.0"/>
+ <dubbo:service interface="org.apache.dubbo.demo.ErrorProvider" ref="errorProvider" version="1.0.0"/>
</beans>
diff --git a/java/dubbo-demo/dubbo-demo-provider/src/main/resources/META-INF/spring/dubbo-demo-provider1.xml b/java/dubbo-demo/dubbo-demo-provider/src/main/resources/META-INF/spring/dubbo-demo-provider1.xml
index 9cc6129..f4aa344 100644
--- a/java/dubbo-demo/dubbo-demo-provider/src/main/resources/META-INF/spring/dubbo-demo-provider1.xml
+++ b/java/dubbo-demo/dubbo-demo-provider/src/main/resources/META-INF/spring/dubbo-demo-provider1.xml
@@ -32,16 +32,16 @@
<dubbo:protocol name="dubbo" port="20881"/>
<!-- 和本地bean一样实现服务 -->
- <bean id="demoProvider" class="com.alibaba.dubbo.demo.provider.DemoProviderImpl"/>
- <bean id="basicTypeProvider" class="com.alibaba.dubbo.demo.provider.BasicTypeProviderImpl"/>
- <bean id="errorProvider" class="com.alibaba.dubbo.demo.provider.ErrorProviderImpl"/>
+ <bean id="demoProvider" class="org.apache.dubbo.demo.provider.DemoProviderImpl"/>
+ <bean id="basicTypeProvider" class="org.apache.dubbo.demo.provider.BasicTypeProviderImpl"/>
+ <bean id="errorProvider" class="org.apache.dubbo.demo.provider.ErrorProviderImpl"/>
<!-- 声明需要暴露的服务接口 -->
- <dubbo:service interface="com.alibaba.dubbo.demo.DemoProvider" ref="demoProvider" version="1.0.0" timeout="10000">
+ <dubbo:service interface="org.apache.dubbo.demo.DemoProvider" ref="demoProvider" version="1.0.0" timeout="10000">
<dubbo:method name="sayHello" timeout="8000"/>
</dubbo:service>
- <dubbo:service interface="com.alibaba.dubbo.demo.BasicTypeProvider" ref="basicTypeProvider" version="2.0.0"/>
- <dubbo:service interface="com.alibaba.dubbo.demo.ErrorProvider" ref="errorProvider" version="1.0.0"/>
+ <dubbo:service interface="org.apache.dubbo.demo.BasicTypeProvider" ref="basicTypeProvider" version="2.0.0"/>
+ <dubbo:service interface="org.apache.dubbo.demo.ErrorProvider" ref="errorProvider" version="1.0.0"/>
</beans>
diff --git a/packages/dubbo-invoker/src/__tests__/matcher-test.ts b/packages/dubbo-invoker/src/__tests__/matcher-test.ts
index 6996286..d77de38 100644
--- a/packages/dubbo-invoker/src/__tests__/matcher-test.ts
+++ b/packages/dubbo-invoker/src/__tests__/matcher-test.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import {Context} from 'dubbo2.js';
+import {Context} from 'dubbo-js';
import matcher from '../matcher';
describe('matcher test suite', () => {
diff --git a/packages/dubbo/README.md b/packages/dubbo/README.md
index 45ca9ad..d92099f 100644
--- a/packages/dubbo/README.md
+++ b/packages/dubbo/README.md
@@ -31,16 +31,16 @@ interface IDemoService {
//创建dubbo对象
const dubbo = new Dubbo({
- application: {name: 'node-dubbo'},
+ application: {name: 'dubbo-js'},
//zookeeper address
register: 'localhost:2181',
dubboVersion: '2.0.0',
- interfaces: ['com.alibaba.dubbo.demo.DemoService'],
+ interfaces: ['org.apache.dubbo.demo.DemoService'],
});
//代理本地对象->dubbo对象
const demoService = dubbo.proxyService<IDemoService>({
- dubboInterface: 'com.alibaba.dubbo.demo.DemoService',
+ dubboInterface: 'org.apache.dubbo.demo.DemoService',
version: '1.0.0',
methods: {
sayHello(name) {
diff --git a/packages/dubbo/src/__tests__/directly-dubbo-test.ts b/packages/dubbo/src/__tests__/directly-dubbo-test.ts
index b655adf..ae30dc8 100644
--- a/packages/dubbo/src/__tests__/directly-dubbo-test.ts
+++ b/packages/dubbo/src/__tests__/directly-dubbo-test.ts
@@ -19,8 +19,8 @@ import {DirectlyDubbo, java} from 'dubbo-js';
import {
DemoProviderWrapper,
IDemoProvider,
-} from './providers/com/alibaba/dubbo/demo/DemoProvider';
-import {UserRequest} from './providers/com/alibaba/dubbo/demo/UserRequest';
+} from './providers/org/apache/dubbo/demo/DemoProvider';
+import {UserRequest} from './providers/org/apache/dubbo/demo/UserRequest';
const dubbo = DirectlyDubbo.from({
dubboAddress: 'localhost:20880',
@@ -29,7 +29,7 @@ const dubbo = DirectlyDubbo.from({
});
const demoService = dubbo.proxyService<IDemoProvider>({
- dubboInterface: 'com.alibaba.dubbo.demo.DemoProvider',
+ dubboInterface: 'org.apache.dubbo.demo.DemoProvider',
methods: DemoProviderWrapper,
version: '1.0.0',
});
diff --git a/packages/dubbo/src/__tests__/dubbo-hessian-parameter-test.ts b/packages/dubbo/src/__tests__/dubbo-hessian-parameter-test.ts
index 757d456..f55dd44 100644
--- a/packages/dubbo/src/__tests__/dubbo-hessian-parameter-test.ts
+++ b/packages/dubbo/src/__tests__/dubbo-hessian-parameter-test.ts
@@ -16,26 +16,26 @@
*/
import {Dubbo, setting} from 'dubbo-js';
-import {DemoProvider} from './providers/com/alibaba/dubbo/demo/DemoProvider';
+import {DemoProvider} from './providers/org/apache/dubbo/demo/DemoProvider';
const service = {
DemoProvider,
};
const dubboSetting = setting
- .match('com.alibaba.dubbo.demo.BasicTypeProvider', {
+ .match('org.apache.dubbo.demo.BasicTypeProvider', {
version: '2.0.0',
})
.match(
[
- 'com.alibaba.dubbo.demo.DemoProvider',
- 'com.alibaba.dubbo.demo.ErrorProvider',
+ 'org.apache.dubbo.demo.DemoProvider',
+ 'org.apache.dubbo.demo.ErrorProvider',
],
{version: '1.0.0'},
);
const dubbo = new Dubbo<typeof service>({
- application: {name: '@qianmi/node-dubbo'},
+ application: {name: 'dubbo-js'},
register: 'localhost:2181',
service,
dubboSetting,
diff --git a/packages/dubbo/src/__tests__/dubbo-test.ts b/packages/dubbo/src/__tests__/dubbo-test.ts
index 12a33a5..a724102 100644
--- a/packages/dubbo/src/__tests__/dubbo-test.ts
+++ b/packages/dubbo/src/__tests__/dubbo-test.ts
@@ -16,11 +16,11 @@
*/
import {Context, Dubbo, java, setting} from 'dubbo-js';
-import {BasicTypeProvider} from './providers/com/alibaba/dubbo/demo/BasicTypeProvider';
-import {DemoProvider} from './providers/com/alibaba/dubbo/demo/DemoProvider';
-import {ErrorProvider} from './providers/com/alibaba/dubbo/demo/ErrorProvider';
-import {TypeRequest} from './providers/com/alibaba/dubbo/demo/TypeRequest';
-import {UserRequest} from './providers/com/alibaba/dubbo/demo/UserRequest';
+import {BasicTypeProvider} from './providers/org/apache/dubbo/demo/BasicTypeProvider';
+import {DemoProvider} from './providers/org/apache/dubbo/demo/DemoProvider';
+import {ErrorProvider} from './providers/org/apache/dubbo/demo/ErrorProvider';
+import {TypeRequest} from './providers/org/apache/dubbo/demo/TypeRequest';
+import {UserRequest} from './providers/org/apache/dubbo/demo/UserRequest';
//==============init dubbo==============
const service = {
@@ -31,13 +31,13 @@ const service = {
//dubbo-setting
const dubboSetting = setting
- .match('com.alibaba.dubbo.demo.BasicTypeProvider', {
+ .match('org.apache.dubbo.demo.BasicTypeProvider', {
version: '2.0.0',
})
.match(
[
- 'com.alibaba.dubbo.demo.DemoProvider',
- 'com.alibaba.dubbo.demo.ErrorProvider',
+ 'org.apache.dubbo.demo.DemoProvider',
+ 'org.apache.dubbo.demo.ErrorProvider',
],
{version: '1.0.0'},
);
diff --git a/packages/dubbo/src/__tests__/dubbo-timeout-test.ts b/packages/dubbo/src/__tests__/dubbo-timeout-test.ts
index 1d0ef68..b9fd50d 100644
--- a/packages/dubbo/src/__tests__/dubbo-timeout-test.ts
+++ b/packages/dubbo/src/__tests__/dubbo-timeout-test.ts
@@ -16,22 +16,22 @@
*/
import {Dubbo, java, setting} from 'dubbo-js';
-import {DemoProvider} from './providers/com/alibaba/dubbo/demo/DemoProvider';
-import {UserRequest} from './providers/com/alibaba/dubbo/demo/UserRequest';
+import {DemoProvider} from './providers/org/apache/dubbo/demo/DemoProvider';
+import {UserRequest} from './providers/org/apache/dubbo/demo/UserRequest';
const service = {
DemoProvider,
};
const dubboSetting = setting
- .match('com.alibaba.dubbo.demo.BasicTypeProvider', {
+ .match('org.apache.dubbo.demo.BasicTypeProvider', {
version: '2.0.0',
})
- .match('com.alibaba.dubbo.demo.DemoProvider', {version: '1.0.0'})
- .match('com.alibaba.dubbo.demo.ErrorProvider', {version: '1.0.0'});
+ .match('org.apache.dubbo.demo.DemoProvider', {version: '1.0.0'})
+ .match('org.apache.dubbo.demo.ErrorProvider', {version: '1.0.0'});
const dubbo = new Dubbo<typeof service>({
- application: {name: '@qianmi/node-dubbo'},
+ application: {name: 'dubbo-js'},
register: 'localhost:2181,localhost:2181,localhost:2181',
dubboInvokeTimeout: 0.001,
service,
@@ -74,7 +74,7 @@ describe('dubbo timeout test suite', () => {
new UserRequest({
id: 1,
name: 'nodejs',
- email: 'node@qianmi.com',
+ email: 'dubbo-js',
}),
);
expect(res).toEqual(null);
diff --git a/packages/dubbo/src/__tests__/providers/com/alibaba/dubbo/demo/BasicTypeProvider.ts b/packages/dubbo/src/__tests__/providers/org/apache/dubbo/demo/BasicTypeProvider.ts
similarity index 95%
rename from packages/dubbo/src/__tests__/providers/com/alibaba/dubbo/demo/BasicTypeProvider.ts
rename to packages/dubbo/src/__tests__/providers/org/apache/dubbo/demo/BasicTypeProvider.ts
index f3ada37..66be46e 100644
--- a/packages/dubbo/src/__tests__/providers/com/alibaba/dubbo/demo/BasicTypeProvider.ts
+++ b/packages/dubbo/src/__tests__/providers/org/apache/dubbo/demo/BasicTypeProvider.ts
@@ -27,7 +27,7 @@ export const BasicTypeProviderWrapper = {testBasicType: argumentMap};
export function BasicTypeProvider(dubbo: Dubbo): IBasicTypeProvider {
return dubbo.proxyService<IBasicTypeProvider>({
- dubboInterface: 'com.alibaba.dubbo.demo.BasicTypeProvider',
+ dubboInterface: 'org.apache.dubbo.demo.BasicTypeProvider',
methods: BasicTypeProviderWrapper,
});
}
diff --git a/packages/dubbo/src/__tests__/providers/com/alibaba/dubbo/demo/DemoProvider.ts b/packages/dubbo/src/__tests__/providers/org/apache/dubbo/demo/DemoProvider.ts
similarity index 96%
rename from packages/dubbo/src/__tests__/providers/com/alibaba/dubbo/demo/DemoProvider.ts
rename to packages/dubbo/src/__tests__/providers/org/apache/dubbo/demo/DemoProvider.ts
index 7f4d6b2..e593e37 100644
--- a/packages/dubbo/src/__tests__/providers/com/alibaba/dubbo/demo/DemoProvider.ts
+++ b/packages/dubbo/src/__tests__/providers/org/apache/dubbo/demo/DemoProvider.ts
@@ -35,7 +35,7 @@ export const DemoProviderWrapper = {
export function DemoProvider(dubbo: Dubbo): IDemoProvider {
return dubbo.proxyService<IDemoProvider>({
- dubboInterface: 'com.alibaba.dubbo.demo.DemoProvider',
+ dubboInterface: 'org.apache.dubbo.demo.DemoProvider',
methods: DemoProviderWrapper,
});
}
diff --git a/packages/dubbo/src/__tests__/providers/com/alibaba/dubbo/demo/ErrorProvider.ts b/packages/dubbo/src/__tests__/providers/org/apache/dubbo/demo/ErrorProvider.ts
similarity index 95%
rename from packages/dubbo/src/__tests__/providers/com/alibaba/dubbo/demo/ErrorProvider.ts
rename to packages/dubbo/src/__tests__/providers/org/apache/dubbo/demo/ErrorProvider.ts
index 79cded2..6c45fc6 100644
--- a/packages/dubbo/src/__tests__/providers/com/alibaba/dubbo/demo/ErrorProvider.ts
+++ b/packages/dubbo/src/__tests__/providers/org/apache/dubbo/demo/ErrorProvider.ts
@@ -25,7 +25,7 @@ export const ErrorProviderWrapper = {errorTest: argumentMap};
export function ErrorProvider(dubbo: Dubbo): IErrorProvider {
return dubbo.proxyService<IErrorProvider>({
- dubboInterface: 'com.alibaba.dubbo.demo.ErrorProvider',
+ dubboInterface: 'org.apache.dubbo.demo.ErrorProvider',
methods: ErrorProviderWrapper,
});
}
diff --git a/packages/dubbo/src/__tests__/providers/com/alibaba/dubbo/demo/TypeRequest.ts b/packages/dubbo/src/__tests__/providers/org/apache/dubbo/demo/TypeRequest.ts
similarity index 96%
rename from packages/dubbo/src/__tests__/providers/com/alibaba/dubbo/demo/TypeRequest.ts
rename to packages/dubbo/src/__tests__/providers/org/apache/dubbo/demo/TypeRequest.ts
index 7180df5..e7ed107 100644
--- a/packages/dubbo/src/__tests__/providers/com/alibaba/dubbo/demo/TypeRequest.ts
+++ b/packages/dubbo/src/__tests__/providers/org/apache/dubbo/demo/TypeRequest.ts
@@ -36,7 +36,7 @@ export class TypeRequest {
mapMapTransfer.set(java.String(mapKey), java.String(this.map[mapKey]));
}
return {
- $class: 'com.alibaba.dubbo.demo.TypeRequest',
+ $class: 'org.apache.dubbo.demo.TypeRequest',
$: {
bigDecimal: java.BigDecimal(this.bigDecimal.value),
map: java.Map(mapMapTransfer),
diff --git a/packages/dubbo/src/__tests__/providers/com/alibaba/dubbo/demo/UserRequest.ts b/packages/dubbo/src/__tests__/providers/org/apache/dubbo/demo/UserRequest.ts
similarity index 96%
rename from packages/dubbo/src/__tests__/providers/com/alibaba/dubbo/demo/UserRequest.ts
rename to packages/dubbo/src/__tests__/providers/org/apache/dubbo/demo/UserRequest.ts
index 28988eb..f037ae7 100644
--- a/packages/dubbo/src/__tests__/providers/com/alibaba/dubbo/demo/UserRequest.ts
+++ b/packages/dubbo/src/__tests__/providers/org/apache/dubbo/demo/UserRequest.ts
@@ -36,7 +36,7 @@ export class UserRequest {
__fields2java() {
return {
- $class: 'com.alibaba.dubbo.demo.UserRequest',
+ $class: 'org.apache.dubbo.demo.UserRequest',
$: {
name: java.String(this.name),
id: java.Integer(this.id),
diff --git a/packages/dubbo/src/__tests__/providers/com/alibaba/dubbo/demo/UserResponse.ts b/packages/dubbo/src/__tests__/providers/org/apache/dubbo/demo/UserResponse.ts
similarity index 96%
rename from packages/dubbo/src/__tests__/providers/com/alibaba/dubbo/demo/UserResponse.ts
rename to packages/dubbo/src/__tests__/providers/org/apache/dubbo/demo/UserResponse.ts
index 72891a7..dce4ad5 100644
--- a/packages/dubbo/src/__tests__/providers/com/alibaba/dubbo/demo/UserResponse.ts
+++ b/packages/dubbo/src/__tests__/providers/org/apache/dubbo/demo/UserResponse.ts
@@ -36,7 +36,7 @@ export class UserResponse {
infoMapTransfer.set(java.String(mapKey), java.String(this.info[mapKey]));
}
return {
- $class: 'com.alibaba.dubbo.demo.UserResponse',
+ $class: 'org.apache.dubbo.demo.UserResponse',
$: {status: java.String(this.status), info: java.Map(infoMapTransfer)},
};
}
diff --git a/packages/dubbo/src/__tests__/setting-test.ts b/packages/dubbo/src/__tests__/setting-test.ts
index f721ac3..20cea3e 100644
--- a/packages/dubbo/src/__tests__/setting-test.ts
+++ b/packages/dubbo/src/__tests__/setting-test.ts
@@ -19,76 +19,76 @@ import setting from '../setting';
describe('matcher test suite', () => {
it('test string match', () => {
- setting.match('com.alibaba.dubbo.demo.DemoProvider', {
+ setting.match('org.apache.dubbo.demo.DemoProvider', {
version: '1.0.0',
- group: 'alibaba',
+ group: 'apache',
});
expect(
- setting.getDubboSetting('com.alibaba.dubbo.demo.DemoProvider'),
+ setting.getDubboSetting('org.apache.dubbo.demo.DemoProvider'),
).toEqual({
version: '1.0.0',
- group: 'alibaba',
+ group: 'apache',
});
});
it('test array string match', () => {
setting.match(
[
- 'com.alibaba.dubbo.demo.DemoProvider',
- 'com.alibaba.dubbo.demo.ProductProvider',
+ 'org.apache.dubbo.demo.DemoProvider',
+ 'org.apache.dubbo.demo.ProductProvider',
],
- {version: '1.0.0', group: 'alibaba'},
+ {version: '1.0.0', group: 'apache'},
);
expect(
- setting.getDubboSetting('com.alibaba.dubbo.demo.ProductProvider'),
+ setting.getDubboSetting('org.apache.dubbo.demo.ProductProvider'),
).toEqual({
version: '1.0.0',
- group: 'alibaba',
+ group: 'apache',
});
});
it('test predict fn match', () => {
//setting match rule
setting.match((dubboInterface: string) => {
- if (dubboInterface === 'com.alibaba.dubbo.demo.ProductProvider1') {
+ if (dubboInterface === 'org.apache.dubbo.demo.ProductProvider1') {
return {
version: '3.0.0',
- group: 'alibaba',
+ group: 'apache',
};
}
});
expect(
- setting.getDubboSetting('com.alibaba.dubbo.demo.ProductProvider1'),
+ setting.getDubboSetting('org.apache.dubbo.demo.ProductProvider1'),
).toEqual({
version: '3.0.0',
- group: 'alibaba',
+ group: 'apache',
});
//not match
expect(
- setting.getDubboSetting('com.alibaba.dubbo.demo.GoodsProvider'),
+ setting.getDubboSetting('org.apache.dubbo.demo.GoodsProvider'),
).toEqual(null);
});
it('test RegExp match', () => {
- setting.match(/^com.alibaba.dubbo.demo/, {
+ setting.match(/^org.apache.dubbo.demo/, {
version: '2.0.0',
- group: 'alibaba',
+ group: 'apache',
});
expect(
- setting.getDubboSetting('com.alibaba.dubbo.demo.UserProvider'),
+ setting.getDubboSetting('org.apache.dubbo.demo.UserProvider'),
).toEqual({
version: '2.0.0',
- group: 'alibaba',
+ group: 'apache',
});
});
it('test not match', () => {
- expect(setting.getDubboSetting('com.dubbo.demo.ShoppingCart')).toEqual(
+ expect(setting.getDubboSetting('org.dubbo.demo.ShoppingCart')).toEqual(
null,
);
});
diff --git a/packages/dubbo/src/__tests__/zookeeper-test.ts b/packages/dubbo/src/__tests__/zookeeper-test.ts
index e7c10f9..616f0d6 100644
--- a/packages/dubbo/src/__tests__/zookeeper-test.ts
+++ b/packages/dubbo/src/__tests__/zookeeper-test.ts
@@ -22,13 +22,13 @@ describe('zookeeper test suite', () => {
it('test connect', () => {
//dubbo-setting
const dubboSetting = setting
- .match('com.alibaba.dubbo.demo.BasicTypeProvider', {
+ .match('org.apache.dubbo.demo.BasicTypeProvider', {
version: '2.0.0',
})
.match(
[
- 'com.alibaba.dubbo.demo.DemoProvider',
- 'com.alibaba.dubbo.demo.ErrorProvider',
+ 'org.apache.dubbo.demo.DemoProvider',
+ 'org.apache.dubbo.demo.ErrorProvider',
],
{version: '1.0.0'},
);
@@ -37,9 +37,9 @@ describe('zookeeper test suite', () => {
url: 'localhost:2181,localhost:2181,localhost:2181',
})({
interfaces: [
- 'com.alibaba.dubbo.demo.DemoProvider',
- 'com.alibaba.dubbo.demo.BasicTypeProvider',
- 'com.alibaba.dubbo.demo.ErrorProvider',
+ 'org.apache.dubbo.demo.DemoProvider',
+ 'org.apache.dubbo.demo.BasicTypeProvider',
+ 'org.apache.dubbo.demo.ErrorProvider',
],
dubboSetting,
application: {
diff --git a/packages/interpret-cli/src/cli.ts b/packages/interpret-cli/src/cli.ts
index 85c3380..502f2fb 100644
--- a/packages/interpret-cli/src/cli.ts
+++ b/packages/interpret-cli/src/cli.ts
@@ -15,15 +15,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-import klaw from 'klaw';
-import {to} from './to';
-import debug from 'debug';
-import {extra} from './ext';
-import Config from './config';
import program from 'commander';
+import debug from 'debug';
+import {readFile, writeFile} from 'fs-extra';
+import klaw from 'klaw';
import prettier from 'prettier';
+import Config from './config';
+import {extra} from './ext';
import {Request} from './request';
-import {readFile, writeFile} from 'fs-extra';
+import {to} from './to';
const log = debug('j2t:cli');
diff --git a/packages/interpret-cli/src/config.ts b/packages/interpret-cli/src/config.ts
index b98a223..36a9ce2 100644
--- a/packages/interpret-cli/src/config.ts
+++ b/packages/interpret-cli/src/config.ts
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-import {to} from './to';
import {readJson} from 'fs-extra';
import {isAbsolute, join} from 'path';
+import {to} from './to';
import {IConfig} from './typings';
export default class Config {
diff --git a/packages/interpret-cli/src/ext/index.ts b/packages/interpret-cli/src/ext/index.ts
index d146a59..35d79b2 100644
--- a/packages/interpret-cli/src/ext/index.ts
+++ b/packages/interpret-cli/src/ext/index.ts
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-import {join} from 'path';
-import {pathExists} from 'fs-extra';
import {spawn} from 'child_process';
+import {pathExists} from 'fs-extra';
+import {join} from 'path';
import {IDubboExtInfo, IExtraResult} from '../typings';
const startFlag = 'Output at:';
diff --git a/packages/interpret-cli/src/transfer/bean/to-field.ts b/packages/interpret-cli/src/transfer/bean/to-field.ts
index 12231a5..b1f56fa 100644
--- a/packages/interpret-cli/src/transfer/bean/to-field.ts
+++ b/packages/interpret-cli/src/transfer/bean/to-field.ts
@@ -15,10 +15,10 @@
* limitations under the License.
*/
import debug from 'debug';
+import {PropertySignatureStructure} from 'ts-simple-ast';
import {IntepretHandle} from '../../handle';
import {IJFieldPropers} from '../../typings';
import {jType2Ts} from '../../util/type-parse';
-import {PropertySignatureStructure} from 'ts-simple-ast';
const log = debug('j2t:core:toField');
diff --git a/packages/interpret-cli/src/transfer/bean/to-vo.ts b/packages/interpret-cli/src/transfer/bean/to-vo.ts
index a9664f9..7477414 100644
--- a/packages/interpret-cli/src/transfer/bean/to-vo.ts
+++ b/packages/interpret-cli/src/transfer/bean/to-vo.ts
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+import debug from 'debug';
import {
ClassDeclarationStructure,
InterfaceDeclarationStructure,
@@ -22,11 +23,10 @@ import {
PropertyDeclarationStructure,
TypeParameterDeclarationStructure,
} from 'ts-simple-ast';
-import debug from 'debug';
-import {toField} from './to-field';
import {IntepretHandle} from '../../handle';
-import {jType2Ts} from '../../util/type-parse';
import {IJClass} from '../../typings';
+import {jType2Ts} from '../../util/type-parse';
+import {toField} from './to-field';
import {fields2CtrContent, getCtorParaStr} from './util/transfer';
const log = debug('j2t:core:toBeanClass');
diff --git a/packages/interpret-cli/src/transfer/bean/util/__tests__/transfer.test.ts b/packages/interpret-cli/src/transfer/bean/util/__tests__/transfer.test.ts
index 462225e..bde813a 100644
--- a/packages/interpret-cli/src/transfer/bean/util/__tests__/transfer.test.ts
+++ b/packages/interpret-cli/src/transfer/bean/util/__tests__/transfer.test.ts
@@ -14,8 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-import {fields2CtrContent, getCtorParaStr, j2Jtj} from '../transfer';
import {TypeInfoI} from '../../../../typings';
+import {fields2CtrContent, getCtorParaStr, j2Jtj} from '../transfer';
/**
* @desc
@@ -26,7 +26,10 @@ import {TypeInfoI} from '../../../../typings';
* @Date 2018/4/8
**/
-let enums = ['com.qianmi.yxtc.enums.BusiTypeEnum','com.qianmi.gavin.comm.Phone'],
+let enums = [
+ 'com.qianmi.yxtc.enums.BusiTypeEnum',
+ 'com.qianmi.gavin.comm.Phone',
+ ],
beans = ['com.qianmi.yxtc.domain.PayMethodInfo'];
let typeInfo: Map<string, TypeInfoI> = new Map();
@@ -63,9 +66,9 @@ let typeOptions = {
},
addDenpend: async (classPath: string) => {
return {
- classPath:"",
- name:"",
- importName:"",
+ classPath: '',
+ name: '',
+ importName: '',
};
},
getTypeInfo: (classPath: string) => {
@@ -151,11 +154,12 @@ describe('基础转换生成', () => {
paramRefName: 'this.initPrice',
classPath: 'java.math.BigDecimal',
});
- expect(content).toEqual('this.initPrice?java.BigDecimal(this.initPrice.value):null');
+ expect(content).toEqual(
+ 'this.initPrice?java.BigDecimal(this.initPrice.value):null',
+ );
});
});
-
describe('集合显示问题 ', () => {
it('java.util.Collection', async () => {
let {fieldTrans, initContent} = await fields2CtrContent(
@@ -190,9 +194,8 @@ describe('数组显示问题 string[]', () => {
});
});
-
describe('枚举类型转换', () => {
- it('Enum<Phone> 用法的支持',async ()=>{
+ it('Enum<Phone> 用法的支持', async () => {
let {fieldTrans, initContent} = await fields2CtrContent(
[
{
@@ -204,9 +207,7 @@ describe('枚举类型转换', () => {
typeDef,
);
expect(fieldTrans).toMatchSnapshot('枚举类型转换');
-
- })
-
+ });
});
describe('map<string,List<string>>转换方法', () => {
@@ -245,9 +246,9 @@ describe('map<string,List<string>>转换方法', () => {
const typeDef = {
fields: {
- "initPrice":{
- "name":"java.math.BigDecimal",
- "typeArgs":[]
+ initPrice: {
+ name: 'java.math.BigDecimal',
+ typeArgs: [],
},
skuIds: {
name: 'java.util.Collection',
@@ -268,15 +269,17 @@ const typeDef = {
},
isArray: true,
},
- "type":{
- "name":"java.lang.Enum",
- "typeArgs":[{
- "isWildcard":false,
- "type":{
- "name":"com.qianmi.gavin.comm.Phone",
- "typeArgs":[]
- }
- }]
+ type: {
+ name: 'java.lang.Enum',
+ typeArgs: [
+ {
+ isWildcard: false,
+ type: {
+ name: 'com.qianmi.gavin.comm.Phone',
+ typeArgs: [],
+ },
+ },
+ ],
},
cats: {
isArray: false,
diff --git a/packages/interpret-cli/src/transfer/bean/util/transfer.ts b/packages/interpret-cli/src/transfer/bean/util/transfer.ts
index 53fe9e7..97611fa 100644
--- a/packages/interpret-cli/src/transfer/bean/util/transfer.ts
+++ b/packages/interpret-cli/src/transfer/bean/util/transfer.ts
@@ -15,10 +15,10 @@
* limitations under the License.
*/
import debug from 'debug';
+import {TypeParameterDeclarationStructure} from 'ts-simple-ast';
import {IntepretHandle} from '../../../handle';
-import {jType2Ts} from '../../../util/type-parse';
import {IJClass, IJFieldPropers, ITypeSearch} from '../../../typings';
-import {TypeParameterDeclarationStructure} from 'ts-simple-ast';
+import {jType2Ts} from '../../../util/type-parse';
const log = debug('j2t:core:toBeanClass:transfer');
@@ -42,7 +42,11 @@ export function getCtorParaStr(
if (typeParameters.length === 0) {
return 'I' + className;
} else {
- return `I${className}<${typeParameters.map(({name}) => name.replace(" extends { __fields2java?(): any } = any","")).join(',')}>`;
+ return `I${className}<${typeParameters
+ .map(({name}) =>
+ name.replace(' extends { __fields2java?(): any } = any', ''),
+ )
+ .join(',')}>`;
}
}
@@ -92,8 +96,8 @@ export async function fields2CtrContent(
`${name}:${j2Jtj(typeOption, {
classPath: filedAst.typeArgs[0].type.name,
paramRefName: `this.${name}`,
- })}`
- );
+ })}`,
+ );
} else if (filedAst.typeArgs && filedAst.typeArgs.length > 0) {
let isWildcard = false;
for (var j = 0, jLen = filedAst.typeArgs.length; j < jLen; j++) {
@@ -311,6 +315,6 @@ export function j2Jtj(
classPath.lastIndexOf('.') + 1,
)}(${paramRefName})`;
} else {
- return `${paramRefName}`
+ return `${paramRefName}`;
}
}
diff --git a/packages/interpret-cli/src/transfer/to-import.ts b/packages/interpret-cli/src/transfer/to-import.ts
index c602aac..98590bd 100644
--- a/packages/interpret-cli/src/transfer/to-import.ts
+++ b/packages/interpret-cli/src/transfer/to-import.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
import debug from 'debug';
-import {relative,sep} from 'path';
+import {relative, sep} from 'path';
import {ImportDeclarationStructure} from 'ts-simple-ast';
const log = debug('j2t:core:toImport');
@@ -43,10 +43,9 @@ export function toImport({
return {
moduleSpecifier:
'./' +
- relative(
- packagePath.split('.').join('/'),
- classPath.split('.').join('/'),
- ).split(sep).join("/"),
+ relative(packagePath.split('.').join('/'), classPath.split('.').join('/'))
+ .split(sep)
+ .join('/'),
namedImports: [{name: className}],
};
}
diff --git a/packages/interpret-cli/src/transfer/to-method.ts b/packages/interpret-cli/src/transfer/to-method.ts
index 83e9bb6..599018b 100644
--- a/packages/interpret-cli/src/transfer/to-method.ts
+++ b/packages/interpret-cli/src/transfer/to-method.ts
@@ -15,10 +15,10 @@
* limitations under the License.
*/
import debug from 'debug';
+import {MethodSignatureStructure} from 'ts-simple-ast';
import {IntepretHandle} from '../handle';
import {IJMethodPropers} from '../typings';
import {jType2Ts} from '../util/type-parse';
-import {MethodSignatureStructure} from 'ts-simple-ast';
const log = debug('j2t:core:toMethod');
diff --git a/packages/interpret-cli/src/transfer/to-typescript.ts b/packages/interpret-cli/src/transfer/to-typescript.ts
index 6001afd..be23b08 100644
--- a/packages/interpret-cli/src/transfer/to-typescript.ts
+++ b/packages/interpret-cli/src/transfer/to-typescript.ts
@@ -15,10 +15,10 @@
* limitations under the License.
*/
import debug from 'debug';
-import {toEnum} from './bean/to-enum';
-import {toBeanClass} from './bean/to-vo';
import {SourceFile} from 'ts-simple-ast';
import {IntepretHandle} from '../handle';
+import {toEnum} from './bean/to-enum';
+import {toBeanClass} from './bean/to-vo';
import {toInterface} from './provider/to-interface';
import {toProxyFunc} from './provider/to-proxy-function';
import {toWrapperClass} from './provider/to-wrapper-class';
@@ -46,12 +46,14 @@ export async function toTypescript(
isAbstract: astJava.isAbstract,
isInterface: astJava.isInterface,
isClass: !astJava.isEnum && !astJava.isInterface,
- isProvider: astJava.name.endsWith(String(intepretHandle.providerSuffix) || 'Provider'),
+ isProvider: astJava.name.endsWith(
+ String(intepretHandle.providerSuffix) || 'Provider',
+ ),
};
intepretHandle.request.registerTypeInfo(typeInfo);
- if(astJava.isAbstract && !typeInfo.isProvider) {
- console.warn('warning 抽象类型要注意了.classPath:',typeInfo.classPath);
+ if (astJava.isAbstract && !typeInfo.isProvider) {
+ console.warn('warning 抽象类型要注意了.classPath:', typeInfo.classPath);
}
try {
diff --git a/packages/interpret-cli/src/typings.ts b/packages/interpret-cli/src/typings.ts
index 96ffaa0..673a540 100644
--- a/packages/interpret-cli/src/typings.ts
+++ b/packages/interpret-cli/src/typings.ts
@@ -73,10 +73,10 @@ export interface IHasAst {
(classPath: string): boolean;
}
-export interface IDependItem{
- classPath:string;
- name:string;
- importName:string;
+export interface IDependItem {
+ classPath: string;
+ name: string;
+ importName: string;
}
export interface IAddDenpend {
(classPath: string): Promise<IDependItem>;
@@ -150,7 +150,7 @@ export interface IJClass {
isInterface: boolean;
isAbstract?: boolean;
methods: IJMethod;
- privateFields:string[];//私有变量
+ privateFields: string[]; //私有变量
typeParams: ITypeParam[];
values?: string[] | number[]; //枚举类型首个值;
name: typePath;
diff --git a/packages/interpret-cli/src/util/__tests__/type-parse-test.ts b/packages/interpret-cli/src/util/__tests__/type-parse-test.ts
index e91a727..5636fc8 100644
--- a/packages/interpret-cli/src/util/__tests__/type-parse-test.ts
+++ b/packages/interpret-cli/src/util/__tests__/type-parse-test.ts
@@ -14,18 +14,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-import {jType2Ts} from '../type-parse';
import {TypeInfoI} from '../../typings';
+import {jType2Ts} from '../type-parse';
let beans = ['com.qianmi.gavin.comm.Phone'];
let typeInfo: Map<string, TypeInfoI> = new Map();
-typeInfo.set('com.qianmi.gavin.comm.Phone',{
- classPath:"com.qianmi.gavin.comm.Phone",
- packagePath:"com.qianmi.gavin.comm",
- className:"Phone",
- isProvider:false,
+typeInfo.set('com.qianmi.gavin.comm.Phone', {
+ classPath: 'com.qianmi.gavin.comm.Phone',
+ packagePath: 'com.qianmi.gavin.comm',
+ className: 'Phone',
+ isProvider: false,
isClass: false,
- isEnum: true
+ isEnum: true,
});
describe('基本类型转换', () => {
@@ -36,9 +36,9 @@ describe('基本类型转换', () => {
addDenpend: async (classPath: string) => {
let _typeInfo = typeInfo.get(classPath);
return {
- classPath:_typeInfo.classPath,
- name:_typeInfo.className,
- importName:_typeInfo.className,
+ classPath: _typeInfo.classPath,
+ name: _typeInfo.className,
+ importName: _typeInfo.className,
};
},
hasAst: (classPath: string) => {
@@ -61,17 +61,19 @@ describe('基本类型转换', () => {
},
};
- it('枚举Enum<Phone>类型转换',async()=>{
+ it('枚举Enum<Phone>类型转换', async () => {
let type = await jType2Ts(
{
- "name":"java.lang.Enum",
- "typeArgs":[{
- "isWildcard":false,
- "type":{
- "name":"com.qianmi.gavin.comm.Phone",
- "typeArgs":[]
- }
- }]
+ name: 'java.lang.Enum',
+ typeArgs: [
+ {
+ isWildcard: false,
+ type: {
+ name: 'com.qianmi.gavin.comm.Phone',
+ typeArgs: [],
+ },
+ },
+ ],
},
typeOptions,
);
@@ -130,6 +132,5 @@ describe('基本类型转换', () => {
});
describe('数组类型转换', () => {
- it('基本数据类型转换', async () => {
- });
+ it('基本数据类型转换', async () => {});
});
diff --git a/packages/interpret-cli/src/util/type-parse.ts b/packages/interpret-cli/src/util/type-parse.ts
index 95a1840..da41f29 100644
--- a/packages/interpret-cli/src/util/type-parse.ts
+++ b/packages/interpret-cli/src/util/type-parse.ts
@@ -83,15 +83,15 @@ export async function jType2Ts(
} else if (typePropers.isArray) {
let subType = await jType2Ts(typePropers.elementType, typeOptions);
return `${subType}[]`;
- }else if(typePropers.name==='java.lang.Enum') {
+ } else if (typePropers.name === 'java.lang.Enum') {
//枚举类型处理
- let enumClassPath =typePropers.typeArgs[0].type.name;
- return classPath2TypeName(enumClassPath, typeOptions)
+ let enumClassPath = typePropers.typeArgs[0].type.name;
+ return classPath2TypeName(enumClassPath, typeOptions);
} else if (
typePropers.name === 'java.util.Map' &&
typePropers.typeArgs.length === 0
) {
- return 'any';//直接返回any
+ return 'any'; //直接返回any
} else if (typePropers.typeArgs && typePropers.typeArgs.length > 0) {
//泛型处理
let type = await classPath2TypeName(typePropers.name, typeOptions);
@@ -113,7 +113,7 @@ export async function jType2Ts(
result = type
.replace('${nameType}', nameType)
.replace('${value}', valueType);
- } else if(type === 'any') {
+ } else if (type === 'any') {
return 'any';
} else {
let subTypes = [];
@@ -158,14 +158,14 @@ export async function classPath2TypeName(
return result;
} else if (typeOptions.hasAst(classPath)) {
let denpendItem = await typeOptions.addDenpend(classPath);
- if(denpendItem){
+ if (denpendItem) {
return denpendItem.importName;
- }else{
- console.warn('warning: not find class Type for :'+classPath);
- return "any";
+ } else {
+ console.warn('warning: not find class Type for :' + classPath);
+ return 'any';
}
} else {
- return "any";
+ return 'any';
// throw new Error(`未找到类${classPath},在typescript中的信息; `);
}
}
diff --git a/packages/zone-context/Makefile b/packages/zone-context/Makefile
index 8a00054..1454829 100644
--- a/packages/zone-context/Makefile
+++ b/packages/zone-context/Makefile
@@ -1,3 +1,19 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
tsc = ../../node_modules/.bin/tsc
jest = ../../node_modules/.bin/jest
diff --git a/packages/zone-context/src/__tests__/index-test.ts b/packages/zone-context/src/__tests__/index-test.ts
index b58dddf..15b4100 100644
--- a/packages/zone-context/src/__tests__/index-test.ts
+++ b/packages/zone-context/src/__tests__/index-test.ts
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
import zone from '../index';
it('test zone context', () => {
diff --git a/packages/zone-context/src/index.ts b/packages/zone-context/src/index.ts
index ec4389f..3581eed 100644
--- a/packages/zone-context/src/index.ts
+++ b/packages/zone-context/src/index.ts
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
import async_hooks from 'async_hooks';
import debug from 'debug';
const log = debug('dubbo:zone');