You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@knox.apache.org by kr...@apache.org on 2018/11/15 21:00:42 UTC
[1/2] knox git commit: KNOX-1605 - Ensure overridden methods have
@Override annotation
Repository: knox
Updated Branches:
refs/heads/master 0f89a951e -> c4b35aaff
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-server/src/main/java/org/apache/knox/gateway/topology/discovery/DefaultServiceDiscoveryConfig.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/topology/discovery/DefaultServiceDiscoveryConfig.java b/gateway-server/src/main/java/org/apache/knox/gateway/topology/discovery/DefaultServiceDiscoveryConfig.java
index fde01b0..04e0e8c 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/topology/discovery/DefaultServiceDiscoveryConfig.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/topology/discovery/DefaultServiceDiscoveryConfig.java
@@ -33,14 +33,17 @@ public class DefaultServiceDiscoveryConfig implements ServiceDiscoveryConfig {
this.pwdAlias = alias;
}
+ @Override
public String getAddress() {
return address;
}
+ @Override
public String getUser() {
return user;
}
+ @Override
public String getPasswordAlias() {
return pwdAlias;
}
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-server/src/main/java/org/apache/knox/gateway/topology/monitor/DefaultRemoteConfigurationMonitor.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/topology/monitor/DefaultRemoteConfigurationMonitor.java b/gateway-server/src/main/java/org/apache/knox/gateway/topology/monitor/DefaultRemoteConfigurationMonitor.java
index d94eb73..87d9373 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/topology/monitor/DefaultRemoteConfigurationMonitor.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/topology/monitor/DefaultRemoteConfigurationMonitor.java
@@ -46,22 +46,27 @@ class DefaultRemoteConfigurationMonitor implements RemoteConfigurationMonitor {
private static final RemoteConfigurationRegistryClient.EntryACL AUTHENTICATED_USERS_ALL;
static {
AUTHENTICATED_USERS_ALL = new RemoteConfigurationRegistryClient.EntryACL() {
+ @Override
public String getId() {
return "";
}
+ @Override
public String getType() {
return "auth";
}
+ @Override
public Object getPermissions() {
return ZooDefs.Perms.ALL;
}
+ @Override
public boolean canRead() {
return true;
}
+ @Override
public boolean canWrite() {
return true;
}
@@ -71,22 +76,27 @@ class DefaultRemoteConfigurationMonitor implements RemoteConfigurationMonitor {
private static final RemoteConfigurationRegistryClient.EntryACL WORLD_ANYONE_READ;
static {
WORLD_ANYONE_READ = new RemoteConfigurationRegistryClient.EntryACL() {
+ @Override
public String getId() {
return "anyone";
}
+ @Override
public String getType() {
return "world";
}
+ @Override
public Object getPermissions() {
return ZooDefs.Perms.READ;
}
+ @Override
public boolean canRead() {
return true;
}
+ @Override
public boolean canWrite() {
return false;
}
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-server/src/main/java/org/apache/knox/gateway/topology/validation/TopologyValidator.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/topology/validation/TopologyValidator.java b/gateway-server/src/main/java/org/apache/knox/gateway/topology/validation/TopologyValidator.java
index 090bffc..1a7359b 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/topology/validation/TopologyValidator.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/topology/validation/TopologyValidator.java
@@ -62,14 +62,17 @@ public class TopologyValidator {
Validator validator = s.newValidator();
final List<SAXParseException> exceptions = new LinkedList<>();
validator.setErrorHandler(new ErrorHandler() {
+ @Override
public void warning(SAXParseException exception) throws SAXException {
exceptions.add(exception);
}
+ @Override
public void fatalError(SAXParseException exception) throws SAXException {
exceptions.add(exception);
}
+ @Override
public void error(SAXParseException exception) throws SAXException {
exceptions.add(exception);
}
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-server/src/main/java/org/apache/knox/gateway/trace/TraceRequest.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/trace/TraceRequest.java b/gateway-server/src/main/java/org/apache/knox/gateway/trace/TraceRequest.java
index 3b4eaca..e40ef98 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/trace/TraceRequest.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/trace/TraceRequest.java
@@ -40,6 +40,7 @@ class TraceRequest extends HttpServletRequestWrapper {
}
}
+ @Override
public synchronized ServletInputStream getInputStream() throws IOException {
if( log.isTraceEnabled() ) {
if( input == null ) {
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-server/src/main/java/org/apache/knox/gateway/trace/TraceResponse.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/trace/TraceResponse.java b/gateway-server/src/main/java/org/apache/knox/gateway/trace/TraceResponse.java
index 92d9ccc..e954338 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/trace/TraceResponse.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/trace/TraceResponse.java
@@ -41,6 +41,7 @@ class TraceResponse extends HttpServletResponseWrapper {
this.filter = filter;
}
+ @Override
public synchronized ServletOutputStream getOutputStream() throws IOException {
if( log.isTraceEnabled() ) {
traceResponseDetails();
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-server/src/main/java/org/apache/knox/gateway/util/KnoxCLI.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/util/KnoxCLI.java b/gateway-server/src/main/java/org/apache/knox/gateway/util/KnoxCLI.java
index 9e66ecc..90255cd 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/util/KnoxCLI.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/util/KnoxCLI.java
@@ -861,6 +861,7 @@ public class KnoxCLI extends Configured implements Tool {
return result;
}
+ @Override
public boolean validate() {
boolean valid = true;
GatewayConfig config = getGatewayConfig();
@@ -990,6 +991,7 @@ public class KnoxCLI extends Configured implements Tool {
return USAGE + ":\n\n" + DESC;
}
+ @Override
public void execute() throws Exception {
GatewayConfig gc = getGatewayConfig();
String topDir = gc.getGatewayTopologyDir();
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-server/src/test/java/org/apache/knox/gateway/jetty/SslSocketTest.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/jetty/SslSocketTest.java b/gateway-server/src/test/java/org/apache/knox/gateway/jetty/SslSocketTest.java
index d21e8fd..a3cd6cd 100644
--- a/gateway-server/src/test/java/org/apache/knox/gateway/jetty/SslSocketTest.java
+++ b/gateway-server/src/test/java/org/apache/knox/gateway/jetty/SslSocketTest.java
@@ -75,6 +75,7 @@ public class SslSocketTest {
return ready;
}
+ @Override
public void run() {
try {
SSLServerSocketFactory sslserversocketfactory = (SSLServerSocketFactory)SSLServerSocketFactory.getDefault();
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-service-admin/src/main/java/org/apache/knox/gateway/service/admin/beans/Application.java
----------------------------------------------------------------------
diff --git a/gateway-service-admin/src/main/java/org/apache/knox/gateway/service/admin/beans/Application.java b/gateway-service-admin/src/main/java/org/apache/knox/gateway/service/admin/beans/Application.java
index 0c56374..01145e1 100644
--- a/gateway-service-admin/src/main/java/org/apache/knox/gateway/service/admin/beans/Application.java
+++ b/gateway-service-admin/src/main/java/org/apache/knox/gateway/service/admin/beans/Application.java
@@ -23,11 +23,13 @@ import javax.xml.bind.annotation.XmlAccessorType;
@XmlAccessorType(XmlAccessType.NONE)
public class Application extends Service {
+ @Override
public String getRole() {
return getName();
}
- public void setRole( String role ) {
+ @Override
+ public void setRole(String role ) {
setName( role );
}
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-service-hbase/src/main/java/org/apache/knox/gateway/hbase/HBaseDispatch.java
----------------------------------------------------------------------
diff --git a/gateway-service-hbase/src/main/java/org/apache/knox/gateway/hbase/HBaseDispatch.java b/gateway-service-hbase/src/main/java/org/apache/knox/gateway/hbase/HBaseDispatch.java
index 833dea1..3e47383 100644
--- a/gateway-service-hbase/src/main/java/org/apache/knox/gateway/hbase/HBaseDispatch.java
+++ b/gateway-service-hbase/src/main/java/org/apache/knox/gateway/hbase/HBaseDispatch.java
@@ -33,7 +33,8 @@ import org.apache.knox.gateway.dispatch.DefaultDispatch;
public class HBaseDispatch extends DefaultDispatch {
// KNOX-709: HBase can't handle URL encoded paths.
- public URI getDispatchUrl( HttpServletRequest request) {
+ @Override
+ public URI getDispatchUrl(HttpServletRequest request) {
String base = request.getRequestURI();
StringBuilder str = new StringBuilder();
try {
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-service-hive/src/main/java/org/apache/knox/gateway/hive/HiveDispatch.java
----------------------------------------------------------------------
diff --git a/gateway-service-hive/src/main/java/org/apache/knox/gateway/hive/HiveDispatch.java b/gateway-service-hive/src/main/java/org/apache/knox/gateway/hive/HiveDispatch.java
index aa44241..4ddbe46 100644
--- a/gateway-service-hive/src/main/java/org/apache/knox/gateway/hive/HiveDispatch.java
+++ b/gateway-service-hive/src/main/java/org/apache/knox/gateway/hive/HiveDispatch.java
@@ -34,6 +34,7 @@ public class HiveDispatch extends DefaultDispatch {
super.init();
}
+ @Override
protected void addCredentialsToRequest(HttpUriRequest request) {
if( isBasicAuthPreemptive() ) {
HiveDispatchUtils.addCredentialsToRequest(request);
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-service-hive/src/main/java/org/apache/knox/gateway/hive/HiveHaDispatch.java
----------------------------------------------------------------------
diff --git a/gateway-service-hive/src/main/java/org/apache/knox/gateway/hive/HiveHaDispatch.java b/gateway-service-hive/src/main/java/org/apache/knox/gateway/hive/HiveHaDispatch.java
index 92911ad..9403a2c 100644
--- a/gateway-service-hive/src/main/java/org/apache/knox/gateway/hive/HiveHaDispatch.java
+++ b/gateway-service-hive/src/main/java/org/apache/knox/gateway/hive/HiveHaDispatch.java
@@ -31,6 +31,7 @@ public class HiveHaDispatch extends DefaultHaDispatch {
setServiceRole("HIVE");
}
+ @Override
protected void addCredentialsToRequest(HttpUriRequest request) {
if ( isBasicAuthPreemptive() ) {
HiveDispatchUtils.addCredentialsToRequest(request);
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-service-nifi/src/main/java/org/apache/knox/gateway/dispatch/NiFiDispatch.java
----------------------------------------------------------------------
diff --git a/gateway-service-nifi/src/main/java/org/apache/knox/gateway/dispatch/NiFiDispatch.java b/gateway-service-nifi/src/main/java/org/apache/knox/gateway/dispatch/NiFiDispatch.java
index da2c529..ef02bd0 100644
--- a/gateway-service-nifi/src/main/java/org/apache/knox/gateway/dispatch/NiFiDispatch.java
+++ b/gateway-service-nifi/src/main/java/org/apache/knox/gateway/dispatch/NiFiDispatch.java
@@ -43,6 +43,7 @@ public class NiFiDispatch extends DefaultDispatch {
/**
* Overridden to provide a spot to modify the outbound response before its stream is closed.
*/
+ @Override
protected void writeOutboundResponse(HttpUriRequest outboundRequest, HttpServletRequest inboundRequest, HttpServletResponse outboundResponse, HttpResponse inboundResponse) throws IOException {
// Copy the client respond header to the server respond.
outboundResponse.setStatus(inboundResponse.getStatusLine().getStatusCode());
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-service-nifi/src/main/java/org/apache/knox/gateway/dispatch/NiFiHaDispatch.java
----------------------------------------------------------------------
diff --git a/gateway-service-nifi/src/main/java/org/apache/knox/gateway/dispatch/NiFiHaDispatch.java b/gateway-service-nifi/src/main/java/org/apache/knox/gateway/dispatch/NiFiHaDispatch.java
index bea1fac..c79124c 100644
--- a/gateway-service-nifi/src/main/java/org/apache/knox/gateway/dispatch/NiFiHaDispatch.java
+++ b/gateway-service-nifi/src/main/java/org/apache/knox/gateway/dispatch/NiFiHaDispatch.java
@@ -54,6 +54,7 @@ public class NiFiHaDispatch extends DefaultHaDispatch {
/**
* Overridden to provide a spot to modify the outbound response before its stream is closed.
*/
+ @Override
protected void writeOutboundResponse(HttpUriRequest outboundRequest, HttpServletRequest inboundRequest, HttpServletResponse outboundResponse, HttpResponse inboundResponse) throws IOException {
// Copy the client respond header to the server respond.
outboundResponse.setStatus(inboundResponse.getStatusLine().getStatusCode());
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-service-remoteconfig/src/main/java/org/apache/knox/gateway/service/config/remote/config/RemoteConfigurationRegistry.java
----------------------------------------------------------------------
diff --git a/gateway-service-remoteconfig/src/main/java/org/apache/knox/gateway/service/config/remote/config/RemoteConfigurationRegistry.java b/gateway-service-remoteconfig/src/main/java/org/apache/knox/gateway/service/config/remote/config/RemoteConfigurationRegistry.java
index a934113..6c865e5 100644
--- a/gateway-service-remoteconfig/src/main/java/org/apache/knox/gateway/service/config/remote/config/RemoteConfigurationRegistry.java
+++ b/gateway-service-remoteconfig/src/main/java/org/apache/knox/gateway/service/config/remote/config/RemoteConfigurationRegistry.java
@@ -76,26 +76,31 @@ class RemoteConfigurationRegistry implements RemoteConfigurationRegistryConfig {
this.keyTab = keytab;
}
+ @Override
@XmlElement(name="name")
public String getName() {
return name;
}
+ @Override
@XmlElement(name="type")
public String getRegistryType() {
return type;
}
+ @Override
@XmlElement(name="auth-type")
public String getAuthType() {
return authType;
}
+ @Override
@XmlElement(name="principal")
public String getPrincipal() {
return principal;
}
+ @Override
@XmlElement(name="credential-alias")
public String getCredentialAlias() {
return credentialAlias;
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-service-rm/src/main/java/org/apache/knox/gateway/rm/dispatch/RMHaDispatch.java
----------------------------------------------------------------------
diff --git a/gateway-service-rm/src/main/java/org/apache/knox/gateway/rm/dispatch/RMHaDispatch.java b/gateway-service-rm/src/main/java/org/apache/knox/gateway/rm/dispatch/RMHaDispatch.java
index 17ca574..bf3f050 100644
--- a/gateway-service-rm/src/main/java/org/apache/knox/gateway/rm/dispatch/RMHaDispatch.java
+++ b/gateway-service-rm/src/main/java/org/apache/knox/gateway/rm/dispatch/RMHaDispatch.java
@@ -28,6 +28,7 @@ public class RMHaDispatch extends RMHaBaseDispatcher {
public RMHaDispatch() {
super();
}
+ @Override
@Configure
public void setHaProvider(HaProvider haProvider) {
this.haProvider = haProvider;
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-service-rm/src/main/java/org/apache/knox/gateway/rm/dispatch/RMUI2HaDispatch.java
----------------------------------------------------------------------
diff --git a/gateway-service-rm/src/main/java/org/apache/knox/gateway/rm/dispatch/RMUI2HaDispatch.java b/gateway-service-rm/src/main/java/org/apache/knox/gateway/rm/dispatch/RMUI2HaDispatch.java
index d5adaed..3d247a4 100644
--- a/gateway-service-rm/src/main/java/org/apache/knox/gateway/rm/dispatch/RMUI2HaDispatch.java
+++ b/gateway-service-rm/src/main/java/org/apache/knox/gateway/rm/dispatch/RMUI2HaDispatch.java
@@ -29,6 +29,7 @@ public class RMUI2HaDispatch extends RMHaBaseDispatcher {
super();
}
+ @Override
@Configure
public void setHaProvider(HaProvider haProvider) {
this.haProvider = haProvider;
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-service-rm/src/main/java/org/apache/knox/gateway/rm/dispatch/RMUIHaDispatch.java
----------------------------------------------------------------------
diff --git a/gateway-service-rm/src/main/java/org/apache/knox/gateway/rm/dispatch/RMUIHaDispatch.java b/gateway-service-rm/src/main/java/org/apache/knox/gateway/rm/dispatch/RMUIHaDispatch.java
index 3143af1..cf9068e 100644
--- a/gateway-service-rm/src/main/java/org/apache/knox/gateway/rm/dispatch/RMUIHaDispatch.java
+++ b/gateway-service-rm/src/main/java/org/apache/knox/gateway/rm/dispatch/RMUIHaDispatch.java
@@ -30,6 +30,7 @@ public class RMUIHaDispatch extends RMHaBaseDispatcher {
public RMUIHaDispatch() throws ServletException {
super();
}
+ @Override
@Configure
public void setHaProvider(HaProvider haProvider) {
this.haProvider = haProvider;
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-service-webhdfs/src/main/java/org/apache/knox/gateway/hdfs/dispatch/HdfsHttpClientDispatch.java
----------------------------------------------------------------------
diff --git a/gateway-service-webhdfs/src/main/java/org/apache/knox/gateway/hdfs/dispatch/HdfsHttpClientDispatch.java b/gateway-service-webhdfs/src/main/java/org/apache/knox/gateway/hdfs/dispatch/HdfsHttpClientDispatch.java
index 6da2190..b5fbf0f 100644
--- a/gateway-service-webhdfs/src/main/java/org/apache/knox/gateway/hdfs/dispatch/HdfsHttpClientDispatch.java
+++ b/gateway-service-webhdfs/src/main/java/org/apache/knox/gateway/hdfs/dispatch/HdfsHttpClientDispatch.java
@@ -39,6 +39,7 @@ public class HdfsHttpClientDispatch extends DefaultDispatch {
* send the entire payload before redirect to the target component
* like a datanode and have to send it again.
*/
+ @Override
protected HttpEntity createRequestEntity(HttpServletRequest request)
throws IOException {
return null;
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-service-webhdfs/src/main/java/org/apache/knox/gateway/hdfs/dispatch/HdfsUIHaDispatch.java
----------------------------------------------------------------------
diff --git a/gateway-service-webhdfs/src/main/java/org/apache/knox/gateway/hdfs/dispatch/HdfsUIHaDispatch.java b/gateway-service-webhdfs/src/main/java/org/apache/knox/gateway/hdfs/dispatch/HdfsUIHaDispatch.java
index b84f8f3..d4edc96 100644
--- a/gateway-service-webhdfs/src/main/java/org/apache/knox/gateway/hdfs/dispatch/HdfsUIHaDispatch.java
+++ b/gateway-service-webhdfs/src/main/java/org/apache/knox/gateway/hdfs/dispatch/HdfsUIHaDispatch.java
@@ -26,6 +26,7 @@ public class HdfsUIHaDispatch extends AbstractHdfsHaDispatch {
super();
}
+ @Override
protected String getResourceRole() {
return RESOURCE_ROLE;
}
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-service-webhdfs/src/main/java/org/apache/knox/gateway/hdfs/dispatch/WebHdfsHaDispatch.java
----------------------------------------------------------------------
diff --git a/gateway-service-webhdfs/src/main/java/org/apache/knox/gateway/hdfs/dispatch/WebHdfsHaDispatch.java b/gateway-service-webhdfs/src/main/java/org/apache/knox/gateway/hdfs/dispatch/WebHdfsHaDispatch.java
index 6cff354..925800e 100644
--- a/gateway-service-webhdfs/src/main/java/org/apache/knox/gateway/hdfs/dispatch/WebHdfsHaDispatch.java
+++ b/gateway-service-webhdfs/src/main/java/org/apache/knox/gateway/hdfs/dispatch/WebHdfsHaDispatch.java
@@ -26,6 +26,7 @@ public class WebHdfsHaDispatch extends AbstractHdfsHaDispatch {
super();
}
+ @Override
protected String getResourceRole() {
return RESOURCE_ROLE;
}
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-shell/src/main/java/org/apache/knox/gateway/shell/BasicResponse.java
----------------------------------------------------------------------
diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/BasicResponse.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/BasicResponse.java
index bcfbfa7..d7e3b50 100644
--- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/BasicResponse.java
+++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/BasicResponse.java
@@ -44,6 +44,7 @@ public class BasicResponse implements Closeable {
}
}
+ @Override
public void close() {
consume();
}
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/ClusterVersion.java
----------------------------------------------------------------------
diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/ClusterVersion.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/ClusterVersion.java
index 6a472ac..f07fe46 100644
--- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/ClusterVersion.java
+++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/ClusterVersion.java
@@ -33,6 +33,7 @@ public class ClusterVersion {
super( session );
}
+ @Override
protected Callable<Response> callable() {
return new Callable<Response>() {
@Override
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/Status.java
----------------------------------------------------------------------
diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/Status.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/Status.java
index 1cc7953..199148e 100644
--- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/Status.java
+++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/Status.java
@@ -33,6 +33,7 @@ public class Status {
super( session );
}
+ @Override
protected Callable<Response> callable() {
return new Callable<Response>() {
@Override
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/SystemVersion.java
----------------------------------------------------------------------
diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/SystemVersion.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/SystemVersion.java
index c2505d4..9043386 100644
--- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/SystemVersion.java
+++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/SystemVersion.java
@@ -33,6 +33,7 @@ public class SystemVersion {
super( session );
}
+ @Override
protected Callable<Response> callable() {
return new Callable<Response>() {
@Override
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/CreateTable.java
----------------------------------------------------------------------
diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/CreateTable.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/CreateTable.java
index dc54037..3d0b801 100644
--- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/CreateTable.java
+++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/CreateTable.java
@@ -72,6 +72,7 @@ public class CreateTable {
return this;
}
+ @Override
protected Callable<Response> callable() {
return new Callable<Response>() {
@Override
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/DeleteTable.java
----------------------------------------------------------------------
diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/DeleteTable.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/DeleteTable.java
index 5389eea..4cdf9f7 100644
--- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/DeleteTable.java
+++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/DeleteTable.java
@@ -37,6 +37,7 @@ public class DeleteTable {
this.tableName = tableName;
}
+ @Override
protected Callable<Response> callable() {
return new Callable<Response>() {
@Override
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/TableList.java
----------------------------------------------------------------------
diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/TableList.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/TableList.java
index cdc022b..74a39cd 100644
--- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/TableList.java
+++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/TableList.java
@@ -34,6 +34,7 @@ public class TableList {
super( session );
}
+ @Override
protected Callable<Response> callable() {
return new Callable<Response>() {
@Override
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/TableRegions.java
----------------------------------------------------------------------
diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/TableRegions.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/TableRegions.java
index 7455d56..d4bff64 100644
--- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/TableRegions.java
+++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/TableRegions.java
@@ -37,6 +37,7 @@ public class TableRegions {
this.tableName = tableName;
}
+ @Override
protected Callable<Response> callable() {
return new Callable<Response>() {
@Override
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/TableSchema.java
----------------------------------------------------------------------
diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/TableSchema.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/TableSchema.java
index 97956bd..a1e76f3 100644
--- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/TableSchema.java
+++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/TableSchema.java
@@ -37,6 +37,7 @@ public class TableSchema {
this.tableName = tableName;
}
+ @Override
protected Callable<Response> callable() {
return new Callable<Response>() {
@Override
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/TruncateTable.java
----------------------------------------------------------------------
diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/TruncateTable.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/TruncateTable.java
index c67e9bd..2fdcdbf 100644
--- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/TruncateTable.java
+++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/TruncateTable.java
@@ -44,6 +44,7 @@ public class TruncateTable {
this.tableName = tableName;
}
+ @Override
protected Callable<TruncateTable.Response> callable() {
return new Callable<TruncateTable.Response>() {
@Override
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/UpdateTable.java
----------------------------------------------------------------------
diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/UpdateTable.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/UpdateTable.java
index eb6d879..16dda54 100644
--- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/UpdateTable.java
+++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/UpdateTable.java
@@ -66,6 +66,7 @@ public class UpdateTable {
return this;
}
+ @Override
protected Callable<Response> callable() {
return new Callable<Response>() {
@Override
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/row/DeleteRows.java
----------------------------------------------------------------------
diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/row/DeleteRows.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/row/DeleteRows.java
index 8671b7f..ee8d7d1 100644
--- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/row/DeleteRows.java
+++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/row/DeleteRows.java
@@ -56,6 +56,7 @@ public class DeleteRows {
return this;
}
+ @Override
protected Callable<Response> callable() {
return new Callable<Response>() {
@Override
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/row/QueryRows.java
----------------------------------------------------------------------
diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/row/QueryRows.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/row/QueryRows.java
index a30b3af..7686520 100644
--- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/row/QueryRows.java
+++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/row/QueryRows.java
@@ -76,6 +76,7 @@ public class QueryRows {
return this;
}
+ @Override
protected Callable<Response> callable() {
return new Callable<Response>() {
@Override
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/row/StoreRow.java
----------------------------------------------------------------------
diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/row/StoreRow.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/row/StoreRow.java
index 77ba041..25cdce1 100644
--- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/row/StoreRow.java
+++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/row/StoreRow.java
@@ -70,6 +70,7 @@ public class StoreRow {
return this;
}
+ @Override
protected Callable<Response> callable() {
return new Callable<Response>() {
@Override
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/scanner/CreateScanner.java
----------------------------------------------------------------------
diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/scanner/CreateScanner.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/scanner/CreateScanner.java
index 26816ee..53afadf 100644
--- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/scanner/CreateScanner.java
+++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/scanner/CreateScanner.java
@@ -127,6 +127,7 @@ public class CreateScanner {
return this;
}
+ @Override
protected Callable<Response> callable() {
return new Callable<Response>() {
@Override
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/scanner/DeleteScanner.java
----------------------------------------------------------------------
diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/scanner/DeleteScanner.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/scanner/DeleteScanner.java
index a25acf6..3a31d59 100644
--- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/scanner/DeleteScanner.java
+++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/scanner/DeleteScanner.java
@@ -39,6 +39,7 @@ public class DeleteScanner {
this.tableName = tableName;
}
+ @Override
protected Callable<Response> callable() {
return new Callable<Response>() {
@Override
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/scanner/ScannerGetNext.java
----------------------------------------------------------------------
diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/scanner/ScannerGetNext.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/scanner/ScannerGetNext.java
index 28f26b2..c9fd4f0 100644
--- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/scanner/ScannerGetNext.java
+++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/scanner/ScannerGetNext.java
@@ -39,6 +39,7 @@ public class ScannerGetNext {
this.tableName = tableName;
}
+ @Override
protected Callable<Response> callable() {
return new Callable<Response>() {
@Override
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hdfs/Get.java
----------------------------------------------------------------------
diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hdfs/Get.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hdfs/Get.java
index 202e735..28e4419 100644
--- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hdfs/Get.java
+++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hdfs/Get.java
@@ -51,6 +51,7 @@ public class Get {
}
+ @Override
protected Callable<Response> callable() {
return new Callable<Response>() {
@Override
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hdfs/Ls.java
----------------------------------------------------------------------
diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hdfs/Ls.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hdfs/Ls.java
index 04c0a06..88d8d86 100644
--- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hdfs/Ls.java
+++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hdfs/Ls.java
@@ -41,6 +41,7 @@ class Ls {
return this;
}
+ @Override
protected Callable<Response> callable() {
return new Callable<Response>() {
@Override
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hdfs/Mkdir.java
----------------------------------------------------------------------
diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hdfs/Mkdir.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hdfs/Mkdir.java
index 3dd5d82..d4aaab7 100644
--- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hdfs/Mkdir.java
+++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hdfs/Mkdir.java
@@ -47,6 +47,7 @@ class Mkdir {
return this;
}
+ @Override
public Callable<Response> callable() {
return new Callable<Response>() {
@Override
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hdfs/Put.java
----------------------------------------------------------------------
diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hdfs/Put.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hdfs/Put.java
index 733185a..f48b40b 100644
--- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hdfs/Put.java
+++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hdfs/Put.java
@@ -91,6 +91,7 @@ class Put {
return this;
}
+ @Override
protected Callable<Response> callable() {
return new Callable<Response>() {
@Override
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hdfs/Rename.java
----------------------------------------------------------------------
diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hdfs/Rename.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hdfs/Rename.java
index af85643..cec30e5 100644
--- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hdfs/Rename.java
+++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hdfs/Rename.java
@@ -47,6 +47,7 @@ public class Rename {
return this;
}
+ @Override
protected Callable<Rename.Response> callable() {
return new Callable<Rename.Response>() {
@Override
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hdfs/Rm.java
----------------------------------------------------------------------
diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hdfs/Rm.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hdfs/Rm.java
index 4076da3..52f3a88 100644
--- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hdfs/Rm.java
+++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hdfs/Rm.java
@@ -52,6 +52,7 @@ class Rm {
return recursive( true );
}
+ @Override
public Callable<Response> callable() {
return new Callable<Response>() {
@Override
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hdfs/Status.java
----------------------------------------------------------------------
diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hdfs/Status.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hdfs/Status.java
index e49ba8e..7c5836f 100644
--- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hdfs/Status.java
+++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hdfs/Status.java
@@ -42,6 +42,7 @@ public class Status {
return this;
}
+ @Override
public Callable<Response> callable() {
return new Callable<Response>() {
@Override
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Hive.java
----------------------------------------------------------------------
diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Hive.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Hive.java
index 2ac0dd9..bb2714a 100644
--- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Hive.java
+++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Hive.java
@@ -65,6 +65,7 @@ public class Hive {
return this;
}
+ @Override
protected Callable<Response> callable() {
return new Callable<Response>() {
@Override
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Java.java
----------------------------------------------------------------------
diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Java.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Java.java
index 69b50ed..72801fc 100644
--- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Java.java
+++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Java.java
@@ -72,6 +72,7 @@ class Java {
return this;
}
+ @Override
protected Callable<Response> callable() {
return new Callable<Response>() {
@Override
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Pig.java
----------------------------------------------------------------------
diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Pig.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Pig.java
index 77383a5..69033b6 100644
--- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Pig.java
+++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Pig.java
@@ -65,6 +65,7 @@ public class Pig {
return this;
}
+ @Override
protected Callable<Response> callable() {
return new Callable<Response>() {
@Override
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Queue.java
----------------------------------------------------------------------
diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Queue.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Queue.java
index 79ac9f2..07081eb 100644
--- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Queue.java
+++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Queue.java
@@ -34,6 +34,7 @@ class Queue {
super( session );
}
+ @Override
protected Callable<Response> callable() {
return new Callable<Response>() {
@Override
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Sqoop.java
----------------------------------------------------------------------
diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Sqoop.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Sqoop.java
index 030b0c1..e58cf7e 100644
--- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Sqoop.java
+++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Sqoop.java
@@ -68,6 +68,7 @@ public class Sqoop {
return this;
}
+ @Override
protected Callable<Response> callable() {
return new Callable<Response>() {
@Override
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Status.java
----------------------------------------------------------------------
diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Status.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Status.java
index 52bf296..2a1a9ae 100644
--- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Status.java
+++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Status.java
@@ -41,6 +41,7 @@ class Status {
return this;
}
+ @Override
protected Callable<Response> callable() {
return new Callable<Response>() {
@Override
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-shell/src/main/java/org/apache/knox/gateway/shell/knox/token/Get.java
----------------------------------------------------------------------
diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/knox/token/Get.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/knox/token/Get.java
index cf7ab19..fe1aa77 100644
--- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/knox/token/Get.java
+++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/knox/token/Get.java
@@ -37,6 +37,7 @@ public class Get {
super(session);
}
+ @Override
protected Callable<Response> callable() {
return new Callable<Response>() {
@Override
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-shell/src/main/java/org/apache/knox/gateway/shell/workflow/Status.java
----------------------------------------------------------------------
diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/workflow/Status.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/workflow/Status.java
index 2c5612e..0e3725a 100644
--- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/workflow/Status.java
+++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/workflow/Status.java
@@ -41,6 +41,7 @@ class Status {
return this;
}
+ @Override
protected Callable<Response> callable() {
return new Callable<Response>() {
@Override
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-shell/src/main/java/org/apache/knox/gateway/shell/workflow/Submit.java
----------------------------------------------------------------------
diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/workflow/Submit.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/workflow/Submit.java
index d22d85e..cf860b0 100644
--- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/workflow/Submit.java
+++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/workflow/Submit.java
@@ -61,6 +61,7 @@ class Submit {
return this;
}
+ @Override
protected Callable<Response> callable() {
return new Callable<Response>() {
@Override
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-shell/src/main/java/org/apache/knox/gateway/shell/yarn/SubmitApp.java
----------------------------------------------------------------------
diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/yarn/SubmitApp.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/yarn/SubmitApp.java
index 65e7f1e..9605b38 100644
--- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/yarn/SubmitApp.java
+++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/yarn/SubmitApp.java
@@ -52,6 +52,7 @@ public class SubmitApp {
return this;
}
+ @Override
protected Callable<Response> callable() {
return new Callable<Response>() {
@Override
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-spi/src/main/java/org/apache/knox/gateway/deploy/ProviderDeploymentContributorBase.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/deploy/ProviderDeploymentContributorBase.java b/gateway-spi/src/main/java/org/apache/knox/gateway/deploy/ProviderDeploymentContributorBase.java
index 68798ef..f796dc6 100644
--- a/gateway-spi/src/main/java/org/apache/knox/gateway/deploy/ProviderDeploymentContributorBase.java
+++ b/gateway-spi/src/main/java/org/apache/knox/gateway/deploy/ProviderDeploymentContributorBase.java
@@ -21,15 +21,18 @@ import org.apache.knox.gateway.topology.Provider;
public abstract class ProviderDeploymentContributorBase extends DeploymentContributorBase implements ProviderDeploymentContributor {
- public void initializeContribution( DeploymentContext context ) {
+ @Override
+ public void initializeContribution(DeploymentContext context ) {
// Noop.
}
- public void contributeProvider( DeploymentContext context, Provider provider ) {
+ @Override
+ public void contributeProvider(DeploymentContext context, Provider provider ) {
// Noop.
}
- public void finalizeContribution( DeploymentContext context ) {
+ @Override
+ public void finalizeContribution(DeploymentContext context ) {
// Noop.
}
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-spi/src/main/java/org/apache/knox/gateway/deploy/ServiceDeploymentContributorBase.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/deploy/ServiceDeploymentContributorBase.java b/gateway-spi/src/main/java/org/apache/knox/gateway/deploy/ServiceDeploymentContributorBase.java
index 1102f49..f4d8fb6 100644
--- a/gateway-spi/src/main/java/org/apache/knox/gateway/deploy/ServiceDeploymentContributorBase.java
+++ b/gateway-spi/src/main/java/org/apache/knox/gateway/deploy/ServiceDeploymentContributorBase.java
@@ -34,11 +34,13 @@ public abstract class ServiceDeploymentContributorBase extends DeploymentContrib
return new Version();
}
- public void initializeContribution( DeploymentContext context ) {
+ @Override
+ public void initializeContribution(DeploymentContext context ) {
// Noop.
}
- public void finalizeContribution( DeploymentContext context ) {
+ @Override
+ public void finalizeContribution(DeploymentContext context ) {
// Noop.
}
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/AbstractGatewayDispatch.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/AbstractGatewayDispatch.java b/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/AbstractGatewayDispatch.java
index cef53be..00c16e2 100644
--- a/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/AbstractGatewayDispatch.java
+++ b/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/AbstractGatewayDispatch.java
@@ -90,27 +90,32 @@ public abstract class AbstractGatewayDispatch implements Dispatch {
return url;
}
- public void doGet( URI url, HttpServletRequest request, HttpServletResponse response )
+ @Override
+ public void doGet(URI url, HttpServletRequest request, HttpServletResponse response )
throws IOException, URISyntaxException {
response.sendError( HttpServletResponse.SC_METHOD_NOT_ALLOWED );
}
- public void doPost( URI url, HttpServletRequest request, HttpServletResponse response )
+ @Override
+ public void doPost(URI url, HttpServletRequest request, HttpServletResponse response )
throws IOException, URISyntaxException {
response.sendError( HttpServletResponse.SC_METHOD_NOT_ALLOWED );
}
- public void doPut( URI url, HttpServletRequest request, HttpServletResponse response )
+ @Override
+ public void doPut(URI url, HttpServletRequest request, HttpServletResponse response )
throws IOException, URISyntaxException {
response.sendError( HttpServletResponse.SC_METHOD_NOT_ALLOWED );
}
- public void doDelete( URI url, HttpServletRequest request, HttpServletResponse response )
+ @Override
+ public void doDelete(URI url, HttpServletRequest request, HttpServletResponse response )
throws IOException, URISyntaxException {
response.sendError( HttpServletResponse.SC_METHOD_NOT_ALLOWED );
}
- public void doOptions( URI url, HttpServletRequest request, HttpServletResponse response )
+ @Override
+ public void doOptions(URI url, HttpServletRequest request, HttpServletResponse response )
throws IOException, URISyntaxException {
response.sendError( HttpServletResponse.SC_METHOD_NOT_ALLOWED );
}
@@ -118,7 +123,8 @@ public abstract class AbstractGatewayDispatch implements Dispatch {
/**
* @since 0.14.0
*/
- public void doHead( URI url, HttpServletRequest request, HttpServletResponse response )
+ @Override
+ public void doHead(URI url, HttpServletRequest request, HttpServletResponse response )
throws IOException, URISyntaxException {
response.sendError( HttpServletResponse.SC_METHOD_NOT_ALLOWED );
}
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/CappedBufferHttpEntity.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/CappedBufferHttpEntity.java b/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/CappedBufferHttpEntity.java
index b7f104f..8e5d455 100644
--- a/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/CappedBufferHttpEntity.java
+++ b/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/CappedBufferHttpEntity.java
@@ -121,7 +121,8 @@ public class CappedBufferHttpEntity extends HttpEntityWrapper {
return b;
}
- public int read( byte[] buffer, int offset, int limit ) throws IOException {
+ @Override
+ public int read(byte[] buffer, int offset, int limit ) throws IOException {
int count = -1;
// If we can read from the buffer do so.
if( replayReadIndex < replayWriteIndex ) {
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/DefaultHttpClientFactory.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/DefaultHttpClientFactory.java b/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/DefaultHttpClientFactory.java
index 29a66de..fd69e74 100644
--- a/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/DefaultHttpClientFactory.java
+++ b/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/DefaultHttpClientFactory.java
@@ -196,10 +196,12 @@ public class DefaultHttpClientFactory implements HttpClientFactory {
private static class UseJaasCredentials implements Credentials {
+ @Override
public String getPassword() {
return null;
}
+ @Override
public Principal getUserPrincipal() {
return null;
}
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/GatewayDispatchFilter.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/GatewayDispatchFilter.java b/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/GatewayDispatchFilter.java
index 216ff6e..5f6611f 100644
--- a/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/GatewayDispatchFilter.java
+++ b/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/GatewayDispatchFilter.java
@@ -167,6 +167,7 @@ public class GatewayDispatchFilter extends AbstractGatewayFilter {
}
private static class GetAdapter implements Adapter {
+ @Override
public void doMethod(Dispatch dispatch, HttpServletRequest request, HttpServletResponse response)
throws IOException, ServletException, URISyntaxException {
dispatch.doGet( dispatch.getDispatchUrl(request), request, response);
@@ -174,6 +175,7 @@ public class GatewayDispatchFilter extends AbstractGatewayFilter {
}
private static class PostAdapter implements Adapter {
+ @Override
public void doMethod(Dispatch dispatch, HttpServletRequest request, HttpServletResponse response)
throws IOException, ServletException, URISyntaxException {
dispatch.doPost( dispatch.getDispatchUrl(request), request, response);
@@ -181,6 +183,7 @@ public class GatewayDispatchFilter extends AbstractGatewayFilter {
}
private static class PutAdapter implements Adapter {
+ @Override
public void doMethod(Dispatch dispatch, HttpServletRequest request, HttpServletResponse response)
throws IOException, ServletException, URISyntaxException {
dispatch.doPut( dispatch.getDispatchUrl(request), request, response);
@@ -188,6 +191,7 @@ public class GatewayDispatchFilter extends AbstractGatewayFilter {
}
private static class DeleteAdapter implements Adapter {
+ @Override
public void doMethod(Dispatch dispatch, HttpServletRequest request, HttpServletResponse response)
throws IOException, ServletException, URISyntaxException {
dispatch.doDelete( dispatch.getDispatchUrl(request), request, response);
@@ -195,6 +199,7 @@ public class GatewayDispatchFilter extends AbstractGatewayFilter {
}
private static class OptionsAdapter implements Adapter {
+ @Override
public void doMethod(Dispatch dispatch, HttpServletRequest request, HttpServletResponse response)
throws IOException, ServletException, URISyntaxException {
dispatch.doOptions( dispatch.getDispatchUrl(request), request, response);
@@ -202,6 +207,7 @@ public class GatewayDispatchFilter extends AbstractGatewayFilter {
}
private static class HeadAdapter implements Adapter {
+ @Override
public void doMethod(Dispatch dispatch, HttpServletRequest request, HttpServletResponse response)
throws IOException, ServletException, URISyntaxException {
dispatch.doHead( dispatch.getDispatchUrl(request), request, response);
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/HadoopAuthCookieStore.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/HadoopAuthCookieStore.java b/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/HadoopAuthCookieStore.java
index 44b3390..b8aa618 100644
--- a/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/HadoopAuthCookieStore.java
+++ b/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/HadoopAuthCookieStore.java
@@ -184,8 +184,10 @@ public class HadoopAuthCookieStore extends BasicCookieStore {
return delegate.isExpired( date );
}
+ @Override
public String toString() {
return (new ReflectionToStringBuilder(this) {
+ @Override
protected boolean accept(Field f) {
return super.accept(f) && !f.getName().equals("delegate");
}
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/InputStreamEntity.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/InputStreamEntity.java b/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/InputStreamEntity.java
index 2b231c9..e1975aa 100644
--- a/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/InputStreamEntity.java
+++ b/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/InputStreamEntity.java
@@ -94,6 +94,7 @@ public class InputStreamEntity extends AbstractHttpEntity {
}
}
+ @Override
public boolean isRepeatable() {
return false;
}
@@ -101,10 +102,12 @@ public class InputStreamEntity extends AbstractHttpEntity {
/**
* @return the content length or {@code -1} if unknown
*/
+ @Override
public long getContentLength() {
return this.length;
}
+ @Override
public InputStream getContent() throws IOException {
return this.content;
}
@@ -115,7 +118,8 @@ public class InputStreamEntity extends AbstractHttpEntity {
* determines how many bytes are written. If the length is unknown ({@code -1}), the
* stream will be completely consumed (to the end of the stream).
*/
- public void writeTo( final OutputStream outstream ) throws IOException {
+ @Override
+ public void writeTo(final OutputStream outstream ) throws IOException {
Args.notNull( outstream, "Output stream" );
final InputStream instream = this.content;
try {
@@ -143,6 +147,7 @@ public class InputStreamEntity extends AbstractHttpEntity {
}
}
+ @Override
public boolean isStreaming() {
return true;
}
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/KnoxSpnegoAuthSchemeFactory.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/KnoxSpnegoAuthSchemeFactory.java b/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/KnoxSpnegoAuthSchemeFactory.java
index 6c730a1..0e4145a 100644
--- a/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/KnoxSpnegoAuthSchemeFactory.java
+++ b/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/KnoxSpnegoAuthSchemeFactory.java
@@ -31,7 +31,8 @@ public class KnoxSpnegoAuthSchemeFactory extends SPNegoSchemeFactory {
super();
}
- public AuthScheme newInstance( final HttpParams params ) {
+ @Override
+ public AuthScheme newInstance(final HttpParams params ) {
return new KnoxSpnegoAuthScheme( isStripPort() );
}
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/PartiallyRepeatableHttpEntity.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/PartiallyRepeatableHttpEntity.java b/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/PartiallyRepeatableHttpEntity.java
index a882e02..b9c18ed 100644
--- a/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/PartiallyRepeatableHttpEntity.java
+++ b/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/PartiallyRepeatableHttpEntity.java
@@ -129,7 +129,8 @@ public class PartiallyRepeatableHttpEntity extends HttpEntityWrapper {
return b;
}
- public int read( byte[] buffer, int offset, int limit ) throws IOException {
+ @Override
+ public int read(byte[] buffer, int offset, int limit ) throws IOException {
int count = -1;
if( finalStream != null && finalStream != this ) {
throw new IOException( "Replay stream taken over by another consumer." );
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/PassAllHeadersNoEncodingDispatch.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/PassAllHeadersNoEncodingDispatch.java b/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/PassAllHeadersNoEncodingDispatch.java
index 928857c..e947057 100644
--- a/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/PassAllHeadersNoEncodingDispatch.java
+++ b/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/PassAllHeadersNoEncodingDispatch.java
@@ -30,7 +30,8 @@ import javax.servlet.http.HttpServletRequest;
* UIs may require this at some point as well.
*/
public class PassAllHeadersNoEncodingDispatch extends PassAllHeadersDispatch {
- public URI getDispatchUrl( HttpServletRequest request) {
+ @Override
+ public URI getDispatchUrl(HttpServletRequest request) {
String base = request.getRequestURI();
StringBuffer str = new StringBuffer();
str.append( base );
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-spi/src/main/java/org/apache/knox/gateway/filter/security/AbstractIdentityAssertionFilter.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/filter/security/AbstractIdentityAssertionFilter.java b/gateway-spi/src/main/java/org/apache/knox/gateway/filter/security/AbstractIdentityAssertionFilter.java
index 76a8db5..f0cca53 100644
--- a/gateway-spi/src/main/java/org/apache/knox/gateway/filter/security/AbstractIdentityAssertionFilter.java
+++ b/gateway-spi/src/main/java/org/apache/knox/gateway/filter/security/AbstractIdentityAssertionFilter.java
@@ -66,6 +66,7 @@ public abstract class AbstractIdentityAssertionFilter extends AbstractIdentityAs
loadPrincipalMappings(filterConfig);
}
+ @Override
public void destroy() {
}
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-spi/src/main/java/org/apache/knox/gateway/security/GroupPrincipal.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/security/GroupPrincipal.java b/gateway-spi/src/main/java/org/apache/knox/gateway/security/GroupPrincipal.java
index 30c8f92..485356f 100644
--- a/gateway-spi/src/main/java/org/apache/knox/gateway/security/GroupPrincipal.java
+++ b/gateway-spi/src/main/java/org/apache/knox/gateway/security/GroupPrincipal.java
@@ -26,6 +26,7 @@ public class GroupPrincipal implements Principal {
this.name = name;
}
+ @Override
public String getName() {
return name;
}
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-spi/src/main/java/org/apache/knox/gateway/security/PrimaryPrincipal.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/security/PrimaryPrincipal.java b/gateway-spi/src/main/java/org/apache/knox/gateway/security/PrimaryPrincipal.java
index 9212c28..cfa6518 100644
--- a/gateway-spi/src/main/java/org/apache/knox/gateway/security/PrimaryPrincipal.java
+++ b/gateway-spi/src/main/java/org/apache/knox/gateway/security/PrimaryPrincipal.java
@@ -26,6 +26,7 @@ public class PrimaryPrincipal implements Principal {
this.name = name;
}
+ @Override
public String getName() {
return name;
}
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/token/impl/JWTToken.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/token/impl/JWTToken.java b/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/token/impl/JWTToken.java
index f714ccc..da8bfe3 100644
--- a/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/token/impl/JWTToken.java
+++ b/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/token/impl/JWTToken.java
@@ -103,6 +103,7 @@ public class JWTToken implements JWT {
return payload.toString();
}
+ @Override
public String toString() {
return jwt.serialize();
}
@@ -222,6 +223,7 @@ public class JWTToken implements JWT {
}
}
+ @Override
public boolean verify(JWSVerifier verifier) {
boolean rc = false;
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-spi/src/main/java/org/apache/knox/gateway/topology/Application.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/topology/Application.java b/gateway-spi/src/main/java/org/apache/knox/gateway/topology/Application.java
index a95792a..ad44f31 100644
--- a/gateway-spi/src/main/java/org/apache/knox/gateway/topology/Application.java
+++ b/gateway-spi/src/main/java/org/apache/knox/gateway/topology/Application.java
@@ -19,11 +19,13 @@ package org.apache.knox.gateway.topology;
public class Application extends Service {
+ @Override
public String getRole() {
return getName();
}
- public void setRole( String role ) {
+ @Override
+ public void setRole(String role ) {
setName( role );
}
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-spi/src/test/java/org/apache/knox/gateway/services/security/impl/CMFKeystoreServiceTest.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/test/java/org/apache/knox/gateway/services/security/impl/CMFKeystoreServiceTest.java b/gateway-spi/src/test/java/org/apache/knox/gateway/services/security/impl/CMFKeystoreServiceTest.java
index b7109d6..dd0584b 100644
--- a/gateway-spi/src/test/java/org/apache/knox/gateway/services/security/impl/CMFKeystoreServiceTest.java
+++ b/gateway-spi/src/test/java/org/apache/knox/gateway/services/security/impl/CMFKeystoreServiceTest.java
@@ -61,6 +61,7 @@ public class CMFKeystoreServiceTest {
public void stop() throws ServiceLifecycleException {}
+ @Override
public char[] getMasterSecret() {
return "testmaster".toCharArray();
}
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-test-release-utils/src/main/java/org/apache/knox/gateway/GatewayTestConfig.java
----------------------------------------------------------------------
diff --git a/gateway-test-release-utils/src/main/java/org/apache/knox/gateway/GatewayTestConfig.java b/gateway-test-release-utils/src/main/java/org/apache/knox/gateway/GatewayTestConfig.java
index bd50e07..c4a71a0 100644
--- a/gateway-test-release-utils/src/main/java/org/apache/knox/gateway/GatewayTestConfig.java
+++ b/gateway-test-release-utils/src/main/java/org/apache/knox/gateway/GatewayTestConfig.java
@@ -130,6 +130,7 @@ public class GatewayTestConfig extends Configuration implements GatewayConfig {
return new InetSocketAddress( getGatewayHost(), getGatewayPort() );
}
+ @Override
public long getGatewayIdleTimeout() {
return 0l;
}
@@ -347,6 +348,7 @@ public class GatewayTestConfig extends Configuration implements GatewayConfig {
backupVersionLimit = newBackupVersionLimit;
}
+ @Override
public int getGatewayDeploymentsBackupVersionLimit() {
return backupVersionLimit;
}
@@ -611,6 +613,7 @@ public class GatewayTestConfig extends Configuration implements GatewayConfig {
return null;
}
+ @Override
public String getDispatchWhitelist() {
return null;
}
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-test-utils/src/main/java/org/apache/knox/test/mock/MockRequestMatcher.java
----------------------------------------------------------------------
diff --git a/gateway-test-utils/src/main/java/org/apache/knox/test/mock/MockRequestMatcher.java b/gateway-test-utils/src/main/java/org/apache/knox/test/mock/MockRequestMatcher.java
index 46d3316..c2fe83e 100644
--- a/gateway-test-utils/src/main/java/org/apache/knox/test/mock/MockRequestMatcher.java
+++ b/gateway-test-utils/src/main/java/org/apache/knox/test/mock/MockRequestMatcher.java
@@ -320,6 +320,7 @@ public class MockRequestMatcher {
}
}
+ @Override
public String toString() {
return "from=" + from + ", pathInfo=" + pathInfo;
}
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-test/src/test/java/org/apache/knox/gateway/GatewaySslFuncTest.java
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/java/org/apache/knox/gateway/GatewaySslFuncTest.java b/gateway-test/src/test/java/org/apache/knox/gateway/GatewaySslFuncTest.java
index 52fc618..449cf5f 100644
--- a/gateway-test/src/test/java/org/apache/knox/gateway/GatewaySslFuncTest.java
+++ b/gateway-test/src/test/java/org/apache/knox/gateway/GatewaySslFuncTest.java
@@ -280,14 +280,17 @@ public class GatewaySslFuncTest {
public static class TrustAllCerts implements X509TrustManager {
- public void checkClientTrusted( X509Certificate[] x509Certificates, String s ) throws CertificateException {
+ @Override
+ public void checkClientTrusted(X509Certificate[] x509Certificates, String s ) throws CertificateException {
// Trust all certificates.
}
- public void checkServerTrusted( X509Certificate[] x509Certificates, String s ) throws CertificateException {
+ @Override
+ public void checkServerTrusted(X509Certificate[] x509Certificates, String s ) throws CertificateException {
// Trust all certificates.
}
+ @Override
public X509Certificate[] getAcceptedIssuers() {
return null;
}
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/log4j/appender/JdbmStoreAndForwardAppender.java
----------------------------------------------------------------------
diff --git a/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/log4j/appender/JdbmStoreAndForwardAppender.java b/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/log4j/appender/JdbmStoreAndForwardAppender.java
index 98cb2ab..dac9290 100644
--- a/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/log4j/appender/JdbmStoreAndForwardAppender.java
+++ b/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/log4j/appender/JdbmStoreAndForwardAppender.java
@@ -91,6 +91,7 @@ public class JdbmStoreAndForwardAppender extends AppenderSkeleton {
private class Forwarder extends Thread {
+ @Override
public void run() {
final AtomicBoolean done = new AtomicBoolean( false );
while( !done.get() ) {
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-util-common/src/main/java/org/apache/knox/gateway/util/JsonPath.java
----------------------------------------------------------------------
diff --git a/gateway-util-common/src/main/java/org/apache/knox/gateway/util/JsonPath.java b/gateway-util-common/src/main/java/org/apache/knox/gateway/util/JsonPath.java
index fcfb972..c9d537e 100644
--- a/gateway-util-common/src/main/java/org/apache/knox/gateway/util/JsonPath.java
+++ b/gateway-util-common/src/main/java/org/apache/knox/gateway/util/JsonPath.java
@@ -72,6 +72,7 @@ public class JsonPath {
return index;
}
+ @Override
public String toString() {
StringBuilder s = new StringBuilder();
s.append( "JsonPath{" );
@@ -312,6 +313,7 @@ public class JsonPath {
}
}
+ @Override
public String toString() {
StringBuilder s = new StringBuilder();
s.append( "JsonPath.Expression{" );
@@ -368,6 +370,7 @@ public class JsonPath {
return index;
}
+ @Override
public String toString() {
StringBuilder s = new StringBuilder();
s.append( "JsonPath.Segment{" );
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-util-common/src/test/java/org/apache/knox/gateway/audit/JdbmQueueTest.java
----------------------------------------------------------------------
diff --git a/gateway-util-common/src/test/java/org/apache/knox/gateway/audit/JdbmQueueTest.java b/gateway-util-common/src/test/java/org/apache/knox/gateway/audit/JdbmQueueTest.java
index 885ce55..47f1f92 100644
--- a/gateway-util-common/src/test/java/org/apache/knox/gateway/audit/JdbmQueueTest.java
+++ b/gateway-util-common/src/test/java/org/apache/knox/gateway/audit/JdbmQueueTest.java
@@ -214,6 +214,7 @@ public class JdbmQueueTest {
public Producer( int iterations ) {
this.iterations = iterations;
}
+ @Override
public void run() {
try {
for( int i = 0; i < iterations; i++ ) {
@@ -230,6 +231,7 @@ public class JdbmQueueTest {
public Consumer( Set<String> consumed ) {
this.consumed = consumed;
}
+ @Override
public void run() {
try {
while( true ) {
@@ -254,6 +256,7 @@ public class JdbmQueueTest {
public Processor( Set<String> consumed ) {
this.consumed = consumed;
}
+ @Override
public void run() {
try {
final AtomicBoolean done = new AtomicBoolean( false );
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-util-urltemplate/src/main/java/org/apache/knox/gateway/util/urltemplate/Matcher.java
----------------------------------------------------------------------
diff --git a/gateway-util-urltemplate/src/main/java/org/apache/knox/gateway/util/urltemplate/Matcher.java b/gateway-util-urltemplate/src/main/java/org/apache/knox/gateway/util/urltemplate/Matcher.java
index d307156..20e20f6 100644
--- a/gateway-util-urltemplate/src/main/java/org/apache/knox/gateway/util/urltemplate/Matcher.java
+++ b/gateway-util-urltemplate/src/main/java/org/apache/knox/gateway/util/urltemplate/Matcher.java
@@ -376,6 +376,7 @@ public class Matcher<V> {
private Map<String,List<String>> map = new HashMap<>();
+ @Override
public Set<String> getNames() {
return map.keySet();
}
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-util-urltemplate/src/main/java/org/apache/knox/gateway/util/urltemplate/MockParams.java
----------------------------------------------------------------------
diff --git a/gateway-util-urltemplate/src/main/java/org/apache/knox/gateway/util/urltemplate/MockParams.java b/gateway-util-urltemplate/src/main/java/org/apache/knox/gateway/util/urltemplate/MockParams.java
index a5c7dae..dbc06ee 100644
--- a/gateway-util-urltemplate/src/main/java/org/apache/knox/gateway/util/urltemplate/MockParams.java
+++ b/gateway-util-urltemplate/src/main/java/org/apache/knox/gateway/util/urltemplate/MockParams.java
@@ -27,6 +27,7 @@ public class MockParams implements Params {
private Map<String,List<String>> map = new HashMap<>();
+ @Override
public Set<String> getNames() {
return map.keySet();
}
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-util-urltemplate/src/main/java/org/apache/knox/gateway/util/urltemplate/Segment.java
----------------------------------------------------------------------
diff --git a/gateway-util-urltemplate/src/main/java/org/apache/knox/gateway/util/urltemplate/Segment.java b/gateway-util-urltemplate/src/main/java/org/apache/knox/gateway/util/urltemplate/Segment.java
index 61eb1d4..6e563b3 100644
--- a/gateway-util-urltemplate/src/main/java/org/apache/knox/gateway/util/urltemplate/Segment.java
+++ b/gateway-util-urltemplate/src/main/java/org/apache/knox/gateway/util/urltemplate/Segment.java
@@ -133,6 +133,7 @@ abstract class Segment {
// values.put( valuePattern, value );
// }
+ @Override
public String toString() {
StringBuilder s = new StringBuilder();
s.append( getParamName() );
@@ -227,6 +228,7 @@ abstract class Segment {
return regex;
}
+ @Override
public String toString() {
return token.effectivePattern;
}
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-util-urltemplate/src/main/java/org/apache/knox/gateway/util/urltemplate/Template.java
----------------------------------------------------------------------
diff --git a/gateway-util-urltemplate/src/main/java/org/apache/knox/gateway/util/urltemplate/Template.java b/gateway-util-urltemplate/src/main/java/org/apache/knox/gateway/util/urltemplate/Template.java
index 6ff732d..f284438 100644
--- a/gateway-util-urltemplate/src/main/java/org/apache/knox/gateway/util/urltemplate/Template.java
+++ b/gateway-util-urltemplate/src/main/java/org/apache/knox/gateway/util/urltemplate/Template.java
@@ -311,6 +311,7 @@ public class Template {
}
}
+ @Override
public String toString() {
String s = null;
StringBuilder b = new StringBuilder();
@@ -323,6 +324,7 @@ public class Template {
return s;
}
+ @Override
public int hashCode() {
Integer hc = hash;
if( hc == null ) {
@@ -332,7 +334,8 @@ public class Template {
return hc.intValue();
}
- public boolean equals( Object object ) {
+ @Override
+ public boolean equals(Object object ) {
boolean equals = false;
if( object != null && object instanceof Template ) {
String thisStr = toString();
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-util-urltemplate/src/test/java/org/apache/knox/gateway/util/urltemplate/RewriterTest.java
----------------------------------------------------------------------
diff --git a/gateway-util-urltemplate/src/test/java/org/apache/knox/gateway/util/urltemplate/RewriterTest.java b/gateway-util-urltemplate/src/test/java/org/apache/knox/gateway/util/urltemplate/RewriterTest.java
index 068493c..e8ea0b5 100644
--- a/gateway-util-urltemplate/src/test/java/org/apache/knox/gateway/util/urltemplate/RewriterTest.java
+++ b/gateway-util-urltemplate/src/test/java/org/apache/knox/gateway/util/urltemplate/RewriterTest.java
@@ -393,6 +393,7 @@ public class RewriterTest {
}
// Picks the values from either the expect or the config in that order.
+ @Override
@SuppressWarnings( "unchecked" )
public List<String> resolve( String name ) {
List<String> values = null;
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/hadoop-examples/src/main/java/org/apache/knox/examples/WordCount.java
----------------------------------------------------------------------
diff --git a/hadoop-examples/src/main/java/org/apache/knox/examples/WordCount.java b/hadoop-examples/src/main/java/org/apache/knox/examples/WordCount.java
index 7021d7d..cecc23f 100644
--- a/hadoop-examples/src/main/java/org/apache/knox/examples/WordCount.java
+++ b/hadoop-examples/src/main/java/org/apache/knox/examples/WordCount.java
@@ -39,6 +39,7 @@ public class WordCount {
private static final IntWritable one = new IntWritable(1);
private Text word = new Text();
+ @Override
public void map(Object key, Text value, Context context
) throws IOException, InterruptedException {
StringTokenizer itr = new StringTokenizer(value.toString());
@@ -53,6 +54,7 @@ public class WordCount {
extends Reducer<Text,IntWritable,Text,IntWritable> {
private IntWritable result = new IntWritable();
+ @Override
public void reduce(Text key, Iterable<IntWritable> values,
Context context
) throws IOException, InterruptedException {
[2/2] knox git commit: KNOX-1605 - Ensure overridden methods have
@Override annotation
Posted by kr...@apache.org.
KNOX-1605 - Ensure overridden methods have @Override annotation
Signed-off-by: Kevin Risden <kr...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/c4b35aaf
Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/c4b35aaf
Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/c4b35aaf
Branch: refs/heads/master
Commit: c4b35aaff1b5ba9e354230e3149e401017022ae3
Parents: 0f89a95
Author: Kevin Risden <kr...@apache.org>
Authored: Thu Nov 15 15:26:27 2018 -0500
Committer: Kevin Risden <kr...@apache.org>
Committed: Thu Nov 15 15:28:23 2018 -0500
----------------------------------------------------------------------
.../resources/build-tools/checkstyle/checker.xml | 2 ++
.../hdfs/dispatch/HdfsHttpClientDispatch.java | 1 +
.../ambari/AmbariConfigurationMonitor.java | 5 +++++
.../ambari/AmbariDynamicServiceURLCreator.java | 1 +
.../discovery/ambari/HDFSURLCreatorBase.java | 2 ++
.../discovery/ambari/HdfsUIUrlCreator.java | 1 +
.../discovery/ambari/NameNodeUrlCreator.java | 1 +
.../ambari/ResourceManagerURLCreatorBase.java | 1 +
.../discovery/ambari/WebHdfsUrlCreator.java | 1 +
.../gateway/i18n/messages/MessagesInvoker.java | 5 ++++-
.../provider/impl/HBaseZookeeperURLManager.java | 1 +
.../provider/impl/KafkaZookeeperURLManager.java | 1 +
.../ha/provider/impl/SOLRZookeeperURLManager.java | 1 +
.../filter/AbstractIdentityAssertionFilter.java | 1 +
.../filter/CommonIdentityAssertionFilter.java | 3 ++-
.../filter/CommonIdentityAssertionFilterTest.java | 1 +
...ncatIdentityAsserterDeploymentContributor.java | 1 +
.../groups/filter/HadoopGroupProviderFilter.java | 4 +++-
...egexIdentityAsserterDeploymentContributor.java | 1 +
.../filter/RegexIdentityAssertionFilter.java | 2 ++
...CaseIdentityAsserterDeploymentContributor.java | 2 ++
.../JerseyServiceDeploymentContributorBase.java | 3 ++-
.../encrypturi/api/DecryptUriDescriptor.java | 4 +++-
.../encrypturi/api/EncryptUriDescriptor.java | 4 +++-
.../filter/rewrite/api/UrlRewriteProcessor.java | 1 +
.../impl/UrlRewriteDeploymentContributor.java | 9 ++++++---
.../filter/rewrite/impl/UrlRewriteResponse.java | 8 ++++++--
.../impl/json/JsonUrlRewriteFilterReader.java | 3 ++-
.../spi/UrlRewriteFunctionProcessorBase.java | 4 +++-
.../rewrite/impl/json/NoopJsonFilterReader.java | 6 ++++--
.../rewrite/impl/json/TestJsonFilterReader.java | 6 ++++--
.../gateway/filter/AclsAuthorizationFilter.java | 4 +++-
.../knox/gateway/filter/AclsAuthzFilterTest.java | 13 +++++++++++--
.../hadoopauth/filter/HadoopAuthPostFilter.java | 1 +
.../federation/jwt/filter/AbstractJWTFilter.java | 1 +
.../jwt/filter/AccessTokenFederationFilter.java | 4 +++-
.../jwt/filter/JWTFederationFilter.java | 3 +++
.../jwt/filter/SSOCookieFederationFilter.java | 2 ++
.../federation/JWTFederationFilterTest.java | 3 +++
.../federation/SSOCookieProviderTest.java | 3 +++
.../pac4j/filter/Pac4jIdentityAdapter.java | 3 +++
.../gateway/pac4j/session/KnoxSessionStore.java | 3 +++
.../filter/AbstractPreAuthFederationFilter.java | 1 +
.../knox/gateway/deploy/impl/ShiroConfig.java | 1 +
.../knox/gateway/filter/ResponseCookieFilter.java | 9 ++++++---
.../filter/ShiroSubjectIdentityAdapter.java | 4 +++-
.../org/apache/knox/gateway/GatewayFilter.java | 6 ++++--
.../knox/gateway/GatewayForwardingServlet.java | 1 +
.../gateway/config/impl/GatewayConfigImpl.java | 1 +
.../descriptor/impl/ResourceDescriptorImpl.java | 8 ++++++--
.../knox/gateway/services/CLIGatewayServices.java | 3 +++
.../gateway/services/DefaultGatewayServices.java | 3 +++
.../instr/InstrHttpClientBuilderProvider.java | 1 +
.../impl/reporters/AbstractMetricsReporter.java | 1 +
.../impl/DefaultServiceRegistryService.java | 3 +++
.../security/impl/DefaultKeystoreService.java | 4 +++-
.../services/security/impl/JettySSLService.java | 3 ++-
.../security/impl/RemoteAliasService.java | 5 +++++
.../topology/impl/DefaultTopologyService.java | 6 ++++++
.../builder/BeanPropertyTopologyBuilder.java | 1 +
.../topology/builder/PropertyTopologyBuilder.java | 1 +
.../discovery/DefaultServiceDiscoveryConfig.java | 3 +++
.../DefaultRemoteConfigurationMonitor.java | 10 ++++++++++
.../topology/validation/TopologyValidator.java | 3 +++
.../apache/knox/gateway/trace/TraceRequest.java | 1 +
.../apache/knox/gateway/trace/TraceResponse.java | 1 +
.../org/apache/knox/gateway/util/KnoxCLI.java | 2 ++
.../apache/knox/gateway/jetty/SslSocketTest.java | 1 +
.../gateway/service/admin/beans/Application.java | 4 +++-
.../apache/knox/gateway/hbase/HBaseDispatch.java | 3 ++-
.../apache/knox/gateway/hive/HiveDispatch.java | 1 +
.../apache/knox/gateway/hive/HiveHaDispatch.java | 1 +
.../knox/gateway/dispatch/NiFiDispatch.java | 1 +
.../knox/gateway/dispatch/NiFiHaDispatch.java | 1 +
.../config/RemoteConfigurationRegistry.java | 5 +++++
.../knox/gateway/rm/dispatch/RMHaDispatch.java | 1 +
.../knox/gateway/rm/dispatch/RMUI2HaDispatch.java | 1 +
.../knox/gateway/rm/dispatch/RMUIHaDispatch.java | 1 +
.../hdfs/dispatch/HdfsHttpClientDispatch.java | 1 +
.../gateway/hdfs/dispatch/HdfsUIHaDispatch.java | 1 +
.../gateway/hdfs/dispatch/WebHdfsHaDispatch.java | 1 +
.../apache/knox/gateway/shell/BasicResponse.java | 1 +
.../knox/gateway/shell/hbase/ClusterVersion.java | 1 +
.../apache/knox/gateway/shell/hbase/Status.java | 1 +
.../knox/gateway/shell/hbase/SystemVersion.java | 1 +
.../gateway/shell/hbase/table/CreateTable.java | 1 +
.../gateway/shell/hbase/table/DeleteTable.java | 1 +
.../knox/gateway/shell/hbase/table/TableList.java | 1 +
.../gateway/shell/hbase/table/TableRegions.java | 1 +
.../gateway/shell/hbase/table/TableSchema.java | 1 +
.../gateway/shell/hbase/table/TruncateTable.java | 1 +
.../gateway/shell/hbase/table/UpdateTable.java | 1 +
.../gateway/shell/hbase/table/row/DeleteRows.java | 1 +
.../gateway/shell/hbase/table/row/QueryRows.java | 1 +
.../gateway/shell/hbase/table/row/StoreRow.java | 1 +
.../shell/hbase/table/scanner/CreateScanner.java | 1 +
.../shell/hbase/table/scanner/DeleteScanner.java | 1 +
.../shell/hbase/table/scanner/ScannerGetNext.java | 1 +
.../org/apache/knox/gateway/shell/hdfs/Get.java | 1 +
.../org/apache/knox/gateway/shell/hdfs/Ls.java | 1 +
.../org/apache/knox/gateway/shell/hdfs/Mkdir.java | 1 +
.../org/apache/knox/gateway/shell/hdfs/Put.java | 1 +
.../apache/knox/gateway/shell/hdfs/Rename.java | 1 +
.../org/apache/knox/gateway/shell/hdfs/Rm.java | 1 +
.../apache/knox/gateway/shell/hdfs/Status.java | 1 +
.../org/apache/knox/gateway/shell/job/Hive.java | 1 +
.../org/apache/knox/gateway/shell/job/Java.java | 1 +
.../org/apache/knox/gateway/shell/job/Pig.java | 1 +
.../org/apache/knox/gateway/shell/job/Queue.java | 1 +
.../org/apache/knox/gateway/shell/job/Sqoop.java | 1 +
.../org/apache/knox/gateway/shell/job/Status.java | 1 +
.../apache/knox/gateway/shell/knox/token/Get.java | 1 +
.../knox/gateway/shell/workflow/Status.java | 1 +
.../knox/gateway/shell/workflow/Submit.java | 1 +
.../apache/knox/gateway/shell/yarn/SubmitApp.java | 1 +
.../deploy/ProviderDeploymentContributorBase.java | 9 ++++++---
.../deploy/ServiceDeploymentContributorBase.java | 6 ++++--
.../gateway/dispatch/AbstractGatewayDispatch.java | 18 ++++++++++++------
.../gateway/dispatch/CappedBufferHttpEntity.java | 3 ++-
.../dispatch/DefaultHttpClientFactory.java | 2 ++
.../gateway/dispatch/GatewayDispatchFilter.java | 6 ++++++
.../gateway/dispatch/HadoopAuthCookieStore.java | 2 ++
.../knox/gateway/dispatch/InputStreamEntity.java | 7 ++++++-
.../dispatch/KnoxSpnegoAuthSchemeFactory.java | 3 ++-
.../dispatch/PartiallyRepeatableHttpEntity.java | 3 ++-
.../PassAllHeadersNoEncodingDispatch.java | 3 ++-
.../security/AbstractIdentityAssertionFilter.java | 1 +
.../knox/gateway/security/GroupPrincipal.java | 1 +
.../knox/gateway/security/PrimaryPrincipal.java | 1 +
.../services/security/token/impl/JWTToken.java | 2 ++
.../apache/knox/gateway/topology/Application.java | 4 +++-
.../security/impl/CMFKeystoreServiceTest.java | 1 +
.../apache/knox/gateway/GatewayTestConfig.java | 3 +++
.../apache/knox/test/mock/MockRequestMatcher.java | 1 +
.../apache/knox/gateway/GatewaySslFuncTest.java | 7 +++++--
.../appender/JdbmStoreAndForwardAppender.java | 1 +
.../org/apache/knox/gateway/util/JsonPath.java | 3 +++
.../apache/knox/gateway/audit/JdbmQueueTest.java | 3 +++
.../knox/gateway/util/urltemplate/Matcher.java | 1 +
.../knox/gateway/util/urltemplate/MockParams.java | 1 +
.../knox/gateway/util/urltemplate/Segment.java | 2 ++
.../knox/gateway/util/urltemplate/Template.java | 5 ++++-
.../gateway/util/urltemplate/RewriterTest.java | 1 +
.../java/org/apache/knox/examples/WordCount.java | 2 ++
144 files changed, 314 insertions(+), 53 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/build-tools/src/main/resources/build-tools/checkstyle/checker.xml
----------------------------------------------------------------------
diff --git a/build-tools/src/main/resources/build-tools/checkstyle/checker.xml b/build-tools/src/main/resources/build-tools/checkstyle/checker.xml
index 3798001..50af2f6 100644
--- a/build-tools/src/main/resources/build-tools/checkstyle/checker.xml
+++ b/build-tools/src/main/resources/build-tools/checkstyle/checker.xml
@@ -80,6 +80,8 @@ limitations under the License.
<module name="StringLiteralEquality"/>
<!-- Don't declare multiple variables in the same statement -->
<!--<module name="MultipleVariableDeclarations"/>-->
+ <!-- Make sure @Override annotation is on methods -->
+ <module name="MissingOverride"/>
<!-- Checks for imports -->
<!-- See http://checkstyle.sf.net/config_import.html -->
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-adapter/src/main/java/org/apache/hadoop/gateway/hdfs/dispatch/HdfsHttpClientDispatch.java
----------------------------------------------------------------------
diff --git a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/hdfs/dispatch/HdfsHttpClientDispatch.java b/gateway-adapter/src/main/java/org/apache/hadoop/gateway/hdfs/dispatch/HdfsHttpClientDispatch.java
index 5e55f8b..43f773a 100644
--- a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/hdfs/dispatch/HdfsHttpClientDispatch.java
+++ b/gateway-adapter/src/main/java/org/apache/hadoop/gateway/hdfs/dispatch/HdfsHttpClientDispatch.java
@@ -38,6 +38,7 @@ public class HdfsHttpClientDispatch extends org.apache.knox.gateway.hdfs.dispatc
* send the entire payload before redirect to the target component
* like a datanode and have to send it again.
*/
+ @Override
protected HttpEntity createRequestEntity(HttpServletRequest request)
throws IOException {
return super.createRequestEntity(request);
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/AmbariConfigurationMonitor.java
----------------------------------------------------------------------
diff --git a/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/AmbariConfigurationMonitor.java b/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/AmbariConfigurationMonitor.java
index ce00ee5..3b1cc6a 100644
--- a/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/AmbariConfigurationMonitor.java
+++ b/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/AmbariConfigurationMonitor.java
@@ -122,14 +122,17 @@ class AmbariConfigurationMonitor implements ClusterConfigurationMonitor {
props.load(in);
addDiscoveryConfig(props.getProperty(PROP_CLUSTER_NAME), new ServiceDiscoveryConfig() {
+ @Override
public String getAddress() {
return props.getProperty(PROP_CLUSTER_SOURCE);
}
+ @Override
public String getUser() {
return props.getProperty(PROP_CLUSTER_USER);
}
+ @Override
public String getPasswordAlias() {
return props.getProperty(PROP_CLUSTER_ALIAS);
}
@@ -291,10 +294,12 @@ class AmbariConfigurationMonitor implements ClusterConfigurationMonitor {
}
}
+ @Override
public void start() {
(new Thread(internalMonitor, "AmbariConfigurationMonitor")).start();
}
+ @Override
public void stop() {
internalMonitor.stop();
}
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/AmbariDynamicServiceURLCreator.java
----------------------------------------------------------------------
diff --git a/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/AmbariDynamicServiceURLCreator.java b/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/AmbariDynamicServiceURLCreator.java
index 162003a..dc929f7 100644
--- a/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/AmbariDynamicServiceURLCreator.java
+++ b/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/AmbariDynamicServiceURLCreator.java
@@ -105,6 +105,7 @@ class AmbariDynamicServiceURLCreator implements ServiceURLCreator {
return null;
}
+ @Override
public List<String> create(String serviceName, Map<String, String> serviceParams) {
List<String> urls = new ArrayList<>();
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/HDFSURLCreatorBase.java
----------------------------------------------------------------------
diff --git a/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/HDFSURLCreatorBase.java b/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/HDFSURLCreatorBase.java
index c71d188..14d9f72 100644
--- a/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/HDFSURLCreatorBase.java
+++ b/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/HDFSURLCreatorBase.java
@@ -47,10 +47,12 @@ public abstract class HDFSURLCreatorBase implements ServiceURLCreator {
private AmbariCluster cluster = null;
+ @Override
public void init(AmbariCluster cluster) {
this.cluster = cluster;
}
+ @Override
public List<String> create(String service, Map<String, String> serviceParams) {
List<String> urls = new ArrayList<>();
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/HdfsUIUrlCreator.java
----------------------------------------------------------------------
diff --git a/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/HdfsUIUrlCreator.java b/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/HdfsUIUrlCreator.java
index 3efb051..1a71343 100644
--- a/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/HdfsUIUrlCreator.java
+++ b/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/HdfsUIUrlCreator.java
@@ -24,6 +24,7 @@ public class HdfsUIUrlCreator extends HDFSURLCreatorBase {
private static final String SERVICE = "HDFSUI";
+ @Override
public void init(AmbariCluster cluster) {
super.init(cluster);
}
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/NameNodeUrlCreator.java
----------------------------------------------------------------------
diff --git a/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/NameNodeUrlCreator.java b/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/NameNodeUrlCreator.java
index d3cdf61..17a7517 100644
--- a/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/NameNodeUrlCreator.java
+++ b/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/NameNodeUrlCreator.java
@@ -33,6 +33,7 @@ public class NameNodeUrlCreator implements ServiceURLCreator {
private AmbariCluster cluster = null;
+ @Override
public void init(AmbariCluster cluster) {
this.cluster = cluster;
}
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/ResourceManagerURLCreatorBase.java
----------------------------------------------------------------------
diff --git a/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/ResourceManagerURLCreatorBase.java b/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/ResourceManagerURLCreatorBase.java
index 9944c1b..7081b30 100644
--- a/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/ResourceManagerURLCreatorBase.java
+++ b/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/ResourceManagerURLCreatorBase.java
@@ -38,6 +38,7 @@ public abstract class ResourceManagerURLCreatorBase implements ServiceURLCreator
private AmbariCluster cluster = null;
+ @Override
public void init(AmbariCluster cluster) {
this.cluster = cluster;
}
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/WebHdfsUrlCreator.java
----------------------------------------------------------------------
diff --git a/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/WebHdfsUrlCreator.java b/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/WebHdfsUrlCreator.java
index c75eec3..de9c39f 100644
--- a/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/WebHdfsUrlCreator.java
+++ b/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/WebHdfsUrlCreator.java
@@ -24,6 +24,7 @@ public class WebHdfsUrlCreator extends HDFSURLCreatorBase {
private static final String SERVICE = "WEBHDFS";
+ @Override
public void init(AmbariCluster cluster) {
super.init(cluster);
}
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/MessagesInvoker.java
----------------------------------------------------------------------
diff --git a/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/MessagesInvoker.java b/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/MessagesInvoker.java
index edfeae3..77ddf25 100644
--- a/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/MessagesInvoker.java
+++ b/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/MessagesInvoker.java
@@ -101,7 +101,8 @@ public class MessagesInvoker extends ResourcesInvoker implements InvocationHandl
return throwable;
}
- protected String getAnnotationPattern( final Method method ) {
+ @Override
+ protected String getAnnotationPattern(final Method method ) {
String pattern = null;
Message anno = method.getAnnotation( Message.class );
if( anno != null ) {
@@ -157,6 +158,7 @@ public class MessagesInvoker extends ResourcesInvoker implements InvocationHandl
return logger;
}
+ @Override
protected String getBundleName() {
return bundle;
}
@@ -165,6 +167,7 @@ public class MessagesInvoker extends ResourcesInvoker implements InvocationHandl
return loggers.getLogger( calcLoggerName( clazz, anno ) );
}
+ @Override
public String toString() {
return "MessageInvoker["+bundle+"]";
}
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/HBaseZookeeperURLManager.java
----------------------------------------------------------------------
diff --git a/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/HBaseZookeeperURLManager.java b/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/HBaseZookeeperURLManager.java
index 7f7522e..b0808f5 100644
--- a/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/HBaseZookeeperURLManager.java
+++ b/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/HBaseZookeeperURLManager.java
@@ -75,6 +75,7 @@ public class HBaseZookeeperURLManager extends BaseZookeeperURLManager {
return validatedHosts;
}
+ @Override
protected String getServiceName() {
return "WEBHBASE";
};
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/KafkaZookeeperURLManager.java
----------------------------------------------------------------------
diff --git a/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/KafkaZookeeperURLManager.java b/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/KafkaZookeeperURLManager.java
index 3472d78..06a5335 100644
--- a/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/KafkaZookeeperURLManager.java
+++ b/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/KafkaZookeeperURLManager.java
@@ -79,6 +79,7 @@ public class KafkaZookeeperURLManager extends BaseZookeeperURLManager {
return validatedHosts;
}
+ @Override
protected String getServiceName() {
return "KAFKA";
};
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/SOLRZookeeperURLManager.java
----------------------------------------------------------------------
diff --git a/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/SOLRZookeeperURLManager.java b/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/SOLRZookeeperURLManager.java
index 830ef66..71ce7bb 100644
--- a/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/SOLRZookeeperURLManager.java
+++ b/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/SOLRZookeeperURLManager.java
@@ -59,6 +59,7 @@ public class SOLRZookeeperURLManager extends BaseZookeeperURLManager {
return hosts;
}
+ @Override
protected String getServiceName() {
return "SOLR";
};
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/identityasserter/common/filter/AbstractIdentityAssertionFilter.java
----------------------------------------------------------------------
diff --git a/gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/identityasserter/common/filter/AbstractIdentityAssertionFilter.java b/gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/identityasserter/common/filter/AbstractIdentityAssertionFilter.java
index 18ce1be..d56ec87 100644
--- a/gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/identityasserter/common/filter/AbstractIdentityAssertionFilter.java
+++ b/gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/identityasserter/common/filter/AbstractIdentityAssertionFilter.java
@@ -159,6 +159,7 @@ public abstract class AbstractIdentityAssertionFilter extends
Subject.doAs(
subject,
new PrivilegedExceptionAction<Object>() {
+ @Override
public Object run() throws Exception {
doFilterInternal(request, response, chain);
return null;
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/identityasserter/common/filter/CommonIdentityAssertionFilter.java
----------------------------------------------------------------------
diff --git a/gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/identityasserter/common/filter/CommonIdentityAssertionFilter.java b/gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/identityasserter/common/filter/CommonIdentityAssertionFilter.java
index 2076e0a..977c318 100644
--- a/gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/identityasserter/common/filter/CommonIdentityAssertionFilter.java
+++ b/gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/identityasserter/common/filter/CommonIdentityAssertionFilter.java
@@ -70,7 +70,8 @@ public class CommonIdentityAssertionFilter extends AbstractIdentityAssertionFilt
* to the identity to be asserted as appropriate and create the provider specific
* assertion token. Add the assertion token to the request.
*/
- public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
+ @Override
+ public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
throws IOException, ServletException {
Subject subject = Subject.getSubject(AccessController.getContext());
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-provider-identity-assertion-common/src/test/java/org/apache/knox/gateway/identityasserter/filter/CommonIdentityAssertionFilterTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-identity-assertion-common/src/test/java/org/apache/knox/gateway/identityasserter/filter/CommonIdentityAssertionFilterTest.java b/gateway-provider-identity-assertion-common/src/test/java/org/apache/knox/gateway/identityasserter/filter/CommonIdentityAssertionFilterTest.java
index 15894d9..e7ccb8c 100644
--- a/gateway-provider-identity-assertion-common/src/test/java/org/apache/knox/gateway/identityasserter/filter/CommonIdentityAssertionFilterTest.java
+++ b/gateway-provider-identity-assertion-common/src/test/java/org/apache/knox/gateway/identityasserter/filter/CommonIdentityAssertionFilterTest.java
@@ -103,6 +103,7 @@ public class CommonIdentityAssertionFilterTest {
Subject.doAs(
subject,
new PrivilegedExceptionAction<Object>() {
+ @Override
public Object run() throws Exception {
filter.doFilter(request, response, chain);
return null;
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-provider-identity-assertion-concat/src/main/java/org/apache/knox/gateway/identityasserter/concat/filter/ConcatIdentityAsserterDeploymentContributor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-identity-assertion-concat/src/main/java/org/apache/knox/gateway/identityasserter/concat/filter/ConcatIdentityAsserterDeploymentContributor.java b/gateway-provider-identity-assertion-concat/src/main/java/org/apache/knox/gateway/identityasserter/concat/filter/ConcatIdentityAsserterDeploymentContributor.java
index 6e9f230..a94eef1 100644
--- a/gateway-provider-identity-assertion-concat/src/main/java/org/apache/knox/gateway/identityasserter/concat/filter/ConcatIdentityAsserterDeploymentContributor.java
+++ b/gateway-provider-identity-assertion-concat/src/main/java/org/apache/knox/gateway/identityasserter/concat/filter/ConcatIdentityAsserterDeploymentContributor.java
@@ -26,6 +26,7 @@ public class ConcatIdentityAsserterDeploymentContributor extends AbstractIdentit
return "Concat";
}
+ @Override
protected String getFilterClassname() {
return ConcatIdentityAssertionFilter.class.getName();
}
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-provider-identity-assertion-hadoop-groups/src/main/java/org/apache/knox/gateway/identityasserter/hadoop/groups/filter/HadoopGroupProviderFilter.java
----------------------------------------------------------------------
diff --git a/gateway-provider-identity-assertion-hadoop-groups/src/main/java/org/apache/knox/gateway/identityasserter/hadoop/groups/filter/HadoopGroupProviderFilter.java b/gateway-provider-identity-assertion-hadoop-groups/src/main/java/org/apache/knox/gateway/identityasserter/hadoop/groups/filter/HadoopGroupProviderFilter.java
index 7047baa..391f4a4 100644
--- a/gateway-provider-identity-assertion-hadoop-groups/src/main/java/org/apache/knox/gateway/identityasserter/hadoop/groups/filter/HadoopGroupProviderFilter.java
+++ b/gateway-provider-identity-assertion-hadoop-groups/src/main/java/org/apache/knox/gateway/identityasserter/hadoop/groups/filter/HadoopGroupProviderFilter.java
@@ -90,8 +90,9 @@ public class HadoopGroupProviderFilter extends CommonIdentityAssertionFilter {
* Query the Hadoop implementation of {@link Groups} to retrieve groups for
* provided user.
*/
+ @Override
public String[] mapGroupPrincipals(final String mappedPrincipalName,
- final Subject subject) {
+ final Subject subject) {
/* return the groups as seen by Hadoop */
String[] groups = null;
try {
@@ -113,6 +114,7 @@ public class HadoopGroupProviderFilter extends CommonIdentityAssertionFilter {
return groups;
}
+ @Override
public String mapUserPrincipal(final String principalName) {
/* return the passed principal */
return principalName;
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-provider-identity-assertion-regex/src/main/java/org/apache/knox/gateway/identityasserter/regex/filter/RegexIdentityAsserterDeploymentContributor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-identity-assertion-regex/src/main/java/org/apache/knox/gateway/identityasserter/regex/filter/RegexIdentityAsserterDeploymentContributor.java b/gateway-provider-identity-assertion-regex/src/main/java/org/apache/knox/gateway/identityasserter/regex/filter/RegexIdentityAsserterDeploymentContributor.java
index a3ec36f..7ee8e6c 100644
--- a/gateway-provider-identity-assertion-regex/src/main/java/org/apache/knox/gateway/identityasserter/regex/filter/RegexIdentityAsserterDeploymentContributor.java
+++ b/gateway-provider-identity-assertion-regex/src/main/java/org/apache/knox/gateway/identityasserter/regex/filter/RegexIdentityAsserterDeploymentContributor.java
@@ -27,6 +27,7 @@ public class RegexIdentityAsserterDeploymentContributor extends
return "Regex";
}
+ @Override
protected String getFilterClassname() {
return RegexIdentityAssertionFilter.class.getName();
}
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-provider-identity-assertion-regex/src/main/java/org/apache/knox/gateway/identityasserter/regex/filter/RegexIdentityAssertionFilter.java
----------------------------------------------------------------------
diff --git a/gateway-provider-identity-assertion-regex/src/main/java/org/apache/knox/gateway/identityasserter/regex/filter/RegexIdentityAssertionFilter.java b/gateway-provider-identity-assertion-regex/src/main/java/org/apache/knox/gateway/identityasserter/regex/filter/RegexIdentityAssertionFilter.java
index 7eb7541..db4afbf 100644
--- a/gateway-provider-identity-assertion-regex/src/main/java/org/apache/knox/gateway/identityasserter/regex/filter/RegexIdentityAssertionFilter.java
+++ b/gateway-provider-identity-assertion-regex/src/main/java/org/apache/knox/gateway/identityasserter/regex/filter/RegexIdentityAssertionFilter.java
@@ -56,11 +56,13 @@ public class RegexIdentityAssertionFilter extends
}
}
+ @Override
public String[] mapGroupPrincipals(String mappedPrincipalName, Subject subject) {
// Returning null will allow existing Subject group principals to remain the same
return null;
}
+ @Override
public String mapUserPrincipal(String principalName) {
return template.apply( principalName );
}
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-provider-identity-assertion-switchcase/src/main/java/org/apache/knox/gateway/identityasserter/switchcase/SwitchCaseIdentityAsserterDeploymentContributor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-identity-assertion-switchcase/src/main/java/org/apache/knox/gateway/identityasserter/switchcase/SwitchCaseIdentityAsserterDeploymentContributor.java b/gateway-provider-identity-assertion-switchcase/src/main/java/org/apache/knox/gateway/identityasserter/switchcase/SwitchCaseIdentityAsserterDeploymentContributor.java
index 5306401..8218634 100644
--- a/gateway-provider-identity-assertion-switchcase/src/main/java/org/apache/knox/gateway/identityasserter/switchcase/SwitchCaseIdentityAsserterDeploymentContributor.java
+++ b/gateway-provider-identity-assertion-switchcase/src/main/java/org/apache/knox/gateway/identityasserter/switchcase/SwitchCaseIdentityAsserterDeploymentContributor.java
@@ -22,10 +22,12 @@ import org.apache.knox.gateway.identityasserter.common.filter.AbstractIdentityAs
public class SwitchCaseIdentityAsserterDeploymentContributor extends
AbstractIdentityAsserterDeploymentContributor {
+ @Override
public String getName() {
return "SwitchCase";
}
+ @Override
protected String getFilterClassname() {
return SwitchCaseIdentityAssertionFilter.class.getName();
}
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-provider-jersey/src/main/java/org/apache/knox/gateway/jersey/JerseyServiceDeploymentContributorBase.java
----------------------------------------------------------------------
diff --git a/gateway-provider-jersey/src/main/java/org/apache/knox/gateway/jersey/JerseyServiceDeploymentContributorBase.java b/gateway-provider-jersey/src/main/java/org/apache/knox/gateway/jersey/JerseyServiceDeploymentContributorBase.java
index d5300e7..4ad2c6f 100644
--- a/gateway-provider-jersey/src/main/java/org/apache/knox/gateway/jersey/JerseyServiceDeploymentContributorBase.java
+++ b/gateway-provider-jersey/src/main/java/org/apache/knox/gateway/jersey/JerseyServiceDeploymentContributorBase.java
@@ -37,7 +37,8 @@ public abstract class JerseyServiceDeploymentContributorBase extends ServiceDepl
protected abstract String[] getPatterns();
- public void contributeService( DeploymentContext context, Service service ) throws Exception {
+ @Override
+ public void contributeService(DeploymentContext context, Service service ) throws Exception {
String packages = StringUtils.join( getPackages(), ";" );
for( String pattern : getPatterns() ) {
ResourceDescriptor resource = context.getGatewayDescriptor().addResource();
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-provider-rewrite-step-encrypt-uri/src/main/java/org/apache/knox/gateway/encrypturi/api/DecryptUriDescriptor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-step-encrypt-uri/src/main/java/org/apache/knox/gateway/encrypturi/api/DecryptUriDescriptor.java b/gateway-provider-rewrite-step-encrypt-uri/src/main/java/org/apache/knox/gateway/encrypturi/api/DecryptUriDescriptor.java
index 0ec3f48..0c6b8ec 100644
--- a/gateway-provider-rewrite-step-encrypt-uri/src/main/java/org/apache/knox/gateway/encrypturi/api/DecryptUriDescriptor.java
+++ b/gateway-provider-rewrite-step-encrypt-uri/src/main/java/org/apache/knox/gateway/encrypturi/api/DecryptUriDescriptor.java
@@ -29,11 +29,13 @@ public class DecryptUriDescriptor extends UrlRewriteActionDescriptorBase
super( STEP_NAME );
}
+ @Override
public String getParam() {
return param;
}
- public void setParam( String param ) {
+ @Override
+ public void setParam(String param ) {
this.param = param;
}
}
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-provider-rewrite-step-encrypt-uri/src/main/java/org/apache/knox/gateway/encrypturi/api/EncryptUriDescriptor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-step-encrypt-uri/src/main/java/org/apache/knox/gateway/encrypturi/api/EncryptUriDescriptor.java b/gateway-provider-rewrite-step-encrypt-uri/src/main/java/org/apache/knox/gateway/encrypturi/api/EncryptUriDescriptor.java
index 44bf7e5..dcfee51 100644
--- a/gateway-provider-rewrite-step-encrypt-uri/src/main/java/org/apache/knox/gateway/encrypturi/api/EncryptUriDescriptor.java
+++ b/gateway-provider-rewrite-step-encrypt-uri/src/main/java/org/apache/knox/gateway/encrypturi/api/EncryptUriDescriptor.java
@@ -39,11 +39,13 @@ public class EncryptUriDescriptor extends UrlRewriteActionDescriptorBase
this.template = template;
}
+ @Override
public String getParam() {
return param;
}
- public void setParam( String param ) {
+ @Override
+ public void setParam(String param ) {
this.param = param;
}
}
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteProcessor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteProcessor.java b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteProcessor.java
index b811775..d96ca25 100644
--- a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteProcessor.java
+++ b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteProcessor.java
@@ -58,6 +58,7 @@ public class UrlRewriteProcessor implements UrlRewriter {
initializeRules( descriptor );
}
+ @Override
public UrlRewriteRulesDescriptor getConfig() {
return descriptor;
}
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/UrlRewriteDeploymentContributor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/UrlRewriteDeploymentContributor.java b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/UrlRewriteDeploymentContributor.java
index 5fc7a9e..dd42ada 100644
--- a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/UrlRewriteDeploymentContributor.java
+++ b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/UrlRewriteDeploymentContributor.java
@@ -54,14 +54,17 @@ public class UrlRewriteDeploymentContributor extends
return PROVIDER_IMPL_NAME;
}
- public void initializeContribution( DeploymentContext context ) {
+ @Override
+ public void initializeContribution(DeploymentContext context ) {
context.addDescriptor( getRole(), UrlRewriteRulesDescriptorFactory.create() );
}
- public void contributeProvider( DeploymentContext context, Provider provider ) {
+ @Override
+ public void contributeProvider(DeploymentContext context, Provider provider ) {
}
- public void finalizeContribution( DeploymentContext context ) {
+ @Override
+ public void finalizeContribution(DeploymentContext context ) {
// Write the descriptor into the archive.
UrlRewriteRulesDescriptor descriptor = context.getDescriptor( getRole() );
StringWriter writer = new StringWriter();
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/UrlRewriteResponse.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/UrlRewriteResponse.java b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/UrlRewriteResponse.java
index 7712986..b0b6aa4 100644
--- a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/UrlRewriteResponse.java
+++ b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/UrlRewriteResponse.java
@@ -298,23 +298,27 @@ public class UrlRewriteResponse extends GatewayResponseWrapper implements Params
}
}
+ @Override
@SuppressWarnings("deprecation")
public String encodeUrl( String url ) {
return this.encodeURL( url );
}
//TODO: Route these through the rewriter.
- public String encodeURL( String url ) {
+ @Override
+ public String encodeURL(String url ) {
throw new UnsupportedOperationException();
}
+ @Override
@SuppressWarnings("deprecation")
public String encodeRedirectUrl( String url ) {
return this.encodeRedirectURL( url );
}
//TODO: Route these through the rewriter.
- public String encodeRedirectURL( String url ) {
+ @Override
+ public String encodeRedirectURL(String url ) {
throw new UnsupportedOperationException();
}
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/json/JsonUrlRewriteFilterReader.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/json/JsonUrlRewriteFilterReader.java b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/json/JsonUrlRewriteFilterReader.java
index e994397..da6735f 100644
--- a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/json/JsonUrlRewriteFilterReader.java
+++ b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/json/JsonUrlRewriteFilterReader.java
@@ -50,7 +50,8 @@ public class JsonUrlRewriteFilterReader extends JsonFilterReader {
this.direction = direction;
}
- protected String filterValueString( String name, String value, String rule ) {
+ @Override
+ protected String filterValueString(String name, String value, String rule ) {
try {
Template input = Parser.parseLiteral( value );
Template output = rewriter.rewrite( resolver, input, direction, rule );
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/spi/UrlRewriteFunctionProcessorBase.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/spi/UrlRewriteFunctionProcessorBase.java b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/spi/UrlRewriteFunctionProcessorBase.java
index 6d65ae3..7a9ae29 100644
--- a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/spi/UrlRewriteFunctionProcessorBase.java
+++ b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/spi/UrlRewriteFunctionProcessorBase.java
@@ -22,9 +22,11 @@ import org.apache.knox.gateway.filter.rewrite.api.UrlRewriteFunctionDescriptor;
public abstract class UrlRewriteFunctionProcessorBase<T extends UrlRewriteFunctionDescriptor> implements UrlRewriteFunctionProcessor<T> {
- public void initialize( UrlRewriteEnvironment environment, T descriptor ) throws Exception {
+ @Override
+ public void initialize(UrlRewriteEnvironment environment, T descriptor ) throws Exception {
}
+ @Override
public void destroy() throws Exception {
}
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/json/NoopJsonFilterReader.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/json/NoopJsonFilterReader.java b/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/json/NoopJsonFilterReader.java
index 745c9f4..c109979 100644
--- a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/json/NoopJsonFilterReader.java
+++ b/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/json/NoopJsonFilterReader.java
@@ -28,11 +28,13 @@ public class NoopJsonFilterReader extends JsonFilterReader {
super( reader, config );
}
- protected String filterFieldName( String name ) {
+ @Override
+ protected String filterFieldName(String name ) {
return name;
}
- protected String filterValueString( String name, String value, String rule ) {
+ @Override
+ protected String filterValueString(String name, String value, String rule ) {
return value;
}
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/json/TestJsonFilterReader.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/json/TestJsonFilterReader.java b/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/json/TestJsonFilterReader.java
index 0c25b37..f1ae60e 100644
--- a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/json/TestJsonFilterReader.java
+++ b/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/json/TestJsonFilterReader.java
@@ -28,11 +28,13 @@ public class TestJsonFilterReader extends JsonFilterReader {
super( reader, config );
}
- protected String filterFieldName( String name ) {
+ @Override
+ protected String filterFieldName(String name ) {
return "name<" + name + ">";
}
- protected String filterValueString( String name, String value, String rule ) {
+ @Override
+ protected String filterValueString(String name, String value, String rule ) {
return "value:" + rule + "<" + value + ">";
}
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-provider-security-authz-acls/src/main/java/org/apache/knox/gateway/filter/AclsAuthorizationFilter.java
----------------------------------------------------------------------
diff --git a/gateway-provider-security-authz-acls/src/main/java/org/apache/knox/gateway/filter/AclsAuthorizationFilter.java b/gateway-provider-security-authz-acls/src/main/java/org/apache/knox/gateway/filter/AclsAuthorizationFilter.java
index eb0a67f..4813c06 100644
--- a/gateway-provider-security-authz-acls/src/main/java/org/apache/knox/gateway/filter/AclsAuthorizationFilter.java
+++ b/gateway-provider-security-authz-acls/src/main/java/org/apache/knox/gateway/filter/AclsAuthorizationFilter.java
@@ -95,11 +95,13 @@ public class AclsAuthorizationFilter implements Filter {
Collections.addAll(adminUsers, users.split(","));
}
+ @Override
public void destroy() {
}
+ @Override
public void doFilter(ServletRequest request, ServletResponse response,
- FilterChain chain) throws IOException, ServletException {
+ FilterChain chain) throws IOException, ServletException {
boolean accessGranted = enforceAclAuthorizationPolicy(request, response, chain);
log.accessGranted(accessGranted);
String sourceUrl = (String)request.getAttribute( AbstractGatewayFilter.SOURCE_REQUEST_CONTEXT_URL_ATTRIBUTE_NAME );
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-provider-security-authz-acls/src/test/java/org/apache/knox/gateway/filter/AclsAuthzFilterTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-security-authz-acls/src/test/java/org/apache/knox/gateway/filter/AclsAuthzFilterTest.java b/gateway-provider-security-authz-acls/src/test/java/org/apache/knox/gateway/filter/AclsAuthzFilterTest.java
index e9ae06e..78f6f58 100644
--- a/gateway-provider-security-authz-acls/src/test/java/org/apache/knox/gateway/filter/AclsAuthzFilterTest.java
+++ b/gateway-provider-security-authz-acls/src/test/java/org/apache/knox/gateway/filter/AclsAuthzFilterTest.java
@@ -46,8 +46,9 @@ public class AclsAuthzFilterTest {
@Before
public void setup() {
filter = new AclsAuthorizationFilter() {
+ @Override
public void doFilter(ServletRequest request, ServletResponse response,
- FilterChain chain) throws IOException, ServletException {
+ FilterChain chain) throws IOException, ServletException {
boolean accessGranted = enforceAclAuthorizationPolicy(request, response, chain);
String sourceUrl = (String)request.getAttribute( AbstractGatewayFilter.SOURCE_REQUEST_CONTEXT_URL_ATTRIBUTE_NAME );
if (accessGranted) {
@@ -55,8 +56,9 @@ public class AclsAuthzFilterTest {
}
}
+ @Override
protected boolean enforceAclAuthorizationPolicy(ServletRequest request,
- ServletResponse response, FilterChain chain) {
+ ServletResponse response, FilterChain chain) {
accessGranted = super.enforceAclAuthorizationPolicy(request, response, chain);
return accessGranted;
}
@@ -98,6 +100,7 @@ public class AclsAuthzFilterTest {
Subject.doAs(
subject,
new PrivilegedExceptionAction<Object>() {
+ @Override
public Object run() throws Exception {
filter.doFilter(request, response, chain);
return null;
@@ -154,6 +157,7 @@ public class AclsAuthzFilterTest {
Subject.doAs(
subject,
new PrivilegedExceptionAction<Object>() {
+ @Override
public Object run() throws Exception {
filter.doFilter(request, response, chain);
return null;
@@ -210,6 +214,7 @@ public class AclsAuthzFilterTest {
Subject.doAs(
subject,
new PrivilegedExceptionAction<Object>() {
+ @Override
public Object run() throws Exception {
filter.doFilter(request, response, chain);
return null;
@@ -266,6 +271,7 @@ public class AclsAuthzFilterTest {
Subject.doAs(
subject,
new PrivilegedExceptionAction<Object>() {
+ @Override
public Object run() throws Exception {
filter.doFilter(request, response, chain);
return null;
@@ -322,6 +328,7 @@ public class AclsAuthzFilterTest {
Subject.doAs(
subject,
new PrivilegedExceptionAction<Object>() {
+ @Override
public Object run() throws Exception {
filter.doFilter(request, response, chain);
return null;
@@ -378,6 +385,7 @@ public class AclsAuthzFilterTest {
Subject.doAs(
subject,
new PrivilegedExceptionAction<Object>() {
+ @Override
public Object run() throws Exception {
filter.doFilter(request, response, chain);
return null;
@@ -434,6 +442,7 @@ public class AclsAuthzFilterTest {
Subject.doAs(
subject,
new PrivilegedExceptionAction<Object>() {
+ @Override
public Object run() throws Exception {
filter.doFilter(request, response, chain);
return null;
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-provider-security-hadoopauth/src/main/java/org/apache/knox/gateway/hadoopauth/filter/HadoopAuthPostFilter.java
----------------------------------------------------------------------
diff --git a/gateway-provider-security-hadoopauth/src/main/java/org/apache/knox/gateway/hadoopauth/filter/HadoopAuthPostFilter.java b/gateway-provider-security-hadoopauth/src/main/java/org/apache/knox/gateway/hadoopauth/filter/HadoopAuthPostFilter.java
index 9d8b8c8..30d0e40 100755
--- a/gateway-provider-security-hadoopauth/src/main/java/org/apache/knox/gateway/hadoopauth/filter/HadoopAuthPostFilter.java
+++ b/gateway-provider-security-hadoopauth/src/main/java/org/apache/knox/gateway/hadoopauth/filter/HadoopAuthPostFilter.java
@@ -84,6 +84,7 @@ public class HadoopAuthPostFilter implements Filter {
Subject.doAs(
subject,
new PrivilegedExceptionAction<Object>() {
+ @Override
public Object run() throws Exception {
chain.doFilter(request, response);
return null;
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/AbstractJWTFilter.java
----------------------------------------------------------------------
diff --git a/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/AbstractJWTFilter.java b/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/AbstractJWTFilter.java
index e28a0f3..6857906 100644
--- a/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/AbstractJWTFilter.java
+++ b/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/AbstractJWTFilter.java
@@ -87,6 +87,7 @@ public abstract class AbstractJWTFilter implements Filter {
private String expectedIssuer;
private String expectedSigAlg;
+ @Override
public abstract void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
throws IOException, ServletException;
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/AccessTokenFederationFilter.java
----------------------------------------------------------------------
diff --git a/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/AccessTokenFederationFilter.java b/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/AccessTokenFederationFilter.java
index 3870e06..0a0bc37 100644
--- a/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/AccessTokenFederationFilter.java
+++ b/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/AccessTokenFederationFilter.java
@@ -55,10 +55,12 @@ public class AccessTokenFederationFilter implements Filter {
authority = (JWTokenAuthority) services.getService(GatewayServices.TOKEN_SERVICE);
}
+ @Override
public void destroy() {
}
- public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
+ @Override
+ public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
throws IOException, ServletException {
String header = ((HttpServletRequest) request).getHeader("Authorization");
if (header != null && header.startsWith(BEARER)) {
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/JWTFederationFilter.java
----------------------------------------------------------------------
diff --git a/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/JWTFederationFilter.java b/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/JWTFederationFilter.java
index 3b78de9..2aa6f1c 100644
--- a/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/JWTFederationFilter.java
+++ b/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/JWTFederationFilter.java
@@ -67,9 +67,11 @@ public class JWTFederationFilter extends AbstractJWTFilter {
configureExpectedParameters(filterConfig);
}
+ @Override
public void destroy() {
}
+ @Override
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
throws IOException, ServletException {
String header = ((HttpServletRequest) request).getHeader("Authorization");
@@ -100,6 +102,7 @@ public class JWTFederationFilter extends AbstractJWTFilter {
}
}
+ @Override
protected void handleValidationError(HttpServletRequest request, HttpServletResponse response, int status,
String error) throws IOException {
if (error != null) {
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/SSOCookieFederationFilter.java
----------------------------------------------------------------------
diff --git a/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/SSOCookieFederationFilter.java b/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/SSOCookieFederationFilter.java
index 7ab5bf3..c52cf57 100644
--- a/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/SSOCookieFederationFilter.java
+++ b/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/SSOCookieFederationFilter.java
@@ -93,6 +93,7 @@ private String gatewayPath;
configureExpectedParameters(filterConfig);
}
+ @Override
public void destroy() {
}
@@ -128,6 +129,7 @@ private String gatewayPath;
}
}
+ @Override
protected void handleValidationError(HttpServletRequest request, HttpServletResponse response, int status,
String error) throws IOException {
String loginURL = constructLoginURL(request);
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-provider-security-jwt/src/test/java/org/apache/knox/gateway/provider/federation/JWTFederationFilterTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-security-jwt/src/test/java/org/apache/knox/gateway/provider/federation/JWTFederationFilterTest.java b/gateway-provider-security-jwt/src/test/java/org/apache/knox/gateway/provider/federation/JWTFederationFilterTest.java
index 40cd277..f72ca6c 100644
--- a/gateway-provider-security-jwt/src/test/java/org/apache/knox/gateway/provider/federation/JWTFederationFilterTest.java
+++ b/gateway-provider-security-jwt/src/test/java/org/apache/knox/gateway/provider/federation/JWTFederationFilterTest.java
@@ -36,16 +36,19 @@ public class JWTFederationFilterTest extends AbstractJWTFilterTest {
((TestJWTFederationFilter) handler).setTokenService(new TestJWTokenAuthority(publicKey));
}
+ @Override
protected void setTokenOnRequest(HttpServletRequest request, SignedJWT jwt) {
String token = "Bearer " + jwt.serialize();
EasyMock.expect(request.getHeader("Authorization")).andReturn(token);
}
+ @Override
protected void setGarbledTokenOnRequest(HttpServletRequest request, SignedJWT jwt) {
String token = "Bearer " + "ljm" + jwt.serialize();
EasyMock.expect(request.getHeader("Authorization")).andReturn(token);
}
+ @Override
protected String getAudienceProperty() {
return TestJWTFederationFilter.KNOX_TOKEN_AUDIENCES;
}
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-provider-security-jwt/src/test/java/org/apache/knox/gateway/provider/federation/SSOCookieProviderTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-security-jwt/src/test/java/org/apache/knox/gateway/provider/federation/SSOCookieProviderTest.java b/gateway-provider-security-jwt/src/test/java/org/apache/knox/gateway/provider/federation/SSOCookieProviderTest.java
index 3c481ed..db95a8d 100644
--- a/gateway-provider-security-jwt/src/test/java/org/apache/knox/gateway/provider/federation/SSOCookieProviderTest.java
+++ b/gateway-provider-security-jwt/src/test/java/org/apache/knox/gateway/provider/federation/SSOCookieProviderTest.java
@@ -50,16 +50,19 @@ public class SSOCookieProviderTest extends AbstractJWTFilterTest {
((TestSSOCookieFederationProvider) handler).setTokenService(new TestJWTokenAuthority(publicKey));
}
+ @Override
protected void setTokenOnRequest(HttpServletRequest request, SignedJWT jwt) {
Cookie cookie = new Cookie("hadoop-jwt", jwt.serialize());
EasyMock.expect(request.getCookies()).andReturn(new Cookie[] { cookie });
}
+ @Override
protected void setGarbledTokenOnRequest(HttpServletRequest request, SignedJWT jwt) {
Cookie cookie = new Cookie("hadoop-jwt", "ljm" + jwt.serialize());
EasyMock.expect(request.getCookies()).andReturn(new Cookie[] { cookie });
}
+ @Override
protected String getAudienceProperty() {
return TestSSOCookieFederationProvider.SSO_EXPECTED_AUDIENCES;
}
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/filter/Pac4jIdentityAdapter.java
----------------------------------------------------------------------
diff --git a/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/filter/Pac4jIdentityAdapter.java b/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/filter/Pac4jIdentityAdapter.java
index b954af5..f3d2c52 100644
--- a/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/filter/Pac4jIdentityAdapter.java
+++ b/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/filter/Pac4jIdentityAdapter.java
@@ -73,9 +73,11 @@ public class Pac4jIdentityAdapter implements Filter {
idAttribute = filterConfig.getInitParameter(PAC4J_ID_ATTRIBUTE);
}
+ @Override
public void destroy() {
}
+ @Override
public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain chain)
throws IOException, ServletException {
@@ -122,6 +124,7 @@ public class Pac4jIdentityAdapter implements Filter {
Subject.doAs(
subject,
new PrivilegedExceptionAction<Object>() {
+ @Override
public Object run() throws Exception {
chain.doFilter(request, response);
return null;
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/session/KnoxSessionStore.java
----------------------------------------------------------------------
diff --git a/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/session/KnoxSessionStore.java b/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/session/KnoxSessionStore.java
index 3ffbee6..d14675f 100644
--- a/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/session/KnoxSessionStore.java
+++ b/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/session/KnoxSessionStore.java
@@ -68,6 +68,7 @@ public class KnoxSessionStore implements SessionStore {
this.domainSuffix = domainSuffix;
}
+ @Override
public String getOrCreateSessionId(WebContext context) {
return null;
}
@@ -92,6 +93,7 @@ public class KnoxSessionStore implements SessionStore {
return null;
}
+ @Override
public Object get(WebContext context, String key) {
final Cookie cookie = ContextHelper.getCookie(context, PAC4J_SESSION_PREFIX + key);
Object value = null;
@@ -126,6 +128,7 @@ public class KnoxSessionStore implements SessionStore {
}
}
+ @Override
public void set(WebContext context, String key, Object value) {
logger.debug("Save in session: {} = {}", key, value);
final Cookie cookie = new Cookie(PAC4J_SESSION_PREFIX + key, compressEncryptBase64(value));
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/filter/AbstractPreAuthFederationFilter.java
----------------------------------------------------------------------
diff --git a/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/filter/AbstractPreAuthFederationFilter.java b/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/filter/AbstractPreAuthFederationFilter.java
index e4f7685..8990d7d 100644
--- a/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/filter/AbstractPreAuthFederationFilter.java
+++ b/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/filter/AbstractPreAuthFederationFilter.java
@@ -106,6 +106,7 @@ public abstract class AbstractPreAuthFederationFilter implements Filter {
Subject.doAs(
subject,
new PrivilegedExceptionAction<Object>() {
+ @Override
public Object run() throws Exception {
chain.doFilter(request, response);
return null;
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/deploy/impl/ShiroConfig.java
----------------------------------------------------------------------
diff --git a/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/deploy/impl/ShiroConfig.java b/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/deploy/impl/ShiroConfig.java
index 2c171e1..d927212 100644
--- a/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/deploy/impl/ShiroConfig.java
+++ b/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/deploy/impl/ShiroConfig.java
@@ -58,6 +58,7 @@ public class ShiroConfig {
section.put(name, value);
}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder();
for(Entry<String, Map<String, String>> section : sections.entrySet()) {
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/filter/ResponseCookieFilter.java
----------------------------------------------------------------------
diff --git a/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/filter/ResponseCookieFilter.java b/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/filter/ResponseCookieFilter.java
index 66eaac1..39fdbf8 100644
--- a/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/filter/ResponseCookieFilter.java
+++ b/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/filter/ResponseCookieFilter.java
@@ -56,19 +56,22 @@ public class ResponseCookieFilter extends AbstractGatewayFilter {
super( response );
}
- public void addCookie( Cookie cookie ) {
+ @Override
+ public void addCookie(Cookie cookie ) {
if( cookie != null && isAllowedHeader( cookie.getName() ) ) {
super.addCookie( cookie );
}
}
- public void setHeader( String name, String value ) {
+ @Override
+ public void setHeader(String name, String value ) {
if( isAllowedHeader( name ) ) {
super.setHeader( name, value );
}
}
- public void addHeader( String name, String value ) {
+ @Override
+ public void addHeader(String name, String value ) {
if( isAllowedHeader( name ) ) {
super.addHeader( name, value );
}
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/filter/ShiroSubjectIdentityAdapter.java
----------------------------------------------------------------------
diff --git a/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/filter/ShiroSubjectIdentityAdapter.java b/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/filter/ShiroSubjectIdentityAdapter.java
index 6b6e245..b318091 100644
--- a/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/filter/ShiroSubjectIdentityAdapter.java
+++ b/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/filter/ShiroSubjectIdentityAdapter.java
@@ -56,10 +56,12 @@ public class ShiroSubjectIdentityAdapter implements Filter {
public void init( FilterConfig filterConfig ) throws ServletException {
}
+ @Override
public void destroy() {
}
- public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
+ @Override
+ public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
throws IOException, ServletException {
Subject subject = SecurityUtils.getSubject();
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-server/src/main/java/org/apache/knox/gateway/GatewayFilter.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/GatewayFilter.java b/gateway-server/src/main/java/org/apache/knox/gateway/GatewayFilter.java
index c6eb5a8..a56fb1b 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/GatewayFilter.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/GatewayFilter.java
@@ -61,7 +61,8 @@ import java.util.UUID;
public class GatewayFilter implements Filter {
private static final FilterChain EMPTY_CHAIN = new FilterChain() {
- public void doFilter( ServletRequest servletRequest, ServletResponse servletResponse ) throws IOException, ServletException {
+ @Override
+ public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse ) throws IOException, ServletException {
}
};
@@ -262,7 +263,8 @@ public class GatewayFilter implements Filter {
this.chain = chain;
}
- public void doFilter( ServletRequest servletRequest, ServletResponse servletResponse ) throws IOException, ServletException {
+ @Override
+ public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse ) throws IOException, ServletException {
if( chain != null && !chain.isEmpty() ) {
final Filter filter = chain.get( 0 );
final FilterChain chain = subChain();
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-server/src/main/java/org/apache/knox/gateway/GatewayForwardingServlet.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/GatewayForwardingServlet.java b/gateway-server/src/main/java/org/apache/knox/gateway/GatewayForwardingServlet.java
index 5c52ca4..1e52fe0 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/GatewayForwardingServlet.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/GatewayForwardingServlet.java
@@ -88,6 +88,7 @@ public class GatewayForwardingServlet extends HttpServlet{
redirectToContext = config.getInitParameter("redirectTo");
}
+ @Override
public void doGet(HttpServletRequest request,
HttpServletResponse response)
throws ServletException, IOException
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-server/src/main/java/org/apache/knox/gateway/config/impl/GatewayConfigImpl.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/config/impl/GatewayConfigImpl.java b/gateway-server/src/main/java/org/apache/knox/gateway/config/impl/GatewayConfigImpl.java
index 9c538cd..aad3462 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/config/impl/GatewayConfigImpl.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/config/impl/GatewayConfigImpl.java
@@ -939,6 +939,7 @@ public class GatewayConfigImpl extends Configuration implements GatewayConfig {
return topologyNames;
}
+ @Override
public String getDispatchWhitelist() {
return get(DISPATCH_HOST_WHITELIST);
}
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-server/src/main/java/org/apache/knox/gateway/descriptor/impl/ResourceDescriptorImpl.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/descriptor/impl/ResourceDescriptorImpl.java b/gateway-server/src/main/java/org/apache/knox/gateway/descriptor/impl/ResourceDescriptorImpl.java
index 994c294..4e9fad9 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/descriptor/impl/ResourceDescriptorImpl.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/descriptor/impl/ResourceDescriptorImpl.java
@@ -45,20 +45,24 @@ public class ResourceDescriptorImpl implements ResourceDescriptor {
return parent;
}
- public ResourceDescriptor role( String role ) {
+ @Override
+ public ResourceDescriptor role(String role ) {
this.role = role;
return this;
}
+ @Override
public String role() {
return role;
}
- public ResourceDescriptor pattern( String pattern ) {
+ @Override
+ public ResourceDescriptor pattern(String pattern ) {
this.pattern = pattern;
return this;
}
+ @Override
public String pattern() {
return pattern;
}
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-server/src/main/java/org/apache/knox/gateway/services/CLIGatewayServices.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/services/CLIGatewayServices.java b/gateway-server/src/main/java/org/apache/knox/gateway/services/CLIGatewayServices.java
index af20c6a..ce56471 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/services/CLIGatewayServices.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/services/CLIGatewayServices.java
@@ -50,6 +50,7 @@ public class CLIGatewayServices implements GatewayServices {
super();
}
+ @Override
public void init(GatewayConfig config, Map<String,String> options) throws ServiceLifecycleException {
/* create an instance so that it can be passed to other services */
@@ -97,6 +98,7 @@ public class CLIGatewayServices implements GatewayServices {
services.put(TOPOLOGY_SERVICE, tops);
}
+ @Override
public void start() throws ServiceLifecycleException {
ms.start();
@@ -111,6 +113,7 @@ public class CLIGatewayServices implements GatewayServices {
(services.get(REMOTE_REGISTRY_CLIENT_SERVICE)).start();
}
+ @Override
public void stop() throws ServiceLifecycleException {
ms.stop();
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-server/src/main/java/org/apache/knox/gateway/services/DefaultGatewayServices.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/services/DefaultGatewayServices.java b/gateway-server/src/main/java/org/apache/knox/gateway/services/DefaultGatewayServices.java
index 8c0848a..5bbf11b 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/services/DefaultGatewayServices.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/services/DefaultGatewayServices.java
@@ -59,6 +59,7 @@ public class DefaultGatewayServices implements GatewayServices {
super();
}
+ @Override
public void init(GatewayConfig config, Map<String,String> options) throws ServiceLifecycleException {
ms = new DefaultMasterService();
ms.init(config, options);
@@ -149,6 +150,7 @@ public class DefaultGatewayServices implements GatewayServices {
services.put( METRICS_SERVICE, metricsService );
}
+ @Override
public void start() throws ServiceLifecycleException {
ms.start();
@@ -176,6 +178,7 @@ public class DefaultGatewayServices implements GatewayServices {
metricsService.start();
}
+ @Override
public void stop() throws ServiceLifecycleException {
ms.stop();
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-server/src/main/java/org/apache/knox/gateway/services/metrics/impl/instr/InstrHttpClientBuilderProvider.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/services/metrics/impl/instr/InstrHttpClientBuilderProvider.java b/gateway-server/src/main/java/org/apache/knox/gateway/services/metrics/impl/instr/InstrHttpClientBuilderProvider.java
index 4733e63..c7bb39d 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/services/metrics/impl/instr/InstrHttpClientBuilderProvider.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/services/metrics/impl/instr/InstrHttpClientBuilderProvider.java
@@ -47,6 +47,7 @@ public class InstrHttpClientBuilderProvider implements
}
private static final HttpClientMetricNameStrategy TOPOLOGY_URL_AND_METHOD = new HttpClientMetricNameStrategy() {
+ @Override
public String getNameFor(String name, HttpRequest request) {
try {
String context = "";
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-server/src/main/java/org/apache/knox/gateway/services/metrics/impl/reporters/AbstractMetricsReporter.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/services/metrics/impl/reporters/AbstractMetricsReporter.java b/gateway-server/src/main/java/org/apache/knox/gateway/services/metrics/impl/reporters/AbstractMetricsReporter.java
index 8f685b2..9ec3cb5 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/services/metrics/impl/reporters/AbstractMetricsReporter.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/services/metrics/impl/reporters/AbstractMetricsReporter.java
@@ -22,6 +22,7 @@ import org.apache.knox.gateway.services.metrics.MetricsReporter;
public abstract class AbstractMetricsReporter implements MetricsReporter {
private boolean enabled = false;
+ @Override
public boolean isEnabled() {
return enabled;
}
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-server/src/main/java/org/apache/knox/gateway/services/registry/impl/DefaultServiceRegistryService.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/services/registry/impl/DefaultServiceRegistryService.java b/gateway-server/src/main/java/org/apache/knox/gateway/services/registry/impl/DefaultServiceRegistryService.java
index 5a7e63b..6ae4778 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/services/registry/impl/DefaultServiceRegistryService.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/services/registry/impl/DefaultServiceRegistryService.java
@@ -62,6 +62,7 @@ public class DefaultServiceRegistryService implements ServiceRegistry, Service {
this.crypto = crypto;
}
+ @Override
public String getRegistrationCode(String clusterName) {
String code = generateRegCode(16);
byte[] signature = crypto.sign("SHA256withRSA","gateway-identity",code);
@@ -79,10 +80,12 @@ public class DefaultServiceRegistryService implements ServiceRegistry, Service {
return sb.toString();
}
+ @Override
public void removeClusterServices(String clusterName) {
registry.remove(clusterName);
}
+ @Override
public boolean registerService(String regCode, String clusterName, String serviceName, List<String> urls) {
boolean rc = false;
// verify the signature of the regCode
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-server/src/main/java/org/apache/knox/gateway/services/security/impl/DefaultKeystoreService.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/services/security/impl/DefaultKeystoreService.java b/gateway-server/src/main/java/org/apache/knox/gateway/services/security/impl/DefaultKeystoreService.java
index c2c7a17..d232305 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/services/security/impl/DefaultKeystoreService.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/services/security/impl/DefaultKeystoreService.java
@@ -343,6 +343,7 @@ public class DefaultKeystoreService extends BaseKeystoreService implements
}
}
+ @Override
public KeyStore getCredentialStoreForCluster(String clusterName)
throws KeystoreServiceException {
final File keyStoreFile = new File( keyStoreDir + clusterName + CREDENTIALS_SUFFIX );
@@ -355,7 +356,8 @@ public class DefaultKeystoreService extends BaseKeystoreService implements
}
}
- public void addCredentialForCluster(String clusterName, String alias, String value)
+ @Override
+ public void addCredentialForCluster(String clusterName, String alias, String value)
throws KeystoreServiceException {
writeLock.lock();
try {
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-server/src/main/java/org/apache/knox/gateway/services/security/impl/JettySSLService.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/services/security/impl/JettySSLService.java b/gateway-server/src/main/java/org/apache/knox/gateway/services/security/impl/JettySSLService.java
index c90fbf7..3a17938 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/services/security/impl/JettySSLService.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/services/security/impl/JettySSLService.java
@@ -168,7 +168,8 @@ public class JettySSLService implements SSLService {
}
}
- public Object buildSslContextFactory( String keystoreFileName ) throws KeyStoreException, IOException, CertificateException, NoSuchAlgorithmException {
+ @Override
+ public Object buildSslContextFactory(String keystoreFileName ) throws KeyStoreException, IOException, CertificateException, NoSuchAlgorithmException {
SslContextFactory sslContextFactory = new SslContextFactory( true );
sslContextFactory.setCertAlias( "gateway-identity" );
sslContextFactory.setKeyStoreType(keystoreType);
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-server/src/main/java/org/apache/knox/gateway/services/security/impl/RemoteAliasService.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/services/security/impl/RemoteAliasService.java b/gateway-server/src/main/java/org/apache/knox/gateway/services/security/impl/RemoteAliasService.java
index 52507c2..91c6365 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/services/security/impl/RemoteAliasService.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/services/security/impl/RemoteAliasService.java
@@ -71,22 +71,27 @@ public class RemoteAliasService implements AliasService {
static {
AUTHENTICATED_USERS_ALL = new RemoteConfigurationRegistryClient.EntryACL() {
+ @Override
public String getId() {
return "";
}
+ @Override
public String getType() {
return "auth";
}
+ @Override
public Object getPermissions() {
return ZooDefs.Perms.ALL;
}
+ @Override
public boolean canRead() {
return true;
}
+ @Override
public boolean canWrite() {
return true;
}
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-server/src/main/java/org/apache/knox/gateway/services/topology/impl/DefaultTopologyService.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/services/topology/impl/DefaultTopologyService.java b/gateway-server/src/main/java/org/apache/knox/gateway/services/topology/impl/DefaultTopologyService.java
index 6f5d73d..01d2c51 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/services/topology/impl/DefaultTopologyService.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/services/topology/impl/DefaultTopologyService.java
@@ -307,6 +307,7 @@ public class DefaultTopologyService
this.aliasService = as;
}
+ @Override
public void deployTopology(Topology t){
try {
@@ -349,6 +350,7 @@ public class DefaultTopologyService
reloadTopologies();
}
+ @Override
public void redeployTopologies(String topologyName) {
for (Topology topology : getTopologies()) {
@@ -359,6 +361,7 @@ public class DefaultTopologyService
}
+ @Override
public void reloadTopologies() {
try {
synchronized (this) {
@@ -374,6 +377,7 @@ public class DefaultTopologyService
}
}
+ @Override
public void deleteTopology(Topology t) {
File topoDir = topologiesDirectory;
@@ -399,6 +403,7 @@ public class DefaultTopologyService
}
}
+ @Override
public Map<String, List<String>> getServiceTestURLs(Topology t, GatewayConfig config) {
File tFile = null;
Map<String, List<String>> urls = new HashMap<>();
@@ -420,6 +425,7 @@ public class DefaultTopologyService
return urls;
}
+ @Override
public Collection<Topology> getTopologies() {
Map<File, Topology> map = topologies;
return Collections.unmodifiableCollection(map.values());
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-server/src/main/java/org/apache/knox/gateway/topology/builder/BeanPropertyTopologyBuilder.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/topology/builder/BeanPropertyTopologyBuilder.java b/gateway-server/src/main/java/org/apache/knox/gateway/topology/builder/BeanPropertyTopologyBuilder.java
index 2b4f6ac..749e149 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/topology/builder/BeanPropertyTopologyBuilder.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/topology/builder/BeanPropertyTopologyBuilder.java
@@ -93,6 +93,7 @@ public class BeanPropertyTopologyBuilder implements TopologyBuilder {
return applications;
}
+ @Override
public Topology build() {
Topology topology = new Topology();
topology.setName(name);
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-server/src/main/java/org/apache/knox/gateway/topology/builder/PropertyTopologyBuilder.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/topology/builder/PropertyTopologyBuilder.java b/gateway-server/src/main/java/org/apache/knox/gateway/topology/builder/PropertyTopologyBuilder.java
index 6a19786..a7d053e 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/topology/builder/PropertyTopologyBuilder.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/topology/builder/PropertyTopologyBuilder.java
@@ -48,6 +48,7 @@ public class PropertyTopologyBuilder implements TopologyBuilder {
return properties;
}
+ @Override
public Topology build() {
Topology topology = new Topology();
PropertyInterpreter propertyInterpreter = new PropertyInterpreter(topology);