Skip to content

removing common-lang and mimeparse dependency #225

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

Open
gs-gunjan wants to merge 1 commit into
base: master
Choose a base branch
from
+33 −22
Open

removing common-lang and mimeparse dependency #225

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
4 changes: 0 additions & 4 deletions legend-shared-pac4j/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,6 @@
<groupId>org.pac4j</groupId>
<artifactId>dropwizard-pac4j</artifactId>
</dependency>
<dependency>
<groupId>org.commonjava.mimeparse</groupId>
<artifactId>mimeparse</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
Expand Down
39 changes: 33 additions & 6 deletions ...src/main/java/org/finos/legend/server/pac4j/internal/AcceptHeaderAjaxRequestResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,17 @@

import com.google.common.base.Strings;
import com.google.common.net.HttpHeaders;
import com.google.common.net.MediaType;
import java.util.Collections;
import org.commonjava.mimeparse.MIMEParse;

import java.text.ParseException;
import java.util.List;

import org.glassfish.jersey.message.internal.AcceptableMediaType;
import org.glassfish.jersey.message.internal.HttpHeaderReader;
import org.pac4j.core.context.WebContext;
import org.pac4j.core.http.ajax.DefaultAjaxRequestResolver;

import javax.ws.rs.core.MediaType;

public class AcceptHeaderAjaxRequestResolver extends DefaultAjaxRequestResolver
{
@Override
Expand All @@ -32,8 +37,30 @@ public boolean isAjax(WebContext context)
{
return true;
}
String mimeType = MIMEParse.bestMatch(Collections.singleton(MediaType.HTML_UTF_8.toString()),
acceptHeader);
return Strings.isNullOrEmpty(mimeType);
String mimeType = mimeParseBestMatch(acceptHeader);
return Strings.isNullOrEmpty(mimeType);
}

private String mimeParseBestMatch(String acceptHeader)
{
List<AcceptableMediaType> requested;
try
{
requested = HttpHeaderReader.readAcceptMediaType(acceptHeader);
requested.sort(AcceptableMediaType.COMPARATOR);
}
catch (ParseException e)
{
return "";
}
MediaType supported = new MediaType("text", "html", "utf-8");
for (AcceptableMediaType req : requested)
{
if (req.isCompatible(supported))
{
return supported.toString();
}
}
return "";
}
}
12 changes: 0 additions & 12 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@
<jetty.version>9.4.44.v20210927</jetty.version>
<junit.version>4.13.1</junit.version>
<slf4j.version>1.7.36</slf4j.version>
<mimeparse.version>0.1.3.3</mimeparse.version>
<mockwebserver.version>4.9.0</mockwebserver.version>
<mockito.version>3.5.10</mockito.version>
<mongo.driver.version>5.3.1</mongo.driver.version>
Expand Down Expand Up @@ -648,17 +647,6 @@
<artifactId>nimbus-jose-jwt</artifactId>
<version>${nimbus.jwt.version}</version>
</dependency>
<dependency>
<groupId>org.commonjava.mimeparse</groupId>
<artifactId>mimeparse</artifactId>
<version>${mimeparse.version}</version>
<exclusions>
<exclusion>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-http</artifactId>
Expand Down
Loading