diff options
| author |   Pamela Dragosh <pdragosh@research.att.com> | 2019-10-22 07:53:44 -0400 |
|---|---|---|
| committer | Pamela Dragosh <pdragosh@research.att.com> | 2019-10-23 13:33:56 -0400 |
| commit | 1e61676b77dd09659027b8984f050df7e8538526 (patch) | |
| tree | 115053dba12b4b27a0f92de0e7648a672a66893a /PolicyEngineUtils/src/main/java/org | |
| parent | f18fbfc026de9cf02126f57844c37abfee607394 (diff) | |
Consolidate PolicyRestAdapter setup
Put common code into PolicyEngineUtils that the controllers use to
populate the PolicyRestController.
Also some more sonar cleanup and formatting of XML files.
Shortened 120 line characters. Removed some trailing spaces
from comments.
Fixed up one JUnit.
Licenses.
Issue-ID: POLICY-2133
Change-Id: Id7d8ac3ab60331535f048ec0f26aeb17a099414e
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
Diffstat (limited to 'PolicyEngineUtils/src/main/java/org')
| -rw-r--r-- | PolicyEngineUtils/src/main/java/org/onap/policy/utils/AAFPolicyClient.java | 7 | ||||
| -rw-r--r-- | PolicyEngineUtils/src/main/java/org/onap/policy/utils/PolicyUtils.java | 5 |
2 files changed, 11 insertions, 1 deletions
diff --git a/PolicyEngineUtils/src/main/java/org/onap/policy/utils/AAFPolicyClient.java b/PolicyEngineUtils/src/main/java/org/onap/policy/utils/AAFPolicyClient.java index ab87bc093..236f01eff 100644 --- a/PolicyEngineUtils/src/main/java/org/onap/policy/utils/AAFPolicyClient.java +++ b/PolicyEngineUtils/src/main/java/org/onap/policy/utils/AAFPolicyClient.java @@ -33,6 +33,13 @@ public interface AAFPolicyClient { public boolean checkPerm(String userName, String pass, String type, String instance, String action); + /** + * getInstance. + * + * @param properties Properties + * @return AAFPolicyClient + * @throws AAFPolicyException AAFPolicyException + */ public static AAFPolicyClient getInstance(Properties properties) throws AAFPolicyException { try { Class<?> aafPolicyClient = Class diff --git a/PolicyEngineUtils/src/main/java/org/onap/policy/utils/PolicyUtils.java b/PolicyEngineUtils/src/main/java/org/onap/policy/utils/PolicyUtils.java index 9c1294540..7d70da2f7 100644 --- a/PolicyEngineUtils/src/main/java/org/onap/policy/utils/PolicyUtils.java +++ b/PolicyEngineUtils/src/main/java/org/onap/policy/utils/PolicyUtils.java @@ -53,11 +53,14 @@ import org.xml.sax.XMLReader; public class PolicyUtils { private static final Logger LOGGER = FlexLogger.getLogger(PolicyUtils.class); + private static final String PACKAGE_ERROR = "mismatched input '{' expecting one of the following tokens: '[package"; + public static final String CATCH_EXCEPTION = "PE500: An exception was caught."; public static final String EMAIL_PATTERN = "^[_A-Za-z0-9-\\+]+(\\.[_A-Za-z0-9-]+)*@" + "[A-Za-z0-9-]+(\\.[A-Za-z0-9]+)*(\\.[A-Za-z]{2,})$"; - private static final String PACKAGE_ERROR = "mismatched input '{' expecting one of the following tokens: '[package"; public static final String SUCCESS = "success"; + public static final String CHARACTER_ENCODING = "UTF-8"; + public static final String APPLICATION_JSON = "application/json"; private PolicyUtils() { // Private Constructor |