policy/common.git
5 years agoProvide access to HttpClient's WebTarget 92/102792/2
Jim Hahn [Tue, 3 Mar 2020 00:13:16 +0000 (19:13 -0500)]
Provide access to HttpClient's WebTarget

Issue-ID: POLICY-2349
Signed-off-by: Jim Hahn <jrh3@att.com>
Change-Id: Iad10c3b6d77f859235c9e63f3fc0693bd9ba3c27

5 years agoAdding DefaultServlet to support static resources 83/102283/4
Hengye [Tue, 25 Feb 2020 02:43:40 +0000 (10:43 +0800)]
Adding DefaultServlet to support static resources

Adding DefaultServlet to make embeded jetty not only
support Jersey, but also support static resources, like
html, css and js.

Issue-ID: POLICY-2311
Signed-off-by: Hengye <yehui.wang@est.tech>
Change-Id: I71309036627d75dcc56947b395688a4e2f22c0ce

5 years agoFixes to support dependency upgrade 29/102229/3
Pamela Dragosh [Mon, 24 Feb 2020 12:38:20 +0000 (07:38 -0500)]
Fixes to support dependency upgrade

Uped the time for Thread.sleep due to new http core dependency. It
seems to randomly timeout inconsistently due to that upgrade.

Google gson seems to have changed its layout. Did not see any
problems with the other repos.

Issue-ID: POLICY-2381
Change-Id: Id2a9bfffd42a2c713af042bd2a8cc4abafba2d9f
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
5 years agoAdd convert() to Coder 47/101847/1
Jim Hahn [Mon, 17 Feb 2020 18:21:08 +0000 (13:21 -0500)]
Add convert() to Coder

This addresses Liam's review comment about moving the "translate"
method from the actor Util class into policy-common.
Added a method to Coder to convert from one object type to
another (e.g., from a Map to a POJO, or vice versa).

Issue-ID: POLICY-2363
Signed-off-by: Jim Hahn <jrh3@att.com>
Change-Id: I2a0b5ab4ce4b0eeda216a57cbe23a8bb64f64940

5 years agoMerge "Allow storing REST servers password and userName in environment variables"
Jim Hahn [Mon, 17 Feb 2020 17:00:55 +0000 (17:00 +0000)]
Merge "Allow storing REST servers password and userName in environment variables"

5 years agoAllow storing REST servers password and userName in environment variables 37/101837/2
Dominik Mizyn [Mon, 17 Feb 2020 14:23:43 +0000 (15:23 +0100)]
Allow storing REST servers password and userName in environment variables

This patch allows to store and get REST servers password and userName from
environment variables. This is needed if we want to send those
variables by helm secrets.

Issue-ID: OOM-2287
Change-Id: I4d6a8bf188a0d17e5444137d871dd341627ec397
Signed-off-by: Dominik Mizyn <d.mizyn@samsung.com>
5 years agoAdd PseudoExecutor to utils-test 65/101765/2
Jim Hahn [Fri, 14 Feb 2020 21:29:11 +0000 (16:29 -0500)]
Add PseudoExecutor to utils-test

Moved MyExec from actors package to policy-common/utils-test,
renaming it to PseudoExecutor.

Updated per review comment(s):
- declare "task" of type "Queue" instead of "LinkedList"

Issue-ID: POLICY-2363
Signed-off-by: Jim Hahn <jrh3@att.com>
Change-Id: I40049ca52defecc4f3f7479470c28da58521866d

5 years agoAdded BidirectionalTopicClient to policy-common 52/101752/3
Jim Hahn [Fri, 14 Feb 2020 16:15:13 +0000 (11:15 -0500)]
Added BidirectionalTopicClient to policy-common

Added review comments:
- check for too many topic sources

Issue-ID: POLICY-2363
Signed-off-by: Jim Hahn <jrh3@att.com>
Change-Id: I89f34c4f756fb0c938dd7dda5896f3426cfc7ac2

5 years agoMerge "Add headers to asynchronous get in HttpClient"
Ram Krishna Verma [Mon, 10 Feb 2020 15:58:04 +0000 (15:58 +0000)]
Merge "Add headers to asynchronous get in HttpClient"

5 years agoAdd enhancements to standard coder 26/101426/3
Jim Hahn [Sat, 8 Feb 2020 18:02:02 +0000 (13:02 -0500)]
Add enhancements to standard coder

Added support for array indices in StandardCoderObject getString().
Also made it Serializable.

Issue-ID: POLICY-1625
Signed-off-by: Jim Hahn <jrh3@att.com>
Change-Id: Ia514aed96fdfe7f635c5a6dc3e1f90939654d383

5 years agoAdd headers to asynchronous get in HttpClient 27/101427/1
Jim Hahn [Sat, 8 Feb 2020 19:16:15 +0000 (14:16 -0500)]
Add headers to asynchronous get in HttpClient

Issue-ID: POLICY-1625
Signed-off-by: Jim Hahn <jrh3@att.com>
Change-Id: I61ef2fcfde5eb361652d2d6e3f55324af7ca7b4e

5 years agoMerge "Fix ResourceUtilsTest junit"
Pamela Dragosh [Mon, 3 Feb 2020 12:23:15 +0000 (12:23 +0000)]
Merge "Fix ResourceUtilsTest junit"

5 years agoMerge "Add pretty() method to Coder"
Pamela Dragosh [Mon, 3 Feb 2020 12:22:59 +0000 (12:22 +0000)]
Merge "Add pretty() method to Coder"

5 years agoAdd pretty() method to Coder 87/100987/3
Jim Hahn [Fri, 31 Jan 2020 16:15:44 +0000 (11:15 -0500)]
Add pretty() method to Coder

"Pretty" JSON is often needed, so added Coder.pretty() to facilitate
that.
Incorporated review comment(s):
- changed pretty() to encode(object, pretty)

Issue-ID: POLICY-1625
Signed-off-by: Jim Hahn <jrh3@att.com>
Change-Id: I180fa6de416836008bf1c410132ae30f4dde9271

5 years agoFix ResourceUtilsTest junit 88/100988/1
Jim Hahn [Fri, 31 Jan 2020 17:03:08 +0000 (12:03 -0500)]
Fix ResourceUtilsTest junit

The junit for ResourceUtilsTest fails when run on a non-linux box due
to the different path separator.  Modified the test to normalize path
names before making comparisons.

Issue-ID: POLICY-1625
Signed-off-by: Jim Hahn <jrh3@att.com>
Change-Id: I58db71155d30b379e20e7c46bedfc6d79e26b6cb

5 years agoAdd async support to HttpClient 79/100979/2
Jim Hahn [Fri, 31 Jan 2020 14:42:04 +0000 (09:42 -0500)]
Add async support to HttpClient

Issue-ID: POLICY-1625
Signed-off-by: Jim Hahn <jrh3@att.com>
Change-Id: I0123b98e89b734efd264dd62080bb23573a7a3e6

5 years agoAdd Configurable to common/capabilities 67/100967/1
Jim Hahn [Fri, 31 Jan 2020 00:15:01 +0000 (19:15 -0500)]
Add Configurable to common/capabilities

Issue-ID: POLICY-1625
Signed-off-by: Jim Hahn <jrh3@att.com>
Change-Id: Iab0ce1ba0c478d646546d02734228ef97d58b4c4

5 years agoMerge "Add a bean validator"
Pamela Dragosh [Thu, 30 Jan 2020 15:38:57 +0000 (15:38 +0000)]
Merge "Add a bean validator"

5 years agoAdd a bean validator 23/100923/3
Jim Hahn [Thu, 30 Jan 2020 05:11:26 +0000 (00:11 -0500)]
Add a bean validator

Added a bean validator that will validate the fields within an arbitrary
object using the annotations in the parameters package.
Also added validateMap to the bean validators.

Issue-ID: POLICY-1625
Signed-off-by: Jim Hahn <jrh3@att.com>
Change-Id: I2192f3d1ba735d3779c35711a7dba053918aa547

5 years agoConvert double to int when decoding JSON 19/100919/2
Jim Hahn [Wed, 29 Jan 2020 22:21:24 +0000 (17:21 -0500)]
Convert double to int when decoding JSON

When decoding straight into a List or Map class, StandardCoder was not
applying the double-to-int conversion.  Fixed it.

Issue-ID: POLICY-1625
Signed-off-by: Jim Hahn <jrh3@att.com>
Change-Id: I939e3378645d45ac98d2bca6b2a4076870a05626

5 years agoSchema validation extension to StandardCoder 14/100814/6
jhh [Mon, 27 Jan 2020 12:45:07 +0000 (06:45 -0600)]
Schema validation extension to StandardCoder

Issue-ID: POLICY-2331
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Change-Id: Ic3e8d21715d17a61ea5d07740dd9f4dd0dbb8641
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
5 years agoMerge "Create path to text file being created"
Liam Fallon [Thu, 23 Jan 2020 13:35:07 +0000 (13:35 +0000)]
Merge "Create path to text file being created"

5 years agoCreate path to text file being created 17/100617/1
liamfallon [Wed, 22 Jan 2020 17:51:26 +0000 (17:51 +0000)]
Create path to text file being created

If you try and write to a file where part of the pat does not exist,
that path should be created.

Issue-ID: POLICY-1581
Change-Id: Ifb7a4ff4e1804814b6679956f0c58d5ac026c4a4
Signed-off-by: liamfallon <liam.fallon@est.tech>
5 years agoReplace deprecated Nashorn javascript engine 19/100519/2
Jim Hahn [Mon, 20 Jan 2020 22:39:32 +0000 (17:39 -0500)]
Replace deprecated Nashorn javascript engine

Some test drivers use javascript to evaluate expected results.
In java 8, the standard javascript engine was Nashorn, but that has
been deprecated.  As the test scripts use a simple xxx.yyy.zzz notation,
decided to go with a small expression language, Apache JEXL, instead.

Issue-ID: POLICY-2324
Signed-off-by: Jim Hahn <jrh3@att.com>
Change-Id: Iffff468a880c612bdb31da84964dfa4132fa15e3

5 years agoSonar cleanup overrides and fixes 90/100290/2
Pamela Dragosh [Tue, 14 Jan 2020 18:51:12 +0000 (13:51 -0500)]
Sonar cleanup overrides and fixes

Removal of UTF-8 because its already set
capabilities doesn't generate any code, no need to include
override false positives for passwords etc.
override for logging and exception throw that we want
add synchronized to overrides that are synchronized
ignore checking of some conditions
adding synchronized to match set* methods

Issue-ID: POLICY-2321
Change-Id: I26d9ca22a0cdd67fdaae9c44b718b8dc103f190e
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
5 years agoMerge "Changed Matchers to ArgumentMatchers"
Pamela Dragosh [Tue, 14 Jan 2020 12:35:41 +0000 (12:35 +0000)]
Merge "Changed Matchers to ArgumentMatchers"

5 years agoAdd method to return resource directory contents 14/100214/4
liamfallon [Fri, 10 Jan 2020 20:27:22 +0000 (20:27 +0000)]
Add method to return resource directory contents

In order to avoid hard coding the policy types and policies that are in
the example directories into unit test cases, and in order to
automatically pick up added and removed policy types and policies, it
would be good to read the contents of resource directories at run time
in unit tests. This change brings in that functionality into
ResourceUtils.

Issue-ID: POLICY-2315
Change-Id: I601718828aad0f065dbbaa1f5af8d0a0f133f44d
Signed-off-by: liamfallon <liam.fallon@est.tech>
5 years agoChanged Matchers to ArgumentMatchers 27/100227/2
Jim Hahn [Fri, 10 Jan 2020 22:20:07 +0000 (17:20 -0500)]
Changed Matchers to ArgumentMatchers

Issue-ID: POLICY-1406
Signed-off-by: Jim Hahn <jrh3@att.com>
Change-Id: I6d85bb10c15f9d82fa55d9328d18640098050dd9

5 years agoMerge "Update sonar configuration"
Ram Krishna Verma [Mon, 13 Jan 2020 12:56:55 +0000 (12:56 +0000)]
Merge "Update sonar configuration"

5 years agoMerge "Address items deprecated by move to java 11"
Ram Krishna Verma [Mon, 13 Jan 2020 12:55:56 +0000 (12:55 +0000)]
Merge "Address items deprecated by move to java 11"

5 years agoFix mockito import in common 26/100226/2
Jim Hahn [Fri, 10 Jan 2020 21:59:48 +0000 (16:59 -0500)]
Fix mockito import in common

ONAP-Logging was failing when using powermock-mockito2.
This change also requires a property (version.javax.bind) to be
added to the parent/integration pom.

Issue-ID: POLICY-1406
Signed-off-by: Jim Hahn <jrh3@att.com>
Change-Id: If8813edaf86d84cff72c0e476ebf2a36bf5dcf18

5 years agoUpdate sonar configuration 69/100169/3
Pamela Dragosh [Fri, 10 Jan 2020 01:26:46 +0000 (20:26 -0500)]
Update sonar configuration

Sonarcloud upgrade resulted in new configuration property
Removed deprecated properties
No need for plugin configuration override of oparent

Issue-ID: POLICY-2321
Change-Id: Ia294575d2ea0a589eab6797b48b8c1924f9f1b36
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
5 years agoAddress items deprecated by move to java 11 08/100208/4
Jim Hahn [Fri, 10 Jan 2020 16:30:21 +0000 (11:30 -0500)]
Address items deprecated by move to java 11

Addressed the following deprecated items:
- "new Integer(xxx)"
- Observable/Observer
- Mockito.anyObject()

Added assertion to a junit test to address a sonar issue.

Did not address deprecated Nashorn javascript interpreter; that will be
done in a separate review.

Updated licenses.

Issue-ID: POLICY-1406
Signed-off-by: Jim Hahn <jrh3@att.com>
Change-Id: I81fd158f831e01d5410d79898ced658285787d47

5 years agopolicy/common jdk11 upgrades 42/100142/1
HOCKLA [Thu, 9 Jan 2020 17:48:49 +0000 (11:48 -0600)]
policy/common jdk11 upgrades

Issue-ID: POLICY-1583
Change-Id: I6bcd320a6cdedd84dad9b54fdb4fec0cb8443b44
Signed-off-by: HOCKLA <ah999m@att.com>
5 years agoUpdate policy common for checkstyle 8 51/99651/2
liamfallon [Thu, 12 Dec 2019 14:11:28 +0000 (14:11 +0000)]
Update policy common for checkstyle 8

Minor changes to clear down checkstyle warnings in policy common.

Issue-ID: POLICY-206
Change-Id: Ifa6753bafdc4b2a9ee0725c4f3751c6eac03e096
Signed-off-by: liamfallon <liam.fallon@est.tech>
5 years agoAdded JDK 11 upgrades and point to parent java 11 branch 02/99502/3
HOCKLA [Wed, 11 Dec 2019 16:24:44 +0000 (10:24 -0600)]
Added JDK 11 upgrades and point to parent java 11 branch

Issue-ID: POLICY-1583
Change-Id: Ic46ffcb6eb5b0d18f9cb0a6a2ec46374e523f54a
Signed-off-by: HOCKLA <ah999m@att.com>
5 years agoMerge "Minor changes for new Eclipse checkstyle checks"
Pamela Dragosh [Fri, 6 Dec 2019 21:47:40 +0000 (21:47 +0000)]
Merge "Minor changes for new Eclipse checkstyle checks"

5 years agoBumped policy/common patch version to 1.6.2-SNAPSHOT 78/99278/2
HOCKLA [Fri, 6 Dec 2019 20:29:46 +0000 (14:29 -0600)]
Bumped policy/common patch version to 1.6.2-SNAPSHOT

Issue-ID: POLICY-1583
Change-Id: I4a1c5848f158d10b4b6f21f048f92d69ccc90a83
Signed-off-by: HOCKLA <ah999m@att.com>
5 years agoRelease 1.6.1 policy/common 69/99269/1
HOCKLA [Fri, 6 Dec 2019 17:16:11 +0000 (11:16 -0600)]
Release 1.6.1 policy/common

This is a re-release, previous release wasn't pointing to
an already installed release

Issue-ID: POLICY-1583
Change-Id: I613dd5a78b439b60455be58b476204e422ebbf02
Signed-off-by: HOCKLA <ah999m@att.com>
5 years agoPoint to 3.1.0 policy/parent to prep for re-release 67/99267/1
HOCKLA [Fri, 6 Dec 2019 15:56:15 +0000 (09:56 -0600)]
Point to 3.1.0 policy/parent to prep for re-release

Issue-ID: POLICY-1583
Change-Id: I1c65a4478d1121b863d29388bd3a7047d92ff5ea
Signed-off-by: HOCKLA <ah999m@att.com>
5 years agoMinor changes for new Eclipse checkstyle checks 33/99133/7
liamfallon [Wed, 4 Dec 2019 10:24:58 +0000 (10:24 +0000)]
Minor changes for new Eclipse checkstyle checks

The laest Eclipse checkstyle version 8.26.0 does more thorough checking
and identified a number of small issues in the apex-pdp codebase. This
review fixes those issues.

logging pattern in logback.xml files amended to be less than 120
characters. Test case added for checking parameter is valid.

Issue-ID: POLICY-2204
Change-Id: Id7293e44b56c225afc6290e1c599603e9ebedb19
Signed-off-by: liamfallon <liam.fallon@est.tech>
5 years agoChanged project version to 1.6.1-SNAPSHOT to isolate for java 11 upgrades 07/99207/1
HOCKLA [Thu, 5 Dec 2019 13:25:42 +0000 (07:25 -0600)]
Changed project version to 1.6.1-SNAPSHOT to isolate for java 11 upgrades

Issue-ID: POLICY-1583
Change-Id: I805ebed75e7e0cb5109946328958341018421aad
Signed-off-by: HOCKLA <ah999m@att.com>
5 years agoAdded a yaml file to release 1.6.0 policy/common 50/99150/2
HOCKLA [Wed, 4 Dec 2019 14:53:28 +0000 (08:53 -0600)]
Added a yaml file to release 1.6.0 policy/common

Issue-ID: POLICY-1583
Change-Id: I20b608a6674a4496e5aa20fa3c26da2a275a289d
Signed-off-by: HOCKLA <ah999m@att.com>
5 years agoMake jersey-hk2 dependency non-test 13/97913/1
liamfallon [Mon, 4 Nov 2019 14:30:14 +0000 (14:30 +0000)]
Make jersey-hk2 dependency non-test

THis change will amke this dependency available to all components when
using policy-endopints.

Issue-ID: POLICY-2209
Change-Id: Ie3c6ca9d21327bdc54b5f14d64c41eed329941ad
Signed-off-by: liamfallon <liam.fallon@est.tech>
5 years agoAdd common Jersey version 44/97844/2
liamfallon [Fri, 1 Nov 2019 11:21:54 +0000 (11:21 +0000)]
Add common Jersey version

Add a common version of Jersey for all Policy Framework components.

Issue-ID: POLICY-2209
Change-Id: I8554a97e9f13887418118966bfe1043b65d9a179
Signed-off-by: liamfallon <liam.fallon@est.tech>
5 years agoFix new sonar issues in common 04/97704/2
Jim Hahn [Tue, 29 Oct 2019 19:02:25 +0000 (15:02 -0400)]
Fix new sonar issues in common

Issue-ID: POLICY-2204
Signed-off-by: Jim Hahn <jrh3@att.com>
Change-Id: If0a11913f614e038ecd3e8c3f0b56d3ac78b03ec
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoMerge "Cleanup eclipse warnings in common"
Jorge Hernandez [Tue, 29 Oct 2019 17:45:34 +0000 (17:45 +0000)]
Merge "Cleanup eclipse warnings in common"

5 years agoCleanup eclipse warnings in common 97/97697/1
Jim Hahn [Tue, 29 Oct 2019 16:44:35 +0000 (12:44 -0400)]
Cleanup eclipse warnings in common

Issue-ID: POLICY-2204
Signed-off-by: Jim Hahn <jrh3@att.com>
Change-Id: If55ea1a804997ab751f15813e6b643572d4f189f

5 years agoDisable HTML escaping in gson coders 77/97677/2
Jim Hahn [Tue, 29 Oct 2019 13:47:44 +0000 (09:47 -0400)]
Disable HTML escaping in gson coders

Issue-ID: POLICY-1869
Signed-off-by: Jim Hahn <jrh3@att.com>
Change-Id: Ic757d3a8e7e0e3537ecba979a919b9ea3c1aa797
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoIntegrate CryptoUtils into ONAP common 23/97423/6
Chou, Joseph (jc2555) [Tue, 22 Oct 2019 13:47:21 +0000 (09:47 -0400)]
Integrate CryptoUtils into ONAP common

Update junit to add test cases

Change-Id: If3236853138a05faac5f51a859b935265c14f0d6
Issue-ID: POLICY-1945
Signed-off-by: Chou, Joseph (jc2555) <jc2555@att.com>
5 years agoAdd CryptoCoder interface 78/97378/3
jhh [Mon, 21 Oct 2019 14:08:11 +0000 (09:08 -0500)]
Add CryptoCoder interface

This is to allow multiple supporting implementations.

Issue-ID: POLICY-1945
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Change-Id: I42491e5671f561fe320f034bf8ffe03848dff43f
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
5 years agoRemoved unthrown checked exceptions from CryptoUtils. 28/97228/1
jhh [Thu, 17 Oct 2019 02:25:57 +0000 (21:25 -0500)]
Removed unthrown checked exceptions from CryptoUtils.

additional minor javadoc clean up

Issue-ID: POLICY-1945
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Change-Id: I23927b8c4dd63ed658e8062c87b4884ea1d31825

5 years agoEliminate constructors with side-effects 55/95755/1
Jim Hahn [Mon, 16 Sep 2019 15:38:20 +0000 (11:38 -0400)]
Eliminate constructors with side-effects

Several of the Gson and Jackson handlers take a GsonBuilder, which
they then configure with additional adapters prior to create a Gson
object that they subsequently use.  The code has been modified so
that the constructors no longer take a GsonBuilder, thus eliminating
the side-effects that they had on the builders.  Instead, a
configBuilder() method has been added to the handler classes that
makes it clear tht they modify the GsonBuilder.

This also has the advantage that classes that want a Gson object
configured per a given handler need only call that handler's
configBuilder() method; previously, they had to constructor the
handler and then retrieve its gson object.

Also updated a few tests to specify the HTTP "Accept" header to ensure
that return results are in yaml format.

Change-Id: I2ef98198041ff9f73913d01ee6ee14ecf20ba617
Issue-ID: POLICY-2081
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoExtract YamlJsonTranslator from StandardYamlCoder 82/95682/2
Jim Hahn [Fri, 13 Sep 2019 16:14:25 +0000 (12:14 -0400)]
Extract YamlJsonTranslator from StandardYamlCoder

Refactored StandardYamlCoder, extracting a new class, YamlJsonTranslator,
from it.  This facilitates performing yaml translation when not using a
standard "gson" coder.
Added YamlJacksonHandler which supports YAML translation layered on
top of a JacksonHandler instead of a GsonMessageBodyHandler.
Also added junit tests to complete coverage of StandardCoder.
Also added public APPLICATION_YAML to YamlMessageBodyHandler.

Change-Id: Ia470fa194661fbf1aebeaf0f18b57f2a984cb64b
Issue-ID: POLICY-2081
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoMerge "Changes to accomodate to version of jetty"
Jorge Hernandez [Fri, 13 Sep 2019 19:07:53 +0000 (19:07 +0000)]
Merge "Changes to accomodate to version of jetty"

5 years agoMerge "Remove YamlException class"
Jim Hahn [Fri, 13 Sep 2019 15:36:48 +0000 (15:36 +0000)]
Merge "Remove YamlException class"

5 years agoChanges to accomodate to version of jetty 41/95641/1
Jim Hahn [Tue, 10 Sep 2019 17:48:31 +0000 (13:48 -0400)]
Changes to accomodate to version of jetty

With a newer version of jetty being used, a couple of methods have
been deprecated.  Modified the code to use the facilities appropriate
to the new jetty version.

Change-Id: Idcaef11836841480c24b1721c06ed642d3d4394a
Issue-ID: POLICY-2100
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoReport bad-request for invalid YAML 23/95623/2
Jim Hahn [Thu, 12 Sep 2019 21:29:49 +0000 (17:29 -0400)]
Report bad-request for invalid YAML

Added classes and modified code to report bad-request when a servlet
attempts to read invalid YAML.

Change-Id: Iacddee92a448fb69d5c778a3c3f3f2b5528983f7
Issue-ID: POLICY-2085
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoRemove YamlException class 01/95601/1
Jim Hahn [Thu, 12 Sep 2019 18:25:45 +0000 (14:25 -0400)]
Remove YamlException class

After the implementation was finalized, it turned out that YamlException
was no longer needed, so it has been deleted.

Change-Id: Ie895fc096787f05eff36a6127b08247a7664ff8d
Issue-ID: POLICY-2065
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoCreate StandardYamlCoder 80/95280/5
Jim Hahn [Mon, 9 Sep 2019 20:51:32 +0000 (16:51 -0400)]
Create StandardYamlCoder

Created StandardYamlCoder which is like a StandardCoder, except that
the original converts to/from JSON, while the new class converts to/from
YAML.  Also added YamlMessageBodyHandler and incorporated it into the
http server so that it supports a media type of */yaml.

Change-Id: Ibd83a9f6d355a330f63e435f2bb41affcf1947c2
Issue-ID: POLICY-2065
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoUpdate default branch in common for master 82/95382/1
Jim Hahn [Tue, 10 Sep 2019 14:43:11 +0000 (10:43 -0400)]
Update default branch in common for master

Change-Id: I7ddce7f583575adc11db4f9cc102d474a827d488
Issue-ID: POLICY-2045
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoBump version in policy/common master 75/95075/2
Jim Hahn [Thu, 5 Sep 2019 18:23:30 +0000 (14:23 -0400)]
Bump version in policy/common master

Change-Id: If86cac60ee143b1d8ae92fd3893ea33a0d3e1b81
Issue-ID: POLICY-2045
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoUpgrade to released parent 3.0.1 34/95034/1
Pamela Dragosh [Thu, 5 Sep 2019 12:57:24 +0000 (08:57 -0400)]
Upgrade to released parent 3.0.1

Released

Issue-ID: POLICY-2045
Change-Id: I82bf30780064ddaf26fdc6ed96a78653b1af1797
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
5 years agoRemove AlertSeverity from logback in policy/common 68/94368/2
Jim Hahn [Tue, 27 Aug 2019 18:13:25 +0000 (14:13 -0400)]
Remove AlertSeverity from logback in policy/common

Replaced AlertSeverity with severity in logback xml files, because
the MDC only has severity.

Change-Id: I118b195b65555c915c723faf117c4f4854e990f3
Issue-ID: POLICY-1989
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoRest servers should return 400 for bad syntax JSON 45/94245/2
Jim Hahn [Fri, 23 Aug 2019 22:35:40 +0000 (18:35 -0400)]
Rest servers should return 400 for bad syntax JSON

Modified common RestServer to inject an exception handler
into the list of providers so that it returns 400 instead
of 500 for JSON parsing errors.

Change-Id: I7c77625e3531e26413d72cc386296a709946cda2
Issue-ID: POLICY-1725
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoEnhance TestTimeMulti 92/93892/6
Jim Hahn [Mon, 19 Aug 2019 21:32:09 +0000 (17:32 -0400)]
Enhance TestTimeMulti

Enhance TestTimeMulti to support execution of tasks, whether
submitted via Timers or via Executors.

Change-Id: Ib5f216730b3b69028e9581052645370b827cd446
Issue-ID: POLICY-1968
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoAdd ApiUtils to facilitate looping over features 12/93512/2
Jim Hahn [Tue, 6 Aug 2019 16:17:29 +0000 (12:17 -0400)]
Add ApiUtils to facilitate looping over features

A number of places in the code (common & drools-pdp) loop over
features, giving each provider a chance to act on something.
Created a common method in a new ApiUtils class to faciliate
it.
Renamed to FeatureApiUtils per review comment.

Change-Id: I0c2cf0f33854cb5b6921b394f64de498a6234909
Issue-ID: POLICY-1968
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoReview maven dependency for snakeyaml 95/93095/1
Bruno Sakoto [Thu, 8 Aug 2019 14:40:11 +0000 (10:40 -0400)]
Review maven dependency for snakeyaml

Remove explicit version for snakeyaml maven dependency and inherit it
from integration parent artifact.

Upgrade snakeyaml to latest 1.24 version.

Issue-ID: POLICY-1603
Signed-off-by: Bruno Sakoto <bruno.sakoto@bell.ca>
Change-Id: Id44753332f39409205d2a64f6bc5563a5869bf91

5 years agoBump version in policy/common 25/92625/2
Jim Hahn [Fri, 2 Aug 2019 22:10:29 +0000 (18:10 -0400)]
Bump version in policy/common

Change-Id: I7efbdf7c36907eb10ae5ce4c9d7d4988d7e2d68a
Issue-ID: POLICY-1965
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoMerge "Change to fix issues in overridden validations of ParameterGroups" 1.5.1
Ram Krishna Verma [Thu, 1 Aug 2019 10:29:17 +0000 (10:29 +0000)]
Merge "Change to fix issues in overridden validations of ParameterGroups"

5 years agoRemove ParameterUtils 76/92376/1
Jim Hahn [Wed, 31 Jul 2019 15:16:39 +0000 (11:16 -0400)]
Remove ParameterUtils

Removed ParameterUtils.
Also made RestServer.getServerProperties() protected so it can be
overridden.
Also fixed issue in TopicParameterGroupTest to prevent it from validating
static fields.

Change-Id: Icb4580f5802b9edca489a38896d61ad24aece449
Issue-ID: POLICY-1953
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoChange to fix issues in overridden validations of ParameterGroups 55/92355/2
a.sreekumar [Wed, 31 Jul 2019 13:25:29 +0000 (13:25 +0000)]
Change to fix issues in overridden validations of ParameterGroups

Currently, for validation of nested ParameterGroup classes, a new
GroupValidationResult is directly created instead of calling the
validate method of nested classes. Thus any overridden validate methods
won't work. This is fixed.

Change-Id: I8ee9265b295cb68d67926128b5b68c217f341034
Issue-ID: POLICY-1744
Signed-off-by: a.sreekumar <ajith.sreekumar@est.tech>
5 years agoFix managed noop topic source 80/92280/3
Jim Hahn [Tue, 30 Jul 2019 13:53:19 +0000 (09:53 -0400)]
Fix managed noop topic source

NOOP topic sources configured via TopicParameterGroup are left
unmanaged.  Removed a new override method, as it did not pass
the "managed" flag down, while the method that already existed
in the superclass already works correctly.

Also restored "null" lists to TopicParameterGroup so-as not
to break the behavior of its validate() method.

Change-Id: Id392a3263c3bd1c8f278461715b441719817c47c
Issue-ID: POLICY-1953
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoMerge "Passing the updated topic parameters to policy-endpoints"
Jorge Hernandez [Tue, 30 Jul 2019 13:57:35 +0000 (13:57 +0000)]
Merge "Passing the updated topic parameters to policy-endpoints"

5 years agoPassing the updated topic parameters to policy-endpoints 21/92221/2
a.sreekumar [Tue, 30 Jul 2019 11:17:55 +0000 (11:17 +0000)]
Passing the updated topic parameters to policy-endpoints

Changes to pass the updated parameters from BusTopicParams to
PolicyEndpoints.

Change-Id: I49d3b9d30a2a4c6b2337d0ab76a61583eb9ef04a
Issue-ID: POLICY-1744
Signed-off-by: a.sreekumar <ajith.sreekumar@est.tech>
5 years agoAdd addTopic(List<TopicParams>) 19/92219/3
Jim Hahn [Sat, 27 Jul 2019 12:20:17 +0000 (08:20 -0400)]
Add addTopic(List<TopicParams>)

New services are typically configured using TopicParameters.  These
are converted into Properties before being passed to
TopicEndpoint.addTopic(), which then converts them into BusTopicParams
before configuring a given topic.  Added
TopicEndpoint.addTopic(List<TopicParams>), which makes it possible
to configure the topics without going into the intermediate Properties.
Furthermore, because TopicParams is a subclass of BusTopicParams, no
conversion is needed for that either, so the TopicParams can be passed
directly into the configuration classes.
Incorporated changes from review.

Change-Id: Id87e2c6812e36ae1a3ac680e6b35208667971782
Issue-ID: POLICY-1953
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoDefault TopicParams.isManaged to true 47/92147/2
Jim Hahn [Sat, 27 Jul 2019 11:53:24 +0000 (07:53 -0400)]
Default TopicParams.isManaged to true

Modified TopicParams to set "managed" to true by default.

Change-Id: Ia21caba2b882199f1a63d40b0fed1167ccb93142
Issue-ID: POLICY-1744
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoChanges to add missing topic parameters 57/91957/6
a.sreekumar [Thu, 25 Jul 2019 15:58:58 +0000 (15:58 +0000)]
Changes to add missing topic parameters

Changes to support parameters which would be critical to run in a
secure environment.

Change-Id: Ia7df174261041b35e57b9f1f2be7552e5dcd2cec
Issue-ID: POLICY-1744
Signed-off-by: a.sreekumar <ajith.sreekumar@est.tech>
5 years agoMerge "Convert double to int when decoding via gson"
Ram Krishna Verma [Thu, 18 Jul 2019 11:14:22 +0000 (11:14 +0000)]
Merge "Convert double to int when decoding via gson"

5 years agoConvert double to int when decoding via gson 14/91614/3
Jim Hahn [Wed, 17 Jul 2019 16:05:34 +0000 (12:05 -0400)]
Convert double to int when decoding via gson

Refactored MapDoubleAdapterFactory, extracting DoubleConverter to be
used by code needing to convert Double to Integer/Long after being
decoded by GSON.
Enhanced StandardCoder to automatically use the above converter if
the desired class is a generic Object.

Change-Id: I1d4e83910de41ceda383f257bfea706db2b8fbbe
Issue-ID: POLICY-1919
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoCopy PapRestServer to policy/common 67/91567/3
Jim Hahn [Tue, 16 Jul 2019 20:10:25 +0000 (16:10 -0400)]
Copy PapRestServer to policy/common

Copied and renamed the class to RestServer.  Also modified it to
derive from ServiceManagerContainer.
Added getName() method to HttpServletServer, which facilitated
the refactoring.
Renamed "controllers" to "providers".

Change-Id: I905166e41063e3fe84e356fd6c4a91ca9d4cb8a6
Issue-ID: POLICY-1652
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoCombine lines in IM state transition table 88/91388/3
Jim Hahn [Thu, 11 Jul 2019 22:05:01 +0000 (18:05 -0400)]
Combine lines in IM state transition table

Rewrote the code to generate the Integrity Monitor state transition
table, eliminating duplicate lines.  Output the table, before and
after the change, and verified that they were identical, with one
exception: there were two places where the original code had
"StandbyStateException", while all of the others had
"StandbyStatusException".  Guessing that the original code was
incorrect in these two cases, I changed the new code to always use
"StandbyStatusException" instead.

Change-Id: Ibe3044eb1ac398a0bc8f328f4e14305d4bdeb380
Issue-ID: POLICY-1791
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoFix checkstyle issues in common/gson 67/91267/1
Jim Hahn [Thu, 11 Jul 2019 14:10:17 +0000 (10:10 -0400)]
Fix checkstyle issues in common/gson

Also deleted the checkstyle suppression file.

Change-Id: I6d310af32d6d4be9633a8f88745447f40a566af7
Issue-ID: POLICY-1074
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoMerge "Fix sonar issues in Integrity Monitor"
Jorge Hernandez [Mon, 8 Jul 2019 16:17:17 +0000 (16:17 +0000)]
Merge "Fix sonar issues in Integrity Monitor"

5 years agoMerge "Replace ONAP-logging getters/setters with lombok"
Jim Hahn [Mon, 8 Jul 2019 15:54:31 +0000 (15:54 +0000)]
Merge "Replace ONAP-logging getters/setters with lombok"

5 years agoMerge "Fix sonar issues in policy/endpoints"
Jim Hahn [Mon, 8 Jul 2019 15:12:11 +0000 (15:12 +0000)]
Merge "Fix sonar issues in policy/endpoints"

5 years agoReplace ONAP-logging getters/setters with lombok 24/91024/1
Jim Hahn [Mon, 8 Jul 2019 13:32:51 +0000 (09:32 -0400)]
Replace ONAP-logging getters/setters with lombok

Added lombok annotations to EvenData, but forgot to remove
the get/set methods.

Change-Id: I4dc21fdf1e57e2d326a122ddebe10ef99a9b2638
Issue-ID: POLICY-1791
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoMerge "Fix sonar issues in policy ONAP logging"
Pamela Dragosh [Mon, 8 Jul 2019 13:20:38 +0000 (13:20 +0000)]
Merge "Fix sonar issues in policy ONAP logging"

5 years agoFix sonar issues in policy ONAP logging 80/90980/4
Jim Hahn [Fri, 5 Jul 2019 17:03:06 +0000 (13:03 -0400)]
Fix sonar issues in policy ONAP logging

Sonar fixes, other than code coverage.  These changes are disruptive
and will likely cause breakage in a number of policy repos.
Renamed constants.
Moved constants/factories from interfaces to classes.
Also fixed remaining checkstyle issues, which was equally disruptive,
as it required renaming of methods and classes.
Split out Onap config properties from EELF config properties, in
case changes are made in the future such that Onap properties can
no longer subclass from EELF properties (e.g., if EELF properties are
converted from a interface to a utility class with a private constructor).
Attempted to eliminate some duplicate blocks of code by refactoring
out common methods.

Change-Id: Ie038d2d4ed553037a9af3f0ddf31baf2b3628fa3
Issue-ID: POLICY-1791
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoFix sonar issues in policy/endpoints 71/90971/3
Jim Hahn [Fri, 5 Jul 2019 14:52:20 +0000 (10:52 -0400)]
Fix sonar issues in policy/endpoints

Sonar fixes, other than code coverage.  These changes are disruptive
and will likely cause breakage in a number of policy repos.
Renamed constants.
Moved constants/factories from interfaces to classes.

Change-Id: I182d50320aa6b53e383081af806c60dd2f806cbe
Issue-ID: POLICY-1791
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoFix sonar issue in common/utils 53/90953/2
Jim Hahn [Fri, 5 Jul 2019 14:04:55 +0000 (10:04 -0400)]
Fix sonar issue in common/utils

Renamed a constant.

Change-Id: I5e1f2fb6de8445a8f667ea48a595773173c6beae
Issue-ID: POLICY-1791
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoFix sonar issues in Integrity Monitor 52/90952/1
Jim Hahn [Fri, 5 Jul 2019 13:58:14 +0000 (09:58 -0400)]
Fix sonar issues in Integrity Monitor

Fixed most sonar issues, except for code coverage.

Change-Id: I473635d896797b2290920da86c6770848bc2e883
Issue-ID: POLICY-1791
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoFix remaining sonar issues in Integrity Audit 58/90858/4
Jim Hahn [Wed, 3 Jul 2019 18:04:48 +0000 (14:04 -0400)]
Fix remaining sonar issues in Integrity Audit

Renamed enums to upper case - this might disrupt other repos, though
it should be minimal.
Renamed constants in a junit test.

Change-Id: Ifd864bb61eec3d9b3c7a0321fe3841696046f6f6
Issue-ID: POLICY-1791
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoRemove ToStringTester from utils 40/90840/1
ramverma [Wed, 3 Jul 2019 13:33:08 +0000 (13:33 +0000)]
Remove ToStringTester from utils

Finally, removing the ToStringTester from utils module.
All repos are moved to use it from utils-test.

Change-Id: I79c7db0b39b5d300a850279c46858c719aa1faab
Issue-ID: POLICY-1746
Signed-off-by: ramverma <ram.krishna.verma@est.tech>
5 years agoAllow empty DB password in IntegrityAudit 28/90628/1
Jim Hahn [Thu, 27 Jun 2019 22:15:45 +0000 (18:15 -0400)]
Allow empty DB password in IntegrityAudit

With the sonar fixes, IntegrityAudit is no longer allowing an empty
DB password.  This breaks some junits in other policy repos.
Corrected the issue.

Change-Id: I291d1592ffd80ee76dd9758b3b7156436c579dab
Issue-ID: POLICY-1791
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoMaking the topic property utility method more generic - addressing Jorge's review... 41/90541/2
a.sreekumar [Thu, 27 Jun 2019 10:26:04 +0000 (10:26 +0000)]
Making the topic property utility method more generic - addressing Jorge's review comment

Making the method to update topic properties object more generic so that
it can be used by other components such as drools if needed.

Change-Id: I29c0f8fde5f4e1dd464072a9b06f2d93cc15b137
Issue-ID: POLICY-1744
Signed-off-by: a.sreekumar <ajith.sreekumar@est.tech>
5 years agoMerge "Speed up CryptoUtilsTest"
Jim Hahn [Wed, 26 Jun 2019 15:13:19 +0000 (15:13 +0000)]
Merge "Speed up CryptoUtilsTest"

5 years agoMerge "Adding Topic and REST parameters to policy-endpoints"
Pamela Dragosh [Wed, 26 Jun 2019 15:11:58 +0000 (15:11 +0000)]
Merge "Adding Topic and REST parameters to policy-endpoints"

5 years agoSpeed up CryptoUtilsTest 23/90523/3
Jim Hahn [Wed, 26 Jun 2019 13:27:51 +0000 (09:27 -0400)]
Speed up CryptoUtilsTest

CryptoUtilsTest runs slowly because the SecureRandom that CryptoUtils
uses to generate an "iv" takes a while to create enough randomness.
However, as the "iv" is only used as a "salt", it is not necessary
to use SecureRandom; the values generated by Random are sufficient.

Change-Id: I1f3b03b85d28852a7969d3a83802a2691308caa5
Issue-ID: POLICY-1791
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoFix some sonar issues in policy-endpoints 86/90486/3
Jim Hahn [Mon, 24 Jun 2019 19:46:36 +0000 (15:46 -0400)]
Fix some sonar issues in policy-endpoints

Refactored various classes to reduce cyclomatic complexity.
Introduced some endpoint utility classes to facilitate extraction
and conversion of property values, and populating of common
"builder" values.

Change-Id: Ie1c91cd94cb54700dc9127f72780b4d94b82ec39
Issue-ID: POLICY-1791
Signed-off-by: Jim Hahn <jrh3@att.com>