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/12/07 23:49:14 UTC
[01/10] knox git commit: KNOX-1663 - Enforce more Checkstyle rules
Repository: knox
Updated Branches:
refs/heads/master 8e004963b -> 6736393dd
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-task-counters.json
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-task-counters.json b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-task-counters.json
index fa13d8a..07f2c29 100644
--- a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-task-counters.json
+++ b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-task-counters.json
@@ -1,155 +1,155 @@
{
- "jobTaskCounters":{
- "id":"task_1399541193872_0036_r_000000",
- "taskCounterGroup":[
- {
- "counterGroupName":"org.apache.hadoop.mapreduce.FileSystemCounter",
- "counter":[
- {
- "name":"FILE_BYTES_READ",
- "value":393216
- },
- {
- "name":"FILE_BYTES_WRITTEN",
- "value":4883518
- },
- {
- "name":"FILE_READ_OPS",
- "value":0
- },
- {
- "name":"FILE_LARGE_READ_OPS",
- "value":0
- },
- {
- "name":"FILE_WRITE_OPS",
- "value":0
- },
- {
- "name":"HDFS_BYTES_READ",
- "value":0
- },
- {
- "name":"HDFS_BYTES_WRITTEN",
- "value":0
- },
- {
- "name":"HDFS_READ_OPS",
- "value":0
- },
- {
- "name":"HDFS_LARGE_READ_OPS",
- "value":0
- },
- {
- "name":"HDFS_WRITE_OPS",
- "value":0
- }
- ]
- },
- {
- "counterGroupName":"org.apache.hadoop.mapreduce.TaskCounter",
- "counter":[
- {
- "name":"COMBINE_INPUT_RECORDS",
- "value":0
- },
- {
- "name":"COMBINE_OUTPUT_RECORDS",
- "value":0
- },
- {
- "name":"REDUCE_INPUT_GROUPS",
- "value":68609
- },
- {
- "name":"REDUCE_SHUFFLE_BYTES",
- "value":4780221
- },
- {
- "name":"REDUCE_INPUT_RECORDS",
- "value":68609
- },
- {
- "name":"REDUCE_OUTPUT_RECORDS",
- "value":0
- },
- {
- "name":"SPILLED_RECORDS",
- "value":0
- },
- {
- "name":"SHUFFLED_MAPS",
- "value":1
- },
- {
- "name":"FAILED_SHUFFLE",
- "value":0
- },
- {
- "name":"MERGED_MAP_OUTPUTS",
- "value":1
- },
- {
- "name":"GC_TIME_MILLIS",
- "value":4356
- },
- {
- "name":"CPU_MILLISECONDS",
- "value":67070
- },
- {
- "name":"PHYSICAL_MEMORY_BYTES",
- "value":110243840
- },
- {
- "name":"VIRTUAL_MEMORY_BYTES",
- "value":2812141568
- },
- {
- "name":"COMMITTED_HEAP_BYTES",
- "value":30474240
- }
- ]
- },
- {
- "counterGroupName":"Shuffle Errors",
- "counter":[
- {
- "name":"BAD_ID",
- "value":0
- },
- {
- "name":"CONNECTION",
- "value":0
- },
- {
- "name":"IO_ERROR",
- "value":0
- },
- {
- "name":"WRONG_LENGTH",
- "value":0
- },
- {
- "name":"WRONG_MAP",
- "value":0
- },
- {
- "name":"WRONG_REDUCE",
- "value":0
- }
- ]
- },
- {
- "counterGroupName":"org.apache.hadoop.mapreduce.lib.output.FileOutputFormatCounter",
- "counter":[
- {
- "name":"BYTES_WRITTEN",
- "value":0
- }
- ]
- }
- ]
- }
+ "jobTaskCounters":{
+ "id":"task_1399541193872_0036_r_000000",
+ "taskCounterGroup":[
+ {
+ "counterGroupName":"org.apache.hadoop.mapreduce.FileSystemCounter",
+ "counter":[
+ {
+ "name":"FILE_BYTES_READ",
+ "value":393216
+ },
+ {
+ "name":"FILE_BYTES_WRITTEN",
+ "value":4883518
+ },
+ {
+ "name":"FILE_READ_OPS",
+ "value":0
+ },
+ {
+ "name":"FILE_LARGE_READ_OPS",
+ "value":0
+ },
+ {
+ "name":"FILE_WRITE_OPS",
+ "value":0
+ },
+ {
+ "name":"HDFS_BYTES_READ",
+ "value":0
+ },
+ {
+ "name":"HDFS_BYTES_WRITTEN",
+ "value":0
+ },
+ {
+ "name":"HDFS_READ_OPS",
+ "value":0
+ },
+ {
+ "name":"HDFS_LARGE_READ_OPS",
+ "value":0
+ },
+ {
+ "name":"HDFS_WRITE_OPS",
+ "value":0
+ }
+ ]
+ },
+ {
+ "counterGroupName":"org.apache.hadoop.mapreduce.TaskCounter",
+ "counter":[
+ {
+ "name":"COMBINE_INPUT_RECORDS",
+ "value":0
+ },
+ {
+ "name":"COMBINE_OUTPUT_RECORDS",
+ "value":0
+ },
+ {
+ "name":"REDUCE_INPUT_GROUPS",
+ "value":68609
+ },
+ {
+ "name":"REDUCE_SHUFFLE_BYTES",
+ "value":4780221
+ },
+ {
+ "name":"REDUCE_INPUT_RECORDS",
+ "value":68609
+ },
+ {
+ "name":"REDUCE_OUTPUT_RECORDS",
+ "value":0
+ },
+ {
+ "name":"SPILLED_RECORDS",
+ "value":0
+ },
+ {
+ "name":"SHUFFLED_MAPS",
+ "value":1
+ },
+ {
+ "name":"FAILED_SHUFFLE",
+ "value":0
+ },
+ {
+ "name":"MERGED_MAP_OUTPUTS",
+ "value":1
+ },
+ {
+ "name":"GC_TIME_MILLIS",
+ "value":4356
+ },
+ {
+ "name":"CPU_MILLISECONDS",
+ "value":67070
+ },
+ {
+ "name":"PHYSICAL_MEMORY_BYTES",
+ "value":110243840
+ },
+ {
+ "name":"VIRTUAL_MEMORY_BYTES",
+ "value":2812141568
+ },
+ {
+ "name":"COMMITTED_HEAP_BYTES",
+ "value":30474240
+ }
+ ]
+ },
+ {
+ "counterGroupName":"Shuffle Errors",
+ "counter":[
+ {
+ "name":"BAD_ID",
+ "value":0
+ },
+ {
+ "name":"CONNECTION",
+ "value":0
+ },
+ {
+ "name":"IO_ERROR",
+ "value":0
+ },
+ {
+ "name":"WRONG_LENGTH",
+ "value":0
+ },
+ {
+ "name":"WRONG_MAP",
+ "value":0
+ },
+ {
+ "name":"WRONG_REDUCE",
+ "value":0
+ }
+ ]
+ },
+ {
+ "counterGroupName":"org.apache.hadoop.mapreduce.lib.output.FileOutputFormatCounter",
+ "counter":[
+ {
+ "name":"BYTES_WRITTEN",
+ "value":0
+ }
+ ]
+ }
+ ]
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-task-counters.xml
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-task-counters.xml b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-task-counters.xml
index 2d11078..4566f94 100644
--- a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-task-counters.xml
+++ b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-task-counters.xml
@@ -16,145 +16,145 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
<jobTaskCounters>
- <id>task_1399541193872_0036_r_000000</id>
- <taskCounterGroup>
- <counterGroupName>org.apache.hadoop.mapreduce.FileSystemCounter</counterGroupName>
- <counter>
- <name>FILE_BYTES_READ</name>
- <value>393216</value>
- </counter>
- <counter>
- <name>FILE_BYTES_WRITTEN</name>
- <value>4883518</value>
- </counter>
- <counter>
- <name>FILE_READ_OPS</name>
- <value>0</value>
- </counter>
- <counter>
- <name>FILE_LARGE_READ_OPS</name>
- <value>0</value>
- </counter>
- <counter>
- <name>FILE_WRITE_OPS</name>
- <value>0</value>
- </counter>
- <counter>
- <name>HDFS_BYTES_READ</name>
- <value>0</value>
- </counter>
- <counter>
- <name>HDFS_BYTES_WRITTEN</name>
- <value>0</value>
- </counter>
- <counter>
- <name>HDFS_READ_OPS</name>
- <value>0</value>
- </counter>
- <counter>
- <name>HDFS_LARGE_READ_OPS</name>
- <value>0</value>
- </counter>
- <counter>
- <name>HDFS_WRITE_OPS</name>
- <value>0</value>
- </counter>
- </taskCounterGroup>
- <taskCounterGroup>
- <counterGroupName>org.apache.hadoop.mapreduce.TaskCounter</counterGroupName>
- <counter>
- <name>COMBINE_INPUT_RECORDS</name>
- <value>0</value>
- </counter>
- <counter>
- <name>COMBINE_OUTPUT_RECORDS</name>
- <value>0</value>
- </counter>
- <counter>
- <name>REDUCE_INPUT_GROUPS</name>
- <value>70961</value>
- </counter>
- <counter>
- <name>REDUCE_SHUFFLE_BYTES</name>
- <value>4780221</value>
- </counter>
- <counter>
- <name>REDUCE_INPUT_RECORDS</name>
- <value>70961</value>
- </counter>
- <counter>
- <name>REDUCE_OUTPUT_RECORDS</name>
- <value>0</value>
- </counter>
- <counter>
- <name>SPILLED_RECORDS</name>
- <value>0</value>
- </counter>
- <counter>
- <name>SHUFFLED_MAPS</name>
- <value>1</value>
- </counter>
- <counter>
- <name>FAILED_SHUFFLE</name>
- <value>0</value>
- </counter>
- <counter>
- <name>MERGED_MAP_OUTPUTS</name>
- <value>1</value>
- </counter>
- <counter>
- <name>GC_TIME_MILLIS</name>
- <value>4459</value>
- </counter>
- <counter>
- <name>CPU_MILLISECONDS</name>
- <value>68810</value>
- </counter>
- <counter>
- <name>PHYSICAL_MEMORY_BYTES</name>
- <value>110243840</value>
- </counter>
- <counter>
- <name>VIRTUAL_MEMORY_BYTES</name>
- <value>2812141568</value>
- </counter>
- <counter>
- <name>COMMITTED_HEAP_BYTES</name>
- <value>30474240</value>
- </counter>
- </taskCounterGroup>
- <taskCounterGroup>
- <counterGroupName>Shuffle Errors</counterGroupName>
- <counter>
- <name>BAD_ID</name>
- <value>0</value>
- </counter>
- <counter>
- <name>CONNECTION</name>
- <value>0</value>
- </counter>
- <counter>
- <name>IO_ERROR</name>
- <value>0</value>
- </counter>
- <counter>
- <name>WRONG_LENGTH</name>
- <value>0</value>
- </counter>
- <counter>
- <name>WRONG_MAP</name>
- <value>0</value>
- </counter>
- <counter>
- <name>WRONG_REDUCE</name>
- <value>0</value>
- </counter>
- </taskCounterGroup>
- <taskCounterGroup>
- <counterGroupName>org.apache.hadoop.mapreduce.lib.output.FileOutputFormatCounter</counterGroupName>
- <counter>
- <name>BYTES_WRITTEN</name>
- <value>0</value>
- </counter>
- </taskCounterGroup>
+ <id>task_1399541193872_0036_r_000000</id>
+ <taskCounterGroup>
+ <counterGroupName>org.apache.hadoop.mapreduce.FileSystemCounter</counterGroupName>
+ <counter>
+ <name>FILE_BYTES_READ</name>
+ <value>393216</value>
+ </counter>
+ <counter>
+ <name>FILE_BYTES_WRITTEN</name>
+ <value>4883518</value>
+ </counter>
+ <counter>
+ <name>FILE_READ_OPS</name>
+ <value>0</value>
+ </counter>
+ <counter>
+ <name>FILE_LARGE_READ_OPS</name>
+ <value>0</value>
+ </counter>
+ <counter>
+ <name>FILE_WRITE_OPS</name>
+ <value>0</value>
+ </counter>
+ <counter>
+ <name>HDFS_BYTES_READ</name>
+ <value>0</value>
+ </counter>
+ <counter>
+ <name>HDFS_BYTES_WRITTEN</name>
+ <value>0</value>
+ </counter>
+ <counter>
+ <name>HDFS_READ_OPS</name>
+ <value>0</value>
+ </counter>
+ <counter>
+ <name>HDFS_LARGE_READ_OPS</name>
+ <value>0</value>
+ </counter>
+ <counter>
+ <name>HDFS_WRITE_OPS</name>
+ <value>0</value>
+ </counter>
+ </taskCounterGroup>
+ <taskCounterGroup>
+ <counterGroupName>org.apache.hadoop.mapreduce.TaskCounter</counterGroupName>
+ <counter>
+ <name>COMBINE_INPUT_RECORDS</name>
+ <value>0</value>
+ </counter>
+ <counter>
+ <name>COMBINE_OUTPUT_RECORDS</name>
+ <value>0</value>
+ </counter>
+ <counter>
+ <name>REDUCE_INPUT_GROUPS</name>
+ <value>70961</value>
+ </counter>
+ <counter>
+ <name>REDUCE_SHUFFLE_BYTES</name>
+ <value>4780221</value>
+ </counter>
+ <counter>
+ <name>REDUCE_INPUT_RECORDS</name>
+ <value>70961</value>
+ </counter>
+ <counter>
+ <name>REDUCE_OUTPUT_RECORDS</name>
+ <value>0</value>
+ </counter>
+ <counter>
+ <name>SPILLED_RECORDS</name>
+ <value>0</value>
+ </counter>
+ <counter>
+ <name>SHUFFLED_MAPS</name>
+ <value>1</value>
+ </counter>
+ <counter>
+ <name>FAILED_SHUFFLE</name>
+ <value>0</value>
+ </counter>
+ <counter>
+ <name>MERGED_MAP_OUTPUTS</name>
+ <value>1</value>
+ </counter>
+ <counter>
+ <name>GC_TIME_MILLIS</name>
+ <value>4459</value>
+ </counter>
+ <counter>
+ <name>CPU_MILLISECONDS</name>
+ <value>68810</value>
+ </counter>
+ <counter>
+ <name>PHYSICAL_MEMORY_BYTES</name>
+ <value>110243840</value>
+ </counter>
+ <counter>
+ <name>VIRTUAL_MEMORY_BYTES</name>
+ <value>2812141568</value>
+ </counter>
+ <counter>
+ <name>COMMITTED_HEAP_BYTES</name>
+ <value>30474240</value>
+ </counter>
+ </taskCounterGroup>
+ <taskCounterGroup>
+ <counterGroupName>Shuffle Errors</counterGroupName>
+ <counter>
+ <name>BAD_ID</name>
+ <value>0</value>
+ </counter>
+ <counter>
+ <name>CONNECTION</name>
+ <value>0</value>
+ </counter>
+ <counter>
+ <name>IO_ERROR</name>
+ <value>0</value>
+ </counter>
+ <counter>
+ <name>WRONG_LENGTH</name>
+ <value>0</value>
+ </counter>
+ <counter>
+ <name>WRONG_MAP</name>
+ <value>0</value>
+ </counter>
+ <counter>
+ <name>WRONG_REDUCE</name>
+ <value>0</value>
+ </counter>
+ </taskCounterGroup>
+ <taskCounterGroup>
+ <counterGroupName>org.apache.hadoop.mapreduce.lib.output.FileOutputFormatCounter</counterGroupName>
+ <counter>
+ <name>BYTES_WRITTEN</name>
+ <value>0</value>
+ </counter>
+ </taskCounterGroup>
</jobTaskCounters>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-task.json
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-task.json b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-task.json
index ce53291..5ef8a08 100644
--- a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-task.json
+++ b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-task.json
@@ -1,13 +1,13 @@
{
- "task":{
- "startTime":1401273289105,
- "finishTime":0,
- "elapsedTime":3343308,
- "progress":67.33751,
- "id":"task_1399541193872_0036_r_000000",
- "state":"RUNNING",
- "type":"REDUCE",
- "successfulAttempt":"",
- "status":"Sleeping... (116684700) ms left > reduce"
- }
+ "task":{
+ "startTime":1401273289105,
+ "finishTime":0,
+ "elapsedTime":3343308,
+ "progress":67.33751,
+ "id":"task_1399541193872_0036_r_000000",
+ "state":"RUNNING",
+ "type":"REDUCE",
+ "successfulAttempt":"",
+ "status":"Sleeping... (116684700) ms left > reduce"
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-task.xml
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-task.xml b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-task.xml
index a00e5c6..7aa40c3 100644
--- a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-task.xml
+++ b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-task.xml
@@ -16,13 +16,13 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
<task>
- <startTime>1401273289105</startTime>
- <finishTime>0</finishTime>
- <elapsedTime>2531116</elapsedTime>
- <progress>67.33751</progress>
- <id>task_1399541193872_0036_r_000000</id>
- <state>RUNNING</state>
- <type>REDUCE</type>
- <successfulAttempt></successfulAttempt>
- <status>Sleeping... (117493500) ms left > reduce</status>
+ <startTime>1401273289105</startTime>
+ <finishTime>0</finishTime>
+ <elapsedTime>2531116</elapsedTime>
+ <progress>67.33751</progress>
+ <id>task_1399541193872_0036_r_000000</id>
+ <state>RUNNING</state>
+ <type>REDUCE</type>
+ <successfulAttempt></successfulAttempt>
+ <status>Sleeping... (117493500) ms left > reduce</status>
</task>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-tasks.json
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-tasks.json b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-tasks.json
index ce1fa51..c9b4f74 100644
--- a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-tasks.json
+++ b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-tasks.json
@@ -1,28 +1,28 @@
{
- "tasks":{
- "task":[
- {
- "startTime":1401273271711,
- "finishTime":1401273284990,
- "elapsedTime":13279,
- "progress":100.0,
- "id":"task_1399541193872_0036_m_000000",
- "state":"SUCCEEDED",
- "type":"MAP",
- "successfulAttempt":"attempt_1399541193872_0036_m_000000_0",
- "status":"Sleeping... (20) ms left"
- },
- {
- "startTime":1401273289105,
- "finishTime":0,
- "elapsedTime":31069,
- "progress":67.33751,
- "id":"task_1399541193872_0036_r_000000",
- "state":"RUNNING",
- "type":"REDUCE",
- "successfulAttempt":"",
- "status":"Sleeping... (119977500) ms left > reduce"
- }
- ]
- }
+ "tasks":{
+ "task":[
+ {
+ "startTime":1401273271711,
+ "finishTime":1401273284990,
+ "elapsedTime":13279,
+ "progress":100.0,
+ "id":"task_1399541193872_0036_m_000000",
+ "state":"SUCCEEDED",
+ "type":"MAP",
+ "successfulAttempt":"attempt_1399541193872_0036_m_000000_0",
+ "status":"Sleeping... (20) ms left"
+ },
+ {
+ "startTime":1401273289105,
+ "finishTime":0,
+ "elapsedTime":31069,
+ "progress":67.33751,
+ "id":"task_1399541193872_0036_r_000000",
+ "state":"RUNNING",
+ "type":"REDUCE",
+ "successfulAttempt":"",
+ "status":"Sleeping... (119977500) ms left > reduce"
+ }
+ ]
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-tasks.xml
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-tasks.xml b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-tasks.xml
index 66e5177..90de881 100644
--- a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-tasks.xml
+++ b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-tasks.xml
@@ -16,27 +16,27 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
<tasks>
- <task>
- <startTime>1401273271711</startTime>
- <finishTime>1401273284990</finishTime>
- <elapsedTime>13279</elapsedTime>
- <progress>100.0</progress>
- <id>task_1399541193872_0036_m_000000</id>
- <state>SUCCEEDED</state>
- <type>MAP</type>
- <successfulAttempt>attempt_1399541193872_0036_m_000000_0
- </successfulAttempt>
- <status>Sleeping... (20) ms left</status>
- </task>
- <task>
- <startTime>1401273289105</startTime>
- <finishTime>0</finishTime>
- <elapsedTime>269880</elapsedTime>
- <progress>67.33751</progress>
- <id>task_1399541193872_0036_r_000000</id>
- <state>RUNNING</state>
- <type>REDUCE</type>
- <successfulAttempt></successfulAttempt>
- <status>Sleeping... (119742300) ms left > reduce</status>
- </task>
+ <task>
+ <startTime>1401273271711</startTime>
+ <finishTime>1401273284990</finishTime>
+ <elapsedTime>13279</elapsedTime>
+ <progress>100.0</progress>
+ <id>task_1399541193872_0036_m_000000</id>
+ <state>SUCCEEDED</state>
+ <type>MAP</type>
+ <successfulAttempt>attempt_1399541193872_0036_m_000000_0
+ </successfulAttempt>
+ <status>Sleeping... (20) ms left</status>
+ </task>
+ <task>
+ <startTime>1401273289105</startTime>
+ <finishTime>0</finishTime>
+ <elapsedTime>269880</elapsedTime>
+ <progress>67.33751</progress>
+ <id>task_1399541193872_0036_r_000000</id>
+ <state>RUNNING</state>
+ <type>REDUCE</type>
+ <successfulAttempt></successfulAttempt>
+ <status>Sleeping... (119742300) ms left > reduce</status>
+ </task>
</tasks>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/scheduler.json
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/scheduler.json b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/scheduler.json
index d348d92..daf2d52 100644
--- a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/scheduler.json
+++ b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/scheduler.json
@@ -1,41 +1,41 @@
{
- "scheduler":{
- "schedulerInfo":{
- "type":"capacityScheduler",
- "capacity":100.0,
- "usedCapacity":0.0,
- "maxCapacity":100.0,
- "queueName":"root",
- "queues":{
- "queue":[
- {
- "type":"capacitySchedulerLeafQueueInfo",
- "capacity":100.0,
- "usedCapacity":0.0,
- "maxCapacity":100.0,
- "absoluteCapacity":100.0,
- "absoluteMaxCapacity":100.0,
- "absoluteUsedCapacity":0.0,
- "numApplications":0,
- "queueName":"default",
- "state":"RUNNING",
- "resourcesUsed":{
- "memory":0,
- "vCores":0
- },
- "numActiveApplications":0,
- "numPendingApplications":0,
- "numContainers":0,
- "maxApplications":10000,
- "maxApplicationsPerUser":10000,
- "maxActiveApplications":26,
- "maxActiveApplicationsPerUser":26,
- "userLimit":100,
- "users":null,
- "userLimitFactor":1.0
- }
- ]
- }
- }
- }
+ "scheduler":{
+ "schedulerInfo":{
+ "type":"capacityScheduler",
+ "capacity":100.0,
+ "usedCapacity":0.0,
+ "maxCapacity":100.0,
+ "queueName":"root",
+ "queues":{
+ "queue":[
+ {
+ "type":"capacitySchedulerLeafQueueInfo",
+ "capacity":100.0,
+ "usedCapacity":0.0,
+ "maxCapacity":100.0,
+ "absoluteCapacity":100.0,
+ "absoluteMaxCapacity":100.0,
+ "absoluteUsedCapacity":0.0,
+ "numApplications":0,
+ "queueName":"default",
+ "state":"RUNNING",
+ "resourcesUsed":{
+ "memory":0,
+ "vCores":0
+ },
+ "numActiveApplications":0,
+ "numPendingApplications":0,
+ "numContainers":0,
+ "maxApplications":10000,
+ "maxApplicationsPerUser":10000,
+ "maxActiveApplications":26,
+ "maxActiveApplicationsPerUser":26,
+ "userLimit":100,
+ "users":null,
+ "userLimitFactor":1.0
+ }
+ ]
+ }
+ }
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/scheduler.xml
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/scheduler.xml b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/scheduler.xml
index 7e4b0f1..d124b16 100644
--- a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/scheduler.xml
+++ b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/scheduler.xml
@@ -16,38 +16,38 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
<scheduler>
- <schedulerInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:type="capacityScheduler">
- <capacity>100.0</capacity>
- <usedCapacity>0.0</usedCapacity>
- <maxCapacity>100.0</maxCapacity>
- <queueName>root</queueName>
- <queues>
- <queue xsi:type="capacitySchedulerLeafQueueInfo">
- <capacity>100.0</capacity>
- <usedCapacity>0.0</usedCapacity>
- <maxCapacity>100.0</maxCapacity>
- <absoluteCapacity>100.0</absoluteCapacity>
- <absoluteMaxCapacity>100.0</absoluteMaxCapacity>
- <absoluteUsedCapacity>0.0</absoluteUsedCapacity>
- <numApplications>0</numApplications>
- <queueName>default</queueName>
- <state>RUNNING</state>
- <resourcesUsed>
- <memory>0</memory>
- <vCores>0</vCores>
- </resourcesUsed>
- <numActiveApplications>0</numActiveApplications>
- <numPendingApplications>0</numPendingApplications>
- <numContainers>0</numContainers>
- <maxApplications>10000</maxApplications>
- <maxApplicationsPerUser>10000</maxApplicationsPerUser>
- <maxActiveApplications>26</maxActiveApplications>
- <maxActiveApplicationsPerUser>26</maxActiveApplicationsPerUser>
- <userLimit>100</userLimit>
- <users></users>
- <userLimitFactor>1.0</userLimitFactor>
- </queue>
- </queues>
- </schedulerInfo>
+ <schedulerInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:type="capacityScheduler">
+ <capacity>100.0</capacity>
+ <usedCapacity>0.0</usedCapacity>
+ <maxCapacity>100.0</maxCapacity>
+ <queueName>root</queueName>
+ <queues>
+ <queue xsi:type="capacitySchedulerLeafQueueInfo">
+ <capacity>100.0</capacity>
+ <usedCapacity>0.0</usedCapacity>
+ <maxCapacity>100.0</maxCapacity>
+ <absoluteCapacity>100.0</absoluteCapacity>
+ <absoluteMaxCapacity>100.0</absoluteMaxCapacity>
+ <absoluteUsedCapacity>0.0</absoluteUsedCapacity>
+ <numApplications>0</numApplications>
+ <queueName>default</queueName>
+ <state>RUNNING</state>
+ <resourcesUsed>
+ <memory>0</memory>
+ <vCores>0</vCores>
+ </resourcesUsed>
+ <numActiveApplications>0</numActiveApplications>
+ <numPendingApplications>0</numPendingApplications>
+ <numContainers>0</numContainers>
+ <maxApplications>10000</maxApplications>
+ <maxApplicationsPerUser>10000</maxApplicationsPerUser>
+ <maxActiveApplications>26</maxActiveApplications>
+ <maxActiveApplicationsPerUser>26</maxActiveApplicationsPerUser>
+ <userLimit>100</userLimit>
+ <users></users>
+ <userLimitFactor>1.0</userLimitFactor>
+ </queue>
+ </queues>
+ </schedulerInfo>
</scheduler>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/api/ActionOutcome.java
----------------------------------------------------------------------
diff --git a/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/api/ActionOutcome.java b/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/api/ActionOutcome.java
index 847962b..8586ee0 100644
--- a/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/api/ActionOutcome.java
+++ b/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/api/ActionOutcome.java
@@ -23,7 +23,6 @@ package org.apache.knox.gateway.audit.api;
* following: "Success", "success", "SUCCESS", "Succeed" Action outcomes doesn't
* restricted to this list and any constants from component's source code may be
* used.
- *
*/
public abstract class ActionOutcome {
private ActionOutcome() {
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/api/AuditContext.java
----------------------------------------------------------------------
diff --git a/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/api/AuditContext.java b/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/api/AuditContext.java
index 1e4652c..24ddbf9 100644
--- a/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/api/AuditContext.java
+++ b/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/api/AuditContext.java
@@ -33,9 +33,9 @@ public interface AuditContext {
String getSystemUsername();
void setSystemUsername( String systemUsername );
-
+
String getTargetServiceName();
-
+
void setTargetServiceName( String targetServiceName );
String getRemoteIp();
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/api/Auditor.java
----------------------------------------------------------------------
diff --git a/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/api/Auditor.java b/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/api/Auditor.java
index e801a3b..aa6e7b3 100644
--- a/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/api/Auditor.java
+++ b/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/api/Auditor.java
@@ -46,7 +46,7 @@ public interface Auditor {
* @param message An arbitrary message to record with the audit event. May be null.
*/
void audit( String action, String resourceName, String resourceType, String outcome, String message );
-
+
/**
* Records a single audit event using context information associated with the current thread.
*
@@ -57,18 +57,17 @@ public interface Auditor {
*/
void audit( String action, String resourceName, String resourceType, String outcome );
-
/**
* The service name established when the Auditor was acquired.
* Every event logged by auditor instance will contain data about service that generated event.
- *
+ *
* @return The service name established when the Auditor was acquired.
*/
String getServiceName();
/**
* The component name established when the Auditor was acquired.
- *
+ *
* @return The component name established when the Auditor was acquired.
*/
String getComponentName();
@@ -78,7 +77,7 @@ public interface Auditor {
* As an example, authentication/authorization operations may be logged to separate security log.
* Or actions on some resources shouldn't be logged into central storage.
* Auditor name provide an ability to logically group audit events, configure theirs filtration and persistence
- *
+ *
* @return The auditor name established when the Auditor was acquired.
*/
String getAuditorName();
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/api/CorrelationContext.java
----------------------------------------------------------------------
diff --git a/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/api/CorrelationContext.java b/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/api/CorrelationContext.java
index 7cf2136..b8179b1 100644
--- a/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/api/CorrelationContext.java
+++ b/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/api/CorrelationContext.java
@@ -65,8 +65,8 @@ public interface CorrelationContext {
void setRootRequestId( String rootRequestId );
/**
- * Would be used to indicate that the context can be cleaned and reused.
- * This is only important if the service would like to maintain a pool of available "empty" context
+ * Would be used to indicate that the context can be cleaned and reused.
+ * This is only important if the service would like to maintain a pool of available "empty" context
* that can be reused to limit memory allocation and garbage collection.
*/
void destroy();
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/api/CorrelationService.java
----------------------------------------------------------------------
diff --git a/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/api/CorrelationService.java b/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/api/CorrelationService.java
index 9d8f721..fb7b2ac 100644
--- a/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/api/CorrelationService.java
+++ b/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/api/CorrelationService.java
@@ -27,7 +27,7 @@ public interface CorrelationService {
/**
* The recommended protocol header name used to transmit the correlation context over the network.
*/
- static final String PROTOCOL_HEADER = "X-Correlation-Context";
+ String PROTOCOL_HEADER = "X-Correlation-Context";
/**
* Creates a new correlation context. The context is attached and empty.
@@ -59,7 +59,7 @@ public interface CorrelationService {
* @return The now detached correlation context. May be null.
*/
CorrelationContext detachContext();
-
+
/**
* Executes the callable within the provided correlation context.
* The provided context is attached and detached around the invocation of the callable.
@@ -70,27 +70,27 @@ public interface CorrelationService {
* @throws Exception Thrown if thrown by the callable's call method.
*/
<T> T execute( CorrelationContext context, Callable<T> callable ) throws Exception;
-
+
/**
* Attaches the externalized correlation context
* @param externalizedContext The externalized correlation context
* @return An attached instance of correlation context that was restored form externalized context
*/
CorrelationContext attachExternalizedContext( byte[] externalizedContext );
-
+
/**
* Detaches the existing attached correlation context and returns it in externalized form.
* @return The detached externalized context
*/
byte[] detachExternalizedContext();
-
+
/**
* Restores correlation context from externalized form.
* @param externalizedContext The externalized correlation context. May not be null.
* @return the correlation context that is not attached yet
*/
CorrelationContext readExternalizedContext( byte[] externalizedContext );
-
+
/**
* Returns externalized correlation context without detaching it from execution scope.
* @return The externalized correlation context
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/log4j/audit/AuditConstants.java
----------------------------------------------------------------------
diff --git a/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/log4j/audit/AuditConstants.java b/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/log4j/audit/AuditConstants.java
index a0afbbc..5a44aaf 100644
--- a/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/log4j/audit/AuditConstants.java
+++ b/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/log4j/audit/AuditConstants.java
@@ -21,14 +21,14 @@ public class AuditConstants {
//resource
public static final String MDC_RESOURCE_TYPE_KEY = "resource_type";
public static final String MDC_RESOURCE_NAME_KEY = "resource_name";
-
+
//Action details
public static final String MDC_ACTION_KEY = "action";
public static final String MDC_OUTCOME_KEY = "outcome";
-
+
public static final String MDC_SERVICE_KEY = "service_name";
public static final String MDC_COMPONENT_KEY = "component_name";
-
+
public static final String DEFAULT_AUDITOR_NAME = "audit";
public static final String KNOX_SERVICE_NAME = "knox";
public static final String KNOX_COMPONENT_NAME = "knox";
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/log4j/audit/Log4jAuditContext.java
----------------------------------------------------------------------
diff --git a/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/log4j/audit/Log4jAuditContext.java b/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/log4j/audit/Log4jAuditContext.java
index e8395fe..2052cf9 100644
--- a/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/log4j/audit/Log4jAuditContext.java
+++ b/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/log4j/audit/Log4jAuditContext.java
@@ -61,12 +61,12 @@ public class Log4jAuditContext implements Serializable, AuditContext {
public void setSystemUsername( String systemUsername ) {
this.systemUsername = systemUsername;
}
-
+
@Override
public String getTargetServiceName() {
return targetServiceName;
}
-
+
@Override
public void setTargetServiceName( String targetServiceName ) {
this.targetServiceName = targetServiceName;
@@ -81,7 +81,7 @@ public class Log4jAuditContext implements Serializable, AuditContext {
public void setRemoteIp( String remoteIp ) {
this.remoteIp = remoteIp;
}
-
+
@Override
public String getRemoteHostname() {
return remoteHostname;
@@ -107,7 +107,6 @@ public class Log4jAuditContext implements Serializable, AuditContext {
}
@Override
- public void destroy() {
+ public void destroy() {
}
-
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/log4j/audit/Log4jAuditService.java
----------------------------------------------------------------------
diff --git a/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/log4j/audit/Log4jAuditService.java b/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/log4j/audit/Log4jAuditService.java
index 5032099..988c677 100644
--- a/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/log4j/audit/Log4jAuditService.java
+++ b/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/log4j/audit/Log4jAuditService.java
@@ -69,7 +69,7 @@ public class Log4jAuditService implements AuditService {
detachContext();
}
}
-
+
@Override
public synchronized Auditor getAuditor( String auditorName, String componentName, String serviceName ) {
String key = auditorName + componentName + serviceName;
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/log4j/audit/Log4jAuditor.java
----------------------------------------------------------------------
diff --git a/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/log4j/audit/Log4jAuditor.java b/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/log4j/audit/Log4jAuditor.java
index 291c703..a3594c5 100644
--- a/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/log4j/audit/Log4jAuditor.java
+++ b/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/log4j/audit/Log4jAuditor.java
@@ -94,7 +94,7 @@ public class Log4jAuditor implements Auditor {
public void audit( String action, String resourceName, String resourceType, String outcome, String message ) {
auditLog( action, resourceName, resourceType, outcome, message );
}
-
+
@Override
public void audit( String action, String resourceName, String resourceType, String outcome ) {
auditLog( action, resourceName, resourceType, outcome, null );
@@ -108,9 +108,9 @@ public class Log4jAuditor implements Auditor {
MDC.put( AuditConstants.MDC_OUTCOME_KEY, outcome );
MDC.put( AuditConstants.MDC_SERVICE_KEY, serviceName );
MDC.put( AuditConstants.MDC_COMPONENT_KEY, componentName );
-
+
logger.info( message );
-
+
MDC.remove( AuditConstants.MDC_ACTION_KEY );
MDC.remove( AuditConstants.MDC_RESOURCE_NAME_KEY );
MDC.remove( AuditConstants.MDC_RESOURCE_TYPE_KEY );
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/log4j/correlation/Log4jCorrelationService.java
----------------------------------------------------------------------
diff --git a/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/log4j/correlation/Log4jCorrelationService.java b/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/log4j/correlation/Log4jCorrelationService.java
index 8bbfcb6..5b4d9d4 100644
--- a/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/log4j/correlation/Log4jCorrelationService.java
+++ b/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/log4j/correlation/Log4jCorrelationService.java
@@ -30,9 +30,9 @@ import org.apache.knox.gateway.audit.api.CorrelationService;
import org.apache.log4j.MDC;
public class Log4jCorrelationService implements CorrelationService {
-
+
public static final String MDC_CORRELATION_CONTEXT_KEY = "correlation_context";
-
+
@Override
public CorrelationContext createContext() {
CorrelationContext context = getContext();
@@ -61,7 +61,7 @@ public class Log4jCorrelationService implements CorrelationService {
MDC.remove( MDC_CORRELATION_CONTEXT_KEY );
return context;
}
-
+
@Override
public <T> T execute( CorrelationContext context, Callable<T> callable ) throws Exception {
try {
@@ -108,6 +108,5 @@ public class Log4jCorrelationService implements CorrelationService {
}
return baos.toByteArray();
}
-
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/log4j/layout/AuditLayout.java
----------------------------------------------------------------------
diff --git a/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/log4j/layout/AuditLayout.java b/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/log4j/layout/AuditLayout.java
index bda40c8..7a2d817 100644
--- a/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/log4j/layout/AuditLayout.java
+++ b/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/log4j/layout/AuditLayout.java
@@ -30,11 +30,11 @@ import org.apache.log4j.spi.LoggingEvent;
* date time root_request_id|parent_request_id|request_id|channel|target_service|username|proxy_username|system_username|action|resource_type|resource_name|outcome|message
*/
public class AuditLayout extends DateLayout {
-
+
private static final String DATE_FORMAT = "yy/MM/dd HH:mm:ss";
private static final String SEPARATOR = "|";
private StringBuffer sb = new StringBuffer();
-
+
@Override
public void activateOptions() {
setDateFormat( DATE_FORMAT );
@@ -68,7 +68,7 @@ public class AuditLayout extends DateLayout {
public boolean ignoresThrowable() {
return true;
}
-
+
private void appendParameter( String parameter ) {
if ( parameter != null ) {
sb.append( parameter );
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-util-common/src/main/java/org/apache/knox/gateway/util/HttpUtils.java
----------------------------------------------------------------------
diff --git a/gateway-util-common/src/main/java/org/apache/knox/gateway/util/HttpUtils.java b/gateway-util-common/src/main/java/org/apache/knox/gateway/util/HttpUtils.java
index 4e2a742..8f4294c 100644
--- a/gateway-util-common/src/main/java/org/apache/knox/gateway/util/HttpUtils.java
+++ b/gateway-util-common/src/main/java/org/apache/knox/gateway/util/HttpUtils.java
@@ -42,7 +42,7 @@ public class HttpUtils {
if (!queryPairs.containsKey(key)) {
queryPairs.put(key, new ArrayList<String>());
}
- final String value = idx > 0 && pair.length() > idx + 1
+ final String value = idx > 0 && pair.length() > idx + 1
? URLDecoder.decode(pair.substring(idx + 1), StandardCharsets.UTF_8.name()) : "";
queryPairs.get(key).add(value);
}
@@ -95,7 +95,7 @@ public class HttpUtils {
return map;
}
- private static final String urlDecodeUtf8( String s ) {
+ private static String urlDecodeUtf8( String s ) {
if( s != null ) {
try {
s = URLDecoder.decode( s, StandardCharsets.UTF_8.name() );
@@ -106,7 +106,7 @@ public class HttpUtils {
return s;
}
- static final void addQueryStringParam( final Map<String,String[]> map, String name, String value ) {
+ static void addQueryStringParam(final Map<String,String[]> map, String name, String value ) {
name = urlDecodeUtf8( name );
value = urlDecodeUtf8( value );
String[] values = map.get( name );
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-util-common/src/main/java/org/apache/knox/gateway/util/IpAddressValidator.java
----------------------------------------------------------------------
diff --git a/gateway-util-common/src/main/java/org/apache/knox/gateway/util/IpAddressValidator.java b/gateway-util-common/src/main/java/org/apache/knox/gateway/util/IpAddressValidator.java
index e668ee9..1253bb8 100644
--- a/gateway-util-common/src/main/java/org/apache/knox/gateway/util/IpAddressValidator.java
+++ b/gateway-util-common/src/main/java/org/apache/knox/gateway/util/IpAddressValidator.java
@@ -24,17 +24,16 @@ import java.util.Collections;
* Validate a given IP Address against a list of comma separated list of addresses.
*/
public class IpAddressValidator {
-
/**
- * The parsed list of ip addresses
+ * The parsed list of ip addresses
*/
private ArrayList<String> ipaddr = new ArrayList<>();
-
+
/**
* IP addresses from the ipaddr list that contain a wildcard character '*'
*/
private ArrayList<String> wildCardIPs = new ArrayList<>();
-
+
/**
* Optimization based on empty IP address list or an explicit '*' wildcard
*/
@@ -49,7 +48,7 @@ public class IpAddressValidator {
anyIP = true;
return;
}
-
+
parseIpAddesses(commaSeparatedIpAddresses);
}
@@ -68,14 +67,14 @@ public class IpAddressValidator {
}
}
}
-
+
public boolean validateIpAddress(String addr) {
boolean valid = false;
if (addr == null) {
// LJM TODO: log as possible programming error
return false;
}
-
+
if (anyIP) {
valid = true;
}
@@ -101,7 +100,7 @@ public class IpAddressValidator {
public boolean allowsAnyIP() {
return anyIP;
}
-
+
public ArrayList<String> getIPAddresses() {
return ipaddr;
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/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 c9d537e..9a2a961 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
@@ -291,7 +291,7 @@ public class JsonPath {
return oldMatches;
}
- private static final void addAllChildren( Match parent, List<Match> matches, JsonNode node ) {
+ private static void addAllChildren( Match parent, List<Match> matches, JsonNode node ) {
Match match;
switch( node.getNodeType() ) {
case OBJECT:
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-util-common/src/main/java/org/apache/knox/gateway/util/JsonUtils.java
----------------------------------------------------------------------
diff --git a/gateway-util-common/src/main/java/org/apache/knox/gateway/util/JsonUtils.java b/gateway-util-common/src/main/java/org/apache/knox/gateway/util/JsonUtils.java
index e8cf934..a86e4d1 100644
--- a/gateway-util-common/src/main/java/org/apache/knox/gateway/util/JsonUtils.java
+++ b/gateway-util-common/src/main/java/org/apache/knox/gateway/util/JsonUtils.java
@@ -31,31 +31,28 @@ import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.JsonMappingException;
import com.fasterxml.jackson.databind.ObjectMapper;
-
public class JsonUtils {
-
private static final GatewayUtilCommonMessages LOG = MessagesFactory.get( GatewayUtilCommonMessages.class );
public static String renderAsJsonString(Map<String, Object> map) {
String json = null;
ObjectMapper mapper = new ObjectMapper();
-
+
try {
// write JSON to a file
json = mapper.writeValueAsString(map);
-
} catch ( JsonProcessingException e ) {
LOG.failedToSerializeMapToJSON( map, e );
}
return json;
}
-
+
public static Map<String, String> getMapFromJsonString(String json) {
Map<String, String> map = null;
- JsonFactory factory = new JsonFactory();
- ObjectMapper mapper = new ObjectMapper(factory);
- TypeReference<HashMap<String,String>> typeRef
- = new TypeReference<HashMap<String,String>>() {};
+ JsonFactory factory = new JsonFactory();
+ ObjectMapper mapper = new ObjectMapper(factory);
+ TypeReference<HashMap<String,String>> typeRef
+ = new TypeReference<HashMap<String,String>>() {};
try {
map = mapper.readValue(json, typeRef);
} catch (JsonParseException e) {
@@ -64,7 +61,7 @@ public class JsonUtils {
LOG.failedToGetMapFromJsonString( json, e );
} catch (IOException e) {
LOG.failedToGetMapFromJsonString( json, e );
- }
+ }
return map;
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-util-common/src/main/java/org/apache/knox/gateway/util/X500PrincipalParser.java
----------------------------------------------------------------------
diff --git a/gateway-util-common/src/main/java/org/apache/knox/gateway/util/X500PrincipalParser.java b/gateway-util-common/src/main/java/org/apache/knox/gateway/util/X500PrincipalParser.java
index 44fd365..bb1f3fe 100644
--- a/gateway-util-common/src/main/java/org/apache/knox/gateway/util/X500PrincipalParser.java
+++ b/gateway-util-common/src/main/java/org/apache/knox/gateway/util/X500PrincipalParser.java
@@ -27,7 +27,7 @@ public class X500PrincipalParser
{
public static final int LEASTSIGNIFICANT = 0;
public static final int MOSTSIGNIFICANT = 1;
-
+
public static final String attrCN = "CN";
public static final String attrOU = "OU";
public static final String attrO = "O";
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-util-common/src/main/java/org/apache/knox/gateway/util/XmlUtils.java
----------------------------------------------------------------------
diff --git a/gateway-util-common/src/main/java/org/apache/knox/gateway/util/XmlUtils.java b/gateway-util-common/src/main/java/org/apache/knox/gateway/util/XmlUtils.java
index fa297a3..15a09cc 100644
--- a/gateway-util-common/src/main/java/org/apache/knox/gateway/util/XmlUtils.java
+++ b/gateway-util-common/src/main/java/org/apache/knox/gateway/util/XmlUtils.java
@@ -50,7 +50,7 @@ public class XmlUtils {
DocumentBuilder b = f.newDocumentBuilder();
return b.parse( input );
}
-
+
public static Document readXml( InputSource source ) throws ParserConfigurationException, IOException, SAXException {
DocumentBuilderFactory f = DocumentBuilderFactory.newInstance();
f.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, Boolean.TRUE);
@@ -63,13 +63,13 @@ public class XmlUtils {
Transformer t = XmlUtils.getTransformer( false, true, 4, false );
writeXml( document, writer, t );
}
-
+
public static void writeXml( Document document, Writer writer, Transformer transformer ) throws TransformerException {
DOMSource s = new DOMSource( document );
StreamResult r = new StreamResult( writer );
transformer.transform( s, r );
}
-
+
public static Transformer getTransformer( boolean standalone, boolean indent, int indentNumber,
boolean omitXmlDeclaration) throws TransformerException {
TransformerFactory f = TransformerFactory.newInstance();
@@ -77,7 +77,7 @@ public class XmlUtils {
if ( indent ) {
f.setAttribute( "indent-number", indentNumber );
}
-
+
Transformer t = f.newTransformer();
if ( standalone ) {
t.setOutputProperty( OutputKeys.STANDALONE, "yes" );
@@ -89,14 +89,14 @@ public class XmlUtils {
if ( omitXmlDeclaration ) {
t.setOutputProperty( OutputKeys.OMIT_XML_DECLARATION, "yes" );
}
-
+
return t;
}
public static Document createDocument() throws ParserConfigurationException {
return createDocument(true);
}
-
+
public static Document createDocument(boolean standalone) throws ParserConfigurationException {
DocumentBuilderFactory f = DocumentBuilderFactory.newInstance();
f.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, Boolean.TRUE);
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-util-common/src/test/java/org/apache/knox/gateway/audit/AuditLayoutTest.java
----------------------------------------------------------------------
diff --git a/gateway-util-common/src/test/java/org/apache/knox/gateway/audit/AuditLayoutTest.java b/gateway-util-common/src/test/java/org/apache/knox/gateway/audit/AuditLayoutTest.java
index 5b1b858..88c4c2c 100644
--- a/gateway-util-common/src/test/java/org/apache/knox/gateway/audit/AuditLayoutTest.java
+++ b/gateway-util-common/src/test/java/org/apache/knox/gateway/audit/AuditLayoutTest.java
@@ -48,7 +48,7 @@ public class AuditLayoutTest {
.getCorrelationService();
private static Auditor auditor = auditService.getAuditor( "audit.forward", AuditConstants.KNOX_COMPONENT_NAME, AuditConstants.KNOX_SERVICE_NAME );
private static AuditLayout layout = new AuditLayout();
-
+
private static final String USERNAME = "username";
private static final String PROXYUSERNAME = "proxy_username";
private static final String SYSTEMUSERNAME = "system_username";
@@ -102,13 +102,13 @@ public class AuditLayoutTest {
auditContext.setRemoteHostname( HOST_NAME );
auditContext.setRemoteIp( HOST_ADDRESS );
auditContext.setTargetServiceName( TARGET_SERVICE );
-
+
CorrelationContext correlationContext = correlationService.createContext();
correlationContext.setRequestId( REQUEST_ID );
correlationContext.setParentRequestId( PARENT_REQUEST_ID );
correlationContext.setRootRequestId( ROOT_REQUEST_ID );
auditor.audit( ACTION, RESOURCE_NAME, RESOURCE_TYPE, OUTCOME, MESSAGE );
-
+
assertThat( CollectAppender.queue.size(), is( 1 ) );
LoggingEvent event = CollectAppender.queue.iterator().next();
SimpleDateFormat format = new SimpleDateFormat( "yy/MM/dd HH:mm:ss", Locale.getDefault() );
@@ -121,7 +121,6 @@ public class AuditLayoutTest {
RESOURCE_TYPE, RESOURCE_NAME, OUTCOME, MESSAGE, AuditLayout.LINE_SEP );
String auditOutput = layout.format( event );
assertThat( auditOutput, is( expectedOutput ) );
-
}
@Test
@@ -138,7 +137,6 @@ public class AuditLayoutTest {
EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, ACTION, RESOURCE_TYPE, RESOURCE_NAME, OUTCOME, MESSAGE, AuditLayout.LINE_SEP );
String auditOutput = layout.format( event );
assertThat( auditOutput, is( expectedOutput ) );
-
}
@Test
@@ -156,5 +154,4 @@ public class AuditLayoutTest {
String auditOutput = layout.format( event );
assertThat( auditOutput, is( expectedOutput ) );
}
-
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-util-common/src/test/java/org/apache/knox/gateway/audit/AuditServiceTest.java
----------------------------------------------------------------------
diff --git a/gateway-util-common/src/test/java/org/apache/knox/gateway/audit/AuditServiceTest.java b/gateway-util-common/src/test/java/org/apache/knox/gateway/audit/AuditServiceTest.java
index ea94102..a1b7076 100644
--- a/gateway-util-common/src/test/java/org/apache/knox/gateway/audit/AuditServiceTest.java
+++ b/gateway-util-common/src/test/java/org/apache/knox/gateway/audit/AuditServiceTest.java
@@ -47,7 +47,7 @@ public class AuditServiceTest {
private static AuditService auditService = AuditServiceFactory.getAuditService();
private static CorrelationService correlationService = CorrelationServiceFactory.getCorrelationService();
private static Auditor auditor = AuditServiceFactory.getAuditService().getAuditor( "audit.forward", AuditConstants.KNOX_COMPONENT_NAME, AuditConstants.KNOX_SERVICE_NAME );
-
+
private String username = "user";
private String proxyUsername = "proxyuser";
private String remoteIp = "127.0.0.1";
@@ -78,35 +78,35 @@ public class AuditServiceTest {
@Test
public void testMultipleRequestEvents() {
int iterations = 1000;
-
+
AuditContext ac = auditService.createContext();
ac.setUsername( username );
ac.setProxyUsername( proxyUsername );
ac.setRemoteIp( remoteIp );
ac.setRemoteHostname( remoteHostname );
ac.setTargetServiceName( targetServiceName );
-
+
CorrelationContext cc = correlationService.createContext();
cc.setRequestId( UUID.randomUUID().toString() );
cc.setParentRequestId( UUID.randomUUID().toString() );
cc.setRootRequestId( UUID.randomUUID().toString() );
-
+
CollectAppender.queue.clear();
for( int i = 0; i < iterations; i++ ) {
auditor.audit( "action" + i, "resource" + i, "resource type" + i, "outcome" + i, "message" + i );
}
-
+
auditService.detachContext();
correlationService.detachContext();
assertThat( CollectAppender.queue.size(), is( iterations ) );
-
+
//Verify events number and audit/correlation parameters in each event
Iterator<LoggingEvent> iterator = CollectAppender.queue.iterator();
int counter = 0;
while(iterator.hasNext()) {
LoggingEvent event = iterator.next();
checkLogEventContexts( event, cc, ac );
-
+
assertThat(event.getMDC( AuditConstants.MDC_ACTION_KEY ), is( "action" + counter ) );
assertThat(event.getMDC( AuditConstants.MDC_RESOURCE_NAME_KEY ), is( "resource" + counter ) );
assertThat(event.getMDC( AuditConstants.MDC_RESOURCE_TYPE_KEY ), is( "resource type" + counter ) );
@@ -119,7 +119,6 @@ public class AuditServiceTest {
}
assertThat( auditService.getContext(), nullValue() );
assertThat( correlationService.getContext(), nullValue() );
-
}
@Test
@@ -130,45 +129,45 @@ public class AuditServiceTest {
ac.setRemoteIp( remoteIp );
ac.setRemoteHostname( remoteHostname );
ac.setTargetServiceName( targetServiceName );
-
+
CorrelationContext cc = correlationService.createContext();
cc.setRequestId( UUID.randomUUID().toString() );
cc.setParentRequestId( UUID.randomUUID().toString() );
cc.setRootRequestId( UUID.randomUUID().toString() );
auditor.audit( "action", "resource", "resource type", "outcome", "message" );
-
+
auditService.detachContext();
correlationService.detachContext();
-
+
assertThat( CollectAppender.queue.size(), is( 1 ) );
LoggingEvent event = CollectAppender.queue.iterator().next();
checkLogEventContexts( event, cc, ac );
-
+
CollectAppender.queue.clear();
-
+
ac = auditService.createContext();
ac.setUsername( username + "1" );
ac.setProxyUsername( proxyUsername + "1" );
ac.setRemoteIp( remoteIp + "1" );
ac.setRemoteHostname( remoteHostname + "1" );
ac.setTargetServiceName( targetServiceName + "1" );
-
+
cc = correlationService.createContext();
cc.setRequestId( UUID.randomUUID().toString() );
cc.setParentRequestId( UUID.randomUUID().toString() );
cc.setRootRequestId( UUID.randomUUID().toString() );
-
+
auditor.audit( "action", "resource", "resource type", "outcome", "message" );
-
+
auditService.detachContext();
correlationService.detachContext();
-
+
assertThat( CollectAppender.queue.size(), is( 1 ) );
event = CollectAppender.queue.iterator().next();
checkLogEventContexts( event, cc, ac );
}
-
+
private void checkLogEventContexts( LoggingEvent event, CorrelationContext expectedCorrelationContext, AuditContext expectedAuditContext ) {
AuditContext context = (AuditContext) event.getMDC( Log4jAuditService.MDC_AUDIT_CONTEXT_KEY );
assertThat( context.getUsername(), is( expectedAuditContext.getUsername() ) );
@@ -177,11 +176,10 @@ public class AuditServiceTest {
assertThat( context.getRemoteIp(), is( expectedAuditContext.getRemoteIp() ) );
assertThat( context.getRemoteHostname(), is( expectedAuditContext.getRemoteHostname() ) );
assertThat( context.getTargetServiceName(), is( expectedAuditContext.getTargetServiceName() ) );
-
+
CorrelationContext correlationContext = (CorrelationContext)event.getMDC( Log4jCorrelationService.MDC_CORRELATION_CONTEXT_KEY );
assertThat( correlationContext.getRequestId(), is( expectedCorrelationContext.getRequestId() ) );
assertThat( correlationContext.getRootRequestId(), is( expectedCorrelationContext.getRootRequestId() ) );
assertThat( correlationContext.getParentRequestId(), is( expectedCorrelationContext.getParentRequestId() ) );
}
-
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-util-common/src/test/java/org/apache/knox/gateway/util/IpAddressValidatorTest.java
----------------------------------------------------------------------
diff --git a/gateway-util-common/src/test/java/org/apache/knox/gateway/util/IpAddressValidatorTest.java b/gateway-util-common/src/test/java/org/apache/knox/gateway/util/IpAddressValidatorTest.java
index 6224f04..d1d4bf5 100644
--- a/gateway-util-common/src/test/java/org/apache/knox/gateway/util/IpAddressValidatorTest.java
+++ b/gateway-util-common/src/test/java/org/apache/knox/gateway/util/IpAddressValidatorTest.java
@@ -19,16 +19,15 @@ package org.apache.knox.gateway.util;
import org.junit.Test;
-
public class IpAddressValidatorTest extends org.junit.Assert {
String test = "127.0.0.1,193.*,192.168.1.*,0:0:0:0:0:0:0:1,0:0:0:0:0:0:*";
String testWeirdConfig = ",127.0.0.1,,193.*,192.168.1.*,29*";
String testNullConfig = null;
-
+
@Test
public void testExplicitIpAddress() throws Exception {
IpAddressValidator ipv = new IpAddressValidator(test);
-
+
assertTrue("Should have validated 127.0.0.1", ipv.validateIpAddress("127.0.0.1"));
assertFalse("Should not have validated 127.0.0.2", ipv.validateIpAddress("127.0.0.2"));
@@ -36,11 +35,11 @@ public class IpAddressValidatorTest extends org.junit.Assert {
assertFalse("Should not have validated 1:0:0:0:0:0:0:1", ipv.validateIpAddress("1:0:0:0:0:0:0:1"));
ipv = new IpAddressValidator(testWeirdConfig);
-
+
assertTrue("Should have validated 127.0.0.1", ipv.validateIpAddress("127.0.0.1"));
assertFalse("Should not have validated 127.0.0.2", ipv.validateIpAddress("127.0.0.2"));
}
-
+
@Test
public void testNullConfig() throws Exception {
IpAddressValidator ipv = new IpAddressValidator(testNullConfig);
@@ -48,7 +47,7 @@ public class IpAddressValidatorTest extends org.junit.Assert {
// null config indicatest that all IPs are accepted
assertTrue("Should have validated 127.0.0.1", ipv.validateIpAddress("127.0.0.1"));
}
-
+
@Test
public void testNullRemoteIP() throws Exception {
IpAddressValidator ipv = new IpAddressValidator(testNullConfig);
@@ -59,7 +58,7 @@ public class IpAddressValidatorTest extends org.junit.Assert {
@Test
public void testWildcardIpAddress() throws Exception {
IpAddressValidator ipv = new IpAddressValidator(test);
-
+
assertTrue("Should have validated 192.168.1.1", ipv.validateIpAddress("192.168.1.1"));
assertFalse("Should not have validated 192.168.2.1", ipv.validateIpAddress("192.168.2.1"));
@@ -70,7 +69,7 @@ public class IpAddressValidatorTest extends org.junit.Assert {
assertFalse("Should not have validated 194.168.2.1", ipv.validateIpAddress("194.168.2.1"));
ipv = new IpAddressValidator(testWeirdConfig);
-
+
assertTrue("Should have validated 293.168.1.1", ipv.validateIpAddress("293.168.1.1"));
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-util-common/src/test/java/org/apache/knox/gateway/util/JsonUtilsTest.java
----------------------------------------------------------------------
diff --git a/gateway-util-common/src/test/java/org/apache/knox/gateway/util/JsonUtilsTest.java b/gateway-util-common/src/test/java/org/apache/knox/gateway/util/JsonUtilsTest.java
index cbd0016..4d58d47 100644
--- a/gateway-util-common/src/test/java/org/apache/knox/gateway/util/JsonUtilsTest.java
+++ b/gateway-util-common/src/test/java/org/apache/knox/gateway/util/JsonUtilsTest.java
@@ -29,21 +29,21 @@ public class JsonUtilsTest extends org.junit.Assert {
String tokenType = "\"token_type\":\"Bearer\"";
String accessToken = "\"access_token\":\"ksdfh3489tyiodhfjk\"";
String test = '{' + expiresIn + "," + tokenType + "," + accessToken + '}';
-
+
@Test
public void testRenderAsJson() throws Exception {
HashMap map = new HashMap();
map.put("access_token", "ksdfh3489tyiodhfjk");
map.put("token_type", "Bearer");
map.put( "expires_in", "1364487943100" );
-
+
String result = JsonUtils.renderAsJsonString(map);
assertThat( result, containsString( expiresIn ) );
assertThat( result, containsString( tokenType ) );
assertThat( result, containsString( accessToken ) );
}
-
+
@Test
public void testGetMapFromString() throws Exception {
HashMap map = (HashMap) JsonUtils.getMapFromJsonString(test);
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-util-configinjector/src/main/java/org/apache/knox/gateway/config/Alias.java
----------------------------------------------------------------------
diff --git a/gateway-util-configinjector/src/main/java/org/apache/knox/gateway/config/Alias.java b/gateway-util-configinjector/src/main/java/org/apache/knox/gateway/config/Alias.java
index 5e9adea..6e8d169 100755
--- a/gateway-util-configinjector/src/main/java/org/apache/knox/gateway/config/Alias.java
+++ b/gateway-util-configinjector/src/main/java/org/apache/knox/gateway/config/Alias.java
@@ -27,5 +27,5 @@ import java.lang.annotation.Target;
@Retention( RetentionPolicy.RUNTIME )
@Documented
public @interface Alias {
- public String value();
+ String value();
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-util-configinjector/src/main/java/org/apache/knox/gateway/config/Default.java
----------------------------------------------------------------------
diff --git a/gateway-util-configinjector/src/main/java/org/apache/knox/gateway/config/Default.java b/gateway-util-configinjector/src/main/java/org/apache/knox/gateway/config/Default.java
index 70213e4..de97175 100755
--- a/gateway-util-configinjector/src/main/java/org/apache/knox/gateway/config/Default.java
+++ b/gateway-util-configinjector/src/main/java/org/apache/knox/gateway/config/Default.java
@@ -27,5 +27,5 @@ import java.lang.annotation.Target;
@Retention( RetentionPolicy.RUNTIME )
@Documented
public @interface Default {
- public String value();
+ String value();
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-util-configinjector/src/main/java/org/apache/knox/gateway/config/impl/DefaultConfigurationInjector.java
----------------------------------------------------------------------
diff --git a/gateway-util-configinjector/src/main/java/org/apache/knox/gateway/config/impl/DefaultConfigurationInjector.java b/gateway-util-configinjector/src/main/java/org/apache/knox/gateway/config/impl/DefaultConfigurationInjector.java
index e1ef56e..80022c6 100755
--- a/gateway-util-configinjector/src/main/java/org/apache/knox/gateway/config/impl/DefaultConfigurationInjector.java
+++ b/gateway-util-configinjector/src/main/java/org/apache/knox/gateway/config/impl/DefaultConfigurationInjector.java
@@ -69,7 +69,7 @@ public class DefaultConfigurationInjector implements ConfigurationInjector {
if( value == null ) {
Optional optional = field.getAnnotation( Optional.class );
if( optional == null ) {
- throw new ConfigurationException( String.format( Locale.ROOT,
+ throw new ConfigurationException( String.format( Locale.ROOT,
"Failed to find configuration for %s bound to %s of %s via %s",
bind, name, target.getClass().getName(), adapter.getClass().getName() ) );
}
@@ -107,7 +107,7 @@ public class DefaultConfigurationInjector implements ConfigurationInjector {
String strValue = defTag.value();
argValue = convertValue( target, argName, strValue, argTypes[i] );
} else {
- throw new ConfigurationException( String.format( Locale.ROOT,
+ throw new ConfigurationException( String.format( Locale.ROOT,
"Failed to find configuration for %s as %s of %s via %s",
bndName, argName, target.getClass().getName(), adapter.getClass().getName() ) );
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-util-configinjector/src/test/java/org/apache/knox/gateway/config/AdapterSampleTest.java
----------------------------------------------------------------------
diff --git a/gateway-util-configinjector/src/test/java/org/apache/knox/gateway/config/AdapterSampleTest.java b/gateway-util-configinjector/src/test/java/org/apache/knox/gateway/config/AdapterSampleTest.java
index f88fb0e..d6030dd 100755
--- a/gateway-util-configinjector/src/test/java/org/apache/knox/gateway/config/AdapterSampleTest.java
+++ b/gateway-util-configinjector/src/test/java/org/apache/knox/gateway/config/AdapterSampleTest.java
@@ -35,7 +35,7 @@ public class AdapterSampleTest {
private static class Adapter implements ConfigurationAdapter {
private Map<String, Object> config;
- public Adapter( Map<String, Object> config ) {
+ Adapter( Map<String, Object> config ) {
this.config = config;
}
@Override
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-util-urltemplate/src/main/java/org/apache/knox/gateway/util/urltemplate/Parser.java
----------------------------------------------------------------------
diff --git a/gateway-util-urltemplate/src/main/java/org/apache/knox/gateway/util/urltemplate/Parser.java b/gateway-util-urltemplate/src/main/java/org/apache/knox/gateway/util/urltemplate/Parser.java
index fe1db82..26e51dc 100644
--- a/gateway-util-urltemplate/src/main/java/org/apache/knox/gateway/util/urltemplate/Parser.java
+++ b/gateway-util-urltemplate/src/main/java/org/apache/knox/gateway/util/urltemplate/Parser.java
@@ -81,22 +81,22 @@ public class Parser {
private static Pattern PATTERN = Pattern.compile( "^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\\?([^#]*))?(#(.*))?" );
@Deprecated
- public static final Template parse( String template ) throws URISyntaxException {
+ public static Template parse( String template ) throws URISyntaxException {
return Parser.parseTemplate( template );
}
- public static final Template parseTemplate( final String template ) throws URISyntaxException {
+ public static Template parseTemplate( final String template ) throws URISyntaxException {
Builder builder = new Builder( template );
return parseInternal( builder );
}
- public static final Template parseLiteral( final String literal ) throws URISyntaxException {
+ public static Template parseLiteral( final String literal ) throws URISyntaxException {
Builder builder = new Builder( literal );
builder.setLiteral( true );
return parseInternal( builder );
}
- private static final Template parseInternal( final Builder builder ) throws URISyntaxException {
+ private static Template parseInternal( final Builder builder ) throws URISyntaxException {
String original = builder.getOriginal();
builder.setHasScheme( false );
builder.setHasAuthority( false ); // Assume no until found otherwise. If true, will cause // in output URL.
@@ -119,7 +119,7 @@ public class Parser {
return builder.build();
}
- private static final void fixNakedAuthority( final Builder builder ) {
+ private static void fixNakedAuthority( final Builder builder ) {
if( builder.getHasScheme() &&
!builder.getHasAuthority() &&
!builder.getIsAbsolute() &&
@@ -136,7 +136,7 @@ public class Parser {
}
}
- private static final Token makeTokenSingular( Token token ) {
+ private static Token makeTokenSingular( Token token ) {
final String effectivePattern = token.getEffectivePattern();
if( Segment.GLOB_PATTERN.equals( effectivePattern ) ) {
token = new Token( token.getParameterName(), token.getOriginalPattern(), Segment.STAR_PATTERN, token.isLiteral() );
@@ -213,7 +213,7 @@ public class Parser {
}
}
- private static final void consumePathToken( final Builder builder, final String token ) {
+ private static void consumePathToken( final Builder builder, final String token ) {
if( token != null ) {
final StringTokenizer tokenizer = new StringTokenizer( token, "/" );
while( tokenizer.hasMoreTokens() ) {
@@ -222,7 +222,7 @@ public class Parser {
}
}
- private static final void consumePathSegment( final Builder builder, final String token ) {
+ private static void consumePathSegment( final Builder builder, final String token ) {
if( token != null ) {
final Token t = parseTemplateToken( builder, token, Segment.GLOB_PATTERN );
builder.addPath( t );
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-util-urltemplate/src/test/java/org/apache/knox/gateway/util/urltemplate/SegmentTest.java
----------------------------------------------------------------------
diff --git a/gateway-util-urltemplate/src/test/java/org/apache/knox/gateway/util/urltemplate/SegmentTest.java b/gateway-util-urltemplate/src/test/java/org/apache/knox/gateway/util/urltemplate/SegmentTest.java
index 549d64a..fc0e79e 100644
--- a/gateway-util-urltemplate/src/test/java/org/apache/knox/gateway/util/urltemplate/SegmentTest.java
+++ b/gateway-util-urltemplate/src/test/java/org/apache/knox/gateway/util/urltemplate/SegmentTest.java
@@ -127,19 +127,8 @@ public class SegmentTest {
}
private class TestSegment extends Segment {
-
- public TestSegment( String paramName, String valuePattern, boolean literal ) {
+ TestSegment( String paramName, String valuePattern, boolean literal ) {
super( new Token( paramName, valuePattern, literal ) );
}
-
}
-
-// private class InvalidSegment extends Segment {
-//
-// public InvalidSegment( String paramName, String valuePattern ) {
-// super( paramName, valuePattern );
-// }
-//
-// }
-
}
[02/10] knox git commit: KNOX-1663 - Enforce more Checkstyle rules
Posted by kr...@apache.org.
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-job-counters.json
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-job-counters.json b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-job-counters.json
index 7ad29fa..8136a86 100644
--- a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-job-counters.json
+++ b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-job-counters.json
@@ -1,307 +1,307 @@
{
- "jobCounters":{
- "id":"job_1399541193872_0035",
- "counterGroup":[
- {
- "counterGroupName":"org.apache.hadoop.mapreduce.FileSystemCounter",
- "counter":[
- {
- "name":"FILE_BYTES_READ",
- "totalCounterValue":477928,
- "mapCounterValue":0,
- "reduceCounterValue":477928
- },
- {
- "name":"FILE_BYTES_WRITTEN",
- "totalCounterValue":1162489,
- "mapCounterValue":581270,
- "reduceCounterValue":581219
- },
- {
- "name":"FILE_READ_OPS",
- "totalCounterValue":0,
- "mapCounterValue":0,
- "reduceCounterValue":0
- },
- {
- "name":"FILE_LARGE_READ_OPS",
- "totalCounterValue":0,
- "mapCounterValue":0,
- "reduceCounterValue":0
- },
- {
- "name":"FILE_WRITE_OPS",
- "totalCounterValue":0,
- "mapCounterValue":0,
- "reduceCounterValue":0
- },
- {
- "name":"HDFS_BYTES_READ",
- "totalCounterValue":48,
- "mapCounterValue":48,
- "reduceCounterValue":0
- },
- {
- "name":"HDFS_BYTES_WRITTEN",
- "totalCounterValue":0,
- "mapCounterValue":0,
- "reduceCounterValue":0
- },
- {
- "name":"HDFS_READ_OPS",
- "totalCounterValue":1,
- "mapCounterValue":1,
- "reduceCounterValue":0
- },
- {
- "name":"HDFS_LARGE_READ_OPS",
- "totalCounterValue":0,
- "mapCounterValue":0,
- "reduceCounterValue":0
- },
- {
- "name":"HDFS_WRITE_OPS",
- "totalCounterValue":0,
- "mapCounterValue":0,
- "reduceCounterValue":0
- }
- ]
- },
- {
- "counterGroupName":"org.apache.hadoop.mapreduce.JobCounter",
- "counter":[
- {
- "name":"TOTAL_LAUNCHED_MAPS",
- "totalCounterValue":1,
- "mapCounterValue":0,
- "reduceCounterValue":0
- },
- {
- "name":"TOTAL_LAUNCHED_REDUCES",
- "totalCounterValue":1,
- "mapCounterValue":0,
- "reduceCounterValue":0
- },
- {
- "name":"OTHER_LOCAL_MAPS",
- "totalCounterValue":1,
- "mapCounterValue":0,
- "reduceCounterValue":0
- },
- {
- "name":"SLOTS_MILLIS_MAPS",
- "totalCounterValue":260112,
- "mapCounterValue":0,
- "reduceCounterValue":0
- },
- {
- "name":"MILLIS_MAPS",
- "totalCounterValue":10838,
- "mapCounterValue":0,
- "reduceCounterValue":0
- },
- {
- "name":"VCORES_MILLIS_MAPS",
- "totalCounterValue":10838,
- "mapCounterValue":0,
- "reduceCounterValue":0
- },
- {
- "name":"MB_MILLIS_MAPS",
- "totalCounterValue":16625492,
- "mapCounterValue":0,
- "reduceCounterValue":0
- }
- ]
- },
- {
- "counterGroupName":"org.apache.hadoop.mapreduce.TaskCounter",
- "counter":[
- {
- "name":"MAP_INPUT_RECORDS",
- "totalCounterValue":1,
- "mapCounterValue":1,
- "reduceCounterValue":0
- },
- {
- "name":"MAP_OUTPUT_RECORDS",
- "totalCounterValue":120000,
- "mapCounterValue":120000,
- "reduceCounterValue":0
- },
- {
- "name":"MAP_OUTPUT_BYTES",
- "totalCounterValue":480000,
- "mapCounterValue":480000,
- "reduceCounterValue":0
- },
- {
- "name":"MAP_OUTPUT_MATERIALIZED_BYTES",
- "totalCounterValue":477924,
- "mapCounterValue":477924,
- "reduceCounterValue":0
- },
- {
- "name":"SPLIT_RAW_BYTES",
- "totalCounterValue":48,
- "mapCounterValue":48,
- "reduceCounterValue":0
- },
- {
- "name":"COMBINE_INPUT_RECORDS",
- "totalCounterValue":0,
- "mapCounterValue":0,
- "reduceCounterValue":0
- },
- {
- "name":"COMBINE_OUTPUT_RECORDS",
- "totalCounterValue":0,
- "mapCounterValue":0,
- "reduceCounterValue":0
- },
- {
- "name":"REDUCE_INPUT_GROUPS",
- "totalCounterValue":108650,
- "mapCounterValue":0,
- "reduceCounterValue":108650
- },
- {
- "name":"REDUCE_SHUFFLE_BYTES",
- "totalCounterValue":477924,
- "mapCounterValue":0,
- "reduceCounterValue":477924
- },
- {
- "name":"REDUCE_INPUT_RECORDS",
- "totalCounterValue":108650,
- "mapCounterValue":0,
- "reduceCounterValue":108650
- },
- {
- "name":"REDUCE_OUTPUT_RECORDS",
- "totalCounterValue":0,
- "mapCounterValue":0,
- "reduceCounterValue":0
- },
- {
- "name":"SPILLED_RECORDS",
- "totalCounterValue":120000,
- "mapCounterValue":120000,
- "reduceCounterValue":0
- },
- {
- "name":"SHUFFLED_MAPS",
- "totalCounterValue":1,
- "mapCounterValue":0,
- "reduceCounterValue":1
- },
- {
- "name":"FAILED_SHUFFLE",
- "totalCounterValue":0,
- "mapCounterValue":0,
- "reduceCounterValue":0
- },
- {
- "name":"MERGED_MAP_OUTPUTS",
- "totalCounterValue":1,
- "mapCounterValue":0,
- "reduceCounterValue":1
- },
- {
- "name":"GC_TIME_MILLIS",
- "totalCounterValue":7207,
- "mapCounterValue":137,
- "reduceCounterValue":7070
- },
- {
- "name":"CPU_MILLISECONDS",
- "totalCounterValue":106630,
- "mapCounterValue":1480,
- "reduceCounterValue":105150
- },
- {
- "name":"PHYSICAL_MEMORY_BYTES",
- "totalCounterValue":418787328,
- "mapCounterValue":315940864,
- "reduceCounterValue":102846464
- },
- {
- "name":"VIRTUAL_MEMORY_BYTES",
- "totalCounterValue":4514369536,
- "mapCounterValue":1702195200,
- "reduceCounterValue":2812174336
- },
- {
- "name":"COMMITTED_HEAP_BYTES",
- "totalCounterValue":270733312,
- "mapCounterValue":240259072,
- "reduceCounterValue":30474240
- }
- ]
- },
- {
- "counterGroupName":"Shuffle Errors",
- "counter":[
- {
- "name":"BAD_ID",
- "totalCounterValue":0,
- "mapCounterValue":0,
- "reduceCounterValue":0
- },
- {
- "name":"CONNECTION",
- "totalCounterValue":0,
- "mapCounterValue":0,
- "reduceCounterValue":0
- },
- {
- "name":"IO_ERROR",
- "totalCounterValue":0,
- "mapCounterValue":0,
- "reduceCounterValue":0
- },
- {
- "name":"WRONG_LENGTH",
- "totalCounterValue":0,
- "mapCounterValue":0,
- "reduceCounterValue":0
- },
- {
- "name":"WRONG_MAP",
- "totalCounterValue":0,
- "mapCounterValue":0,
- "reduceCounterValue":0
- },
- {
- "name":"WRONG_REDUCE",
- "totalCounterValue":0,
- "mapCounterValue":0,
- "reduceCounterValue":0
- }
- ]
- },
- {
- "counterGroupName":"org.apache.hadoop.mapreduce.lib.input.FileInputFormatCounter",
- "counter":[
- {
- "name":"BYTES_READ",
- "totalCounterValue":0,
- "mapCounterValue":0,
- "reduceCounterValue":0
- }
- ]
- },
- {
- "counterGroupName":"org.apache.hadoop.mapreduce.lib.output.FileOutputFormatCounter",
- "counter":[
- {
- "name":"BYTES_WRITTEN",
- "totalCounterValue":0,
- "mapCounterValue":0,
- "reduceCounterValue":0
- }
- ]
- }
- ]
- }
+ "jobCounters":{
+ "id":"job_1399541193872_0035",
+ "counterGroup":[
+ {
+ "counterGroupName":"org.apache.hadoop.mapreduce.FileSystemCounter",
+ "counter":[
+ {
+ "name":"FILE_BYTES_READ",
+ "totalCounterValue":477928,
+ "mapCounterValue":0,
+ "reduceCounterValue":477928
+ },
+ {
+ "name":"FILE_BYTES_WRITTEN",
+ "totalCounterValue":1162489,
+ "mapCounterValue":581270,
+ "reduceCounterValue":581219
+ },
+ {
+ "name":"FILE_READ_OPS",
+ "totalCounterValue":0,
+ "mapCounterValue":0,
+ "reduceCounterValue":0
+ },
+ {
+ "name":"FILE_LARGE_READ_OPS",
+ "totalCounterValue":0,
+ "mapCounterValue":0,
+ "reduceCounterValue":0
+ },
+ {
+ "name":"FILE_WRITE_OPS",
+ "totalCounterValue":0,
+ "mapCounterValue":0,
+ "reduceCounterValue":0
+ },
+ {
+ "name":"HDFS_BYTES_READ",
+ "totalCounterValue":48,
+ "mapCounterValue":48,
+ "reduceCounterValue":0
+ },
+ {
+ "name":"HDFS_BYTES_WRITTEN",
+ "totalCounterValue":0,
+ "mapCounterValue":0,
+ "reduceCounterValue":0
+ },
+ {
+ "name":"HDFS_READ_OPS",
+ "totalCounterValue":1,
+ "mapCounterValue":1,
+ "reduceCounterValue":0
+ },
+ {
+ "name":"HDFS_LARGE_READ_OPS",
+ "totalCounterValue":0,
+ "mapCounterValue":0,
+ "reduceCounterValue":0
+ },
+ {
+ "name":"HDFS_WRITE_OPS",
+ "totalCounterValue":0,
+ "mapCounterValue":0,
+ "reduceCounterValue":0
+ }
+ ]
+ },
+ {
+ "counterGroupName":"org.apache.hadoop.mapreduce.JobCounter",
+ "counter":[
+ {
+ "name":"TOTAL_LAUNCHED_MAPS",
+ "totalCounterValue":1,
+ "mapCounterValue":0,
+ "reduceCounterValue":0
+ },
+ {
+ "name":"TOTAL_LAUNCHED_REDUCES",
+ "totalCounterValue":1,
+ "mapCounterValue":0,
+ "reduceCounterValue":0
+ },
+ {
+ "name":"OTHER_LOCAL_MAPS",
+ "totalCounterValue":1,
+ "mapCounterValue":0,
+ "reduceCounterValue":0
+ },
+ {
+ "name":"SLOTS_MILLIS_MAPS",
+ "totalCounterValue":260112,
+ "mapCounterValue":0,
+ "reduceCounterValue":0
+ },
+ {
+ "name":"MILLIS_MAPS",
+ "totalCounterValue":10838,
+ "mapCounterValue":0,
+ "reduceCounterValue":0
+ },
+ {
+ "name":"VCORES_MILLIS_MAPS",
+ "totalCounterValue":10838,
+ "mapCounterValue":0,
+ "reduceCounterValue":0
+ },
+ {
+ "name":"MB_MILLIS_MAPS",
+ "totalCounterValue":16625492,
+ "mapCounterValue":0,
+ "reduceCounterValue":0
+ }
+ ]
+ },
+ {
+ "counterGroupName":"org.apache.hadoop.mapreduce.TaskCounter",
+ "counter":[
+ {
+ "name":"MAP_INPUT_RECORDS",
+ "totalCounterValue":1,
+ "mapCounterValue":1,
+ "reduceCounterValue":0
+ },
+ {
+ "name":"MAP_OUTPUT_RECORDS",
+ "totalCounterValue":120000,
+ "mapCounterValue":120000,
+ "reduceCounterValue":0
+ },
+ {
+ "name":"MAP_OUTPUT_BYTES",
+ "totalCounterValue":480000,
+ "mapCounterValue":480000,
+ "reduceCounterValue":0
+ },
+ {
+ "name":"MAP_OUTPUT_MATERIALIZED_BYTES",
+ "totalCounterValue":477924,
+ "mapCounterValue":477924,
+ "reduceCounterValue":0
+ },
+ {
+ "name":"SPLIT_RAW_BYTES",
+ "totalCounterValue":48,
+ "mapCounterValue":48,
+ "reduceCounterValue":0
+ },
+ {
+ "name":"COMBINE_INPUT_RECORDS",
+ "totalCounterValue":0,
+ "mapCounterValue":0,
+ "reduceCounterValue":0
+ },
+ {
+ "name":"COMBINE_OUTPUT_RECORDS",
+ "totalCounterValue":0,
+ "mapCounterValue":0,
+ "reduceCounterValue":0
+ },
+ {
+ "name":"REDUCE_INPUT_GROUPS",
+ "totalCounterValue":108650,
+ "mapCounterValue":0,
+ "reduceCounterValue":108650
+ },
+ {
+ "name":"REDUCE_SHUFFLE_BYTES",
+ "totalCounterValue":477924,
+ "mapCounterValue":0,
+ "reduceCounterValue":477924
+ },
+ {
+ "name":"REDUCE_INPUT_RECORDS",
+ "totalCounterValue":108650,
+ "mapCounterValue":0,
+ "reduceCounterValue":108650
+ },
+ {
+ "name":"REDUCE_OUTPUT_RECORDS",
+ "totalCounterValue":0,
+ "mapCounterValue":0,
+ "reduceCounterValue":0
+ },
+ {
+ "name":"SPILLED_RECORDS",
+ "totalCounterValue":120000,
+ "mapCounterValue":120000,
+ "reduceCounterValue":0
+ },
+ {
+ "name":"SHUFFLED_MAPS",
+ "totalCounterValue":1,
+ "mapCounterValue":0,
+ "reduceCounterValue":1
+ },
+ {
+ "name":"FAILED_SHUFFLE",
+ "totalCounterValue":0,
+ "mapCounterValue":0,
+ "reduceCounterValue":0
+ },
+ {
+ "name":"MERGED_MAP_OUTPUTS",
+ "totalCounterValue":1,
+ "mapCounterValue":0,
+ "reduceCounterValue":1
+ },
+ {
+ "name":"GC_TIME_MILLIS",
+ "totalCounterValue":7207,
+ "mapCounterValue":137,
+ "reduceCounterValue":7070
+ },
+ {
+ "name":"CPU_MILLISECONDS",
+ "totalCounterValue":106630,
+ "mapCounterValue":1480,
+ "reduceCounterValue":105150
+ },
+ {
+ "name":"PHYSICAL_MEMORY_BYTES",
+ "totalCounterValue":418787328,
+ "mapCounterValue":315940864,
+ "reduceCounterValue":102846464
+ },
+ {
+ "name":"VIRTUAL_MEMORY_BYTES",
+ "totalCounterValue":4514369536,
+ "mapCounterValue":1702195200,
+ "reduceCounterValue":2812174336
+ },
+ {
+ "name":"COMMITTED_HEAP_BYTES",
+ "totalCounterValue":270733312,
+ "mapCounterValue":240259072,
+ "reduceCounterValue":30474240
+ }
+ ]
+ },
+ {
+ "counterGroupName":"Shuffle Errors",
+ "counter":[
+ {
+ "name":"BAD_ID",
+ "totalCounterValue":0,
+ "mapCounterValue":0,
+ "reduceCounterValue":0
+ },
+ {
+ "name":"CONNECTION",
+ "totalCounterValue":0,
+ "mapCounterValue":0,
+ "reduceCounterValue":0
+ },
+ {
+ "name":"IO_ERROR",
+ "totalCounterValue":0,
+ "mapCounterValue":0,
+ "reduceCounterValue":0
+ },
+ {
+ "name":"WRONG_LENGTH",
+ "totalCounterValue":0,
+ "mapCounterValue":0,
+ "reduceCounterValue":0
+ },
+ {
+ "name":"WRONG_MAP",
+ "totalCounterValue":0,
+ "mapCounterValue":0,
+ "reduceCounterValue":0
+ },
+ {
+ "name":"WRONG_REDUCE",
+ "totalCounterValue":0,
+ "mapCounterValue":0,
+ "reduceCounterValue":0
+ }
+ ]
+ },
+ {
+ "counterGroupName":"org.apache.hadoop.mapreduce.lib.input.FileInputFormatCounter",
+ "counter":[
+ {
+ "name":"BYTES_READ",
+ "totalCounterValue":0,
+ "mapCounterValue":0,
+ "reduceCounterValue":0
+ }
+ ]
+ },
+ {
+ "counterGroupName":"org.apache.hadoop.mapreduce.lib.output.FileOutputFormatCounter",
+ "counter":[
+ {
+ "name":"BYTES_WRITTEN",
+ "totalCounterValue":0,
+ "mapCounterValue":0,
+ "reduceCounterValue":0
+ }
+ ]
+ }
+ ]
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-job-counters.xml
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-job-counters.xml b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-job-counters.xml
index 8a82a40..5f96ad9 100644
--- a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-job-counters.xml
+++ b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-job-counters.xml
@@ -16,298 +16,298 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
<jobCounters>
- <id>job_1399541193872_0035</id>
- <counterGroup>
- <counterGroupName>org.apache.hadoop.mapreduce.FileSystemCounter
- </counterGroupName>
- <counter>
- <name>FILE_BYTES_READ</name>
- <totalCounterValue>477928</totalCounterValue>
- <mapCounterValue>0</mapCounterValue>
- <reduceCounterValue>477928</reduceCounterValue>
- </counter>
- <counter>
- <name>FILE_BYTES_WRITTEN</name>
- <totalCounterValue>1162489</totalCounterValue>
- <mapCounterValue>581270</mapCounterValue>
- <reduceCounterValue>581219</reduceCounterValue>
- </counter>
- <counter>
- <name>FILE_READ_OPS</name>
- <totalCounterValue>0</totalCounterValue>
- <mapCounterValue>0</mapCounterValue>
- <reduceCounterValue>0</reduceCounterValue>
- </counter>
- <counter>
- <name>FILE_LARGE_READ_OPS</name>
- <totalCounterValue>0</totalCounterValue>
- <mapCounterValue>0</mapCounterValue>
- <reduceCounterValue>0</reduceCounterValue>
- </counter>
- <counter>
- <name>FILE_WRITE_OPS</name>
- <totalCounterValue>0</totalCounterValue>
- <mapCounterValue>0</mapCounterValue>
- <reduceCounterValue>0</reduceCounterValue>
- </counter>
- <counter>
- <name>HDFS_BYTES_READ</name>
- <totalCounterValue>48</totalCounterValue>
- <mapCounterValue>48</mapCounterValue>
- <reduceCounterValue>0</reduceCounterValue>
- </counter>
- <counter>
- <name>HDFS_BYTES_WRITTEN</name>
- <totalCounterValue>0</totalCounterValue>
- <mapCounterValue>0</mapCounterValue>
- <reduceCounterValue>0</reduceCounterValue>
- </counter>
- <counter>
- <name>HDFS_READ_OPS</name>
- <totalCounterValue>1</totalCounterValue>
- <mapCounterValue>1</mapCounterValue>
- <reduceCounterValue>0</reduceCounterValue>
- </counter>
- <counter>
- <name>HDFS_LARGE_READ_OPS</name>
- <totalCounterValue>0</totalCounterValue>
- <mapCounterValue>0</mapCounterValue>
- <reduceCounterValue>0</reduceCounterValue>
- </counter>
- <counter>
- <name>HDFS_WRITE_OPS</name>
- <totalCounterValue>0</totalCounterValue>
- <mapCounterValue>0</mapCounterValue>
- <reduceCounterValue>0</reduceCounterValue>
- </counter>
- </counterGroup>
- <counterGroup>
- <counterGroupName>org.apache.hadoop.mapreduce.JobCounter
- </counterGroupName>
- <counter>
- <name>TOTAL_LAUNCHED_MAPS</name>
- <totalCounterValue>1</totalCounterValue>
- <mapCounterValue>0</mapCounterValue>
- <reduceCounterValue>0</reduceCounterValue>
- </counter>
- <counter>
- <name>TOTAL_LAUNCHED_REDUCES</name>
- <totalCounterValue>1</totalCounterValue>
- <mapCounterValue>0</mapCounterValue>
- <reduceCounterValue>0</reduceCounterValue>
- </counter>
- <counter>
- <name>OTHER_LOCAL_MAPS</name>
- <totalCounterValue>1</totalCounterValue>
- <mapCounterValue>0</mapCounterValue>
- <reduceCounterValue>0</reduceCounterValue>
- </counter>
- <counter>
- <name>SLOTS_MILLIS_MAPS</name>
- <totalCounterValue>260112</totalCounterValue>
- <mapCounterValue>0</mapCounterValue>
- <reduceCounterValue>0</reduceCounterValue>
- </counter>
- <counter>
- <name>MILLIS_MAPS</name>
- <totalCounterValue>10838</totalCounterValue>
- <mapCounterValue>0</mapCounterValue>
- <reduceCounterValue>0</reduceCounterValue>
- </counter>
- <counter>
- <name>VCORES_MILLIS_MAPS</name>
- <totalCounterValue>10838</totalCounterValue>
- <mapCounterValue>0</mapCounterValue>
- <reduceCounterValue>0</reduceCounterValue>
- </counter>
- <counter>
- <name>MB_MILLIS_MAPS</name>
- <totalCounterValue>16625492</totalCounterValue>
- <mapCounterValue>0</mapCounterValue>
- <reduceCounterValue>0</reduceCounterValue>
- </counter>
- </counterGroup>
- <counterGroup>
- <counterGroupName>org.apache.hadoop.mapreduce.TaskCounter
- </counterGroupName>
- <counter>
- <name>MAP_INPUT_RECORDS</name>
- <totalCounterValue>1</totalCounterValue>
- <mapCounterValue>1</mapCounterValue>
- <reduceCounterValue>0</reduceCounterValue>
- </counter>
- <counter>
- <name>MAP_OUTPUT_RECORDS</name>
- <totalCounterValue>120000</totalCounterValue>
- <mapCounterValue>120000</mapCounterValue>
- <reduceCounterValue>0</reduceCounterValue>
- </counter>
- <counter>
- <name>MAP_OUTPUT_BYTES</name>
- <totalCounterValue>480000</totalCounterValue>
- <mapCounterValue>480000</mapCounterValue>
- <reduceCounterValue>0</reduceCounterValue>
- </counter>
- <counter>
- <name>MAP_OUTPUT_MATERIALIZED_BYTES</name>
- <totalCounterValue>477924</totalCounterValue>
- <mapCounterValue>477924</mapCounterValue>
- <reduceCounterValue>0</reduceCounterValue>
- </counter>
- <counter>
- <name>SPLIT_RAW_BYTES</name>
- <totalCounterValue>48</totalCounterValue>
- <mapCounterValue>48</mapCounterValue>
- <reduceCounterValue>0</reduceCounterValue>
- </counter>
- <counter>
- <name>COMBINE_INPUT_RECORDS</name>
- <totalCounterValue>0</totalCounterValue>
- <mapCounterValue>0</mapCounterValue>
- <reduceCounterValue>0</reduceCounterValue>
- </counter>
- <counter>
- <name>COMBINE_OUTPUT_RECORDS</name>
- <totalCounterValue>0</totalCounterValue>
- <mapCounterValue>0</mapCounterValue>
- <reduceCounterValue>0</reduceCounterValue>
- </counter>
- <counter>
- <name>REDUCE_INPUT_GROUPS</name>
- <totalCounterValue>109375</totalCounterValue>
- <mapCounterValue>0</mapCounterValue>
- <reduceCounterValue>109375</reduceCounterValue>
- </counter>
- <counter>
- <name>REDUCE_SHUFFLE_BYTES</name>
- <totalCounterValue>477924</totalCounterValue>
- <mapCounterValue>0</mapCounterValue>
- <reduceCounterValue>477924</reduceCounterValue>
- </counter>
- <counter>
- <name>REDUCE_INPUT_RECORDS</name>
- <totalCounterValue>109375</totalCounterValue>
- <mapCounterValue>0</mapCounterValue>
- <reduceCounterValue>109375</reduceCounterValue>
- </counter>
- <counter>
- <name>REDUCE_OUTPUT_RECORDS</name>
- <totalCounterValue>0</totalCounterValue>
- <mapCounterValue>0</mapCounterValue>
- <reduceCounterValue>0</reduceCounterValue>
- </counter>
- <counter>
- <name>SPILLED_RECORDS</name>
- <totalCounterValue>120000</totalCounterValue>
- <mapCounterValue>120000</mapCounterValue>
- <reduceCounterValue>0</reduceCounterValue>
- </counter>
- <counter>
- <name>SHUFFLED_MAPS</name>
- <totalCounterValue>1</totalCounterValue>
- <mapCounterValue>0</mapCounterValue>
- <reduceCounterValue>1</reduceCounterValue>
- </counter>
- <counter>
- <name>FAILED_SHUFFLE</name>
- <totalCounterValue>0</totalCounterValue>
- <mapCounterValue>0</mapCounterValue>
- <reduceCounterValue>0</reduceCounterValue>
- </counter>
- <counter>
- <name>MERGED_MAP_OUTPUTS</name>
- <totalCounterValue>1</totalCounterValue>
- <mapCounterValue>0</mapCounterValue>
- <reduceCounterValue>1</reduceCounterValue>
- </counter>
- <counter>
- <name>GC_TIME_MILLIS</name>
- <totalCounterValue>7249</totalCounterValue>
- <mapCounterValue>137</mapCounterValue>
- <reduceCounterValue>7112</reduceCounterValue>
- </counter>
- <counter>
- <name>CPU_MILLISECONDS</name>
- <totalCounterValue>107300</totalCounterValue>
- <mapCounterValue>1480</mapCounterValue>
- <reduceCounterValue>105820</reduceCounterValue>
- </counter>
- <counter>
- <name>PHYSICAL_MEMORY_BYTES</name>
- <totalCounterValue>418811904</totalCounterValue>
- <mapCounterValue>315940864</mapCounterValue>
- <reduceCounterValue>102871040</reduceCounterValue>
- </counter>
- <counter>
- <name>VIRTUAL_MEMORY_BYTES</name>
- <totalCounterValue>4514369536</totalCounterValue>
- <mapCounterValue>1702195200</mapCounterValue>
- <reduceCounterValue>2812174336</reduceCounterValue>
- </counter>
- <counter>
- <name>COMMITTED_HEAP_BYTES</name>
- <totalCounterValue>270733312</totalCounterValue>
- <mapCounterValue>240259072</mapCounterValue>
- <reduceCounterValue>30474240</reduceCounterValue>
- </counter>
- </counterGroup>
- <counterGroup>
- <counterGroupName>Shuffle Errors</counterGroupName>
- <counter>
- <name>BAD_ID</name>
- <totalCounterValue>0</totalCounterValue>
- <mapCounterValue>0</mapCounterValue>
- <reduceCounterValue>0</reduceCounterValue>
- </counter>
- <counter>
- <name>CONNECTION</name>
- <totalCounterValue>0</totalCounterValue>
- <mapCounterValue>0</mapCounterValue>
- <reduceCounterValue>0</reduceCounterValue>
- </counter>
- <counter>
- <name>IO_ERROR</name>
- <totalCounterValue>0</totalCounterValue>
- <mapCounterValue>0</mapCounterValue>
- <reduceCounterValue>0</reduceCounterValue>
- </counter>
- <counter>
- <name>WRONG_LENGTH</name>
- <totalCounterValue>0</totalCounterValue>
- <mapCounterValue>0</mapCounterValue>
- <reduceCounterValue>0</reduceCounterValue>
- </counter>
- <counter>
- <name>WRONG_MAP</name>
- <totalCounterValue>0</totalCounterValue>
- <mapCounterValue>0</mapCounterValue>
- <reduceCounterValue>0</reduceCounterValue>
- </counter>
- <counter>
- <name>WRONG_REDUCE</name>
- <totalCounterValue>0</totalCounterValue>
- <mapCounterValue>0</mapCounterValue>
- <reduceCounterValue>0</reduceCounterValue>
- </counter>
- </counterGroup>
- <counterGroup>
- <counterGroupName>org.apache.hadoop.mapreduce.lib.input.FileInputFormatCounter
- </counterGroupName>
- <counter>
- <name>BYTES_READ</name>
- <totalCounterValue>0</totalCounterValue>
- <mapCounterValue>0</mapCounterValue>
- <reduceCounterValue>0</reduceCounterValue>
- </counter>
- </counterGroup>
- <counterGroup>
- <counterGroupName>org.apache.hadoop.mapreduce.lib.output.FileOutputFormatCounter
- </counterGroupName>
- <counter>
- <name>BYTES_WRITTEN</name>
- <totalCounterValue>0</totalCounterValue>
- <mapCounterValue>0</mapCounterValue>
- <reduceCounterValue>0</reduceCounterValue>
- </counter>
- </counterGroup>
+ <id>job_1399541193872_0035</id>
+ <counterGroup>
+ <counterGroupName>org.apache.hadoop.mapreduce.FileSystemCounter
+ </counterGroupName>
+ <counter>
+ <name>FILE_BYTES_READ</name>
+ <totalCounterValue>477928</totalCounterValue>
+ <mapCounterValue>0</mapCounterValue>
+ <reduceCounterValue>477928</reduceCounterValue>
+ </counter>
+ <counter>
+ <name>FILE_BYTES_WRITTEN</name>
+ <totalCounterValue>1162489</totalCounterValue>
+ <mapCounterValue>581270</mapCounterValue>
+ <reduceCounterValue>581219</reduceCounterValue>
+ </counter>
+ <counter>
+ <name>FILE_READ_OPS</name>
+ <totalCounterValue>0</totalCounterValue>
+ <mapCounterValue>0</mapCounterValue>
+ <reduceCounterValue>0</reduceCounterValue>
+ </counter>
+ <counter>
+ <name>FILE_LARGE_READ_OPS</name>
+ <totalCounterValue>0</totalCounterValue>
+ <mapCounterValue>0</mapCounterValue>
+ <reduceCounterValue>0</reduceCounterValue>
+ </counter>
+ <counter>
+ <name>FILE_WRITE_OPS</name>
+ <totalCounterValue>0</totalCounterValue>
+ <mapCounterValue>0</mapCounterValue>
+ <reduceCounterValue>0</reduceCounterValue>
+ </counter>
+ <counter>
+ <name>HDFS_BYTES_READ</name>
+ <totalCounterValue>48</totalCounterValue>
+ <mapCounterValue>48</mapCounterValue>
+ <reduceCounterValue>0</reduceCounterValue>
+ </counter>
+ <counter>
+ <name>HDFS_BYTES_WRITTEN</name>
+ <totalCounterValue>0</totalCounterValue>
+ <mapCounterValue>0</mapCounterValue>
+ <reduceCounterValue>0</reduceCounterValue>
+ </counter>
+ <counter>
+ <name>HDFS_READ_OPS</name>
+ <totalCounterValue>1</totalCounterValue>
+ <mapCounterValue>1</mapCounterValue>
+ <reduceCounterValue>0</reduceCounterValue>
+ </counter>
+ <counter>
+ <name>HDFS_LARGE_READ_OPS</name>
+ <totalCounterValue>0</totalCounterValue>
+ <mapCounterValue>0</mapCounterValue>
+ <reduceCounterValue>0</reduceCounterValue>
+ </counter>
+ <counter>
+ <name>HDFS_WRITE_OPS</name>
+ <totalCounterValue>0</totalCounterValue>
+ <mapCounterValue>0</mapCounterValue>
+ <reduceCounterValue>0</reduceCounterValue>
+ </counter>
+ </counterGroup>
+ <counterGroup>
+ <counterGroupName>org.apache.hadoop.mapreduce.JobCounter
+ </counterGroupName>
+ <counter>
+ <name>TOTAL_LAUNCHED_MAPS</name>
+ <totalCounterValue>1</totalCounterValue>
+ <mapCounterValue>0</mapCounterValue>
+ <reduceCounterValue>0</reduceCounterValue>
+ </counter>
+ <counter>
+ <name>TOTAL_LAUNCHED_REDUCES</name>
+ <totalCounterValue>1</totalCounterValue>
+ <mapCounterValue>0</mapCounterValue>
+ <reduceCounterValue>0</reduceCounterValue>
+ </counter>
+ <counter>
+ <name>OTHER_LOCAL_MAPS</name>
+ <totalCounterValue>1</totalCounterValue>
+ <mapCounterValue>0</mapCounterValue>
+ <reduceCounterValue>0</reduceCounterValue>
+ </counter>
+ <counter>
+ <name>SLOTS_MILLIS_MAPS</name>
+ <totalCounterValue>260112</totalCounterValue>
+ <mapCounterValue>0</mapCounterValue>
+ <reduceCounterValue>0</reduceCounterValue>
+ </counter>
+ <counter>
+ <name>MILLIS_MAPS</name>
+ <totalCounterValue>10838</totalCounterValue>
+ <mapCounterValue>0</mapCounterValue>
+ <reduceCounterValue>0</reduceCounterValue>
+ </counter>
+ <counter>
+ <name>VCORES_MILLIS_MAPS</name>
+ <totalCounterValue>10838</totalCounterValue>
+ <mapCounterValue>0</mapCounterValue>
+ <reduceCounterValue>0</reduceCounterValue>
+ </counter>
+ <counter>
+ <name>MB_MILLIS_MAPS</name>
+ <totalCounterValue>16625492</totalCounterValue>
+ <mapCounterValue>0</mapCounterValue>
+ <reduceCounterValue>0</reduceCounterValue>
+ </counter>
+ </counterGroup>
+ <counterGroup>
+ <counterGroupName>org.apache.hadoop.mapreduce.TaskCounter
+ </counterGroupName>
+ <counter>
+ <name>MAP_INPUT_RECORDS</name>
+ <totalCounterValue>1</totalCounterValue>
+ <mapCounterValue>1</mapCounterValue>
+ <reduceCounterValue>0</reduceCounterValue>
+ </counter>
+ <counter>
+ <name>MAP_OUTPUT_RECORDS</name>
+ <totalCounterValue>120000</totalCounterValue>
+ <mapCounterValue>120000</mapCounterValue>
+ <reduceCounterValue>0</reduceCounterValue>
+ </counter>
+ <counter>
+ <name>MAP_OUTPUT_BYTES</name>
+ <totalCounterValue>480000</totalCounterValue>
+ <mapCounterValue>480000</mapCounterValue>
+ <reduceCounterValue>0</reduceCounterValue>
+ </counter>
+ <counter>
+ <name>MAP_OUTPUT_MATERIALIZED_BYTES</name>
+ <totalCounterValue>477924</totalCounterValue>
+ <mapCounterValue>477924</mapCounterValue>
+ <reduceCounterValue>0</reduceCounterValue>
+ </counter>
+ <counter>
+ <name>SPLIT_RAW_BYTES</name>
+ <totalCounterValue>48</totalCounterValue>
+ <mapCounterValue>48</mapCounterValue>
+ <reduceCounterValue>0</reduceCounterValue>
+ </counter>
+ <counter>
+ <name>COMBINE_INPUT_RECORDS</name>
+ <totalCounterValue>0</totalCounterValue>
+ <mapCounterValue>0</mapCounterValue>
+ <reduceCounterValue>0</reduceCounterValue>
+ </counter>
+ <counter>
+ <name>COMBINE_OUTPUT_RECORDS</name>
+ <totalCounterValue>0</totalCounterValue>
+ <mapCounterValue>0</mapCounterValue>
+ <reduceCounterValue>0</reduceCounterValue>
+ </counter>
+ <counter>
+ <name>REDUCE_INPUT_GROUPS</name>
+ <totalCounterValue>109375</totalCounterValue>
+ <mapCounterValue>0</mapCounterValue>
+ <reduceCounterValue>109375</reduceCounterValue>
+ </counter>
+ <counter>
+ <name>REDUCE_SHUFFLE_BYTES</name>
+ <totalCounterValue>477924</totalCounterValue>
+ <mapCounterValue>0</mapCounterValue>
+ <reduceCounterValue>477924</reduceCounterValue>
+ </counter>
+ <counter>
+ <name>REDUCE_INPUT_RECORDS</name>
+ <totalCounterValue>109375</totalCounterValue>
+ <mapCounterValue>0</mapCounterValue>
+ <reduceCounterValue>109375</reduceCounterValue>
+ </counter>
+ <counter>
+ <name>REDUCE_OUTPUT_RECORDS</name>
+ <totalCounterValue>0</totalCounterValue>
+ <mapCounterValue>0</mapCounterValue>
+ <reduceCounterValue>0</reduceCounterValue>
+ </counter>
+ <counter>
+ <name>SPILLED_RECORDS</name>
+ <totalCounterValue>120000</totalCounterValue>
+ <mapCounterValue>120000</mapCounterValue>
+ <reduceCounterValue>0</reduceCounterValue>
+ </counter>
+ <counter>
+ <name>SHUFFLED_MAPS</name>
+ <totalCounterValue>1</totalCounterValue>
+ <mapCounterValue>0</mapCounterValue>
+ <reduceCounterValue>1</reduceCounterValue>
+ </counter>
+ <counter>
+ <name>FAILED_SHUFFLE</name>
+ <totalCounterValue>0</totalCounterValue>
+ <mapCounterValue>0</mapCounterValue>
+ <reduceCounterValue>0</reduceCounterValue>
+ </counter>
+ <counter>
+ <name>MERGED_MAP_OUTPUTS</name>
+ <totalCounterValue>1</totalCounterValue>
+ <mapCounterValue>0</mapCounterValue>
+ <reduceCounterValue>1</reduceCounterValue>
+ </counter>
+ <counter>
+ <name>GC_TIME_MILLIS</name>
+ <totalCounterValue>7249</totalCounterValue>
+ <mapCounterValue>137</mapCounterValue>
+ <reduceCounterValue>7112</reduceCounterValue>
+ </counter>
+ <counter>
+ <name>CPU_MILLISECONDS</name>
+ <totalCounterValue>107300</totalCounterValue>
+ <mapCounterValue>1480</mapCounterValue>
+ <reduceCounterValue>105820</reduceCounterValue>
+ </counter>
+ <counter>
+ <name>PHYSICAL_MEMORY_BYTES</name>
+ <totalCounterValue>418811904</totalCounterValue>
+ <mapCounterValue>315940864</mapCounterValue>
+ <reduceCounterValue>102871040</reduceCounterValue>
+ </counter>
+ <counter>
+ <name>VIRTUAL_MEMORY_BYTES</name>
+ <totalCounterValue>4514369536</totalCounterValue>
+ <mapCounterValue>1702195200</mapCounterValue>
+ <reduceCounterValue>2812174336</reduceCounterValue>
+ </counter>
+ <counter>
+ <name>COMMITTED_HEAP_BYTES</name>
+ <totalCounterValue>270733312</totalCounterValue>
+ <mapCounterValue>240259072</mapCounterValue>
+ <reduceCounterValue>30474240</reduceCounterValue>
+ </counter>
+ </counterGroup>
+ <counterGroup>
+ <counterGroupName>Shuffle Errors</counterGroupName>
+ <counter>
+ <name>BAD_ID</name>
+ <totalCounterValue>0</totalCounterValue>
+ <mapCounterValue>0</mapCounterValue>
+ <reduceCounterValue>0</reduceCounterValue>
+ </counter>
+ <counter>
+ <name>CONNECTION</name>
+ <totalCounterValue>0</totalCounterValue>
+ <mapCounterValue>0</mapCounterValue>
+ <reduceCounterValue>0</reduceCounterValue>
+ </counter>
+ <counter>
+ <name>IO_ERROR</name>
+ <totalCounterValue>0</totalCounterValue>
+ <mapCounterValue>0</mapCounterValue>
+ <reduceCounterValue>0</reduceCounterValue>
+ </counter>
+ <counter>
+ <name>WRONG_LENGTH</name>
+ <totalCounterValue>0</totalCounterValue>
+ <mapCounterValue>0</mapCounterValue>
+ <reduceCounterValue>0</reduceCounterValue>
+ </counter>
+ <counter>
+ <name>WRONG_MAP</name>
+ <totalCounterValue>0</totalCounterValue>
+ <mapCounterValue>0</mapCounterValue>
+ <reduceCounterValue>0</reduceCounterValue>
+ </counter>
+ <counter>
+ <name>WRONG_REDUCE</name>
+ <totalCounterValue>0</totalCounterValue>
+ <mapCounterValue>0</mapCounterValue>
+ <reduceCounterValue>0</reduceCounterValue>
+ </counter>
+ </counterGroup>
+ <counterGroup>
+ <counterGroupName>org.apache.hadoop.mapreduce.lib.input.FileInputFormatCounter
+ </counterGroupName>
+ <counter>
+ <name>BYTES_READ</name>
+ <totalCounterValue>0</totalCounterValue>
+ <mapCounterValue>0</mapCounterValue>
+ <reduceCounterValue>0</reduceCounterValue>
+ </counter>
+ </counterGroup>
+ <counterGroup>
+ <counterGroupName>org.apache.hadoop.mapreduce.lib.output.FileOutputFormatCounter
+ </counterGroupName>
+ <counter>
+ <name>BYTES_WRITTEN</name>
+ <totalCounterValue>0</totalCounterValue>
+ <mapCounterValue>0</mapCounterValue>
+ <reduceCounterValue>0</reduceCounterValue>
+ </counter>
+ </counterGroup>
</jobCounters>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-job.json
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-job.json b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-job.json
index 42a6953..e25a89e 100644
--- a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-job.json
+++ b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-job.json
@@ -1,33 +1,33 @@
{
- "job":{
- "startTime":1401199825397,
- "finishTime":0,
- "elapsedTime":10573843,
- "id":"job_1399541193872_0035",
- "name":"Sleep job",
- "user":"hdfs",
- "state":"RUNNING",
- "mapsTotal":1,
- "mapsCompleted":1,
- "reducesTotal":1,
- "reducesCompleted":0,
- "mapProgress":100.0,
- "reduceProgress":86.803696,
- "mapsPending":0,
- "mapsRunning":0,
- "reducesPending":0,
- "reducesRunning":1,
- "uberized":false,
- "diagnostics":"",
- "newReduceAttempts":0,
- "runningReduceAttempts":1,
- "failedReduceAttempts":0,
- "killedReduceAttempts":0,
- "successfulReduceAttempts":0,
- "newMapAttempts":0,
- "runningMapAttempts":0,
- "failedMapAttempts":0,
- "killedMapAttempts":0,
- "successfulMapAttempts":1
- }
+ "job":{
+ "startTime":1401199825397,
+ "finishTime":0,
+ "elapsedTime":10573843,
+ "id":"job_1399541193872_0035",
+ "name":"Sleep job",
+ "user":"hdfs",
+ "state":"RUNNING",
+ "mapsTotal":1,
+ "mapsCompleted":1,
+ "reducesTotal":1,
+ "reducesCompleted":0,
+ "mapProgress":100.0,
+ "reduceProgress":86.803696,
+ "mapsPending":0,
+ "mapsRunning":0,
+ "reducesPending":0,
+ "reducesRunning":1,
+ "uberized":false,
+ "diagnostics":"",
+ "newReduceAttempts":0,
+ "runningReduceAttempts":1,
+ "failedReduceAttempts":0,
+ "killedReduceAttempts":0,
+ "successfulReduceAttempts":0,
+ "newMapAttempts":0,
+ "runningMapAttempts":0,
+ "failedMapAttempts":0,
+ "killedMapAttempts":0,
+ "successfulMapAttempts":1
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-job.xml
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-job.xml b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-job.xml
index c0c1bc1..7dfe37f 100644
--- a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-job.xml
+++ b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-job.xml
@@ -16,33 +16,33 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
<job>
- <startTime>1401199825397</startTime>
- <finishTime>0</finishTime>
- <elapsedTime>10493588</elapsedTime>
- <id>job_1399541193872_0035</id>
- <name>Sleep job</name>
- <user>hdfs</user>
- <state>RUNNING</state>
- <mapsTotal>1</mapsTotal>
- <mapsCompleted>1</mapsCompleted>
- <reducesTotal>1</reducesTotal>
- <reducesCompleted>0</reducesCompleted>
- <mapProgress>100.0</mapProgress>
- <reduceProgress>86.803696</reduceProgress>
- <mapsPending>0</mapsPending>
- <mapsRunning>0</mapsRunning>
- <reducesPending>0</reducesPending>
- <reducesRunning>1</reducesRunning>
- <uberized>false</uberized>
- <diagnostics></diagnostics>
- <newReduceAttempts>0</newReduceAttempts>
- <runningReduceAttempts>1</runningReduceAttempts>
- <failedReduceAttempts>0</failedReduceAttempts>
- <killedReduceAttempts>0</killedReduceAttempts>
- <successfulReduceAttempts>0</successfulReduceAttempts>
- <newMapAttempts>0</newMapAttempts>
- <runningMapAttempts>0</runningMapAttempts>
- <failedMapAttempts>0</failedMapAttempts>
- <killedMapAttempts>0</killedMapAttempts>
- <successfulMapAttempts>1</successfulMapAttempts>
+ <startTime>1401199825397</startTime>
+ <finishTime>0</finishTime>
+ <elapsedTime>10493588</elapsedTime>
+ <id>job_1399541193872_0035</id>
+ <name>Sleep job</name>
+ <user>hdfs</user>
+ <state>RUNNING</state>
+ <mapsTotal>1</mapsTotal>
+ <mapsCompleted>1</mapsCompleted>
+ <reducesTotal>1</reducesTotal>
+ <reducesCompleted>0</reducesCompleted>
+ <mapProgress>100.0</mapProgress>
+ <reduceProgress>86.803696</reduceProgress>
+ <mapsPending>0</mapsPending>
+ <mapsRunning>0</mapsRunning>
+ <reducesPending>0</reducesPending>
+ <reducesRunning>1</reducesRunning>
+ <uberized>false</uberized>
+ <diagnostics></diagnostics>
+ <newReduceAttempts>0</newReduceAttempts>
+ <runningReduceAttempts>1</runningReduceAttempts>
+ <failedReduceAttempts>0</failedReduceAttempts>
+ <killedReduceAttempts>0</killedReduceAttempts>
+ <successfulReduceAttempts>0</successfulReduceAttempts>
+ <newMapAttempts>0</newMapAttempts>
+ <runningMapAttempts>0</runningMapAttempts>
+ <failedMapAttempts>0</failedMapAttempts>
+ <killedMapAttempts>0</killedMapAttempts>
+ <successfulMapAttempts>1</successfulMapAttempts>
</job>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-jobs.json
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-jobs.json b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-jobs.json
index 34f708b..f6a428f 100644
--- a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-jobs.json
+++ b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-jobs.json
@@ -1,37 +1,37 @@
{
- "jobs":{
- "job":[
- {
- "startTime":1401199825397,
- "finishTime":0,
- "elapsedTime":10152389,
- "id":"job_1399541193872_0035",
- "name":"Sleep job",
- "user":"hdfs",
- "state":"RUNNING",
- "mapsTotal":1,
- "mapsCompleted":1,
- "reducesTotal":1,
- "reducesCompleted":0,
- "mapProgress":100.0,
- "reduceProgress":86.803696,
- "mapsPending":0,
- "mapsRunning":0,
- "reducesPending":0,
- "reducesRunning":1,
- "uberized":false,
- "diagnostics":"",
- "newReduceAttempts":0,
- "runningReduceAttempts":1,
- "failedReduceAttempts":0,
- "killedReduceAttempts":0,
- "successfulReduceAttempts":0,
- "newMapAttempts":0,
- "runningMapAttempts":0,
- "failedMapAttempts":0,
- "killedMapAttempts":0,
- "successfulMapAttempts":1
- }
- ]
- }
+ "jobs":{
+ "job":[
+ {
+ "startTime":1401199825397,
+ "finishTime":0,
+ "elapsedTime":10152389,
+ "id":"job_1399541193872_0035",
+ "name":"Sleep job",
+ "user":"hdfs",
+ "state":"RUNNING",
+ "mapsTotal":1,
+ "mapsCompleted":1,
+ "reducesTotal":1,
+ "reducesCompleted":0,
+ "mapProgress":100.0,
+ "reduceProgress":86.803696,
+ "mapsPending":0,
+ "mapsRunning":0,
+ "reducesPending":0,
+ "reducesRunning":1,
+ "uberized":false,
+ "diagnostics":"",
+ "newReduceAttempts":0,
+ "runningReduceAttempts":1,
+ "failedReduceAttempts":0,
+ "killedReduceAttempts":0,
+ "successfulReduceAttempts":0,
+ "newMapAttempts":0,
+ "runningMapAttempts":0,
+ "failedMapAttempts":0,
+ "killedMapAttempts":0,
+ "successfulMapAttempts":1
+ }
+ ]
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-jobs.xml
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-jobs.xml b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-jobs.xml
index 772f6b9..2b53d16 100644
--- a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-jobs.xml
+++ b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-jobs.xml
@@ -16,35 +16,35 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
<jobs>
- <job>
- <startTime>1401199825397</startTime>
- <finishTime>0</finishTime>
- <elapsedTime>10188267</elapsedTime>
- <id>job_1399541193872_0035</id>
- <name>Sleep job</name>
- <user>hdfs</user>
- <state>RUNNING</state>
- <mapsTotal>1</mapsTotal>
- <mapsCompleted>1</mapsCompleted>
- <reducesTotal>1</reducesTotal>
- <reducesCompleted>0</reducesCompleted>
- <mapProgress>100.0</mapProgress>
- <reduceProgress>86.803696</reduceProgress>
- <mapsPending>0</mapsPending>
- <mapsRunning>0</mapsRunning>
- <reducesPending>0</reducesPending>
- <reducesRunning>1</reducesRunning>
- <uberized>false</uberized>
- <diagnostics></diagnostics>
- <newReduceAttempts>0</newReduceAttempts>
- <runningReduceAttempts>1</runningReduceAttempts>
- <failedReduceAttempts>0</failedReduceAttempts>
- <killedReduceAttempts>0</killedReduceAttempts>
- <successfulReduceAttempts>0</successfulReduceAttempts>
- <newMapAttempts>0</newMapAttempts>
- <runningMapAttempts>0</runningMapAttempts>
- <failedMapAttempts>0</failedMapAttempts>
- <killedMapAttempts>0</killedMapAttempts>
- <successfulMapAttempts>1</successfulMapAttempts>
- </job>
+ <job>
+ <startTime>1401199825397</startTime>
+ <finishTime>0</finishTime>
+ <elapsedTime>10188267</elapsedTime>
+ <id>job_1399541193872_0035</id>
+ <name>Sleep job</name>
+ <user>hdfs</user>
+ <state>RUNNING</state>
+ <mapsTotal>1</mapsTotal>
+ <mapsCompleted>1</mapsCompleted>
+ <reducesTotal>1</reducesTotal>
+ <reducesCompleted>0</reducesCompleted>
+ <mapProgress>100.0</mapProgress>
+ <reduceProgress>86.803696</reduceProgress>
+ <mapsPending>0</mapsPending>
+ <mapsRunning>0</mapsRunning>
+ <reducesPending>0</reducesPending>
+ <reducesRunning>1</reducesRunning>
+ <uberized>false</uberized>
+ <diagnostics></diagnostics>
+ <newReduceAttempts>0</newReduceAttempts>
+ <runningReduceAttempts>1</runningReduceAttempts>
+ <failedReduceAttempts>0</failedReduceAttempts>
+ <killedReduceAttempts>0</killedReduceAttempts>
+ <successfulReduceAttempts>0</successfulReduceAttempts>
+ <newMapAttempts>0</newMapAttempts>
+ <runningMapAttempts>0</runningMapAttempts>
+ <failedMapAttempts>0</failedMapAttempts>
+ <killedMapAttempts>0</killedMapAttempts>
+ <successfulMapAttempts>1</successfulMapAttempts>
+ </job>
</jobs>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-task-attempt-counters.json
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-task-attempt-counters.json b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-task-attempt-counters.json
index 9b806ea..61e935c 100644
--- a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-task-attempt-counters.json
+++ b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-task-attempt-counters.json
@@ -1,155 +1,155 @@
{
- "jobTaskAttemptCounters":{
- "id":"attempt_1399541193872_0036_r_000000_0",
- "taskAttemptCounterGroup":[
- {
- "counterGroupName":"org.apache.hadoop.mapreduce.FileSystemCounter",
- "counter":[
- {
- "name":"FILE_BYTES_READ",
- "value":655360
- },
- {
- "name":"FILE_BYTES_WRITTEN",
- "value":4883518
- },
- {
- "name":"FILE_READ_OPS",
- "value":0
- },
- {
- "name":"FILE_LARGE_READ_OPS",
- "value":0
- },
- {
- "name":"FILE_WRITE_OPS",
- "value":0
- },
- {
- "name":"HDFS_BYTES_READ",
- "value":0
- },
- {
- "name":"HDFS_BYTES_WRITTEN",
- "value":0
- },
- {
- "name":"HDFS_READ_OPS",
- "value":0
- },
- {
- "name":"HDFS_LARGE_READ_OPS",
- "value":0
- },
- {
- "name":"HDFS_WRITE_OPS",
- "value":0
- }
- ]
- },
- {
- "counterGroupName":"org.apache.hadoop.mapreduce.TaskCounter",
- "counter":[
- {
- "name":"COMBINE_INPUT_RECORDS",
- "value":0
- },
- {
- "name":"COMBINE_OUTPUT_RECORDS",
- "value":0
- },
- {
- "name":"REDUCE_INPUT_GROUPS",
- "value":118653
- },
- {
- "name":"REDUCE_SHUFFLE_BYTES",
- "value":4780221
- },
- {
- "name":"REDUCE_INPUT_RECORDS",
- "value":118653
- },
- {
- "name":"REDUCE_OUTPUT_RECORDS",
- "value":0
- },
- {
- "name":"SPILLED_RECORDS",
- "value":0
- },
- {
- "name":"SHUFFLED_MAPS",
- "value":1
- },
- {
- "name":"FAILED_SHUFFLE",
- "value":0
- },
- {
- "name":"MERGED_MAP_OUTPUTS",
- "value":1
- },
- {
- "name":"GC_TIME_MILLIS",
- "value":7223
- },
- {
- "name":"CPU_MILLISECONDS",
- "value":106990
- },
- {
- "name":"PHYSICAL_MEMORY_BYTES",
- "value":110182400
- },
- {
- "name":"VIRTUAL_MEMORY_BYTES",
- "value":2812141568
- },
- {
- "name":"COMMITTED_HEAP_BYTES",
- "value":30474240
- }
- ]
- },
- {
- "counterGroupName":"Shuffle Errors",
- "counter":[
- {
- "name":"BAD_ID",
- "value":0
- },
- {
- "name":"CONNECTION",
- "value":0
- },
- {
- "name":"IO_ERROR",
- "value":0
- },
- {
- "name":"WRONG_LENGTH",
- "value":0
- },
- {
- "name":"WRONG_MAP",
- "value":0
- },
- {
- "name":"WRONG_REDUCE",
- "value":0
- }
- ]
- },
- {
- "counterGroupName":"org.apache.hadoop.mapreduce.lib.output.FileOutputFormatCounter",
- "counter":[
- {
- "name":"BYTES_WRITTEN",
- "value":0
- }
- ]
- }
- ]
- }
+ "jobTaskAttemptCounters":{
+ "id":"attempt_1399541193872_0036_r_000000_0",
+ "taskAttemptCounterGroup":[
+ {
+ "counterGroupName":"org.apache.hadoop.mapreduce.FileSystemCounter",
+ "counter":[
+ {
+ "name":"FILE_BYTES_READ",
+ "value":655360
+ },
+ {
+ "name":"FILE_BYTES_WRITTEN",
+ "value":4883518
+ },
+ {
+ "name":"FILE_READ_OPS",
+ "value":0
+ },
+ {
+ "name":"FILE_LARGE_READ_OPS",
+ "value":0
+ },
+ {
+ "name":"FILE_WRITE_OPS",
+ "value":0
+ },
+ {
+ "name":"HDFS_BYTES_READ",
+ "value":0
+ },
+ {
+ "name":"HDFS_BYTES_WRITTEN",
+ "value":0
+ },
+ {
+ "name":"HDFS_READ_OPS",
+ "value":0
+ },
+ {
+ "name":"HDFS_LARGE_READ_OPS",
+ "value":0
+ },
+ {
+ "name":"HDFS_WRITE_OPS",
+ "value":0
+ }
+ ]
+ },
+ {
+ "counterGroupName":"org.apache.hadoop.mapreduce.TaskCounter",
+ "counter":[
+ {
+ "name":"COMBINE_INPUT_RECORDS",
+ "value":0
+ },
+ {
+ "name":"COMBINE_OUTPUT_RECORDS",
+ "value":0
+ },
+ {
+ "name":"REDUCE_INPUT_GROUPS",
+ "value":118653
+ },
+ {
+ "name":"REDUCE_SHUFFLE_BYTES",
+ "value":4780221
+ },
+ {
+ "name":"REDUCE_INPUT_RECORDS",
+ "value":118653
+ },
+ {
+ "name":"REDUCE_OUTPUT_RECORDS",
+ "value":0
+ },
+ {
+ "name":"SPILLED_RECORDS",
+ "value":0
+ },
+ {
+ "name":"SHUFFLED_MAPS",
+ "value":1
+ },
+ {
+ "name":"FAILED_SHUFFLE",
+ "value":0
+ },
+ {
+ "name":"MERGED_MAP_OUTPUTS",
+ "value":1
+ },
+ {
+ "name":"GC_TIME_MILLIS",
+ "value":7223
+ },
+ {
+ "name":"CPU_MILLISECONDS",
+ "value":106990
+ },
+ {
+ "name":"PHYSICAL_MEMORY_BYTES",
+ "value":110182400
+ },
+ {
+ "name":"VIRTUAL_MEMORY_BYTES",
+ "value":2812141568
+ },
+ {
+ "name":"COMMITTED_HEAP_BYTES",
+ "value":30474240
+ }
+ ]
+ },
+ {
+ "counterGroupName":"Shuffle Errors",
+ "counter":[
+ {
+ "name":"BAD_ID",
+ "value":0
+ },
+ {
+ "name":"CONNECTION",
+ "value":0
+ },
+ {
+ "name":"IO_ERROR",
+ "value":0
+ },
+ {
+ "name":"WRONG_LENGTH",
+ "value":0
+ },
+ {
+ "name":"WRONG_MAP",
+ "value":0
+ },
+ {
+ "name":"WRONG_REDUCE",
+ "value":0
+ }
+ ]
+ },
+ {
+ "counterGroupName":"org.apache.hadoop.mapreduce.lib.output.FileOutputFormatCounter",
+ "counter":[
+ {
+ "name":"BYTES_WRITTEN",
+ "value":0
+ }
+ ]
+ }
+ ]
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-task-attempt-counters.xml
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-task-attempt-counters.xml b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-task-attempt-counters.xml
index 5019ecd..4119849 100644
--- a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-task-attempt-counters.xml
+++ b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-task-attempt-counters.xml
@@ -16,148 +16,148 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
<jobTaskAttemptCounters>
- <id>attempt_1399541193872_0036_r_000000_0</id>
- <taskAttemptCounterGroup>
- <counterGroupName>org.apache.hadoop.mapreduce.FileSystemCounter
- </counterGroupName>
- <counter>
- <name>FILE_BYTES_READ</name>
- <value>655360</value>
- </counter>
- <counter>
- <name>FILE_BYTES_WRITTEN</name>
- <value>4883518</value>
- </counter>
- <counter>
- <name>FILE_READ_OPS</name>
- <value>0</value>
- </counter>
- <counter>
- <name>FILE_LARGE_READ_OPS</name>
- <value>0</value>
- </counter>
- <counter>
- <name>FILE_WRITE_OPS</name>
- <value>0</value>
- </counter>
- <counter>
- <name>HDFS_BYTES_READ</name>
- <value>0</value>
- </counter>
- <counter>
- <name>HDFS_BYTES_WRITTEN</name>
- <value>0</value>
- </counter>
- <counter>
- <name>HDFS_READ_OPS</name>
- <value>0</value>
- </counter>
- <counter>
- <name>HDFS_LARGE_READ_OPS</name>
- <value>0</value>
- </counter>
- <counter>
- <name>HDFS_WRITE_OPS</name>
- <value>0</value>
- </counter>
- </taskAttemptCounterGroup>
- <taskAttemptCounterGroup>
- <counterGroupName>org.apache.hadoop.mapreduce.TaskCounter
- </counterGroupName>
- <counter>
- <name>COMBINE_INPUT_RECORDS</name>
- <value>0</value>
- </counter>
- <counter>
- <name>COMBINE_OUTPUT_RECORDS</name>
- <value>0</value>
- </counter>
- <counter>
- <name>REDUCE_INPUT_GROUPS</name>
- <value>109953</value>
- </counter>
- <counter>
- <name>REDUCE_SHUFFLE_BYTES</name>
- <value>4780221</value>
- </counter>
- <counter>
- <name>REDUCE_INPUT_RECORDS</name>
- <value>109953</value>
- </counter>
- <counter>
- <name>REDUCE_OUTPUT_RECORDS</name>
- <value>0</value>
- </counter>
- <counter>
- <name>SPILLED_RECORDS</name>
- <value>0</value>
- </counter>
- <counter>
- <name>SHUFFLED_MAPS</name>
- <value>1</value>
- </counter>
- <counter>
- <name>FAILED_SHUFFLE</name>
- <value>0</value>
- </counter>
- <counter>
- <name>MERGED_MAP_OUTPUTS</name>
- <value>1</value>
- </counter>
- <counter>
- <name>GC_TIME_MILLIS</name>
- <value>6722</value>
- </counter>
- <counter>
- <name>CPU_MILLISECONDS</name>
- <value>99330</value>
- </counter>
- <counter>
- <name>PHYSICAL_MEMORY_BYTES</name>
- <value>110190592</value>
- </counter>
- <counter>
- <name>VIRTUAL_MEMORY_BYTES</name>
- <value>2812141568</value>
- </counter>
- <counter>
- <name>COMMITTED_HEAP_BYTES</name>
- <value>30474240</value>
- </counter>
- </taskAttemptCounterGroup>
- <taskAttemptCounterGroup>
- <counterGroupName>Shuffle Errors</counterGroupName>
- <counter>
- <name>BAD_ID</name>
- <value>0</value>
- </counter>
- <counter>
- <name>CONNECTION</name>
- <value>0</value>
- </counter>
- <counter>
- <name>IO_ERROR</name>
- <value>0</value>
- </counter>
- <counter>
- <name>WRONG_LENGTH</name>
- <value>0</value>
- </counter>
- <counter>
- <name>WRONG_MAP</name>
- <value>0</value>
- </counter>
- <counter>
- <name>WRONG_REDUCE</name>
- <value>0</value>
- </counter>
- </taskAttemptCounterGroup>
- <taskAttemptCounterGroup>
- <counterGroupName>org.apache.hadoop.mapreduce.lib.output.FileOutputFormatCounter
- </counterGroupName>
- <counter>
- <name>BYTES_WRITTEN</name>
- <value>0</value>
- </counter>
- </taskAttemptCounterGroup>
+ <id>attempt_1399541193872_0036_r_000000_0</id>
+ <taskAttemptCounterGroup>
+ <counterGroupName>org.apache.hadoop.mapreduce.FileSystemCounter
+ </counterGroupName>
+ <counter>
+ <name>FILE_BYTES_READ</name>
+ <value>655360</value>
+ </counter>
+ <counter>
+ <name>FILE_BYTES_WRITTEN</name>
+ <value>4883518</value>
+ </counter>
+ <counter>
+ <name>FILE_READ_OPS</name>
+ <value>0</value>
+ </counter>
+ <counter>
+ <name>FILE_LARGE_READ_OPS</name>
+ <value>0</value>
+ </counter>
+ <counter>
+ <name>FILE_WRITE_OPS</name>
+ <value>0</value>
+ </counter>
+ <counter>
+ <name>HDFS_BYTES_READ</name>
+ <value>0</value>
+ </counter>
+ <counter>
+ <name>HDFS_BYTES_WRITTEN</name>
+ <value>0</value>
+ </counter>
+ <counter>
+ <name>HDFS_READ_OPS</name>
+ <value>0</value>
+ </counter>
+ <counter>
+ <name>HDFS_LARGE_READ_OPS</name>
+ <value>0</value>
+ </counter>
+ <counter>
+ <name>HDFS_WRITE_OPS</name>
+ <value>0</value>
+ </counter>
+ </taskAttemptCounterGroup>
+ <taskAttemptCounterGroup>
+ <counterGroupName>org.apache.hadoop.mapreduce.TaskCounter
+ </counterGroupName>
+ <counter>
+ <name>COMBINE_INPUT_RECORDS</name>
+ <value>0</value>
+ </counter>
+ <counter>
+ <name>COMBINE_OUTPUT_RECORDS</name>
+ <value>0</value>
+ </counter>
+ <counter>
+ <name>REDUCE_INPUT_GROUPS</name>
+ <value>109953</value>
+ </counter>
+ <counter>
+ <name>REDUCE_SHUFFLE_BYTES</name>
+ <value>4780221</value>
+ </counter>
+ <counter>
+ <name>REDUCE_INPUT_RECORDS</name>
+ <value>109953</value>
+ </counter>
+ <counter>
+ <name>REDUCE_OUTPUT_RECORDS</name>
+ <value>0</value>
+ </counter>
+ <counter>
+ <name>SPILLED_RECORDS</name>
+ <value>0</value>
+ </counter>
+ <counter>
+ <name>SHUFFLED_MAPS</name>
+ <value>1</value>
+ </counter>
+ <counter>
+ <name>FAILED_SHUFFLE</name>
+ <value>0</value>
+ </counter>
+ <counter>
+ <name>MERGED_MAP_OUTPUTS</name>
+ <value>1</value>
+ </counter>
+ <counter>
+ <name>GC_TIME_MILLIS</name>
+ <value>6722</value>
+ </counter>
+ <counter>
+ <name>CPU_MILLISECONDS</name>
+ <value>99330</value>
+ </counter>
+ <counter>
+ <name>PHYSICAL_MEMORY_BYTES</name>
+ <value>110190592</value>
+ </counter>
+ <counter>
+ <name>VIRTUAL_MEMORY_BYTES</name>
+ <value>2812141568</value>
+ </counter>
+ <counter>
+ <name>COMMITTED_HEAP_BYTES</name>
+ <value>30474240</value>
+ </counter>
+ </taskAttemptCounterGroup>
+ <taskAttemptCounterGroup>
+ <counterGroupName>Shuffle Errors</counterGroupName>
+ <counter>
+ <name>BAD_ID</name>
+ <value>0</value>
+ </counter>
+ <counter>
+ <name>CONNECTION</name>
+ <value>0</value>
+ </counter>
+ <counter>
+ <name>IO_ERROR</name>
+ <value>0</value>
+ </counter>
+ <counter>
+ <name>WRONG_LENGTH</name>
+ <value>0</value>
+ </counter>
+ <counter>
+ <name>WRONG_MAP</name>
+ <value>0</value>
+ </counter>
+ <counter>
+ <name>WRONG_REDUCE</name>
+ <value>0</value>
+ </counter>
+ </taskAttemptCounterGroup>
+ <taskAttemptCounterGroup>
+ <counterGroupName>org.apache.hadoop.mapreduce.lib.output.FileOutputFormatCounter
+ </counterGroupName>
+ <counter>
+ <name>BYTES_WRITTEN</name>
+ <value>0</value>
+ </counter>
+ </taskAttemptCounterGroup>
</jobTaskAttemptCounters>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-task-attempt.json
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-task-attempt.json b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-task-attempt.json
index 69bc6a5..8a580f3 100644
--- a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-task-attempt.json
+++ b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-task-attempt.json
@@ -1,21 +1,21 @@
{
- "taskAttempt":{
- "startTime":1401273289105,
- "finishTime":0,
- "elapsedTime":0,
- "progress":68.680374,
- "id":"attempt_1399541193872_0036_r_000000_0",
- "rack":"/default-rack",
- "state":"RUNNING",
- "status":"Sleeping... (109692800) ms left > reduce",
- "nodeHttpAddress":"host.yarn.com:50060",
- "diagnostics":"",
- "type":"REDUCE",
- "assignedContainerId":"container_1399541193872_0036_01_000003",
- "shuffleFinishTime":1401273296009,
- "mergeFinishTime":1401273296736,
- "elapsedShuffleTime":6904,
- "elapsedMergeTime":727,
- "elapsedReduceTime":0
- }
+ "taskAttempt":{
+ "startTime":1401273289105,
+ "finishTime":0,
+ "elapsedTime":0,
+ "progress":68.680374,
+ "id":"attempt_1399541193872_0036_r_000000_0",
+ "rack":"/default-rack",
+ "state":"RUNNING",
+ "status":"Sleeping... (109692800) ms left > reduce",
+ "nodeHttpAddress":"host.yarn.com:50060",
+ "diagnostics":"",
+ "type":"REDUCE",
+ "assignedContainerId":"container_1399541193872_0036_01_000003",
+ "shuffleFinishTime":1401273296009,
+ "mergeFinishTime":1401273296736,
+ "elapsedShuffleTime":6904,
+ "elapsedMergeTime":727,
+ "elapsedReduceTime":0
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-task-attempt.xml
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-task-attempt.xml b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-task-attempt.xml
index 4f99117..5e8eb6c 100644
--- a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-task-attempt.xml
+++ b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-task-attempt.xml
@@ -16,22 +16,22 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
<taskAttempt>
- <startTime>1401273289105</startTime>
- <finishTime>0</finishTime>
- <elapsedTime>0</elapsedTime>
- <progress>68.680374</progress>
- <id>attempt_1399541193872_0036_r_000000_0</id>
- <rack>/default-rack</rack>
- <state>RUNNING</state>
- <status>Sleeping... (109200400) ms left > reduce</status>
- <nodeHttpAddress>hdp.example.com:50060</nodeHttpAddress>
- <diagnostics></diagnostics>
- <type>REDUCE</type>
- <assignedContainerId>container_1399541193872_0036_01_000003
- </assignedContainerId>
- <shuffleFinishTime>1401273296009</shuffleFinishTime>
- <mergeFinishTime>1401273296736</mergeFinishTime>
- <elapsedShuffleTime>6904</elapsedShuffleTime>
- <elapsedMergeTime>727</elapsedMergeTime>
- <elapsedReduceTime>0</elapsedReduceTime>
+ <startTime>1401273289105</startTime>
+ <finishTime>0</finishTime>
+ <elapsedTime>0</elapsedTime>
+ <progress>68.680374</progress>
+ <id>attempt_1399541193872_0036_r_000000_0</id>
+ <rack>/default-rack</rack>
+ <state>RUNNING</state>
+ <status>Sleeping... (109200400) ms left > reduce</status>
+ <nodeHttpAddress>hdp.example.com:50060</nodeHttpAddress>
+ <diagnostics></diagnostics>
+ <type>REDUCE</type>
+ <assignedContainerId>container_1399541193872_0036_01_000003
+ </assignedContainerId>
+ <shuffleFinishTime>1401273296009</shuffleFinishTime>
+ <mergeFinishTime>1401273296736</mergeFinishTime>
+ <elapsedShuffleTime>6904</elapsedShuffleTime>
+ <elapsedMergeTime>727</elapsedMergeTime>
+ <elapsedReduceTime>0</elapsedReduceTime>
</taskAttempt>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-task-attempts.json
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-task-attempts.json b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-task-attempts.json
index 31ffeb8..50463d9 100644
--- a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-task-attempts.json
+++ b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-task-attempts.json
@@ -1,26 +1,26 @@
{
- "taskAttempts":{
- "taskAttempt":[
- {
- "type":"reduceTaskAttemptInfo",
- "startTime":1401273289105,
- "finishTime":0,
- "elapsedTime":0,
- "progress":68.680374,
- "id":"attempt_1399541193872_0036_r_000000_0",
- "rack":"/default-rack",
- "state":"RUNNING",
- "status":"Sleeping... (110404400) ms left > reduce",
- "nodeHttpAddress":"host.yarn.com:50060",
- "diagnostics":"",
- "type":"REDUCE",
- "assignedContainerId":"container_1399541193872_0036_01_000003",
- "shuffleFinishTime":1401273296009,
- "mergeFinishTime":1401273296736,
- "elapsedShuffleTime":6904,
- "elapsedMergeTime":727,
- "elapsedReduceTime":0
- }
- ]
- }
+ "taskAttempts":{
+ "taskAttempt":[
+ {
+ "type":"reduceTaskAttemptInfo",
+ "startTime":1401273289105,
+ "finishTime":0,
+ "elapsedTime":0,
+ "progress":68.680374,
+ "id":"attempt_1399541193872_0036_r_000000_0",
+ "rack":"/default-rack",
+ "state":"RUNNING",
+ "status":"Sleeping... (110404400) ms left > reduce",
+ "nodeHttpAddress":"host.yarn.com:50060",
+ "diagnostics":"",
+ "type":"REDUCE",
+ "assignedContainerId":"container_1399541193872_0036_01_000003",
+ "shuffleFinishTime":1401273296009,
+ "mergeFinishTime":1401273296736,
+ "elapsedShuffleTime":6904,
+ "elapsedMergeTime":727,
+ "elapsedReduceTime":0
+ }
+ ]
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-task-attempts.xml
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-task-attempts.xml b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-task-attempts.xml
index 3de9457..81fa381 100644
--- a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-task-attempts.xml
+++ b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-task-attempts.xml
@@ -16,25 +16,25 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
<taskAttempts>
- <taskAttempt xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:type="reduceTaskAttemptInfo">
- <startTime>1401273289105</startTime>
- <finishTime>0</finishTime>
- <elapsedTime>0</elapsedTime>
- <progress>68.680374</progress>
- <id>attempt_1399541193872_0036_r_000000_0</id>
- <rack>/default-rack</rack>
- <state>RUNNING</state>
- <status>Sleeping... (110792700) ms left > reduce</status>
- <nodeHttpAddress>host.yarn.com:50060</nodeHttpAddress>
- <diagnostics></diagnostics>
- <type>REDUCE</type>
- <assignedContainerId>container_1399541193872_0036_01_000003
- </assignedContainerId>
- <shuffleFinishTime>1401273296009</shuffleFinishTime>
- <mergeFinishTime>1401273296736</mergeFinishTime>
- <elapsedShuffleTime>6904</elapsedShuffleTime>
- <elapsedMergeTime>727</elapsedMergeTime>
- <elapsedReduceTime>0</elapsedReduceTime>
- </taskAttempt>
+ <taskAttempt xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:type="reduceTaskAttemptInfo">
+ <startTime>1401273289105</startTime>
+ <finishTime>0</finishTime>
+ <elapsedTime>0</elapsedTime>
+ <progress>68.680374</progress>
+ <id>attempt_1399541193872_0036_r_000000_0</id>
+ <rack>/default-rack</rack>
+ <state>RUNNING</state>
+ <status>Sleeping... (110792700) ms left > reduce</status>
+ <nodeHttpAddress>host.yarn.com:50060</nodeHttpAddress>
+ <diagnostics></diagnostics>
+ <type>REDUCE</type>
+ <assignedContainerId>container_1399541193872_0036_01_000003
+ </assignedContainerId>
+ <shuffleFinishTime>1401273296009</shuffleFinishTime>
+ <mergeFinishTime>1401273296736</mergeFinishTime>
+ <elapsedShuffleTime>6904</elapsedShuffleTime>
+ <elapsedMergeTime>727</elapsedMergeTime>
+ <elapsedReduceTime>0</elapsedReduceTime>
+ </taskAttempt>
</taskAttempts>
\ No newline at end of file
[07/10] knox git commit: KNOX-1663 - Enforce more Checkstyle rules
Posted by kr...@apache.org.
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-server/src/main/java/org/apache/knox/gateway/services/security/impl/DefaultCryptoService.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/services/security/impl/DefaultCryptoService.java b/gateway-server/src/main/java/org/apache/knox/gateway/services/security/impl/DefaultCryptoService.java
index 502dfa2..7cfc4ee 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/services/security/impl/DefaultCryptoService.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/services/security/impl/DefaultCryptoService.java
@@ -182,7 +182,7 @@ public class DefaultCryptoService implements CryptoService {
// The assumption here is that lock contention will be less of a performance issue than the cost of object creation.
// We have seen via profiling that AESEncryptor instantiation is very expensive.
- private final ConfigurableEncryptor getEncryptor( final String clusterName, final char[] password ) {
+ private ConfigurableEncryptor getEncryptor( final String clusterName, final char[] password ) {
synchronized( encryptorCache ) {
ConfigurableEncryptor encryptor = encryptorCache.get( clusterName );
if( encryptor == null ) {
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/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 d232305..11afe75 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
@@ -124,8 +124,7 @@ public class DefaultKeystoreService extends BaseKeystoreService implements
try {
String filename = getKeystorePath();
createKeystore(filename, "JKS");
- }
- finally {
+ } finally {
writeLock.unlock();
}
}
@@ -157,7 +156,7 @@ public class DefaultKeystoreService extends BaseKeystoreService implements
} else {
keyStoreFile = new File(keyStoreDir + GATEWAY_KEYSTORE);
}
-
+
// make sure the keystore exists
if (!keyStoreFile.exists()) {
throw new KeystoreServiceException("Configured signing keystore does not exist.");
@@ -183,14 +182,14 @@ public class DefaultKeystoreService extends BaseKeystoreService implements
}
@Override
- public void addSelfSignedCertForGateway(String alias, char[] passphrase, String hostname)
+ public void addSelfSignedCertForGateway(String alias, char[] passphrase, String hostname)
throws KeystoreServiceException {
writeLock.lock();
try {
KeyPairGenerator keyPairGenerator;
try {
keyPairGenerator = KeyPairGenerator.getInstance("RSA");
- keyPairGenerator.initialize(1024);
+ keyPairGenerator.initialize(1024);
KeyPair KPair = keyPairGenerator.generateKeyPair();
if (hostname == null) {
hostname = System.getProperty(CERT_GEN_MODE, CERT_GEN_MODE_LOCALHOST);
@@ -204,12 +203,12 @@ public class DefaultKeystoreService extends BaseKeystoreService implements
String dn = buildDistinguishedName(hostname);
cert = X509CertificateUtil.generateCertificate(dn, KPair, 365, "SHA1withRSA");
}
-
+
KeyStore privateKS = getKeystoreForGateway();
- privateKS.setKeyEntry(alias, KPair.getPrivate(),
- passphrase,
- new java.security.cert.Certificate[]{cert});
-
+ privateKS.setKeyEntry(alias, KPair.getPrivate(),
+ passphrase,
+ new java.security.cert.Certificate[]{cert});
+
writeKeystoreToFile(privateKS, new File( keyStoreDir + GATEWAY_KEYSTORE ));
//writeCertificateToFile( cert, new File( keyStoreDir + alias + ".pem" ) );
} catch (GeneralSecurityException | IOException e) {
@@ -226,10 +225,9 @@ public class DefaultKeystoreService extends BaseKeystoreService implements
MessageFormat headerFormatter = new MessageFormat(dnTemplate, Locale.ROOT);
String[] paramArray = new String[1];
paramArray[0] = hostname;
- String dn = headerFormatter.format(paramArray);
- return dn;
+ return headerFormatter.format(paramArray);
}
-
+
@Override
public void createCredentialStoreForCluster(String clusterName) throws KeystoreServiceException {
String filename = keyStoreDir + clusterName + CREDENTIALS_SUFFIX;
@@ -308,7 +306,7 @@ public class DefaultKeystoreService extends BaseKeystoreService implements
finally {
readLock.unlock();
}
- }
+ }
@Override
public Key getSigningKey(String alias, char[] passphrase) throws KeystoreServiceException {
@@ -382,7 +380,7 @@ public class DefaultKeystoreService extends BaseKeystoreService implements
}
@Override
- public char[] getCredentialForCluster(String clusterName, String alias)
+ public char[] getCredentialForCluster(String clusterName, String alias)
throws KeystoreServiceException {
char[] credential = null;
readLock.lock();
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-server/src/main/java/org/apache/knox/gateway/services/security/impl/DefaultMasterService.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/services/security/impl/DefaultMasterService.java b/gateway-server/src/main/java/org/apache/knox/gateway/services/security/impl/DefaultMasterService.java
index 2607436..fbb574c 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/services/security/impl/DefaultMasterService.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/services/security/impl/DefaultMasterService.java
@@ -55,5 +55,4 @@ public class DefaultMasterService extends CMFMasterService implements MasterServ
@Override
public void stop() throws ServiceLifecycleException {
}
-
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/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 3a17938..8041a83 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
@@ -77,7 +77,6 @@ public class JettySSLService implements SSLService {
this.ks = ks;
}
-
@Override
public void init(GatewayConfig config, Map<String, String> options)
throws ServiceLifecycleException {
@@ -149,7 +148,7 @@ public class JettySSLService implements SSLService {
Date notBefore = ((X509Certificate) cert).getNotBefore();
Date notAfter = ((X509Certificate) cert).getNotAfter();
log.certificateValidityPeriod(notBefore, notAfter);
-
+
// let's not even start if the current date is not within the validity period for the SSL cert
try {
((X509Certificate)cert).checkValidity();
@@ -158,12 +157,10 @@ public class JettySSLService implements SSLService {
} catch (CertificateNotYetValidException e) {
throw new ServiceLifecycleException("Gateway SSL Certificate is not yet valid. Server will not start.", e);
}
- }
- else {
+ } else {
throw new ServiceLifecycleException("Public certificate for the gateway cannot be found with the alias gateway-identity. Plase check the identity certificate alias.");
}
- }
- else {
+ } else {
throw new ServiceLifecycleException("Public certificate for the gateway is not of the expected type of X509Certificate. Something is wrong with the gateway keystore.");
}
}
@@ -233,7 +230,7 @@ public class JettySSLService implements SSLService {
}
return sslContextFactory;
}
-
+
@Override
public void start() throws ServiceLifecycleException {
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/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 c7552db..e6470c0 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
@@ -264,7 +264,7 @@ public class RemoteAliasService implements AliasService {
}
if (remoteClient.getEntryData(aliasEntryPath) == null) {
- throw new IllegalStateException(String.format(Locale.ROOT,
+ throw new IllegalStateException(String.format(Locale.ROOT,
"Failed to store alias %s for cluster %s in remote registry", alias,
clusterName));
}
@@ -290,7 +290,7 @@ public class RemoteAliasService implements AliasService {
remoteClient.deleteEntry(aliasEntryPath);
if (remoteClient.entryExists(aliasEntryPath)) {
- throw new IllegalStateException(String.format(Locale.ROOT,
+ throw new IllegalStateException(String.format(Locale.ROOT,
"Failed to delete alias %s for cluster %s in remote registry",
alias, clusterName));
}
@@ -559,7 +559,7 @@ public class RemoteAliasService implements AliasService {
final RemoteAliasService remoteAliasService;
- public RemoteAliasChildListener (final RemoteAliasService remoteAliasService ) {
+ RemoteAliasChildListener (final RemoteAliasService remoteAliasService ) {
this.remoteAliasService = remoteAliasService;
}
@@ -627,7 +627,7 @@ public class RemoteAliasService implements AliasService {
final String alias;
final RemoteAliasService remoteAliasService;
- public RemoteAliasEntryListener(final String cluster, final String alias, final RemoteAliasService remoteAliasService) {
+ RemoteAliasEntryListener(final String cluster, final String alias, final RemoteAliasService remoteAliasService) {
this.cluster = cluster;
this.alias = alias;
this.remoteAliasService = remoteAliasService;
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-server/src/main/java/org/apache/knox/gateway/topology/simple/SimpleDescriptorMessages.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/topology/simple/SimpleDescriptorMessages.java b/gateway-server/src/main/java/org/apache/knox/gateway/topology/simple/SimpleDescriptorMessages.java
index b0113a2..08438e6 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/topology/simple/SimpleDescriptorMessages.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/topology/simple/SimpleDescriptorMessages.java
@@ -26,30 +26,30 @@ public interface SimpleDescriptorMessages {
@Message(level = MessageLevel.ERROR,
text = "Unable to complete service discovery for cluster {0}.")
- void failedToDiscoverClusterServices(final String descriptorName);
+ void failedToDiscoverClusterServices(String descriptorName);
@Message(level = MessageLevel.ERROR,
text = "No valid URLs were discovered for {0} in the {1} cluster.")
- void failedToDiscoverClusterServiceURLs(final String serviceName, final String clusterName);
+ void failedToDiscoverClusterServiceURLs(String serviceName, String clusterName);
@Message(level = MessageLevel.ERROR,
text = "Failed to resolve the referenced provider configuration {0}.")
- void failedToResolveProviderConfigRef(final String providerConfigRef);
+ void failedToResolveProviderConfigRef(String providerConfigRef);
@Message(level = MessageLevel.ERROR,
text = "Failed to parse the referenced provider configuration {0}: {1}")
- void failedToParseProviderConfig(final String providerConfigRef,
+ void failedToParseProviderConfig(String providerConfigRef,
@StackTrace( level = MessageLevel.DEBUG ) Exception e);
@Message(level = MessageLevel.ERROR,
text = "URL validation failed for {0} URL {1} : {2}")
- void serviceURLValidationFailed(final String serviceName,
- final String url,
+ void serviceURLValidationFailed(String serviceName,
+ String url,
@StackTrace( level = MessageLevel.DEBUG ) Exception e);
@Message(level = MessageLevel.ERROR,
text = "Error generating topology {0} from simple descriptor: {1}")
- void failedToGenerateTopologyFromSimpleDescriptor(final String topologyFile,
+ void failedToGenerateTopologyFromSimpleDescriptor(String topologyFile,
@StackTrace( level = MessageLevel.DEBUG ) Exception e);
@Message(level = MessageLevel.ERROR,
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-server/src/main/java/org/apache/knox/gateway/trace/TraceUtil.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/trace/TraceUtil.java b/gateway-server/src/main/java/org/apache/knox/gateway/trace/TraceUtil.java
index e3c1ba8..c7f0c6b 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/trace/TraceUtil.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/trace/TraceUtil.java
@@ -29,7 +29,7 @@ public class TraceUtil {
private static CorrelationService cs = CorrelationServiceFactory.getCorrelationService();
- static final void appendCorrelationContext( final StringBuilder sb ) {
+ static void appendCorrelationContext(final StringBuilder sb ) {
CorrelationContext cc = cs.getContext();
if( cc == null ) {
sb.append( "||" );
@@ -42,13 +42,13 @@ public class TraceUtil {
}
}
- private static final void append( final StringBuilder sb, final String s ) {
+ private static void append( final StringBuilder sb, final String s ) {
if( s != null ) {
sb.append( s );
}
}
- static final Set<Integer> parseIntegerSet( String str ) {
+ static Set<Integer> parseIntegerSet(String str ) {
Set<Integer> set = new HashSet<>();
if( str != null && !str.trim().isEmpty() ) {
StringTokenizer parser = new StringTokenizer( str.trim(), ",", false );
@@ -59,7 +59,7 @@ public class TraceUtil {
return set;
}
- private static final void addParsedIntegerToSet( Set<Integer> set, String str ) {
+ private static void addParsedIntegerToSet( Set<Integer> set, String str ) {
if( str != null && !str.trim().isEmpty() ) {
try {
set.add( Integer.valueOf( str.trim() ) );
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/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 108961a..37b0335 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
@@ -88,7 +88,7 @@ import java.util.UUID;
public class KnoxCLI extends Configured implements Tool {
private static final String USAGE_PREFIX = "KnoxCLI {cmd} [options]";
- static final private String COMMANDS =
+ private static final String COMMANDS =
" [--help]\n" +
" [" + VersionCommand.USAGE + "]\n" +
" [" + MasterCreateCommand.USAGE + "]\n" +
@@ -1176,7 +1176,7 @@ public class KnoxCLI extends Configured implements Tool {
if(errors > 0) {
out.println(userSearchAttributeName + " or " + userObjectClass + " or " + searchBase + " or " + userSearchBase + " was found in the topology");
- out.println("If any one of the above params is present then " + userSearchAttributeName +
+ out.println("If any one of the above params is present then " + userSearchAttributeName +
" and " + userObjectClass + " must both be present and either " + searchBase + " or " + userSearchBase + " must also be present.");
}
errs += errors;
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-server/src/main/java/org/apache/knox/gateway/websockets/GatewayWebsocketHandler.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/websockets/GatewayWebsocketHandler.java b/gateway-server/src/main/java/org/apache/knox/gateway/websockets/GatewayWebsocketHandler.java
index 99ee19d..ffe423e 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/websockets/GatewayWebsocketHandler.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/websockets/GatewayWebsocketHandler.java
@@ -63,7 +63,7 @@ public class GatewayWebsocketHandler extends WebSocketHandler
static final String REGEX_SPLIT_CONTEXT = "^((?:[^/]*/){2}[^/]*)";
- final static String REGEX_SPLIT_SERVICE_PATH = "^((?:[^/]*/){3}[^/]*)";
+ static final String REGEX_SPLIT_SERVICE_PATH = "^((?:[^/]*/){3}[^/]*)";
private static final int POOL_SIZE = 10;
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-server/src/main/java/org/apache/knox/gateway/websockets/MessageEventCallback.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/websockets/MessageEventCallback.java b/gateway-server/src/main/java/org/apache/knox/gateway/websockets/MessageEventCallback.java
index a91eaef..4e3e1ea 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/websockets/MessageEventCallback.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/websockets/MessageEventCallback.java
@@ -29,39 +29,38 @@ public interface MessageEventCallback {
* A generic callback, can be left un-implemented
* @param message message
*/
- void doCallback(final String message);
-
+ void doCallback(String message);
+
/**
* Callback when connection is established.
* @param session session
*/
- void onConnectionOpen(final Object session);
-
+ void onConnectionOpen(Object session);
+
/**
* Callback when connection is closed.
* @param reason Reason for the connection close
*/
- void onConnectionClose(final CloseReason reason);
-
+ void onConnectionClose(CloseReason reason);
+
/**
* Callback when there is an error in connection.
* @param cause cause to throw on error
*/
- void onError(final Throwable cause);
-
+ void onError(Throwable cause);
+
/**
* Callback when a text message is received.
* @param message message
* @param session session
*/
- void onMessageText(final String message, final Object session);
-
+ void onMessageText(String message, Object session);
+
/**
* Callback when a binary message is received.
* @param message message
* @param last last
* @param session session
*/
- void onMessageBinary(final byte[] message, final boolean last, final Object session);
-
+ void onMessageBinary(byte[] message, boolean last, Object session);
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-server/src/main/java/org/apache/knox/gateway/websockets/ProxyWebSocketAdapter.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/websockets/ProxyWebSocketAdapter.java b/gateway-server/src/main/java/org/apache/knox/gateway/websockets/ProxyWebSocketAdapter.java
index d3cc717..529cf3f 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/websockets/ProxyWebSocketAdapter.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/websockets/ProxyWebSocketAdapter.java
@@ -64,7 +64,7 @@ public class ProxyWebSocketAdapter extends WebSocketAdapter {
* @since 0.14
*/
private ClientEndpointConfig clientConfig;
-
+
public ProxyWebSocketAdapter(final URI backend, final ExecutorService pool) {
this(backend, pool, null);
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-server/src/main/java/org/apache/knox/gateway/websockets/WebsocketLogMessages.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/websockets/WebsocketLogMessages.java b/gateway-server/src/main/java/org/apache/knox/gateway/websockets/WebsocketLogMessages.java
index 42f6ee5..9681d9d 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/websockets/WebsocketLogMessages.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/websockets/WebsocketLogMessages.java
@@ -24,10 +24,9 @@ import org.apache.knox.gateway.i18n.messages.StackTrace;
/**
* Logging for Websocket
- *
+ *
* @since 0.10
*/
-
@Messages(logger = "org.apache.knox.gateway.websockets")
public interface WebsocketLogMessages {
@@ -41,20 +40,20 @@ public interface WebsocketLogMessages {
void connectionFailed(@StackTrace(level = MessageLevel.ERROR) Exception e);
@Message(level = MessageLevel.ERROR, text = "Error: {0}")
- void onError(final String message);
+ void onError(String message);
@Message(level = MessageLevel.ERROR, text = "Bad or malformed url: {0}")
void badUrlError(@StackTrace(level = MessageLevel.ERROR) Exception e);
@Message(level = MessageLevel.DEBUG,
text = "Websocket connection to backend server {0} opened")
- void onConnectionOpen(final String backend);
+ void onConnectionOpen(String backend);
@Message(level = MessageLevel.DEBUG, text = "Message: {0}")
- void logMessage(final String message);
+ void logMessage(String message);
@Message(level = MessageLevel.DEBUG,
text = "Websocket connection to backend server {0} closed")
- void onConnectionClose(final String backend);
+ void onConnectionClose(String backend);
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-server/src/test/java/org/apache/knox/gateway/GatewayFilterTest.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/GatewayFilterTest.java b/gateway-server/src/test/java/org/apache/knox/gateway/GatewayFilterTest.java
index 853cb1b..6f5129e 100644
--- a/gateway-server/src/test/java/org/apache/knox/gateway/GatewayFilterTest.java
+++ b/gateway-server/src/test/java/org/apache/knox/gateway/GatewayFilterTest.java
@@ -73,7 +73,7 @@ public class GatewayFilterTest {
EasyMock.replay( request );
EasyMock.replay( context );
EasyMock.replay( gatewayConfig );
-
+
HttpServletResponse response = EasyMock.createNiceMock( HttpServletResponse.class );
EasyMock.replay( response );
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-server/src/test/java/org/apache/knox/gateway/GatewayForwardingServletTest.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/GatewayForwardingServletTest.java b/gateway-server/src/test/java/org/apache/knox/gateway/GatewayForwardingServletTest.java
index ec4d26e..72876b0 100644
--- a/gateway-server/src/test/java/org/apache/knox/gateway/GatewayForwardingServletTest.java
+++ b/gateway-server/src/test/java/org/apache/knox/gateway/GatewayForwardingServletTest.java
@@ -31,7 +31,6 @@ import org.easymock.IMocksControl;
import org.junit.Test;
public class GatewayForwardingServletTest {
-
@Test
public void testRedirectDefaults() throws ServletException, IOException {
IMocksControl mockControl = EasyMock.createControl();
@@ -62,5 +61,4 @@ public class GatewayForwardingServletTest {
servlet.service(request, response);
mockControl.verify();
}
-
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-server/src/test/java/org/apache/knox/gateway/GatewayPortMappingConfigTest.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/GatewayPortMappingConfigTest.java b/gateway-server/src/test/java/org/apache/knox/gateway/GatewayPortMappingConfigTest.java
index 68280e9..56b59b9 100644
--- a/gateway-server/src/test/java/org/apache/knox/gateway/GatewayPortMappingConfigTest.java
+++ b/gateway-server/src/test/java/org/apache/knox/gateway/GatewayPortMappingConfigTest.java
@@ -141,7 +141,7 @@ public class GatewayPortMappingConfigTest {
throws IOException, NoSuchFieldException, IllegalAccessException {
/* Check port conflict with default port */
exception.expect(IOException.class);
- exception.expectMessage(String.format(Locale.ROOT,
+ exception.expectMessage(String.format(Locale.ROOT,
" Port %d used by topology %s is used by other topology, ports for topologies (if defined) have to be unique. ",
huronPort, "eerie"));
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-server/src/test/java/org/apache/knox/gateway/config/impl/GatewayConfigImplTest.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/config/impl/GatewayConfigImplTest.java b/gateway-server/src/test/java/org/apache/knox/gateway/config/impl/GatewayConfigImplTest.java
index c34bf95..ffd9ac3 100644
--- a/gateway-server/src/test/java/org/apache/knox/gateway/config/impl/GatewayConfigImplTest.java
+++ b/gateway-server/src/test/java/org/apache/knox/gateway/config/impl/GatewayConfigImplTest.java
@@ -196,12 +196,12 @@ public class GatewayConfigImplTest {
assertThat(config.getGraphiteHost(), is("localhost"));
assertThat(config.getGraphitePort(), is(32772));
}
-
+
@Test( timeout = TestUtils.SHORT_TIMEOUT )
public void testGatewayIdleTimeout() {
GatewayConfigImpl config = new GatewayConfigImpl();
- long idleTimeout = 0l;
-
+ long idleTimeout;
+
idleTimeout = config.getGatewayIdleTimeout();
assertThat( idleTimeout, is(300000L));
@@ -209,12 +209,12 @@ public class GatewayConfigImplTest {
idleTimeout = config.getGatewayIdleTimeout();
assertThat( idleTimeout, is(15000L));
}
-
+
@Test( timeout = TestUtils.SHORT_TIMEOUT )
public void testGatewayServerHeaderEnabled() {
GatewayConfigImpl config = new GatewayConfigImpl();
- boolean serverHeaderEnabled = true;
-
+ boolean serverHeaderEnabled;
+
serverHeaderEnabled = config.isGatewayServerHeaderEnabled();
assertThat( serverHeaderEnabled, is(true));
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-server/src/test/java/org/apache/knox/gateway/services/security/CryptoServiceTest.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/services/security/CryptoServiceTest.java b/gateway-server/src/test/java/org/apache/knox/gateway/services/security/CryptoServiceTest.java
index 4d8511d..84a829e 100644
--- a/gateway-server/src/test/java/org/apache/knox/gateway/services/security/CryptoServiceTest.java
+++ b/gateway-server/src/test/java/org/apache/knox/gateway/services/security/CryptoServiceTest.java
@@ -28,6 +28,7 @@ import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import java.nio.charset.StandardCharsets;
import java.security.cert.Certificate;
import java.util.HashMap;
import java.util.List;
@@ -37,9 +38,9 @@ import static org.junit.Assert.assertEquals;
@Category( { ManualTests.class, MediumTests.class } )
public class CryptoServiceTest {
- static CryptoService cs = null;
- static AliasService as = null;
-
+ private static CryptoService cs = null;
+ private static AliasService as = null;
+
@BeforeClass
public static void setupSuite() throws Exception {
as = new AliasService() {
@@ -125,11 +126,11 @@ public class CryptoServiceTest {
ConfigurableEncryptor aes0 = new ConfigurableEncryptor("password");
aes0.init(config);
cs.init(config, new HashMap<String,String>());
- EncryptionResult result0 = cs.encryptForCluster("Test", "encrypt_url", queryString.getBytes("UTF8"));
+ EncryptionResult result0 = cs.encryptForCluster("Test", "encrypt_url", queryString.getBytes(StandardCharsets.UTF_8));
byte[] decrypted0 = cs.decryptForCluster("Test", "encrypt_url", result0.cipher, result0.iv, result0.salt);
- assertEquals(queryString, new String(decrypted0, "UTF8"));
- assertEquals(queryString.getBytes("UTF8").length, decrypted0.length);
- assertEquals(queryString.getBytes("UTF8").length, new String(decrypted0, "UTF8").toCharArray().length);
+ assertEquals(queryString, new String(decrypted0, StandardCharsets.UTF_8));
+ assertEquals(queryString.getBytes(StandardCharsets.UTF_8).length, decrypted0.length);
+ assertEquals(queryString.getBytes(StandardCharsets.UTF_8).length, new String(decrypted0, StandardCharsets.UTF_8).toCharArray().length);
}
@Test
@@ -148,11 +149,11 @@ public class CryptoServiceTest {
ConfigurableEncryptor aes0 = new ConfigurableEncryptor("password");
aes0.init(config);
cs.init(config, new HashMap<String,String>());
- EncryptionResult result0 = cs.encryptForCluster("Test", "encrypt_url", queryString.getBytes("UTF8"));
+ EncryptionResult result0 = cs.encryptForCluster("Test", "encrypt_url", queryString.getBytes(StandardCharsets.UTF_8));
byte[] decrypted0 = cs.decryptForCluster("Test", "encrypt_url", result0.cipher, result0.iv, result0.salt);
- assertEquals(queryString, new String(decrypted0, "UTF8"));
- assertEquals(queryString.getBytes("UTF8").length, decrypted0.length);
- assertEquals(queryString.getBytes("UTF8").length, new String(decrypted0, "UTF8").toCharArray().length);
+ assertEquals(queryString, new String(decrypted0, StandardCharsets.UTF_8));
+ assertEquals(queryString.getBytes(StandardCharsets.UTF_8).length, decrypted0.length);
+ assertEquals(queryString.getBytes(StandardCharsets.UTF_8).length, new String(decrypted0, StandardCharsets.UTF_8).toCharArray().length);
}
@Test
@@ -169,39 +170,39 @@ public class CryptoServiceTest {
// password to create key - same Encryptor
ConfigurableEncryptor aes = new ConfigurableEncryptor("Test");
aes.init(config);
- EncryptionResult result = aes.encrypt("larry".getBytes("UTF8"));
+ EncryptionResult result = aes.encrypt("larry".getBytes(StandardCharsets.UTF_8));
byte[] decrypted = aes.decrypt(result.salt, result.iv, result.cipher);
- assertEquals(new String(decrypted, "UTF8"), "larry");
+ assertEquals(new String(decrypted, StandardCharsets.UTF_8), "larry");
// password to create key - different Encryptor
ConfigurableEncryptor aes2 = new ConfigurableEncryptor("Test");
aes2.init(config);
decrypted = aes2.decrypt(result.salt, result.iv, result.cipher);
- assertEquals(new String(decrypted, "UTF8"), "larry");
+ assertEquals(new String(decrypted, StandardCharsets.UTF_8), "larry");
// password to create key resolved from alias - same Encryptor
ConfigurableEncryptor aes3 = new ConfigurableEncryptor(new String(as.getPasswordFromAliasForCluster("test", "encrypt_url")));
aes3.init(config);
- result = aes3.encrypt("larry".getBytes("UTF8"));
+ result = aes3.encrypt("larry".getBytes(StandardCharsets.UTF_8));
decrypted = aes3.decrypt(result.salt, result.iv, result.cipher);
- assertEquals(new String(decrypted, "UTF8"), "larry");
+ assertEquals(new String(decrypted, StandardCharsets.UTF_8), "larry");
// password to create key resolved from alias - different Encryptor
ConfigurableEncryptor aes4 = new ConfigurableEncryptor(new String(as.getPasswordFromAliasForCluster("test", "encrypt_url")));
aes4.init(config);
decrypted = aes4.decrypt(result.salt, result.iv, result.cipher);
- assertEquals(new String(decrypted, "UTF8"), "larry");
+ assertEquals(new String(decrypted, StandardCharsets.UTF_8), "larry");
}
@Test
//@Ignore
public void testEncryptionOfQueryStrings() throws Exception {
String alias = "encrypt-url";
- String queryString = "url=http://localhost:50070/api/v1/blahblah";
-
- EncryptionResult result = cs.encryptForCluster("Test", alias, queryString.getBytes("UTF8"));
+ String queryString = "url=http://localhost:50070/api/v1/blahblah";
+
+ EncryptionResult result = cs.encryptForCluster("Test", alias, queryString.getBytes(StandardCharsets.UTF_8));
assertEquals("Resulted cipertext length should be a multiple of 16", 0, (result.cipher.length % 16));
byte[] decryptedQueryString = cs.decryptForCluster("Test", alias, result.cipher, result.iv, result.salt);
- assertEquals(queryString.getBytes("UTF8").length, decryptedQueryString.length);
+ assertEquals(queryString.getBytes(StandardCharsets.UTF_8).length, decryptedQueryString.length);
}
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-server/src/test/java/org/apache/knox/gateway/util/KnoxCLITest.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/util/KnoxCLITest.java b/gateway-server/src/test/java/org/apache/knox/gateway/util/KnoxCLITest.java
index f82593f..ec1864e 100644
--- a/gateway-server/src/test/java/org/apache/knox/gateway/util/KnoxCLITest.java
+++ b/gateway-server/src/test/java/org/apache/knox/gateway/util/KnoxCLITest.java
@@ -455,14 +455,14 @@ public class KnoxCLITest {
"created."));
outContent.reset();
- String[] args2 = {"list-alias", "--master",
+ String[] args2 = {"list-alias", "--master",
"master"};
rc = cli.run(args2);
assertEquals(0, rc);
assertTrue(outContent.toString(StandardCharsets.UTF_8.name()), outContent.toString(StandardCharsets.UTF_8.name()).contains("alias1"));
outContent.reset();
- String[] args4 = {"delete-alias", "alias1", "--master",
+ String[] args4 = {"delete-alias", "alias1", "--master",
"master"};
rc = cli.run(args4);
assertEquals(0, rc);
@@ -474,7 +474,7 @@ public class KnoxCLITest {
assertEquals(0, rc);
assertFalse(outContent.toString(StandardCharsets.UTF_8.name()), outContent.toString(StandardCharsets.UTF_8.name()).contains("alias1"));
}
-
+
@Test
public void testListAndDeleteOfAliasForInvalidClusterName() throws Exception {
outContent.reset();
@@ -620,7 +620,7 @@ public class KnoxCLITest {
AliasService as = cli.getGatewayServices().getService(GatewayServices.ALIAS_SERVICE);
outContent.reset();
- String[] clusterCreateArgs = {"create-alias", "alias2", "--value", "testvalue1", "--cluster", "test",
+ String[] clusterCreateArgs = {"create-alias", "alias2", "--value", "testvalue1", "--cluster", "test",
"--master", "master"};
cli = new KnoxCLI();
cli.setConf( config );
@@ -656,7 +656,7 @@ public class KnoxCLITest {
assertEquals(0, rc);
assertTrue(outContent.toString(StandardCharsets.UTF_8.name()), outContent.toString(StandardCharsets.UTF_8.name()).contains("alias1 has been successfully " +
"deleted."));
-
+
outContent.reset();
String[] args5 = {"delete-alias", "alias2", "--cluster", "test", "--master", "master"};
cli = new KnoxCLI();
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-server/src/test/java/org/apache/knox/gateway/websockets/BadBackendTest.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/websockets/BadBackendTest.java b/gateway-server/src/test/java/org/apache/knox/gateway/websockets/BadBackendTest.java
index 036224b..ceaad86 100644
--- a/gateway-server/src/test/java/org/apache/knox/gateway/websockets/BadBackendTest.java
+++ b/gateway-server/src/test/java/org/apache/knox/gateway/websockets/BadBackendTest.java
@@ -40,37 +40,30 @@ import java.util.concurrent.TimeUnit;
*
*/
public class BadBackendTest {
-
/* Proxy */
private static Server proxy;
private static ServerConnector proxyConnector;
private static URI proxyUri;
-
+
private static final String BAD_BACKEND = "ws://localhost:666";
-
- public BadBackendTest() {
- super();
- }
-
+
@BeforeClass
public static void startServer() throws Exception {
startProxy();
-
}
@AfterClass
public static void stopServer() throws Exception {
proxy.stop();
-
}
-
+
/*
* Test for a message within limit.
*/
@Test(timeout = 8000)
public void testBadBackEnd() throws IOException, Exception {
final String message = "Echo";
-
+
WebSocketContainer container = ContainerProvider.getWebSocketContainer();
WebsocketClient client = new WebsocketClient();
@@ -80,11 +73,10 @@ public class BadBackendTest {
client.awaitClose(CloseReason.CloseCodes.UNEXPECTED_CONDITION.getCode(), 1000,
TimeUnit.MILLISECONDS);
-
- Assert.assertThat(client.close.getCloseCode().getCode(), CoreMatchers.is(CloseReason.CloseCodes.UNEXPECTED_CONDITION.getCode()));
+ Assert.assertThat(client.close.getCloseCode().getCode(), CoreMatchers.is(CloseReason.CloseCodes.UNEXPECTED_CONDITION.getCode()));
}
-
+
private static void startProxy() throws Exception {
proxy = new Server();
proxyConnector = new ServerConnector(proxy);
@@ -108,8 +100,5 @@ public class BadBackendTest {
}
int port = proxyConnector.getLocalPort();
proxyUri = new URI(String.format(Locale.ROOT, "ws://%s:%d/", host, port));
-
}
-
-
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-server/src/test/java/org/apache/knox/gateway/websockets/ConnectionDroppedTest.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/websockets/ConnectionDroppedTest.java b/gateway-server/src/test/java/org/apache/knox/gateway/websockets/ConnectionDroppedTest.java
index bdc5672..88a3275 100644
--- a/gateway-server/src/test/java/org/apache/knox/gateway/websockets/ConnectionDroppedTest.java
+++ b/gateway-server/src/test/java/org/apache/knox/gateway/websockets/ConnectionDroppedTest.java
@@ -41,7 +41,7 @@ import java.util.concurrent.TimeUnit;
/**
* Test to simulate unexpected connection drop. Here we establish a connection
* and then try to simulate an error.
- *
+ *
* @since 0.10
*
*/
@@ -148,9 +148,8 @@ public class ConnectionDroppedTest {
}
/**
- *
* Simulate a bad socket.
- *
+ *
* @since 0.10
*/
class BadSocket extends WebSocketAdapter {
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-server/src/test/java/org/apache/knox/gateway/websockets/EchoSocket.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/websockets/EchoSocket.java b/gateway-server/src/test/java/org/apache/knox/gateway/websockets/EchoSocket.java
index 477a218..4d55b60 100644
--- a/gateway-server/src/test/java/org/apache/knox/gateway/websockets/EchoSocket.java
+++ b/gateway-server/src/test/java/org/apache/knox/gateway/websockets/EchoSocket.java
@@ -26,8 +26,7 @@ import org.eclipse.jetty.websocket.api.RemoteEndpoint;
import org.eclipse.jetty.websocket.api.WebSocketAdapter;
/**
- *
- * A simple Echo socket
+ * A simple Echo socket
*/
public class EchoSocket extends WebSocketAdapter {
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-server/src/test/java/org/apache/knox/gateway/websockets/MessageFailureTest.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/websockets/MessageFailureTest.java b/gateway-server/src/test/java/org/apache/knox/gateway/websockets/MessageFailureTest.java
index 6b38ca0..9786dc1 100644
--- a/gateway-server/src/test/java/org/apache/knox/gateway/websockets/MessageFailureTest.java
+++ b/gateway-server/src/test/java/org/apache/knox/gateway/websockets/MessageFailureTest.java
@@ -88,7 +88,7 @@ public class MessageFailureTest {
client.awaitClose(CloseReason.CloseCodes.TOO_BIG.getCode(), 1000,
TimeUnit.MILLISECONDS);
-
+
Assert.assertThat(client.close.getCloseCode().getCode(), CoreMatchers.is(CloseReason.CloseCodes.TOO_BIG.getCode()));
}
@@ -161,21 +161,16 @@ public class MessageFailureTest {
}
int port = proxyConnector.getLocalPort();
proxyUri = new URI(String.format(Locale.ROOT, "ws://%s:%d/", host, port));
-
}
-
}
/**
* A Mock websocket handler that just Echos messages
*/
-class BigEchoSocketHandler extends WebSocketHandler
- implements WebSocketCreator {
-
- // final EchoSocket socket = new EchoSocket();
- final WebSocketAdapter socket;
+class BigEchoSocketHandler extends WebSocketHandler implements WebSocketCreator {
+ private final WebSocketAdapter socket;
- public BigEchoSocketHandler(final WebSocketAdapter socket) {
+ BigEchoSocketHandler(final WebSocketAdapter socket) {
this.socket = socket;
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-server/src/test/java/org/apache/knox/gateway/websockets/WebsocketEchoHandler.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/websockets/WebsocketEchoHandler.java b/gateway-server/src/test/java/org/apache/knox/gateway/websockets/WebsocketEchoHandler.java
index b231c76..1049c9b 100644
--- a/gateway-server/src/test/java/org/apache/knox/gateway/websockets/WebsocketEchoHandler.java
+++ b/gateway-server/src/test/java/org/apache/knox/gateway/websockets/WebsocketEchoHandler.java
@@ -28,20 +28,16 @@ import org.eclipse.jetty.websocket.servlet.WebSocketServletFactory;
*
*/
public class WebsocketEchoHandler extends WebSocketHandler implements WebSocketCreator {
+ private final EchoSocket socket = new EchoSocket();
- final EchoSocket socket = new EchoSocket();
-
@Override
- public void configure(WebSocketServletFactory factory)
- {
+ public void configure(WebSocketServletFactory factory) {
factory.getPolicy().setMaxTextMessageSize(2 * 1024 * 1024);
factory.setCreator(this);
}
@Override
- public Object createWebSocket(ServletUpgradeRequest req, ServletUpgradeResponse resp)
- {
+ public Object createWebSocket(ServletUpgradeRequest req, ServletUpgradeResponse resp) {
return socket;
}
-
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-server/src/test/java/org/apache/knox/gateway/websockets/WebsocketEchoTest.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/websockets/WebsocketEchoTest.java b/gateway-server/src/test/java/org/apache/knox/gateway/websockets/WebsocketEchoTest.java
index a15b70c..9891985 100644
--- a/gateway-server/src/test/java/org/apache/knox/gateway/websockets/WebsocketEchoTest.java
+++ b/gateway-server/src/test/java/org/apache/knox/gateway/websockets/WebsocketEchoTest.java
@@ -72,11 +72,10 @@ import static org.hamcrest.MatcherAssert.assertThat;
* address of the Websocket server.
* <li>A mock client is setup to connect to gateway.
* </ul>
- *
+ *
* The test is to confirm whether the message is sent all the way to the backend
* Websocket server through Knox and back.
- *
- *
+ *
* @since 0.10
*/
public class WebsocketEchoTest {
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-server/src/test/java/org/apache/knox/gateway/websockets/WebsocketMultipleConnectionTest.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/websockets/WebsocketMultipleConnectionTest.java b/gateway-server/src/test/java/org/apache/knox/gateway/websockets/WebsocketMultipleConnectionTest.java
index 2d25d82..fd28e7f 100644
--- a/gateway-server/src/test/java/org/apache/knox/gateway/websockets/WebsocketMultipleConnectionTest.java
+++ b/gateway-server/src/test/java/org/apache/knox/gateway/websockets/WebsocketMultipleConnectionTest.java
@@ -372,7 +372,7 @@ public class WebsocketMultipleConnectionTest {
}
}
- private static abstract class WebsocketClient extends Endpoint
+ private abstract static class WebsocketClient extends Endpoint
implements MessageHandler.Whole<String> {
@Override
public void onOpen(Session session, EndpointConfig config) {
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-server/src/test/resources/org/apache/knox/gateway/topology/xml/simple-topology-knox-format.xml
----------------------------------------------------------------------
diff --git a/gateway-server/src/test/resources/org/apache/knox/gateway/topology/xml/simple-topology-knox-format.xml b/gateway-server/src/test/resources/org/apache/knox/gateway/topology/xml/simple-topology-knox-format.xml
index c0b9b13..b9fed2d 100644
--- a/gateway-server/src/test/resources/org/apache/knox/gateway/topology/xml/simple-topology-knox-format.xml
+++ b/gateway-server/src/test/resources/org/apache/knox/gateway/topology/xml/simple-topology-knox-format.xml
@@ -47,16 +47,16 @@
</param>
</provider>
<provider>
- <role>identity-assertion</role>
- <enabled>true</enabled>
- <name>Default</name>
- <param>
+ <role>identity-assertion</role>
+ <enabled>true</enabled>
+ <name>Default</name>
+ <param>
<name>name</name>
<value>user.name</value>
</param>
<param>
- <name>principal.mapping</name>
- <value>hdfs=lmccay;kminder=admin</value>
+ <name>principal.mapping</name>
+ <value>hdfs=lmccay;kminder=admin</value>
</param>
</provider>
</gateway>
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-service-admin/src/main/java/org/apache/knox/gateway/service/admin/VersionResource.java
----------------------------------------------------------------------
diff --git a/gateway-service-admin/src/main/java/org/apache/knox/gateway/service/admin/VersionResource.java b/gateway-service-admin/src/main/java/org/apache/knox/gateway/service/admin/VersionResource.java
index 4d613c0..30e35ff 100644
--- a/gateway-service-admin/src/main/java/org/apache/knox/gateway/service/admin/VersionResource.java
+++ b/gateway-service-admin/src/main/java/org/apache/knox/gateway/service/admin/VersionResource.java
@@ -37,7 +37,7 @@ import static javax.ws.rs.core.Response.Status.NOT_FOUND;
@Path( "/api/v1" )
public class VersionResource {
- @Context
+ @Context
private HttpServletRequest request;
@GET
@@ -68,7 +68,7 @@ public class VersionResource {
private String version;
@XmlElement(name="hash")
private String hash;
-
+
public ServerVersion(String version, String hash) {
super();
this.version = version;
@@ -76,7 +76,7 @@ public class VersionResource {
}
public ServerVersion() { }
-
+
public String getVersion() {
return version;
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-service-definitions/src/main/resources/services/sparkthriftui/2.1.0/service.xml
----------------------------------------------------------------------
diff --git a/gateway-service-definitions/src/main/resources/services/sparkthriftui/2.1.0/service.xml b/gateway-service-definitions/src/main/resources/services/sparkthriftui/2.1.0/service.xml
index 1865efa..3633899 100644
--- a/gateway-service-definitions/src/main/resources/services/sparkthriftui/2.1.0/service.xml
+++ b/gateway-service-definitions/src/main/resources/services/sparkthriftui/2.1.0/service.xml
@@ -19,7 +19,7 @@
<routes>
<route path="/thrift/jobs">
<rewrite apply="THRIFTSERVERUI/thrift/root/filter/OUT" to="response.body"/>
- </route>
+ </route>
<route path="/thrift/">
<rewrite apply="THRIFTSERVERUI/thrift/outbound/headers" to="response.headers"/>
</route>
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-service-definitions/src/main/resources/services/yarn-rm/2.5.0/rewrite.xml
----------------------------------------------------------------------
diff --git a/gateway-service-definitions/src/main/resources/services/yarn-rm/2.5.0/rewrite.xml b/gateway-service-definitions/src/main/resources/services/yarn-rm/2.5.0/rewrite.xml
index 95ce2a3..bcb9005 100644
--- a/gateway-service-definitions/src/main/resources/services/yarn-rm/2.5.0/rewrite.xml
+++ b/gateway-service-definitions/src/main/resources/services/yarn-rm/2.5.0/rewrite.xml
@@ -33,27 +33,27 @@
<rule dir="OUT" name="RESOURCEMANAGER/resourcemanager/url/outbound">
<match pattern="*://*:*/**?**"/>
- <rewrite template=""/>
+ <rewrite template=""/>
</rule>
<rule dir="OUT" name="RESOURCEMANAGER/resourcemanager/trackingUrlHistory/outbound">
<match pattern="{scheme}://{host}:{port}/proxy/{appid=*}/jobhistory/job/**"/>
- <rewrite template=""/>
+ <rewrite template=""/>
</rule>
<rule dir="OUT" name="RESOURCEMANAGER/resourcemanager/trackingUrlAM/outbound">
<match pattern="{scheme}://{host}:{port}/proxy/{appid=*}"/>
- <rewrite template="{$frontend[url]}/resourcemanager/proxy/{appid=*}?{scheme}?host={$hostmap(host)}?{port}?{**}"/>
- <encrypt-query/>
+ <rewrite template="{$frontend[url]}/resourcemanager/proxy/{appid=*}?{scheme}?host={$hostmap(host)}?{port}?{**}"/>
+ <encrypt-query/>
</rule>
<rule dir="OUT" name="RESOURCEMANAGER/resourcemanager/hostport/outbound">
<match pattern="*:*"/>
- <rewrite template=""/>
+ <rewrite template=""/>
</rule>
<rule dir="OUT" name="RESOURCEMANAGER/resourcemanager/logsLink/outbound">
<match pattern="//*:*/**?**"/>
- <rewrite template=""/>
+ <rewrite template=""/>
</rule>
<rule dir="OUT" name="RESOURCEMANAGER/resourcemanager/host/outbound">
- <rewrite template=""/>
+ <rewrite template=""/>
</rule>
<rule dir="OUT" name="RESOURCEMANAGER/resourcemanager/nodeId/outbound">
<match pattern="{host=*}:{port=*}"/>
@@ -68,54 +68,54 @@
<filter name="RESOURCEMANAGER/resourcemanager/apps/outbound">
<content type="*/json">
- <buffer path="$.apps.app[*]">
- <detect path="$.trackingUI" value="History">
- <apply path="$.trackingUrl" rule="RESOURCEMANAGER/resourcemanager/url/outbound"/>
- </detect>
- <detect path="$.trackingUI" value="ApplicationMaster">
- <apply path="$.trackingUrl" rule="RESOURCEMANAGER/resourcemanager/trackingUrlAM/outbound"/>
- </detect>
- <apply path="$.amContainerLogs" rule="RESOURCEMANAGER/resourcemanager/url/outbound"/>
- <apply path="$.amHostHttpAddress" rule="RESOURCEMANAGER/resourcemanager/hostport/outbound"/>
- </buffer>
+ <buffer path="$.apps.app[*]">
+ <detect path="$.trackingUI" value="History">
+ <apply path="$.trackingUrl" rule="RESOURCEMANAGER/resourcemanager/url/outbound"/>
+ </detect>
+ <detect path="$.trackingUI" value="ApplicationMaster">
+ <apply path="$.trackingUrl" rule="RESOURCEMANAGER/resourcemanager/trackingUrlAM/outbound"/>
+ </detect>
+ <apply path="$.amContainerLogs" rule="RESOURCEMANAGER/resourcemanager/url/outbound"/>
+ <apply path="$.amHostHttpAddress" rule="RESOURCEMANAGER/resourcemanager/hostport/outbound"/>
+ </buffer>
</content>
<content type="*/xml">
- <buffer path="/apps/app">
- <detect path="trackingUI" value="History">
- <apply path="trackingUrl" rule="RESOURCEMANAGER/resourcemanager/url/outbound"/>
- </detect>
- <detect path="trackingUI" value="ApplicationMaster">
- <apply path="trackingUrl" rule="RESOURCEMANAGER/resourcemanager/trackingUrlAM/outbound"/>
- </detect>
- <apply path="amContainerLogs" rule="RESOURCEMANAGER/resourcemanager/url/outbound"/>
- <apply path="amHostHttpAddress" rule="RESOURCEMANAGER/resourcemanager/hostport/outbound"/>
- </buffer>
+ <buffer path="/apps/app">
+ <detect path="trackingUI" value="History">
+ <apply path="trackingUrl" rule="RESOURCEMANAGER/resourcemanager/url/outbound"/>
+ </detect>
+ <detect path="trackingUI" value="ApplicationMaster">
+ <apply path="trackingUrl" rule="RESOURCEMANAGER/resourcemanager/trackingUrlAM/outbound"/>
+ </detect>
+ <apply path="amContainerLogs" rule="RESOURCEMANAGER/resourcemanager/url/outbound"/>
+ <apply path="amHostHttpAddress" rule="RESOURCEMANAGER/resourcemanager/hostport/outbound"/>
+ </buffer>
</content>
</filter>
<filter name="RESOURCEMANAGER/resourcemanager/app/outbound">
<content type="*/json">
- <buffer path="$.app">
- <detect path="$.trackingUI" value="History">
- <apply path="$.trackingUrl" rule="RESOURCEMANAGER/resourcemanager/url/outbound"/>
- </detect>
- <detect path="$.trackingUI" value="ApplicationMaster">
- <apply path="$.trackingUrl" rule="RESOURCEMANAGER/resourcemanager/trackingUrlAM/outbound"/>
- </detect>
- <apply path="$.amContainerLogs" rule="RESOURCEMANAGER/resourcemanager/url/outbound"/>
- <apply path="$.amHostHttpAddress" rule="RESOURCEMANAGER/resourcemanager/hostport/outbound"/>
+ <buffer path="$.app">
+ <detect path="$.trackingUI" value="History">
+ <apply path="$.trackingUrl" rule="RESOURCEMANAGER/resourcemanager/url/outbound"/>
+ </detect>
+ <detect path="$.trackingUI" value="ApplicationMaster">
+ <apply path="$.trackingUrl" rule="RESOURCEMANAGER/resourcemanager/trackingUrlAM/outbound"/>
+ </detect>
+ <apply path="$.amContainerLogs" rule="RESOURCEMANAGER/resourcemanager/url/outbound"/>
+ <apply path="$.amHostHttpAddress" rule="RESOURCEMANAGER/resourcemanager/hostport/outbound"/>
</buffer>
</content>
<content type="*/xml">
- <buffer path="/app">
- <detect path="trackingUI" value="History">
- <apply path="trackingUrl" rule="RESOURCEMANAGER/resourcemanager/url/outbound"/>
- </detect>
- <detect path="trackingUI" value="ApplicationMaster">
- <apply path="trackingUrl" rule="RESOURCEMANAGER/resourcemanager/trackingUrlAM/outbound"/>
- </detect>
- <apply path="amContainerLogs" rule="RESOURCEMANAGER/resourcemanager/url/outbound"/>
- <apply path="amHostHttpAddress" rule="RESOURCEMANAGER/resourcemanager/hostport/outbound"/>
+ <buffer path="/app">
+ <detect path="trackingUI" value="History">
+ <apply path="trackingUrl" rule="RESOURCEMANAGER/resourcemanager/url/outbound"/>
+ </detect>
+ <detect path="trackingUI" value="ApplicationMaster">
+ <apply path="trackingUrl" rule="RESOURCEMANAGER/resourcemanager/trackingUrlAM/outbound"/>
+ </detect>
+ <apply path="amContainerLogs" rule="RESOURCEMANAGER/resourcemanager/url/outbound"/>
+ <apply path="amHostHttpAddress" rule="RESOURCEMANAGER/resourcemanager/hostport/outbound"/>
</buffer>
</content>
</filter>
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-service-knoxsso/src/test/java/org/apache/knox/gateway/service/knoxsso/WebSSOResourceTest.java
----------------------------------------------------------------------
diff --git a/gateway-service-knoxsso/src/test/java/org/apache/knox/gateway/service/knoxsso/WebSSOResourceTest.java b/gateway-service-knoxsso/src/test/java/org/apache/knox/gateway/service/knoxsso/WebSSOResourceTest.java
index e5f972d..52cc8f7 100644
--- a/gateway-service-knoxsso/src/test/java/org/apache/knox/gateway/service/knoxsso/WebSSOResourceTest.java
+++ b/gateway-service-knoxsso/src/test/java/org/apache/knox/gateway/service/knoxsso/WebSSOResourceTest.java
@@ -548,7 +548,7 @@ public class WebSSOResourceTest {
GatewayServices services = EasyMock.createNiceMock(GatewayServices.class);
EasyMock.expect(context.getAttribute(GatewayServices.GATEWAY_SERVICES_ATTRIBUTE)).andReturn(services);
-
+
JWTokenAuthority authority = new TestJWTokenAuthority(gatewayPublicKey, gatewayPrivateKey);
EasyMock.expect(services.getService(GatewayServices.TOKEN_SERVICE)).andReturn(authority);
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-service-knoxtoken/src/main/java/org/apache/knox/gateway/service/knoxtoken/TokenResource.java
----------------------------------------------------------------------
diff --git a/gateway-service-knoxtoken/src/main/java/org/apache/knox/gateway/service/knoxtoken/TokenResource.java b/gateway-service-knoxtoken/src/main/java/org/apache/knox/gateway/service/knoxtoken/TokenResource.java
index 983b616..1a583f4 100644
--- a/gateway-service-knoxtoken/src/main/java/org/apache/knox/gateway/service/knoxtoken/TokenResource.java
+++ b/gateway-service-knoxtoken/src/main/java/org/apache/knox/gateway/service/knoxtoken/TokenResource.java
@@ -212,7 +212,7 @@ public class TokenResource {
}
private long getExpiry() {
- long expiry = 0l;
+ long expiry;
if (tokenTTL == -1) {
expiry = -1;
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-service-remoteconfig/src/main/java/org/apache/knox/gateway/service/config/remote/RemoteConfigurationMessages.java
----------------------------------------------------------------------
diff --git a/gateway-service-remoteconfig/src/main/java/org/apache/knox/gateway/service/config/remote/RemoteConfigurationMessages.java b/gateway-service-remoteconfig/src/main/java/org/apache/knox/gateway/service/config/remote/RemoteConfigurationMessages.java
index a243330..732981c 100644
--- a/gateway-service-remoteconfig/src/main/java/org/apache/knox/gateway/service/config/remote/RemoteConfigurationMessages.java
+++ b/gateway-service-remoteconfig/src/main/java/org/apache/knox/gateway/service/config/remote/RemoteConfigurationMessages.java
@@ -30,17 +30,16 @@ public interface RemoteConfigurationMessages {
void multipleRemoteRegistryConfigurations();
@Message(level = MessageLevel.ERROR, text = "Failed to resolve the credential alias {0}")
- void unresolvedCredentialAlias(final String alias);
+ void unresolvedCredentialAlias(String alias);
@Message(level = MessageLevel.ERROR, text = "An error occurred interacting with the remote configuration registry : {0}")
void errorInteractingWithRemoteConfigRegistry(@StackTrace(level = MessageLevel.DEBUG) Exception e);
@Message(level = MessageLevel.ERROR, text = "An error occurred handling the ACL for remote configuration {0} : {1}")
- void errorHandlingRemoteConfigACL(final String path,
+ void errorHandlingRemoteConfigACL(String path,
@StackTrace(level = MessageLevel.DEBUG) Exception e);
@Message(level = MessageLevel.ERROR, text = "An error occurred setting the ACL for remote configuration {0} : {1}")
- void errorSettingEntryACL(final String path,
+ void errorSettingEntryACL(String path,
@StackTrace(level = MessageLevel.DEBUG) Exception e);
-
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-service-vault/src/main/java/org/apache/knox/gateway/service/vault/CredentialResource.java
----------------------------------------------------------------------
diff --git a/gateway-service-vault/src/main/java/org/apache/knox/gateway/service/vault/CredentialResource.java b/gateway-service-vault/src/main/java/org/apache/knox/gateway/service/vault/CredentialResource.java
index 5a78500..0dfc6ae 100644
--- a/gateway-service-vault/src/main/java/org/apache/knox/gateway/service/vault/CredentialResource.java
+++ b/gateway-service-vault/src/main/java/org/apache/knox/gateway/service/vault/CredentialResource.java
@@ -41,9 +41,9 @@ import static javax.ws.rs.core.Response.Status.NOT_FOUND;
@Path( "/vault/credentials" )
public class CredentialResource {
- @Context
+ @Context
private HttpServletRequest request;
-
+
@GET
@Path("{alias}")
@Produces({APPLICATION_JSON, APPLICATION_XML})
@@ -103,17 +103,17 @@ public class CredentialResource {
}
return null;
}
-
+
public static class CredentialValue {
private String alias;
private String credential;
-
+
public CredentialValue(String alias, String credential) {
super();
this.alias = alias;
this.credential = credential;
}
-
+
public String getAlias() {
return alias;
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-service-webhdfs/src/main/java/org/apache/knox/gateway/hdfs/dispatch/AbstractHdfsHaDispatch.java
----------------------------------------------------------------------
diff --git a/gateway-service-webhdfs/src/main/java/org/apache/knox/gateway/hdfs/dispatch/AbstractHdfsHaDispatch.java b/gateway-service-webhdfs/src/main/java/org/apache/knox/gateway/hdfs/dispatch/AbstractHdfsHaDispatch.java
index 37e146a..97890fc 100644
--- a/gateway-service-webhdfs/src/main/java/org/apache/knox/gateway/hdfs/dispatch/AbstractHdfsHaDispatch.java
+++ b/gateway-service-webhdfs/src/main/java/org/apache/knox/gateway/hdfs/dispatch/AbstractHdfsHaDispatch.java
@@ -63,14 +63,14 @@ public abstract class AbstractHdfsHaDispatch extends HdfsHttpClientDispatch {
public HaProvider getHaProvider() {
return haProvider;
}
-
+
abstract String getResourceRole();
@Configure
public void setHaProvider(HaProvider haProvider) {
this.haProvider = haProvider;
}
-
+
@Override
protected void executeRequest(HttpUriRequest outboundRequest, HttpServletRequest inboundRequest, HttpServletResponse outboundResponse) throws IOException {
HttpResponse inboundResponse = null;
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/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 925800e..643387b 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
@@ -25,7 +25,7 @@ public class WebHdfsHaDispatch extends AbstractHdfsHaDispatch {
public WebHdfsHaDispatch() throws ServletException {
super();
}
-
+
@Override
protected String getResourceRole() {
return RESOURCE_ROLE;
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-shell/src/main/java/org/apache/knox/gateway/shell/AbstractCredentialCollector.java
----------------------------------------------------------------------
diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/AbstractCredentialCollector.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/AbstractCredentialCollector.java
index 9146c12..3d1f259 100644
--- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/AbstractCredentialCollector.java
+++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/AbstractCredentialCollector.java
@@ -25,9 +25,6 @@ public abstract class AbstractCredentialCollector implements CredentialCollector
protected String value;
private String name;
- /**
- *
- */
public AbstractCredentialCollector() {
super();
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-shell/src/main/java/org/apache/knox/gateway/shell/AbstractJavaConsoleCredentialCollector.java
----------------------------------------------------------------------
diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/AbstractJavaConsoleCredentialCollector.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/AbstractJavaConsoleCredentialCollector.java
index e077ad6..f234a4a 100644
--- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/AbstractJavaConsoleCredentialCollector.java
+++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/AbstractJavaConsoleCredentialCollector.java
@@ -31,10 +31,10 @@ public abstract class AbstractJavaConsoleCredentialCollector extends AbstractCre
System.err.println("No console.");
System.exit(1);
}
-
+
String username = c.readLine(prompt);
value = username;
-
+
return value;
}
@@ -45,10 +45,10 @@ public abstract class AbstractJavaConsoleCredentialCollector extends AbstractCre
System.err.println("No console.");
System.exit(1);
}
-
+
response = c.readPassword(prompt);
value = new String(response);
-
+
return value;
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-shell/src/main/java/org/apache/knox/gateway/shell/AbstractRequest.java
----------------------------------------------------------------------
diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/AbstractRequest.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/AbstractRequest.java
index 1a6af29..48a2e05 100644
--- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/AbstractRequest.java
+++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/AbstractRequest.java
@@ -49,7 +49,7 @@ public abstract class AbstractRequest<T> {
addHeaders(request, session.getHeaders());
return session.executeNow( request );
}
-
+
private void addHeaders(HttpRequest request, Map<String, String> headers) {
for(Entry<String, String> header : headers.entrySet()) {
request.setHeader(header.getKey(), header.getValue());
@@ -72,7 +72,7 @@ public abstract class AbstractRequest<T> {
}
}
- abstract protected Callable<T> callable();
+ protected abstract Callable<T> callable();
public T now() throws KnoxShellException {
try {
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-shell/src/main/java/org/apache/knox/gateway/shell/Credentials.java
----------------------------------------------------------------------
diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/Credentials.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/Credentials.java
index 4cf42f0..dae0062 100644
--- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/Credentials.java
+++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/Credentials.java
@@ -22,8 +22,8 @@ import java.util.ServiceLoader;
public class Credentials {
ArrayList<CredentialCollector> collectors = new ArrayList<>();
-
- public Credentials add(String collectorType, String prompt, String name)
+
+ public Credentials add(String collectorType, String prompt, String name)
throws CredentialCollectionException {
CredentialCollector collector = loadCredentialCollector(collectorType, prompt, name);
if (collector == null) {
@@ -50,7 +50,7 @@ public class Credentials {
}
return null;
}
-
+
private CredentialCollector loadCredentialCollector(String type, String prompt, String name) {
ServiceLoader<CredentialCollector> collectorsList = ServiceLoader.load(CredentialCollector.class);
for (CredentialCollector collector : collectorsList) {
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-shell/src/main/java/org/apache/knox/gateway/shell/KnoxSh.java
----------------------------------------------------------------------
diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/KnoxSh.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/KnoxSh.java
index fdb09a5..af7b648 100644
--- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/KnoxSh.java
+++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/KnoxSh.java
@@ -45,7 +45,7 @@ import java.util.TimeZone;
public class KnoxSh {
private static final String USAGE_PREFIX = "KnoxSh {cmd} [options]";
- final static private String COMMANDS =
+ private static final String COMMANDS =
" [--help]\n" +
" [" + KnoxInit.USAGE + "]\n" +
" [" + KnoxDestroy.USAGE + "]\n" +
@@ -169,20 +169,20 @@ public class KnoxSh {
String username = credentials.get("user").string();
String pass = credentials.get("pass").string();
-
+
KnoxSession session = null;
Get.Response response = null;
try {
session = KnoxSession.login(gateway, username, pass);
-
+
response = Token.get( session ).now();
String text = response.getString();
Map<String, String> json = JsonUtils.getMapFromJsonString(text);
-
+
//println "Access Token: " + json.access_token
System.out.println("knoxinit successful!");
displayTokenDetails(json);
-
+
File tokenfile = new File(System.getProperty("user.home"), ".knoxtokencache");
try( FileOutputStream fos = new FileOutputStream(tokenfile) ) {
fos.write(text.getBytes(StandardCharsets.UTF_8));
@@ -236,7 +236,7 @@ public class KnoxSh {
File.separator + ".knoxtokencache";
if (new File(tokenFilePath).exists()) {
String tokenfile = readFile(tokenFilePath);
-
+
if (tokenfile != null) {
Map<String, String> json = JsonUtils.getMapFromJsonString(tokenfile);
displayTokenDetails(json);
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/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 72801fc..5d04d12 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
@@ -34,7 +34,6 @@ import java.util.List;
import java.util.concurrent.Callable;
class Java {
-
public static class Request extends AbstractRequest<Response> {
String jar;
@@ -43,7 +42,7 @@ class Java {
String output;
List<NameValuePair> params = new ArrayList<>();
- public Request( KnoxSession session ) {
+ Request( KnoxSession session ) {
super( session );
}
@@ -93,8 +92,7 @@ class Java {
}
public static class Response extends BasicResponse {
-
- public Response( HttpResponse response ) {
+ Response( HttpResponse response ) {
super( response );
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/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 07081eb..d5c0fea 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
@@ -29,8 +29,7 @@ import java.util.concurrent.Callable;
class Queue {
public static class Request extends AbstractRequest<Response> {
-
- public Request( KnoxSession session ) {
+ Request( KnoxSession session ) {
super( session );
}
@@ -45,15 +44,11 @@ class Queue {
}
};
}
-
}
public static class Response extends BasicResponse {
-
protected Response( HttpResponse response ) {
super( response );
}
-
}
-
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/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 2a1a9ae..79e2ce1 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
@@ -32,7 +32,7 @@ class Status {
private String jobId;
- public Request( KnoxSession session ) {
+ Request( KnoxSession session ) {
super( session );
}
@@ -52,15 +52,11 @@ class Status {
}
};
}
-
}
public static class Response extends BasicResponse {
-
protected Response( HttpResponse response ) {
super( response );
}
-
}
-
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-spi/src/main/java/org/apache/knox/gateway/SpiGatewayMessages.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/SpiGatewayMessages.java b/gateway-spi/src/main/java/org/apache/knox/gateway/SpiGatewayMessages.java
index 8fffb36..335a5ce 100644
--- a/gateway-spi/src/main/java/org/apache/knox/gateway/SpiGatewayMessages.java
+++ b/gateway-spi/src/main/java/org/apache/knox/gateway/SpiGatewayMessages.java
@@ -33,7 +33,7 @@ public interface SpiGatewayMessages {
@Message( level = MessageLevel.DEBUG, text = "Dispatch request: {0} {1}" )
void dispatchRequest( String method, URI uri );
-
+
@Message( level = MessageLevel.WARN, text = "Connection exception dispatching request: {0} {1}" )
void dispatchServiceConnectionException( URI uri, @StackTrace(level=MessageLevel.WARN) Exception e );
@@ -45,7 +45,7 @@ public interface SpiGatewayMessages {
@Message( level = MessageLevel.DEBUG, text = "Successful Knox->Hadoop SPNegotiation authentication for URL: {0}" )
void successfulSPNegoAuthn(String uri);
-
+
@Message( level = MessageLevel.ERROR, text = "Failed Knox->Hadoop SPNegotiation authentication for URL: {0}" )
void failedSPNegoAuthn(String uri);
@@ -81,11 +81,11 @@ public interface SpiGatewayMessages {
@Message( level = MessageLevel.INFO,
text = "Applying a derived dispatch whitelist because none is configured in gateway-site: {0}" )
- void derivedDispatchWhitelist(final String derivedWhitelist);
+ void derivedDispatchWhitelist(String derivedWhitelist);
@Message( level=MessageLevel.ERROR,
text = "Unable to reliably determine the Knox domain for the default whitelist. Defaulting to allow requests only to {0}. Please consider explicitly configuring the whitelist via the gateway.dispatch.whitelist property in gateway-site" )
- void unableToDetermineKnoxDomainForDefaultWhitelist(final String permittedHostName);
+ void unableToDetermineKnoxDomainForDefaultWhitelist(String permittedHostName);
@Message( level = MessageLevel.ERROR,
text = "The dispatch to {0} was disallowed because it fails the dispatch whitelist validation. See documentation for dispatch whitelisting." )
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-spi/src/main/java/org/apache/knox/gateway/config/GatewayConfig.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/config/GatewayConfig.java b/gateway-spi/src/main/java/org/apache/knox/gateway/config/GatewayConfig.java
index 98846ac..c13ece5 100644
--- a/gateway-spi/src/main/java/org/apache/knox/gateway/config/GatewayConfig.java
+++ b/gateway-spi/src/main/java/org/apache/knox/gateway/config/GatewayConfig.java
@@ -25,22 +25,22 @@ import java.util.Map;
public interface GatewayConfig {
// Used as the basis for any home directory that is not specified.
- static final String GATEWAY_HOME_VAR = "GATEWAY_HOME";
+ String GATEWAY_HOME_VAR = "GATEWAY_HOME";
// Variable name for the location of configuration files edited by users
- static final String GATEWAY_CONF_HOME_VAR = "GATEWAY_CONF_HOME";
+ String GATEWAY_CONF_HOME_VAR = "GATEWAY_CONF_HOME";
// Variable name for the location of data files generated by the gateway at runtime.
- static final String GATEWAY_DATA_HOME_VAR = "GATEWAY_DATA_HOME";
+ String GATEWAY_DATA_HOME_VAR = "GATEWAY_DATA_HOME";
- public static final String GATEWAY_CONFIG_ATTRIBUTE = "org.apache.knox.gateway.config";
- public static final String HADOOP_KERBEROS_SECURED = "gateway.hadoop.kerberos.secured";
- public static final String KRB5_CONFIG = "java.security.krb5.conf";
- public static final String KRB5_DEBUG = "sun.security.krb5.debug";
- public static final String KRB5_LOGIN_CONFIG = "java.security.auth.login.config";
- public static final String KRB5_USE_SUBJECT_CREDS_ONLY = "javax.security.auth.useSubjectCredsOnly";
- public static final String SIGNING_KEYSTORE_NAME = "gateway.signing.keystore.name";
- public static final String SIGNING_KEY_ALIAS = "gateway.signing.key.alias";
+ String GATEWAY_CONFIG_ATTRIBUTE = "org.apache.knox.gateway.config";
+ String HADOOP_KERBEROS_SECURED = "gateway.hadoop.kerberos.secured";
+ String KRB5_CONFIG = "java.security.krb5.conf";
+ String KRB5_DEBUG = "sun.security.krb5.debug";
+ String KRB5_LOGIN_CONFIG = "java.security.auth.login.config";
+ String KRB5_USE_SUBJECT_CREDS_ONLY = "javax.security.auth.useSubjectCredsOnly";
+ String SIGNING_KEYSTORE_NAME = "gateway.signing.keystore.name";
+ String SIGNING_KEY_ALIAS = "gateway.signing.key.alias";
String REMOTE_CONFIG_REGISTRY_TYPE = "type";
String REMOTE_CONFIG_REGISTRY_ADDRESS = "address";
@@ -99,7 +99,7 @@ public interface GatewayConfig {
InetSocketAddress getGatewayAddress() throws UnknownHostException;
boolean isSSLEnabled();
-
+
List<String> getExcludedSSLProtocols();
List<String> getIncludedSSLCiphers();
@@ -329,7 +329,7 @@ public interface GatewayConfig {
* @return The polling interval configuration value, or -1 if it has not been configured.
*/
int getClusterMonitorPollingInterval(String type);
-
+
/**
*
* @param type The type of cluster configuration monitor for which the interval should be returned.
@@ -337,7 +337,7 @@ public interface GatewayConfig {
* @return The enabled status of the specified type of cluster configuration monitor.
*/
boolean isClusterMonitorEnabled(String type);
-
+
/**
* @return The list of the names of any remote registry configurations defined herein.
*/
@@ -406,7 +406,7 @@ public interface GatewayConfig {
/**
* Get the list of topology names that should be redeployed on restart.
* manager and admin are default topologies as they may depend on gateway-site.xml
- * configuration for deployment time config.
+ * configuration for deployment time config.
* @return list of topology names
*/
List<String> getAutoDeployTopologyNames();
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/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 f4d8fb6..9f3b7a8 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
@@ -48,7 +48,7 @@ public abstract class ServiceDeploymentContributorBase extends DeploymentContrib
final Provider provider = getProviderByRole(context, role);
return (provider != null);
}
-
+
protected Provider getProviderByRole(DeploymentContext context, String role) {
Provider p = null;
Collection<Provider> providers = context.getTopology().getProviders();
@@ -60,7 +60,7 @@ public abstract class ServiceDeploymentContributorBase extends DeploymentContrib
}
return p;
}
-
+
protected void addWebAppSecFilters( DeploymentContext context, Service service, ResourceDescriptor resource ) {
if (topologyContainsProviderType(context, "webappsec")) {
context.contributeFilter( service, resource, "webappsec", null, null );
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-spi/src/main/java/org/apache/knox/gateway/descriptor/GatewayDescriptorExporter.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/descriptor/GatewayDescriptorExporter.java b/gateway-spi/src/main/java/org/apache/knox/gateway/descriptor/GatewayDescriptorExporter.java
index b3264eb..95bf38e 100644
--- a/gateway-spi/src/main/java/org/apache/knox/gateway/descriptor/GatewayDescriptorExporter.java
+++ b/gateway-spi/src/main/java/org/apache/knox/gateway/descriptor/GatewayDescriptorExporter.java
@@ -21,9 +21,7 @@ import java.io.IOException;
import java.io.Writer;
public interface GatewayDescriptorExporter {
+ String getFormat();
- public String getFormat();
-
- public void store( GatewayDescriptor descriptor, Writer writer ) throws IOException;
-
+ void store( GatewayDescriptor descriptor, Writer writer ) throws IOException;
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-spi/src/main/java/org/apache/knox/gateway/descriptor/GatewayDescriptorImporter.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/descriptor/GatewayDescriptorImporter.java b/gateway-spi/src/main/java/org/apache/knox/gateway/descriptor/GatewayDescriptorImporter.java
index 5d8151e..d7dcf51 100644
--- a/gateway-spi/src/main/java/org/apache/knox/gateway/descriptor/GatewayDescriptorImporter.java
+++ b/gateway-spi/src/main/java/org/apache/knox/gateway/descriptor/GatewayDescriptorImporter.java
@@ -21,9 +21,7 @@ import java.io.IOException;
import java.io.Reader;
public interface GatewayDescriptorImporter {
-
- public String getFormat();
+ String getFormat();
GatewayDescriptor load( Reader reader ) throws IOException;
-
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/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 00c16e2..cf60458 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
@@ -43,7 +43,7 @@ public abstract class AbstractGatewayDispatch implements Dispatch {
REQUEST_EXCLUDE_HEADERS.add("Content-Length");
REQUEST_EXCLUDE_HEADERS.add("Transfer-Encoding");
}
-
+
protected HttpClient client;
@Override
@@ -69,12 +69,12 @@ public abstract class AbstractGatewayDispatch implements Dispatch {
}
@Override
- synchronized public HttpClient getHttpClient() {
+ public synchronized HttpClient getHttpClient() {
return client;
}
@Override
- synchronized public void setHttpClient(HttpClient client) {
+ public synchronized void setHttpClient(HttpClient client) {
this.client = client;
}
@@ -128,7 +128,7 @@ public abstract class AbstractGatewayDispatch implements Dispatch {
throws IOException, URISyntaxException {
response.sendError( HttpServletResponse.SC_METHOD_NOT_ALLOWED );
}
-
+
public void copyRequestHeaderFields(HttpUriRequest outboundRequest,
HttpServletRequest inboundRequest) {
Enumeration<String> headerNames = inboundRequest.getHeaderNames();
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/Dispatch.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/Dispatch.java b/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/Dispatch.java
index ac13031..32f985d 100644
--- a/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/Dispatch.java
+++ b/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/Dispatch.java
@@ -52,7 +52,7 @@ public interface Dispatch {
void doOptions( URI url, HttpServletRequest request, HttpServletResponse response )
throws IOException, ServletException, URISyntaxException;
-
+
void doHead( URI url, HttpServletRequest request, HttpServletResponse response )
throws IOException, ServletException, URISyntaxException;
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/HttpClientFactory.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/HttpClientFactory.java b/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/HttpClientFactory.java
index e67c7fb..c5e639e 100644
--- a/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/HttpClientFactory.java
+++ b/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/HttpClientFactory.java
@@ -22,6 +22,5 @@ import org.apache.http.client.HttpClient;
import javax.servlet.FilterConfig;
public interface HttpClientFactory {
-
- public HttpClient createHttpClient( FilterConfig filterConfig );
+ HttpClient createHttpClient( FilterConfig filterConfig );
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/PassAllHeadersDispatch.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/PassAllHeadersDispatch.java b/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/PassAllHeadersDispatch.java
index 2dbef75..6267047 100644
--- a/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/PassAllHeadersDispatch.java
+++ b/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/PassAllHeadersDispatch.java
@@ -24,7 +24,7 @@ import java.util.Set;
public class PassAllHeadersDispatch extends DefaultDispatch {
private static final Set<String> REQUEST_EXCLUDE_HEADERS = new HashSet<>();
-
+
static {
REQUEST_EXCLUDE_HEADERS.add("Content-Length");
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/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 f0cca53..aa1fdb3 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
@@ -67,7 +67,5 @@ public abstract class AbstractIdentityAssertionFilter extends AbstractIdentityAs
}
@Override
- public void destroy() {
-
- }
+ public void destroy() {}
}
[03/10] knox git commit: KNOX-1663 - Enforce more Checkstyle rules
Posted by kr...@apache.org.
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-job-conf.xml
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-job-conf.xml b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-job-conf.xml
index 118afaf..27bcab0 100644
--- a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-job-conf.xml
+++ b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-job-conf.xml
@@ -16,4004 +16,4004 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
<conf>
- <path>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml </path>
- <property>
- <name>dfs.datanode.data.dir</name>
- <value>/var/hadoop/datanode</value>
- <source>hdfs-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.namenode.checkpoint.txns</name>
- <value>1000000</value>
- <source>hdfs-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>s3.replication</name>
- <value>3</value>
- <source>core-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.output.fileoutputformat.compress.type</name>
- <value>RECORD</value>
- <source>mapred-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.jobtracker.jobhistory.lru.cache.size</name>
- <value>5</value>
- <source>mapred-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.datanode.failed.volumes.tolerated</name>
- <value>0</value>
- <source>hdfs-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.nodemanager.webapp.spnego-keytab-file</name>
- <value>/etc/security/keytabs/spnego.service.keytab</value>
- <source>yarn-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.resourcemanager.principal</name>
- <value>rm/_HOST@EXAMPLE.COM</value>
- <source>yarn-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>hadoop.http.filter.initializers</name>
- <value>org.apache.hadoop.yarn.server.webproxy.amfilter.AmFilterInitializer
- </value>
- <source>programatically</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.cluster.temp.dir</name>
- <value>${hadoop.tmp.dir}/mapred/temp</value>
- <source>mapred-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.nodemanager.keytab</name>
- <value>/etc/security/keytabs/nm.service.keytab</value>
- <source>yarn-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.reduce.shuffle.memory.limit.percent</name>
- <value>0.25</value>
- <source>mapred-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.namenode.checkpoint.max-retries</name>
- <value>3</value>
- <source>hdfs-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.resourcemanager.zk-acl</name>
- <value>world:anyone:rwcda</value>
- <source>yarn-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.reduce.skip.maxgroups</name>
- <value>0</value>
- <source>mapred-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.https.server.keystore.resource</name>
- <value>ssl-server.xml</value>
- <source>hdfs-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.app.mapreduce.task.container.log.backups</name>
- <value>0</value>
- <source>mapred-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.domain.socket.path</name>
- <value>/var/lib/hadoop-hdfs/dn_socket</value>
- <source>hdfs-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>hadoop.http.authentication.kerberos.keytab</name>
- <value>${user.home}/hadoop.keytab</value>
- <source>core-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.sleepjob.reduce.sleep.count</name>
- <value>120000</value>
- <source>programatically</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.timeline-service.generic-application-history.store-class
- </name>
- <value>org.apache.hadoop.yarn.server.applicationhistoryservice.FileSystemApplicationHistoryStore
- </value>
- <source>yarn-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.nodemanager.disk-health-checker.max-disk-utilization-per-disk-percentage
- </name>
- <value>100.0</value>
- <source>yarn-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>jetty.connector</name>
- <value>org.mortbay.jetty.nio.SelectChannelConnector</value>
- <source>mapred-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.job.jar</name>
- <value>/user/hdfs/.staging/job_1399541193872_0035/job.jar</value>
- <source>programatically</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.nodemanager.localizer.client.thread-count</name>
- <value>5</value>
- <source>yarn-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.jobhistory.done-dir</name>
- <value>/mapred/history/done</value>
- <source>mapred-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.framework.name</name>
- <value>yarn</value>
- <source>mapred-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>ha.failover-controller.new-active.rpc-timeout.ms</name>
- <value>60000</value>
- <source>core-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>ha.health-monitor.check-interval.ms</name>
- <value>1000</value>
- <source>core-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>io.file.buffer.size</name>
- <value>131072</value>
- <source>core-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.shuffle.max.connections</name>
- <value>0</value>
- <source>mapred-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.namenode.path.based.cache.block.map.allocation.percent
- </name>
- <value>0.25</value>
- <source>hdfs-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.task.tmp.dir</name>
- <value>./tmp</value>
- <source>mapred-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.namenode.checkpoint.period</name>
- <value>86400</value>
- <source>hdfs-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.encrypt.data.transfer.algorithm</name>
- <value>3des</value>
- <source>hdfs-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.client.mmap.cache.timeout.ms</name>
- <value>3600000</value>
- <source>hdfs-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>ipc.client.kill.max</name>
- <value>10</value>
- <source>core-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.resourcemanager.scheduler.class</name>
- <value>org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler
- </value>
- <source>yarn-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.jobtracker.taskcache.levels</name>
- <value>2</value>
- <source>mapred-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>s3.stream-buffer-size</name>
- <value>4096</value>
- <source>core-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.namenode.secondary.http-address</name>
- <value>host.yarn.com:50090</value>
- <source>hdfs-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.namenode.decommission.interval</name>
- <value>30</value>
- <source>hdfs-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.jobhistory.webapp.spnego-principal</name>
- <value>HTTP/_HOST@EXAMPLE.COM</value>
- <source>yarn-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.namenode.http-address</name>
- <value>host.yarn.com:50070</value>
- <source>hdfs-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.task.files.preserve.failedtasks</name>
- <value>false</value>
- <source>mapred-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.encrypt.data.transfer</name>
- <value>false</value>
- <source>hdfs-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.resourcemanager.ha.enabled</name>
- <value>false</value>
- <source>yarn-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.datanode.address</name>
- <value>0.0.0.0:50010</value>
- <source>hdfs-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.namenode.avoid.write.stale.datanode</name>
- <value>false</value>
- <source>hdfs-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>nfs3.server.port</name>
- <value>2049</value>
- <source>core-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>hadoop.http.authentication.token.validity</name>
- <value>36000</value>
- <source>core-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>fs.AbstractFileSystem.wasb.impl</name>
- <value>org.apache.hadoop.fs.azurenative.Wasb</value>
- <source>core-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>hadoop.security.group.mapping.ldap.search.filter.group</name>
- <value>(objectClass=group)</value>
- <source>core-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.client.failover.max.attempts</name>
- <value>15</value>
- <source>hdfs-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.resourcemanager.scheduler.monitor.policies</name>
- <value>org.apache.hadoop.yarn.server.resourcemanager.monitor.capacity.ProportionalCapacityPreemptionPolicy
- </value>
- <source>yarn-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.resourcemanager.fs.state-store.retry-policy-spec</name>
- <value>2000, 500</value>
- <source>yarn-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.admin.acl</name>
- <value>*</value>
- <source>yarn-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.sleepjob.reduce.sleep.time</name>
- <value>12000000</value>
- <source>programatically</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.nodemanager.local-cache.max-files-per-directory</name>
- <value>8192</value>
- <source>yarn-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.client.failover-retries-on-socket-timeouts</name>
- <value>0</value>
- <source>yarn-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.resourcemanager.application-tokens.master-key-rolling-interval-secs
- </name>
- <value>86400</value>
- <source>yarn-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.namenode.retrycache.expirytime.millis</name>
- <value>600000</value>
- <source>hdfs-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.resourcemanager.nodemanagers.heartbeat-interval-ms</name>
- <value>1000</value>
- <source>yarn-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.client.failover.connection.retries.on.timeouts</name>
- <value>0</value>
- <source>hdfs-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.client.failover-proxy-provider</name>
- <value>org.apache.hadoop.yarn.client.ConfiguredRMFailoverProxyProvider
- </value>
- <source>yarn-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.map.sort.spill.percent</name>
- <value>0.9</value>
- <source>mapred-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>file.stream-buffer-size</name>
- <value>4096</value>
- <source>core-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.webhdfs.enabled</name>
- <value>true</value>
- <source>hdfs-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>io.compression.codec.lzo.class</name>
- <value>com.hadoop.compression.lzo.LzoCodec</value>
- <source>core-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>ipc.client.connection.maxidletime</name>
- <value>30000</value>
- <source>core-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.jobtracker.persist.jobstatus.hours</name>
- <value>1</value>
- <source>mapred-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.image.transfer.chunksize</name>
- <value>65536</value>
- <source>hdfs-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.nodemanager.resourcemanager.connect.retry_interval.secs
- </name>
- <value>30</value>
- <source>yarn-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.nodemanager.address</name>
- <value>0.0.0.0:45454</value>
- <source>yarn-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.datanode.ipc.address</name>
- <value>0.0.0.0:8010</value>
- <source>hdfs-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.resourcemanager.ha.automatic-failover.embedded</name>
- <value>true</value>
- <source>yarn-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.jobhistory.recovery.store.fs.uri</name>
- <value>${hadoop.tmp.dir}/mapred/history/recoverystore</value>
- <source>mapred-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.resourcemanager.zk-state-store.parent-path</name>
- <value>/rmstore</value>
- <source>yarn-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.app.mapreduce.am.job.task.listener.thread-count</name>
- <value>30</value>
- <source>mapred-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.namenode.list.cache.pools.num.responses</name>
- <value>100</value>
- <source>hdfs-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>hadoop.proxyuser.hbase.groups</name>
- <value>users</value>
- <source>core-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.client.read.shortcircuit</name>
- <value>true</value>
- <source>hdfs-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.namenode.safemode.extension</name>
- <value>30000</value>
- <source>hdfs-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.timeline-service.generic-application-history.fs-history-store.compression-type
- </name>
- <value>none</value>
- <source>yarn-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>ha.zookeeper.parent-znode</name>
- <value>/hadoop-ha</value>
- <source>core-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.nodemanager.container-executor.class</name>
- <value>org.apache.hadoop.yarn.server.nodemanager.DefaultContainerExecutor
- </value>
- <source>yarn-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>io.skip.checksum.errors</name>
- <value>false</value>
- <source>core-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.namenode.path.based.cache.refresh.interval.ms</name>
- <value>30000</value>
- <source>hdfs-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.job.user.name</name>
- <value>hdfs</value>
- <source>programatically</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.resourcemanager.scheduler.client.thread-count</name>
- <value>50</value>
- <source>yarn-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>hadoop.http.authentication.kerberos.principal</name>
- <value>HTTP/_HOST@LOCALHOST</value>
- <source>core-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.reduce.log.level</name>
- <value>INFO</value>
- <source>mapred-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.nodemanager.linux-container-executor.nonsecure-mode.user-pattern
- </name>
- <value>^[_.A-Za-z0-9][-@_.A-Za-z0-9]{0,255}?[$]?$</value>
- <source>yarn-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>fs.s3.maxRetries</name>
- <value>4</value>
- <source>core-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>ipc.server.max.response.size</name>
- <value>5242880</value>
- <source>hdfs-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.admin.reduce.child.java.opts</name>
- <value>-server -XX:NewRatio=8 -Djava.net.preferIPv4Stack=true</value>
- <source>mapred-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.nodemanager.resourcemanager.minimum.version</name>
- <value>NONE</value>
- <source>yarn-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>hadoop.kerberos.kinit.command</name>
- <value>kinit</value>
- <source>core-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.log-aggregation.retain-check-interval-seconds</name>
- <value>-1</value>
- <source>yarn-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.nodemanager.process-kill-wait.ms</name>
- <value>2000</value>
- <source>yarn-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.nodemanager.linux-container-executor.cgroups.mount</name>
- <value>false</value>
- <source>yarn-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.map.output.key.class</name>
- <value>org.apache.hadoop.io.IntWritable</value>
- <source>programatically</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.job.working.dir</name>
- <value>hdfs://hdfs.host.yarn.com:8020/user/hdfs</value>
- <source>programatically</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.namenode.name.dir.restore</name>
- <value>false</value>
- <source>hdfs-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.jobtracker.handler.count</name>
- <value>10</value>
- <source>mapred-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.jobhistory.admin.address</name>
- <value>0.0.0.0:10033</value>
- <source>mapred-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.app.mapreduce.client-am.ipc.max-retries</name>
- <value>3</value>
- <source>mapred-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.client.use.datanode.hostname</name>
- <value>false</value>
- <source>hdfs-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>hadoop.util.hash.type</name>
- <value>murmur</value>
- <source>core-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.datanode.available-space-volume-choosing-policy.balanced-space-preference-fraction
- </name>
- <value>0.75f</value>
- <source>hdfs-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.datanode.dns.interface</name>
- <value>default</value>
- <source>hdfs-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>io.seqfile.lazydecompress</name>
- <value>true</value>
- <source>core-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.nodemanager.disk-health-checker.min-healthy-disks</name>
- <value>0.25</value>
- <source>yarn-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.job.maxtaskfailures.per.tracker</name>
- <value>3</value>
- <source>mapred-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.tasktracker.healthchecker.script.timeout</name>
- <value>600000</value>
- <source>mapred-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.client.max-nodemanagers-proxies</name>
- <value>500</value>
- <source>yarn-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>hadoop.security.group.mapping.ldap.search.attr.group.name</name>
- <value>cn</value>
- <source>core-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>fs.df.interval</name>
- <value>60000</value>
- <source>core-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.namenode.kerberos.internal.spnego.principal</name>
- <value>${dfs.web.authentication.kerberos.principal}</value>
- <source>hdfs-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.client.cached.conn.retry</name>
- <value>3</value>
- <source>hdfs-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.job.reduce.class</name>
- <value>org.apache.hadoop.mapreduce.SleepJob$SleepReducer</value>
- <source>programatically</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.job.map.class</name>
- <value>org.apache.hadoop.mapreduce.SleepJob$SleepMapper</value>
- <source>programatically</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.job.reduce.shuffle.consumer.plugin.class</name>
- <value>org.apache.hadoop.mapreduce.task.reduce.Shuffle</value>
- <source>mapred-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.jobtracker.address</name>
- <value>local</value>
- <source>mapred-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.tasktracker.tasks.sleeptimebeforesigkill</name>
- <value>5000</value>
- <source>mapred-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.journalnode.rpc-address</name>
- <value>0.0.0.0:8485</value>
- <source>hdfs-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.namenode.fs-limits.max-blocks-per-file</name>
- <value>1048576</value>
- <source>hdfs-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.job.acl-view-job</name>
- <value>*</value>
- <source>mapred-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.app.mapreduce.am.job.committer.cancel-timeout</name>
- <value>60000</value>
- <source>mapred-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.client.block.write.replace-datanode-on-failure.policy</name>
- <value>DEFAULT</value>
- <source>hdfs-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.shuffle.connection-keep-alive.enable</name>
- <value>false</value>
- <source>mapred-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.job.counters.group.name.max</name>
- <value>1000</value>
- <source>mapred-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.namenode.replication.interval</name>
- <value>3</value>
- <source>hdfs-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.jobhistory.minicluster.fixed.ports</name>
- <value>false</value>
- <source>mapred-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.namenode.num.checkpoints.retained</name>
- <value>2</value>
- <source>hdfs-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.resourcemanager.scheduler.address</name>
- <value>${yarn.resourcemanager.hostname}:8030</value>
- <source>yarn-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.tasktracker.http.address</name>
- <value>0.0.0.0:50060</value>
- <source>mapred-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.jobhistory.admin.acl</name>
- <value>*</value>
- <source>mapred-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.datanode.directoryscan.threads</name>
- <value>1</value>
- <source>hdfs-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.reduce.memory.mb</name>
- <value>3072</value>
- <source>mapred-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>hadoop.security.group.mapping.ldap.ssl</name>
- <value>false</value>
- <source>core-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.nodemanager.principal</name>
- <value>nm/_HOST@EXAMPLE.COM</value>
- <source>yarn-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.http.policy</name>
- <value>HTTP_ONLY</value>
- <source>hdfs-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.task.merge.progress.records</name>
- <value>10000</value>
- <source>mapred-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.heartbeat.interval</name>
- <value>3</value>
- <source>hdfs-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.resourcemanager.recovery.enabled</name>
- <value>false</value>
- <source>yarn-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>net.topology.script.number.args</name>
- <value>100</value>
- <source>core-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.hosts.exclude</name>
- <value>/etc/hadoop/conf/dfs.exclude</value>
- <source>hdfs-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.local.clientfactory.class.name</name>
- <value>org.apache.hadoop.mapred.LocalClientFactory</value>
- <source>mapred-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.client-write-packet-size</name>
- <value>65536</value>
- <source>hdfs-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>hadoop.security.group.mapping.ldap.directory.search.timeout
- </name>
- <value>10000</value>
- <source>core-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>io.native.lib.available</name>
- <value>true</value>
- <source>core-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.client.failover.connection.retries</name>
- <value>0</value>
- <source>hdfs-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.nodemanager.disk-health-checker.interval-ms</name>
- <value>120000</value>
- <source>yarn-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.blocksize</name>
- <value>134217728</value>
- <source>hdfs-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.resourcemanager.container-tokens.master-key-rolling-interval-secs
- </name>
- <value>86400</value>
- <source>yarn-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.jobhistory.webapp.address</name>
- <value>host.yarn.com:19888</value>
- <source>mapred-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.resourcemanager.resource-tracker.client.thread-count</name>
- <value>50</value>
- <source>yarn-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.client.failover-retries</name>
- <value>0</value>
- <source>yarn-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.blockreport.initialDelay</name>
- <value>120</value>
- <source>hdfs-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.nodemanager.aux-services.mapreduce_shuffle.class</name>
- <value>org.apache.hadoop.mapred.ShuffleHandler</value>
- <source>yarn-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>ha.health-monitor.rpc-timeout.ms</name>
- <value>45000</value>
- <source>core-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.resourcemanager.zk-timeout-ms</name>
- <value>10000</value>
- <source>yarn-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.reduce.markreset.buffer.percent</name>
- <value>0.0</value>
- <source>mapred-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.timeline-service.leveldb-timeline-store.start-time-read-cache-size
- </name>
- <value>10000</value>
- <source>yarn-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.ha.tail-edits.period</name>
- <value>60</value>
- <source>hdfs-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.admin.user.env</name>
- <value>LD_LIBRARY_PATH=/usr/lib/hadoop/lib/native:/usr/lib/hadoop/lib/native/`$JAVA_HOME/bin/java
- -d32 -version &> /dev/null;if [ $? -eq 0 ]; then echo
- Linux-i386-32; else echo Linux-amd64-64;fi`</value>
- <source>mapred-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.resourcemanager.client.thread-count</name>
- <value>50</value>
- <source>yarn-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.nodemanager.health-checker.script.timeout-ms</name>
- <value>60000</value>
- <source>yarn-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>file.bytes-per-checksum</name>
- <value>512</value>
- <source>core-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.replication.max</name>
- <value>50</value>
- <source>hdfs-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.namenode.max.extra.edits.segments.retained</name>
- <value>10000</value>
- <source>hdfs-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>io.map.index.skip</name>
- <value>0</value>
- <source>core-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.nodemanager.webapp.spnego-principal</name>
- <value>HTTP/_HOST@EXAMPLE.COM</value>
- <source>yarn-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.task.timeout</name>
- <value>600000</value>
- <source>mapred-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.datanode.du.reserved</name>
- <value>1073741824</value>
- <source>hdfs-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.reduce.cpu.vcores</name>
- <value>1</value>
- <source>mapred-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.support.append</name>
- <value>true</value>
- <source>hdfs-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.client.file-block-storage-locations.num-threads</name>
- <value>10</value>
- <source>hdfs-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>ftp.blocksize</name>
- <value>67108864</value>
- <source>core-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.nodemanager.container-manager.thread-count</name>
- <value>20</value>
- <source>yarn-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>ipc.server.listen.queue.size</name>
- <value>128</value>
- <source>core-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.resourcemanager.amliveliness-monitor.interval-ms</name>
- <value>1000</value>
- <source>yarn-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.resourcemanager.ha.automatic-failover.enabled</name>
- <value>true</value>
- <source>yarn-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>hadoop.ssl.hostname.verifier</name>
- <value>DEFAULT</value>
- <source>core-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.tasktracker.dns.interface</name>
- <value>default</value>
- <source>mapred-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>hadoop.security.group.mapping.ldap.search.attr.member</name>
- <value>member</value>
- <source>core-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.job.userlog.retain.hours</name>
- <value>24</value>
- <source>mapred-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.tasktracker.outofband.heartbeat</name>
- <value>false</value>
- <source>mapred-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.log.server.url</name>
- <value>http://host.yarn.com:19888/jobhistory/logs</value>
- <source>yarn-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.job.name</name>
- <value>Sleep job</value>
- <source>programatically</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.nodemanager.resource.memory-mb</name>
- <value>8192</value>
- <source>yarn-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.webhdfs.user.provider.user.pattern</name>
- <value>^[A-Za-z_][A-Za-z0-9._-]*[$]?$</value>
- <source>hdfs-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.web.authentication.kerberos.keytab</name>
- <value>/etc/security/keytabs/spnego.service.keytab</value>
- <source>hdfs-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.namenode.delegation.token.renew-interval</name>
- <value>86400000</value>
- <source>hdfs-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>hadoop.ssl.keystores.factory.class</name>
- <value>org.apache.hadoop.security.ssl.FileBasedKeyStoresFactory
- </value>
- <source>core-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.http.policy</name>
- <value>HTTP_ONLY</value>
- <source>yarn-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.datanode.sync.behind.writes</name>
- <value>false</value>
- <source>hdfs-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.client.read.shortcircuit.skip.checksum</name>
- <value>false</value>
- <source>hdfs-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.map.maxattempts</name>
- <value>4</value>
- <source>mapred-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.timeline-service.webapp.address</name>
- <value>${yarn.timeline-service.hostname}:8188</value>
- <source>yarn-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.datanode.handler.count</name>
- <value>10</value>
- <source>hdfs-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>hadoop.ssl.require.client.cert</name>
- <value>false</value>
- <source>core-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>ftp.client-write-packet-size</name>
- <value>65536</value>
- <source>core-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.client.write.exclude.nodes.cache.expiry.interval.millis
- </name>
- <value>600000</value>
- <source>hdfs-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>ipc.server.tcpnodelay</name>
- <value>false</value>
- <source>core-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.jobhistory.cleaner.enable</name>
- <value>true</value>
- <source>mapred-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>fs.du.interval</name>
- <value>600000</value>
- <source>core-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.reduce.shuffle.retry-delay.max.ms</name>
- <value>60000</value>
- <source>mapred-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.task.profile.reduces</name>
- <value>0-2</value>
- <source>mapred-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>ha.health-monitor.connect-retry-interval.ms</name>
- <value>1000</value>
- <source>core-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>hadoop.fuse.connection.timeout</name>
- <value>300</value>
- <source>hdfs-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.permissions.superusergroup</name>
- <value>hdfs</value>
- <source>hdfs-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.jobtracker.jobhistory.task.numberprogresssplits</name>
- <value>12</value>
- <source>mapred-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.job.counters.counter.name.max</name>
- <value>1000</value>
- <source>mapred-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>fs.ftp.host.port</name>
- <value>21</value>
- <source>core-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.map.speculative</name>
- <value>false</value>
- <source>programatically</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.datanode.data.dir.perm</name>
- <value>755</value>
- <source>hdfs-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.client.submit.file.replication</name>
- <value>10</value>
- <source>mapred-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.job.ubertask.maxmaps</name>
- <value>9</value>
- <source>mapred-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>s3native.blocksize</name>
- <value>67108864</value>
- <source>core-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.namenode.replication.min</name>
- <value>1</value>
- <source>hdfs-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.cluster.acls.enabled</name>
- <value>false</value>
- <source>mapred-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.jobhistory.webapp.https.address</name>
- <value>host.yarn.com:19888</value>
- <source>mapred-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>hadoop.security.uid.cache.secs</name>
- <value>14400</value>
- <source>core-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.nodemanager.localizer.fetch.thread-count</name>
- <value>4</value>
- <source>yarn-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>map.sort.class</name>
- <value>org.apache.hadoop.util.QuickSort</value>
- <source>mapred-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>fs.trash.checkpoint.interval</name>
- <value>0</value>
- <source>core-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>hadoop.proxyuser.hcat.groups</name>
- <value>users</value>
- <source>core-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapred.queue.default.acl-administer-jobs</name>
- <value>*</value>
- <source>programatically</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.image.transfer.timeout</name>
- <value>60000</value>
- <source>hdfs-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.namenode.name.dir</name>
- <value>/var/hadoop/namenode</value>
- <source>hdfs-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>ipc.client.connect.timeout</name>
- <value>20000</value>
- <source>core-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.app.mapreduce.am.staging-dir</name>
- <value>/user</value>
- <source>mapred-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>fs.AbstractFileSystem.file.impl</name>
- <value>org.apache.hadoop.fs.local.LocalFs</value>
- <source>core-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.nodemanager.env-whitelist</name>
- <value>JAVA_HOME,HADOOP_COMMON_HOME,HADOOP_HDFS_HOME,HADOOP_CONF_DIR,HADOOP_YARN_HOME
- </value>
- <source>yarn-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.image.compression.codec</name>
- <value>org.apache.hadoop.io.compress.DefaultCodec</value>
- <source>hdfs-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.job.reduces</name>
- <value>1</value>
- <source>programatically</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.job.complete.cancel.delegation.tokens</name>
- <value>true</value>
- <source>mapred-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.jobhistory.recovery.store.class</name>
- <value>org.apache.hadoop.mapreduce.v2.hs.HistoryServerFileSystemStateStoreService
- </value>
- <source>mapred-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>hadoop.security.group.mapping.ldap.search.filter.user</name>
- <value>(&(objectClass=user)(sAMAccountName={0}))</value>
- <source>core-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.namenode.enable.retrycache</name>
- <value>true</value>
- <source>hdfs-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.nodemanager.sleep-delay-before-sigkill.ms</name>
- <value>250</value>
- <source>yarn-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.jobhistory.joblist.cache.size</name>
- <value>20000</value>
- <source>mapred-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.job.outputformat.class</name>
- <value>org.apache.hadoop.mapreduce.lib.output.NullOutputFormat</value>
- <source>programatically</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.tasktracker.healthchecker.interval</name>
- <value>60000</value>
- <source>mapred-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.jobtracker.heartbeats.in.second</name>
- <value>100</value>
- <source>mapred-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>hadoop.security.auth_to_local</name>
- <value>
- RULE:[2:$1@$0](jhs@.*EXAMPLE.COM)s/.*/mapred/
- RULE:[2:$1@$0]([nr]m@.*EXAMPLE.COM)s/.*/yarn/
- RULE:[2:$1@$0]([nd]n@.*EXAMPLE.COM)s/.*/hdfs/
- DEFAULT
- </value>
- <source>core-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.admin.map.child.java.opts</name>
- <value>-server -XX:NewRatio=8 -Djava.net.preferIPv4Stack=true</value>
- <source>mapred-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.jobtracker.persist.jobstatus.dir</name>
- <value>/jobtracker/jobsInfo</value>
- <source>mapred-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.namenode.backup.http-address</name>
- <value>0.0.0.0:50105</value>
- <source>hdfs-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>hadoop.rpc.protection</name>
- <value>authentication</value>
- <source>core-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.client.mmap.enabled</name>
- <value>true</value>
- <source>hdfs-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.app.mapreduce.am.container.log.backups</name>
- <value>0</value>
- <source>mapred-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>ftp.stream-buffer-size</name>
- <value>4096</value>
- <source>core-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.namenode.https-address</name>
- <value>host.yarn.com:50701</value>
- <source>hdfs-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.timeline-service.address</name>
- <value>${yarn.timeline-service.hostname}:10200</value>
- <source>yarn-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.ha.log-roll.period</name>
- <value>120</value>
- <source>hdfs-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.resourcemanager.webapp.spnego-keytab-file</name>
- <value>/etc/security/keytabs/spnego.service.keytab</value>
- <source>yarn-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.resourcemanager.admin.client.thread-count</name>
- <value>1</value>
- <source>yarn-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.jobhistory.webapp.spnego-keytab-file</name>
- <value>/etc/security/keytabs/spnego.service.keytab</value>
- <source>yarn-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.datanode.fsdatasetcache.max.threads.per.volume</name>
- <value>4</value>
- <source>hdfs-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>file.client-write-packet-size</name>
- <value>65536</value>
- <source>core-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>hadoop.http.authentication.simple.anonymous.allowed</name>
- <value>true</value>
- <source>core-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.timeline-service.leveldb-timeline-store.path</name>
- <value>${yarn.log.dir}/timeline</value>
- <source>yarn-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.datanode.drop.cache.behind.reads</name>
- <value>false</value>
- <source>hdfs-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.nodemanager.log.retain-seconds</name>
- <value>10800</value>
- <source>yarn-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.image.transfer.bandwidthPerSec</name>
- <value>0</value>
- <source>hdfs-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.tasktracker.instrumentation</name>
- <value>org.apache.hadoop.mapred.TaskTrackerMetricsInst</value>
- <source>mapred-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>ha.failover-controller.cli-check.rpc-timeout.ms</name>
- <value>20000</value>
- <source>core-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.nodemanager.linux-container-executor.cgroups.hierarchy
- </name>
- <value>/hadoop-yarn</value>
- <source>yarn-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.namenode.write.stale.datanode.ratio</name>
- <value>0.5f</value>
- <source>hdfs-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>hadoop.security.groups.cache.warn.after.ms</name>
- <value>5000</value>
- <source>core-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.jobhistory.client.thread-count</name>
- <value>10</value>
- <source>mapred-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>io.mapfile.bloom.size</name>
- <value>1048576</value>
- <source>core-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.ha.fencing.ssh.connect-timeout</name>
- <value>30000</value>
- <source>core-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.resourcemanager.zk-num-retries</name>
- <value>500</value>
- <source>yarn-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>s3.bytes-per-checksum</name>
- <value>512</value>
- <source>core-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.app.mapreduce.am.container.log.limit.kb</name>
- <value>0</value>
- <source>mapred-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.namenode.edit.log.autoroll.check.interval.ms</name>
- <value>300000</value>
- <source>hdfs-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>fs.automatic.close</name>
- <value>true</value>
- <source>core-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.app.mapreduce.am.create-intermediate-jh-base-dir</name>
- <value>false</value>
- <source>mapred-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>fs.trash.interval</name>
- <value>360</value>
- <source>core-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.journalnode.https-address</name>
- <value>0.0.0.0:8481</value>
- <source>hdfs-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>hadoop.security.authentication</name>
- <value>simple</value>
- <source>core-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.timeline-service.ttl-ms</name>
- <value>604800000</value>
- <source>yarn-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>fs.defaultFS</name>
- <value>hdfs://host.yarn.com:8020</value>
- <source>core-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.timeline-service.generic-application-history.enabled</name>
- <value>false</value>
- <source>yarn-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>hadoop.ssl.server.conf</name>
- <value>ssl-server.xml</value>
- <source>core-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>ipc.client.connect.max.retries</name>
- <value>50</value>
- <source>core-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.resourcemanager.delayed.delegation-token.removal-interval-ms
- </name>
- <value>30000</value>
- <source>yarn-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.journalnode.http-address</name>
- <value>0.0.0.0:8480</value>
- <source>hdfs-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.datanode.shared.file.descriptor.paths</name>
- <value>/dev/shm,/tmp</value>
- <source>hdfs-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.jobtracker.taskscheduler</name>
- <value>org.apache.hadoop.mapred.JobQueueTaskScheduler</value>
- <source>mapred-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.job.speculative.speculativecap</name>
- <value>0.1</value>
- <source>mapred-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.timeline-service.store-class</name>
- <value>org.apache.hadoop.yarn.server.applicationhistoryservice.timeline.LeveldbTimelineStore
- </value>
- <source>yarn-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.am.liveness-monitor.expiry-interval-ms</name>
- <value>600000</value>
- <source>yarn-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.output.fileoutputformat.compress</name>
- <value>false</value>
- <source>mapred-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.checksum.type</name>
- <value>CRC32</value>
- <source>hdfs-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>ipc.server.read.threadpool.size</name>
- <value>5</value>
- <source>hdfs-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>net.topology.node.switch.mapping.impl</name>
- <value>org.apache.hadoop.net.ScriptBasedMapping</value>
- <source>core-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.namenode.replication.considerLoad</name>
- <value>true</value>
- <source>hdfs-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.namenode.fs-limits.min-block-size</name>
- <value>1048576</value>
- <source>hdfs-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>fs.swift.impl</name>
- <value>org.apache.hadoop.fs.swift.snative.SwiftNativeFileSystem
- </value>
- <source>core-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.namenode.audit.loggers</name>
- <value>default</value>
- <source>hdfs-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.job.max.split.locations</name>
- <value>10</value>
- <source>mapred-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.resourcemanager.address</name>
- <value>${yarn.resourcemanager.hostname}:8032</value>
- <source>yarn-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.job.counters.max</name>
- <value>20000</value>
- <source>mapred-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.client.block.write.retries</name>
- <value>3</value>
- <source>hdfs-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.resourcemanager.nm.liveness-monitor.interval-ms</name>
- <value>1000</value>
- <source>yarn-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.short.circuit.shared.memory.watcher.interrupt.check.ms
- </name>
- <value>60000</value>
- <source>hdfs-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>io.map.index.interval</name>
- <value>128</value>
- <source>core-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapred.child.java.opts</name>
- <value>-Xmx200m</value>
- <source>mapred-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.tasktracker.local.dir.minspacestart</name>
- <value>0</value>
- <source>mapred-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.client.progressmonitor.pollinterval</name>
- <value>1000</value>
- <source>mapred-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.client.https.keystore.resource</name>
- <value>ssl-client.xml</value>
- <source>hdfs-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.task.profile.map.params</name>
- <value>${mapreduce.task.profile.params}</value>
- <source>mapred-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>rpc.engine.org.apache.hadoop.hdfs.protocolPB.ClientNamenodeProtocolPB
- </name>
- <value>org.apache.hadoop.ipc.ProtobufRpcEngine</value>
- <source>programatically</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.jobtracker.tasktracker.maxblacklists</name>
- <value>4</value>
- <source>mapred-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.job.queuename</name>
- <value>default</value>
- <source>mapred-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.app.mapreduce.client-am.ipc.max-retries-on-timeouts</name>
- <value>3</value>
- <source>mapred-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.nodemanager.localizer.address</name>
- <value>${yarn.nodemanager.hostname}:8040</value>
- <source>yarn-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>io.mapfile.bloom.error.rate</name>
- <value>0.005</value>
- <source>core-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.nodemanager.delete.thread-count</name>
- <value>4</value>
- <source>yarn-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.job.split.metainfo.maxsize</name>
- <value>10000000</value>
- <source>mapred-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.scheduler.maximum-allocation-vcores</name>
- <value>32</value>
- <source>yarn-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapred.mapper.new-api</name>
- <value>true</value>
- <source>programatically</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>ipc.client.tcpnodelay</name>
- <value>false</value>
- <source>core-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.job.dir</name>
- <value>/user/hdfs/.staging/job_1399541193872_0035</value>
- <source>programatically</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.https.port</name>
- <value>50070</value>
- <source>hdfs-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.app.mapreduce.am.resource.mb</name>
- <value>1536</value>
- <source>mapred-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.datanode.dns.nameserver</name>
- <value>default</value>
- <source>hdfs-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.nodemanager.disk-health-checker.min-free-space-per-disk-mb
- </name>
- <value>0</value>
- <source>yarn-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.map.output.compress.codec</name>
- <value>org.apache.hadoop.io.compress.SnappyCodec</value>
- <source>mapred-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapred.child.root.logger</name>
- <value>INFO,TLA</value>
- <source>mapred-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.namenode.accesstime.precision</name>
- <value>0</value>
- <source>hdfs-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.map.log.level</name>
- <value>INFO</value>
- <source>mapred-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>io.seqfile.compress.blocksize</name>
- <value>1000000</value>
- <source>core-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.tasktracker.taskcontroller</name>
- <value>org.apache.hadoop.mapred.DefaultTaskController</value>
- <source>mapred-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>hadoop.security.groups.cache.secs</name>
- <value>300</value>
- <source>core-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>dfs.client.context</name>
- <value>default</value>
- <source>hdfs-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>hadoop.proxyuser.hbase.hosts</name>
- <value>*</value>
- <source>core-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>hadoop.proxyuser.hive.groups</name>
- <value>users</value>
- <source>core-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.fileoutputcommitter.marksuccessfuljobs</name>
- <value>true</value>
- <source>mapred-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.job.end-notification.max.attempts</name>
- <value>5</value>
- <source>mapred-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.nodemanager.linux-container-executor.nonsecure-mode.local-user
- </name>
- <value>nobody</value>
- <source>yarn-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.nodemanager.webapp.address</name>
- <value>0.0.0.0:50060</value>
- <source>yarn-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.job.submithostname</name>
- <value>host.yarn.com</value>
- <source>programatically</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.jobhistory.recovery.enable</name>
- <value>false</value>
- <source>mapred-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.jobtracker.expire.trackers.interval</name>
- <value>600000</value>
- <source>mapred-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.resourcemanager.webapp.address</name>
- <value>host.yarn.com:8088</value>
- <source>yarn-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.nodemanager.health-checker.interval-ms</name>
- <value>135000</value>
- <source>yarn-site.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>mapreduce.jobhistory.loadedjobs.cache.size</name>
- <value>5</value>
- <source>mapred-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>yarn.resourcemanager.history-writer.multi-threaded-dispatcher.pool-size
- </name>
- <value>10</value>
- <source>yarn-default.xml</source>
- <source>hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml</source>
- </property>
- <property>
- <name>hadoop.security.authorization</name>
- <value>false</value>
- <source>core-site.xml</source>
- <
<TRUNCATED>
[09/10] knox git commit: KNOX-1663 - Enforce more Checkstyle rules
Posted by kr...@apache.org.
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/HaServiceConfig.java
----------------------------------------------------------------------
diff --git a/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/HaServiceConfig.java b/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/HaServiceConfig.java
index b746262..8daa2d6 100644
--- a/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/HaServiceConfig.java
+++ b/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/HaServiceConfig.java
@@ -18,36 +18,35 @@
package org.apache.knox.gateway.ha.provider;
public interface HaServiceConfig {
+ void setServiceName(String name);
- public void setServiceName(String name);
+ String getServiceName();
- public String getServiceName();
+ boolean isEnabled();
- public boolean isEnabled();
+ void setEnabled(boolean enabled);
- public void setEnabled(boolean enabled);
+ void setMaxFailoverAttempts(int limit);
- public void setMaxFailoverAttempts(int limit);
+ int getMaxFailoverAttempts();
- public int getMaxFailoverAttempts();
+ void setFailoverSleep(int sleep);
- public void setFailoverSleep(int sleep);
+ int getFailoverSleep();
- public int getFailoverSleep();
+ void setMaxRetryAttempts(int limit);
- public void setMaxRetryAttempts(int limit);
+ int getMaxRetryAttempts();
- public int getMaxRetryAttempts();
+ void setRetrySleep(int sleep);
- public void setRetrySleep(int sleep);
+ int getRetrySleep();
- public int getRetrySleep();
+ String getZookeeperEnsemble();
- public String getZookeeperEnsemble();
+ void setZookeeperEnsemble(String zookeeperEnsemble);
- public void setZookeeperEnsemble(String zookeeperEnsemble);
+ String getZookeeperNamespace();
- public String getZookeeperNamespace();
-
- public void setZookeeperNamespace(String zookeeperNamespace);
+ void setZookeeperNamespace(String zookeeperNamespace);
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/URLManager.java
----------------------------------------------------------------------
diff --git a/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/URLManager.java b/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/URLManager.java
index 3cbc603..7f54c56 100644
--- a/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/URLManager.java
+++ b/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/URLManager.java
@@ -20,18 +20,17 @@ package org.apache.knox.gateway.ha.provider;
import java.util.List;
public interface URLManager {
+ boolean supportsConfig(HaServiceConfig config);
- public boolean supportsConfig(HaServiceConfig config);
+ void setConfig(HaServiceConfig config);
- public void setConfig(HaServiceConfig config);
+ String getActiveURL();
- public String getActiveURL();
+ void setActiveURL(String url);
- public void setActiveURL(String url);
+ List<String> getURLs();
- public List<String> getURLs();
+ void setURLs(List<String> urls);
- public void setURLs(List<String> urls);
-
- public void markFailed(String url);
+ void markFailed(String url);
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/AtlasZookeeperURLManager.java
----------------------------------------------------------------------
diff --git a/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/AtlasZookeeperURLManager.java b/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/AtlasZookeeperURLManager.java
index af0aa37..8bca9e4 100644
--- a/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/AtlasZookeeperURLManager.java
+++ b/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/AtlasZookeeperURLManager.java
@@ -72,7 +72,7 @@ public class AtlasZookeeperURLManager extends DefaultURLManager {
.connectString(zooKeeperEnsemble)
.retryPolicy(new ExponentialBackoffRetry(1000, 3))
.build()) {
-
+
zooKeeperClient.start();
zooKeeperClient.blockUntilConnected(10, TimeUnit.SECONDS);
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/BaseZookeeperURLManager.java
----------------------------------------------------------------------
diff --git a/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/BaseZookeeperURLManager.java b/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/BaseZookeeperURLManager.java
index 07be403..6107d2f 100644
--- a/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/BaseZookeeperURLManager.java
+++ b/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/BaseZookeeperURLManager.java
@@ -46,9 +46,9 @@ import org.apache.http.impl.client.HttpClientBuilder;
* Base implementation of URLManager intended for query of Zookeeper active hosts. In
* the event of a failure via markFailed, Zookeeper is queried again for active
* host information.
- *
+ *
* When configuring the HAProvider in the topology, the zookeeperEnsemble attribute must be set to a
- * comma delimited list of the host and port number, i.e. host1:2181,host2:2181.
+ * comma delimited list of the host and port number, i.e. host1:2181,host2:2181.
*/
public abstract class BaseZookeeperURLManager implements URLManager {
protected static final HaMessages LOG = MessagesFactory.get(HaMessages.class);
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/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 b9dd018..91f7971 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
@@ -28,13 +28,13 @@ import java.util.concurrent.TimeUnit;
/**
* Implementation of URLManager intended for query of Zookeeper for active HBase RegionServer hosts.
- *
+ *
* The assumption is that the HBase REST Server will be installed on the same host. For safety
* reasons, the REST Server is pinged for access before inclusion in the list of returned hosts.
- *
+ *
* In the event of a failure via markFailed, Zookeeper is queried again for active
* host information.
- *
+ *
* When configuring the HAProvider in the topology, the zookeeperEnsemble
* attribute must be set to a comma delimited list of the host and port number,
* i.e. host1:2181,host2:2181.
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/HaDescriptorConstants.java
----------------------------------------------------------------------
diff --git a/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/HaDescriptorConstants.java b/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/HaDescriptorConstants.java
index ffb0388..3ee55c1 100644
--- a/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/HaDescriptorConstants.java
+++ b/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/HaDescriptorConstants.java
@@ -28,25 +28,23 @@ package org.apache.knox.gateway.ha.provider.impl;
* </pre>
*/
public interface HaDescriptorConstants {
+ String ROOT_ELEMENT = "ha";
- public static final String ROOT_ELEMENT = "ha";
+ String SERVICE_ELEMENT = "service";
- public static final String SERVICE_ELEMENT = "service";
+ String SERVICE_NAME_ATTRIBUTE = "name";
- public static final String SERVICE_NAME_ATTRIBUTE = "name";
+ String MAX_FAILOVER_ATTEMPTS = "maxFailoverAttempts";
- public static final String MAX_FAILOVER_ATTEMPTS = "maxFailoverAttempts";
+ String FAILOVER_SLEEP = "failoverSleep";
- public static final String FAILOVER_SLEEP = "failoverSleep";
+ String MAX_RETRY_ATTEMPTS = "maxRetryAttempts";
- public static final String MAX_RETRY_ATTEMPTS = "maxRetryAttempts";
+ String RETRY_SLEEP = "retrySleep";
- public static final String RETRY_SLEEP = "retrySleep";
+ String ENABLED_ATTRIBUTE = "enabled";
- public static final String ENABLED_ATTRIBUTE = "enabled";
-
- public static final String ZOOKEEPER_ENSEMBLE = "zookeeperEnsemble";
-
- public static final String ZOOKEEPER_NAMESPACE = "zookeeperNamespace";
+ String ZOOKEEPER_ENSEMBLE = "zookeeperEnsemble";
+ String ZOOKEEPER_NAMESPACE = "zookeeperNamespace";
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/HaServiceConfigConstants.java
----------------------------------------------------------------------
diff --git a/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/HaServiceConfigConstants.java b/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/HaServiceConfigConstants.java
index 3dd4965..f79daa2 100644
--- a/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/HaServiceConfigConstants.java
+++ b/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/HaServiceConfigConstants.java
@@ -18,33 +18,31 @@
package org.apache.knox.gateway.ha.provider.impl;
public interface HaServiceConfigConstants {
+ String CONFIG_PAIRS_DELIMITER = ";";
- public static final String CONFIG_PAIRS_DELIMITER = ";";
+ String CONFIG_PAIR_DELIMITER = "=";
- public static final String CONFIG_PAIR_DELIMITER = "=";
+ String CONFIG_PARAM_MAX_FAILOVER_ATTEMPTS = "maxFailoverAttempts";
- public static final String CONFIG_PARAM_MAX_FAILOVER_ATTEMPTS = "maxFailoverAttempts";
+ String CONFIG_PARAM_FAILOVER_SLEEP = "failoverSleep";
- public static final String CONFIG_PARAM_FAILOVER_SLEEP = "failoverSleep";
+ String CONFIG_PARAM_MAX_RETRY_ATTEMPTS = "maxRetryAttempts";
- public static final String CONFIG_PARAM_MAX_RETRY_ATTEMPTS = "maxRetryAttempts";
+ String CONFIG_PARAM_RETRY_SLEEP = "retrySleep";
- public static final String CONFIG_PARAM_RETRY_SLEEP = "retrySleep";
+ String CONFIG_PARAM_ENABLED = "enabled";
- public static final String CONFIG_PARAM_ENABLED = "enabled";
+ String CONFIG_PARAM_ZOOKEEPER_ENSEMBLE = "zookeeperEnsemble";
- public static final String CONFIG_PARAM_ZOOKEEPER_ENSEMBLE = "zookeeperEnsemble";
+ String CONFIG_PARAM_ZOOKEEPER_NAMESPACE = "zookeeperNamespace";
- public static final String CONFIG_PARAM_ZOOKEEPER_NAMESPACE = "zookeeperNamespace";
+ int DEFAULT_MAX_FAILOVER_ATTEMPTS = 3;
- public static final int DEFAULT_MAX_FAILOVER_ATTEMPTS = 3;
+ int DEFAULT_FAILOVER_SLEEP = 1000;
- public static final int DEFAULT_FAILOVER_SLEEP = 1000;
+ int DEFAULT_MAX_RETRY_ATTEMPTS = 3;
- public static final int DEFAULT_MAX_RETRY_ATTEMPTS = 3;
-
- public static final int DEFAULT_RETRY_SLEEP = 1000;
-
- public static final boolean DEFAULT_ENABLED = true;
+ int DEFAULT_RETRY_SLEEP = 1000;
+ boolean DEFAULT_ENABLED = true;
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/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 06a5335..f09fc15 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
@@ -32,14 +32,14 @@ import java.util.List;
import java.util.concurrent.TimeUnit;
/**
- * Implementation of URLManager intended for query of Zookeeper for active Kafka hosts.
- *
+ * Implementation of URLManager intended for query of Zookeeper for active Kafka hosts.
+ *
* The assumption is that the Confluent REST Proxy will be installed on the same host. For safety
* reasons, the REST Server is pinged for access before inclusion in the list of returned hosts.
- *
+ *
* In the event of a failure via markFailed, Zookeeper is queried again for active
* host information.
- *
+ *
* When configuring the HAProvider in the topology, the zookeeperEnsemble
* attribute must be set to a comma delimited list of the host and port number,
* i.e. host1:2181,host2:2181.
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/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 71ce7bb..24a9e53 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
@@ -27,10 +27,10 @@ import java.util.List;
import java.util.concurrent.TimeUnit;
/**
- * Implementation of URLManager intended for query of Zookeeper for active SOLR Cloud hosts.
+ * Implementation of URLManager intended for query of Zookeeper for active SOLR Cloud hosts.
* In the event of a failure via markFailed, Zookeeper is queried again for active
* host information.
- *
+ *
* When configuring the HAProvider in the topology, the zookeeperEnsemble
* attribute must be set to a comma delimited list of the host and port number,
* i.e. host1:2181,host2:2181.
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/StringResponseHandler.java
----------------------------------------------------------------------
diff --git a/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/StringResponseHandler.java b/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/StringResponseHandler.java
index b2e7be9..859f28c 100644
--- a/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/StringResponseHandler.java
+++ b/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/StringResponseHandler.java
@@ -32,7 +32,7 @@ public class StringResponseHandler implements ResponseHandler<String>
{
@Override
public String handleResponse(HttpResponse response)
- throws ClientProtocolException, IOException
+ throws ClientProtocolException, IOException
{
int status = response.getStatusLine().getStatusCode();
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-provider-ha/src/test/java/org/apache/knox/gateway/ha/deploy/HaProviderDeploymentContributorTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-ha/src/test/java/org/apache/knox/gateway/ha/deploy/HaProviderDeploymentContributorTest.java b/gateway-provider-ha/src/test/java/org/apache/knox/gateway/ha/deploy/HaProviderDeploymentContributorTest.java
index 4410020..e948ca9 100644
--- a/gateway-provider-ha/src/test/java/org/apache/knox/gateway/ha/deploy/HaProviderDeploymentContributorTest.java
+++ b/gateway-provider-ha/src/test/java/org/apache/knox/gateway/ha/deploy/HaProviderDeploymentContributorTest.java
@@ -355,7 +355,6 @@ public class HaProviderDeploymentContributorTest {
/**
* Validate the service ha config.
- *
* @param config The HaServiceConfig to validate
* @param isEnabled The expected enabled param value
* @param failoverSleep The expected failoverSleep param value
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-provider-ha/src/test/java/org/apache/knox/gateway/ha/provider/impl/HBaseZookeeperURLManagerTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-ha/src/test/java/org/apache/knox/gateway/ha/provider/impl/HBaseZookeeperURLManagerTest.java b/gateway-provider-ha/src/test/java/org/apache/knox/gateway/ha/provider/impl/HBaseZookeeperURLManagerTest.java
index 5e02f68..8858614 100644
--- a/gateway-provider-ha/src/test/java/org/apache/knox/gateway/ha/provider/impl/HBaseZookeeperURLManagerTest.java
+++ b/gateway-provider-ha/src/test/java/org/apache/knox/gateway/ha/provider/impl/HBaseZookeeperURLManagerTest.java
@@ -37,7 +37,7 @@ import static org.junit.Assert.fail;
/**
* Simple unit tests for HBaseZookeeperURLManager.
- *
+ *
* @see HBaseZookeeperURLManager
*/
public class HBaseZookeeperURLManagerTest {
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-provider-ha/src/test/java/org/apache/knox/gateway/ha/provider/impl/KafkaZookeeperURLManagerTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-ha/src/test/java/org/apache/knox/gateway/ha/provider/impl/KafkaZookeeperURLManagerTest.java b/gateway-provider-ha/src/test/java/org/apache/knox/gateway/ha/provider/impl/KafkaZookeeperURLManagerTest.java
index 4c2fa45..30367c6 100644
--- a/gateway-provider-ha/src/test/java/org/apache/knox/gateway/ha/provider/impl/KafkaZookeeperURLManagerTest.java
+++ b/gateway-provider-ha/src/test/java/org/apache/knox/gateway/ha/provider/impl/KafkaZookeeperURLManagerTest.java
@@ -36,7 +36,7 @@ import static org.junit.Assert.assertTrue;
/**
* Simple unit tests for KafkaZookeeperURLManager.
- *
+ *
* @see KafkaZookeeperURLManager
*/
public class KafkaZookeeperURLManagerTest {
@@ -64,7 +64,7 @@ public class KafkaZookeeperURLManagerTest {
cluster.close();
}
}
-
+
@Test
public void testHBaseZookeeperURLManagerLoading() {
HaServiceConfig config = new DefaultHaServiceConfig("KAFKA");
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-provider-ha/src/test/java/org/apache/knox/gateway/ha/provider/impl/SOLRZookeeperURLManagerTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-ha/src/test/java/org/apache/knox/gateway/ha/provider/impl/SOLRZookeeperURLManagerTest.java b/gateway-provider-ha/src/test/java/org/apache/knox/gateway/ha/provider/impl/SOLRZookeeperURLManagerTest.java
index f874cbb..637fdab 100644
--- a/gateway-provider-ha/src/test/java/org/apache/knox/gateway/ha/provider/impl/SOLRZookeeperURLManagerTest.java
+++ b/gateway-provider-ha/src/test/java/org/apache/knox/gateway/ha/provider/impl/SOLRZookeeperURLManagerTest.java
@@ -39,7 +39,7 @@ import static org.junit.Assert.assertTrue;
/**
* Simple unit tests for SOLRZookeeperURLManager.
- *
+ *
* @see SOLRZookeeperURLManager
*/
public class SOLRZookeeperURLManagerTest {
@@ -84,20 +84,19 @@ public class SOLRZookeeperURLManagerTest {
// Order of URLS is not deterministic out of Zookeeper
// So we just check for expected values
-
TreeSet<String> expected = new TreeSet<>();
expected.add("http://host1:8983/solr");
expected.add("http://host2:8983/solr");
expected.add("http://host3:8983/solr");
-
+
for(String url : urls) {
assertTrue(expected.contains(url));
expected.remove(url);
}
-
+
assertEquals(0,expected.size());
-
+
// Unable to test markFailed because the SOLRZookeeperURLManager always does a refresh on Zookeeper contents.
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/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 d56ec87..f6dbae6 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
@@ -61,9 +61,6 @@ public abstract class AbstractIdentityAssertionFilter extends
AuditConstants.DEFAULT_AUDITOR_NAME, AuditConstants.KNOX_SERVICE_NAME,
AuditConstants.KNOX_COMPONENT_NAME );
- /**
- *
- */
public AbstractIdentityAssertionFilter() {
super();
}
@@ -94,12 +91,12 @@ public abstract class AbstractIdentityAssertionFilter extends
Subject subject = null;
Principal impersonationPrincipal = null;
Principal primaryPrincipal = null;
-
- // get the current subject and determine whether we need another doAs with
+
+ // get the current subject and determine whether we need another doAs with
// an impersonatedPrincipal and/or mapped group principals
boolean impersonationNeeded = false;
boolean groupsMapped = false;
-
+
// look up the current Java Subject and assosciated group principals
Subject currentSubject = Subject.getSubject(AccessController.getContext());
if (currentSubject == null) {
@@ -108,13 +105,13 @@ public abstract class AbstractIdentityAssertionFilter extends
}
Set<?> currentGroups = currentSubject.getPrincipals(GroupPrincipal.class);
-
+
primaryPrincipal = (PrimaryPrincipal) currentSubject.getPrincipals(PrimaryPrincipal.class).toArray()[0];
if (primaryPrincipal != null) {
if (!primaryPrincipal.getName().equals(mappedPrincipalName)) {
impersonationNeeded = true;
auditService.getContext().setProxyUsername( mappedPrincipalName );
- auditor.audit( Action.IDENTITY_MAPPING, primaryPrincipal.getName(),
+ auditor.audit( Action.IDENTITY_MAPPING, primaryPrincipal.getName(),
ResourceType.PRINCIPAL, ActionOutcome.SUCCESS, RES.effectiveUser(mappedPrincipalName) );
}
}
@@ -125,20 +122,20 @@ public abstract class AbstractIdentityAssertionFilter extends
// TODO: log as appropriate
primaryPrincipal = new PrimaryPrincipal(((HttpServletRequest) request).getUserPrincipal().getName());
}
-
+
groupsMapped = groups != null || !currentGroups.isEmpty();
-
+
if (impersonationNeeded || groupsMapped) {
// gonna need a new subject and doAs
subject = new Subject();
Set<Principal> principals = subject.getPrincipals();
principals.add(primaryPrincipal);
-
+
// map group principals from current Subject into newly created Subject
for (Object obj : currentGroups) {
principals.add((Principal)obj);
}
-
+
if (impersonationNeeded) {
impersonationPrincipal = new ImpersonatedPrincipal(mappedPrincipalName);
subject.getPrincipals().add(impersonationPrincipal);
@@ -182,7 +179,7 @@ public abstract class AbstractIdentityAssertionFilter extends
private void addMappedGroupsToSubject(String mappedPrincipalName, String[] groups, Subject subject) {
if (groups != null) {
- auditor.audit( Action.IDENTITY_MAPPING, mappedPrincipalName, ResourceType.PRINCIPAL,
+ auditor.audit( Action.IDENTITY_MAPPING, mappedPrincipalName, ResourceType.PRINCIPAL,
ActionOutcome.SUCCESS, RES.groupsList( Arrays.toString( groups ) ) );
for (int i = 0; i < groups.length; i++) {
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/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 977c318..db75424 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
@@ -37,11 +37,11 @@ import java.security.AccessController;
public class CommonIdentityAssertionFilter extends AbstractIdentityAssertionFilter {
private IdentityAsserterMessages LOG = MessagesFactory.get(IdentityAsserterMessages.class);
-
+
private static final String GROUP_PRINCIPAL_MAPPING = "group.principal.mapping";
private static final String PRINCIPAL_MAPPING = "principal.mapping";
private SimplePrincipalMapper mapper = new SimplePrincipalMapper();
-
+
@Override
public void init(FilterConfig filterConfig) throws ServletException {
String principalMapping = filterConfig.getInitParameter(PRINCIPAL_MAPPING);
@@ -109,7 +109,7 @@ public class CommonIdentityAssertionFilter extends AbstractIdentityAssertionFilt
// from request methods
IdentityAsserterHttpServletRequestWrapper wrapper =
new IdentityAsserterHttpServletRequestWrapper(
- (HttpServletRequest)request,
+ (HttpServletRequest)request,
mappedPrincipalName);
return wrapper;
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/identityasserter/common/filter/IdentityAsserterHttpServletRequestWrapper.java
----------------------------------------------------------------------
diff --git a/gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/identityasserter/common/filter/IdentityAsserterHttpServletRequestWrapper.java b/gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/identityasserter/common/filter/IdentityAsserterHttpServletRequestWrapper.java
index 4061a30..b4395d8 100644
--- a/gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/identityasserter/common/filter/IdentityAsserterHttpServletRequestWrapper.java
+++ b/gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/identityasserter/common/filter/IdentityAsserterHttpServletRequestWrapper.java
@@ -50,7 +50,7 @@ private static SpiGatewayMessages log = MessagesFactory.get( SpiGatewayMessages.
private static final String PRINCIPAL_PARAM = "user.name";
private static final String DOAS_PRINCIPAL_PARAM = "doAs";
-
+
private String username;
public IdentityAsserterHttpServletRequestWrapper( HttpServletRequest request, String principal ) {
@@ -70,7 +70,7 @@ private static SpiGatewayMessages log = MessagesFactory.get( SpiGatewayMessages.
}
return super.getParameter(name);
}
-
+
@Override
public Map<String, String[]> getParameterMap() {
Map<String, String[]> map = null;
@@ -145,7 +145,7 @@ private static SpiGatewayMessages log = MessagesFactory.get( SpiGatewayMessages.
else {
params = HttpUtils.splitQuery( qString );
}
- }
+ }
return params;
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/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 e7ccb8c..25800f5 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
@@ -51,7 +51,7 @@ public class CommonIdentityAssertionFilterTest {
private String username = null;
private String[] mappedGroups = null;
private Filter filter = null;
-
+
@Before
public void setup() {
filter = new CommonIdentityAssertionFilter() {
@@ -94,7 +94,7 @@ public class CommonIdentityAssertionFilterTest {
throws IOException, ServletException {
}
};
-
+
Subject subject = new Subject();
subject.getPrincipals().add(new PrimaryPrincipal("larry"));
subject.getPrincipals().add(new GroupPrincipal("users"));
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-provider-identity-assertion-common/src/test/java/org/apache/knox/gateway/identityasserter/filter/IdentityAssertionHttpServletRequestWrapperTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-identity-assertion-common/src/test/java/org/apache/knox/gateway/identityasserter/filter/IdentityAssertionHttpServletRequestWrapperTest.java b/gateway-provider-identity-assertion-common/src/test/java/org/apache/knox/gateway/identityasserter/filter/IdentityAssertionHttpServletRequestWrapperTest.java
index 5d63d33..7290e0d 100644
--- a/gateway-provider-identity-assertion-common/src/test/java/org/apache/knox/gateway/identityasserter/filter/IdentityAssertionHttpServletRequestWrapperTest.java
+++ b/gateway-provider-identity-assertion-common/src/test/java/org/apache/knox/gateway/identityasserter/filter/IdentityAssertionHttpServletRequestWrapperTest.java
@@ -111,7 +111,7 @@ public class IdentityAssertionHttpServletRequestWrapperTest {
request.setCharacterEncoding( StandardCharsets.UTF_8.name() );
request.setContentType( "application/x-www-form-urlencoded" );
request.setMethod("POST");
-
+
IdentityAsserterHttpServletRequestWrapper wrapper
= new IdentityAsserterHttpServletRequestWrapper( request, "output-user" );
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-provider-identity-assertion-common/src/test/java/org/apache/knox/gateway/identityasserter/function/UsernameFunctionProcessorTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-identity-assertion-common/src/test/java/org/apache/knox/gateway/identityasserter/function/UsernameFunctionProcessorTest.java b/gateway-provider-identity-assertion-common/src/test/java/org/apache/knox/gateway/identityasserter/function/UsernameFunctionProcessorTest.java
index 8f81515..785751f 100644
--- a/gateway-provider-identity-assertion-common/src/test/java/org/apache/knox/gateway/identityasserter/function/UsernameFunctionProcessorTest.java
+++ b/gateway-provider-identity-assertion-common/src/test/java/org/apache/knox/gateway/identityasserter/function/UsernameFunctionProcessorTest.java
@@ -202,7 +202,7 @@ public class UsernameFunctionProcessorTest {
private static class SetupFilter implements Filter {
private Subject subject;
- public SetupFilter( String userName ) {
+ SetupFilter( String userName ) {
subject = new Subject();
subject.getPrincipals().add( new BasicUserPrincipal( userName ) );
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-provider-identity-assertion-concat/src/test/java/org/apache/knox/gateway/identityasserter/concat/filter/ConcatIdentityAssertionFilterTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-identity-assertion-concat/src/test/java/org/apache/knox/gateway/identityasserter/concat/filter/ConcatIdentityAssertionFilterTest.java b/gateway-provider-identity-assertion-concat/src/test/java/org/apache/knox/gateway/identityasserter/concat/filter/ConcatIdentityAssertionFilterTest.java
index e960c0a..4fbe020 100644
--- a/gateway-provider-identity-assertion-concat/src/test/java/org/apache/knox/gateway/identityasserter/concat/filter/ConcatIdentityAssertionFilterTest.java
+++ b/gateway-provider-identity-assertion-concat/src/test/java/org/apache/knox/gateway/identityasserter/concat/filter/ConcatIdentityAssertionFilterTest.java
@@ -45,17 +45,17 @@ public class ConcatIdentityAssertionFilterTest {
ConcatIdentityAssertionFilter filter = new ConcatIdentityAssertionFilter();
Subject subject = new Subject();
-
+
subject.getPrincipals().add(new PrimaryPrincipal("larry"));
subject.getPrincipals().add(new GroupPrincipal("users"));
subject.getPrincipals().add(new GroupPrincipal("admin"));
-
+
filter.init(config);
String username = filter.mapUserPrincipal(((Principal) subject.getPrincipals(PrimaryPrincipal.class).toArray()[0]).getName());
String[] groups = filter.mapGroupPrincipals(username, subject);
assertEquals(username, "larry");
assertNull(groups); // means for the caller to use the existing subject groups
-
+
config = EasyMock.createNiceMock( FilterConfig.class );
EasyMock.expect(config.getInitParameter("principal.mapping") ).andReturn( "" ).anyTimes();
context = EasyMock.createNiceMock(ServletContext.class);
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-provider-identity-assertion-hadoop-groups/src/main/java/org/apache/knox/gateway/identityasserter/hadoop/groups/filter/HadoopGroupProviderDeploymentContributor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-identity-assertion-hadoop-groups/src/main/java/org/apache/knox/gateway/identityasserter/hadoop/groups/filter/HadoopGroupProviderDeploymentContributor.java b/gateway-provider-identity-assertion-hadoop-groups/src/main/java/org/apache/knox/gateway/identityasserter/hadoop/groups/filter/HadoopGroupProviderDeploymentContributor.java
index f41f793..eef4919 100644
--- a/gateway-provider-identity-assertion-hadoop-groups/src/main/java/org/apache/knox/gateway/identityasserter/hadoop/groups/filter/HadoopGroupProviderDeploymentContributor.java
+++ b/gateway-provider-identity-assertion-hadoop-groups/src/main/java/org/apache/knox/gateway/identityasserter/hadoop/groups/filter/HadoopGroupProviderDeploymentContributor.java
@@ -34,7 +34,7 @@ import java.util.Map.Entry;
/**
* A provider deployment contributor for looking up authenticated user groups as
* seen by Hadoop implementation.
- *
+ *
* @since 0.11.0
*/
@@ -70,13 +70,13 @@ public class HadoopGroupProviderDeploymentContributor
if (!prefix.endsWith(".")) {
prefix += ".";
}
- Map<String, String> groupMappingParams =
+ Map<String, String> groupMappingParams =
((Configuration)context.getGatewayConfig()).getPropsWithPrefix(prefix);
if (groupMappingParams != null) {
params = createParamList(resource, params, groupMappingParams);
}
}
-
+
if (params == null || params.isEmpty()) {
params = buildFilterInitParms(provider, resource, params);
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-provider-identity-assertion-hadoop-groups/src/main/java/org/apache/knox/gateway/identityasserter/hadoop/groups/filter/HadoopGroupProviderMessages.java
----------------------------------------------------------------------
diff --git a/gateway-provider-identity-assertion-hadoop-groups/src/main/java/org/apache/knox/gateway/identityasserter/hadoop/groups/filter/HadoopGroupProviderMessages.java b/gateway-provider-identity-assertion-hadoop-groups/src/main/java/org/apache/knox/gateway/identityasserter/hadoop/groups/filter/HadoopGroupProviderMessages.java
index 685fb8b..db6246b 100644
--- a/gateway-provider-identity-assertion-hadoop-groups/src/main/java/org/apache/knox/gateway/identityasserter/hadoop/groups/filter/HadoopGroupProviderMessages.java
+++ b/gateway-provider-identity-assertion-hadoop-groups/src/main/java/org/apache/knox/gateway/identityasserter/hadoop/groups/filter/HadoopGroupProviderMessages.java
@@ -24,20 +24,18 @@ import org.apache.knox.gateway.i18n.messages.StackTrace;
/**
* Messages for provider - HadoopGroupProvider
- *
+ *
* @since 0.11
*/
-
@Messages(logger="org.apache.knox.gateway")
public interface HadoopGroupProviderMessages {
@Message( level = MessageLevel.ERROR, text = "Error getting groups for principal {0}" )
- void errorGettingUserGroups(final String principal , @StackTrace( level = MessageLevel.DEBUG ) Exception e );
-
+ void errorGettingUserGroups(String principal , @StackTrace( level = MessageLevel.DEBUG ) Exception e );
+
@Message( level = MessageLevel.INFO, text = "No groups for principal {0} found" )
- void noGroupsFound(final String principal);
-
+ void noGroupsFound(String principal);
+
@Message( level = MessageLevel.DEBUG, text = "Found groups for principal {0} : {1}" )
- void groupsFound(final String principal, final String groups );
-
+ void groupsFound(String principal, String groups );
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-provider-identity-assertion-hadoop-groups/src/test/java/org/apache/knox/gateway/identityasserter/hadoop/groups/filter/HadoopGroupProviderDeploymentContributorTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-identity-assertion-hadoop-groups/src/test/java/org/apache/knox/gateway/identityasserter/hadoop/groups/filter/HadoopGroupProviderDeploymentContributorTest.java b/gateway-provider-identity-assertion-hadoop-groups/src/test/java/org/apache/knox/gateway/identityasserter/hadoop/groups/filter/HadoopGroupProviderDeploymentContributorTest.java
index e3e06bd..66675de 100644
--- a/gateway-provider-identity-assertion-hadoop-groups/src/test/java/org/apache/knox/gateway/identityasserter/hadoop/groups/filter/HadoopGroupProviderDeploymentContributorTest.java
+++ b/gateway-provider-identity-assertion-hadoop-groups/src/test/java/org/apache/knox/gateway/identityasserter/hadoop/groups/filter/HadoopGroupProviderDeploymentContributorTest.java
@@ -34,10 +34,9 @@ public class HadoopGroupProviderDeploymentContributorTest {
@Test
public void testServiceLoader() throws Exception {
-
ServiceLoader<ProviderDeploymentContributor> loader = ServiceLoader
.load(ProviderDeploymentContributor.class);
-
+
Iterator<ProviderDeploymentContributor> iterator = loader.iterator();
assertThat("Service iterator empty.", iterator.hasNext());
while (iterator.hasNext()) {
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-provider-identity-assertion-hadoop-groups/src/test/java/org/apache/knox/gateway/identityasserter/hadoop/groups/filter/HadoopGroupsTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-identity-assertion-hadoop-groups/src/test/java/org/apache/knox/gateway/identityasserter/hadoop/groups/filter/HadoopGroupsTest.java b/gateway-provider-identity-assertion-hadoop-groups/src/test/java/org/apache/knox/gateway/identityasserter/hadoop/groups/filter/HadoopGroupsTest.java
index 70d00e6..a2267bf 100644
--- a/gateway-provider-identity-assertion-hadoop-groups/src/test/java/org/apache/knox/gateway/identityasserter/hadoop/groups/filter/HadoopGroupsTest.java
+++ b/gateway-provider-identity-assertion-hadoop-groups/src/test/java/org/apache/knox/gateway/identityasserter/hadoop/groups/filter/HadoopGroupsTest.java
@@ -29,7 +29,7 @@ import org.junit.Test;
/**
* Test Hadoop {@link Groups} class. Basically to make sure that the
* interface we depend on does not change.
- *
+ *
* @since 0.11.0
*/
public class HadoopGroupsTest {
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-provider-identity-assertion-pseudo/src/test/java/org/apache/knox/gateway/identityasserter/filter/DefaultIdentityAssertionFilterTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-identity-assertion-pseudo/src/test/java/org/apache/knox/gateway/identityasserter/filter/DefaultIdentityAssertionFilterTest.java b/gateway-provider-identity-assertion-pseudo/src/test/java/org/apache/knox/gateway/identityasserter/filter/DefaultIdentityAssertionFilterTest.java
index b66dbb1..273c103 100644
--- a/gateway-provider-identity-assertion-pseudo/src/test/java/org/apache/knox/gateway/identityasserter/filter/DefaultIdentityAssertionFilterTest.java
+++ b/gateway-provider-identity-assertion-pseudo/src/test/java/org/apache/knox/gateway/identityasserter/filter/DefaultIdentityAssertionFilterTest.java
@@ -47,17 +47,17 @@ public class DefaultIdentityAssertionFilterTest {
IdentityAsserterFilter filter = new IdentityAsserterFilter();
Subject subject = new Subject();
-
+
subject.getPrincipals().add(new PrimaryPrincipal("lmccay"));
subject.getPrincipals().add(new GroupPrincipal("users"));
subject.getPrincipals().add(new GroupPrincipal("admin"));
-
+
filter.init(config);
String username = filter.mapUserPrincipal(((Principal) subject.getPrincipals(PrimaryPrincipal.class).toArray()[0]).getName());
String[] groups = filter.mapGroupPrincipals(username, subject);
assertEquals("lmccay", username);
assertNull(groups); // means for the caller to use the existing subject groups
-
+
config = EasyMock.createNiceMock( FilterConfig.class );
EasyMock.expect(config.getInitParameter("principal.mapping") ).andReturn( "lmccay,kminder=hdfs;newuser=mapred" ).anyTimes();
EasyMock.expect(config.getInitParameter("group.principal.mapping") ).andReturn( "kminder=group1;lmccay=mrgroup,mrducks" ).anyTimes();
@@ -73,11 +73,11 @@ public class DefaultIdentityAssertionFilterTest {
assertFalse("group1 WAS found in groups: " + Arrays.toString(mappedGroups), groupFoundIn("group1", mappedGroups));
subject = new Subject();
-
+
subject.getPrincipals().add(new PrimaryPrincipal("kminder"));
subject.getPrincipals().add(new GroupPrincipal("users"));
subject.getPrincipals().add(new GroupPrincipal("admin"));
-
+
config = EasyMock.createNiceMock( FilterConfig.class );
EasyMock.expect(config.getInitParameter("principal.mapping") ).andReturn( "lmccay,kminder=hdfs;newuser=mapred" ).anyTimes();
EasyMock.expect(config.getInitParameter("group.principal.mapping") ).andReturn( "kminder=group1;lmccay=mrgroup,mrducks" ).anyTimes();
@@ -116,18 +116,18 @@ public class DefaultIdentityAssertionFilterTest {
IdentityAsserterFilter filter = new IdentityAsserterFilter();
Subject subject = new Subject();
-
+
subject.getPrincipals().add(new PrimaryPrincipal("lmccay"));
subject.getPrincipals().add(new GroupPrincipal("users"));
subject.getPrincipals().add(new GroupPrincipal("admin"));
-
+
filter.init(config);
String username = filter.mapUserPrincipal(((Principal) subject.getPrincipals(PrimaryPrincipal.class).toArray()[0]).getName());
String[] groups = filter.mapGroupPrincipals(((Principal) subject.getPrincipals(PrimaryPrincipal.class).toArray()[0]).getName(), subject);
-// String[] groups = filter.mapGroupPrincipals(username, subject);
+
assertEquals("lmccay", username);
assertNull(groups); // means for the caller to use the existing subject groups
-
+
config = EasyMock.createNiceMock( FilterConfig.class );
EasyMock.expect(config.getInitParameter("principal.mapping") ).andReturn( "" ).anyTimes();
context = EasyMock.createNiceMock(ServletContext.class);
@@ -145,11 +145,11 @@ public class DefaultIdentityAssertionFilterTest {
assertFalse("group1 WAS found in groups: " + Arrays.toString(groups), groupFoundIn("group1", groups));
subject = new Subject();
-
+
subject.getPrincipals().add(new PrimaryPrincipal("kminder"));
subject.getPrincipals().add(new GroupPrincipal("users"));
subject.getPrincipals().add(new GroupPrincipal("admin"));
-
+
config = EasyMock.createNiceMock( FilterConfig.class );
EasyMock.expect(config.getInitParameter("principal.mapping") ).andReturn( "" ).anyTimes();
context = EasyMock.createNiceMock(ServletContext.class);
@@ -162,5 +162,4 @@ public class DefaultIdentityAssertionFilterTest {
username = filter.mapUserPrincipal(((Principal) subject.getPrincipals(PrimaryPrincipal.class).toArray()[0]).getName());
assertEquals("hdfs", username);
}
-
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/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 db4afbf..cb8c222 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
@@ -35,7 +35,7 @@ public class RegexIdentityAssertionFilter extends
private String output = null;
private Map<String,String> dict;
RegexTemplate template;
-
+
@Override
public void init(FilterConfig filterConfig) throws ServletException {
super.init(filterConfig);
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-provider-jersey/src/test/java/org/apache/knox/gateway/jersey/JerseyDeploymentContributorTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-jersey/src/test/java/org/apache/knox/gateway/jersey/JerseyDeploymentContributorTest.java b/gateway-provider-jersey/src/test/java/org/apache/knox/gateway/jersey/JerseyDeploymentContributorTest.java
index 0aa1356..1e86eba 100644
--- a/gateway-provider-jersey/src/test/java/org/apache/knox/gateway/jersey/JerseyDeploymentContributorTest.java
+++ b/gateway-provider-jersey/src/test/java/org/apache/knox/gateway/jersey/JerseyDeploymentContributorTest.java
@@ -206,7 +206,7 @@ public class JerseyDeploymentContributorTest {
ProviderDeploymentContributor providerContributor;
Provider provider;
- public MockDeploymentContext(
+ MockDeploymentContext(
DeploymentContext context,
ProviderDeploymentContributor providerContributor,
Provider provider ) {
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-provider-rewrite-func-hostmap-static/src/test/java/org/apache/knox/gateway/hostmap/impl/HostmapFunctionProcessorTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-func-hostmap-static/src/test/java/org/apache/knox/gateway/hostmap/impl/HostmapFunctionProcessorTest.java b/gateway-provider-rewrite-func-hostmap-static/src/test/java/org/apache/knox/gateway/hostmap/impl/HostmapFunctionProcessorTest.java
index f63d7cc..e405ae4 100644
--- a/gateway-provider-rewrite-func-hostmap-static/src/test/java/org/apache/knox/gateway/hostmap/impl/HostmapFunctionProcessorTest.java
+++ b/gateway-provider-rewrite-func-hostmap-static/src/test/java/org/apache/knox/gateway/hostmap/impl/HostmapFunctionProcessorTest.java
@@ -67,15 +67,14 @@ public class HostmapFunctionProcessorTest {
HostMapper hm = EasyMock.createNiceMock(HostMapper.class);
EasyMock.expect( hm.resolveInboundHostName("test-inbound-host")).andReturn( "test-inbound-rewritten-host" ).anyTimes();
-
+
HostMapperService hms = EasyMock.createNiceMock( HostMapperService.class );
GatewayServices gatewayServices = EasyMock.createNiceMock( GatewayServices.class );
EasyMock.expect( gatewayServices.getService( GatewayServices.HOST_MAPPING_SERVICE ) ).andReturn( hms ).anyTimes();
-
UrlRewriteEnvironment environment = EasyMock.createNiceMock( UrlRewriteEnvironment.class );
- EasyMock.expect( environment.getAttribute( GatewayServices.GATEWAY_SERVICES_ATTRIBUTE ) ).andReturn( gatewayServices ).anyTimes();
+ EasyMock.expect( environment.getAttribute( GatewayServices.GATEWAY_SERVICES_ATTRIBUTE ) ).andReturn( gatewayServices ).anyTimes();
EasyMock.expect( environment.resolve( "cluster.name" ) ).andReturn( Arrays.asList( "test-cluster-name" ) ).anyTimes();
EasyMock.expect( environment.getResource( "/WEB-INF/hostmap.txt" ) ).andReturn( configUrl ).anyTimes();
Resolver resolver = EasyMock.createNiceMock( Resolver.class );
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServiceRegistryFunctionsTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServiceRegistryFunctionsTest.java b/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServiceRegistryFunctionsTest.java
index ee1b9eb..081eeeb 100644
--- a/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServiceRegistryFunctionsTest.java
+++ b/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServiceRegistryFunctionsTest.java
@@ -106,7 +106,7 @@ public class ServiceRegistryFunctionsTest {
}
}
rewriteFilter.setFilter( new UrlRewriteServletFilter() );
-
+
interactions = new ArrayDeque<>();
ServletHolder servlet = server.addServlet( MockServlet.class, "/" );
@@ -186,7 +186,7 @@ public class ServiceRegistryFunctionsTest {
private static class SetupFilter implements Filter {
private Subject subject;
- public SetupFilter( String userName ) {
+ SetupFilter( String userName ) {
subject = new Subject();
subject.getPrincipals().add( new BasicUserPrincipal( userName ) );
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-provider-rewrite-step-secure-query/src/main/java/org/apache/knox/gateway/securequery/SecureQueryDecryptProcessor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-step-secure-query/src/main/java/org/apache/knox/gateway/securequery/SecureQueryDecryptProcessor.java b/gateway-provider-rewrite-step-secure-query/src/main/java/org/apache/knox/gateway/securequery/SecureQueryDecryptProcessor.java
index 6845dd2..df9e33e 100644
--- a/gateway-provider-rewrite-step-secure-query/src/main/java/org/apache/knox/gateway/securequery/SecureQueryDecryptProcessor.java
+++ b/gateway-provider-rewrite-step-secure-query/src/main/java/org/apache/knox/gateway/securequery/SecureQueryDecryptProcessor.java
@@ -111,8 +111,8 @@ public class SecureQueryDecryptProcessor implements
byte[] clear = null;
try {
clear = encryptor.decrypt(
- result.salt,
- result.iv,
+ result.salt,
+ result.iv,
result.cipher);
} catch (Exception e) {
log.unableToDecryptValue(e);
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-provider-rewrite-step-secure-query/src/main/java/org/apache/knox/gateway/securequery/SecureQueryDeploymentContributor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-step-secure-query/src/main/java/org/apache/knox/gateway/securequery/SecureQueryDeploymentContributor.java b/gateway-provider-rewrite-step-secure-query/src/main/java/org/apache/knox/gateway/securequery/SecureQueryDeploymentContributor.java
index 88cb7be..b1ef60a 100644
--- a/gateway-provider-rewrite-step-secure-query/src/main/java/org/apache/knox/gateway/securequery/SecureQueryDeploymentContributor.java
+++ b/gateway-provider-rewrite-step-secure-query/src/main/java/org/apache/knox/gateway/securequery/SecureQueryDeploymentContributor.java
@@ -48,7 +48,7 @@ public class SecureQueryDeploymentContributor
public String getName() {
return PROVIDER_IMPL_NAME;
}
-
+
public void setAliasService(AliasService as) {
this.as = as;
}
@@ -58,7 +58,7 @@ public class SecureQueryDeploymentContributor
super.initializeContribution(context);
String clusterName = context.getTopology().getName();
-
+
// we don't want to overwrite an existing alias from a previous topology deployment
// so we can't just blindly generateAlias here.
// this version of getPassword will generate a value for it only if missing
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-provider-rewrite-step-secure-query/src/test/java/org/apache/knox/gateway/securequery/SecureQueryDeploymentContributorTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-step-secure-query/src/test/java/org/apache/knox/gateway/securequery/SecureQueryDeploymentContributorTest.java b/gateway-provider-rewrite-step-secure-query/src/test/java/org/apache/knox/gateway/securequery/SecureQueryDeploymentContributorTest.java
index 298e8f2..2eaddaa 100644
--- a/gateway-provider-rewrite-step-secure-query/src/test/java/org/apache/knox/gateway/securequery/SecureQueryDeploymentContributorTest.java
+++ b/gateway-provider-rewrite-step-secure-query/src/test/java/org/apache/knox/gateway/securequery/SecureQueryDeploymentContributorTest.java
@@ -53,7 +53,7 @@ public class SecureQueryDeploymentContributorTest {
Topology topology = new Topology();
topology.setName("Sample");
-
+
DeploymentContext context = EasyMock.createNiceMock( DeploymentContext.class );
// EasyMock.expect( context.getDescriptor( "rewrite" ) ).andReturn( rewriteRules ).anyTimes();
EasyMock.expect( context.getWebArchive() ).andReturn( webArchive ).anyTimes();
@@ -68,8 +68,8 @@ public class SecureQueryDeploymentContributorTest {
EasyMock.expect( gatewayServices.getService( GatewayServices.CRYPTO_SERVICE ) ).andReturn( cryptoService ).anyTimes();
UrlRewriteEnvironment encEnvironment = EasyMock.createNiceMock( UrlRewriteEnvironment.class );
- EasyMock.expect( encEnvironment.getAttribute( GatewayServices.GATEWAY_SERVICES_ATTRIBUTE ) ).andReturn( gatewayServices ).anyTimes();
-
+ EasyMock.expect( encEnvironment.getAttribute( GatewayServices.GATEWAY_SERVICES_ATTRIBUTE ) ).andReturn( gatewayServices ).anyTimes();
+
SecureQueryDeploymentContributor contributor = new SecureQueryDeploymentContributor();
contributor.setAliasService(as);
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-provider-rewrite-step-secure-query/src/test/java/org/apache/knox/gateway/securequery/SecureQueryEncodeProcessorTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-step-secure-query/src/test/java/org/apache/knox/gateway/securequery/SecureQueryEncodeProcessorTest.java b/gateway-provider-rewrite-step-secure-query/src/test/java/org/apache/knox/gateway/securequery/SecureQueryEncodeProcessorTest.java
index 41979d9..6e37d0d 100644
--- a/gateway-provider-rewrite-step-secure-query/src/test/java/org/apache/knox/gateway/securequery/SecureQueryEncodeProcessorTest.java
+++ b/gateway-provider-rewrite-step-secure-query/src/test/java/org/apache/knox/gateway/securequery/SecureQueryEncodeProcessorTest.java
@@ -48,7 +48,7 @@ public class SecureQueryEncodeProcessorTest {
EasyMock.expect( gatewayServices.getService( GatewayServices.CRYPTO_SERVICE ) ).andReturn( cryptoService );
UrlRewriteEnvironment environment = EasyMock.createNiceMock( UrlRewriteEnvironment.class );
- EasyMock.expect( environment.getAttribute( GatewayServices.GATEWAY_SERVICES_ATTRIBUTE ) ).andReturn( gatewayServices ).anyTimes();
+ EasyMock.expect( environment.getAttribute( GatewayServices.GATEWAY_SERVICES_ATTRIBUTE ) ).andReturn( gatewayServices ).anyTimes();
EasyMock.expect( environment.getAttribute( GatewayServices.GATEWAY_CLUSTER_ATTRIBUTE ) ).andReturn(Collections.singletonList("test-cluster-name")).anyTimes();
Template inTemplate = Parser.parseLiteral( "http://host:0/root/path?query" );
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-provider-rewrite-step-secure-query/src/test/java/org/apache/knox/gateway/securequery/SecureQueryEncryptDecryptProcessorTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-step-secure-query/src/test/java/org/apache/knox/gateway/securequery/SecureQueryEncryptDecryptProcessorTest.java b/gateway-provider-rewrite-step-secure-query/src/test/java/org/apache/knox/gateway/securequery/SecureQueryEncryptDecryptProcessorTest.java
index a0c850e..211f98d 100644
--- a/gateway-provider-rewrite-step-secure-query/src/test/java/org/apache/knox/gateway/securequery/SecureQueryEncryptDecryptProcessorTest.java
+++ b/gateway-provider-rewrite-step-secure-query/src/test/java/org/apache/knox/gateway/securequery/SecureQueryEncryptDecryptProcessorTest.java
@@ -58,7 +58,7 @@ public class SecureQueryEncryptDecryptProcessorTest {
EasyMock.expect( gatewayServices.getService( GatewayServices.CRYPTO_SERVICE ) ).andReturn( cryptoService );
UrlRewriteEnvironment encEnvironment = EasyMock.createNiceMock( UrlRewriteEnvironment.class );
- EasyMock.expect( encEnvironment.getAttribute( GatewayServices.GATEWAY_SERVICES_ATTRIBUTE ) ).andReturn( gatewayServices ).anyTimes();
+ EasyMock.expect( encEnvironment.getAttribute( GatewayServices.GATEWAY_SERVICES_ATTRIBUTE ) ).andReturn( gatewayServices ).anyTimes();
EasyMock.expect( encEnvironment.getAttribute( GatewayServices.GATEWAY_CLUSTER_ATTRIBUTE ) ).andReturn( "test-cluster-name" ).anyTimes();
UrlRewriteContext encContext = EasyMock.createNiceMock( UrlRewriteContext.class );
EasyMock.expect( encContext.getCurrentUrl() ).andReturn( origTemplate );
@@ -85,7 +85,7 @@ public class SecureQueryEncryptDecryptProcessorTest {
EasyMock.expect( as.getPasswordFromAliasForCluster("test-cluster-name", "encryptQueryString")).andReturn( secret.toCharArray() ).anyTimes();
UrlRewriteEnvironment decEnvironment = EasyMock.createNiceMock( UrlRewriteEnvironment.class );
- EasyMock.expect( decEnvironment.getAttribute( GatewayServices.GATEWAY_SERVICES_ATTRIBUTE ) ).andReturn( gatewayServices ).anyTimes();
+ EasyMock.expect( decEnvironment.getAttribute( GatewayServices.GATEWAY_SERVICES_ATTRIBUTE ) ).andReturn( gatewayServices ).anyTimes();
EasyMock.expect( decEnvironment.getAttribute( GatewayServices.GATEWAY_CLUSTER_ATTRIBUTE ) ).andReturn( "test-cluster-name" ).anyTimes();
Params decParams = EasyMock.createNiceMock( Params.class );
EasyMock.expect( decParams.resolve( GatewayServices.GATEWAY_CLUSTER_ATTRIBUTE ) ).andReturn( Arrays.asList("test-cluster-name") ).anyTimes();
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteFilterBufferDescriptor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteFilterBufferDescriptor.java b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteFilterBufferDescriptor.java
index 8950487..3740976 100644
--- a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteFilterBufferDescriptor.java
+++ b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteFilterBufferDescriptor.java
@@ -20,6 +20,5 @@ package org.apache.knox.gateway.filter.rewrite.api;
public interface UrlRewriteFilterBufferDescriptor
extends UrlRewriteFilterPathDescriptor, UrlRewriteFilterGroupDescriptor {
- public UrlRewriteFilterDetectDescriptor addDetect( String path, String value );
-
+ UrlRewriteFilterDetectDescriptor addDetect( String path, String value );
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteFilterGroupDescriptor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteFilterGroupDescriptor.java b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteFilterGroupDescriptor.java
index f6a9f0e..bdfaad8 100644
--- a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteFilterGroupDescriptor.java
+++ b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteFilterGroupDescriptor.java
@@ -20,11 +20,9 @@ package org.apache.knox.gateway.filter.rewrite.api;
import java.util.List;
public interface UrlRewriteFilterGroupDescriptor extends UrlRewriteFilterPathDescriptor {
+ List<UrlRewriteFilterPathDescriptor> getSelectors();
- public List<UrlRewriteFilterPathDescriptor> getSelectors();
-
- public void addSelector( UrlRewriteFilterPathDescriptor selector );
+ void addSelector( UrlRewriteFilterPathDescriptor selector );
UrlRewriteFilterApplyDescriptor addApply( String path, String rule );
-
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/UrlRewriteFilterReader.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/UrlRewriteFilterReader.java b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/UrlRewriteFilterReader.java
index 98c403f..3fada3f 100644
--- a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/UrlRewriteFilterReader.java
+++ b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/UrlRewriteFilterReader.java
@@ -21,12 +21,10 @@ import java.util.regex.Pattern;
import org.apache.knox.gateway.filter.rewrite.api.UrlRewriteFilterPathDescriptor;
-
public interface UrlRewriteFilterReader {
+ String filterValueString( String name, String value, String rule );
- public String filterValueString( String name, String value, String rule );
-
- public static class RegexCompiler implements UrlRewriteFilterPathDescriptor.Compiler<Pattern> {
+ class RegexCompiler implements UrlRewriteFilterPathDescriptor.Compiler<Pattern> {
@Override
public Pattern compile( String expression, Pattern compiled ) {
if( compiled != null ) {
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/html/HtmlPrefixProcessor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/html/HtmlPrefixProcessor.java b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/html/HtmlPrefixProcessor.java
index 2e2d307..303e9c2 100644
--- a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/html/HtmlPrefixProcessor.java
+++ b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/html/HtmlPrefixProcessor.java
@@ -45,7 +45,7 @@ import java.util.List;
* <div ng-include src=\"'http://localhost:8443/sandbox/service/components/navbar/navbar.html?v=1498928142479'\"></div>
* }
* </pre>
- *
+ *
* The rewrite rule could then contain the $prefix function that would delegate
* to the frontend function.
*
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/html/HtmlUrlRewriteFilterReader.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/html/HtmlUrlRewriteFilterReader.java b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/html/HtmlUrlRewriteFilterReader.java
index f3f6074..d796a81 100644
--- a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/html/HtmlUrlRewriteFilterReader.java
+++ b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/html/HtmlUrlRewriteFilterReader.java
@@ -33,7 +33,7 @@ import java.net.URISyntaxException;
public class HtmlUrlRewriteFilterReader extends HtmlFilterReader {
private static final UrlRewriteMessages LOG = MessagesFactory.get( UrlRewriteMessages.class );
-
+
private Resolver resolver;
private UrlRewriter rewriter;
private UrlRewriter.Direction direction;
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/json/JsonFilterReader.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/json/JsonFilterReader.java b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/json/JsonFilterReader.java
index ecc7925..7afab15 100644
--- a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/json/JsonFilterReader.java
+++ b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/json/JsonFilterReader.java
@@ -64,8 +64,7 @@ class JsonFilterReader extends Reader {
private UrlRewriteFilterBufferDescriptor bufferingConfig;
private UrlRewriteFilterGroupDescriptor config;
-
- public JsonFilterReader( Reader reader, UrlRewriteFilterContentDescriptor config ) throws IOException {
+ JsonFilterReader( Reader reader, UrlRewriteFilterContentDescriptor config ) throws IOException {
this.reader = reader;
factory = new JsonFactory();
mapper = new ObjectMapper();
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/xml/XmlFilterReader.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/xml/XmlFilterReader.java b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/xml/XmlFilterReader.java
index 6c907f8..be67dac 100644
--- a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/xml/XmlFilterReader.java
+++ b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/xml/XmlFilterReader.java
@@ -404,12 +404,11 @@ public abstract class XmlFilterReader extends Reader {
if( localName == null ) {
qname = new QName( node.getNodeName() );
} else {
- if ( node.getPrefix() == null ) {
+ if ( node.getPrefix() == null ) {
qname = new QName( node.getNamespaceURI(), localName );
} else {
qname = new QName( node.getNamespaceURI(), localName, node.getPrefix() );
}
-
}
return qname;
}
@@ -539,7 +538,7 @@ public abstract class XmlFilterReader extends Reader {
writer.write( "]]>" );
} else {
writer.write( StringEscapeUtils.escapeXml( value ) );
- }
+ }
}
}
@@ -648,7 +647,7 @@ public abstract class XmlFilterReader extends Reader {
}
}
- private static final void writeBufferedElement( Node node, Writer writer ) throws IOException {
+ private static void writeBufferedElement( Node node, Writer writer ) throws IOException {
try {
Transformer t = XmlUtils.getTransformer( false, false, 0, true );
t.transform( new DOMSource( node ), new StreamResult( writer ) );
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/xml/XmlRewriteRulesDigester.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/xml/XmlRewriteRulesDigester.java b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/xml/XmlRewriteRulesDigester.java
index 7f3580c..e6cd4cc 100644
--- a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/xml/XmlRewriteRulesDigester.java
+++ b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/xml/XmlRewriteRulesDigester.java
@@ -220,8 +220,7 @@ public class XmlRewriteRulesDigester extends AbstractRulesModule implements XmlR
// }
// }
- private static abstract class FactoryRule extends Rule {
-
+ private abstract static class FactoryRule extends Rule {
protected abstract Object create( String namespace, String name, Attributes attributes );
@Override
@@ -233,7 +232,5 @@ public class XmlRewriteRulesDigester extends AbstractRulesModule implements XmlR
public void end( String namespace, String name ) throws Exception {
getDigester().pop();
}
-
}
-
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/xml/XmlRewriteRulesTags.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/xml/XmlRewriteRulesTags.java b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/xml/XmlRewriteRulesTags.java
index 2735d83..9d152cf 100644
--- a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/xml/XmlRewriteRulesTags.java
+++ b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/xml/XmlRewriteRulesTags.java
@@ -36,23 +36,14 @@ package org.apache.knox.gateway.filter.rewrite.impl.xml;
* </pre>
*/
public interface XmlRewriteRulesTags {
+ String ROOT = "rules";
+ String FUNCTIONS = "functions";
+ String RULE = "rule";
- static final String ROOT = "rules";
-
- static final String FUNCTIONS = "functions";
-
- static final String RULE = "rule";
-
-// static final String MATCH = "match";
-// static final String CHECK = "check";
-// static final String CONTROL = "control";
-// static final String ACTION = "action";
-
- static final String FILTER = "filter";
- static final String CONTENT = "content";
- static final String SCOPE = "scope";
- static final String BUFFER = "buffer";
- static final String DETECT = "detect";
- static final String APPLY = "apply";
-
+ String FILTER = "filter";
+ String CONTENT = "content";
+ String SCOPE = "scope";
+ String BUFFER = "buffer";
+ String DETECT = "detect";
+ String APPLY = "apply";
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/xml/XmlUrlRewriteRulesExporter.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/xml/XmlUrlRewriteRulesExporter.java b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/xml/XmlUrlRewriteRulesExporter.java
index 89536f7..d6f6453 100644
--- a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/xml/XmlUrlRewriteRulesExporter.java
+++ b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/xml/XmlUrlRewriteRulesExporter.java
@@ -52,7 +52,7 @@ import java.lang.reflect.InvocationTargetException;
public class XmlUrlRewriteRulesExporter implements UrlRewriteRulesExporter, XmlRewriteRulesTags {
private static final UrlRewriteMessages LOG = MessagesFactory.get( UrlRewriteMessages.class );
-
+
@Override
public String getFormat() {
return "xml";
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteProcessorTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteProcessorTest.java b/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteProcessorTest.java
index b7f56fa..5728cb6 100644
--- a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteProcessorTest.java
+++ b/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteProcessorTest.java
@@ -393,11 +393,11 @@ public class UrlRewriteProcessorTest {
/**
* Turn a string containing URL parameters, e.g.
- *
+ *
* <pre>
* a=b&c=d&e=f
* </pre>
- *
+ *
* into a map such as
* <table>
* <tr>
@@ -413,7 +413,7 @@ public class UrlRewriteProcessorTest {
* <td>d</td>
* </tr>
* </table>
- *
+ *
* @param urlParameters the URL parameter string. Expected to contain something of the form
* "a=b&c=d" etc (i.e. Key=Value separated by &).
* @return a map, with the key-values pairs representing the URL parameters.
@@ -426,6 +426,4 @@ public class UrlRewriteProcessorTest {
}
return map;
}
-
-
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteServletFilterTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteServletFilterTest.java b/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteServletFilterTest.java
index ab2a9fc..0a25a3a 100644
--- a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteServletFilterTest.java
+++ b/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteServletFilterTest.java
@@ -919,7 +919,7 @@ public class UrlRewriteServletFilterTest {
assertThat(content, is(expectedCustomHeader));
}
-
+
/*
* See KNOX-791
*/
@@ -958,7 +958,6 @@ public class UrlRewriteServletFilterTest {
String content = response.getContent();
assertThat(content, is(rewrittenResponseHtml));
}
-
private static class SetupFilter implements Filter {
@Override
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/FrontendFunctionProcessorTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/FrontendFunctionProcessorTest.java b/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/FrontendFunctionProcessorTest.java
index a0791fb..65b75bf 100644
--- a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/FrontendFunctionProcessorTest.java
+++ b/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/FrontendFunctionProcessorTest.java
@@ -158,7 +158,7 @@ public class FrontendFunctionProcessorTest {
}
}
rewriteFilter.setFilter( new UrlRewriteServletFilter() );
-
+
interactions = new ArrayDeque<>();
ServletHolder servlet = server.addServlet( MockServlet.class, "/" );
@@ -258,7 +258,7 @@ public class FrontendFunctionProcessorTest {
private static class SetupFilter implements Filter {
private Subject subject;
- public SetupFilter( String userName ) {
+ SetupFilter( String userName ) {
subject = new Subject();
subject.getPrincipals().add( new BasicUserPrincipal( userName ) );
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/html/HtmlFilterReaderBaseTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/html/HtmlFilterReaderBaseTest.java b/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/html/HtmlFilterReaderBaseTest.java
index 18ed7c1..e611b9b 100644
--- a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/html/HtmlFilterReaderBaseTest.java
+++ b/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/html/HtmlFilterReaderBaseTest.java
@@ -718,22 +718,22 @@ public class HtmlFilterReaderBaseTest {
assertThat( step.flow(), is( UrlRewriteStepFlow.OR ) );
}
}
-
+
@Test
public void testTagNameLetterCase() throws Exception {
String inputXml = "<Root/>";
StringReader inputReader = new StringReader( inputXml );
-
+
HtmlFilterReaderBase filterReader = new NoopXmlFilterReader( inputReader );
String outputXml = new String( IOUtils.toCharArray( filterReader ) );
assertThat( the( outputXml ), hasXPath( "/Root" ) );
}
-
+
@Test
public void testXmlWithHtmlTagNames() throws Exception {
String inputXml = "<root><br><table name=\"table1\"></table><table name=\"table2\"></table></br></root>";
StringReader inputReader = new StringReader( inputXml );
-
+
HtmlFilterReaderBase filterReader = new NoopXmlFilterReader( inputReader );
String outputXml = new String( IOUtils.toCharArray( filterReader ) );
assertThat( the( outputXml ), hasXPath( "/root/br/table[1]/@name", equalTo( "table1" ) ) );
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-provider-security-authz-acls/src/main/java/org/apache/knox/gateway/deploy/impl/AclsAuthzDeploymentContributor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-security-authz-acls/src/main/java/org/apache/knox/gateway/deploy/impl/AclsAuthzDeploymentContributor.java b/gateway-provider-security-authz-acls/src/main/java/org/apache/knox/gateway/deploy/impl/AclsAuthzDeploymentContributor.java
index 13f9968..fa095fe 100644
--- a/gateway-provider-security-authz-acls/src/main/java/org/apache/knox/gateway/deploy/impl/AclsAuthzDeploymentContributor.java
+++ b/gateway-provider-security-authz-acls/src/main/java/org/apache/knox/gateway/deploy/impl/AclsAuthzDeploymentContributor.java
@@ -54,14 +54,14 @@ public class AclsAuthzDeploymentContributor extends ProviderDeploymentContributo
}
@Override
- public void contributeFilter( DeploymentContext context, Provider provider, Service service,
+ public void contributeFilter( DeploymentContext context, Provider provider, Service service,
ResourceDescriptor resource, List<FilterParamDescriptor> params ) {
if (params == null) {
params = new ArrayList<>();
}
// add resource role to params so that we can determine the acls to enforce at runtime
params.add( resource.createFilterParam().name( "resource.role" ).value(resource.role() ) );
-
+
// the following are used within the AclsAuthz provider to replace
// placeholders within the acls KNOX_ADMIN_GROUPS and KNOX_ADMIN_USERS
String adminGroups = context.getGatewayConfig().getKnoxAdminGroups();
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-provider-security-authz-acls/src/main/java/org/apache/knox/gateway/filter/AclParser.java
----------------------------------------------------------------------
diff --git a/gateway-provider-security-authz-acls/src/main/java/org/apache/knox/gateway/filter/AclParser.java b/gateway-provider-security-authz-acls/src/main/java/org/apache/knox/gateway/filter/AclParser.java
index d82f88d..603dfe8 100644
--- a/gateway-provider-security-authz-acls/src/main/java/org/apache/knox/gateway/filter/AclParser.java
+++ b/gateway-provider-security-authz-acls/src/main/java/org/apache/knox/gateway/filter/AclParser.java
@@ -38,7 +38,7 @@ public class AclParser {
groups = new ArrayList<>();
ipv = new IpAddressValidator(null);
}
-
+
public void parseAcls(String resourceRole, String acls) throws InvalidACLException {
if (acls != null) {
String[] parts = acls.split(";");
@@ -49,7 +49,7 @@ public class AclParser {
log.aclsFoundForResource(resourceRole);
}
parseUserAcls(parts);
-
+
parseGroupAcls(parts);
parseIpAddressAcls(parts);
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/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 4813c06..6701198 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
@@ -56,14 +56,13 @@ public class AclsAuthorizationFilter implements Filter {
private ArrayList<String> adminGroups = new ArrayList<>();;
private ArrayList<String> adminUsers = new ArrayList<>();;
-
@Override
public void init(FilterConfig filterConfig) throws ServletException {
String adminGroups = filterConfig.getInitParameter("knox.admin.groups");
if (adminGroups != null) {
parseAdminGroupConfig(adminGroups);
}
-
+
String adminUsers = filterConfig.getInitParameter("knox.admin.users");
if (adminUsers != null) {
parseAdminUserConfig(adminUsers);
@@ -118,8 +117,8 @@ public class AclsAuthorizationFilter implements Filter {
protected boolean enforceAclAuthorizationPolicy(ServletRequest request,
ServletResponse response, FilterChain chain) {
HttpServletRequest req = (HttpServletRequest) request;
-
- // before enforcing acls check whether there are no acls defined
+
+ // before enforcing acls check whether there are no acls defined
// which would mean that there are no restrictions
if (parser.users.size() == 0 && parser.groups.size() == 0 && parser.ipv.getIPAddresses().size() == 0) {
return true;
@@ -128,7 +127,7 @@ public class AclsAuthorizationFilter implements Filter {
boolean userAccess = false;
boolean groupAccess = false;
boolean ipAddrAccess = false;
-
+
Subject subject = Subject.getSubject(AccessController.getContext());
Principal primaryPrincipal = (Principal)subject.getPrincipals(PrimaryPrincipal.class).toArray()[0];
log.primaryPrincipal(primaryPrincipal.getName());
@@ -160,7 +159,7 @@ public class AclsAuthorizationFilter implements Filter {
log.remoteIPAddress(req.getRemoteAddr());
ipAddrAccess = checkRemoteIpAcls(req.getRemoteAddr());
log.remoteIPAddressHasAccess(ipAddrAccess);
-
+
if ("OR".equals(aclProcessingMode)) {
// need to interpret '*' as excluded for OR semantics
// to make sense and not grant access to everyone by mistake.
@@ -169,7 +168,7 @@ public class AclsAuthorizationFilter implements Filter {
if (parser.anyUser) userAccess = false;
if (parser.anyGroup) groupAccess = false;
if (parser.ipv.allowsAnyIP()) ipAddrAccess = false;
-
+
return (userAccess || groupAccess || ipAddrAccess);
}
else if ("AND".equals(aclProcessingMode)) {
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-provider-security-authz-acls/src/test/java/org/apache/knox/gateway/filter/AclParserTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-security-authz-acls/src/test/java/org/apache/knox/gateway/filter/AclParserTest.java b/gateway-provider-security-authz-acls/src/test/java/org/apache/knox/gateway/filter/AclParserTest.java
index f8f738c..113b499 100644
--- a/gateway-provider-security-authz-acls/src/test/java/org/apache/knox/gateway/filter/AclParserTest.java
+++ b/gateway-provider-security-authz-acls/src/test/java/org/apache/knox/gateway/filter/AclParserTest.java
@@ -89,7 +89,6 @@ public class AclParserTest {
assertFalse(p.ipv.allowsAnyIP());
assertTrue(p.ipv.getIPAddresses().contains("127.0.0.1"));
}
-
@Test
public void testValidMultiValuedAcls() throws Exception {
@@ -130,10 +129,10 @@ public class AclParserTest {
assertFalse(p.ipv.allowsAnyIP());
assertTrue(p.ipv.getIPAddresses().contains("127.0.0.1"));
assertTrue(p.ipv.getIPAddresses().contains("127.0.0.2"));
- assertFalse(p.ipv.getIPAddresses().contains("127.0.0.3"));
+ assertFalse(p.ipv.getIPAddresses().contains("127.0.0.3"));
}
-
- @Test
+
+ @Test
public void testNullACL() throws Exception {
AclParser p = new AclParser();
try {
@@ -144,7 +143,7 @@ public class AclParserTest {
fail("NULL acl should NOT have thrown InvalidACLException.");
}
}
-
+
@Test
public void testInvalidAcls() throws Exception {
AclParser p = new AclParser();
@@ -164,7 +163,7 @@ public class AclParserTest {
catch (InvalidACLException sle) {
// expected
}
-
+
p = new AclParser();
try {
p.parseAcls("test", ";;");
[08/10] knox git commit: KNOX-1663 - Enforce more Checkstyle rules
Posted by kr...@apache.org.
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/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 eba7877..4d1258a 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
@@ -44,7 +44,7 @@ import org.junit.Test;
public class AclsAuthzFilterTest {
private boolean accessGranted = false;
private Filter filter = null;
-
+
@Before
public void setup() {
filter = new AclsAuthorizationFilter() {
@@ -57,7 +57,7 @@ public class AclsAuthzFilterTest {
chain.doFilter(request, response);
}
}
-
+
@Override
protected boolean enforceAclAuthorizationPolicy(ServletRequest request,
ServletResponse response, FilterChain chain) {
@@ -66,7 +66,7 @@ public class AclsAuthzFilterTest {
}
};
}
-
+
@Test
public void testKnoxAdminGroupsValid() throws ServletException, IOException,
URISyntaxException {
@@ -91,9 +91,9 @@ public class AclsAuthzFilterTest {
throws IOException, ServletException {
}
};
-
+
filter.init(config);
-
+
Subject subject = new Subject();
subject.getPrincipals().add(new PrimaryPrincipal("larry"));
subject.getPrincipals().add(new GroupPrincipal("users"));
@@ -148,9 +148,9 @@ public class AclsAuthzFilterTest {
throws IOException, ServletException {
}
};
-
+
filter.init(config);
-
+
Subject subject = new Subject();
subject.getPrincipals().add(new PrimaryPrincipal("larry"));
subject.getPrincipals().add(new GroupPrincipal("users"));
@@ -180,7 +180,7 @@ public class AclsAuthzFilterTest {
}
assertFalse(accessGranted);
}
-
+
@Test
public void testKnoxAdminUsersValid() throws ServletException, IOException,
URISyntaxException {
@@ -205,9 +205,9 @@ public class AclsAuthzFilterTest {
throws IOException, ServletException {
}
};
-
+
filter.init(config);
-
+
Subject subject = new Subject();
subject.getPrincipals().add(new PrimaryPrincipal("adminuser"));
subject.getPrincipals().add(new GroupPrincipal("users"));
@@ -262,9 +262,9 @@ public class AclsAuthzFilterTest {
throws IOException, ServletException {
}
};
-
+
filter.init(config);
-
+
Subject subject = new Subject();
subject.getPrincipals().add(new PrimaryPrincipal("larry"));
subject.getPrincipals().add(new GroupPrincipal("users"));
@@ -294,7 +294,7 @@ public class AclsAuthzFilterTest {
}
assertFalse(accessGranted);
}
-
+
@Test
public void testKnoxAdminUsersInvalidButACLUsersValid() throws ServletException, IOException,
URISyntaxException {
@@ -319,9 +319,9 @@ public class AclsAuthzFilterTest {
throws IOException, ServletException {
}
};
-
+
filter.init(config);
-
+
Subject subject = new Subject();
subject.getPrincipals().add(new PrimaryPrincipal("larry"));
subject.getPrincipals().add(new GroupPrincipal("users"));
@@ -376,9 +376,9 @@ public class AclsAuthzFilterTest {
throws IOException, ServletException {
}
};
-
+
filter.init(config);
-
+
Subject subject = new Subject();
subject.getPrincipals().add(new PrimaryPrincipal("larry"));
subject.getPrincipals().add(new GroupPrincipal("users"));
@@ -433,9 +433,9 @@ public class AclsAuthzFilterTest {
throws IOException, ServletException {
}
};
-
+
filter.init(config);
-
+
Subject subject = new Subject();
subject.getPrincipals().add(new PrimaryPrincipal("larry"));
subject.getPrincipals().add(new GroupPrincipal("users"));
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-provider-security-hadoopauth/src/main/java/org/apache/knox/gateway/hadoopauth/HadoopAuthMessages.java
----------------------------------------------------------------------
diff --git a/gateway-provider-security-hadoopauth/src/main/java/org/apache/knox/gateway/hadoopauth/HadoopAuthMessages.java b/gateway-provider-security-hadoopauth/src/main/java/org/apache/knox/gateway/hadoopauth/HadoopAuthMessages.java
index 859e901..333bf4a 100755
--- a/gateway-provider-security-hadoopauth/src/main/java/org/apache/knox/gateway/hadoopauth/HadoopAuthMessages.java
+++ b/gateway-provider-security-hadoopauth/src/main/java/org/apache/knox/gateway/hadoopauth/HadoopAuthMessages.java
@@ -24,7 +24,6 @@ import org.apache.knox.gateway.i18n.messages.StackTrace;
@Messages(logger="org.apache.knox.gateway.provider.global.hadoopauth")
public interface HadoopAuthMessages {
-
@Message( level = MessageLevel.DEBUG, text = "Hadoop Authentication Asserted Principal: {0}" )
void hadoopAuthAssertedPrincipal(String name);
@@ -33,5 +32,4 @@ public interface HadoopAuthMessages {
@Message( level = MessageLevel.ERROR, text = "Unable to get password for {0}: {1}" )
void unableToGetPassword(String name, @StackTrace( level = MessageLevel.DEBUG ) Exception e);
-
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-provider-security-hadoopauth/src/main/java/org/apache/knox/gateway/hadoopauth/filter/HadoopAuthFilter.java
----------------------------------------------------------------------
diff --git a/gateway-provider-security-hadoopauth/src/main/java/org/apache/knox/gateway/hadoopauth/filter/HadoopAuthFilter.java b/gateway-provider-security-hadoopauth/src/main/java/org/apache/knox/gateway/hadoopauth/filter/HadoopAuthFilter.java
index 44cafbc..a81855b 100755
--- a/gateway-provider-security-hadoopauth/src/main/java/org/apache/knox/gateway/hadoopauth/filter/HadoopAuthFilter.java
+++ b/gateway-provider-security-hadoopauth/src/main/java/org/apache/knox/gateway/hadoopauth/filter/HadoopAuthFilter.java
@@ -42,9 +42,9 @@ import javax.servlet.ServletException;
* hadoop.auth.config.kerberos.keytab=/etc/knox/conf/knox.service.keytab (default: null)
*/
-public class HadoopAuthFilter extends
+public class HadoopAuthFilter extends
org.apache.hadoop.security.authentication.server.AuthenticationFilter {
-
+
@Override
protected Properties getConfiguration(String configPrefix, FilterConfig filterConfig) throws ServletException {
Properties props = new Properties();
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/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 30d0e40..1913c54 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
@@ -58,7 +58,7 @@ public class HadoopAuthPostFilter implements Filter {
@Override
public void destroy() {
}
-
+
@Override
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
throws IOException, ServletException {
@@ -72,38 +72,33 @@ public class HadoopAuthPostFilter implements Filter {
String sourceUri = (String)request.getAttribute( AbstractGatewayFilter.SOURCE_REQUEST_CONTEXT_URL_ATTRIBUTE_NAME );
auditor.audit( Action.AUTHENTICATION , sourceUri, ResourceType.URI, ActionOutcome.SUCCESS );
doAs(httpRequest, response, chain, subject);
- }
- else {
+ } else {
((HttpServletResponse)response).sendError(HttpServletResponse.SC_FORBIDDEN, "User not authenticated");
}
}
private void doAs(final ServletRequest request, final ServletResponse response, final FilterChain chain, Subject subject)
throws IOException, ServletException {
- try {
- Subject.doAs(
- subject,
- new PrivilegedExceptionAction<Object>() {
- @Override
- public Object run() throws Exception {
- chain.doFilter(request, response);
- return null;
- }
+ try {
+ Subject.doAs(
+ subject,
+ new PrivilegedExceptionAction<Object>() {
+ @Override
+ public Object run() throws Exception {
+ chain.doFilter(request, response);
+ return null;
}
- );
- }
- catch (PrivilegedActionException e) {
- Throwable t = e.getCause();
- if (t instanceof IOException) {
- throw (IOException) t;
- }
- else if (t instanceof ServletException) {
- throw (ServletException) t;
- }
- else {
- throw new ServletException(t);
- }
+ }
+ );
+ } catch (PrivilegedActionException e) {
+ Throwable t = e.getCause();
+ if (t instanceof IOException) {
+ throw (IOException) t;
+ } else if (t instanceof ServletException) {
+ throw (ServletException) t;
+ } else {
+ throw new ServletException(t);
}
}
-
+ }
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-provider-security-hadoopauth/src/test/java/org/apache/knox/gateway/hadoopauth/HadoopAuthDeploymentContributorTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-security-hadoopauth/src/test/java/org/apache/knox/gateway/hadoopauth/HadoopAuthDeploymentContributorTest.java b/gateway-provider-security-hadoopauth/src/test/java/org/apache/knox/gateway/hadoopauth/HadoopAuthDeploymentContributorTest.java
index 7306172..b795433 100644
--- a/gateway-provider-security-hadoopauth/src/test/java/org/apache/knox/gateway/hadoopauth/HadoopAuthDeploymentContributorTest.java
+++ b/gateway-provider-security-hadoopauth/src/test/java/org/apache/knox/gateway/hadoopauth/HadoopAuthDeploymentContributorTest.java
@@ -93,7 +93,7 @@ public class HadoopAuthDeploymentContributorTest {
GatewayDescriptor gatewayDescriptor = new GatewayDescriptorImpl();
ResourceDescriptor resource = gatewayDescriptor.createResource();
-
+
AliasService as = EasyMock.createNiceMock( AliasService.class );
EasyMock.expect(as.getAliasesForCluster(context.getTopology().getName()))
.andReturn(Collections.singletonList(aliasKey)).anyTimes();
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/deploy/JWTAccessTokenAssertionContributor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/deploy/JWTAccessTokenAssertionContributor.java b/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/deploy/JWTAccessTokenAssertionContributor.java
index 946446e..0a35064 100644
--- a/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/deploy/JWTAccessTokenAssertionContributor.java
+++ b/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/deploy/JWTAccessTokenAssertionContributor.java
@@ -55,7 +55,7 @@ public class JWTAccessTokenAssertionContributor extends
ResourceDescriptor resource, List<FilterParamDescriptor> params) {
resource.addFilter().name( getName() ).role( getRole() ).impl( FILTER_CLASSNAME ).params( params );
}
-
+
public void setCryptoService(CryptoService crypto) {
this.crypto = crypto;
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/deploy/SSOCookieFederationContributor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/deploy/SSOCookieFederationContributor.java b/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/deploy/SSOCookieFederationContributor.java
index ba19d64..5f934a6 100644
--- a/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/deploy/SSOCookieFederationContributor.java
+++ b/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/deploy/SSOCookieFederationContributor.java
@@ -62,7 +62,7 @@ public class SSOCookieFederationContributor extends
// add the gatewaypath to the filter params in case a provider URL needs to be derived
String path = context.getGatewayConfig().getGatewayPath();
params.add( resource.createFilterParam().name("gateway.path").value(path));
-
+
resource.addFilter().name( getName() ).role( getRole() ).impl( FILTER_CLASSNAME ).params( params );
}
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/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 fb413bf..3636f3a 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
@@ -46,9 +46,9 @@ import java.util.Set;
public class AccessTokenFederationFilter implements Filter {
private static JWTMessages log = MessagesFactory.get( JWTMessages.class );
private static final String BEARER = "Bearer ";
-
+
private JWTokenAuthority authority;
-
+
@Override
public void init( FilterConfig filterConfig ) throws ServletException {
GatewayServices services = (GatewayServices) filterConfig.getServletContext().getAttribute(GatewayServices.GATEWAY_SERVICES_ATTRIBUTE);
@@ -115,7 +115,7 @@ public class AccessTokenFederationFilter implements Filter {
((HttpServletResponse) response).sendError(HttpServletResponse.SC_UNAUTHORIZED);
return;
}
-
+
private void continueWithEstablishedSecurityContext(Subject subject, final HttpServletRequest request, final HttpServletResponse response, final FilterChain chain) throws IOException, ServletException {
try {
Subject.doAs(
@@ -142,7 +142,7 @@ public class AccessTokenFederationFilter implements Filter {
}
}
}
-
+
private Subject createSubjectFromToken(JWTToken token) {
final String principal = token.getPrincipal();
@@ -150,16 +150,15 @@ public class AccessTokenFederationFilter implements Filter {
Set<Principal> principals = new HashSet<>();
Principal p = new PrimaryPrincipal(principal);
principals.add(p);
-
-// The newly constructed Sets check whether this Subject has been set read-only
-// before permitting subsequent modifications. The newly created Sets also prevent
-// illegal modifications by ensuring that callers have sufficient permissions.
-//
-// To modify the Principals Set, the caller must have AuthPermission("modifyPrincipals").
-// To modify the public credential Set, the caller must have AuthPermission("modifyPublicCredentials").
-// To modify the private credential Set, the caller must have AuthPermission("modifyPrivateCredentials").
- javax.security.auth.Subject subject = new javax.security.auth.Subject(true, principals, emptySet, emptySet);
- return subject;
+
+ // The newly constructed Sets check whether this Subject has been set read-only
+ // before permitting subsequent modifications. The newly created Sets also prevent
+ // illegal modifications by ensuring that callers have sufficient permissions.
+ //
+ // To modify the Principals Set, the caller must have AuthPermission("modifyPrincipals").
+ // To modify the public credential Set, the caller must have AuthPermission("modifyPublicCredentials").
+ // To modify the private credential Set, the caller must have AuthPermission("modifyPrivateCredentials").
+ return new javax.security.auth.Subject(true, principals, emptySet, emptySet);
}
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/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 c52cf57..05743ee 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
@@ -211,13 +211,13 @@ private String gatewayPath;
host = request.getHeader(X_FORWARDED_HOST);
port = Integer.parseInt(request.getHeader(X_FORWARDED_PORT));
}
- StringBuffer sb = new StringBuffer(scheme);
+ StringBuilder sb = new StringBuilder(scheme);
sb.append("://").append(host);
if (!host.contains(":")) {
sb.append(":").append(port);
}
sb.append("/").append(gatewayPath).append("/knoxsso/api/v1/websso");
-
+
return sb.toString();
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/Pac4jMessages.java
----------------------------------------------------------------------
diff --git a/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/Pac4jMessages.java b/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/Pac4jMessages.java
index 7323a6d..56840c0 100644
--- a/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/Pac4jMessages.java
+++ b/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/Pac4jMessages.java
@@ -30,21 +30,21 @@ import org.apache.knox.gateway.i18n.messages.Messages;
public interface Pac4jMessages {
@Message( level = MessageLevel.ERROR, text = "pac4j callback URL required")
- public void ssoAuthenticationProviderUrlRequired();
+ void ssoAuthenticationProviderUrlRequired();
@Message( level = MessageLevel.ERROR, text = "pac4j clientName parameter required")
- public void clientNameParameterRequired();
+ void clientNameParameterRequired();
@Message( level = MessageLevel.ERROR, text = "At least one pac4j client must be defined")
- public void atLeastOnePac4jClientMustBeDefined();
+ void atLeastOnePac4jClientMustBeDefined();
@Message( level = MessageLevel.ERROR, text = "Crypto service, alias service and cluster name required")
- public void cryptoServiceAndAliasServiceAndClusterNameRequired();
+ void cryptoServiceAndAliasServiceAndClusterNameRequired();
@Message( level = MessageLevel.ERROR, text = "Unable to generate a password for encryption")
- public void unableToGenerateAPasswordForEncryption(Exception e);
+ void unableToGenerateAPasswordForEncryption(Exception e);
- @Message( level = MessageLevel.INFO, text =
+ @Message( level = MessageLevel.INFO, text =
"No private key passphrase alias found. Defaulting to master. Exception encountered: {0}")
- public void noPrivateKeyPasshraseProvisioned(Exception e);
+ void noPrivateKeyPasshraseProvisioned(Exception e);
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/deploy/Pac4jFederationProviderContributor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/deploy/Pac4jFederationProviderContributor.java b/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/deploy/Pac4jFederationProviderContributor.java
index 74baad3..7820423 100644
--- a/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/deploy/Pac4jFederationProviderContributor.java
+++ b/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/deploy/Pac4jFederationProviderContributor.java
@@ -51,7 +51,7 @@ public class Pac4jFederationProviderContributor extends
public String getName() {
return NAME;
}
-
+
@Override
public void initializeContribution(DeploymentContext context) {
super.initializeContribution(context);
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/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 d14675f..c1f4cb0 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
@@ -153,12 +153,10 @@ public class KnoxSessionStore implements SessionStore {
* @since 1.1.0
*/
private static byte[] compress(final byte[] data) throws IOException {
-
- try (final ByteArrayOutputStream byteStream = new ByteArrayOutputStream(
- data.length);
- final GZIPOutputStream gzip = new GZIPOutputStream(byteStream)) {
- gzip.write(data);
- gzip.close();
+ try (ByteArrayOutputStream byteStream = new ByteArrayOutputStream(data.length)) {
+ try(GZIPOutputStream gzip = new GZIPOutputStream(byteStream)) {
+ gzip.write(data);
+ }
return byteStream.toByteArray();
}
}
@@ -172,15 +170,12 @@ public class KnoxSessionStore implements SessionStore {
* @since 1.1.0
*/
private static byte[] unCompress(final byte[] data) throws IOException {
-
- try (final ByteArrayInputStream inputStream = new ByteArrayInputStream(
- data);
- final GZIPInputStream gzip = new GZIPInputStream(inputStream)) {
+ try (ByteArrayInputStream inputStream = new ByteArrayInputStream(data);
+ GZIPInputStream gzip = new GZIPInputStream(inputStream)) {
return IOUtils.toByteArray(gzip);
}
}
-
@Override
public SessionStore buildFromTrackableSession(WebContext arg0, Object arg1) {
return null;
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/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 8990d7d..c6d1389 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
@@ -53,9 +53,6 @@ public abstract class AbstractPreAuthFederationFilter implements Filter {
AuditConstants.DEFAULT_AUDITOR_NAME, AuditConstants.KNOX_SERVICE_NAME,
AuditConstants.KNOX_COMPONENT_NAME );
- /**
- *
- */
public AbstractPreAuthFederationFilter() {
super();
}
@@ -85,13 +82,11 @@ public abstract class AbstractPreAuthFederationFilter implements Filter {
String sourceUri = (String)request.getAttribute( AbstractGatewayFilter.SOURCE_REQUEST_CONTEXT_URL_ATTRIBUTE_NAME );
auditor.audit( Action.AUTHENTICATION , sourceUri, ResourceType.URI, ActionOutcome.SUCCESS );
doAs(httpRequest, response, chain, subject);
- }
- else {
+ } else {
// TODO: log preauthenticated SSO validation failure
((HttpServletResponse)response).sendError(HttpServletResponse.SC_FORBIDDEN, "SSO Validation Failure.");
}
- }
- else {
+ } else {
((HttpServletResponse)response).sendError(HttpServletResponse.SC_FORBIDDEN, "Missing Required Header for PreAuth SSO Federation");
}
}
@@ -128,7 +123,7 @@ public abstract class AbstractPreAuthFederationFilter implements Filter {
}
}
- abstract protected String getPrimaryPrincipal(HttpServletRequest httpRequest);
+ protected abstract String getPrimaryPrincipal(HttpServletRequest httpRequest);
- abstract protected void addGroupPrincipals(HttpServletRequest request, Set<Principal> principals);
+ protected abstract void addGroupPrincipals(HttpServletRequest request, Set<Principal> principals);
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/filter/HeaderPreAuthFederationFilter.java
----------------------------------------------------------------------
diff --git a/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/filter/HeaderPreAuthFederationFilter.java b/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/filter/HeaderPreAuthFederationFilter.java
index 2d92192..15bc657 100644
--- a/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/filter/HeaderPreAuthFederationFilter.java
+++ b/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/filter/HeaderPreAuthFederationFilter.java
@@ -31,7 +31,7 @@ public class HeaderPreAuthFederationFilter extends AbstractPreAuthFederationFilt
static final String CUSTOM_GROUP_HEADER_PARAM = "preauth.custom.group.header";
String headerName = "SM_USER";
String groupHeaderName = null;
-
+
@Override
public void init(FilterConfig filterConfig) throws ServletException {
super.init(filterConfig);
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/filter/PreAuthValidator.java
----------------------------------------------------------------------
diff --git a/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/filter/PreAuthValidator.java b/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/filter/PreAuthValidator.java
index 6900d12..beb9e19 100644
--- a/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/filter/PreAuthValidator.java
+++ b/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/filter/PreAuthValidator.java
@@ -21,7 +21,7 @@ import javax.servlet.FilterConfig;
import javax.servlet.http.HttpServletRequest;
public interface PreAuthValidator {
- public abstract boolean validate(HttpServletRequest httpRequest, FilterConfig filterConfig) throws
+ boolean validate(HttpServletRequest httpRequest, FilterConfig filterConfig) throws
PreAuthValidationException;
/**
@@ -29,5 +29,5 @@ public interface PreAuthValidator {
*
* @return name of validator
*/
- public abstract String getName();
+ String getName();
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-provider-security-preauth/src/test/java/org/apache/knox/gateway/provider/federation/IPValidatorTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-security-preauth/src/test/java/org/apache/knox/gateway/provider/federation/IPValidatorTest.java b/gateway-provider-security-preauth/src/test/java/org/apache/knox/gateway/provider/federation/IPValidatorTest.java
index 1587be8..131ba9c 100644
--- a/gateway-provider-security-preauth/src/test/java/org/apache/knox/gateway/provider/federation/IPValidatorTest.java
+++ b/gateway-provider-security-preauth/src/test/java/org/apache/knox/gateway/provider/federation/IPValidatorTest.java
@@ -37,7 +37,7 @@ public class IPValidatorTest extends org.junit.Assert {
@Test
public void testIPAddressPositive() throws PreAuthValidationException {
IPValidator ipv = new IPValidator();
-
+
final FilterConfig filterConfig = EasyMock.createMock(FilterConfig.class);
EasyMock.expect(filterConfig.getInitParameter(IPValidator.IP_ADDRESSES_PARAM)).andReturn("5.4.3.2,10.1.23.42");
EasyMock.replay(filterConfig);
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/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 98c2ebf..638b89b 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
@@ -24,9 +24,9 @@ import java.util.Map;
import java.util.Map.Entry;
public class ShiroConfig {
-
+
private Map<String, Map<String, String>> sections = new LinkedHashMap<>();
-
+
public ShiroConfig(Provider provider, String clusterName) {
Map<String, String> params = provider.getParams();
String name = null;
@@ -57,7 +57,7 @@ public class ShiroConfig {
}
section.put(name, value);
}
-
+
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/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 39fdbf8..017f56b 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
@@ -52,7 +52,7 @@ public class ResponseCookieFilter extends AbstractGatewayFilter {
// inner class wraps response to prevent adding of not allowed headers
private static class ResponseWrapper extends HttpServletResponseWrapper {
- public ResponseWrapper( HttpServletResponse response ) {
+ ResponseWrapper( HttpServletResponse response ) {
super( response );
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/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 94211c4..6da6170 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
@@ -44,13 +44,11 @@ import org.apache.shiro.SecurityUtils;
import org.apache.shiro.subject.Subject;
public class ShiroSubjectIdentityAdapter implements Filter {
-
private static final String SUBJECT_USER_GROUPS = "subject.userGroups";
private static AuditService auditService = AuditServiceFactory.getAuditService();
private static Auditor auditor = auditService.getAuditor(
AuditConstants.DEFAULT_AUDITOR_NAME, AuditConstants.KNOX_SERVICE_NAME,
AuditConstants.KNOX_COMPONENT_NAME );
-
@Override
public void init( FilterConfig filterConfig ) throws ServletException {
@@ -63,9 +61,8 @@ public class ShiroSubjectIdentityAdapter implements Filter {
@Override
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
throws IOException, ServletException {
-
Subject subject = SecurityUtils.getSubject();
-
+
// trigger call to shiro authorization realm
// we use shiro authorization realm to look up groups
subject.hasRole("authenticatedUser");
@@ -73,12 +70,12 @@ public class ShiroSubjectIdentityAdapter implements Filter {
CallableChain callableChain = new CallableChain(request, response, chain);
SecurityUtils.getSubject().execute(callableChain);
}
-
+
private static class CallableChain implements Callable<Void> {
private FilterChain chain = null;
ServletRequest request = null;
ServletResponse response = null;
-
+
CallableChain(ServletRequest request, ServletResponse response, FilterChain chain) {
this.request = request;
this.response = response;
@@ -114,7 +111,7 @@ public class ShiroSubjectIdentityAdapter implements Filter {
if (SecurityUtils.getSubject().getSession().getAttribute(SUBJECT_USER_GROUPS) != null) {
userGroups = (Set<String>)SecurityUtils.getSubject().getSession().getAttribute(SUBJECT_USER_GROUPS);
} else { // KnoxLdapRealm case
- if( shiroSubject.getPrincipal() instanceof String ) {
+ if( shiroSubject.getPrincipal() instanceof String ) {
userGroups = new HashSet<>(shiroSubject.getPrincipals().asSet());
userGroups.remove(principal);
} else { // KnoxPamRealm case
@@ -133,20 +130,18 @@ public class ShiroSubjectIdentityAdapter implements Filter {
principals.add(gp);
}
auditor.audit( Action.AUTHENTICATION , sourceUri, ResourceType.URI, ActionOutcome.SUCCESS, "Groups: " + userGroups );
-
-// The newly constructed Sets check whether this Subject has been set read-only
-// before permitting subsequent modifications. The newly created Sets also prevent
-// illegal modifications by ensuring that callers have sufficient permissions.
-//
-// To modify the Principals Set, the caller must have AuthPermission("modifyPrincipals").
-// To modify the public credential Set, the caller must have AuthPermission("modifyPublicCredentials").
-// To modify the private credential Set, the caller must have AuthPermission("modifyPrivateCredentials").
+
+ // The newly constructed Sets check whether this Subject has been set read-only
+ // before permitting subsequent modifications. The newly created Sets also prevent
+ // illegal modifications by ensuring that callers have sufficient permissions.
+ //
+ // To modify the Principals Set, the caller must have AuthPermission("modifyPrincipals").
+ // To modify the public credential Set, the caller must have AuthPermission("modifyPublicCredentials").
+ // To modify the private credential Set, the caller must have AuthPermission("modifyPrivateCredentials").
javax.security.auth.Subject subject = new javax.security.auth.Subject(true, principals, emptySet, emptySet);
javax.security.auth.Subject.doAs( subject, action );
-
+
return null;
}
-
}
-
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/shirorealm/KnoxLdapContextFactory.java
----------------------------------------------------------------------
diff --git a/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/shirorealm/KnoxLdapContextFactory.java b/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/shirorealm/KnoxLdapContextFactory.java
index 1cbc102..09f10ba 100644
--- a/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/shirorealm/KnoxLdapContextFactory.java
+++ b/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/shirorealm/KnoxLdapContextFactory.java
@@ -36,21 +36,21 @@ import org.apache.shiro.realm.ldap.JndiLdapContextFactory;
* An extension of {@link JndiLdapContextFactory} that allows a different authentication mechanism
* for system-level authentications (as used by authorization lookups, for example)
* compared to regular authentication.
- *
+ *
* <p>
* See {@link KnoxLdapRealm} for typical configuration within <tt>shiro.ini</tt>.
*/
public class KnoxLdapContextFactory extends JndiLdapContextFactory {
private static GatewayMessages LOG = MessagesFactory.get( GatewayMessages.class );
-
+
private String systemAuthenticationMechanism = "simple";
private String clusterName = "";
public KnoxLdapContextFactory() {
setAuthenticationMechanism("simple");
}
-
+
@SuppressWarnings({ "unchecked", "rawtypes" })
@Override
protected LdapContext createLdapContext(Hashtable env) throws NamingException {
@@ -63,34 +63,33 @@ public class KnoxLdapContextFactory extends JndiLdapContextFactory {
public String getSystemAuthenticationMechanism() {
return systemAuthenticationMechanism != null? systemAuthenticationMechanism: getAuthenticationMechanism();
}
-
+
public void setSystemAuthenticationMechanism(String systemAuthenticationMechanism) {
this.systemAuthenticationMechanism = systemAuthenticationMechanism;
}
-
+
@Override
public void setSystemPassword(String systemPass) {
-
if ( systemPass == null ) {
return;
}
-
+
systemPass = systemPass.trim();
if (systemPass.length() == 0) {
return;
}
-
+
if (!systemPass.startsWith("S{ALIAS=")) {
super.setSystemPassword( systemPass );
return;
}
-
+
systemPass= systemPass.substring( "S{ALIAS=".length(), systemPass.length() - 1 );
String aliasName = systemPass;
-
+
GatewayServices services = GatewayServer.getGatewayServices();
AliasService aliasService = services.getService(GatewayServices.ALIAS_SERVICE);
-
+
String clusterName = getClusterName();
//System.err.println("FACTORY systempass 30: " + systemPass);
//System.err.println("FACTORY clustername 40: " + clusterName);
@@ -111,7 +110,7 @@ public class KnoxLdapContextFactory extends JndiLdapContextFactory {
LOG.aliasValueNotFound(clusterName, aliasName);
}
}
-
+
public String getClusterName() {
return clusterName;
}
@@ -121,5 +120,4 @@ public class KnoxLdapContextFactory extends JndiLdapContextFactory {
this.clusterName = clusterName.trim();
}
}
-
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/shirorealm/KnoxLdapRealm.java
----------------------------------------------------------------------
diff --git a/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/shirorealm/KnoxLdapRealm.java b/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/shirorealm/KnoxLdapRealm.java
index 4b36e56..e1d1c34 100644
--- a/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/shirorealm/KnoxLdapRealm.java
+++ b/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/shirorealm/KnoxLdapRealm.java
@@ -80,13 +80,13 @@ import java.util.regex.Pattern;
* Implementation of {@link org.apache.shiro.realm.ldap.JndiLdapRealm} that also
* returns each user's groups.
* This implementation is heavily based on org.apache.isis.security.shiro.IsisLdapRealm.
- *
+ *
* This implementation saves looked up ldap groups in Shiro Session to make them
* easy to be looked up outside of this object
- *
+ *
* <p>
* Sample config for <tt>shiro.ini</tt>:
- *
+ *
* <pre>
* [main]
* ldapRealm=KnoxLdapRealm
@@ -114,15 +114,15 @@ import java.util.regex.Pattern;
* HKG_USERS: user_role,\
* GLOBAL_ADMIN: admin_role,\
* DEMOS: self-install_role
- *
+ *
* ldapRealm.permissionsByRole=\
* user_role = *:ToDoItemsJdo:*:*,\
* *:ToDoItem:*:*; \
* self-install_role = *:ToDoItemsFixturesService:install:* ; \
* admin_role = *
- *
+ *
* securityManager.realms = $ldapRealm
- *
+ *
* </pre>
*/
public class KnoxLdapRealm extends JndiLdapRealm {
@@ -157,7 +157,6 @@ public class KnoxLdapRealm extends JndiLdapRealm {
OBJECT_SCOPE.setSearchScope( SearchControls.OBJECT_SCOPE );
}
-
private String searchBase;
private String userSearchBase;
private String principalRegex = DEFAULT_PRINCIPAL_REGEX;
@@ -170,18 +169,18 @@ public class KnoxLdapRealm extends JndiLdapRealm {
private String groupSearchBase;
private String groupObjectClass = "groupOfNames";
-
+
// typical value: member, uniqueMember, meberUrl
private String memberAttribute = "member";
private String groupIdAttribute = "cn";
-
+
private String memberAttributeValuePrefix = "uid={0}";
private String memberAttributeValueSuffix = "";
-
+
private final Map<String,String> rolesByGroup = new LinkedHashMap<>();
private final Map<String,List<String>> permissionsByRole = new LinkedHashMap<>();
-
+
private boolean authorizationEnabled;
private String userSearchAttributeName;
@@ -211,7 +210,7 @@ public class KnoxLdapRealm extends JndiLdapRealm {
/**
* Get groups from LDAP.
- *
+ *
* @param principals
* the principals of the Subject whose AuthenticationInfo should
* be queried from the LDAP server.
@@ -223,7 +222,7 @@ public class KnoxLdapRealm extends JndiLdapRealm {
* if any LDAP errors occur during the search.
*/
@Override
- protected AuthorizationInfo queryForAuthorizationInfo(final PrincipalCollection principals,
+ protected AuthorizationInfo queryForAuthorizationInfo(final PrincipalCollection principals,
final LdapContextFactory ldapContextFactory) throws NamingException {
if (!isAuthorizationEnabled()) {
return null;
@@ -340,7 +339,7 @@ public class KnoxLdapRealm extends JndiLdapRealm {
LdapName userLdapDn = new LdapName(userDn);
Attribute attribute = group.getAttributes().get(getGroupIdAttribute());
String groupName = attribute.get().toString();
-
+
attributeEnum = group
.getAttributes().getAll();
while (attributeEnum.hasMore()) {
@@ -421,7 +420,7 @@ public class KnoxLdapRealm extends JndiLdapRealm {
}
public String getUserSearchBase() {
- return (userSearchBase != null && !userSearchBase.isEmpty()) ?
+ return (userSearchBase != null && !userSearchBase.isEmpty()) ?
userSearchBase : searchBase;
}
@@ -430,7 +429,7 @@ public class KnoxLdapRealm extends JndiLdapRealm {
}
public String getGroupSearchBase() {
- return (groupSearchBase != null && !groupSearchBase.isEmpty()) ?
+ return (groupSearchBase != null && !groupSearchBase.isEmpty()) ?
groupSearchBase : searchBase;
}
@@ -441,7 +440,7 @@ public class KnoxLdapRealm extends JndiLdapRealm {
public String getGroupObjectClass() {
return groupObjectClass;
}
-
+
public void setGroupObjectClass(String groupObjectClassAttribute) {
this.groupObjectClass = groupObjectClassAttribute;
}
@@ -449,19 +448,19 @@ public class KnoxLdapRealm extends JndiLdapRealm {
public String getMemberAttribute() {
return memberAttribute;
}
-
+
public void setMemberAttribute(String memberAttribute) {
this.memberAttribute = memberAttribute;
}
-
+
public String getGroupIdAttribute() {
return groupIdAttribute;
}
-
+
public void setGroupIdAttribute(String groupIdAttribute) {
this.groupIdAttribute = groupIdAttribute;
}
-
+
public void setMemberAttributeValueTemplate(String template) {
if (!StringUtils.hasText(template)) {
String msg = "User DN template cannot be null or empty.";
@@ -487,7 +486,7 @@ public class KnoxLdapRealm extends JndiLdapRealm {
public void setPermissionsByRole(String permissionsByRoleStr) {
permissionsByRole.putAll(parsePermissionByRoleString(permissionsByRoleStr));
}
-
+
public boolean isAuthorizationEnabled() {
return authorizationEnabled;
}
@@ -510,14 +509,14 @@ public class KnoxLdapRealm extends JndiLdapRealm {
public String getUserObjectClass() {
return userObjectClass;
}
-
+
public void setUserObjectClass(String userObjectClass) {
this.userObjectClass = userObjectClass;
}
private Map<String, List<String>> parsePermissionByRoleString(String permissionsByRoleStr) {
Map<String,List<String>> perms = new HashMap<>();
-
+
// split by semicolon ; then by eq = then by comma ,
StringTokenizer stSem = new StringTokenizer(permissionsByRoleStr, ";");
while (stSem.hasMoreTokens()) {
@@ -753,7 +752,7 @@ public class KnoxLdapRealm extends JndiLdapRealm {
return new SimpleAuthenticationInfo(token.getPrincipal(), credentialsHash.toHex(), credentialsHash.getSalt(), getName());
}
- private static final String expandTemplate( final String template, final Matcher input ) {
+ private static String expandTemplate( final String template, final Matcher input ) {
String output = template;
Matcher matcher = TEMPLATE_PATTERN.matcher( output );
while( matcher.find() ) {
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-provider-security-shiro/src/test/java/org/apache/knox/gateway/shirorealm/KnoxLdapRealmTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-security-shiro/src/test/java/org/apache/knox/gateway/shirorealm/KnoxLdapRealmTest.java b/gateway-provider-security-shiro/src/test/java/org/apache/knox/gateway/shirorealm/KnoxLdapRealmTest.java
index e1469ff..d26bdbb 100644
--- a/gateway-provider-security-shiro/src/test/java/org/apache/knox/gateway/shirorealm/KnoxLdapRealmTest.java
+++ b/gateway-provider-security-shiro/src/test/java/org/apache/knox/gateway/shirorealm/KnoxLdapRealmTest.java
@@ -25,42 +25,42 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
public class KnoxLdapRealmTest {
-
+
@Test
public void setGetSearchBase() {
KnoxLdapRealm realm = new KnoxLdapRealm();
realm.setSearchBase("dc=hadoop,dc=apache,dc=org");
assertEquals(realm.getSearchBase(), "dc=hadoop,dc=apache,dc=org");
}
-
+
@Test
public void setGetGroupObjectClass() {
KnoxLdapRealm realm = new KnoxLdapRealm();
realm.setGroupObjectClass("groupOfMembers");
assertEquals(realm.getGroupObjectClass(), "groupOfMembers");
- }
-
+ }
+
@Test
public void setGetUniqueMemberAttribute() {
KnoxLdapRealm realm = new KnoxLdapRealm();
realm.setMemberAttribute("member");
assertEquals(realm.getMemberAttribute(), "member");
}
-
+
@Test
public void setGetUserSearchAttributeName() {
KnoxLdapRealm realm = new KnoxLdapRealm();
realm.setUserSearchAttributeName("uid");
assertEquals(realm.getUserSearchAttributeName(), "uid");
}
-
+
@Test
public void setGetUserObjectClass() {
KnoxLdapRealm realm = new KnoxLdapRealm();
realm.setUserObjectClass("inetuser");
assertEquals(realm.getUserObjectClass(), "inetuser");
}
-
+
@Test
public void setGetUserSearchBase() {
KnoxLdapRealm realm = new KnoxLdapRealm();
@@ -68,7 +68,7 @@ public class KnoxLdapRealmTest {
realm.setUserSearchBase("dc=knox,dc=example,dc=com");
assertEquals(realm.getUserSearchBase(), "dc=knox,dc=example,dc=com");
}
-
+
@Test
public void setGetGroupSearchBase() {
KnoxLdapRealm realm = new KnoxLdapRealm();
@@ -76,31 +76,30 @@ public class KnoxLdapRealmTest {
realm.setGroupSearchBase("dc=knox,dc=example,dc=com");
assertEquals(realm.getGroupSearchBase(), "dc=knox,dc=example,dc=com");
}
-
+
@Test
public void verifyDefaultUserSearchAttributeName() {
KnoxLdapRealm realm = new KnoxLdapRealm();
assertNull(realm.getUserSearchAttributeName());
}
-
+
@Test
public void verifyDefaultGetUserObjectClass() {
KnoxLdapRealm realm = new KnoxLdapRealm();
assertEquals(realm.getUserObjectClass(), "person");
}
-
+
@Test
public void verifyDefaultUserSearchBase() {
KnoxLdapRealm realm = new KnoxLdapRealm();
realm.setSearchBase("dc=knox,dc=example,dc=com");
assertEquals(realm.getUserSearchBase(), "dc=knox,dc=example,dc=com");
}
-
+
@Test
public void verifyDefaultGroupSearchBase() {
KnoxLdapRealm realm = new KnoxLdapRealm();
realm.setSearchBase("dc=knox,dc=example,dc=com");
assertEquals(realm.getGroupSearchBase(), "dc=knox,dc=example,dc=com");
}
-
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-provider-security-webappsec/src/main/java/org/apache/knox/gateway/webappsec/deploy/WebAppSecContributor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-security-webappsec/src/main/java/org/apache/knox/gateway/webappsec/deploy/WebAppSecContributor.java b/gateway-provider-security-webappsec/src/main/java/org/apache/knox/gateway/webappsec/deploy/WebAppSecContributor.java
index dc9f58e..f01688e 100644
--- a/gateway-provider-security-webappsec/src/main/java/org/apache/knox/gateway/webappsec/deploy/WebAppSecContributor.java
+++ b/gateway-provider-security-webappsec/src/main/java/org/apache/knox/gateway/webappsec/deploy/WebAppSecContributor.java
@@ -74,7 +74,7 @@ public class WebAppSecContributor extends ProviderDeploymentContributorBase {
Service service,
ResourceDescriptor resource,
List<FilterParamDescriptor> params) {
-
+
Provider webappsec = context.getTopology().getProvider(ROLE, NAME);
if (webappsec != null && webappsec.isEnabled()) {
Map<String,String> map = provider.getParams();
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-provider-security-webappsec/src/main/java/org/apache/knox/gateway/webappsec/filter/CSRFPreventionFilter.java
----------------------------------------------------------------------
diff --git a/gateway-provider-security-webappsec/src/main/java/org/apache/knox/gateway/webappsec/filter/CSRFPreventionFilter.java b/gateway-provider-security-webappsec/src/main/java/org/apache/knox/gateway/webappsec/filter/CSRFPreventionFilter.java
index befa540..9d0ba44 100644
--- a/gateway-provider-security-webappsec/src/main/java/org/apache/knox/gateway/webappsec/filter/CSRFPreventionFilter.java
+++ b/gateway-provider-security-webappsec/src/main/java/org/apache/knox/gateway/webappsec/filter/CSRFPreventionFilter.java
@@ -37,7 +37,7 @@ public class CSRFPreventionFilter implements Filter {
private String headerName = "X-XSRF-Header";
private String mti = "GET,OPTIONS,HEAD";
private Set<String> methodsToIgnore = null;
-
+
@Override
public void init( FilterConfig filterConfig ) throws ServletException {
String customHeader = filterConfig.getInitParameter(CUSTOM_HEADER_PARAM);
@@ -52,7 +52,7 @@ public class CSRFPreventionFilter implements Filter {
methodsToIgnore = new HashSet<>();
methodsToIgnore.addAll(Arrays.asList(methods));
}
-
+
@Override
public void doFilter(ServletRequest request, ServletResponse response,
FilterChain chain) throws IOException, ServletException {
@@ -66,6 +66,5 @@ public class CSRFPreventionFilter implements Filter {
@Override
public void destroy() {
-
}
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-provider-security-webappsec/src/main/java/org/apache/knox/gateway/webappsec/filter/StrictTransportFilter.java
----------------------------------------------------------------------
diff --git a/gateway-provider-security-webappsec/src/main/java/org/apache/knox/gateway/webappsec/filter/StrictTransportFilter.java b/gateway-provider-security-webappsec/src/main/java/org/apache/knox/gateway/webappsec/filter/StrictTransportFilter.java
index f88dc8c..7d2c2e7 100644
--- a/gateway-provider-security-webappsec/src/main/java/org/apache/knox/gateway/webappsec/filter/StrictTransportFilter.java
+++ b/gateway-provider-security-webappsec/src/main/java/org/apache/knox/gateway/webappsec/filter/StrictTransportFilter.java
@@ -32,7 +32,7 @@ import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpServletResponseWrapper;
/**
- * This filter protects proxied webapps from protocol downgrade attacks
+ * This filter protects proxied webapps from protocol downgrade attacks
* and cookie hijacking.
*/
public class StrictTransportFilter implements Filter {
@@ -93,7 +93,7 @@ public class StrictTransportFilter implements Filter {
}
return headerValue;
}
-
+
@Override
public Collection<String> getHeaderNames() {
List<String> names = (List<String>) super.getHeaderNames();
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-provider-security-webappsec/src/main/java/org/apache/knox/gateway/webappsec/filter/XFrameOptionsFilter.java
----------------------------------------------------------------------
diff --git a/gateway-provider-security-webappsec/src/main/java/org/apache/knox/gateway/webappsec/filter/XFrameOptionsFilter.java b/gateway-provider-security-webappsec/src/main/java/org/apache/knox/gateway/webappsec/filter/XFrameOptionsFilter.java
index 44b0e9f..467bd9a 100644
--- a/gateway-provider-security-webappsec/src/main/java/org/apache/knox/gateway/webappsec/filter/XFrameOptionsFilter.java
+++ b/gateway-provider-security-webappsec/src/main/java/org/apache/knox/gateway/webappsec/filter/XFrameOptionsFilter.java
@@ -77,7 +77,7 @@ public class XFrameOptionsFilter implements Filter {
super.setHeader(name, value);
}
}
-
+
public XFrameOptionsResponseWrapper(HttpServletResponse response) {
super(response);
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-provider-security-webappsec/src/test/java/org/apache/knox/gateway/webappsec/StrictTransportFilterTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-security-webappsec/src/test/java/org/apache/knox/gateway/webappsec/StrictTransportFilterTest.java b/gateway-provider-security-webappsec/src/test/java/org/apache/knox/gateway/webappsec/StrictTransportFilterTest.java
index 675d19b..86000d3 100644
--- a/gateway-provider-security-webappsec/src/test/java/org/apache/knox/gateway/webappsec/StrictTransportFilterTest.java
+++ b/gateway-provider-security-webappsec/src/test/java/org/apache/knox/gateway/webappsec/StrictTransportFilterTest.java
@@ -103,7 +103,7 @@ public class StrictTransportFilterTest {
class TestFilterConfig implements FilterConfig {
Properties props = null;
- public TestFilterConfig(Properties props) {
+ TestFilterConfig(Properties props) {
this.props = props;
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-provider-security-webappsec/src/test/java/org/apache/knox/gateway/webappsec/XFrameOptionsFilterTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-security-webappsec/src/test/java/org/apache/knox/gateway/webappsec/XFrameOptionsFilterTest.java b/gateway-provider-security-webappsec/src/test/java/org/apache/knox/gateway/webappsec/XFrameOptionsFilterTest.java
index 3b9ca7d..d233a09 100644
--- a/gateway-provider-security-webappsec/src/test/java/org/apache/knox/gateway/webappsec/XFrameOptionsFilterTest.java
+++ b/gateway-provider-security-webappsec/src/test/java/org/apache/knox/gateway/webappsec/XFrameOptionsFilterTest.java
@@ -38,9 +38,6 @@ import org.junit.Assert;
import org.junit.Test;
public class XFrameOptionsFilterTest {
- /**
- *
- */
private static final String X_FRAME_OPTIONS = "X-Frame-Options";
String options = null;
Collection<String> headerNames = null;
@@ -135,7 +132,7 @@ public class XFrameOptionsFilterTest {
class TestFilterConfig implements FilterConfig {
Properties props = null;
- public TestFilterConfig(Properties props) {
+ TestFilterConfig(Properties props) {
this.props = props;
}
@@ -158,7 +155,6 @@ public class XFrameOptionsFilterTest {
public Enumeration<String> getInitParameterNames() {
return null;
}
-
}
class TestFilterChain implements FilterChain {
@@ -172,7 +168,5 @@ public class XFrameOptionsFilterTest {
headerNames = ((HttpServletResponse)response).getHeaderNames();
headers = ((HttpServletResponse)response).getHeaders(X_FRAME_OPTIONS);
}
-
}
-
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-provider-security-webappsec/src/test/java/org/apache/knox/gateway/webappsec/XSSProtectionFilterTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-security-webappsec/src/test/java/org/apache/knox/gateway/webappsec/XSSProtectionFilterTest.java b/gateway-provider-security-webappsec/src/test/java/org/apache/knox/gateway/webappsec/XSSProtectionFilterTest.java
index f11bd95..6fe1bb9 100644
--- a/gateway-provider-security-webappsec/src/test/java/org/apache/knox/gateway/webappsec/XSSProtectionFilterTest.java
+++ b/gateway-provider-security-webappsec/src/test/java/org/apache/knox/gateway/webappsec/XSSProtectionFilterTest.java
@@ -95,7 +95,7 @@ public class XSSProtectionFilterTest {
private static class TestFilterConfig implements FilterConfig {
Properties props = null;
- public TestFilterConfig(Properties props) {
+ TestFilterConfig(Properties props) {
this.props = props;
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/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 a56fb1b..b95ade1 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
@@ -65,7 +65,7 @@ public class GatewayFilter implements Filter {
public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse ) throws IOException, ServletException {
}
};
-
+
private static final GatewayMessages LOG = MessagesFactory.get( GatewayMessages.class );
private static final GatewayResources RES = ResourcesFactory.get( GatewayResources.class );
private static AuditService auditService = AuditServiceFactory.getAuditService();
@@ -161,7 +161,7 @@ public class GatewayFilter implements Filter {
auditor.audit(
Action.ACCESS, contextWithPathAndQuery, ResourceType.URI,
ActionOutcome.UNAVAILABLE, RES.requestMethod(((HttpServletRequest)servletRequest).getMethod()));
-
+
if( match != null ) {
Chain chain = match.getValue();
servletRequest.setAttribute( AbstractGatewayFilter.TARGET_SERVICE_ROLE, chain.getResourceRole() );
@@ -186,7 +186,7 @@ public class GatewayFilter implements Filter {
// Make sure to destroy the correlationContext to prevent threading issues
CorrelationServiceFactory.getCorrelationService().detachContext();
}
-
+
//KAM[ Don't do this or the Jetty default servlet will overwrite any response setup by the filter.
// filterChain.doFilter( servletRequest, servletResponse );
//]
@@ -253,7 +253,7 @@ public class GatewayFilter implements Filter {
private class Chain implements FilterChain {
private List<Holder> chain;
- private String resourceRole;
+ private String resourceRole;
private Chain() {
this.chain = new ArrayList<>();
@@ -406,7 +406,7 @@ public class GatewayFilter implements Filter {
}
return instance;
}
-
+
private String getResourceRole() {
return resourceRole;
}
@@ -422,7 +422,7 @@ public class GatewayFilter implements Filter {
private String newURL;
private String contextpath;
- public ForwardedRequest(final HttpServletRequest request,
+ ForwardedRequest(final HttpServletRequest request,
final String contextpath, final String newURL) {
super(request);
this.newURL = newURL;
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/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 1e52fe0..6f078bd 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
@@ -128,7 +128,7 @@ public class GatewayForwardingServlet extends HttpServlet{
}
}
- private static final String getRequestPath( final HttpServletRequest request ) {
+ private static String getRequestPath( final HttpServletRequest request ) {
final String path = request.getPathInfo();
if( path == null ) {
return "";
@@ -137,7 +137,7 @@ public class GatewayForwardingServlet extends HttpServlet{
}
}
- private static final String getRequestLine( final HttpServletRequest request ) {
+ private static String getRequestLine( final HttpServletRequest request ) {
final String path = getRequestPath( request );
final String query = request.getQueryString();
if( query == null ) {
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-server/src/main/java/org/apache/knox/gateway/GatewayMessages.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/GatewayMessages.java b/gateway-server/src/main/java/org/apache/knox/gateway/GatewayMessages.java
index 001799d..e1e27e5 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/GatewayMessages.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/GatewayMessages.java
@@ -183,7 +183,7 @@ public interface GatewayMessages {
@Message( level = MessageLevel.DEBUG, text = "Dispatch request: {0} {1}" )
void dispatchRequest( String method, URI uri );
-
+
@Message( level = MessageLevel.WARN, text = "Connection exception dispatching request: {0} {1}" )
void dispatchServiceConnectionException( URI uri, @StackTrace(level=MessageLevel.WARN) Exception e );
@@ -252,7 +252,7 @@ public interface GatewayMessages {
@Message( level = MessageLevel.ERROR, text = "Failed to encrypt password for cluster {0}: {1}")
void failedToEncryptPasswordForCluster( String clusterName, @StackTrace( level = MessageLevel.DEBUG ) Exception e );
-
+
@Message( level = MessageLevel.ERROR, text = "Failed to create keystore [filename={0}, type={1}]: {2}" )
void failedToCreateKeystore( String fileName, String keyStoreType, @StackTrace( level = MessageLevel.DEBUG ) Exception e );
@@ -264,7 +264,7 @@ public interface GatewayMessages {
@Message( level = MessageLevel.ERROR, text = "Failed to add credential for cluster {0}: {1}" )
void failedToAddCredentialForCluster( String clusterName, @StackTrace( level = MessageLevel.DEBUG ) Exception e );
-
+
@Message( level = MessageLevel.ERROR, text = "Failed to get key for Gateway {0}: {1}" )
void failedToGetKeyForGateway( String alias, @StackTrace( level=MessageLevel.DEBUG ) Exception e );
@@ -294,10 +294,10 @@ public interface GatewayMessages {
@Message( level = MessageLevel.ERROR, text = "Failed to get map from Json string {0}: {1}" )
void failedToGetMapFromJsonString( String json, @StackTrace( level = MessageLevel.DEBUG ) Exception e );
-
+
@Message( level = MessageLevel.DEBUG, text = "Successful Knox->Hadoop SPNegotiation authentication for URL: {0}" )
void successfulSPNegoAuthn(String uri);
-
+
@Message( level = MessageLevel.ERROR, text = "Failed Knox->Hadoop SPNegotiation authentication for URL: {0}" )
void failedSPNegoAuthn(String uri);
@@ -333,10 +333,10 @@ public interface GatewayMessages {
@Message( level = MessageLevel.WARN, text = "Failed to match path {0}" )
void failedToMatchPath( String path );
-
+
@Message( level = MessageLevel.ERROR, text = "Failed to get system ldap connection: {0}" )
void failedToGetSystemLdapConnection( @StackTrace( level = MessageLevel.DEBUG ) Exception e );
-
+
@Message( level = MessageLevel.WARN, text = "Value not found for cluster:{0}, alias: {1}" )
void aliasValueNotFound( String cluster, String alias );
@@ -438,55 +438,55 @@ public interface GatewayMessages {
@Message(level = MessageLevel.INFO,
text = "Topology port mapping feature enabled: {0}")
- void gatewayTopologyPortMappingEnabled(final boolean enabled);
+ void gatewayTopologyPortMappingEnabled(boolean enabled);
@Message(level = MessageLevel.DEBUG,
text = "Creating a connector for topology {0} listening on port {1}.")
- void createJettyConnector(final String topology, final int port);
+ void createJettyConnector(String topology, int port);
@Message(level = MessageLevel.DEBUG,
text = "Creating a handler for topology {0}.")
- void createJettyHandler(final String topology);
+ void createJettyHandler(String topology);
@Message(level = MessageLevel.INFO,
text = "Updating request context from {0} to {1}")
- void topologyPortMappingAddContext(final String oldTarget,
- final String newTarget);
+ void topologyPortMappingAddContext(String oldTarget,
+ String newTarget);
@Message(level = MessageLevel.DEBUG,
text = "Updating request target from {0} to {1}")
- void topologyPortMappingUpdateRequest(final String oldTarget,
- final String newTarget);
+ void topologyPortMappingUpdateRequest(String oldTarget,
+ String newTarget);
@Message(level = MessageLevel.ERROR,
text = "Port {0} configured for Topology - {1} is already in use.")
- void portAlreadyInUse(final int port, final String topology);
+ void portAlreadyInUse(int port, String topology);
@Message(level = MessageLevel.ERROR,
text = "Port {0} is already in use.")
- void portAlreadyInUse(final int port);
+ void portAlreadyInUse(int port);
@Message(level = MessageLevel.INFO,
text = "Started gateway, topology \"{0}\" listening on port \"{1}\".")
- void startedGateway(final String topology, final int port);
+ void startedGateway(String topology, int port);
@Message(level = MessageLevel.ERROR,
text = "Topology \"{0}\" failed to start listening on port \"{1}\".")
- void startedGatewayPortConflict(final String topology, final int port);
+ void startedGatewayPortConflict(String topology, int port);
@Message(level = MessageLevel.ERROR,
text =
" Could not find topology \"{0}\" mapped to port \"{1}\" configured in gateway-config.xml. "
+ "This invalid topology mapping will be ignored by the gateway. "
+ "Gateway restart will be required if in the future \"{0}\" topology is added.")
- void topologyPortMappingCannotFindTopology(final String topology, final int port);
+ void topologyPortMappingCannotFindTopology(String topology, int port);
@Message( level = MessageLevel.WARN, text = "There is no registry client defined for remote configuration monitoring." )
void missingClientConfigurationForRemoteMonitoring();
@Message( level = MessageLevel.WARN, text = "Could not resolve a remote configuration registry client for {0}." )
- void unresolvedClientConfigurationForRemoteMonitoring(final String clientName);
+ void unresolvedClientConfigurationForRemoteMonitoring(String clientName);
@Message( level = MessageLevel.INFO, text = "Monitoring simple descriptors in directory: {0}" )
void monitoringDescriptorChangesInDirectory(String descriptorsDir);
@@ -495,15 +495,15 @@ public interface GatewayMessages {
void monitoringProviderConfigChangesInDirectory(String sharedProviderDir);
@Message( level = MessageLevel.ERROR, text = "Error registering listener for remote configuration path {0} : {1}" )
- void errorAddingRemoteConfigurationListenerForPath(final String path,
+ void errorAddingRemoteConfigurationListenerForPath(String path,
@StackTrace( level = MessageLevel.DEBUG ) Exception e);
@Message( level = MessageLevel.ERROR, text = "Error unregistering listener for remote configuration path {0} : {1}" )
- void errorRemovingRemoteConfigurationListenerForPath(final String path,
+ void errorRemovingRemoteConfigurationListenerForPath(String path,
@StackTrace( level = MessageLevel.DEBUG ) Exception e);
@Message( level = MessageLevel.ERROR, text = "Error downloading remote configuration {0} : {1}" )
- void errorDownloadingRemoteConfiguration(final String path,
+ void errorDownloadingRemoteConfiguration(String path,
@StackTrace( level = MessageLevel.DEBUG ) Exception e);
@Message( level = MessageLevel.INFO, text = "Prevented deletion of shared provider configuration because there are referencing descriptors: {0}" )
@@ -513,36 +513,36 @@ public interface GatewayMessages {
void generatedTopologyForDescriptorChange(String topologyName, String descriptorName);
@Message( level = MessageLevel.WARN, text = "An error occurred while attempting to initialize the remote configuration monitor: {0}" )
- void remoteConfigurationMonitorInitFailure(final String errorMessage,
+ void remoteConfigurationMonitorInitFailure(String errorMessage,
@StackTrace( level = MessageLevel.DEBUG ) Exception e );
@Message( level = MessageLevel.WARN, text = "An error occurred while attempting to start the remote configuration monitor {0} : {1}" )
- void remoteConfigurationMonitorStartFailure(final String monitorType, final String errorMessage);
+ void remoteConfigurationMonitorStartFailure(String monitorType, String errorMessage);
@Message( level = MessageLevel.INFO, text = "Starting remote configuration monitor for source {0} ..." )
- void startingRemoteConfigurationMonitor(final String address);
+ void startingRemoteConfigurationMonitor(String address);
@Message( level = MessageLevel.INFO, text = "Monitoring remote configuration source {0}" )
- void monitoringRemoteConfigurationSource(final String address);
+ void monitoringRemoteConfigurationSource(String address);
@Message( level = MessageLevel.INFO, text = "Remote configuration monitor downloaded {0} configuration file {1}" )
- void downloadedRemoteConfigFile(final String type, final String configFileName);
+ void downloadedRemoteConfigFile(String type, String configFileName);
@Message( level = MessageLevel.INFO, text = "Remote configuration monitor deleted {0} configuration file {1} based on remote change." )
- void deletedRemoteConfigFile(final String type, final String configFileName);
+ void deletedRemoteConfigFile(String type, String configFileName);
@Message( level = MessageLevel.ERROR, text = "Failed to delete remote {0} file {1}." )
- void failedToDeletedRemoteConfigFile(final String type, final String configFileName);
+ void failedToDeletedRemoteConfigFile(String type, String configFileName);
@Message( level = MessageLevel.ERROR, text = "An error occurred while processing {0} : {1}" )
- void simpleDescriptorHandlingError(final String simpleDesc,
+ void simpleDescriptorHandlingError(String simpleDesc,
@StackTrace(level = MessageLevel.DEBUG) Exception e);
@Message(level = MessageLevel.DEBUG, text = "Successfully wrote configuration: {0}")
- void wroteConfigurationFile(final String filePath);
+ void wroteConfigurationFile(String filePath);
@Message(level = MessageLevel.ERROR, text = "Failed to write configuration: {0}")
- void failedToWriteConfigurationFile(final String filePath,
+ void failedToWriteConfigurationFile(String filePath,
@StackTrace(level = MessageLevel.DEBUG) Exception e );
@Message( level = MessageLevel.INFO, text = "Deleting topology {0} because the associated descriptor {1} was deleted." )
@@ -567,47 +567,47 @@ public interface GatewayMessages {
@Message(level = MessageLevel.INFO,
text = "A cluster configuration change was noticed for {1} @ {0}")
- void noticedClusterConfigurationChange(final String source, final String clusterName);
+ void noticedClusterConfigurationChange(String source, String clusterName);
@Message(level = MessageLevel.INFO,
text = "Triggering topology regeneration for descriptor {2} because of change to the {1} @ {0} configuration.")
- void triggeringTopologyRegeneration(final String source, final String clusterName, final String affected);
+ void triggeringTopologyRegeneration(String source, String clusterName, String affected);
@Message(level = MessageLevel.ERROR,
text = "Encountered an error while responding to {1} @ {0} configuration change: {2}")
- void errorRespondingToConfigChange(final String source,
- final String clusterName,
+ void errorRespondingToConfigChange(String source,
+ String clusterName,
@StackTrace(level = MessageLevel.DEBUG) Exception e);
@Message(level = MessageLevel.INFO,
text = "Adding alias {1} for cluster {0} locally (local keystore) ")
- void addAliasLocally(final String cluster, final String alias);
+ void addAliasLocally(String cluster, String alias);
@Message(level = MessageLevel.ERROR,
text = "Error adding alias {1} for cluster {0} locally (local keystore), cause: {2} ")
- void errorAddingAliasLocally(final String cluster, final String alias, final String cause);
+ void errorAddingAliasLocally(String cluster, String alias, String cause);
@Message(level = MessageLevel.INFO,
text = "Remove alias {1} for cluster {0} locally (local keystore) ")
- void removeAliasLocally(final String cluster, final String alias);
+ void removeAliasLocally(String cluster, String alias);
@Message(level = MessageLevel.ERROR,
text = "Error removing alias {1} for cluster {0} locally (local keystore), cause: {2} ")
- void errorRemovingAliasLocally(final String cluster, final String alias, final String cause);
+ void errorRemovingAliasLocally(String cluster, String alias, String cause);
@Message(level = MessageLevel.INFO,
text = "Adding remote listener for path {0} ")
- void addRemoteListener(final String path);
+ void addRemoteListener(String path);
@Message(level = MessageLevel.ERROR,
text = "Error adding remote listener for path {0}, cause: {1} ")
- void errorAddingRemoteListener(final String path, final String cause);
+ void errorAddingRemoteListener(String path, String cause);
@Message(level = MessageLevel.ERROR,
text = "Error removing remote listener for path {0}, cause: {1} ")
- void errorRemovingRemoteListener(final String path, final String cause);
+ void errorRemovingRemoteListener(String path, String cause);
@Message(level = MessageLevel.INFO,
text = "Remote Alias Service disabled")
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-server/src/main/java/org/apache/knox/gateway/GatewayServer.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/GatewayServer.java b/gateway-server/src/main/java/org/apache/knox/gateway/GatewayServer.java
index 8cd503e..ad15c65 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/GatewayServer.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/GatewayServer.java
@@ -396,7 +396,7 @@ public class GatewayServer {
}
long idleTimeout = config.getGatewayIdleTimeout();
- if (idleTimeout > 0l) {
+ if (idleTimeout > 0L) {
connector.setIdleTimeout(idleTimeout);
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/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 aad3462..51533b7 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
@@ -156,14 +156,14 @@ public class GatewayConfigImpl extends Configuration implements GatewayConfig {
// These config property names are not inline with the convention of using the
// GATEWAY_CONFIG_FILE_PREFIX as is done by those above. These are left for
- // backward compatibility.
+ // backward compatibility.
// LET'S NOT CONTINUE THIS PATTERN BUT LEAVE THEM FOR NOW.
private static final String SSL_ENABLED = "ssl.enabled";
private static final String SSL_EXCLUDE_PROTOCOLS = "ssl.exclude.protocols";
private static final String SSL_INCLUDE_CIPHERS = "ssl.include.ciphers";
private static final String SSL_EXCLUDE_CIPHERS = "ssl.exclude.ciphers";
// END BACKWARD COMPATIBLE BLOCK
-
+
public static final String DEFAULT_HTTP_PORT = "8888";
public static final String DEFAULT_HTTP_PATH = "gateway";
public static final String DEFAULT_DEPLOYMENT_DIR = "deployments";
@@ -453,7 +453,7 @@ public class GatewayConfigImpl extends Configuration implements GatewayConfig {
@Override
public boolean isSSLEnabled() {
String enabled = get( SSL_ENABLED, "true" );
-
+
return "true".equals(enabled);
}
@@ -473,7 +473,7 @@ public class GatewayConfigImpl extends Configuration implements GatewayConfig {
String kerberosDebugEnabled = get( KRB5_DEBUG, "false" );
return "true".equals(kerberosDebugEnabled);
}
-
+
@Override
public String getKerberosLoginConfig() {
return get( KRB5_LOGIN_CONFIG );
@@ -648,7 +648,7 @@ public class GatewayConfigImpl extends Configuration implements GatewayConfig {
@Override
public long getGatewayIdleTimeout() {
- return getLong(GATEWAY_IDLE_TIMEOUT, 300000l);
+ return getLong(GATEWAY_IDLE_TIMEOUT, 300000L);
}
@Override
@@ -854,7 +854,7 @@ public class GatewayConfigImpl extends Configuration implements GatewayConfig {
public int getClusterMonitorPollingInterval(String type) {
return getInt(CLUSTER_CONFIG_MONITOR_PREFIX + type.toLowerCase(Locale.ROOT) + CLUSTER_CONFIG_MONITOR_INTERVAL_SUFFIX, -1);
}
-
+
@Override
public boolean isClusterMonitorEnabled(String type) {
return getBoolean(CLUSTER_CONFIG_MONITOR_PREFIX + type.toLowerCase(Locale.ROOT) + CLUSTER_CONFIG_MONITOR_ENABLED_SUFFIX, true);
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-server/src/main/java/org/apache/knox/gateway/deploy/impl/DispatchDeploymentContributor.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/deploy/impl/DispatchDeploymentContributor.java b/gateway-server/src/main/java/org/apache/knox/gateway/deploy/impl/DispatchDeploymentContributor.java
index ba1a8a8..4926f1e 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/deploy/impl/DispatchDeploymentContributor.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/deploy/impl/DispatchDeploymentContributor.java
@@ -32,7 +32,7 @@ import java.util.Map;
public class DispatchDeploymentContributor extends
ProviderDeploymentContributorBase {
-
+
private static final String DISPATCH_IMPL_PARAM = "dispatch-impl";
@Override
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-server/src/main/java/org/apache/knox/gateway/descriptor/xml/XmlGatewayDescriptorTags.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/descriptor/xml/XmlGatewayDescriptorTags.java b/gateway-server/src/main/java/org/apache/knox/gateway/descriptor/xml/XmlGatewayDescriptorTags.java
index 10c1b43..f746669 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/descriptor/xml/XmlGatewayDescriptorTags.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/descriptor/xml/XmlGatewayDescriptorTags.java
@@ -18,17 +18,15 @@
package org.apache.knox.gateway.descriptor.xml;
interface XmlGatewayDescriptorTags {
-
- static final String GATEWAY = "gateway";
- static final String RESOURCE = "resource";
- static final String RESOURCE_ROLE = "role";
- static final String RESOURCE_PATTERN = "pattern";
- static final String FILTER = "filter";
- static final String FILTER_NAME = "name";
- static final String FILTER_ROLE = "role";
- static final String FILTER_IMPL = "class";
- static final String FILTER_PARAM = "param";
- static final String FILTER_PARAM_NAME = "name";
- static final String FILTER_PARAM_VALUE = "value";
-
+ String GATEWAY = "gateway";
+ String RESOURCE = "resource";
+ String RESOURCE_ROLE = "role";
+ String RESOURCE_PATTERN = "pattern";
+ String FILTER = "filter";
+ String FILTER_NAME = "name";
+ String FILTER_ROLE = "role";
+ String FILTER_IMPL = "class";
+ String FILTER_PARAM = "param";
+ String FILTER_PARAM_NAME = "name";
+ String FILTER_PARAM_VALUE = "value";
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-server/src/main/java/org/apache/knox/gateway/filter/RequestUpdateHandler.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/filter/RequestUpdateHandler.java b/gateway-server/src/main/java/org/apache/knox/gateway/filter/RequestUpdateHandler.java
index 5042f48..7b90380 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/filter/RequestUpdateHandler.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/filter/RequestUpdateHandler.java
@@ -105,7 +105,7 @@ public class RequestUpdateHandler extends ScopedHandler {
private String newURL;
private String contextpath;
- public ForwardedRequest(final HttpServletRequest request,
+ ForwardedRequest(final HttpServletRequest request,
final String contextpath, final String newURL) {
super(request);
this.newURL = newURL;
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/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 ce56471..919019d 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
@@ -70,7 +70,7 @@ public class CLIGatewayServices implements GatewayServices {
ks.setMasterService(ms);
ks.init(config, options);
services.put(KEYSTORE_SERVICE, ks);
-
+
DefaultAliasService defaultAlias = new DefaultAliasService();
defaultAlias.setKeystoreService(ks);
defaultAlias.init(config, options);
@@ -97,7 +97,7 @@ public class CLIGatewayServices implements GatewayServices {
tops.init( config, options );
services.put(TOPOLOGY_SERVICE, tops);
}
-
+
@Override
public void start() throws ServiceLifecycleException {
ms.start();
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/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 5bbf11b..98f13b2 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
@@ -102,14 +102,14 @@ public class DefaultGatewayServices implements GatewayServices {
crypto.setAliasService(alias);
crypto.init(config, options);
services.put(CRYPTO_SERVICE, crypto);
-
+
DefaultTokenAuthorityService ts = new DefaultTokenAuthorityService();
ts.setAliasService(alias);
ts.setKeystoreService(ks);
ts.init(config, options);
// prolly should not allow the token service to be looked up?
services.put(TOKEN_SERVICE, ts);
-
+
JettySSLService ssl = new JettySSLService();
ssl.setAliasService(alias);
ssl.setKeystoreService(ks);
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-server/src/main/java/org/apache/knox/gateway/services/registry/impl/Registry.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/services/registry/impl/Registry.java b/gateway-server/src/main/java/org/apache/knox/gateway/services/registry/impl/Registry.java
index f667de2..640d643 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/services/registry/impl/Registry.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/services/registry/impl/Registry.java
@@ -20,14 +20,9 @@ package org.apache.knox.gateway.services.registry.impl;
import java.util.HashMap;
class Registry extends HashMap<String,HashMap<String,RegEntry>> {
-
- /**
- *
- */
private static final long serialVersionUID = 1L;
-
- public Registry() {
+
+ Registry() {
super();
}
-
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-server/src/main/java/org/apache/knox/gateway/services/security/impl/CLIMasterService.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/services/security/impl/CLIMasterService.java b/gateway-server/src/main/java/org/apache/knox/gateway/services/security/impl/CLIMasterService.java
index 7262e70..fb1dfb9 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/services/security/impl/CLIMasterService.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/services/security/impl/CLIMasterService.java
@@ -52,5 +52,4 @@ public class CLIMasterService extends CMFMasterService implements MasterService,
@Override
public void stop() throws ServiceLifecycleException {
}
-
}
[05/10] knox git commit: KNOX-1663 - Enforce more Checkstyle rules
Posted by kr...@apache.org.
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/nodes.json
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/nodes.json b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/nodes.json
index 0740757..ab33854 100644
--- a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/nodes.json
+++ b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/nodes.json
@@ -1,19 +1,19 @@
{
- "nodes":{
- "node":[
- {
- "rack":"/default-rack",
- "state":"RUNNING",
- "id":"localhost:45454",
- "nodeHostName":"localhost",
- "nodeHTTPAddress":"localhost:50060",
- "lastHealthUpdate":1401194681758,
- "version":"2.4.0.2.1.1.0-390",
- "healthReport":"",
- "numContainers":0,
- "usedMemoryMB":0,
- "availMemoryMB":8192
- }
- ]
- }
+ "nodes":{
+ "node":[
+ {
+ "rack":"/default-rack",
+ "state":"RUNNING",
+ "id":"localhost:45454",
+ "nodeHostName":"localhost",
+ "nodeHTTPAddress":"localhost:50060",
+ "lastHealthUpdate":1401194681758,
+ "version":"2.4.0.2.1.1.0-390",
+ "healthReport":"",
+ "numContainers":0,
+ "usedMemoryMB":0,
+ "availMemoryMB":8192
+ }
+ ]
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/nodes.xml
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/nodes.xml b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/nodes.xml
index 619d995..4bf7c44 100644
--- a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/nodes.xml
+++ b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/nodes.xml
@@ -16,17 +16,17 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
<nodes>
- <node>
- <rack>/default-rack</rack>
- <state>RUNNING</state>
- <id>localhost:45454</id>
- <nodeHostName>hdp.example.com</nodeHostName>
- <nodeHTTPAddress>localhost:50060</nodeHTTPAddress>
- <lastHealthUpdate>1401194561733</lastHealthUpdate>
- <version>2.4.0.2.1.1.0-390</version>
- <healthReport></healthReport>
- <numContainers>0</numContainers>
- <usedMemoryMB>0</usedMemoryMB>
- <availMemoryMB>8192</availMemoryMB>
- </node>
+ <node>
+ <rack>/default-rack</rack>
+ <state>RUNNING</state>
+ <id>localhost:45454</id>
+ <nodeHostName>hdp.example.com</nodeHostName>
+ <nodeHTTPAddress>localhost:50060</nodeHTTPAddress>
+ <lastHealthUpdate>1401194561733</lastHealthUpdate>
+ <version>2.4.0.2.1.1.0-390</version>
+ <healthReport></healthReport>
+ <numContainers>0</numContainers>
+ <usedMemoryMB>0</usedMemoryMB>
+ <availMemoryMB>8192</availMemoryMB>
+ </node>
</nodes>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-info.json
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-info.json b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-info.json
index b44a01b..49811ec 100644
--- a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-info.json
+++ b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-info.json
@@ -1,9 +1,9 @@
{
- "info":{
- "appId":"application_1399541193872_0035",
- "name":"Sleep job",
- "user":"hdfs",
- "startedOn":1401199817106,
- "elapsedTime":852931
- }
+ "info":{
+ "appId":"application_1399541193872_0035",
+ "name":"Sleep job",
+ "user":"hdfs",
+ "startedOn":1401199817106,
+ "elapsedTime":852931
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-info.xml
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-info.xml b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-info.xml
index 7ed4a49..02cf7fe 100644
--- a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-info.xml
+++ b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-info.xml
@@ -16,9 +16,9 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
<info>
- <appId>application_1399541193872_0035</appId>
- <name>Sleep job</name>
- <user>hdfs</user>
- <startedOn>1401199817106</startedOn>
- <elapsedTime>113773</elapsedTime>
+ <appId>application_1399541193872_0035</appId>
+ <name>Sleep job</name>
+ <user>hdfs</user>
+ <startedOn>1401199817106</startedOn>
+ <elapsedTime>113773</elapsedTime>
</info>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-job-attempts.json
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-job-attempts.json b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-job-attempts.json
index af46d3e..1539f04 100644
--- a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-job-attempts.json
+++ b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-job-attempts.json
@@ -1,14 +1,14 @@
{
- "jobAttempts":{
- "jobAttempt":[
- {
- "nodeHttpAddress":"host.yarn.com:50060",
- "nodeId":"host.yarn.com:45454",
- "id":1,
- "startTime":1401199817106,
- "containerId":"container_1399541193872_0035_01_000001",
- "logsLink":"http://host.yarn.com:50060/node/containerlogs/container_1399541193872_0035_01_000001/hdfs"
- }
- ]
- }
+ "jobAttempts":{
+ "jobAttempt":[
+ {
+ "nodeHttpAddress":"host.yarn.com:50060",
+ "nodeId":"host.yarn.com:45454",
+ "id":1,
+ "startTime":1401199817106,
+ "containerId":"container_1399541193872_0035_01_000001",
+ "logsLink":"http://host.yarn.com:50060/node/containerlogs/container_1399541193872_0035_01_000001/hdfs"
+ }
+ ]
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-job-attempts.xml
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-job-attempts.xml b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-job-attempts.xml
index f02354b..d0b306d 100644
--- a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-job-attempts.xml
+++ b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-job-attempts.xml
@@ -16,12 +16,12 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
<jobAttempts>
- <jobAttempt>
- <nodeHttpAddress>localhost:50060</nodeHttpAddress>
- <nodeId>localhost:45454</nodeId>
- <id>1</id>
- <startTime>1401199817106</startTime>
- <containerId>container_1399541193872_0035_01_000001</containerId>
- <logsLink>http://localhost:50060/node/containerlogs/container_1399541193872_0035_01_000001/hdfs</logsLink>
- </jobAttempt>
+ <jobAttempt>
+ <nodeHttpAddress>localhost:50060</nodeHttpAddress>
+ <nodeId>localhost:45454</nodeId>
+ <id>1</id>
+ <startTime>1401199817106</startTime>
+ <containerId>container_1399541193872_0035_01_000001</containerId>
+ <logsLink>http://localhost:50060/node/containerlogs/container_1399541193872_0035_01_000001/hdfs</logsLink>
+ </jobAttempt>
</jobAttempts>
\ No newline at end of file
[04/10] knox git commit: KNOX-1663 - Enforce more Checkstyle rules
Posted by kr...@apache.org.
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-job-conf.json
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-job-conf.json b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-job-conf.json
index 2e9b772..f578653 100644
--- a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-job-conf.json
+++ b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/proxy-mapreduce-job-conf.json
@@ -1,5263 +1,5263 @@
{
- "conf":{
- "path":"hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml",
- "property":[
- {
- "name":"dfs.datanode.data.dir",
- "value":"/var/hadoop/datanode",
- "source":[
- "hdfs-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.namenode.checkpoint.txns",
- "value":"1000000",
- "source":[
- "hdfs-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"s3.replication",
- "value":"3",
- "source":[
- "core-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.output.fileoutputformat.compress.type",
- "value":"RECORD",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.jobtracker.jobhistory.lru.cache.size",
- "value":"5",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.datanode.failed.volumes.tolerated",
- "value":"0",
- "source":[
- "hdfs-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.nodemanager.webapp.spnego-keytab-file",
- "value":"/etc/security/keytabs/spnego.service.keytab",
- "source":[
- "yarn-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.resourcemanager.principal",
- "value":"rm/_HOST@EXAMPLE.COM",
- "source":[
- "yarn-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"hadoop.http.filter.initializers",
- "value":"org.apache.hadoop.yarn.server.webproxy.amfilter.AmFilterInitializer",
- "source":[
- "programatically",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.cluster.temp.dir",
- "value":"${hadoop.tmp.dir}/mapred/temp",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.nodemanager.keytab",
- "value":"/etc/security/keytabs/nm.service.keytab",
- "source":[
- "yarn-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.reduce.shuffle.memory.limit.percent",
- "value":"0.25",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.namenode.checkpoint.max-retries",
- "value":"3",
- "source":[
- "hdfs-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.resourcemanager.zk-acl",
- "value":"world:anyone:rwcda",
- "source":[
- "yarn-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.reduce.skip.maxgroups",
- "value":"0",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.https.server.keystore.resource",
- "value":"ssl-server.xml",
- "source":[
- "hdfs-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.app.mapreduce.task.container.log.backups",
- "value":"0",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.domain.socket.path",
- "value":"/var/lib/hadoop-hdfs/dn_socket",
- "source":[
- "hdfs-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"hadoop.http.authentication.kerberos.keytab",
- "value":"${user.home}/hadoop.keytab",
- "source":[
- "core-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.sleepjob.reduce.sleep.count",
- "value":"120000",
- "source":[
- "programatically",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.timeline-service.generic-application-history.store-class",
- "value":"org.apache.hadoop.yarn.server.applicationhistoryservice.FileSystemApplicationHistoryStore",
- "source":[
- "yarn-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.nodemanager.disk-health-checker.max-disk-utilization-per-disk-percentage",
- "value":"100.0",
- "source":[
- "yarn-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"jetty.connector",
- "value":"org.mortbay.jetty.nio.SelectChannelConnector",
- "source":[
- "mapred-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.job.jar",
- "value":"/user/hdfs/.staging/job_1399541193872_0035/job.jar",
- "source":[
- "programatically",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.nodemanager.localizer.client.thread-count",
- "value":"5",
- "source":[
- "yarn-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.jobhistory.done-dir",
- "value":"/mapred/history/done",
- "source":[
- "mapred-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.framework.name",
- "value":"yarn",
- "source":[
- "mapred-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"ha.failover-controller.new-active.rpc-timeout.ms",
- "value":"60000",
- "source":[
- "core-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"ha.health-monitor.check-interval.ms",
- "value":"1000",
- "source":[
- "core-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"io.file.buffer.size",
- "value":"131072",
- "source":[
- "core-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.shuffle.max.connections",
- "value":"0",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.namenode.path.based.cache.block.map.allocation.percent",
- "value":"0.25",
- "source":[
- "hdfs-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.task.tmp.dir",
- "value":"./tmp",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.namenode.checkpoint.period",
- "value":"86400",
- "source":[
- "hdfs-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.encrypt.data.transfer.algorithm",
- "value":"3des",
- "source":[
- "hdfs-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.client.mmap.cache.timeout.ms",
- "value":"3600000",
- "source":[
- "hdfs-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"ipc.client.kill.max",
- "value":"10",
- "source":[
- "core-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.resourcemanager.scheduler.class",
- "value":"org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler",
- "source":[
- "yarn-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.jobtracker.taskcache.levels",
- "value":"2",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"s3.stream-buffer-size",
- "value":"4096",
- "source":[
- "core-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.namenode.secondary.http-address",
- "value":"host.yarn.com:50090",
- "source":[
- "hdfs-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.namenode.decommission.interval",
- "value":"30",
- "source":[
- "hdfs-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.jobhistory.webapp.spnego-principal",
- "value":"HTTP/_HOST@EXAMPLE.COM",
- "source":[
- "yarn-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.namenode.http-address",
- "value":"host.yarn.com:50070",
- "source":[
- "hdfs-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.task.files.preserve.failedtasks",
- "value":"false",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.encrypt.data.transfer",
- "value":"false",
- "source":[
- "hdfs-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.resourcemanager.ha.enabled",
- "value":"false",
- "source":[
- "yarn-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.datanode.address",
- "value":"0.0.0.0:50010",
- "source":[
- "hdfs-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.namenode.avoid.write.stale.datanode",
- "value":"false",
- "source":[
- "hdfs-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"nfs3.server.port",
- "value":"2049",
- "source":[
- "core-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"hadoop.http.authentication.token.validity",
- "value":"36000",
- "source":[
- "core-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"fs.AbstractFileSystem.wasb.impl",
- "value":"org.apache.hadoop.fs.azurenative.Wasb",
- "source":[
- "core-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"hadoop.security.group.mapping.ldap.search.filter.group",
- "value":"(objectClass=group)",
- "source":[
- "core-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.client.failover.max.attempts",
- "value":"15",
- "source":[
- "hdfs-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.resourcemanager.scheduler.monitor.policies",
- "value":"org.apache.hadoop.yarn.server.resourcemanager.monitor.capacity.ProportionalCapacityPreemptionPolicy",
- "source":[
- "yarn-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.resourcemanager.fs.state-store.retry-policy-spec",
- "value":"2000, 500",
- "source":[
- "yarn-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.admin.acl",
- "value":"*",
- "source":[
- "yarn-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.sleepjob.reduce.sleep.time",
- "value":"12000000",
- "source":[
- "programatically",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.nodemanager.local-cache.max-files-per-directory",
- "value":"8192",
- "source":[
- "yarn-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.client.failover-retries-on-socket-timeouts",
- "value":"0",
- "source":[
- "yarn-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.resourcemanager.application-tokens.master-key-rolling-interval-secs",
- "value":"86400",
- "source":[
- "yarn-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.namenode.retrycache.expirytime.millis",
- "value":"600000",
- "source":[
- "hdfs-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.resourcemanager.nodemanagers.heartbeat-interval-ms",
- "value":"1000",
- "source":[
- "yarn-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.client.failover.connection.retries.on.timeouts",
- "value":"0",
- "source":[
- "hdfs-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.client.failover-proxy-provider",
- "value":"org.apache.hadoop.yarn.client.ConfiguredRMFailoverProxyProvider",
- "source":[
- "yarn-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.map.sort.spill.percent",
- "value":"0.9",
- "source":[
- "mapred-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"file.stream-buffer-size",
- "value":"4096",
- "source":[
- "core-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.webhdfs.enabled",
- "value":"true",
- "source":[
- "hdfs-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"io.compression.codec.lzo.class",
- "value":"com.hadoop.compression.lzo.LzoCodec",
- "source":[
- "core-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"ipc.client.connection.maxidletime",
- "value":"30000",
- "source":[
- "core-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.jobtracker.persist.jobstatus.hours",
- "value":"1",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.image.transfer.chunksize",
- "value":"65536",
- "source":[
- "hdfs-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.nodemanager.resourcemanager.connect.retry_interval.secs",
- "value":"30",
- "source":[
- "yarn-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.nodemanager.address",
- "value":"0.0.0.0:45454",
- "source":[
- "yarn-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.datanode.ipc.address",
- "value":"0.0.0.0:8010",
- "source":[
- "hdfs-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.resourcemanager.ha.automatic-failover.embedded",
- "value":"true",
- "source":[
- "yarn-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.jobhistory.recovery.store.fs.uri",
- "value":"${hadoop.tmp.dir}/mapred/history/recoverystore",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.resourcemanager.zk-state-store.parent-path",
- "value":"/rmstore",
- "source":[
- "yarn-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.app.mapreduce.am.job.task.listener.thread-count",
- "value":"30",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.namenode.list.cache.pools.num.responses",
- "value":"100",
- "source":[
- "hdfs-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"hadoop.proxyuser.hbase.groups",
- "value":"users",
- "source":[
- "core-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.client.read.shortcircuit",
- "value":"true",
- "source":[
- "hdfs-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.namenode.safemode.extension",
- "value":"30000",
- "source":[
- "hdfs-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.timeline-service.generic-application-history.fs-history-store.compression-type",
- "value":"none",
- "source":[
- "yarn-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"ha.zookeeper.parent-znode",
- "value":"/hadoop-ha",
- "source":[
- "core-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.nodemanager.container-executor.class",
- "value":"org.apache.hadoop.yarn.server.nodemanager.DefaultContainerExecutor",
- "source":[
- "yarn-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"io.skip.checksum.errors",
- "value":"false",
- "source":[
- "core-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.namenode.path.based.cache.refresh.interval.ms",
- "value":"30000",
- "source":[
- "hdfs-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.job.user.name",
- "value":"hdfs",
- "source":[
- "programatically",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.resourcemanager.scheduler.client.thread-count",
- "value":"50",
- "source":[
- "yarn-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"hadoop.http.authentication.kerberos.principal",
- "value":"HTTP/_HOST@LOCALHOST",
- "source":[
- "core-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.reduce.log.level",
- "value":"INFO",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.nodemanager.linux-container-executor.nonsecure-mode.user-pattern",
- "value":"^[_.A-Za-z0-9][-@_.A-Za-z0-9]{0,255}?[$]?$",
- "source":[
- "yarn-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"fs.s3.maxRetries",
- "value":"4",
- "source":[
- "core-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"ipc.server.max.response.size",
- "value":"5242880",
- "source":[
- "hdfs-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.admin.reduce.child.java.opts",
- "value":"-server -XX:NewRatio=8 -Djava.net.preferIPv4Stack=true",
- "source":[
- "mapred-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.nodemanager.resourcemanager.minimum.version",
- "value":"NONE",
- "source":[
- "yarn-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"hadoop.kerberos.kinit.command",
- "value":"kinit",
- "source":[
- "core-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.log-aggregation.retain-check-interval-seconds",
- "value":"-1",
- "source":[
- "yarn-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.nodemanager.process-kill-wait.ms",
- "value":"2000",
- "source":[
- "yarn-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.nodemanager.linux-container-executor.cgroups.mount",
- "value":"false",
- "source":[
- "yarn-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.map.output.key.class",
- "value":"org.apache.hadoop.io.IntWritable",
- "source":[
- "programatically",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.job.working.dir",
- "value":"hdfs://hdfs.host.yarn.com:8020/user/hdfs",
- "source":[
- "programatically",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.namenode.name.dir.restore",
- "value":"false",
- "source":[
- "hdfs-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.jobtracker.handler.count",
- "value":"10",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.jobhistory.admin.address",
- "value":"0.0.0.0:10033",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.app.mapreduce.client-am.ipc.max-retries",
- "value":"3",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.client.use.datanode.hostname",
- "value":"false",
- "source":[
- "hdfs-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"hadoop.util.hash.type",
- "value":"murmur",
- "source":[
- "core-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.datanode.available-space-volume-choosing-policy.balanced-space-preference-fraction",
- "value":"0.75f",
- "source":[
- "hdfs-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.datanode.dns.interface",
- "value":"default",
- "source":[
- "hdfs-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"io.seqfile.lazydecompress",
- "value":"true",
- "source":[
- "core-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.nodemanager.disk-health-checker.min-healthy-disks",
- "value":"0.25",
- "source":[
- "yarn-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.job.maxtaskfailures.per.tracker",
- "value":"3",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.tasktracker.healthchecker.script.timeout",
- "value":"600000",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.client.max-nodemanagers-proxies",
- "value":"500",
- "source":[
- "yarn-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"hadoop.security.group.mapping.ldap.search.attr.group.name",
- "value":"cn",
- "source":[
- "core-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"fs.df.interval",
- "value":"60000",
- "source":[
- "core-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.namenode.kerberos.internal.spnego.principal",
- "value":"${dfs.web.authentication.kerberos.principal}",
- "source":[
- "hdfs-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.client.cached.conn.retry",
- "value":"3",
- "source":[
- "hdfs-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.job.reduce.class",
- "value":"org.apache.hadoop.mapreduce.SleepJob$SleepReducer",
- "source":[
- "programatically",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.job.map.class",
- "value":"org.apache.hadoop.mapreduce.SleepJob$SleepMapper",
- "source":[
- "programatically",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.job.reduce.shuffle.consumer.plugin.class",
- "value":"org.apache.hadoop.mapreduce.task.reduce.Shuffle",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.jobtracker.address",
- "value":"local",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.tasktracker.tasks.sleeptimebeforesigkill",
- "value":"5000",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.journalnode.rpc-address",
- "value":"0.0.0.0:8485",
- "source":[
- "hdfs-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.namenode.fs-limits.max-blocks-per-file",
- "value":"1048576",
- "source":[
- "hdfs-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.job.acl-view-job",
- "value":"*",
- "source":[
- "mapred-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.app.mapreduce.am.job.committer.cancel-timeout",
- "value":"60000",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.client.block.write.replace-datanode-on-failure.policy",
- "value":"DEFAULT",
- "source":[
- "hdfs-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.shuffle.connection-keep-alive.enable",
- "value":"false",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.job.counters.group.name.max",
- "value":"1000",
- "source":[
- "mapred-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.namenode.replication.interval",
- "value":"3",
- "source":[
- "hdfs-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.jobhistory.minicluster.fixed.ports",
- "value":"false",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.namenode.num.checkpoints.retained",
- "value":"2",
- "source":[
- "hdfs-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.resourcemanager.scheduler.address",
- "value":"${yarn.resourcemanager.hostname}:8030",
- "source":[
- "yarn-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.tasktracker.http.address",
- "value":"0.0.0.0:50060",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.jobhistory.admin.acl",
- "value":"*",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.datanode.directoryscan.threads",
- "value":"1",
- "source":[
- "hdfs-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.reduce.memory.mb",
- "value":"3072",
- "source":[
- "mapred-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"hadoop.security.group.mapping.ldap.ssl",
- "value":"false",
- "source":[
- "core-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.nodemanager.principal",
- "value":"nm/_HOST@EXAMPLE.COM",
- "source":[
- "yarn-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.http.policy",
- "value":"HTTP_ONLY",
- "source":[
- "hdfs-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.task.merge.progress.records",
- "value":"10000",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.heartbeat.interval",
- "value":"3",
- "source":[
- "hdfs-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.resourcemanager.recovery.enabled",
- "value":"false",
- "source":[
- "yarn-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"net.topology.script.number.args",
- "value":"100",
- "source":[
- "core-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.hosts.exclude",
- "value":"/etc/hadoop/conf/dfs.exclude",
- "source":[
- "hdfs-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.local.clientfactory.class.name",
- "value":"org.apache.hadoop.mapred.LocalClientFactory",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.client-write-packet-size",
- "value":"65536",
- "source":[
- "hdfs-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"hadoop.security.group.mapping.ldap.directory.search.timeout",
- "value":"10000",
- "source":[
- "core-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"io.native.lib.available",
- "value":"true",
- "source":[
- "core-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.client.failover.connection.retries",
- "value":"0",
- "source":[
- "hdfs-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.nodemanager.disk-health-checker.interval-ms",
- "value":"120000",
- "source":[
- "yarn-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.blocksize",
- "value":"134217728",
- "source":[
- "hdfs-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.resourcemanager.container-tokens.master-key-rolling-interval-secs",
- "value":"86400",
- "source":[
- "yarn-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.jobhistory.webapp.address",
- "value":"host.yarn.com:19888",
- "source":[
- "mapred-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.resourcemanager.resource-tracker.client.thread-count",
- "value":"50",
- "source":[
- "yarn-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.client.failover-retries",
- "value":"0",
- "source":[
- "yarn-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.blockreport.initialDelay",
- "value":"120",
- "source":[
- "hdfs-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.nodemanager.aux-services.mapreduce_shuffle.class",
- "value":"org.apache.hadoop.mapred.ShuffleHandler",
- "source":[
- "yarn-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"ha.health-monitor.rpc-timeout.ms",
- "value":"45000",
- "source":[
- "core-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.resourcemanager.zk-timeout-ms",
- "value":"10000",
- "source":[
- "yarn-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.reduce.markreset.buffer.percent",
- "value":"0.0",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.timeline-service.leveldb-timeline-store.start-time-read-cache-size",
- "value":"10000",
- "source":[
- "yarn-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.ha.tail-edits.period",
- "value":"60",
- "source":[
- "hdfs-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.admin.user.env",
- "value":"LD_LIBRARY_PATH=/usr/lib/hadoop/lib/native:/usr/lib/hadoop/lib/native/`$JAVA_HOME/bin/java -d32 -version &> /dev/null;if [ $? -eq 0 ]; then echo Linux-i386-32; else echo Linux-amd64-64;fi`",
- "source":[
- "mapred-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.resourcemanager.client.thread-count",
- "value":"50",
- "source":[
- "yarn-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.nodemanager.health-checker.script.timeout-ms",
- "value":"60000",
- "source":[
- "yarn-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"file.bytes-per-checksum",
- "value":"512",
- "source":[
- "core-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.replication.max",
- "value":"50",
- "source":[
- "hdfs-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.namenode.max.extra.edits.segments.retained",
- "value":"10000",
- "source":[
- "hdfs-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"io.map.index.skip",
- "value":"0",
- "source":[
- "core-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.nodemanager.webapp.spnego-principal",
- "value":"HTTP/_HOST@EXAMPLE.COM",
- "source":[
- "yarn-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.task.timeout",
- "value":"600000",
- "source":[
- "mapred-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.datanode.du.reserved",
- "value":"1073741824",
- "source":[
- "hdfs-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.reduce.cpu.vcores",
- "value":"1",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.support.append",
- "value":"true",
- "source":[
- "hdfs-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.client.file-block-storage-locations.num-threads",
- "value":"10",
- "source":[
- "hdfs-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"ftp.blocksize",
- "value":"67108864",
- "source":[
- "core-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.nodemanager.container-manager.thread-count",
- "value":"20",
- "source":[
- "yarn-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"ipc.server.listen.queue.size",
- "value":"128",
- "source":[
- "core-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.resourcemanager.amliveliness-monitor.interval-ms",
- "value":"1000",
- "source":[
- "yarn-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.resourcemanager.ha.automatic-failover.enabled",
- "value":"true",
- "source":[
- "yarn-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"hadoop.ssl.hostname.verifier",
- "value":"DEFAULT",
- "source":[
- "core-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.tasktracker.dns.interface",
- "value":"default",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"hadoop.security.group.mapping.ldap.search.attr.member",
- "value":"member",
- "source":[
- "core-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.job.userlog.retain.hours",
- "value":"24",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.tasktracker.outofband.heartbeat",
- "value":"false",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.log.server.url",
- "value":"http://host.yarn.com:19888/jobhistory/logs",
- "source":[
- "yarn-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.job.name",
- "value":"Sleep job",
- "source":[
- "programatically",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.nodemanager.resource.memory-mb",
- "value":"8192",
- "source":[
- "yarn-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.webhdfs.user.provider.user.pattern",
- "value":"^[A-Za-z_][A-Za-z0-9._-]*[$]?$",
- "source":[
- "hdfs-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.web.authentication.kerberos.keytab",
- "value":"/etc/security/keytabs/spnego.service.keytab",
- "source":[
- "hdfs-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.namenode.delegation.token.renew-interval",
- "value":"86400000",
- "source":[
- "hdfs-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"hadoop.ssl.keystores.factory.class",
- "value":"org.apache.hadoop.security.ssl.FileBasedKeyStoresFactory",
- "source":[
- "core-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.http.policy",
- "value":"HTTP_ONLY",
- "source":[
- "yarn-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.datanode.sync.behind.writes",
- "value":"false",
- "source":[
- "hdfs-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.client.read.shortcircuit.skip.checksum",
- "value":"false",
- "source":[
- "hdfs-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.map.maxattempts",
- "value":"4",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.timeline-service.webapp.address",
- "value":"${yarn.timeline-service.hostname}:8188",
- "source":[
- "yarn-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.datanode.handler.count",
- "value":"10",
- "source":[
- "hdfs-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"hadoop.ssl.require.client.cert",
- "value":"false",
- "source":[
- "core-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"ftp.client-write-packet-size",
- "value":"65536",
- "source":[
- "core-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.client.write.exclude.nodes.cache.expiry.interval.millis",
- "value":"600000",
- "source":[
- "hdfs-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"ipc.server.tcpnodelay",
- "value":"false",
- "source":[
- "core-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.jobhistory.cleaner.enable",
- "value":"true",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"fs.du.interval",
- "value":"600000",
- "source":[
- "core-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.reduce.shuffle.retry-delay.max.ms",
- "value":"60000",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.task.profile.reduces",
- "value":"0-2",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"ha.health-monitor.connect-retry-interval.ms",
- "value":"1000",
- "source":[
- "core-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"hadoop.fuse.connection.timeout",
- "value":"300",
- "source":[
- "hdfs-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.permissions.superusergroup",
- "value":"hdfs",
- "source":[
- "hdfs-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.jobtracker.jobhistory.task.numberprogresssplits",
- "value":"12",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.job.counters.counter.name.max",
- "value":"1000",
- "source":[
- "mapred-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"fs.ftp.host.port",
- "value":"21",
- "source":[
- "core-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.map.speculative",
- "value":"false",
- "source":[
- "programatically",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.datanode.data.dir.perm",
- "value":"755",
- "source":[
- "hdfs-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.client.submit.file.replication",
- "value":"10",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.job.ubertask.maxmaps",
- "value":"9",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"s3native.blocksize",
- "value":"67108864",
- "source":[
- "core-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.namenode.replication.min",
- "value":"1",
- "source":[
- "hdfs-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.cluster.acls.enabled",
- "value":"false",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.jobhistory.webapp.https.address",
- "value":"host.yarn.com:19888",
- "source":[
- "mapred-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"hadoop.security.uid.cache.secs",
- "value":"14400",
- "source":[
- "core-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.nodemanager.localizer.fetch.thread-count",
- "value":"4",
- "source":[
- "yarn-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"map.sort.class",
- "value":"org.apache.hadoop.util.QuickSort",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"fs.trash.checkpoint.interval",
- "value":"0",
- "source":[
- "core-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"hadoop.proxyuser.hcat.groups",
- "value":"users",
- "source":[
- "core-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapred.queue.default.acl-administer-jobs",
- "value":"*",
- "source":[
- "programatically",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.image.transfer.timeout",
- "value":"60000",
- "source":[
- "hdfs-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.namenode.name.dir",
- "value":"/var/hadoop/namenode",
- "source":[
- "hdfs-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"ipc.client.connect.timeout",
- "value":"20000",
- "source":[
- "core-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.app.mapreduce.am.staging-dir",
- "value":"/user",
- "source":[
- "mapred-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"fs.AbstractFileSystem.file.impl",
- "value":"org.apache.hadoop.fs.local.LocalFs",
- "source":[
- "core-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.nodemanager.env-whitelist",
- "value":"JAVA_HOME,HADOOP_COMMON_HOME,HADOOP_HDFS_HOME,HADOOP_CONF_DIR,HADOOP_YARN_HOME",
- "source":[
- "yarn-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.image.compression.codec",
- "value":"org.apache.hadoop.io.compress.DefaultCodec",
- "source":[
- "hdfs-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.job.reduces",
- "value":"1",
- "source":[
- "programatically",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.job.complete.cancel.delegation.tokens",
- "value":"true",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.jobhistory.recovery.store.class",
- "value":"org.apache.hadoop.mapreduce.v2.hs.HistoryServerFileSystemStateStoreService",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"hadoop.security.group.mapping.ldap.search.filter.user",
- "value":"(&(objectClass=user)(sAMAccountName={0}))",
- "source":[
- "core-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.namenode.enable.retrycache",
- "value":"true",
- "source":[
- "hdfs-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.nodemanager.sleep-delay-before-sigkill.ms",
- "value":"250",
- "source":[
- "yarn-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.jobhistory.joblist.cache.size",
- "value":"20000",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.job.outputformat.class",
- "value":"org.apache.hadoop.mapreduce.lib.output.NullOutputFormat",
- "source":[
- "programatically",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.tasktracker.healthchecker.interval",
- "value":"60000",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.jobtracker.heartbeats.in.second",
- "value":"100",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"hadoop.security.auth_to_local",
- "value":"\n RULE:[2:$1@$0](jhs@.*EXAMPLE.COM)s/.*/mapred/\n RULE:[2:$1@$0]([nr]m@.*EXAMPLE.COM)s/.*/yarn/\n RULE:[2:$1@$0]([nd]n@.*EXAMPLE.COM)s/.*/hdfs/\n DEFAULT",
- "source":[
- "core-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.admin.map.child.java.opts",
- "value":"-server -XX:NewRatio=8 -Djava.net.preferIPv4Stack=true",
- "source":[
- "mapred-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.jobtracker.persist.jobstatus.dir",
- "value":"/jobtracker/jobsInfo",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.namenode.backup.http-address",
- "value":"0.0.0.0:50105",
- "source":[
- "hdfs-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"hadoop.rpc.protection",
- "value":"authentication",
- "source":[
- "core-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.client.mmap.enabled",
- "value":"true",
- "source":[
- "hdfs-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.app.mapreduce.am.container.log.backups",
- "value":"0",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"ftp.stream-buffer-size",
- "value":"4096",
- "source":[
- "core-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.namenode.https-address",
- "value":"host.yarn.com:50701",
- "source":[
- "hdfs-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.timeline-service.address",
- "value":"${yarn.timeline-service.hostname}:10200",
- "source":[
- "yarn-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.ha.log-roll.period",
- "value":"120",
- "source":[
- "hdfs-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.resourcemanager.webapp.spnego-keytab-file",
- "value":"/etc/security/keytabs/spnego.service.keytab",
- "source":[
- "yarn-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.resourcemanager.admin.client.thread-count",
- "value":"1",
- "source":[
- "yarn-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.jobhistory.webapp.spnego-keytab-file",
- "value":"/etc/security/keytabs/spnego.service.keytab",
- "source":[
- "yarn-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.datanode.fsdatasetcache.max.threads.per.volume",
- "value":"4",
- "source":[
- "hdfs-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"file.client-write-packet-size",
- "value":"65536",
- "source":[
- "core-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"hadoop.http.authentication.simple.anonymous.allowed",
- "value":"true",
- "source":[
- "core-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.timeline-service.leveldb-timeline-store.path",
- "value":"${yarn.log.dir}/timeline",
- "source":[
- "yarn-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.datanode.drop.cache.behind.reads",
- "value":"false",
- "source":[
- "hdfs-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.nodemanager.log.retain-seconds",
- "value":"10800",
- "source":[
- "yarn-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.image.transfer.bandwidthPerSec",
- "value":"0",
- "source":[
- "hdfs-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.tasktracker.instrumentation",
- "value":"org.apache.hadoop.mapred.TaskTrackerMetricsInst",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"ha.failover-controller.cli-check.rpc-timeout.ms",
- "value":"20000",
- "source":[
- "core-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.nodemanager.linux-container-executor.cgroups.hierarchy",
- "value":"/hadoop-yarn",
- "source":[
- "yarn-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.namenode.write.stale.datanode.ratio",
- "value":"0.5f",
- "source":[
- "hdfs-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"hadoop.security.groups.cache.warn.after.ms",
- "value":"5000",
- "source":[
- "core-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.jobhistory.client.thread-count",
- "value":"10",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"io.mapfile.bloom.size",
- "value":"1048576",
- "source":[
- "core-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.ha.fencing.ssh.connect-timeout",
- "value":"30000",
- "source":[
- "core-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.resourcemanager.zk-num-retries",
- "value":"500",
- "source":[
- "yarn-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"s3.bytes-per-checksum",
- "value":"512",
- "source":[
- "core-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.app.mapreduce.am.container.log.limit.kb",
- "value":"0",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.namenode.edit.log.autoroll.check.interval.ms",
- "value":"300000",
- "source":[
- "hdfs-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"fs.automatic.close",
- "value":"true",
- "source":[
- "core-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.app.mapreduce.am.create-intermediate-jh-base-dir",
- "value":"false",
- "source":[
- "mapred-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"fs.trash.interval",
- "value":"360",
- "source":[
- "core-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.journalnode.https-address",
- "value":"0.0.0.0:8481",
- "source":[
- "hdfs-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"hadoop.security.authentication",
- "value":"simple",
- "source":[
- "core-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.timeline-service.ttl-ms",
- "value":"604800000",
- "source":[
- "yarn-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"fs.defaultFS",
- "value":"hdfs://hdfs.host.yarn.com:8020",
- "source":[
- "core-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.timeline-service.generic-application-history.enabled",
- "value":"false",
- "source":[
- "yarn-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"hadoop.ssl.server.conf",
- "value":"ssl-server.xml",
- "source":[
- "core-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"ipc.client.connect.max.retries",
- "value":"50",
- "source":[
- "core-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.resourcemanager.delayed.delegation-token.removal-interval-ms",
- "value":"30000",
- "source":[
- "yarn-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.journalnode.http-address",
- "value":"0.0.0.0:8480",
- "source":[
- "hdfs-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.datanode.shared.file.descriptor.paths",
- "value":"/dev/shm,/tmp",
- "source":[
- "hdfs-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.jobtracker.taskscheduler",
- "value":"org.apache.hadoop.mapred.JobQueueTaskScheduler",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.job.speculative.speculativecap",
- "value":"0.1",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.timeline-service.store-class",
- "value":"org.apache.hadoop.yarn.server.applicationhistoryservice.timeline.LeveldbTimelineStore",
- "source":[
- "yarn-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.am.liveness-monitor.expiry-interval-ms",
- "value":"600000",
- "source":[
- "yarn-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.output.fileoutputformat.compress",
- "value":"false",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.checksum.type",
- "value":"CRC32",
- "source":[
- "hdfs-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"ipc.server.read.threadpool.size",
- "value":"5",
- "source":[
- "hdfs-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"net.topology.node.switch.mapping.impl",
- "value":"org.apache.hadoop.net.ScriptBasedMapping",
- "source":[
- "core-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.namenode.replication.considerLoad",
- "value":"true",
- "source":[
- "hdfs-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.namenode.fs-limits.min-block-size",
- "value":"1048576",
- "source":[
- "hdfs-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"fs.swift.impl",
- "value":"org.apache.hadoop.fs.swift.snative.SwiftNativeFileSystem",
- "source":[
- "core-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.namenode.audit.loggers",
- "value":"default",
- "source":[
- "hdfs-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.job.max.split.locations",
- "value":"10",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.resourcemanager.address",
- "value":"${yarn.resourcemanager.hostname}:8032",
- "source":[
- "yarn-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.job.counters.max",
- "value":"20000",
- "source":[
- "mapred-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.client.block.write.retries",
- "value":"3",
- "source":[
- "hdfs-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.resourcemanager.nm.liveness-monitor.interval-ms",
- "value":"1000",
- "source":[
- "yarn-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.short.circuit.shared.memory.watcher.interrupt.check.ms",
- "value":"60000",
- "source":[
- "hdfs-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"io.map.index.interval",
- "value":"128",
- "source":[
- "core-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapred.child.java.opts",
- "value":"-Xmx200m",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.tasktracker.local.dir.minspacestart",
- "value":"0",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.client.progressmonitor.pollinterval",
- "value":"1000",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.client.https.keystore.resource",
- "value":"ssl-client.xml",
- "source":[
- "hdfs-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.task.profile.map.params",
- "value":"${mapreduce.task.profile.params}",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"rpc.engine.org.apache.hadoop.hdfs.protocolPB.ClientNamenodeProtocolPB",
- "value":"org.apache.hadoop.ipc.ProtobufRpcEngine",
- "source":[
- "programatically",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.jobtracker.tasktracker.maxblacklists",
- "value":"4",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.job.queuename",
- "value":"default",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.app.mapreduce.client-am.ipc.max-retries-on-timeouts",
- "value":"3",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.nodemanager.localizer.address",
- "value":"${yarn.nodemanager.hostname}:8040",
- "source":[
- "yarn-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"io.mapfile.bloom.error.rate",
- "value":"0.005",
- "source":[
- "core-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.nodemanager.delete.thread-count",
- "value":"4",
- "source":[
- "yarn-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.job.split.metainfo.maxsize",
- "value":"10000000",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.scheduler.maximum-allocation-vcores",
- "value":"32",
- "source":[
- "yarn-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapred.mapper.new-api",
- "value":"true",
- "source":[
- "programatically",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"ipc.client.tcpnodelay",
- "value":"false",
- "source":[
- "core-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.job.dir",
- "value":"/user/hdfs/.staging/job_1399541193872_0035",
- "source":[
- "programatically",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.https.port",
- "value":"50070",
- "source":[
- "hdfs-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.app.mapreduce.am.resource.mb",
- "value":"1536",
- "source":[
- "mapred-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.datanode.dns.nameserver",
- "value":"default",
- "source":[
- "hdfs-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.nodemanager.disk-health-checker.min-free-space-per-disk-mb",
- "value":"0",
- "source":[
- "yarn-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.map.output.compress.codec",
- "value":"org.apache.hadoop.io.compress.SnappyCodec",
- "source":[
- "mapred-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapred.child.root.logger",
- "value":"INFO,TLA",
- "source":[
- "mapred-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.namenode.accesstime.precision",
- "value":"0",
- "source":[
- "hdfs-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.map.log.level",
- "value":"INFO",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"io.seqfile.compress.blocksize",
- "value":"1000000",
- "source":[
- "core-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.tasktracker.taskcontroller",
- "value":"org.apache.hadoop.mapred.DefaultTaskController",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"hadoop.security.groups.cache.secs",
- "value":"300",
- "source":[
- "core-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.client.context",
- "value":"default",
- "source":[
- "hdfs-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"hadoop.proxyuser.hbase.hosts",
- "value":"*",
- "source":[
- "core-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"hadoop.proxyuser.hive.groups",
- "value":"users",
- "source":[
- "core-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.fileoutputcommitter.marksuccessfuljobs",
- "value":"true",
- "source":[
- "mapred-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.job.end-notification.max.attempts",
- "value":"5",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.nodemanager.linux-container-executor.nonsecure-mode.local-user",
- "value":"nobody",
- "source":[
- "yarn-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.nodemanager.webapp.address",
- "value":"0.0.0.0:50060",
- "source":[
- "yarn-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.job.submithostname",
- "value":"host.yarn.com",
- "source":[
- "programatically",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.jobhistory.recovery.enable",
- "value":"false",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.jobtracker.expire.trackers.interval",
- "value":"600000",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.resourcemanager.webapp.address",
- "value":"host.yarn.com:8088",
- "source":[
- "yarn-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.nodemanager.health-checker.interval-ms",
- "value":"135000",
- "source":[
- "yarn-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.jobhistory.loadedjobs.cache.size",
- "value":"5",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.resourcemanager.history-writer.multi-threaded-dispatcher.pool-size",
- "value":"10",
- "source":[
- "yarn-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"hadoop.security.authorization",
- "value":"false",
- "source":[
- "core-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.job.map.output.collector.class",
- "value":"org.apache.hadoop.mapred.MapTask$MapOutputBuffer",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.am.max-attempts",
- "value":"2",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"fs.ftp.host",
- "value":"0.0.0.0",
- "source":[
- "core-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.app.mapreduce.am.scheduler.heartbeat.interval-ms",
- "value":"1000",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.datanode.kerberos.principal",
- "value":"dn/_HOST@EXAMPLE.COM",
- "source":[
- "hdfs-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.ifile.readahead",
- "value":"true",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.resourcemanager.scheduler.monitor.enable",
- "value":"false",
- "source":[
- "yarn-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.resourcemanager.zk-retry-interval-ms",
- "value":"2000",
- "source":[
- "yarn-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"ha.zookeeper.session-timeout.ms",
- "value":"5000",
- "source":[
- "core-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.tasktracker.taskmemorymanager.monitoringinterval",
- "value":"5000",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.reduce.shuffle.parallelcopies",
- "value":"30",
- "source":[
- "mapred-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.client.mmap.retry.timeout.ms",
- "value":"300000",
- "source":[
- "hdfs-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.map.skip.maxrecords",
- "value":"0",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.job.classloader.system.classes",
- "value":"java.,javax.,org.apache.commons.logging.,org.apache.log4j.,org.apache.hadoop.",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.namenode.avoid.read.stale.datanode",
- "value":"false",
- "source":[
- "hdfs-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.https.enable",
- "value":"false",
- "source":[
- "hdfs-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.timeline-service.webapp.https.address",
- "value":"${yarn.timeline-service.hostname}:8190",
- "source":[
- "yarn-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.reduce.shuffle.read.timeout",
- "value":"180000",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"yarn.nodemanager.remote-app-log-dir-suffix",
- "value":"logs",
- "source":[
- "yarn-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.output.fileoutputformat.compress.codec",
- "value":"org.apache.hadoop.io.compress.DefaultCodec",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.jobtracker.instrumentation",
- "value":"org.apache.hadoop.mapred.JobTrackerMetricsInst",
- "source":[
- "mapred-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.blockreport.intervalMsec",
- "value":"21600000",
- "source":[
- "hdfs-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"ipc.client.connect.retry.interval",
- "value":"1000",
- "source":[
- "core-default.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.reduce.speculative",
- "value":"false",
- "source":[
- "programatically",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"mapreduce.jobhistory.keytab",
- "value":"/etc/security/keytabs/jhs.service.keytab",
- "source":[
- "mapred-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name":"dfs.namenode.kerberos.principal",
- "value":"nn/_HOST@EXAMPLE.COM",
- "source":[
- "hdfs-site.xml",
- "hdfs://hdfs.host.yarn.com:8020/user/hdfs/.staging/job_1399541193872_0035/job.xml"
- ]
- },
- {
- "name"
<TRUNCATED>
[06/10] knox git commit: KNOX-1663 - Enforce more Checkstyle rules
Posted by kr...@apache.org.
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-spi/src/main/java/org/apache/knox/gateway/i18n/GatewaySpiMessages.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/i18n/GatewaySpiMessages.java b/gateway-spi/src/main/java/org/apache/knox/gateway/i18n/GatewaySpiMessages.java
index 2516f51..4270222 100644
--- a/gateway-spi/src/main/java/org/apache/knox/gateway/i18n/GatewaySpiMessages.java
+++ b/gateway-spi/src/main/java/org/apache/knox/gateway/i18n/GatewaySpiMessages.java
@@ -30,19 +30,19 @@ public interface GatewaySpiMessages {
@Message( level = MessageLevel.ERROR, text = "Failed to execute filter: {0}" )
void failedToExecuteFilter( @StackTrace( level = MessageLevel.DEBUG ) Throwable t );
-
+
@Message( level = MessageLevel.ERROR, text = "Failed to encrypt passphrase: {0}" )
void failedToEncryptPassphrase( @StackTrace( level = MessageLevel.DEBUG ) Exception e );
@Message( level = MessageLevel.ERROR, text = "Failed to generate secret key from password: {0}" )
void failedToGenerateKeyFromPassword( @StackTrace( level = MessageLevel.DEBUG ) Exception e );
-
+
@Message( level = MessageLevel.ERROR, text = "Failed to create keystore [filename={0}, type={1}]: {2}" )
void failedToCreateKeystore( String fileName, String keyStoreType, @StackTrace( level = MessageLevel.DEBUG ) Exception e );
-
+
@Message( level = MessageLevel.ERROR, text = "Failed to load keystore [filename={0}, type={1}]: {2}" )
void failedToLoadKeystore( String fileName, String keyStoreType, @StackTrace( level = MessageLevel.DEBUG ) Exception e );
-
+
@Message( level = MessageLevel.ERROR, text = "Failed to add credential: {1}" )
void failedToAddCredential( @StackTrace( level = MessageLevel.DEBUG ) Exception e );
@@ -51,7 +51,7 @@ public interface GatewaySpiMessages {
@Message( level = MessageLevel.ERROR, text = "Failed to get credential: {1}" )
void failedToGetCredential(@StackTrace( level = MessageLevel.DEBUG ) Exception e);
-
+
@Message( level = MessageLevel.ERROR, text = "Failed to persist master secret: {0}" )
void failedToPersistMasterSecret( @StackTrace( level = MessageLevel.DEBUG ) Exception e );
@@ -83,15 +83,15 @@ public interface GatewaySpiMessages {
void failedToGenerateCertificate( @StackTrace( level = MessageLevel.ERROR ) Exception e );
@Message(level = MessageLevel.ERROR, text = "Failed to read configuration: {0}")
- void failedToReadConfigurationFile(final String filePath, @StackTrace(level = MessageLevel.DEBUG) Exception e );
+ void failedToReadConfigurationFile(String filePath, @StackTrace(level = MessageLevel.DEBUG) Exception e );
@Message(level = MessageLevel.ERROR, text = "Invalid resource URI {0} : {1}")
- void invalidResourceURI(final String uri, final String reason, @StackTrace(level = MessageLevel.DEBUG) Exception e );
+ void invalidResourceURI(String uri, String reason, @StackTrace(level = MessageLevel.DEBUG) Exception e );
@Message(level = MessageLevel.ERROR, text = "Invalid resource name: {0}")
- void invalidResourceName(final String resourceName);
+ void invalidResourceName(String resourceName);
@Message( level = MessageLevel.ERROR, text = "Topology {0} cannot be manually overwritten because it was generated from a simple descriptor." )
- void disallowedOverwritingGeneratedTopology(final String topologyName);
+ void disallowedOverwritingGeneratedTopology(String topologyName);
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-spi/src/main/java/org/apache/knox/gateway/i18n/GatewaySpiResources.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/i18n/GatewaySpiResources.java b/gateway-spi/src/main/java/org/apache/knox/gateway/i18n/GatewaySpiResources.java
index 0a05f81..1aa90e2 100644
--- a/gateway-spi/src/main/java/org/apache/knox/gateway/i18n/GatewaySpiResources.java
+++ b/gateway-spi/src/main/java/org/apache/knox/gateway/i18n/GatewaySpiResources.java
@@ -24,7 +24,7 @@ import org.apache.knox.gateway.i18n.resources.Resources;
public interface GatewaySpiResources {
@Resource(text = "Groups: {0}")
String groupsList( String groups );
-
+
@Resource(text = "Effective User: {0}")
String effectiveUser( String user );
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/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 485356f..ba623ca 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
@@ -25,7 +25,7 @@ public class GroupPrincipal implements Principal {
public GroupPrincipal(String name) {
this.name = name;
}
-
+
@Override
public String getName() {
return name;
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-spi/src/main/java/org/apache/knox/gateway/security/ImpersonatedPrincipal.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/security/ImpersonatedPrincipal.java b/gateway-spi/src/main/java/org/apache/knox/gateway/security/ImpersonatedPrincipal.java
index f9809e6..1e134b3 100644
--- a/gateway-spi/src/main/java/org/apache/knox/gateway/security/ImpersonatedPrincipal.java
+++ b/gateway-spi/src/main/java/org/apache/knox/gateway/security/ImpersonatedPrincipal.java
@@ -21,11 +21,11 @@ import java.security.Principal;
public class ImpersonatedPrincipal implements Principal {
private String name = null;
-
+
public ImpersonatedPrincipal(String name) {
this.name = name;
}
-
+
@Override
public String getName() {
return name;
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/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 cfa6518..59ed99e 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
@@ -25,7 +25,7 @@ public class PrimaryPrincipal implements Principal {
public PrimaryPrincipal(String name) {
this.name = name;
}
-
+
@Override
public String getName() {
return name;
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-spi/src/main/java/org/apache/knox/gateway/security/SubjectUtils.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/security/SubjectUtils.java b/gateway-spi/src/main/java/org/apache/knox/gateway/security/SubjectUtils.java
index 71340c0..aac20af 100644
--- a/gateway-spi/src/main/java/org/apache/knox/gateway/security/SubjectUtils.java
+++ b/gateway-spi/src/main/java/org/apache/knox/gateway/security/SubjectUtils.java
@@ -26,7 +26,6 @@ import java.util.Set;
* General utility methods for interrogating the standard java Subject
*/
public class SubjectUtils {
-
public static Subject getCurrentSubject() {
return Subject.getSubject( AccessController.getContext() );
}
@@ -47,16 +46,12 @@ public class SubjectUtils {
name = p.getName();
break;
}
-
+
return name;
}
-
+
public static boolean isImpersonating(Subject subject) {
- boolean impersonating = false;
-
- impersonating = (subject.getPrincipals(ImpersonatedPrincipal.class).size() > 0);
-
- return impersonating;
+ return (subject.getPrincipals(ImpersonatedPrincipal.class).size() > 0);
}
public static String getImpersonatedPrincipalName(Subject subject) {
@@ -66,18 +61,16 @@ public class SubjectUtils {
if (!impPrincipals.isEmpty()) {
return ((Principal)impPrincipals.toArray()[0]).getName();
}
-
+
return name;
}
-
+
public static String getEffectivePrincipalName(Subject subject) {
- String name = null;
-
- name = getImpersonatedPrincipalName(subject);
+ String name = getImpersonatedPrincipalName(subject);
if (name == null) {
name = getPrimaryPrincipalName(subject);
}
-
+
return name;
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-spi/src/main/java/org/apache/knox/gateway/security/principal/SimplePrincipalMapper.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/security/principal/SimplePrincipalMapper.java b/gateway-spi/src/main/java/org/apache/knox/gateway/security/principal/SimplePrincipalMapper.java
index 753cb08..fc7db6c 100644
--- a/gateway-spi/src/main/java/org/apache/knox/gateway/security/principal/SimplePrincipalMapper.java
+++ b/gateway-spi/src/main/java/org/apache/knox/gateway/security/principal/SimplePrincipalMapper.java
@@ -75,7 +75,6 @@ public class SimplePrincipalMapper implements PrincipalMapper {
if (p == null) {
return principalName;
}
-
return p[0];
}
@@ -83,18 +82,17 @@ public class SimplePrincipalMapper implements PrincipalMapper {
public String[] mapGroupPrincipal(String principalName) {
String[] groups = null;
String[] wildCardGroups = null;
-
+
if (groupMappings != null) {
groups = groupMappings.get(principalName);
wildCardGroups = groupMappings.get("*");
if (groups != null && wildCardGroups != null) {
- groups = concat(groups, wildCardGroups);
+ groups = concat(groups, wildCardGroups);
}
else if (wildCardGroups != null) {
return wildCardGroups;
}
}
-
return groups;
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-spi/src/main/java/org/apache/knox/gateway/services/GatewayServices.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/services/GatewayServices.java b/gateway-spi/src/main/java/org/apache/knox/gateway/services/GatewayServices.java
index 8fa2236..db512a0 100644
--- a/gateway-spi/src/main/java/org/apache/knox/gateway/services/GatewayServices.java
+++ b/gateway-spi/src/main/java/org/apache/knox/gateway/services/GatewayServices.java
@@ -24,27 +24,26 @@ import org.apache.knox.gateway.deploy.ProviderDeploymentContributor;
public interface GatewayServices extends Service,
ProviderDeploymentContributor {
- public static final String GATEWAY_CLUSTER_ATTRIBUTE = "org.apache.knox.gateway.gateway.cluster";
- public static final String GATEWAY_SERVICES_ATTRIBUTE = "org.apache.knox.gateway.gateway.services";
-
- public static final String SSL_SERVICE = "SSLService";
- public static final String CRYPTO_SERVICE = "CryptoService";
- public static final String ALIAS_SERVICE = "AliasService";
- public static final String KEYSTORE_SERVICE = "KeystoreService";
- public static final String TOKEN_SERVICE = "TokenService";
- public static final String SERVICE_REGISTRY_SERVICE = "ServiceRegistryService";
- public static final String HOST_MAPPING_SERVICE = "HostMappingService";
- public static final String SERVER_INFO_SERVICE = "ServerInfoService";
- public static final String TOPOLOGY_SERVICE = "TopologyService";
- public static final String SERVICE_DEFINITION_REGISTRY = "ServiceDefinitionRegistry";
- public static final String METRICS_SERVICE = "MetricsService";
+ String GATEWAY_CLUSTER_ATTRIBUTE = "org.apache.knox.gateway.gateway.cluster";
+ String GATEWAY_SERVICES_ATTRIBUTE = "org.apache.knox.gateway.gateway.services";
+
+ String SSL_SERVICE = "SSLService";
+ String CRYPTO_SERVICE = "CryptoService";
+ String ALIAS_SERVICE = "AliasService";
+ String KEYSTORE_SERVICE = "KeystoreService";
+ String TOKEN_SERVICE = "TokenService";
+ String SERVICE_REGISTRY_SERVICE = "ServiceRegistryService";
+ String HOST_MAPPING_SERVICE = "HostMappingService";
+ String SERVER_INFO_SERVICE = "ServerInfoService";
+ String TOPOLOGY_SERVICE = "TopologyService";
+ String SERVICE_DEFINITION_REGISTRY = "ServiceDefinitionRegistry";
+ String METRICS_SERVICE = "MetricsService";
String REMOTE_REGISTRY_CLIENT_SERVICE = "RemoteConfigRegistryClientService";
String CLUSTER_CONFIGURATION_MONITOR_SERVICE = "ClusterConfigurationMonitorService";
- public abstract Collection<String> getServiceNames();
-
- public abstract <T> T getService( String serviceName );
+ Collection<String> getServiceNames();
+ <T> T getService( String serviceName );
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-spi/src/main/java/org/apache/knox/gateway/services/ServerInfoService.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/services/ServerInfoService.java b/gateway-spi/src/main/java/org/apache/knox/gateway/services/ServerInfoService.java
index 2cb2f01..a9b3301 100644
--- a/gateway-spi/src/main/java/org/apache/knox/gateway/services/ServerInfoService.java
+++ b/gateway-spi/src/main/java/org/apache/knox/gateway/services/ServerInfoService.java
@@ -27,7 +27,7 @@ public interface ServerInfoService extends Service {
* @return build version
*/
String getBuildVersion();
-
+
/**
* Get the build hash for the server instance
* @return build hash
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-spi/src/main/java/org/apache/knox/gateway/services/Service.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/services/Service.java b/gateway-spi/src/main/java/org/apache/knox/gateway/services/Service.java
index 63a9baa..8e2f002 100644
--- a/gateway-spi/src/main/java/org/apache/knox/gateway/services/Service.java
+++ b/gateway-spi/src/main/java/org/apache/knox/gateway/services/Service.java
@@ -23,8 +23,8 @@ import org.apache.knox.gateway.config.GatewayConfig;
public interface Service {
void init(GatewayConfig config, Map<String,String> options) throws ServiceLifecycleException;
-
+
void start() throws ServiceLifecycleException;
-
+
void stop() throws ServiceLifecycleException;
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-spi/src/main/java/org/apache/knox/gateway/services/hostmap/HostMapper.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/services/hostmap/HostMapper.java b/gateway-spi/src/main/java/org/apache/knox/gateway/services/hostmap/HostMapper.java
index 9c008d0..90cd791 100644
--- a/gateway-spi/src/main/java/org/apache/knox/gateway/services/hostmap/HostMapper.java
+++ b/gateway-spi/src/main/java/org/apache/knox/gateway/services/hostmap/HostMapper.java
@@ -18,8 +18,7 @@
package org.apache.knox.gateway.services.hostmap;
public interface HostMapper {
- public abstract String resolveInboundHostName( String inboundHost );
-
- public abstract String resolveOutboundHostName( String outboundHost );
+ String resolveInboundHostName( String inboundHost );
+ String resolveOutboundHostName( String outboundHost );
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-spi/src/main/java/org/apache/knox/gateway/services/registry/ServiceRegistry.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/services/registry/ServiceRegistry.java b/gateway-spi/src/main/java/org/apache/knox/gateway/services/registry/ServiceRegistry.java
index d851767..aef6168 100644
--- a/gateway-spi/src/main/java/org/apache/knox/gateway/services/registry/ServiceRegistry.java
+++ b/gateway-spi/src/main/java/org/apache/knox/gateway/services/registry/ServiceRegistry.java
@@ -20,15 +20,13 @@ package org.apache.knox.gateway.services.registry;
import java.util.List;
public interface ServiceRegistry {
-
String getRegistrationCode(String clusterName);
-
+
boolean registerService(String regCode, String clusterName, String serviceName, List<String> urls);
-
+
String lookupServiceURL(String clusterName, String serviceName);
List<String> lookupServiceURLs( String clusterName, String serviceName );
-
- void removeClusterServices(String clusterName);
+ void removeClusterServices(String clusterName);
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/CryptoService.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/CryptoService.java b/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/CryptoService.java
index 5e0a7d4..e2ccd2a 100644
--- a/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/CryptoService.java
+++ b/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/CryptoService.java
@@ -20,16 +20,15 @@ package org.apache.knox.gateway.services.security;
import org.apache.knox.gateway.services.Service;
public interface CryptoService extends Service {
-
- public void createAndStoreEncryptionKeyForCluster(String clusterName, String alias);
-
- public EncryptionResult encryptForCluster(String clusterName, String alias, byte[] clear);
+ void createAndStoreEncryptionKeyForCluster(String clusterName, String alias);
- public byte[] decryptForCluster(String clusterName, String alias, String cipherText);
+ EncryptionResult encryptForCluster(String clusterName, String alias, byte[] clear);
- public byte[] decryptForCluster(String clusterName, String alias, byte[] cipherText, byte[] iv, byte[] salt);
+ byte[] decryptForCluster(String clusterName, String alias, String cipherText);
- public boolean verify(String algorithm, String alias, String payloadToSign, byte[] signaturePayload);
+ byte[] decryptForCluster(String clusterName, String alias, byte[] cipherText, byte[] iv, byte[] salt);
- public byte[] sign(String algorithm, String alias, String payloadToSign);
+ boolean verify(String algorithm, String alias, String payloadToSign, byte[] signaturePayload);
+
+ byte[] sign(String algorithm, String alias, String payloadToSign);
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/EncryptionResult.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/EncryptionResult.java b/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/EncryptionResult.java
index b2db1c4..3d3ccf4 100644
--- a/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/EncryptionResult.java
+++ b/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/EncryptionResult.java
@@ -23,17 +23,16 @@ public class EncryptionResult {
public byte[] salt;
public byte[] iv;
public byte[] cipher;
-
+
public EncryptionResult() {
-
}
-
+
public EncryptionResult(byte[] salt, byte[] iv, byte[] cipher) {
this.salt = salt;
this.iv = iv;
this.cipher = cipher;
}
-
+
public byte[] toByteAray() {
int headerLength = 12;
ByteBuffer bb = ByteBuffer.allocate(salt.length + iv.length + cipher.length + headerLength);
@@ -44,15 +43,15 @@ public class EncryptionResult {
.put(iv)
.put(cipher);
bb.flip();
-
+
return bb.array();
}
-
+
public static EncryptionResult fromByteArray(byte[] array) {
EncryptionResult result = new EncryptionResult();
-
+
ByteBuffer bb = ByteBuffer.wrap(array);
-
+
int saltSize = bb.getInt();
int ivSize = bb.getInt();
int cipherSize = bb.getInt();
@@ -60,11 +59,11 @@ public class EncryptionResult {
result.salt = new byte[saltSize];
result.iv = new byte[ivSize];
result.cipher = new byte[cipherSize];
-
+
bb.get(result.salt);
bb.get(result.iv);
bb.get(result.cipher);
-
+
return result;
}
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/KeystoreService.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/KeystoreService.java b/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/KeystoreService.java
index 0467565..5c21d90 100644
--- a/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/KeystoreService.java
+++ b/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/KeystoreService.java
@@ -25,7 +25,7 @@ public interface KeystoreService {
void createKeystoreForGateway() throws KeystoreServiceException;
void addSelfSignedCertForGateway(String alias, char[] passphrase) throws KeystoreServiceException;
-
+
void addSelfSignedCertForGateway(String alias, char[] passphrase, String hostname) throws KeystoreServiceException;
KeyStore getKeystoreForGateway() throws KeystoreServiceException;
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/MasterService.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/MasterService.java b/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/MasterService.java
index 99faad8..6c028ea 100644
--- a/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/MasterService.java
+++ b/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/MasterService.java
@@ -18,5 +18,5 @@
package org.apache.knox.gateway.services.security;
public interface MasterService {
- public abstract char[] getMasterSecret();
+ char[] getMasterSecret();
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/impl/BaseKeystoreService.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/impl/BaseKeystoreService.java b/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/impl/BaseKeystoreService.java
index 720e4c3..1f5ba58 100644
--- a/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/impl/BaseKeystoreService.java
+++ b/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/impl/BaseKeystoreService.java
@@ -47,9 +47,7 @@ public class BaseKeystoreService {
protected String keyStoreDir;
private static KeyStore loadKeyStore(final File keyStoreFile, final char[] masterPassword, String storeType)
- throws CertificateException, IOException, KeyStoreException,
- NoSuchAlgorithmException {
-
+ throws CertificateException, IOException, KeyStoreException, NoSuchAlgorithmException {
final KeyStore keyStore = KeyStore.getInstance(storeType);
if ( keyStoreFile.exists() ) {
try (FileInputStream input = new FileInputStream( keyStoreFile )) {
@@ -58,7 +56,7 @@ public class BaseKeystoreService {
} else {
keyStore.load( null, masterPassword );
}
-
+
return keyStore;
}
@@ -83,8 +81,8 @@ public class BaseKeystoreService {
protected void createKeystore(String filename, String keystoreType) throws KeystoreServiceException {
try (FileOutputStream out = createKeyStoreFile( filename )) {
- KeyStore ks = KeyStore.getInstance(keystoreType);
- ks.load( null, null );
+ KeyStore ks = KeyStore.getInstance(keystoreType);
+ ks.load( null, null );
ks.store( out, masterService.getMasterSecret() );
} catch (KeyStoreException e) {
LOG.failedToCreateKeystore( filename, keystoreType, e );
@@ -185,7 +183,7 @@ public class BaseKeystoreService {
protected void writeCertificateToFile( Certificate cert, final File file ) throws CertificateEncodingException, IOException {
byte[] bytes = cert.getEncoded();
Base64 encoder = new Base64( 76, "\n".getBytes( StandardCharsets.US_ASCII ) );
- try( final FileOutputStream out = new FileOutputStream( file ) ) {
+ try( FileOutputStream out = new FileOutputStream( file ) ) {
out.write( "-----BEGIN CERTIFICATE-----\n".getBytes( StandardCharsets.US_ASCII ) );
out.write( encoder.encodeToString( bytes ).getBytes( StandardCharsets.US_ASCII ) );
out.write( "-----END CERTIFICATE-----\n".getBytes( StandardCharsets.US_ASCII ) );
@@ -195,7 +193,7 @@ public class BaseKeystoreService {
protected void writeKeystoreToFile(final KeyStore keyStore, final File file)
throws KeyStoreException, IOException, NoSuchAlgorithmException, CertificateException {
// TODO: backup the keystore on disk before attempting a write and restore on failure
- try( final FileOutputStream out = new FileOutputStream(file) ) {
+ try( FileOutputStream out = new FileOutputStream(file) ) {
keyStore.store( out, masterService.getMasterSecret() );
}
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/impl/CMFKeystoreService.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/impl/CMFKeystoreService.java b/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/impl/CMFKeystoreService.java
index 623314e..0e4c9ab 100644
--- a/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/impl/CMFKeystoreService.java
+++ b/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/impl/CMFKeystoreService.java
@@ -42,7 +42,7 @@ public class CMFKeystoreService extends BaseKeystoreService {
private static final String CREDENTIALS_SUFFIX = "-credentials.jceks";
private String serviceName = null;
-
+
public CMFKeystoreService(String keystoreDir, String serviceName)
throws ServiceLifecycleException {
this.serviceName = serviceName;
@@ -62,21 +62,21 @@ public class CMFKeystoreService extends BaseKeystoreService {
final File keyStoreFile = new File( keyStoreDir + serviceName );
return getKeystore(keyStoreFile, "JKS");
}
-
+
public void addSelfSignedCert(String alias, char[] passphrase)
throws KeystoreServiceException {
KeyPairGenerator keyPairGenerator;
try {
keyPairGenerator = KeyPairGenerator.getInstance("RSA");
- keyPairGenerator.initialize(1024);
+ keyPairGenerator.initialize(1024);
KeyPair KPair = keyPairGenerator.generateKeyPair();
X509Certificate cert = X509CertificateUtil.generateCertificate(TEST_CERT_DN, KPair, 365, "SHA1withRSA");
KeyStore privateKS = getKeystore();
if (privateKS != null) {
- privateKS.setKeyEntry(alias, KPair.getPrivate(),
- passphrase,
- new java.security.cert.Certificate[]{cert});
+ privateKS.setKeyEntry(alias, KPair.getPrivate(),
+ passphrase,
+ new java.security.cert.Certificate[]{cert});
writeKeystoreToFile(privateKS, new File( keyStoreDir + serviceName ));
} else {
throw new IOException("Unable to open gateway keystore.");
@@ -85,7 +85,7 @@ public class CMFKeystoreService extends BaseKeystoreService {
LOG.failedToAddSeflSignedCertForGateway(alias, e);
}
}
-
+
public void createCredentialStore() throws KeystoreServiceException {
String filename = keyStoreDir + serviceName + CREDENTIALS_SUFFIX;
createKeystore(filename, "JCEKS");
@@ -120,8 +120,8 @@ public class CMFKeystoreService extends BaseKeystoreService {
}
}
return key;
- }
-
+ }
+
public KeyStore getCredentialStore() throws KeystoreServiceException {
final File keyStoreFile = new File( keyStoreDir + serviceName + CREDENTIALS_SUFFIX );
return getKeystore(keyStoreFile, "JCEKS");
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/impl/CMFMasterService.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/impl/CMFMasterService.java b/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/impl/CMFMasterService.java
index 6552dcc..4996030 100644
--- a/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/impl/CMFMasterService.java
+++ b/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/impl/CMFMasterService.java
@@ -136,14 +136,14 @@ public class CMFMasterService {
try {
ArrayList<String> lines = new ArrayList<>();
lines.add(MASTER_PERSISTENCE_TAG);
-
+
String line = Base64.encodeBase64String((
- Base64.encodeBase64String(atom.salt) + "::" +
- Base64.encodeBase64String(atom.iv) + "::" +
+ Base64.encodeBase64String(atom.salt) + "::" +
+ Base64.encodeBase64String(atom.iv) + "::" +
Base64.encodeBase64String(atom.cipher)).getBytes(StandardCharsets.UTF_8));
lines.add(line);
FileUtils.writeLines(masterFile, StandardCharsets.UTF_8.name(), lines);
-
+
// restrict os permissions to only the user running this process
chmod("600", masterFile);
} catch (IOException e) {
@@ -184,11 +184,11 @@ public class CMFMasterService {
// TODO: look into the following for Windows: Runtime.getRuntime().exec("attrib -r myFile");
if (isUnixEnv()) {
//args and file should never be null.
- if (args == null || file == null)
+ if (args == null || file == null)
throw new IllegalArgumentException("nullArg");
- if (!file.exists())
+ if (!file.exists())
throw new IOException("fileNotFound");
-
+
// " +" regular expression for 1 or more spaces
final String[] argsString = args.split(" +");
List<String> cmdList = new ArrayList<>();
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/impl/ConfigurableEncryptor.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/impl/ConfigurableEncryptor.java b/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/impl/ConfigurableEncryptor.java
index e29b1e5..f3361d8 100644
--- a/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/impl/ConfigurableEncryptor.java
+++ b/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/impl/ConfigurableEncryptor.java
@@ -37,10 +37,10 @@ import org.apache.knox.gateway.services.security.EncryptionResult;
public class ConfigurableEncryptor {
private static final GatewaySpiMessages LOG = MessagesFactory.get( GatewaySpiMessages.class );
-
+
private static final int ITERATION_COUNT = 65536;
private static final int KEY_LENGTH = 128;
-
+
private char[] passPhrase = null;
private String alg = "AES";
private String pbeAlg = "PBKDF2WithHmacSHA1";
@@ -48,7 +48,7 @@ public class ConfigurableEncryptor {
private int saltSize = 8;
private int iterationCount = ITERATION_COUNT;
private int keyLength = KEY_LENGTH;
-
+
public ConfigurableEncryptor(String passPhrase) {
this.passPhrase = passPhrase.toCharArray();
}
@@ -94,7 +94,7 @@ public class ConfigurableEncryptor {
} catch (InvalidKeySpecException e) {
LOG.failedToGenerateKeyFromPassword( e );
}
-
+
return key;
}
@@ -121,7 +121,7 @@ public class ConfigurableEncryptor {
public byte[] decrypt(byte[] salt, byte[] iv, byte[] encrypt) throws Exception {
SecretKey tmp = getKeyFromPassword(new String(passPhrase), salt);
SecretKey secret = new SecretKeySpec(tmp.getEncoded(), alg);
-
+
Cipher dcipher = Cipher.getInstance(transformation);
dcipher.init(Cipher.DECRYPT_MODE, secret, new IvParameterSpec(iv));
return dcipher.doFinal(encrypt);
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/impl/X509CertificateUtil.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/impl/X509CertificateUtil.java b/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/impl/X509CertificateUtil.java
index 1cce280..551fb5c 100644
--- a/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/impl/X509CertificateUtil.java
+++ b/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/impl/X509CertificateUtil.java
@@ -276,7 +276,7 @@ public class X509CertificateUtil {
throws CertificateEncodingException, IOException {
byte[] bytes = cert.getEncoded();
Base64 encoder = new Base64( 76, "\n".getBytes( StandardCharsets.US_ASCII ) );
- try( final FileOutputStream out = new FileOutputStream( file ) ) {
+ try( FileOutputStream out = new FileOutputStream( file ) ) {
out.write( "-----BEGIN CERTIFICATE-----\n".getBytes( StandardCharsets.US_ASCII ) );
out.write( encoder.encodeToString( bytes ).getBytes( StandardCharsets.US_ASCII ) );
out.write( "-----END CERTIFICATE-----\n".getBytes( StandardCharsets.US_ASCII ) );
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/token/impl/JWT.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/token/impl/JWT.java b/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/token/impl/JWT.java
index 445f51c..984f515 100644
--- a/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/token/impl/JWT.java
+++ b/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/token/impl/JWT.java
@@ -45,7 +45,7 @@ public interface JWT {
String getAudience();
- public String[] getAudienceClaims();
+ String[] getAudienceClaims();
String getExpires();
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-spi/src/main/java/org/apache/knox/gateway/topology/Param.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/topology/Param.java b/gateway-spi/src/main/java/org/apache/knox/gateway/topology/Param.java
index e42e76c..1a15cf3 100644
--- a/gateway-spi/src/main/java/org/apache/knox/gateway/topology/Param.java
+++ b/gateway-spi/src/main/java/org/apache/knox/gateway/topology/Param.java
@@ -45,6 +45,4 @@ public class Param {
public void setValue(String value) {
this.value = value;
}
-
-
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-spi/src/main/java/org/apache/knox/gateway/topology/Provider.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/topology/Provider.java b/gateway-spi/src/main/java/org/apache/knox/gateway/topology/Provider.java
index a031bec..0e20ae8 100644
--- a/gateway-spi/src/main/java/org/apache/knox/gateway/topology/Provider.java
+++ b/gateway-spi/src/main/java/org/apache/knox/gateway/topology/Provider.java
@@ -31,7 +31,7 @@ public class Provider {
public Provider() {
}
-
+
public String getName() {
return name;
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-spi/src/main/java/org/apache/knox/gateway/topology/Service.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/topology/Service.java b/gateway-spi/src/main/java/org/apache/knox/gateway/topology/Service.java
index bff840f..6b0c5de 100644
--- a/gateway-spi/src/main/java/org/apache/knox/gateway/topology/Service.java
+++ b/gateway-spi/src/main/java/org/apache/knox/gateway/topology/Service.java
@@ -136,7 +136,7 @@ public class Service {
}
return true;
}
-
+
@Override
public int hashCode() {
int hashCode = 17;
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-spi/src/main/java/org/apache/knox/gateway/topology/Topology.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/topology/Topology.java b/gateway-spi/src/main/java/org/apache/knox/gateway/topology/Topology.java
index ddf8575..c84673f 100644
--- a/gateway-spi/src/main/java/org/apache/knox/gateway/topology/Topology.java
+++ b/gateway-spi/src/main/java/org/apache/knox/gateway/topology/Topology.java
@@ -137,7 +137,7 @@ public class Topology {
public Provider getProvider( String role, String name ) {
Provider provider = null;
Map<String,Provider> nameMap = providerMap.get( role );
- if( nameMap != null) {
+ if( nameMap != null) {
if( name != null ) {
provider = nameMap.get( name );
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-spi/src/test/java/org/apache/knox/gateway/dispatch/CappedBufferHttpEntityTest.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/test/java/org/apache/knox/gateway/dispatch/CappedBufferHttpEntityTest.java b/gateway-spi/src/test/java/org/apache/knox/gateway/dispatch/CappedBufferHttpEntityTest.java
index 702b73a..be5ff41 100644
--- a/gateway-spi/src/test/java/org/apache/knox/gateway/dispatch/CappedBufferHttpEntityTest.java
+++ b/gateway-spi/src/test/java/org/apache/knox/gateway/dispatch/CappedBufferHttpEntityTest.java
@@ -190,7 +190,6 @@ public class CappedBufferHttpEntityTest {
} catch( IOException e ) {
// Expected.
}
-
}
@Test
@@ -555,7 +554,7 @@ public class CappedBufferHttpEntityTest {
replay = new CappedBufferHttpEntity( basic, 5 );
stream = replay.getContent();
- try {
+ try {
text = blockRead( stream, StandardCharsets.UTF_8, 7, 2 );
fail( "Expected IOException" );
} catch ( IOException e ) {
@@ -658,7 +657,6 @@ public class CappedBufferHttpEntityTest {
} catch (IOException e) {
// expected
}
-
}
@Test
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-spi/src/test/java/org/apache/knox/gateway/security/principal/PrincipalMapperTest.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/test/java/org/apache/knox/gateway/security/principal/PrincipalMapperTest.java b/gateway-spi/src/test/java/org/apache/knox/gateway/security/principal/PrincipalMapperTest.java
index a4aed1c..066d546 100644
--- a/gateway-spi/src/test/java/org/apache/knox/gateway/security/principal/PrincipalMapperTest.java
+++ b/gateway-spi/src/test/java/org/apache/knox/gateway/security/principal/PrincipalMapperTest.java
@@ -55,7 +55,7 @@ public class PrincipalMapperTest {
assertEquals("users", mapper.mapGroupPrincipal("hdfs")[0]);
assertEquals("users", mapper.mapGroupPrincipal("lmccay")[0]);
}
-
+
@Test
public void testSimplePrincipalMappingWithWildcardAndExplicitGroups() {
String principalMapping = "";
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-spi/src/test/java/org/apache/knox/gateway/services/security/impl/CMFMasterServiceTest.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/test/java/org/apache/knox/gateway/services/security/impl/CMFMasterServiceTest.java b/gateway-spi/src/test/java/org/apache/knox/gateway/services/security/impl/CMFMasterServiceTest.java
index bd17ceb..82170ed 100644
--- a/gateway-spi/src/test/java/org/apache/knox/gateway/services/security/impl/CMFMasterServiceTest.java
+++ b/gateway-spi/src/test/java/org/apache/knox/gateway/services/security/impl/CMFMasterServiceTest.java
@@ -41,7 +41,7 @@ public class CMFMasterServiceTest {
public void setup() {
ms = new TestCMFMasterService("ambari");
}
-
+
@Test
public void testMasterService() {
try {
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-spi/src/test/java/org/apache/knox/gateway/services/security/impl/TestCMFMasterService.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/test/java/org/apache/knox/gateway/services/security/impl/TestCMFMasterService.java b/gateway-spi/src/test/java/org/apache/knox/gateway/services/security/impl/TestCMFMasterService.java
index 2d0cd24..03c81b6 100644
--- a/gateway-spi/src/test/java/org/apache/knox/gateway/services/security/impl/TestCMFMasterService.java
+++ b/gateway-spi/src/test/java/org/apache/knox/gateway/services/security/impl/TestCMFMasterService.java
@@ -32,6 +32,4 @@ public class TestCMFMasterService extends CMFMasterService {
@Override
protected void displayWarning(boolean persisting) {
}
-
-
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/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 c4a71a0..118f861 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
@@ -132,7 +132,7 @@ public class GatewayTestConfig extends Configuration implements GatewayConfig {
@Override
public long getGatewayIdleTimeout() {
- return 0l;
+ return 0L;
}
@Override
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-test-utils/src/main/java/org/apache/knox/test/log/CollectAppender.java
----------------------------------------------------------------------
diff --git a/gateway-test-utils/src/main/java/org/apache/knox/test/log/CollectAppender.java b/gateway-test-utils/src/main/java/org/apache/knox/test/log/CollectAppender.java
index 88c3cd1..14bbe05 100644
--- a/gateway-test-utils/src/main/java/org/apache/knox/test/log/CollectAppender.java
+++ b/gateway-test-utils/src/main/java/org/apache/knox/test/log/CollectAppender.java
@@ -30,7 +30,7 @@ public class CollectAppender extends AppenderSkeleton {
}
public static final BlockingQueue<LoggingEvent> queue = new LinkedBlockingQueue<>();
-
+
@Override
protected void append( LoggingEvent event ) {
event.getProperties();
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/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 c2fe83e..5be7739 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
@@ -210,7 +210,7 @@ public class MockRequestMatcher {
request.getPathInfo(), is( pathInfo ) );
}
if( requestURL != null ) {
- assertThat(
+ assertThat(
"Request " + request.getMethod() + " " + request.getRequestURL() +
" does not have the expected requestURL",
request.getRequestURL().toString(), is( requestURL ) );
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-test/src/test/java/org/apache/knox/gateway/GatewayCorrelationIdTest.java
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/java/org/apache/knox/gateway/GatewayCorrelationIdTest.java b/gateway-test/src/test/java/org/apache/knox/gateway/GatewayCorrelationIdTest.java
index 754ef99..ecb0461 100644
--- a/gateway-test/src/test/java/org/apache/knox/gateway/GatewayCorrelationIdTest.java
+++ b/gateway-test/src/test/java/org/apache/knox/gateway/GatewayCorrelationIdTest.java
@@ -207,7 +207,7 @@ public class GatewayCorrelationIdTest {
// There should be a unique correlation id for each request
assertThat(requestIds.size(), is(numberTotalRequests));
-
+
LOG_EXIT();
}
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-test/src/test/java/org/apache/knox/gateway/topology/monitor/RemoteConfigurationMonitorTest.java
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/java/org/apache/knox/gateway/topology/monitor/RemoteConfigurationMonitorTest.java b/gateway-test/src/test/java/org/apache/knox/gateway/topology/monitor/RemoteConfigurationMonitorTest.java
index ef53de2..3894a69 100644
--- a/gateway-test/src/test/java/org/apache/knox/gateway/topology/monitor/RemoteConfigurationMonitorTest.java
+++ b/gateway-test/src/test/java/org/apache/knox/gateway/topology/monitor/RemoteConfigurationMonitorTest.java
@@ -486,7 +486,7 @@ public class RemoteConfigurationMonitorTest {
try {
cm.start();
-
+
// Test auth violation
clientService.get(configMonitorName).createEntry("/auth_test/child_node/test1");
assertNull("Creation should have been prevented since write access is not granted to the test client.",
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/changes.txt
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/changes.txt b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/changes.txt
index 9249ab1..5125b64 100644
--- a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/changes.txt
+++ b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/changes.txt
@@ -3431,9 +3431,9 @@ Release 0.20.0 - 2009-04-15
HADOOP-4253. Fix various warnings generated by findbugs.
Following deprecated methods in RawLocalFileSystem are removed:
- public String getName()
- public void lock(Path p, boolean shared)
- public void release(Path p)
+ public String getName()
+ public void lock(Path p, boolean shared)
+ public void release(Path p)
(Suresh Srinivas via johan)
HADOOP-4618. Move http server from FSNamesystem into NameNode.
@@ -10189,7 +10189,7 @@ Release 0.10.1 - 2007-01-10
9. HADOOP-865. Fix S3 FileSystem so that partially created files can
be deleted. (Tom White via cutting)
-10. HADOOP-873. Pass java.library.path correctly to child processes.
+10. HADOOP-873. Pass java.library.path correctly to child processes.
(omalley via cutting)
11. HADOOP-851. Add support for the LZO codec. This is much faster
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/app_running.json
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/app_running.json b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/app_running.json
index 441dbc8..a794b32 100644
--- a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/app_running.json
+++ b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/app_running.json
@@ -1,25 +1,25 @@
{
- "app":{
- "id":"application_1399541193872_0033",
- "user":"hdfs",
- "name":"Sleep job",
- "queue":"default",
- "state":"RUNNING",
- "finalStatus":"UNDEFINED",
- "progress":89.94973,
- "trackingUI":"ApplicationMaster",
- "trackingUrl":"$proxy_address/proxy/application_1399541193872_0033/",
- "diagnostics":"",
- "clusterId":1399541193872,
- "applicationType":"MAPREDUCE",
- "applicationTags":"",
- "startedTime":1401184778896,
- "finishedTime":0,
- "elapsedTime":139545,
- "amContainerLogs":"http://localhost:50060/node/containerlogs/container_1399541193872_0033_01_000001/hdfs",
- "amHostHttpAddress":"localhost:50060",
- "allocatedMB":4608,
- "allocatedVCores":2,
- "runningContainers":2
- }
+ "app":{
+ "id":"application_1399541193872_0033",
+ "user":"hdfs",
+ "name":"Sleep job",
+ "queue":"default",
+ "state":"RUNNING",
+ "finalStatus":"UNDEFINED",
+ "progress":89.94973,
+ "trackingUI":"ApplicationMaster",
+ "trackingUrl":"$proxy_address/proxy/application_1399541193872_0033/",
+ "diagnostics":"",
+ "clusterId":1399541193872,
+ "applicationType":"MAPREDUCE",
+ "applicationTags":"",
+ "startedTime":1401184778896,
+ "finishedTime":0,
+ "elapsedTime":139545,
+ "amContainerLogs":"http://localhost:50060/node/containerlogs/container_1399541193872_0033_01_000001/hdfs",
+ "amHostHttpAddress":"localhost:50060",
+ "allocatedMB":4608,
+ "allocatedVCores":2,
+ "runningContainers":2
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/app_running.xml
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/app_running.xml b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/app_running.xml
index 424f9df..5c5a644 100644
--- a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/app_running.xml
+++ b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/app_running.xml
@@ -16,25 +16,25 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
<app>
- <id>application_1399541193872_0033</id>
- <user>hdfs</user>
- <name>Sleep job</name>
- <queue>default</queue>
- <state>RUNNING</state>
- <finalStatus>UNDEFINED</finalStatus>
- <progress>89.94973</progress>
- <trackingUI>ApplicationMaster</trackingUI>
- <trackingUrl>$proxy_address/proxy/application_1399541193872_0033/</trackingUrl>
- <diagnostics></diagnostics>
- <clusterId>1399541193872</clusterId>
- <applicationType>MAPREDUCE</applicationType>
- <applicationTags></applicationTags>
- <startedTime>1401184778896</startedTime>
- <finishedTime>0</finishedTime>
- <elapsedTime>438390</elapsedTime>
- <amContainerLogs>http://localhost:50060/node/containerlogs/container_1399541193872_0033_01_000001/hdfs</amContainerLogs>
- <amHostHttpAddress>localhost:50060</amHostHttpAddress>
- <allocatedMB>4608</allocatedMB>
- <allocatedVCores>2</allocatedVCores>
- <runningContainers>2</runningContainers>
+ <id>application_1399541193872_0033</id>
+ <user>hdfs</user>
+ <name>Sleep job</name>
+ <queue>default</queue>
+ <state>RUNNING</state>
+ <finalStatus>UNDEFINED</finalStatus>
+ <progress>89.94973</progress>
+ <trackingUI>ApplicationMaster</trackingUI>
+ <trackingUrl>$proxy_address/proxy/application_1399541193872_0033/</trackingUrl>
+ <diagnostics></diagnostics>
+ <clusterId>1399541193872</clusterId>
+ <applicationType>MAPREDUCE</applicationType>
+ <applicationTags></applicationTags>
+ <startedTime>1401184778896</startedTime>
+ <finishedTime>0</finishedTime>
+ <elapsedTime>438390</elapsedTime>
+ <amContainerLogs>http://localhost:50060/node/containerlogs/container_1399541193872_0033_01_000001/hdfs</amContainerLogs>
+ <amHostHttpAddress>localhost:50060</amHostHttpAddress>
+ <allocatedMB>4608</allocatedMB>
+ <allocatedVCores>2</allocatedVCores>
+ <runningContainers>2</runningContainers>
</app>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/app_succeeded.json
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/app_succeeded.json b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/app_succeeded.json
index bb72949..e583062 100644
--- a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/app_succeeded.json
+++ b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/app_succeeded.json
@@ -1,25 +1,25 @@
{
- "app":{
- "id":"application_1399541193872_0018",
- "user":"hdfs",
- "name":"Sleep job",
- "queue":"default",
- "state":"FINISHED",
- "finalStatus":"SUCCEEDED",
- "progress":100.0,
- "trackingUI":"History",
- "trackingUrl":"http://localhost:8088/proxy/application_1399541193872_0018/jobhistory/job/job_1399541193872_0018",
- "diagnostics":"",
- "clusterId":1399541193872,
- "applicationType":"MAPREDUCE",
- "applicationTags":"",
- "startedTime":1399903578539,
- "finishedTime":1399904819572,
- "elapsedTime":1241033,
- "amContainerLogs":"http://localhost:50060/node/containerlogs/container_1399541193872_0018_01_000001/hdfs",
- "amHostHttpAddress":"localhost:50060",
- "allocatedMB":0,
- "allocatedVCores":0,
- "runningContainers":0
- }
+ "app":{
+ "id":"application_1399541193872_0018",
+ "user":"hdfs",
+ "name":"Sleep job",
+ "queue":"default",
+ "state":"FINISHED",
+ "finalStatus":"SUCCEEDED",
+ "progress":100.0,
+ "trackingUI":"History",
+ "trackingUrl":"http://localhost:8088/proxy/application_1399541193872_0018/jobhistory/job/job_1399541193872_0018",
+ "diagnostics":"",
+ "clusterId":1399541193872,
+ "applicationType":"MAPREDUCE",
+ "applicationTags":"",
+ "startedTime":1399903578539,
+ "finishedTime":1399904819572,
+ "elapsedTime":1241033,
+ "amContainerLogs":"http://localhost:50060/node/containerlogs/container_1399541193872_0018_01_000001/hdfs",
+ "amHostHttpAddress":"localhost:50060",
+ "allocatedMB":0,
+ "allocatedVCores":0,
+ "runningContainers":0
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/app_succeeded.xml
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/app_succeeded.xml b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/app_succeeded.xml
index 076ff95..204a481 100644
--- a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/app_succeeded.xml
+++ b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/app_succeeded.xml
@@ -16,25 +16,25 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
<app>
- <id>application_1399541193872_0018</id>
- <user>hdfs</user>
- <name>Sleep job</name>
- <queue>default</queue>
- <state>FINISHED</state>
- <finalStatus>SUCCEEDED</finalStatus>
- <progress>100.0</progress>
- <trackingUI>History</trackingUI>
- <trackingUrl>http://localhost:8088/proxy/application_1399541193872_0018/jobhistory/job/job_1399541193872_0018</trackingUrl>
- <diagnostics></diagnostics>
- <clusterId>1399541193872</clusterId>
- <applicationType>MAPREDUCE</applicationType>
- <applicationTags></applicationTags>
- <startedTime>1399903578539</startedTime>
- <finishedTime>1399904819572</finishedTime>
- <elapsedTime>1241033</elapsedTime>
- <amContainerLogs>http://localhost:50060/node/containerlogs/container_1399541193872_0018_01_000001/hdfs</amContainerLogs>
- <amHostHttpAddress>localhost:50060</amHostHttpAddress>
- <allocatedMB>0</allocatedMB>
- <allocatedVCores>0</allocatedVCores>
- <runningContainers>0</runningContainers>
+ <id>application_1399541193872_0018</id>
+ <user>hdfs</user>
+ <name>Sleep job</name>
+ <queue>default</queue>
+ <state>FINISHED</state>
+ <finalStatus>SUCCEEDED</finalStatus>
+ <progress>100.0</progress>
+ <trackingUI>History</trackingUI>
+ <trackingUrl>http://localhost:8088/proxy/application_1399541193872_0018/jobhistory/job/job_1399541193872_0018</trackingUrl>
+ <diagnostics></diagnostics>
+ <clusterId>1399541193872</clusterId>
+ <applicationType>MAPREDUCE</applicationType>
+ <applicationTags></applicationTags>
+ <startedTime>1399903578539</startedTime>
+ <finishedTime>1399904819572</finishedTime>
+ <elapsedTime>1241033</elapsedTime>
+ <amContainerLogs>http://localhost:50060/node/containerlogs/container_1399541193872_0018_01_000001/hdfs</amContainerLogs>
+ <amHostHttpAddress>localhost:50060</amHostHttpAddress>
+ <allocatedMB>0</allocatedMB>
+ <allocatedVCores>0</allocatedVCores>
+ <runningContainers>0</runningContainers>
</app>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/appattempts.json
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/appattempts.json b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/appattempts.json
index ef21483..a9a6d37 100644
--- a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/appattempts.json
+++ b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/appattempts.json
@@ -1,14 +1,14 @@
{
- "appAttempts":{
- "appAttempt":[
- {
- "id":1,
- "startTime":1399903578541,
- "containerId":"container_1399541193872_0018_01_000001",
- "nodeHttpAddress":"localhost:50060",
- "nodeId":"localhost:45454",
- "logsLink":"//localhost:50060/node/containerlogs/container_1399541193872_0018_01_000001/hdfs"
- }
- ]
- }
+ "appAttempts":{
+ "appAttempt":[
+ {
+ "id":1,
+ "startTime":1399903578541,
+ "containerId":"container_1399541193872_0018_01_000001",
+ "nodeHttpAddress":"localhost:50060",
+ "nodeId":"localhost:45454",
+ "logsLink":"//localhost:50060/node/containerlogs/container_1399541193872_0018_01_000001/hdfs"
+ }
+ ]
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/appattempts.xml
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/appattempts.xml b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/appattempts.xml
index 57a6378..cb53782 100644
--- a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/appattempts.xml
+++ b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/appattempts.xml
@@ -16,12 +16,12 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
<appAttempts>
- <appAttempt>
- <id>1</id>
- <startTime>1399903578541</startTime>
- <containerId>container_1399541193872_0018_01_000001</containerId>
- <nodeHttpAddress>localhost:50060</nodeHttpAddress>
- <nodeId>localhost:45454</nodeId>
- <logsLink>//localhost:50060/node/containerlogs/container_1399541193872_0018_01_000001/hdfs</logsLink>
- </appAttempt>
+ <appAttempt>
+ <id>1</id>
+ <startTime>1399903578541</startTime>
+ <containerId>container_1399541193872_0018_01_000001</containerId>
+ <nodeHttpAddress>localhost:50060</nodeHttpAddress>
+ <nodeId>localhost:45454</nodeId>
+ <logsLink>//localhost:50060/node/containerlogs/container_1399541193872_0018_01_000001/hdfs</logsLink>
+ </appAttempt>
</appAttempts>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/apps.json
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/apps.json b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/apps.json
index dc95157..2da9231 100644
--- a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/apps.json
+++ b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/apps.json
@@ -1,73 +1,73 @@
{
- "apps":{
- "app":[
- {
- "id":"application_1399541193872_0018",
- "user":"hdfs",
- "name":"Sleep job",
- "queue":"default",
- "state":"FINISHED",
- "finalStatus":"SUCCEEDED",
- "progress":100.0,
- "trackingUI":"History",
- "trackingUrl":"http://localhost:8088/proxy/application_1399541193872_0018/jobhistory/job/job_1399541193872_0018",
- "diagnostics":"",
- "clusterId":1399541193872,
- "applicationType":"MAPREDUCE",
- "applicationTags":"",
- "startedTime":1399903578539,
- "finishedTime":1399904819572,
- "elapsedTime":1241033,
- "amContainerLogs":"http://localhost:50060/node/containerlogs/container_1399541193872_0018_01_000001/hdfs",
- "amHostHttpAddress":"localhost:50060",
- "allocatedMB":0,
- "allocatedVCores":0,
- "runningContainers":0
- },
- {
- "id":"application_1399541193872_0031",
- "user":"hdfs",
- "name":"Sleep job",
- "queue":"default",
- "state":"RUNNING",
- "finalStatus":"UNDEFINED",
- "progress":89.94973,
- "trackingUI":"ApplicationMaster",
- "trackingUrl":"http://localhost:8088/proxy/application_1399541193872_0031/",
- "diagnostics":"",
- "clusterId":1399541193872,
- "applicationType":"MAPREDUCE",
- "applicationTags":"",
- "startedTime":1400855314702,
- "finishedTime":0,
- "elapsedTime":471349,
- "amContainerLogs":"http://localhost:50060/node/containerlogs/container_1399541193872_0031_01_000001/hdfs",
- "amHostHttpAddress":"localhost:50060",
- "allocatedMB":4608,
- "allocatedVCores":2,
- "runningContainers":2
- },
- {
- "id":"application_1399541193872_0009",
- "user":"hdfs",
- "name":"Sleep job",
- "queue":"a1",
- "state":"FAILED",
- "finalStatus":"FAILED",
- "progress":0.0,
- "trackingUI":"History",
+ "apps":{
+ "app":[
+ {
+ "id":"application_1399541193872_0018",
+ "user":"hdfs",
+ "name":"Sleep job",
+ "queue":"default",
+ "state":"FINISHED",
+ "finalStatus":"SUCCEEDED",
+ "progress":100.0,
+ "trackingUI":"History",
+ "trackingUrl":"http://localhost:8088/proxy/application_1399541193872_0018/jobhistory/job/job_1399541193872_0018",
+ "diagnostics":"",
+ "clusterId":1399541193872,
+ "applicationType":"MAPREDUCE",
+ "applicationTags":"",
+ "startedTime":1399903578539,
+ "finishedTime":1399904819572,
+ "elapsedTime":1241033,
+ "amContainerLogs":"http://localhost:50060/node/containerlogs/container_1399541193872_0018_01_000001/hdfs",
+ "amHostHttpAddress":"localhost:50060",
+ "allocatedMB":0,
+ "allocatedVCores":0,
+ "runningContainers":0
+ },
+ {
+ "id":"application_1399541193872_0031",
+ "user":"hdfs",
+ "name":"Sleep job",
+ "queue":"default",
+ "state":"RUNNING",
+ "finalStatus":"UNDEFINED",
+ "progress":89.94973,
+ "trackingUI":"ApplicationMaster",
+ "trackingUrl":"http://localhost:8088/proxy/application_1399541193872_0031/",
+ "diagnostics":"",
+ "clusterId":1399541193872,
+ "applicationType":"MAPREDUCE",
+ "applicationTags":"",
+ "startedTime":1400855314702,
+ "finishedTime":0,
+ "elapsedTime":471349,
+ "amContainerLogs":"http://localhost:50060/node/containerlogs/container_1399541193872_0031_01_000001/hdfs",
+ "amHostHttpAddress":"localhost:50060",
+ "allocatedMB":4608,
+ "allocatedVCores":2,
+ "runningContainers":2
+ },
+ {
+ "id":"application_1399541193872_0009",
+ "user":"hdfs",
+ "name":"Sleep job",
+ "queue":"a1",
+ "state":"FAILED",
+ "finalStatus":"FAILED",
+ "progress":0.0,
+ "trackingUI":"History",
"trackingUrl":"http://localhost:8088/cluster/app/application_1409008107556_0001",
"diagnostics":"Application application_1399541193872_0009 submitted by user hdfs to unknown queue: a1",
- "clusterId":1399541193872,
- "applicationType":"MAPREDUCE",
- "applicationTags":"",
- "startedTime":1399543135010,
- "finishedTime":1399543135013,
- "elapsedTime":3,
- "allocatedMB":0,
- "allocatedVCores":0,
- "runningContainers":0
- }
- ]
- }
+ "clusterId":1399541193872,
+ "applicationType":"MAPREDUCE",
+ "applicationTags":"",
+ "startedTime":1399543135010,
+ "finishedTime":1399543135013,
+ "elapsedTime":3,
+ "allocatedMB":0,
+ "allocatedVCores":0,
+ "runningContainers":0
+ }
+ ]
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/apps.xml
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/apps.xml b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/apps.xml
index ad11446..8e6e6c1 100644
--- a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/apps.xml
+++ b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/apps.xml
@@ -16,71 +16,71 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
<apps>
- <app>
- <id>application_1399541193872_0018</id>
- <user>hdfs</user>
- <name>Sleep job</name>
- <queue>default</queue>
- <state>FINISHED</state>
- <finalStatus>SUCCEEDED</finalStatus>
- <progress>100.0</progress>
- <trackingUI>History</trackingUI>
- <trackingUrl>http://localhost:8088/proxy/application_1399541193872_0018/jobhistory/job/job_1399541193872_0018</trackingUrl>
- <diagnostics></diagnostics>
- <clusterId>1399541193872</clusterId>
- <applicationType>MAPREDUCE</applicationType>
- <applicationTags></applicationTags>
- <startedTime>1399903578539</startedTime>
- <finishedTime>1399904819572</finishedTime>
- <elapsedTime>1241033</elapsedTime>
- <amContainerLogs>http://localhost:50060/node/containerlogs/container_1399541193872_0018_01_000001/hdfs</amContainerLogs>
- <amHostHttpAddress>localhost:50060</amHostHttpAddress>
- <allocatedMB>0</allocatedMB>
- <allocatedVCores>0</allocatedVCores>
- <runningContainers>0</runningContainers>
- </app>
- <app>
- <id>application_1399541193872_0031</id>
- <user>hdfs</user>
- <name>Sleep job</name>
- <queue>default</queue>
- <state>RUNNING</state>
- <finalStatus>UNDEFINED</finalStatus>
- <progress>89.94973</progress>
- <trackingUI>ApplicationMaster</trackingUI>
- <trackingUrl>http://localhost:8088/proxy/application_1399541193872_0031/</trackingUrl>
- <diagnostics></diagnostics>
- <clusterId>1399541193872</clusterId>
- <applicationType>MAPREDUCE</applicationType>
- <applicationTags></applicationTags>
- <startedTime>1400855314702</startedTime>
- <finishedTime>0</finishedTime>
- <elapsedTime>548138</elapsedTime>
- <amContainerLogs>http://localhost:50060/node/containerlogs/container_1399541193872_0031_01_000001/hdfs</amContainerLogs>
- <amHostHttpAddress>localhost:50060</amHostHttpAddress>
- <allocatedMB>4608</allocatedMB>
- <allocatedVCores>2</allocatedVCores>
- <runningContainers>2</runningContainers>
- </app>
- <app>
- <id>application_1399541193872_0009</id>
- <user>hdfs</user>
- <name>Sleep job</name>
- <queue>a1</queue>
- <state>FAILED</state>
- <finalStatus>FAILED</finalStatus>
- <progress>0.0</progress>
- <trackingUI>History</trackingUI>
+ <app>
+ <id>application_1399541193872_0018</id>
+ <user>hdfs</user>
+ <name>Sleep job</name>
+ <queue>default</queue>
+ <state>FINISHED</state>
+ <finalStatus>SUCCEEDED</finalStatus>
+ <progress>100.0</progress>
+ <trackingUI>History</trackingUI>
+ <trackingUrl>http://localhost:8088/proxy/application_1399541193872_0018/jobhistory/job/job_1399541193872_0018</trackingUrl>
+ <diagnostics></diagnostics>
+ <clusterId>1399541193872</clusterId>
+ <applicationType>MAPREDUCE</applicationType>
+ <applicationTags></applicationTags>
+ <startedTime>1399903578539</startedTime>
+ <finishedTime>1399904819572</finishedTime>
+ <elapsedTime>1241033</elapsedTime>
+ <amContainerLogs>http://localhost:50060/node/containerlogs/container_1399541193872_0018_01_000001/hdfs</amContainerLogs>
+ <amHostHttpAddress>localhost:50060</amHostHttpAddress>
+ <allocatedMB>0</allocatedMB>
+ <allocatedVCores>0</allocatedVCores>
+ <runningContainers>0</runningContainers>
+ </app>
+ <app>
+ <id>application_1399541193872_0031</id>
+ <user>hdfs</user>
+ <name>Sleep job</name>
+ <queue>default</queue>
+ <state>RUNNING</state>
+ <finalStatus>UNDEFINED</finalStatus>
+ <progress>89.94973</progress>
+ <trackingUI>ApplicationMaster</trackingUI>
+ <trackingUrl>http://localhost:8088/proxy/application_1399541193872_0031/</trackingUrl>
+ <diagnostics></diagnostics>
+ <clusterId>1399541193872</clusterId>
+ <applicationType>MAPREDUCE</applicationType>
+ <applicationTags></applicationTags>
+ <startedTime>1400855314702</startedTime>
+ <finishedTime>0</finishedTime>
+ <elapsedTime>548138</elapsedTime>
+ <amContainerLogs>http://localhost:50060/node/containerlogs/container_1399541193872_0031_01_000001/hdfs</amContainerLogs>
+ <amHostHttpAddress>localhost:50060</amHostHttpAddress>
+ <allocatedMB>4608</allocatedMB>
+ <allocatedVCores>2</allocatedVCores>
+ <runningContainers>2</runningContainers>
+ </app>
+ <app>
+ <id>application_1399541193872_0009</id>
+ <user>hdfs</user>
+ <name>Sleep job</name>
+ <queue>a1</queue>
+ <state>FAILED</state>
+ <finalStatus>FAILED</finalStatus>
+ <progress>0.0</progress>
+ <trackingUI>History</trackingUI>
<trackingUrl>http://localhost:8088/cluster/app/application_1409008107556_0001</trackingUrl>
<diagnostics>Application application_1399541193872_0009 submitted by user hdfs to unknown queue: a1</diagnostics>
- <clusterId>1399541193872</clusterId>
- <applicationType>MAPREDUCE</applicationType>
- <applicationTags></applicationTags>
- <startedTime>1399543135010</startedTime>
- <finishedTime>1399543135013</finishedTime>
- <elapsedTime>3</elapsedTime>
- <allocatedMB>0</allocatedMB>
- <allocatedVCores>0</allocatedVCores>
- <runningContainers>0</runningContainers>
- </app>
+ <clusterId>1399541193872</clusterId>
+ <applicationType>MAPREDUCE</applicationType>
+ <applicationTags></applicationTags>
+ <startedTime>1399543135010</startedTime>
+ <finishedTime>1399543135013</finishedTime>
+ <elapsedTime>3</elapsedTime>
+ <allocatedMB>0</allocatedMB>
+ <allocatedVCores>0</allocatedVCores>
+ <runningContainers>0</runningContainers>
+ </app>
</apps>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/appstatistics.json
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/appstatistics.json b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/appstatistics.json
index 894c7c6..c6b85f8 100644
--- a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/appstatistics.json
+++ b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/appstatistics.json
@@ -1,26 +1,26 @@
{
- "appStatInfo":{
- "statItem":[
- {
- "state":"FAILED",
- "type":"mapreduce",
- "count":2
- },
- {
- "state":"FINISHED",
- "type":"mapreduce",
- "count":31
- },
- {
- "state":"RUNNING",
- "type":"mapreduce",
- "count":1
- },
- {
- "state":"ACCEPTED",
- "type":"mapreduce",
- "count":0
- }
- ]
- }
+ "appStatInfo":{
+ "statItem":[
+ {
+ "state":"FAILED",
+ "type":"mapreduce",
+ "count":2
+ },
+ {
+ "state":"FINISHED",
+ "type":"mapreduce",
+ "count":31
+ },
+ {
+ "state":"RUNNING",
+ "type":"mapreduce",
+ "count":1
+ },
+ {
+ "state":"ACCEPTED",
+ "type":"mapreduce",
+ "count":0
+ }
+ ]
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/appstatistics.xml
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/appstatistics.xml b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/appstatistics.xml
index a356c78..0149ca6 100644
--- a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/appstatistics.xml
+++ b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/appstatistics.xml
@@ -16,24 +16,24 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
<appStatInfo>
- <statItem>
- <state>FAILED</state>
- <type>mapreduce</type>
- <count>2</count>
- </statItem>
- <statItem>
- <state>FINISHED</state>
- <type>mapreduce</type>
- <count>31</count>
- </statItem>
- <statItem>
- <state>RUNNING</state>
- <type>mapreduce</type>
- <count>1</count>
- </statItem>
- <statItem>
- <state>ACCEPTED</state>
- <type>mapreduce</type>
- <count>0</count>
- </statItem>
+ <statItem>
+ <state>FAILED</state>
+ <type>mapreduce</type>
+ <count>2</count>
+ </statItem>
+ <statItem>
+ <state>FINISHED</state>
+ <type>mapreduce</type>
+ <count>31</count>
+ </statItem>
+ <statItem>
+ <state>RUNNING</state>
+ <type>mapreduce</type>
+ <count>1</count>
+ </statItem>
+ <statItem>
+ <state>ACCEPTED</state>
+ <type>mapreduce</type>
+ <count>0</count>
+ </statItem>
</appStatInfo>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/cluster-info.json
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/cluster-info.json b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/cluster-info.json
index fe49a72..0d158b1 100644
--- a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/cluster-info.json
+++ b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/cluster-info.json
@@ -1,14 +1,14 @@
{
- "clusterInfo":{
- "id":1399541193872,
- "startedOn":1399541193872,
- "state":"STARTED",
- "haState":"ACTIVE",
- "resourceManagerVersion":"2.4.0.2.1.1.0-390",
- "resourceManagerBuildVersion":"2.4.0.2.1.1.0-390 from 68ceccf06a4441273e81a5ec856d41fc7e11c792 by jenkins source checksum a06aa69de28a8ebc9ddba56f20d6d73d",
- "resourceManagerVersionBuiltOn":"2014-04-23T16:39Z",
- "hadoopVersion":"2.4.0.2.1.1.0-390",
- "hadoopBuildVersion":"2.4.0.2.1.1.0-390 from 68ceccf06a4441273e81a5ec856d41fc7e11c792 by jenkins source checksum 9e788148daa5dd7934eb468e57e037b5",
- "hadoopVersionBuiltOn":"2014-04-23T16:32Z"
- }
+ "clusterInfo":{
+ "id":1399541193872,
+ "startedOn":1399541193872,
+ "state":"STARTED",
+ "haState":"ACTIVE",
+ "resourceManagerVersion":"2.4.0.2.1.1.0-390",
+ "resourceManagerBuildVersion":"2.4.0.2.1.1.0-390 from 68ceccf06a4441273e81a5ec856d41fc7e11c792 by jenkins source checksum a06aa69de28a8ebc9ddba56f20d6d73d",
+ "resourceManagerVersionBuiltOn":"2014-04-23T16:39Z",
+ "hadoopVersion":"2.4.0.2.1.1.0-390",
+ "hadoopBuildVersion":"2.4.0.2.1.1.0-390 from 68ceccf06a4441273e81a5ec856d41fc7e11c792 by jenkins source checksum 9e788148daa5dd7934eb468e57e037b5",
+ "hadoopVersionBuiltOn":"2014-04-23T16:32Z"
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/cluster-info.xml
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/cluster-info.xml b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/cluster-info.xml
index dcd6a99..b2048f5 100644
--- a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/cluster-info.xml
+++ b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/cluster-info.xml
@@ -16,19 +16,19 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
<clusterInfo>
- <id>1399541193872</id>
- <startedOn>1399541193872</startedOn>
- <state>STARTED</state>
- <haState>ACTIVE</haState>
- <resourceManagerVersion>2.4.0.2.1.1.0-390</resourceManagerVersion>
- <resourceManagerBuildVersion>2.4.0.2.1.1.0-390 from
- 68ceccf06a4441273e81a5ec856d41fc7e11c792 by jenkins source checksum
- a06aa69de28a8ebc9ddba56f20d6d73d</resourceManagerBuildVersion>
- <resourceManagerVersionBuiltOn>2014-04-23T16:39Z
- </resourceManagerVersionBuiltOn>
- <hadoopVersion>2.4.0.2.1.1.0-390</hadoopVersion>
- <hadoopBuildVersion>2.4.0.2.1.1.0-390 from
- 68ceccf06a4441273e81a5ec856d41fc7e11c792 by jenkins source checksum
- 9e788148daa5dd7934eb468e57e037b5</hadoopBuildVersion>
- <hadoopVersionBuiltOn>2014-04-23T16:32Z</hadoopVersionBuiltOn>
+ <id>1399541193872</id>
+ <startedOn>1399541193872</startedOn>
+ <state>STARTED</state>
+ <haState>ACTIVE</haState>
+ <resourceManagerVersion>2.4.0.2.1.1.0-390</resourceManagerVersion>
+ <resourceManagerBuildVersion>2.4.0.2.1.1.0-390 from
+ 68ceccf06a4441273e81a5ec856d41fc7e11c792 by jenkins source checksum
+ a06aa69de28a8ebc9ddba56f20d6d73d</resourceManagerBuildVersion>
+ <resourceManagerVersionBuiltOn>2014-04-23T16:39Z
+ </resourceManagerVersionBuiltOn>
+ <hadoopVersion>2.4.0.2.1.1.0-390</hadoopVersion>
+ <hadoopBuildVersion>2.4.0.2.1.1.0-390 from
+ 68ceccf06a4441273e81a5ec856d41fc7e11c792 by jenkins source checksum
+ 9e788148daa5dd7934eb468e57e037b5</hadoopBuildVersion>
+ <hadoopVersionBuiltOn>2014-04-23T16:32Z</hadoopVersionBuiltOn>
</clusterInfo>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/cluster-metrics.json
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/cluster-metrics.json b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/cluster-metrics.json
index 35b7228..675991f 100644
--- a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/cluster-metrics.json
+++ b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/cluster-metrics.json
@@ -1,23 +1,23 @@
{
- "clusterMetrics":{
- "appsSubmitted":28,
- "appsCompleted":28,
- "appsPending":0,
- "appsRunning":0,
- "appsFailed":0,
- "appsKilled":0,
- "reservedMB":0,
- "availableMB":8192,
- "allocatedMB":0,
- "containersAllocated":0,
- "containersReserved":0,
- "containersPending":0,
- "totalMB":8192,
- "totalNodes":1,
- "lostNodes":0,
- "unhealthyNodes":0,
- "decommissionedNodes":0,
- "rebootedNodes":0,
- "activeNodes":1
- }
+ "clusterMetrics":{
+ "appsSubmitted":28,
+ "appsCompleted":28,
+ "appsPending":0,
+ "appsRunning":0,
+ "appsFailed":0,
+ "appsKilled":0,
+ "reservedMB":0,
+ "availableMB":8192,
+ "allocatedMB":0,
+ "containersAllocated":0,
+ "containersReserved":0,
+ "containersPending":0,
+ "totalMB":8192,
+ "totalNodes":1,
+ "lostNodes":0,
+ "unhealthyNodes":0,
+ "decommissionedNodes":0,
+ "rebootedNodes":0,
+ "activeNodes":1
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/cluster-metrics.xml
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/cluster-metrics.xml b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/cluster-metrics.xml
index e14e643..61b2f10 100644
--- a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/cluster-metrics.xml
+++ b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/cluster-metrics.xml
@@ -16,23 +16,23 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
<clusterMetrics>
- <appsSubmitted>28</appsSubmitted>
- <appsCompleted>28</appsCompleted>
- <appsPending>0</appsPending>
- <appsRunning>0</appsRunning>
- <appsFailed>0</appsFailed>
- <appsKilled>0</appsKilled>
- <reservedMB>0</reservedMB>
- <availableMB>8192</availableMB>
- <allocatedMB>0</allocatedMB>
- <containersAllocated>0</containersAllocated>
- <containersReserved>0</containersReserved>
- <containersPending>0</containersPending>
- <totalMB>8192</totalMB>
- <totalNodes>1</totalNodes>
- <lostNodes>0</lostNodes>
- <unhealthyNodes>0</unhealthyNodes>
- <decommissionedNodes>0</decommissionedNodes>
- <rebootedNodes>0</rebootedNodes>
- <activeNodes>1</activeNodes>
+ <appsSubmitted>28</appsSubmitted>
+ <appsCompleted>28</appsCompleted>
+ <appsPending>0</appsPending>
+ <appsRunning>0</appsRunning>
+ <appsFailed>0</appsFailed>
+ <appsKilled>0</appsKilled>
+ <reservedMB>0</reservedMB>
+ <availableMB>8192</availableMB>
+ <allocatedMB>0</allocatedMB>
+ <containersAllocated>0</containersAllocated>
+ <containersReserved>0</containersReserved>
+ <containersPending>0</containersPending>
+ <totalMB>8192</totalMB>
+ <totalNodes>1</totalNodes>
+ <lostNodes>0</lostNodes>
+ <unhealthyNodes>0</unhealthyNodes>
+ <decommissionedNodes>0</decommissionedNodes>
+ <rebootedNodes>0</rebootedNodes>
+ <activeNodes>1</activeNodes>
</clusterMetrics>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/node.json
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/node.json b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/node.json
index 0d359fa..facacb0 100644
--- a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/node.json
+++ b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/node.json
@@ -1,15 +1,15 @@
{
- "node":{
- "rack":"/default-rack",
- "state":"RUNNING",
- "id":"localhost:45454",
- "nodeHostName":"localhost",
- "nodeHTTPAddress":"localhost:50060",
- "lastHealthUpdate":1401197561733,
- "version":"2.4.0.2.1.1.0-390",
- "healthReport":"",
- "numContainers":0,
- "usedMemoryMB":0,
- "availMemoryMB":8192
- }
+ "node":{
+ "rack":"/default-rack",
+ "state":"RUNNING",
+ "id":"localhost:45454",
+ "nodeHostName":"localhost",
+ "nodeHTTPAddress":"localhost:50060",
+ "lastHealthUpdate":1401197561733,
+ "version":"2.4.0.2.1.1.0-390",
+ "healthReport":"",
+ "numContainers":0,
+ "usedMemoryMB":0,
+ "availMemoryMB":8192
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/node.xml
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/node.xml b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/node.xml
index 2599ca3..462ba2a 100644
--- a/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/node.xml
+++ b/gateway-test/src/test/resources/org/apache/knox/gateway/GatewayBasicFuncTest/yarn/node.xml
@@ -16,15 +16,15 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
<node>
- <rack>/default-rack</rack>
- <state>RUNNING</state>
- <id>localhost:45454</id>
- <nodeHostName>localhost</nodeHostName>
- <nodeHTTPAddress>localhost:50060</nodeHTTPAddress>
- <lastHealthUpdate>1401197651742</lastHealthUpdate>
- <version>2.4.0.2.1.1.0-390</version>
- <healthReport></healthReport>
- <numContainers>0</numContainers>
- <usedMemoryMB>0</usedMemoryMB>
- <availMemoryMB>8192</availMemoryMB>
+ <rack>/default-rack</rack>
+ <state>RUNNING</state>
+ <id>localhost:45454</id>
+ <nodeHostName>localhost</nodeHostName>
+ <nodeHTTPAddress>localhost:50060</nodeHTTPAddress>
+ <lastHealthUpdate>1401197651742</lastHealthUpdate>
+ <version>2.4.0.2.1.1.0-390</version>
+ <healthReport></healthReport>
+ <numContainers>0</numContainers>
+ <usedMemoryMB>0</usedMemoryMB>
+ <availMemoryMB>8192</availMemoryMB>
</node>
\ No newline at end of file
[10/10] knox git commit: KNOX-1663 - Enforce more Checkstyle rules
Posted by kr...@apache.org.
KNOX-1663 - Enforce more Checkstyle rules
* UpperEll
* ModifierOrder
* RedundantModifier
* Trailing whitespace
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/6736393d
Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/6736393d
Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/6736393d
Branch: refs/heads/master
Commit: 6736393ddb51b5eed583b437af683cdd17df5be9
Parents: 8e00496
Author: Kevin Risden <kr...@apache.org>
Authored: Fri Dec 7 17:35:50 2018 -0500
Committer: Kevin Risden <kr...@apache.org>
Committed: Fri Dec 7 18:11:07 2018 -0500
----------------------------------------------------------------------
.../build-tools/checkstyle/checker.xml | 9 +
.../admin-ui/app/assets/vkbeautify.js | 516 +-
.../knoxauth/app/libs/bower/jquery/js/jquery.js | 37 +-
.../applications/knoxauth/app/login.html | 98 +-
.../applications/knoxauth/app/redirecting.html | 28 +-
.../applications/knoxauth/app/redirecting.jsp | 58 +-
.../applications/knoxauth/app/styles/knox.css | 130 +-
.../ambari/AmbariServiceDiscoveryMessages.java | 68 +-
.../ambari/AmbariServiceDiscoveryTest.java | 5 +-
.../loggers/log4j/Log4jMessageLogger.java | 6 +-
.../knox/gateway/i18n/messages/Message.java | 4 +-
.../knox/gateway/i18n/messages/Messages.java | 6 +-
.../gateway/i18n/messages/MessagesInvoker.java | 12 +-
.../messages/loggers/jdk/JdkMessageLogger.java | 6 +-
.../loggers/sout/SoutMessageLogger.java | 2 +-
.../loggers/test/TestMessageRecord.java | 2 +-
.../knox/gateway/i18n/resources/Resource.java | 2 +-
.../knox/gateway/i18n/resources/Resources.java | 2 +-
.../i18n/resources/ResourcesInvoker.java | 4 +-
.../knox/gateway/ha/provider/HaDescriptor.java | 12 +-
.../knox/gateway/ha/provider/HaProvider.java | 74 +-
.../gateway/ha/provider/HaServiceConfig.java | 33 +-
.../knox/gateway/ha/provider/URLManager.java | 15 +-
.../provider/impl/AtlasZookeeperURLManager.java | 2 +-
.../provider/impl/BaseZookeeperURLManager.java | 4 +-
.../provider/impl/HBaseZookeeperURLManager.java | 6 +-
.../ha/provider/impl/HaDescriptorConstants.java | 22 +-
.../provider/impl/HaServiceConfigConstants.java | 30 +-
.../provider/impl/KafkaZookeeperURLManager.java | 8 +-
.../provider/impl/SOLRZookeeperURLManager.java | 4 +-
.../ha/provider/impl/StringResponseHandler.java | 2 +-
.../HaProviderDeploymentContributorTest.java | 1 -
.../impl/HBaseZookeeperURLManagerTest.java | 2 +-
.../impl/KafkaZookeeperURLManagerTest.java | 4 +-
.../impl/SOLRZookeeperURLManagerTest.java | 9 +-
.../filter/AbstractIdentityAssertionFilter.java | 23 +-
.../filter/CommonIdentityAssertionFilter.java | 6 +-
...entityAsserterHttpServletRequestWrapper.java | 6 +-
.../CommonIdentityAssertionFilterTest.java | 4 +-
...yAssertionHttpServletRequestWrapperTest.java | 2 +-
.../function/UsernameFunctionProcessorTest.java | 2 +-
.../ConcatIdentityAssertionFilterTest.java | 6 +-
...adoopGroupProviderDeploymentContributor.java | 6 +-
.../filter/HadoopGroupProviderMessages.java | 14 +-
...pGroupProviderDeploymentContributorTest.java | 3 +-
.../hadoop/groups/filter/HadoopGroupsTest.java | 2 +-
.../DefaultIdentityAssertionFilterTest.java | 23 +-
.../filter/RegexIdentityAssertionFilter.java | 2 +-
.../jersey/JerseyDeploymentContributorTest.java | 2 +-
.../impl/HostmapFunctionProcessorTest.java | 5 +-
.../impl/ServiceRegistryFunctionsTest.java | 4 +-
.../SecureQueryDecryptProcessor.java | 4 +-
.../SecureQueryDeploymentContributor.java | 4 +-
.../SecureQueryDeploymentContributorTest.java | 6 +-
.../SecureQueryEncodeProcessorTest.java | 2 +-
.../SecureQueryEncryptDecryptProcessorTest.java | 4 +-
.../api/UrlRewriteFilterBufferDescriptor.java | 3 +-
.../api/UrlRewriteFilterGroupDescriptor.java | 6 +-
.../rewrite/impl/UrlRewriteFilterReader.java | 6 +-
.../rewrite/impl/html/HtmlPrefixProcessor.java | 2 +-
.../impl/html/HtmlUrlRewriteFilterReader.java | 2 +-
.../rewrite/impl/json/JsonFilterReader.java | 3 +-
.../rewrite/impl/xml/XmlFilterReader.java | 7 +-
.../impl/xml/XmlRewriteRulesDigester.java | 5 +-
.../rewrite/impl/xml/XmlRewriteRulesTags.java | 27 +-
.../impl/xml/XmlUrlRewriteRulesExporter.java | 2 +-
.../rewrite/api/UrlRewriteProcessorTest.java | 8 +-
.../api/UrlRewriteServletFilterTest.java | 3 +-
.../impl/FrontendFunctionProcessorTest.java | 4 +-
.../impl/html/HtmlFilterReaderBaseTest.java | 8 +-
.../impl/AclsAuthzDeploymentContributor.java | 4 +-
.../apache/knox/gateway/filter/AclParser.java | 4 +-
.../gateway/filter/AclsAuthorizationFilter.java | 13 +-
.../knox/gateway/filter/AclParserTest.java | 11 +-
.../gateway/filter/AclsAuthzFilterTest.java | 38 +-
.../gateway/hadoopauth/HadoopAuthMessages.java | 2 -
.../hadoopauth/filter/HadoopAuthFilter.java | 4 +-
.../hadoopauth/filter/HadoopAuthPostFilter.java | 47 +-
.../HadoopAuthDeploymentContributorTest.java | 2 +-
.../JWTAccessTokenAssertionContributor.java | 2 +-
.../deploy/SSOCookieFederationContributor.java | 2 +-
.../jwt/filter/AccessTokenFederationFilter.java | 27 +-
.../jwt/filter/SSOCookieFederationFilter.java | 4 +-
.../knox/gateway/pac4j/Pac4jMessages.java | 14 +-
.../Pac4jFederationProviderContributor.java | 2 +-
.../gateway/pac4j/session/KnoxSessionStore.java | 17 +-
.../filter/AbstractPreAuthFederationFilter.java | 13 +-
.../filter/HeaderPreAuthFederationFilter.java | 2 +-
.../preauth/filter/PreAuthValidator.java | 4 +-
.../provider/federation/IPValidatorTest.java | 2 +-
.../knox/gateway/deploy/impl/ShiroConfig.java | 6 +-
.../gateway/filter/ResponseCookieFilter.java | 2 +-
.../filter/ShiroSubjectIdentityAdapter.java | 31 +-
.../shirorealm/KnoxLdapContextFactory.java | 24 +-
.../knox/gateway/shirorealm/KnoxLdapRealm.java | 49 +-
.../gateway/shirorealm/KnoxLdapRealmTest.java | 25 +-
.../webappsec/deploy/WebAppSecContributor.java | 2 +-
.../webappsec/filter/CSRFPreventionFilter.java | 5 +-
.../webappsec/filter/StrictTransportFilter.java | 4 +-
.../webappsec/filter/XFrameOptionsFilter.java | 2 +-
.../webappsec/StrictTransportFilterTest.java | 2 +-
.../webappsec/XFrameOptionsFilterTest.java | 8 +-
.../webappsec/XSSProtectionFilterTest.java | 2 +-
.../org/apache/knox/gateway/GatewayFilter.java | 12 +-
.../knox/gateway/GatewayForwardingServlet.java | 4 +-
.../apache/knox/gateway/GatewayMessages.java | 88 +-
.../org/apache/knox/gateway/GatewayServer.java | 2 +-
.../gateway/config/impl/GatewayConfigImpl.java | 12 +-
.../impl/DispatchDeploymentContributor.java | 2 +-
.../xml/XmlGatewayDescriptorTags.java | 24 +-
.../gateway/filter/RequestUpdateHandler.java | 2 +-
.../gateway/services/CLIGatewayServices.java | 4 +-
.../services/DefaultGatewayServices.java | 4 +-
.../services/registry/impl/Registry.java | 9 +-
.../security/impl/CLIMasterService.java | 1 -
.../security/impl/DefaultCryptoService.java | 2 +-
.../security/impl/DefaultKeystoreService.java | 28 +-
.../security/impl/DefaultMasterService.java | 1 -
.../services/security/impl/JettySSLService.java | 11 +-
.../security/impl/RemoteAliasService.java | 8 +-
.../simple/SimpleDescriptorMessages.java | 14 +-
.../apache/knox/gateway/trace/TraceUtil.java | 8 +-
.../org/apache/knox/gateway/util/KnoxCLI.java | 4 +-
.../websockets/GatewayWebsocketHandler.java | 2 +-
.../websockets/MessageEventCallback.java | 23 +-
.../websockets/ProxyWebSocketAdapter.java | 2 +-
.../websockets/WebsocketLogMessages.java | 11 +-
.../apache/knox/gateway/GatewayFilterTest.java | 2 +-
.../gateway/GatewayForwardingServletTest.java | 2 -
.../gateway/GatewayPortMappingConfigTest.java | 2 +-
.../config/impl/GatewayConfigImplTest.java | 12 +-
.../services/security/CryptoServiceTest.java | 43 +-
.../apache/knox/gateway/util/KnoxCLITest.java | 10 +-
.../knox/gateway/websockets/BadBackendTest.java | 23 +-
.../websockets/ConnectionDroppedTest.java | 5 +-
.../knox/gateway/websockets/EchoSocket.java | 3 +-
.../gateway/websockets/MessageFailureTest.java | 13 +-
.../websockets/WebsocketEchoHandler.java | 10 +-
.../gateway/websockets/WebsocketEchoTest.java | 5 +-
.../WebsocketMultipleConnectionTest.java | 2 +-
.../xml/simple-topology-knox-format.xml | 12 +-
.../gateway/service/admin/VersionResource.java | 6 +-
.../services/sparkthriftui/2.1.0/service.xml | 2 +-
.../services/yarn-rm/2.5.0/rewrite.xml | 90 +-
.../service/knoxsso/WebSSOResourceTest.java | 2 +-
.../service/knoxtoken/TokenResource.java | 2 +-
.../remote/RemoteConfigurationMessages.java | 7 +-
.../service/vault/CredentialResource.java | 10 +-
.../hdfs/dispatch/AbstractHdfsHaDispatch.java | 4 +-
.../hdfs/dispatch/WebHdfsHaDispatch.java | 2 +-
.../shell/AbstractCredentialCollector.java | 3 -
.../AbstractJavaConsoleCredentialCollector.java | 8 +-
.../knox/gateway/shell/AbstractRequest.java | 4 +-
.../apache/knox/gateway/shell/Credentials.java | 6 +-
.../org/apache/knox/gateway/shell/KnoxSh.java | 12 +-
.../org/apache/knox/gateway/shell/job/Java.java | 6 +-
.../apache/knox/gateway/shell/job/Queue.java | 7 +-
.../apache/knox/gateway/shell/job/Status.java | 6 +-
.../apache/knox/gateway/SpiGatewayMessages.java | 8 +-
.../knox/gateway/config/GatewayConfig.java | 30 +-
.../ServiceDeploymentContributorBase.java | 4 +-
.../descriptor/GatewayDescriptorExporter.java | 6 +-
.../descriptor/GatewayDescriptorImporter.java | 4 +-
.../dispatch/AbstractGatewayDispatch.java | 8 +-
.../apache/knox/gateway/dispatch/Dispatch.java | 2 +-
.../gateway/dispatch/HttpClientFactory.java | 3 +-
.../dispatch/PassAllHeadersDispatch.java | 2 +-
.../AbstractIdentityAssertionFilter.java | 4 +-
.../knox/gateway/i18n/GatewaySpiMessages.java | 18 +-
.../knox/gateway/i18n/GatewaySpiResources.java | 2 +-
.../knox/gateway/security/GroupPrincipal.java | 2 +-
.../gateway/security/ImpersonatedPrincipal.java | 4 +-
.../knox/gateway/security/PrimaryPrincipal.java | 2 +-
.../knox/gateway/security/SubjectUtils.java | 21 +-
.../principal/SimplePrincipalMapper.java | 6 +-
.../knox/gateway/services/GatewayServices.java | 33 +-
.../gateway/services/ServerInfoService.java | 2 +-
.../apache/knox/gateway/services/Service.java | 4 +-
.../gateway/services/hostmap/HostMapper.java | 5 +-
.../services/registry/ServiceRegistry.java | 8 +-
.../services/security/CryptoService.java | 15 +-
.../services/security/EncryptionResult.java | 19 +-
.../services/security/KeystoreService.java | 2 +-
.../services/security/MasterService.java | 2 +-
.../security/impl/BaseKeystoreService.java | 14 +-
.../security/impl/CMFKeystoreService.java | 18 +-
.../security/impl/CMFMasterService.java | 14 +-
.../security/impl/ConfigurableEncryptor.java | 10 +-
.../security/impl/X509CertificateUtil.java | 2 +-
.../services/security/token/impl/JWT.java | 2 +-
.../org/apache/knox/gateway/topology/Param.java | 2 -
.../apache/knox/gateway/topology/Provider.java | 2 +-
.../apache/knox/gateway/topology/Service.java | 2 +-
.../apache/knox/gateway/topology/Topology.java | 2 +-
.../dispatch/CappedBufferHttpEntityTest.java | 4 +-
.../security/principal/PrincipalMapperTest.java | 2 +-
.../security/impl/CMFMasterServiceTest.java | 2 +-
.../security/impl/TestCMFMasterService.java | 2 -
.../apache/knox/gateway/GatewayTestConfig.java | 2 +-
.../apache/knox/test/log/CollectAppender.java | 2 +-
.../knox/test/mock/MockRequestMatcher.java | 2 +-
.../knox/gateway/GatewayCorrelationIdTest.java | 2 +-
.../monitor/RemoteConfigurationMonitorTest.java | 2 +-
.../gateway/GatewayBasicFuncTest/changes.txt | 8 +-
.../GatewayBasicFuncTest/yarn/app_running.json | 46 +-
.../GatewayBasicFuncTest/yarn/app_running.xml | 42 +-
.../yarn/app_succeeded.json | 46 +-
.../GatewayBasicFuncTest/yarn/app_succeeded.xml | 42 +-
.../GatewayBasicFuncTest/yarn/appattempts.json | 24 +-
.../GatewayBasicFuncTest/yarn/appattempts.xml | 16 +-
.../gateway/GatewayBasicFuncTest/yarn/apps.json | 138 +-
.../gateway/GatewayBasicFuncTest/yarn/apps.xml | 130 +-
.../yarn/appstatistics.json | 48 +-
.../GatewayBasicFuncTest/yarn/appstatistics.xml | 40 +-
.../GatewayBasicFuncTest/yarn/cluster-info.json | 24 +-
.../GatewayBasicFuncTest/yarn/cluster-info.xml | 30 +-
.../yarn/cluster-metrics.json | 42 +-
.../yarn/cluster-metrics.xml | 38 +-
.../gateway/GatewayBasicFuncTest/yarn/node.json | 26 +-
.../gateway/GatewayBasicFuncTest/yarn/node.xml | 22 +-
.../GatewayBasicFuncTest/yarn/nodes.json | 34 +-
.../gateway/GatewayBasicFuncTest/yarn/nodes.xml | 26 +-
.../yarn/proxy-mapreduce-info.json | 14 +-
.../yarn/proxy-mapreduce-info.xml | 10 +-
.../yarn/proxy-mapreduce-job-attempts.json | 24 +-
.../yarn/proxy-mapreduce-job-attempts.xml | 16 +-
.../yarn/proxy-mapreduce-job-conf.json | 10522 ++++++++---------
.../yarn/proxy-mapreduce-job-conf.xml | 8000 ++++++-------
.../yarn/proxy-mapreduce-job-counters.json | 610 +-
.../yarn/proxy-mapreduce-job-counters.xml | 588 +-
.../yarn/proxy-mapreduce-job.json | 62 +-
.../yarn/proxy-mapreduce-job.xml | 58 +-
.../yarn/proxy-mapreduce-jobs.json | 70 +-
.../yarn/proxy-mapreduce-jobs.xml | 62 +-
.../proxy-mapreduce-task-attempt-counters.json | 306 +-
.../proxy-mapreduce-task-attempt-counters.xml | 288 +-
.../yarn/proxy-mapreduce-task-attempt.json | 38 +-
.../yarn/proxy-mapreduce-task-attempt.xml | 36 +-
.../yarn/proxy-mapreduce-task-attempts.json | 48 +-
.../yarn/proxy-mapreduce-task-attempts.xml | 42 +-
.../yarn/proxy-mapreduce-task-counters.json | 306 +-
.../yarn/proxy-mapreduce-task-counters.xml | 282 +-
.../yarn/proxy-mapreduce-task.json | 22 +-
.../yarn/proxy-mapreduce-task.xml | 18 +-
.../yarn/proxy-mapreduce-tasks.json | 52 +-
.../yarn/proxy-mapreduce-tasks.xml | 46 +-
.../GatewayBasicFuncTest/yarn/scheduler.json | 78 +-
.../GatewayBasicFuncTest/yarn/scheduler.xml | 68 +-
.../knox/gateway/audit/api/ActionOutcome.java | 1 -
.../knox/gateway/audit/api/AuditContext.java | 4 +-
.../apache/knox/gateway/audit/api/Auditor.java | 9 +-
.../gateway/audit/api/CorrelationContext.java | 4 +-
.../gateway/audit/api/CorrelationService.java | 12 +-
.../audit/log4j/audit/AuditConstants.java | 6 +-
.../audit/log4j/audit/Log4jAuditContext.java | 9 +-
.../audit/log4j/audit/Log4jAuditService.java | 2 +-
.../gateway/audit/log4j/audit/Log4jAuditor.java | 6 +-
.../correlation/Log4jCorrelationService.java | 7 +-
.../gateway/audit/log4j/layout/AuditLayout.java | 6 +-
.../org/apache/knox/gateway/util/HttpUtils.java | 6 +-
.../knox/gateway/util/IpAddressValidator.java | 15 +-
.../org/apache/knox/gateway/util/JsonPath.java | 2 +-
.../org/apache/knox/gateway/util/JsonUtils.java | 19 +-
.../knox/gateway/util/X500PrincipalParser.java | 2 +-
.../org/apache/knox/gateway/util/XmlUtils.java | 12 +-
.../knox/gateway/audit/AuditLayoutTest.java | 9 +-
.../knox/gateway/audit/AuditServiceTest.java | 38 +-
.../gateway/util/IpAddressValidatorTest.java | 15 +-
.../apache/knox/gateway/util/JsonUtilsTest.java | 6 +-
.../org/apache/knox/gateway/config/Alias.java | 2 +-
.../org/apache/knox/gateway/config/Default.java | 2 +-
.../impl/DefaultConfigurationInjector.java | 4 +-
.../knox/gateway/config/AdapterSampleTest.java | 2 +-
.../knox/gateway/util/urltemplate/Parser.java | 16 +-
.../gateway/util/urltemplate/SegmentTest.java | 13 +-
275 files changed, 12620 insertions(+), 12815 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/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 d3d4b5f..268259d 100644
--- a/build-tools/src/main/resources/build-tools/checkstyle/checker.xml
+++ b/build-tools/src/main/resources/build-tools/checkstyle/checker.xml
@@ -95,5 +95,14 @@ limitations under the License.
</module>
<module name="IllegalImport"/>
<module name="AvoidStarImport"/>
+
+ <module name="UpperEll"/>
+ <module name="ModifierOrder"/>
+ <module name="RedundantModifier"/>
+ <module name="Regexp">
+ <property name="format" value="[ \t]+$"/>
+ <property name="illegalPattern" value="true"/>
+ <property name="message" value="Trailing whitespace"/>
+ </module>
</module>
</module>
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-applications/src/main/resources/applications/admin-ui/app/assets/vkbeautify.js
----------------------------------------------------------------------
diff --git a/gateway-applications/src/main/resources/applications/admin-ui/app/assets/vkbeautify.js b/gateway-applications/src/main/resources/applications/admin-ui/app/assets/vkbeautify.js
index 076c3d5..383f3f3 100644
--- a/gateway-applications/src/main/resources/applications/admin-ui/app/assets/vkbeautify.js
+++ b/gateway-applications/src/main/resources/applications/admin-ui/app/assets/vkbeautify.js
@@ -48,307 +48,307 @@
function createShiftArr(step) {
- var space = ' ';
-
- if ( isNaN(parseInt(step)) ) { // argument is string
- space = step;
- } else { // argument is integer
- switch(step) {
- case 1: space = ' '; break;
- case 2: space = ' '; break;
- case 3: space = ' '; break;
- case 4: space = ' '; break;
- case 5: space = ' '; break;
- case 6: space = ' '; break;
- case 7: space = ' '; break;
- case 8: space = ' '; break;
- case 9: space = ' '; break;
- case 10: space = ' '; break;
- case 11: space = ' '; break;
- case 12: space = ' '; break;
- }
- }
-
- var shift = ['\n']; // array of shifts
- for(ix=0;ix<100;ix++){
- shift.push(shift[ix]+space);
- }
- return shift;
+ var space = ' ';
+
+ if ( isNaN(parseInt(step)) ) { // argument is string
+ space = step;
+ } else { // argument is integer
+ switch(step) {
+ case 1: space = ' '; break;
+ case 2: space = ' '; break;
+ case 3: space = ' '; break;
+ case 4: space = ' '; break;
+ case 5: space = ' '; break;
+ case 6: space = ' '; break;
+ case 7: space = ' '; break;
+ case 8: space = ' '; break;
+ case 9: space = ' '; break;
+ case 10: space = ' '; break;
+ case 11: space = ' '; break;
+ case 12: space = ' '; break;
+ }
+ }
+
+ var shift = ['\n']; // array of shifts
+ for(ix=0;ix<100;ix++){
+ shift.push(shift[ix]+space);
+ }
+ return shift;
}
function vkbeautify(){
- this.step = '\t'; // 4 spaces
- this.shift = createShiftArr(this.step);
+ this.step = '\t'; // 4 spaces
+ this.shift = createShiftArr(this.step);
};
vkbeautify.prototype.xml = function(text,step) {
- var ar = text.replace(/>\s{0,}</g,"><")
- .replace(/</g,"~::~<")
- .replace(/\s*xmlns\:/g,"~::~xmlns:")
- .replace(/\s*xmlns\=/g,"~::~xmlns=")
- .split('~::~'),
- len = ar.length,
- inComment = false,
- deep = 0,
- str = '',
- ix = 0,
- shift = step ? createShiftArr(step) : this.shift;
-
- for(ix=0;ix<len;ix++) {
- // start comment or <![CDATA[...]]> or <!DOCTYPE //
- if(ar[ix].search(/<!/) > -1) {
- str += shift[deep]+ar[ix];
- inComment = true;
- // end comment or <![CDATA[...]]> //
- if(ar[ix].search(/-->/) > -1 || ar[ix].search(/\]>/) > -1 || ar[ix].search(/!DOCTYPE/) > -1 ) {
- inComment = false;
- }
- } else
- // end comment or <![CDATA[...]]> //
- if(ar[ix].search(/-->/) > -1 || ar[ix].search(/\]>/) > -1) {
- str += ar[ix];
- inComment = false;
- } else
- // <elm></elm> //
- if( /^<\w/.exec(ar[ix-1]) && /^<\/\w/.exec(ar[ix]) &&
- /^<[\w:\-\.\,]+/.exec(ar[ix-1]) == /^<\/[\w:\-\.\,]+/.exec(ar[ix])[0].replace('/','')) {
- str += ar[ix];
- if(!inComment) deep--;
- } else
- // <elm> //
- if(ar[ix].search(/<\w/) > -1 && ar[ix].search(/<\//) == -1 && ar[ix].search(/\/>/) == -1 ) {
- str = !inComment ? str += shift[deep++]+ar[ix] : str += ar[ix];
- } else
- // <elm>...</elm> //
- if(ar[ix].search(/<\w/) > -1 && ar[ix].search(/<\//) > -1) {
- str = !inComment ? str += shift[deep]+ar[ix] : str += ar[ix];
- } else
- // </elm> //
- if(ar[ix].search(/<\//) > -1) {
- str = !inComment ? str += shift[--deep]+ar[ix] : str += ar[ix];
- } else
- // <elm/> //
- if(ar[ix].search(/\/>/) > -1 ) {
- str = !inComment ? str += shift[deep]+ar[ix] : str += ar[ix];
- } else
- // <? xml ... ?> //
- if(ar[ix].search(/<\?/) > -1) {
- str += shift[deep]+ar[ix];
- } else
- // xmlns //
- if( ar[ix].search(/xmlns\:/) > -1 || ar[ix].search(/xmlns\=/) > -1) {
- str += shift[deep]+ar[ix];
- }
-
- else {
- str += ar[ix];
- }
- }
-
- return (str[0] == '\n') ? str.slice(1) : str;
+ var ar = text.replace(/>\s{0,}</g,"><")
+ .replace(/</g,"~::~<")
+ .replace(/\s*xmlns\:/g,"~::~xmlns:")
+ .replace(/\s*xmlns\=/g,"~::~xmlns=")
+ .split('~::~'),
+ len = ar.length,
+ inComment = false,
+ deep = 0,
+ str = '',
+ ix = 0,
+ shift = step ? createShiftArr(step) : this.shift;
+
+ for(ix=0;ix<len;ix++) {
+ // start comment or <![CDATA[...]]> or <!DOCTYPE //
+ if(ar[ix].search(/<!/) > -1) {
+ str += shift[deep]+ar[ix];
+ inComment = true;
+ // end comment or <![CDATA[...]]> //
+ if(ar[ix].search(/-->/) > -1 || ar[ix].search(/\]>/) > -1 || ar[ix].search(/!DOCTYPE/) > -1 ) {
+ inComment = false;
+ }
+ } else
+ // end comment or <![CDATA[...]]> //
+ if(ar[ix].search(/-->/) > -1 || ar[ix].search(/\]>/) > -1) {
+ str += ar[ix];
+ inComment = false;
+ } else
+ // <elm></elm> //
+ if( /^<\w/.exec(ar[ix-1]) && /^<\/\w/.exec(ar[ix]) &&
+ /^<[\w:\-\.\,]+/.exec(ar[ix-1]) == /^<\/[\w:\-\.\,]+/.exec(ar[ix])[0].replace('/','')) {
+ str += ar[ix];
+ if(!inComment) deep--;
+ } else
+ // <elm> //
+ if(ar[ix].search(/<\w/) > -1 && ar[ix].search(/<\//) == -1 && ar[ix].search(/\/>/) == -1 ) {
+ str = !inComment ? str += shift[deep++]+ar[ix] : str += ar[ix];
+ } else
+ // <elm>...</elm> //
+ if(ar[ix].search(/<\w/) > -1 && ar[ix].search(/<\//) > -1) {
+ str = !inComment ? str += shift[deep]+ar[ix] : str += ar[ix];
+ } else
+ // </elm> //
+ if(ar[ix].search(/<\//) > -1) {
+ str = !inComment ? str += shift[--deep]+ar[ix] : str += ar[ix];
+ } else
+ // <elm/> //
+ if(ar[ix].search(/\/>/) > -1 ) {
+ str = !inComment ? str += shift[deep]+ar[ix] : str += ar[ix];
+ } else
+ // <? xml ... ?> //
+ if(ar[ix].search(/<\?/) > -1) {
+ str += shift[deep]+ar[ix];
+ } else
+ // xmlns //
+ if( ar[ix].search(/xmlns\:/) > -1 || ar[ix].search(/xmlns\=/) > -1) {
+ str += shift[deep]+ar[ix];
+ }
+
+ else {
+ str += ar[ix];
+ }
+ }
+
+ return (str[0] == '\n') ? str.slice(1) : str;
}
vkbeautify.prototype.json = function(text,step) {
- var step = step ? step : this.step;
-
- if (typeof JSON === 'undefined' ) return text;
-
- if ( typeof text === "string" ) return JSON.stringify(JSON.parse(text), null, step);
- if ( typeof text === "object" ) return JSON.stringify(text, null, step);
-
- return text; // text is not string nor object
+ var step = step ? step : this.step;
+
+ if (typeof JSON === 'undefined' ) return text;
+
+ if ( typeof text === "string" ) return JSON.stringify(JSON.parse(text), null, step);
+ if ( typeof text === "object" ) return JSON.stringify(text, null, step);
+
+ return text; // text is not string nor object
}
vkbeautify.prototype.css = function(text, step) {
- var ar = text.replace(/\s{1,}/g,' ')
- .replace(/\{/g,"{~::~")
- .replace(/\}/g,"~::~}~::~")
- .replace(/\;/g,";~::~")
- .replace(/\/\*/g,"~::~/*")
- .replace(/\*\//g,"*/~::~")
- .replace(/~::~\s{0,}~::~/g,"~::~")
- .split('~::~'),
- len = ar.length,
- deep = 0,
- str = '',
- ix = 0,
- shift = step ? createShiftArr(step) : this.shift;
-
- for(ix=0;ix<len;ix++) {
-
- if( /\{/.exec(ar[ix])) {
- str += shift[deep++]+ar[ix];
- } else
- if( /\}/.exec(ar[ix])) {
- str += shift[--deep]+ar[ix];
- } else
- if( /\*\\/.exec(ar[ix])) {
- str += shift[deep]+ar[ix];
- }
- else {
- str += shift[deep]+ar[ix];
- }
- }
- return str.replace(/^\n{1,}/,'');
+ var ar = text.replace(/\s{1,}/g,' ')
+ .replace(/\{/g,"{~::~")
+ .replace(/\}/g,"~::~}~::~")
+ .replace(/\;/g,";~::~")
+ .replace(/\/\*/g,"~::~/*")
+ .replace(/\*\//g,"*/~::~")
+ .replace(/~::~\s{0,}~::~/g,"~::~")
+ .split('~::~'),
+ len = ar.length,
+ deep = 0,
+ str = '',
+ ix = 0,
+ shift = step ? createShiftArr(step) : this.shift;
+
+ for(ix=0;ix<len;ix++) {
+
+ if( /\{/.exec(ar[ix])) {
+ str += shift[deep++]+ar[ix];
+ } else
+ if( /\}/.exec(ar[ix])) {
+ str += shift[--deep]+ar[ix];
+ } else
+ if( /\*\\/.exec(ar[ix])) {
+ str += shift[deep]+ar[ix];
+ }
+ else {
+ str += shift[deep]+ar[ix];
+ }
+ }
+ return str.replace(/^\n{1,}/,'');
}
//----------------------------------------------------------------------------
function isSubquery(str, parenthesisLevel) {
- return parenthesisLevel - (str.replace(/\(/g,'').length - str.replace(/\)/g,'').length )
+ return parenthesisLevel - (str.replace(/\(/g,'').length - str.replace(/\)/g,'').length )
}
function split_sql(str, tab) {
- return str.replace(/\s{1,}/g," ")
-
- .replace(/ AND /ig,"~::~"+tab+tab+"AND ")
- .replace(/ BETWEEN /ig,"~::~"+tab+"BETWEEN ")
- .replace(/ CASE /ig,"~::~"+tab+"CASE ")
- .replace(/ ELSE /ig,"~::~"+tab+"ELSE ")
- .replace(/ END /ig,"~::~"+tab+"END ")
- .replace(/ FROM /ig,"~::~FROM ")
- .replace(/ GROUP\s{1,}BY/ig,"~::~GROUP BY ")
- .replace(/ HAVING /ig,"~::~HAVING ")
- //.replace(/ SET /ig," SET~::~")
- .replace(/ IN /ig," IN ")
-
- .replace(/ JOIN /ig,"~::~JOIN ")
- .replace(/ CROSS~::~{1,}JOIN /ig,"~::~CROSS JOIN ")
- .replace(/ INNER~::~{1,}JOIN /ig,"~::~INNER JOIN ")
- .replace(/ LEFT~::~{1,}JOIN /ig,"~::~LEFT JOIN ")
- .replace(/ RIGHT~::~{1,}JOIN /ig,"~::~RIGHT JOIN ")
-
- .replace(/ ON /ig,"~::~"+tab+"ON ")
- .replace(/ OR /ig,"~::~"+tab+tab+"OR ")
- .replace(/ ORDER\s{1,}BY/ig,"~::~ORDER BY ")
- .replace(/ OVER /ig,"~::~"+tab+"OVER ")
-
- .replace(/\(\s{0,}SELECT /ig,"~::~(SELECT ")
- .replace(/\)\s{0,}SELECT /ig,")~::~SELECT ")
-
- .replace(/ THEN /ig," THEN~::~"+tab+"")
- .replace(/ UNION /ig,"~::~UNION~::~")
- .replace(/ USING /ig,"~::~USING ")
- .replace(/ WHEN /ig,"~::~"+tab+"WHEN ")
- .replace(/ WHERE /ig,"~::~WHERE ")
- .replace(/ WITH /ig,"~::~WITH ")
-
- //.replace(/\,\s{0,}\(/ig,",~::~( ")
- //.replace(/\,/ig,",~::~"+tab+tab+"")
-
- .replace(/ ALL /ig," ALL ")
- .replace(/ AS /ig," AS ")
- .replace(/ ASC /ig," ASC ")
- .replace(/ DESC /ig," DESC ")
- .replace(/ DISTINCT /ig," DISTINCT ")
- .replace(/ EXISTS /ig," EXISTS ")
- .replace(/ NOT /ig," NOT ")
- .replace(/ NULL /ig," NULL ")
- .replace(/ LIKE /ig," LIKE ")
- .replace(/\s{0,}SELECT /ig,"SELECT ")
- .replace(/\s{0,}UPDATE /ig,"UPDATE ")
- .replace(/ SET /ig," SET ")
-
- .replace(/~::~{1,}/g,"~::~")
- .split('~::~');
+ return str.replace(/\s{1,}/g," ")
+
+ .replace(/ AND /ig,"~::~"+tab+tab+"AND ")
+ .replace(/ BETWEEN /ig,"~::~"+tab+"BETWEEN ")
+ .replace(/ CASE /ig,"~::~"+tab+"CASE ")
+ .replace(/ ELSE /ig,"~::~"+tab+"ELSE ")
+ .replace(/ END /ig,"~::~"+tab+"END ")
+ .replace(/ FROM /ig,"~::~FROM ")
+ .replace(/ GROUP\s{1,}BY/ig,"~::~GROUP BY ")
+ .replace(/ HAVING /ig,"~::~HAVING ")
+ //.replace(/ SET /ig," SET~::~")
+ .replace(/ IN /ig," IN ")
+
+ .replace(/ JOIN /ig,"~::~JOIN ")
+ .replace(/ CROSS~::~{1,}JOIN /ig,"~::~CROSS JOIN ")
+ .replace(/ INNER~::~{1,}JOIN /ig,"~::~INNER JOIN ")
+ .replace(/ LEFT~::~{1,}JOIN /ig,"~::~LEFT JOIN ")
+ .replace(/ RIGHT~::~{1,}JOIN /ig,"~::~RIGHT JOIN ")
+
+ .replace(/ ON /ig,"~::~"+tab+"ON ")
+ .replace(/ OR /ig,"~::~"+tab+tab+"OR ")
+ .replace(/ ORDER\s{1,}BY/ig,"~::~ORDER BY ")
+ .replace(/ OVER /ig,"~::~"+tab+"OVER ")
+
+ .replace(/\(\s{0,}SELECT /ig,"~::~(SELECT ")
+ .replace(/\)\s{0,}SELECT /ig,")~::~SELECT ")
+
+ .replace(/ THEN /ig," THEN~::~"+tab+"")
+ .replace(/ UNION /ig,"~::~UNION~::~")
+ .replace(/ USING /ig,"~::~USING ")
+ .replace(/ WHEN /ig,"~::~"+tab+"WHEN ")
+ .replace(/ WHERE /ig,"~::~WHERE ")
+ .replace(/ WITH /ig,"~::~WITH ")
+
+ //.replace(/\,\s{0,}\(/ig,",~::~( ")
+ //.replace(/\,/ig,",~::~"+tab+tab+"")
+
+ .replace(/ ALL /ig," ALL ")
+ .replace(/ AS /ig," AS ")
+ .replace(/ ASC /ig," ASC ")
+ .replace(/ DESC /ig," DESC ")
+ .replace(/ DISTINCT /ig," DISTINCT ")
+ .replace(/ EXISTS /ig," EXISTS ")
+ .replace(/ NOT /ig," NOT ")
+ .replace(/ NULL /ig," NULL ")
+ .replace(/ LIKE /ig," LIKE ")
+ .replace(/\s{0,}SELECT /ig,"SELECT ")
+ .replace(/\s{0,}UPDATE /ig,"UPDATE ")
+ .replace(/ SET /ig," SET ")
+
+ .replace(/~::~{1,}/g,"~::~")
+ .split('~::~');
}
vkbeautify.prototype.sql = function(text,step) {
- var ar_by_quote = text.replace(/\s{1,}/g," ")
- .replace(/\'/ig,"~::~\'")
- .split('~::~'),
- len = ar_by_quote.length,
- ar = [],
- deep = 0,
- tab = this.step,//+this.step,
- inComment = true,
- inQuote = false,
- parenthesisLevel = 0,
- str = '',
- ix = 0,
- shift = step ? createShiftArr(step) : this.shift;;
-
- for(ix=0;ix<len;ix++) {
- if(ix%2) {
- ar = ar.concat(ar_by_quote[ix]);
- } else {
- ar = ar.concat(split_sql(ar_by_quote[ix], tab) );
- }
- }
-
- len = ar.length;
- for(ix=0;ix<len;ix++) {
-
- parenthesisLevel = isSubquery(ar[ix], parenthesisLevel);
-
- if( /\s{0,}\s{0,}SELECT\s{0,}/.exec(ar[ix])) {
- ar[ix] = ar[ix].replace(/\,/g,",\n"+tab+tab+"")
- }
-
- if( /\s{0,}\s{0,}SET\s{0,}/.exec(ar[ix])) {
- ar[ix] = ar[ix].replace(/\,/g,",\n"+tab+tab+"")
- }
-
- if( /\s{0,}\(\s{0,}SELECT\s{0,}/.exec(ar[ix])) {
- deep++;
- str += shift[deep]+ar[ix];
- } else
- if( /\'/.exec(ar[ix]) ) {
- if(parenthesisLevel<1 && deep) {
- deep--;
- }
- str += ar[ix];
- }
- else {
- str += shift[deep]+ar[ix];
- if(parenthesisLevel<1 && deep) {
- deep--;
- }
- }
- var junk = 0;
- }
-
- str = str.replace(/^\n{1,}/,'').replace(/\n{1,}/g,"\n");
- return str;
+ var ar_by_quote = text.replace(/\s{1,}/g," ")
+ .replace(/\'/ig,"~::~\'")
+ .split('~::~'),
+ len = ar_by_quote.length,
+ ar = [],
+ deep = 0,
+ tab = this.step,//+this.step,
+ inComment = true,
+ inQuote = false,
+ parenthesisLevel = 0,
+ str = '',
+ ix = 0,
+ shift = step ? createShiftArr(step) : this.shift;;
+
+ for(ix=0;ix<len;ix++) {
+ if(ix%2) {
+ ar = ar.concat(ar_by_quote[ix]);
+ } else {
+ ar = ar.concat(split_sql(ar_by_quote[ix], tab) );
+ }
+ }
+
+ len = ar.length;
+ for(ix=0;ix<len;ix++) {
+
+ parenthesisLevel = isSubquery(ar[ix], parenthesisLevel);
+
+ if( /\s{0,}\s{0,}SELECT\s{0,}/.exec(ar[ix])) {
+ ar[ix] = ar[ix].replace(/\,/g,",\n"+tab+tab+"")
+ }
+
+ if( /\s{0,}\s{0,}SET\s{0,}/.exec(ar[ix])) {
+ ar[ix] = ar[ix].replace(/\,/g,",\n"+tab+tab+"")
+ }
+
+ if( /\s{0,}\(\s{0,}SELECT\s{0,}/.exec(ar[ix])) {
+ deep++;
+ str += shift[deep]+ar[ix];
+ } else
+ if( /\'/.exec(ar[ix]) ) {
+ if(parenthesisLevel<1 && deep) {
+ deep--;
+ }
+ str += ar[ix];
+ }
+ else {
+ str += shift[deep]+ar[ix];
+ if(parenthesisLevel<1 && deep) {
+ deep--;
+ }
+ }
+ var junk = 0;
+ }
+
+ str = str.replace(/^\n{1,}/,'').replace(/\n{1,}/g,"\n");
+ return str;
}
vkbeautify.prototype.xmlmin = function(text, preserveComments) {
- var str = preserveComments ? text
- : text.replace(/\<![ \r\n\t]*(--([^\-]|[\r\n]|-[^\-])*--[ \r\n\t]*)\>/g,"")
- .replace(/[ \r\n\t]{1,}xmlns/g, ' xmlns');
- return str.replace(/>\s{0,}</g,"><");
+ var str = preserveComments ? text
+ : text.replace(/\<![ \r\n\t]*(--([^\-]|[\r\n]|-[^\-])*--[ \r\n\t]*)\>/g,"")
+ .replace(/[ \r\n\t]{1,}xmlns/g, ' xmlns');
+ return str.replace(/>\s{0,}</g,"><");
}
vkbeautify.prototype.jsonmin = function(text) {
- if (typeof JSON === 'undefined' ) return text;
-
- return JSON.stringify(JSON.parse(text), null, 0);
-
+ if (typeof JSON === 'undefined' ) return text;
+
+ return JSON.stringify(JSON.parse(text), null, 0);
+
}
vkbeautify.prototype.cssmin = function(text, preserveComments) {
-
- var str = preserveComments ? text
- : text.replace(/\/\*([^*]|[\r\n]|(\*+([^*/]|[\r\n])))*\*+\//g,"") ;
-
- return str.replace(/\s{1,}/g,' ')
- .replace(/\{\s{1,}/g,"{")
- .replace(/\}\s{1,}/g,"}")
- .replace(/\;\s{1,}/g,";")
- .replace(/\/\*\s{1,}/g,"/*")
- .replace(/\*\/\s{1,}/g,"*/");
+
+ var str = preserveComments ? text
+ : text.replace(/\/\*([^*]|[\r\n]|(\*+([^*/]|[\r\n])))*\*+\//g,"") ;
+
+ return str.replace(/\s{1,}/g,' ')
+ .replace(/\{\s{1,}/g,"{")
+ .replace(/\}\s{1,}/g,"}")
+ .replace(/\;\s{1,}/g,";")
+ .replace(/\/\*\s{1,}/g,"/*")
+ .replace(/\*\/\s{1,}/g,"*/");
}
vkbeautify.prototype.sqlmin = function(text) {
- return text.replace(/\s{1,}/g," ").replace(/\s{1,}\(/,"(").replace(/\s{1,}\)/,")");
+ return text.replace(/\s{1,}/g," ").replace(/\s{1,}\(/,"(").replace(/\s{1,}\)/,")");
}
window.vkbeautify = new vkbeautify();
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-applications/src/main/resources/applications/knoxauth/app/libs/bower/jquery/js/jquery.js
----------------------------------------------------------------------
diff --git a/gateway-applications/src/main/resources/applications/knoxauth/app/libs/bower/jquery/js/jquery.js b/gateway-applications/src/main/resources/applications/knoxauth/app/libs/bower/jquery/js/jquery.js
index 2a702b0..e6c1903 100644
--- a/gateway-applications/src/main/resources/applications/knoxauth/app/libs/bower/jquery/js/jquery.js
+++ b/gateway-applications/src/main/resources/applications/knoxauth/app/libs/bower/jquery/js/jquery.js
@@ -848,8 +848,8 @@ function Sizzle( selector, context, results, seed ) {
/**
* Create key-value caches of limited size
* @returns {function(string, object)} Returns the Object data after storing it on itself with
- * property name the (space-suffixed) string and (if the cache is larger than Expr.cacheLength)
- * deleting the oldest entry
+ * property name the (space-suffixed) string and (if the cache is larger than Expr.cacheLength)
+ * deleting the oldest entry
*/
function createCache() {
var keys = [];
@@ -3203,23 +3203,24 @@ function createOptions( options ) {
/*
* Create a callback list using the following parameters:
*
- * options: an optional list of space-separated options that will change how
- * the callback list behaves or a more traditional option object
+ * options: an optional list of space-separated options that will change how
+ * the callback list behaves or a more traditional option object
*
* By default a callback list will act like an event callback list and can be
* "fired" multiple times.
*
* Possible options:
*
- * once: will ensure the callback list can only be fired once (like a Deferred)
*
- * memory: will keep track of previous values and will call any callback added
- * after the list has been fired right away with the latest "memorized"
- * values (like a Deferred)
+ * once: will ensure the callback list can only be fired once (like a Deferred)
*
- * unique: will ensure a callback can only be added once (no duplicate in the list)
+ * memory: will keep track of previous values and will call any callback added
+ * after the list has been fired right away with the latest "memorized"
+ * values (like a Deferred)
*
- * stopOnFalse: interrupt callings when a callback returns false
+ * unique: will ensure a callback can only be added once (no duplicate in the list)
+ *
+ * stopOnFalse: interrupt callings when a callback returns false
*
*/
jQuery.Callbacks = function( options ) {
@@ -4157,15 +4158,15 @@ var dataUser = new Data();
-// Implementation Summary
+// Implementation Summary
//
-// 1. Enforce API surface and semantic compatibility with 1.9.x branch
-// 2. Improve the module's maintainability by reducing the storage
-// paths to a single mechanism.
-// 3. Use the same single mechanism to support "private" and "user" data.
-// 4. _Never_ expose "private" data to user code (TODO: Drop _data, _removeData)
-// 5. Avoid exposing implementation details on user objects (eg. expando properties)
-// 6. Provide a clear path for implementation upgrade to WeakMap in 2014
+// 1. Enforce API surface and semantic compatibility with 1.9.x branch
+// 2. Improve the module's maintainability by reducing the storage
+// paths to a single mechanism.
+// 3. Use the same single mechanism to support "private" and "user" data.
+// 4. _Never_ expose "private" data to user code (TODO: Drop _data, _removeData)
+// 5. Avoid exposing implementation details on user objects (eg. expando properties)
+// 6. Provide a clear path for implementation upgrade to WeakMap in 2014
var rbrace = /^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,
rmultiDash = /[A-Z]/g;
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-applications/src/main/resources/applications/knoxauth/app/login.html
----------------------------------------------------------------------
diff --git a/gateway-applications/src/main/resources/applications/knoxauth/app/login.html b/gateway-applications/src/main/resources/applications/knoxauth/app/login.html
index 427fdf0..64fa16c 100644
--- a/gateway-applications/src/main/resources/applications/knoxauth/app/login.html
+++ b/gateway-applications/src/main/resources/applications/knoxauth/app/login.html
@@ -18,59 +18,59 @@
<!--[if IE 8]><html class="no-js lt-ie9"><![endif]-->
<!--[if gt IE 8]><!-->
<html class="no-js">
- <!--<![endif]-->
- <head>
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <title>KnoxSSO - Sign In</title>
- <meta name="description" content="">
- <meta name="viewport" content="width=device-width">
-
- <link rel="shortcut icon" href="images/favicon.ico">
- <link href="styles/bootstrap.min.css" media="all" rel="stylesheet" type="text/css" id="bootstrap-css">
- <link href="styles/knox.css" media="all" rel="stylesheet" type="text/css" >
+ <!--<![endif]-->
+ <head>
+ <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <title>KnoxSSO - Sign In</title>
+ <meta name="description" content="">
+ <meta name="viewport" content="width=device-width">
- <script src="libs/bower/jquery/js/jquery.js" ></script>
+ <link rel="shortcut icon" href="images/favicon.ico">
+ <link href="styles/bootstrap.min.css" media="all" rel="stylesheet" type="text/css" id="bootstrap-css">
+ <link href="styles/knox.css" media="all" rel="stylesheet" type="text/css" >
+
+ <script src="libs/bower/jquery/js/jquery.js" ></script>
<script type="text/javascript" src="js/knoxauth.js"></script>
- <script type="text/javascript">
+ <script type="text/javascript">
$(function() {
- var updateBoxPosition = function() {
- $('#signin-container').css({
- 'margin-top' : ($(window).height() - $('#signin-container').height()) / 2
- });
- };
- $(window).resize(updateBoxPosition);
- setTimeout(updateBoxPosition, 50);
- });
- </script>
+ var updateBoxPosition = function() {
+ $('#signin-container').css({
+ 'margin-top' : ($(window).height() - $('#signin-container').height()) / 2
+ });
+ };
+ $(window).resize(updateBoxPosition);
+ setTimeout(updateBoxPosition, 50);
+ });
+ </script>
- </head>
- <body class="login" style="">
- <!-- Page content
- ================================================== -->
- <section id="signin-container" style="margin-top: 4.5px;">
- <div class="l-logo">
- <img src="images/knox-logo.gif" alt="Knox logo">
- </div>
- <form action="" method="post" accept-charset="utf-8">
- <fieldset>
- <div class="fields">
- <label><i class="icon-user"></i> Username:</label>
- <input type="text" name="username" id="username" tabindex="1" onkeypress=keypressed(event) autofocus>
- <label><i class="icon-lock"></i> Password:</label>
- <input type="password" name="password" id="password" tabindex="2" autocomplete="off" onkeypress=keypressed(event)>
- </div>
- <span id="errorBox" class="help-inline" style="color:white;display:none;"><span class="errorMsg"></span>
- <i class="icon-warning-sign" style="color:#ae2817;"></i>
- </span>
- <button type="button" class="btn btn-primary btn-block" id="signIn" tabindex="4" onkeypress="keypressed(event)" onclick="login();">
- Sign In
- <i id="signInLoading" class="icon-spinner icon-spin pull-right icon-sign-in"></i>
- </button>
- </fieldset>
- </form>
- </section>
+ </head>
+ <body class="login" style="">
+ <!-- Page content
+ ================================================== -->
+ <section id="signin-container" style="margin-top: 4.5px;">
+ <div class="l-logo">
+ <img src="images/knox-logo.gif" alt="Knox logo">
+ </div>
+ <form action="" method="post" accept-charset="utf-8">
+ <fieldset>
+ <div class="fields">
+ <label><i class="icon-user"></i> Username:</label>
+ <input type="text" name="username" id="username" tabindex="1" onkeypress=keypressed(event) autofocus>
+ <label><i class="icon-lock"></i> Password:</label>
+ <input type="password" name="password" id="password" tabindex="2" autocomplete="off" onkeypress=keypressed(event)>
+ </div>
+ <span id="errorBox" class="help-inline" style="color:white;display:none;"><span class="errorMsg"></span>
+ <i class="icon-warning-sign" style="color:#ae2817;"></i>
+ </span>
+ <button type="button" class="btn btn-primary btn-block" id="signIn" tabindex="4" onkeypress="keypressed(event)" onclick="login();">
+ Sign In
+ <i id="signInLoading" class="icon-spinner icon-spin pull-right icon-sign-in"></i>
+ </button>
+ </fieldset>
+ </form>
+ </section>
- </body>
+ </body>
</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-applications/src/main/resources/applications/knoxauth/app/redirecting.html
----------------------------------------------------------------------
diff --git a/gateway-applications/src/main/resources/applications/knoxauth/app/redirecting.html b/gateway-applications/src/main/resources/applications/knoxauth/app/redirecting.html
index 64ad5e6..3e55a4e 100644
--- a/gateway-applications/src/main/resources/applications/knoxauth/app/redirecting.html
+++ b/gateway-applications/src/main/resources/applications/knoxauth/app/redirecting.html
@@ -18,18 +18,18 @@
<!--[if IE 8]><html class="no-js lt-ie9"><![endif]-->
<!--[if gt IE 8]><!-->
<html class="no-js">
- <!--<![endif]-->
- <head>
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <!--<![endif]-->
+ <head>
+ <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<title>Apache KnoxSSO Redirect</title>
- <meta name="description" content="">
- <meta name="viewport" content="width=device-width">
- <meta http-equiv="Content-Type" content="text/html;charset=utf-8"/>
+ <meta name="description" content="">
+ <meta name="viewport" content="width=device-width">
+ <meta http-equiv="Content-Type" content="text/html;charset=utf-8"/>
- <link rel="shortcut icon" href="images/favicon.ico">
- <link href="styles/bootstrap.min.css" media="all" rel="stylesheet" type="text/css" id="bootstrap-css">
- <link href="styles/knox.css" media="all" rel="stylesheet" type="text/css" >
+ <link rel="shortcut icon" href="images/favicon.ico">
+ <link href="styles/bootstrap.min.css" media="all" rel="stylesheet" type="text/css" id="bootstrap-css">
+ <link href="styles/knox.css" media="all" rel="stylesheet" type="text/css" >
<script>
document.addEventListener("load", redirectOnLoad());
@@ -41,13 +41,13 @@
</head>
<body>
- <section id="signin-container" style="margin-top: 80px;">
+ <section id="signin-container" style="margin-top: 80px;">
<div style="background: gray;text-color: white;text-align:center;">
<h1 style="color: white;">Redirecting...</h1>
<div style="background: white;" class="l-logo">
- <img src="images/loading.gif" alt="Knox logo" style="text-align:center;width: 2%; height: 2%">
- </div>
- </div>
+ <img src="images/loading.gif" alt="Knox logo" style="text-align:center;width: 2%; height: 2%">
+ </div>
+ </div>
</section>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-applications/src/main/resources/applications/knoxauth/app/redirecting.jsp
----------------------------------------------------------------------
diff --git a/gateway-applications/src/main/resources/applications/knoxauth/app/redirecting.jsp b/gateway-applications/src/main/resources/applications/knoxauth/app/redirecting.jsp
index 193c69a..05ed96e 100644
--- a/gateway-applications/src/main/resources/applications/knoxauth/app/redirecting.jsp
+++ b/gateway-applications/src/main/resources/applications/knoxauth/app/redirecting.jsp
@@ -25,25 +25,25 @@
<!--[if IE 8]><html class="no-js lt-ie9"><![endif]-->
<!--[if gt IE 8]><!-->
<html class="no-js">
- <!--<![endif]-->
- <head>
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <meta name="description" content="">
- <meta name="viewport" content="width=device-width">
- <meta http-equiv="Content-Type" content="text/html;charset=utf-8"/>
+ <!--<![endif]-->
+ <head>
+ <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="description" content="">
+ <meta name="viewport" content="width=device-width">
+ <meta http-equiv="Content-Type" content="text/html;charset=utf-8"/>
- <link rel="shortcut icon" href="images/favicon.ico">
- <link href="styles/bootstrap.min.css" media="all" rel="stylesheet" type="text/css" id="bootstrap-css">
- <link href="styles/knox.css" media="all" rel="stylesheet" type="text/css" >
+ <link rel="shortcut icon" href="images/favicon.ico">
+ <link href="styles/bootstrap.min.css" media="all" rel="stylesheet" type="text/css" id="bootstrap-css">
+ <link href="styles/knox.css" media="all" rel="stylesheet" type="text/css" >
<script src="libs/bower/jquery/js/jquery.js" ></script>
<script type="text/javascript" src="js/knoxauth.js"></script>
- <%
+ <%
Topology topology = (Topology)request.getSession().getServletContext().getAttribute("org.apache.knox.gateway.topology");
String whitelist = null;
- Collection services = topology.getServices();
+ Collection services = topology.getServices();
for (Object service : services) {
Service svc = (Service)service;
if (svc.getRole().equals("KNOXSSO")) {
@@ -59,45 +59,45 @@
}
boolean validRedirect = RegExUtils.checkWhitelist(whitelist, request.getParameter("originalUrl"));
if (validRedirect) {
- %>
+ %>
<script>
document.addEventListener("load", redirectOnLoad());
function redirectOnLoad() {
var originalUrl = get("originalUrl");
if (originalUrl != null) {
- redirect(originalUrl);
+ redirect(originalUrl);
}
}
</script>
- <%
+ <%
}
- %>
+ %>
</head>
<body>
- <section id="signin-container" style="margin-top: 80px;">
- <%
+ <section id="signin-container" style="margin-top: 80px;">
+ <%
if (validRedirect) {
- %>
+ %>
<div style="background: gray;text-color: white;text-align:center;">
<h1 style="color: white;">Loading...</h1>
<div style="background: white;" class="l-logo">
- <img src="images/loading.gif" alt="Knox logo" style="text-align:center;width: 2%; height: 2%">
- </div>
- <p style="color: white;display: block">Loading should complete in few a seconds. If not, click <a href="#" onclick='redirect(get("originalUrl"));' >here</a></p>
- <%
+ <img src="images/loading.gif" alt="Knox logo" style="text-align:center;width: 2%; height: 2%">
+ </div>
+ <p style="color: white;display: block">Loading should complete in few a seconds. If not, click <a href="#" onclick='redirect(get("originalUrl"));' >here</a></p>
+ <%
} else {
- %>
+ %>
<div style="background: gray;text-color: white;text-align:center;">
<h1 style="color: red;">ERROR</h1>
<div style="background: white;" class="l-logo">
- </div>
- <p style="color: white;display: block">Invalid Redirect: Possible Phishing Attempt</p>
- <%
+ </div>
+ <p style="color: white;display: block">Invalid Redirect: Possible Phishing Attempt</p>
+ <%
}
- %>
- </div>
+ %>
+ </div>
</section>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-applications/src/main/resources/applications/knoxauth/app/styles/knox.css
----------------------------------------------------------------------
diff --git a/gateway-applications/src/main/resources/applications/knoxauth/app/styles/knox.css b/gateway-applications/src/main/resources/applications/knoxauth/app/styles/knox.css
index 80280db..2de4274 100644
--- a/gateway-applications/src/main/resources/applications/knoxauth/app/styles/knox.css
+++ b/gateway-applications/src/main/resources/applications/knoxauth/app/styles/knox.css
@@ -1674,131 +1674,131 @@ body.login {
box-shadow: none;
}
.label-yellow{
- background-color: #f3a139;
+ background-color: #f3a139;
}
.label-inverse {
background-color: #444444;
}
.alert {
- border:none;
+ border:none;
}
tr.disable-policy td {
- background-color: #F0F0F0;
+ background-color: #F0F0F0;
}
.policy-disabled .formHeader,
.policy-disabled .control-label {
- color:#aaa;
+ color:#aaa;
}
td.html-cell.renderable:last-child {
- text-align:center;
+ text-align:center;
}
.policy-manager span.policy-title {
- font-size: 20px;
- line-height: 32px;
- text-transform: uppercase;
- color: #707070;
+ font-size: 20px;
+ line-height: 32px;
+ text-transform: uppercase;
+ color: #707070;
}
.policy-manager table thead tr th:first-child {
- background-color: #d8d8d8;
+ background-color: #d8d8d8;
}
.policy-manager table thead tr th:first-child a {
- color: #707070;
+ color: #707070;
}
.label-green{
- background-color: #3ea211;
+ background-color: #3ea211;
}
.connection-error-font {
- font-size: 11px;
- font-family: monospace;
+ font-size: 11px;
+ font-family: monospace;
}
/**************/
.policy-form .field-name{
- float: left;
- margin-bottom: 0 !important;
+ float: left;
+ margin-bottom: 0 !important;
}
.policy-form .field-isEnabled{
margin-left: 413px;
margin-bottom: 12px !important;
}
.policy-form .field-isEnabled .controls{
- margin-left:30px;
+ margin-left:30px;
}
.margin-bottom-5{
margin-bottom: 5px;
}
.popover-content {
- /*overflow-y: auto;
- max-height: 250px;*/
- padding-right: 25px;
+ /*overflow-y: auto;
+ max-height: 250px;*/
+ padding-right: 25px;
}
.margin-bottom-57 {
- margin-bottom:57px;
+ margin-bottom:57px;
}
.table .table {
- width:auto;
+ width:auto;
}
.width-25{
- width:25%;
+ width:25%;
}
.margin-left-0{
- margin-left:0%!important;
+ margin-left:0%!important;
}
.policy-manager .row-fluid [class*="span"]:first-child {
- margin-left: 1%;
+ margin-left: 1%;
}
.policy-manager .row-fluid [class*="span"] {
- margin-left: 1%;
- margin-right: 1%;
+ margin-left: 1%;
+ margin-right: 1%;
}
.policy-manager .row-fluid [class*="span"]:nth-child(3n+4) {
- clear: both;
+ clear: both;
}
.field-isEnabled + div {
clear:both;
}
.include-toggle{
- margin-left: 264px;
- margin-top: -29px;
+ margin-left: 264px;
+ margin-top: -29px;
}
.recursive-toggle{
- margin-left: 363px;
- margin-top: -20px;
+ margin-left: 363px;
+ margin-top: -20px;
}
.recursive-toggle-path {
margin-left: 347px;
margin-top: -29px;
}
.policy-form .help-inline {
- position: relative;
- top: 10px;
+ position: relative;
+ top: 10px;
}
.hideResource{
- display:none;
+ display:none;
}
.btn-mini {
- padding: 0px 8px;
- font-size: 11.05px;
+ padding: 0px 8px;
+ font-size: 11.05px;
}
.label-ranger {
- background-color: #3C9C11;
+ background-color: #3C9C11;
}
.sameLevelDropdown{
- margin-right: 31px;
- margin-left: -130px;
- width: 100px;
- height: 29px;
- font-family: Tahoma;
- font-size: 14px;
- border-radius: 10px;
- border: 2px #cccccc solid;
+ margin-right: 31px;
+ margin-left: -130px;
+ width: 100px;
+ height: 29px;
+ font-family: Tahoma;
+ font-size: 14px;
+ border-radius: 10px;
+ border: 2px #cccccc solid;
}
.margin-left-5{
- margin-left:5px;
+ margin-left:5px;
}
.tr-inactive {
background-color: #F5F5F5;
@@ -1816,24 +1816,24 @@ td.select-row-cell {
text-align: center;
}
.ranger-notifications {
- right: 33px!important;
- top: 41px!important;
+ right: 33px!important;
+ top: 41px!important;
}table.table-permission.visible-border tr td:last-child {
border: 1px solid #dddddd;
padding-left: 0;
}
.set-height-groups{
- width: 100%;
- height: 100px;
- overflow-x: hidden;
+ width: 100%;
+ height: 100px;
+ overflow-x: hidden;
}
.float-left-margin-2{
- float: left;
- margin: 2px;
+ float: left;
+ margin: 2px;
}
#r_topNav .dropdown-menu {
- margin:0;
+ margin:0;
}
.table-policy-condition th,
@@ -1872,15 +1872,15 @@ input[type="radio"], input[type="checkbox"] {margin-top: 0;}
margin-top: 6px;
}
.tag-fixed-popover {
- top: 50px !important;
- left: 55% !important;
- margin-left: -350px !important;
- max-width: 700px !important;
- max-height: 500px;
- overflow-y: auto;
+ top: 50px !important;
+ left: 55% !important;
+ margin-left: -350px !important;
+ max-width: 700px !important;
+ max-height: 500px;
+ overflow-y: auto;
}
.tag-fixed-popover-wrapper {
- position: fixed !important;
+ position: fixed !important;
top: 0 !important;
bottom: 0 !important;
right: 0 !important;
@@ -1889,8 +1889,8 @@ input[type="radio"], input[type="checkbox"] {margin-top: 0;}
background-color: rgba(0,0,0,0.5);
}
.table-policy-condition label {
- font-size: 12px;
- text-align: left;
+ font-size: 12px;
+ text-align: left;
}
.table-policy-condition tr[data-id=storm] td label {
min-width: 170px;
@@ -1900,7 +1900,7 @@ input[type="radio"], input[type="checkbox"] {margin-top: 0;}
min-width: 170px;
} */
.pause-play-close{
- margin-left: -5px;
+ margin-left: -5px;
margin-top: -2px;
font-size: 11px;
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/AmbariServiceDiscoveryMessages.java
----------------------------------------------------------------------
diff --git a/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/AmbariServiceDiscoveryMessages.java b/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/AmbariServiceDiscoveryMessages.java
index f7f9d5a..88b8557 100644
--- a/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/AmbariServiceDiscoveryMessages.java
+++ b/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/AmbariServiceDiscoveryMessages.java
@@ -26,18 +26,18 @@ public interface AmbariServiceDiscoveryMessages {
@Message(level = MessageLevel.ERROR,
text = "Failed to persist data for cluster configuration monitor {0} {1}: {2}")
- void failedToPersistClusterMonitorData(final String monitor,
- final String filename,
+ void failedToPersistClusterMonitorData(String monitor,
+ String filename,
@StackTrace(level = MessageLevel.DEBUG) Exception e);
@Message(level = MessageLevel.ERROR,
text = "Failed to load persisted service discovery configuration for cluster monitor {0} : {1}")
- void failedToLoadClusterMonitorServiceDiscoveryConfig(final String monitor,
+ void failedToLoadClusterMonitorServiceDiscoveryConfig(String monitor,
@StackTrace(level = MessageLevel.DEBUG) Exception e);
@Message(level = MessageLevel.ERROR,
text = "Failed to load persisted cluster configuration version data for cluster monitor {0} : {1}")
- void failedToLoadClusterMonitorConfigVersions(final String monitor,
+ void failedToLoadClusterMonitorConfigVersions(String monitor,
@StackTrace(level = MessageLevel.DEBUG) Exception e);
@Message(level = MessageLevel.ERROR,
@@ -54,24 +54,24 @@ public interface AmbariServiceDiscoveryMessages {
@Message(level = MessageLevel.ERROR,
text = "Failed to load service discovery URL definition configuration {0}: {1}")
- void failedToLoadServiceDiscoveryURLDefConfiguration(final String configuration,
+ void failedToLoadServiceDiscoveryURLDefConfiguration(String configuration,
@StackTrace(level = MessageLevel.ERROR) Exception e);
@Message(level = MessageLevel.ERROR,
text = "Encountered an error during cluster ({0}) discovery: {1}")
- void clusterDiscoveryError(final String clusterName, @StackTrace(level = MessageLevel.DEBUG) Exception e);
+ void clusterDiscoveryError(String clusterName, @StackTrace(level = MessageLevel.DEBUG) Exception e);
@Message(level = MessageLevel.ERROR,
text = "Failed to access the service configurations for cluster ({0}) discovery")
- void failedToAccessServiceConfigs(final String clusterName);
+ void failedToAccessServiceConfigs(String clusterName);
@Message(level = MessageLevel.ERROR,
text = "REST invocation {0} timed out")
- void restInvocationTimedOut(final String url, @StackTrace(level = MessageLevel.DEBUG) Exception e);
+ void restInvocationTimedOut(String url, @StackTrace(level = MessageLevel.DEBUG) Exception e);
@Message(level = MessageLevel.ERROR,
text = "REST invocation {0} failed: {1}")
- void restInvocationError(final String url, @StackTrace(level = MessageLevel.ERROR) Exception e);
+ void restInvocationError(String url, @StackTrace(level = MessageLevel.ERROR) Exception e);
@Message(level = MessageLevel.ERROR,
text = "No address for Ambari service discovery has been configured.")
@@ -83,92 +83,74 @@ public interface AmbariServiceDiscoveryMessages {
@Message(level = MessageLevel.ERROR,
text = "Encountered an error attempting to determine the value for alias {0} : {1}")
- void aliasServiceError(final String alias, final String error);
-
+ void aliasServiceError(String alias, String error);
@Message(level = MessageLevel.ERROR,
text = "Encountered an error attempting to determine the user for alias {0} : {1}")
- void aliasServiceUserError(final String alias, final String error);
-
+ void aliasServiceUserError(String alias, String error);
@Message(level = MessageLevel.ERROR,
text = "Encountered an error attempting to determine the password for alias {0} : {1}")
- void aliasServicePasswordError(final String alias, final String error);
-
+ void aliasServicePasswordError(String alias, String error);
@Message(level = MessageLevel.ERROR,
text = "No user configured for Ambari service discovery.")
void aliasServiceUserNotFound();
-
@Message(level = MessageLevel.ERROR,
text = "No password configured for Ambari service discovery.")
void aliasServicePasswordNotFound();
-
@Message(level = MessageLevel.ERROR,
text = "Unexpected REST invocation response code for {0} : {1}")
- void unexpectedRestResponseStatusCode(final String url, int responseStatusCode);
-
+ void unexpectedRestResponseStatusCode(String url, int responseStatusCode);
@Message(level = MessageLevel.ERROR,
text = "REST invocation {0} yielded a response without any JSON.")
- void noJSON(final String url);
-
+ void noJSON(String url);
@Message(level = MessageLevel.TRACE,
text = "REST invocation result: {0}")
- void debugJSON(final String json);
-
+ void debugJSON(String json);
@Message(level = MessageLevel.DEBUG,
text = "Loaded component configuration mappings: {0}")
- void loadedComponentConfigMappings(final String mappings);
-
+ void loadedComponentConfigMappings(String mappings);
@Message(level = MessageLevel.ERROR,
text = "Failed to load component configuration property mappings {0}: {1}")
- void failedToLoadComponentConfigMappings(final String mappings,
+ void failedToLoadComponentConfigMappings(String mappings,
@StackTrace(level = MessageLevel.DEBUG) Exception e);
-
@Message(level = MessageLevel.TRACE,
text = "Discovered: Service: {0}, Host: {1}")
- void discoveredServiceHost(final String serviceName, final String hostName);
-
+ void discoveredServiceHost(String serviceName, String hostName);
@Message(level = MessageLevel.DEBUG,
text = "Querying the cluster for the {0} configuration ({1}) property: {2}")
- void lookingUpServiceConfigProperty(final String serviceName, final String configType, final String propertyName);
-
+ void lookingUpServiceConfigProperty(String serviceName, String configType, String propertyName);
@Message(level = MessageLevel.DEBUG,
text = "Querying the cluster for the {0} component configuration property: {1}")
- void lookingUpComponentConfigProperty(final String componentName, final String propertyName);
-
+ void lookingUpComponentConfigProperty(String componentName, String propertyName);
@Message(level = MessageLevel.DEBUG,
text = "Querying the cluster for the {0} component's hosts")
- void lookingUpComponentHosts(final String componentName);
-
+ void lookingUpComponentHosts(String componentName);
@Message(level = MessageLevel.DEBUG,
text = "Handling a derived service URL mapping property for the {0} service: type = {1}, name = {2}")
- void handlingDerivedProperty(final String serviceName, final String propertyType, final String propertyName);
-
+ void handlingDerivedProperty(String serviceName, String propertyType, String propertyName);
@Message(level = MessageLevel.DEBUG,
text = "Determined the service URL mapping property {0} value: {1}")
- void determinedPropertyValue(final String propertyName, final String propertyValue);
-
+ void determinedPropertyValue(String propertyName, String propertyValue);
@Message(level = MessageLevel.INFO,
text = "Started Ambari cluster configuration monitor (checking every {0} seconds)")
- void startedAmbariConfigMonitor(final long pollingInterval);
-
+ void startedAmbariConfigMonitor(long pollingInterval);
@Message(level = MessageLevel.WARN,
text = "The declared nameservice {0} is not defined in the HDFS configuration.")
- void undefinedHDFSNameService(final String nameservice);
-
+ void undefinedHDFSNameService(String nameservice);
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-discovery-ambari/src/test/java/org/apache/knox/gateway/topology/discovery/ambari/AmbariServiceDiscoveryTest.java
----------------------------------------------------------------------
diff --git a/gateway-discovery-ambari/src/test/java/org/apache/knox/gateway/topology/discovery/ambari/AmbariServiceDiscoveryTest.java b/gateway-discovery-ambari/src/test/java/org/apache/knox/gateway/topology/discovery/ambari/AmbariServiceDiscoveryTest.java
index 4e6a261..6ce77d4 100644
--- a/gateway-discovery-ambari/src/test/java/org/apache/knox/gateway/topology/discovery/ambari/AmbariServiceDiscoveryTest.java
+++ b/gateway-discovery-ambari/src/test/java/org/apache/knox/gateway/topology/discovery/ambari/AmbariServiceDiscoveryTest.java
@@ -336,7 +336,7 @@ public class AmbariServiceDiscoveryTest {
*/
private static final class TestAmbariServiceDiscovery extends AmbariServiceDiscovery {
- final static String CLUSTER_PLACEHOLDER = TestRESTInvoker.CLUSTER_PLACEHOLDER;
+ static final String CLUSTER_PLACEHOLDER = TestRESTInvoker.CLUSTER_PLACEHOLDER;
TestAmbariServiceDiscovery(String clusterName) {
super(new TestRESTInvoker(clusterName));
@@ -360,8 +360,7 @@ public class AmbariServiceDiscoveryTest {
}
private static final class TestRESTInvoker extends RESTInvoker {
-
- final static String CLUSTER_PLACEHOLDER = "CLUSTER_NAME";
+ static final String CLUSTER_PLACEHOLDER = "CLUSTER_NAME";
private Map<String, JSONObject> cannedResponses = new HashMap<>();
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-i18n-logging-log4j/src/main/java/org/apache/knox/gateway/i18n/messages/loggers/log4j/Log4jMessageLogger.java
----------------------------------------------------------------------
diff --git a/gateway-i18n-logging-log4j/src/main/java/org/apache/knox/gateway/i18n/messages/loggers/log4j/Log4jMessageLogger.java b/gateway-i18n-logging-log4j/src/main/java/org/apache/knox/gateway/i18n/messages/loggers/log4j/Log4jMessageLogger.java
index 2e40471..c8b42dc 100644
--- a/gateway-i18n-logging-log4j/src/main/java/org/apache/knox/gateway/i18n/messages/loggers/log4j/Log4jMessageLogger.java
+++ b/gateway-i18n-logging-log4j/src/main/java/org/apache/knox/gateway/i18n/messages/loggers/log4j/Log4jMessageLogger.java
@@ -56,7 +56,7 @@ public class Log4jMessageLogger implements MessageLogger {
logger.callAppenders( event );
}
- private static final ThrowableInformation toThrownInformation( final Throwable thrown ) {
+ private static ThrowableInformation toThrownInformation( final Throwable thrown ) {
ThrowableInformation info = null;
if( thrown != null ) {
info = new ThrowableInformation( thrown );
@@ -64,7 +64,7 @@ public class Log4jMessageLogger implements MessageLogger {
return info;
}
- private static final LocationInfo toLocationInfo( final StackTraceElement caller ) {
+ private static LocationInfo toLocationInfo( final StackTraceElement caller ) {
LocationInfo info = null;
if( caller != null ) {
info = new LocationInfo( caller.getFileName(), caller.getClassName(), caller.getMethodName(), Integer.toString(caller.getLineNumber()) );
@@ -72,7 +72,7 @@ public class Log4jMessageLogger implements MessageLogger {
return info;
}
- private static final Level toLevel( final MessageLevel level ) {
+ private static Level toLevel( final MessageLevel level ) {
switch( level ) {
case FATAL: return Level.FATAL;
case ERROR: return Level.ERROR;
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/Message.java
----------------------------------------------------------------------
diff --git a/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/Message.java b/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/Message.java
index 89e4662..a628b61 100644
--- a/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/Message.java
+++ b/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/Message.java
@@ -25,8 +25,8 @@ import java.lang.annotation.Target;
@Retention( RetentionPolicy.RUNTIME )
@Target( ElementType.METHOD )
public @interface Message {
- static final String DEFAULT_TEXT = "{}";
- static final int DEFAULT_CODE = -1;
+ String DEFAULT_TEXT = "{}";
+ int DEFAULT_CODE = -1;
MessageLevel level() default MessageLevel.INFO;
int code() default DEFAULT_CODE;
String text() default DEFAULT_TEXT;
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/Messages.java
----------------------------------------------------------------------
diff --git a/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/Messages.java b/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/Messages.java
index 6908146..8c8da1c 100644
--- a/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/Messages.java
+++ b/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/Messages.java
@@ -25,9 +25,9 @@ import java.lang.annotation.Target;
@Retention( RetentionPolicy.RUNTIME )
@Target( ElementType.TYPE )
public @interface Messages {
- static final String DEFAULT_BUNDLE = "";
- static final String DEFAULT_LOGGER = "";
- static final String DEFAULT_CODES = "{0}";
+ String DEFAULT_BUNDLE = "";
+ String DEFAULT_LOGGER = "";
+ String DEFAULT_CODES = "{0}";
String bundle() default DEFAULT_BUNDLE;
String logger() default DEFAULT_LOGGER;
String codes() default DEFAULT_CODES;
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/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 77ddf25..62dae84 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
@@ -59,7 +59,7 @@ public class MessagesInvoker extends ResourcesInvoker implements InvocationHandl
return message;
}
- private final String getCode( final Method method ) {
+ private String getCode( final Method method ) {
String code = null;
Message anno = method.getAnnotation( Message.class );
if( anno != null ) {
@@ -72,7 +72,7 @@ public class MessagesInvoker extends ResourcesInvoker implements InvocationHandl
return code;
}
- private static final StackTrace getStackTraceAnno( final Method method, final int param ) {
+ private static StackTrace getStackTraceAnno( final Method method, final int param ) {
final Annotation[] annos = method.getParameterAnnotations()[ param ];
for( Annotation anno: annos ) {
if( anno instanceof StackTrace ) {
@@ -82,7 +82,7 @@ public class MessagesInvoker extends ResourcesInvoker implements InvocationHandl
return null;
}
- private static final Throwable findLoggableThrowable( final MessageLogger logger, final Method method, final Object[] args ) {
+ private static Throwable findLoggableThrowable( final MessageLogger logger, final Method method, final Object[] args ) {
Throwable throwable = null;
if( args != null ) {
for( int i=0; i<args.length; i++ ) {
@@ -111,7 +111,7 @@ public class MessagesInvoker extends ResourcesInvoker implements InvocationHandl
return pattern;
}
- private static final MessageLevel getLevel( final Method method ) {
+ private static MessageLevel getLevel( final Method method ) {
MessageLevel level;
Message anno = method.getAnnotation( Message.class );
if( anno == null ) {
@@ -144,7 +144,7 @@ public class MessagesInvoker extends ResourcesInvoker implements InvocationHandl
return bundle;
}
- private static final String calcLoggerName( final Class<?> clazz, final Messages anno ) {
+ private static String calcLoggerName( final Class<?> clazz, final Messages anno ) {
String logger = null;
if( anno != null ) {
logger = anno.logger();
@@ -163,7 +163,7 @@ public class MessagesInvoker extends ResourcesInvoker implements InvocationHandl
return bundle;
}
- private static final MessageLogger getLogger( final Class<?> clazz, final Messages anno, final MessageLoggerFactory loggers ) {
+ private static MessageLogger getLogger( final Class<?> clazz, final Messages anno, final MessageLoggerFactory loggers ) {
return loggers.getLogger( calcLoggerName( clazz, anno ) );
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/loggers/jdk/JdkMessageLogger.java
----------------------------------------------------------------------
diff --git a/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/loggers/jdk/JdkMessageLogger.java b/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/loggers/jdk/JdkMessageLogger.java
index c8d63fe..7f6f08d 100644
--- a/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/loggers/jdk/JdkMessageLogger.java
+++ b/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/loggers/jdk/JdkMessageLogger.java
@@ -33,13 +33,13 @@ final class JdkMessageLogger implements MessageLogger {
}
@Override
- public final boolean isLoggable( final MessageLevel level ) {
+ public boolean isLoggable( final MessageLevel level ) {
return logger.isLoggable( toLevel( level ) );
}
//TODO: Handle message ID.
@Override
- public final void log( final StackTraceElement caller, final MessageLevel level, final String id, final String message, final Throwable thrown ) {
+ public void log( final StackTraceElement caller, final MessageLevel level, final String id, final String message, final Throwable thrown ) {
LogRecord record = new LogRecord( toLevel( level ), message );
record.setSourceClassName( caller.getClassName() );
record.setSourceMethodName( caller.getMethodName() );
@@ -49,7 +49,7 @@ final class JdkMessageLogger implements MessageLogger {
logger.log( record );
}
- private static final Level toLevel( final MessageLevel level ) {
+ private static Level toLevel( final MessageLevel level ) {
switch( level ) {
case FATAL: return Level.SEVERE;
case ERROR: return Level.SEVERE;
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/loggers/sout/SoutMessageLogger.java
----------------------------------------------------------------------
diff --git a/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/loggers/sout/SoutMessageLogger.java b/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/loggers/sout/SoutMessageLogger.java
index b214ae4..4109eaf 100644
--- a/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/loggers/sout/SoutMessageLogger.java
+++ b/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/loggers/sout/SoutMessageLogger.java
@@ -39,7 +39,7 @@ public class SoutMessageLogger implements MessageLogger {
return true;
}
- private static final String getFormat( final String id ) {
+ private static String getFormat( final String id ) {
return( id == null ) ? FORMAT_WITHOUT_ID : FORMAT_WITH_ID;
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/loggers/test/TestMessageRecord.java
----------------------------------------------------------------------
diff --git a/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/loggers/test/TestMessageRecord.java b/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/loggers/test/TestMessageRecord.java
index 786cfff..6c3c10e 100644
--- a/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/loggers/test/TestMessageRecord.java
+++ b/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/loggers/test/TestMessageRecord.java
@@ -36,7 +36,7 @@ public class TestMessageRecord {
this.message = message;
this.throwable = throwable;
}
-
+
public TestMessageLogger getLogger() {
return logger;
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/resources/Resource.java
----------------------------------------------------------------------
diff --git a/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/resources/Resource.java b/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/resources/Resource.java
index 021f81b..77f2010 100644
--- a/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/resources/Resource.java
+++ b/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/resources/Resource.java
@@ -25,6 +25,6 @@ import java.lang.annotation.Target;
@Retention( RetentionPolicy.RUNTIME )
@Target( ElementType.METHOD )
public @interface Resource {
- static final String DEFAULT_TEXT = "{}";
+ String DEFAULT_TEXT = "{}";
String text() default DEFAULT_TEXT;
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/resources/Resources.java
----------------------------------------------------------------------
diff --git a/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/resources/Resources.java b/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/resources/Resources.java
index cba4a9d..0833734 100644
--- a/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/resources/Resources.java
+++ b/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/resources/Resources.java
@@ -25,6 +25,6 @@ import java.lang.annotation.Target;
@Retention( RetentionPolicy.RUNTIME )
@Target( ElementType.TYPE )
public @interface Resources {
- static final String DEFAULT_BUNDLE = "";
+ String DEFAULT_BUNDLE = "";
String bundle() default DEFAULT_BUNDLE;
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/resources/ResourcesInvoker.java
----------------------------------------------------------------------
diff --git a/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/resources/ResourcesInvoker.java b/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/resources/ResourcesInvoker.java
index d1a3926..c551366 100644
--- a/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/resources/ResourcesInvoker.java
+++ b/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/resources/ResourcesInvoker.java
@@ -106,7 +106,7 @@ public class ResourcesInvoker implements InvocationHandler {
return prefix + suffix;
}
- private static final String createDefaultPatternSuffix( final int size ) {
+ private static String createDefaultPatternSuffix( final int size ) {
StringBuilder builder = new StringBuilder( 1 + size*7 );
builder.append( "(" );
for( int i=0; i<size; i++ ) {
@@ -120,7 +120,7 @@ public class ResourcesInvoker implements InvocationHandler {
}
- private static final String calcBundleName( final Class<?> clazz ) {
+ private static String calcBundleName( final Class<?> clazz ) {
String bundle = null;
final Resources anno = clazz.getAnnotation( Resources.class );
if( anno != null ) {
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/HaDescriptor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/HaDescriptor.java b/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/HaDescriptor.java
index 421c459..33abb52 100644
--- a/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/HaDescriptor.java
+++ b/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/HaDescriptor.java
@@ -20,15 +20,13 @@ package org.apache.knox.gateway.ha.provider;
import java.util.List;
public interface HaDescriptor {
+ void addServiceConfig(HaServiceConfig serviceConfig);
- public void addServiceConfig(HaServiceConfig serviceConfig);
+ HaServiceConfig getServiceConfig(String serviceName);
- public HaServiceConfig getServiceConfig(String serviceName);
+ List<String> getServiceNames();
- public List<String> getServiceNames();
-
- public List<String> getEnabledServiceNames();
-
- public List<HaServiceConfig> getServiceConfigs();
+ List<String> getEnabledServiceNames();
+ List<HaServiceConfig> getServiceConfigs();
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6736393d/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/HaProvider.java
----------------------------------------------------------------------
diff --git a/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/HaProvider.java b/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/HaProvider.java
index e1642ee..6df79cb 100644
--- a/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/HaProvider.java
+++ b/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/HaProvider.java
@@ -21,47 +21,47 @@ import java.util.List;
public interface HaProvider {
- public HaDescriptor getHaDescriptor();
+ HaDescriptor getHaDescriptor();
- /**
- * Add a service name (role) as a HA service with the URLs that it is configured for
- *
- * @param serviceName the name of the service
- * @param urls the list of urls that can be used for that service
- */
- public void addHaService(String serviceName, List<String> urls);
+ /**
+ * Add a service name (role) as a HA service with the URLs that it is configured for
+ *
+ * @param serviceName the name of the service
+ * @param urls the list of urls that can be used for that service
+ */
+ void addHaService(String serviceName, List<String> urls);
- /**
- * Returns whether the service is enabled for HA
- *
- * @param serviceName the name of the service
- * @return true if the service is enabled; false otherwise
- */
- public boolean isHaEnabled(String serviceName);
+ /**
+ * Returns whether the service is enabled for HA
+ *
+ * @param serviceName the name of the service
+ * @return true if the service is enabled; false otherwise
+ */
+ boolean isHaEnabled(String serviceName);
- /**
- * Returns the current URL that is known to be active for the service
- *
- * @param serviceName the name of the service
- * @return the URL as a string or null if the service name is not found
- */
- public String getActiveURL(String serviceName);
+ /**
+ * Returns the current URL that is known to be active for the service
+ *
+ * @param serviceName the name of the service
+ * @return the URL as a string or null if the service name is not found
+ */
+ String getActiveURL(String serviceName);
- /**
- * Sets a given URL that is known to be active for the service
- *
- * @param serviceName the name of the service
- * @param url the active url
- */
- public void setActiveURL(String serviceName, String url);
+ /**
+ * Sets a given URL that is known to be active for the service
+ *
+ * @param serviceName the name of the service
+ * @param url the active url
+ */
+ void setActiveURL(String serviceName, String url);
- /**
- * Mark the URL for the service as one that has failed. This method puts changes the active URL to
- * the next available URL for the service.
- *
- * @param serviceName the name of the service
- * @param url the URL that has failed in some way
- */
- public void markFailedURL(String serviceName, String url);
+ /**
+ * Mark the URL for the service as one that has failed. This method puts changes the active URL to
+ * the next available URL for the service.
+ *
+ * @param serviceName the name of the service
+ * @param url the URL that has failed in some way
+ */
+ void markFailedURL(String serviceName, String url);
}