From f8000a9d35928f136216be504828ef9074dfb42a Mon Sep 17 00:00:00 2001 From: liamfallon Date: Thu, 23 Jan 2020 16:50:47 +0000 Subject: Remove apex-pdp TextFileUtils class This class was moved to policy-common some time ago. Removing it in apex-pdp. Issue-ID: POLICY-1913 Change-Id: I982fbd799334b34f1526e19f339236b52205b91e Signed-off-by: liamfallon --- .../model/modelapi/impl/ModelHandlerFacade.java | 53 +++++++++++----------- .../apex/model/modelapi/ApexModelApiTest.java | 4 +- .../model/modelapi/ModelHandlerFacadeTest.java | 10 ++-- 3 files changed, 36 insertions(+), 31 deletions(-) (limited to 'model/model-api') diff --git a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ModelHandlerFacade.java b/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ModelHandlerFacade.java index da14e810a..8acf3fc45 100644 --- a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ModelHandlerFacade.java +++ b/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ModelHandlerFacade.java @@ -1,7 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. - * Modifications Copyright (C) 2019 Nordix Foundation. + * Modifications Copyright (C) 2019-2020 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,6 +33,7 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Properties; import java.util.Set; + import org.onap.policy.apex.model.basicmodel.concepts.ApexException; import org.onap.policy.apex.model.basicmodel.concepts.ApexRuntimeException; import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey; @@ -54,8 +55,8 @@ import org.onap.policy.apex.model.policymodel.handling.PolicyAnalysisResult; import org.onap.policy.apex.model.policymodel.handling.PolicyModelComparer; import org.onap.policy.apex.model.policymodel.handling.PolicyModelMerger; import org.onap.policy.apex.model.policymodel.handling.PolicyModelSplitter; -import org.onap.policy.apex.model.utilities.TextFileUtils; import org.onap.policy.common.utils.resources.ResourceUtils; +import org.onap.policy.common.utils.resources.TextFileUtils; import org.onap.policy.common.utils.validation.Assertions; import org.slf4j.ext.XLogger; import org.slf4j.ext.XLoggerFactory; @@ -105,7 +106,7 @@ public class ModelHandlerFacade { if (!apexModel.getPolicyModel().getKey().equals(AxArtifactKey.getNullKey())) { return new ApexApiResult(ApexApiResult.Result.CONCEPT_EXISTS, - MODEL + apexModel.getPolicyModel().getKey().getId() + ALREADY_LOADED); + MODEL + apexModel.getPolicyModel().getKey().getId() + ALREADY_LOADED); } ApexApiResult result = new ApexApiResult(); @@ -126,7 +127,7 @@ public class ModelHandlerFacade { if (!apexModel.getPolicyModel().getKey().equals(AxArtifactKey.getNullKey())) { return new ApexApiResult(ApexApiResult.Result.CONCEPT_EXISTS, - MODEL + apexModel.getPolicyModel().getKey().getId() + ALREADY_LOADED); + MODEL + apexModel.getPolicyModel().getKey().getId() + ALREADY_LOADED); } ApexApiResult result = new ApexApiResult(); @@ -170,13 +171,13 @@ public class ModelHandlerFacade { * @return the result of the operation */ public ApexApiResult loadFromDatabase(final String modelName, final String modelVersion, - final DaoParameters daoParameters) { + final DaoParameters daoParameters) { Assertions.argumentNotNull(modelName, "modelName may not be null"); Assertions.argumentNotNull(daoParameters, "DaoParameters may not be null"); if (!apexModel.getPolicyModel().getKey().equals(AxArtifactKey.getNullKey())) { return new ApexApiResult(ApexApiResult.Result.CONCEPT_EXISTS, - MODEL + apexModel.getPolicyModel().getKey().getId() + ALREADY_LOADED); + MODEL + apexModel.getPolicyModel().getKey().getId() + ALREADY_LOADED); } ApexDao apexDao = null; @@ -186,8 +187,8 @@ public class ModelHandlerFacade { // Single specific model requested if (modelVersion != null) { - AxPolicyModel daoPolicyModel = apexDao.get(AxPolicyModel.class, - new AxArtifactKey(modelName, modelVersion)); + AxPolicyModel daoPolicyModel = + apexDao.get(AxPolicyModel.class, new AxArtifactKey(modelName, modelVersion)); if (daoPolicyModel != null) { apexModel.setPolicyModel(daoPolicyModel); @@ -195,7 +196,7 @@ public class ModelHandlerFacade { } else { apexModel.setPolicyModel(new AxPolicyModel()); return new ApexApiResult(ApexApiResult.Result.FAILED, "no policy model with name " + modelName - + " and version " + modelVersion + FOUND_IN_DATABASE); + + " and version " + modelVersion + FOUND_IN_DATABASE); } } // Fishing expedition @@ -229,7 +230,7 @@ public class ModelHandlerFacade { foundPolicyModel = dbPolicyModel; } else { return new ApexApiResult(ApexApiResult.Result.FAILED, - "more than one policy model with name " + modelName + FOUND_IN_DATABASE); + "more than one policy model with name " + modelName + FOUND_IN_DATABASE); } } } @@ -240,7 +241,7 @@ public class ModelHandlerFacade { } else { apexModel.setPolicyModel(new AxPolicyModel()); return new ApexApiResult(ApexApiResult.Result.FAILED, - "no policy model with name " + modelName + FOUND_IN_DATABASE); + "no policy model with name " + modelName + FOUND_IN_DATABASE); } } @@ -279,7 +280,7 @@ public class ModelHandlerFacade { if (!apexModel.getPolicyModel().getKey().equals(AxArtifactKey.getNullKey())) { return new ApexApiResult(ApexApiResult.Result.CONCEPT_EXISTS, - MODEL + apexModel.getPolicyModel().getKey().getId() + ALREADY_LOADED); + MODEL + apexModel.getPolicyModel().getKey().getId() + ALREADY_LOADED); } URL apexModelUrl; @@ -364,7 +365,7 @@ public class ModelHandlerFacade { result.setResult(ApexApiResult.Result.FAILED); } result.addMessage(new ApexModelStringWriter(false) - .writeString(apexModel.getPolicyModel().getKey(), AxArtifactKey.class, jsonMode)); + .writeString(apexModel.getPolicyModel().getKey(), AxArtifactKey.class, jsonMode)); result.addMessage(validationResult.toString()); return result; } catch (Exception e) { @@ -388,10 +389,10 @@ public class ModelHandlerFacade { return result; } - PolicyModelComparer policyModelComparer = new PolicyModelComparer(apexModel.getPolicyModel(), - otherPolicyModel); + PolicyModelComparer policyModelComparer = + new PolicyModelComparer(apexModel.getPolicyModel(), otherPolicyModel); result.addMessage(new ApexModelStringWriter(false) - .writeString(apexModel.getPolicyModel().getKey(), AxArtifactKey.class, jsonMode)); + .writeString(apexModel.getPolicyModel().getKey(), AxArtifactKey.class, jsonMode)); result.addMessage(policyModelComparer.toString()); return result; @@ -409,7 +410,7 @@ public class ModelHandlerFacade { * @return the result of the operation */ public ApexApiResult compareWithString(final String otherModelString, final boolean diffsOnly, - final boolean keysOnly) { + final boolean keysOnly) { ApexApiResult result = new ApexApiResult(); try { AxPolicyModel otherPolicyModel = loadModelFromString(otherModelString, result); @@ -417,10 +418,10 @@ public class ModelHandlerFacade { return result; } - PolicyModelComparer policyModelComparer = new PolicyModelComparer(apexModel.getPolicyModel(), - otherPolicyModel); + PolicyModelComparer policyModelComparer = + new PolicyModelComparer(apexModel.getPolicyModel(), otherPolicyModel); result.addMessage(new ApexModelStringWriter(false) - .writeString(apexModel.getPolicyModel().getKey(), AxArtifactKey.class, jsonMode)); + .writeString(apexModel.getPolicyModel().getKey(), AxArtifactKey.class, jsonMode)); result.addMessage(policyModelComparer.toString()); return result; @@ -453,13 +454,13 @@ public class ModelHandlerFacade { requiredPolicySet.add(requiredPolicy.getKey()); } else { return new ApexApiResult(ApexApiResult.Result.FAILED, - "policy for policy name " + policyName + " not found in model"); + "policy for policy name " + policyName + " not found in model"); } } try { - AxPolicyModel splitPolicyModel = PolicyModelSplitter.getSubPolicyModel(apexModel.getPolicyModel(), - requiredPolicySet, false); + AxPolicyModel splitPolicyModel = + PolicyModelSplitter.getSubPolicyModel(apexModel.getPolicyModel(), requiredPolicySet, false); ApexModelFileWriter apexModelFileWriter = new ApexModelFileWriter<>(false); apexModelFileWriter.apexModelWriteJsonFile(splitPolicyModel, AxPolicyModel.class, targetModelName); @@ -497,7 +498,7 @@ public class ModelHandlerFacade { return splitResult; } catch (Exception e) { return new ApexApiResult(ApexApiResult.Result.FAILED, - "split of policy model " + apexModel.getPolicyModel().getId() + " failed", e); + "split of policy model " + apexModel.getPolicyModel().getId() + " failed", e); } finally { if (tempSplitPolicyFile != null) { try { @@ -527,7 +528,7 @@ public class ModelHandlerFacade { try { AxPolicyModel mergedPolicyModel = PolicyModelMerger.getMergedPolicyModel(apexModel.getPolicyModel(), - mergeInPolicyModel, keepOriginal, false, false); + mergeInPolicyModel, keepOriginal, false, false); apexModel.setPolicyModel(mergedPolicyModel != null ? mergedPolicyModel : new AxPolicyModel()); return new ApexApiResult(); } catch (ApexModelException e) { @@ -554,7 +555,7 @@ public class ModelHandlerFacade { try { AxPolicyModel mergedPolicyModel = PolicyModelMerger.getMergedPolicyModel(apexModel.getPolicyModel(), - mergeInPolicyModel, keepOriginal, false, false); + mergeInPolicyModel, keepOriginal, false, false); apexModel.setPolicyModel(mergedPolicyModel != null ? mergedPolicyModel : new AxPolicyModel()); return new ApexApiResult(); } catch (ApexModelException e) { diff --git a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexModelApiTest.java b/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexModelApiTest.java index df5e54ca9..e6d948f35 100644 --- a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexModelApiTest.java +++ b/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexModelApiTest.java @@ -1,6 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. + * Modifications Copyright (C) 2020 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -37,10 +38,11 @@ import org.junit.Before; import org.junit.Test; import org.onap.policy.apex.model.basicmodel.dao.DaoParameters; import org.onap.policy.apex.model.modelapi.impl.ApexModelImpl; -import org.onap.policy.apex.model.utilities.TextFileUtils; +import org.onap.policy.common.utils.resources.TextFileUtils; /** * Test the apex model API. + * * @author Liam Fallon (liam.fallon@ericsson.com) */ public class ApexModelApiTest { diff --git a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ModelHandlerFacadeTest.java b/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ModelHandlerFacadeTest.java index 9bbba1d99..cfbf1be57 100644 --- a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ModelHandlerFacadeTest.java +++ b/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ModelHandlerFacadeTest.java @@ -1,19 +1,20 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. + * Modifications Copyright (C) 2020 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * SPDX-License-Identifier: Apache-2.0 * ============LICENSE_END========================================================= */ @@ -31,10 +32,11 @@ import java.util.Properties; import org.junit.Test; import org.onap.policy.apex.model.basicmodel.dao.DaoParameters; import org.onap.policy.apex.model.modelapi.impl.ModelHandlerFacade; -import org.onap.policy.apex.model.utilities.TextFileUtils; +import org.onap.policy.common.utils.resources.TextFileUtils; /** * Test the model handler facade. + * * @author Liam Fallon (liam.fallon@ericsson.com) */ public class ModelHandlerFacadeTest { -- cgit 1.2.3-korg