Skip to content

Update jersey monorepo to v3 (major) #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
meik99 merged 2 commits into from
Jun 15, 2023
Merged

Update jersey monorepo to v3 (major) #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
140524a
Update jersey monorepo to v3
renovate[bot] Jun 15, 2023
328f8b1
removes rs-api library and replaces annotations with jersey 3.1 ones
meik99 Jun 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions web/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ task runTest(type: JavaExec, dependsOn: classes, group: 'application') {
dependencies {
testImplementation group: 'org.slf4j', name: 'slf4j-simple', version: '2.0.7'
implementation group: 'org.slf4j', name: 'slf4j-api', version: '2.0.7'
implementation group: 'javax.ws.rs', name: 'javax.ws.rs-api', version: '2.1.1'
implementation group: 'org.glassfish.jersey.inject', name: 'jersey-hk2', version: '2.39.1'
implementation group: 'org.glassfish.jersey.containers', name: 'jersey-container-grizzly2-http', version: '2.39.1'
implementation group: 'org.glassfish.jersey.media', name: 'jersey-media-json-jackson', version: '2.39.1'
implementation group: 'org.glassfish.jersey.media', name: 'jersey-media-multipart', version: '2.39.1'

implementation group: 'org.glassfish.jersey.inject', name: 'jersey-hk2', version: '3.1.2'
implementation group: 'org.glassfish.jersey.containers', name: 'jersey-container-grizzly2-http', version: '3.1.2'
implementation group: 'org.glassfish.jersey.media', name: 'jersey-media-json-jackson', version: '3.1.2'
implementation group: 'org.glassfish.jersey.media', name: 'jersey-media-multipart', version: '3.1.2'

implementation group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.1'

Expand Down
12 changes: 3 additions & 9 deletions web/src/main/java/at/jku/isse/ecco/web/controller/ArtefactController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,12 @@
import at.jku.isse.ecco.web.domain.model.AssociationModel;
import at.jku.isse.ecco.web.domain.repository.AbstractRepository;
import at.jku.isse.ecco.web.domain.repository.ArtefactRepository;
import jakarta.ws.rs.*;
import jakarta.ws.rs.core.*;
import jakarta.ws.rs.ext.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.ws.rs.Consumes;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
import javax.ws.rs.core.Configuration;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.ext.ContextResolver;
import javax.ws.rs.ext.Providers;

@Path("/artefacts")
public class ArtefactController {
Expand Down
12 changes: 3 additions & 9 deletions web/src/main/java/at/jku/isse/ecco/web/controller/AssociationController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,9 @@
import at.jku.isse.ecco.web.domain.repository.AssociationRepository;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
import javax.ws.rs.core.Configuration;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.ext.ContextResolver;
import javax.ws.rs.ext.Providers;
import jakarta.ws.rs.*;
import jakarta.ws.rs.core.*;
import jakarta.ws.rs.ext.*;

@Path("/associations")
public class AssociationController {
Expand Down
9 changes: 3 additions & 6 deletions web/src/main/java/at/jku/isse/ecco/web/controller/FeatureController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,9 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.ws.rs.*;
import javax.ws.rs.core.Configuration;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.ext.ContextResolver;
import javax.ws.rs.ext.Providers;
import jakarta.ws.rs.*;
import jakarta.ws.rs.core.*;
import jakarta.ws.rs.ext.*;

@Path("features")
public class FeatureController {
Expand Down
10 changes: 3 additions & 7 deletions web/src/main/java/at/jku/isse/ecco/web/controller/OperationController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,9 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.ws.rs.*;
import javax.ws.rs.core.Configuration;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.ext.ContextResolver;
import javax.ws.rs.ext.Providers;
import jakarta.ws.rs.*;
import jakarta.ws.rs.core.*;
import jakarta.ws.rs.ext.*;
import java.io.InputStream;

@Path("/repository")
Expand Down
5 changes: 1 addition & 4 deletions web/src/main/java/at/jku/isse/ecco/web/domain/repository/OperationRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,7 @@
import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.ws.rs.BadRequestException;
import javax.ws.rs.NotAllowedException;
import javax.ws.rs.NotFoundException;
import jakarta.ws.rs.*;
import java.io.IOException;
import java.io.InputStream;
import java.nio.file.Files;
Expand Down
8 changes: 4 additions & 4 deletions web/src/main/java/at/jku/isse/ecco/web/provider/RepositoryProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

import at.jku.isse.ecco.web.domain.repository.AbstractRepository;
import at.jku.isse.ecco.web.rest.EccoApplication;
import jakarta.ws.rs.core.Context;
import jakarta.ws.rs.ext.ContextResolver;
import jakarta.ws.rs.ext.Provider;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.ws.rs.core.Context;
import javax.ws.rs.ext.ContextResolver;
import javax.ws.rs.ext.Provider;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;

Expand All @@ -20,7 +20,7 @@ public class RepositoryProvider implements ContextResolver<AbstractRepository> {
public AbstractRepository getContext(Class<?> type) {
Object object = null;
try {
Constructor constructor = type.getConstructor(EccoApplication.class);
Constructor<?> constructor = type.getConstructor(EccoApplication.class);
constructor.setAccessible(true);
object = constructor.newInstance(this.application);
} catch (NoSuchMethodException | IllegalAccessException | InstantiationException | InvocationTargetException e) {
Expand Down
9 changes: 3 additions & 6 deletions web/src/main/java/at/jku/isse/ecco/web/rest/EccoApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,15 @@

import at.jku.isse.ecco.service.EccoService;
import at.jku.isse.ecco.web.domain.model.ArtefactGraphModel;
import jakarta.ws.rs.ApplicationPath;
import org.glassfish.jersey.media.multipart.MultiPartFeature;
import org.glassfish.jersey.server.ResourceConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.nio.file.Paths;

/*
ApplicationPath hat leider keine Auswirkung auf die URI auf der die API laufen wird
siehe https://github.com/eclipse-ee4j/jersey/issues/4205
Issue ist bisher auch nicht closed hat auch keinen Workaround...
*/
//@ApplicationPath("ecco")
@ApplicationPath("ecco")
public class EccoApplication extends ResourceConfig {

private static final Logger LOGGER = LoggerFactory.getLogger(EccoApplication.class);
Expand All @@ -33,6 +29,7 @@ public EccoApplication() {
public EccoService getEccoService() {
return this.eccoService;
}

public void open(String baseDirectory) {
this.eccoService.setBaseDir(Paths.get(baseDirectory));
this.eccoService.setRepositoryDir(Paths.get(baseDirectory + ECCO_REPOSITORY_DIRECTORY));
Expand Down
29 changes: 10 additions & 19 deletions web/src/main/java/at/jku/isse/ecco/web/rest/resource/GraphsResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,15 @@
package at.jku.isse.ecco.web.rest.resource;

import at.jku.isse.ecco.adapter.dispatch.DirectoryArtifactData;
import at.jku.isse.ecco.adapter.dispatch.PluginArtifactData;
import at.jku.isse.ecco.composition.LazyCompositionRootNode;
import at.jku.isse.ecco.core.Association;
import at.jku.isse.ecco.service.EccoService;
import at.jku.isse.ecco.web.rest.EccoApplication;
import at.jku.isse.ecco.web.rest.dto.ArtifactsGraphDTO;

import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.Application;
import javax.ws.rs.core.Configuration;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
import at.jku.isse.ecco.adapter.dispatch.*;
import at.jku.isse.ecco.composition.*;
import at.jku.isse.ecco.core.*;
import at.jku.isse.ecco.service.*;
import at.jku.isse.ecco.web.rest.*;
import at.jku.isse.ecco.web.rest.dto.*;
import jakarta.ws.rs.*;
import jakarta.ws.rs.core.*;

import java.util.*;

@Path("/graph")
public class GraphsResource {
Expand Down
9 changes: 4 additions & 5 deletions web/src/main/java/at/jku/isse/ecco/web/server/CORSFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
package at.jku.isse.ecco.web.server;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.ws.rs.container.ContainerRequestContext;
import javax.ws.rs.container.ContainerResponseContext;
import javax.ws.rs.container.ContainerResponseFilter;
import javax.ws.rs.ext.Provider;
import jakarta.ws.rs.container.*;
import jakarta.ws.rs.ext.*;
import java.io.IOException;

@Provider
public class CORSFilter implements ContainerResponseFilter {

Expand Down