honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Restore errorprone to the build

This commit is contained in:
jamesagnew 2019-12-15 19:11:27 -05:00
parent e1f2d044ed
commit f2221bcc69
7 changed files with 576 additions and 494 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hapi-fhir-converter/pom.xml
View File

@ -175,6 +175,23 @@
</dependencySourceIncludes> </dependencySourceIncludes>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<configuration>
<dumpOnExit>true</dumpOnExit>
</configuration>
<executions>
<execution>
<id>default-prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins> </plugins>
</build> </build>
</project> </project>

15
hapi-fhir-igpacks/pom.xml
View File

@ -47,6 +47,21 @@
<skip>true</skip> <skip>true</skip>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<configuration>
<dumpOnExit>true</dumpOnExit>
</configuration>
<executions>
<execution>
<id>default-prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins> </plugins>
</build> </build>

22
hapi-fhir-jaxrsserver-base/pom.xml
View File

@ -173,4 +173,26 @@
</plugins> </plugins>
</reporting> </reporting>
<build>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<configuration>
<dumpOnExit>true</dumpOnExit>
</configuration>
<executions>
<execution>
<id>default-prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project> </project>

6
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/SearchFilterParser.java
View File

@ -277,7 +277,7 @@ public class SearchFilterParser {
cursor++; cursor++;
result.setFilter(parseOpen()); result.setFilter(parseOpen());
if (peek() != FilterLexType.fsltCloseSq) { if (peek() != FilterLexType.fsltCloseSq) {
throw new FilterSyntaxException(String.format("Expected ']' at %d but found %c", throw new FilterSyntaxException(String.format("Expected ']' at %d but found %s",
cursor, cursor,
peekCh())); peekCh()));
} }
@ -287,13 +287,13 @@ public class SearchFilterParser {
if (peek() == FilterLexType.fsltDot) { if (peek() == FilterLexType.fsltDot) {
cursor++; cursor++;
if (peek() != FilterLexType.fsltName) { if (peek() != FilterLexType.fsltName) {
throw new FilterSyntaxException(String.format("Unexpected Character %c at %d", throw new FilterSyntaxException(String.format("Unexpected Character %s at %d",
peekCh(), peekCh(),
cursor)); cursor));
} }
result.setNext(parsePath(consumeName())); result.setNext(parsePath(consumeName()));
} else if (result.getFilter() != null) { } else if (result.getFilter() != null) {
throw new FilterSyntaxException(String.format("Expected '.' at %d but found %c", throw new FilterSyntaxException(String.format("Expected '.' at %d but found %s",
cursor, cursor,
peekCh())); peekCh()));
} }

2
hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/server/RestfulServerRule.java
View File

@ -32,7 +32,6 @@ import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.servlet.ServletHandler; import org.eclipse.jetty.servlet.ServletHandler;
import org.eclipse.jetty.servlet.ServletHolder; import org.eclipse.jetty.servlet.ServletHolder;
import org.junit.BeforeClass;
import org.junit.rules.TestRule; import org.junit.rules.TestRule;
import org.junit.runner.Description; import org.junit.runner.Description;
import org.junit.runners.model.Statement; import org.junit.runners.model.Statement;
@ -75,7 +74,6 @@ public class RestfulServerRule implements TestRule {
myHttpClient.close(); myHttpClient.close();
} }
@BeforeClass
private void startServer() throws Exception { private void startServer() throws Exception {
myServer = new Server(0); myServer = new Server(0);

15
hapi-tinder-test/pom.xml
View File

@ -420,6 +420,21 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<configuration>
<dumpOnExit>true</dumpOnExit>
</configuration>
<executions>
<execution>
<id>default-prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins> </plugins>
<pluginManagement> <pluginManagement>
<plugins> <plugins>

15
pom.xml
View File

@ -2262,6 +2262,21 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<configuration>
<dumpOnExit>true</dumpOnExit>
</configuration>
<executions>
<execution>
<id>default-prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins> </plugins>
</build> </build>