Merge pull request #408 from bannergress/package-by-feature

Change packaging structure to features

Author: Poeschl

src/main/java/com/bannergress/backend/services/AgentService.java renamed to src/main/java/com/bannergress/backend/agent/AgentService.java

@@ -1,7 +1,4 @@
-package com.bannergress.backend.services;
-
-import com.bannergress.backend.entities.NamedAgent;
-import com.bannergress.backend.enums.Faction;
+package com.bannergress.backend.agent;
 
 /**
  * Service for agent-related tasks.

src/main/java/com/bannergress/backend/services/impl/AgentServiceImpl.java renamed to src/main/java/com/bannergress/backend/agent/AgentServiceImpl.java

@@ -1,8 +1,5 @@
-package com.bannergress.backend.services.impl;
+package com.bannergress.backend.agent;
 
-import com.bannergress.backend.entities.NamedAgent;
-import com.bannergress.backend.enums.Faction;
-import com.bannergress.backend.services.AgentService;
 import jakarta.persistence.EntityManager;
 import jakarta.transaction.Transactional;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/bannergress/backend/enums/Faction.java renamed to src/main/java/com/bannergress/backend/agent/Faction.java

@@ -1,4 +1,4 @@
-package com.bannergress.backend.enums;
+package com.bannergress.backend.agent;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 

src/main/java/com/bannergress/backend/entities/NamedAgent.java renamed to src/main/java/com/bannergress/backend/agent/NamedAgent.java

@@ -1,6 +1,6 @@
-package com.bannergress.backend.entities;
+package com.bannergress.backend.agent;
 
-import com.bannergress.backend.enums.Faction;
+import com.bannergress.backend.mission.Mission;
 import com.bannergress.backend.utils.PojoBuilder;
 import jakarta.persistence.*;
 import net.karneim.pojobuilder.GeneratePojoBuilder;

src/main/java/com/bannergress/backend/dto/NamedAgentDto.java renamed to src/main/java/com/bannergress/backend/agent/NamedAgentDto.java

@@ -1,6 +1,5 @@
-package com.bannergress.backend.dto;
+package com.bannergress.backend.agent;
 
-import com.bannergress.backend.enums.Faction;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 

src/main/java/com/bannergress/backend/security/CustomRevisionListener.java renamed to src/main/java/com/bannergress/backend/audit/CustomRevisionListener.java

@@ -1,6 +1,5 @@
-package com.bannergress.backend.security;
+package com.bannergress.backend.audit;
 
-import com.bannergress.backend.entities.Revision;
 import org.hibernate.envers.RevisionListener;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;

src/main/java/com/bannergress/backend/entities/Revision.java renamed to src/main/java/com/bannergress/backend/audit/Revision.java

@@ -1,6 +1,5 @@
-package com.bannergress.backend.entities;
+package com.bannergress.backend.audit;
 
-import com.bannergress.backend.security.CustomRevisionListener;
 import jakarta.persistence.*;
 import org.hibernate.envers.RevisionEntity;
 import org.hibernate.envers.RevisionNumber;

src/main/java/com/bannergress/backend/entities/Banner.java renamed to src/main/java/com/bannergress/backend/banner/Banner.java

@@ -1,7 +1,10 @@
-package com.bannergress.backend.entities;
+package com.bannergress.backend.banner;
 
-import com.bannergress.backend.enums.BannerType;
-import com.bannergress.backend.utils.PointBridge;
+import com.bannergress.backend.banner.picture.BannerPicture;
+import com.bannergress.backend.banner.settings.BannerSettings;
+import com.bannergress.backend.mission.Mission;
+import com.bannergress.backend.place.Place;
+import com.bannergress.backend.spatial.PointBridge;
 import com.bannergress.backend.utils.PojoBuilder;
 import com.google.common.collect.ImmutableSortedMap;
 import com.google.common.collect.Maps;

src/main/java/com/bannergress/backend/controllers/BannerController.java renamed to src/main/java/com/bannergress/backend/banner/BannerController.java

@@ -1,21 +1,20 @@
-package com.bannergress.backend.controllers;
-
-import com.bannergress.backend.dto.BannerDto;
-import com.bannergress.backend.dto.BannerSettingsDto;
-import com.bannergress.backend.dto.Gpx;
-import com.bannergress.backend.dto.MissionDto;
-import com.bannergress.backend.entities.*;
-import com.bannergress.backend.enums.BannerDtoAttribute;
-import com.bannergress.backend.enums.BannerListType;
-import com.bannergress.backend.enums.BannerSortOrder;
-import com.bannergress.backend.enums.POIType;
-import com.bannergress.backend.exceptions.MissionAlreadyUsedException;
+package com.bannergress.backend.banner;
+
+import com.bannergress.backend.banner.search.BannerSearchService;
+import com.bannergress.backend.banner.search.BannerSortOrder;
+import com.bannergress.backend.banner.settings.BannerSettings;
+import com.bannergress.backend.banner.settings.BannerSettingsDto;
+import com.bannergress.backend.banner.settings.BannerSettingsService;
+import com.bannergress.backend.mission.Mission;
+import com.bannergress.backend.mission.MissionController;
+import com.bannergress.backend.mission.MissionDto;
+import com.bannergress.backend.mission.step.MissionStep;
+import com.bannergress.backend.mission.validation.NianticId;
+import com.bannergress.backend.place.PlaceInformation;
+import com.bannergress.backend.place.PlaceService;
+import com.bannergress.backend.poi.POI;
+import com.bannergress.backend.poi.POIType;
 import com.bannergress.backend.security.Roles;
-import com.bannergress.backend.services.BannerSearchService;
-import com.bannergress.backend.services.BannerService;
-import com.bannergress.backend.services.BannerSettingsService;
-import com.bannergress.backend.services.PlaceService;
-import com.bannergress.backend.validation.NianticId;
 import com.google.common.base.Suppliers;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
@@ -52,8 +51,8 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import static com.bannergress.backend.utils.Spatial.getLatitude;
-import static com.bannergress.backend.utils.Spatial.getLongitude;
+import static com.bannergress.backend.spatial.Spatial.getLatitude;
+import static com.bannergress.backend.spatial.Spatial.getLongitude;
 
 /**
  * REST endpoint for banners.

src/main/java/com/bannergress/backend/dto/BannerDto.java renamed to src/main/java/com/bannergress/backend/banner/BannerDto.java

@@ -1,7 +1,5 @@
-package com.bannergress.backend.dto;
+package com.bannergress.backend.banner;
 
-import com.bannergress.backend.enums.BannerListType;
-import com.bannergress.backend.enums.BannerType;
 import com.bannergress.backend.utils.PojoBuilder;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
@@ -70,7 +68,7 @@ public class BannerDto {
      * position must be less than {@link #numberOfMissions}. The map may be sparse,
      * i.e. not every position is necessarily mapped to a mission.
      */
-    public Map<@NotNull @Min(0) @Max(2999) Integer, @NotNull MissionDto> missions;
+    public Map<@NotNull @Min(0) @Max(2999) Integer, com.bannergress.backend.mission.MissionDto> missions;
 
     /**
      * Latitude of the start portal of the first mission.

src/main/java/com/bannergress/backend/enums/BannerDtoAttribute.java renamed to src/main/java/com/bannergress/backend/banner/BannerDtoAttribute.java

@@ -1,6 +1,4 @@
-package com.bannergress.backend.enums;
-
-import com.bannergress.backend.dto.BannerDto;
+package com.bannergress.backend.banner;
 
 /** Attributes of {@link BannerDto} class. */
 public enum BannerDtoAttribute {
@@ -60,7 +58,7 @@ public enum BannerDtoAttribute {
 
     /** {@link BannerDto#type}. */
     type,
-    
+
     /** {@link BannerDto#uuid}. */
     uuid,
 

src/main/java/com/bannergress/backend/enums/BannerListType.java renamed to src/main/java/com/bannergress/backend/banner/BannerListType.java

@@ -1,4 +1,4 @@
-package com.bannergress.backend.enums;
+package com.bannergress.backend.banner;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 

src/main/java/com/bannergress/backend/repositories/BannerRepository.java renamed to src/main/java/com/bannergress/backend/banner/BannerRepository.java

@@ -1,6 +1,5 @@
-package com.bannergress.backend.repositories;
+package com.bannergress.backend.banner;
 
-import com.bannergress.backend.entities.Banner;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;

src/main/java/com/bannergress/backend/services/BannerService.java renamed to src/main/java/com/bannergress/backend/banner/BannerService.java

@@ -1,8 +1,4 @@
-package com.bannergress.backend.services;
-
-import com.bannergress.backend.dto.BannerDto;
-import com.bannergress.backend.entities.Banner;
-import com.bannergress.backend.exceptions.MissionAlreadyUsedException;
+package com.bannergress.backend.banner;
 
 import java.util.List;
 import java.util.Optional;

src/main/java/com/bannergress/backend/services/impl/BannerServiceImpl.java renamed to src/main/java/com/bannergress/backend/banner/BannerServiceImpl.java

@@ -1,19 +1,12 @@
-package com.bannergress.backend.services.impl;
+package com.bannergress.backend.banner;
 
-import com.bannergress.backend.dto.BannerDto;
-import com.bannergress.backend.dto.MissionDto;
-import com.bannergress.backend.entities.Banner;
-import com.bannergress.backend.entities.Mission;
-import com.bannergress.backend.entities.MissionStep;
-import com.bannergress.backend.entities.Place;
-import com.bannergress.backend.enums.MissionStatus;
-import com.bannergress.backend.exceptions.MissionAlreadyUsedException;
-import com.bannergress.backend.repositories.BannerRepository;
-import com.bannergress.backend.repositories.BannerSpecifications;
-import com.bannergress.backend.repositories.MissionRepository;
-import com.bannergress.backend.repositories.MissionSpecifications;
-import com.bannergress.backend.services.*;
-import com.bannergress.backend.utils.DistanceCalculation;
+import com.bannergress.backend.banner.picture.BannerPictureService;
+import com.bannergress.backend.banner.timezone.TimezoneService;
+import com.bannergress.backend.mission.*;
+import com.bannergress.backend.mission.step.MissionStep;
+import com.bannergress.backend.place.Place;
+import com.bannergress.backend.place.PlaceService;
+import com.bannergress.backend.spatial.DistanceCalculation;
 import com.bannergress.backend.utils.SlugGenerator;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Collections2;

src/main/java/com/bannergress/backend/repositories/BannerSpecifications.java renamed to src/main/java/com/bannergress/backend/banner/BannerSpecifications.java

@@ -1,7 +1,13 @@
-package com.bannergress.backend.repositories;
-
-import com.bannergress.backend.entities.*;
-import com.bannergress.backend.enums.BannerListType;
+package com.bannergress.backend.banner;
+
+import com.bannergress.backend.banner.settings.BannerSettings;
+import com.bannergress.backend.banner.settings.BannerSettings_;
+import com.bannergress.backend.mission.Mission;
+import com.bannergress.backend.mission.Mission_;
+import com.bannergress.backend.mission.step.MissionStep_;
+import com.bannergress.backend.place.Place;
+import com.bannergress.backend.place.Place_;
+import com.bannergress.backend.user.User_;
 import com.google.common.base.Preconditions;
 import jakarta.persistence.criteria.*;
 import org.hibernate.query.criteria.HibernateCriteriaBuilder;

src/main/java/com/bannergress/backend/enums/BannerType.java renamed to src/main/java/com/bannergress/backend/banner/BannerType.java

@@ -1,4 +1,4 @@
-package com.bannergress.backend.enums;
+package com.bannergress.backend.banner;
 
 /**
  * Banner type.

src/main/java/com/bannergress/backend/dto/Gpx.java renamed to src/main/java/com/bannergress/backend/banner/Gpx.java

@@ -1,4 +1,4 @@
-package com.bannergress.backend.dto;
+package com.bannergress.backend.banner;
 
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;

src/main/java/com/bannergress/backend/exceptions/MissionAlreadyUsedException.java renamed to src/main/java/com/bannergress/backend/banner/MissionAlreadyUsedException.java

@@ -1,4 +1,4 @@
-package com.bannergress.backend.exceptions;
+package com.bannergress.backend.banner;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ResponseStatus;

src/main/java/com/bannergress/backend/controllers/MetaController.java renamed to src/main/java/com/bannergress/backend/banner/meta/MetaController.java

@@ -1,10 +1,10 @@
-package com.bannergress.backend.controllers;
+package com.bannergress.backend.banner.meta;
 
-import com.bannergress.backend.entities.Banner;
-import com.bannergress.backend.entities.Place;
-import com.bannergress.backend.entities.PlaceInformation;
-import com.bannergress.backend.services.BannerService;
-import com.bannergress.backend.services.PlaceService;
+import com.bannergress.backend.banner.Banner;
+import com.bannergress.backend.banner.BannerService;
+import com.bannergress.backend.place.Place;
+import com.bannergress.backend.place.PlaceInformation;
+import com.bannergress.backend.place.PlaceService;
 import com.bannergress.backend.utils.SiteUrls;
 import com.google.common.collect.ImmutableList;
 import com.google.common.escape.Escaper;

src/main/java/com/bannergress/backend/entities/BannerPicture.java renamed to src/main/java/com/bannergress/backend/banner/picture/BannerPicture.java

@@ -1,5 +1,6 @@
-package com.bannergress.backend.entities;
+package com.bannergress.backend.banner.picture;
 
+import com.bannergress.backend.banner.Banner;
 import com.bannergress.backend.utils.PojoBuilder;
 import jakarta.persistence.*;
 import net.karneim.pojobuilder.GeneratePojoBuilder;

src/main/java/com/bannergress/backend/controllers/BannerPictureController.java renamed to src/main/java/com/bannergress/backend/banner/picture/BannerPictureController.java

@@ -1,7 +1,5 @@
-package com.bannergress.backend.controllers;
+package com.bannergress.backend.banner.picture;
 
-import com.bannergress.backend.entities.BannerPicture;
-import com.bannergress.backend.services.BannerPictureService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;

src/main/java/com/bannergress/backend/services/BannerPictureMaintenanceService.java renamed to src/main/java/com/bannergress/backend/banner/picture/BannerPictureMaintenanceService.java

@@ -1,4 +1,4 @@
-package com.bannergress.backend.services;
+package com.bannergress.backend.banner.picture;
 
 /**
  * Service for banner picture tasks.

src/main/java/com/bannergress/backend/services/impl/BannerPictureMaintenanceServiceImpl.java renamed to src/main/java/com/bannergress/backend/banner/picture/BannerPictureMaintenanceServiceImpl.java

@@ -1,7 +1,5 @@
-package com.bannergress.backend.services.impl;
+package com.bannergress.backend.banner.picture;
 
-import com.bannergress.backend.services.BannerPictureMaintenanceService;
-import com.bannergress.backend.services.BannerPictureService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;

src/main/java/com/bannergress/backend/services/BannerPictureService.java renamed to src/main/java/com/bannergress/backend/banner/picture/BannerPictureService.java

@@ -1,7 +1,6 @@
-package com.bannergress.backend.services;
+package com.bannergress.backend.banner.picture;
 
-import com.bannergress.backend.entities.Banner;
-import com.bannergress.backend.entities.BannerPicture;
+import com.bannergress.backend.banner.Banner;
 
 import java.util.Optional;
 

src/main/java/com/bannergress/backend/services/impl/BannerPictureServiceImpl.java renamed to src/main/java/com/bannergress/backend/banner/picture/BannerPictureServiceImpl.java

@@ -1,10 +1,8 @@
-package com.bannergress.backend.services.impl;
+package com.bannergress.backend.banner.picture;
 
-import com.bannergress.backend.entities.Banner;
-import com.bannergress.backend.entities.BannerPicture;
-import com.bannergress.backend.entities.Mission;
-import com.bannergress.backend.enums.MissionStatus;
-import com.bannergress.backend.services.BannerPictureService;
+import com.bannergress.backend.banner.Banner;
+import com.bannergress.backend.mission.Mission;
+import com.bannergress.backend.mission.MissionStatus;
 import com.google.common.hash.Hasher;
 import com.google.common.hash.Hashing;
 import jakarta.persistence.EntityManager;
@@ -131,9 +129,9 @@ private boolean isOnlyDisabledOrSubmitted(Banner banner) {
         return banner.getNumberOfDisabledMissions() + banner.getNumberOfSubmittedMissions() == banner.getNumberOfMissions();
     }
 
-    private static final BufferedImage maskImageOnline = loadImage("/mask-100-online.png");
-    private static final BufferedImage maskImageOffline = loadImage("/mask-100-offline.png");
-    private static final BufferedImage maskImagePlaceholder = loadImage("/mask-100-placeholder.png");
+    private static final BufferedImage maskImageOnline = loadImage("mask-100-online.png");
+    private static final BufferedImage maskImageOffline = loadImage("mask-100-offline.png");
+    private static final BufferedImage maskImagePlaceholder = loadImage("mask-100-placeholder.png");
 
     private static BufferedImage loadImage(String path) {
         try (InputStream stream = BannerPictureServiceImpl.class.getResourceAsStream(path)) {

src/main/java/com/bannergress/backend/services/BannerSearchService.java renamed to src/main/java/com/bannergress/backend/banner/search/BannerSearchService.java

@@ -1,8 +1,7 @@
-package com.bannergress.backend.services;
+package com.bannergress.backend.banner.search;
 
-import com.bannergress.backend.entities.Banner;
-import com.bannergress.backend.enums.BannerListType;
-import com.bannergress.backend.enums.BannerSortOrder;
+import com.bannergress.backend.banner.Banner;
+import com.bannergress.backend.banner.BannerListType;
 import org.springframework.data.domain.Sort.Direction;
 
 import java.time.Instant;

src/main/java/com/bannergress/backend/enums/BannerSortOrder.java renamed to src/main/java/com/bannergress/backend/banner/search/BannerSortOrder.java

@@ -1,6 +1,5 @@
-package com.bannergress.backend.enums;
+package com.bannergress.backend.banner.search;
 
-import com.bannergress.backend.entities.Banner;
 import io.swagger.v3.oas.annotations.media.Schema;
 
 /**

src/main/java/com/bannergress/backend/services/impl/BaseBannerSearchServiceImpl.java renamed to src/main/java/com/bannergress/backend/banner/search/BaseBannerSearchServiceImpl.java

@@ -1,9 +1,8 @@
-package com.bannergress.backend.services.impl;
+package com.bannergress.backend.banner.search;
 
-import com.bannergress.backend.entities.Banner;
-import com.bannergress.backend.repositories.BannerRepository;
-import com.bannergress.backend.repositories.BannerSpecifications;
-import com.bannergress.backend.services.BannerSearchService;
+import com.bannergress.backend.banner.Banner;
+import com.bannergress.backend.banner.BannerRepository;
+import com.bannergress.backend.banner.BannerSpecifications;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 

src/main/java/com/bannergress/backend/services/impl/DatabaseBannerSearchServiceImpl.java renamed to src/main/java/com/bannergress/backend/banner/search/DatabaseBannerSearchServiceImpl.java

@@ -1,13 +1,11 @@
-package com.bannergress.backend.services.impl;
+package com.bannergress.backend.banner.search;
 
-import com.bannergress.backend.entities.Banner;
-import com.bannergress.backend.enums.BannerListType;
-import com.bannergress.backend.enums.BannerSortOrder;
-import com.bannergress.backend.repositories.BannerSpecifications;
-import com.bannergress.backend.repositories.MissionSpecifications;
-import com.bannergress.backend.services.BannerSearchService;
+import com.bannergress.backend.banner.Banner;
+import com.bannergress.backend.banner.BannerListType;
+import com.bannergress.backend.banner.BannerSpecifications;
+import com.bannergress.backend.mission.MissionSpecifications;
+import com.bannergress.backend.spatial.Spatial;
 import com.bannergress.backend.utils.OffsetBasedPageRequest;
-import com.bannergress.backend.utils.Spatial;
 import org.locationtech.jts.geom.Geometry;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Profile;

src/main/java/com/bannergress/backend/services/impl/LuceneBannerSearchServiceImpl.java renamed to src/main/java/com/bannergress/backend/banner/search/LuceneBannerSearchServiceImpl.java

@@ -1,9 +1,7 @@
-package com.bannergress.backend.services.impl;
+package com.bannergress.backend.banner.search;
 
-import com.bannergress.backend.entities.Banner;
-import com.bannergress.backend.enums.BannerListType;
-import com.bannergress.backend.enums.BannerSortOrder;
-import com.bannergress.backend.services.BannerSearchService;
+import com.bannergress.backend.banner.Banner;
+import com.bannergress.backend.banner.BannerListType;
 import jakarta.persistence.EntityManager;
 import org.hibernate.search.engine.search.common.BooleanOperator;
 import org.hibernate.search.engine.search.predicate.dsl.PredicateFinalStep;