fix CI and checkstyle issues

opencadc · Apr 19, 2024 · a5fc47d · a5fc47d
1 parent 6bcee3d
commit a5fc47d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 20 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -22,8 +22,9 @@ jobs:
     - name: build and test cadc-vosi
       run: cd cadc-vosi && ../gradlew --info clean build javadoc checkstyleMain install
 
-    - name: build and test cadc-registry-server
-      run: cd cadc-registry-server && ../gradlew --info clean build javadoc checkstyleMain install
-
     - name: build and test cadc-test-vosi
-      run: cd cadc-test-vosi && ../gradlew --info clean build javadoc install
+      run: cd cadc-test-vosi && ../gradlew --info clean build javadoc checkstyleMain install
+
+    - name: build reg
+      run: cd reg && ../gradlew --info clean build compileIntTest javadoc checkstyleMain
+
diff --git a/cadc-test-vosi/src/main/java/ca/nrc/cadc/vosi/AvailabilityTest.java b/cadc-test-vosi/src/main/java/ca/nrc/cadc/vosi/AvailabilityTest.java
@@ -3,7 +3,7 @@
  *******************  CANADIAN ASTRONOMY DATA CENTRE  *******************
  **************  CENTRE CANADIEN DE DONNÉES ASTRONOMIQUES  **************
  *
- *  (c) 2019.                            (c) 2019.
+ *  (c) 2024.                            (c) 2024.
  *  Government of Canada                 Gouvernement du Canada
  *  National Research Council            Conseil national de recherches
  *  Ottawa, Canada, K1A 0R6              Ottawa, Canada, K1A 0R6
@@ -70,31 +70,21 @@
 package ca.nrc.cadc.vosi;
 
 import ca.nrc.cadc.auth.AuthMethod;
-import ca.nrc.cadc.net.HttpDownload;
 import ca.nrc.cadc.reg.Standards;
 import ca.nrc.cadc.reg.client.RegistryClient;
 import ca.nrc.cadc.util.Log4jInit;
 import ca.nrc.cadc.vosi.avail.CheckWebService;
-import ca.nrc.cadc.xml.XmlUtil;
+import java.net.URI;
+import java.net.URL;
+import java.util.List;
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 import org.jdom2.Content;
-import org.jdom2.Document;
 import org.jdom2.Element;
 import org.jdom2.filter.ContentFilter;
 import org.junit.Assert;
 import org.junit.Test;
 
-import java.io.ByteArrayOutputStream;
-import java.net.HttpURLConnection;
-import java.net.URI;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.List;
-
-import javax.servlet.http.HttpServletResponse;
-
-
 /**
  * Tests the availability of a service.
  */
@@ -172,8 +162,8 @@ boolean hasClientIPComment(final Element element) throws Exception {
             @Override
             public Content filter(final Object obj) {
                 final Content c = super.filter(obj);
-                return ((c != null) && (c.getValue().indexOf("</clientip>") > -1) &&
-                        (c.getValue().indexOf("</clientip>") > c.getValue().indexOf("<clientip>"))) ?  c : null;
+                return ((c != null) && (c.getValue().indexOf("</clientip>") > -1) 
+                        && (c.getValue().indexOf("</clientip>") > c.getValue().indexOf("<clientip>"))) ?  c : null;
             }
         });