From a503495ff62adc7021986fc4a3ba4528b7ea3fd5 Mon Sep 17 00:00:00 2001
From: Javen O'Neal <onealj@apache.org>
Date: Wed, 14 Sep 2016 05:31:48 +0000
Subject: [PATCH] bug 58671: add @Removal annotation to deprecated fields

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1760632 13f79535-47bb-0310-9956-ffa450edef68
---
 src/java/org/apache/poi/ss/usermodel/Row.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/java/org/apache/poi/ss/usermodel/Row.java b/src/java/org/apache/poi/ss/usermodel/Row.java
index b17edcd303..f58775704c 100644
--- a/src/java/org/apache/poi/ss/usermodel/Row.java
+++ b/src/java/org/apache/poi/ss/usermodel/Row.java
@@ -19,6 +19,8 @@ package org.apache.poi.ss.usermodel;
 
 import java.util.Iterator;
 
+import org.apache.poi.util.Removal;
+
 /**
  * High level representation of a row of a spreadsheet.
  */
@@ -240,8 +242,10 @@ public interface Row extends Iterable<Cell> {
         CREATE_NULL_AS_BLANK(3);
         
         /**
-         * @deprecated as of POI 3.15-beta2, scheduled for removal in 3.17 - the id has no function and will be removed 
+         * @deprecated as of POI 3.15-beta2, scheduled for removal in 3.17 - the id has no function and will be removed.
+         * The {@code id} is only kept only for backwards compatibility with applications that hard-coded the number
          */
+        @Removal(version="3.17")
         @Deprecated
         public final int id;
         private MissingCellPolicy(int id) {
@@ -254,6 +258,7 @@ public interface Row extends Iterable<Cell> {
      * 
      * @deprecated as of POI 3.15-beta2, scheduled for removal in 3.17 - use the MissingCellPolicy enum
      **/
+    @Removal(version="3.17")
     @Deprecated
     public static final MissingCellPolicy RETURN_NULL_AND_BLANK = MissingCellPolicy.RETURN_NULL_AND_BLANK;
     /**
@@ -261,6 +266,7 @@ public interface Row extends Iterable<Cell> {
      * 
      * @deprecated as of POI 3.15-beta2, scheduled for removal in 3.17 - use the MissingCellPolicy enum
      **/
+    @Removal(version="3.17")
     @Deprecated
     public static final MissingCellPolicy RETURN_BLANK_AS_NULL = MissingCellPolicy.RETURN_BLANK_AS_NULL;
     /**
@@ -268,6 +274,7 @@ public interface Row extends Iterable<Cell> {
      * 
      * @deprecated as of POI 3.15-beta2, scheduled for removal in 3.17 - use the MissingCellPolicy enum
      **/
+    @Removal(version="3.17")
     @Deprecated
     public static final MissingCellPolicy CREATE_NULL_AS_BLANK = MissingCellPolicy.CREATE_NULL_AS_BLANK;