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 ); -// } -// -// } - }
