* @return the validation result
*/
public ValidationResult validatePapRest() {
- BeanValidationResult result = new BeanValidationResult("group", this);
+ var result = new BeanValidationResult("group", this);
result.validateNotNull("name", name);
result.validateNotNullList(SUBGROUP_FIELD, deploymentSubgroups, DeploymentSubGroup::validatePapRest);
Map<String, Action> pdpType2action = new HashMap<>();
for (DeploymentSubGroup subgrp : deploymentSubgroups) {
- Action action = subgrp.getAction();
+ var action = subgrp.getAction();
pdpType2action.compute(subgrp.getPdpType(), (pdpType, curact) -> {
if (curact != null && action == Action.PATCH) {
- BeanValidationResult subResult = new BeanValidationResult(pdpType, pdpType);
+ var subResult = new BeanValidationResult(pdpType, pdpType);
subResult.addResult("action", action, ValidationStatus.INVALID,
"incompatible with previous action: " + curact);
- BeanValidationResult subResult2 = new BeanValidationResult(SUBGROUP_FIELD, subgrp);
+ var subResult2 = new BeanValidationResult(SUBGROUP_FIELD, subgrp);
subResult2.addResult(subResult);
result.addResult(subResult2);
}
* ============LICENSE_START=======================================================
* ONAP Policy Models
* ================================================================================
- * Copyright (C) 2019 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.
* @return the validation result
*/
public ValidationResult validatePapRest() {
- BeanValidationResult result = new BeanValidationResult(GROUPS_FIELD, this);
+ var result = new BeanValidationResult(GROUPS_FIELD, this);
result.validateNotNullList(GROUPS_FIELD, groups, DeploymentGroup::validatePapRest);
if (!result.isValid()) {
/*-
* ============LICENSE_START=======================================================
- * 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.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* @return the validation result
*/
public ValidationResult validatePapRest() {
- BeanValidationResult result = new BeanValidationResult("group", this);
+ var result = new BeanValidationResult("group", this);
result.validateNotNull("pdpType", pdpType);
result.validateNotNull("action", action);
* @return the validation result
*/
public ValidationResult validatePapRest(boolean updateGroupFlow) {
- BeanValidationResult result = new BeanValidationResult("group", this);
+ var result = new BeanValidationResult("group", this);
/*
* Don't care about state, because we override it. Ok if description is null.
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2019-2021 Nordix Foundation.
- * Modifications Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved.
+ * Modifications 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.
for (ToscaConceptIdentifier supportedPolicyType : supportedPolicyTypes) {
String supName = supportedPolicyType.getName();
if (supName.endsWith(".*")) {
- String substr = supName.substring(0, supName.length() - 1);
+ var substr = supName.substring(0, supName.length() - 1);
if (typeFilter.stream().anyMatch(type -> type.getName().startsWith(substr))) {
return true;
}
* @return the validation result
*/
public ValidationResult validatePapRest(boolean updateGroupFlow) {
- BeanValidationResult result = new BeanValidationResult("group", this);
+ var result = new BeanValidationResult("group", this);
result.validateNotNull("pdpType", pdpType);
// When doing PdpGroup Update operation, supported policy types and policies doesn't have to be validated.
@Override
public Pdp toAuthorative() {
- Pdp pdp = new Pdp();
+ var pdp = new Pdp();
pdp.setInstanceId(key.getLocalName());
pdp.setPdpState(pdpState);
@Override
public PdpGroup toAuthorative() {
- PdpGroup pdpGroup = new PdpGroup();
+ var pdpGroup = new PdpGroup();
pdpGroup.setName(getKey().getName());
pdpGroup.setVersion(getKey().getVersion());
this.pdpSubGroups = new ArrayList<>();
for (PdpSubGroup pdpSubgroup : pdpGroup.getPdpSubgroups()) {
- JpaPdpSubGroup jpaPdpSubGroup = new JpaPdpSubGroup();
+ var jpaPdpSubGroup = new JpaPdpSubGroup();
jpaPdpSubGroup.setKey(new PfReferenceKey(getKey(), pdpSubgroup.getPdpType()));
jpaPdpSubGroup.fromAuthorative(pdpSubgroup);
this.pdpSubGroups.add(jpaPdpSubGroup);
@Override
public PdpPolicyStatus toAuthorative() {
PfConceptKey policyKey = key.getParentConceptKey();
- ToscaConceptIdentifier policyIdent = new ToscaConceptIdentifier(policyKey.getName(), policyKey.getVersion());
-
- ToscaConceptIdentifier policyTypeIdent =
- new ToscaConceptIdentifier(policyType.getName(), policyType.getVersion());
+ var policyIdent = new ToscaConceptIdentifier(policyKey.getName(), policyKey.getVersion());
+ var policyTypeIdent = new ToscaConceptIdentifier(policyType.getName(), policyType.getVersion());
// @formatter:off
return PdpPolicyStatus.builder()
* ONAP Policy Model
* ================================================================================
* Copyright (C) 2019-2021 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 PdpStatistics toAuthorative() {
- PdpStatistics pdpStatistics = new PdpStatistics();
+ var pdpStatistics = new PdpStatistics();
pdpStatistics.setPdpInstanceId(key.getName());
pdpStatistics.setGeneratedId(key.getGeneratedId());
pdpStatistics.setTimeStamp(timeStamp.toInstant());
@Override
public PdpSubGroup toAuthorative() {
- PdpSubGroup pdpSubgroup = new PdpSubGroup();
+ var pdpSubgroup = new PdpSubGroup();
pdpSubgroup.setPdpType(getKey().getLocalName());
pdpSubgroup.setSupportedPolicyTypes(new ArrayList<>());
for (PfSearchableKey supportedPolicyTypeKey : supportedPolicyTypes) {
- ToscaConceptIdentifier supportedPolicyTypeIdent = new ToscaConceptIdentifier(
+ var supportedPolicyTypeIdent = new ToscaConceptIdentifier(
supportedPolicyTypeKey.getName(), supportedPolicyTypeKey.getVersion());
pdpSubgroup.getSupportedPolicyTypes().add(supportedPolicyTypeIdent);
}
pdpSubgroup.setPolicies(new ArrayList<>());
for (PfConceptKey policyKey : policies) {
- ToscaConceptIdentifier toscaPolicyIdentifier = new ToscaConceptIdentifier();
+ var toscaPolicyIdentifier = new ToscaConceptIdentifier();
toscaPolicyIdentifier.setName(policyKey.getName());
toscaPolicyIdentifier.setVersion(policyKey.getVersion());
pdpSubgroup.getPolicies().add(toscaPolicyIdentifier);
this.pdpInstances = new ArrayList<>();
if (pdpSubgroup.getPdpInstances() != null) {
for (Pdp pdp : pdpSubgroup.getPdpInstances()) {
- JpaPdp jpaPdp = new JpaPdp();
+ var jpaPdp = new JpaPdp();
jpaPdp.setKey(new PfReferenceKey(getKey(), pdp.getInstanceId()));
jpaPdp.fromAuthorative(pdp);
this.pdpInstances.add(jpaPdp);
throws PfModelException {
for (PdpGroup pdpGroup : pdpGroups) {
- JpaPdpGroup jpaPdpGroup = new JpaPdpGroup();
+ var jpaPdpGroup = new JpaPdpGroup();
jpaPdpGroup.fromAuthorative(pdpGroup);
BeanValidationResult validationResult = jpaPdpGroup.validate("PDP group");
List<PdpGroup> returnPdpGroups = new ArrayList<>();
for (PdpGroup pdpGroup : pdpGroups) {
- JpaPdpGroup jpaPdpGroup =
- dao.get(JpaPdpGroup.class, new PfConceptKey(pdpGroup.getName(), PfKey.NULL_KEY_VERSION));
+ var jpaPdpGroup = dao.get(JpaPdpGroup.class, new PfConceptKey(pdpGroup.getName(), PfKey.NULL_KEY_VERSION));
returnPdpGroups.add(jpaPdpGroup.toAuthorative());
}
throws PfModelException {
for (PdpGroup pdpGroup : pdpGroups) {
- JpaPdpGroup jpaPdpGroup = new JpaPdpGroup();
+ var jpaPdpGroup = new JpaPdpGroup();
jpaPdpGroup.fromAuthorative(pdpGroup);
BeanValidationResult validationResult = jpaPdpGroup.validate("PDP group");
List<PdpGroup> returnPdpGroups = new ArrayList<>();
for (PdpGroup pdpGroup : pdpGroups) {
- JpaPdpGroup jpaPdpGroup =
+ var jpaPdpGroup =
dao.get(JpaPdpGroup.class, new PfConceptKey(pdpGroup.getName(), PfKey.NULL_KEY_VERSION));
returnPdpGroups.add(jpaPdpGroup.toAuthorative());
}
public void updatePdpSubGroup(@NonNull final PfDao dao, @NonNull final String pdpGroupName,
@NonNull final PdpSubGroup pdpSubGroup) throws PfModelException {
- final PfReferenceKey subGroupKey =
+ final var subGroupKey =
new PfReferenceKey(pdpGroupName, PfKey.NULL_KEY_VERSION, pdpSubGroup.getPdpType());
- final JpaPdpSubGroup jpaPdpSubgroup = new JpaPdpSubGroup(subGroupKey);
+ final var jpaPdpSubgroup = new JpaPdpSubGroup(subGroupKey);
jpaPdpSubgroup.fromAuthorative(pdpSubGroup);
BeanValidationResult validationResult = jpaPdpSubgroup.validate("PDP sub group");
public void updatePdp(@NonNull final PfDao dao, @NonNull final String pdpGroupName,
@NonNull final String pdpSubGroup, @NonNull final Pdp pdp) {
- final PfReferenceKey pdpKey =
+ final var pdpKey =
new PfReferenceKey(pdpGroupName, PfKey.NULL_KEY_VERSION, pdpSubGroup, pdp.getInstanceId());
- final JpaPdp jpaPdp = new JpaPdp(pdpKey);
+ final var jpaPdp = new JpaPdp(pdpKey);
jpaPdp.fromAuthorative(pdp);
BeanValidationResult validationResult = jpaPdp.validate("PDP");
*/
public PdpGroup deletePdpGroup(@NonNull final PfDao dao, @NonNull final String name) {
- PfConceptKey pdpGroupKey = new PfConceptKey(name, PfKey.NULL_KEY_VERSION);
+ var pdpGroupKey = new PfConceptKey(name, PfKey.NULL_KEY_VERSION);
JpaPdpGroup jpaDeletePdpGroup = dao.get(JpaPdpGroup.class, pdpGroupKey);
List<JpaPdpPolicyStatus> jpas = objs.stream().map(JpaPdpPolicyStatus::new).collect(Collectors.toList());
// validate the objects
- BeanValidationResult result = new BeanValidationResult(fieldName, jpas);
+ var result = new BeanValidationResult(fieldName, jpas);
- int count = 0;
+ var count = 0;
for (JpaPdpPolicyStatus jpa: jpas) {
result.addResult(jpa.validate(String.valueOf(count++)));
}
* ONAP Policy Model
* ================================================================================
* Copyright (C) 2019-2021 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.
*/
public List<PdpStatistics> getPdpStatistics(@NonNull final PfDao dao, final String name, final Instant timeStamp)
throws PfModelException {
- List<PdpStatistics> pdpStatistics = new ArrayList<>();
if (name != null && timeStamp != null) {
return asPdpStatisticsList(dao.getByTimestamp(JpaPdpStatistics.class,
new PfGeneratedIdKey(name, PfKey.NULL_KEY_VERSION), timeStamp));
public List<PdpStatistics> createPdpStatistics(@NonNull final PfDao dao,
@NonNull final List<PdpStatistics> pdpStatisticsList) throws PfModelException {
for (PdpStatistics pdpStatistics : pdpStatisticsList) {
- JpaPdpStatistics jpaPdpStatistics = new JpaPdpStatistics();
+ var jpaPdpStatistics = new JpaPdpStatistics();
jpaPdpStatistics.fromAuthorative(pdpStatistics);
BeanValidationResult validationResult = jpaPdpStatistics.validate("pdp statistics");
if (!validationResult.isValid()) {
List<PdpStatistics> pdpStatistics = new ArrayList<>(pdpStatisticsList.size());
for (PdpStatistics pdpStatisticsItem : pdpStatisticsList) {
- JpaPdpStatistics jpaPdpStatistics =
+ var jpaPdpStatistics =
dao.get(JpaPdpStatistics.class, new PfGeneratedIdKey(pdpStatisticsItem.getPdpInstanceId(),
PfKey.NULL_KEY_VERSION, pdpStatisticsItem.getGeneratedId()));
pdpStatistics.add(jpaPdpStatistics.toAuthorative());
@NonNull final List<PdpStatistics> pdpStatisticsList) throws PfModelException {
for (PdpStatistics pdpStatistics : pdpStatisticsList) {
- JpaPdpStatistics jpaPdpStatistics = new JpaPdpStatistics();
+ var jpaPdpStatistics = new JpaPdpStatistics();
jpaPdpStatistics.fromAuthorative(pdpStatistics);
BeanValidationResult validationResult = jpaPdpStatistics.validate("pdp statistics");
List<PdpStatistics> pdpStatistics = new ArrayList<>(pdpStatisticsList.size());
for (PdpStatistics pdpStatisticsItem : pdpStatisticsList) {
- JpaPdpStatistics jpaPdpStatistics =
+ var jpaPdpStatistics =
dao.get(JpaPdpStatistics.class, new PfGeneratedIdKey(pdpStatisticsItem.getPdpInstanceId(),
PfKey.NULL_KEY_VERSION, pdpStatisticsItem.getGeneratedId()));
pdpStatistics.add(jpaPdpStatistics.toAuthorative());
parameters.getPersistenceUnit());
if (pfDao != null) {
- String errorMessage = "provider is already initialized";
+ var errorMessage = "provider is already initialized";
throw new PfModelException(Response.Status.NOT_ACCEPTABLE, errorMessage);
}
// Parameters for the DAO
- final DaoParameters daoParameters = new DaoParameters();
+ final var daoParameters = new DaoParameters();
daoParameters.setPluginClass(DefaultPfDao.class.getName());
daoParameters.setPersistenceUnit(parameters.getPersistenceUnit());
// @formatter:off
- Properties jdbcProperties = new Properties();
+ var jdbcProperties = new Properties();
jdbcProperties.setProperty(PersistenceUnitProperties.JDBC_DRIVER, parameters.getDatabaseDriver());
jdbcProperties.setProperty(PersistenceUnitProperties.JDBC_URL, parameters.getDatabaseUrl());
jdbcProperties.setProperty(PersistenceUnitProperties.JDBC_USER, parameters.getDatabaseUser());
throws PfModelException {
assertInitialized();
- ToscaConceptIdentifier policyTypeIdentifier = new ToscaConceptIdentifier(name, version);
+ var policyTypeIdentifier = new ToscaConceptIdentifier(name, version);
assertPolicyTypeNotSupportedInPdpGroup(policyTypeIdentifier);
return new AuthorativeToscaProvider().deletePolicyType(getPfDao(), name, version);
throws PfModelException {
assertInitialized();
- ToscaConceptIdentifier policyIdentifier = new ToscaConceptIdentifier(name, version);
+ var policyIdentifier = new ToscaConceptIdentifier(name, version);
assertPolicyNotDeployedInPdpGroup(policyIdentifier);
return new AuthorativeToscaProvider().deletePolicy(getPfDao(), name, version);
*/
private void assertInitialized() {
if (getPfDao() == null) {
- String errorMessage = "policy models provider is not initilaized";
+ var errorMessage = "policy models provider is not initilaized";
throw new PfModelRuntimeException(Response.Status.BAD_REQUEST, errorMessage);
}
}
* @return the ToscaServiceTemplate with the dummy response
*/
protected ToscaServiceTemplate getDummyResponse(final String fileName) {
- StandardCoder standardCoder = new StandardCoder();
+ var standardCoder = new StandardCoder();
ToscaServiceTemplate serviceTemplate;
try {
List<PdpStatistics> statisticsArrayList = makePdpStatisticsList();
- assertThat(databaseProvider.getPdpStatistics(null, null)).hasSize(0);
+ assertThat(databaseProvider.getPdpStatistics(null, null)).isEmpty();
assertThat(databaseProvider.createPdpStatistics(statisticsArrayList)).hasSize(1);
assertThat(databaseProvider.updatePdpStatistics(statisticsArrayList)).hasSize(1);
}
* @return the validation result
*/
public ValidationResult validatePapRest() {
- BeanValidationResult result = new BeanValidationResult("identifier", this);
+ var result = new BeanValidationResult("identifier", this);
result.validateNotNull("name", getName());
result.validateNotNull("version", getVersion());
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2019-2021 Nordix Foundation.
- * Modifications Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * Modifications 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 (providerLockObject) {
LOGGER.debug("->getFilteredPolicyTypes: filter={}", filter);
- SimpleToscaProvider simpleToscaProvider = new SimpleToscaProvider();
+ var simpleToscaProvider = new SimpleToscaProvider();
final JpaToscaServiceTemplate dbServiceTemplate = simpleToscaProvider.getPolicyTypes(dao, null, null);
"policy types for filter " + filter.toString() + " do not exist");
}
- JpaToscaServiceTemplate filteredServiceTemplate = new JpaToscaServiceTemplate();
+ var filteredServiceTemplate = new JpaToscaServiceTemplate();
for (ToscaPolicyType policyType : filteredPolicyTypes) {
JpaToscaServiceTemplate cascadedServiceTemplate = simpleToscaProvider
String version =
ToscaTypedEntityFilter.LATEST_VERSION.equals(filter.getVersion()) ? null : filter.getVersion();
- SimpleToscaProvider simpleToscaProvider = new SimpleToscaProvider();
+ var simpleToscaProvider = new SimpleToscaProvider();
final JpaToscaServiceTemplate dbServiceTemplate =
simpleToscaProvider.getPolicies(dao, filter.getName(), version);
"policies for filter " + filter.toString() + " do not exist");
}
- JpaToscaServiceTemplate filteredServiceTemplate = new JpaToscaServiceTemplate();
+ var filteredServiceTemplate = new JpaToscaServiceTemplate();
for (ToscaPolicy policy : filteredPolicies) {
JpaToscaServiceTemplate cascadedServiceTemplate = simpleToscaProvider
@Override
public ToscaCapabilityAssignment toAuthorative() {
- ToscaCapabilityAssignment toscaCapabilityAssignment = new ToscaCapabilityAssignment();
+ var toscaCapabilityAssignment = new ToscaCapabilityAssignment();
super.setToscaEntity(toscaCapabilityAssignment);
super.toAuthorative();
/*-
* ============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.
@Override
public ToscaConstraint toAuthorative() {
- ToscaConstraint toscaConstraint = new ToscaConstraint();
+ var toscaConstraint = new ToscaConstraint();
if (operation == null) {
return null;
/*-
* ============LICENSE_START=======================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2019, 2021 AT&T Intellectual Property. All rights reserved.
* Modifications Copyright (C) 2019-2020 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
@Override
public ToscaConstraint toAuthorative() {
- ToscaConstraint toscaConstraint = new ToscaConstraint();
+ var toscaConstraint = new ToscaConstraint();
toscaConstraint.setValidValues(validValues);
@Override
public ToscaDataType toAuthorative() {
- ToscaDataType toscaDataType = new ToscaDataType();
+ var toscaDataType = new ToscaDataType();
super.setToscaEntity(toscaDataType);
super.toAuthorative();
@Override
public ToscaNodeTemplate toAuthorative() {
- ToscaNodeTemplate toscaNodeTemplate = new ToscaNodeTemplate();
+ var toscaNodeTemplate = new ToscaNodeTemplate();
super.setToscaEntity(toscaNodeTemplate);
super.toAuthorative();
@Override
public ToscaNodeType toAuthorative() {
- ToscaNodeType toscaNodeType = new ToscaNodeType();
+ var toscaNodeType = new ToscaNodeType();
super.setToscaEntity(toscaNodeType);
super.toAuthorative();
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2020 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 ToscaParameter toAuthorative() {
- ToscaParameter toscaParameter = new ToscaParameter();
+ var toscaParameter = new ToscaParameter();
toscaParameter.setName(key.getLocalName());
@Override
public ToscaPolicy toAuthorative() {
- ToscaPolicy toscaPolicy = new ToscaPolicy();
+ var toscaPolicy = new ToscaPolicy();
super.setToscaEntity(toscaPolicy);
super.toAuthorative();
@Override
public ToscaPolicyType toAuthorative() {
- ToscaPolicyType toscaPolicyType = new ToscaPolicyType();
+ var toscaPolicyType = new ToscaPolicyType();
super.setToscaEntity(toscaPolicyType);
super.toAuthorative();
@Override
public ToscaProperty toAuthorative() {
- ToscaProperty toscaProperty = new ToscaProperty();
+ var toscaProperty = new ToscaProperty();
toscaProperty.setName(key.getLocalName());
@Override
public ToscaRequirement toAuthorative() {
- ToscaRequirement toscaRequirement = new ToscaRequirement();
+ var toscaRequirement = new ToscaRequirement();
super.setToscaEntity(toscaRequirement);
super.toAuthorative();
@Override
public ToscaSchemaDefinition toAuthorative() {
- ToscaSchemaDefinition toscaEntrySchema = new ToscaSchemaDefinition();
+ var toscaEntrySchema = new ToscaSchemaDefinition();
toscaEntrySchema.setType(type.getName());
toscaEntrySchema.setTypeVersion(type.getVersion());
@Override
public ToscaServiceTemplate toAuthorative() {
- final ToscaServiceTemplate toscaServiceTemplate = new ToscaServiceTemplate();
+ final var toscaServiceTemplate = new ToscaServiceTemplate();
super.setToscaEntity(toscaServiceTemplate);
super.toAuthorative();
@Override
public ToscaTopologyTemplate toAuthorative() {
- final ToscaTopologyTemplate toscaTopologyTemplate = new ToscaTopologyTemplate();
+ final var toscaTopologyTemplate = new ToscaTopologyTemplate();
toscaTopologyTemplate.setDescription(description);
if (toscaTopologyTemplate.getInputs() != null) {
inputs = new LinkedHashMap<>();
for (Map.Entry<String, ToscaParameter> toscaInputEntry : toscaTopologyTemplate.getInputs().entrySet()) {
- JpaToscaParameter jpaInput = new JpaToscaParameter(toscaInputEntry.getValue());
+ var jpaInput = new JpaToscaParameter(toscaInputEntry.getValue());
jpaInput.setKey(new PfReferenceKey(getKey(), toscaInputEntry.getKey()));
inputs.put(toscaInputEntry.getKey(), jpaInput);
}
if (authorativeConcept.getProperties() != null) {
properties = new LinkedHashMap<>();
for (Entry<String, ToscaProperty> toscaPropertyEntry : authorativeConcept.getProperties().entrySet()) {
- JpaToscaProperty jpaProperty = new JpaToscaProperty(toscaPropertyEntry.getValue());
+ var jpaProperty = new JpaToscaProperty(toscaPropertyEntry.getValue());
jpaProperty.setKey(new PfReferenceKey(getKey(), toscaPropertyEntry.getKey()));
properties.put(toscaPropertyEntry.getKey(), jpaProperty);
}
@Override
public T toAuthorative() {
- T tosca = super.toAuthorative();
+ var tosca = super.toAuthorative();
tosca.setProperties(PfUtils.mapMap(properties, JpaToscaProperty::toAuthorative));
@Override
public T toAuthorative() {
- T tosca = super.toAuthorative();
+ var tosca = super.toAuthorative();
tosca.setType(type.getName());
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2019-2020 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.
public JpaToscaServiceTemplate getCascadedDataTypes(@NonNull final JpaToscaServiceTemplate dbServiceTemplate,
final String name, final String version) throws PfModelException {
- JpaToscaServiceTemplate serviceTemplate = new JpaToscaServiceTemplate(dbServiceTemplate);
+ var serviceTemplate = new JpaToscaServiceTemplate(dbServiceTemplate);
serviceTemplate.setPolicyTypes(null);
serviceTemplate.setTopologyTemplate(null);
}
// Return the created data types
- JpaToscaDataTypes returnDataTypes = new JpaToscaDataTypes();
+ var returnDataTypes = new JpaToscaDataTypes();
for (PfConceptKey dataTypeKey : serviceTemplate.getDataTypes().getConceptMap().keySet()) {
returnDataTypes.getConceptMap().put(dataTypeKey, dao.get(JpaToscaDataType.class, dataTypeKey));
}
- JpaToscaServiceTemplate returnServiceTemplate = new JpaToscaServiceTemplate();
+ var returnServiceTemplate = new JpaToscaServiceTemplate();
returnServiceTemplate.setDataTypes(returnDataTypes);
LOGGER.debug("<-updateDataTypes: returnServiceTempalate={}", returnServiceTemplate);
new SimpleToscaServiceTemplateProvider().write(dao, serviceTemplate);
dao.delete(dataType4Deletion);
- JpaToscaServiceTemplate deletedServiceTemplate = new JpaToscaServiceTemplate();
+ var deletedServiceTemplate = new JpaToscaServiceTemplate();
deletedServiceTemplate.setDataTypes(new JpaToscaDataTypes());
deletedServiceTemplate.getDataTypes().getConceptMap().put(dataTypeKey, dataType4Deletion);
public JpaToscaServiceTemplate getCascadedPolicyTypes(final JpaToscaServiceTemplate dbServiceTemplate,
final String name, final String version) throws PfModelException {
- JpaToscaServiceTemplate serviceTemplate = new JpaToscaServiceTemplate(dbServiceTemplate);
+ var serviceTemplate = new JpaToscaServiceTemplate(dbServiceTemplate);
serviceTemplate.setDataTypes(null);
serviceTemplate.setTopologyTemplate(null);
"policy types for " + name + ":" + version + DO_NOT_EXIST);
}
- JpaToscaServiceTemplate dataTypeServiceTemplate = new JpaToscaServiceTemplate(serviceTemplate);
+ var dataTypeServiceTemplate = new JpaToscaServiceTemplate(serviceTemplate);
dataTypeServiceTemplate.setPolicyTypes(null);
for (JpaToscaPolicyType policyType : serviceTemplate.getPolicyTypes().getConceptMap().values()) {
}
// Return the created policy types
- JpaToscaPolicyTypes returnPolicyTypes = new JpaToscaPolicyTypes();
+ var returnPolicyTypes = new JpaToscaPolicyTypes();
for (PfConceptKey policyTypeKey : serviceTemplate.getPolicyTypes().getConceptMap().keySet()) {
returnPolicyTypes.getConceptMap().put(policyTypeKey, dao.get(JpaToscaPolicyType.class, policyTypeKey));
}
- JpaToscaServiceTemplate returnServiceTemplate = new JpaToscaServiceTemplate();
+ var returnServiceTemplate = new JpaToscaServiceTemplate();
returnServiceTemplate.setPolicyTypes(returnPolicyTypes);
LOGGER.debug("<-updatePolicyTypes: returnServiceTempalate={}", returnServiceTemplate);
POLICY_TYPE + policyTypeKey.getId() + NOT_FOUND);
}
- BeanValidationResult result = new BeanValidationResult("policy types", serviceTemplate);
+ var result = new BeanValidationResult("policy types", serviceTemplate);
for (JpaToscaPolicyType policyType : serviceTemplate.getPolicyTypes().getAll(null)) {
Collection<JpaToscaEntityType<ToscaEntity>> ancestorList = ToscaUtils
new SimpleToscaServiceTemplateProvider().write(dao, serviceTemplate);
dao.delete(policyType4Deletion);
- JpaToscaServiceTemplate deletedServiceTemplate = new JpaToscaServiceTemplate();
+ var deletedServiceTemplate = new JpaToscaServiceTemplate();
deletedServiceTemplate.setPolicyTypes(new JpaToscaPolicyTypes());
deletedServiceTemplate.getPolicyTypes().getConceptMap().put(policyTypeKey, policyType4Deletion);
public JpaToscaServiceTemplate getCascadedPolicies(final JpaToscaServiceTemplate dbServiceTemplate,
final String name, final String version) throws PfModelException {
- JpaToscaServiceTemplate serviceTemplate = new JpaToscaServiceTemplate(dbServiceTemplate);
+ var serviceTemplate = new JpaToscaServiceTemplate(dbServiceTemplate);
serviceTemplate.setDataTypes(new JpaToscaDataTypes());
serviceTemplate.setPolicyTypes(new JpaToscaPolicyTypes());
"policies for " + name + ":" + version + DO_NOT_EXIST);
}
- JpaToscaServiceTemplate returnServiceTemplate = new JpaToscaServiceTemplate(serviceTemplate);
+ var returnServiceTemplate = new JpaToscaServiceTemplate(serviceTemplate);
returnServiceTemplate.getTopologyTemplate().setPolicies(new JpaToscaPolicies());
for (JpaToscaPolicy policy : serviceTemplate.getTopologyTemplate().getPolicies().getConceptMap().values()) {
}
// Return the created policy types
- JpaToscaPolicies returnPolicies = new JpaToscaPolicies();
+ var returnPolicies = new JpaToscaPolicies();
returnPolicies.setKey(serviceTemplate.getTopologyTemplate().getPolicies().getKey());
for (PfConceptKey policyKey : serviceTemplate.getTopologyTemplate().getPolicies().getConceptMap().keySet()) {
new SimpleToscaServiceTemplateProvider().write(dao, serviceTemplate);
dao.delete(policy4Deletion);
- JpaToscaServiceTemplate deletedServiceTemplate = new JpaToscaServiceTemplate();
+ var deletedServiceTemplate = new JpaToscaServiceTemplate();
deletedServiceTemplate.setTopologyTemplate(new JpaToscaTopologyTemplate());
deletedServiceTemplate.getTopologyTemplate().setPolicies(new JpaToscaPolicies());
deletedServiceTemplate.getTopologyTemplate().getPolicies().getConceptMap().put(policyKey, policy4Deletion);
}
// Create a filter to get the latest version of the policy type
- PfConceptFilter pfConceptFilter = PfConceptFilter.builder().version(PfConceptFilter.LATEST_VERSION).build();
+ var pfConceptFilter = PfConceptFilter.builder().version(PfConceptFilter.LATEST_VERSION).build();
// FIlter the returned policy type list
List<PfConcept> policyTypeKeyList = new ArrayList<>(jpaPolicyTypeList);
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2020 Nordix Foundation.
- * Modifications Copyright (C) 2020 AT&T
+ * 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.
public static JpaToscaServiceTemplate addFragment(@NonNull final JpaToscaServiceTemplate originalTemplate,
@NonNull final JpaToscaServiceTemplate fragmentTemplate) {
- BeanValidationResult result = new BeanValidationResult("incoming fragment", fragmentTemplate);
+ var result = new BeanValidationResult("incoming fragment", fragmentTemplate);
if (originalTemplate.compareToWithoutEntities(fragmentTemplate) != 0) {
Validated.addResult(result, "service template",
"does not equal existing service template");
}
- JpaToscaServiceTemplate compositeTemplate = new JpaToscaServiceTemplate(originalTemplate);
+ var compositeTemplate = new JpaToscaServiceTemplate(originalTemplate);
compositeTemplate.setDataTypes(
addFragmentEntitites(compositeTemplate.getDataTypes(), fragmentTemplate.getDataTypes(), result));
return compositeContainer;
}
- BeanValidationResult result2 = new BeanValidationResult("incoming fragment", fragmentContainer);
+ var result2 = new BeanValidationResult("incoming fragment", fragmentContainer);
for (Entry<PfConceptKey, ? extends JpaToscaEntityType<? extends ToscaEntity>> fragmentEntry : fragmentContainer
.getConceptMap().entrySet()) {
import lombok.NonNull;
import org.apache.commons.collections4.CollectionUtils;
import org.onap.policy.common.parameters.BeanValidationResult;
-import org.onap.policy.common.parameters.ObjectValidationResult;
import org.onap.policy.common.parameters.ValidationStatus;
import org.onap.policy.models.base.PfConcept;
import org.onap.policy.models.base.PfConceptContainer;
@NonNull final PfConceptContainer<? extends PfConcept, ? extends PfNameVersion> entityTypes,
final String entityName, final String entityVersion) {
- BeanValidationResult result = new BeanValidationResult("entity", entityName);
+ var result = new BeanValidationResult("entity", entityName);
@SuppressWarnings("unchecked")
Set<JpaToscaEntityType<?>> filteredEntitySet =
Code Review / policy / models.git / commitdiff