Skip to content

Commit

Permalink
https://github.com/jakartaee/faces/issues/1830
Browse files Browse the repository at this point in the history 
Remove things marked @deprecated(forRemoval = true, since = "4.0")
  • Loading branch information
@BalusC
BalusC committed Jul 22, 2023
1 parent 7b2cc1f commit 70c1edf
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 267 deletions.
37 changes: 0 additions & 37 deletions impl/src/main/java/jakarta/faces/annotation/FacesConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,43 +54,6 @@ public static final class Literal extends AnnotationLiteral<FacesConfig> impleme
* Instance of the {@link FacesConfig} qualifier.
*/
public static final Literal INSTANCE = new Literal();

@Override
public Version version() {
return Version.JSF_2_3;
}
}

/**
* The Faces spec version
*
* @deprecated It has no effect anymore as per Jakarta Faces version 4.0; the actual impl version should be leading.
*/
@Deprecated(forRemoval = true, since = "4.0")
public static enum Version {

/**
* <p class="changed_added_2_3">
* This value indicates CDI should be used for Jakarta Expression Language resolution as well as enabling Jakarta Server
* Faces CDI injection, as specified in Section 5.6.3 "CDI for EL Resolution" and Section 5.9 "CDI Integration".
* </p>
*/
JSF_2_3

}

/**
* <p class="changed_added_2_3">
* The value of this attribute indicates that features corresponding to this version must be enabled for this
* application.
* </p>
*
* @return the spec version for which the features must be enabled.
*
* @deprecated It has no effect anymore as per Jakarta Faces version 4.0; the actual impl version should be leading.
*/
@Nonbinding
@Deprecated(forRemoval = true, since = "4.0")
Version version() default Version.JSF_2_3;

}
22 changes: 0 additions & 22 deletions impl/src/main/java/jakarta/faces/application/ResourceHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,17 +155,6 @@ public abstract class ResourceHandler {
*/
public static final String RESOURCE_IDENTIFIER = "/jakarta.faces.resource";

/**
* <p class="changed_added_2_3">
* Resource name of Jakarta Faces script resource.
* </p>
*
* @since 2.3
* @deprecated Use {@link #FACES_SCRIPT_RESOURCE_NAME} instead.
*/
@Deprecated(since = "4.0", forRemoval = true)
public static final String JSF_SCRIPT_RESOURCE_NAME = "faces.js";

/**
* <p class="changed_modified_4_0">
* Resource name of Jakarta Faces script resource.
Expand All @@ -175,17 +164,6 @@ public abstract class ResourceHandler {
*/
public static final String FACES_SCRIPT_RESOURCE_NAME = "faces.js";

/**
* <p class="changed_added_2_3">
* Library name of Jakarta Faces script resource.
* </p>
*
* @since 2.3
* @deprecated Use {@link #FACES_SCRIPT_LIBRARY_NAME} instead.
*/
@Deprecated(since = "4.0", forRemoval = true)
public static final String JSF_SCRIPT_LIBRARY_NAME = "jakarta.faces";

/**
* <p class="changed_modified_4_0">
* Library name of Jakarta Faces script resource.
Expand Down
18 changes: 0 additions & 18 deletions impl/src/main/java/jakarta/faces/application/ViewHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,24 +78,6 @@ public abstract class ViewHandler {
*/
public static final String CHARACTER_ENCODING_KEY = "jakarta.faces.request.charset";

/**
* <p class="changed_modified_4_0">
* This is not anymore used since removal of support for Jakarta Pages.
* </p>
* @deprecated Use {@link #FACELETS_SUFFIX_PARAM_NAME} instead.
*/
@Deprecated(since = "4.0", forRemoval = true)
public static final String DEFAULT_SUFFIX_PARAM_NAME = "jakarta.faces.DEFAULT_SUFFIX";

/**
* <p class="changed_modified_4_0">
* This is not anymore used since removal of support for Jakarta Pages.
* </p>
* @deprecated Use {@link #DEFAULT_FACELETS_SUFFIX} instead.
*/
@Deprecated(since = "4.0", forRemoval = true)
public static final String DEFAULT_SUFFIX = ".xhtml";

/**
* <p class="changed_added_2_2">
* If this param is set, and calling toLowerCase().equals("true") on a String representation of its value returns true,
Expand Down
158 changes: 0 additions & 158 deletions impl/src/main/java/jakarta/faces/component/html/HtmlInputFile.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,6 @@ public HtmlInputFile() {
protected enum PropertyKeys {
accept, accesskey, dir, disabled, label, lang, multiple, onblur, onchange, onclick, ondblclick, onfocus, onkeydown, onkeypress, onkeyup,
onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, onselect, role, style, styleClass, tabindex, title,
@Deprecated(since = "4.0", forRemoval = true) alt,
@Deprecated(since = "4.0", forRemoval = true) autocomplete,
@Deprecated(since = "4.0", forRemoval = true) maxlength,
@Deprecated(since = "4.0", forRemoval = true) readonly,
@Deprecated (since = "4.0", forRemoval = true)size,
;
String toString;

Expand Down Expand Up @@ -132,68 +127,6 @@ public void setAccept(java.lang.String accept) {
handleAttribute(this, "accept", accept);
}

/**
* <p>
* Return the value of the <code>alt</code> property.
* </p>
* <p>
* Contents: Alternate textual description of the element rendered by this component.
*
* @return the value of the property
* @deprecated This attribute is actually not specified in HTML. Do not use it on this component.
*/
@Deprecated(since = "4.0", forRemoval = true)
public java.lang.String getAlt() {
return (java.lang.String) getStateHelper().eval(PropertyKeys.alt);

}

/**
* <p>
* Set the value of the <code>alt</code> property.
* </p>
*
* @param alt the new property value
* @deprecated This attribute is actually not specified in HTML. Do not use it on this component.
*/
@Deprecated(since = "4.0", forRemoval = true)
public void setAlt(java.lang.String alt) {
getStateHelper().put(PropertyKeys.alt, alt);
handleAttribute(this, "alt", alt);
}

/**
* <p>
* Return the value of the <code>autocomplete</code> property.
* </p>
* <p>
* Contents: If the value of this attribute is "off", render "off" as the value of the attribute. This indicates that
* the browser should disable its autocomplete feature for this component. This is useful for components that perform
* autocompletion and do not want the browser interfering. If this attribute is not set or the value is "on", render
* nothing.
*
* @return the value of the property
* @deprecated This attribute is actually not specified in HTML. Do not use it on this component.
*/
@Deprecated(since = "4.0", forRemoval = true)
public java.lang.String getAutocomplete() {
return (java.lang.String) getStateHelper().eval(PropertyKeys.autocomplete);

}

/**
* <p>
* Set the value of the <code>autocomplete</code> property.
* </p>
*
* @param autocomplete the new property value
* @deprecated This attribute is actually not specified in HTML. Do not use it on this component.
*/
@Deprecated(since = "4.0", forRemoval = true)
public void setAutocomplete(java.lang.String autocomplete) {
getStateHelper().put(PropertyKeys.autocomplete, autocomplete);
}

/**
* <p>
* Return the value of the <code>dir</code> property.
Expand Down Expand Up @@ -340,36 +273,6 @@ public void setMultiple(boolean multiple) {
handleAttribute(this, "multiple", multiple);
}

/**
* <p>
* Return the value of the <code>maxlength</code> property.
* </p>
* <p>
* Contents: The maximum number of characters that may be entered in this field.
*
* @return the value of the property
* @deprecated This attribute is actually not specified in HTML. Do not use it on this component.
*/
@Deprecated(since = "4.0", forRemoval = true)
public int getMaxlength() {
return (java.lang.Integer) getStateHelper().eval(PropertyKeys.maxlength, Integer.MIN_VALUE);

}

/**
* <p>
* Set the value of the <code>maxlength</code> property.
* </p>
*
* @param maxlength the new property value
* @deprecated This attribute is actually not specified in HTML. Do not use it on this component.
*/
@Deprecated(since = "4.0", forRemoval = true)
public void setMaxlength(int maxlength) {
getStateHelper().put(PropertyKeys.maxlength, maxlength);
handleAttribute(this, "maxlength", maxlength);
}

/**
* <p>
* Return the value of the <code>onblur</code> property.
Expand Down Expand Up @@ -761,37 +664,6 @@ public void setOnselect(java.lang.String onselect) {
handleAttribute(this, "onselect", onselect);
}

/**
* <p>
* Return the value of the <code>readonly</code> property.
* </p>
* <p>
* Contents: Flag indicating that this component will prohibit changes by the user. The element may receive focus unless
* it has also been disabled. A value of false causes no attribute to be rendered, while a value of true causes the
* attribute to be rendered as readonly="readonly".
*
* @return the value of the property
* @deprecated This attribute is actually not specified in HTML. Do not use it on this component.
*/
@Deprecated(since = "4.0", forRemoval = true)
public boolean isReadonly() {
return (java.lang.Boolean) getStateHelper().eval(PropertyKeys.readonly, false);

}

/**
* <p>
* Set the value of the <code>readonly</code> property.
* </p>
*
* @param readonly the new property value
* @deprecated This attribute is actually not specified in HTML. Do not use it on this component.
*/
@Deprecated(since = "4.0", forRemoval = true)
public void setReadonly(boolean readonly) {
getStateHelper().put(PropertyKeys.readonly, readonly);
}

/**
* <p>
* Return the value of the <code>role</code> property.
Expand Down Expand Up @@ -832,36 +704,6 @@ public void setRole(java.lang.String role) {
handleAttribute(this, "role", role);
}

/**
* <p>
* Return the value of the <code>size</code> property.
* </p>
* <p>
* Contents: The number of characters used to determine the width of this field.
*
* @return the value of the property
* @deprecated This attribute is actually not specified in HTML. Do not use it on this component.
*/
@Deprecated(since = "4.0", forRemoval = true)
public int getSize() {
return (java.lang.Integer) getStateHelper().eval(PropertyKeys.size, Integer.MIN_VALUE);

}

/**
* <p>
* Set the value of the <code>size</code> property.
* </p>
*
* @param size the new property value
* @deprecated This attribute is actually not specified in HTML. Do not use it on this component.
*/
@Deprecated(since = "4.0", forRemoval = true)
public void setSize(int size) {
getStateHelper().put(PropertyKeys.size, size);
handleAttribute(this, "size", size);
}

/**
* <p>
* Return the value of the <code>style</code> property.
Expand Down
32 changes: 0 additions & 32 deletions impl/src/main/java/jakarta/faces/component/html/HtmlInputSecret.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ public HtmlInputSecret() {
protected enum PropertyKeys {
accesskey, autocomplete, dir, disabled, label, lang, maxlength, onblur, onchange, onclick, ondblclick, onfocus, onkeydown, onkeypress, onkeyup,
onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, onselect, readonly, redisplay, role, size, style, styleClass, tabindex, title,
@Deprecated(since = "4.0", forRemoval = true) alt,
;

String toString;
Expand Down Expand Up @@ -102,37 +101,6 @@ public void setAccesskey(java.lang.String accesskey) {
handleAttribute(this, "accesskey", accesskey);
}

/**
* <p>
* Return the value of the <code>alt</code> property.
* </p>
*
* @return the property value
* <p>
* Contents: Alternate textual description of the element rendered by this component.
*
* @deprecated This attribute is actually not specified in HTML. Do not use it on this component.
*/
@Deprecated(since = "4.0", forRemoval = true)
public java.lang.String getAlt() {
return (java.lang.String) getStateHelper().eval(PropertyKeys.alt);

}

/**
* <p>
* Set the value of the <code>alt</code> property.
* </p>
*
* @param alt the new property value
* @deprecated This attribute is actually not specified in HTML. Do not use it on this component.
*/
@Deprecated(since = "4.0", forRemoval = true)
public void setAlt(java.lang.String alt) {
getStateHelper().put(PropertyKeys.alt, alt);
handleAttribute(this, "alt", alt);
}

/**
* <p>
* Return the value of the <code>autocomplete</code> property.
Expand Down

0 comments on commit 70c1edf

Please sign in to comment.