skip unnecessary build steps in frontend pom.xml

querwurzel · Nov 24, 2023 · cfd7115 · cfd7115
1 parent 79d9f69
commit cfd7115
Show file tree

Hide file tree

Showing 16 changed files with 62 additions and 52 deletions.
diff --git a/backend/src/main/java/com/github/binpastes/paste/api/PasteController.java b/backend/src/main/java/com/github/binpastes/paste/api/PasteController.java
@@ -6,7 +6,7 @@
 import com.github.binpastes.paste.api.model.SearchView.SearchItemView;
 import com.github.binpastes.paste.api.model.SingleView;
 import com.github.binpastes.paste.domain.Paste;
-import com.github.binpastes.paste.domain.PasteService;
+import com.github.binpastes.paste.application.PasteService;
 import jakarta.validation.ConstraintViolationException;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotBlank;

diff --git a/.../binpastes/paste/domain/PasteService.java → ...astes/paste/application/PasteService.java b/.../binpastes/paste/domain/PasteService.java → ...astes/paste/application/PasteService.java
@@ -1,6 +1,8 @@
-package com.github.binpastes.paste.domain;
+package com.github.binpastes.paste.application;
 
-import com.github.binpastes.paste.business.tracking.TrackingService;
+import com.github.binpastes.paste.application.tracking.TrackingService;
+import com.github.binpastes.paste.domain.Paste;
+import com.github.binpastes.paste.domain.PasteRepository;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

diff --git a/...te/business/tracking/MessagingClient.java → ...application/tracking/MessagingClient.java b/...te/business/tracking/MessagingClient.java → ...application/tracking/MessagingClient.java
@@ -1,4 +1,4 @@
-package com.github.binpastes.paste.business.tracking;
+package com.github.binpastes.paste.application.tracking;
 
 import org.apache.activemq.artemis.api.core.ActiveMQException;
 import org.apache.activemq.artemis.api.core.ActiveMQObjectClosedException;

diff --git a/...te/business/tracking/MessagingConfig.java → ...application/tracking/MessagingConfig.java b/...te/business/tracking/MessagingConfig.java → ...application/tracking/MessagingConfig.java
@@ -1,4 +1,4 @@
-package com.github.binpastes.paste.business.tracking;
+package com.github.binpastes.paste.application.tracking;
 
 import org.apache.activemq.artemis.api.core.QueueConfiguration;
 import org.apache.activemq.artemis.api.core.RoutingType;

diff --git a/...te/business/tracking/TrackingService.java → ...application/tracking/TrackingService.java b/...te/business/tracking/TrackingService.java → ...application/tracking/TrackingService.java
@@ -1,4 +1,4 @@
-package com.github.binpastes.paste.business.tracking;
+package com.github.binpastes.paste.application.tracking;
 
 import com.github.binpastes.paste.domain.PasteRepository;
 import jakarta.annotation.PostConstruct;

diff --git a/backend/src/main/resources/application-dev.properties b/backend/src/main/resources/application-dev.properties
@@ -2,7 +2,7 @@
 #logging.level.io.r2dbc=TRACE
 #logging.level.org.apache.activemq.artemis.core.server=INFO
 #logging.level.org.flywaydb.core.internal.license.VersionPrinter=INFO
-logging.level.com.github.binpastes.paste.business.tracking=DEBUG
+logging.level.com.github.binpastes.paste.application.tracking=DEBUG
 
 spring.flyway.enabled=true
 spring.flyway.driver-class-name=org.h2.Driver

diff --git a/backend/src/test/java/com/github/binpastes/paste/api/PasteControllerTest.java b/backend/src/test/java/com/github/binpastes/paste/api/PasteControllerTest.java
@@ -1,6 +1,6 @@
 package com.github.binpastes.paste.api;
 
-import com.github.binpastes.paste.domain.PasteService;
+import com.github.binpastes.paste.application.PasteService;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;

diff --git a/backend/src/test/java/com/github/binpastes/paste/api/TrackingIT.java b/backend/src/test/java/com/github/binpastes/paste/api/TrackingIT.java
@@ -1,7 +1,7 @@
 package com.github.binpastes.paste.api;
 
-import com.github.binpastes.paste.business.tracking.MessagingClient;
-import com.github.binpastes.paste.business.tracking.TrackingService;
+import com.github.binpastes.paste.application.tracking.MessagingClient;
+import com.github.binpastes.paste.application.tracking.TrackingService;
 import com.github.binpastes.paste.domain.Paste;
 import com.github.binpastes.paste.domain.Paste.PasteExposure;
 import com.github.binpastes.paste.domain.PasteRepository;

diff --git a/backend/src/test/java/com/github/binpastes/paste/domain/PasteTest.java b/backend/src/test/java/com/github/binpastes/paste/domain/PasteTest.java
@@ -58,13 +58,13 @@ void trackPasteViewCount() {
     @DisplayName("track paste - updates lastViewed timestamp to most recent one")
     void trackPasteLastViewed() {
         var newPaste = Paste.newInstance(null, "someContent", null, false, PasteExposure.PUBLIC, null);
-        var now = LocalDateTime.now();
-        var yesterday = now.minusDays(1);
+        var today = LocalDateTime.now();
+        var yesterday = today.minusDays(1);
 
-        newPaste.trackView(now);
+        newPaste.trackView(today);
         newPaste.trackView(yesterday);
 
-        assertThat(newPaste.getLastViewed()).isEqualTo(now);
+        assertThat(newPaste.getLastViewed()).isEqualTo(today);
         assertThat(newPaste.getViews()).isEqualTo(2);
     }
 

diff --git a/frontend/pom.xml b/frontend/pom.xml
@@ -49,21 +49,28 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
+                <artifactId>maven-resources-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>default-test</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>resources</goal>
+                        </goals>
+                        <configuration>
+                            <resources>
+                                <resource>
+                                    <directory>dist</directory>
+                                </resource>
+                            </resources>
+                            <outputDirectory>${project.build.outputDirectory}/static</outputDirectory>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>default-resources</id>
                         <phase>none</phase>
                     </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-failsafe-plugin</artifactId>
-                <executions>
                     <execution>
-                        <id>default-test</id>
+                        <id>default-testResources</id>
                         <phase>none</phase>
                     </execution>
                 </executions>
@@ -83,21 +90,22 @@
                 </executions>
             </plugin>
             <plugin>
-                <artifactId>maven-resources-plugin</artifactId>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
                 <executions>
                     <execution>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>resources</goal>
-                        </goals>
-                        <configuration>
-                            <resources>
-                                <resource>
-                                    <directory>dist</directory>
-                                </resource>
-                            </resources>
-                            <outputDirectory>${project.build.outputDirectory}/static</outputDirectory>
-                        </configuration>
+                        <id>default-test</id>
+                        <phase>none</phase>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>default</id>
+                        <phase>none</phase>
                     </execution>
                 </executions>
             </plugin>

diff --git a/frontend/src/components/CreatePaste/CreatePaste.tsx b/frontend/src/components/CreatePaste/CreatePaste.tsx
@@ -35,6 +35,9 @@ const CreatePaste: Component<CreatePasteProps> = ({onCreatePaste, initialPaste})
 
   const [lastPasteUrl, setLastPasteUrl] = createSignal<string>();
 
+  let creationForm: HTMLFormElement
+  let submitInput: HTMLInputElement
+
   onMount(() => {
     window.addEventListener("keydown", globalSubmitPaste);
   })
@@ -43,9 +46,6 @@ const CreatePaste: Component<CreatePasteProps> = ({onCreatePaste, initialPaste})
     window.removeEventListener("keydown", globalSubmitPaste);
   })
 
-  let creationForm: HTMLFormElement
-  let submitInput: HTMLInputElement
-
   function globalSubmitPaste(e: KeyboardEvent) {
     if (e.altKey || e.shiftKey) {
       return;

diff --git a/frontend/src/components/ReadPaste/ReadPaste.tsx b/frontend/src/components/ReadPaste/ReadPaste.tsx
@@ -16,11 +16,11 @@ const ReadPaste: Component<ReadPasteProps> = ({paste, onClonePaste, onDeletePast
 
   const [clearText, setClearText] = createSignal<string>();
 
-  createEffect(on(clearText, () => linkifyContent()));
-
   let keyInput: HTMLInputElement;
   let contentElement: HTMLPreElement;
 
+  createEffect(on(clearText, () => linkifyContent()));
+
   onMount(() => {
     window.addEventListener("keydown", globalSelectContent);
   })

diff --git a/frontend/src/components/RecentPastes/RecentPastes.tsx b/frontend/src/components/RecentPastes/RecentPastes.tsx
@@ -11,10 +11,14 @@ const RecentPastes: () => JSX.Element = () => {
 
   const [pastes, { mutate, refetch }] = createResource(ApiClient.findAll);
 
+  let refetchSchedule;
+
   onMount(() => {
     startSchedule();
 
     AppContext.onPasteCreated((paste) => {
+      restartSchedule();
+
       const newItem: PasteListView = {
         id: paste.id,
         title: paste.title,
@@ -23,9 +27,7 @@ const RecentPastes: () => JSX.Element = () => {
         isEncrypted: paste.isEncrypted,
         sizeInBytes: paste.sizeInBytes
       };
-
-      restartSchedule();
-      mutate(prev => [newItem].concat(prev))
+      mutate(prev => prev.concat([newItem]));
     });
 
     AppContext.onPasteDeleted((paste) => {
@@ -36,8 +38,6 @@ const RecentPastes: () => JSX.Element = () => {
 
   onCleanup(() => stopSchedule());
 
-  let refetchSchedule;
-
   function manualRefetch() {
     restartSchedule();
     refetch();

diff --git a/frontend/src/pages/Create.tsx b/frontend/src/pages/Create.tsx
@@ -9,7 +9,7 @@ const Create: () => JSX.Element = () => {
 
   const navigate = useNavigate();
 
-  const onCreatePaste = (cmd: PasteCreateCmd): Promise<string> => {
+  function onCreatePaste(cmd: PasteCreateCmd): Promise<string> {
     return ApiClient.createPaste(cmd)
       .then(paste => {
         const path = '/paste/' + paste.id;

diff --git a/frontend/src/pages/Read.tsx b/frontend/src/pages/Read.tsx
@@ -14,15 +14,15 @@ const Read: Component = (): JSX.Element => {
 
   const [paste] = createResource(() => params.id, (id) => AppContext.popPasteCreated() || ApiClient.findOne(id));
 
-  const clonePaste = () => {
+  function clonePaste() {
     AppContext.pushPasteCloned({
       title: paste().title,
       content: paste().content
     })
     navigate('/')
   }
 
-  const deletePaste = () => {
+  function deletePaste() {
     ApiClient.deletePaste(paste().id)
       .then(_ => {
         AppContext.pushPasteDeleted(paste());

diff --git a/pom.xml b/pom.xml
@@ -157,8 +157,8 @@
   </distributionManagement>
 
   <scm>
-    <connection>scm:git:https://github.com/querwurzel/binpastes.git</connection>
-    <developerConnection>scm:git:https://github.com/querwurzel/binpastes.git</developerConnection>
+    <connection>scm:git:https://github.com/querwurzel/BinPastes.git</connection>
+    <developerConnection>scm:git:https://github.com/querwurzel/BinPastes.git</developerConnection>
     <tag>HEAD</tag>
   </scm>