.gitlab-ci.yml

@@ -4,6 +4,11 @@ stages:
   - semantic-release
   - pipeline-cleanup
 
+include:
+  - template: Security/SAST.gitlab-ci.yml
+  - project: devops/pipelines
+    file: delete-pipelines.yaml
+
 variables:
   MAVEN_OPTS: "-Dmaven.repo.local=.m2/repository"
 
@@ -38,23 +43,5 @@ semantic-release:
   only:
     - main
 
-# Remove pipelines older than one month, except the last 25.
-pipeline-cleanup:
-  image: iotguru/node:lts
-  stage: pipeline-cleanup
-  script:
-    - PER_PAGE=25
-    - ONE_MONTH=`date -d '-1 month' -u -Is`
-    - PIPELINES_URL="$CI_API_V4_URL/projects/$CI_PROJECT_ID/pipelines?per_page=$PER_PAGE&sort=desc&page=2&updated_before=$ONE_MONTH"
-    - |
-      for PIPELINE_ID in `curl -s -H "Private-Token: $GITLAB_TOKEN" "$PIPELINES_URL" | jq '.[].id'`
-      do
-        curl -s -H "Private-Token: $GITLAB_TOKEN" --request "DELETE" "$CI_API_V4_URL/projects/$CI_PROJECT_ID/pipelines/$PIPELINE_ID"
-      done
-  only:
-    - main
-
 sast:
   stage: sast-test
-include:
-  - template: Security/SAST.gitlab-ci.yml

CHANGELOG.md

+## [1.0.5](https://gitlab.iotguru.dev/power-of-planets/pop-commons/compare/v1.0.4...v1.0.5) (2023-08-08)
+
+
+### Bug Fixes
+
+* Version upgrades and code quality improvements ([5798bb7](https://gitlab.iotguru.dev/power-of-planets/pop-commons/commit/5798bb770f6e91b4bdd5ad00a4b6e859cc8a1378))
+
 ## [1.0.4](https://gitlab.iotguru.dev/power-of-planets/pop-commons/compare/v1.0.3...v1.0.4) (2023-08-02)
 
 

gacivs-entities/nb-configuration.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<project-shared-configuration>
-    <!--
-This file contains additional configuration written by modules in the NetBeans IDE.
-The configuration is intended to be shared among all the users of project and
-therefore it is assumed to be part of version control checkout.
-Without this configuration present, some functionality in the IDE may be limited or fail altogether.
--->
-    <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
-        <!--
-Properties that influence various parts of the IDE, especially code formatting and the like. 
-You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
-That way multiple projects can share the same settings (useful for formatting rules for example).
-Any value defined here will override the pom.xml file value but is only applicable to the current project.
--->
-        <netbeans.hint.jdkPlatform>JDK_1.6</netbeans.hint.jdkPlatform>
-    </properties>
-</project-shared-configuration>

gacivs-entities/pom.xml

@@ -6,11 +6,11 @@
     <parent>
         <groupId>info.gacivs</groupId>
         <artifactId>gacivs-common</artifactId>
-        <version>1.0.4</version>
+        <version>1.0.5</version>
     </parent>
 
     <artifactId>gacivs-entities</artifactId>
-    <version>1.0.4</version>
+    <version>1.0.5</version>
     <packaging>jar</packaging>
     <name>Golden Age of Civilizations Game Common Entities</name>
     <description>Golden Age of Civilizations Game Common Entities</description>

gacivs-entities/src/main/java/info/gacivs/common/EntityContants.java

@@ -22,6 +22,6 @@ public final class EntityContants {
     /**
      * Private constructor.
      */
-    protected EntityContants() {
+    EntityContants() {
     }
 }

gacivs-entities/src/main/java/info/gacivs/common/MapBase.java

@@ -93,9 +93,7 @@ public abstract class MapBase implements Serializable {
 
         if (other instanceof MapBase) {
             final MapBase mapBase = (MapBase) other;
-            if (this.toString().equals(mapBase.toString())) {
-                return true;
-            }
+            return this.toString().equals(mapBase.toString());
         }
 
         return false;

gacivs-entities/src/main/java/info/gacivs/common/dtos/Building.java

@@ -93,9 +93,7 @@ public class Building implements Serializable {
 
         if (other instanceof Building) {
             final Building building = (Building) other;
-            if (this.toString().equals(building.toString())) {
-                return true;
-            }
+            return this.toString().equals(building.toString());
         }
 
         return false;

gacivs-entities/src/main/java/info/gacivs/common/dtos/CityOverview.java

@@ -183,9 +183,7 @@ public class CityOverview implements Serializable {
 
         if (other instanceof CityOverview) {
             final CityOverview cityOverview = (CityOverview) other;
-            if (this.toString().equals(cityOverview.toString())) {
-                return true;
-            }
+            return this.toString().equals(cityOverview.toString());
         }
 
         return false;

gacivs-entities/src/main/java/info/gacivs/common/dtos/Leaderboard.java

@@ -53,9 +53,7 @@ public class Leaderboard extends Statistics implements Serializable {
 
         if (other instanceof Statistics) {
             final Statistics statistics = (Statistics) other;
-            if (this.toString().equals(statistics.toString())) {
-                return true;
-            }
+            return this.toString().equals(statistics.toString());
         }
 
         return false;

gacivs-entities/src/main/java/info/gacivs/common/dtos/MapTile.java

@@ -128,9 +128,7 @@ public class MapTile implements Serializable {
 
         if (other instanceof MapTile) {
             final MapTile mapTile = (MapTile) other;
-            if (this.toString().equals(mapTile.toString())) {
-                return true;
-            }
+            return this.toString().equals(mapTile.toString());
         }
 
         return false;

gacivs-entities/src/main/java/info/gacivs/common/dtos/MoveResult.java

@@ -190,9 +190,7 @@ public class MoveResult implements Serializable {
 
         if (other instanceof MoveResult) {
             final MoveResult moveResult = (MoveResult) other;
-            if (this.toString().equals(moveResult.toString())) {
-                return true;
-            }
+            return this.toString().equals(moveResult.toString());
         }
 
         return false;

gacivs-entities/src/main/java/info/gacivs/common/dtos/PathItem.java

@@ -140,9 +140,7 @@ public class PathItem implements Serializable {
 
         if (other instanceof PathItem) {
             final PathItem pathItem = (PathItem) other;
-            if (this.toString().equals(pathItem.toString())) {
-                return true;
-            }
+            return this.toString().equals(pathItem.toString());
         }
 
         return false;

gacivs-entities/src/main/java/info/gacivs/common/dtos/WebSocketFrame.java

@@ -149,9 +149,7 @@ public class WebSocketFrame {
 
         if (other instanceof WebSocketFrame) {
             final WebSocketFrame webSocketFrame = (WebSocketFrame) other;
-            if (this.toString().equals(webSocketFrame.toString())) {
-                return true;
-            }
+            return this.toString().equals(webSocketFrame.toString());
         }
 
         return false;

gacivs-entities/src/main/java/info/gacivs/common/dtos/moveresult/AttackResult.java

@@ -23,7 +23,7 @@ public class AttackResult implements Serializable {
      */
     private String result;
     /**
-     * The damage of the target unit.
+     * The damage to the target unit.
      */
     private Float targetDamage;
     /**
@@ -118,9 +118,7 @@ public class AttackResult implements Serializable {
 
         if (other instanceof AttackResult) {
             final AttackResult attackResult = (AttackResult) other;
-            if (this.toString().equals(attackResult.toString())) {
-                return true;
-            }
+            return this.toString().equals(attackResult.toString());
         }
 
         return false;

gacivs-entities/src/main/java/info/gacivs/common/dtos/moveresult/HutResult.java

@@ -16,7 +16,7 @@ import java.io.Serializable;
 public class HutResult implements Serializable {
 
     /**
-     * The damage of the attack.
+     * The damage to the attack.
      */
     private Float damage;
     /**
@@ -141,9 +141,7 @@ public class HutResult implements Serializable {
 
         if (other instanceof HutResult) {
             final HutResult hut = (HutResult) other;
-            if (this.toString().equals(hut.toString())) {
-                return true;
-            }
+            return this.toString().equals(hut.toString());
         }
 
         return false;

gacivs-entities/src/main/java/info/gacivs/common/dtos/moveresult/OccupyResult.java

@@ -141,9 +141,7 @@ public class OccupyResult implements Serializable {
 
         if (other instanceof OccupyResult) {
             final OccupyResult occupyResult = (OccupyResult) other;
-            if (this.toString().equals(occupyResult.toString())) {
-                return true;
-            }
+            return this.toString().equals(occupyResult.toString());
         }
 
         return false;

gacivs-entities/src/main/java/info/gacivs/common/dtos/moveresult/StealResult.java

@@ -97,9 +97,7 @@ public class StealResult implements Serializable {
 
         if (other instanceof StealResult) {
             final StealResult stealResult = (StealResult) other;
-            if (this.toString().equals(stealResult.toString())) {
-                return true;
-            }
+            return this.toString().equals(stealResult.toString());
         }
 
         return false;

gacivs-entities/src/main/java/info/gacivs/common/dtos/moveresult/TradeRouteResult.java

@@ -53,9 +53,7 @@ public class TradeRouteResult implements Serializable {
 
         if (other instanceof TradeRouteResult) {
             final TradeRouteResult tradeRouteResult = (TradeRouteResult) other;
-            if (this.toString().equals(tradeRouteResult.toString())) {
-                return true;
-            }
+            return this.toString().equals(tradeRouteResult.toString());
         }
 
         return false;

gacivs-entities/src/main/java/info/gacivs/common/entities/Account.java

@@ -477,9 +477,7 @@ public class Account implements Serializable {
 
         if (other instanceof Account) {
             final Account account = (Account) other;
-            if (this.toString().equals(account.toString())) {
-                return true;
-            }
+            return this.toString().equals(account.toString());
         }
 
         return false;

gacivs-entities/src/main/java/info/gacivs/common/entities/BoundTile.java

@@ -307,9 +307,7 @@ public class BoundTile implements Serializable {
 
         if (other instanceof BoundTile) {
             final BoundTile boundTile = (BoundTile) other;
-            if (this.toString().equals(boundTile.toString())) {
-                return true;
-            }
+            return this.toString().equals(boundTile.toString());
         }
 
         return false;