CAY-2898 Crypto: NPE in a ColumnQuery

Author: stariy95

RELEASE-NOTES.txt

@@ -29,6 +29,7 @@ CAY-2879 Negative number for non parameterized ObjectSelect query not processed
 CAY-2883 License and notice templates are not processed by the Gradle build
 CAY-2885 Modeler: DbImport fails to load DB schema view
 CAY-2896 Inserting two identical objects into two datamaps stores both objects in the last used datamap
+CAY-2898 Crypto: NPE in a ColumnQuery
 
 ----------------------------------
 Release: 5.0-M1

cayenne-crypto/src/main/java/org/apache/cayenne/crypto/reader/CryptoRowReaderFactoryDecorator.java

@@ -159,7 +159,7 @@ private class DecoratedScalarRowReader implements RowReader<Object> {
         @Override
         public Object readRow(ResultSet resultSet) {
             Object value = delegateReader.readRow(resultSet);
-            if(valueDecryptor == null) {
+            if(valueDecryptor == null || value == null) {
                 return value;
             }
             return valueDecryptor.decrypt(bytesDecryptor, value);

cayenne-crypto/src/test/java/org/apache/cayenne/crypto/Runtime_AES128_GZIP_IT.java

@@ -190,4 +190,72 @@ public void test_SelectQueryWithOptimisticLocking() throws SQLException {
         assertEquals(str+"A", result.get(0).getCryptoString());
     }
 
+    @Test
+    public void test_ScalarColumnQuery() throws SQLException {
+        // make sure compression is on...
+        byte[] cryptoBytes1 = CryptoUnitUtils.bytesOfSize(GZIP_THRESHOLD + 101);
+        byte[] cryptoBytes2 = CryptoUnitUtils.bytesOfSize(GZIP_THRESHOLD + 102);
+
+        ObjectContext context = runtime.newContext();
+
+        Table2 t1 = context.newObject(Table2.class);
+        t1.setPlainBytes("a".getBytes());
+        t1.setCryptoBytes(cryptoBytes1);
+
+        Table2 t2 = context.newObject(Table2.class);
+        t2.setPlainBytes("b".getBytes());
+        t2.setCryptoBytes(cryptoBytes2);
+
+        Table2 t3 = context.newObject(Table2.class);
+        t3.setPlainBytes("c".getBytes());
+        t3.setCryptoBytes(null);
+
+        context.commitChanges();
+
+        List<byte[]> result = ObjectSelect.query(Table2.class)
+                .column(Table2.CRYPTO_BYTES)
+                .orderBy(Table2.PLAIN_BYTES.asc())
+                .select(runtime.newContext());
+
+        assertEquals(3, result.size());
+        assertArrayEquals(cryptoBytes1, result.get(0));
+        assertArrayEquals(cryptoBytes2, result.get(1));
+        assertArrayEquals(null, result.get(2));
+    }
+
+    @Test
+    public void test_MultipleColumnsQuery() throws SQLException {
+        // make sure compression is on...
+        byte[] cryptoBytes1 = CryptoUnitUtils.bytesOfSize(GZIP_THRESHOLD + 101);
+        byte[] cryptoBytes2 = CryptoUnitUtils.bytesOfSize(GZIP_THRESHOLD + 102);
+
+        ObjectContext context = runtime.newContext();
+
+        Table2 t1 = context.newObject(Table2.class);
+        t1.setPlainBytes("a".getBytes());
+        t1.setCryptoBytes(cryptoBytes1);
+
+        Table2 t2 = context.newObject(Table2.class);
+        t2.setPlainBytes("b".getBytes());
+        t2.setCryptoBytes(cryptoBytes2);
+
+        Table2 t3 = context.newObject(Table2.class);
+        t3.setPlainBytes("c".getBytes());
+        t3.setCryptoBytes(null);
+
+        context.commitChanges();
+
+        List<Object[]> result = ObjectSelect.query(Table2.class)
+                .columns(Table2.CRYPTO_BYTES, Table2.PLAIN_BYTES)
+                .orderBy(Table2.PLAIN_BYTES.asc())
+                .select(runtime.newContext());
+
+        assertEquals(3, result.size());
+        assertArrayEquals(cryptoBytes1, (byte[])result.get(0)[0]);
+        assertArrayEquals("a".getBytes(), (byte[])result.get(0)[1]);
+        assertArrayEquals(cryptoBytes2, (byte[])result.get(1)[0]);
+        assertArrayEquals("b".getBytes(), (byte[])result.get(1)[1]);
+        assertArrayEquals(null, (byte[])result.get(2)[0]);
+    }
+
 }

cayenne-crypto/src/test/java/org/apache/cayenne/crypto/Runtime_AES128_IT.java

@@ -333,6 +333,23 @@ public void test_ColumnQuerySingleScalar() {
         assertEquals("test", result.get(0));
     }
 
+    @Test
+    public void test_ColumnQuerySingleScalarNull() {
+        ObjectContext context = runtime.newContext();
+
+        Table1 t1 = context.newObject(Table1.class);
+        t1.setCryptoInt(1);
+        t1.setCryptoString(null);
+        context.commitChanges();
+
+        List<String> result = ObjectSelect
+                .columnQuery(Table1.class, Table1.CRYPTO_STRING)
+                .select(context);
+
+        assertEquals(1, result.size());
+        assertNull(result.get(0));
+    }
+
     @Test
     public void test_ColumnQueryMultipleScalars() {
         ObjectContext context = runtime.newContext();