This is an automated email from the ASF dual-hosted git repository.
xiaoyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-shenyu.git
The following commit(s) were added to refs/heads/master by this push:
new e75cf4f compatible with java11+ (#1870)
e75cf4f is described below
commit e75cf4f855053fd6b255dc04af052a40040f81d7
Author: dengliming <[email protected]>
AuthorDate: Thu Aug 5 10:56:31 2021 +0800
compatible with java11+ (#1870)
* compatible with java11+
* fix
---
.github/workflows/ci.yml | 3 ++-
.../java/org/apache/shenyu/admin/mapper/AppAuthMapperTest.java | 3 +--
.../org/apache/shenyu/admin/mapper/AuthParamMapperTest.java | 3 +--
.../org/apache/shenyu/admin/mapper/AuthPathMapperTest.java | 3 +--
.../apache/shenyu/admin/mapper/DashboardUserMapperTest.java | 3 +--
.../org/apache/shenyu/admin/mapper/MetaDataMapperTest.java | 3 +--
.../org/apache/shenyu/admin/mapper/PluginHandleMapperTest.java | 3 +--
.../java/org/apache/shenyu/admin/mapper/PluginMapperTest.java | 6 +++---
.../java/org/apache/shenyu/admin/mapper/RoleMapperTest.java | 10 +++++-----
.../apache/shenyu/admin/mapper/RuleConditionMapperTest.java | 2 +-
.../java/org/apache/shenyu/admin/mapper/RuleMapperTest.java | 3 +--
.../shenyu/admin/mapper/SelectorConditionMapperTest.java | 3 ++-
.../org/apache/shenyu/admin/mapper/SelectorMapperTest.java | 5 ++---
.../org/apache/shenyu/admin/mapper/ShenyuDictMapperTest.java | 3 +--
14 files changed, 23 insertions(+), 30 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c3cd602..3ab66ce 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -25,6 +25,7 @@ jobs:
build:
strategy:
matrix:
+ java: [ 8, 11 ]
os: [ ubuntu-latest, macos-latest, windows-latest ]
runs-on: ${{ matrix.os }}
steps:
@@ -47,7 +48,7 @@ jobs:
- uses: actions/setup-java@v1
if: env.SKIP_CI != 'true'
with:
- java-version: 8
+ java-version: ${{ matrix.java }}
- name: Build with Maven
if: env.SKIP_CI != 'true'
run: ./mvnw -B clean install
diff --git
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/AppAuthMapperTest.java
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/AppAuthMapperTest.java
index 7ef925d..37f4003 100644
---
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/AppAuthMapperTest.java
+++
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/AppAuthMapperTest.java
@@ -26,7 +26,6 @@ import org.junit.Before;
import org.junit.Test;
import javax.annotation.Resource;
import java.sql.Timestamp;
-import java.time.LocalDateTime;
import java.util.List;
import static org.hamcrest.Matchers.greaterThan;
import static org.junit.Assert.assertEquals;
@@ -134,7 +133,7 @@ public final class AppAuthMapperTest extends
AbstractSpringIntegrationTest {
}
private AppAuthDO buildAppAuthDO() {
- Timestamp now = Timestamp.valueOf(LocalDateTime.now());
+ Timestamp now = new Timestamp(System.currentTimeMillis());
return AppAuthDO.builder()
.id(UUIDUtils.getInstance().generateShortUuid())
.appKey(SignUtils.getInstance().generateKey())
diff --git
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/AuthParamMapperTest.java
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/AuthParamMapperTest.java
index 1c82b99..6ee1b58 100644
---
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/AuthParamMapperTest.java
+++
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/AuthParamMapperTest.java
@@ -23,7 +23,6 @@ import org.apache.shenyu.common.utils.UUIDUtils;
import org.junit.Test;
import javax.annotation.Resource;
import java.sql.Timestamp;
-import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import static org.hamcrest.Matchers.comparesEqualTo;
@@ -104,7 +103,7 @@ public final class AuthParamMapperTest extends
AbstractSpringIntegrationTest {
* @return the auth param do
*/
private AuthParamDO buildAuthParamDO() {
- Timestamp now = Timestamp.valueOf(LocalDateTime.now());
+ Timestamp now = new Timestamp(System.currentTimeMillis());
String id = UUIDUtils.getInstance().generateShortUuid();
String authId = UUIDUtils.getInstance().generateShortUuid();
return AuthParamDO.builder()
diff --git
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/AuthPathMapperTest.java
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/AuthPathMapperTest.java
index d287e0c..05bd05a 100644
---
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/AuthPathMapperTest.java
+++
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/AuthPathMapperTest.java
@@ -23,7 +23,6 @@ import org.apache.shenyu.common.utils.UUIDUtils;
import org.junit.Test;
import javax.annotation.Resource;
import java.sql.Timestamp;
-import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import static org.hamcrest.Matchers.greaterThan;
@@ -99,7 +98,7 @@ public final class AuthPathMapperTest extends
AbstractSpringIntegrationTest {
}
private AuthPathDO buildAuthPathDO() {
- Timestamp now = Timestamp.valueOf(LocalDateTime.now());
+ Timestamp now = new Timestamp(System.currentTimeMillis());
String id = UUIDUtils.getInstance().generateShortUuid();
String authId = UUIDUtils.getInstance().generateShortUuid();
return AuthPathDO.builder()
diff --git
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/DashboardUserMapperTest.java
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/DashboardUserMapperTest.java
index 0250ba3..dc989a7 100644
---
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/DashboardUserMapperTest.java
+++
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/DashboardUserMapperTest.java
@@ -27,7 +27,6 @@ import org.junit.Test;
import javax.annotation.Resource;
import java.sql.Timestamp;
-import java.time.LocalDateTime;
import java.util.List;
import static org.hamcrest.Matchers.comparesEqualTo;
@@ -164,7 +163,7 @@ public final class DashboardUserMapperTest extends
AbstractSpringIntegrationTest
String aseKey = "2095132720951327";
String iv = "6075877187097700";
- Timestamp now = Timestamp.valueOf(LocalDateTime.now());
+ Timestamp now = new Timestamp(System.currentTimeMillis());
return DashboardUserDO.builder()
.id(UUIDUtils.getInstance().generateShortUuid())
.userName("adminTest")
diff --git
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/MetaDataMapperTest.java
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/MetaDataMapperTest.java
index 007fd70..cd89dc5 100644
---
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/MetaDataMapperTest.java
+++
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/MetaDataMapperTest.java
@@ -26,7 +26,6 @@ import org.junit.Before;
import org.junit.Test;
import javax.annotation.Resource;
import java.sql.Timestamp;
-import java.time.LocalDateTime;
import java.util.List;
import static org.hamcrest.Matchers.comparesEqualTo;
import static org.junit.Assert.assertThat;
@@ -184,7 +183,7 @@ public final class MetaDataMapperTest extends
AbstractSpringIntegrationTest {
}
private MetaDataDO getMetaDataDO() {
- Timestamp now = Timestamp.valueOf(LocalDateTime.now());
+ Timestamp now = new Timestamp(System.currentTimeMillis());
return MetaDataDO.builder()
.appName("testAppName")
.path("testPath")
diff --git
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/PluginHandleMapperTest.java
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/PluginHandleMapperTest.java
index 75b65db..94ab12d 100644
---
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/PluginHandleMapperTest.java
+++
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/PluginHandleMapperTest.java
@@ -24,7 +24,6 @@ import org.apache.shenyu.common.utils.UUIDUtils;
import org.junit.Test;
import javax.annotation.Resource;
import java.sql.Timestamp;
-import java.time.LocalDateTime;
import java.util.List;
import static org.hamcrest.Matchers.equalTo;
import static org.junit.Assert.assertThat;
@@ -167,7 +166,7 @@ public final class PluginHandleMapperTest extends
AbstractSpringIntegrationTest
private PluginHandleDO buildPluginHandleDO() {
String id = UUIDUtils.getInstance().generateShortUuid();
String pluginId = UUIDUtils.getInstance().generateShortUuid();
- Timestamp now = Timestamp.valueOf(LocalDateTime.now());
+ Timestamp now = new Timestamp(System.currentTimeMillis());
return PluginHandleDO.builder()
.id(id)
.pluginId(pluginId)
diff --git
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/PluginMapperTest.java
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/PluginMapperTest.java
index 288df20..ff06d9f 100644
---
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/PluginMapperTest.java
+++
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/PluginMapperTest.java
@@ -23,7 +23,7 @@ import org.apache.shenyu.admin.model.entity.PluginDO;
import org.apache.shenyu.admin.model.query.PluginQuery;
import org.junit.Test;
import javax.annotation.Resource;
-import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.greaterThanOrEqualTo;
@@ -73,8 +73,8 @@ public final class PluginMapperTest extends
AbstractSpringIntegrationTest {
final int insertResult = pluginMapper.insert(pluginDO);
assertThat(insertResult, equalTo(1));
- final List<PluginDO> resultPluginDOS =
pluginMapper.selectByNames(Arrays.asList(pluginDO.getName()));
- assertThat(pluginDO,
equalTo(resultPluginDOS.stream().findAny().get()));
+ final List<PluginDO> resultPluginDOS =
pluginMapper.selectByNames(Collections.singletonList(pluginDO.getName()));
+ assertThat(pluginDO,
equalTo(resultPluginDOS.stream().findAny().orElse(null)));
final int deleteResult = pluginMapper.delete(pluginDO.getId());
assertThat(deleteResult, equalTo(1));
diff --git
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/RoleMapperTest.java
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/RoleMapperTest.java
index 3393aa0..a3b9cbd 100644
---
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/RoleMapperTest.java
+++
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/RoleMapperTest.java
@@ -18,6 +18,7 @@
package org.apache.shenyu.admin.mapper;
import org.apache.shenyu.admin.AbstractSpringIntegrationTest;
+import org.apache.shenyu.admin.model.entity.BaseDO;
import org.apache.shenyu.admin.model.entity.RoleDO;
import org.apache.shenyu.admin.model.query.RoleQuery;
import org.apache.shenyu.common.utils.UUIDUtils;
@@ -26,8 +27,7 @@ import org.junit.Test;
import javax.annotation.Resource;
import java.sql.Timestamp;
-import java.time.LocalDateTime;
-import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
@@ -138,7 +138,7 @@ public final class RoleMapperTest extends
AbstractSpringIntegrationTest {
int insert = mapper.insertSelective(roleDO);
assertThat(insert, equalTo(1));
- int delete = mapper.delete(Arrays.asList(roleDO.getId()));
+ int delete = mapper.delete(Collections.singletonList(roleDO.getId()));
assertThat(delete, equalTo(1));
RoleDO result = mapper.selectById(roleDO.getId());
@@ -157,14 +157,14 @@ public final class RoleMapperTest extends
AbstractSpringIntegrationTest {
@After
public void resetDB() {
- List<String> ids = mapper.selectAll().stream().map(roleDO ->
roleDO.getId()).collect(Collectors.toList());
+ List<String> ids =
mapper.selectAll().stream().map(BaseDO::getId).collect(Collectors.toList());
if (!ids.isEmpty()) {
mapper.delete(ids);
}
}
private RoleDO buildRoleDO() {
- Timestamp now = Timestamp.valueOf(LocalDateTime.now());
+ Timestamp now = new Timestamp(System.currentTimeMillis());
return RoleDO.builder()
.id(UUIDUtils.getInstance().generateShortUuid())
.roleName("test-role")
diff --git
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/RuleConditionMapperTest.java
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/RuleConditionMapperTest.java
index ddf6e23..7c01d01 100644
---
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/RuleConditionMapperTest.java
+++
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/RuleConditionMapperTest.java
@@ -123,7 +123,7 @@ public final class RuleConditionMapperTest extends
AbstractSpringIntegrationTest
* @return new ruleCondition
*/
public RuleConditionDO buildRuleConditionDo() {
- Timestamp currentTimeStamp = Timestamp.valueOf(LocalDateTime.now());
+ Timestamp currentTimeStamp = new Timestamp(System.currentTimeMillis());
return RuleConditionDO.builder()
.id(UUIDUtils.getInstance().generateShortUuid())
.ruleId(UUIDUtils.getInstance().generateShortUuid())
diff --git
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/RuleMapperTest.java
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/RuleMapperTest.java
index bf2b919..0892737 100644
---
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/RuleMapperTest.java
+++
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/RuleMapperTest.java
@@ -24,7 +24,6 @@ import org.apache.shenyu.common.utils.UUIDUtils;
import org.junit.Test;
import javax.annotation.Resource;
import java.sql.Timestamp;
-import java.time.LocalDateTime;
import java.util.List;
import java.util.Random;
import static org.hamcrest.Matchers.equalTo;
@@ -190,7 +189,7 @@ public final class RuleMapperTest extends
AbstractSpringIntegrationTest {
}
private RuleDO buildRuleDO() {
- Timestamp now = Timestamp.valueOf(LocalDateTime.now());
+ Timestamp now = new Timestamp(System.currentTimeMillis());
String id = UUIDUtils.getInstance().generateShortUuid();
return RuleDO.builder()
.id(id)
diff --git
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/SelectorConditionMapperTest.java
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/SelectorConditionMapperTest.java
index 4f77e3d..f1275e8 100644
---
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/SelectorConditionMapperTest.java
+++
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/SelectorConditionMapperTest.java
@@ -106,7 +106,8 @@ public final class SelectorConditionMapperTest extends
AbstractSpringIntegration
}
private SelectorConditionDO buildSelectorConditionDO() {
- Timestamp currentTime = Timestamp.valueOf(LocalDateTime.now());
+ Timestamp currentTime = new Timestamp(System.currentTimeMillis());
+
return SelectorConditionDO.builder()
.id(UUIDUtils.getInstance().generateShortUuid())
.selectorId(UUIDUtils.getInstance().generateShortUuid())
diff --git
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/SelectorMapperTest.java
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/SelectorMapperTest.java
index 31bd881..18d4c41 100644
---
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/SelectorMapperTest.java
+++
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/SelectorMapperTest.java
@@ -26,7 +26,6 @@ import org.junit.Test;
import javax.annotation.Resource;
import java.sql.Timestamp;
-import java.time.LocalDateTime;
import java.util.List;
import static org.junit.Assert.assertEquals;
@@ -110,7 +109,7 @@ public final class SelectorMapperTest extends
AbstractSpringIntegrationTest {
SelectorQuery query = new SelectorQuery(selectorDO.getPluginId(),
selectorDO.getName(), new PageParameter());
Integer count = selectorMapper.countByQuery(query);
assertNotNull(count);
- assertEquals(new Integer(1), count);
+ assertEquals(Integer.valueOf(1), count);
int delete = selectorMapper.delete(selectorDO.getId());
assertEquals(1, delete);
@@ -200,7 +199,7 @@ public final class SelectorMapperTest extends
AbstractSpringIntegrationTest {
}
private SelectorDO buildSelectorDO() {
- Timestamp currentTime = Timestamp.valueOf(LocalDateTime.now());
+ Timestamp currentTime = new Timestamp(System.currentTimeMillis());
return SelectorDO.builder()
.id(UUIDUtils.getInstance().generateShortUuid())
.dateCreated(currentTime)
diff --git
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/ShenyuDictMapperTest.java
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/ShenyuDictMapperTest.java
index 530417d..2ede60b 100644
---
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/ShenyuDictMapperTest.java
+++
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/ShenyuDictMapperTest.java
@@ -24,7 +24,6 @@ import org.apache.shenyu.common.utils.UUIDUtils;
import org.junit.Test;
import javax.annotation.Resource;
import java.sql.Timestamp;
-import java.time.LocalDateTime;
import java.util.List;
import static org.hamcrest.Matchers.greaterThan;
import static org.junit.Assert.assertThat;
@@ -63,7 +62,7 @@ public final class ShenyuDictMapperTest extends
AbstractSpringIntegrationTest {
}
private ShenyuDictDO buildShenyuDictDO() {
- Timestamp now = Timestamp.valueOf(LocalDateTime.now());
+ Timestamp now = new Timestamp(System.currentTimeMillis());
String id = UUIDUtils.getInstance().generateShortUuid();
return ShenyuDictDO.builder()
.id(id)
