Skip to content
Snippets Groups Projects
Commit 1ccf3722 authored by Tor-Einar Skog's avatar Tor-Einar Skog
Browse files

chore(refactor): Fix javax -> jakarta

parent d715c691
Branches
Tags
3 merge requests!35build: New dummy version for testing the pipeline,!34Main,!33Jakarta vipsutv 904
......@@ -20,8 +20,8 @@
package no.nibio.vips.core;
import java.util.Set;
import javax.ws.rs.ApplicationPath;
import javax.ws.rs.core.Application;
import jakarta.ws.rs.ApplicationPath;
import jakarta.ws.rs.core.Application;
/**
......
......@@ -20,14 +20,14 @@ package no.nibio.vips.core.config;
import com.bedatadriven.jackson.datatype.jts.JtsModule;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.ext.ContextResolver;
import javax.ws.rs.ext.Provider;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
import com.fasterxml.jackson.databind.module.SimpleModule;
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
import jakarta.ws.rs.Produces;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.ext.ContextResolver;
import jakarta.ws.rs.ext.Provider;
import net.ipmdecisions.weather.entity.LocationWeatherData;
import no.nibio.vips.ipmdecisions.LocationWeatherDataDeserializer;
......
......@@ -18,6 +18,7 @@
package no.nibio.vips.core.service;
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
......@@ -115,7 +116,7 @@ public class ModelResourceImpl implements ModelResource{
{
retVal.append(mF.getModelInstance(key).getModelName(language));
}
catch(DuplicateModelIdException ex)
catch(DuplicateModelIdException | SecurityException | NoSuchMethodException | InvocationTargetException ex)
{
retVal.append(ex.getMessage());
}
......@@ -149,7 +150,7 @@ public class ModelResourceImpl implements ModelResource{
{
try {
retVal.append(key).append(" ").append(mF.getModelInstance(key).getModelName(language)).append("\n");
} catch (InstantiationException | IllegalAccessException | NoSuchModelException | DuplicateModelIdException ex) {
} catch (InstantiationException | IllegalAccessException | NoSuchModelException | DuplicateModelIdException | SecurityException | NoSuchMethodException | InvocationTargetException ex) {
retVal.append(key).append(" ").append(ex.getMessage()).append("\n");
Logger.getLogger(ModelResourceImpl.class.getName()).log(Level.SEVERE, null, ex);
}
......@@ -231,7 +232,7 @@ public class ModelResourceImpl implements ModelResource{
{
sampleConfig = ModelFactory.getInstance().getModelInstance(modelId).getSampleConfig();
}
catch(NoSuchModelException | DuplicateModelIdException ex)
catch(NoSuchModelException | DuplicateModelIdException | SecurityException | NoSuchMethodException | InvocationTargetException ex)
{
sampleConfig = ex.getMessage();
}
......@@ -261,7 +262,7 @@ public class ModelResourceImpl implements ModelResource{
}
else throw new ModelExcecutionException("Model returned NULL Result");
}
catch(InstantiationException | IllegalAccessException | ConfigValidationException | ModelExcecutionException | NoSuchModelException | DuplicateModelIdException ex)
catch(InstantiationException | IllegalAccessException | ConfigValidationException | ModelExcecutionException | NoSuchModelException | DuplicateModelIdException | SecurityException | NoSuchMethodException | InvocationTargetException ex)
{
Logger.getLogger(ModelResourceImpl.class.getName()).log(Level.SEVERE, null, ex);
return Response.serverError().entity(ex.getMessage()).build();
......
......@@ -18,8 +18,7 @@
package no.nibio.vips.core.startup;
import javax.servlet.ServletContextEvent;
import jakarta.servlet.ServletContextEvent;
import no.nibio.vips.model.factory.ModelFactory;
/**
* This class is created and method contextInitialized called when the application
......@@ -28,7 +27,7 @@ import no.nibio.vips.model.factory.ModelFactory;
* @copyright 2013 {@link http://www.nibio.no NIBIO}
* @author Tor-Einar Skog <tor-einar.skog@nibio.no>
*/
public class StartupListener implements javax.servlet.ServletContextListener{
public class StartupListener implements jakarta.servlet.ServletContextListener{
/**
* Called when the application
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment