fix catalogdb cvfnc customization

Hibernate entities were all wrong and needed
a complete rewrite.
The scope kept growing and ended up touching a
lot more of the code than originally planned.
These changes make the db interactions much easier
and more straightforward from java.

The flyway script order had to change to make this
migration possible.

Change-Id: I6ce363a385661300eddb11923ac6a80538edaddc
Issue-ID: SO-1710
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>

1 files changed, 6 insertions, 5 deletions

diff --git a/common/src/main/java/org/onap/so/openpojo/rules/EqualsAndHashCodeTester.java b/common/src/main/java/org/onap/so/openpojo/rules/EqualsAndHashCodeTester.java
index 88a83db7e2..05f69caacd 100644
--- a/common/src/main/java/org/onap/so/openpojo/rules/EqualsAndHashCodeTester.java
+++ b/common/src/main/java/org/onap/so/openpojo/rules/EqualsAndHashCodeTester.java
@@ -122,13 +122,14 @@ public class EqualsAndHashCodeTester implements Tester {
 	
 	private Set<PojoField> hasIdOrBusinessKey(PojoClass pojoClass) {
 		final Set<PojoField> fields = new HashSet<>();
-		
+
 		fields.addAll(pojoClass.getPojoFieldsAnnotatedWith(BusinessKey.class));
-		fields.addAll(pojoClass.getPojoFieldsAnnotatedWith(Id.class));
-		fields.removeAll(pojoClass.getPojoFieldsAnnotatedWith(GeneratedValue.class));
-		
+		final Set<PojoField> temp = new HashSet<>();
+		temp.addAll(pojoClass.getPojoFieldsAnnotatedWith(Id.class));
+		temp.removeAll(pojoClass.getPojoFieldsAnnotatedWith(GeneratedValue.class));
+		fields.addAll(temp);
 		return fields;
-		
+
 	}
 
 }