Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
959b30e
commit b6b0201
Showing
154 changed files
with
10,013 additions
and
85 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -22,4 +22,4 @@ logs | |
| .m2 | ||
| sofa-boot-gradle-plugin/build/ | ||
| .gradle | ||
| sofa-boot-gradle-plugin/out/ | ||
| sofa-boot-gradle-plugin/out/ | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,7 +5,6 @@ jdk: | |
| - oraclejdk8 | ||
|
|
||
| install: | ||
|
|
||
| - mvn clean install -DskipTests -B -V | ||
| - mvn test | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
83 changes: 83 additions & 0 deletions
83
...ofa-boot-starter/src/test/java/com/alipay/sofa/infra/config/spring/XsdValidationTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| /* | ||
| * 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. | ||
| */ | ||
| package com.alipay.sofa.infra.config.spring; | ||
|
|
||
| import com.sun.org.apache.xml.internal.utils.DefaultErrorHandler; | ||
| import org.junit.Assert; | ||
| import org.junit.Test; | ||
| import org.springframework.beans.factory.xml.DefaultDocumentLoader; | ||
| import org.springframework.beans.factory.xml.DelegatingEntityResolver; | ||
| import org.springframework.beans.factory.xml.DocumentLoader; | ||
| import org.springframework.util.xml.XmlValidationModeDetector; | ||
| import org.xml.sax.InputSource; | ||
| import org.xml.sax.SAXParseException; | ||
|
|
||
| /** | ||
| * XML validation with rpc.xsd | ||
| * | ||
| * @author <a href="mailto:scienjus@gmail.com">ScienJus</a> | ||
| */ | ||
| public class XsdValidationTest { | ||
|
|
||
| @Test | ||
| public void testSofaParameter() throws Exception { | ||
| loadXml("config/spring/test_sofa_parameter.xml"); | ||
| } | ||
|
|
||
| @Test | ||
| public void testSofaParameterMissingKey() throws Exception { | ||
| try { | ||
| loadXml("config/spring/test_sofa_parameter_missing_key.xml"); | ||
| Assert.fail(); | ||
| } catch (SAXParseException e) { | ||
| // org.xml.sax.SAXParseException; lineNumber: 10; columnNumber: 52; | ||
| // cvc-complex-type.4: Attribute 'key' must appear on element 'sofa:parameter'. | ||
| assertSaxException(10, 52, "cvc-complex-type.4", e); | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| public void testSofaParameterOutsideBinding() throws Exception { | ||
| try { | ||
| loadXml("config/spring/test_sofa_parameter_outside_binding.xml"); | ||
| Assert.fail(); | ||
| } catch (SAXParseException e) { | ||
| // org.xml.sax.SAXParseException; lineNumber: 11; columnNumber: 65; | ||
| // cvc-complex-type.2.4.a: Invalid content was found starting with element 'sofa:parameter'. | ||
| // One of '{"http://sofastack.io/schema/sofaboot":binding.jvm, | ||
| // "http://sofastack.io/schema/sofaboot":binding.rest, | ||
| // "http://sofastack.io/schema/sofaboot":binding.dubbo, | ||
| // "http://sofastack.io/schema/sofaboot":binding.h2c}' is expected. | ||
| assertSaxException(11, 65, "cvc-complex-type.2.4.a", e); | ||
| } | ||
| } | ||
|
|
||
| private void assertSaxException(int expectedLineNumber, int expectedColumnNumber, | ||
| String expectedErrorCode, SAXParseException e) { | ||
| Assert.assertEquals(expectedLineNumber, e.getLineNumber()); | ||
| Assert.assertEquals(expectedColumnNumber, e.getColumnNumber()); | ||
| Assert.assertEquals(expectedErrorCode, e.getMessage().split(":")[0]); | ||
| } | ||
|
|
||
| private void loadXml(String xml) throws Exception { | ||
| DocumentLoader documentLoader = new DefaultDocumentLoader(); | ||
| documentLoader.loadDocument(new InputSource(this.getClass().getClassLoader() | ||
| .getResourceAsStream(xml)), new DelegatingEntityResolver(this.getClass() | ||
| .getClassLoader()), new DefaultErrorHandler(), | ||
| XmlValidationModeDetector.VALIDATION_XSD, true); | ||
| } | ||
| } |
23 changes: 23 additions & 0 deletions
23
infra-sofa-boot-starter/src/test/resources/config/spring/test_sofa_parameter.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <beans xmlns="http://www.springframework.org/schema/beans" | ||
| xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xmlns:sofa="http://sofastack.io/schema/sofaboot" | ||
| xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd | ||
| http://sofastack.io/schema/sofaboot http://sofastack.io/schema/sofaboot.xsd"> | ||
|
|
||
| <sofa:reference id="helloSyncService" interface="com.alipay.sofa.rpc.boot.invoke.HelloSyncService"> | ||
| <sofa:binding.bolt> | ||
| <sofa:parameter key="static_key" value="static_value" /> | ||
| <sofa:parameter key="${dynamic_key}" value="${dynamic_value}" /> | ||
| </sofa:binding.bolt> | ||
| </sofa:reference> | ||
|
|
||
| <sofa:service ref="helloSyncServiceImpl" interface="com.alipay.sofa.rpc.boot.invoke.HelloSyncService"> | ||
| <sofa:binding.rest> | ||
| <sofa:parameter key="static_key" value="static_value"/> | ||
| <sofa:parameter key="${dynamic_key}" value="${dynamic_value}" /> | ||
| </sofa:binding.rest> | ||
| </sofa:service> | ||
|
|
||
| <bean id="helloSyncServiceImpl" class="com.alipay.sofa.rpc.boot.invoke.HelloSyncServiceImpl"/> | ||
| </beans> |
14 changes: 14 additions & 0 deletions
14
infra-sofa-boot-starter/src/test/resources/config/spring/test_sofa_parameter_missing_key.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <beans xmlns="http://www.springframework.org/schema/beans" | ||
| xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xmlns:sofa="http://sofastack.io/schema/sofaboot" | ||
| xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd | ||
| http://sofastack.io/schema/sofaboot http://sofastack.io/schema/sofaboot.xsd"> | ||
|
|
||
| <sofa:reference id="helloSyncService" interface="com.alipay.sofa.rpc.boot.invoke.HelloSyncService"> | ||
| <sofa:binding.bolt> | ||
| <sofa:parameter value="static_value" /> | ||
| </sofa:binding.bolt> | ||
| </sofa:reference> | ||
|
|
||
| </beans> |
Oops, something went wrong.