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 --- .../policy/apex/model/utilities/TextFileUtils.java | 5 +++++ .../model/utilities/typeutils/ClassBuilder.java | 21 +++++++++------------ 2 files changed, 14 insertions(+), 12 deletions(-) (limited to 'model/utilities/src/main/java') diff --git a/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/TextFileUtils.java b/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/TextFileUtils.java index 29e31d6e6..23efd9136 100644 --- a/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/TextFileUtils.java +++ b/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/TextFileUtils.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. @@ -61,6 +62,10 @@ public abstract class TextFileUtils { */ public static void putStringAsTextFile(final String outString, final String textFilePath) throws IOException { final File textFile = new File(textFilePath); + if (!textFile.getParentFile().exists()) { + textFile.getParentFile().mkdirs(); + } + putStringAsFile(outString, textFile); } diff --git a/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/typeutils/ClassBuilder.java b/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/typeutils/ClassBuilder.java index 4c8bd1384..8d1ed9497 100644 --- a/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/typeutils/ClassBuilder.java +++ b/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/typeutils/ClassBuilder.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========================================================= */ @@ -27,10 +28,6 @@ import java.util.List; import org.slf4j.ext.XLogger; import org.slf4j.ext.XLoggerFactory; -//CHECKSTYLE:OFF: checkstyle:IllegalImport -import sun.reflect.generics.reflectiveObjects.ParameterizedTypeImpl; -//CHECKSTYLE:ON: checkstyle:IllegalImport - /** * This class is a utility class that builds a class with a set of user defined fields. It is used to get the Type of * fields in Java schemas
For more information see:
* https://github.com/KetothXupack/stackoverflow-answers/tree/master/q39401083
*/ -@SuppressWarnings("restriction") public class ClassBuilder { // Logger for this class private static final XLogger LOGGER = XLoggerFactory.getXLogger(ClassBuilder.class); @@ -70,9 +66,8 @@ public class ClassBuilder { return new ClassBuilder(Class.forName("java.lang." + className)); } catch (Exception classFindException) { LOGGER.warn("class not found", classFindException); - throw new IllegalArgumentException( - "Class '" + className + "' not found. Also looked for a class called 'java.lang." + className + "'", - e); + throw new IllegalArgumentException("Class '" + className + + "' not found. Also looked for a class called 'java.lang." + className + "'", e); } } } @@ -101,6 +96,8 @@ public class ClassBuilder { for (ClassBuilder classBuilder : parameters) { paramTypes[paramTypeIndex++] = classBuilder.build(); } - return ParameterizedTypeImpl.make(clazz, paramTypes, null); + // TODO: Fix this for parameterized types if needed or adapt to work with generic types only + // return ParameterizedTypeImpl.make(clazz, paramTypes, null); + return null; } } -- cgit 1.2.3-korg