Feature: base refactoring (#25)

* feature: provided fixes * fix: fixed build related issues * fix: fixed bugs * fix: fixed bugs * fix: fixed bugs * fix: fixed bugs * fix: fixed bugs * fix: fixed bugs
YarikRevich · Oct 6, 2024 · 26cf462 · 26cf462
1 parent 2b672c1
commit 26cf462
Show file tree

Hide file tree

Showing 15 changed files with 89 additions and 59 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -9,12 +9,11 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Set up JDK 21
-        uses: actions/setup-java@v3
+      - name: Set up JDK 23
+        uses: oracle-actions/setup-java@v1
         with:
-          java-version: '21'
-          cache: maven
-          distribution: 'temurin'
+          website: oracle.com
+          java-version: '23'
 
       - name: "Install prerequisites"
         run: |

diff --git a/Makefile b/Makefile
@@ -28,13 +28,13 @@ lint: ## Run Apache Spotless linter
 	@mvn spotless:apply
 
 .PHONY: create-local-client
-create-local-client: ## Create ResourceTracker local directory for client
+create-local-client: ## Create RepoAchiever local directory for client
 .PHONY: create-local-client
-create-local-client: ## Create ResourceTracker local directory for client
+create-local-client: ## Create RepoAchiever local directory for client
 	@mkdir -p $(HOME)/.repoachiever/config/swap
 
 .PHONY: create-local-api-server
-create-local-api-server: ## Create ResourceTracker local directory for API Server
+create-local-api-server: ## Create RepoAchiever local directory for API Server
 	@mkdir -p $(HOME)/.repoachiever/config
 	@mkdir -p $(HOME)/.repoachiever/diagnostics/prometheus/internal
 	@mkdir -p $(HOME)/.repoachiever/diagnostics/prometheus/config
@@ -57,13 +57,6 @@ clone-api-server-config: ## Clone RepoAchiever API Server configuration files to
 	@cp -r ./config/prometheus/prometheus.tmpl $(HOME)/.repoachiever/diagnostics/prometheus/config
 	@cp -r ./samples/config/api-server/api-server.yaml $(HOME)/.repoachiever/config
 
-.PHONY: clone-worker
-clone-worker: ## Clone Worker JAR into a RepoAchiever local directory
-ifeq (,$(wildcard $(HOME)/.repoachiever/bin/worker))
-	@mkdir -p $(HOME)/.repoachiever/bin
-endif
-	@cp -r ./bin/worker $(HOME)/.repoachiever/bin/
-
 .PHONY: clone-cluster
 clone-cluster: ## Clone Cluster JAR into a RepoAchiever local directory
 ifeq (,$(wildcard $(HOME)/.repoachiever/bin/cluster))
@@ -78,27 +71,15 @@ ifeq (,$(wildcard $(HOME)/.repoachiever/bin/api-server))
 endif
 	@cp -r ./bin/api-server $(HOME)/.repoachiever/bin/
 
-.PHONY: build-worker
-build-worker: clean ## Build Worker application
-ifneq (,$(wildcard ./bin/worker))
-	@rm -r ./bin/worker
-endif
-ifeq ($(dev), 'false')
-	@mvn -pl worker -T10 install
-else
-	@mvn -P dev -pl worker -T10 install
-endif
-	$(MAKE) clone-worker
-
 .PHONY: build-cluster
 build-cluster: clean ## Build Cluster application
 ifneq (,$(wildcard ./bin/cluster))
 	@rm -r ./bin/cluster
 endif
 ifeq ($(dev), 'false')
-	@mvn -pl cluster -T10 install
+	@mvn -pl cluster -T10 install -U
 else
-	@mvn -P dev -pl cluster -T10 install
+	@mvn -P dev -pl cluster -T10 install -U
 endif
 	$(MAKE) clone-cluster
 
@@ -108,9 +89,9 @@ ifneq (,$(wildcard ./bin/api-server))
 	@rm -r ./bin/api-server
 endif
 ifeq ($(dev), 'false')
-	@mvn -pl api-server -T10 install
+	@mvn -pl api-server -T10 install -U
 else
-	@mvn -P dev -pl api-server -T10 install
+	@mvn -P dev -pl api-server -T10 install -U
 endif
 	$(MAKE) clone-api-server
 
@@ -120,9 +101,9 @@ ifneq (,$(wildcard ./bin/cli))
 	@rm -r ./bin/cli
 endif
 ifeq ($(dev), 'false')
-	@mvn -pl cli -T10 install
+	@mvn -pl cli -T10 install -U
 else
-	@mvn -P dev -pl cli -T10 install
+	@mvn -P dev -pl cli -T10 install -U
 endif
 
 .PHONY: build-gui
@@ -131,7 +112,7 @@ ifneq (,$(wildcard ./bin/gui))
 	@rm -r ./bin/gui
 endif
 ifeq ($(dev), 'false')
-	@mvn -pl gui -T10 install
+	@mvn -pl gui -T10 install -U
 else
-	@mvn -P dev -pl gui -T10 install
+	@mvn -P dev -pl gui -T10 install -U
 endif
diff --git a/README.md b/README.md
@@ -1,8 +1,9 @@
 # RepoAchiever
 
-[![Build](https://github.com/YarikRevich/RepoAchiever/actions/workflows/build.yml/badge.svg)](https://github.com/YarikRevich/ResourceTracker/actions/workflows/build.yml)
+[![Build](https://github.com/YarikRevich/RepoAchiever/actions/workflows/build.yml/badge.svg)](https://github.com/YarikRevich/RepoAchiever/actions/workflows/build.yml)
 ![Linux](https://img.shields.io/badge/Linux-FCC624?style=for-the-badge&logo=linux&logoColor=black)
 ![MacOS](https://img.shields.io/badge/MacOS-8773f5?style=for-the-badge&logo=macos&logoColor=black)
+![OpenJDK](https://img.shields.io/badge/JDK-23-65bd60?style=for-the-badge)
 [![StandWithUkraine](https://raw.githubusercontent.com/vshymanskyy/StandWithUkraine/main/badges/StandWithUkraine.svg)](https://github.com/vshymanskyy/StandWithUkraine/blob/main/docs/README.md)
 
 ## General Information

diff --git a/api-server/src/main/java/com/repoachiever/logging/FatalAppender.java b/api-server/src/main/java/com/repoachiever/logging/FatalAppender.java
@@ -15,7 +15,7 @@
 /**
  * Service used for logging fatal level application state changes.
  */
-@Plugin(name = "FatalAppender", category = Core.CATEGORY_NAME, elementType = Appender.ELEMENT_TYPE)
+@Plugin(name = "fatalappender", category = Core.CATEGORY_NAME, elementType = Appender.ELEMENT_TYPE)
 public class FatalAppender extends AbstractAppender {
   protected FatalAppender(String name, Filter filter) {
     super(name, filter, null, false, null);

diff --git a/api-server/src/main/java/com/repoachiever/repository/facade/RepositoryFacade.java b/api-server/src/main/java/com/repoachiever/repository/facade/RepositoryFacade.java
@@ -307,7 +307,7 @@ public void destroy(ContentWithdrawal contentWithdrawal) throws RepositoryConten
                     contentWithdrawal.getCredentials().getInternal().getId(),
                     credentials);
         } catch (RepositoryOperationFailureException e) {
-            throw new RepositoryContentDestructionFailureException(e.getMessage());
+            return;
         }
 
         try {

diff --git a/api-server/src/main/java/com/repoachiever/service/cluster/facade/ClusterFacade.java b/api-server/src/main/java/com/repoachiever/service/cluster/facade/ClusterFacade.java
@@ -100,7 +100,6 @@ public ContentRetrievalResult retrieveContent(ContentRetrievalApplication conten
                 throw new ClusterContentRetrievalFailureException(e.getMessage());
             }
 
-
             List<String> additionalContentUnits;
 
             try {
@@ -368,6 +367,8 @@ public void destroy(ContentWithdrawal contentWithdrawal) throws ClusterWithdrawa
             logger.info(
                     String.format("Removing RepoAchiever Cluster allocation: '%s'", clusterAllocation.getName()));
 
+            System.out.println(clusterAllocation.getPid());
+
             try {
                 clusterService.destroy(clusterAllocation.getPid());
             } catch (ClusterDestructionFailureException e) {

diff --git a/...n/java/com/repoachiever/service/command/cluster/destroy/ClusterDestroyCommandService.java b/...n/java/com/repoachiever/service/command/cluster/destroy/ClusterDestroyCommandService.java
@@ -15,7 +15,7 @@ public ClusterDestroyCommandService(Integer pid) {
 
         this.command = switch (osType) {
             case WINDOWS -> null;
-            case UNIX, MAC, ANY -> String.format("kill -15 %d", pid);
+            case UNIX, MAC, ANY -> String.format("kill -9 %d", pid);
         };
     }
 

diff --git a/cli/pom.xml b/cli/pom.xml
@@ -3,7 +3,7 @@
   <artifactId>cli</artifactId>
   <version>1.0-SNAPSHOT</version>
   <name>cli</name>
-  <description>CLI for ResourceTracker</description>
+  <description>CLI for RepoAchiever</description>
 
   <parent>
     <groupId>com.repoachiever</groupId>

diff --git a/cluster/pom.xml b/cluster/pom.xml
@@ -174,14 +174,14 @@
           <groupId>com.google.cloud.tools</groupId>
           <artifactId>jib-maven-plugin</artifactId>
         </plugin>
-        <plugin>
+        <!-- <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
           <configuration>
-            <source>19</source>
-            <target>19</target>
+            <source>22</source>
+            <target>22</target>
           </configuration>
-        </plugin>
+        </plugin> -->
         <plugin>
           <groupId>com.coderplus.maven.plugins</groupId>
           <artifactId>copy-rename-maven-plugin</artifactId>

diff --git a/config/grafana/datasources/datasource.tmpl b/config/grafana/datasources/datasource.tmpl
@@ -17,3 +17,5 @@ datasources:
       tlsAuthWithCACert: false
     version: 1
     editable: false
+
+
diff --git a/config/prometheus/prometheus.tmpl b/config/prometheus/prometheus.tmpl
@@ -16,3 +16,5 @@ scrape_configs:
 
     static_configs:
       - targets: ['${(nodeexporter.host)}:${(nodeexporter.port)}']
+
+
diff --git a/gui/pom.xml b/gui/pom.xml
@@ -4,7 +4,7 @@
     <artifactId>gui</artifactId>
     <version>1.0-SNAPSHOT</version>
     <name>gui</name>
-    <description>GUI for ResourceTracker</description>
+    <description>GUI for RepoAchiever</description>
 
     <parent>
         <groupId>com.repoachiever</groupId>

diff --git a/pom.xml b/pom.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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>
   <groupId>com.repoachiever</groupId>
@@ -23,10 +25,6 @@
   </modules>
 
   <properties>
-    <java.release>21</java.release>
-    <java.version>21</java.version>
-    <maven.compiler.source>21</maven.compiler.source>
-    <maven.compiler.target>21</maven.compiler.target>
     <main.basedir>${project.basedir}</main.basedir>
     <default.package>com.repoachiever</default.package>
   </properties>
@@ -225,6 +223,11 @@
       </dependency>
 
       <!-- THIRD PARTY -->
+      <dependency>
+        <groupId>net.bytebuddy</groupId>
+        <artifactId>byte-buddy</artifactId>
+        <version>1.15.3</version>
+      </dependency>
       <dependency>
         <groupId>io.pebbletemplates</groupId>
         <artifactId>pebble</artifactId>
@@ -279,7 +282,7 @@
       <dependency>
         <groupId>org.projectlombok</groupId>
         <artifactId>lombok</artifactId>
-        <version>1.18.30</version>
+        <version>1.18.34</version>
         <scope>provided</scope>
       </dependency>
       <dependency>
@@ -452,7 +455,7 @@
               <includes>
                 <include>src/main/java/**/*.java</include>
               </includes>
-              <endWithNewline/>
+              <endWithNewline />
               <indent>
                 <tabs>true</tabs>
                 <spacesPerTab>2</spacesPerTab>
@@ -533,9 +536,14 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
           <configuration>
-            <source>21</source>
-            <target>21</target>
-            <compilerArgs>--enable-preview</compilerArgs>
+            <release>22</release>
+            <annotationProcessorPaths>
+              <path>
+                <groupId>org.projectlombok</groupId>
+                <artifactId>lombok</artifactId>
+                <version>1.18.34</version>
+              </path>
+            </annotationProcessorPaths>
           </configuration>
         </plugin>
 
@@ -622,4 +630,4 @@
       </plugins>
     </pluginManagement>
   </build>
-</project>
+</project>
diff --git a/samples/config/api-server/api-server.yaml b/samples/config/api-server/api-server.yaml
@@ -48,7 +48,7 @@ resource:
     # Represents the highest amount of downloaded content versions per each.
     max-versions: 5
 
-  # Represents a set of options used for RepoAchiever Worker configuration.
+  # Represents a set of options used for RepoAchiever Cluster worker configuration.
   worker:
     # Represents frequency of requests to selected VCS provider resources.
     frequency: "0/30 * * * * ?"
diff --git a/samples/config/client/user.yaml b/samples/config/client/user.yaml
@@ -6,6 +6,42 @@ content:
 
       # Enables additional content download of repositories of VCS provider repositories.
       additional: true
+    - name: "[YarikRevich]scripts:master" # Represents location definition name.
+
+      # Enables additional content download of repositories of VCS provider repositories.
+      additional: true
+    - name: "[YarikRevich]odb:master" # Represents location definition name.
+
+      # Enables additional content download of repositories of VCS provider repositories.
+      additional: true
+    - name: "[YarikRevich]tetris:main" # Represents location definition name.
+
+      # Enables additional content download of repositories of VCS provider repositories.
+      additional: true
+    - name: "[YarikRevich]tmpm:master" # Represents location definition name.
+
+      # Enables additional content download of repositories of VCS provider repositories.
+      additional: true
+    - name: "[YarikRevich]portfolio:master" # Represents location definition name.
+
+      # Enables additional content download of repositories of VCS provider repositories.
+      additional: true
+    - name: "[YarikRevich]ai-commit-generator:master" # Represents location definition name.
+
+      # Enables additional content download of repositories of VCS provider repositories.
+      additional: true
+    - name: "[YarikRevich]website:main" # Represents location definition name.
+
+      # Enables additional content download of repositories of VCS provider repositories.
+      additional: true
+    - name: "[YarikRevich]vim-config:master" # Represents location definition name.
+
+      # Enables additional content download of repositories of VCS provider repositories.
+      additional: true
+    - name: "[YarikRevich]critical_db_framework:master" # Represents location definition name.
+
+      # Enables additional content download of repositories of VCS provider repositories.
+      additional: true
 
 # Represents section used for VCS provider configuration.
 service:
@@ -27,7 +63,7 @@ service:
     id: "1"
 
     # Represents authentication token intended to be used for VCS provider API access permission.
-    token: "ghp_UMz4cQAD87xXAtEbsPazlRcLw7kVPu1zF8bq"
+    token: ""
 
 # Represents section used for RepoAchiever API Server configuration.
 api-server:
Original file line number	Diff line number	Diff line change
Expand Up		@@ -17,3 +17,5 @@ datasources:
		tlsAuthWithCACert: false
		version: 1
		editable: false
Original file line number	Diff line number	Diff line change
Expand Up		@@ -16,3 +16,5 @@ scrape_configs:

		static_configs:
		- targets: ['${(nodeexporter.host)}:${(nodeexporter.port)}']