Dependency updates

Author: ctmay4

.circleci/config.yml

@@ -0,0 +1,29 @@
+version: 2.0
+jobs:
+  build:
+    docker:
+      - image: circleci/openjdk:8-jdk
+    environment:
+      JVM_OPTS: -Xmx512m
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+            - gradle-{{ checksum "build.gradle" }}
+      - run:
+          name: Run tests
+          command: gradle assemble test
+      - run:
+          name: Save test results
+          command: |
+            mkdir -p ~/junit/
+            find . -type f -regex ".*/build/test-results/.*xml" -exec cp {} ~/junit/ \;
+          when: always
+      - store_test_results:
+          path: ~/junit
+      - store_artifacts:
+          path: ~/junit
+      - save_cache:
+          paths:
+            - ~/.gradle
+          key: gradle-{{ checksum "build.gradle" }}

.travis.yml

@@ -1,5 +1,5 @@
 # seerapi-client-java
-[![Build Status](https://travis-ci.org/imsweb/seerapi-client-java.svg?branch=master)](https://travis-ci.org/imsweb/seerapi-client-java)
+[![CircleCI](https://circleci.com/gh/imsweb/seerapi-client-java.svg?style=svg)](https://circleci.com/gh/imsweb/seerapi-client-java)
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.imsweb/seerapi-client-java/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.imsweb/seerapi-client-java)
 
 A [SEER*API](https://api.seer.cancer.gov) client for Java applications.  This library supports most of the APIs and

README.md

@@ -3,10 +3,9 @@ import org.gradle.internal.jvm.Jvm
 plugins {
     id 'java'
     id 'checkstyle'
-    id 'findbugs'
+    id "com.github.spotbugs" version "1.6.5"
     id 'com.bmuschko.nexus' version '2.3.1'
-    id "io.codearte.nexus-staging" version "0.11.0"
-    id 'net.ossindex.audit' version '0.1.1'
+    id "io.codearte.nexus-staging" version "0.20.0"
 }
 
 group = 'com.imsweb'
@@ -52,18 +51,16 @@ jar {
     }
 }
 
-// checkstyle plugin settings
 checkstyle {
     configFile = file("config/checkstyle/checkstyle.xml")
 }
 
-// findbugs plugin settings
-findbugs {
-    excludeFilter = file("config/findbugs/findbugs-exclude.xml")
+spotbugs {
+    toolVersion = '3.1.8'
+    excludeFilter = file('config/spotbugs/spotbugs-exclude.xml')
 }
-
 wrapper {
-    gradleVersion = '4.10.2'
+    gradleVersion = '5.1.1'
     distributionType = Wrapper.DistributionType.ALL
 }
 

build.gradle

@@ -1,6 +1,5 @@
-#Mon Oct 08 13:02:30 EDT 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip

config/findbugs/findbugs-exclude.xml config/spotbugs/spotbugs-exclude.xmlconfig/findbugs/findbugs-exclude.xml renamed to config/spotbugs/spotbugs-exclude.xml

@@ -23,7 +23,7 @@ public interface MphService {
     /**
      * Uses multiple primary rules to compare two diseases
      * @param pair a pair of diseases
-     * @param matchMode
+     * @param matchMode match mode
      * @return a result indicating whether the two diseases are the same primary
      */
     @POST("mph")

gradle/wrapper/gradle-wrapper.properties

@@ -36,17 +36,12 @@ public void testDiseaseTypeCategory() {
     public void testDiseaseVersions() throws IOException {
         List<DiseaseVersion> versions = _DISEASE.versions().execute().body();
 
-        assertTrue(versions.size() > 0);
-        for (DiseaseVersion version : versions) {
-            assertTrue(version.getName().length() > 0);
-            assertTrue(version.getType().length() > 0);
-            assertNotNull(version.getLastModified());
-            if (version.getName().equals("latest")) {
-                assertNotNull(version.getType());
-                assertNotNull(version.getFirstPublished());
-                assertNotNull(version.getCount());
-            }
-        }
+        assertEquals(1, versions.size());
+        DiseaseVersion version = versions.get(0);
+        assertEquals("latest", version.getName());
+        assertNull(version.getType());  // type not returned when no permisisons
+        assertNotNull(version.getFirstPublished());
+        assertNotNull(version.getCount());
     }
 
     @Test

src/main/java/com/imsweb/seerapi/client/mph/MphService.java

@@ -15,6 +15,10 @@
 import com.imsweb.seerapi.client.SeerApi;
 import com.imsweb.seerapi.client.publishable.PublishableSearch;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
 public class GlossaryTest {
 
     private static GlossaryService _GLOSSARY;
@@ -33,12 +37,12 @@ public void testGlossaryCategory() {
     public void testGlossaryVersions() throws IOException {
         List<GlossaryVersion> versions = _GLOSSARY.versions().execute().body();
 
-        Assert.assertTrue(versions.size() > 0);
-        for (GlossaryVersion version : versions) {
-            Assert.assertTrue(version.getName().length() > 0);
-            Assert.assertTrue(version.getType().length() > 0);
-            Assert.assertNotNull(version.getLastModified());
-        }
+        assertEquals(1, versions.size());
+        GlossaryVersion version = versions.get(0);
+        assertEquals("latest", version.getName());
+        assertNull(version.getType());  // type not returned when no permisisons
+        assertNotNull(version.getFirstPublished());
+        assertNotNull(version.getCount());
     }
 
     @Test

src/test/java/com/imsweb/seerapi/client/disease/DiseaseTest.java

@@ -33,12 +33,12 @@ public static void setup() {
     public void testRxVersions() throws IOException {
         List<RxVersion> versions = _RX.versions().execute().body();
 
-        assertTrue(versions.size() > 0);
-        for (RxVersion version : versions) {
-            assertTrue(version.getName().length() > 0);
-            assertTrue(version.getType().length() > 0);
-            assertNotNull(version.getLastModified());
-        }
+        assertEquals(1, versions.size());
+        RxVersion version = versions.get(0);
+        assertEquals("latest", version.getName());
+        assertNull(version.getType());  // type not returned when no permisisons
+        assertNotNull(version.getFirstPublished());
+        assertNotNull(version.getCount());
     }
 
     @Test