sashapolo commented on code in PR #816:
URL: https://github.com/apache/ignite-3/pull/816#discussion_r884985206
##########
modules/cli/src/main/java/org/apache/ignite/cli/builtins/config/ConfigurationClient.java:
##########
@@ -81,7 +81,7 @@ public String get(
) {
var req = HttpRequest
.newBuilder()
- .header("Content-Type", "application/json");
+ .header("Content-Type", "text/plain");
Review Comment:
Why did you change this?
##########
modules/configuration/src/main/java/org/apache/ignite/internal/rest/configuration/exception/handler/package-info.java:
##########
@@ -0,0 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * This package contains classes that implement the number of
ExceptionHandlers. They wrap plain exceptions into human-readable rest
Review Comment:
```suggestion
* This package contains classes that implement a number of
ExceptionHandlers. They wrap plain exceptions into human-readable rest
```
##########
modules/rest/pom.xml:
##########
@@ -45,52 +45,41 @@
<dependency>
<groupId>org.apache.ignite</groupId>
- <artifactId>ignite-api</artifactId>
+ <artifactId>ignite-cluster-management</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ignite</groupId>
- <artifactId>ignite-network</artifactId>
+ <artifactId>ignite-api</artifactId>
</dependency>
<!-- 3rd party dependencies -->
+ <!-- micronaut dependencies, use dependencyManagement when ignite-cli
is migrated to micronaut 3 -->
Review Comment:
Is there a ticket for this migration?
##########
modules/cluster-management/src/integrationTest/java/org/apache/ignite/internal/cluster/management/ItClusterManagerTest.java:
##########
@@ -107,13 +107,13 @@ void testInit(TestInfo testInfo) throws Exception {
initCluster(metaStorageNodes, cmgNodes);
- assertThat(cluster.get(0).clusterManager().metaStorageNodes(),
will(containsInAnyOrder(metaStorageNodes)));
- assertThat(cluster.get(1).clusterManager().metaStorageNodes(),
will(containsInAnyOrder(metaStorageNodes)));
+ assertThat(cluster.get(0).getClusterManager().metaStorageNodes(),
will(containsInAnyOrder(metaStorageNodes)));
+ assertThat(cluster.get(1).getClusterManager().metaStorageNodes(),
will(containsInAnyOrder(metaStorageNodes)));
Review Comment:
why did you change `clusterManager` to `getClusterManager`?
##########
modules/cluster-management/src/integrationTest/java/org/apache/ignite/internal/cluster/management/rest/ClusterManagementControllerTest.java:
##########
@@ -0,0 +1,168 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.cluster.management.rest;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.is;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import io.micronaut.context.annotation.Bean;
+import io.micronaut.context.annotation.Factory;
+import io.micronaut.context.annotation.Replaces;
+import io.micronaut.http.HttpRequest;
+import io.micronaut.http.HttpResponse;
+import io.micronaut.http.HttpStatus;
+import io.micronaut.http.client.HttpClient;
+import io.micronaut.http.client.annotation.Client;
+import io.micronaut.http.client.exceptions.HttpClientResponseException;
+import io.micronaut.runtime.server.EmbeddedServer;
+import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
+import jakarta.inject.Inject;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import org.apache.ignite.internal.cluster.management.ClusterInitializer;
+import org.apache.ignite.internal.cluster.management.MockNode;
+import org.apache.ignite.internal.rest.api.ErrorResult;
+import org.apache.ignite.internal.testframework.WorkDirectory;
+import org.apache.ignite.internal.testframework.WorkDirectoryExtension;
+import org.apache.ignite.network.ClusterService;
+import org.apache.ignite.network.NetworkAddress;
+import org.apache.ignite.network.StaticNodeFinder;
+import org.jetbrains.annotations.NotNull;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInfo;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+/**
+ * Cluster management REST test.
+ */
+@MicronautTest
+@ExtendWith(WorkDirectoryExtension.class)
+public class ClusterManagementControllerTest {
+
+ private static final int PORT_BASE = 10000;
+
+ private static final List<MockNode> cluster = new ArrayList<>();
+ static ClusterService clusterService;
+ @WorkDirectory
+ private static Path workDir;
+ @Inject
+ EmbeddedServer server;
+ @Inject
+ @Client("/management/v1/cluster/init/")
+ HttpClient client;
+ @Inject
+ ClusterInitializer clusterInitializer;
+
+ @BeforeAll
+ static void setUp(TestInfo testInfo) throws IOException {
+ var addr1 = new NetworkAddress("localhost", PORT_BASE);
+ var addr2 = new NetworkAddress("localhost", PORT_BASE + 1);
+
+ var nodeFinder = new StaticNodeFinder(List.of(addr1, addr2));
+
+ cluster.add(new MockNode(testInfo, addr1, nodeFinder,
workDir.resolve("node0")));
+ cluster.add(new MockNode(testInfo, addr2, nodeFinder,
workDir.resolve("node1")));
+
+ for (MockNode node : cluster) {
+ node.start();
+ }
+
+ clusterService = cluster.get(0).getClusterService();
+
+ }
+
+ @AfterAll
+ static void tearDown() {
+ for (MockNode node : cluster) {
+ node.beforeNodeStop();
+ }
+
+ for (MockNode node : cluster) {
+ node.stop();
+ }
+ }
+
+ @Test
+ void testControllerLoaded() {
+
assertNotNull(server.getApplicationContext().getBean(ClusterManagementController.class));
+ }
+
+ @Test
+ void testInitNoSuchNode() {
+ // Given body with nodename that does not exist
+ String givenInvalidBody = "{\"metaStorageNodes\": [\"nodename\"],
\"cmgNodes\": [], \"clusterName\": \"cluster\"}";
+
+ try {
+ // When
+ client.toBlocking().exchange(HttpRequest.POST("",
givenInvalidBody));
+ } catch (HttpClientResponseException e) {
+ // Then
+ assertThat(e.getResponse().getStatus(),
is(equalTo((HttpStatus.BAD_REQUEST))));
+ // And
+ var errorResult = getErrorResult(e);
+ assertEquals("INVALID_NODES", errorResult.type());
+ }
+ }
+
+ @Test
+ void testInitAlreadyInitializedWithAnotherNodes() {
+ // Given cluster initialized
+ String givenFirstRequestBody =
+ "{\"metaStorageNodes\": [\"" +
cluster.get(0).getClusterService().localConfiguration().getName() + "\"],
\"cmgNodes\": [], "
+ + "\"clusterName\": \"cluster\"}";
+ // When
+ HttpResponse<Object> response =
client.toBlocking().exchange(HttpRequest.POST("", givenFirstRequestBody));
+ // Then
+ assertThat(response.getStatus(), is(equalTo((HttpStatus.OK))));
+
+ // And second request with different node name
+ String givenSecondRequestBody =
+ "{\"metaStorageNodes\": [\"" +
cluster.get(1).getClusterService().localConfiguration().getName() + "\"],
\"cmgNodes\": [], "
+ + "\"clusterName\": \"cluster\" }";
+
+ try {
+ // When
+ client.toBlocking().exchange(HttpRequest.POST("",
givenSecondRequestBody));
+ } catch (HttpClientResponseException e) {
+ // Then
+ assertThat(e.getResponse().getStatus(),
is(equalTo((HttpStatus.CONFLICT))));
+ // And
+ var errorResult = getErrorResult(e);
+ assertEquals("ALREADY_INITIALIZED", errorResult.type());
+ }
+ }
+
+ @Factory
+ @Bean
+ @Replaces(ClusterManagementRestFactory.class)
+ public ClusterManagementRestFactory clusterManagementRestFactory() {
+ return new ClusterManagementRestFactory(clusterService);
+ }
+
+ @NotNull
+ private ErrorResult getErrorResult(HttpClientResponseException exception) {
+ return
exception.getResponse().getBody(ErrorResult.class).orElseThrow();
+ }
+}
Review Comment:
Line break is missing, please check your IDE settings
##########
modules/rest-api/pom.xml:
##########
@@ -18,70 +18,57 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
Review Comment:
Please check your formatting settings, this file is all messed up
##########
modules/configuration/src/main/java/org/apache/ignite/internal/rest/configuration/NodeConfigurationController.java:
##########
@@ -0,0 +1,94 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.rest.configuration;
+
+import io.micronaut.http.MediaType;
+import io.micronaut.http.annotation.Body;
+import io.micronaut.http.annotation.Consumes;
+import io.micronaut.http.annotation.Controller;
+import io.micronaut.http.annotation.Get;
+import io.micronaut.http.annotation.Patch;
+import io.micronaut.http.annotation.PathVariable;
+import io.micronaut.http.annotation.Produces;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.inject.Named;
+import
org.apache.ignite.internal.configuration.rest.presentation.ConfigurationPresentation;
+
+/**
+ * Node configuration controller.
+ */
+@Controller("/management/v1/configuration/node")
+@ApiResponse(responseCode = "400", description = "Incorrect configuration")
+@ApiResponse(responseCode = "500", description = "Internal error")
+@Tag(name = "nodeConfiguration")
+public class NodeConfigurationController extends
AbstractConfigurationController {
+
+ public NodeConfigurationController(@Named("nodeCfgPresentation")
ConfigurationPresentation<String> nodeCfgPresentation) {
+ super(nodeCfgPresentation);
+ }
+
+ /**
+ * Returns node configuration in HOCON format.
+ *
+ * @return the whole node configuration in HOCON format.
+ */
+ @Operation(operationId = "getNodeConfiguration")
+ @ApiResponse(responseCode = "200",
+ content = @Content(mediaType = MediaType.TEXT_PLAIN,
+ schema = @Schema(type = "string")),
+ description = "Whole node configuration")
+ @Produces(MediaType.TEXT_PLAIN)
+ @Get
+ public String getConfiguration() {
+ return super.getConfiguration();
+ }
+
+ /**
+ * Returns configuration in HOCON format represented by path.
+ *
+ * @param path to represent a node configuration.
+ * @return system configuration in HOCON format represented by given path.
+ */
+ @Operation(operationId = "getNodeConfigurationByPath")
+ @ApiResponse(responseCode = "200",
+ content = @Content(mediaType = MediaType.TEXT_PLAIN,
+ schema = @Schema(type = "string")),
+ description = "Configuration represented by path")
+ @Produces(MediaType.TEXT_PLAIN)
+ @Get("/{path}")
+ public String getConfigurationByPath(@PathVariable String path) {
+ return super.getConfigurationByPath(path);
+ }
+
+ /**
+ * Updates node configuration in HOCON format.
+ *
+ * @param updatedConfiguration the node configuration to update.
+ */
+ @Operation(operationId = "updateNodeConfiguration")
+ @ApiResponse(responseCode = "200", description = "Configuration updated")
+ @Consumes(MediaType.TEXT_PLAIN)
+ @Patch
+ public void updateConfiguration(@Body String updatedConfiguration) throws
Throwable {
Review Comment:
Same comment as in `ClusterConfigurationController`
##########
modules/rest-api/src/main/java/org/apache/ignite/internal/rest/api/RestFactory.java:
##########
@@ -15,8 +15,10 @@
* limitations under the License.
*/
+package org.apache.ignite.internal.rest.api;
+
/**
- * This package contains classes that represent inbound requests, outbound
responses and main REST handler.
+ * Factory that produces all beans that is necessary for the controller class.
*/
-
-package org.apache.ignite.internal.rest.netty;
+public interface RestFactory {
Review Comment:
Why do you need this interface?
##########
modules/configuration/src/main/java/org/apache/ignite/internal/rest/configuration/PresentationsFactory.java:
##########
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.rest.configuration;
+
+import io.micronaut.context.annotation.Bean;
+import io.micronaut.context.annotation.Factory;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
+import org.apache.ignite.internal.configuration.ConfigurationManager;
+import
org.apache.ignite.internal.configuration.rest.presentation.ConfigurationPresentation;
+import
org.apache.ignite.internal.configuration.rest.presentation.hocon.HoconPresentation;
+import org.apache.ignite.internal.rest.api.RestFactory;
+
+/**
+ * Factory that defines beans that needed for rest module.
Review Comment:
```suggestion
* Factory that defines beans required for the rest module.
```
##########
modules/configuration/src/main/java/org/apache/ignite/internal/rest/configuration/ClusterConfigurationController.java:
##########
@@ -0,0 +1,94 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.rest.configuration;
+
+import io.micronaut.http.MediaType;
+import io.micronaut.http.annotation.Body;
+import io.micronaut.http.annotation.Consumes;
+import io.micronaut.http.annotation.Controller;
+import io.micronaut.http.annotation.Get;
+import io.micronaut.http.annotation.Patch;
+import io.micronaut.http.annotation.PathVariable;
+import io.micronaut.http.annotation.Produces;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.inject.Named;
+import
org.apache.ignite.internal.configuration.rest.presentation.ConfigurationPresentation;
+
+/**
+ * Cluster configuration controller.
+ */
+@Controller("/management/v1/configuration/cluster/")
+@ApiResponse(responseCode = "400", description = "Incorrect configuration")
+@ApiResponse(responseCode = "500", description = "Internal error")
+@Tag(name = "clusterConfiguration")
+public class ClusterConfigurationController extends
AbstractConfigurationController {
+
+ public ClusterConfigurationController(@Named("clusterCfgPresentation")
ConfigurationPresentation<String> clusterCfgPresentation) {
+ super(clusterCfgPresentation);
+ }
+
+ /**
+ * Returns cluster configuration in HOCON format.
+ *
+ * @return the whole cluster configuration in HOCON format.
+ */
+ @Operation(operationId = "getClusterConfiguration")
+ @ApiResponse(
+ responseCode = "200",
+ content = @Content(mediaType = MediaType.TEXT_PLAIN, schema =
@Schema(type = "string")),
+ description = "Get cluster configuration")
+ @Produces(MediaType.TEXT_PLAIN)
+ @Get
+ public String getConfiguration() {
+ return super.getConfiguration();
+ }
+
+ /**
+ * Returns configuration in HOCON format represented by path.
+ *
+ * @param path to represent a cluster configuration.
+ * @return system configuration in HOCON format represented by given path.
+ */
+ @Operation(operationId = "getClusterConfigurationByPath")
+ @ApiResponse(responseCode = "200",
+ content = @Content(mediaType = MediaType.TEXT_PLAIN,
+ schema = @Schema(type = "string")),
+ description = "Configuration represented by path")
+ @Produces(MediaType.TEXT_PLAIN)
+ @Get("/{path}")
+ public String getConfigurationByPath(@PathVariable String path) {
+ return super.getConfigurationByPath(path);
+ }
+
+ /**
+ * Updates cluster configuration in HOCON format.
+ *
+ * @param updatedConfiguration the cluster configuration to update.
+ */
+ @Operation(operationId = "updateClusterConfiguration")
+ @ApiResponse(responseCode = "200", description = "Configuration updated")
+ @Consumes(MediaType.TEXT_PLAIN)
+ @Patch
+ public void updateConfiguration(@Body String updatedConfiguration) throws
Throwable {
Review Comment:
I believe it's possible to return `CompletableFuture` as a response in
Micronaut controller. Can we do that? If yes. I would also make
`updateConfiguration` non-blockable
##########
parent/pom.xml:
##########
@@ -954,6 +963,7 @@
<ignorePackages>
<package>org.apache.ignite.internal.sql.engine</package>
<package>org.apache.ignite.internal.generated</package>
+
<package>org.apache.ignite.rest.client</package>
Review Comment:
Do I understand correctly that this package contains clients generated by
Swagger? If yes, please add a comment, if no - why did you add it here?
##########
parent/pom.xml:
##########
@@ -53,19 +53,21 @@
<asm.framework.version>9.0</asm.framework.version>
<compile.testing.library.version>0.19</compile.testing.library.version>
<jackson.version>2.13.1</jackson.version>
+ <jakarta.annotations.version>2.0.0</jakarta.annotations.version>
<jansi.version>1.18</jansi.version>
<netty.version>4.1.70.Final</netty.version>
<javapoet.version>1.13.0</javapoet.version>
<javax.annotation.api.version>1.3.2</javax.annotation.api.version>
<jetbrains.annotations.version>20.1.0</jetbrains.annotations.version>
<jmh.framework.version>1.35</jmh.framework.version>
<junit.version>5.8.1</junit.version>
- <micronaut.version>2.1.2</micronaut.version>
- <micronaut.test.junit5.version>2.3.1</micronaut.test.junit5.version>
+ <micronaut.version>3.4.1</micronaut.version>
+ <micronaut.test.junit5.version>3.0.5</micronaut.test.junit5.version>
Review Comment:
I think we can get rid of this property if we use a bom
##########
modules/configuration/src/main/java/org/apache/ignite/internal/rest/configuration/ClusterConfigurationController.java:
##########
@@ -0,0 +1,94 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.rest.configuration;
+
+import io.micronaut.http.MediaType;
+import io.micronaut.http.annotation.Body;
+import io.micronaut.http.annotation.Consumes;
+import io.micronaut.http.annotation.Controller;
+import io.micronaut.http.annotation.Get;
+import io.micronaut.http.annotation.Patch;
+import io.micronaut.http.annotation.PathVariable;
+import io.micronaut.http.annotation.Produces;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.inject.Named;
+import
org.apache.ignite.internal.configuration.rest.presentation.ConfigurationPresentation;
+
+/**
+ * Cluster configuration controller.
+ */
+@Controller("/management/v1/configuration/cluster/")
+@ApiResponse(responseCode = "400", description = "Incorrect configuration")
+@ApiResponse(responseCode = "500", description = "Internal error")
+@Tag(name = "clusterConfiguration")
+public class ClusterConfigurationController extends
AbstractConfigurationController {
+
+ public ClusterConfigurationController(@Named("clusterCfgPresentation")
ConfigurationPresentation<String> clusterCfgPresentation) {
+ super(clusterCfgPresentation);
+ }
+
+ /**
+ * Returns cluster configuration in HOCON format.
+ *
+ * @return the whole cluster configuration in HOCON format.
+ */
+ @Operation(operationId = "getClusterConfiguration")
+ @ApiResponse(
+ responseCode = "200",
+ content = @Content(mediaType = MediaType.TEXT_PLAIN, schema =
@Schema(type = "string")),
+ description = "Get cluster configuration")
+ @Produces(MediaType.TEXT_PLAIN)
Review Comment:
Why not `application/json`?
##########
modules/rest-client/pom.xml:
##########
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.ignite</groupId>
+ <artifactId>ignite-parent</artifactId>
+ <version>1</version>
+ <relativePath>../../parent/pom.xml</relativePath>
+ </parent>
+
+ <artifactId>ignite-rest-client</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+
+ <dependencies>
+
+ <!--client specific dependencies, versions cannot be moved to the parent
pom-->
Review Comment:
Is this module (and this file) auto-generated?
##########
modules/cluster-management/pom.xml:
##########
@@ -49,17 +49,26 @@
<dependency>
<groupId>org.apache.ignite</groupId>
- <artifactId>ignite-rest</artifactId>
+ <artifactId>ignite-vault</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ignite</groupId>
- <artifactId>ignite-vault</artifactId>
+ <artifactId>ignite-rest-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>io.micronaut</groupId>
+ <artifactId>micronaut-http</artifactId>
+ <version>${micronaut.version}</version>
Review Comment:
Shall we use
[micronaut-bom](https://mvnrepository.com/artifact/io.micronaut/micronaut-bom)
instead of specifying `micronaut.version` explicitly?
##########
modules/cluster-management/pom.xml:
##########
@@ -49,17 +49,26 @@
<dependency>
<groupId>org.apache.ignite</groupId>
- <artifactId>ignite-rest</artifactId>
+ <artifactId>ignite-vault</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ignite</groupId>
- <artifactId>ignite-vault</artifactId>
+ <artifactId>ignite-rest-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>io.micronaut</groupId>
+ <artifactId>micronaut-http</artifactId>
+ <version>${micronaut.version}</version>
Review Comment:
Also, I believe that `compile` scope is the default, so no need to specify it
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
