From 632fbf4e3d5a6f72d1ca2987267ebc5942329041 Mon Sep 17 00:00:00 2001 From: Andrew Berezovskyi Date: Mon, 14 Aug 2023 20:58:42 +0200 Subject: [PATCH] finish Jena 5 move Signed-off-by: Andrew Berezovskyi --- .../oslc4j/provider/jena/JenaModelHelper.java | 12 ++++---- .../provider/jena/JenaModelHelperTest.java | 28 +++++++++---------- pom.xml | 1 + 3 files changed, 20 insertions(+), 21 deletions(-) diff --git a/core/oslc4j-core/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/JenaModelHelper.java b/core/oslc4j-core/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/JenaModelHelper.java index 7f57cb17a..9113f4df3 100644 --- a/core/oslc4j-core/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/JenaModelHelper.java +++ b/core/oslc4j-core/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/JenaModelHelper.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Contributors to the Eclipse Foundation + * Copyright (c) 2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. @@ -363,7 +363,7 @@ public static Object fromJenaResource(final Resource resource, Class beanClas if (mostConcreteResourceClass.isPresent()) { beanClass = mostConcreteResourceClass.get(); } - final Object newInstance = beanClass.newInstance(); + final Object newInstance = beanClass.getDeclaredConstructor().newInstance(); final Map, Map> classPropertyDefinitionsToSetMethods = new HashMap<>(); final Map visitedResources = new HashMap<>(); final HashSet rdfTypes = new HashSet<>(); @@ -553,7 +553,7 @@ private static List createObjectResultList(Class beanClass, continue; } } - final Object newInstance = beanClass.newInstance(); + final Object newInstance = beanClass.getDeclaredConstructor().newInstance(); final Map visitedResources = new HashMap<>(); final HashSet rdfTypes = new HashSet<>(); @@ -912,7 +912,7 @@ else if (o.isResource()) Class resourceClass = optionalResourceClass.isPresent() ? optionalResourceClass.get() : setMethodComponentParameterClass; - final Object nestedBean = resourceClass.newInstance(); + final Object nestedBean = resourceClass.getDeclaredConstructor().newInstance(); fromResource(classPropertyDefinitionsToSetMethods, nestedBean.getClass(), nestedBean, @@ -930,7 +930,7 @@ else if (o.isResource()) { // This property supports reified statements. Create the // new resource to hold the value and any metadata. - final Object reifiedResource = reifiedClass.newInstance(); + final Object reifiedResource = reifiedClass.getDeclaredConstructor().newInstance(); // Find a setter for the actual value. for (Method method : reifiedClass.getMethods()) @@ -1051,7 +1051,7 @@ else if ((SortedSet.class == parameterClass) || // Not handled above. Let's try newInstance with possible failure. else { - collection = ((Collection) parameterClass.newInstance()); + collection = ((Collection) parameterClass.getDeclaredConstructor().newInstance()); } collection.addAll(values); diff --git a/core/oslc4j-jena-provider/src/test/java/org/eclipse/lyo/oslc4j/provider/jena/JenaModelHelperTest.java b/core/oslc4j-jena-provider/src/test/java/org/eclipse/lyo/oslc4j/provider/jena/JenaModelHelperTest.java index 8e3ba493a..9cbee8f38 100644 --- a/core/oslc4j-jena-provider/src/test/java/org/eclipse/lyo/oslc4j/provider/jena/JenaModelHelperTest.java +++ b/core/oslc4j-jena-provider/src/test/java/org/eclipse/lyo/oslc4j/provider/jena/JenaModelHelperTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Contributors to the Eclipse Foundation + * Copyright (c) 2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. @@ -14,32 +14,30 @@ package org.eclipse.lyo.oslc4j.provider.jena; -import java.io.IOException; -import java.lang.reflect.InvocationTargetException; -import java.net.URI; -import java.net.URISyntaxException; -import javax.xml.datatype.DatatypeConfigurationException; - +import com.google.common.collect.ImmutableList; import org.apache.jena.datatypes.DatatypeFormatException; -import org.apache.jena.ext.com.google.common.collect.ImmutableList; import org.apache.jena.rdf.model.Model; -import org.eclipse.lyo.oslc4j.core.OSLC4JConstants; import org.eclipse.lyo.oslc4j.core.exception.LyoModelException; import org.eclipse.lyo.oslc4j.core.exception.OslcCoreApplicationException; import org.eclipse.lyo.oslc4j.core.model.ServiceProvider; import org.eclipse.lyo.oslc4j.provider.jena.helpers.RDFHelper; import org.eclipse.lyo.oslc4j.provider.jena.resources.Container; +import org.eclipse.lyo.oslc4j.provider.jena.resources.Dog; import org.eclipse.lyo.oslc4j.provider.jena.resources.Element; +import org.eclipse.lyo.oslc4j.provider.jena.resources.Person; +import org.eclipse.lyo.oslc4j.provider.jena.resources.Pet; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.junit.Assert.*; -import static org.eclipse.lyo.oslc4j.provider.jena.helpers.JenaAssert.*; -import org.eclipse.lyo.oslc4j.provider.jena.resources.Animal; -import org.eclipse.lyo.oslc4j.provider.jena.resources.Dog; -import org.eclipse.lyo.oslc4j.provider.jena.resources.Person; -import org.eclipse.lyo.oslc4j.provider.jena.resources.Pet; +import javax.xml.datatype.DatatypeConfigurationException; +import java.io.IOException; +import java.lang.reflect.InvocationTargetException; +import java.net.URI; + +import static org.eclipse.lyo.oslc4j.provider.jena.helpers.JenaAssert.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; /** * diff --git a/pom.xml b/pom.xml index f269f3c55..96ae5f194 100644 --- a/pom.xml +++ b/pom.xml @@ -406,6 +406,7 @@ 20100527 + org.apache.tomcat.embed tomcat-embed-core