diff options
author | liamfallon <liam.fallon@est.tech> | 2020-01-22 12:11:11 +0000 |
---|---|---|
committer | liamfallon <liam.fallon@est.tech> | 2020-01-23 12:15:19 +0000 |
commit | 755eb9df282d80273043a2e902e2a51bf6eaab24 (patch) | |
tree | fb603fff3d378bb868dba63e3d766d7723e03839 /examples/examples-pcvs/src | |
parent | 37da84e2a40f7f39fe73fa2ceb6a7166618e9ddb (diff) |
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 <liam.fallon@est.tech>
Diffstat (limited to 'examples/examples-pcvs/src')
3 files changed, 0 insertions, 164 deletions
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<AxPolicyModel> 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 <code>arg[0]</code> 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<AxPolicyModel> 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; - |