This is an automated email from the ASF dual-hosted git repository. nizhikov pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/ignite-extensions.git
commit 662b6699b176c681e5029e35745353efd29cff88 Author: Nikolay Izhikov <[email protected]> AuthorDate: Wed Jan 22 22:19:58 2020 +0300 IGNITE-12525: code review fixes. --- .../boot/autoconfigure/AutoConfigureExample.java | 122 +++++++++++++++++++++ .../examples/main/resources/application.yml | 24 ++++ modules/spring-boot-autoconfigure/pom.xml | 65 ++++++++++- .../autoconfigure/IgniteAutoConfiguration.java} | 4 +- .../boot/autoconfigure}/IgniteConfigurer.java | 4 +- .../src/main/resources/META-INF/spring.factories | 2 +- .../autoconfigure/IgniteAutoconfigureTest.java} | 8 +- .../IgniteAutoconfigureTestSuite.java} | 20 ++-- .../autoconfigure/AutoConfigureClientExample.java | 80 ++++++++++++++ .../examples/main/resources/application.yml | 4 + modules/spring-boot-client-autoconfigure/pom.xml | 68 +++++++++++- .../IgniteClientAutoConfiguration.java | 2 +- .../autoconfigure}/IgniteClientConfigurer.java | 2 +- .../src/main/resources/META-INF/spring.factories | 2 +- .../IgniteClientAutoConfigureTest.java | 2 +- .../IgniteClientAutoConfigureTestSuite.java} | 20 ++-- 16 files changed, 379 insertions(+), 50 deletions(-) diff --git a/modules/spring-boot-autoconfigure/examples/main/java/org/apache/ignite/springframework/boot/autoconfigure/AutoConfigureExample.java b/modules/spring-boot-autoconfigure/examples/main/java/org/apache/ignite/springframework/boot/autoconfigure/AutoConfigureExample.java new file mode 100644 index 0000000..1b49125 --- /dev/null +++ b/modules/spring-boot-autoconfigure/examples/main/java/org/apache/ignite/springframework/boot/autoconfigure/AutoConfigureExample.java @@ -0,0 +1,122 @@ +/* + * 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.springframework.boot.autoconfigure; + +import java.util.Date; +import java.util.List; +import org.apache.ignite.Ignite; +import org.apache.ignite.IgniteCache; +import org.apache.ignite.cache.query.SqlFieldsQuery; +import org.apache.ignite.configuration.DataRegionConfiguration; +import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.CommandLineRunner; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; +import org.springframework.context.annotation.Bean; + +/** Example of Ignite auto configurer. */ +@SpringBootApplication(exclude = DataSourceAutoConfiguration.class) +public class AutoConfigureExample { + /** Main method of the application. */ + public static void main(String[] args) { + SpringApplication.run(AutoConfigureExample.class, args); + } + + /** Providing configurer for the Ignite. */ + @Bean + public IgniteConfigurer configurer() { + return cfg -> { + //Setting consistent id. + //See `application.yml` for the additional properties. + cfg.setConsistentId("consistent-id"); + cfg.setCommunicationSpi(new TcpCommunicationSpi()); + }; + } + + /** Service using autoconfigured Ignite. */ + @Bean + public CommandLineRunner runner() { + return new CommandLineRunner() { + /** Ignite instance. */ + @Autowired + private Ignite ignite; + + /** Method will be executed on application startup. */ + @Override public void run(String... args) throws Exception { + System.out.println("ServiceWithIgnite.run:"); + //This property comes from configurer. See AutoConfigureExample. + System.out.println(" IgniteConsistentId: " + ignite.configuration().getConsistentId()); + + //Other properties are set via application-node.yml. + System.out.println(" IgniteInstanceName: " + ignite.configuration().getIgniteInstanceName()); + System.out.println(" CommunicationSpi.localPort: " + + ((TcpCommunicationSpi)ignite.configuration().getCommunicationSpi()).getLocalPort()); + System.out.println(" DefaultDataRegion initial size: " + + ignite.configuration().getDataStorageConfiguration().getDefaultDataRegionConfiguration().getInitialSize()); + + DataRegionConfiguration drc = + ignite.configuration().getDataStorageConfiguration().getDataRegionConfigurations()[0]; + + System.out.println(" " + drc.getName() + " initial size: " + drc.getInitialSize()); + System.out.println(" Cache in cluster:"); + + for (String cacheName : ignite.cacheNames()) + System.out.println(" " + cacheName); + + cacheAPI(); + sqlAPI(); + } + + /** Example of the SQL API usage. */ + private void sqlAPI() { + //This cache configured in `application.yml`. + IgniteCache<Long, Object> accounts = ignite.cache("accounts"); + + //SQL table configured via QueryEntity in `application.yml` + String qry = "INSERT INTO ACCOUNTS(ID, AMOUNT, UPDATEDATE) VALUES(?, ?, ?)"; + + accounts.query(new SqlFieldsQuery(qry).setArgs(1, 250.05, new Date())).getAll(); + accounts.query(new SqlFieldsQuery(qry).setArgs(2, 255.05, new Date())).getAll(); + accounts.query(new SqlFieldsQuery(qry).setArgs(3, .05, new Date())).getAll(); + + qry = "SELECT * FROM ACCOUNTS"; + + List<List<?>> res = accounts.query(new SqlFieldsQuery(qry)).getAll(); + + for (List<?> row : res) + System.out.println("(" + row.get(0) + ", " + row.get(1) + ", " + row.get(2) + ")"); + } + + /** Example of the Cache API usage. */ + private void cacheAPI() { + //This cache configured in `application.yml`. + IgniteCache<Integer, Integer> cache = ignite.cache("my-cache2"); + + System.out.println("Putting data to the my-cache1..."); + + cache.put(1, 1); + cache.put(2, 2); + cache.put(3, 3); + + System.out.println("Done putting data to the my-cache1..."); + } + }; + } +} diff --git a/modules/spring-boot-autoconfigure/examples/main/resources/application.yml b/modules/spring-boot-autoconfigure/examples/main/resources/application.yml new file mode 100644 index 0000000..3b86d1d --- /dev/null +++ b/modules/spring-boot-autoconfigure/examples/main/resources/application.yml @@ -0,0 +1,24 @@ +ignite: + igniteInstanceName: properties-instance-name + communicationSpi: + localPort: 5555 + dataStorageConfiguration: + defaultDataRegionConfiguration: + initialSize: 10485760 #10MB + dataRegionConfigurations[0]: + name: my-dataregion + initialSize: 104857600 #100MB + cacheConfiguration[0]: + name: accounts + queryEntities: + - tableName: ACCOUNTS + keyFieldName: ID + keyType: java.lang.Long + valueType: java.lang.Object + fields: + ID: java.lang.Long + amount: java.lang.Double + updateDate: java.util.Date + cacheConfiguration[1]: + name: my-cache2 + diff --git a/modules/spring-boot-autoconfigure/pom.xml b/modules/spring-boot-autoconfigure/pom.xml index 0296b9f..35df5d8 100644 --- a/modules/spring-boot-autoconfigure/pom.xml +++ b/modules/spring-boot-autoconfigure/pom.xml @@ -30,15 +30,19 @@ <relativePath>../../parent</relativePath> </parent> - <artifactId>spring-boot-ignite-autoconfigure</artifactId> - <version>2.9.0-SNAPSHOT</version> + <artifactId>ignite-spring-boot-autoconfigure</artifactId> + <version>1.0.0-SNAPSHOT</version> <url>http://ignite.apache.org</url> + <properties> + <ignite.version>2.9.0-SNAPSHOT</ignite.version> + </properties> + <dependencies> <dependency> <groupId>org.apache.ignite</groupId> <artifactId>ignite-core</artifactId> - <version>${project.version}</version> + <version>${ignite.version}</version> </dependency> <dependency> @@ -56,7 +60,7 @@ <dependency> <groupId>org.apache.ignite</groupId> <artifactId>ignite-log4j</artifactId> - <version>${project.version}</version> + <version>${ignite.version}</version> <scope>test</scope> </dependency> @@ -70,7 +74,7 @@ <dependency> <groupId>org.apache.ignite</groupId> <artifactId>ignite-core</artifactId> - <version>${project.version}</version> + <version>${ignite.version}</version> <type>test-jar</type> <scope>test</scope> <exclusions> @@ -104,4 +108,55 @@ </plugin> </plugins> </build> + + <profiles> + <profile> + <id>examples</id> + + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>add-source</goal> + </goals> + <configuration> + <sources> + <source>examples/main/java</source> + </sources> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + <resources> + <resource> + <directory>${project.basedir}/examples/main/resources</directory> + </resource> + <resource> + <directory>${project.basedir}/src/main/resources</directory> + </resource> + </resources> + </build> + + <dependencies> + <dependency> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-indexing</artifactId> + <version>${ignite.version}</version> + </dependency> + + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <version>${h2.version}</version> + </dependency> + </dependencies> + </profile> + + </profiles> </project> diff --git a/modules/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ignite/IgniteNodeAutoConfiguration.java b/modules/spring-boot-autoconfigure/src/main/java/org/apache/ignite/springframework/boot/autoconfigure/IgniteAutoConfiguration.java similarity index 97% rename from modules/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ignite/IgniteNodeAutoConfiguration.java rename to modules/spring-boot-autoconfigure/src/main/java/org/apache/ignite/springframework/boot/autoconfigure/IgniteAutoConfiguration.java index 66d13de..449f008 100644 --- a/modules/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ignite/IgniteNodeAutoConfiguration.java +++ b/modules/spring-boot-autoconfigure/src/main/java/org/apache/ignite/springframework/boot/autoconfigure/IgniteAutoConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.springframework.boot.autoconfigure.ignite; +package org.apache.ignite.springframework.boot.autoconfigure; import org.apache.ignite.Ignite; import org.apache.ignite.Ignition; @@ -57,7 +57,7 @@ import org.springframework.context.annotation.Configuration; */ @Configuration @EnableConfigurationProperties -public class IgniteNodeAutoConfiguration { +public class IgniteAutoConfiguration { /** Ignite configuration properties prefix. */ public static final String IGNITE_PROPS_PREFIX = "ignite"; diff --git a/modules/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ignite/IgniteConfigurer.java b/modules/spring-boot-autoconfigure/src/main/java/org/apache/ignite/springframework/boot/autoconfigure/IgniteConfigurer.java similarity index 93% copy from modules/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ignite/IgniteConfigurer.java copy to modules/spring-boot-autoconfigure/src/main/java/org/apache/ignite/springframework/boot/autoconfigure/IgniteConfigurer.java index 1339f80..e5c95d6 100644 --- a/modules/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ignite/IgniteConfigurer.java +++ b/modules/spring-boot-autoconfigure/src/main/java/org/apache/ignite/springframework/boot/autoconfigure/IgniteConfigurer.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.springframework.boot.autoconfigure.ignite; +package org.apache.ignite.springframework.boot.autoconfigure; import java.util.function.Consumer; import org.apache.ignite.configuration.IgniteConfiguration; @@ -27,6 +27,6 @@ import org.springframework.beans.factory.BeanFactory; * similar hardcoded values you should do it in the implementation of this interface. * * @see IgniteConfiguration - * @see IgniteNodeAutoConfiguration + * @see IgniteAutoConfiguration */ public interface IgniteConfigurer extends Consumer<IgniteConfiguration> { /* No-op. */ } diff --git a/modules/spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories b/modules/spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories index 8c8dd31..1fc7d14 100644 --- a/modules/spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories +++ b/modules/spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories @@ -14,4 +14,4 @@ # limitations under the License. org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -org.springframework.boot.autoconfigure.ignite.IgniteNodeAutoConfiguration +org.apache.ignite.springframework.boot.autoconfigure.IgniteAutoConfiguration diff --git a/modules/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ignite/IgniteNodeAutoconfigureTest.java b/modules/spring-boot-autoconfigure/src/test/java/org/apache/ignite/springframework/boot/autoconfigure/IgniteAutoconfigureTest.java similarity index 96% rename from modules/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ignite/IgniteNodeAutoconfigureTest.java rename to modules/spring-boot-autoconfigure/src/test/java/org/apache/ignite/springframework/boot/autoconfigure/IgniteAutoconfigureTest.java index 32f0909..98cddf0 100644 --- a/modules/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ignite/IgniteNodeAutoconfigureTest.java +++ b/modules/spring-boot-autoconfigure/src/test/java/org/apache/ignite/springframework/boot/autoconfigure/IgniteAutoconfigureTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.springframework.boot.autoconfigure.ignite; +package org.apache.ignite.springframework.boot.autoconfigure; import org.apache.ignite.Ignite; import org.apache.ignite.configuration.IgniteConfiguration; @@ -30,9 +30,9 @@ import org.springframework.test.context.junit.jupiter.SpringExtension; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; -/** Tests {@link IgniteNodeAutoConfiguration} feature. */ +/** Tests {@link IgniteAutoConfiguration} feature. */ @ExtendWith(SpringExtension.class) -public class IgniteNodeAutoconfigureTest { +public class IgniteAutoconfigureTest { /** Spring test application context. */ private ApplicationContextRunner contextRunner; @@ -40,7 +40,7 @@ public class IgniteNodeAutoconfigureTest { @BeforeEach public void beforeTest() { contextRunner = new ApplicationContextRunner() - .withConfiguration(AutoConfigurations.of(IgniteNodeAutoConfiguration.class)); + .withConfiguration(AutoConfigurations.of(IgniteAutoConfiguration.class)); } /** Tests that Ignite node start without explicit configuration. */ diff --git a/modules/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ignite/IgniteConfigurer.java b/modules/spring-boot-autoconfigure/src/test/java/org/apache/ignite/springframework/boot/autoconfigure/IgniteAutoconfigureTestSuite.java similarity index 55% copy from modules/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ignite/IgniteConfigurer.java copy to modules/spring-boot-autoconfigure/src/test/java/org/apache/ignite/springframework/boot/autoconfigure/IgniteAutoconfigureTestSuite.java index 1339f80..04a18ee 100644 --- a/modules/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ignite/IgniteConfigurer.java +++ b/modules/spring-boot-autoconfigure/src/test/java/org/apache/ignite/springframework/boot/autoconfigure/IgniteAutoconfigureTestSuite.java @@ -15,18 +15,12 @@ * limitations under the License. */ -package org.springframework.boot.autoconfigure.ignite; +package org.apache.ignite.springframework.boot.autoconfigure; -import java.util.function.Consumer; -import org.apache.ignite.configuration.IgniteConfiguration; -import org.springframework.beans.factory.BeanFactory; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; -/** - * Instance of this interface available in {@link BeanFactory} will be used to customize empty - * {@link IgniteConfiguration} during Ignite node start. If you want to set custom SPI instances or - * similar hardcoded values you should do it in the implementation of this interface. - * - * @see IgniteConfiguration - * @see IgniteNodeAutoConfiguration - */ -public interface IgniteConfigurer extends Consumer<IgniteConfiguration> { /* No-op. */ } +@RunWith(Suite.class) [email protected]({IgniteAutoconfigureTest.class}) +public class IgniteAutoconfigureTestSuite { +} diff --git a/modules/spring-boot-client-autoconfigure/examples/main/java/org/apache/ignite/springframework/boot/autoconfigure/AutoConfigureClientExample.java b/modules/spring-boot-client-autoconfigure/examples/main/java/org/apache/ignite/springframework/boot/autoconfigure/AutoConfigureClientExample.java new file mode 100644 index 0000000..faab907 --- /dev/null +++ b/modules/spring-boot-client-autoconfigure/examples/main/java/org/apache/ignite/springframework/boot/autoconfigure/AutoConfigureClientExample.java @@ -0,0 +1,80 @@ +/* + * 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.springframework.boot.autoconfigure; + +import org.apache.ignite.Ignite; +import org.apache.ignite.Ignition; +import org.apache.ignite.client.ClientCache; +import org.apache.ignite.client.IgniteClient; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.CommandLineRunner; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; +import org.springframework.context.annotation.Bean; + +/** Example of Ignite client auto configuration. */ +@SpringBootApplication(exclude = DataSourceAutoConfiguration.class) +public class AutoConfigureClientExample { + /** Main method of the application. */ + public static void main(String[] args) { + //Starting Ignite server node outside of Spring Boot application so client can connect to it. + Ignite serverNode = Ignition.start(new IgniteConfiguration()); + + //Creating caches. + serverNode.createCache("my-cache1"); + serverNode.createCache("my-cache2"); + + SpringApplication.run(AutoConfigureClientExample.class); + } + + /** Providing configurer for the Ignite client. */ + @Bean + IgniteClientConfigurer configurer() { + //Setting some property. + //Other will come from `application.yml` + return cfg -> cfg.setSendBufferSize(64*1024); + } + + /** Service using autoconfigured Ignite. */ + @Bean + CommandLineRunner runner() { + return new CommandLineRunner() { + /** IgniteClient instance. */ + @Autowired + private IgniteClient client; + + /** Method will be executed on application startup. */ + @Override public void run(String... args) throws Exception { + System.out.println("ServiceWithIgniteClient.run"); + System.out.println("Cache names existing in cluster: " + client.cacheNames()); + + ClientCache<Integer, Integer> cache = client.cache("my-cache1"); + + System.out.println("Putting data to the my-cache1..."); + + cache.put(1, 1); + cache.put(2, 2); + cache.put(3, 3); + + System.out.println("Done putting data to the my-cache1..."); + } + }; + } +} diff --git a/modules/spring-boot-client-autoconfigure/examples/main/resources/application.yml b/modules/spring-boot-client-autoconfigure/examples/main/resources/application.yml new file mode 100644 index 0000000..d712bfb --- /dev/null +++ b/modules/spring-boot-client-autoconfigure/examples/main/resources/application.yml @@ -0,0 +1,4 @@ +ignite-client: + addresses: 127.0.0.1:10800 + timeout: 10000 + tcpNoDelay: false diff --git a/modules/spring-boot-client-autoconfigure/pom.xml b/modules/spring-boot-client-autoconfigure/pom.xml index 386f187..f50ab78 100644 --- a/modules/spring-boot-client-autoconfigure/pom.xml +++ b/modules/spring-boot-client-autoconfigure/pom.xml @@ -20,7 +20,8 @@ <!-- POM file. --> -<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";> +<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> @@ -30,15 +31,19 @@ <relativePath>../../parent</relativePath> </parent> - <artifactId>spring-boot-ignite-client-autoconfigure</artifactId> - <version>2.9.0-SNAPSHOT</version> + <artifactId>ignite-client-spring-boot-autoconfigure</artifactId> + <version>1.0.0-SNAPSHOT</version> <url>http://ignite.apache.org</url> + <properties> + <ignite.version>2.9.0-SNAPSHOT</ignite.version> + </properties> + <dependencies> <dependency> <groupId>org.apache.ignite</groupId> <artifactId>ignite-core</artifactId> - <version>${project.version}</version> + <version>${ignite.version}</version> </dependency> <dependency> @@ -56,7 +61,7 @@ <dependency> <groupId>org.apache.ignite</groupId> <artifactId>ignite-log4j</artifactId> - <version>${project.version}</version> + <version>${ignite.version}</version> <scope>test</scope> </dependency> @@ -67,10 +72,11 @@ <scope>test</scope> </dependency> + <dependency> <groupId>org.apache.ignite</groupId> <artifactId>ignite-core</artifactId> - <version>${project.version}</version> + <version>${ignite.version}</version> <type>test-jar</type> <scope>test</scope> <exclusions> @@ -92,4 +98,54 @@ <version>${spring-boot.version}</version> </dependency> </dependencies> + + <profiles> + <profile> + <id>examples</id> + + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>add-source</goal> + </goals> + <configuration> + <sources> + <source>examples/main/java</source> + </sources> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + <resources> + <resource> + <directory>${project.basedir}/examples/main/resources</directory> + </resource> + <resource> + <directory>${project.basedir}/src/main/resources</directory> + </resource> + </resources> + </build> + + <dependencies> + <dependency> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-indexing</artifactId> + <version>${ignite.version}</version> + </dependency> + + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <version>${h2.version}</version> + </dependency> + </dependencies> + </profile> + </profiles> </project> diff --git a/modules/spring-boot-client-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ignite/IgniteClientAutoConfiguration.java b/modules/spring-boot-client-autoconfigure/src/main/java/org/apache/ignite/springframework/boot/autoconfigure/IgniteClientAutoConfiguration.java similarity index 98% rename from modules/spring-boot-client-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ignite/IgniteClientAutoConfiguration.java rename to modules/spring-boot-client-autoconfigure/src/main/java/org/apache/ignite/springframework/boot/autoconfigure/IgniteClientAutoConfiguration.java index b28b3ad..fddb8a3 100644 --- a/modules/spring-boot-client-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ignite/IgniteClientAutoConfiguration.java +++ b/modules/spring-boot-client-autoconfigure/src/main/java/org/apache/ignite/springframework/boot/autoconfigure/IgniteClientAutoConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.springframework.boot.autoconfigure.ignite; +package org.apache.ignite.springframework.boot.autoconfigure; import org.apache.ignite.Ignition; import org.apache.ignite.client.IgniteClient; diff --git a/modules/spring-boot-client-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ignite/IgniteClientConfigurer.java b/modules/spring-boot-client-autoconfigure/src/main/java/org/apache/ignite/springframework/boot/autoconfigure/IgniteClientConfigurer.java similarity index 95% rename from modules/spring-boot-client-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ignite/IgniteClientConfigurer.java rename to modules/spring-boot-client-autoconfigure/src/main/java/org/apache/ignite/springframework/boot/autoconfigure/IgniteClientConfigurer.java index 2ce2509..b086eda 100644 --- a/modules/spring-boot-client-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ignite/IgniteClientConfigurer.java +++ b/modules/spring-boot-client-autoconfigure/src/main/java/org/apache/ignite/springframework/boot/autoconfigure/IgniteClientConfigurer.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.springframework.boot.autoconfigure.ignite; +package org.apache.ignite.springframework.boot.autoconfigure; import java.util.function.Consumer; import org.apache.ignite.configuration.ClientConfiguration; diff --git a/modules/spring-boot-client-autoconfigure/src/main/resources/META-INF/spring.factories b/modules/spring-boot-client-autoconfigure/src/main/resources/META-INF/spring.factories index a8e5ec6..7eb759b 100644 --- a/modules/spring-boot-client-autoconfigure/src/main/resources/META-INF/spring.factories +++ b/modules/spring-boot-client-autoconfigure/src/main/resources/META-INF/spring.factories @@ -14,4 +14,4 @@ # limitations under the License. org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -org.springframework.boot.autoconfigure.ignite.IgniteClientAutoConfiguration +org.apache.ignite.springframework.boot.autoconfigure.IgniteClientAutoConfiguration diff --git a/modules/spring-boot-client-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ignite/IgniteClientAutoConfigureTest.java b/modules/spring-boot-client-autoconfigure/src/test/java/org/apache/ignite/springframework/boot/autoconfigure/IgniteClientAutoConfigureTest.java similarity index 98% rename from modules/spring-boot-client-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ignite/IgniteClientAutoConfigureTest.java rename to modules/spring-boot-client-autoconfigure/src/test/java/org/apache/ignite/springframework/boot/autoconfigure/IgniteClientAutoConfigureTest.java index d58d030..698a83d 100644 --- a/modules/spring-boot-client-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ignite/IgniteClientAutoConfigureTest.java +++ b/modules/spring-boot-client-autoconfigure/src/test/java/org/apache/ignite/springframework/boot/autoconfigure/IgniteClientAutoConfigureTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.springframework.boot.autoconfigure.ignite; +package org.apache.ignite.springframework.boot.autoconfigure; import java.util.Collections; import java.util.Set; diff --git a/modules/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ignite/IgniteConfigurer.java b/modules/spring-boot-client-autoconfigure/src/test/java/org/apache/ignite/springframework/boot/autoconfigure/IgniteClientAutoConfigureTestSuite.java similarity index 55% rename from modules/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ignite/IgniteConfigurer.java rename to modules/spring-boot-client-autoconfigure/src/test/java/org/apache/ignite/springframework/boot/autoconfigure/IgniteClientAutoConfigureTestSuite.java index 1339f80..abdcf8d 100644 --- a/modules/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ignite/IgniteConfigurer.java +++ b/modules/spring-boot-client-autoconfigure/src/test/java/org/apache/ignite/springframework/boot/autoconfigure/IgniteClientAutoConfigureTestSuite.java @@ -15,18 +15,12 @@ * limitations under the License. */ -package org.springframework.boot.autoconfigure.ignite; +package org.apache.ignite.springframework.boot.autoconfigure; -import java.util.function.Consumer; -import org.apache.ignite.configuration.IgniteConfiguration; -import org.springframework.beans.factory.BeanFactory; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; -/** - * Instance of this interface available in {@link BeanFactory} will be used to customize empty - * {@link IgniteConfiguration} during Ignite node start. If you want to set custom SPI instances or - * similar hardcoded values you should do it in the implementation of this interface. - * - * @see IgniteConfiguration - * @see IgniteNodeAutoConfiguration - */ -public interface IgniteConfigurer extends Consumer<IgniteConfiguration> { /* No-op. */ } +@RunWith(Suite.class) [email protected]({IgniteClientAutoConfigureTest.class}) +public class IgniteClientAutoConfigureTestSuite { +}
