Skip to content

Commit 0dbb09a

Browse files
UmeshPatil-1pareshD-1991
authored andcommitted
ATLAS-5002: Resolved Reflection error and refactor mockito imports.
1 parent 4f4524c commit 0dbb09a

5 files changed

Lines changed: 22 additions & 7 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636

3737
strategy:
3838
matrix:
39-
java: [ 8 ]
39+
java: [ 8, 17 ]
4040

4141
steps:
4242
- uses: actions/checkout@v4

addons/hive-bridge/src/test/java/org/apache/atlas/hive/bridge/HiveMetaStoreBridgeTest.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,11 @@
6666
import static org.junit.Assert.assertFalse;
6767
import static org.junit.Assert.assertNull;
6868
import static org.junit.Assert.assertNotNull;
69-
import static org.mockito.ArgumentMatchers.*;
69+
import static org.mockito.ArgumentMatchers.anyString;
70+
import static org.mockito.ArgumentMatchers.isNull;
71+
import static org.mockito.ArgumentMatchers.any;
72+
import static org.mockito.ArgumentMatchers.anyBoolean;
73+
import static org.mockito.ArgumentMatchers.anyInt;
7074
import static org.mockito.Mockito.never;
7175
import static org.mockito.Mockito.times;
7276
import static org.mockito.Mockito.mock;

addons/hive-bridge/src/test/java/org/apache/atlas/hive/hook/events/BaseHiveEventTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,9 @@
5858
import java.util.Set;
5959

6060

61-
import static org.mockito.ArgumentMatchers.*;
61+
import static org.mockito.ArgumentMatchers.any;
62+
import static org.mockito.ArgumentMatchers.anyString;
63+
import static org.mockito.ArgumentMatchers.eq;
6264
import static org.mockito.Mockito.when;
6365
import static org.mockito.Mockito.doNothing;
6466
import static org.mockito.Mockito.doReturn;

dev-support/atlas-docker/.env

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ PROFILE=dist,external-hbase-solr
77
# Java version for AtlasBase image.
88
# This image gets used as base docker image for all images.
99
# Valid values: 8, 11, 17
10-
ATLAS_BASE_JAVA_VERSION=8
10+
ATLAS_BASE_JAVA_VERSION=17
1111

1212
# Java version to use to build Apache Atlas
1313
# Valid values: 8, 11, 17
14-
ATLAS_BUILD_JAVA_VERSION=8
14+
ATLAS_BUILD_JAVA_VERSION=17
1515

1616
# Java version to use to run Atlas server
1717
# Valid values: 8, 11, 17
18-
ATLAS_SERVER_JAVA_VERSION=8
18+
ATLAS_SERVER_JAVA_VERSION=17
1919

2020
ATLAS_VERSION=3.0.0-SNAPSHOT
2121
UBUNTU_VERSION=20.04

graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/AtlasJanusGraphDatabase.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,16 @@ private static void addRdbmsSupport() {
355355

356356
field.setAccessible(true);
357357

358-
Field modifiersField = Field.class.getDeclaredField("modifiers");
358+
Method getDeclaredFields0 = Class.class.getDeclaredMethod("getDeclaredFields0", boolean.class);
359+
getDeclaredFields0.setAccessible(true);
360+
Field[] fields = (Field[]) getDeclaredFields0.invoke(Field.class, false);
361+
Field modifiersField = null;
362+
for (Field each : fields) {
363+
if ("modifiers".equals(each.getName())) {
364+
modifiersField = each;
365+
break;
366+
}
367+
}
359368

360369
modifiersField.setAccessible(true);
361370
modifiersField.setInt(field, field.getModifiers() & ~Modifier.FINAL);

0 commit comments

Comments
 (0)