From 755eb9df282d80273043a2e902e2a51bf6eaab24 Mon Sep 17 00:00:00 2001 From: liamfallon Date: Wed, 22 Jan 2020 12:11:11 +0000 Subject: Run apex-pdp in Java 11: base changes This change brings in the minimum changes to get apex-pdp running in Java 11. Other reviews will bring in changes to remove Java 11 warnings and to convert apex-pdp Javascript handling from the now deprecated nashorn engine. Issue-ID: POLICY-1581 Change-Id: I879bbae08d4e67aca3f1bfeedeca639d8dbbc281 Signed-off-by: liamfallon --- examples/examples-myfirstpolicy/pom.xml | 63 +++++++++++++++---- examples/examples-pcvs/pom.xml | 30 +++++---- .../pcvs/model/PcvsDomainModelFactory.java | 72 ---------------------- .../examples/pcvs/model/PcvsDomainModelSaver.java | 62 ------------------- .../apex/examples/pcvs/model/package-info.java | 30 --------- 5 files changed, 69 insertions(+), 188 deletions(-) delete mode 100644 examples/examples-pcvs/src/main/java/org/onap/policy/apex/examples/pcvs/model/PcvsDomainModelFactory.java delete mode 100644 examples/examples-pcvs/src/main/java/org/onap/policy/apex/examples/pcvs/model/PcvsDomainModelSaver.java delete mode 100644 examples/examples-pcvs/src/main/java/org/onap/policy/apex/examples/pcvs/model/package-info.java (limited to 'examples') diff --git a/examples/examples-myfirstpolicy/pom.xml b/examples/examples-myfirstpolicy/pom.xml index 0e3424120..ec61748f0 100644 --- a/examples/examples-myfirstpolicy/pom.xml +++ b/examples/examples-myfirstpolicy/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 org.onap.policy.apex-pdp.examples @@ -30,7 +34,8 @@ Specific code for the Apex MyFirstPolicy Example - ${project.basedir}/src + MyFirstPolicyModel_0.0.1 + MyFirstPolicyModel_0.0.1 @@ -55,7 +60,6 @@ org.onap.policy.apex-pdp.auth cli-editor ${project.version} - test org.onap.policy.apex-pdp.plugins.plugins-executor @@ -79,24 +83,61 @@ generate-models - process-classes + compile - exec + java - java + org.onap.policy.apex.examples.myfirstpolicy.model.MfpDomainModelSaver + compile - -classpath - - - org.onap.policy.apex.examples.myfirstpolicy.model.MfpDomainModelSaver ${project.build.directory}/classes/examples/models/MyFirstPolicy + + org.codehaus.mojo + exec-maven-plugin + + + + generate-policy1 + compile + + java + + + org.onap.policy.apex.auth.clieditor.ApexCommandLineEditorMain + compile + + --command-file=${project.basedir}/src/main/resources/examples/models/MyFirstPolicy/1/${policymodel1.name}.apex + --output-model-file=${project.build.directory}/classes/examples/models/MyFirstPolicy/1/${policymodel1.name}.json + --log-file=${project.build.directory}/${policymodel1.name}_policygeneration.log + --working-dir=${project.basedir} + + + + + generate-policy2 + compile + + java + + + org.onap.policy.apex.auth.clieditor.ApexCommandLineEditorMain + compile + + --command-file=${project.basedir}/src/main/resources/examples/models/MyFirstPolicy/2/${policymodel2.name}.apex + --output-model-file=${project.build.directory}/classes/examples/models/MyFirstPolicy/2/${policymodel2.name}.json + --log-file=${project.build.directory}/${policymodel2.name}_policygeneration.log + --working-dir=${project.basedir} + + + + + diff --git a/examples/examples-pcvs/pom.xml b/examples/examples-pcvs/pom.xml index 720ebf7a9..9f0b08ae8 100644 --- a/examples/examples-pcvs/pom.xml +++ b/examples/examples-pcvs/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 org.onap.policy.apex-pdp.examples @@ -30,11 +34,11 @@ Example for Policy-controlled Video Streaming - ${project.basedir}/src + vpnsla - + org.onap.policy.common utils @@ -80,19 +84,19 @@ exec-maven-plugin - generate-models - process-classes + generate-policy + compile - exec + java - java + org.onap.policy.apex.auth.clieditor.ApexCommandLineEditorMain + compile - -classpath - - org.onap.policy.apex.examples.pcvs.model.PcvsDomainModelSaver - ${project.basedir} - ${project.build.directory}/classes/examples/models/pcvs/ + -command-file=${project.basedir}/src/main/resources/org/onap/policy/apex/examples/pcvs/vpnsla/${policymodel.name}.apex + -output-model-file=${project.build.directory}/classes/examples/models/pcvs/vpnsla/${policymodel.name}.json + -log-file=${project.build.directory}/${policymodel.name}_policygeneration.log + -working-dir=${project.basedir} @@ -150,4 +154,4 @@ - \ No newline at end of file + diff --git a/examples/examples-pcvs/src/main/java/org/onap/policy/apex/examples/pcvs/model/PcvsDomainModelFactory.java b/examples/examples-pcvs/src/main/java/org/onap/policy/apex/examples/pcvs/model/PcvsDomainModelFactory.java deleted file mode 100644 index fa8903b62..000000000 --- a/examples/examples-pcvs/src/main/java/org/onap/policy/apex/examples/pcvs/model/PcvsDomainModelFactory.java +++ /dev/null @@ -1,72 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * Copyright (C) 2016-2018 Ericsson. 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. - * 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========================================================= - */ - -package org.onap.policy.apex.examples.pcvs.model; - -import java.io.File; - -import org.onap.policy.apex.auth.clieditor.ApexCommandLineEditorMain; -import org.onap.policy.apex.model.basicmodel.concepts.ApexRuntimeException; -import org.onap.policy.apex.model.basicmodel.handling.ApexModelReader; -import org.onap.policy.apex.model.policymodel.concepts.AxPolicyModel; -import org.onap.policy.common.utils.resources.ResourceUtils; - -/** - * A factory for creating PCVSDomainModel objects. - * - * @author Sven van der Meer (sven.van.der.meer@ericsson.com) - */ -public class PcvsDomainModelFactory { - - /** - * Generates the PCVS VPN-SLA policy model from CLI commands and creates an APEX model. - * - * @param workingDirectory The working directory for the CLI editor for includes - * - * @return the PCVS VPN-SLA policy model - */ - public AxPolicyModel getPcvsVpnSlaSPolicyModel(final String workingDirectory) { - final String path = "target/model-gen/pcvs/vpnsla"; - final String file = "policy.json"; - final String full = path + "/" + file; - - final File pathFile = new File(path); - pathFile.mkdirs(); - - final String[] args = - new String[] {"-c", "src/main/resources/org/onap/policy/apex/examples/pcvs/vpnsla/vpnsla.apex", "-wd", - workingDirectory, "-o", full}; - - final ApexCommandLineEditorMain cliEditor = new ApexCommandLineEditorMain(args); - if (cliEditor.getErrorCount() > 0) { - throw new ApexRuntimeException( - "Apex CLI editor execution failed with " + cliEditor.getErrorCount() + " errors"); - } - - java.util.TimeZone.getTimeZone("gmt"); - try { - final ApexModelReader reader = new ApexModelReader<>(AxPolicyModel.class); - return reader.read(ResourceUtils.getResourceAsString(full)); - } catch (final Exception e) { - throw new ApexRuntimeException("Failed to build PCVS SLA1 policy from path: " + full, e); - } - } - -} diff --git a/examples/examples-pcvs/src/main/java/org/onap/policy/apex/examples/pcvs/model/PcvsDomainModelSaver.java b/examples/examples-pcvs/src/main/java/org/onap/policy/apex/examples/pcvs/model/PcvsDomainModelSaver.java deleted file mode 100644 index 02b107767..000000000 --- a/examples/examples-pcvs/src/main/java/org/onap/policy/apex/examples/pcvs/model/PcvsDomainModelSaver.java +++ /dev/null @@ -1,62 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * Copyright (C) 2016-2018 Ericsson. All rights reserved. - * Modifications Copyright (C) 2019 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========================================================= - */ - -package org.onap.policy.apex.examples.pcvs.model; - -import org.onap.policy.apex.model.basicmodel.concepts.ApexException; -import org.onap.policy.apex.model.basicmodel.handling.ApexModelSaver; -import org.onap.policy.apex.model.policymodel.concepts.AxPolicyModel; -import org.slf4j.ext.XLogger; -import org.slf4j.ext.XLoggerFactory; - -/** - * The Class PcvsDomainModelSaver. - * - * @author Sven van der Meer (sven.van.der.meer@ericsson.com) - */ -public final class PcvsDomainModelSaver { - // Logger for this class - private static final XLogger LOGGER = XLoggerFactory.getXLogger(PcvsDomainModelSaver.class); - - /** Private constructor to prevent instantiation. */ - private PcvsDomainModelSaver() { - } - - /** - * Write all PCVS models to args[0]. - * - * @param args uses arg[0] for directory information - * @throws ApexException the apex exception - */ - public static void main(final String[] args) throws ApexException { - if (args.length != 2) { - LOGGER.error("usage: " + PcvsDomainModelSaver.class.getName() + " workingDirectory modelDirectory"); - return; - } - - final AxPolicyModel pcvsPolicyModel = new PcvsDomainModelFactory().getPcvsVpnSlaSPolicyModel(args[0]); - final ApexModelSaver pcvsModelSaver = new ApexModelSaver<>(AxPolicyModel.class, pcvsPolicyModel, - args[1] + "vpnsla/"); - pcvsModelSaver.apexModelWriteJson(); - pcvsModelSaver.apexModelWriteXml(); - - } -} diff --git a/examples/examples-pcvs/src/main/java/org/onap/policy/apex/examples/pcvs/model/package-info.java b/examples/examples-pcvs/src/main/java/org/onap/policy/apex/examples/pcvs/model/package-info.java deleted file mode 100644 index ff9b39730..000000000 --- a/examples/examples-pcvs/src/main/java/org/onap/policy/apex/examples/pcvs/model/package-info.java +++ /dev/null @@ -1,30 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * Copyright (C) 2016-2018 Ericsson. 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. - * 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========================================================= - */ - -/** - * Contains the model for Policy-controlled Video Streaming. - * - * @author Sven van der Meer (sven.van.der.meer@ericsson.com) - * @author Joseph McNamara (joseph.mcnamara@ericsson.com) - * @author John Keeney (john.keeney@ericsson.com) - */ - -package org.onap.policy.apex.examples.pcvs.model; - -- cgit 1.2.3-korg