You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@knox.apache.org by km...@apache.org on 2013/09/27 22:27:17 UTC
git commit: KNOX-169: Push changes to get a clean compile in pre
commit job.
Updated Branches:
refs/heads/master 93a482278 -> 288cf916b
KNOX-169: Push changes to get a clean compile in pre commit job.
Project: http://git-wip-us.apache.org/repos/asf/incubator-knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-knox/commit/288cf916
Tree: http://git-wip-us.apache.org/repos/asf/incubator-knox/tree/288cf916
Diff: http://git-wip-us.apache.org/repos/asf/incubator-knox/diff/288cf916
Branch: refs/heads/master
Commit: 288cf916bedecb31ac73b293f0262becb97ed4e0
Parents: 93a4822
Author: Kevin Minder <ke...@hortonworks.com>
Authored: Fri Sep 27 16:27:11 2013 -0400
Committer: Kevin Minder <ke...@hortonworks.com>
Committed: Fri Sep 27 16:27:11 2013 -0400
----------------------------------------------------------------------
dev-support/test-patch.sh | 2 +-
.../rewrite/api/UrlRewriteFlowDescriptor.java | 4 ++--
.../impl/UrlRewriteRulesDescriptorImpl.java | 12 +++++++-----
.../rewrite/spi/UrlRewriteFlowDescriptorBase.java | 15 +++++++++------
pom.xml | 17 ++++++++++++++++-
5 files changed, 35 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/288cf916/dev-support/test-patch.sh
----------------------------------------------------------------------
diff --git a/dev-support/test-patch.sh b/dev-support/test-patch.sh
index d83f667..f941f3b 100644
--- a/dev-support/test-patch.sh
+++ b/dev-support/test-patch.sh
@@ -27,7 +27,7 @@ else
MVN=$MAVEN_HOME/bin/mvn
fi
-PROJECT_NAME=Giraph
+PROJECT_NAME=Knox
JENKINS=false
PATCH_DIR=/tmp
SUPPORT_DIR=/tmp
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/288cf916/gateway-provider-rewrite/src/main/java/org/apache/hadoop/gateway/filter/rewrite/api/UrlRewriteFlowDescriptor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite/src/main/java/org/apache/hadoop/gateway/filter/rewrite/api/UrlRewriteFlowDescriptor.java b/gateway-provider-rewrite/src/main/java/org/apache/hadoop/gateway/filter/rewrite/api/UrlRewriteFlowDescriptor.java
index 1b7ab4a..aab4f15 100644
--- a/gateway-provider-rewrite/src/main/java/org/apache/hadoop/gateway/filter/rewrite/api/UrlRewriteFlowDescriptor.java
+++ b/gateway-provider-rewrite/src/main/java/org/apache/hadoop/gateway/filter/rewrite/api/UrlRewriteFlowDescriptor.java
@@ -23,9 +23,9 @@ public interface UrlRewriteFlowDescriptor<T> extends UrlRewriteStepDescriptor<T>
UrlRewriteStepFlow flow();
- T flow( String flow );
+ <F extends UrlRewriteFlowDescriptor<?>> F flow( String flow );
- T flow( UrlRewriteStepFlow flow );
+ <F extends UrlRewriteFlowDescriptor<?>> F flow( UrlRewriteStepFlow flow );
List<UrlRewriteStepDescriptor> steps();
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/288cf916/gateway-provider-rewrite/src/main/java/org/apache/hadoop/gateway/filter/rewrite/impl/UrlRewriteRulesDescriptorImpl.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite/src/main/java/org/apache/hadoop/gateway/filter/rewrite/impl/UrlRewriteRulesDescriptorImpl.java b/gateway-provider-rewrite/src/main/java/org/apache/hadoop/gateway/filter/rewrite/impl/UrlRewriteRulesDescriptorImpl.java
index 5e0043f..108793f 100644
--- a/gateway-provider-rewrite/src/main/java/org/apache/hadoop/gateway/filter/rewrite/impl/UrlRewriteRulesDescriptorImpl.java
+++ b/gateway-provider-rewrite/src/main/java/org/apache/hadoop/gateway/filter/rewrite/impl/UrlRewriteRulesDescriptorImpl.java
@@ -88,19 +88,21 @@ public class UrlRewriteRulesDescriptorImpl implements UrlRewriteRulesDescriptor
@SuppressWarnings("unchecked")
public <T extends UrlRewriteFunctionDescriptor<?>> T getFunction( String name ) {
T descriptor = (T)funcMap.get( name );
- return descriptor;
+ return (T)descriptor;
}
@Override
+ @SuppressWarnings("unchecked")
public <T extends UrlRewriteFunctionDescriptor<?>> T addFunction( String name ) {
- T descriptor = newFunction( name );
+ T descriptor = (T)newFunction( name );
addFunction( descriptor );
- return descriptor;
+ return (T)descriptor;
}
+ @SuppressWarnings("unchecked")
protected <T extends UrlRewriteFunctionDescriptor<?>> T newFunction( String name ) {
- T descriptor = UrlRewriteFunctionDescriptorFactory.create( name );
- return descriptor;
+ T descriptor = (T)UrlRewriteFunctionDescriptorFactory.create( name );
+ return (T)descriptor;
}
protected void addFunction( UrlRewriteFunctionDescriptor descriptor ) {
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/288cf916/gateway-provider-rewrite/src/main/java/org/apache/hadoop/gateway/filter/rewrite/spi/UrlRewriteFlowDescriptorBase.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite/src/main/java/org/apache/hadoop/gateway/filter/rewrite/spi/UrlRewriteFlowDescriptorBase.java b/gateway-provider-rewrite/src/main/java/org/apache/hadoop/gateway/filter/rewrite/spi/UrlRewriteFlowDescriptorBase.java
index 064cbd6..97f8c33 100644
--- a/gateway-provider-rewrite/src/main/java/org/apache/hadoop/gateway/filter/rewrite/spi/UrlRewriteFlowDescriptorBase.java
+++ b/gateway-provider-rewrite/src/main/java/org/apache/hadoop/gateway/filter/rewrite/spi/UrlRewriteFlowDescriptorBase.java
@@ -39,16 +39,18 @@ public abstract class UrlRewriteFlowDescriptorBase<T> extends UrlRewriteStepDesc
return flow;
}
+ @SuppressWarnings( "unchecked" )
@Override
- public T flow( String flow ) {
+ public <F extends UrlRewriteFlowDescriptor<?>> F flow( String flow ) {
setFlow( flow );
- return (T)this;
+ return (F)this;
}
+ @SuppressWarnings( "unchecked" )
@Override
- public T flow( UrlRewriteStepFlow flow ) {
+ public <F extends UrlRewriteFlowDescriptor<?>> F flow( UrlRewriteStepFlow flow ) {
setFlow( flow );
- return (T)this;
+ return (F)this;
}
public void setFlow( UrlRewriteStepFlow flow ) {
@@ -101,11 +103,12 @@ public abstract class UrlRewriteFlowDescriptorBase<T> extends UrlRewriteStepDesc
// return step;
// }
+ @SuppressWarnings( "unchecked" )
@Override
public <T extends UrlRewriteStepDescriptor<?>> T addStep( String type ) {
- T step = UrlRewriteStepDescriptorFactory.create( type );
+ T step = (T)UrlRewriteStepDescriptorFactory.create( type );
steps.add( step );
- return step;
+ return (T)step;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/288cf916/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f12ffdf..83474d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -194,10 +194,25 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.0</version>
+ <version>3.1</version>
<configuration>
+ <compilerId>javac</compilerId>
+ <source>1.6</source>
+ <target>1.6</target>
<debug>true</debug>
+ <!--
+ <verbose>true</verbose>
+ <forceJavacCompilerUse>true</forceJavacCompilerUse>
+ <fork>true</fork>
+ -->
</configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-compiler-javac</artifactId>
+ <version>2.3</version>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>