2 files changed, 190 insertions, 476 deletions
diff --git a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/ApexApiResult.java b/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/ApexApiResult.java
index 2b1dc5505..65bd84add 100644
--- a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/ApexApiResult.java
+++ b/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/ApexApiResult.java
@@ -280,10 +280,8 @@ public class ApexApiResult {
         return builder.toString();
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Object#toString()
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public String toString() {
diff --git a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ApexModelImpl.java b/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ApexModelImpl.java
index 6719dea99..77ded31d6 100644
--- a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ApexModelImpl.java
+++ b/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ApexModelImpl.java
@@ -83,10 +83,8 @@ public final class ApexModelImpl implements ApexModel {
      */
     private ApexModelImpl() {}
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.core.modelapi.ApexModel#clone()
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexModel clone() {
@@ -109,11 +107,8 @@ public final class ApexModelImpl implements ApexModel {
         return ret;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.core.modelapi.ApexModel#createModel(java.lang.String,
-     * java.lang.String, java.lang.String, java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult createModel(final String name, final String version, final String uuid,
@@ -121,11 +116,8 @@ public final class ApexModelImpl implements ApexModel {
         return modelFacade.createModel(name, version, uuid, description);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.core.modelapi.ApexModel#updateModel(java.lang.String,
-     * java.lang.String, java.lang.String, java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult updateModel(final String name, final String version, final String uuid,
@@ -133,41 +125,32 @@ public final class ApexModelImpl implements ApexModel {
         return modelFacade.updateModel(name, version, uuid, description);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.core.modelapi.ApexEditorAPI#getModelKey()
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult getModelKey() {
         return modelFacade.getModelKey();
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.auth.api.ApexEditorAPI#listModel()
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult listModel() {
         return modelFacade.listModel();
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.auth.api.ApexEditorAPI#deleteModel()
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult deleteModel() {
         return modelFacade.deleteModel();
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.auth.api.ApexEditorAPI#createKeyInformation(java.lang.String,
-     * java.lang.String, java.lang.String, java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult createKeyInformation(final String name, final String version, final String uuid,
@@ -175,11 +158,8 @@ public final class ApexModelImpl implements ApexModel {
         return keyInformationFacade.createKeyInformation(name, version, uuid, description);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.auth.api.ApexEditorAPI#updateKeyInformation(java.lang.String,
-     * java.lang.String, java.lang.String, java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult updateKeyInformation(final String name, final String version, final String uuid,
@@ -187,44 +167,32 @@ public final class ApexModelImpl implements ApexModel {
         return keyInformationFacade.updateKeyInformation(name, version, uuid, description);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.auth.api.ApexEditorAPI#listKeyInformation(java.lang.String,
-     * java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult listKeyInformation(final String name, final String version) {
         return keyInformationFacade.listKeyInformation(name, version);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.auth.api.ApexEditorAPI#deleteKeyInformation(java.lang.String,
-     * java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult deleteKeyInformation(final String name, final String version) {
         return keyInformationFacade.deleteKeyInformation(name, version);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.auth.api.ApexEditorAPI#validateKeyInformation(java.lang.String,
-     * java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult validateKeyInformation(final String name, final String version) {
         return keyInformationFacade.validateKeyInformation(name, version);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.auth.api.ApexEditorAPI#createContextSchema(java.lang.String,
-     * java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult createContextSchema(final String name, final String version, final String schemaFlavour,
@@ -233,11 +201,8 @@ public final class ApexModelImpl implements ApexModel {
                 description);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.auth.api.ApexEditorAPI#updateContextSchema(java.lang.String,
-     * java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult updateContextSchema(final String name, final String version, final String schemaFlavour,
@@ -246,45 +211,32 @@ public final class ApexModelImpl implements ApexModel {
                 description);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.auth.api.ApexEditorAPI#listContextSchemas(java.lang.String,
-     * java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult listContextSchemas(final String name, final String version) {
         return contextSchemaFacade.listContextSchemas(name, version);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.auth.api.ApexEditorAPI#deleteContextSchema(java.lang.String,
-     * java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult deleteContextSchema(final String name, final String version) {
         return contextSchemaFacade.deleteContextSchema(name, version);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.auth.api.ApexEditorAPI#validateContextSchemas(java.lang.String,
-     * java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult validateContextSchemas(final String name, final String version) {
         return contextSchemaFacade.validateContextSchemas(name, version);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.auth.api.ApexEditorAPI#createEvent(java.lang.String,
-     * java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String,
-     * java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult createEvent(final String name, final String version, final String nameSpace,
@@ -292,12 +244,8 @@ public final class ApexModelImpl implements ApexModel {
         return eventFacade.createEvent(name, version, nameSpace, source, target, uuid, description);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.auth.api.ApexEditorAPI#updateEvent(java.lang.String,
-     * java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String,
-     * java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult updateEvent(final String name, final String version, final String nameSpace,
@@ -305,44 +253,32 @@ public final class ApexModelImpl implements ApexModel {
         return eventFacade.updateEvent(name, version, nameSpace, source, target, uuid, description);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.auth.api.ApexEditorAPI#listEvent(java.lang.String,
-     * java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult listEvent(final String name, final String version) {
         return eventFacade.listEvent(name, version);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.auth.api.ApexEditorAPI#deleteEvent(java.lang.String,
-     * java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult deleteEvent(final String name, final String version) {
         return eventFacade.deleteEvent(name, version);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.auth.api.ApexEditorAPI#validateEvent(java.lang.String,
-     * java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult validateEvent(final String name, final String version) {
         return eventFacade.validateEvent(name, version);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.model.modelapi.ApexEditorAPI#createEventPar(java.lang.String,
-     * java.lang.String, java.lang.String, java.lang.String, java.lang.String, boolean)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult createEventPar(final String name, final String version, final String parName,
@@ -350,34 +286,24 @@ public final class ApexModelImpl implements ApexModel {
         return eventFacade.createEventPar(name, version, parName, contextSchemaName, contextSchemaVersion, optional);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.auth.api.ApexEditorAPI#listEventPar(java.lang.String,
-     * java.lang.String, java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult listEventPar(final String name, final String version, final String parName) {
         return eventFacade.listEventPar(name, version, parName);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.auth.api.ApexEditorAPI#deleteEventPar(java.lang.String,
-     * java.lang.String, java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult deleteEventPar(final String name, final String version, final String parName) {
         return eventFacade.deleteEventPar(name, version, parName);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.model.modelapi.ApexEditorAPI#createContextAlbum(java.lang.String,
-     * java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String,
-     * java.lang.String, java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     // CHECKSTYLE:OFF: checkstyle:parameterNumber
@@ -390,12 +316,8 @@ public final class ApexModelImpl implements ApexModel {
     }
     // CHECKSTYLE:ON: checkstyle:parameterNumber
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.model.modelapi.ApexEditorAPI#updateContextAlbum(java.lang.String,
-     * java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String,
-     * java.lang.String, java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     // CHECKSTYLE:OFF: checkstyle:parameterNumber
     @Override
@@ -408,44 +330,32 @@ public final class ApexModelImpl implements ApexModel {
     }
     // CHECKSTYLE:ON: checkstyle:parameterNumber
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.auth.api.ApexEditorAPI#listContextAlbum(java.lang.String,
-     * java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult listContextAlbum(final String name, final String version) {
         return contextAlbumFacade.listContextAlbum(name, version);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.auth.api.ApexEditorAPI#deleteContextAlbum(java.lang.String,
-     * java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult deleteContextAlbum(final String name, final String version) {
         return contextAlbumFacade.deleteContextAlbum(name, version);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.auth.api.ApexEditorAPI#validateContextAlbum(java.lang.String,
-     * java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult validateContextAlbum(final String name, final String version) {
         return contextAlbumFacade.validateContextAlbum(name, version);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.auth.api.ApexEditorAPI#createTask(java.lang.String,
-     * java.lang.String, java.lang.String, java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult createTask(final String name, final String version, final String uuid,
@@ -453,11 +363,8 @@ public final class ApexModelImpl implements ApexModel {
         return taskFacade.createTask(name, version, uuid, description);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.auth.api.ApexEditorAPI#updateTask(java.lang.String,
-     * java.lang.String, java.lang.String, java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult updateTask(final String name, final String version, final String uuid,
@@ -465,43 +372,32 @@ public final class ApexModelImpl implements ApexModel {
         return taskFacade.updateTask(name, version, uuid, description);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.auth.api.ApexEditorAPI#listTask(java.lang.String, java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult listTask(final String name, final String version) {
         return taskFacade.listTask(name, version);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.auth.api.ApexEditorAPI#deleteTask(java.lang.String,
-     * java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult deleteTask(final String name, final String version) {
         return taskFacade.deleteTask(name, version);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.auth.api.ApexEditorAPI#validateTask(java.lang.String,
-     * java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult validateTask(final String name, final String version) {
         return taskFacade.validateTask(name, version);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.auth.api.ApexEditorAPI#createTaskLogic(java.lang.String,
-     * java.lang.String, java.lang.String, java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult createTaskLogic(final String name, final String version, final String logicFlavour,
@@ -509,11 +405,8 @@ public final class ApexModelImpl implements ApexModel {
         return taskFacade.createTaskLogic(name, version, logicFlavour, logic);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.auth.api.ApexEditorAPI#updateTaskLogic(java.lang.String,
-     * java.lang.String, java.lang.String, java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult updateTaskLogic(final String name, final String version, final String logicFlavour,
@@ -521,33 +414,24 @@ public final class ApexModelImpl implements ApexModel {
         return taskFacade.updateTaskLogic(name, version, logicFlavour, logic);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.auth.api.ApexEditorAPI#listTaskLogic(java.lang.String,
-     * java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult listTaskLogic(final String name, final String version) {
         return taskFacade.listTaskLogic(name, version);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.auth.api.ApexEditorAPI#deleteTaskLogic(java.lang.String,
-     * java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult deleteTaskLogic(final String name, final String version) {
         return taskFacade.deleteTaskLogic(name, version);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.auth.api.ApexEditorAPI#createTaskInputField(java.lang.String,
-     * java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.boolean)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult createTaskInputField(final String name, final String version, final String fieldName,
@@ -555,33 +439,24 @@ public final class ApexModelImpl implements ApexModel {
         return taskFacade.createTaskInputField(name, version, fieldName, dataTypeName, dataTypeVersion, optional);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.auth.api.ApexEditorAPI#listTaskInputField(java.lang.String,
-     * java.lang.String, java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult listTaskInputField(final String name, final String version, final String fieldName) {
         return taskFacade.listTaskInputField(name, version, fieldName);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.auth.api.ApexEditorAPI#deleteTaskInputField(java.lang.String,
-     * java.lang.String, java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult deleteTaskInputField(final String name, final String version, final String fieldName) {
         return taskFacade.deleteTaskInputField(name, version, fieldName);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.auth.api.ApexEditorAPI#createTaskOutputField(java.lang.String,
-     * java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.boolean)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult createTaskOutputField(final String name, final String version, final String fieldName,
@@ -589,33 +464,24 @@ public final class ApexModelImpl implements ApexModel {
         return taskFacade.createTaskOutputField(name, version, fieldName, dataTypeName, dataTypeVersion, optional);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.auth.api.ApexEditorAPI#listTaskOutputField(java.lang.String,
-     * java.lang.String, java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult listTaskOutputField(final String name, final String version, final String fieldName) {
         return taskFacade.listTaskOutputField(name, version, fieldName);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.auth.api.ApexEditorAPI#deleteTaskOutputField(java.lang.String,
-     * java.lang.String, java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult deleteTaskOutputField(final String name, final String version, final String fieldName) {
         return taskFacade.deleteTaskOutputField(name, version, fieldName);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.auth.api.ApexEditorAPI#createTaskParameter(java.lang.String,
-     * java.lang.String, java.lang.String, java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult createTaskParameter(final String name, final String version, final String parName,
@@ -623,33 +489,24 @@ public final class ApexModelImpl implements ApexModel {
         return taskFacade.createTaskParameter(name, version, parName, defaultValue);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.auth.api.ApexEditorAPI#listTaskParameter(java.lang.String,
-     * java.lang.String, java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult listTaskParameter(final String name, final String version, final String parName) {
         return taskFacade.listTaskParameter(name, version, parName);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.auth.api.ApexEditorAPI#deleteTaskParameter(java.lang.String,
-     * java.lang.String, java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult deleteTaskParameter(final String name, final String version, final String parName) {
         return taskFacade.deleteTaskParameter(name, version, parName);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.auth.api.ApexEditorAPI#createTaskContextRef(java.lang.String,
-     * java.lang.String, java.lang.String, java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult createTaskContextRef(final String name, final String version, final String contextAlbumName,
@@ -657,11 +514,8 @@ public final class ApexModelImpl implements ApexModel {
         return taskFacade.createTaskContextRef(name, version, contextAlbumName, contextAlbumVersion);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.auth.api.ApexEditorAPI#listTaskContextRef(java.lang.String,
-     * java.lang.String, java.lang.String, java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult listTaskContextRef(final String name, final String version, final String contextAlbumName,
@@ -669,11 +523,8 @@ public final class ApexModelImpl implements ApexModel {
         return taskFacade.listTaskContextRef(name, version, contextAlbumName, contextAlbumVersion);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.auth.api.ApexEditorAPI#deleteTaskContextRef(java.lang.String,
-     * java.lang.String, java.lang.String, java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult deleteTaskContextRef(final String name, final String version, final String contextAlbumName,
@@ -681,11 +532,8 @@ public final class ApexModelImpl implements ApexModel {
         return taskFacade.deleteTaskContextRef(name, version, contextAlbumName, contextAlbumVersion);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.auth.api.ApexEditorAPI#createPolicy(java.lang.String,
-     * java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult createPolicy(final String name, final String version, final String template,
@@ -693,11 +541,8 @@ public final class ApexModelImpl implements ApexModel {
         return policyFacade.createPolicy(name, version, template, firstState, uuid, description);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.auth.api.ApexEditorAPI#updatePolicy(java.lang.String,
-     * java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult updatePolicy(final String name, final String version, final String template,
@@ -705,45 +550,32 @@ public final class ApexModelImpl implements ApexModel {
         return policyFacade.updatePolicy(name, version, template, firstState, uuid, description);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.auth.api.ApexEditorAPI#listPolicy(java.lang.String,
-     * java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult listPolicy(final String name, final String version) {
         return policyFacade.listPolicy(name, version);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.auth.api.ApexEditorAPI#deletePolicy(java.lang.String,
-     * java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult deletePolicy(final String name, final String version) {
         return policyFacade.deletePolicy(name, version);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.auth.api.ApexEditorAPI#validatePolicy(java.lang.String,
-     * java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult validatePolicy(final String name, final String version) {
         return policyFacade.validatePolicy(name, version);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.auth.api.ApexEditorAPI#createPolicyState(java.lang.String,
-     * java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String,
-     * java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult createPolicyState(final String name, final String version, final String stateName,
@@ -753,12 +585,8 @@ public final class ApexModelImpl implements ApexModel {
                 defaltTaskVersion);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.auth.api.ApexEditorAPI#updatePolicyState(java.lang.String,
-     * java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String,
-     * java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult updatePolicyState(final String name, final String version, final String stateName,
@@ -768,34 +596,24 @@ public final class ApexModelImpl implements ApexModel {
                 defaltTaskVersion);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.auth.api.ApexEditorAPI#listPolicyState(java.lang.String,
-     * java.lang.String, java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult listPolicyState(final String name, final String version, final String stateName) {
         return policyFacade.listPolicyState(name, version, stateName);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.auth.api.ApexEditorAPI#deletePolicyState(java.lang.String,
-     * java.lang.String, java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult deletePolicyState(final String name, final String version, final String stateName) {
         return policyFacade.deletePolicyState(name, version, stateName);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.onap.policy.apex.auth.api.ApexEditorAPI#createPolicyStateTaskSelectionLogic(java.lang.
-     * String, java.lang.String, java.lang.String, java.lang.String, java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult createPolicyStateTaskSelectionLogic(final String name, final String version,
@@ -803,12 +621,8 @@ public final class ApexModelImpl implements ApexModel {
         return policyFacade.createPolicyStateTaskSelectionLogic(name, version, stateName, logicFlavour, logic);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.onap.policy.apex.auth.api.ApexEditorAPI#updatePolicyStateTaskSelectionLogic(java.lang.
-     * String, java.lang.String, java.lang.String, java.lang.String, java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult updatePolicyStateTaskSelectionLogic(final String name, final String version,
@@ -816,11 +630,8 @@ public final class ApexModelImpl implements ApexModel {
         return policyFacade.updatePolicyStateTaskSelectionLogic(name, version, stateName, logicFlavour, logic);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.auth.api.ApexEditorAPI#listPolicyStateTaskSelectionLogic(java.lang.
-     * String, java.lang.String, java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult listPolicyStateTaskSelectionLogic(final String name, final String version,
@@ -828,12 +639,8 @@ public final class ApexModelImpl implements ApexModel {
         return policyFacade.listPolicyStateTaskSelectionLogic(name, version, stateName);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.onap.policy.apex.auth.api.ApexEditorAPI#deletePolicyStateTaskSelectionLogic(java.lang.
-     * String, java.lang.String, java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult deletePolicyStateTaskSelectionLogic(final String name, final String version,
@@ -841,12 +648,8 @@ public final class ApexModelImpl implements ApexModel {
         return policyFacade.deletePolicyStateTaskSelectionLogic(name, version, stateName);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.auth.api.ApexEditorAPI#createPolicyStateOutput(java.lang.String,
-     * java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String,
-     * java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult createPolicyStateOutput(final String name, final String version, final String stateName,
@@ -855,11 +658,8 @@ public final class ApexModelImpl implements ApexModel {
                 nextState);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.auth.api.ApexEditorAPI#listPolicyStateOutput(java.lang.String,
-     * java.lang.String, java.lang.String, java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult listPolicyStateOutput(final String name, final String version, final String stateName,
@@ -867,11 +667,8 @@ public final class ApexModelImpl implements ApexModel {
         return policyFacade.listPolicyStateOutput(name, version, stateName, outputName);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.auth.api.ApexEditorAPI#deletePolicyStateOutput(java.lang.String,
-     * java.lang.String, java.lang.String, java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult deletePolicyStateOutput(final String name, final String version, final String stateName,
@@ -879,13 +676,8 @@ public final class ApexModelImpl implements ApexModel {
         return policyFacade.deletePolicyStateOutput(name, version, stateName, outputName);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.onap.policy.apex.core.modelapi.ApexEditorAPI#createPolicyStateFinalizerLogic(java.lang.
-     * String, java.lang.String, java.lang.String, java.lang.String, java.lang.String,
-     * java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult createPolicyStateFinalizerLogic(final String name, final String version,
@@ -894,13 +686,8 @@ public final class ApexModelImpl implements ApexModel {
                 logic);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.onap.policy.apex.core.modelapi.ApexEditorAPI#updatePolicyStateFinalizerLogic(java.lang.
-     * String, java.lang.String, java.lang.String, java.lang.String, java.lang.String,
-     * java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult updatePolicyStateFinalizerLogic(final String name, final String version,
@@ -909,12 +696,8 @@ public final class ApexModelImpl implements ApexModel {
                 logic);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.onap.policy.apex.core.modelapi.ApexEditorAPI#listPolicyStateFinalizerLogic(java.lang.
-     * String, java.lang.String, java.lang.String, java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult listPolicyStateFinalizerLogic(final String name, final String version, final String stateName,
@@ -922,12 +705,8 @@ public final class ApexModelImpl implements ApexModel {
         return policyFacade.listPolicyStateFinalizerLogic(name, version, stateName, finalizerLogicName);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.onap.policy.apex.core.modelapi.ApexEditorAPI#deletePolicyStateFinalizerLogic(java.lang.
-     * String, java.lang.String, java.lang.String, java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult deletePolicyStateFinalizerLogic(final String name, final String version,
@@ -935,13 +714,8 @@ public final class ApexModelImpl implements ApexModel {
         return policyFacade.deletePolicyStateFinalizerLogic(name, version, stateName, finalizerLogicName);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.onap.policy.apex.core.modelapi.ApexEditorAPI#createPolicyStateTaskRef(java.lang.String,
-     * java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String,
-     * java.lang.String, java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     // CHECKSTYLE:OFF: checkstyle:parameterNumber
@@ -954,11 +728,8 @@ public final class ApexModelImpl implements ApexModel {
     }
     // CHECKSTYLE:ON: checkstyle:parameterNumber
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.auth.api.ApexEditorAPI#listPolicyStateTaskRef(java.lang.String,
-     * java.lang.String, java.lang.String, java.lang.String, java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult listPolicyStateTaskRef(final String name, final String version, final String stateName,
@@ -966,11 +737,8 @@ public final class ApexModelImpl implements ApexModel {
         return policyFacade.listPolicyStateTaskRef(name, version, stateName, taskName, taskVersion);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.auth.api.ApexEditorAPI#deletePolicyStateTaskRef(java.lang.String,
-     * java.lang.String, java.lang.String, java.lang.String, java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult deletePolicyStateTaskRef(final String name, final String version, final String stateName,
@@ -978,12 +746,8 @@ public final class ApexModelImpl implements ApexModel {
         return policyFacade.deletePolicyStateTaskRef(name, version, stateName, taskName, taskVersion);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.onap.policy.apex.auth.api.ApexEditorAPI#createPolicyStateContextRef(java.lang.String,
-     * java.lang.String, java.lang.String, java.lang.String, java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult createPolicyStateContextRef(final String name, final String version, final String stateName,
@@ -992,11 +756,8 @@ public final class ApexModelImpl implements ApexModel {
                 contextAlbumVersion);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.auth.api.ApexEditorAPI#listPolicyStateContextRef(java.lang.String,
-     * java.lang.String, java.lang.String, java.lang.String, java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult listPolicyStateContextRef(final String name, final String version, final String stateName,
@@ -1004,12 +765,8 @@ public final class ApexModelImpl implements ApexModel {
         return policyFacade.listPolicyStateContextRef(name, version, stateName, contextAlbumName, contextAlbumVersion);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.onap.policy.apex.auth.api.ApexEditorAPI#deletePolicyStateContextRef(java.lang.String,
-     * java.lang.String, java.lang.String, java.lang.String, java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult deletePolicyStateContextRef(final String name, final String version, final String stateName,
@@ -1018,20 +775,16 @@ public final class ApexModelImpl implements ApexModel {
                 contextAlbumVersion);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.core.modelapi.ApexModel#loadFromString(java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult loadFromString(final String modelString) {
         return modelHandlerFacade.loadFromString(modelString);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.auth.api.ApexModel#loadFromFile(java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     // CHECKSTYLE:OFF: checkstyle:HiddenField
@@ -1041,10 +794,8 @@ public final class ApexModelImpl implements ApexModel {
     }
     // CHECKSTYLE:ON: checkstyle:HiddenField
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.auth.api.ApexModel#saveToFile(java.lang.String, boolean)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult saveToFile(final String saveFileName, final boolean xmlFlag) {
@@ -1055,11 +806,8 @@ public final class ApexModelImpl implements ApexModel {
         }
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.model.modelapi.ApexModel#loadFromDatabase(java.lang.String,
-     * java.lang.String, org.onap.policy.apex.model.basicmodel.dao.DaoParameters)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult loadFromDatabase(final String modelName, final String modelVersion,
@@ -1067,72 +815,56 @@ public final class ApexModelImpl implements ApexModel {
         return modelHandlerFacade.loadFromDatabase(modelName, modelVersion, daoParameters);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.model.modelapi.ApexModel#saveToDatabase(org.onap.policy.apex.model.
-     * basicmodel. dao.DaoParameters)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult saveToDatabase(final DaoParameters daoParameters) {
         return modelHandlerFacade.saveToDatabase(daoParameters);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.auth.api.ApexModel#readFromURL(java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult readFromUrl(final String urlString) {
         return modelHandlerFacade.readFromUrl(urlString);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.auth.api.ApexModel#writeToURL(java.lang.String, boolean)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult writeToUrl(final String urlString, final boolean xmlFlag) {
         return modelHandlerFacade.writeToUrl(urlString, xmlFlag);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.auth.api.ApexModel#analyse()
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult analyse() {
         return modelHandlerFacade.analyse();
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.auth.api.ApexModel#validate()
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult validate() {
         return modelHandlerFacade.validate();
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.auth.api.ApexModel#compare(java.lang.String, boolean, boolean)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult compare(final String otherModelFileName, final boolean diffsOnly, final boolean keysOnly) {
         return modelHandlerFacade.compare(otherModelFileName, diffsOnly, keysOnly);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.core.modelapi.ApexModel#compareWithString(java.lang.String,
-     * boolean, boolean)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult compareWithString(final String otherModelString, final boolean diffsOnly,
@@ -1140,72 +872,56 @@ public final class ApexModelImpl implements ApexModel {
         return modelHandlerFacade.compareWithString(otherModelString, diffsOnly, keysOnly);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.auth.api.ApexModel#split(java.lang.String, java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult split(final String targetModelFileName, final String splitOutPolicies) {
         return modelHandlerFacade.split(targetModelFileName, splitOutPolicies);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.core.modelapi.ApexModel#split(java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult split(final String splitOutPolicies) {
         return modelHandlerFacade.split(splitOutPolicies);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.auth.api.ApexModel#merge(java.lang.String, boolean)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult merge(final String mergeInModelFileName, final boolean keepOriginal) {
         return modelHandlerFacade.merge(mergeInModelFileName, keepOriginal);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.core.modelapi.ApexModel#mergeWithString(java.lang.String, boolean)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public ApexApiResult mergeWithString(final String otherModelString, final boolean keepOriginal) {
         return modelHandlerFacade.mergeWithString(otherModelString, keepOriginal);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.auth.api.ApexModel#getModel()
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public AxPolicyModel getPolicyModel() {
         return policyModel;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.onap.policy.apex.auth.api.ApexModel#setPolicyModel(org.onap.policy.apex.core.policymodel.
-     * concepts.AxPolicyModel)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public void setPolicyModel(final AxPolicyModel policyModel) {
         this.policyModel = policyModel;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.core.modelapi.ApexModel#build()
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public AxPolicyModel build() {