cleanups

gtiwari333 · Sep 9, 2022 · 3e2894c · 3e2894c
2 parents cf102ee + 20f22d6
commit 3e2894c
Show file tree

Hide file tree

Showing 22 changed files with 274 additions and 52 deletions.
diff --git a/...-webapp/src/main/resources/checkstyle.xml → checkstyle.xml b/...-webapp/src/main/resources/checkstyle.xml → checkstyle.xml
@@ -172,8 +172,8 @@
         <!-- Checks for class design                         -->
         <!-- See https://checkstyle.org/config_design.html -->
         <!--        <module name="DesignForExtension"/>-->
-        <module name="FinalClass"/>
-        <module name="HideUtilityClassConstructor"/>
+<!--        <module name="FinalClass"/>-->
+<!--        <module name="HideUtilityClassConstructor"/>-->
         <module name="InterfaceIsType"/>
         <!--        <module name="VisibilityModifier"/>-->
 

diff --git a/common/pom.xml b/common/pom.xml
@@ -65,4 +65,22 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.github.spotbugs</groupId>
+                <artifactId>spotbugs-maven-plugin</artifactId>
+                <configuration>
+                    <excludeFilterFile>../spot-bugs.filter-exclude.xml</excludeFilterFile>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <configuration>
+                    <configLocation>../checkstyle.xml</configLocation>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/content-checker/content-checker-service-model/pom.xml b/content-checker/content-checker-service-model/pom.xml
@@ -27,4 +27,15 @@
 
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.github.spotbugs</groupId>
+                <artifactId>spotbugs-maven-plugin</artifactId>
+                <configuration>
+                    <excludeFilterFile>../../spot-bugs.filter-exclude.xml</excludeFilterFile>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/content-checker/content-checker-service/pom.xml b/content-checker/content-checker-service/pom.xml
@@ -57,6 +57,20 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>com.github.spotbugs</groupId>
+                <artifactId>spotbugs-maven-plugin</artifactId>
+                <configuration>
+                    <excludeFilterFile>../../spot-bugs.filter-exclude.xml</excludeFilterFile>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <configuration>
+                    <configLocation>../../checkstyle.xml</configLocation>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

diff --git a/email/email-service/pom.xml b/email/email-service/pom.xml
@@ -104,6 +104,20 @@
                     <testFramework>JUNIT5</testFramework>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>com.github.spotbugs</groupId>
+                <artifactId>spotbugs-maven-plugin</artifactId>
+                <configuration>
+                    <excludeFilterFile>../../spot-bugs.filter-exclude.xml</excludeFilterFile>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <configuration>
+                    <configLocation>../../checkstyle.xml</configLocation>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

diff --git a/email/pom.xml b/email/pom.xml
@@ -19,5 +19,4 @@
         <module>email-service-api</module>
     </modules>
 
-
 </project>
diff --git a/main-app/main-orm/pom.xml b/main-app/main-orm/pom.xml
@@ -146,6 +146,25 @@
                     </dependency>
                 </dependencies>
             </plugin>
+            <plugin>
+                <groupId>com.github.spotbugs</groupId>
+                <artifactId>spotbugs-maven-plugin</artifactId>
+                <configuration>
+                    <excludeFilterFile>../../spot-bugs.filter-exclude.xml</excludeFilterFile>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <configuration>
+                    <configLocation>../../checkstyle.xml</configLocation>
+                    <sourceDirectories>
+                        <sourceDirectory>
+                            ${project.build.sourceDirectory}
+                        </sourceDirectory>
+                    </sourceDirectories>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

diff --git a/main-app/main-orm/src/main/java/gt/app/domain/Comment.java b/main-app/main-orm/src/main/java/gt/app/domain/Comment.java
@@ -42,8 +42,12 @@ public void addChildComment(Comment childComment) {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
         Comment comment = (Comment) o;
         return Objects.equals(id, comment.id) &&
             Objects.equals(articleId, comment.articleId);

diff --git a/main-app/main-webapp/pom.xml b/main-app/main-webapp/pom.xml
@@ -249,18 +249,18 @@
         </dependency>
 
         <!--spring cloud contract stubs -->
-<!--        <dependency>-->
-<!--            <groupId>gt.app</groupId>-->
-<!--            <artifactId>email-service</artifactId>-->
-<!--            <classifier>stub</classifier>-->
-<!--            <version>${project.parent.version}</version>-->
-<!--            <exclusions>-->
-<!--                <exclusion>-->
-<!--                    <groupId>*</groupId>-->
-<!--                    <artifactId>*</artifactId>-->
-<!--                </exclusion>-->
-<!--            </exclusions>-->
-<!--        </dependency>-->
+        <!--        <dependency>-->
+        <!--            <groupId>gt.app</groupId>-->
+        <!--            <artifactId>email-service</artifactId>-->
+        <!--            <classifier>stub</classifier>-->
+        <!--            <version>${project.parent.version}</version>-->
+        <!--            <exclusions>-->
+        <!--                <exclusion>-->
+        <!--                    <groupId>*</groupId>-->
+        <!--                    <artifactId>*</artifactId>-->
+        <!--                </exclusion>-->
+        <!--            </exclusions>-->
+        <!--        </dependency>-->
         <!-- test only dependencies -->
     </dependencies>
 
@@ -339,20 +339,19 @@
                 </executions>
             </plugin>
 
+            <plugin>
+                <groupId>com.github.spotbugs</groupId>
+                <artifactId>spotbugs-maven-plugin</artifactId>
+                <configuration>
+                    <excludeFilterFile>../../spot-bugs.filter-exclude.xml</excludeFilterFile>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>${maven.checkstyle.plugin.version}</version>
                 <configuration>
-                    <configLocation>src/main/resources/checkstyle.xml</configLocation>
+                    <configLocation>../../checkstyle.xml</configLocation>
                 </configuration>
-                <dependencies>
-                    <dependency>
-                        <groupId>com.puppycrawl.tools</groupId>
-                        <artifactId>checkstyle</artifactId>
-                        <version>${puppycrawl.checkstyle.version}</version>
-                    </dependency>
-                </dependencies>
             </plugin>
 
             <plugin>

diff --git a/main-app/main-webapp/src/main/java/gt/app/config/logging/HibernateStatInterceptor.java b/main-app/main-webapp/src/main/java/gt/app/config/logging/HibernateStatInterceptor.java
@@ -3,9 +3,13 @@
 import lombok.extern.slf4j.Slf4j;
 import org.hibernate.EmptyInterceptor;
 
+import java.io.Serial;
+
 @Slf4j
 public class HibernateStatInterceptor extends EmptyInterceptor {
 
+    @Serial
+    private static final long serialVersionUID = -7875557911815131906L;
     private final transient ThreadLocal<Long> queryCount = new ThreadLocal<>();
 
     public void startCounter() {

diff --git a/main-app/main-webapp/src/main/java/gt/app/config/security/AppKeycloakAuthProvider.java b/main-app/main-webapp/src/main/java/gt/app/config/security/AppKeycloakAuthProvider.java
@@ -19,7 +19,7 @@ class AppKeycloakAuthProvider extends KeycloakAuthenticationProvider {
     final UserService userService;
     private GrantedAuthoritiesMapper grantedAuthoritiesMapper;
 
-    public AppKeycloakAuthProvider(UserService userService) {
+    AppKeycloakAuthProvider(UserService userService) {
         this.userService = userService;
     }
 

diff --git a/main-app/main-webapp/src/main/java/gt/app/config/security/MethodSecurityConfig.java b/main-app/main-webapp/src/main/java/gt/app/config/security/MethodSecurityConfig.java
@@ -16,7 +16,7 @@ class MethodSecurityConfig extends GlobalMethodSecurityConfiguration {
     private final AppPermissionEvaluatorService permissionEvaluator;
     private final ApplicationContext applicationContext;
 
-    public MethodSecurityConfig(@Qualifier("permEvaluator") AppPermissionEvaluatorService permissionEvaluator, ApplicationContext applicationContext) {
+    MethodSecurityConfig(@Qualifier("permEvaluator") AppPermissionEvaluatorService permissionEvaluator, ApplicationContext applicationContext) {
         this.permissionEvaluator = permissionEvaluator;
         this.applicationContext = applicationContext;
     }

diff --git a/main-app/main-webapp/src/main/java/gt/app/config/security/SecurityConfig.java b/main-app/main-webapp/src/main/java/gt/app/config/security/SecurityConfig.java
@@ -91,7 +91,7 @@ protected void configure(HttpSecurity http) throws Exception {
 
         static class LogoutHandler extends KeycloakLogoutHandler {
 
-            public LogoutHandler(AdapterDeploymentContext adapterDeploymentContext) {
+            LogoutHandler(AdapterDeploymentContext adapterDeploymentContext) {
                 super(adapterDeploymentContext);
             }
 

diff --git a/main-app/main-webapp/src/main/java/gt/app/modules/article/CommentRepositoryCustomImpl.java b/main-app/main-webapp/src/main/java/gt/app/modules/article/CommentRepositoryCustomImpl.java
@@ -18,7 +18,7 @@ class CommentRepositoryCustomImpl extends AbstractRepositoryImpl<Comment, Commen
 
     private final DSLContext jooq;
 
-    public CommentRepositoryCustomImpl(DSLContext jooq) {
+    CommentRepositoryCustomImpl(DSLContext jooq) {
         super(Comment.class);
         this.jooq = jooq;
     }

diff --git a/main-app/main-webapp/src/main/java/gt/app/modules/user/UserService.java b/main-app/main-webapp/src/main/java/gt/app/modules/user/UserService.java
@@ -32,7 +32,7 @@ public void updateUserIfNeeded(User user) {
     }
 
     public User getReference(UUID id) {
-        return userRepository.getById(id);
+        return userRepository.getReferenceById(id);
     }
 
     public Optional<User> find(UUID id) {

diff --git a/main-app/main-webapp/src/main/resources/messages_np.properties b/main-app/main-webapp/src/main/resources/messages_np.properties
@@ -1,2 +1,4 @@
-blogapp.title=ब्लग एप
-blogapp.user-articles={0}को लेखहरु
+blogapp.title=???? ??
+blogapp.user-articles={0}?? ??????
+blogapp.home-link-text=HOME
+blogapp.new-article-link=New Article
diff --git a/main-app/main-webapp/src/main/resources/wro.properties b/main-app/main-webapp/src/main/resources/wro.properties
@@ -0,0 +1 @@
+
diff --git a/main-app/report-service/pom.xml b/main-app/report-service/pom.xml
@@ -48,6 +48,20 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>com.github.spotbugs</groupId>
+                <artifactId>spotbugs-maven-plugin</artifactId>
+                <configuration>
+                    <excludeFilterFile>../../spot-bugs.filter-exclude.xml</excludeFilterFile>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <configuration>
+                    <configLocation>../../checkstyle.xml</configLocation>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -19,5 +19,4 @@
		<module>email-service-api</module>
		</modules>


		</project>