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

Reverted master back to 1.0 API #135

Merged
merged 2 commits into from
Jul 22, 2019
Merged

Reverted master back to 1.0 API #135

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
4221ede
Reverted master back to 1.0 API
arjantijms Jul 22, 2019
10c8688
Reverted master back to 1.0 API - Test package
arjantijms Jul 22, 2019
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 api/src/main/java/javax/security/enterprise/CallerPrincipal.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* Principal that represents the caller principal associated with the invocation being
* processed by the container (e.g. the current HTTP request).
*/
public class CallerPrincipal implements Principal, Serializable {
public class CallerPrincipal implements Principal {

private static final long serialVersionUID = -6951555039431667786L;

Expand Down
16 changes: 1 addition & 15 deletions ...c/main/java/javax/security/enterprise/authentication/mechanism/http/AutoApplySession.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;

import javax.enterprise.util.AnnotationLiteral;
import javax.interceptor.InterceptorBinding;

/**
Expand Down Expand Up @@ -57,18 +56,5 @@
@Retention(RUNTIME)
@Target(TYPE)
public @interface AutoApplySession {

/**
* A default literal for the {@link AutoApplySession} annotation.
*
* @since 1.1
*/
@SuppressWarnings("all")
public final static class Literal extends AnnotationLiteral<AutoApplySession> implements AutoApplySession {

private static final long serialVersionUID = 1L;

public static final Literal INSTANCE = new Literal();

}

}
59 changes: 0 additions & 59 deletions ...security/enterprise/authentication/mechanism/http/HttpAuthenticationMechanismWrapper.java
View file
Open in desktop

This file was deleted.

86 changes: 0 additions & 86 deletions ...rc/main/java/javax/security/enterprise/authentication/mechanism/http/LoginToContinue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;

import javax.enterprise.util.AnnotationLiteral;
import javax.enterprise.util.Nonbinding;
import javax.interceptor.InterceptorBinding;

Expand Down Expand Up @@ -53,91 +52,6 @@
@Target(TYPE)
public @interface LoginToContinue {

/**
* A default literal type for the {@link LoginToContinue} annotation.
*
* @since 1.1
*/
@SuppressWarnings("all")
public final static class Literal extends AnnotationLiteral<LoginToContinue> implements LoginToContinue {

private static final long serialVersionUID = 1L;

private final String loginPage;
private final boolean useForwardToLogin;
private final String useForwardToLoginExpression;
private final String errorPage;

public static LiteralBuilder builder() {
return new LiteralBuilder();
}

public static class LiteralBuilder {

private String loginPage = "/login";
private boolean useForwardToLogin = true;
private String useForwardToLoginExpression;
private String errorPage = "/login-error";

public LiteralBuilder loginPage (String loginPage) {
this.loginPage = loginPage;
return this;
}

public LiteralBuilder useForwardToLogin (boolean useForwardToLogin) {
this.useForwardToLogin = useForwardToLogin;
return this;
}

public LiteralBuilder useForwardToLoginExpression (String useForwardToLoginExpression) {
this.useForwardToLoginExpression = useForwardToLoginExpression;
return this;
}

public LiteralBuilder errorPage (String errorPage) {
this.errorPage = errorPage;
return this;
}

public Literal build() {
return new Literal(
loginPage,
useForwardToLogin,
useForwardToLoginExpression,
errorPage);
}

}

public Literal(String loginPage, boolean useForwardToLogin, String useForwardToLoginExpression, String errorPage) {
this.loginPage = loginPage;
this.useForwardToLogin = useForwardToLogin;
this.useForwardToLoginExpression = useForwardToLoginExpression;
this.errorPage = errorPage;
}

@Override
public String loginPage() {
return loginPage;
}

@Override
public boolean useForwardToLogin() {
return useForwardToLogin;
}

@Override
public String useForwardToLoginExpression() {
return useForwardToLoginExpression;
}

@Override
public String errorPage() {
return errorPage;
}

}

/**
* The resource (page) a caller should get to see in case the originally requested
* resource requires authentication, and the caller is currently not authenticated.
Expand Down
168 changes: 0 additions & 168 deletions api/src/main/java/javax/security/enterprise/authentication/mechanism/http/RememberMe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import java.lang.annotation.Target;

import javax.el.ELProcessor;
import javax.enterprise.util.AnnotationLiteral;
import javax.enterprise.util.Nonbinding;
import javax.interceptor.InterceptorBinding;
import javax.security.enterprise.identitystore.IdentityStore;
Expand Down Expand Up @@ -83,173 +82,6 @@
@Target(TYPE)
public @interface RememberMe {

/**
* A default literal type for the {@link RememberMe} annotation.
*
* @since 1.1
*/
@SuppressWarnings("all")
public final static class Literal extends AnnotationLiteral<RememberMe> implements RememberMe {

private static final long serialVersionUID = 1L;

private final int cookieMaxAgeSeconds;
private final String cookieMaxAgeSecondsExpression;
private final boolean cookieSecureOnly;
private final String cookieSecureOnlyExpression;
private final boolean cookieHttpOnly;
private final String cookieHttpOnlyExpression;
private final String cookieName;
private final boolean isRememberMe;
private final String isRememberMeExpression;

public static LiteralBuilder builder() {
return new LiteralBuilder();
}

public static class LiteralBuilder {

private int cookieMaxAgeSeconds = 86400; // 1 day
private String cookieMaxAgeSecondsExpression;
private boolean cookieSecureOnly = true;
private String cookieSecureOnlyExpression;
private boolean cookieHttpOnly = true;
private String cookieHttpOnlyExpression;
private String cookieName = "JREMEMBERMEID";
private boolean isRememberMe = true;
private String isRememberMeExpression;

public LiteralBuilder cookieMaxAgeSeconds(int cookieMaxAgeSeconds) {
this.cookieMaxAgeSeconds = cookieMaxAgeSeconds;
return this;
}

public LiteralBuilder cookieMaxAgeSecondsExpression (String cookieMaxAgeSecondsExpression) {
this.cookieMaxAgeSecondsExpression = cookieMaxAgeSecondsExpression;
return this;
}

public LiteralBuilder cookieSecureOnly (boolean cookieSecureOnly) {
this.cookieSecureOnly = cookieSecureOnly;
return this;

}

public LiteralBuilder cookieSecureOnlyExpression (String cookieSecureOnlyExpression) {
this.cookieHttpOnlyExpression = cookieSecureOnlyExpression;
return this;
}

public LiteralBuilder cookieHttpOnly (boolean cookieHttpOnly) {
this.cookieHttpOnly = cookieHttpOnly;
return this;
}

public LiteralBuilder cookieHttpOnlyExpression (String cookieHttpOnlyExpression) {
this.cookieHttpOnlyExpression = cookieHttpOnlyExpression;
return this;
}

public LiteralBuilder cookieName (String cookieName) {
this.cookieName = cookieName;
return this;
}

public LiteralBuilder isRememberMe (boolean isRememberMe) {
this.isRememberMe = isRememberMe;
return this;
}

public LiteralBuilder isRememberMeExpression (String isRememberMeExpression) {
this.isRememberMeExpression = isRememberMeExpression;
return this;
}

public Literal build() {
return new Literal(
cookieMaxAgeSeconds,
cookieMaxAgeSecondsExpression,
cookieSecureOnly,
cookieSecureOnlyExpression,
cookieHttpOnly,
cookieHttpOnlyExpression,
cookieName,
isRememberMe,
isRememberMeExpression);
}
}

public Literal(

int cookieMaxAgeSeconds,
String cookieMaxAgeSecondsExpression,
boolean cookieSecureOnly,
String cookieSecureOnlyExpression,
boolean cookieHttpOnly,
String cookieHttpOnlyExpression,
String cookieName,
boolean isRememberMe,
String isRememberMeExpression

) {

this.cookieMaxAgeSeconds = cookieMaxAgeSeconds;
this.cookieMaxAgeSecondsExpression = cookieMaxAgeSecondsExpression;
this.cookieSecureOnly = cookieSecureOnly;
this.cookieSecureOnlyExpression = cookieSecureOnlyExpression;
this.cookieHttpOnly = cookieHttpOnly;
this.cookieHttpOnlyExpression = cookieHttpOnlyExpression;
this.cookieName = cookieName;
this.isRememberMe = isRememberMe;
this.isRememberMeExpression = isRememberMeExpression;
}

@Override
public boolean cookieHttpOnly() {
return cookieHttpOnly;
}

@Override
public String cookieHttpOnlyExpression() {
return cookieHttpOnlyExpression;
}

@Override
public int cookieMaxAgeSeconds() {
return cookieMaxAgeSeconds;
}

@Override
public String cookieMaxAgeSecondsExpression() {
return cookieMaxAgeSecondsExpression;
}

@Override
public boolean cookieSecureOnly() {
return cookieSecureOnly;
}

@Override
public String cookieSecureOnlyExpression() {
return cookieSecureOnlyExpression;
}

@Override
public String cookieName() {
return cookieName;
}

@Override
public boolean isRememberMe() {
return isRememberMe;
}

@Override
public String isRememberMeExpression() {
return isRememberMeExpression;
}
}

/**
* Max age in seconds for the remember me cookie.
* Defaults to one day.
Expand Down
Loading