X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=models-dao%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Fmodels%2Fdao%2Fimpl%2FProxyDao.java;fp=models-dao%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Fmodels%2Fdao%2Fimpl%2FProxyDao.java;h=ec0c357e655a426887edd9191bb9685d12176f0d;hb=389c85c8e7213c10c17896f4c63d94e2b5e9d27a;hp=cdf2a9857553036e0f1ab39124202eb0ffa8ebbf;hpb=107b75a2b584222f7d5dcdbec64063c036b4f2b2;p=policy%2Fmodels.git

diff --git a/models-dao/src/main/java/org/onap/policy/models/dao/impl/ProxyDao.java b/models-dao/src/main/java/org/onap/policy/models/dao/impl/ProxyDao.java
index cdf2a9857..ec0c357e6 100644
--- a/models-dao/src/main/java/org/onap/policy/models/dao/impl/ProxyDao.java
+++ b/models-dao/src/main/java/org/onap/policy/models/dao/impl/ProxyDao.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2021, 2023 Nordix Foundation.
+ *  Copyright (C) 2021, 2023-2024 Nordix Foundation.
  *  Modifications Copyright (C) 2022 Bell Canada. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -52,55 +52,6 @@ import org.slf4j.LoggerFactory;
 public class ProxyDao implements PfDao {
     private static final Logger LOGGER = LoggerFactory.getLogger(ProxyDao.class);
 
-    // @formatter:off
-    private static final String NAME           = "name";
-    private static final String VERSION        = "version";
-    private static final String TIMESTAMP      = "timeStamp";
-    private static final String PARENT_NAME    = "parentname";
-    private static final String PARENT_VERSION = "parentversion";
-    private static final String LOCAL_NAME     = "localname";
-
-    private static final String TABLE_TOKEN = "__TABLE__";
-
-    private static final String DELETE_FROM_TABLE = "DELETE FROM __TABLE__ c";
-
-    private static final String SELECT_FROM_TABLE = "SELECT c FROM __TABLE__ c";
-
-    private static final String WHERE      = " WHERE ";
-    private static final String AND        = " AND ";
-    private static final String ORDER_BY        = " ORDER BY c.";
-
-    private static final String NAME_FILTER            = "c.key.name = :name";
-    private static final String VERSION_FILTER         = "c.key.version = :version";
-    private static final String TIMESTAMP_FILTER       = "c.key.timeStamp = :timeStamp";
-    private static final String PARENT_NAME_FILTER     = "c.key.parentKeyName = :parentname";
-    private static final String PARENT_VERSION_FILTER  = "c.key.parentKeyVersion = :parentversion";
-    private static final String LOCAL_NAME_FILTER      = "c.key.localName = :localname";
-
-    private static final String CLONE_ERR_MSG = "Could not clone object of class \"{}\"";
-
-    private static final String DELETE_BY_CONCEPT_KEY =
-            DELETE_FROM_TABLE + WHERE + NAME_FILTER + AND + VERSION_FILTER;
-
-    private static final String DELETE_BY_TIMESTAMP_KEY =
-            DELETE_FROM_TABLE + WHERE + NAME_FILTER + AND + VERSION_FILTER  + AND + TIMESTAMP_FILTER;
-
-    private static final String DELETE_BY_REFERENCE_KEY =
-            DELETE_FROM_TABLE + WHERE + PARENT_NAME_FILTER + AND + PARENT_VERSION_FILTER + AND + LOCAL_NAME_FILTER;
-
-    private static final String SELECT_ALL_FOR_PARENT =
-            SELECT_FROM_TABLE + WHERE + PARENT_NAME_FILTER + AND + PARENT_VERSION_FILTER;
-
-    private static final String SELECT_ALL_VERSIONS_FOR_PARENT =
-            SELECT_FROM_TABLE + WHERE + PARENT_NAME_FILTER;
-
-    private static final String SELECT_ALL_VERSIONS = SELECT_FROM_TABLE + WHERE + NAME_FILTER;
-
-    private static final String SELECT_BY_CONCEPT_KEY =
-            SELECT_FROM_TABLE + WHERE + NAME_FILTER + AND + VERSION_FILTER;
-
-    private static final String SELECT_BY_REFERENCE_KEY =
-            SELECT_FROM_TABLE + WHERE + PARENT_NAME_FILTER + AND + PARENT_VERSION_FILTER + AND + LOCAL_NAME_FILTER;
     // @formatter:on
 
     // Entity manager for JPA