Repository: metamodel-membrane Updated Branches: refs/heads/master a015e28cb -> bb7a124e5
Updated Membrane to depend on MetaModel 5.0-RC4 Project: http://git-wip-us.apache.org/repos/asf/metamodel-membrane/repo Commit: http://git-wip-us.apache.org/repos/asf/metamodel-membrane/commit/e48f76d6 Tree: http://git-wip-us.apache.org/repos/asf/metamodel-membrane/tree/e48f76d6 Diff: http://git-wip-us.apache.org/repos/asf/metamodel-membrane/diff/e48f76d6 Branch: refs/heads/master Commit: e48f76d66358b56a8bdbd1b5ee495ec206e22dfe Parents: 5e7dcac Author: Kasper Sørensen <i.am.kasper.soren...@gmail.com> Authored: Tue Aug 15 00:02:00 2017 -0700 Committer: Kasper Sørensen <i.am.kasper.soren...@gmail.com> Committed: Tue Aug 15 00:02:00 2017 -0700 ---------------------------------------------------------------------- .../metamodel/membrane/controllers/DataSourceController.java | 3 +-- .../apache/metamodel/membrane/controllers/QueryController.java | 2 +- .../apache/metamodel/membrane/controllers/SchemaController.java | 3 +-- .../apache/metamodel/membrane/controllers/TableController.java | 3 +-- pom.xml | 4 ++-- 5 files changed, 6 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metamodel-membrane/blob/e48f76d6/core/src/main/java/org/apache/metamodel/membrane/controllers/DataSourceController.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/metamodel/membrane/controllers/DataSourceController.java b/core/src/main/java/org/apache/metamodel/membrane/controllers/DataSourceController.java index 309893e..194bbe4 100644 --- a/core/src/main/java/org/apache/metamodel/membrane/controllers/DataSourceController.java +++ b/core/src/main/java/org/apache/metamodel/membrane/controllers/DataSourceController.java @@ -18,7 +18,6 @@ */ package org.apache.metamodel.membrane.controllers; -import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -89,7 +88,7 @@ public class DataSourceController { final String tenantName = tenantContext.getTenantName(); final UriBuilder uriBuilder = UriBuilder.fromPath("/{tenant}/{dataContext}/s/{schema}"); - final List<GetDatasourceResponseSchemas> schemaLinks = Arrays.stream(dataContext.getSchemaNames()).map(s -> { + final List<GetDatasourceResponseSchemas> schemaLinks = dataContext.getSchemaNames().stream().map(s -> { final String uri = uriBuilder.build(tenantName, dataSourceName, s).toString(); return new GetDatasourceResponseSchemas().name(s).uri(uri); }).collect(Collectors.toList()); http://git-wip-us.apache.org/repos/asf/metamodel-membrane/blob/e48f76d6/core/src/main/java/org/apache/metamodel/membrane/controllers/QueryController.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/metamodel/membrane/controllers/QueryController.java b/core/src/main/java/org/apache/metamodel/membrane/controllers/QueryController.java index 7cf90b5..1fefa27 100644 --- a/core/src/main/java/org/apache/metamodel/membrane/controllers/QueryController.java +++ b/core/src/main/java/org/apache/metamodel/membrane/controllers/QueryController.java @@ -78,7 +78,7 @@ public class QueryController { final List<List<Object>> data = new ArrayList<>(); try (final DataSet dataSet = dataContext.executeQuery(query)) { - headers = Arrays.stream(dataSet.getSelectItems()).map((si) -> si.toString()).collect(Collectors.toList()); + headers = dataSet.getSelectItems().stream().map((si) -> si.toString()).collect(Collectors.toList()); while (dataSet.next()) { final Object[] values = dataSet.getRow().getValues(); data.add(Arrays.asList(values)); http://git-wip-us.apache.org/repos/asf/metamodel-membrane/blob/e48f76d6/core/src/main/java/org/apache/metamodel/membrane/controllers/SchemaController.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/metamodel/membrane/controllers/SchemaController.java b/core/src/main/java/org/apache/metamodel/membrane/controllers/SchemaController.java index 0fdf49b..04d55e1 100644 --- a/core/src/main/java/org/apache/metamodel/membrane/controllers/SchemaController.java +++ b/core/src/main/java/org/apache/metamodel/membrane/controllers/SchemaController.java @@ -18,7 +18,6 @@ */ package org.apache.metamodel.membrane.controllers; -import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; @@ -65,7 +64,7 @@ public class SchemaController { final UriBuilder uriBuilder = UriBuilder.fromPath("/{tenant}/{dataContext}/s/{schema}/t/{table}"); final String schemaName = schema.getName(); - final List<GetSchemaResponseTables> tableLinks = Arrays.stream(schema.getTableNames()).map(t -> { + final List<GetSchemaResponseTables> tableLinks = schema.getTableNames().stream().map(t -> { final String uri = uriBuilder.build(tenantName, dataSourceName, schemaName, t).toString(); return new GetSchemaResponseTables().name(String.valueOf(t)).uri(uri); }).collect(Collectors.toList()); http://git-wip-us.apache.org/repos/asf/metamodel-membrane/blob/e48f76d6/core/src/main/java/org/apache/metamodel/membrane/controllers/TableController.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/metamodel/membrane/controllers/TableController.java b/core/src/main/java/org/apache/metamodel/membrane/controllers/TableController.java index f43f598..af7decf 100644 --- a/core/src/main/java/org/apache/metamodel/membrane/controllers/TableController.java +++ b/core/src/main/java/org/apache/metamodel/membrane/controllers/TableController.java @@ -18,7 +18,6 @@ */ package org.apache.metamodel.membrane.controllers; -import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; @@ -68,7 +67,7 @@ public class TableController { final String tableName = table.getName(); final String schemaName = table.getSchema().getName(); - final List<GetTableResponseColumns> columnsLinks = Arrays.stream(table.getColumnNames()).map(c -> { + final List<GetTableResponseColumns> columnsLinks = table.getColumnNames().stream().map(c -> { final String uri = uriBuilder.build(tenantName, dataSourceName, schemaName, tableName, c).toString(); return new GetTableResponseColumns().name(c).uri(uri); }).collect(Collectors.toList()); http://git-wip-us.apache.org/repos/asf/metamodel-membrane/blob/e48f76d6/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 46d967b..4b43522 100644 --- a/pom.xml +++ b/pom.xml @@ -21,12 +21,12 @@ under the License. xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <properties> - <metamodel.version>5.0-RC3</metamodel.version> + <metamodel.version>5.0-RC4</metamodel.version> </properties> <parent> <groupId>org.apache.metamodel</groupId> <artifactId>MetaModel</artifactId> - <version>5.0-RC3</version> + <version>5.0-RC4</version> </parent> <scm> <url>https://git-wip-us.apache.org/repos/asf?p=metamodel-membrane.git</url>
