Merge pull request #748 from mysqto:master

mysqto · chickenlj · commit 8c1cf5890283 · 2017-10-21T10:07:56.000-05:00
Fix typo implemention -&gt; implementation
diff --git a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/AbstractInterfaceConfig.java b/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/AbstractInterfaceConfig.java
@@ -272,23 +272,23 @@ protected void checkStubAndMock(Class<?> interfaceClass) {
         if (ConfigUtils.isNotEmpty(local)) {
             Class<?> localClass = ConfigUtils.isDefault(local) ? ReflectUtils.forName(interfaceClass.getName() + "Local") : ReflectUtils.forName(local);
             if (!interfaceClass.isAssignableFrom(localClass)) {
-                throw new IllegalStateException("The local implemention class " + localClass.getName() + " not implement interface " + interfaceClass.getName());
+                throw new IllegalStateException("The local implementation class " + localClass.getName() + " not implement interface " + interfaceClass.getName());
             }
             try {
                 ReflectUtils.findConstructor(localClass, interfaceClass);
             } catch (NoSuchMethodException e) {
-                throw new IllegalStateException("No such constructor \"public " + localClass.getSimpleName() + "(" + interfaceClass.getName() + ")\" in local implemention class " + localClass.getName());
+                throw new IllegalStateException("No such constructor \"public " + localClass.getSimpleName() + "(" + interfaceClass.getName() + ")\" in local implementation class " + localClass.getName());
             }
         }
         if (ConfigUtils.isNotEmpty(stub)) {
             Class<?> localClass = ConfigUtils.isDefault(stub) ? ReflectUtils.forName(interfaceClass.getName() + "Stub") : ReflectUtils.forName(stub);
             if (!interfaceClass.isAssignableFrom(localClass)) {
-                throw new IllegalStateException("The local implemention class " + localClass.getName() + " not implement interface " + interfaceClass.getName());
+                throw new IllegalStateException("The local implementation class " + localClass.getName() + " not implement interface " + interfaceClass.getName());
             }
             try {
                 ReflectUtils.findConstructor(localClass, interfaceClass);
             } catch (NoSuchMethodException e) {
-                throw new IllegalStateException("No such constructor \"public " + localClass.getSimpleName() + "(" + interfaceClass.getName() + ")\" in local implemention class " + localClass.getName());
+                throw new IllegalStateException("No such constructor \"public " + localClass.getSimpleName() + "(" + interfaceClass.getName() + ")\" in local implementation class " + localClass.getName());
             }
         }
         if (ConfigUtils.isNotEmpty(mock)) {
@@ -302,12 +302,12 @@ protected void checkStubAndMock(Class<?> interfaceClass) {
             } else {
                 Class<?> mockClass = ConfigUtils.isDefault(mock) ? ReflectUtils.forName(interfaceClass.getName() + "Mock") : ReflectUtils.forName(mock);
                 if (!interfaceClass.isAssignableFrom(mockClass)) {
-                    throw new IllegalStateException("The mock implemention class " + mockClass.getName() + " not implement interface " + interfaceClass.getName());
+                    throw new IllegalStateException("The mock implementation class " + mockClass.getName() + " not implement interface " + interfaceClass.getName());
                 }
                 try {
                     mockClass.getConstructor(new Class<?>[0]);
                 } catch (NoSuchMethodException e) {
-                    throw new IllegalStateException("No such empty constructor \"public " + mockClass.getSimpleName() + "()\" in mock implemention class " + mockClass.getName());
+                    throw new IllegalStateException("No such empty constructor \"public " + mockClass.getSimpleName() + "()\" in mock implementation class " + mockClass.getName());
                 }
             }
         }
diff --git a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ServiceConfig.java b/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ServiceConfig.java
@@ -279,7 +279,7 @@ protected synchronized void doExport() {
                 throw new IllegalStateException(e.getMessage(), e);
             }
             if (!interfaceClass.isAssignableFrom(localClass)) {
-                throw new IllegalStateException("The local implemention class " + localClass.getName() + " not implement interface " + interfaceName);
+                throw new IllegalStateException("The local implementation class " + localClass.getName() + " not implement interface " + interfaceName);
             }
         }
         if (stub != null) {
@@ -293,7 +293,7 @@ protected synchronized void doExport() {
                 throw new IllegalStateException(e.getMessage(), e);
             }
             if (!interfaceClass.isAssignableFrom(stubClass)) {
-                throw new IllegalStateException("The stub implemention class " + stubClass.getName() + " not implement interface " + interfaceName);
+                throw new IllegalStateException("The stub implementation class " + stubClass.getName() + " not implement interface " + interfaceName);
             }
         }
         checkApplication();
diff --git a/dubbo-config/dubbo-config-spring/src/main/resources/META-INF/dubbo.xsd b/dubbo-config/dubbo-config-spring/src/main/resources/META-INF/dubbo.xsd
@@ -53,7 +53,7 @@
         </xsd:attribute>
         <xsd:attribute name="mock" type="xsd:string" use="optional">
             <xsd:annotation>
-                <xsd:documentation><![CDATA[ Use service mock implemention. ]]></xsd:documentation>
+                <xsd:documentation><![CDATA[ Use service mock implementation. ]]></xsd:documentation>
             </xsd:annotation>
         </xsd:attribute>
         <xsd:attribute name="merger" type="xsd:string" use="optional">
@@ -83,12 +83,12 @@
                 </xsd:attribute>
                 <xsd:attribute name="local" type="xsd:string" use="optional">
                     <xsd:annotation>
-                        <xsd:documentation><![CDATA[ Use service local implemention. ]]></xsd:documentation>
+                        <xsd:documentation><![CDATA[ Use service local implementation. ]]></xsd:documentation>
                     </xsd:annotation>
                 </xsd:attribute>
                 <xsd:attribute name="stub" type="xsd:string" use="optional">
                     <xsd:annotation>
-                        <xsd:documentation><![CDATA[ Use service local implemention. ]]></xsd:documentation>
+                        <xsd:documentation><![CDATA[ Use service local implementation. ]]></xsd:documentation>
                     </xsd:annotation>
                 </xsd:attribute>
                 <xsd:attribute name="proxy" type="xsd:string" use="optional">
diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/proxy/wrapper/StubProxyFactoryWrapper.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/proxy/wrapper/StubProxyFactoryWrapper.java
@@ -72,7 +72,7 @@ public <T> T getProxy(Invoker<T> invoker) throws RpcException {
                 try {
                     Class<?> stubClass = ReflectUtils.forName(stub);
                     if (!serviceType.isAssignableFrom(stubClass)) {
-                        throw new IllegalStateException("The stub implemention class " + stubClass.getName() + " not implement interface " + serviceType.getName());
+                        throw new IllegalStateException("The stub implementation class " + stubClass.getName() + " not implement interface " + serviceType.getName());
                     }
                     try {
                         Constructor<?> constructor = ReflectUtils.findConstructor(stubClass, serviceType);
@@ -89,10 +89,10 @@ public <T> T getProxy(Invoker<T> invoker) throws RpcException {
                             }
                         }
                     } catch (NoSuchMethodException e) {
-                        throw new IllegalStateException("No such constructor \"public " + stubClass.getSimpleName() + "(" + serviceType.getName() + ")\" in stub implemention class " + stubClass.getName(), e);
+                        throw new IllegalStateException("No such constructor \"public " + stubClass.getSimpleName() + "(" + serviceType.getName() + ")\" in stub implementation class " + stubClass.getName(), e);
                     }
                 } catch (Throwable t) {
-                    LOGGER.error("Failed to create stub implemention class " + stub + " in consumer " + NetUtils.getLocalHost() + " use dubbo version " + Version.getVersion() + ", cause: " + t.getMessage(), t);
+                    LOGGER.error("Failed to create stub implementation class " + stub + " in consumer " + NetUtils.getLocalHost() + " use dubbo version " + Version.getVersion() + ", cause: " + t.getMessage(), t);
                     // ignore
                 }
             }
diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/support/MockInvoker.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/support/MockInvoker.java
@@ -127,7 +127,7 @@ public Result invoke(Invocation invocation) throws RpcException {
                 Invoker<T> invoker = getInvoker(mock);
                 return invoker.invoke(invocation);
             } catch (Throwable t) {
-                throw new RpcException("Failed to create mock implemention class " + mock, t);
+                throw new RpcException("Failed to create mock implementation class " + mock, t);
             }
         }
     }
@@ -166,11 +166,11 @@ private Invoker<T> getInvoker(String mockService) {
 
             Class<?> mockClass = ReflectUtils.forName(mockService);
             if (!serviceType.isAssignableFrom(mockClass)) {
-                throw new IllegalArgumentException("The mock implemention class " + mockClass.getName() + " not implement interface " + serviceType.getName());
+                throw new IllegalArgumentException("The mock implementation class " + mockClass.getName() + " not implement interface " + serviceType.getName());
             }
 
             if (!serviceType.isAssignableFrom(mockClass)) {
-                throw new IllegalArgumentException("The mock implemention class " + mockClass.getName() + " not implement interface " + serviceType.getName());
+                throw new IllegalArgumentException("The mock implementation class " + mockClass.getName() + " not implement interface " + serviceType.getName());
             }
             try {
                 T mockObject = (T) mockClass.newInstance();
@@ -180,7 +180,7 @@ private Invoker<T> getInvoker(String mockService) {
                 }
                 return invoker;
             } catch (InstantiationException e) {
-                throw new IllegalStateException("No such empty constructor \"public " + mockClass.getSimpleName() + "()\" in mock implemention class " + mockClass.getName(), e);
+                throw new IllegalStateException("No such empty constructor \"public " + mockClass.getSimpleName() + "()\" in mock implementation class " + mockClass.getName(), e);
             } catch (IllegalAccessException e) {
                 throw new IllegalStateException(e);
             }

Original file line number	Diff line number	Diff line change
`@@ -272,23 +272,23 @@ protected void checkStubAndMock(Class<?> interfaceClass) {`
`272`	`272`	`if (ConfigUtils.isNotEmpty(local)) {`
`273`	`273`	`Class<?> localClass = ConfigUtils.isDefault(local) ? ReflectUtils.forName(interfaceClass.getName() + "Local") : ReflectUtils.forName(local);`
`274`	`274`	`if (!interfaceClass.isAssignableFrom(localClass)) {`
`275`		`- throw new IllegalStateException("The local implemention class " + localClass.getName() + " not implement interface " + interfaceClass.getName());`
	`275`	`+ throw new IllegalStateException("The local implementation class " + localClass.getName() + " not implement interface " + interfaceClass.getName());`
`276`	`276`	`}`
`277`	`277`	`try {`
`278`	`278`	`ReflectUtils.findConstructor(localClass, interfaceClass);`
`279`	`279`	`} catch (NoSuchMethodException e) {`
`280`		`- throw new IllegalStateException("No such constructor \"public " + localClass.getSimpleName() + "(" + interfaceClass.getName() + ")\" in local implemention class " + localClass.getName());`
	`280`	`+ throw new IllegalStateException("No such constructor \"public " + localClass.getSimpleName() + "(" + interfaceClass.getName() + ")\" in local implementation class " + localClass.getName());`
`281`	`281`	`}`
`282`	`282`	`}`
`283`	`283`	`if (ConfigUtils.isNotEmpty(stub)) {`
`284`	`284`	`Class<?> localClass = ConfigUtils.isDefault(stub) ? ReflectUtils.forName(interfaceClass.getName() + "Stub") : ReflectUtils.forName(stub);`
`285`	`285`	`if (!interfaceClass.isAssignableFrom(localClass)) {`
`286`		`- throw new IllegalStateException("The local implemention class " + localClass.getName() + " not implement interface " + interfaceClass.getName());`
	`286`	`+ throw new IllegalStateException("The local implementation class " + localClass.getName() + " not implement interface " + interfaceClass.getName());`
`287`	`287`	`}`
`288`	`288`	`try {`
`289`	`289`	`ReflectUtils.findConstructor(localClass, interfaceClass);`
`290`	`290`	`} catch (NoSuchMethodException e) {`
`291`		`- throw new IllegalStateException("No such constructor \"public " + localClass.getSimpleName() + "(" + interfaceClass.getName() + ")\" in local implemention class " + localClass.getName());`
	`291`	`+ throw new IllegalStateException("No such constructor \"public " + localClass.getSimpleName() + "(" + interfaceClass.getName() + ")\" in local implementation class " + localClass.getName());`
`292`	`292`	`}`
`293`	`293`	`}`
`294`	`294`	`if (ConfigUtils.isNotEmpty(mock)) {`
`@@ -302,12 +302,12 @@ protected void checkStubAndMock(Class<?> interfaceClass) {`
`302`	`302`	`} else {`
`303`	`303`	`Class<?> mockClass = ConfigUtils.isDefault(mock) ? ReflectUtils.forName(interfaceClass.getName() + "Mock") : ReflectUtils.forName(mock);`
`304`	`304`	`if (!interfaceClass.isAssignableFrom(mockClass)) {`
`305`		`- throw new IllegalStateException("The mock implemention class " + mockClass.getName() + " not implement interface " + interfaceClass.getName());`
	`305`	`+ throw new IllegalStateException("The mock implementation class " + mockClass.getName() + " not implement interface " + interfaceClass.getName());`
`306`	`306`	`}`
`307`	`307`	`try {`
`308`	`308`	`mockClass.getConstructor(new Class<?>[0]);`
`309`	`309`	`} catch (NoSuchMethodException e) {`
`310`		`- throw new IllegalStateException("No such empty constructor \"public " + mockClass.getSimpleName() + "()\" in mock implemention class " + mockClass.getName());`
	`310`	`+ throw new IllegalStateException("No such empty constructor \"public " + mockClass.getSimpleName() + "()\" in mock implementation class " + mockClass.getName());`
`311`	`311`	`}`
`312`	`312`	`}`
`313`	`313`	`}`
Original file line number	Diff line number	Diff line change
`@@ -279,7 +279,7 @@ protected synchronized void doExport() {`
`279`	`279`	`throw new IllegalStateException(e.getMessage(), e);`
`280`	`280`	`}`
`281`	`281`	`if (!interfaceClass.isAssignableFrom(localClass)) {`
`282`		`- throw new IllegalStateException("The local implemention class " + localClass.getName() + " not implement interface " + interfaceName);`
	`282`	`+ throw new IllegalStateException("The local implementation class " + localClass.getName() + " not implement interface " + interfaceName);`
`283`	`283`	`}`
`284`	`284`	`}`
`285`	`285`	`if (stub != null) {`
`@@ -293,7 +293,7 @@ protected synchronized void doExport() {`
`293`	`293`	`throw new IllegalStateException(e.getMessage(), e);`
`294`	`294`	`}`
`295`	`295`	`if (!interfaceClass.isAssignableFrom(stubClass)) {`
`296`		`- throw new IllegalStateException("The stub implemention class " + stubClass.getName() + " not implement interface " + interfaceName);`
	`296`	`+ throw new IllegalStateException("The stub implementation class " + stubClass.getName() + " not implement interface " + interfaceName);`
`297`	`297`	`}`
`298`	`298`	`}`
`299`	`299`	`checkApplication();`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public <T> T getProxy(Invoker<T> invoker) throws RpcException {`
`72`	`72`	`try {`
`73`	`73`	`Class<?> stubClass = ReflectUtils.forName(stub);`
`74`	`74`	`if (!serviceType.isAssignableFrom(stubClass)) {`
`75`		`- throw new IllegalStateException("The stub implemention class " + stubClass.getName() + " not implement interface " + serviceType.getName());`
	`75`	`+ throw new IllegalStateException("The stub implementation class " + stubClass.getName() + " not implement interface " + serviceType.getName());`
`76`	`76`	`}`
`77`	`77`	`try {`
`78`	`78`	`Constructor<?> constructor = ReflectUtils.findConstructor(stubClass, serviceType);`
`@@ -89,10 +89,10 @@ public <T> T getProxy(Invoker<T> invoker) throws RpcException {`
`89`	`89`	`}`
`90`	`90`	`}`
`91`	`91`	`} catch (NoSuchMethodException e) {`
`92`		`- throw new IllegalStateException("No such constructor \"public " + stubClass.getSimpleName() + "(" + serviceType.getName() + ")\" in stub implemention class " + stubClass.getName(), e);`
	`92`	`+ throw new IllegalStateException("No such constructor \"public " + stubClass.getSimpleName() + "(" + serviceType.getName() + ")\" in stub implementation class " + stubClass.getName(), e);`
`93`	`93`	`}`
`94`	`94`	`} catch (Throwable t) {`
`95`		`- LOGGER.error("Failed to create stub implemention class " + stub + " in consumer " + NetUtils.getLocalHost() + " use dubbo version " + Version.getVersion() + ", cause: " + t.getMessage(), t);`
	`95`	`+ LOGGER.error("Failed to create stub implementation class " + stub + " in consumer " + NetUtils.getLocalHost() + " use dubbo version " + Version.getVersion() + ", cause: " + t.getMessage(), t);`
`96`	`96`	`// ignore`
`97`	`97`	`}`
`98`	`98`	`}`
Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ public Result invoke(Invocation invocation) throws RpcException {`
`127`	`127`	`Invoker<T> invoker = getInvoker(mock);`
`128`	`128`	`return invoker.invoke(invocation);`
`129`	`129`	`} catch (Throwable t) {`
`130`		`- throw new RpcException("Failed to create mock implemention class " + mock, t);`
	`130`	`+ throw new RpcException("Failed to create mock implementation class " + mock, t);`
`131`	`131`	`}`
`132`	`132`	`}`
`133`	`133`	`}`
`@@ -166,11 +166,11 @@ private Invoker<T> getInvoker(String mockService) {`
`166`	`166`
`167`	`167`	`Class<?> mockClass = ReflectUtils.forName(mockService);`
`168`	`168`	`if (!serviceType.isAssignableFrom(mockClass)) {`
`169`		`- throw new IllegalArgumentException("The mock implemention class " + mockClass.getName() + " not implement interface " + serviceType.getName());`
	`169`	`+ throw new IllegalArgumentException("The mock implementation class " + mockClass.getName() + " not implement interface " + serviceType.getName());`
`170`	`170`	`}`
`171`	`171`
`172`	`172`	`if (!serviceType.isAssignableFrom(mockClass)) {`
`173`		`- throw new IllegalArgumentException("The mock implemention class " + mockClass.getName() + " not implement interface " + serviceType.getName());`
	`173`	`+ throw new IllegalArgumentException("The mock implementation class " + mockClass.getName() + " not implement interface " + serviceType.getName());`
`174`	`174`	`}`
`175`	`175`	`try {`
`176`	`176`	`T mockObject = (T) mockClass.newInstance();`
`@@ -180,7 +180,7 @@ private Invoker<T> getInvoker(String mockService) {`
`180`	`180`	`}`
`181`	`181`	`return invoker;`
`182`	`182`	`} catch (InstantiationException e) {`
`183`		`- throw new IllegalStateException("No such empty constructor \"public " + mockClass.getSimpleName() + "()\" in mock implemention class " + mockClass.getName(), e);`
	`183`	`+ throw new IllegalStateException("No such empty constructor \"public " + mockClass.getSimpleName() + "()\" in mock implementation class " + mockClass.getName(), e);`
`184`	`184`	`} catch (IllegalAccessException e) {`
`185`	`185`	`throw new IllegalStateException(e);`
`186`	`186`	`}`