IGNITE-17053 Fix spring-data-ext examples (#158)

shishkovilja · web-flow · commit 60fba0ecdf38 · 2022-10-21T14:19:58.000+03:00
IGNITE-17053 Fixed spring-data-ext examples and documentation
diff --git a/docs/_docs/spring/spring-data.adoc b/docs/_docs/spring/spring-data.adoc
@@ -32,7 +32,7 @@ tab:pom.xml[]
 ----
 <dependency>
     <groupId>org.apache.ignite</groupId>
-    <artifactId>ignite-spring-data-2.2-ext</artifactId>
+    <artifactId>ignite-spring-data-ext</artifactId>
     <version>${ignite-spring-data-ext.version}</version>
 </dependency>
 
@@ -75,12 +75,6 @@ Apache Ignite each one is compatible with.
 | 1.0.0 | All versions since 2.8.0
 |===
 
-[NOTE]
-====
-If your Spring Data version is earlier than Spring Data 2.2 then set `ignite-spring-data-2.0-ext`
-or `ignite-spring-data-ext` as an `artifactId` in the pom.xml configuration.
-====
-
 == Apache Ignite Repository
 
 Apache Ignite introduces a special `IgniteRepository` interface that extends default `CrudRepository`. This interface
@@ -287,7 +281,7 @@ System.out.println("\n>>> Top Person with surname 'Smith': " +
 
 == Example
 
-The complete example is available on link: https://github.com/apache/ignite-extensions/tree/master/modules/spring-data-2.0-ext/examples/main[GitHub, windows="_blank"]
+The complete example is available on link: https://github.com/apache/ignite-extensions/tree/master/modules/spring-data-ext/examples[GitHub, windows="_blank"]
 
 == Tutorial
 
diff --git a/modules/spring-data-ext/examples/pom.xml b/modules/spring-data-ext/examples/pom.xml
@@ -85,5 +85,20 @@
                 </exclusion>
             </exclusions>
         </dependency>
+
+        <dependency>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-core</artifactId>
+            <version>${ignite.version}</version>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-log4j2</artifactId>
+            <version>${ignite.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>
diff --git a/modules/spring-data-ext/examples/src/main/java/org/apache/ignite/springdata/examples/SpringApplicationConfiguration.java b/modules/spring-data-ext/examples/src/main/java/org/apache/ignite/springdata/examples/SpringApplicationConfiguration.java
@@ -48,6 +48,6 @@ public class SpringApplicationConfiguration {
      */
     @Bean
     public Ignite igniteInstance() {
-        return Ignition.start("modules/spring-data-2.2-ext/examples/config/example-spring-data.xml");
+        return Ignition.start("example-spring-data.xml");
     }
 }
diff --git a/modules/spring-data-ext/examples/src/main/java/org/apache/ignite/springdata/examples/SpringDataExample.java b/modules/spring-data-ext/examples/src/main/java/org/apache/ignite/springdata/examples/SpringDataExample.java
@@ -32,9 +32,6 @@
 
 /**
  * The example demonstrates how to interact with an Apache Ignite cluster by means of Spring Data API.
- *
- * Additional cluster nodes can be started with special configuration file which
- * enables P2P class loading: {@code 'ignite.{sh|bat} modules/spring-data-2.2/examples/config/example-spring-data.xml'}.
  */
 public class SpringDataExample {
     /** Spring Application Context. */
diff --git a/modules/spring-data-ext/examples/src/main/resources/example-default.xml b/modules/spring-data-ext/examples/src/main/resources/example-default.xml
diff --git a/modules/spring-data-ext/examples/src/main/resources/example-spring-data.xml b/modules/spring-data-ext/examples/src/main/resources/example-spring-data.xml
@@ -25,11 +25,8 @@
 
     Use this configuration file when running Spring Data examples.
 
-    When starting a standalone node, you need to execute the following command:
-    {IGNITE_HOME}/bin/ignite.{bat|sh} modules/spring-data-ext/examples/config/example-spring-data.xml
-
     When starting Ignite from Java IDE, pass path to this file to Ignition:
-    Ignition.start("modules/spring-data-ext/examples/config/example-spring-data.xml");
+    Ignition.start("example-spring-data.xml");
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -54,7 +51,7 @@
                     <property name="indexedTypes">
                         <list>
                             <value>java.lang.Long</value>
-                            <value>org.apache.ignite.springdata22.examples.model.Person</value>
+                            <value>org.apache.ignite.springdata.examples.model.Person</value>
                         </list>
                     </property>
                 </bean>
diff --git a/modules/spring-data-ext/examples/src/test/java/org/apache/ignite/springdata/examples/IgniteSpringDataExamplesTestSuite.java b/modules/spring-data-ext/examples/src/test/java/org/apache/ignite/springdata/examples/IgniteSpringDataExamplesTestSuite.java
@@ -0,0 +1,29 @@
+/*
+ * 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.springdata.examples;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+/** */
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    SpringDataExampleTest.class
+})
+public class IgniteSpringDataExamplesTestSuite {
+}
diff --git a/modules/spring-data-ext/examples/src/test/java/org/apache/ignite/springdata/examples/SpringDataExampleTest.java b/modules/spring-data-ext/examples/src/test/java/org/apache/ignite/springdata/examples/SpringDataExampleTest.java
@@ -0,0 +1,30 @@
+/*
+ * 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.springdata.examples;
+
+import org.apache.ignite.testframework.junits.common.GridAbstractExamplesTest;
+import org.junit.Test;
+
+/** */
+public class SpringDataExampleTest extends GridAbstractExamplesTest {
+    /** */
+    @Test
+    public void testExample() {
+        SpringDataExample.main(EMPTY_ARGS);
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,6 @@ public class SpringApplicationConfiguration {`
`48`	`48`	`*/`
`49`	`49`	`@Bean`
`50`	`50`	`public Ignite igniteInstance() {`
`51`		`- return Ignition.start("modules/spring-data-2.2-ext/examples/config/example-spring-data.xml");`
	`51`	`+ return Ignition.start("example-spring-data.xml");`
`52`	`52`	`}`
`53`	`53`	`}`