+++ /dev/null
-/*-
- * ============LICENSE_START=======================================================
- * ONAP Policy API
- * ================================================================================
- * Copyright (C) 2019 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.distribution.main.rest.aaf;
-
-import org.onap.policy.common.endpoints.http.server.aaf.AafGranularAuthFilter;
-
-/**
- * Distribution AAF authorization filter.
- */
-public class AafDistributionFilter extends AafGranularAuthFilter {
-
- public static final String AAF_NODETYPE = "policy-distribution";
- public static final String AAF_ROOT_PERMISSION = DEFAULT_NAMESPACE + "." + AAF_NODETYPE;
-
- @Override
- public String getPermissionTypeRoot() {
- return AAF_ROOT_PERMISSION;
- }
-}
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2018 Ericsson. All rights reserved.
- * Copyright (C) 2019 Nordix Foundation.
+ * Copyright (C) 2019, 2023 Nordix Foundation.
* Modifications Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved.
* Modifications Copyright (C) 2021 Bell Canada. All rights reserved.
* ================================================================================
import java.lang.reflect.InvocationTargetException;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import lombok.Getter;
import org.onap.policy.distribution.main.parameters.DistributionParameterGroup;
import org.onap.policy.distribution.main.parameters.PolicyForwarderConfigurationParameterGroup;
import org.onap.policy.distribution.main.rest.DistributionRestController;
-import org.onap.policy.distribution.main.rest.aaf.AafDistributionFilter;
import org.onap.policy.distribution.reception.decoding.PluginInitializationException;
import org.onap.policy.distribution.reception.handling.AbstractReceptionHandler;
import org.onap.policy.distribution.reception.parameters.PolicyDecoderConfigurationParameterGroup;
*/
private void startDistributionRestServer() throws PolicyDistributionException {
distributionParameterGroup.getRestServerParameters().setName(distributionParameterGroup.getName());
- restServer = new RestServer(distributionParameterGroup.getRestServerParameters(), AafDistributionFilter.class,
- DistributionRestController.class);
+ restServer = new RestServer(distributionParameterGroup.getRestServerParameters(), List.of(),
+ List.of(DistributionRestController.class));
if (!restServer.start()) {
throw new PolicyDistributionException(
"Failed to start distribution rest server. Check log for more details...");
"src/test/resources/parameters/LifecycleApiAutomationCompositionForwarderParameters.json",
LifecycleApiAutomationCompositionForwarderParameters.class);
ParameterService.register(parameterGroup);
- simulator.startLifecycycleApiSimulator();
+ simulator.startLifecycleApiSimulator();
if (!NetworkUtil.isTcpPortOpen("localhost", 6969, 50, 200L)) {
throw new IllegalStateException("cannot connect to port 6969");
}
"src/test/resources/parameters/LifecycleApiPolicyForwarderParameters.json",
LifecycleApiForwarderParameters.class);
ParameterService.register(parameterGroup);
- simulator.startLifecycycleApiSimulator();
+ simulator.startLifecycleApiSimulator();
if (!NetworkUtil.isTcpPortOpen("localhost", 6969, 50, 200L)) {
throw new IllegalStateException("cannot connect to port 6969");
}
@AfterAll
static void tearDown() {
ParameterService.deregister(LifecycleApiForwarderParameters.class.getSimpleName());
- simulator.stopLifecycycleApiSimulator();
+ simulator.stopLifecycleApiSimulator();
}
@Test
/*-
* ============LICENSE_START=======================================================
- * Copyright (C) 2022 Nordix Foundation.
- * Modifications Copyright (C) 2022 Nordix Foundation.
+ * Copyright (C) 2022-2023 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
package org.onap.policy.distribution.forwarding.testclasses;
+import java.util.List;
import org.onap.policy.common.endpoints.http.server.RestServer;
import org.onap.policy.common.endpoints.parameters.RestServerParameters;
import org.onap.policy.common.utils.coder.CoderException;
import org.onap.policy.common.utils.resources.ResourceUtils;
import org.onap.policy.distribution.forwarding.PolicyForwardingException;
import org.onap.policy.distribution.forwarding.lifecycle.api.LifecycleApiAutomationCompositionForwarder;
-import org.onap.policy.distribution.main.rest.aaf.AafDistributionFilter;
/**
* The class for starting/stopping simulator for testing {@link LifecycleApiAutomationCompositionForwarder} .
* @throws PolicyForwardingException if error occurs
* @throws CoderException if error occurs
*/
- public void startLifecycycleApiSimulator() throws PolicyForwardingException, CoderException {
+ public void startLifecycleApiSimulator() throws PolicyForwardingException, CoderException {
final StandardCoder standardCoder = new StandardCoder();
final RestServerParameters restServerParameters = standardCoder.decode(
ResourceUtils.getResourceAsString("src/test/resources/parameters/RestServerParameters.json"),
RestServerParameters.class);
- restServer = new RestServer(restServerParameters, AafDistributionFilter.class,
- LifecycleApiAutomationCompositionSimulatorEndpoint.class);
+ restServer = new RestServer(restServerParameters, List.of(),
+ List.of(LifecycleApiAutomationCompositionSimulatorEndpoint.class));
if (!restServer.start()) {
throw new PolicyForwardingException("Failed to start rest simulator. Check log for more details...");
}
/*-
* ============LICENSE_START=======================================================
- * Copyright (C) 2019 Nordix Foundation.
+ * Copyright (C) 2019, 2023 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
package org.onap.policy.distribution.forwarding.testclasses;
+import java.util.List;
import org.onap.policy.common.endpoints.http.server.RestServer;
import org.onap.policy.common.endpoints.parameters.RestServerParameters;
import org.onap.policy.common.utils.coder.CoderException;
import org.onap.policy.common.utils.resources.ResourceUtils;
import org.onap.policy.distribution.forwarding.PolicyForwardingException;
import org.onap.policy.distribution.forwarding.lifecycle.api.LifecycleApiPolicyForwarder;
-import org.onap.policy.distribution.main.rest.aaf.AafDistributionFilter;
/**
* The class for starting/stopping simulator for testing {@link LifecycleApiPolicyForwarder} .
* @throws PolicyForwardingException if error occurs
* @throws CoderException if error occurs
*/
- public void startLifecycycleApiSimulator() throws PolicyForwardingException, CoderException {
+ public void startLifecycleApiSimulator() throws PolicyForwardingException, CoderException {
final StandardCoder standardCoder = new StandardCoder();
final RestServerParameters restServerParameters = standardCoder.decode(
ResourceUtils.getResourceAsString("src/test/resources/parameters/RestServerParameters.json"),
RestServerParameters.class);
- restServer = new RestServer(restServerParameters, AafDistributionFilter.class,
- LifecycycleApiSimulatorEndpoint.class);
+ restServer = new RestServer(restServerParameters, List.of(),
+ List.of(LifecycycleApiSimulatorEndpoint.class));
if (!restServer.start()) {
throw new PolicyForwardingException("Failed to start rest simulator. Check log for more details...");
}
/**
* Shut down Execution.
*/
- public void stopLifecycycleApiSimulator() {
+ public void stopLifecycleApiSimulator() {
if (restServer != null) {
restServer.stop();
}
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2018 Ericsson. All rights reserved.
- * Copyright (C) 2019, 2022 Nordix Foundation.
+ * Copyright (C) 2019, 2022-2023 Nordix Foundation.
* Modifications Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved.
* Modifications Copyright (C) 2021 Bell Canada. All rights reserved.
* ================================================================================
*/
private synchronized void changeSdcReceptionHandlerStatus(final SdcReceptionHandlerStatus newStatus) {
switch (newStatus) {
- case INIT:
- case STOPPED:
+ case INIT, STOPPED:
sdcReceptionHandlerStatus = newStatus;
break;
case IDLE:
"Failed to deploy the artifact due to: " + exp.getMessage());
}
}
- if (artifactsProcessedSuccessfully) {
+
+ // NoSonar here for complaining about var not changing, when, in fact,
+ // can change to false when Exceptions are triggered.
+ if (artifactsProcessedSuccessfully) { // NOSONAR
DistributionStatisticsManager.updateDistributionSuccessCount();
sendComponentDoneStatus(notificationData.getDistributionID(), DistributionStatusEnum.COMPONENT_DONE_OK,
null);
}
private File safelyCreateFile(String prefix) throws IOException {
- File file = Files.createTempFile(prefix, ".csar").toFile();
+ File file = Files.createTempFile(prefix, ".csar").toFile(); // NOSONAR
if (file.setReadable(true, false)
&& file.setWritable(true, true)) {
return file;
/*-
* ============LICENSE_START=======================================================
- * Copyright (C) 2021 Nordix Foundation.
+ * Copyright (C) 2021, 2023 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* @author Adheli Tavares (adheli.tavares@est.tech)
*
*/
-public class TestPolicyDecoderConfigurationParametersJsonAdapter {
+class TestPolicyDecoderConfigurationParametersJsonAdapter {
@Test
void testDeserialize() throws JsonSyntaxException, IOException {
Code Review / policy / distribution.git / commitdiff