Skip to content
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

Jump to bottom

Upgrade dataset provider to use JakartaEE dependencies used in KC22 #328

Merged
merged 1 commit into from
Apr 28, 2023
Merged

Upgrade dataset provider to use JakartaEE dependencies used in KC22 #328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion benchmark/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>org.keycloak.benchmark</groupId>
<artifactId>keycloak-benchmark</artifactId>
<version>0.9-SNAPSHOT</version>
<version>0.10-SNAPSHOT</version>

<properties>
<scala.version>2.12.10</scala.version>
Expand Down
20 changes: 1 addition & 19 deletions dataset/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-benchmark-parent</artifactId>
<groupId>org.keycloak</groupId>
<version>0.9-SNAPSHOT</version>
<version>0.10-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down Expand Up @@ -33,30 +33,12 @@
<groupId>org.keycloak</groupId>
<artifactId>keycloak-services</artifactId>
<scope>provided</scope>
<exclusions>
<!-- keycloak-services contains the wrong version of resteasy,
- so we exclude it here and add the dependency in the correct
- version manually (see ../pom.xml)
-->
<exclusion>
<artifactId>resteasy-multipart-provider</artifactId>
<groupId>org.jboss.resteasy</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-model-infinispan</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.ws.rs</groupId>
<artifactId>jboss-jaxrs-api_2.1_spec</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-core</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand Down
10 changes: 5 additions & 5 deletions dataset/src/main/java/org/keycloak/benchmark/cache/CacheResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@

import java.util.UUID;

import javax.ws.rs.GET;
import javax.ws.rs.NotFoundException;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.NotFoundException;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.PathParam;
import jakarta.ws.rs.Produces;

import org.infinispan.Cache;
import org.infinispan.commons.CacheConfigurationException;
Expand Down
8 changes: 4 additions & 4 deletions dataset/src/main/java/org/keycloak/benchmark/cache/CacheResourceProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
import java.util.Map;
import java.util.stream.Stream;

import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.PathParam;
import jakarta.ws.rs.Produces;

import org.infinispan.Cache;
import org.infinispan.client.hotrod.RemoteCache;
Expand Down
10 changes: 5 additions & 5 deletions dataset/src/main/java/org/keycloak/benchmark/cache/RemoteCacheResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@

import java.util.UUID;

import javax.ws.rs.GET;
import javax.ws.rs.NotFoundException;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.NotFoundException;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.PathParam;
import jakarta.ws.rs.Produces;

import org.infinispan.Cache;
import org.infinispan.client.hotrod.RemoteCache;
Expand Down
4 changes: 2 additions & 2 deletions dataset/src/main/java/org/keycloak/benchmark/cache/RemoteCacheResourceProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@

package org.keycloak.benchmark.cache;

import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.PathParam;

import org.keycloak.models.KeycloakSession;
import org.keycloak.services.resource.RealmResourceProvider;
Expand Down
10 changes: 5 additions & 5 deletions dataset/src/main/java/org/keycloak/benchmark/dataset/AuthorizationProvisioner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
import java.util.List;
import java.util.Random;
import java.util.Set;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.Produces;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
import org.jboss.resteasy.annotations.cache.NoCache;
import org.keycloak.authorization.AuthorizationProvider;
import org.keycloak.authorization.model.Policy;
Expand Down
17 changes: 9 additions & 8 deletions dataset/src/main/java/org/keycloak/benchmark/dataset/DatasetResourceProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@
import java.util.Collections;
import java.util.stream.Collectors;

import javax.ws.rs.DELETE;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import jakarta.ws.rs.DELETE;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.Produces;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
import jakarta.ws.rs.core.UriInfo;

import org.jboss.logging.Logger;
import org.jboss.resteasy.annotations.cache.NoCache;
Expand All @@ -57,6 +57,7 @@
import org.keycloak.models.GroupModel;
import org.keycloak.models.KeycloakSession;
import org.keycloak.models.KeycloakSessionFactory;
import org.keycloak.models.KeycloakUriInfo;
import org.keycloak.models.PasswordPolicy;
import org.keycloak.models.RealmModel;
import org.keycloak.models.RealmProvider;
Expand Down Expand Up @@ -87,7 +88,7 @@ public class DatasetResourceProvider implements RealmResourceProvider {

protected HttpRequest httpRequest;

protected UriInfo uriInfo;
protected KeycloakUriInfo uriInfo;

public DatasetResourceProvider(KeycloakSession session) {
this.baseSession = session;
Expand Down
2 changes: 1 addition & 1 deletion dataset/src/test/java/org/keycloak/benchmark/it/DeploymentIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ private Process startKeycloak(Path keycloakProvidersFolder, String[] args) throw
Assert.assertTrue(executable.toFile().exists());
cli.add(executable.toString());
}
cli.addAll(Arrays.asList("start-dev", "--http-port", Integer.toString(port)));
cli.addAll(Arrays.asList("--verbose", "start-dev", "--http-port", Integer.toString(port)));
cli.addAll(Arrays.asList(args));
ProcessBuilder processBuilder = new ProcessBuilder(cli);
processBuilder.environment().put("KEYCLOAK_ADMIN", "admin");
Expand Down
1 change: 0 additions & 1 deletion doc/dataset/modules/ROOT/nav.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
* xref:installing-provider.adoc[]
** xref:installation/installation-quarkus.adoc[]
** xref:installation/installation-minikube.adoc[]
** xref:installation/installation-wildfly.adoc[]
* xref:using-provider.adoc[]
* xref:clearing-caches.adoc[]
* xref:changing-provider.adoc[]
52 changes: 0 additions & 52 deletions doc/dataset/modules/ROOT/pages/installation/installation-wildfly.adoc
View file
Open in desktop

This file was deleted.

5 changes: 2 additions & 3 deletions doc/dataset/modules/ROOT/pages/installing-provider.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,5 @@ A fully scripted installation to be run on a single machine.
xref:installation/installation-quarkus.adoc[]::
A custom installation on Keycloak for Quarkus.

xref:installation/installation-wildfly.adoc[]::
A custom installation on Keycloak for Wildfly.

Installing on Keycloak with a Wildfly distribution is not support from version 0.10 onwards.
Use a version 0.9 or earlier of this project.
14 changes: 1 addition & 13 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,17 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-benchmark-parent</artifactId>
<version>0.9-SNAPSHOT</version>
<version>0.10-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Keycloak Benchmark Parent</name>
<description>Keycloak Benchmark Parent</description>

<properties>
<keycloak.version>999.0.0-SNAPSHOT</keycloak.version>
<jboss-jaxrs-api_2.1_spec>2.0.1.Final</jboss-jaxrs-api_2.1_spec>
<junit.version>4.13.2</junit.version>
<maven.compiler.source>11</maven.compiler.source>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<resteasy.version>4.7.4.Final</resteasy.version>
<maven.compiler.target>11</maven.compiler.target>
<encoding>UTF-8</encoding>
</properties>
Expand Down Expand Up @@ -59,16 +57,6 @@
<artifactId>keycloak-model-infinispan</artifactId>
<version>${keycloak.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-core</artifactId>
<version>${resteasy.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.ws.rs</groupId>
<artifactId>jboss-jaxrs-api_2.1_spec</artifactId>
<version>${jboss-jaxrs-api_2.1_spec}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand Down