Skip to content

Validate code format when building on travis #767

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
velo merged 2 commits into from
Aug 13, 2018
Merged

Validate code format when building on travis #767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ba87a7
Validate code format when building on travis
velo Aug 13, 2018
fbfd3ce
Fix code format
velo Aug 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions jaxb/src/test/java/feign/jaxb/JAXBCodecTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,10 +123,10 @@ public void encodesXmlWithCustomJAXBNoNamespaceSchemaLocation() throws Exception

assertThat(template)
.hasBody(
"<?xml version=\"1.0\" encoding=\"UTF-8\" " +
"standalone=\"yes\"?><mockObject xsi:noNamespaceSchemaLocation=\"http://apihost/schema.xsd\" " +
"xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">" +
"<value>Test</value></mockObject>");
"<?xml version=\"1.0\" encoding=\"UTF-8\" "
+ "standalone=\"yes\"?><mockObject xsi:noNamespaceSchemaLocation=\"http://apihost/schema.xsd\" "
+ "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">"
+ "<value>Test</value></mockObject>");
}

@Test
Expand Down Expand Up @@ -180,9 +180,9 @@ public void decodesXml() throws Exception {
public void doesntDecodeParameterizedTypes() throws Exception {
thrown.expect(feign.codec.DecodeException.class);
thrown.expectMessage(
"java.util.Map is an interface, and JAXB can't handle interfaces.\n"+
"\tthis problem is related to the following location:\n"+
"\t\tat java.util.Map");
"java.util.Map is an interface, and JAXB can't handle interfaces.\n"
+ "\tthis problem is related to the following location:\n"
+ "\t\tat java.util.Map");

class ParameterizedHolder {

Expand Down
33 changes: 33 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,6 +472,39 @@
<module>jaxb</module>
</modules>
</profile>

<profile>
<id>validateCodeFormat</id>
<activation>
<property>
<name>validateFormat</name>
</property>
</activation>

<build>
<plugins>
<plugin>
<groupId>com.marvinformatics.formatter</groupId>
<artifactId>formatter-maven-plugin</artifactId>
<version>2.2.0</version>
<configuration>
<lineEnding>LF</lineEnding>
<configFile>${main.basedir}/src/config/eclipse-java-style.xml</configFile>
</configuration>
<executions>
<execution>
<id>validate-only</id>
<goals>
<goal>validate</goal>
</goals>
<phase>initialize</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>

<profile>
<id>release</id>
<build>
Expand Down
2 changes: 1 addition & 1 deletion travis/publish.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ if ! is_pull_request && build_started_by_tag; then
fi

# skip license on travis due to #1512
./mvnw install -nsu -Dlicense.skip=true
./mvnw install -nsu -Dlicense.skip=true -DvalidateFormat

# If we are on a pull request, our only job is to run tests, which happened above via ./mvnw install
if is_pull_request; then
Expand Down