Renamed methods in TypedParameters

Author: artem-v

services-api/src/main/java/io/scalecube/services/TypedParameters.java

@@ -14,35 +14,35 @@ public TypedParameters(Map<String, String> params) {
  this.params = new LinkedHashMap<>(params != null ? params : Map.of());
  }
 
- public Integer intValue(String name) {
+ public Integer getInt(String name) {
  return get(name, Integer::parseInt);
  }
 
- public Long longValue(String name) {
+ public Long getLong(String name) {
  return get(name, Long::parseLong);
  }
 
- public BigInteger bigInteger(String name) {
+ public BigInteger getBigInteger(String name) {
  return get(name, BigInteger::new);
  }
 
- public Double doubleValue(String name) {
+ public Double getDouble(String name) {
  return get(name, Double::parseDouble);
  }
 
- public BigDecimal bigDecimal(String name) {
+ public BigDecimal getBigDecimal(String name) {
  return get(name, BigDecimal::new);
  }
 
- public <T extends Enum<T>> T enumValue(String name, Function<String, T> enumFunc) {
+ public <T extends Enum<T>> T getEnum(String name, Function<String, T> enumFunc) {
  return get(name, enumFunc);
  }
 
- public Boolean booleanValue(String name) {
+ public Boolean getBoolean(String name) {
  return get(name, Boolean::parseBoolean);
  }
 
- public String stringValue(String name) {
+ public String getString(String name) {
  return get(name, s -> s);
  }
 

services-api/src/test/java/io/scalecube/services/methods/StubServiceImpl.java

@@ -53,8 +53,8 @@ public Mono<Void> invokeDynamicQualifier() {
  assertNotNull(context.principal(), "principal");
  final var pathParams = context.pathParams();
  assertNotNull(pathParams, "pathParams");
- assertNotNull(pathParams.stringValue("foo"), "pathParam[foo]");
- assertNotNull(pathParams.stringValue("bar"), "pathParam[bar]");
+ assertNotNull(pathParams.getString("foo"), "pathParam[foo]");
+ assertNotNull(pathParams.getString("bar"), "pathParam[bar]");
  })
  .then();
  }

services-examples/src/main/java/io/scalecube/services/examples/GreetingServiceImpl.java

@@ -107,6 +107,6 @@ public Mono<ServiceMessage> emptyGreetingMessage(ServiceMessage request) {
  @Override
  public Mono<String> helloDynamicQualifier(Long value) {
  return RequestContext.deferContextual()
- .map(context -> context.pathParams().stringValue("someVar") + "@" + value);
+ .map(context -> context.pathParams().getString("someVar") + "@" + value);
  }
 }

services-gateway/src/test/java/io/scalecube/services/gateway/files/ReportServiceImpl.java

@@ -123,7 +123,7 @@ public Flux<ServiceMessage> successfulDownload() {
  .flatMapMany(
  context -> {
  final var pathParams = context.pathParams();
- final var fileSize = pathParams.longValue("fileSize");
+ final var fileSize = pathParams.getLong("fileSize");
  final var headers = context.headers();
  final File file;
  try {

services-gateway/src/test/java/io/scalecube/services/gateway/rest/RestServiceImpl.java

@@ -19,7 +19,7 @@ public Mono<SomeResponse> options() {
  .map(
  context -> {
  final var pathParams = context.pathParams();
- final var foo = pathParams.stringValue("foo");
+ final var foo = pathParams.getString("foo");
  assertNotNull(foo);
  assertNotNull(context.headers());
  assertThat(context.headers().size(), greaterThan(0));
@@ -34,7 +34,7 @@ public Mono<SomeResponse> get() {
  .map(
  context -> {
  final var pathParams = context.pathParams();
- final var foo = pathParams.stringValue("foo");
+ final var foo = pathParams.getString("foo");
  assertNotNull(foo);
  assertNotNull(context.headers());
  assertThat(context.headers().size(), greaterThan(0));
@@ -49,7 +49,7 @@ public Mono<SomeResponse> head() {
  .map(
  context -> {
  final var pathParams = context.pathParams();
- final var foo = pathParams.stringValue("foo");
+ final var foo = pathParams.getString("foo");
  assertEquals("head123456", foo, "pathParam");
  final var headers = context.headers();
  assertNotNull(headers);
@@ -75,7 +75,7 @@ public Mono<SomeResponse> post(SomeRequest request) {
  .map(
  context -> {
  final var pathParams = context.pathParams();
- final var foo = pathParams.stringValue("foo");
+ final var foo = pathParams.getString("foo");
  assertNotNull(foo);
  assertNotNull(context.headers());
  assertThat(context.headers().size(), greaterThan(0));
@@ -90,7 +90,7 @@ public Mono<SomeResponse> put(SomeRequest request) {
  .map(
  context -> {
  final var pathParams = context.pathParams();
- final var foo = pathParams.stringValue("foo");
+ final var foo = pathParams.getString("foo");
  assertNotNull(foo);
  assertNotNull(context.headers());
  assertThat(context.headers().size(), greaterThan(0));
@@ -105,7 +105,7 @@ public Mono<SomeResponse> patch(SomeRequest request) {
  .map(
  context -> {
  final var pathParams = context.pathParams();
- final var foo = pathParams.stringValue("foo");
+ final var foo = pathParams.getString("foo");
  assertNotNull(foo);
  assertNotNull(context.headers());
  assertThat(context.headers().size(), greaterThan(0));
@@ -120,7 +120,7 @@ public Mono<SomeResponse> delete() {
  .map(
  context -> {
  final var pathParams = context.pathParams();
- final var foo = pathParams.stringValue("foo");
+ final var foo = pathParams.getString("foo");
  assertNotNull(foo);
  assertNotNull(context.headers());
  assertThat(context.headers().size(), greaterThan(0));
@@ -135,7 +135,7 @@ public Mono<SomeResponse> trace() {
  .map(
  context -> {
  final var pathParams = context.pathParams();
- final var foo = pathParams.stringValue("foo");
+ final var foo = pathParams.getString("foo");
  assertNotNull(foo);
  assertNotNull(context.headers());
  assertThat(context.headers().size(), greaterThan(0));
@@ -150,9 +150,9 @@ public Mono<SomeResponse> propagateRequestAttributes() {
  .map(
  context -> {
  final var pathParams = context.pathParams();
- assertEquals(123, pathParams.intValue("foo"), "foo");
- assertEquals("bar456", pathParams.stringValue("bar"), "bar");
- assertEquals("baz789", pathParams.stringValue("baz"), "baz");
+ assertEquals(123, pathParams.getInt("foo"), "foo");
+ assertEquals("bar456", pathParams.getString("bar"), "bar");
+ assertEquals("baz789", pathParams.getString("baz"), "baz");
 
  final var headers = context.headers();
  assertEquals("GET", headers.get("http.method"));
@@ -163,13 +163,13 @@ public Mono<SomeResponse> propagateRequestAttributes() {
  assertEquals("2", headers.get("http.query.y"));
 
  final var httpHeaders = context.headerParams("http.header");
- assertEquals("abc", httpHeaders.stringValue("X-String-Header"));
- assertEquals(123456789, httpHeaders.intValue("X-Int-Header"));
+ assertEquals("abc", httpHeaders.getString("X-String-Header"));
+ assertEquals(123456789, httpHeaders.getInt("X-Int-Header"));
 
  final var queryParams = context.headerParams("http.query");
- assertEquals(true, queryParams.booleanValue("debug"));
- assertEquals(1, queryParams.intValue("x"));
- assertEquals(2, queryParams.intValue("y"));
+ assertEquals(true, queryParams.getBoolean("debug"));
+ assertEquals(1, queryParams.getInt("x"));
+ assertEquals(2, queryParams.getInt("y"));
 
  return new SomeResponse().name(UUID.randomUUID().toString());
  });

services-gateway/src/test/java/io/scalecube/services/gateway/rest/RoutingServiceImpl.java

@@ -15,7 +15,7 @@ public Mono<SomeResponse> find() {
  .map(
  context -> {
  final var pathParams = context.pathParams();
- final var foo = pathParams.stringValue("foo");
+ final var foo = pathParams.getString("foo");
  assertNotNull(foo);
  assertNotNull(context.headers());
  assertTrue(context.headers().size() > 0);
@@ -30,7 +30,7 @@ public Mono<SomeResponse> update(SomeRequest request) {
  .map(
  context -> {
  final var pathParams = context.pathParams();
- final var foo = pathParams.stringValue("foo");
+ final var foo = pathParams.getString("foo");
  assertNotNull(foo);
  assertNotNull(context.headers());
  assertTrue(context.headers().size() > 0);

services/src/main/java/io/scalecube/services/files/FileServiceImpl.java

@@ -97,7 +97,7 @@ public Flux<ServiceMessage> streamFile() {
  context -> {
  final var headers = context.headers();
  final var pathParams = context.pathParams();
- final var filename = pathParams.stringValue("filename");
+ final var filename = pathParams.getString("filename");
  final var path = baseDir.resolve(filename);
 
  if (!isPathValid(path)) {

services/src/test/java/io/scalecube/services/PlaceholderQualifierTest.java

@@ -170,7 +170,7 @@ public Mono<String> hello() {
  @Override
  public Mono<String> helloWithPathParam() {
  return RequestContext.deferContextual()
- .map(context -> id + "|" + context.pathParams().stringValue("name"));
+ .map(context -> id + "|" + context.pathParams().getString("name"));
  }
  }
 }

services/src/test/java/io/scalecube/services/sut/GreetingServiceImpl.java

@@ -205,6 +205,6 @@ public Flux<Long> manyStream(Long cnt) {
  @Override
  public Mono<String> helloDynamicQualifier(Long value) {
  return RequestContext.deferContextual()
- .map(context -> context.pathParams().stringValue("someVar") + "@" + value);
+ .map(context -> context.pathParams().getString("someVar") + "@" + value);
  }
 }