Refactor workspace to prepare for next release.

Removing scripts module. Relocating some of the netflix specific plugins to the zuul-netflix module

Author: Raju Uppalapati

build.gradle

@@ -2,7 +2,7 @@ ext.githubProjectName = rootProject.name
 
 buildscript {
     repositories { mavenCentral() }
-    apply from: file('gradle/buildscript.gradle'), to: buildscript 
+    apply from: file('gradle/buildscript.gradle'), to: buildscript
 }
 
 allprojects {
@@ -12,7 +12,6 @@ allprojects {
 apply plugin: 'idea'
 apply from: file('gradle/convention.gradle')
 apply from: file('gradle/maven.gradle')
-//apply from: file('gradle/check.gradle')
 apply from: file('gradle/license.gradle')
 apply from: file('gradle/release.gradle')
 
@@ -25,21 +24,4 @@ subprojects {
     tasks.withType(Javadoc).each {
         it.classpath = sourceSets.main.compileClasspath
     }
-
-
-
-    idea {
-        module {
-            languageLevel = '1.7'
-        }
-    }
 }
-
-
-
-
-
-
-
-// Prevent contrib project from being published
-// project('hystrix-contrib').task('uploadMavenCentral', overwrite:true) { }

gradle.properties

@@ -1 +1 @@
-version=1.0.19
+version=1.0.20

settings.gradle

@@ -1,3 +1,3 @@
 rootProject.name='zuul'
 
-include 'zuul-core', 'zuul-simple-webapp', 'zuul-netflix', 'zuul-scripts', 'zuul-netflix-webapp'
+include 'zuul-core', 'zuul-simple-webapp', 'zuul-netflix', 'zuul-netflix-webapp'

zuul-core/build.gradle

@@ -4,41 +4,31 @@ apply plugin: 'eclipse'
 apply plugin: 'idea'
 
 dependencies {
-    compile 'commons-io:commons-io:2.4'
-    compile 'org.codehaus.groovy:groovy-all:2.0.2'
-    compile 'org.mockito:mockito-all:1.8.5'
-    compile 'org.slf4j:slf4j-api:1.7.5'
-
-    compile 'com.netflix.archaius:archaius-core:0.5.11'
-    compile 'com.netflix.servo:servo-core:0.4.44'
-    compile 'com.netflix.netflix-commons:netflix-commons-util:0.1.1'
-
-    provided 'junit:junit-dep:4.10'
-    provided 'javax.servlet:servlet-api:2.5'
-
-    // would be nice to only reference the version in one place
-    groovy "org.codehaus.groovy:groovy-all:2.0.2"
+    compile 'commons-io:commons-io:2.4+'
+    compile 'org.codehaus.groovy:groovy-all:2.2.2'
+    compile 'org.mockito:mockito-all:1.8+'
+    compile 'org.slf4j:slf4j-api:+'
+    provided 'junit:junit-dep:4+'
+    provided 'javax.servlet:servlet-api:+'
+    groovy "org.codehaus.groovy:groovy-all:2.2.2"
+
+    compile 'com.netflix.archaius:archaius-core:+'
+    compile 'com.netflix.servo:servo-core:+'
+    compile 'com.netflix.netflix-commons:netflix-commons-util:+'
 }
 
 
 javadoc {
-    // the exclude isn't working, nor is there a subPackages options as docs suggest there should be
-    // we do not want the com.netflix.hystrix.util package include
-    // exclude '**/util/**'
-
     options {
         doclet = "org.benjchristensen.doclet.DocletExclude"
         docletpath = [rootProject.file('./gradle/doclet-exclude.jar')]
         stylesheetFile = rootProject.file('./gradle/javadocStyleSheet.css')
         windowTitle = "Zuul Javadoc ${project.version}"
     }
-    //todo add Zuul logo
-//    options.addStringOption('top').value = '<a href="https://github.com/Netflix/Hystrix"><img width="92" height="79" border="0" align="left" src="http://netflix.github.com/Hystrix/images/hystrix-logo-small.png"></a><h2 class="title" style="padding-top:40px">Hystrix: Latency and Fault Tolerance for Distributed Systems</h2>'
 }
 
 eclipse {
     classpath {
-        // include 'provided' dependencies on the classpath
         plusConfigurations += configurations.provided
         downloadSources = true
         downloadJavadoc = true
@@ -48,7 +38,6 @@ eclipse {
 
 idea {
     module {
-        // include 'provided' dependencies on the classpath
         scopes.PROVIDED.plus += configurations.provided
     }
 }

zuul-core/src/main/java/com/netflix/zuul/FilterProcessor.java

@@ -190,11 +190,10 @@ public Object processZuulFilter(ZuulFilter filter) throws ZuulException {
                 case FAILED:
                     t = result.getException();
                     ctx.addFilterExecutionSummary(filterName, ExecutionStatus.FAILED.name(), execTime);
-                    
                     DynamicCounter.increment(metricPrefix + filterName, "status","fail", "filtertype",filter.filterType());
                     break;
                 case SUCCESS:
-                	DynamicCounter.increment(metricPrefix + filterName, "status","success", "filtertype", filter.filterType());
+                    DynamicCounter.increment(metricPrefix + filterName, "status","success", "filtertype", filter.filterType());
                     o = result.getResult();
                     ctx.addFilterExecutionSummary(filterName, ExecutionStatus.SUCCESS.name(), execTime);
                     if (bDebug) {
@@ -203,7 +202,7 @@ public Object processZuulFilter(ZuulFilter filter) throws ZuulException {
                     }
                     break;
                 default:
-                	DynamicCounter.increment(metricPrefix + filterName, "status", "skip", "filtertype", filter.filterType());
+                    DynamicCounter.increment(metricPrefix + filterName, "status", "skip", "filtertype", filter.filterType());
                     break;
             }
 
@@ -224,7 +223,6 @@ public Object processZuulFilter(ZuulFilter filter) throws ZuulException {
         }
     }
 
-
     @RunWith(MockitoJUnitRunner.class)
     public static class UnitTest {
 
@@ -485,10 +483,5 @@ public void testErrorHttpException() {
             }
 
         }
-
-
     }
 }
-
-
-

zuul-core/src/main/java/com/netflix/zuul/context/RequestContext.java

@@ -15,29 +15,34 @@
  */
 package com.netflix.zuul.context;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.mockito.Mockito.mock;
+
+import java.io.InputStream;
+import java.io.NotSerializableException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
-import com.netflix.util.Pair;
-import com.netflix.zuul.constants.ZuulHeaders;
-import com.netflix.zuul.util.DeepCopy;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.InputStream;
-import java.io.NotSerializableException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.mockito.Mockito.mock;
+import com.netflix.util.Pair;
+import com.netflix.zuul.constants.ZuulHeaders;
+import com.netflix.zuul.util.DeepCopy;
 
 /**
  * The Request Context holds request, response,  state information and data for ZuulFilters to access and share.
@@ -63,7 +68,6 @@ protected RequestContext initialValue() {
             try {
                 return contextClass.newInstance();
             } catch (Throwable e) {
-                e.printStackTrace();
                 throw new RuntimeException(e);
             }
         }
@@ -72,7 +76,6 @@ protected RequestContext initialValue() {
 
     public RequestContext() {
         super();
-
     }
 
     /**

zuul-core/src/main/java/com/netflix/zuul/http/ZuulServlet.java

@@ -15,11 +15,20 @@
  */
 package com.netflix.zuul.http;
 
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
-import com.netflix.zuul.FilterProcessor;
-import com.netflix.zuul.ZuulRunner;
-import com.netflix.zuul.context.RequestContext;
-import com.netflix.zuul.exception.ZuulException;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -29,14 +38,10 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.PrintWriter;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.*;
+import com.netflix.zuul.FilterProcessor;
+import com.netflix.zuul.ZuulRunner;
+import com.netflix.zuul.context.RequestContext;
+import com.netflix.zuul.exception.ZuulException;
 
 /**
  * Core Zuul servlet which intializes and orchestrates zuulFilter execution
@@ -46,17 +51,20 @@
  *         Time: 10:44 AM
  */
 public class ZuulServlet extends HttpServlet {
+    
+    private static final long serialVersionUID = -3374242278843351500L;
     private ZuulRunner zuulRunner = new ZuulRunner();
     private static Logger LOG = LoggerFactory.getLogger(ZuulServlet.class);
 
     @Override
-    public void service(javax.servlet.ServletRequest servletRequest, javax.servlet.ServletResponse servletResponse) throws javax.servlet.ServletException, java.io.IOException {
+    public void service(javax.servlet.ServletRequest servletRequest, javax.servlet.ServletResponse servletResponse) throws ServletException, IOException {
         try {
             init((HttpServletRequest) servletRequest, (HttpServletResponse) servletResponse);
 
-            // marks this request as having passed through the "Zuul engine", as opposed to servlets
+            // Marks this request as having passed through the "Zuul engine", as opposed to servlets
             // explicitly bound in web.xml, for which requests will not have the same data attached
-            RequestContext.getCurrentContext().setZuulEngineRan();
+            RequestContext context = RequestContext.getCurrentContext();
+            context.setZuulEngineRan();
 
             try {
                 preRoute();
@@ -82,7 +90,6 @@ public void service(javax.servlet.ServletRequest servletRequest, javax.servlet.S
         } catch (Throwable e) {
             error(new ZuulException(e, 500, "UNHANDLED_EXCEPTION_" + e.getClass().getName()));
         } finally {
-//            RequestContext.getCurrentContext().unset();
         }
     }
 

zuul-netflix-webapp/build.gradle

@@ -9,15 +9,14 @@ dependencies {
 
     compile project(':zuul-core')
     compile project(':zuul-netflix')
-    compile project(':zuul-scripts')
 
-    runtime project(':zuul-scripts')
-
-    compile 'com.netflix.karyon:karyon-core:2.0.02'
-    compile 'com.netflix.karyon:karyon-admin:2.0.02'
-    compile 'com.netflix.karyon:karyon-admin-web:2.0.02'
-    compile 'com.netflix.karyon:karyon-extensions:2.0.02'
-    compile 'com.netflix.blitz4j:blitz4j:1.31'
+    compile 'com.netflix.karyon:karyon-core:+'
+    compile 'com.netflix.karyon:karyon-admin:+'
+    compile 'com.netflix.karyon:karyon-admin-web:+'
+    compile 'com.netflix.karyon:karyon-extensions:+'
+    compile 'com.netflix.blitz4j:blitz4j:+'
+    compile 'com.sun.jersey:jersey-bundle:+'
+    groovy "org.codehaus.groovy:groovy-all:2.2.2"
 }
 
 javadoc {
@@ -31,7 +30,6 @@ javadoc {
 
 eclipse {
     classpath {
-        // include 'provided' dependencies on the classpath
         plusConfigurations += configurations.provided
         downloadSources = true
         downloadJavadoc = true
@@ -41,34 +39,22 @@ eclipse {
 
 idea {
     module {
-        // include 'provided' dependencies on the classpath
         languageLevel = '1.7'
         scopes.PROVIDED.plus += configurations.provided
     }
 }
 
-def findJar(prefix) {
-    def name = ""
-    configurations.runtime.each {
-        if (it.name.startsWith(prefix)) {
-            name = it
-        }
-    }
-    return name;
-}
-
-tasks.war.doFirst {
-    webInf {
-        def jar = findJar('zuul-scripts')
-        from(zipTree(jar)) {
-            include '**/*.groovy'
+war {
+    webXml = file('src/main/webapp/WEB-INF/web.xml')
+    webInf{
+        from('src/main/groovy/scripts') {
+            into('classes')
         }
     }
 }
 
-// runs webapp at root context
 jettyRun.contextPath = '/'
 
 jettyRun.doFirst {
     System.setProperty("archaius.deployment.applicationId", "zuul")
-}
+}

zuul-scripts/src/main/groovy/scripts/post/PostDecoration.groovy zuul-netflix-webapp/src/main/groovy/scripts/post/PostDecoration.groovy

@@ -20,7 +20,6 @@ import com.netflix.config.DynamicPropertyFactory
 import com.netflix.config.DynamicStringProperty
 import com.netflix.zuul.ZuulFilter
 import com.netflix.zuul.constants.ZuulConstants
-import com.netflix.zuul.context.NFRequestContext
 import com.netflix.zuul.context.RequestContext
 
 class DebugFilter extends ZuulFilter {
@@ -40,7 +39,7 @@ class DebugFilter extends ZuulFilter {
 
     boolean shouldFilter() {
 
-        if ("true".equals(NFRequestContext.currentContext.getRequest().getParameter(debugParameter.get()))) return true;
+        if ("true".equals(RequestContext.currentContext.getRequest().getParameter(debugParameter.get()))) return true;
         return routingDebug.get();
 
     }
@@ -49,11 +48,6 @@ class DebugFilter extends ZuulFilter {
         RequestContext.getCurrentContext().setDebugRequest(true)
         RequestContext.getCurrentContext().setDebugRouting(true)
         return null;
-
     }
 
-
 }
-
-
-