1 files changed, 23 insertions, 15 deletions
diff --git a/main/src/main/java/org/onap/policy/pap/main/rest/depundep/SessionData.java b/main/src/main/java/org/onap/policy/pap/main/rest/depundep/SessionData.java
index b7aff765..5cd2f803 100644
--- a/main/src/main/java/org/onap/policy/pap/main/rest/depundep/SessionData.java
+++ b/main/src/main/java/org/onap/policy/pap/main/rest/depundep/SessionData.java
@@ -102,21 +102,7 @@ public class SessionData {
 
             try {
                 ToscaPolicyFilterBuilder filterBuilder = ToscaPolicyFilter.builder().name(desiredPolicy.getName());
-
-                String version = desiredPolicy.getVersion();
-                if (version == null) {
-                    // no version specified - get the latest
-                    filterBuilder.version(ToscaPolicyFilter.LATEST_VERSION);
-
-                } else if (VERSION_PREFIX_PAT.matcher(version).matches()) {
-                    // version prefix provided - match the prefix and then pick the latest
-                    filterBuilder.versionPrefix(version + ".").version(ToscaPolicyFilter.LATEST_VERSION);
-
-                } else {
-                    // must be an exact match
-                    filterBuilder.version(version);
-                }
-
+                setPolicyFilterVersion(filterBuilder, desiredPolicy.getVersion());
 
                 List<ToscaPolicy> lst = dao.getFilteredPolicyList(filterBuilder.build());
                 if (lst.isEmpty()) {
@@ -139,6 +125,28 @@ public class SessionData {
     }
 
     /**
+     * Sets the "version" in a policy filter.
+     *
+     * @param filterBuilder filter builder whose version should be set
+     * @param desiredVersion desired version
+     */
+    private void setPolicyFilterVersion(ToscaPolicyFilterBuilder filterBuilder, String desiredVersion) {
+
+        if (desiredVersion == null) {
+            // no version specified - get the latest
+            filterBuilder.version(ToscaPolicyFilter.LATEST_VERSION);
+
+        } else if (VERSION_PREFIX_PAT.matcher(desiredVersion).matches()) {
+            // version prefix provided - match the prefix and then pick the latest
+            filterBuilder.versionPrefix(desiredVersion + ".").version(ToscaPolicyFilter.LATEST_VERSION);
+
+        } else {
+            // must be an exact match
+            filterBuilder.version(desiredVersion);
+        }
+    }
+
+    /**
      * Adds an update and state-change to the sets, replacing any previous entries for the
      * given PDP.
      *