From cc699d33774188c70609b41033f49720466ca479 Mon Sep 17 00:00:00 2001
From: Lars Johansson <lars.johansson@ess.eu>
Date: Fri, 8 Jul 2022 15:48:16 +0200
Subject: [PATCH] Fix issues as noted by SonarLint
String literals should not be duplicated
---
.../old/DeviceNamesControllerV0.java | 2 +-
.../openepics/names/service/NamesService.java | 25 ++++++++++---------
.../names/service/StructuresService.java | 13 +++++-----
.../org/openepics/names/util/TextUtil.java | 3 +++
4 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/src/main/java/org/openepics/names/rest/controller/old/DeviceNamesControllerV0.java b/src/main/java/org/openepics/names/rest/controller/old/DeviceNamesControllerV0.java
index 629995c6..310cae9b 100644
--- a/src/main/java/org/openepics/names/rest/controller/old/DeviceNamesControllerV0.java
+++ b/src/main/java/org/openepics/names/rest/controller/old/DeviceNamesControllerV0.java
@@ -123,7 +123,7 @@ public class DeviceNamesControllerV0 {
deviceNameElements.add(DeviceNameElementUtil.getDeviceNameElement(name, holder));
}
- LOGGER.log(Level.FINE, "findNames, deviceNameElement s.size: {0}", deviceNameElements.size());
+ LOGGER.log(Level.FINE, "findNames, deviceNameElement s.size: {0}", deviceNameElements.size());
return deviceNameElements;
}
diff --git a/src/main/java/org/openepics/names/service/NamesService.java b/src/main/java/org/openepics/names/service/NamesService.java
index bd438712..2d91491c 100644
--- a/src/main/java/org/openepics/names/service/NamesService.java
+++ b/src/main/java/org/openepics/names/service/NamesService.java
@@ -59,6 +59,7 @@ import org.openepics.names.util.HolderRepositories;
import org.openepics.names.util.HolderSystemDeviceStructure;
import org.openepics.names.util.NameElementUtil;
import org.openepics.names.util.NameUtil;
+import org.openepics.names.util.TextUtil;
import org.openepics.names.util.ValidateUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -151,7 +152,7 @@ public class NamesService {
// do
Date requested = new Date();
- String requestedBy = "test who";
+ String requestedBy = TextUtil.TEST_WHO;
final List<NameElement> createdNameElements = Lists.newArrayList();
for (NameElementCommand nameElement : nameElements) {
// create name within current transaction
@@ -415,7 +416,7 @@ public class NamesService {
if (toBeChecked.getSystemgroupUuid() != null) {
SystemGroup systemGroup = holderIRepositories.getSystemGroupRepository().findLatestNotDeletedByUuid(toBeChecked.getSystemgroupUuid().toString());
ExceptionUtil.validateConditionDataNotAvailableException(systemGroup != null,
- "system group not available", name, null);
+ TextUtil.SYSTEMGROUP_IS_NOT_AVAILABLE, name, null);
if (systemGroup.isDeleted()) {
return Boolean.TRUE;
@@ -423,7 +424,7 @@ public class NamesService {
} else if (toBeChecked.getSystemUuid() != null) {
org.openepics.names.repository.model.System system = holderIRepositories.getSystemRepository().findLatestNotDeletedByUuid(toBeChecked.getSystemUuid().toString());
ExceptionUtil.validateConditionDataNotAvailableException(system != null,
- "system not available", name, null);
+ TextUtil.SYSTEM_IS_NOT_AVAILABLE, name, null);
if (system.isDeleted()) {
return Boolean.TRUE;
@@ -431,7 +432,7 @@ public class NamesService {
SystemGroup systemGroup = holderIRepositories.getSystemGroupRepository().findLatestNotDeletedByUuid(system.getParentUuid().toString());
ExceptionUtil.validateConditionDataNotAvailableException(systemGroup != null,
- "system group not available", name, null);
+ TextUtil.SYSTEMGROUP_IS_NOT_AVAILABLE, name, null);
if (systemGroup.isDeleted()) {
return Boolean.TRUE;
@@ -439,7 +440,7 @@ public class NamesService {
} else if (toBeChecked.getSubsystemUuid() != null) {
Subsystem subsystem = holderIRepositories.getSubsystemRepository().findLatestNotDeletedByUuid(toBeChecked.getSubsystemUuid().toString());
ExceptionUtil.validateConditionDataNotAvailableException(subsystem != null,
- "subsystem not available", name, null);
+ TextUtil.SUBSYSTEM_IS_NOT_AVAILABLE, name, null);
if (subsystem.isDeleted()) {
return Boolean.TRUE;
@@ -447,7 +448,7 @@ public class NamesService {
org.openepics.names.repository.model.System system = holderIRepositories.getSystemRepository().findLatestNotDeletedByUuid(subsystem.getParentUuid().toString());
ExceptionUtil.validateConditionDataNotAvailableException(system != null,
- "system not available", name, null);
+ TextUtil.SYSTEM_IS_NOT_AVAILABLE, name, null);
if (system.isDeleted()) {
return Boolean.TRUE;
@@ -455,7 +456,7 @@ public class NamesService {
SystemGroup systemGroup = holderIRepositories.getSystemGroupRepository().findLatestNotDeletedByUuid(system.getParentUuid().toString());
ExceptionUtil.validateConditionDataNotAvailableException(systemGroup != null,
- "system group not available", name, null);
+ TextUtil.SYSTEMGROUP_IS_NOT_AVAILABLE, name, null);
if (systemGroup.isDeleted()) {
return Boolean.TRUE;
@@ -465,7 +466,7 @@ public class NamesService {
if (toBeChecked.getDevicetypeUuid() != null) {
DeviceType deviceType = holderIRepositories.getDeviceTypeRepository().findLatestNotDeletedByUuid(toBeChecked.getDevicetypeUuid().toString());
ExceptionUtil.validateConditionDataNotAvailableException(deviceType != null,
- "device type not available", name, null);
+ TextUtil.DEVICETYPE_IS_NOT_AVAILABLE, name, null);
if (deviceType.isDeleted()) {
return Boolean.TRUE;
@@ -473,7 +474,7 @@ public class NamesService {
DeviceGroup deviceGroup = holderIRepositories.getDeviceGroupRepository().findLatestNotDeletedByUuid(deviceType.getParentUuid().toString());
ExceptionUtil.validateConditionDataNotAvailableException(deviceGroup != null,
- "device group not available", name, null);
+ TextUtil.DEVICEGROUP_IS_NOT_AVAILABLE, name, null);
if (deviceGroup.isDeleted()) {
return Boolean.TRUE;
@@ -481,7 +482,7 @@ public class NamesService {
Discipline discipline = holderIRepositories.getDisciplineRepository().findLatestNotDeletedByUuid(deviceType.getParentUuid().toString());
ExceptionUtil.validateConditionDataNotAvailableException(discipline != null,
- "device group not available", name, null);
+ TextUtil.DEVICEGROUP_IS_NOT_AVAILABLE, name, null);
if (discipline.isDeleted()) {
return Boolean.TRUE;
@@ -630,7 +631,7 @@ public class NamesService {
// do
Date requested = new Date();
- String requestedBy = "test who";
+ String requestedBy = TextUtil.TEST_WHO;
final List<NameElement> updatedNameElements = Lists.newArrayList();
for (NameElementCommand nameElement : nameElements) {
// update not latest, not deleted
@@ -710,7 +711,7 @@ public class NamesService {
// do
Date requested = new Date();
- String requestedBy = "test who";
+ String requestedBy = TextUtil.TEST_WHO;
final List<NameElement> deletedNameElements = Lists.newArrayList();
for (NameElementCommand nameElement : nameElements) {
Name name = holderIRepositories.getNameRepository().findLatestByUuid(nameElement.getUuid().toString());
diff --git a/src/main/java/org/openepics/names/service/StructuresService.java b/src/main/java/org/openepics/names/service/StructuresService.java
index cb854921..4bb6b9c9 100644
--- a/src/main/java/org/openepics/names/service/StructuresService.java
+++ b/src/main/java/org/openepics/names/service/StructuresService.java
@@ -60,6 +60,7 @@ import org.openepics.names.util.HolderIRepositories;
import org.openepics.names.util.HolderRepositories;
import org.openepics.names.util.HolderSystemDeviceStructure;
import org.openepics.names.util.StructureElementUtil;
+import org.openepics.names.util.TextUtil;
import org.openepics.names.util.StructureElementUtil.StructureChoice;
import org.openepics.names.util.ValidateUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -154,7 +155,7 @@ public class StructuresService {
// do
Date requested = new Date();
- String requestedBy = "test who";
+ String requestedBy = TextUtil.TEST_WHO;
final List<StructureElement> createdStructureElements = Lists.newArrayList();
for (StructureElementCommand structureElement : structureElements) {
// note
@@ -841,7 +842,7 @@ public class StructuresService {
// do
Date requested = new Date();
- String requestedBy = "test who";
+ String requestedBy = TextUtil.TEST_WHO;
final List<StructureElement> updatedStructureElements = Lists.newArrayList();
for (StructureElementCommand structureElement : structureElements) {
// note
@@ -967,7 +968,7 @@ public class StructuresService {
// do
Date requested = new Date();
- String requestedBy = "test who";
+ String requestedBy = TextUtil.TEST_WHO;
final List<StructureElement> deletedStructureElements = Lists.newArrayList();
for (StructureElementCommand structureElement : structureElements) {
String queryValue = structureElement.getUuid().toString();
@@ -1130,7 +1131,7 @@ public class StructuresService {
// set not latest for current latest
// set approved, latest for pending
Date processed = new Date();
- String processedBy = "test who";
+ String processedBy = TextUtil.TEST_WHO;
final List<StructureElement> approvedStructureElements = Lists.newArrayList();
for (StructureElementCommand structureElement : structureElements) {
String queryValue = structureElement.getUuid().toString();
@@ -1352,7 +1353,7 @@ public class StructuresService {
// do
Date processed = new Date();
- String processedBy = "test who";
+ String processedBy = TextUtil.TEST_WHO;
final List<StructureElement> cancelledStructureElements = Lists.newArrayList();
for (StructureElementCommand structureElement : structureElements) {
String queryValue = structureElement.getUuid().toString();
@@ -1478,7 +1479,7 @@ public class StructuresService {
// do
Date processed = new Date();
- String processedBy = "test who";
+ String processedBy = TextUtil.TEST_WHO;
final List<StructureElement> rejectedStructureElements = Lists.newArrayList();
for (StructureElementCommand structureElement : structureElements) {
String queryValue = structureElement.getUuid().toString();
diff --git a/src/main/java/org/openepics/names/util/TextUtil.java b/src/main/java/org/openepics/names/util/TextUtil.java
index 462a68f6..424d999c 100644
--- a/src/main/java/org/openepics/names/util/TextUtil.java
+++ b/src/main/java/org/openepics/names/util/TextUtil.java
@@ -123,6 +123,9 @@ public class TextUtil {
public static final String FILE_COULD_NOT_BE_PARSED = "File could not be parsed";
+ // TODO check if necessary when authentication authorization is introduced
+ public static final String TEST_WHO = "test who";
+
/**
* This class is not to be instantiated.
*/
--
GitLab