diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index d566e7e2728..33a6e5bec39 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -36,7 +36,7 @@ jobs: - name: Set up jdk uses: actions/setup-java@v3 with: - java-version: '17.0.2' + java-version: '17.0.7' distribution: 'temurin' - name: Set up Maven uses: stCarolas/setup-maven@v4.5 diff --git a/.github/workflows/unit-test-jdk17.yml b/.github/workflows/unit-test-jdk17.yml index ebc920c237a..c66036fd95a 100644 --- a/.github/workflows/unit-test-jdk17.yml +++ b/.github/workflows/unit-test-jdk17.yml @@ -33,7 +33,7 @@ jobs: - name: Set up jdk uses: actions/setup-java@v3 with: - java-version: '17.0.2' + java-version: '17.0.7' distribution: 'temurin' - name: Compilation and Installation run: mvn -B -Dcheckstyle.skip -Dspotbugs.skip=true clean install -Pit diff --git a/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/consumer/MicroserviceVersions.java b/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/consumer/MicroserviceVersions.java index c84925a4783..f769d95cca9 100644 --- a/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/consumer/MicroserviceVersions.java +++ b/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/consumer/MicroserviceVersions.java @@ -167,6 +167,13 @@ public VendorExtensions getVendorExtensions() { public void pullInstances() { lastPullTime = System.currentTimeMillis(); MicroserviceInstances microserviceInstances = findServiceInstances(); + if (microserviceInstances == null || microserviceInstances.getInstancesResponse() == null + || microserviceInstances.getInstancesResponse().getInstances().isEmpty()) { + LOGGER.info("=======================> findServiceInstances is empty"); + } else { + LOGGER.info("pulledInstances =======================>" + + microserviceInstances.getInstancesResponse().getInstances().get(0).toString()); + } lastPulledResult = microserviceInstances; if (microserviceInstances == null) { // pulled failed, did not get anything diff --git a/foundations/foundation-vertx/src/test/java/io/vertx/ext/web/impl/TestHttpServerRequestUtils.java b/foundations/foundation-vertx/src/test/java/io/vertx/ext/web/impl/TestHttpServerRequestUtils.java index 7297a866b2f..aa68b17396e 100644 --- a/foundations/foundation-vertx/src/test/java/io/vertx/ext/web/impl/TestHttpServerRequestUtils.java +++ b/foundations/foundation-vertx/src/test/java/io/vertx/ext/web/impl/TestHttpServerRequestUtils.java @@ -38,6 +38,7 @@ public void testVertxServerRequestToHttpServletRequest() { Mockito.when(request.scheme()).thenReturn("http"); Mockito.when(context.request()).thenReturn(wrapper); Mockito.when(request.authority()).thenReturn(HostAndPort.create("localhost", 8080)); + Mockito.when(request.uri()).thenReturn("/test"); RequestBody requestBody = Mockito.mock(RequestBody.class); Mockito.when(context.body()).thenReturn(requestBody);