package org.onap.policy.distribution.main.parameters;
-import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import java.io.FileReader;
import org.onap.policy.common.parameters.ValidationResult;
// Read the parameters
try {
// Read the parameters from JSON using Gson
- final Gson gson = new GsonBuilder()
+ final var gson = new GsonBuilder()
.registerTypeAdapter(PolicyForwarderConfigurationParameterGroup.class,
new PolicyForwarderConfigurationParametersJsonAdapter())
.registerTypeAdapter(ReceptionHandlerConfigurationParameterGroup.class,
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
* Copyright (C) 2019 Nordix Foundation.
- * Modifications Copyright (C) 2020 AT&T Inc.
+ * 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 PolicyForwarderConfigurationParameterGroup deserialize(final JsonElement json, final Type typeOfT,
final JsonDeserializationContext context) {
- final JsonObject jsonObject = json.getAsJsonObject();
+ final var jsonObject = json.getAsJsonObject();
final String policyForwarderParameterClassName = getParameterGroupClassName(jsonObject);
final Class<?> policyForwarderParameterClass = getParameterGroupClass(policyForwarderParameterClassName);
}
private String getParameterGroupClassName(final JsonObject jsonObject) {
- final JsonPrimitive classNameJsonPrimitive = ((JsonPrimitive) jsonObject.get(PARAMETER_CLASS_NAME));
+ final var classNameJsonPrimitive = ((JsonPrimitive) jsonObject.get(PARAMETER_CLASS_NAME));
if (classNameJsonPrimitive == null || classNameJsonPrimitive.getAsString().length() == 0) {
final String errorMessage = "parameter \"" + PARAMETER_CLASS_NAME + "\" value \""
* ============LICENSE_START=======================================================
* Copyright (C) 2018 Ericsson. All rights reserved.
* Modifications 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.
* @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);
report.setHealthy(DistributionActivator.isAlive());
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2018 Ericsson. All rights reserved.
+ * 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.
* @return Report containing statistics of distribution service
*/
public StatisticsReport fetchCurrentStatistics() {
- final StatisticsReport report = new StatisticsReport();
+ final var report = new StatisticsReport();
report.setCode(DistributionActivator.isAlive() ? 200 : 500);
report.setTotalDistributionCount(DistributionStatisticsManager.getTotalDistributionCount());
report.setDistributionSuccessCount(DistributionStatisticsManager.getDistributionSuccessCount());
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2018 Ericsson. All rights reserved.
+ * 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 String toString() {
- final StringBuilder builder = new StringBuilder();
+ final var builder = new StringBuilder();
builder.append("StatisticsReport [code=");
builder.append(getCode());
builder.append(", totalDistributionCount=");
* ============LICENSE_START=======================================================
* Copyright (C) 2018 Ericsson. All rights reserved.
* Copyright (C) 2019 Nordix Foundation.
- * Modifications Copyright (C) 2020 AT&T Inc.
+ * Modifications Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved.
* Modifications Copyright (C) 2020 Bell Canada. All rights reserved.
* Modifications Copyright (C) 2021 Nordix Foundation.
* ================================================================================
* @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 distribution service with arguments - {}", argumentString);
// Check the arguments
- final DistributionCommandLineArguments arguments = new DistributionCommandLineArguments();
+ final var arguments = new DistributionCommandLineArguments();
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 PolicyDistributionShutdownHookClass());
- String successMsg = String.format(MessageConstants.START_SUCCESS_MSG, MessageConstants.POLICY_DISTRIBUTION);
+ var successMsg = String.format(MessageConstants.START_SUCCESS_MSG, MessageConstants.POLICY_DISTRIBUTION);
LOGGER.info(successMsg);
}
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2019 Intel Crop. All rights reserved.
- * Modifications Copyright (C) 2020 AT&T Inc.
+ * 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.
package org.onap.policy.distribution.forwarding.file;
-import java.io.BufferedWriter;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.InvalidPathException;
-import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Collection;
import org.onap.policy.common.parameters.ParameterService;
public void configure(final String parameterGroupName) {
fileForwarderParameters = ParameterService.get(parameterGroupName);
try {
- final Path path = Paths.get(fileForwarderParameters.getPath());
+ final var path = Paths.get(fileForwarderParameters.getPath());
if (!path.toFile().exists()) {
Files.createDirectories(path);
}
*/
private void forwardPolicy(final ToscaPolicy pol) throws PolicyForwardingException {
final String name = pol.getName();
- final Path path = Paths.get(fileForwarderParameters.getPath(), name);
- try (BufferedWriter writer = Files.newBufferedWriter(path, StandardCharsets.UTF_8)) {
+ final var path = Paths.get(fileForwarderParameters.getPath(), name);
+ try (var writer = Files.newBufferedWriter(path, StandardCharsets.UTF_8)) {
writer.write("policyName: " + name);
if (fileForwarderParameters.isVerbose()) {
writer.newLine();
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2019 Nordix Foundation.
- * Modifications Copyright (C) 2020-2021 AT&T Inc.
+ * Modifications Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved.
* Modifications Copyright (C) 2021 Bell Canada.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
package org.onap.policy.distribution.forwarding.lifecycle.api;
-import com.google.common.collect.ImmutableMap;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
Response policyCreated = null;
try {
if (entity instanceof ToscaServiceTemplate) {
- final ToscaServiceTemplate toscaServiceTemplate = (ToscaServiceTemplate) entity;
+ final var toscaServiceTemplate = (ToscaServiceTemplate) entity;
if (null != toscaServiceTemplate.getPolicyTypes() && !toscaServiceTemplate.getPolicyTypes().isEmpty()) {
createPolicyType(toscaServiceTemplate);
}
}
private Response deployPolicy(final ToscaServiceTemplate toscaServiceTemplate) throws PolicyForwardingException {
- final PdpDeployPolicies pdpPolicies = new PdpDeployPolicies();
+ final var pdpPolicies = new PdpDeployPolicies();
final List<ToscaConceptIdentifierOptVersion> policyIdentifierList = new ArrayList<>();
for (final Map<String, ToscaPolicy> policyMap : toscaServiceTemplate.getToscaTopologyTemplate().getPolicies()) {
final String policyId = policyMap.entrySet().iterator().next().getValue().getMetadata().get("policy-id");
final String policyVersion =
policyMap.entrySet().iterator().next().getValue().getMetadata().get("policy-version");
- final ToscaConceptIdentifierOptVersion toscaPolicyIdentifier =
+ final var toscaPolicyIdentifier =
new ToscaConceptIdentifierOptVersion(policyId, policyVersion);
policyIdentifierList.add(toscaPolicyIdentifier);
}
throws PolicyForwardingException {
Response response = null;
try {
- response = getHttpClient(wantApi).post(path, entity, ImmutableMap.of(HttpHeaders.ACCEPT,
+ response = getHttpClient(wantApi).post(path, entity, Map.of(HttpHeaders.ACCEPT,
MediaType.APPLICATION_JSON, HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON));
if (response.getStatus() / 100 != 2) {
LOGGER.error(
* ============LICENSE_START=======================================================
* Copyright (C) 2018 Ericsson. All rights reserved.
* Copyright (C) 2019 Nordix Foundation.
- * Modifications Copyright (C) 2020-2021 AT&T Inc.
+ * 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 Collection<ToscaEntity> decode(final Csar csar) throws PolicyDecodingException {
final Collection<ToscaEntity> policyList = new ArrayList<>();
- try (ZipFile zipFile = new ZipFile(csar.getCsarPath())) {
+ try (var zipFile = new ZipFile(csar.getCsarPath())) {
final Enumeration<? extends ZipEntry> entries = zipFile.entries();
while (entries.hasMoreElements()) {
//
//
// Now ensure that there is no path injection
//
- Path path = Path.of(csarPath, entryName).normalize();
+ var path = Path.of(csarPath, entryName).normalize();
//
// Throw an exception if path is outside the csar
//
* ============LICENSE_START=======================================================
* Copyright (C) 2018 Intel Corp. All rights reserved.
* Copyright (C) 2019 Nordix Foundation.
- * Modifications Copyright (C) 2019 AT&T Intellectual Property.
+ * 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.
try {
final FileSystemReceptionHandlerConfigurationParameterGroup handlerParameters =
ParameterService.get(parameterGroupName);
- final FileClientHandler fileClientHandler =
+ final var fileClientHandler =
new FileClientHandler(this, handlerParameters.getWatchPath(), handlerParameters.getMaxThread());
- final Thread fileWatcherThread = new Thread(fileClientHandler);
+ final var fileWatcherThread = new Thread(fileClientHandler);
fileWatcherThread.start();
} catch (final Exception ex) {
LOGGER.error("FileSystemReceptionHandler initialization failed", ex);
* @param watchPath Path to watch
*/
public void initFileWatcher(final String watchPath, final int maxThread) throws IOException {
- try (final WatchService watcher = FileSystems.getDefault().newWatchService()) {
- final Path dir = Paths.get(watchPath);
+ try (final var watcher = FileSystems.getDefault().newWatchService()) {
+ final var dir = Paths.get(watchPath);
dir.register(watcher, ENTRY_CREATE);
LOGGER.debug("Watch Service registered for dir: {}", dir.getFileName());
startWatchService(watcher, dir, maxThread);
*/
protected void createPolicyInputAndCallHandler(final String fileName) {
try {
- final Csar csarObject = new Csar(fileName);
+ final var csarObject = new Csar(fileName);
DistributionStatisticsManager.updateTotalDownloadCount();
inputReceived(csarObject);
DistributionStatisticsManager.updateDownloadSuccessCount();
}
private void waitForFileToBeReady(final String fullFilePath) throws InterruptedException {
- boolean flag = true;
+ var flag = true;
while (flag) {
TimeUnit.MILLISECONDS.sleep(100);
- try (ZipFile zipFile = new ZipFile(fullFilePath)) {
+ try (var zipFile = new ZipFile(fullFilePath)) {
flag = false;
} catch (final IOException exp) {
LOGGER.error("file is not ready for reading, wait for sometime and try again", exp);
* ============LICENSE_START=======================================================
* Copyright (C) 2018 Ericsson. All rights reserved.
* Copyright (C) 2019 Nordix Foundation.
- * Copyright (C) 2020 AT&T Inc.
+ * 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.
* @param notificationData the notification from SDC
*/
public void processCsarServiceArtifacts(final INotificationData notificationData) {
- boolean artifactsProcessedSuccessfully = true;
+ var artifactsProcessedSuccessfully = true;
DistributionStatisticsManager.updateTotalDistributionCount();
for (final IArtifactInfo artifact : notificationData.getServiceArtifacts()) {
try {
final IDistributionClientDownloadResult resultArtifact =
downloadTheArtifact(artifact, notificationData);
- final Path filePath = writeArtifactToFile(artifact, resultArtifact);
- final Csar csarObject = new Csar(filePath.toString());
+ final var filePath = writeArtifactToFile(artifact, resultArtifact);
+ final var csarObject = new Csar(filePath.toString());
inputReceived(csarObject);
sendDistributionStatus(DistributionStatusType.DEPLOY, artifact.getArtifactURL(),
notificationData.getDistributionID(), DistributionStatusEnum.DEPLOY_OK, null);
final IDistributionClientDownloadResult resultArtifact) throws ArtifactDownloadException {
try {
final byte[] payloadBytes = resultArtifact.getArtifactPayload();
- final File tempArtifactFile = File.createTempFile(artifact.getArtifactName(), ".csar");
- try (FileOutputStream fileOutputStream = new FileOutputStream(tempArtifactFile)) {
+ final var tempArtifactFile = File.createTempFile(artifact.getArtifactName(), ".csar");
+ try (var fileOutputStream = new FileOutputStream(tempArtifactFile)) {
fileOutputStream.write(payloadBytes, 0, payloadBytes.length);
return tempArtifactFile.toPath();
}
clientResult = distributionClient.sendDeploymentStatus(message);
}
}
- final StringBuilder loggerMessage = new StringBuilder();
+ final var loggerMessage = new StringBuilder();
loggerMessage.append("distribution status to SDC with values - ").append("DistributionId")
.append(distributionId).append(" Artifact: ").append(artifactUrl).append(" StatusType: ")
.append(statusType.name()).append(" Status: ").append(status.name());
clientResult = distributionClient.sendComponentDoneStatus(message, errorReason);
}
- final StringBuilder loggerMessage = new StringBuilder();
+ final var loggerMessage = new StringBuilder();
loggerMessage.append("component done status to SDC with values - ").append("DistributionId")
.append(distributionId).append(" Status: ").append(status.name());
if (errorReason != null) {
* ============LICENSE_START=======================================================
* Copyright (C) 2018 Ericsson. All rights reserved.
* Copyright (C) 2019 Nordix Foundation.
- * Copyright (C) 2020 AT&T Inc.
+ * 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 initialize(final String parameterGroupName) throws PluginInitializationException {
- final ReceptionHandlerParameters receptionHandlerParameters = ParameterService.get(parameterGroupName);
+ final var receptionHandlerParameters = (ReceptionHandlerParameters) ParameterService.get(parameterGroupName);
pluginHandler = new PluginHandler(receptionHandlerParameters.getPluginHandlerParameters().getName());
initializeReception(receptionHandlerParameters.getReceptionHandlerConfigurationName());
}
* ============LICENSE_START=======================================================
* Copyright (C) 2018 Ericsson. All rights reserved.
* Copyright (C) 2019 Nordix Foundation.
- * Modifications Copyright (C) 2020 AT&T Inc.
+ * 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.
try {
final Class<PolicyForwarder> policyForwarderClass =
(Class<PolicyForwarder>) Class.forName(forwarderParameters.getForwarderClassName());
- final PolicyForwarder policyForwarder = policyForwarderClass.getDeclaredConstructor().newInstance();
+ final var policyForwarder = policyForwarderClass.getDeclaredConstructor().newInstance();
policyForwarder.configure(forwarderParameters.getForwarderConfigurationName());
policyForwarders.add(policyForwarder);
} catch (final ClassNotFoundException | InstantiationException | IllegalAccessException
* ============LICENSE_START=======================================================
* Copyright (C) 2018 Ericsson. All rights reserved.
* Copyright (C) 2019 Nordix Foundation.
- * Modifications Copyright (C) 2020 AT&T Inc.
+ * 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 PolicyDecoderConfigurationParameterGroup deserialize(final JsonElement json, final Type typeOfT,
final JsonDeserializationContext context) {
- final JsonObject jsonObject = json.getAsJsonObject();
+ final var jsonObject = json.getAsJsonObject();
final String policyDecoderParameterClassName = getParameterGroupClassName(jsonObject);
final Class<?> policyDecoderParameterClass = getParameterGroupClass(policyDecoderParameterClassName);
}
private String getParameterGroupClassName(final JsonObject jsonObject) {
- final JsonPrimitive classNameJsonPrimitive = ((JsonPrimitive) jsonObject.get(PARAMETER_CLASS_NAME));
+ final var classNameJsonPrimitive = ((JsonPrimitive) jsonObject.get(PARAMETER_CLASS_NAME));
if (classNameJsonPrimitive == null || classNameJsonPrimitive.getAsString().length() == 0) {
final String errorMessage = "parameter \"" + PARAMETER_CLASS_NAME + "\" value \""
* ============LICENSE_START=======================================================
* Copyright (C) 2018 Ericsson. All rights reserved.
* Copyright (C) 2019 Nordix Foundation.
- * Modifications Copyright (C) 2020 AT&T Inc.
+ * 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 ReceptionHandlerConfigurationParameterGroup deserialize(final JsonElement json, final Type typeOfT,
final JsonDeserializationContext context) {
- final JsonObject jsonObject = json.getAsJsonObject();
+ final var jsonObject = json.getAsJsonObject();
final String receptionHandlerParameterClassName = getParameterGroupClassName(jsonObject);
final Class<?> receptionHandlerParameterClass = getParameterGroupClass(receptionHandlerParameterClassName);
}
private String getParameterGroupClassName(final JsonObject jsonObject) {
- final JsonPrimitive classNameJsonPrimitive = ((JsonPrimitive) jsonObject.get(PARAMETER_CLASS_NAME));
+ final var classNameJsonPrimitive = ((JsonPrimitive) jsonObject.get(PARAMETER_CLASS_NAME));
if (classNameJsonPrimitive == null || classNameJsonPrimitive.getAsString().length() == 0) {
final String errorMessage = "parameter \"" + PARAMETER_CLASS_NAME + "\" value \""
Code Review / policy / distribution.git / commitdiff