Refactor: Modify project struct

Signed-off-by: IllTamer <78360471+IllTamer@users.noreply.github.com>
keploy · Nov 28, 2023 · 53bdf86 · 53bdf86
1 parent 6075e8e
commit 53bdf86
Show file tree

Hide file tree

Showing 54 changed files with 272 additions and 21 deletions.
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/sqldialects.xml b/.idea/sqldialects.xml
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
diff --git a/.gitignore → samples-java/.gitignore b/.gitignore → samples-java/.gitignore
@@ -198,7 +198,7 @@ HELP.md
 .sts4-cache
 
 ### IntelliJ IDEA ###
-.idea
+../.idea
 *.iws
 *.iml
 *.ipr

diff --git a/CODE_OF_CONDUCT.md → samples-java/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md → samples-java/CODE_OF_CONDUCT.md
diff --git a/CONTRIBUTING.md → samples-java/CONTRIBUTING.md b/CONTRIBUTING.md → samples-java/CONTRIBUTING.md
diff --git a/LICENSE → samples-java/LICENSE b/LICENSE → samples-java/LICENSE
diff --git a/SECURITY.md → samples-java/SECURITY.md b/SECURITY.md → samples-java/SECURITY.md
diff --git a/samples-java/pom.xml b/samples-java/pom.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.7.3</version>
+    </parent>
+    <groupId>org.example</groupId>
+    <artifactId>samples-java</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+    <modules>
+        <module>springboot-jpa</module>
+        <module>springboot-mongodb</module>
+    </modules>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+</project>
diff --git a/springboot-jpa/README.md → samples-java/springboot-jpa/README.md b/springboot-jpa/README.md → samples-java/springboot-jpa/README.md
@@ -120,7 +120,7 @@ mvn clean install -Dmaven.test.skip=true
 `-javaagent:path of agent jar` like this 👇.
 
 
-![Edit_configurations](/src/main/resources/Edit-configurations.png "Edit configurations")
+![Edit_configurations](/Edit-configurations.png "Edit configurations")
 
 
 ## Generate testcases
@@ -165,7 +165,7 @@ or by querying through the browser `http://localhost:8080/api/employees/1`
 Now both these API calls were captured as **editable** testcases and written to `test/e2e/keploy-tests` folder. The
 keploy directory would also have `mocks` folder.
 
-![testcases](/src/main/resources/test-cases.png "Recorded Test cases and mocks")
+![testcases](/test-cases.png "Recorded Test cases and mocks")
 
 Now, let's see the magic! 🪄💫
 
@@ -317,7 +317,7 @@ Hibernate: select employee0_.id as id1_0_0_, employee0_.email as email2_0_0_, em
 2022-08-26 14:13:19.414  INFO 11560 --- [ionShutdownHook] com.zaxxer.hikari.HikariDataSource       : HikariPool-1 - Shutdown completed.
 ```
 
-![testruns](/src/main/resources/test-runs-success.png "Recent testruns")
+![testruns](/test-runs-success.png "Recent testruns")
 
 ## Let's add a Bug in the App
 
@@ -345,7 +345,7 @@ You'll notice the failed test-case in the output.
 
 To deep dive the problem go to [test runs](http://localhost:6789/testruns)
 
-![testruns](/src/main/resources/test-runs-fail.png "Recent testruns")
+![testruns](/test-runs-fail.png "Recent testruns")
 
 
 **In case of any query, refer to video below,**

diff --git a/springboot-jpa/docker-compose.yaml → ...s-java/springboot-jpa/docker-compose.yaml b/springboot-jpa/docker-compose.yaml → ...s-java/springboot-jpa/docker-compose.yaml
diff --git a/springboot-jpa/pom.xml → samples-java/springboot-jpa/pom.xml b/springboot-jpa/pom.xml → samples-java/springboot-jpa/pom.xml
@@ -4,12 +4,10 @@
          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.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.7.3</version>
-        <relativePath/> <!-- lookup parent from repository -->
+        <groupId>org.example</groupId>
+        <artifactId>samples-java</artifactId>
+        <version>1.0-SNAPSHOT</version>
     </parent>
-    <groupId>org.example</groupId>
     <artifactId>springboot-jpa</artifactId>
     <version>1.0-SNAPSHOT</version>
     <name>springboot-jpa</name>
@@ -47,12 +45,10 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
-            <version>${project.parent.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
-            <version>${project.parent.version}</version>
         </dependency>
         <dependency>
             <groupId>org.postgresql</groupId>
@@ -63,13 +59,11 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
-            <version>${project.parent.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-validation</artifactId>
-            <version>${project.parent.version}</version>
         </dependency>
         <dependency>
             <groupId>com.newrelic.agent.java</groupId>
@@ -104,7 +98,6 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>${project.parent.version}</version>
             </plugin>
             <!--            <plugin>-->
             <!--                <groupId>org.apache.maven.plugins</groupId>-->

diff --git a/.../example/demo/SamplesJavaApplication.java → .../example/demo/SamplesJavaApplication.java b/.../example/demo/SamplesJavaApplication.java → .../example/demo/SamplesJavaApplication.java
diff --git a/...e/demo/controller/EmployeeController.java → ...e/demo/controller/EmployeeController.java b/...e/demo/controller/EmployeeController.java → ...e/demo/controller/EmployeeController.java
diff --git a/.../example/demo/exception/ErrorDetails.java → .../example/demo/exception/ErrorDetails.java b/.../example/demo/exception/ErrorDetails.java → .../example/demo/exception/ErrorDetails.java
diff --git a/...emo/exception/GlobalExceptionHandler.java → ...emo/exception/GlobalExceptionHandler.java b/...emo/exception/GlobalExceptionHandler.java → ...emo/exception/GlobalExceptionHandler.java
diff --git a/.../exception/ResourceNotFoundException.java → .../exception/ResourceNotFoundException.java b/.../exception/ResourceNotFoundException.java → .../exception/ResourceNotFoundException.java
diff --git a/...java/com/example/demo/model/Employee.java → ...java/com/example/demo/model/Employee.java b/...java/com/example/demo/model/Employee.java → ...java/com/example/demo/model/Employee.java
diff --git a/...e/demo/repository/EmployeeRepository.java → ...e/demo/repository/EmployeeRepository.java b/...e/demo/repository/EmployeeRepository.java → ...e/demo/repository/EmployeeRepository.java
diff --git a/...rc/main/resources/Edit-configurations.png → ...rc/main/resources/Edit-configurations.png b/...rc/main/resources/Edit-configurations.png → ...rc/main/resources/Edit-configurations.png
diff --git a/.../src/main/resources/Run_Configuration.png → .../src/main/resources/Run_Configuration.png b/.../src/main/resources/Run_Configuration.png → .../src/main/resources/Run_Configuration.png
diff --git a/springboot-jpa/src/main/resources/Video.png → ...ringboot-jpa/src/main/resources/Video.png b/springboot-jpa/src/main/resources/Video.png → ...ringboot-jpa/src/main/resources/Video.png
diff --git a/...src/main/resources/application.properties → ...src/main/resources/application.properties b/...src/main/resources/application.properties → ...src/main/resources/application.properties
diff --git a/springboot-jpa/src/main/resources/data.sql → ...pringboot-jpa/src/main/resources/data.sql b/springboot-jpa/src/main/resources/data.sql → ...pringboot-jpa/src/main/resources/data.sql
diff --git a/...oot-jpa/src/main/resources/test-cases.png → ...oot-jpa/src/main/resources/test-cases.png b/...oot-jpa/src/main/resources/test-cases.png → ...oot-jpa/src/main/resources/test-cases.png
diff --git a/...jpa/src/main/resources/test-runs-fail.png → ...jpa/src/main/resources/test-runs-fail.png b/...jpa/src/main/resources/test-runs-fail.png → ...jpa/src/main/resources/test-runs-fail.png
diff --git a/.../src/main/resources/test-runs-success.png → .../src/main/resources/test-runs-success.png b/.../src/main/resources/test-runs-success.png → .../src/main/resources/test-runs-success.png
diff --git a/...jpa/src/test/e2e/keploy-tests/test-1.yaml → ...jpa/src/test/e2e/keploy-tests/test-1.yaml b/...jpa/src/test/e2e/keploy-tests/test-1.yaml → ...jpa/src/test/e2e/keploy-tests/test-1.yaml
diff --git a/...jpa/src/test/e2e/keploy-tests/test-2.yaml → ...jpa/src/test/e2e/keploy-tests/test-2.yaml b/...jpa/src/test/e2e/keploy-tests/test-2.yaml → ...jpa/src/test/e2e/keploy-tests/test-2.yaml
diff --git a/...ngboot-jpa/src/test/e2e/mocks/mock-1.yaml → ...ngboot-jpa/src/test/e2e/mocks/mock-1.yaml b/...ngboot-jpa/src/test/e2e/mocks/mock-1.yaml → ...ngboot-jpa/src/test/e2e/mocks/mock-1.yaml
diff --git a/...ngboot-jpa/src/test/e2e/mocks/mock-2.yaml → ...ngboot-jpa/src/test/e2e/mocks/mock-2.yaml b/...ngboot-jpa/src/test/e2e/mocks/mock-2.yaml → ...ngboot-jpa/src/test/e2e/mocks/mock-2.yaml
diff --git a/...est/java/SamplesJavaApplication_Test.java → ...est/java/SamplesJavaApplication_Test.java b/...est/java/SamplesJavaApplication_Test.java → ...est/java/SamplesJavaApplication_Test.java
diff --git a/springboot-mongodb/README.md → samples-java/springboot-mongodb/README.md b/springboot-mongodb/README.md → samples-java/springboot-mongodb/README.md
@@ -120,7 +120,7 @@ mvn clean install -Dmaven.test.skip=true
 `-javaagent:path of agent jar` like this 👇.
 
 
-![Edit_configurations](/src/main/resources/Edit-configurations.png "Edit configurations")
+![Edit_configurations](/Edit-configurations.png "Edit configurations")
 
 
 ## Generate testcases

diff --git a/springboot-mongodb/pom.xml → samples-java/springboot-mongodb/pom.xml b/springboot-mongodb/pom.xml → samples-java/springboot-mongodb/pom.xml
@@ -4,12 +4,10 @@
          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.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.7.3</version>
-        <relativePath/> <!-- lookup parent from repository -->
+        <groupId>org.example</groupId>
+        <artifactId>samples-java</artifactId>
+        <version>1.0-SNAPSHOT</version>
     </parent>
-    <groupId>org.example</groupId>
     <artifactId>springboot-mongodb</artifactId>
     <version>1.0-SNAPSHOT</version>
     <name>springboot-mongodb</name>

diff --git a/...ample/user/SamplesMongoDBApplication.java → ...ample/user/SamplesMongoDBApplication.java b/...ample/user/SamplesMongoDBApplication.java → ...ample/user/SamplesMongoDBApplication.java
diff --git a/...ample/user/controller/UserController.java → ...ample/user/controller/UserController.java b/...ample/user/controller/UserController.java → ...ample/user/controller/UserController.java
diff --git a/.../example/user/exception/ErrorDetails.java → .../example/user/exception/ErrorDetails.java b/.../example/user/exception/ErrorDetails.java → .../example/user/exception/ErrorDetails.java
diff --git a/...ser/exception/GlobalExceptionHandler.java → ...ser/exception/GlobalExceptionHandler.java b/...ser/exception/GlobalExceptionHandler.java → ...ser/exception/GlobalExceptionHandler.java
diff --git a/.../exception/ResourceNotFoundException.java → .../exception/ResourceNotFoundException.java b/.../exception/ResourceNotFoundException.java → .../exception/ResourceNotFoundException.java
diff --git a/...ain/java/com/example/user/model/User.java → ...ain/java/com/example/user/model/User.java b/...ain/java/com/example/user/model/User.java → ...ain/java/com/example/user/model/User.java
diff --git a/...ample/user/repository/UserRepository.java → ...ample/user/repository/UserRepository.java b/...ample/user/repository/UserRepository.java → ...ample/user/repository/UserRepository.java
diff --git a/...com/example/user/service/UserService.java → ...com/example/user/service/UserService.java b/...com/example/user/service/UserService.java → ...com/example/user/service/UserService.java
diff --git a/...rc/main/resources/Edit-configurations.png → ...rc/main/resources/Edit-configurations.png b/...rc/main/resources/Edit-configurations.png → ...rc/main/resources/Edit-configurations.png
diff --git a/.../src/main/resources/Run_Configuration.png → .../src/main/resources/Run_Configuration.png b/.../src/main/resources/Run_Configuration.png → .../src/main/resources/Run_Configuration.png
diff --git a/...ngodb/src/main/resources/application.yaml → ...ngodb/src/main/resources/application.yaml b/...ngodb/src/main/resources/application.yaml → ...ngodb/src/main/resources/application.yaml
diff --git a/...gboot-mongodb/src/main/resources/data.sql → ...gboot-mongodb/src/main/resources/data.sql b/...gboot-mongodb/src/main/resources/data.sql → ...gboot-mongodb/src/main/resources/data.sql
diff --git a/...odb/src/test/e2e/keploy-tests/test-1.yaml → ...odb/src/test/e2e/keploy-tests/test-1.yaml b/...odb/src/test/e2e/keploy-tests/test-1.yaml → ...odb/src/test/e2e/keploy-tests/test-1.yaml
diff --git a/...ot-mongodb/src/test/e2e/mocks/mock-1.yaml → ...ot-mongodb/src/test/e2e/mocks/mock-1.yaml b/...ot-mongodb/src/test/e2e/mocks/mock-1.yaml → ...ot-mongodb/src/test/e2e/mocks/mock-1.yaml
diff --git a/.../java/SamplesMongoDBApplication_Test.java → .../java/SamplesMongoDBApplication_Test.java b/.../java/SamplesMongoDBApplication_Test.java → .../java/SamplesMongoDBApplication_Test.java