/*-
* ============LICENSE_START=======================================================
- * Copyright (C) 2019 Nordix Foundation.
+ * Copyright (C) 2019-2020 Nordix Foundation.
* Modifications Copyright (C) 2019 AT&T Intellectual Property.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
papParameterGroup = CODER.decode(file, PapParameterGroup.class);
} catch (final CoderException e) {
final String errorMessage = "error reading parameters from \"" + arguments.getConfigurationFilePath()
- + "\"\n" + "(" + e.getClass().getSimpleName() + "):" + e.getMessage();
- LOGGER.error(errorMessage, e);
+ + "\"\n" + "(" + e.getClass().getSimpleName() + ")";
throw new PolicyPapException(errorMessage, e);
}
dbgroup.getPdpSubgroups().add(subgrp);
} else {
- updated = updateSubGroup(data, dbsub, subgrp, subResult) || updated;
+ updated = updateSubGroup(dbsub, subgrp, subResult) || updated;
}
result.addResult(subResult);
/**
* Updates an existing subgroup.
*
- * @param data session data
* @param dbsub the subgroup, from the DB
* @param subgrp the subgroup to be updated, updated to fully qualified versions upon
* return
* @param container container for additional validation results
* @return {@code true} if the subgroup content was changed, {@code false} if there
* were no changes
- * @throws PfModelException if an error occurred
*/
- private boolean updateSubGroup(SessionData data, PdpSubGroup dbsub, PdpSubGroup subgrp,
- BeanValidationResult container) throws PfModelException {
+ private boolean updateSubGroup(PdpSubGroup dbsub, PdpSubGroup subgrp, BeanValidationResult container) {
// perform additional validations first
- if (!validateSubGroup(data, dbsub, subgrp, container)) {
+ if (!validateSubGroup(dbsub, subgrp, container)) {
return false;
}
/**
* Performs additional validations of a subgroup.
*
- * @param data session data
* @param dbsub the subgroup, from the DB
* @param subgrp the subgroup to be validated, updated to fully qualified versions
* upon return
* @param container container for additional validation results
* @return {@code true} if the subgroup is valid, {@code false} otherwise
- * @throws PfModelException if an error occurred
*/
- private boolean validateSubGroup(SessionData data, PdpSubGroup dbsub, PdpSubGroup subgrp,
- BeanValidationResult container) throws PfModelException {
+ private boolean validateSubGroup(PdpSubGroup dbsub, PdpSubGroup subgrp, BeanValidationResult container) {
BeanValidationResult result = new BeanValidationResult(subgrp.getPdpType(), subgrp);
/*-
* ============LICENSE_START=======================================================
- * Copyright (C) 2019 Nordix Foundation.
+ * Copyright (C) 2019-2020 Nordix Foundation.
* Modifications Copyright (C) 2019 AT&T Intellectual Property.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
import io.swagger.annotations.Extension;
import io.swagger.annotations.ExtensionProperty;
import io.swagger.annotations.ResponseHeader;
-
import java.util.UUID;
-
import javax.ws.rs.HeaderParam;
import javax.ws.rs.PUT;
import javax.ws.rs.Path;
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status;
-
import org.apache.commons.lang3.tuple.Pair;
import org.onap.policy.models.base.PfModelException;
import org.onap.policy.models.pap.concepts.PdpGroupStateChangeResponse;
*/
public class PdpGroupStateChangeControllerV1 extends PapRestControllerV1 {
- private static final Logger LOGGER = LoggerFactory.getLogger(PdpGroupQueryControllerV1.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(PdpGroupStateChangeControllerV1.class);
private final PdpGroupStateChangeProvider provider = new PdpGroupStateChangeProvider();
* ONAP PAP
* ================================================================================
* Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2020 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
import org.onap.policy.pap.main.PolicyModelsProviderFactoryWrapper;
import org.onap.policy.pap.main.comm.PdpModifyRequestMap;
import org.onap.policy.pap.main.notification.PolicyNotifier;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* Super class of providers that deploy and undeploy PDP groups. The following items must
* </ul>
*/
public abstract class ProviderBase {
- private static final String DEPLOY_FAILED = "failed to deploy/undeploy policies";
public static final String DB_ERROR_MSG = "DB error";
- private static final Logger logger = LoggerFactory.getLogger(ProviderBase.class);
-
/**
* Lock used when updating PDPs.
*/
data.updateDb();
} catch (PfModelException | PfModelRuntimeException e) {
- logger.warn(DEPLOY_FAILED, e);
throw e;
} catch (RuntimeException e) {
- logger.warn(DEPLOY_FAILED, e);
throw new PfModelException(Status.INTERNAL_SERVER_ERROR, "request failed", e);
}
* ONAP PAP
* ================================================================================
* Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2020 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.pap.main;
+import org.assertj.core.api.Assertions;
import org.junit.Test;
import org.powermock.reflect.Whitebox;
public class PapConstantsTest {
@Test
- public void test() throws Exception {
+ public void test() {
// verify that constructor does not throw an exception
- Whitebox.invokeConstructor(PapConstants.class);
+ Assertions.assertThatCode(() -> Whitebox.invokeConstructor(PapConstants.class)).doesNotThrowAnyException();
}
}
* ONAP PAP
* ================================================================================
* Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2020 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import java.util.List;
import java.util.stream.Collectors;
import javax.ws.rs.core.Response.Status;
+import org.assertj.core.api.Assertions;
import org.junit.Before;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
* @throws Exception if an error occurs
*/
@Before
+ @Override
public void setUp() throws Exception {
super.setUp();
@Test
public void testAddRequestPdpUpdatePdpStateChange_BothNull() {
// nulls should be ok
- map.addRequest(null, null);
+ Assertions.assertThatCode(() -> map.addRequest(null, null)).doesNotThrowAnyException();
}
@Test
* ONAP PAP
* ================================================================================
* Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2020 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
+import org.assertj.core.api.Assertions;
import org.junit.Before;
import org.junit.Test;
import org.onap.policy.models.pdp.concepts.PdpMessage;
* @throws Exception if an error occurs
*/
@Before
+ @Override
public void setUp() throws Exception {
super.setUp();
@Test
public void testStopPublishingBoolean_NotPublishing() {
// should not throw an exception
- req.stopPublishing();
+ Assertions.assertThatCode(() -> req.stopPublishing()).doesNotThrowAnyException();
}
@Test
import java.util.List;
import java.util.TreeMap;
import javax.ws.rs.core.Response.Status;
+import org.assertj.core.api.Assertions;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.Test;
*
* @throws Exception if an error occurs
*/
- @Override
@Before
+ @Override
public void setUp() throws Exception {
super.setUp();
}
@Test
- public void testValidateGroupOnly_NullState() throws PfModelException {
+ public void testValidateGroupOnly_NullState() {
PdpGroups groups = loadPdpGroups("createGroups.json");
groups.getGroups().get(0).setPdpGroupState(null);
- prov.createOrUpdateGroups(groups);
+ Assertions.assertThatCode(() -> prov.createOrUpdateGroups(groups)).doesNotThrowAnyException();
}
@Test
- public void testValidateGroupOnly_Active() throws PfModelException {
+ public void testValidateGroupOnly_Active() {
PdpGroups groups = loadPdpGroups("createGroups.json");
groups.getGroups().get(0).setPdpGroupState(PdpState.ACTIVE);
- prov.createOrUpdateGroups(groups);
+ Assertions.assertThatCode(() -> prov.createOrUpdateGroups(groups)).doesNotThrowAnyException();
}
@Test
- public void testValidateGroupOnly_Passive() throws PfModelException {
+ public void testValidateGroupOnly_Passive() {
PdpGroups groups = loadPdpGroups("createGroups.json");
groups.getGroups().get(0).setPdpGroupState(PdpState.PASSIVE);
- prov.createOrUpdateGroups(groups);
+ Assertions.assertThatCode(() -> prov.createOrUpdateGroups(groups)).doesNotThrowAnyException();
}
@Test
assertGroupUpdateOnly(group);
- assertEquals(group.getDescription(), "my description");
+ assertEquals("my description", group.getDescription());
assertEquals(newgrp.toString(), group.toString());
}
* ONAP PAP
* ================================================================================
* Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2020 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
import java.util.List;
import java.util.Set;
import javax.ws.rs.core.Response.Status;
+import org.assertj.core.api.Assertions;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.Test;
* @throws Exception if an error occurs
*/
@Before
+ @Override
public void setUp() throws Exception {
super.setUp();
}
@Test
- public void testUndeploy_testUndeployPolicy() throws Exception {
- prov.undeploy(optIdent);
+ public void testUndeploy_testUndeployPolicy() {
+ Assertions.assertThatCode(() -> prov.undeploy(optIdent)).doesNotThrowAnyException();
}
/**
/*
* ============LICENSE_START=======================================================
- * Copyright (C) 2019 Nordix Foundation.
+ * Copyright (C) 2019-2020 Nordix Foundation.
* Modifications Copyright (C) 2019 AT&T Intellectual Property.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import org.junit.After;
public void testMain_NoArguments() {
final String[] papConfigParameters = {};
main = new Main(papConfigParameters);
- assertTrue(main.getParameters() == null);
+ assertNull(main.getParameters());
}
@Test
public void testMain_InvalidArguments() {
final String[] papConfigParameters = {"parameters/PapConfigParameters.json"};
main = new Main(papConfigParameters);
- assertTrue(main.getParameters() == null);
+ assertNull(main.getParameters());
}
@Test
public void testMain_Help() {
final String[] papConfigParameters = {"-h"};
- Main.main(papConfigParameters);
+ main = new Main(papConfigParameters);
+ assertNull(main.getParameters());
}
@Test
public void testMain_InvalidParameters() {
final String[] papConfigParameters = {"-c", "parameters/PapConfigParameters_InvalidName.json"};
main = new Main(papConfigParameters);
- assertTrue(main.getParameters() == null);
+ assertNull(main.getParameters());
}
}
Code Review / policy / pap.git / commitdiff