From b830606fbb6d76757f4b3c66e612a7f0f4dee331 Mon Sep 17 00:00:00 2001 From: HOCKLA Date: Mon, 20 Jan 2020 16:37:27 -0600 Subject: policy/distribution jdk11 upgrades Issue-ID: POLICY-1585 Change-Id: I4aa879656c039d9de9c288f0309105c21f4bf285 Signed-off-by: HOCKLA --- .../distribution/main/rest/TestHttpsDistributionRestServer.java | 7 +++++-- .../main/rest/TestHttpsStatisticDistributionRestServer.java | 7 +++++-- .../onap/policy/distribution/main/testclasses/DummyDecoder.java | 4 +++- .../policy/distribution/main/testclasses/DummyPolicyForwarder.java | 4 +++- .../distribution/main/testclasses/DummyReceptionHandler.java | 7 +++++-- 5 files changed, 21 insertions(+), 8 deletions(-) (limited to 'main/src/test/java') diff --git a/main/src/test/java/org/onap/policy/distribution/main/rest/TestHttpsDistributionRestServer.java b/main/src/test/java/org/onap/policy/distribution/main/rest/TestHttpsDistributionRestServer.java index 7a9835cb..037ec3a2 100644 --- a/main/src/test/java/org/onap/policy/distribution/main/rest/TestHttpsDistributionRestServer.java +++ b/main/src/test/java/org/onap/policy/distribution/main/rest/TestHttpsDistributionRestServer.java @@ -2,6 +2,7 @@ * ============LICENSE_START======================================================= * Copyright (C) 2018 Intel. All rights reserved. * Modifications Copyright (C) 2019 Nordix Foundation. + * Modifications Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -97,10 +98,12 @@ public class TestHttpsDistributionRestServer { } @Override - public void checkClientTrusted(final java.security.cert.X509Certificate[] certs, final String authType) {} + public void checkClientTrusted(final java.security.cert.X509Certificate[] certs, final String authType) { + } @Override - public void checkServerTrusted(final java.security.cert.X509Certificate[] certs, final String authType) {} + public void checkServerTrusted(final java.security.cert.X509Certificate[] certs, final String authType) { + } } }; final SSLContext sc = SSLContext.getInstance("TLSv1.2"); diff --git a/main/src/test/java/org/onap/policy/distribution/main/rest/TestHttpsStatisticDistributionRestServer.java b/main/src/test/java/org/onap/policy/distribution/main/rest/TestHttpsStatisticDistributionRestServer.java index ba64e550..e659f04f 100644 --- a/main/src/test/java/org/onap/policy/distribution/main/rest/TestHttpsStatisticDistributionRestServer.java +++ b/main/src/test/java/org/onap/policy/distribution/main/rest/TestHttpsStatisticDistributionRestServer.java @@ -2,6 +2,7 @@ * ============LICENSE_START======================================================= * Copyright (C) 2018 Intel. All rights reserved. * Copyright (C) 2019 Nordix Foundation. + * Modifications Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -95,10 +96,12 @@ public class TestHttpsStatisticDistributionRestServer { } @Override - public void checkClientTrusted(final java.security.cert.X509Certificate[] certs, final String authType) {} + public void checkClientTrusted(final java.security.cert.X509Certificate[] certs, final String authType) { + } @Override - public void checkServerTrusted(final java.security.cert.X509Certificate[] certs, final String authType) {} + public void checkServerTrusted(final java.security.cert.X509Certificate[] certs, final String authType) { + } } }; final SSLContext sc = SSLContext.getInstance("TLSv1.2"); diff --git a/main/src/test/java/org/onap/policy/distribution/main/testclasses/DummyDecoder.java b/main/src/test/java/org/onap/policy/distribution/main/testclasses/DummyDecoder.java index b9ee0768..1665a425 100644 --- a/main/src/test/java/org/onap/policy/distribution/main/testclasses/DummyDecoder.java +++ b/main/src/test/java/org/onap/policy/distribution/main/testclasses/DummyDecoder.java @@ -1,6 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2018 Ericsson. All rights reserved. + * Modifications Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -58,5 +59,6 @@ public class DummyDecoder implements PolicyDecoder { } @Override - public void configure(final String parameterGroupName) {} + public void configure(final String parameterGroupName) { + } } diff --git a/main/src/test/java/org/onap/policy/distribution/main/testclasses/DummyPolicyForwarder.java b/main/src/test/java/org/onap/policy/distribution/main/testclasses/DummyPolicyForwarder.java index f2779c85..220660de 100644 --- a/main/src/test/java/org/onap/policy/distribution/main/testclasses/DummyPolicyForwarder.java +++ b/main/src/test/java/org/onap/policy/distribution/main/testclasses/DummyPolicyForwarder.java @@ -1,6 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2018 Ericsson. All rights reserved. + * Modifications Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -51,5 +52,6 @@ public class DummyPolicyForwarder implements PolicyForwarder { } @Override - public void configure(final String parameterGroupName) {} + public void configure(final String parameterGroupName) { + } } diff --git a/main/src/test/java/org/onap/policy/distribution/main/testclasses/DummyReceptionHandler.java b/main/src/test/java/org/onap/policy/distribution/main/testclasses/DummyReceptionHandler.java index 8d3ec682..16b2d563 100644 --- a/main/src/test/java/org/onap/policy/distribution/main/testclasses/DummyReceptionHandler.java +++ b/main/src/test/java/org/onap/policy/distribution/main/testclasses/DummyReceptionHandler.java @@ -1,6 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2018 Ericsson. All rights reserved. + * Modifications Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,8 +31,10 @@ import org.onap.policy.distribution.reception.handling.AbstractReceptionHandler; public class DummyReceptionHandler extends AbstractReceptionHandler { @Override - public void initializeReception(final String parameterGroupName) {} + public void initializeReception(final String parameterGroupName) { + } @Override - public void destroy() {} + public void destroy() { + } } -- cgit 1.2.3-korg