Fix config files to remove outdated configuration for hibernate
[policy/models.git] / models-dao / src / test / java / org / onap / policy / models / dao / EntityTest.java
index bab28c4..4f281bd 100644 (file)
@@ -1,6 +1,8 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
+ *  Copyright (C) 2019-2021, 2023-2024 Nordix Foundation.
+ *  Modifications Copyright (C) 2019-2021 AT&T Intellectual Property. All rights reserved.
+ *  Modifications Copyright (C) 2022 Bell Canada. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
 
 package org.onap.policy.models.dao;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatCode;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 
-import java.sql.Connection;
-import java.sql.DriverManager;
+import java.time.Instant;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.Properties;
 import java.util.Set;
 import java.util.TreeSet;
 import java.util.UUID;
-
 import org.junit.After;
-import org.junit.Before;
 import org.junit.Test;
 import org.onap.policy.models.base.PfConceptKey;
 import org.onap.policy.models.base.PfModelException;
 import org.onap.policy.models.base.PfReferenceKey;
-import org.onap.policy.models.dao.DaoParameters;
-import org.onap.policy.models.dao.PfDao;
-import org.onap.policy.models.dao.PfDaoFactory;
+import org.onap.policy.models.base.PfReferenceTimestampKey;
+import org.onap.policy.models.base.PfTimestampKey;
 import org.onap.policy.models.dao.impl.DefaultPfDao;
 
 /**
  * JUnit test class.
  */
 public class EntityTest {
-    private Connection connection;
-    private PfDao pfDao;
+    private static final String DESCRIPTION2 = "key description 2";
+    private static final String DESCRIPTION1 = "key description 1";
+    private static final String DESCRIPTION0 = "key description 0";
+    private static final String ENTITY0 = "Entity0";
+    private static final String UUID2 = "00000000-0000-0000-0000-000000000002";
+    private static final String UUID1 = "00000000-0000-0000-0000-000000000001";
+    private static final String UUID0 = "00000000-0000-0000-0000-000000000000";
+    private static final String VERSION003 = "0.0.3";
+    private static final String VERSION002 = "0.0.2";
+    private static final String VERSION001 = "0.0.1";
+    private static final Instant TIMESTAMP0 = Instant.ofEpochSecond(1613494293);
+    private static final Instant TIMESTAMP1 = Instant.ofEpochSecond(1613494293).plusSeconds(55);
+    private static final Instant TIMESTAMP2 = Instant.ofEpochSecond(1613494293).plusSeconds(90);
 
-    @Before
-    public void setup() throws Exception {
-        connection = DriverManager.getConnection("jdbc:h2:mem:test");
-    }
+    private PfDao pfDao;
 
+    /**
+     * Closes the DAO.
+     */
     @After
-    public void teardown() throws Exception {
-        connection.close();
+    public void tearDown() {
+        if (pfDao != null) {
+            pfDao.close();
+            pfDao = null;
+        }
     }
 
     @Test
     public void testEntityTestSanity() throws PfModelException {
         final DaoParameters daoParameters = new DaoParameters();
 
+        Properties jdbcProperties = new Properties();
+        // @formatter:off
+        jdbcProperties.setProperty("jakarta.persistence.jdbc.driver",   "org.h2.Driver");
+        jdbcProperties.setProperty("jakarta.persistence.jdbc.url",      "jdbc:h2:mem:EntityTest");
+        jdbcProperties.setProperty("jakarta.persistence.jdbc.user",     "sa");
+        jdbcProperties.setProperty("jakarta.persistence.jdbc.password", "");
+        // @formatter:on
+
+        daoParameters.setJdbcProperties(jdbcProperties);
+
         pfDao = new PfDaoFactory().createPfDao(daoParameters);
 
-        try {
-            pfDao.init(null);
-            fail("Test should throw an exception here");
-        } catch (final Exception e) {
-            assertEquals("Policy Framework persistence unit parameter not set", e.getMessage());
-        }
+        assertThatThrownBy(() -> pfDao.init(null)).hasMessage("Policy Framework persistence unit parameter not set");
 
-        try {
-            pfDao.init(daoParameters);
-            fail("Test should throw an exception here");
-        } catch (final Exception e) {
-            assertEquals("Policy Framework persistence unit parameter not set", e.getMessage());
-        }
+        assertThatThrownBy(() -> pfDao.init(daoParameters))
+                        .hasMessage("Policy Framework persistence unit parameter not set");
 
         daoParameters.setPluginClass("somewhere.over.the.rainbow");
         daoParameters.setPersistenceUnit("Dorothy");
-        try {
-            pfDao.init(daoParameters);
-            fail("Test should throw an exception here");
-        } catch (final Exception e) {
-            assertEquals("Creation of Policy Framework persistence unit \"Dorothy\" failed", e.getMessage());
-        }
-        try {
-            pfDao.create(new PfConceptKey());
-            fail("Test should throw an exception here");
-        } catch (final Exception e) {
-            assertEquals("Policy Framework DAO has not been initialized", e.getMessage());
-        }
-        pfDao.close();
+
+        assertThatThrownBy(() -> pfDao.init(daoParameters))
+                        .hasMessage("Creation of Policy Framework persistence unit \"Dorothy\" failed");
+
+        assertThatThrownBy(() -> pfDao.create(new PfConceptKey()))
+                        .hasMessage("Policy Framework DAO has not been initialized");
     }
 
     @Test
     public void testEntityTestAllOpsJpa() throws PfModelException {
+
         final DaoParameters daoParameters = new DaoParameters();
-        daoParameters.setPluginClass(DefaultPfDao.class.getCanonicalName());
+        daoParameters.setPluginClass(DefaultPfDao.class.getName());
         daoParameters.setPersistenceUnit("DaoTest");
 
+        Properties jdbcProperties = new Properties();
+        jdbcProperties.setProperty("jakarta.persistence.jdbc.driver", "org.h2.Driver");
+        jdbcProperties.setProperty("jakarta.persistence.jdbc.url", "jdbc:h2:mem:EntityTest");
+        jdbcProperties.setProperty("jakarta.persistence.jdbc.user", "sa");
+        jdbcProperties.setProperty("jakarta.persistence.jdbc.password", "");
+
+        daoParameters.setJdbcProperties(jdbcProperties);
+
         pfDao = new PfDaoFactory().createPfDao(daoParameters);
         pfDao.init(daoParameters);
 
         testAllOps();
 
+        testReferenceTimestamp();
+
         testVersionOps();
 
         testgetFilteredOps();
 
-        pfDao.close();
+        testgetFilteredOps3();
     }
 
     @Test
     public void testEntityTestBadVals() throws PfModelException {
         final DaoParameters daoParameters = new DaoParameters();
-        daoParameters.setPluginClass(DefaultPfDao.class.getCanonicalName());
+        daoParameters.setPluginClass(DefaultPfDao.class.getName());
         daoParameters.setPersistenceUnit("DaoTest");
 
+        Properties jdbcProperties = new Properties();
+        jdbcProperties.setProperty("jakarta.persistence.jdbc.driver", "org.h2.Driver");
+        jdbcProperties.setProperty("jakarta.persistence.jdbc.url", "jdbc:h2:mem:EntityTest");
+        jdbcProperties.setProperty("jakarta.persistence.jdbc.user", "sa");
+        jdbcProperties.setProperty("jakarta.persistence.jdbc.password", "");
+
+        daoParameters.setJdbcProperties(jdbcProperties);
+
         pfDao = new PfDaoFactory().createPfDao(daoParameters);
         pfDao.init(daoParameters);
 
         final PfConceptKey nullKey = null;
         final PfReferenceKey nullRefKey = null;
+        final PfTimestampKey nullTimeKey = null;
         final List<PfConceptKey> nullKeyList = null;
         final List<PfConceptKey> emptyKeyList = new ArrayList<>();
         final List<PfReferenceKey> nullRKeyList = null;
@@ -142,6 +172,7 @@ public class EntityTest {
         pfDao.deleteCollection(emptyKeyList);
         pfDao.delete(PfConceptKey.class, nullKey);
         pfDao.delete(PfReferenceKey.class, nullRefKey);
+        pfDao.delete(PfTimestampKey.class, nullTimeKey);
         pfDao.deleteByConceptKey(PfConceptKey.class, nullKeyList);
         pfDao.deleteByConceptKey(PfConceptKey.class, emptyKeyList);
         pfDao.deleteByReferenceKey(PfReferenceKey.class, nullRKeyList);
@@ -149,103 +180,104 @@ public class EntityTest {
 
         pfDao.get(null, nullKey);
         pfDao.get(null, nullRefKey);
+        pfDao.get(null, nullTimeKey);
         pfDao.getAll(null);
         pfDao.getAll(null, nullKey);
+        pfDao.getAll(null, null, null);
         pfDao.getConcept(null, nullKey);
         pfDao.getConcept(PfConceptKey.class, nullKey);
         pfDao.getConcept(null, nullRefKey);
         pfDao.getConcept(PfReferenceKey.class, nullRefKey);
-        pfDao.size(null);
 
-        pfDao.close();
+        assertThatCode(() -> pfDao.size(null)).doesNotThrowAnyException();
     }
 
     private void testAllOps() {
-        final PfConceptKey aKey0 = new PfConceptKey("A-KEY0", "0.0.1");
-        final PfConceptKey aKey1 = new PfConceptKey("A-KEY1", "0.0.1");
-        final PfConceptKey aKey2 = new PfConceptKey("A-KEY2", "0.0.1");
+        final PfConceptKey aKey0 = new PfConceptKey("A-KEY0", VERSION001);
+        final PfConceptKey aKey1 = new PfConceptKey("A-KEY1", VERSION001);
+        final PfConceptKey aKey2 = new PfConceptKey("A-KEY2", VERSION001);
         final DummyConceptEntity keyInfo0 = new DummyConceptEntity(aKey0,
-                UUID.fromString("00000000-0000-0000-0000-000000000000"), "key description 0");
+                UUID.fromString(UUID0), DESCRIPTION0);
         final DummyConceptEntity keyInfo1 = new DummyConceptEntity(aKey1,
-                UUID.fromString("00000000-0000-0000-0000-000000000001"), "key description 1");
+                UUID.fromString(UUID1), DESCRIPTION1);
         final DummyConceptEntity keyInfo2 = new DummyConceptEntity(aKey2,
-                UUID.fromString("00000000-0000-0000-0000-000000000002"), "key description 2");
+                UUID.fromString(UUID2), DESCRIPTION2);
 
         pfDao.create(keyInfo0);
 
         final DummyConceptEntity keyInfoBack0 = pfDao.get(DummyConceptEntity.class, aKey0);
-        assertTrue(keyInfo0.equals(keyInfoBack0));
+        assertEquals(keyInfo0, keyInfoBack0);
 
         final DummyConceptEntity keyInfoBackNull = pfDao.get(DummyConceptEntity.class, PfConceptKey.getNullKey());
         assertNull(keyInfoBackNull);
 
         final DummyConceptEntity keyInfoBack1 = pfDao.getConcept(DummyConceptEntity.class, aKey0);
-        assertTrue(keyInfoBack0.equals(keyInfoBack1));
+        assertEquals(keyInfoBack0, keyInfoBack1);
 
         final DummyConceptEntity keyInfoBack2 =
-                pfDao.getConcept(DummyConceptEntity.class, new PfConceptKey("A-KEY3", "0.0.1"));
+                pfDao.getConcept(DummyConceptEntity.class, new PfConceptKey("A-KEY3", VERSION001));
         assertNull(keyInfoBack2);
 
-        final Set<DummyConceptEntity> keyInfoSetIn = new TreeSet<DummyConceptEntity>();
+        final Set<DummyConceptEntity> keyInfoSetIn = new TreeSet<>();
         keyInfoSetIn.add(keyInfo1);
         keyInfoSetIn.add(keyInfo2);
 
         pfDao.createCollection(keyInfoSetIn);
 
-        Set<DummyConceptEntity> keyInfoSetOut = new TreeSet<DummyConceptEntity>(pfDao.getAll(DummyConceptEntity.class));
+        Set<DummyConceptEntity> keyInfoSetOut = new TreeSet<>(pfDao.getAll(DummyConceptEntity.class));
 
         keyInfoSetIn.add(keyInfo0);
-        assertTrue(keyInfoSetIn.equals(keyInfoSetOut));
+        assertEquals(keyInfoSetIn, keyInfoSetOut);
 
         pfDao.delete(keyInfo1);
         keyInfoSetIn.remove(keyInfo1);
-        keyInfoSetOut = new TreeSet<DummyConceptEntity>(pfDao.getAll(DummyConceptEntity.class));
-        assertTrue(keyInfoSetIn.equals(keyInfoSetOut));
+        keyInfoSetOut = new TreeSet<>(pfDao.getAll(DummyConceptEntity.class));
+        assertEquals(keyInfoSetIn, keyInfoSetOut);
 
         pfDao.deleteCollection(keyInfoSetIn);
-        keyInfoSetOut = new TreeSet<DummyConceptEntity>(pfDao.getAll(DummyConceptEntity.class));
+        keyInfoSetOut = new TreeSet<>(pfDao.getAll(DummyConceptEntity.class));
         assertEquals(0, keyInfoSetOut.size());
 
         keyInfoSetIn.add(keyInfo0);
         keyInfoSetIn.add(keyInfo1);
         keyInfoSetIn.add(keyInfo0);
         pfDao.createCollection(keyInfoSetIn);
-        keyInfoSetOut = new TreeSet<DummyConceptEntity>(pfDao.getAll(DummyConceptEntity.class));
-        assertTrue(keyInfoSetIn.equals(keyInfoSetOut));
+        keyInfoSetOut = new TreeSet<>(pfDao.getAll(DummyConceptEntity.class));
+        assertEquals(keyInfoSetIn, keyInfoSetOut);
 
         pfDao.delete(DummyConceptEntity.class, aKey0);
-        keyInfoSetOut = new TreeSet<DummyConceptEntity>(pfDao.getAll(DummyConceptEntity.class));
+        keyInfoSetOut = new TreeSet<>(pfDao.getAll(DummyConceptEntity.class));
         assertEquals(2, keyInfoSetOut.size());
         assertEquals(2, pfDao.size(DummyConceptEntity.class));
 
-        final Set<PfConceptKey> keySetIn = new TreeSet<PfConceptKey>();
+        final Set<PfConceptKey> keySetIn = new TreeSet<>();
         keySetIn.add(aKey1);
         keySetIn.add(aKey2);
 
         final int deletedCount = pfDao.deleteByConceptKey(DummyConceptEntity.class, keySetIn);
         assertEquals(2, deletedCount);
 
-        keyInfoSetOut = new TreeSet<DummyConceptEntity>(pfDao.getAll(DummyConceptEntity.class));
+        keyInfoSetOut = new TreeSet<>(pfDao.getAll(DummyConceptEntity.class));
         assertEquals(0, keyInfoSetOut.size());
 
         keyInfoSetIn.add(keyInfo0);
         keyInfoSetIn.add(keyInfo1);
         keyInfoSetIn.add(keyInfo0);
         pfDao.createCollection(keyInfoSetIn);
-        keyInfoSetOut = new TreeSet<DummyConceptEntity>(pfDao.getAll(DummyConceptEntity.class));
-        assertTrue(keyInfoSetIn.equals(keyInfoSetOut));
+        keyInfoSetOut = new TreeSet<>(pfDao.getAll(DummyConceptEntity.class));
+        assertEquals(keyInfoSetIn, keyInfoSetOut);
 
         pfDao.deleteAll(DummyConceptEntity.class);
         assertEquals(0, pfDao.size(DummyConceptEntity.class));
 
-        final PfConceptKey owner0Key = new PfConceptKey("Owner0", "0.0.1");
-        final PfConceptKey owner1Key = new PfConceptKey("Owner1", "0.0.1");
-        final PfConceptKey owner2Key = new PfConceptKey("Owner2", "0.0.1");
-        final PfConceptKey owner3Key = new PfConceptKey("Owner3", "0.0.1");
-        final PfConceptKey owner4Key = new PfConceptKey("Owner4", "0.0.1");
-        final PfConceptKey owner5Key = new PfConceptKey("Owner5", "0.0.1");
+        final PfConceptKey owner0Key = new PfConceptKey("Owner0", VERSION001);
+        final PfConceptKey owner1Key = new PfConceptKey("Owner1", VERSION001);
+        final PfConceptKey owner2Key = new PfConceptKey("Owner2", VERSION001);
+        final PfConceptKey owner3Key = new PfConceptKey("Owner3", VERSION001);
+        final PfConceptKey owner4Key = new PfConceptKey("Owner4", VERSION001);
+        final PfConceptKey owner5Key = new PfConceptKey("Owner5", VERSION001);
 
-        pfDao.create(new DummyReferenceEntity(new PfReferenceKey(owner0Key, "Entity0"), 100.0));
+        pfDao.create(new DummyReferenceEntity(new PfReferenceKey(owner0Key, ENTITY0), 100.0));
         pfDao.create(new DummyReferenceEntity(new PfReferenceKey(owner0Key, "Entity1"), 101.0));
         pfDao.create(new DummyReferenceEntity(new PfReferenceKey(owner0Key, "Entity2"), 102.0));
         pfDao.create(new DummyReferenceEntity(new PfReferenceKey(owner0Key, "Entity3"), 103.0));
@@ -263,34 +295,34 @@ public class EntityTest {
         pfDao.create(new DummyReferenceEntity(new PfReferenceKey(owner5Key, "EntityF"), 115.0));
 
         TreeSet<DummyReferenceEntity> testEntitySetOut =
-                new TreeSet<DummyReferenceEntity>(pfDao.getAll(DummyReferenceEntity.class));
+                new TreeSet<>(pfDao.getAll(DummyReferenceEntity.class));
         assertEquals(16, testEntitySetOut.size());
 
-        testEntitySetOut = new TreeSet<DummyReferenceEntity>(pfDao.getAll(DummyReferenceEntity.class, owner0Key));
+        testEntitySetOut = new TreeSet<>(pfDao.getAll(DummyReferenceEntity.class, owner0Key));
         assertEquals(5, testEntitySetOut.size());
 
-        testEntitySetOut = new TreeSet<DummyReferenceEntity>(pfDao.getAll(DummyReferenceEntity.class, owner1Key));
+        testEntitySetOut = new TreeSet<>(pfDao.getAll(DummyReferenceEntity.class, owner1Key));
         assertEquals(3, testEntitySetOut.size());
 
-        testEntitySetOut = new TreeSet<DummyReferenceEntity>(pfDao.getAll(DummyReferenceEntity.class, owner2Key));
+        testEntitySetOut = new TreeSet<>(pfDao.getAll(DummyReferenceEntity.class, owner2Key));
         assertEquals(2, testEntitySetOut.size());
 
-        testEntitySetOut = new TreeSet<DummyReferenceEntity>(pfDao.getAll(DummyReferenceEntity.class, owner3Key));
+        testEntitySetOut = new TreeSet<>(pfDao.getAll(DummyReferenceEntity.class, owner3Key));
         assertEquals(1, testEntitySetOut.size());
 
-        testEntitySetOut = new TreeSet<DummyReferenceEntity>(pfDao.getAll(DummyReferenceEntity.class, owner4Key));
+        testEntitySetOut = new TreeSet<>(pfDao.getAll(DummyReferenceEntity.class, owner4Key));
         assertEquals(1, testEntitySetOut.size());
 
-        testEntitySetOut = new TreeSet<DummyReferenceEntity>(pfDao.getAll(DummyReferenceEntity.class, owner5Key));
+        testEntitySetOut = new TreeSet<>(pfDao.getAll(DummyReferenceEntity.class, owner5Key));
         assertEquals(4, testEntitySetOut.size());
 
-        assertNotNull(pfDao.get(DummyReferenceEntity.class, new PfReferenceKey(owner0Key, "Entity0")));
-        assertNotNull(pfDao.getConcept(DummyReferenceEntity.class, new PfReferenceKey(owner0Key, "Entity0")));
+        assertNotNull(pfDao.get(DummyReferenceEntity.class, new PfReferenceKey(owner0Key, ENTITY0)));
+        assertNotNull(pfDao.getConcept(DummyReferenceEntity.class, new PfReferenceKey(owner0Key, ENTITY0)));
         assertNull(pfDao.get(DummyReferenceEntity.class, new PfReferenceKey(owner0Key, "Entity1000")));
         assertNull(pfDao.getConcept(DummyReferenceEntity.class, new PfReferenceKey(owner0Key, "Entity1000")));
-        pfDao.delete(DummyReferenceEntity.class, new PfReferenceKey(owner0Key, "Entity0"));
+        pfDao.delete(DummyReferenceEntity.class, new PfReferenceKey(owner0Key, ENTITY0));
 
-        final Set<PfReferenceKey> rKeySetIn = new TreeSet<PfReferenceKey>();
+        final Set<PfReferenceKey> rKeySetIn = new TreeSet<>();
         rKeySetIn.add(new PfReferenceKey(owner4Key, "EntityB"));
         rKeySetIn.add(new PfReferenceKey(owner5Key, "EntityD"));
 
@@ -298,27 +330,129 @@ public class EntityTest {
         assertEquals(2, deletedRCount);
 
         pfDao.update(new DummyReferenceEntity(new PfReferenceKey(owner5Key, "EntityF"), 120.0));
+
+        final PfTimestampKey atKey0 = new PfTimestampKey("AT-KEY0", VERSION001, TIMESTAMP0);
+        final PfTimestampKey atKey1 = new PfTimestampKey("AT-KEY1", VERSION001, TIMESTAMP1);
+        final PfTimestampKey atKey2 = new PfTimestampKey("AT-KEY2", VERSION001, TIMESTAMP2);
+        final DummyTimestampEntity tkeyInfo0 = new DummyTimestampEntity(atKey0, 200.0);
+        final DummyTimestampEntity tkeyInfo1 = new DummyTimestampEntity(atKey1, 200.1);
+        final DummyTimestampEntity tkeyInfo2 = new DummyTimestampEntity(atKey2, 200.2);
+
+        pfDao.create(tkeyInfo0);
+
+        final DummyTimestampEntity tkeyInfoBack0 = pfDao.get(DummyTimestampEntity.class, atKey0);
+        assertEquals(tkeyInfo0, tkeyInfoBack0);
+
+        final DummyTimestampEntity tkeyInfoBackNull =
+                pfDao.get(DummyTimestampEntity.class, PfTimestampKey.getNullKey());
+        assertNull(tkeyInfoBackNull);
+
+
+
+        final Set<DummyTimestampEntity> tkeyInfoSetIn = new TreeSet<>();
+        tkeyInfoSetIn.add(tkeyInfo1);
+        tkeyInfoSetIn.add(tkeyInfo2);
+
+        pfDao.createCollection(tkeyInfoSetIn);
+
+        Set<DummyTimestampEntity> tkeyInfoSetOut = new TreeSet<>(pfDao.getAll(DummyTimestampEntity.class));
+
+        tkeyInfoSetIn.add(tkeyInfo0);
+        assertEquals(tkeyInfoSetIn, tkeyInfoSetOut);
+
+        pfDao.delete(tkeyInfo1);
+        tkeyInfoSetIn.remove(tkeyInfo1);
+        tkeyInfoSetOut = new TreeSet<>(pfDao.getAll(DummyTimestampEntity.class));
+        assertEquals(tkeyInfoSetIn, tkeyInfoSetOut);
+
+        pfDao.deleteCollection(tkeyInfoSetIn);
+        tkeyInfoSetOut = new TreeSet<>(pfDao.getAll(DummyTimestampEntity.class));
+        assertEquals(0, tkeyInfoSetOut.size());
+
+        tkeyInfoSetIn.add(tkeyInfo2);
+        pfDao.createCollection(tkeyInfoSetIn);
+        tkeyInfoSetOut = new TreeSet<>(pfDao.getAll(DummyTimestampEntity.class));
+        assertEquals(keyInfoSetIn, keyInfoSetOut);
+
+        pfDao.delete(DummyTimestampEntity.class, atKey2);
+        tkeyInfoSetOut = new TreeSet<>(pfDao.getAll(DummyTimestampEntity.class));
+        assertEquals(3, keyInfoSetOut.size());
+        assertEquals(1, pfDao.size(DummyTimestampEntity.class));
+
+        pfDao.deleteAll(DummyTimestampEntity.class);
+        assertEquals(0, pfDao.size(DummyTimestampEntity.class));
+    }
+
+    private void testReferenceTimestamp() {
+        final PfConceptKey owner0Key = new PfConceptKey("Owner0", VERSION001);
+        final PfConceptKey owner1Key = new PfConceptKey("Owner1", VERSION001);
+        final PfConceptKey owner2Key = new PfConceptKey("Owner2", VERSION001);
+        final PfReferenceTimestampKey arKey0 = new PfReferenceTimestampKey(owner0Key, "AT-KEY0", TIMESTAMP0);
+        final PfReferenceTimestampKey arKey1 = new PfReferenceTimestampKey(owner1Key, "AT-KEY1", TIMESTAMP1);;
+        final PfReferenceTimestampKey arKey2 = new PfReferenceTimestampKey(owner2Key, "AT-KEY2", TIMESTAMP2);
+        final DummyReferenceTimestampEntity rkeyInfo0 = new DummyReferenceTimestampEntity(arKey0);
+        final DummyReferenceTimestampEntity rkeyInfo1 = new DummyReferenceTimestampEntity(arKey1);
+        final DummyReferenceTimestampEntity rkeyInfo2 = new DummyReferenceTimestampEntity(arKey2);
+
+        pfDao.create(rkeyInfo0);
+
+        final  DummyReferenceTimestampEntity rkeyInfoBack0 = pfDao.get(DummyReferenceTimestampEntity.class, arKey0);
+        assertEquals(rkeyInfo0, rkeyInfoBack0);
+
+
+        final DummyReferenceTimestampEntity rkeyInfoBackNull =
+                pfDao.get(DummyReferenceTimestampEntity.class, PfReferenceTimestampKey.getNullKey());
+        assertNull(rkeyInfoBackNull);
+
+        final Set<DummyReferenceTimestampEntity> rkeyInfoSetIn = new TreeSet<>();
+        rkeyInfoSetIn.add(rkeyInfo1);
+        rkeyInfoSetIn.add(rkeyInfo2);
+
+        pfDao.createCollection(rkeyInfoSetIn);
+
+        Set<DummyReferenceTimestampEntity> rkeyInfoSetOut =
+                new TreeSet<>(pfDao.getAll(DummyReferenceTimestampEntity.class));
+
+        rkeyInfoSetIn.add(rkeyInfo0);
+        assertEquals(rkeyInfoSetIn, rkeyInfoSetOut);
+
+        pfDao.delete(rkeyInfo1);
+        rkeyInfoSetIn.remove(rkeyInfo1);
+        rkeyInfoSetOut = new TreeSet<>(pfDao.getAll(DummyReferenceTimestampEntity.class));
+        assertEquals(rkeyInfoSetIn, rkeyInfoSetOut);
+
+        pfDao.deleteCollection(rkeyInfoSetIn);
+        rkeyInfoSetOut = new TreeSet<>(pfDao.getAll(DummyReferenceTimestampEntity.class));
+        assertEquals(0, rkeyInfoSetOut.size());
+
+        rkeyInfoSetIn.add(rkeyInfo2);
+        pfDao.createCollection(rkeyInfoSetIn);
+        rkeyInfoSetOut = new TreeSet<>(pfDao.getAll(DummyReferenceTimestampEntity.class));
+        assertEquals(rkeyInfoSetIn, rkeyInfoSetOut);
+
+        pfDao.deleteAll(DummyReferenceTimestampEntity.class);
+        assertEquals(0, pfDao.size(DummyReferenceTimestampEntity.class));
     }
 
     private void testVersionOps() {
-        final PfConceptKey aKey0 = new PfConceptKey("AAA0", "0.0.1");
-        final PfConceptKey aKey1 = new PfConceptKey("AAA0", "0.0.2");
-        final PfConceptKey aKey2 = new PfConceptKey("AAA0", "0.0.3");
-        final PfConceptKey bKey0 = new PfConceptKey("BBB0", "0.0.1");
-        final PfConceptKey bKey1 = new PfConceptKey("BBB0", "0.0.2");
-        final PfConceptKey bKey2 = new PfConceptKey("BBB0", "0.0.3");
+        final PfConceptKey aKey0 = new PfConceptKey("AAA0", VERSION001);
+        final PfConceptKey aKey1 = new PfConceptKey("AAA0", VERSION002);
+        final PfConceptKey aKey2 = new PfConceptKey("AAA0", VERSION003);
+        final PfConceptKey bKey0 = new PfConceptKey("BBB0", VERSION001);
+        final PfConceptKey bKey1 = new PfConceptKey("BBB0", VERSION002);
+        final PfConceptKey bKey2 = new PfConceptKey("BBB0", VERSION003);
         final DummyConceptEntity keyInfo0 = new DummyConceptEntity(aKey0,
-                UUID.fromString("00000000-0000-0000-0000-000000000000"), "key description 0");
+                UUID.fromString(UUID0), DESCRIPTION0);
         final DummyConceptEntity keyInfo1 = new DummyConceptEntity(aKey1,
-                UUID.fromString("00000000-0000-0000-0000-000000000001"), "key description 1");
+                UUID.fromString(UUID1), DESCRIPTION1);
         final DummyConceptEntity keyInfo2 = new DummyConceptEntity(aKey2,
-                UUID.fromString("00000000-0000-0000-0000-000000000002"), "key description 2");
+                UUID.fromString(UUID2), DESCRIPTION2);
         final DummyConceptEntity keyInfo3 = new DummyConceptEntity(bKey0,
-                UUID.fromString("00000000-0000-0000-0000-000000000000"), "key description 0");
+                UUID.fromString(UUID0), DESCRIPTION0);
         final DummyConceptEntity keyInfo4 = new DummyConceptEntity(bKey1,
-                UUID.fromString("00000000-0000-0000-0000-000000000001"), "key description 1");
+                UUID.fromString(UUID1), DESCRIPTION1);
         final DummyConceptEntity keyInfo5 = new DummyConceptEntity(bKey2,
-                UUID.fromString("00000000-0000-0000-0000-000000000002"), "key description 2");
+                UUID.fromString(UUID2), DESCRIPTION2);
 
         pfDao.create(keyInfo0);
         pfDao.create(keyInfo1);
@@ -328,27 +462,29 @@ public class EntityTest {
         pfDao.create(keyInfo5);
 
         assertEquals(3, pfDao.getAllVersions(DummyConceptEntity.class, "AAA0").size());
+        assertEquals(0, pfDao.getAllVersions(null, "AAA0").size());
+        assertEquals(0, pfDao.getAllVersions(DummyConceptEntity.class, null).size());
     }
 
     private void testgetFilteredOps() {
-        final PfConceptKey aKey0 = new PfConceptKey("AAA0", "0.0.1");
-        final PfConceptKey aKey1 = new PfConceptKey("AAA0", "0.0.2");
-        final PfConceptKey aKey2 = new PfConceptKey("AAA0", "0.0.3");
-        final PfConceptKey bKey0 = new PfConceptKey("BBB0", "0.0.1");
-        final PfConceptKey bKey1 = new PfConceptKey("BBB0", "0.0.2");
-        final PfConceptKey bKey2 = new PfConceptKey("BBB0", "0.0.3");
+        final PfConceptKey aKey0 = new PfConceptKey("AAA0", VERSION001);
+        final PfConceptKey aKey1 = new PfConceptKey("AAA0", VERSION002);
+        final PfConceptKey aKey2 = new PfConceptKey("AAA0", VERSION003);
+        final PfConceptKey bKey0 = new PfConceptKey("BBB0", VERSION001);
+        final PfConceptKey bKey1 = new PfConceptKey("BBB0", VERSION002);
+        final PfConceptKey bKey2 = new PfConceptKey("BBB0", VERSION003);
         final DummyConceptEntity keyInfo0 = new DummyConceptEntity(aKey0,
-                UUID.fromString("00000000-0000-0000-0000-000000000000"), "key description 0");
+                UUID.fromString(UUID0), DESCRIPTION0);
         final DummyConceptEntity keyInfo1 = new DummyConceptEntity(aKey1,
-                UUID.fromString("00000000-0000-0000-0000-000000000001"), "key description 1");
+                UUID.fromString(UUID1), DESCRIPTION1);
         final DummyConceptEntity keyInfo2 = new DummyConceptEntity(aKey2,
-                UUID.fromString("00000000-0000-0000-0000-000000000002"), "key description 2");
+                UUID.fromString(UUID2), DESCRIPTION2);
         final DummyConceptEntity keyInfo3 = new DummyConceptEntity(bKey0,
-                UUID.fromString("00000000-0000-0000-0000-000000000000"), "key description 0");
+                UUID.fromString(UUID0), DESCRIPTION0);
         final DummyConceptEntity keyInfo4 = new DummyConceptEntity(bKey1,
-                UUID.fromString("00000000-0000-0000-0000-000000000001"), "key description 1");
+                UUID.fromString(UUID1), DESCRIPTION1);
         final DummyConceptEntity keyInfo5 = new DummyConceptEntity(bKey2,
-                UUID.fromString("00000000-0000-0000-0000-000000000002"), "key description 2");
+                UUID.fromString(UUID2), DESCRIPTION2);
 
         pfDao.create(keyInfo0);
         pfDao.create(keyInfo1);
@@ -357,10 +493,81 @@ public class EntityTest {
         pfDao.create(keyInfo4);
         pfDao.create(keyInfo5);
 
-        assertEquals(6, pfDao.getFiltered(DummyConceptEntity.class, null, null).size());
-        assertEquals(3, pfDao.getFiltered(DummyConceptEntity.class, "AAA0", null).size());
-        assertEquals(3, pfDao.getFiltered(DummyConceptEntity.class, "BBB0", null).size());
-        assertEquals(1, pfDao.getFiltered(DummyConceptEntity.class, "BBB0", "0.0.3").size());
-        assertEquals(6, pfDao.getFiltered(DummyConceptEntity.class, null, "0.0.3").size());
+        assertThat(pfDao.getFiltered(DummyConceptEntity.class, null, null)).hasSize(6);
+        assertThat(pfDao.getFiltered(DummyConceptEntity.class, "AAA0", null)).hasSize(3);
+        assertThat(pfDao.getFiltered(DummyConceptEntity.class, "BBB0", null)).hasSize(3);
+        assertThat(pfDao.getFiltered(DummyConceptEntity.class, "BBB0", VERSION003)).hasSize(1);
+        assertThat(pfDao.getFiltered(DummyConceptEntity.class, null, VERSION003)).hasSize(6);
+
+        final PfTimestampKey atKey0 = new PfTimestampKey("AT-KEY0", VERSION001, TIMESTAMP0);
+        final PfTimestampKey atKey1 = new PfTimestampKey("AT-KEY1", VERSION001, TIMESTAMP1);
+        final PfTimestampKey atKey2 = new PfTimestampKey("AT-KEY2", VERSION001, TIMESTAMP2);
+        final DummyTimestampEntity tkeyInfo0 = new DummyTimestampEntity(atKey0, 200.0);
+        final DummyTimestampEntity tkeyInfo1 = new DummyTimestampEntity(atKey1, 200.1);
+        final DummyTimestampEntity tkeyInfo2 = new DummyTimestampEntity(atKey2, 200.2);
+
+        pfDao.create(tkeyInfo0);
+        pfDao.create(tkeyInfo1);
+        pfDao.create(tkeyInfo2);
+
+
+        assertThat(pfDao.getFiltered(DummyTimestampEntity.class,
+                        PfFilterParameters.builder().name("AT-KEY0").version(VERSION001).build())).hasSize(1);
+        assertThat(pfDao.getFiltered(DummyTimestampEntity.class, PfFilterParameters.builder().name("AT-KEY0").build()))
+                        .hasSize(1);
+        assertThat(pfDao.getFiltered(DummyTimestampEntity.class, PfFilterParameters.builder().version(VERSION001)
+                        .startTime(TIMESTAMP0).endTime(TIMESTAMP2).build())).hasSize(3);
+        assertThat(pfDao.getFiltered(DummyTimestampEntity.class, PfFilterParameters.builder().name("AT-KEY0")
+                        .version(VERSION001).startTime(TIMESTAMP0).endTime(TIMESTAMP2).build())).hasSize(1);
+        assertThat(pfDao.getFiltered(DummyTimestampEntity.class,
+                        PfFilterParameters.builder().version(VERSION001).endTime(TIMESTAMP2).build())).hasSize(3);
+        assertThat(pfDao.getFiltered(DummyTimestampEntity.class,
+                        PfFilterParameters.builder().version(VERSION001).startTime(TIMESTAMP0).build())).hasSize(3);
+        assertThat(pfDao.getFiltered(DummyTimestampEntity.class, PfFilterParameters.builder().version(VERSION001)
+                        .startTime(TIMESTAMP0).endTime(TIMESTAMP2).sortOrder("DESC").recordNum(2).build())).hasSize(2);
+
+        Map<String, Object> filterMap = new HashMap<>();
+        filterMap.put("doubleValue", 200.1);
+        assertThat(pfDao.getFiltered(DummyTimestampEntity.class,
+                        PfFilterParameters.builder().filterMap(filterMap).build())).hasSize(1);
+    }
+
+    private void testgetFilteredOps3() {
+        Map<String, Object> filterMap = new HashMap<>();
+        filterMap.put("localName", "AT-KEY0");
+
+        final PfConceptKey owner0Key = new PfConceptKey("Owner0", VERSION001);
+        final PfConceptKey owner1Key = new PfConceptKey("Owner1", VERSION001);
+        final PfConceptKey owner2Key = new PfConceptKey("Owner2", VERSION001);
+        final PfReferenceTimestampKey arKey0 = new PfReferenceTimestampKey(owner0Key, "AT-KEY0", TIMESTAMP0);
+        final PfReferenceTimestampKey arKey1 = new PfReferenceTimestampKey(owner1Key, "AT-KEY1", TIMESTAMP1);;
+        final PfReferenceTimestampKey arKey2 = new PfReferenceTimestampKey(owner2Key, "AT-KEY2", TIMESTAMP2);
+        final DummyReferenceTimestampEntity rkeyInfo0 = new DummyReferenceTimestampEntity(arKey0);
+        final DummyReferenceTimestampEntity rkeyInfo1 = new DummyReferenceTimestampEntity(arKey1);
+        final DummyReferenceTimestampEntity rkeyInfo2 = new DummyReferenceTimestampEntity(arKey2);
+
+        pfDao.create(rkeyInfo0);
+        pfDao.create(rkeyInfo1);
+        pfDao.create(rkeyInfo2);
+
+
+        assertThat(pfDao.getFiltered(DummyReferenceTimestampEntity.class,
+                        PfFilterParameters.builder().name("Owner0").version(VERSION001).build())).hasSize(1);
+        assertThat(pfDao.getFiltered(DummyReferenceTimestampEntity.class,
+                        PfFilterParameters.builder().name("Owner0").build())).hasSize(1);
+        assertThat(pfDao.getFiltered(DummyReferenceTimestampEntity.class, PfFilterParameters.builder()
+                        .version(VERSION001).startTime(TIMESTAMP0).endTime(TIMESTAMP2).build())).hasSize(3);
+        assertThat(pfDao.getFiltered(DummyReferenceTimestampEntity.class, PfFilterParameters.builder().name("Owner0")
+                        .version(VERSION001).startTime(TIMESTAMP0).endTime(TIMESTAMP2).build())).hasSize(1);
+        assertThat(pfDao.getFiltered(DummyReferenceTimestampEntity.class,
+                        PfFilterParameters.builder().version(VERSION001).endTime(TIMESTAMP2).build())).hasSize(3);
+        assertThat(pfDao.getFiltered(DummyReferenceTimestampEntity.class,
+                        PfFilterParameters.builder().version(VERSION001).startTime(TIMESTAMP0).build())).hasSize(3);
+        assertThat(pfDao.getFiltered(DummyReferenceTimestampEntity.class,
+                        PfFilterParameters.builder().version(VERSION001).startTime(TIMESTAMP0).endTime(TIMESTAMP2)
+                                        .sortOrder("DESC").recordNum(2).build())).hasSize(2);
+
+        assertThat(pfDao.getFiltered(DummyReferenceTimestampEntity.class,
+                        PfFilterParameters.builder().filterMap(filterMap).build())).hasSize(1);
     }
 }