/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2019 Nordix Foundation.
- * Modifications Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2020-2021 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.
@Override
public void onTopicEvent(final CommInfrastructure infra, final String topic, final PdpStatus message) {
- final PdpStatusMessageHandler handler = new PdpStatusMessageHandler(params);
+ final var handler = new PdpStatusMessageHandler(params);
handler.handlePdpStatus(message);
}
}
* ============LICENSE_START=======================================================
* ONAP PAP
* ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2019, 2021 AT&T Intellectual Property. All rights reserved.
* Modifications Copyright (C) 2021 Nordix Foundation.
* Modifications Copyright (C) 2021 Bell Canada. All rights reserved.
* ================================================================================
}
protected PdpUpdate createPdpUpdateMessage(final String pdpGroupName, final PdpSubGroup subGroup,
- final String pdpInstanceId, final PolicyModelsProvider databaseProvider,
- final List<ToscaPolicy> policies, final List<ToscaPolicy> policiesToBeDeployed,
- final List<ToscaConceptIdentifier> policiesToBeUndeployed) throws PfModelException {
+ final String pdpInstanceId, final List<ToscaPolicy> policies,
+ final List<ToscaPolicy> policiesToBeDeployed,
+ final List<ToscaConceptIdentifier> policiesToBeUndeployed) {
- final PdpUpdate update = new PdpUpdate();
+ final var update = new PdpUpdate();
update.setName(pdpInstanceId);
update.setPdpGroup(pdpGroupName);
protected PdpStateChange createPdpStateChangeMessage(final String pdpGroupName, final PdpSubGroup subGroup,
final String pdpInstanceId, final PdpState pdpState) {
- final PdpStateChange stateChange = new PdpStateChange();
+ final var stateChange = new PdpStateChange();
stateChange.setName(pdpInstanceId);
stateChange.setPdpGroup(pdpGroupName);
stateChange.setPdpSubgroup(subGroup.getPdpType());
protected void updateDeploymentStatus(final String pdpGroupName, final String pdpType, final String pdpInstanceId,
PdpState pdpState, final PolicyModelsProvider databaseProvider, List<ToscaPolicy> policies)
throws PfModelException {
- DeploymentStatus deploymentStatus = new DeploymentStatus(databaseProvider);
+ var deploymentStatus = new DeploymentStatus(databaseProvider);
deploymentStatus.loadByGroup(pdpGroupName);
if (pdpState.equals(PdpState.PASSIVE)) {
deploymentStatus.deleteDeployment(pdpInstanceId);
pdpGroupName, pdpType, true);
}
}
- PolicyNotification notification = new PolicyNotification();
+ var notification = new PolicyNotification();
deploymentStatus.flush(notification);
PolicyNotifier notifier = Registry.get(PapConstants.REG_POLICY_NOTIFIER);
notifier.publish(notification);
// @formatter:on
String name = update.getName() + " " + PdpUpdate.class.getSimpleName();
- UpdateReq request = new UpdateReq(reqparams, name, update);
+ var request = new UpdateReq(reqparams, name, update);
addSingleton(request);
}
// @formatter:on
String name = stateChange.getName() + " " + PdpStateChange.class.getSimpleName();
- StateChangeReq request = new StateChangeReq(reqparams, name, stateChange);
+ var request = new StateChangeReq(reqparams, name, stateChange);
addSingleton(request);
}
List<PdpGroup> groups = dao.getFilteredPdpGroups(filter);
List<PdpGroup> updates = new ArrayList<>(1);
- DeploymentStatus status = new DeploymentStatus(dao);
+ var status = new DeploymentStatus(dao);
for (PdpGroup group : groups) {
if (removeFromGroup(pdpName, group)) {
} else {
dao.updatePdpGroups(updates);
- PolicyNotification notification = new PolicyNotification();
+ var notification = new PolicyNotification();
status.flush(notification);
policyNotifier.publish(notification);
* ============LICENSE_START=======================================================
* ONAP PAP
* ================================================================================
- * Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2019-2021 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.
* Stops all publishing and removes this PDP from any broadcast messages.
*/
public void stopPublishing() {
- Request request = requests.peek();
+ var request = requests.peek();
if (request != null) {
request.stopPublishing();
}
requests.remove();
// start publishing next request, but don't remove it from the queue
- Request nextRequest = requests.peek();
+ var nextRequest = requests.peek();
if (nextRequest == null) {
logger.info("{} has no more requests", pdpName);
return false;
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2019-2020 Nordix Foundation.
- * Modifications Copyright (C) 2019-2020 AT&T Intellectual Property.
+ * Modifications Copyright (C) 2019-2021 AT&T Intellectual Property.
* Modifications Copyright (C) 2021 Bell Canada. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
import org.onap.policy.models.pdp.concepts.Pdp;
import org.onap.policy.models.pdp.concepts.PdpGroup;
import org.onap.policy.models.pdp.concepts.PdpGroupFilter;
-import org.onap.policy.models.pdp.concepts.PdpStateChange;
import org.onap.policy.models.pdp.concepts.PdpStatistics;
import org.onap.policy.models.pdp.concepts.PdpStatus;
import org.onap.policy.models.pdp.concepts.PdpSubGroup;
-import org.onap.policy.models.pdp.concepts.PdpUpdate;
import org.onap.policy.models.pdp.enums.PdpState;
import org.onap.policy.models.provider.PolicyModelsProvider;
import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier;
* throw an exception.
*/
if (message.getName() != null) {
- final PdpTracker pdpTracker = Registry.get(PapConstants.REG_PDP_TRACKER);
+ final var pdpTracker = (PdpTracker) Registry.get(PapConstants.REG_PDP_TRACKER);
pdpTracker.add(message.getName());
}
} catch (final PolicyPapException exp) {
private void handlePdpRegistration(final PdpStatus message, final PolicyModelsProvider databaseProvider)
throws PfModelException, PolicyPapException {
if (!findAndUpdatePdpGroup(message, databaseProvider)) {
- final String errorMessage = "Failed to register PDP. No matching PdpGroup/SubGroup Found - ";
+ final var errorMessage = "Failed to register PDP. No matching PdpGroup/SubGroup Found - ";
LOGGER.debug("{}{}", errorMessage, message);
throw new PolicyPapException(errorMessage + message);
}
private boolean findAndUpdatePdpGroup(final PdpStatus message, final PolicyModelsProvider databaseProvider)
throws PfModelException {
- boolean pdpGroupFound = false;
+ var pdpGroupFound = false;
final PdpGroupFilter filter =
PdpGroupFilter.builder().name(message.getPdpGroup()).groupState(PdpState.ACTIVE).build();
private boolean registerPdp(final PdpStatus message, final PolicyModelsProvider databaseProvider,
final PdpGroup finalizedPdpGroup) throws PfModelException {
Optional<PdpSubGroup> subGroup;
- boolean pdpGroupFound = false;
+ var pdpGroupFound = false;
subGroup = findPdpSubGroup(message, finalizedPdpGroup);
- policies = getToscaPolicies(subGroup.get(), databaseProvider);
- policiesToBeDeployed = policies.stream().collect(Collectors
- .toMap(ToscaPolicy::getIdentifier, policy -> policy));
- policiesToBeUndeployed = null;
-
if (subGroup.isPresent()) {
+ policies = getToscaPolicies(subGroup.get(), databaseProvider);
+ policiesToBeDeployed = policies.stream().collect(Collectors
+ .toMap(ToscaPolicy::getIdentifier, policy -> policy));
+ policiesToBeUndeployed = null;
+
LOGGER.debug("Found pdpGroup - {}, going for registration of PDP - {}", finalizedPdpGroup, message);
if (!findPdpInstance(message, subGroup.get()).isPresent()) {
updatePdpSubGroup(finalizedPdpGroup, subGroup.get(), message, databaseProvider);
private void updatePdpSubGroup(final PdpGroup pdpGroup, final PdpSubGroup pdpSubGroup, final PdpStatus message,
final PolicyModelsProvider databaseProvider) throws PfModelException {
- final Pdp pdpInstance = new Pdp();
+ final var pdpInstance = new Pdp();
pdpInstance.setInstanceId(message.getName());
pdpInstance.setPdpState(PdpState.ACTIVE);
pdpInstance.setHealthy(message.getHealthy());
PdpGroupFilter.builder().name(message.getPdpGroup()).groupState(PdpState.ACTIVE).build();
final List<PdpGroup> pdpGroups = databaseProvider.getFilteredPdpGroups(filter);
if (!pdpGroups.isEmpty()) {
- PdpGroup pdpGroup = pdpGroups.get(0);
+ var pdpGroup = pdpGroups.get(0);
Optional<PdpSubGroup> pdpSubgroup = findPdpSubGroup(message, pdpGroup);
if (pdpSubgroup.isPresent()) {
Optional<Pdp> pdpInstance = findPdpInstance(message, pdpSubgroup.get());
final PdpState pdpState, final PolicyModelsProvider databaseProvider)
throws PfModelException {
final List<ToscaPolicy> polsToBeDeployed = new LinkedList<>(policiesToBeDeployed.values());
- final PdpUpdate pdpUpdatemessage =
- createPdpUpdateMessage(pdpGroupName, subGroup, pdpInstanceId, databaseProvider, policies,
+ final var pdpUpdatemessage =
+ createPdpUpdateMessage(pdpGroupName, subGroup, pdpInstanceId, policies,
polsToBeDeployed, policiesToBeUndeployed);
- final PdpStateChange pdpStateChangeMessage =
+ final var pdpStateChangeMessage =
createPdpStateChangeMessage(pdpGroupName, subGroup, pdpInstanceId, pdpState);
updateDeploymentStatus(pdpGroupName, subGroup.getPdpType(), pdpInstanceId, pdpStateChangeMessage.getState(),
databaseProvider, pdpUpdatemessage.getPolicies());
LOGGER.debug("Sent PdpUpdate message - {}", pdpUpdatemessage);
LOGGER.debug("Sent PdpStateChange message - {}", pdpStateChangeMessage);
}
-}
\ No newline at end of file
+}
* ============LICENSE_START=======================================================
* ONAP PAP
* ================================================================================
- * Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2019-2021 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.
import org.onap.policy.models.provider.PolicyModelsProvider;
import org.onap.policy.pap.main.PolicyModelsProviderFactoryWrapper;
import org.onap.policy.pap.main.PolicyPapRuntimeException;
-import org.onap.policy.pap.main.comm.TimerManager.Timer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
*/
public void add(String pdpName) {
synchronized (modifyLock) {
- Timer timer = pdp2timer.remove(pdpName);
+ var timer = pdp2timer.remove(pdpName);
if (timer != null) {
timer.cancel();
}
* ============LICENSE_START=======================================================
* ONAP PAP
* ================================================================================
- * Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2019-2021 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.
break;
}
- T data = token.replaceItem(null);
+ var data = token.replaceItem(null);
if (data != null) {
client.send(data);
}
* ============LICENSE_START=======================================================
* ONAP PAP
* ================================================================================
- * Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2019-2021 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.
synchronized (lockit) {
// always remove existing entry so that new entry goes at the end of the map
- Timer timer = name2timer.remove(timerName);
+ var timer = name2timer.remove(timerName);
if (timer != null) {
logger.info("{} timer replaced {}", name, timer);
}
* @param notif notification to which to add policy status
*/
protected void addNotifications(PolicyNotification notif) {
- DeploymentTracker newTracker = new DeploymentTracker();
+ var newTracker = new DeploymentTracker();
recordMap.values().forEach(newTracker::add);
tracker.addNotifications(notif, newTracker);
pdpGroupLoaded.add(pdpGroup);
for (PdpPolicyStatus status : provider.getGroupPolicyStatus(pdpGroup)) {
- StatusAction status2 = new StatusAction(Action.UNCHANGED, status);
+ var status2 = new StatusAction(Action.UNCHANGED, status);
recordMap.put(new StatusKey(status), status2);
tracker.add(status2);
}
PolicyStatus status = entry.getValue();
// create a status with counts that are all zero
- PolicyStatus newStatus = new PolicyStatus();
+ var newStatus = new PolicyStatus();
newStatus.setPolicyId(status.getPolicyId());
newStatus.setPolicyVersion(status.getPolicyVersion());
newStatus.setPolicyTypeId(status.getPolicyTypeId());
Map<ToscaConceptIdentifier, PolicyStatus> map = (status.isDeploy() ? deployMap : undeployMap);
PolicyStatus newStat = map.computeIfAbsent(policy, key -> {
- PolicyStatus value = new PolicyStatus();
+ var value = new PolicyStatus();
value.setPolicyId(policy.getName());
value.setPolicyVersion(policy.getVersion());
value.setPolicyTypeId(status.getPolicyType().getName());
status.loadByGroup(pdpGroup);
status.completeDeploy(pdp, expectedPolicies, actualPolicies);
- PolicyNotification notification = new PolicyNotification();
+ var notification = new PolicyNotification();
status.flush(notification);
publish(notification);
// Read the parameters
try {
// Read the parameters from JSON
- File file = new File(arguments.getFullConfigurationFilePath());
+ var file = new File(arguments.getFullConfigurationFilePath());
papParameterGroup = CODER.decode(file, PapParameterGroup.class);
} catch (final CoderException e) {
final String errorMessage = "error reading parameters from \"" + arguments.getConfigurationFilePath()
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2019 Nordix Foundation.
- * Modifications Copyright (C) 2019 AT&T Intellectual Property.
+ * Modifications Copyright (C) 2019, 2021 AT&T Intellectual Property.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* @return Report containing health check status
*/
public HealthCheckReport performHealthCheck() {
- final HealthCheckReport report = new HealthCheckReport();
+ final var report = new HealthCheckReport();
report.setName(NAME);
report.setUrl(URL);
* ONAP PAP
* ================================================================================
* Copyright (C) 2019 Nordix Foundation.
+ * Modifications Copyright (C) 2021 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.
} catch (PfModelException | PfModelRuntimeException e) {
logger.warn(errmsg, e);
- PdpGroupUpdateResponse resp = new PdpGroupUpdateResponse();
+ var resp = new PdpGroupUpdateResponse();
resp.setErrorDetails(e.getErrorResponse().getErrorMessage());
return addLoggingHeaders(addVersionControlHeaders(Response.status(e.getErrorResponse().getResponseCode())),
requestId).entity(resp).build();
* @throws PfModelException if an error occurred
*/
public void createOrUpdateGroups(PdpGroups groups) throws PfModelException {
- BeanValidationResult result = new BeanValidationResult("groups", groups);
+ var result = new BeanValidationResult("groups", groups);
groups.checkForDuplicateGroups(result);
if (!result.isValid()) {
String msg = result.getResult().trim();
* @throws PfModelException if an error occurred
*/
private void createOrUpdate(SessionData data, PdpGroups groups) throws PfModelException {
- BeanValidationResult result = new BeanValidationResult("groups", groups);
+ var result = new BeanValidationResult("groups", groups);
for (PdpGroup group : groups.getGroups()) {
PdpGroup dbgroup = data.getGroup(group.getName());
* @throws PfModelException if an error occurred
*/
private ValidationResult addGroup(SessionData data, PdpGroup group) throws PfModelException {
- BeanValidationResult result = new BeanValidationResult(group.getName(), group);
+ var result = new BeanValidationResult(group.getName(), group);
validateGroupOnly(group, result);
if (!result.isValid()) {
* @throws PfModelException if an error occurred
*/
private ValidationResult updateGroup(SessionData data, PdpGroup dbgroup, PdpGroup group) throws PfModelException {
- BeanValidationResult result = new BeanValidationResult(group.getName(), group);
+ var result = new BeanValidationResult(group.getName(), group);
if (!Objects.equals(dbgroup.getProperties(), group.getProperties())) {
result.addResult("properties", "", ValidationStatus.INVALID, "cannot change properties");
Map<String, PdpSubGroup> type2sub = new HashMap<>();
dbgroup.getPdpSubgroups().forEach(subgrp -> type2sub.put(subgrp.getPdpType(), subgrp));
- boolean updated = false;
+ var updated = false;
for (PdpSubGroup subgrp : group.getPdpSubgroups()) {
PdpSubGroup dbsub = type2sub.get(subgrp.getPdpType());
- BeanValidationResult subResult = new BeanValidationResult(subgrp.getPdpType(), subgrp);
+ var subResult = new BeanValidationResult(subgrp.getPdpType(), subgrp);
if (dbsub == null) {
updated = true;
* @throws PfModelException if an error occurred
*/
private boolean notifyPdpsDelSubGroups(SessionData data, PdpGroup dbgroup, PdpGroup group) throws PfModelException {
- boolean updated = false;
+ var updated = false;
// subgroups, as they appear within the updated group
Set<String> subgroups = new HashSet<>();
String name = pdp.getInstanceId();
// make it passive
- PdpStateChange change = new PdpStateChange();
+ var change = new PdpStateChange();
change.setName(name);
change.setState(PdpState.PASSIVE);
// remove it from subgroup and undeploy all policies
- PdpUpdate update = new PdpUpdate();
+ var update = new PdpUpdate();
update.setName(name);
data.addRequests(update, change);
subgrp.setCurrentInstanceCount(0);
subgrp.setPdpInstances(Collections.emptyList());
- BeanValidationResult result = new BeanValidationResult(subgrp.getPdpType(), subgrp);
+ var result = new BeanValidationResult(subgrp.getPdpType(), subgrp);
result.addResult(validateSupportedTypes(data, subgrp));
return result;
*/
private boolean validateSubGroup(PdpSubGroup dbsub, PdpSubGroup subgrp, BeanValidationResult container) {
- BeanValidationResult result = new BeanValidationResult(subgrp.getPdpType(), subgrp);
+ var result = new BeanValidationResult(subgrp.getPdpType(), subgrp);
if (!Objects.equals(dbsub.getProperties(), subgrp.getProperties())) {
result.addResult("properties", "", ValidationStatus.INVALID, "cannot change properties");
* @throws PfModelException if an error occurred
*/
private ValidationResult validateSupportedTypes(SessionData data, PdpSubGroup subgrp) throws PfModelException {
- BeanValidationResult result = new BeanValidationResult(subgrp.getPdpType(), subgrp);
+ var result = new BeanValidationResult(subgrp.getPdpType(), subgrp);
for (ToscaConceptIdentifier type : subgrp.getSupportedPolicyTypes()) {
if (!type.getName().endsWith(".*") && data.getPolicyType(type) == null) {
result.addResult("policy type", type, ValidationStatus.INVALID, "unknown policy type");
* ============LICENSE_START=======================================================
* ONAP PAP
* ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2019, 2021 AT&T Intellectual Property. All rights reserved.
* Modifications Copyright (C) 2021 Nordix Foundation.
* Modifications Copyright (C) 2021 Bell Canada. All rights reserved.
* ================================================================================
} catch (PfModelException | PfModelRuntimeException e) {
logger.warn(errmsg, e);
- PdpGroupDeleteResponse resp = new PdpGroupDeleteResponse();
+ var resp = new PdpGroupDeleteResponse();
resp.setErrorDetails(e.getErrorResponse().getErrorMessage());
return addLoggingHeaders(addVersionControlHeaders(Response.status(e.getErrorResponse().getResponseCode())),
requestId).entity(resp).build();
} catch (PfModelException | PfModelRuntimeException e) {
logger.warn(errmsg, e);
- PdpGroupDeployResponse resp = new PdpGroupDeployResponse();
+ var resp = new PdpGroupDeployResponse();
resp.setErrorDetails(e.getErrorResponse().getErrorMessage());
return addLoggingHeaders(addVersionControlHeaders(Response.status(e.getErrorResponse().getResponseCode())),
requestId).entity(resp).build();
Set<String> pdps = subgroup.getPdpInstances().stream().map(Pdp::getInstanceId).collect(Collectors.toSet());
- boolean result = false;
+ var result = false;
Iterator<ToscaConceptIdentifier> iter = subgroup.getPolicies().iterator();
while (iter.hasNext()) {
* ============LICENSE_START=======================================================
* ONAP PAP
* ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2019, 2021 AT&T Intellectual Property. All rights reserved.
* Modifications Copyright (C) 2021 Bell Canada. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
} catch (PfModelException | PfModelRuntimeException e) {
logger.warn(errmsg, e);
- PdpGroupDeployResponse resp = new PdpGroupDeployResponse();
+ var resp = new PdpGroupDeployResponse();
resp.setErrorDetails(e.getErrorResponse().getErrorMessage());
return addLoggingHeaders(addVersionControlHeaders(Response.status(e.getErrorResponse().getResponseCode())),
requestId).entity(resp).build();
* @throws PfModelException if an error occurred
*/
private void updateGroups(SessionData data, DeploymentGroups groups) throws PfModelException {
- BeanValidationResult result = new BeanValidationResult("groups", groups);
+ var result = new BeanValidationResult("groups", groups);
for (DeploymentGroup group : groups.getGroups()) {
PdpGroup dbgroup = data.getGroup(group.getName());
private ValidationResult updateGroup(SessionData data, PdpGroup dbgroup, DeploymentGroup group)
throws PfModelException {
- BeanValidationResult result = new BeanValidationResult(group.getName(), group);
+ var result = new BeanValidationResult(group.getName(), group);
boolean updated = updateSubGroups(data, dbgroup, group, result);
Map<String, PdpSubGroup> type2sub = new HashMap<>();
dbgroup.getPdpSubgroups().forEach(subgrp -> type2sub.put(subgrp.getPdpType(), subgrp));
- boolean updated = false;
+ var updated = false;
for (DeploymentSubGroup subgrp : group.getDeploymentSubgroups()) {
PdpSubGroup dbsub = type2sub.get(subgrp.getPdpType());
- BeanValidationResult subResult = new BeanValidationResult(subgrp.getPdpType(), subgrp);
+ var subResult = new BeanValidationResult(subgrp.getPdpType(), subgrp);
if (dbsub == null) {
subResult.addResult(subgrp.getPdpType(), subgrp, ValidationStatus.INVALID, "unknown subgroup");
return false;
}
- boolean updated = false;
+ var updated = false;
switch (subgrp.getAction()) {
case POST:
Set<ToscaConceptIdentifier> policies = new LinkedHashSet<>(dbsub.getPolicies());
policies.addAll(subgrp.getPolicies());
- DeploymentSubGroup subgrp2 = new DeploymentSubGroup(subgrp);
+ var subgrp2 = new DeploymentSubGroup(subgrp);
subgrp2.getPolicies().clear();
subgrp2.getPolicies().addAll(policies);
Set<ToscaConceptIdentifier> policies = new LinkedHashSet<>(dbsub.getPolicies());
policies.removeAll(subgrp.getPolicies());
- DeploymentSubGroup subgrp2 = new DeploymentSubGroup(subgrp);
+ var subgrp2 = new DeploymentSubGroup(subgrp);
subgrp2.getPolicies().clear();
subgrp2.getPolicies().addAll(policies);
private boolean validateSubGroup(SessionData data, PdpSubGroup dbsub, DeploymentSubGroup subgrp,
BeanValidationResult container) throws PfModelException {
- BeanValidationResult result = new BeanValidationResult(subgrp.getPdpType(), subgrp);
+ var result = new BeanValidationResult(subgrp.getPdpType(), subgrp);
result.addResult(validatePolicies(data, dbsub, subgrp));
container.addResult(result);
Map<String, String> dbname2vers = new HashMap<>();
dbsub.getPolicies().forEach(ident -> dbname2vers.put(ident.getName(), ident.getVersion()));
- BeanValidationResult result = new BeanValidationResult(subgrp.getPdpType(), subgrp);
+ var result = new BeanValidationResult(subgrp.getPdpType(), subgrp);
for (ToscaConceptIdentifier ident : subgrp.getPolicies()) {
// note: "ident" may not have a fully qualified version
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2019 Nordix Foundation.
+ * Modifications Copyright (C) 2021 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.
*/
public Pair<Response.Status, Pdps> fetchPdpGroupHealthStatus() throws PfModelException {
- final Pdps pdps = new Pdps();
+ final var pdps = new Pdps();
final PolicyModelsProviderFactoryWrapper modelProviderWrapper =
Registry.get(PapConstants.REG_PAP_DAO_FACTORY, PolicyModelsProviderFactoryWrapper.class);
try (PolicyModelsProvider databaseProvider = modelProviderWrapper.create()) {
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2019 Nordix Foundation.
+ * Modifications Copyright (C) 2021 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.
*/
public Pair<Response.Status, PdpGroups> fetchPdpGroupDetails() throws PfModelException {
- final PdpGroups pdpGroups = new PdpGroups();
+ final var pdpGroups = new PdpGroups();
final PolicyModelsProviderFactoryWrapper modelProviderWrapper =
Registry.get(PapConstants.REG_PAP_DAO_FACTORY, PolicyModelsProviderFactoryWrapper.class);
try (PolicyModelsProvider databaseProvider = modelProviderWrapper.create()) {
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2019 Nordix Foundation.
- * Modifications Copyright (C) 2019-2020 AT&T Intellectual Property.
+ * Modifications Copyright (C) 2019-2021 AT&T Intellectual Property.
* Modifications Copyright (C) 2021 Bell Canada. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
import org.onap.policy.models.pap.concepts.PdpGroupStateChangeResponse;
import org.onap.policy.models.pdp.concepts.Pdp;
import org.onap.policy.models.pdp.concepts.PdpGroup;
-import org.onap.policy.models.pdp.concepts.PdpStateChange;
import org.onap.policy.models.pdp.concepts.PdpSubGroup;
-import org.onap.policy.models.pdp.concepts.PdpUpdate;
import org.onap.policy.models.pdp.enums.PdpState;
import org.onap.policy.models.provider.PolicyModelsProvider;
import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicy;
List<ToscaPolicy> policies = getToscaPolicies(subGroup, databaseProvider);
for (final Pdp pdp : subGroup.getPdpInstances()) {
String pdpInstanceId = pdp.getInstanceId();
- final PdpUpdate pdpUpdatemessage =
- createPdpUpdateMessage(pdpGroup.getName(), subGroup, pdp.getInstanceId(), databaseProvider,
+ final var pdpUpdatemessage =
+ createPdpUpdateMessage(pdpGroup.getName(), subGroup, pdp.getInstanceId(),
policies, policies, null);
- final PdpStateChange pdpStateChangeMessage =
+ final var pdpStateChangeMessage =
createPdpStateChangeMessage(pdpGroupName, subGroup, pdpInstanceId, pdpState);
updateDeploymentStatus(pdpGroupName, subGroup.getPdpType(), pdpInstanceId,
pdpStateChangeMessage.getState(), databaseProvider, pdpUpdatemessage.getPolicies());
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2019-2020 Nordix Foundation.
- * Modifications Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
* Modifications Copyright (C) 2020 Bell Canada. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
-import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import javax.ws.rs.core.Response;
import org.onap.policy.common.endpoints.http.client.HttpClient;
import org.onap.policy.common.endpoints.http.client.HttpClientConfigException;
import org.onap.policy.common.endpoints.http.client.HttpClientFactory;
-import org.onap.policy.common.endpoints.parameters.RestServerParameters;
import org.onap.policy.common.endpoints.report.HealthCheckReport;
import org.onap.policy.common.parameters.ParameterService;
import org.onap.policy.common.utils.services.Registry;
// Check PAP itself
HealthCheckReport papReport = new HealthCheckProvider().performHealthCheck();
- RestServerParameters restServerParameters = papParameterGroup.getRestServerParameters();
+ var restServerParameters = papParameterGroup.getRestServerParameters();
papReport.setUrl(
(restServerParameters.isHttps() ? "https://" : "http://") + papReport.getUrl() + ":" + restServerParameters
.getPort() + POLICY_PAP_HEALTHCHECK_URI);
}
private boolean verifyNumberOfPdps(List<PdpGroup> groups) {
- boolean flag = true;
+ var flag = true;
for (final PdpGroup group : groups) {
for (final PdpSubGroup subGroup : group.getPdpSubgroups()) {
if (subGroup.getCurrentInstanceCount() < subGroup.getDesiredInstanceCount()) {
}
private HealthCheckReport createUnHealthCheckReport(String name, String url, int code, String message) {
- HealthCheckReport report = new HealthCheckReport();
+ var report = new HealthCheckReport();
report.setName(name);
report.setUrl(url);
report.setHealthy(false);
}
private HealthCheckReport replaceIpWithHostname(HealthCheckReport report, String baseUrl) {
- Matcher matcher = IP_REPLACEMENT_PATTERN.matcher(baseUrl);
- String ip = "";
+ var matcher = IP_REPLACEMENT_PATTERN.matcher(baseUrl);
if (matcher.find()) {
- ip = matcher.group(1);
+ var ip = matcher.group(1);
report.setUrl(baseUrl.replace(ip, report.getUrl()));
}
return report;
package org.onap.policy.pap.main.rest;
-import com.google.re2j.Matcher;
import com.google.re2j.Pattern;
import java.util.Collection;
import java.util.List;
*/
public Collection<PolicyStatus> getByRegex(String patternString) throws PfModelException {
// try to make pattern out of regex
- final Pattern pattern = Pattern.compile(patternString);
+ final var pattern = Pattern.compile(patternString);
// get all the statuses
final List<PdpPolicyStatus> policyStatuses;
try (PolicyModelsProvider dao = daoFactory.create()) {
* @return the deployment status of the policies
*/
private Collection<PolicyStatus> accumulate(Collection<PdpPolicyStatus> source) {
- DeploymentTracker tracker = new DeploymentTracker();
+ var tracker = new DeploymentTracker();
for (PdpPolicyStatus status : source) {
if (status.isDeploy()) {
*/
public Collection<PdpPolicyStatus> getPolicyStatusByRegex(String pdpGroupName, String patternString)
throws PfModelException {
- final Pattern pattern = Pattern.compile(patternString);
+ final var pattern = Pattern.compile(patternString);
// get all the statuses
final Collection<PdpPolicyStatus> policyStatuses = getPolicyStatus(pdpGroupName);
// filter out statuses with the wrong name
final String policyName = policyStatus
.getPolicy()
.getName();
- final Matcher matcher = pattern.matcher(policyName);
- return matcher.matches();
+ return pattern.matcher(policyName).matches();
})
.collect(Collectors.toList());
}
PdpSubGroup subgroup = optsub.get();
// remove the policies
- boolean updated = false;
+ var updated = false;
Set<String> pdps = subgroup.getPdpInstances().stream().map(Pdp::getInstanceId).collect(Collectors.toSet());
for (ToscaConceptIdentifier ident : policyInfo.policies) {
synchronized (updateLock) {
SessionData data;
- PolicyNotification notif = new PolicyNotification();
+ var notif = new PolicyNotification();
try (PolicyModelsProvider dao = daoFactory.create()) {
+ desiredPolicy.getName() + " " + desiredPolicy.getVersion());
}
- Updater updater = makeUpdater(data, policy, desiredPolicy);
+ var updater = makeUpdater(data, policy, desiredPolicy);
for (PdpGroup group : groups) {
upgradeGroup(data, group, updater);
private void upgradeGroup(SessionData data, PdpGroup group, Updater updater)
throws PfModelException {
- boolean updated = false;
+ var updated = false;
for (PdpSubGroup subgroup : group.getPdpSubgroups()) {
*/
private PdpUpdate makeUpdate(SessionData data, PdpGroup group, PdpSubGroup subgroup, Pdp pdp) {
- PdpUpdate update = new PdpUpdate();
+ var update = new PdpUpdate();
update.setName(pdp.getInstanceId());
update.setDescription(group.getDescription());
String pdpType) throws PfModelException {
ToscaConceptIdentifier policyId = policy.getIdentifier();
policiesToBeDeployed.put(policyId, policy);
-
+
addData(policyId, pdps, pdpGroup, pdpType, true);
}
// delete all records whose "deploy" flag is the opposite of what we want
deployStatus.deleteDeployment(policyId, !deploy);
- ToscaConceptIdentifierOptVersion optid = new ToscaConceptIdentifierOptVersion(policyId);
+ var optid = new ToscaConceptIdentifierOptVersion(policyId);
ToscaConceptIdentifier policyType = getPolicy(optid).getTypeIdentifier();
for (String pdp : pdps) {
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2020-2021 Nordix Foundation.
- * Modifications Copyright (C) 2019 AT&T Intellectual Property.
+ * Modifications Copyright (C) 2019, 2021 AT&T Intellectual Property.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* @return Report containing statistics of pap component
*/
public StatisticsReport fetchCurrentStatistics() {
- final StatisticsReport report = new StatisticsReport();
+ final var report = new StatisticsReport();
report.setCode(Registry.get(PapConstants.REG_PAP_ACTIVATOR, PapActivator.class).isAlive() ? 200 : 500);
PapStatisticsManager mgr = Registry.get(PapConstants.REG_STATISTICS_MANAGER, PapStatisticsManager.class);
* @param args the command line arguments
*/
public Main(final String[] args) {
- final String argumentString = Arrays.toString(args);
+ final var argumentString = Arrays.toString(args);
LOGGER.info("Starting policy pap service with arguments - {}", argumentString);
// Check the arguments
- final PapCommandLineArguments arguments = new PapCommandLineArguments();
+ final var arguments = new PapCommandLineArguments();
try {
// The arguments return a string if there is a message to print and we should exit
final String argumentMessage = arguments.parse(args);
// Add a shutdown hook to shut everything down in an orderly manner
Runtime.getRuntime().addShutdownHook(new PolicyPapShutdownHookClass());
- String successMsg = String.format(MessageConstants.START_SUCCESS_MSG, MessageConstants.POLICY_PAP);
+ var successMsg = String.format(MessageConstants.START_SUCCESS_MSG, MessageConstants.POLICY_PAP);
LOGGER.info(successMsg);
}
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2019 Nordix Foundation.
- * Modifications Copyright (C) 2019-2020 AT&T Intellectual Property.
+ * Modifications Copyright (C) 2019-2021 AT&T Intellectual Property.
* ================================================================================
* 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.notification.PolicyNotifier;
import org.onap.policy.pap.main.parameters.PapParameterGroup;
import org.onap.policy.pap.main.parameters.PdpModifyRequestMapParams;
-import org.onap.policy.pap.main.parameters.PdpParameters;
import org.onap.policy.pap.main.rest.HealthCheckRestControllerV1;
import org.onap.policy.pap.main.rest.PapAafFilter;
import org.onap.policy.pap.main.rest.PapStatisticsManager;
papParameterGroup.getRestServerParameters().setName(papParameterGroup.getName());
- final Object pdpUpdateLock = new Object();
- final PdpParameters pdpParams = papParameterGroup.getPdpParameters();
+ final var pdpUpdateLock = new Object();
+ final var pdpParams = papParameterGroup.getPdpParameters();
final AtomicReference<Publisher<PdpMessage>> pdpPub = new AtomicReference<>();
final AtomicReference<Publisher<PolicyNotification>> notifyPub = new AtomicReference<>();
final AtomicReference<TimerManager> pdpUpdTimers = new AtomicReference<>();
addAction("REST server",
() -> {
- RestServer server = new RestServer(papParameterGroup.getRestServerParameters(), PapAafFilter.class,
+ var server = new RestServer(papParameterGroup.getRestServerParameters(), PapAafFilter.class,
HealthCheckRestControllerV1.class,
StatisticsRestControllerV1.class,
PdpGroupCreateOrUpdateControllerV1.class,
* @param runner function to run in the background
*/
private void startThread(final Runnable runner) {
- final Thread thread = new Thread(runner);
+ final var thread = new Thread(runner);
thread.setDaemon(true);
thread.start();
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2019 Nordix Foundation.
- * Modifications Copyright (C) 2019 AT&T Intellectual Property.
+ * Modifications Copyright (C) 2019, 2021 AT&T Intellectual Property.
* ================================================================================
* 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.models.base.PfModelException;
import org.onap.policy.models.pdp.concepts.PdpGroup;
import org.onap.policy.models.pdp.concepts.PdpGroups;
-import org.onap.policy.models.provider.PolicyModelsProvider;
import org.onap.policy.models.provider.PolicyModelsProviderFactory;
import org.onap.policy.models.provider.PolicyModelsProviderParameters;
import org.onap.policy.pap.main.PolicyPapException;
public void initializePapDatabase(final PolicyModelsProviderParameters policyModelsProviderParameters)
throws PolicyPapException {
- try (PolicyModelsProvider databaseProvider =
+ try (var databaseProvider =
factory.createPolicyModelsProvider(policyModelsProviderParameters)) {
- final String originalJson = ResourceUtils.getResourceAsString("PapDb.json");
- final PdpGroups pdpGroupsToCreate = standardCoder.decode(originalJson, PdpGroups.class);
+ final var originalJson = ResourceUtils.getResourceAsString("PapDb.json");
+ final var pdpGroupsToCreate = standardCoder.decode(originalJson, PdpGroups.class);
final List<PdpGroup> pdpGroupsFromDb = databaseProvider.getPdpGroups(
pdpGroupsToCreate.getGroups().get(0).getName());
if (pdpGroupsFromDb.isEmpty()) {
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2019-2021 Nordix Foundation.
- * Modifications Copyright (C) 2020 AT&T Intellectual Property.
+ * Modifications Copyright (C) 2020-2021 AT&T Intellectual Property.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
PdpStatusMessageHandler handler = new PdpStatusMessageHandler(params);
PdpUpdate update10 = handler.createPdpUpdateMessage(
status3.getPdpGroup(), new PdpSubGroup(), "pdp_2",
- null, policies, policies, polsUndep);
+ policies, policies, polsUndep);
assertSame(update10.getPolicies(), policies);
assertSame(update10.getPoliciesToBeDeployed(), policies);
assertSame(update10.getPoliciesToBeUndeployed(), polsUndep);
assertTrue(data.reconfigure(msg2));
- List<ToscaConceptIdentifier> dataPols = data.getMessage().getPoliciesToBeDeployed().stream()
- .map(ToscaPolicy::getIdentifier)
- .collect(Collectors.toList());
- assertThat(dataPols).doesNotContainAnyElementsOf(data.getMessage().getPoliciesToBeUndeployed());
+ assertThat(data.getMessage().getPoliciesToBeDeployed()).isEmpty();
// some items only in deploy
policies = new ArrayList<>(update.getPolicies());
Code Review / policy / pap.git / commitdiff