From 673a3d627245900a3a124f446e335beefece65dc Mon Sep 17 00:00:00 2001 From: jamesagnew Date: Fri, 30 Mar 2018 08:54:04 -0400 Subject: [PATCH] Bump to JDK8 --- .travis.yml | 2 +- hapi-deployable-pom/pom.xml | 2 +- .../fhir/jpa/dao/r4/FhirSystemDaoR4Test.java | 14 +++++++------- .../interceptor/PublicSecurityInterceptor.java | 18 +++++++++++------- pom.xml | 7 ++++++- 5 files changed, 26 insertions(+), 17 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5d6fca80e68..f9bc7cd8dc9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,5 +25,5 @@ before_script: script: # - mvn -e -B clean install && cd hapi-fhir-ra && mvn -e -B -DTRAVIS_JOB_ID=$TRAVIS_JOB_ID clean test jacoco:report coveralls:report # - mvn -Dci=true -e -B -P ALLMODULES,NOPARALLEL,ERRORPRONE clean install && cd hapi-fhir-jacoco && mvn -e -B -DTRAVIS_JOB_ID=$TRAVIS_JOB_ID jacoco:report coveralls:report - - mvn -Dci=true -e -B -P ALLMODULES,REDUCED_JPA_TESTS,ERRORPRONE_JDK8 clean install && cd hapi-fhir-jacoco && mvn -e -B -DTRAVIS_JOB_ID=$TRAVIS_JOB_ID jacoco:report coveralls:report + - mvn -Dci=true -e -B -P ALLMODULES,REDUCED_JPA_TESTS,ERRORPRONE_JDK8,JACOCO clean install && cd hapi-fhir-jacoco && mvn -e -B -DTRAVIS_JOB_ID=$TRAVIS_JOB_ID jacoco:report coveralls:report diff --git a/hapi-deployable-pom/pom.xml b/hapi-deployable-pom/pom.xml index 60ce4025799..df1e133619a 100644 --- a/hapi-deployable-pom/pom.xml +++ b/hapi-deployable-pom/pom.xml @@ -32,7 +32,7 @@ org.codehaus.mojo.signature - java17 + java18 1.0 diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirSystemDaoR4Test.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirSystemDaoR4Test.java index 44417070cb7..ef9da79462d 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirSystemDaoR4Test.java +++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirSystemDaoR4Test.java @@ -1129,7 +1129,7 @@ public class FhirSystemDaoR4Test extends BaseJpaR4SystemTest { } @Test - public void testTransactionCreateWithLinks() throws IOException { + public void testTransactionCreateWithLinks() { Bundle request = new Bundle(); request.setType(BundleType.TRANSACTION); @@ -1492,7 +1492,7 @@ public class FhirSystemDaoR4Test extends BaseJpaR4SystemTest { } @Test - public void testTransactionDoesNotLeavePlaceholderIds() throws Exception { + public void testTransactionDoesNotLeavePlaceholderIds() { String input; try { input = IOUtils.toString(getClass().getResourceAsStream("/cdr-bundle.json"), StandardCharsets.UTF_8); @@ -1515,7 +1515,7 @@ public class FhirSystemDaoR4Test extends BaseJpaR4SystemTest { } @Test - public void testTransactionDoesntDoubleCreate() throws IOException { + public void testTransactionDoesntDoubleCreate() { Bundle output, input; BundleEntryResponseComponent respEntry; IdType createdId; @@ -2051,7 +2051,7 @@ public class FhirSystemDaoR4Test extends BaseJpaR4SystemTest { assertThat(nextEntry.getResponse().getLocation(), not(containsString("test"))); assertEquals(id.toVersionless(), p.getIdElement().toVersionless()); assertNotEquals(id, p.getId()); - assertThat(p.getId().toString(), endsWith("/_history/2")); + assertThat(p.getId(), endsWith("/_history/2")); nextEntry = resp.getEntry().get(0); assertEquals(Constants.STATUS_HTTP_200_OK + " OK", nextEntry.getResponse().getStatus()); @@ -2177,7 +2177,7 @@ public class FhirSystemDaoR4Test extends BaseJpaR4SystemTest { } @Test - public void testTransactionWIthInvalidPlaceholder() throws Exception { + public void testTransactionWIthInvalidPlaceholder() { Bundle res = new Bundle(); res.setType(BundleType.TRANSACTION); @@ -2875,7 +2875,7 @@ public class FhirSystemDaoR4Test extends BaseJpaR4SystemTest { } @Test - public void testTransactionWithRelativeOidIds() throws Exception { + public void testTransactionWithRelativeOidIds() { Bundle res = new Bundle(); res.setType(BundleType.TRANSACTION); @@ -3018,7 +3018,7 @@ public class FhirSystemDaoR4Test extends BaseJpaR4SystemTest { * This is not the correct way to do it, but we'll allow it to be lenient */ @Test - public void testTransactionWithRelativeOidIdsQualified() throws Exception { + public void testTransactionWithRelativeOidIdsQualified() { Bundle res = new Bundle(); res.setType(BundleType.TRANSACTION); diff --git a/hapi-fhir-jpaserver-uhnfhirtest/src/main/java/ca/uhn/fhirtest/interceptor/PublicSecurityInterceptor.java b/hapi-fhir-jpaserver-uhnfhirtest/src/main/java/ca/uhn/fhirtest/interceptor/PublicSecurityInterceptor.java index f3011982d53..9e7ec5170de 100644 --- a/hapi-fhir-jpaserver-uhnfhirtest/src/main/java/ca/uhn/fhirtest/interceptor/PublicSecurityInterceptor.java +++ b/hapi-fhir-jpaserver-uhnfhirtest/src/main/java/ca/uhn/fhirtest/interceptor/PublicSecurityInterceptor.java @@ -1,14 +1,18 @@ package ca.uhn.fhirtest.interceptor; -import static org.apache.commons.lang3.StringUtils.isBlank; - -import java.util.*; - import ca.uhn.fhir.jpa.provider.BaseJpaSystemProvider; -import ca.uhn.fhir.jpa.provider.dstu3.TerminologyUploaderProviderDstu3; +import ca.uhn.fhir.jpa.provider.TerminologyUploaderProvider; import ca.uhn.fhir.rest.api.server.RequestDetails; import ca.uhn.fhir.rest.server.exceptions.ForbiddenOperationException; -import ca.uhn.fhir.rest.server.interceptor.auth.*; +import ca.uhn.fhir.rest.server.interceptor.auth.AuthorizationInterceptor; +import ca.uhn.fhir.rest.server.interceptor.auth.IAuthRule; +import ca.uhn.fhir.rest.server.interceptor.auth.RuleBuilder; + +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; + +import static org.apache.commons.lang3.StringUtils.isBlank; public class PublicSecurityInterceptor extends AuthorizationInterceptor { @@ -30,7 +34,7 @@ public class PublicSecurityInterceptor extends AuthorizationInterceptor { if (isBlank(authHeader)) { return new RuleBuilder() .deny().operation().named(BaseJpaSystemProvider.MARK_ALL_RESOURCES_FOR_REINDEXING).onServer().andThen() - .deny().operation().named(TerminologyUploaderProviderDstu3.UPLOAD_EXTERNAL_CODE_SYSTEM).onServer().andThen() + .deny().operation().named(TerminologyUploaderProvider.UPLOAD_EXTERNAL_CODE_SYSTEM).onServer().andThen() .allowAll() .build(); } diff --git a/pom.xml b/pom.xml index 8f3db4098e4..6064b0c4ba5 100644 --- a/pom.xml +++ b/pom.xml @@ -2020,12 +2020,17 @@ example-projects/hapi-fhir-jpaserver-dynamic tests/hapi-fhir-base-test-mindeps-client tests/hapi-fhir-base-test-mindeps-server - hapi-fhir-jacoco hapi-fhir-igpacks hapi-fhir-spring-boot + + JACOCO + + hapi-fhir-jacoco + + NOPARALLEL