Create new classPk if it doesn't exist

auditlog/src/main/java/org/genesys/blocks/auditlog/service/ClassPKService.java

@@ -48,6 +48,6 @@ public interface ClassPKService {
 	 * @param className
 	 * @return
 	 */
-	Long getClassPkId(String className);
+	Long getClassPkId(String className) throws ClassNotFoundException;
 
 }

auditlog/src/main/java/org/genesys/blocks/auditlog/service/impl/ClassPKServiceImpl.java

@@ -53,15 +53,7 @@ public class ClassPKServiceImpl implements ClassPKService {
 		if (classPk != null) {
 			return classPk;
 		}
-		classPk = new ClassPK();
-		classPk.setClassname(class1.getName());
-		classPk.setShortName(generateShortPkName(class1.getSimpleName().toLowerCase()));
-
-		if (LOG.isTraceEnabled()) {
-			LOG.trace("Persisting new ClassPK for classname={}", classPk.getClassname());
-		}
-
-		return classPkRepository.save(classPk);
+		return createNewClassPkForClass(class1);
 	}
 
 	private String generateShortPkName(String shortName) {
@@ -84,7 +76,6 @@ public class ClassPKServiceImpl implements ClassPKService {
 		throw new PersistenceException("Can't generate a shortName for ClassPK for " + shortName);
 	}
 
-
 	@Override
 	@Transactional(isolation = Isolation.DEFAULT, propagation = Propagation.REQUIRES_NEW)
 	public String getClassName(final Long id) {
@@ -98,7 +89,33 @@ public class ClassPKServiceImpl implements ClassPKService {
 	}
 
 	@Override
-	public Long getClassPkId(String classname) {
-		return classPkRepository.getClassPkId(classname);
+	@Transactional(isolation = Isolation.DEFAULT, propagation = Propagation.REQUIRES_NEW)
+	public Long getClassPkId(String classname) throws ClassNotFoundException {
+		Long id = null;
+		try {
+			id = classPkRepository.getClassPkId(classname);
+			if (id == null) {
+				throw new Exception();
+			}
+		} catch (Exception e) {
+			Class aClass = Class.forName(classname);
+			ClassPK classPK = createNewClassPkForClass(aClass);
+			id = classPK.getId();
+		}
+
+		return id;
+	}
+
+	private ClassPK createNewClassPkForClass(Class<?> aClass) {
+
+		ClassPK classPk = new ClassPK();
+		classPk.setClassname(aClass.getName());
+		classPk.setShortName(generateShortPkName(aClass.getSimpleName().toLowerCase()));
+
+		if (LOG.isTraceEnabled()) {
+			LOG.trace("Persisting new ClassPK for classname={}", classPk.getClassname());
+		}
+
+		return classPkRepository.save(classPk);
 	}
 }