Skip to content

Clean Code - Remove unused Code snippets assigned in Ticket #1850 #552

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

Clean Code - Remove unused Code snippets assigned in Ticket #1850 #552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eff13f0
Clean Code - Remove unused Code snippets assigned in Ticket #1850
Nov 5, 2025
8a499d2
Merge branch 'develop' into 1850
ln345 Nov 5, 2025
fdec0cb
Clean Code - Remove unused Code snippets assigned in Ticket #1850 in …
Nov 12, 2025
e4d14ef
Merge remote-tracking branch 'origin/1850' into 1850
Nov 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...java/de/bogenliga/application/services/v1/dsbmannschaft/service/DsbMannschaftService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ public void createMannschaftsMitgliedForPlatzhalter(@RequestBody final DsbMannsc
}

for (int j = 0; j < list.size(); j++) {
MannschaftsMitgliedDTO createdSchuetze = mannschaftsMitgliedService.create(list.get(j), principal);
mannschaftsMitgliedService.create(list.get(j), principal);
}
}catch (NullPointerException ignored) {}
}
Expand Down
2 changes: 1 addition & 1 deletion ...n/src/main/java/de/bogenliga/application/services/v1/feedback/model/FeedbackClassDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@
* @author Lars Bahnmüller, [email protected]
*/
public class FeedbackClassDTO implements DataTransferObject {
private String feedBack;

}
1 change: 0 additions & 1 deletion ...lication/src/main/java/de/bogenliga/application/services/v1/sync/service/SyncService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ public class SyncService implements ServiceFacade {
private static final String PRECONDITION_MSG_WETTKAMPF_ID = "Wettkampf Id must not be negative";
private static final String ERR_NOT_NULL_TEMPLATE = "MatchService: %s: %s must not be null.";
private static final String SERVICE_FIND_MATCHES_BY_IDS = "findMatchesByIds";
private static final String SERVICE_SYNCHRONIZE_MATCHES_AND_PASSEN = "synchronizeMatchesAndPassen";
private static final String CHECKED_PARAM_MATCH_ID = "Match ID";
private static final String ERR_NOT_NEGATIVE_TEMPLATE = "MatchService: %s: %s must not be negative.";
private static final String ERR_WETTKAMPF_ALREADY_OFFLINE = "Cannot got offline. Wettkampf is already offline";
Expand Down
18 changes: 8 additions & 10 deletions ...on/src/main/java/de/bogenliga/application/services/v1/trigger/service/TriggerService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ public class TriggerService implements ServiceFacade {
// define the logger context
private static final Logger LOGGER = LoggerFactory.getLogger(TriggerService.class);
private final BasicDAO basicDao;
private final TriggerDAO triggerDAO;
private final TriggerComponent triggerComponent;

private final MigrationTimestampDAO migrationTimestampDAO;
Expand All @@ -85,7 +84,7 @@ public class TriggerService implements ServiceFacade {
private final ExecutorService executorService = Executors.newCachedThreadPool();

@Autowired
public TriggerService(final BasicDAO basicDao, final TriggerDAO triggerDAO, final TriggerComponent triggerComponent, final MigrationTimestampDAO migrationTimestampDAO,
public TriggerService(final BasicDAO basicDao, final TriggerComponent triggerComponent, final MigrationTimestampDAO migrationTimestampDAO,
final AltsystemLiga altsystemLiga,
final AltsystemSaison altsystemSaison,
final AltsystemMannschaft altsystemMannschaft,
Expand All @@ -95,7 +94,6 @@ public TriggerService(final BasicDAO basicDao, final TriggerDAO triggerDAO, fina
final OldDbImport oldDBImport
) {
this.basicDao = basicDao;
this.triggerDAO = triggerDAO;
this.triggerComponent = triggerComponent;
this.migrationTimestampDAO = migrationTimestampDAO;
this.oldDBImport = oldDBImport;
Expand Down Expand Up @@ -189,7 +187,7 @@ public TriggerCountDTO findInProgressCount() {
@GetMapping("/findAllWithPages")
@RequiresPermission(UserPermission.CAN_MODIFY_STAMMDATEN)
public List<TriggerDTO> findAllWithPages(@RequestParam("offsetMultiplicator") String offsetMultiplicator,@RequestParam("queryPageLimit") String queryPageLimit,@RequestParam("dateInterval") String dateInterval) {
if (checkForMaliciousQueryParams(offsetMultiplicator, queryPageLimit, dateInterval)) {
if (checkForMaliciousQueryParams(offsetMultiplicator, queryPageLimit)) {
final List<TriggerDO> triggerDOList = triggerComponent.findAllWithPages(offsetMultiplicator, queryPageLimit,dateInterval);
return triggerDOList.stream().map(TriggerDTOMapper.toDTO).toList();
}
Expand All @@ -204,7 +202,7 @@ public List<TriggerDTO> findAllSuccessed(@RequestParam("offsetMultiplicator") St
@GetMapping("/findErrors")
@RequiresPermission(UserPermission.CAN_MODIFY_STAMMDATEN)
public List<TriggerDTO> findAllErrors(@RequestParam("offsetMultiplicator") String offsetMultiplicator,@RequestParam("queryPageLimit") String queryPageLimit,@RequestParam("dateInterval") String dateInterval) {
if (checkForMaliciousQueryParams(offsetMultiplicator, queryPageLimit, dateInterval)) {
if (checkForMaliciousQueryParams(offsetMultiplicator, queryPageLimit)) {
final List<TriggerDO> triggerDOList = triggerComponent.findAllErrors(offsetMultiplicator, queryPageLimit,
dateInterval);
return triggerDOList.stream().map(TriggerDTOMapper.toDTO).toList();
Expand All @@ -214,7 +212,7 @@ public List<TriggerDTO> findAllErrors(@RequestParam("offsetMultiplicator") Strin
@GetMapping("/findInProgress")
@RequiresPermission(UserPermission.CAN_MODIFY_STAMMDATEN)
public List<TriggerDTO> findAllInProgress(@RequestParam("offsetMultiplicator") String offsetMultiplicator,@RequestParam("queryPageLimit") String queryPageLimit,@RequestParam("dateInterval") String dateInterval) {
if (checkForMaliciousQueryParams(offsetMultiplicator, queryPageLimit, dateInterval)) {
if (checkForMaliciousQueryParams(offsetMultiplicator, queryPageLimit)) {
final List<TriggerDO> triggerDOList = triggerComponent.findAllInProgress(offsetMultiplicator, queryPageLimit,
dateInterval);
return triggerDOList.stream().map(TriggerDTOMapper.toDTO).toList();
Expand All @@ -224,7 +222,7 @@ public List<TriggerDTO> findAllInProgress(@RequestParam("offsetMultiplicator") S
@GetMapping("/findNews")
@RequiresPermission(UserPermission.CAN_MODIFY_STAMMDATEN)
public List<TriggerDTO> findAllNews(@RequestParam("offsetMultiplicator") String offsetMultiplicator,@RequestParam("queryPageLimit") String queryPageLimit,@RequestParam("dateInterval") String dateInterval) {
if (checkForMaliciousQueryParams(offsetMultiplicator, queryPageLimit, dateInterval)) {
if (checkForMaliciousQueryParams(offsetMultiplicator, queryPageLimit)) {
final List<TriggerDO> triggerDOList = triggerComponent.findAllNews(offsetMultiplicator, queryPageLimit,
dateInterval);
return triggerDOList.stream().map(TriggerDTOMapper.toDTO).toList();
Expand All @@ -247,12 +245,12 @@ public void deleteEntries(@RequestParam("status") String status,@RequestParam("d
triggerComponent.deleteEntries(status, dateInterval);
}
}
public boolean checkForMaliciousQueryParams(String offsetMuliplicator, String queryPageLimit, String dateInterval){
public boolean checkForMaliciousQueryParams(String offsetMuliplicator, String queryPageLimit){
//returns true if Params are not malicious
try{
if(offsetMuliplicator != null && queryPageLimit != null){
int actualOffsetMuliplicator = Integer.parseInt(offsetMuliplicator);
int actualQueryPageLimit = Integer.parseInt(queryPageLimit);
Integer.parseInt(offsetMuliplicator);
Integer.parseInt(queryPageLimit);
}
else {
throw new IllegalArgumentException();
Expand Down
7 changes: 0 additions & 7 deletions ...tion/src/test/java/de/bogenliga/application/services/v1/Sync/service/SyncServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ public class SyncServiceTest {


private static final String PRECONDITION_MSG_VERANSTALTUNG_ID = "Veranstaltung Id must not be negative";
//private static final String PRECONDITION_MSG_WETTKAMPF_ID = "Wettkampf Id must not be negative";

protected static final Long MATCH_ID = 1L;
protected static final Long MATCH_NR = 1L;
Expand Down Expand Up @@ -149,14 +148,8 @@ public class SyncServiceTest {
private static final Integer MM_dsbMitgliedEingesetzt = 1;
private static final String MM_dsbMitgliedVorname = "Foo";
private static final String MM_dsbMitgliedNachname = "Bar";
private static final Long MM_rueckennummer_1 = 5L;
private static final Long MM_rueckennummer_2 = 6L;
private static final Long MM_rueckennummer_3 = 7L;


private static final Long W_id = 5L;
private static final String W_name = "Liga_kummulativ";

private static final Long W_vid = 243L;
private static final Long W_typId = 0L;
private static final Long W_tag = 5L;
Expand Down
10 changes: 5 additions & 5 deletions ...rc/test/java/de/bogenliga/application/services/v1/trigger/service/TriggerServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -735,11 +735,11 @@ public void testCheckForMaliciousQueryParams(){
String falseDateIntervalFour = "10 YEAR";

// Verify the behavior and the return values
assert !triggerServiceTest.checkForMaliciousQueryParams(nullOffset, workingLimit, workingDateInterval);
assert !triggerServiceTest.checkForMaliciousQueryParams(workingOffset, nullLimit, workingDateInterval);
assert !triggerServiceTest.checkForMaliciousQueryParams(falseOffset, workingLimit, workingDateInterval);
assert !triggerServiceTest.checkForMaliciousQueryParams(workingOffset, falseLimit, workingDateInterval);
assert triggerServiceTest.checkForMaliciousQueryParams(workingOffset, workingLimit, workingDateInterval);
assert !triggerServiceTest.checkForMaliciousQueryParams(nullOffset, workingLimit);
assert !triggerServiceTest.checkForMaliciousQueryParams(workingOffset, nullLimit);
assert !triggerServiceTest.checkForMaliciousQueryParams(falseOffset, workingLimit);
assert !triggerServiceTest.checkForMaliciousQueryParams(workingOffset, falseLimit);
assert triggerServiceTest.checkForMaliciousQueryParams(workingOffset, workingLimit);
}
@Test
public void testCheckForMaliciousDeletionParams(){
Expand Down