diff --git a/driver/clirr-ignored-differences.xml b/driver/clirr-ignored-differences.xml
index 642710f955..28c94b0a5a 100644
--- a/driver/clirr-ignored-differences.xml
+++ b/driver/clirr-ignored-differences.xml
@@ -391,4 +391,10 @@
3003
+
+ org/neo4j/driver/types/TypeSystem
+ 7012
+ org.neo4j.driver.types.TypeSystem getDefault()
+
+
diff --git a/driver/src/main/java/org/neo4j/driver/types/TypeSystem.java b/driver/src/main/java/org/neo4j/driver/types/TypeSystem.java
index 31373c3508..a3936d6361 100644
--- a/driver/src/main/java/org/neo4j/driver/types/TypeSystem.java
+++ b/driver/src/main/java/org/neo4j/driver/types/TypeSystem.java
@@ -18,6 +18,8 @@
*/
package org.neo4j.driver.types;
+import static org.neo4j.driver.internal.types.InternalTypeSystem.TYPE_SYSTEM;
+
import org.neo4j.driver.util.Experimental;
import org.neo4j.driver.util.Immutable;
@@ -28,6 +30,15 @@
@Immutable
@Experimental
public interface TypeSystem {
+ /**
+ * Returns an instance of type system.
+ *
+ * @return instance of type system
+ */
+ static TypeSystem getDefault() {
+ return TYPE_SYSTEM;
+ }
+
Type ANY();
Type BOOLEAN();
diff --git a/driver/src/test/java/org/neo4j/driver/types/TypeSystemTest.java b/driver/src/test/java/org/neo4j/driver/types/TypeSystemTest.java
index 2269cd9ae9..fc7b449779 100644
--- a/driver/src/test/java/org/neo4j/driver/types/TypeSystemTest.java
+++ b/driver/src/test/java/org/neo4j/driver/types/TypeSystemTest.java
@@ -21,6 +21,7 @@
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.core.Is.is;
import static org.hamcrest.junit.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.neo4j.driver.Values.value;
import static org.neo4j.driver.internal.types.InternalTypeSystem.TYPE_SYSTEM;
@@ -75,6 +76,11 @@ private TypeVerifier newTypeVerifierFor(Type type) {
return new TypeVerifier(type, allValues);
}
+ @Test
+ void shouldReturnTypeSystem() {
+ assertEquals(TYPE_SYSTEM, TypeSystem.getDefault());
+ }
+
@Test
void shouldNameTypeCorrectly() {
assertThat(TYPE_SYSTEM.ANY().name(), is("ANY"));