Merge pull request Netflix#258 from gzurowski/fix-overrides

Consistently use @OverRide annotation across all classes
nirmalvadi · Aug 15, 2016 · cdfd9c0 · cdfd9c0
2 parents f5cdee4 + be3ad62
commit cdfd9c0
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 2 deletions.
diff --git a/zuul-core/src/main/java/com/netflix/zuul/filters/ZuulServletFilter.java b/zuul-core/src/main/java/com/netflix/zuul/filters/ZuulServletFilter.java
@@ -51,6 +51,7 @@ public class ZuulServletFilter implements Filter {
 
     private ZuulRunner zuulRunner;
 
+    @Override
     public void init(FilterConfig filterConfig) throws ServletException {
 
         String bufferReqsStr = filterConfig.getInitParameter("buffer-requests");
@@ -59,6 +60,7 @@ public void init(FilterConfig filterConfig) throws ServletException {
         zuulRunner = new ZuulRunner(bufferReqs);
     }
 
+    @Override
     public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
         try {
             init((HttpServletRequest) servletRequest, (HttpServletResponse) servletResponse);
@@ -117,8 +119,8 @@ void error(ZuulException e) {
         zuulRunner.error();
     }
 
+    @Override
     public void destroy() {
-
     }
 
 

diff --git a/zuul-core/src/main/java/com/netflix/zuul/groovy/GroovyCompiler.java b/zuul-core/src/main/java/com/netflix/zuul/groovy/GroovyCompiler.java
@@ -49,6 +49,7 @@ public class GroovyCompiler implements DynamicCodeCompiler {
      * @param sName
      * @return
      */
+    @Override
     public Class compile(String sCode, String sName) {
         GroovyClassLoader loader = getGroovyClassLoader();
         LOG.warn("Compiling filter: " + sName);
@@ -70,6 +71,7 @@ GroovyClassLoader getGroovyClassLoader() {
      * @return
      * @throws java.io.IOException
      */
+    @Override
     public Class compile(File file) throws IOException {
         GroovyClassLoader loader = getGroovyClassLoader();
         Class groovyClass = loader.parseClass(file);

diff --git a/zuul-core/src/main/java/com/netflix/zuul/groovy/GroovyFileFilter.java b/zuul-core/src/main/java/com/netflix/zuul/groovy/GroovyFileFilter.java
@@ -38,6 +38,8 @@
  *
  */
 public class GroovyFileFilter implements FilenameFilter {
+
+    @Override
     public boolean accept(File dir, String name) {
         return name.endsWith(".groovy");
     }

diff --git a/zuul-core/src/main/java/com/netflix/zuul/http/HttpServletRequestWrapper.java b/zuul-core/src/main/java/com/netflix/zuul/http/HttpServletRequestWrapper.java
@@ -90,6 +90,7 @@ public HttpServletRequestWrapper(HttpServletRequest request) {
      *
      * @return The wrapped HttpServletRequest.
      */
+    @Override
     public HttpServletRequest getRequest() {
         try {
             parseRequest();
@@ -262,6 +263,7 @@ public long getBodyBufferingTimeNs()
      *
      * @return A new ServletInputStream.
      */
+    @Override
     public ServletInputStream getInputStream() throws IOException {
         parseRequest();
 
@@ -275,6 +277,7 @@ public ServletInputStream getInputStream() throws IOException {
      *
      * @return A new BufferedReader with the wrapped request's character encoding (or UTF-8 if null).
      */
+    @Override
     public BufferedReader getReader() throws IOException {
         parseRequest();
 
@@ -289,6 +292,7 @@ public BufferedReader getReader() throws IOException {
      *
      * @see javax.servlet.ServletRequest#getParameter(java.lang.String)
      */
+    @Override
     public String getParameter(String name) {
         try {
             parseRequest();
@@ -309,6 +313,7 @@ public String getParameter(String name) {
      * @see javax.servlet.ServletRequest#getParameterMap()
      */
     @SuppressWarnings("unchecked")
+    @Override
     public Map getParameterMap() {
         try {
             parseRequest();
@@ -324,6 +329,7 @@ public Map getParameterMap() {
      * @see javax.servlet.ServletRequest#getParameterNames()
      */
     @SuppressWarnings("unchecked")
+    @Override
     public Enumeration getParameterNames() {
         try {
             parseRequest();
@@ -334,10 +340,12 @@ public Enumeration getParameterNames() {
             private String[] arr = getParameters().keySet().toArray(new String[0]);
             private int idx = 0;
 
+            @Override
             public boolean hasMoreElements() {
                 return idx < arr.length;
             }
 
+            @Override
             public String nextElement() {
                 return arr[idx++];
             }
@@ -351,6 +359,7 @@ public String nextElement() {
      *
      * @see javax.servlet.ServletRequest#getParameterValues(java.lang.String)
      */
+    @Override
     public String[] getParameterValues(String name) {
         try {
             parseRequest();

diff --git a/zuul-netflix/src/main/java/com/netflix/zuul/context/NFRequestContext.java b/zuul-netflix/src/main/java/com/netflix/zuul/context/NFRequestContext.java
@@ -95,6 +95,7 @@ public boolean hasRouteVIPOrHost() {
     /**
      * unsets the requestContextVariables
      */
+    @Override
     public void unset() {
         if (getZuulResponse() != null) {
             getZuulResponse().close(); //check this?

diff --git a/zuul-netflix/src/main/java/com/netflix/zuul/dependency/cassandra/DefaultCassandraCache.java b/zuul-netflix/src/main/java/com/netflix/zuul/dependency/cassandra/DefaultCassandraCache.java
@@ -71,6 +71,7 @@ private DefaultCassandraCache(ConcurrentMap<String, K> cacheMap) {
      * @param keys
      * @return
      */
+    @Override
     public K fetchQuery(String... keys) {
         final String key = buildKey(keys);
         final K result = cacheMap.get(key);
@@ -92,6 +93,7 @@ public K fetchQuery(String... keys) {
      * @param response
      * @param keys
      */
+    @Override
     public void storeQuery(K response, String... keys) {
         final String key = buildKey(keys);
 

diff --git a/zuul-netflix/src/main/java/com/netflix/zuul/scriptManager/ZuulFilterDAOCassandra.java b/zuul-netflix/src/main/java/com/netflix/zuul/scriptManager/ZuulFilterDAOCassandra.java
@@ -108,6 +108,7 @@ public void addFilterIdToIndex(String index, String filter_id) {
         cassandraGateway.updateFilterIndex(index, filterIds);
     }
 
+    @Override
     public String getFilterIdsRaw(String index) {
         Rows<String, String> result = cassandraGateway.select("select filter_ids from zuul_filter_indices where index_name = '" + index + "'");
         if (result == null || result.isEmpty()) {
@@ -129,7 +130,7 @@ public String getFilterIdsRaw(String index) {
         }
     }
 
-
+    @Override
     public List<String> getFilterIdsIndex(String index) {
 
         String filter_ids = getFilterIdsRaw(index);
@@ -174,6 +175,7 @@ public List<String> getAllFilterIDs() {
         return getFilterIdsIndex(FILTER_ID + ZuulApplicationInfo.getApplicationName());
     }
 
+    @Override
     public FilterInfo getFilterInfo(String filter_id, int revision) {
         List<FilterInfo> filters = getZuulFiltersForFilterId(filter_id);
         if (filters == null) return null;
@@ -509,6 +511,7 @@ public CassandraGatewayProd(Keyspace keyspace) {
             this.keyspace = keyspace;
         }
 
+        @Override
         public void updateFilterIndex(String rowKey, String filter_ids) {
 
             HashMap<String, Object> attributes = new HashMap<String, Object>();
@@ -523,6 +526,7 @@ public void updateFilterIndex(String rowKey, String filter_ids) {
          * @param rowKey
          * @param attributes
          */
+        @Override
         public void upsert(String rowKey, Map<String, Object> attributes) {
             new HystrixCassandraPut<String>(keyspace, COLUMN_FAMILY, rowKey, attributes).execute();
         }
@@ -533,10 +537,12 @@ public void upsert(String rowKey, Map<String, Object> attributes) {
          * @param cql
          * @return
          */
+        @Override
         public Rows<String, String> select(String cql) {
             return new HystrixCassandraGetRowsByQuery<String>(keyspace, COLUMN_FAMILY, String.class, cql).execute();
         }
 
+        @Override
         public Rows<String, String> getByFilterIds(List<String> filterIds) {
             String[] list = new String[filterIds.size()];
             for (int i = 0; i < filterIds.size(); i++) {