Fix hasMetadata logic

It was broken after renaming here b0d5358#r1149084554
tarantool · Apr 24, 2023 · 207f94a · 207f94a
1 parent d9ca853
commit 207f94a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## [Unreleased]
 
+## [0.11.1] - 2023-04-24
+### Bugfixes
+- Fix hasMetadata logic
+
 ## [0.11.0] - 2023-04-12
 
 ### Internal and API changes

diff --git a/README.md b/README.md
@@ -39,7 +39,7 @@ If you use this code in another project don't forget to add `cartridge-driver` d
 <dependency>
   <groupId>io.tarantool</groupId>
   <artifactId>cartridge-driver</artifactId>
-  <version>0.11.0</version>
+  <version>0.11.1</version>
 </dependency>
 ```
 ## Advanced usage

diff --git a/src/main/java/io/tarantool/driver/core/tuple/TarantoolTupleImpl.java b/src/main/java/io/tarantool/driver/core/tuple/TarantoolTupleImpl.java
@@ -139,8 +139,8 @@ public TarantoolTupleImpl(ArrayValue value, MessagePackMapper mapper, TarantoolS
 
     @Override
     public boolean hasMetadata() {
-        return spaceMetadata == null || spaceMetadata.getSpaceFormatMetadata() == null ||
-                   spaceMetadata.getSpaceFormatMetadata().isEmpty();
+        return spaceMetadata != null && spaceMetadata.getSpaceFormatMetadata() != null &&
+                   !spaceMetadata.getSpaceFormatMetadata().isEmpty();
     }
 
     @Override

diff --git a/src/test/java/io/tarantool/driver/integration/ClusterTarantoolTupleClientIT.java b/src/test/java/io/tarantool/driver/integration/ClusterTarantoolTupleClientIT.java
@@ -380,7 +380,7 @@ public void callForTarantoolResultTest() throws Exception {
 
         assertTrue(result.size() >= 3);
         TarantoolTuple tuple = result.get(0);
-        assertFalse(tuple.hasMetadata());
+        assertTrue(tuple.hasMetadata());
         assertEquals(1605, tuple.getInteger("year"));
 
         result = client.call(
@@ -391,7 +391,7 @@ public void callForTarantoolResultTest() throws Exception {
         ).get();
         assertTrue(result.size() >= 3);
         tuple = result.get(0);
-        assertTrue(tuple.hasMetadata());
+        assertFalse(tuple.hasMetadata());
     }
 
     @Test