From 34aac699d78daf777ae5bcd78490e5f42f3fe30a Mon Sep 17 00:00:00 2001
From: Lars Johansson <lars.johansson@ess.eu>
Date: Wed, 23 Nov 2022 16:59:06 +0100
Subject: [PATCH] Fix issues as noted by SonarLint
Field names should comply with a naming convention
Local variable and method parameter names should comply with a naming convention
---
.../repository/IDeviceGroupRepository.java | 4 +-
.../repository/IDeviceTypeRepository.java | 4 +-
.../names/repository/INameRepository.java | 20 ++---
.../repository/ISubsystemRepository.java | 4 +-
.../names/repository/ISystemRepository.java | 4 +-
.../names/repository/model/DeviceGroup.java | 14 ++--
.../names/repository/model/DeviceType.java | 14 ++--
.../names/repository/model/Name.java | 78 +++++++++--------
.../names/repository/model/NameStructure.java | 45 +++++-----
.../names/repository/model/Structure.java | 12 +--
.../names/repository/model/Subsystem.java | 14 ++--
.../names/repository/model/System.java | 14 ++--
.../controller/VerificationController.java | 84 +++++++++----------
.../names/service/StructuresService.java | 52 ++++++------
14 files changed, 193 insertions(+), 170 deletions(-)
diff --git a/src/main/java/org/openepics/names/repository/IDeviceGroupRepository.java b/src/main/java/org/openepics/names/repository/IDeviceGroupRepository.java
index 3bbea85e..d47675e6 100644
--- a/src/main/java/org/openepics/names/repository/IDeviceGroupRepository.java
+++ b/src/main/java/org/openepics/names/repository/IDeviceGroupRepository.java
@@ -42,7 +42,7 @@ public interface IDeviceGroupRepository extends JpaRepository<DeviceGroup, Long>
@Query("FROM DeviceGroup dg WHERE dg.latest = true AND dg.deleted = false AND dg.uuid = ?1")
DeviceGroup findLatestNotDeletedByUuid(String uuid);
- @Query("FROM DeviceGroup dg WHERE dg.latest = true AND dg.deleted = false AND dg.parent_uuid = ?1 and dg.mnemonic = ?2")
+ @Query("FROM DeviceGroup dg WHERE dg.latest = true AND dg.deleted = false AND dg.parentUuid = ?1 and dg.mnemonic = ?2")
DeviceGroup findLatestNotDeletedByParentAndMnemonic(String uuid, String mnemonic);
@Query("FROM DeviceGroup dg WHERE dg.uuid = ?1")
@@ -57,7 +57,7 @@ public interface IDeviceGroupRepository extends JpaRepository<DeviceGroup, Long>
@Query("FROM DeviceGroup dg WHERE dg.latest = true AND dg.deleted = false")
List<DeviceGroup> findLatestNotDeleted();
- @Query("FROM DeviceGroup dg WHERE dg.latest = true AND dg.deleted = false AND dg.parent_uuid = ?1")
+ @Query("FROM DeviceGroup dg WHERE dg.latest = true AND dg.deleted = false AND dg.parentUuid = ?1")
List<DeviceGroup> findLatestNotDeletedByParent(String uuid);
}
diff --git a/src/main/java/org/openepics/names/repository/IDeviceTypeRepository.java b/src/main/java/org/openepics/names/repository/IDeviceTypeRepository.java
index 3aa16b5e..0a515a0d 100644
--- a/src/main/java/org/openepics/names/repository/IDeviceTypeRepository.java
+++ b/src/main/java/org/openepics/names/repository/IDeviceTypeRepository.java
@@ -42,7 +42,7 @@ public interface IDeviceTypeRepository extends JpaRepository<DeviceType, Long> {
@Query("FROM DeviceType dt WHERE dt.latest = true AND dt.deleted = false AND dt.uuid = ?1")
DeviceType findLatestNotDeletedByUuid(String uuid);
- @Query("FROM DeviceType dt WHERE dt.latest = true AND dt.deleted = false AND dt.parent_uuid = ?1 and dt.mnemonic = ?2")
+ @Query("FROM DeviceType dt WHERE dt.latest = true AND dt.deleted = false AND dt.parentUuid = ?1 and dt.mnemonic = ?2")
DeviceType findLatestNotDeletedByParentAndMnemonic(String uuid, String mnemonic);
@Query("FROM DeviceType dt WHERE dt.uuid = ?1")
@@ -57,7 +57,7 @@ public interface IDeviceTypeRepository extends JpaRepository<DeviceType, Long> {
@Query("FROM DeviceType dt WHERE dt.latest = true AND dt.deleted = false")
List<DeviceType> findLatestNotDeleted();
- @Query("FROM DeviceType dt WHERE dt.latest = true AND dt.deleted = false AND dt.parent_uuid = ?1")
+ @Query("FROM DeviceType dt WHERE dt.latest = true AND dt.deleted = false AND dt.parentUuid = ?1")
List<DeviceType> findLatestNotDeletedByParent(String uuid);
}
diff --git a/src/main/java/org/openepics/names/repository/INameRepository.java b/src/main/java/org/openepics/names/repository/INameRepository.java
index 3a1fbb27..7a7a20cc 100644
--- a/src/main/java/org/openepics/names/repository/INameRepository.java
+++ b/src/main/java/org/openepics/names/repository/INameRepository.java
@@ -36,7 +36,7 @@ public interface INameRepository extends JpaRepository<Name, Long> {
@Query("FROM Name n WHERE n.latest = true AND n.uuid = ?1")
Name findLatestByUuid(String uuid);
- @Query("FROM Name n WHERE n.latest = true AND n.convention_name = ?1")
+ @Query("FROM Name n WHERE n.latest = true AND n.conventionName = ?1")
Name findLatestByConventionName(String conventionName);
@Query("FROM Name n WHERE n.uuid = ?1")
@@ -50,48 +50,48 @@ public interface INameRepository extends JpaRepository<Name, Long> {
@Query("SELECT n FROM Name n, SystemGroup sg "
+ "WHERE n.latest = true "
- + "AND sg.uuid = n.systemgroup_uuid "
+ + "AND sg.uuid = n.systemgroupUuid "
+ "AND sg.latest = true "
+ "AND sg.mnemonic = ?1")
List<Name> findLatestBySystemGroupMnemonic(String mnemonic);
@Query("SELECT n FROM Name n, System sys "
+ "WHERE n.latest = true "
- + "AND sys.uuid = n.system_uuid "
+ + "AND sys.uuid = n.systemUuid "
+ "AND sys.latest = true "
+ "AND sys.mnemonic = ?1")
List<Name> findLatestBySystemMnemonic(String mnemonic);
@Query("SELECT n FROM Name n, Subsystem sub, System sys "
+ "WHERE n.latest = true "
- + "AND sub.uuid = n.subsystem_uuid "
+ + "AND sub.uuid = n.subsystemUuid "
+ "AND sub.latest = true "
- + "AND sys.uuid = sub.parent_uuid "
+ + "AND sys.uuid = sub.parentUuid "
+ "AND sys.latest = true "
+ "AND sys.mnemonic = ?1")
List<Name> findLatestBySystemMnemonicThroughSubsystem(String mnemonic);
@Query("SELECT n FROM Name n, Subsystem sub "
+ "WHERE n.latest = true "
- + "AND sub.uuid = n.subsystem_uuid "
+ + "AND sub.uuid = n.subsystemUuid "
+ "AND sub.latest = true "
+ "AND sub.mnemonic = ?1")
List<Name> findLatestBySubsystemMnemonic(String mnemonic);
@Query("SELECT n FROM Name n, DeviceType dt, DeviceGroup dg, Discipline di "
+ "WHERE n.latest = true "
- + "AND dt.uuid = n.devicetype_uuid "
+ + "AND dt.uuid = n.devicetypeUuid "
+ "AND dt.latest = true "
- + "AND dg.uuid = dt.parent_uuid "
+ + "AND dg.uuid = dt.parentUuid "
+ "AND dg.latest = true "
- + "AND di.uuid = dg.parent_uuid "
+ + "AND di.uuid = dg.parentUuid "
+ "AND di.latest = true "
+ "AND di.mnemonic = ?1")
List<Name> findLatestByDisciplineMnemonic(String mnemonic);
@Query("SELECT n FROM Name n, DeviceType dt "
+ "WHERE n.latest = true "
- + "AND dt.uuid = n.devicetype_uuid "
+ + "AND dt.uuid = n.devicetypeUuid "
+ "AND dt.latest = true "
+ "AND dt.mnemonic = ?1")
List<Name> findLatestByDeviceTypeMnemonic(String mnemonic);
diff --git a/src/main/java/org/openepics/names/repository/ISubsystemRepository.java b/src/main/java/org/openepics/names/repository/ISubsystemRepository.java
index 29eeadd8..34240620 100644
--- a/src/main/java/org/openepics/names/repository/ISubsystemRepository.java
+++ b/src/main/java/org/openepics/names/repository/ISubsystemRepository.java
@@ -42,7 +42,7 @@ public interface ISubsystemRepository extends JpaRepository<Subsystem, Long> {
@Query("FROM Subsystem sub WHERE sub.latest = true AND sub.deleted = false AND sub.uuid = ?1")
Subsystem findLatestNotDeletedByUuid(String uuid);
- @Query("FROM Subsystem sub WHERE sub.latest = true AND sub.deleted = false AND sub.parent_uuid = ?1 and sub.mnemonic = ?2")
+ @Query("FROM Subsystem sub WHERE sub.latest = true AND sub.deleted = false AND sub.parentUuid = ?1 and sub.mnemonic = ?2")
Subsystem findLatestNotDeletedByParentAndMnemonic(String uuid, String mnemonic);
@Query("FROM Subsystem sub WHERE sub.uuid = ?1")
@@ -57,7 +57,7 @@ public interface ISubsystemRepository extends JpaRepository<Subsystem, Long> {
@Query("FROM Subsystem sub WHERE sub.latest = true AND sub.deleted = false")
List<Subsystem> findLatestNotDeleted();
- @Query("FROM Subsystem sub WHERE sub.latest = true AND sub.deleted = false AND sub.parent_uuid = ?1")
+ @Query("FROM Subsystem sub WHERE sub.latest = true AND sub.deleted = false AND sub.parentUuid = ?1")
List<Subsystem> findLatestNotDeletedByParent(String uuid);
}
diff --git a/src/main/java/org/openepics/names/repository/ISystemRepository.java b/src/main/java/org/openepics/names/repository/ISystemRepository.java
index 0933f2cc..7e33eb14 100644
--- a/src/main/java/org/openepics/names/repository/ISystemRepository.java
+++ b/src/main/java/org/openepics/names/repository/ISystemRepository.java
@@ -42,7 +42,7 @@ public interface ISystemRepository extends JpaRepository<System, Long> {
@Query("FROM System sys WHERE sys.latest = true AND sys.deleted = false AND sys.uuid = ?1")
System findLatestNotDeletedByUuid(String uuid);
- @Query("FROM System sys WHERE sys.latest = true AND sys.deleted = false AND sys.parent_uuid = ?1 and sys.mnemonic = ?2")
+ @Query("FROM System sys WHERE sys.latest = true AND sys.deleted = false AND sys.parentUuid = ?1 and sys.mnemonic = ?2")
System findLatestNotDeletedByParentAndMnemonic(String uuid, String mnemonic);
@Query("FROM System sys WHERE sys.uuid = ?1")
@@ -57,7 +57,7 @@ public interface ISystemRepository extends JpaRepository<System, Long> {
@Query("FROM System sys WHERE sys.latest = true AND sys.deleted = false")
List<System> findLatestNotDeleted();
- @Query("FROM System sys WHERE sys.latest = true AND sys.deleted = false AND sys.parent_uuid = ?1")
+ @Query("FROM System sys WHERE sys.latest = true AND sys.deleted = false AND sys.parentUuid = ?1")
List<System> findLatestNotDeletedByParent(String uuid);
}
diff --git a/src/main/java/org/openepics/names/repository/model/DeviceGroup.java b/src/main/java/org/openepics/names/repository/model/DeviceGroup.java
index 5c729b9d..f1828215 100644
--- a/src/main/java/org/openepics/names/repository/model/DeviceGroup.java
+++ b/src/main/java/org/openepics/names/repository/model/DeviceGroup.java
@@ -21,6 +21,7 @@ package org.openepics.names.repository.model;
import java.util.Date;
import java.util.UUID;
+import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
@@ -40,11 +41,12 @@ public class DeviceGroup extends Structure {
*/
private static final long serialVersionUID = -8762287473417706804L;
- public static final String FIELD_PARENT_UUID = "parent_uuid";
+ public static final String FIELD_PARENT_UUID = "parentUuid";
public static final String FUNCTION_GET_MNEMONIC_PATH_DEVICEGROUP = "get_mnemonic_path_devicegroup";
- private String parent_uuid;
+ @Column(name = "parent_uuid")
+ private String parentUuid;
/**
* Constructor for DeviceGroup.
@@ -75,14 +77,14 @@ public class DeviceGroup extends Structure {
super(uuid, name, mnemonic, mnemonicEquivalence,
description, status, latest, deleted,
requested, requestedBy, requestedComment);
- this.parent_uuid = parentUuid != null ? parentUuid.toString() : null;
+ this.parentUuid = parentUuid != null ? parentUuid.toString() : null;
}
public UUID getParentUuid() {
- return parent_uuid != null ? UUID.fromString(parent_uuid) : null;
+ return parentUuid != null ? UUID.fromString(parentUuid) : null;
}
- public void setParentUuid(UUID parent_uuid) {
- this.parent_uuid = parent_uuid != null ? parent_uuid.toString() : null;
+ public void setParentUuid(UUID parentUuid) {
+ this.parentUuid = parentUuid != null ? parentUuid.toString() : null;
}
@Override
diff --git a/src/main/java/org/openepics/names/repository/model/DeviceType.java b/src/main/java/org/openepics/names/repository/model/DeviceType.java
index 8bc11354..ece1a8a8 100644
--- a/src/main/java/org/openepics/names/repository/model/DeviceType.java
+++ b/src/main/java/org/openepics/names/repository/model/DeviceType.java
@@ -21,6 +21,7 @@ package org.openepics.names.repository.model;
import java.util.Date;
import java.util.UUID;
+import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
@@ -40,11 +41,12 @@ public class DeviceType extends Structure {
*/
private static final long serialVersionUID = 2061731870402041740L;
- public static final String FIELD_PARENT_UUID = "parent_uuid";
+ public static final String FIELD_PARENT_UUID = "parentUuid";
public static final String FUNCTION_GET_MNEMONIC_PATH_DEVICETYPE = "get_mnemonic_path_devicetype";
- private String parent_uuid;
+ @Column(name = "parent_uuid")
+ private String parentUuid;
/**
* Constructor for DeviceType.
@@ -75,14 +77,14 @@ public class DeviceType extends Structure {
super(uuid, name, mnemonic, mnemonicEquivalence,
description, status, latest, deleted,
requested, requestedBy, requestedComment);
- this.parent_uuid = parentUuid != null ? parentUuid.toString() : null;
+ this.parentUuid = parentUuid != null ? parentUuid.toString() : null;
}
public UUID getParentUuid() {
- return parent_uuid != null ? UUID.fromString(parent_uuid) : null;
+ return parentUuid != null ? UUID.fromString(parentUuid) : null;
}
- public void setParentUuid(UUID parent_uuid) {
- this.parent_uuid = parent_uuid != null ? parent_uuid.toString() : null;
+ public void setParentUuid(UUID parentUuid) {
+ this.parentUuid = parentUuid != null ? parentUuid.toString() : null;
}
@Override
diff --git a/src/main/java/org/openepics/names/repository/model/Name.java b/src/main/java/org/openepics/names/repository/model/Name.java
index b5afcb39..09be7a46 100644
--- a/src/main/java/org/openepics/names/repository/model/Name.java
+++ b/src/main/java/org/openepics/names/repository/model/Name.java
@@ -22,6 +22,7 @@ import java.io.Serializable;
import java.util.Date;
import java.util.UUID;
+import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
@@ -41,21 +42,28 @@ public class Name extends NameStructure implements Serializable {
*/
private static final long serialVersionUID = 7313392211143183879L;
- public static final String FIELD_SYSTEM_GROUP_UUID = "systemgroup_uuid";
- public static final String FIELD_SYSTEM_UUID = "system_uuid";
- public static final String FIELD_SUBSYSTEM_UUID = "subsystem_uuid";
- public static final String FIELD_DEVICETYPE_UUID = "devicetype_uuid";
- public static final String FIELD_INSTANCE_INDEX = "instance_index";
- public static final String FIELD_CONVENTION_NAME = "convention_name";
- public static final String FIELD_CONVENTION_NAME_EQUIVALENCE = "convention_name_equivalence";
+ public static final String FIELD_SYSTEM_GROUP_UUID = "systemgroupUuid";
+ public static final String FIELD_SYSTEM_UUID = "systemUuid";
+ public static final String FIELD_SUBSYSTEM_UUID = "subsystemUuid";
+ public static final String FIELD_DEVICETYPE_UUID = "devicetypeUuid";
+ public static final String FIELD_INSTANCE_INDEX = "instanceIndex";
+ public static final String FIELD_CONVENTION_NAME = "conventionName";
+ public static final String FIELD_CONVENTION_NAME_EQUIVALENCE = "conventionNameEquivalence";
- private String systemgroup_uuid;
- private String system_uuid;
- private String subsystem_uuid;
- private String devicetype_uuid;
- private String instance_index;
- private String convention_name;
- private String convention_name_equivalence;
+ @Column(name = "systemgroup_uuid")
+ private String systemgroupUuid;
+ @Column(name = "system_uuid")
+ private String systemUuid;
+ @Column(name = "subsystem_uuid")
+ private String subsystemUuid;
+ @Column(name = "devicetype_uuid")
+ private String devicetypeUuid;
+ @Column(name = "instance_index")
+ private String instanceIndex;
+ @Column(name = "convention_name")
+ private String conventionName;
+ @Column(name = "convention_name_equivalence")
+ private String conventionNameEquivalence;
/**
* Constructor for Name.
@@ -104,46 +112,46 @@ public class Name extends NameStructure implements Serializable {
}
public UUID getSystemgroupUuid() {
- return systemgroup_uuid != null ? UUID.fromString(systemgroup_uuid) : null;
+ return systemgroupUuid != null ? UUID.fromString(systemgroupUuid) : null;
}
- public void setSystemgroupUuid(UUID systemgroup_uuid) {
- this.systemgroup_uuid = systemgroup_uuid != null ? systemgroup_uuid.toString() : null;
+ public void setSystemgroupUuid(UUID systemgroupUuid) {
+ this.systemgroupUuid = systemgroupUuid != null ? systemgroupUuid.toString() : null;
}
public UUID getSystemUuid() {
- return system_uuid != null ? UUID.fromString(system_uuid) : null;
+ return systemUuid != null ? UUID.fromString(systemUuid) : null;
}
- public void setSystemUuid(UUID system_uuid) {
- this.system_uuid = system_uuid != null ? system_uuid.toString() : null;
+ public void setSystemUuid(UUID systemUuid) {
+ this.systemUuid = systemUuid != null ? systemUuid.toString() : null;
}
public UUID getSubsystemUuid() {
- return subsystem_uuid != null ? UUID.fromString(subsystem_uuid) : null;
+ return subsystemUuid != null ? UUID.fromString(subsystemUuid) : null;
}
- public void setSubsystemUuid(UUID subsystem_uuid) {
- this.subsystem_uuid = subsystem_uuid != null ? subsystem_uuid.toString() : null;
+ public void setSubsystemUuid(UUID subsystemUuid) {
+ this.subsystemUuid = subsystemUuid != null ? subsystemUuid.toString() : null;
}
public UUID getDevicetypeUuid() {
- return devicetype_uuid != null ? UUID.fromString(devicetype_uuid) : null;
+ return devicetypeUuid != null ? UUID.fromString(devicetypeUuid) : null;
}
- public void setDevicetypeUuid(UUID devicetype_uuid) {
- this.devicetype_uuid = devicetype_uuid != null ? devicetype_uuid.toString() : null;
+ public void setDevicetypeUuid(UUID devicetypeUuid) {
+ this.devicetypeUuid = devicetypeUuid != null ? devicetypeUuid.toString() : null;
}
public String getInstanceIndex() {
- return instance_index;
+ return instanceIndex;
}
- public void setInstanceIndex(String instance_index) {
- this.instance_index = instance_index;
+ public void setInstanceIndex(String instanceIndex) {
+ this.instanceIndex = instanceIndex;
}
public String getConventionName() {
- return convention_name;
+ return conventionName;
}
- public void setConventionName(String convention_name) {
- this.convention_name = convention_name;
+ public void setConventionName(String conventionName) {
+ this.conventionName = conventionName;
}
public String getConventionNameEquivalence() {
- return convention_name_equivalence;
+ return conventionNameEquivalence;
}
- public void setConventionNameEquivalence(String convention_name_equivalence) {
- this.convention_name_equivalence = convention_name_equivalence;
+ public void setConventionNameEquivalence(String conventionNameEquivalence) {
+ this.conventionNameEquivalence = conventionNameEquivalence;
}
@Override
diff --git a/src/main/java/org/openepics/names/repository/model/NameStructure.java b/src/main/java/org/openepics/names/repository/model/NameStructure.java
index a282ff4c..1e143c33 100644
--- a/src/main/java/org/openepics/names/repository/model/NameStructure.java
+++ b/src/main/java/org/openepics/names/repository/model/NameStructure.java
@@ -23,6 +23,7 @@ import java.util.Date;
import java.util.Objects;
import java.util.UUID;
+import javax.persistence.Column;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
import javax.persistence.MappedSuperclass;
@@ -49,11 +50,11 @@ public class NameStructure extends Persistable implements Serializable {
public static final String FIELD_LATEST = "latest";
public static final String FIELD_DELETED = "deleted";
public static final String FIELD_REQUESTED = "requested";
- public static final String FIELD_REQUESTED_BY = "requested_by";
- public static final String FIELD_REQUESTED_COMMENT = "requested_comment";
+ public static final String FIELD_REQUESTED_BY = "requestedBy";
+ public static final String FIELD_REQUESTED_COMMENT = "requestedComment";
public static final String FIELD_PROCESSED = "processed";
- public static final String FIELD_PROCESSED_BY = "processed_by";
- public static final String FIELD_PROCESSED_COMMENT = "processed_comment";
+ public static final String FIELD_PROCESSED_BY = "processedBy";
+ public static final String FIELD_PROCESSED_COMMENT = "processedComment";
public static final String FUNCTION_GET_MNEMONIC_PATH_DEVICE_STRUCTURE = "get_mnemonic_path_device_structure";
public static final String FUNCTION_GET_MNEMONIC_PATH_SYSTEM_STRUCTURE = "get_mnemonic_path_system_structure";
@@ -66,11 +67,15 @@ public class NameStructure extends Persistable implements Serializable {
private Boolean latest;
private Boolean deleted;
private Date requested;
- private String requested_by;
- private String requested_comment;
+ @Column(name = "requested_by")
+ private String requestedBy;
+ @Column(name = "requested_comment")
+ private String requestedComment;
private Date processed;
- private String processed_by;
- private String processed_comment;
+ @Column(name = "processed_by")
+ private String processedBy;
+ @Column(name = "processed_comment")
+ private String processedComment;
public UUID getUuid() {
return uuid != null ? UUID.fromString(uuid) : null;
@@ -109,16 +114,16 @@ public class NameStructure extends Persistable implements Serializable {
this.requested = requested;
}
public String getRequestedBy() {
- return requested_by;
+ return requestedBy;
}
- public void setRequestedBy(String requested_by) {
- this.requested_by = requested_by;
+ public void setRequestedBy(String requestedBy) {
+ this.requestedBy = requestedBy;
}
public String getRequestedComment() {
- return requested_comment;
+ return requestedComment;
}
- public void setRequestedComment(String requested_comment) {
- this.requested_comment = requested_comment;
+ public void setRequestedComment(String requestedComment) {
+ this.requestedComment = requestedComment;
}
public Date getProcessed() {
return processed;
@@ -127,16 +132,16 @@ public class NameStructure extends Persistable implements Serializable {
this.processed = processed;
}
public String getProcessedBy() {
- return processed_by;
+ return processedBy;
}
- public void setProcessedBy(String processed_by) {
- this.processed_by = processed_by;
+ public void setProcessedBy(String processedBy) {
+ this.processedBy = processedBy;
}
public String getProcessedComment() {
- return processed_comment;
+ return processedComment;
}
- public void setProcessedComment(String processed_comment) {
- this.processed_comment = processed_comment;
+ public void setProcessedComment(String processedComment) {
+ this.processedComment = processedComment;
}
@Override
diff --git a/src/main/java/org/openepics/names/repository/model/Structure.java b/src/main/java/org/openepics/names/repository/model/Structure.java
index 4bcc0c6d..86003f23 100644
--- a/src/main/java/org/openepics/names/repository/model/Structure.java
+++ b/src/main/java/org/openepics/names/repository/model/Structure.java
@@ -22,6 +22,7 @@ import java.io.Serializable;
import java.util.Date;
import java.util.UUID;
+import javax.persistence.Column;
import javax.persistence.MappedSuperclass;
import org.openepics.names.rest.beans.Status;
@@ -42,11 +43,12 @@ public class Structure extends NameStructure implements Serializable {
public static final String FIELD_NAME = "name";
public static final String FIELD_MNEMONIC = "mnemonic";
- public static final String FIELD_MNEMONIC_EQUIVALENCE = "mnemonic_equivalence";
+ public static final String FIELD_MNEMONIC_EQUIVALENCE = "mnemonicEquivalence";
private String name;
private String mnemonic;
- private String mnemonic_equivalence;
+ @Column(name = "mnemonic_equivalence")
+ private String mnemonicEquivalence;
/**
* Constructor for Structure.
@@ -98,10 +100,10 @@ public class Structure extends NameStructure implements Serializable {
this.mnemonic = mnemonic;
}
public String getMnemonicEquivalence() {
- return mnemonic_equivalence;
+ return mnemonicEquivalence;
}
- public void setMnemonicEquivalence(String mnemonic_equivalence) {
- this.mnemonic_equivalence = mnemonic_equivalence;
+ public void setMnemonicEquivalence(String mnemonicEquivalence) {
+ this.mnemonicEquivalence = mnemonicEquivalence;
}
/**
diff --git a/src/main/java/org/openepics/names/repository/model/Subsystem.java b/src/main/java/org/openepics/names/repository/model/Subsystem.java
index 22bdece5..d34ac382 100644
--- a/src/main/java/org/openepics/names/repository/model/Subsystem.java
+++ b/src/main/java/org/openepics/names/repository/model/Subsystem.java
@@ -21,6 +21,7 @@ package org.openepics.names.repository.model;
import java.util.Date;
import java.util.UUID;
+import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
@@ -40,11 +41,12 @@ public class Subsystem extends Structure {
*/
private static final long serialVersionUID = 5662135540008222500L;
- public static final String FIELD_PARENT_UUID = "parent_uuid";
+ public static final String FIELD_PARENT_UUID = "parentUuid";
public static final String FUNCTION_GET_MNEMONIC_PATH_SUBSYSTEM = "get_mnemonic_path_subsystem";
- private String parent_uuid;
+ @Column(name = "parent_uuid")
+ private String parentUuid;
/**
* Constructor for Subsystem.
@@ -75,14 +77,14 @@ public class Subsystem extends Structure {
super(uuid, name, mnemonic, mnemonicEquivalence,
description, status, latest, deleted,
requested, requestedBy, requestedComment);
- this.parent_uuid = parentUuid != null ? parentUuid.toString() : null;
+ this.parentUuid = parentUuid != null ? parentUuid.toString() : null;
}
public UUID getParentUuid() {
- return parent_uuid != null ? UUID.fromString(parent_uuid) : null;
+ return parentUuid != null ? UUID.fromString(parentUuid) : null;
}
- public void setParentUuid(UUID parent_uuid) {
- this.parent_uuid = parent_uuid != null ? parent_uuid.toString() : null;
+ public void setParentUuid(UUID parentUuid) {
+ this.parentUuid = parentUuid != null ? parentUuid.toString() : null;
}
@Override
diff --git a/src/main/java/org/openepics/names/repository/model/System.java b/src/main/java/org/openepics/names/repository/model/System.java
index 684da88c..deb24e73 100644
--- a/src/main/java/org/openepics/names/repository/model/System.java
+++ b/src/main/java/org/openepics/names/repository/model/System.java
@@ -21,6 +21,7 @@ package org.openepics.names.repository.model;
import java.util.Date;
import java.util.UUID;
+import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
@@ -40,11 +41,12 @@ public class System extends Structure {
*/
private static final long serialVersionUID = -4323438470765348486L;
- public static final String FIELD_PARENT_UUID = "parent_uuid";
+ public static final String FIELD_PARENT_UUID = "parentUuid";
public static final String FUNCTION_GET_MNEMONIC_PATH_SYSTEM = "get_mnemonic_path_system";
- private String parent_uuid;
+ @Column(name = "parent_uuid")
+ private String parentUuid;
/**
* Constructor for System.
@@ -75,14 +77,14 @@ public class System extends Structure {
super(uuid, name, mnemonic, mnemonicEquivalence,
description, status, latest, deleted,
requested, requestedBy, requestedComment);
- this.parent_uuid = parentUuid != null ? parentUuid.toString() : null;
+ this.parentUuid = parentUuid != null ? parentUuid.toString() : null;
}
public UUID getParentUuid() {
- return parent_uuid != null ? UUID.fromString(parent_uuid) : null;
+ return parentUuid != null ? UUID.fromString(parentUuid) : null;
}
- public void setParentUuid(UUID parent_uuid) {
- this.parent_uuid = parent_uuid != null ? parent_uuid.toString() : null;
+ public void setParentUuid(UUID parentUuid) {
+ this.parentUuid = parentUuid != null ? parentUuid.toString() : null;
}
@Override
diff --git a/src/main/java/org/openepics/names/rest/controller/VerificationController.java b/src/main/java/org/openepics/names/rest/controller/VerificationController.java
index 64c6d00f..40bc8f52 100644
--- a/src/main/java/org/openepics/names/rest/controller/VerificationController.java
+++ b/src/main/java/org/openepics/names/rest/controller/VerificationController.java
@@ -214,11 +214,11 @@ public class VerificationController {
// keep track of id
// ok
// nok
- SortedSet<Long> id_ok_deviceRevisionDevice = new TreeSet<>();
- SortedSet<Long> id_nok_deviceRevisionDevice = new TreeSet<>();
+ SortedSet<Long> idOkDeviceRevisionDevice = new TreeSet<>();
+ SortedSet<Long> idNokDeviceRevisionDevice = new TreeSet<>();
- prepareLogReport("readMigrationDeviceRevision, check, before, id_ok_deviceRevisionDevice.size: " + id_ok_deviceRevisionDevice.size(), reportHtml);
- prepareLogReport("readMigrationDeviceRevision, check, before, id_nok_deviceRevisionDevice.size: " + id_nok_deviceRevisionDevice.size(), reportHtml);
+ prepareLogReport("readMigrationDeviceRevision, check, before, idOkDeviceRevisionDevice.size: " + idOkDeviceRevisionDevice.size(), reportHtml);
+ prepareLogReport("readMigrationDeviceRevision, check, before, idNokDeviceRevisionDevice.size: " + idNokDeviceRevisionDevice.size(), reportHtml);
// name
// check entry by entry
@@ -287,20 +287,20 @@ public class VerificationController {
// add to count
if (check) {
- id_ok_deviceRevisionDevice.add(name.getId());
+ idOkDeviceRevisionDevice.add(name.getId());
} else {
- id_nok_deviceRevisionDevice.add(name.getId());
+ idNokDeviceRevisionDevice.add(name.getId());
}
}
// ok if
// all entries ok
// no entry nok
- boolean ok = id_ok_deviceRevisionDevice.size() == names.size()
- && id_nok_deviceRevisionDevice.isEmpty();
+ boolean ok = idOkDeviceRevisionDevice.size() == names.size()
+ && idNokDeviceRevisionDevice.isEmpty();
- prepareLogReport("readMigrationDeviceRevision, check, after, id_ok_deviceRevisionDevice.size: " + id_ok_deviceRevisionDevice.size(), reportHtml);
- prepareLogReport("readMigrationDeviceRevision, check, after, id_nok_deviceRevisionDevice.size: " + id_nok_deviceRevisionDevice.size(), reportHtml);
+ prepareLogReport("readMigrationDeviceRevision, check, after, idOkDeviceRevisionDevice.size: " + idOkDeviceRevisionDevice.size(), reportHtml);
+ prepareLogReport("readMigrationDeviceRevision, check, after, idNokDeviceRevisionDevice.size: " + idNokDeviceRevisionDevice.size(), reportHtml);
prepareLogReport("readMigrationDeviceRevision, ok: " + ok, reportHtml);
return reportHtml.toString();
@@ -456,11 +456,11 @@ public class VerificationController {
// keep track of id
// ok
// nok
- SortedSet<Long> id_ok_namePartRevision = new TreeSet<>();
- SortedSet<Long> id_nok_namePartRevision = new TreeSet<>();
+ SortedSet<Long> idOkNamePartRevision = new TreeSet<>();
+ SortedSet<Long> idNokNamePartRevision = new TreeSet<>();
- prepareLogReport("readMigrationNamePartRevision, check, before, id_ok_namePartRevision.size: " + id_ok_namePartRevision.size(), reportHtml);
- prepareLogReport("readMigrationNamePartRevision, check, before, id_nok_namePartRevision.size: " + id_nok_namePartRevision.size(), reportHtml);
+ prepareLogReport("readMigrationNamePartRevision, check, before, idOkNamePartRevision.size: " + idOkNamePartRevision.size(), reportHtml);
+ prepareLogReport("readMigrationNamePartRevision, check, before, idNokNamePartRevision.size: " + idNokNamePartRevision.size(), reportHtml);
// system group
// check entry by entry
@@ -504,13 +504,13 @@ public class VerificationController {
// add to count
if (check) {
- id_ok_namePartRevision.add(systemGroup.getId());
+ idOkNamePartRevision.add(systemGroup.getId());
} else {
- id_nok_namePartRevision.add(systemGroup.getId());
+ idNokNamePartRevision.add(systemGroup.getId());
}
}
- prepareLogReport("readMigrationNamePartRevision, check, after systemgroup, id_ok_namePartRevision.size: " + id_ok_namePartRevision.size(), reportHtml);
- prepareLogReport("readMigrationNamePartRevision, check, after systemgroup, id_nok_namePartRevision.size: " + id_nok_namePartRevision.size(), reportHtml);
+ prepareLogReport("readMigrationNamePartRevision, check, after systemgroup, idOkNamePartRevision.size: " + idOkNamePartRevision.size(), reportHtml);
+ prepareLogReport("readMigrationNamePartRevision, check, after systemgroup, idNokNamePartRevision.size: " + idNokNamePartRevision.size(), reportHtml);
// system
// check entry by entry
@@ -553,13 +553,13 @@ public class VerificationController {
// add to count
if (check) {
- id_ok_namePartRevision.add(system.getId());
+ idOkNamePartRevision.add(system.getId());
} else {
- id_nok_namePartRevision.add(system.getId());
+ idNokNamePartRevision.add(system.getId());
}
}
- prepareLogReport("readMigrationNamePartRevision, check, after system, id_ok_namePartRevision.size: " + id_ok_namePartRevision.size(), reportHtml);
- prepareLogReport("readMigrationNamePartRevision, check, after system, id_nok_namePartRevision.size: " + id_nok_namePartRevision.size(), reportHtml);
+ prepareLogReport("readMigrationNamePartRevision, check, after system, idOkNamePartRevision.size: " + idOkNamePartRevision.size(), reportHtml);
+ prepareLogReport("readMigrationNamePartRevision, check, after system, idNokNamePartRevision.size: " + idNokNamePartRevision.size(), reportHtml);
// subsystem
// check entry by entry
@@ -602,13 +602,13 @@ public class VerificationController {
// add to count
if (check) {
- id_ok_namePartRevision.add(subsystem.getId());
+ idOkNamePartRevision.add(subsystem.getId());
} else {
- id_nok_namePartRevision.add(subsystem.getId());
+ idNokNamePartRevision.add(subsystem.getId());
}
}
- prepareLogReport("readMigrationNamePartRevision, check, after subsystem, id_ok_namePartRevision.size: " + id_ok_namePartRevision.size(), reportHtml);
- prepareLogReport("readMigrationNamePartRevision, check, after subsystem, id_nok_namePartRevision.size: " + id_nok_namePartRevision.size(), reportHtml);
+ prepareLogReport("readMigrationNamePartRevision, check, after subsystem, idOkNamePartRevision.size: " + idOkNamePartRevision.size(), reportHtml);
+ prepareLogReport("readMigrationNamePartRevision, check, after subsystem, idNokNamePartRevision.size: " + idNokNamePartRevision.size(), reportHtml);
// discipline
// check entry by entry
@@ -650,13 +650,13 @@ public class VerificationController {
// add to count
if (check) {
- id_ok_namePartRevision.add(discipline.getId());
+ idOkNamePartRevision.add(discipline.getId());
} else {
- id_nok_namePartRevision.add(discipline.getId());
+ idNokNamePartRevision.add(discipline.getId());
}
}
- prepareLogReport("readMigrationNamePartRevision, check, after discipline, id_ok_namePartRevision.size: " + id_ok_namePartRevision.size(), reportHtml);
- prepareLogReport("readMigrationNamePartRevision, check, after discipline, id_nok_namePartRevision.size: " + id_nok_namePartRevision.size(), reportHtml);
+ prepareLogReport("readMigrationNamePartRevision, check, after discipline, idOkNamePartRevision.size: " + idOkNamePartRevision.size(), reportHtml);
+ prepareLogReport("readMigrationNamePartRevision, check, after discipline, idNokNamePartRevision.size: " + idNokNamePartRevision.size(), reportHtml);
// device group
// check entry by entry
@@ -699,13 +699,13 @@ public class VerificationController {
// add to count
if (check) {
- id_ok_namePartRevision.add(deviceGroup.getId());
+ idOkNamePartRevision.add(deviceGroup.getId());
} else {
- id_nok_namePartRevision.add(deviceGroup.getId());
+ idNokNamePartRevision.add(deviceGroup.getId());
}
}
- prepareLogReport("readMigrationNamePartRevision, check, after devicegroup, id_ok_namePartRevision.size: " + id_ok_namePartRevision.size(), reportHtml);
- prepareLogReport("readMigrationNamePartRevision, check, after devicegroup, id_nok_namePartRevision.size: " + id_nok_namePartRevision.size(), reportHtml);
+ prepareLogReport("readMigrationNamePartRevision, check, after devicegroup, idOkNamePartRevision.size: " + idOkNamePartRevision.size(), reportHtml);
+ prepareLogReport("readMigrationNamePartRevision, check, after devicegroup, idNokNamePartRevision.size: " + idNokNamePartRevision.size(), reportHtml);
// device type
// check entry by entry
@@ -748,22 +748,22 @@ public class VerificationController {
// add to count
if (check) {
- id_ok_namePartRevision.add(deviceType.getId());
+ idOkNamePartRevision.add(deviceType.getId());
} else {
- id_nok_namePartRevision.add(deviceType.getId());
+ idNokNamePartRevision.add(deviceType.getId());
}
}
- prepareLogReport("readMigrationNamePartRevision, check, after devicetype, id_ok_namePartRevision.size: " + id_ok_namePartRevision.size(), reportHtml);
- prepareLogReport("readMigrationNamePartRevision, check, after devicetype, id_nok_namePartRevision.size: " + id_nok_namePartRevision.size(), reportHtml);
+ prepareLogReport("readMigrationNamePartRevision, check, after devicetype, idOkNamePartRevision.size: " + idOkNamePartRevision.size(), reportHtml);
+ prepareLogReport("readMigrationNamePartRevision, check, after devicetype, idNokNamePartRevision.size: " + idNokNamePartRevision.size(), reportHtml);
// ok if
// all entries ok
// no entry nok
- boolean ok = id_ok_namePartRevision.size() == namePartRevisions.size()
- && id_nok_namePartRevision.isEmpty();
+ boolean ok = idOkNamePartRevision.size() == namePartRevisions.size()
+ && idNokNamePartRevision.isEmpty();
- prepareLogReport("readMigrationNamePartRevision, check, after, id_ok_namePartRevision.size: " + id_ok_namePartRevision.size(), reportHtml);
- prepareLogReport("readMigrationNamePartRevision, check, after, id_nok_namePartRevision.size: " + id_nok_namePartRevision.size(), reportHtml);
+ prepareLogReport("readMigrationNamePartRevision, check, after, idOkNamePartRevision.size: " + idOkNamePartRevision.size(), reportHtml);
+ prepareLogReport("readMigrationNamePartRevision, check, after, idNokNamePartRevision.size: " + idNokNamePartRevision.size(), reportHtml);
prepareLogReport("readMigrationNamePartRevision, ok: " + ok, reportHtml);
return reportHtml.toString();
diff --git a/src/main/java/org/openepics/names/service/StructuresService.java b/src/main/java/org/openepics/names/service/StructuresService.java
index 67d6670d..d6361b3c 100644
--- a/src/main/java/org/openepics/names/service/StructuresService.java
+++ b/src/main/java/org/openepics/names/service/StructuresService.java
@@ -406,31 +406,31 @@ public class StructuresService {
// validate input
ValidateUtil.validateInputUuid(uuid);
- boolean type_systemGroup = type != null && Type.SYSTEMGROUP.equals(type);
- boolean type_system = type != null && Type.SYSTEM.equals(type);
- boolean type_subsystem = type != null && Type.SUBSYSTEM.equals(type);
- boolean type_discipline = type != null && Type.DISCIPLINE.equals(type);
- boolean type_deviceGroup = type != null && Type.DEVICEGROUP.equals(type);
- boolean type_deviceType = type != null && Type.DEVICETYPE.equals(type);
- boolean type_either = type_systemGroup || type_system || type_subsystem || type_discipline || type_deviceGroup || type_deviceType;
+ boolean typeSystemGroup = type != null && Type.SYSTEMGROUP.equals(type);
+ boolean typeSystem = type != null && Type.SYSTEM.equals(type);
+ boolean typeSubsystem = type != null && Type.SUBSYSTEM.equals(type);
+ boolean typeDiscipline = type != null && Type.DISCIPLINE.equals(type);
+ boolean typeDeviceGroup = type != null && Type.DEVICEGROUP.equals(type);
+ boolean typeDeviceType = type != null && Type.DEVICETYPE.equals(type);
+ boolean typeEither = typeSystemGroup || typeSystem || typeSubsystem || typeDiscipline || typeDeviceGroup || typeDeviceType;
// do
final List<StructureElement> structureElements = Lists.newArrayList();
ResponsePageStructureElements response = null;
- if (type_either) {
- if (type_systemGroup) {
+ if (typeEither) {
+ if (typeSystemGroup) {
response = readStructures(Type.SYSTEM, new Status[] {Status.APPROVED}, false,
null, uuid, null, null, null, null, null,
orderBy, isAsc, offset, limit);
- } else if (type_system) {
+ } else if (typeSystem) {
response = readStructures(Type.SUBSYSTEM, new Status[] {Status.APPROVED}, false,
null, uuid, null, null, null, null, null,
orderBy, isAsc, offset, limit);
- } else if (type_discipline) {
+ } else if (typeDiscipline) {
response = readStructures(Type.DEVICEGROUP, new Status[] {Status.APPROVED}, false,
null, uuid, null, null, null, null, null,
orderBy, isAsc, offset, limit);
- } else if (type_deviceGroup) {
+ } else if (typeDeviceGroup) {
response = readStructures(Type.DEVICETYPE, new Status[] {Status.APPROVED}, false,
null, uuid, null, null, null, null, null,
orderBy, isAsc, offset, limit);
@@ -564,13 +564,13 @@ public class StructuresService {
// validate input
ValidateUtil.validateInputUuid(uuid);
- boolean type_systemGroup = type != null && Type.SYSTEMGROUP.equals(type);
- boolean type_system = type != null && Type.SYSTEM.equals(type);
- boolean type_subsystem = type != null && Type.SUBSYSTEM.equals(type);
- boolean type_discipline = type != null && Type.DISCIPLINE.equals(type);
- boolean type_deviceGroup = type != null && Type.DEVICEGROUP.equals(type);
- boolean type_deviceType = type != null && Type.DEVICETYPE.equals(type);
- boolean type_either = type_systemGroup || type_system || type_subsystem || type_discipline || type_deviceGroup || type_deviceType;
+ boolean typeSystemGroup = type != null && Type.SYSTEMGROUP.equals(type);
+ boolean typeSystem = type != null && Type.SYSTEM.equals(type);
+ boolean typeSubsystem = type != null && Type.SUBSYSTEM.equals(type);
+ boolean typeDiscipline = type != null && Type.DISCIPLINE.equals(type);
+ boolean typeDeviceGroup = type != null && Type.DEVICEGROUP.equals(type);
+ boolean typeDeviceType = type != null && Type.DEVICETYPE.equals(type);
+ boolean typeEither = typeSystemGroup || typeSystem || typeSubsystem || typeDiscipline || typeDeviceGroup || typeDeviceType;
// mnemonic path does not make same sense for history
// (very) tricky to find mnemonic path for uuid at proper time (history)
@@ -579,18 +579,18 @@ public class StructuresService {
// do
final List<StructureElement> structureElements = Lists.newArrayList();
ResponsePageStructureElements response = null;
- if (type_either) {
- if (type_systemGroup) {
+ if (typeEither) {
+ if (typeSystemGroup) {
response = readStructures(Type.SYSTEMGROUP, null, null, uuid, null, null, null, null, null, null, Boolean.TRUE, orderBy, isAsc, offset, limit, StructureChoice.HISTORY);
- } else if (type_system) {
+ } else if (typeSystem) {
response = readStructures(Type.SYSTEM, null, null, uuid, null, null, null, null, null, null, Boolean.TRUE, orderBy, isAsc, offset, limit, StructureChoice.HISTORY);
- } else if (type_subsystem) {
+ } else if (typeSubsystem) {
response = readStructures(Type.SUBSYSTEM, null, null, uuid, null, null, null, null, null, null, Boolean.TRUE, orderBy, isAsc, offset, limit, StructureChoice.HISTORY);
- } else if (type_discipline) {
+ } else if (typeDiscipline) {
response = readStructures(Type.DISCIPLINE, null, null, uuid, null, null, null, null, null, null, Boolean.TRUE, orderBy, isAsc, offset, limit, StructureChoice.HISTORY);
- } else if (type_deviceGroup) {
+ } else if (typeDeviceGroup) {
response = readStructures(Type.DEVICEGROUP, null, null, uuid, null, null, null, null, null, null, Boolean.TRUE, orderBy, isAsc, offset, limit, StructureChoice.HISTORY);
- } else if (type_deviceType) {
+ } else if (typeDeviceType) {
response = readStructures(Type.DEVICETYPE, null, null, uuid, null, null, null, null, null, null, Boolean.TRUE, orderBy, isAsc, offset, limit, StructureChoice.HISTORY);
}
} else {
--
GitLab