Fix PMD errors in REST API framework

Also refactored error catalog to get rid of a useless wrapper
class.

Change-Id: I0d4b190703b85cdea91da00e7f238538e7c115ec
diff --git a/src/main/java/net/onrc/onos/api/rest/RestErrorCatalogEntry.java b/src/main/java/net/onrc/onos/api/rest/RestErrorCatalogEntry.java
index 96b3eea..f4900a3 100644
--- a/src/main/java/net/onrc/onos/api/rest/RestErrorCatalogEntry.java
+++ b/src/main/java/net/onrc/onos/api/rest/RestErrorCatalogEntry.java
@@ -12,7 +12,7 @@
 
 public final class RestErrorCatalogEntry {
 
-    private final RestErrorCodes.RestErrorCode code;
+    private final RestErrorCode code;
     private final String summary;
     private final String descriptionFormatString;
 
@@ -23,7 +23,7 @@
      * @param newSummary short summary for the new error
      * @param newDescriptionFormatString formatable description for the new error
      */
-    public RestErrorCatalogEntry(final RestErrorCodes.RestErrorCode newCode,
+    public RestErrorCatalogEntry(final RestErrorCode newCode,
                                  final String newSummary,
                                  final String newDescriptionFormatString) {
         code = newCode;
@@ -45,7 +45,7 @@
      *
      * @return unique code
      */
-    public RestErrorCodes.RestErrorCode getCode() {
+    public RestErrorCode getCode() {
         return code;
     }