You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by tr...@apache.org on 2018/02/28 12:27:35 UTC

[4/4] flink git commit: [FLINK-8792] [rest] Change MessageQueryParameter#convertValueFromString to convertStringToValue

[FLINK-8792] [rest] Change MessageQueryParameter#convertValueFromString to convertStringToValue


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/e8d16850
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/e8d16850
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/e8d16850

Branch: refs/heads/master
Commit: e8d16850948231070dbc3344c2b287d07e2647a7
Parents: 9a69035
Author: Till Rohrmann <tr...@apache.org>
Authored: Wed Feb 28 10:11:44 2018 +0100
Committer: Till Rohrmann <tr...@apache.org>
Committed: Wed Feb 28 13:27:06 2018 +0100

----------------------------------------------------------------------
 .../handlers/AllowNonRestoredStateQueryParameter.java          | 2 +-
 .../runtime/webmonitor/handlers/ParallelismQueryParameter.java | 2 +-
 .../runtime/webmonitor/handlers/StringQueryParameter.java      | 2 +-
 .../handlers/AllowNonRestoredStateQueryParameterTest.java      | 6 +++---
 .../webmonitor/handlers/ParallelismQueryParameterTest.java     | 2 +-
 .../flink/runtime/rest/messages/MessageQueryParameter.java     | 4 ++--
 .../rest/messages/RescalingParallelismQueryParameter.java      | 2 +-
 .../runtime/rest/messages/TerminationModeQueryParameter.java   | 2 +-
 .../rest/messages/job/metrics/MetricsFilterParameter.java      | 2 +-
 .../apache/flink/runtime/rest/RestServerEndpointITCase.java    | 2 +-
 .../runtime/rest/handler/util/HandlerRequestUtilsTest.java     | 2 +-
 .../flink/runtime/rest/messages/MessageParametersTest.java     | 2 +-
 .../rest/messages/job/metrics/MetricsFilterParameterTest.java  | 2 +-
 13 files changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/e8d16850/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/AllowNonRestoredStateQueryParameter.java
----------------------------------------------------------------------
diff --git a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/AllowNonRestoredStateQueryParameter.java b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/AllowNonRestoredStateQueryParameter.java
index 2ddde3a..19734d8 100644
--- a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/AllowNonRestoredStateQueryParameter.java
+++ b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/AllowNonRestoredStateQueryParameter.java
@@ -34,7 +34,7 @@ public class AllowNonRestoredStateQueryParameter extends MessageQueryParameter<B
 	}
 
 	@Override
-	public Boolean convertValueFromString(final String value) {
+	public Boolean convertStringToValue(final String value) {
 		return Boolean.valueOf(value);
 	}
 

http://git-wip-us.apache.org/repos/asf/flink/blob/e8d16850/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/ParallelismQueryParameter.java
----------------------------------------------------------------------
diff --git a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/ParallelismQueryParameter.java b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/ParallelismQueryParameter.java
index 2ade7eb..398bcb0 100644
--- a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/ParallelismQueryParameter.java
+++ b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/ParallelismQueryParameter.java
@@ -33,7 +33,7 @@ public class ParallelismQueryParameter extends MessageQueryParameter<Integer> {
 	}
 
 	@Override
-	public Integer convertValueFromString(final String value) {
+	public Integer convertStringToValue(final String value) {
 		return Integer.valueOf(value);
 	}
 

http://git-wip-us.apache.org/repos/asf/flink/blob/e8d16850/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/StringQueryParameter.java
----------------------------------------------------------------------
diff --git a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/StringQueryParameter.java b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/StringQueryParameter.java
index 52c0967..67e83ff 100644
--- a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/StringQueryParameter.java
+++ b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/StringQueryParameter.java
@@ -30,7 +30,7 @@ public abstract class StringQueryParameter extends MessageQueryParameter<String>
 	}
 
 	@Override
-	public final String convertValueFromString(final String value) {
+	public final String convertStringToValue(final String value) {
 		return value;
 	}
 

http://git-wip-us.apache.org/repos/asf/flink/blob/e8d16850/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/handlers/AllowNonRestoredStateQueryParameterTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/handlers/AllowNonRestoredStateQueryParameterTest.java b/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/handlers/AllowNonRestoredStateQueryParameterTest.java
index 97b61f6..8bc1327 100644
--- a/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/handlers/AllowNonRestoredStateQueryParameterTest.java
+++ b/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/handlers/AllowNonRestoredStateQueryParameterTest.java
@@ -40,9 +40,9 @@ public class AllowNonRestoredStateQueryParameterTest extends TestLogger {
 
 	@Test
 	public void testConvertValueFromString() {
-		assertEquals(false, allowNonRestoredStateQueryParameter.convertValueFromString("false"));
-		assertEquals(true, allowNonRestoredStateQueryParameter.convertValueFromString("true"));
-		assertEquals(true, allowNonRestoredStateQueryParameter.convertValueFromString("TRUE"));
+		assertEquals(false, allowNonRestoredStateQueryParameter.convertStringToValue("false"));
+		assertEquals(true, allowNonRestoredStateQueryParameter.convertStringToValue("true"));
+		assertEquals(true, allowNonRestoredStateQueryParameter.convertStringToValue("TRUE"));
 	}
 
 }

http://git-wip-us.apache.org/repos/asf/flink/blob/e8d16850/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/handlers/ParallelismQueryParameterTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/handlers/ParallelismQueryParameterTest.java b/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/handlers/ParallelismQueryParameterTest.java
index 684af21..cd9080b 100644
--- a/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/handlers/ParallelismQueryParameterTest.java
+++ b/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/handlers/ParallelismQueryParameterTest.java
@@ -38,7 +38,7 @@ public class ParallelismQueryParameterTest extends TestLogger {
 
 	@Test
 	public void testConvertValueFromString() {
-		assertEquals(42, (int) parallelismQueryParameter.convertValueFromString("42"));
+		assertEquals(42, (int) parallelismQueryParameter.convertStringToValue("42"));
 	}
 
 }

http://git-wip-us.apache.org/repos/asf/flink/blob/e8d16850/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/MessageQueryParameter.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/MessageQueryParameter.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/MessageQueryParameter.java
index 29bee66..180f011 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/MessageQueryParameter.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/MessageQueryParameter.java
@@ -39,7 +39,7 @@ public abstract class MessageQueryParameter<X> extends MessageParameter<List<X>>
 		String[] splitValues = values.split(",");
 		List<X> list = new ArrayList<>();
 		for (String value : splitValues) {
-			list.add(convertValueFromString(value));
+			list.add(convertStringToValue(value));
 		}
 		return list;
 	}
@@ -50,7 +50,7 @@ public abstract class MessageQueryParameter<X> extends MessageParameter<List<X>>
 	 * @param value string representation of parameter value
 	 * @return parameter value
 	 */
-	public abstract X convertValueFromString(String value);
+	public abstract X convertStringToValue(String value);
 
 	@Override
 	public String convertToString(List<X> values) {

http://git-wip-us.apache.org/repos/asf/flink/blob/e8d16850/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/RescalingParallelismQueryParameter.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/RescalingParallelismQueryParameter.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/RescalingParallelismQueryParameter.java
index be9eff1..5c4f912a2 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/RescalingParallelismQueryParameter.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/RescalingParallelismQueryParameter.java
@@ -30,7 +30,7 @@ public class RescalingParallelismQueryParameter extends MessageQueryParameter<In
 	}
 
 	@Override
-	public Integer convertValueFromString(String value) {
+	public Integer convertStringToValue(String value) {
 		return Integer.valueOf(value);
 	}
 

http://git-wip-us.apache.org/repos/asf/flink/blob/e8d16850/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/TerminationModeQueryParameter.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/TerminationModeQueryParameter.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/TerminationModeQueryParameter.java
index 386f22e..889b6d5 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/TerminationModeQueryParameter.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/TerminationModeQueryParameter.java
@@ -32,7 +32,7 @@ public class TerminationModeQueryParameter extends MessageQueryParameter<Termina
 	}
 
 	@Override
-	public TerminationMode convertValueFromString(String value) {
+	public TerminationMode convertStringToValue(String value) {
 		return TerminationMode.valueOf(value.toUpperCase());
 	}
 

http://git-wip-us.apache.org/repos/asf/flink/blob/e8d16850/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/job/metrics/MetricsFilterParameter.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/job/metrics/MetricsFilterParameter.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/job/metrics/MetricsFilterParameter.java
index bcace79..9c6c0fd 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/job/metrics/MetricsFilterParameter.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/job/metrics/MetricsFilterParameter.java
@@ -36,7 +36,7 @@ public class MetricsFilterParameter extends MessageQueryParameter<String> {
 	}
 
 	@Override
-	public String convertValueFromString(String value) {
+	public String convertStringToValue(String value) {
 		return value;
 	}
 

http://git-wip-us.apache.org/repos/asf/flink/blob/e8d16850/flink-runtime/src/test/java/org/apache/flink/runtime/rest/RestServerEndpointITCase.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/RestServerEndpointITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/RestServerEndpointITCase.java
index e049a2d..c9817ff 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/RestServerEndpointITCase.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/RestServerEndpointITCase.java
@@ -476,7 +476,7 @@ public class RestServerEndpointITCase extends TestLogger {
 		}
 
 		@Override
-		public JobID convertValueFromString(String value) {
+		public JobID convertStringToValue(String value) {
 			return JobID.fromHexString(value);
 		}
 

http://git-wip-us.apache.org/repos/asf/flink/blob/e8d16850/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/util/HandlerRequestUtilsTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/util/HandlerRequestUtilsTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/util/HandlerRequestUtilsTest.java
index 259ae20..5001e3d 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/util/HandlerRequestUtilsTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/util/HandlerRequestUtilsTest.java
@@ -103,7 +103,7 @@ public class HandlerRequestUtilsTest extends TestLogger {
 		}
 
 		@Override
-		public Boolean convertValueFromString(final String value) {
+		public Boolean convertStringToValue(final String value) {
 			return Boolean.parseBoolean(value);
 		}
 

http://git-wip-us.apache.org/repos/asf/flink/blob/e8d16850/flink-runtime/src/test/java/org/apache/flink/runtime/rest/messages/MessageParametersTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/messages/MessageParametersTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/messages/MessageParametersTest.java
index 03fcb0a..8d73231 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/messages/MessageParametersTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/messages/MessageParametersTest.java
@@ -104,7 +104,7 @@ public class MessageParametersTest extends TestLogger {
 		}
 
 		@Override
-		public JobID convertValueFromString(String value) {
+		public JobID convertStringToValue(String value) {
 			return JobID.fromHexString(value);
 		}
 

http://git-wip-us.apache.org/repos/asf/flink/blob/e8d16850/flink-runtime/src/test/java/org/apache/flink/runtime/rest/messages/job/metrics/MetricsFilterParameterTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/messages/job/metrics/MetricsFilterParameterTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/messages/job/metrics/MetricsFilterParameterTest.java
index 10dc921..b13cb01 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/messages/job/metrics/MetricsFilterParameterTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/messages/job/metrics/MetricsFilterParameterTest.java
@@ -50,7 +50,7 @@ public class MetricsFilterParameterTest extends TestLogger {
 	@Test
 	public void testConversions() {
 		assertThat(metricsFilterParameter.convertValueToString("test"), equalTo("test"));
-		assertThat(metricsFilterParameter.convertValueFromString("test"), equalTo("test"));
+		assertThat(metricsFilterParameter.convertStringToValue("test"), equalTo("test"));
 	}
 
 }