From c051999635a548ad74733c77b81b0fb87d7941fc Mon Sep 17 00:00:00 2001
From: Lars Johansson <lars.johansson@ess.eu>
Date: Mon, 19 Feb 2024 14:50:22 +0100
Subject: [PATCH] Remove comment from write operations
Update integration tests.
---
.../names/repository/model/Name.java | 4 +-
.../openepics/names/rest/api/v1/INames.java | 28 +-
.../names/rest/api/v1/IStructures.java | 44 ++-
.../names/rest/beans/element/NameElement.java | 28 +-
.../beans/element/NameElementCommand.java | 22 +-
.../element/NameElementCommandConfirm.java | 18 +-
.../element/NameElementCommandCreate.java | 22 +-
.../element/NameElementCommandUpdate.java | 8 +-
.../rest/beans/element/StructureElement.java | 26 +-
.../element/StructureElementCommand.java | 21 +-
.../StructureElementCommandConfirm.java | 21 +-
.../StructureElementCommandCreate.java | 21 +-
.../StructureElementCommandUpdate.java | 7 +-
.../names/service/DeviceGroupService.java | 26 +-
.../names/service/DeviceTypeService.java | 24 +-
.../names/service/DisciplineService.java | 26 +-
.../openepics/names/service/NamesService.java | 38 ++-
.../names/service/StructuresService.java | 1 -
.../names/service/SubsystemService.java | 26 +-
.../names/service/SystemGroupService.java | 28 +-
.../names/service/SystemService.java | 28 +-
.../org/openepics/names/util/ExcelUtil.java | 64 ++---
.../openepics/names/util/NameElementUtil.java | 56 ++--
.../names/util/StructureElementUtil.java | 154 +++++-----
.../org/openepics/names/util/TextUtil.java | 1 -
.../names/util/ValidateNameElementUtil.java | 27 +-
.../util/ValidateStructureElementUtil.java | 58 ++--
.../openepics/names/util/ValidateUtil.java | 11 -
.../util/notification/NotificationName.java | 9 +-
.../notification/NotificationStructure.java | 9 +-
.../util/notification/NotificationUtil.java | 6 -
.../templates/notification_names.html | 6 -
.../templates/notification_structures.html | 12 -
.../org/openepics/names/docker/ConvertIT.java | 42 ++-
.../org/openepics/names/docker/MetricsIT.java | 22 +-
.../org/openepics/names/docker/NamesIT.java | 131 +++------
.../org/openepics/names/docker/PvNamesIT.java | 22 +-
.../names/docker/StructuresDeviceGroupIT.java | 270 +++++++----------
.../names/docker/StructuresDeviceTypeIT.java | 270 +++++++----------
.../names/docker/StructuresDisciplineIT.java | 264 +++++++----------
.../names/docker/StructuresSubsystemIT.java | 270 +++++++----------
.../names/docker/StructuresSystemGroupIT.java | 272 +++++++-----------
.../names/docker/StructuresSystemIT.java | 267 +++++++----------
.../docker/complex/NamesInstanceIndexIT.java | 167 ++++-------
.../names/docker/complex/NamesLegacyIT.java | 99 ++++---
.../NamesLegacyStructuresDeleteIT.java | 99 ++++---
.../NamesLegacyStructuresUpdateIT.java | 99 ++++---
.../names/docker/complex/NamesMultipleIT.java | 176 +++++-------
.../docker/complex/StructuresLevel3IT.java | 159 ++++------
.../docker/complex/StructuresMultipleIT.java | 184 +++++-------
.../repository/model/DeviceGroupTest.java | 40 +--
.../repository/model/DeviceTypeTest.java | 40 +--
.../repository/model/DisciplineTest.java | 40 +--
.../names/repository/model/NameTest.java | 40 +--
.../names/repository/model/StructureTest.java | 40 +--
.../names/repository/model/SubsystemTest.java | 40 +--
.../repository/model/SystemGroupTest.java | 40 +--
.../names/repository/model/SystemTest.java | 40 +--
.../NameElementCommandConfirmTest.java | 25 +-
.../element/NameElementCommandCreateTest.java | 43 ++-
.../beans/element/NameElementCommandTest.java | 43 ++-
.../element/NameElementCommandUpdateTest.java | 25 +-
.../rest/beans/element/NameElementTest.java | 60 ++--
.../StructureElementCommandConfirmTest.java | 25 +-
.../StructureElementCommandCreateTest.java | 34 ++-
.../element/StructureElementCommandTest.java | 34 ++-
.../StructureElementCommandUpdateTest.java | 34 ++-
.../beans/element/StructureElementTest.java | 60 ++--
.../names/util/NameElementUtilTest.java | 85 ++----
.../names/util/StructureElementUtilTest.java | 85 ++----
.../openepics/names/util/UtilitiesTest.java | 18 +-
.../names/util/ValidateUtilTest.java | 42 ---
.../notification/NotificationNameTest.java | 6 +-
.../NotificationStructureTest.java | 6 +-
.../notification/NotificationUtilTest.java | 12 +-
.../INTEGRATIONTEST_DOCKER_TUTORIAL.md | 7 +-
.../NameElementCommand_create_name.xlsx | Bin 7251 -> 7221 bytes
...lementCommand_create_name_NameElement.xlsx | Bin 7576 -> 7618 bytes
...nd_create_name_different_column_order.xlsx | Bin 7281 -> 7246 bytes
...ElementCommand_create_name_empty_uuid.xlsx | Bin 7178 -> 7146 bytes
...entCommand_create_name_incorrect_uuid.xlsx | Bin 7260 -> 7231 bytes
..._incorrect_uuid_parentdevicestructure.xlsx | Bin 7228 -> 7199 bytes
..._incorrect_uuid_parentsystemstructure.xlsx | Bin 7229 -> 7199 bytes
...ntCommand_create_name_too_few_columns.xlsx | Bin 6999 -> 6954 bytes
...tCommand_create_name_too_many_columns.xlsx | Bin 7433 -> 7450 bytes
...and_create_name_too_many_columns_uuid.xlsx | Bin 7428 -> 7460 bytes
.../NameElementCommand_create_names.xlsx | Bin 7381 -> 7331 bytes
...StructureElementCommand_create_system.xlsx | Bin 7381 -> 7318 bytes
...ommand_create_system_StructureElement.xlsx | Bin 7651 -> 7666 bytes
..._create_system_different_column_order.xlsx | Bin 7407 -> 7340 bytes
...ementCommand_create_system_empty_uuid.xlsx | Bin 7345 -> 7279 bytes
...mand_create_system_incorrect_ordering.xlsx | Bin 7369 -> 7319 bytes
...tCommand_create_system_incorrect_uuid.xlsx | Bin 7383 -> 7336 bytes
...d_create_system_incorrect_uuid_parent.xlsx | Bin 7346 -> 7298 bytes
...Command_create_system_too_few_columns.xlsx | Bin 7033 -> 6969 bytes
...ommand_create_system_too_many_columns.xlsx | Bin 7529 -> 7550 bytes
...d_create_system_too_many_columns_uuid.xlsx | Bin 7532 -> 7557 bytes
...tructureElementCommand_create_systems.xlsx | Bin 7462 -> 7392 bytes
98 files changed, 1885 insertions(+), 2772 deletions(-)
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 64e3a4c0..68c8537a 100644
--- a/src/main/java/org/openepics/names/repository/model/Name.java
+++ b/src/main/java/org/openepics/names/repository/model/Name.java
@@ -92,8 +92,8 @@ public class Name extends NameStructure implements Serializable {
* @param requestedComment requested comment
*/
public Name(UUID uuid, UUID systemGroupUuid, UUID systemUuid, UUID subsystemUuid, UUID deviceTypeUuid,
- String index, String conventionName, String conventionNameEquivalence,
- String description, Status status, Boolean latest, Boolean deleted,
+ String index, String conventionName, String conventionNameEquivalence, String description,
+ Status status, Boolean latest, Boolean deleted,
Date requested, String requestedBy, String requestedComment) {
setUuid(uuid);
setSystemGroupUuid(systemGroupUuid);
diff --git a/src/main/java/org/openepics/names/rest/api/v1/INames.java b/src/main/java/org/openepics/names/rest/api/v1/INames.java
index 1ba1d2c4..e635d03a 100644
--- a/src/main/java/org/openepics/names/rest/api/v1/INames.java
+++ b/src/main/java/org/openepics/names/rest/api/v1/INames.java
@@ -61,20 +61,19 @@ import io.swagger.v3.oas.annotations.tags.Tag;
public interface INames {
/*
- NameElementCommandCreate - parentSystemStructure, parentDeviceStructure, index, description, comment
- NameElementCommandUpdate - uuid, parentSystemStructure, parentDeviceStructure, index, description, comment
- NameElementCommandConfirm - uuid, comment
+ NameElementCommandCreate - parentSystemStructure, parentDeviceStructure, index, description
+ NameElementCommandUpdate - uuid, parentSystemStructure, parentDeviceStructure, index, description
+ NameElementCommandConfirm - uuid
----------------------------------------------------------------------------------------------------
converted into NameElementCommand
----------------------------------------------------------------------------------------------------
- NameElementCommand - uuid, parentSystemStructure, parentDeviceStructure, index, description, comment
+ NameElementCommand - uuid, parentSystemStructure, parentDeviceStructure, index, description
NameElement
uuid (UUID)
parentSystemStructure (UUID)
parentDeviceStructure (UUID)
index (String)
description (String)
- comment (String)
----------------------------------
systemStructure (String)
deviceStructure (String)
@@ -84,6 +83,7 @@ public interface INames {
deleted (Boolean)
when (Date)
who (String)
+ comment (String)
Methods
create POST /names - createNames
@@ -139,7 +139,6 @@ public interface INames {
Required attributes:
- parentSystemStructure
- description
- - comment
Optional attributes:
- parentDeviceStructure
@@ -200,7 +199,7 @@ public interface INames {
array = @ArraySchema(
schema = @Schema(
implementation = NameElementCommandCreate.class,
- requiredProperties = {"parentSystemStructure","description","comment"}))))
+ requiredProperties = {"parentSystemStructure","description"}))))
@RequestBody List<NameElementCommandCreate> nameElementCommands);
// ----------------------------------------------------------------------------------------------------
@@ -675,7 +674,6 @@ public interface INames {
Required attributes:
- parentSystemStructure
- description
- - comment
Optional attributes:
- parentDeviceStructure
@@ -722,7 +720,7 @@ public interface INames {
array = @ArraySchema(
schema = @Schema(
implementation = NameElementCommandCreate.class,
- requiredProperties = {"parentSystemStructure","parentDeviceStructure","index","description","comment"}))))
+ requiredProperties = {"parentSystemStructure","parentDeviceStructure","index","description"}))))
@RequestBody List<NameElementCommandCreate> nameElementCommands);
/**
@@ -748,7 +746,6 @@ public interface INames {
- uuid
- parentSystemStructure
- description
- - comment
Optional attributes:
- parentDeviceStructure
@@ -792,7 +789,7 @@ public interface INames {
array = @ArraySchema(
schema = @Schema(
implementation = NameElementCommandUpdate.class,
- requiredProperties = {"uuid","parentSystemStructure","description","comment"}))))
+ requiredProperties = {"uuid","parentSystemStructure","description"}))))
@RequestBody List<NameElementCommandUpdate> nameElementCommands);
/**
@@ -816,7 +813,6 @@ public interface INames {
Required attributes:
- uuid
- - comment
"""
)
@ApiResponses(value = {
@@ -856,7 +852,7 @@ public interface INames {
array = @ArraySchema(
schema = @Schema(
implementation = NameElementCommandConfirm.class,
- requiredProperties = {"uuid","comment"}))))
+ requiredProperties = {"uuid"}))))
@RequestBody List<NameElementCommandConfirm> nameElementCommands);
// ----------------------------------------------------------------------------------------------------
@@ -878,7 +874,6 @@ public interface INames {
- uuid
- parentSystemStructure
- description
- - comment
Optional attributes:
- parentDeviceStructure
@@ -936,7 +931,7 @@ public interface INames {
array = @ArraySchema(
schema = @Schema(
implementation = NameElementCommandUpdate.class,
- requiredProperties = {"uuid","parentSystemStructure","description","comment"}))))
+ requiredProperties = {"uuid","parentSystemStructure","description"}))))
@RequestBody List<NameElementCommandUpdate> nameElementCommands);
// ----------------------------------------------------------------------------------------------------
@@ -955,7 +950,6 @@ public interface INames {
Required attributes:
- uuid
- - comment
"""
)
@ApiResponses(value = {
@@ -1000,7 +994,7 @@ public interface INames {
array = @ArraySchema(
schema = @Schema(
implementation = NameElementCommandConfirm.class,
- requiredProperties = {"uuid","comment"}))))
+ requiredProperties = {"uuid"}))))
@RequestBody List<NameElementCommandConfirm> nameElementCommands);
}
diff --git a/src/main/java/org/openepics/names/rest/api/v1/IStructures.java b/src/main/java/org/openepics/names/rest/api/v1/IStructures.java
index d1b02a30..9bd727e3 100644
--- a/src/main/java/org/openepics/names/rest/api/v1/IStructures.java
+++ b/src/main/java/org/openepics/names/rest/api/v1/IStructures.java
@@ -64,9 +64,9 @@ import io.swagger.v3.oas.annotations.tags.Tag;
public interface IStructures {
/*
- StructureElementCommandCreate - type, parent, mnemonic, ordering, description, comment
- StructureElementCommandUpdate - uuid, type, parent, mnemonic, ordering, description, comment
- StructureElementCommandConfirm - uuid, type, comment
+ StructureElementCommandCreate - type, parent, mnemonic, ordering, description
+ StructureElementCommandUpdate - uuid, type, parent, mnemonic, ordering, description
+ StructureElementCommandConfirm - uuid, type
----------------------------------------------------------------------------------------------------
converted into StructureElementCommand
----------------------------------------------------------------------------------------------------
@@ -78,7 +78,6 @@ public interface IStructures {
mnemonic (String)
ordering (String)
description (String)
- comment (String)
-------------------------
mnemonicPath (String)
level (Integer)
@@ -87,6 +86,7 @@ public interface IStructures {
deleted (Boolean)
when (Date)
who (String)
+ comment (String)
Methods
create POST /structures - createStructures
@@ -147,7 +147,6 @@ public interface IStructures {
Required attributes:
- type
- description
- - comment
Optional attributes:
- parent
@@ -211,7 +210,7 @@ public interface IStructures {
array = @ArraySchema(
schema = @Schema(
implementation = StructureElementCommandCreate.class,
- requiredProperties = {"type","description","comment"}))))
+ requiredProperties = {"type","description"}))))
@RequestBody List<StructureElementCommandCreate> structureElementCommands);
// ----------------------------------------------------------------------------------------------------
@@ -614,7 +613,6 @@ public interface IStructures {
Required attributes:
- type
- description
- - comment
Optional attributes:
- parent
@@ -664,7 +662,7 @@ public interface IStructures {
array = @ArraySchema(
schema = @Schema(
implementation = StructureElementCommandCreate.class,
- requiredProperties = {"type","description","comment"}))))
+ requiredProperties = {"type","description"}))))
@RequestBody List<StructureElementCommandCreate> structureElementCommands);
/**
@@ -696,7 +694,6 @@ public interface IStructures {
- uuid
- type
- description
- - comment
Optional attributes:
- parent
@@ -745,7 +742,7 @@ public interface IStructures {
array = @ArraySchema(
schema = @Schema(
implementation = StructureElementCommandUpdate.class,
- requiredProperties = {"uuid","type","description","comment"}))))
+ requiredProperties = {"uuid","type","description"}))))
@RequestBody List<StructureElementCommandUpdate> structureElementCommands);
/**
@@ -776,7 +773,6 @@ public interface IStructures {
Required attributes:
- uuid
- type
- - comment
"""
)
@ApiResponses(value = {
@@ -816,7 +812,7 @@ public interface IStructures {
array = @ArraySchema(
schema = @Schema(
implementation = StructureElementCommandConfirm.class,
- requiredProperties = {"uuid","type","comment"}))))
+ requiredProperties = {"uuid","type"}))))
@RequestBody List<StructureElementCommandConfirm> structureElementCommands);
/**
@@ -847,7 +843,6 @@ public interface IStructures {
Required attributes:
- uuid
- type
- - comment
"""
)
@ApiResponses(value = {
@@ -887,7 +882,7 @@ public interface IStructures {
array = @ArraySchema(
schema = @Schema(
implementation = StructureElementCommandConfirm.class,
- requiredProperties = {"uuid","type","comment"}))))
+ requiredProperties = {"uuid","type"}))))
@RequestBody List<StructureElementCommandConfirm> structureElementCommands);
/**
@@ -918,7 +913,6 @@ public interface IStructures {
Required attributes:
- uuid
- type
- - comment
"""
)
@ApiResponses(value = {
@@ -958,7 +952,7 @@ public interface IStructures {
array = @ArraySchema(
schema = @Schema(
implementation = StructureElementCommandConfirm.class,
- requiredProperties = {"uuid","type","comment"}))))
+ requiredProperties = {"uuid","type"}))))
@RequestBody List<StructureElementCommandConfirm> structureElementCommands);
/**
@@ -989,7 +983,6 @@ public interface IStructures {
Required attributes:
- uuid
- type
- - comment
"""
)
@ApiResponses(value = {
@@ -1029,7 +1022,7 @@ public interface IStructures {
array = @ArraySchema(
schema = @Schema(
implementation = StructureElementCommandConfirm.class,
- requiredProperties = {"uuid","type","comment"}))))
+ requiredProperties = {"uuid","type"}))))
@RequestBody List<StructureElementCommandConfirm> structureElementCommands);
// ----------------------------------------------------------------------------------------------------
@@ -1051,7 +1044,6 @@ public interface IStructures {
- uuid
- type
- description
- - comment
Optional attributes:
- parent
@@ -1114,7 +1106,7 @@ public interface IStructures {
array = @ArraySchema(
schema = @Schema(
implementation = StructureElementCommandUpdate.class,
- requiredProperties = {"uuid","type","description","comment"}))))
+ requiredProperties = {"uuid","type","description"}))))
@RequestBody List<StructureElementCommandUpdate> structureElementCommands);
// ----------------------------------------------------------------------------------------------------
@@ -1134,7 +1126,6 @@ public interface IStructures {
Required attributes:
- uuid
- type
- - comment
"""
)
@ApiResponses(value = {
@@ -1179,7 +1170,7 @@ public interface IStructures {
array = @ArraySchema(
schema = @Schema(
implementation = StructureElementCommandConfirm.class,
- requiredProperties = {"uuid","type","comment"}))))
+ requiredProperties = {"uuid","type"}))))
@RequestBody List<StructureElementCommandConfirm> structureElementCommands);
// ----------------------------------------------------------------------------------------------------
@@ -1206,7 +1197,6 @@ public interface IStructures {
Required attributes:
- uuid
- type
- - comment
"""
)
@ApiResponses(value = {
@@ -1255,7 +1245,7 @@ public interface IStructures {
array = @ArraySchema(
schema = @Schema(
implementation = StructureElementCommandConfirm.class,
- requiredProperties = {"uuid","type","comment"}))))
+ requiredProperties = {"uuid","type"}))))
@RequestBody List<StructureElementCommandConfirm> structureElementCommands);
/**
@@ -1274,7 +1264,6 @@ public interface IStructures {
Required attributes:
- uuid
- type
- - comment
"""
)
@ApiResponses(value = {
@@ -1323,7 +1312,7 @@ public interface IStructures {
array = @ArraySchema(
schema = @Schema(
implementation = StructureElementCommandConfirm.class,
- requiredProperties = {"uuid","type","comment"}))))
+ requiredProperties = {"uuid","type"}))))
@RequestBody List<StructureElementCommandConfirm> structureElementCommands);
/**
@@ -1342,7 +1331,6 @@ public interface IStructures {
Required attributes:
- uuid
- type
- - comment
"""
)
@ApiResponses(value = {
@@ -1391,7 +1379,7 @@ public interface IStructures {
array = @ArraySchema(
schema = @Schema(
implementation = StructureElementCommandConfirm.class,
- requiredProperties = {"uuid","type","comment"}))))
+ requiredProperties = {"uuid","type"}))))
@RequestBody List<StructureElementCommandConfirm> structureElementCommands);
}
diff --git a/src/main/java/org/openepics/names/rest/beans/element/NameElement.java b/src/main/java/org/openepics/names/rest/beans/element/NameElement.java
index 3fc41fd5..bfa1e34e 100644
--- a/src/main/java/org/openepics/names/rest/beans/element/NameElement.java
+++ b/src/main/java/org/openepics/names/rest/beans/element/NameElement.java
@@ -60,6 +60,8 @@ public class NameElement extends NameElementCommand implements Serializable {
private Date when;
@Schema(description = "Name (user) of who created the name entry.")
private String who;
+ @Schema(description = "Comment of the name entry.")
+ private String comment;
/**
* Public constructor.
@@ -76,7 +78,6 @@ public class NameElement extends NameElementCommand implements Serializable {
* @param parentDeviceStructure parent device structure uuid
* @param index index
* @param description description
- * @param comment comment
* @param systemStructure system structure mnemonic path
* @param deviceStructure device structure mnemonic path
* @param name name
@@ -85,14 +86,15 @@ public class NameElement extends NameElementCommand implements Serializable {
* @param deleted deleted
* @param when when
* @param who who
+ * @param comment comment
*/
public NameElement(
- UUID uuid, UUID parentSystemStructure, UUID parentDeviceStructure, String index,
- String description, String comment,
+ UUID uuid, UUID parentSystemStructure, UUID parentDeviceStructure,
+ String index, String description,
String systemStructure, String deviceStructure, String name,
Status status, Boolean latest, Boolean deleted,
- Date when, String who) {
- super(uuid, parentSystemStructure, parentDeviceStructure, index, description, comment);
+ Date when, String who, String comment) {
+ super(uuid, parentSystemStructure, parentDeviceStructure, index, description);
this.systemStructure = systemStructure;
this.deviceStructure = deviceStructure;
this.name = name;
@@ -101,6 +103,7 @@ public class NameElement extends NameElementCommand implements Serializable {
this.deleted = deleted;
this.when = when;
this.who = who;
+ this.comment = comment;
}
public String getSystemStructure() {
@@ -151,6 +154,12 @@ public class NameElement extends NameElementCommand implements Serializable {
public void setWho(String who) {
this.who = who;
}
+ public String getComment() {
+ return comment;
+ }
+ public void setComment(String comment) {
+ this.comment = comment;
+ }
@Override
public boolean equals(Object obj) {
@@ -212,13 +221,18 @@ public class NameElement extends NameElementCommand implements Serializable {
return false;
} else if (!getWho().equals(other.getWho()))
return false;
+ if (getComment() == null) {
+ if (other.getComment() != null)
+ return false;
+ } else if (!getComment().equals(other.getComment()))
+ return false;
return true;
}
@Override
public int hashCode() {
- return Objects.hash(getUuid(), getWhen());
+ return Objects.hash(getUuid(), getWhen(), getComment());
}
@Override
@@ -231,8 +245,8 @@ public class NameElement extends NameElementCommand implements Serializable {
sb.append(", \"systemStructure\": " + getSystemStructure());
sb.append(", \"deviceStructure\": " + getDeviceStructure());
sb.append(", \"index\": " + getIndex());
- sb.append(", \"name\": " + getName());
sb.append(", \"description\": " + getDescription());
+ sb.append(", \"name\": " + getName());
sb.append(", \"status\": " + getStatus());
sb.append(", \"latest\": " + isLatest());
sb.append(", \"deleted\": " + isDeleted());
diff --git a/src/main/java/org/openepics/names/rest/beans/element/NameElementCommand.java b/src/main/java/org/openepics/names/rest/beans/element/NameElementCommand.java
index b75d1557..8d7494e4 100644
--- a/src/main/java/org/openepics/names/rest/beans/element/NameElementCommand.java
+++ b/src/main/java/org/openepics/names/rest/beans/element/NameElementCommand.java
@@ -51,8 +51,6 @@ public class NameElementCommand implements Serializable {
private String index;
@Schema(description = "Description (verbose) of the name entry.")
private String description;
- @Schema(description = "Comment of the name entry command.")
- private String comment;
/**
* Public constructor.
@@ -68,18 +66,16 @@ public class NameElementCommand implements Serializable {
* @param parentDeviceStructure parent device structure uuid
* @param index index
* @param description description
- * @param comment comment
*/
public NameElementCommand(
- UUID uuid, UUID parentSystemStructure, UUID parentDeviceStructure, String index,
- String description, String comment) {
+ UUID uuid, UUID parentSystemStructure, UUID parentDeviceStructure,
+ String index, String description) {
super();
this.uuid = uuid;
this.parentSystemStructure = parentSystemStructure;
this.parentDeviceStructure = parentDeviceStructure;
this.index = index;
this.description = description;
- this.comment = comment;
}
public UUID getUuid() {
@@ -112,12 +108,6 @@ public class NameElementCommand implements Serializable {
public void setDescription(String description) {
this.description = description;
}
- public String getComment() {
- return comment;
- }
- public void setComment(String comment) {
- this.comment = comment;
- }
@Override
public boolean equals(Object obj) {
@@ -160,11 +150,6 @@ public class NameElementCommand implements Serializable {
return false;
} else if (!getDescription().equals(other.getDescription()))
return false;
- if (getComment() == null) {
- if (other.getComment() != null)
- return false;
- } else if (!getComment().equals(other.getComment()))
- return false;
return true;
}
@@ -173,7 +158,7 @@ public class NameElementCommand implements Serializable {
public int hashCode() {
return Objects.hash(
getUuid(), getParentSystemStructure(), getParentDeviceStructure(), getIndex(),
- getDescription(), getComment());
+ getDescription());
}
@Override
@@ -185,7 +170,6 @@ public class NameElementCommand implements Serializable {
sb.append(", \"parentDeviceStructure\": " + getParentDeviceStructure());
sb.append(", \"index\": " + getIndex());
sb.append(", \"description\": " + getDescription());
- sb.append(", \"comment\": " + getComment());
sb.append("}");
return sb.toString();
}
diff --git a/src/main/java/org/openepics/names/rest/beans/element/NameElementCommandConfirm.java b/src/main/java/org/openepics/names/rest/beans/element/NameElementCommandConfirm.java
index c305db94..0cecd084 100644
--- a/src/main/java/org/openepics/names/rest/beans/element/NameElementCommandConfirm.java
+++ b/src/main/java/org/openepics/names/rest/beans/element/NameElementCommandConfirm.java
@@ -15,8 +15,6 @@ public class NameElementCommandConfirm implements Serializable {
@Schema(description = "Identity (uuid) of the name entry. Value is created server-side.")
private UUID uuid;
- @Schema(description = "Comment of the name entry command.")
- private String comment;
/**
* Public constructor.
@@ -28,13 +26,11 @@ public class NameElementCommandConfirm implements Serializable {
* Public constructor.
*
* @param uuid uuid
- * @param comment comment
*/
public NameElementCommandConfirm(
- UUID uuid, String comment) {
+ UUID uuid) {
super();
this.uuid = uuid;
- this.comment = comment;
}
public UUID getUuid() {
@@ -43,12 +39,6 @@ public class NameElementCommandConfirm implements Serializable {
public void setUuid(UUID uuid) {
this.uuid = uuid;
}
- public String getComment() {
- return comment;
- }
- public void setComment(String comment) {
- this.comment = comment;
- }
@Override
public boolean equals(Object obj) {
@@ -71,11 +61,6 @@ public class NameElementCommandConfirm implements Serializable {
return false;
} else if (!getUuid().equals(other.getUuid()))
return false;
- if (getComment() == null) {
- if (other.getComment() != null)
- return false;
- } else if (!getComment().equals(other.getComment()))
- return false;
return true;
}
@@ -90,7 +75,6 @@ public class NameElementCommandConfirm implements Serializable {
StringBuilder sb = new StringBuilder();
sb.append("{");
sb.append("\"uuid\": " + getUuid());
- sb.append(", \"comment\": " + getComment());
sb.append("}");
return sb.toString();
}
diff --git a/src/main/java/org/openepics/names/rest/beans/element/NameElementCommandCreate.java b/src/main/java/org/openepics/names/rest/beans/element/NameElementCommandCreate.java
index 19a2a89e..57be55f4 100644
--- a/src/main/java/org/openepics/names/rest/beans/element/NameElementCommandCreate.java
+++ b/src/main/java/org/openepics/names/rest/beans/element/NameElementCommandCreate.java
@@ -21,8 +21,6 @@ public class NameElementCommandCreate implements Serializable {
private String index;
@Schema(description = "Description (verbose) of the name entry.")
private String description;
- @Schema(description = "Comment of the name entry command.")
- private String comment;
/**
* Public constructor.
@@ -37,17 +35,15 @@ public class NameElementCommandCreate implements Serializable {
* @param parentDeviceStructure parent device structure uuid
* @param index index
* @param description description
- * @param comment comment
*/
public NameElementCommandCreate(
- UUID parentSystemStructure, UUID parentDeviceStructure, String index,
- String description, String comment) {
+ UUID parentSystemStructure, UUID parentDeviceStructure,
+ String index, String description) {
super();
this.parentSystemStructure = parentSystemStructure;
this.parentDeviceStructure = parentDeviceStructure;
this.index = index;
this.description = description;
- this.comment = comment;
}
public UUID getParentSystemStructure() {
@@ -74,12 +70,6 @@ public class NameElementCommandCreate implements Serializable {
public void setDescription(String description) {
this.description = description;
}
- public String getComment() {
- return comment;
- }
- public void setComment(String comment) {
- this.comment = comment;
- }
@Override
public boolean equals(Object obj) {
@@ -117,11 +107,6 @@ public class NameElementCommandCreate implements Serializable {
return false;
} else if (!getDescription().equals(other.getDescription()))
return false;
- if (getComment() == null) {
- if (other.getComment() != null)
- return false;
- } else if (!getComment().equals(other.getComment()))
- return false;
return true;
}
@@ -130,7 +115,7 @@ public class NameElementCommandCreate implements Serializable {
public int hashCode() {
return Objects.hash(
getParentSystemStructure(), getParentDeviceStructure(), getIndex(),
- getDescription(), getComment());
+ getDescription());
}
@Override
@@ -141,7 +126,6 @@ public class NameElementCommandCreate implements Serializable {
sb.append(", \"parentDeviceStructure\": " + getParentDeviceStructure());
sb.append(", \"index\": " + getIndex());
sb.append(", \"description\": " + getDescription());
- sb.append(", \"comment\": " + getComment());
sb.append("}");
return sb.toString();
}
diff --git a/src/main/java/org/openepics/names/rest/beans/element/NameElementCommandUpdate.java b/src/main/java/org/openepics/names/rest/beans/element/NameElementCommandUpdate.java
index b45ba7c4..9375649f 100644
--- a/src/main/java/org/openepics/names/rest/beans/element/NameElementCommandUpdate.java
+++ b/src/main/java/org/openepics/names/rest/beans/element/NameElementCommandUpdate.java
@@ -30,12 +30,11 @@ public class NameElementCommandUpdate extends NameElementCommandCreate implement
* @param parentDeviceStructure parent device structure uuid
* @param index index
* @param description description
- * @param comment comment
*/
public NameElementCommandUpdate(
- UUID uuid, UUID parentSystemStructure, UUID parentDeviceStructure, String index,
- String description, String comment) {
- super(parentSystemStructure, parentDeviceStructure, index, description, comment);
+ UUID uuid, UUID parentSystemStructure, UUID parentDeviceStructure,
+ String index, String description) {
+ super(parentSystemStructure, parentDeviceStructure, index, description);
this.uuid = uuid;
}
@@ -89,7 +88,6 @@ public class NameElementCommandUpdate extends NameElementCommandCreate implement
sb.append(", \"parentDeviceStructure\": " + getParentDeviceStructure());
sb.append(", \"index\": " + getIndex());
sb.append(", \"description\": " + getDescription());
- sb.append(", \"comment\": " + getComment());
sb.append("}");
return sb.toString();
}
diff --git a/src/main/java/org/openepics/names/rest/beans/element/StructureElement.java b/src/main/java/org/openepics/names/rest/beans/element/StructureElement.java
index 6481c598..f9c512b0 100644
--- a/src/main/java/org/openepics/names/rest/beans/element/StructureElement.java
+++ b/src/main/java/org/openepics/names/rest/beans/element/StructureElement.java
@@ -59,6 +59,8 @@ public class StructureElement extends StructureElementCommand implements Seriali
private Date when;
@Schema(description = "Name (user) of who created the structure entry.")
private String who;
+ @Schema(description = "Comment of the structure entry.")
+ private String comment;
/**
* Public constructor.
@@ -76,7 +78,6 @@ public class StructureElement extends StructureElementCommand implements Seriali
* @param mnemonic mnemonic
* @param ordering ordering
* @param description description
- * @param comment comment
* @param mnemonicPath mnemonic path
* @param level level
* @param status status
@@ -84,14 +85,15 @@ public class StructureElement extends StructureElementCommand implements Seriali
* @param deleted deleted
* @param when when
* @param who who
+ * @param comment comment
*/
public StructureElement(
- UUID uuid, Type type, UUID parent, String mnemonic, Integer ordering,
- String description, String comment,
+ UUID uuid, Type type, UUID parent,
+ String mnemonic, Integer ordering, String description,
String mnemonicPath, Integer level,
Status status, Boolean latest, Boolean deleted,
- Date when, String who) {
- super(uuid, type, parent, mnemonic, ordering, description, comment);
+ Date when, String who, String comment) {
+ super(uuid, type, parent, mnemonic, ordering, description);
this.mnemonicPath = mnemonicPath;
this.level = level;
this.status = status;
@@ -99,6 +101,7 @@ public class StructureElement extends StructureElementCommand implements Seriali
this.deleted = deleted;
this.when = when;
this.who = who;
+ this.comment = comment;
}
public String getMnemonicPath() {
@@ -143,6 +146,12 @@ public class StructureElement extends StructureElementCommand implements Seriali
public void setWho(String who) {
this.who = who;
}
+ public String getComment() {
+ return comment;
+ }
+ public void setComment(String comment) {
+ this.comment = comment;
+ }
@Override
public boolean equals(Object obj) {
@@ -199,13 +208,18 @@ public class StructureElement extends StructureElementCommand implements Seriali
return false;
} else if (!getWho().equals(other.getWho()))
return false;
+ if (getComment() == null) {
+ if (other.getComment() != null)
+ return false;
+ } else if (!getComment().equals(other.getComment()))
+ return false;
return true;
}
@Override
public int hashCode() {
- return Objects.hash(getUuid(), getWhen());
+ return Objects.hash(getUuid(), getWhen(), getComment());
}
@Override
diff --git a/src/main/java/org/openepics/names/rest/beans/element/StructureElementCommand.java b/src/main/java/org/openepics/names/rest/beans/element/StructureElementCommand.java
index e989c61f..00fe0668 100644
--- a/src/main/java/org/openepics/names/rest/beans/element/StructureElementCommand.java
+++ b/src/main/java/org/openepics/names/rest/beans/element/StructureElementCommand.java
@@ -55,8 +55,6 @@ public class StructureElementCommand implements Serializable {
private Integer ordering;
@Schema(description = "Description (verbose) of the structure entry.")
private String description;
- @Schema(description = "Comment of the structure entry command.")
- private String comment;
/**
* Public constructor.
@@ -73,12 +71,10 @@ public class StructureElementCommand implements Serializable {
* @param mnemonic mnemonic
* @param ordering ordering
* @param description description
- * @param comment comment
*/
public StructureElementCommand(
UUID uuid, Type type, UUID parent,
- String mnemonic, Integer ordering,
- String description, String comment) {
+ String mnemonic, Integer ordering, String description) {
super();
this.uuid = uuid;
this.type = type;
@@ -86,7 +82,6 @@ public class StructureElementCommand implements Serializable {
this.mnemonic = mnemonic;
this.ordering = ordering;
this.description = description;
- this.comment = comment;
}
public UUID getUuid() {
@@ -125,12 +120,6 @@ public class StructureElementCommand implements Serializable {
public void setDescription(String description) {
this.description = description;
}
- public String getComment() {
- return comment;
- }
- public void setComment(String comment) {
- this.comment = comment;
- }
@Override
public boolean equals(Object obj) {
@@ -178,11 +167,6 @@ public class StructureElementCommand implements Serializable {
return false;
} else if (!getDescription().equals(other.getDescription()))
return false;
- if (getComment() == null) {
- if (other.getComment() != null)
- return false;
- } else if (!getComment().equals(other.getComment()))
- return false;
return true;
}
@@ -191,7 +175,7 @@ public class StructureElementCommand implements Serializable {
public int hashCode() {
return Objects.hash(
getUuid(), getType(), getParent(),
- getMnemonic(), getDescription(), getComment());
+ getMnemonic(), getDescription());
}
@Override
@@ -204,7 +188,6 @@ public class StructureElementCommand implements Serializable {
sb.append(", \"mnemonic\": " + getMnemonic());
sb.append(", \"ordering\": " + getOrdering());
sb.append(", \"description\": " + getDescription());
- sb.append(", \"comment\": " + getComment());
sb.append("}");
return sb.toString();
}
diff --git a/src/main/java/org/openepics/names/rest/beans/element/StructureElementCommandConfirm.java b/src/main/java/org/openepics/names/rest/beans/element/StructureElementCommandConfirm.java
index d7a2fb92..1bbf7d72 100644
--- a/src/main/java/org/openepics/names/rest/beans/element/StructureElementCommandConfirm.java
+++ b/src/main/java/org/openepics/names/rest/beans/element/StructureElementCommandConfirm.java
@@ -19,8 +19,6 @@ public class StructureElementCommandConfirm implements Serializable {
private UUID uuid;
@Schema(description = "Type of the structure entry. Valid values - SYSTEMGROUP, SYSTEM, SUBSYSTEM, DISCIPLINE, DEVICEGROUP, DEVICETYPE.")
private Type type;
- @Schema(description = "Comment of the structure entry command.")
- private String comment;
/**
* Public constructor.
@@ -33,14 +31,12 @@ public class StructureElementCommandConfirm implements Serializable {
*
* @param uuid uuid
* @param type type
- * @param comment comment
*/
public StructureElementCommandConfirm(
- UUID uuid, Type type, String comment) {
+ UUID uuid, Type type) {
super();
this.uuid = uuid;
this.type = type;
- this.comment = comment;
}
public UUID getUuid() {
@@ -55,12 +51,6 @@ public class StructureElementCommandConfirm implements Serializable {
public void setType(Type type) {
this.type = type;
}
- public String getComment() {
- return comment;
- }
- public void setComment(String comment) {
- this.comment = comment;
- }
@Override
public boolean equals(Object obj) {
@@ -88,19 +78,13 @@ public class StructureElementCommandConfirm implements Serializable {
return false;
} else if (!getType().equals(other.getType()))
return false;
- if (getComment() == null) {
- if (other.getComment() != null)
- return false;
- } else if (!getComment().equals(other.getComment()))
- return false;
return true;
}
@Override
public int hashCode() {
- return Objects.hash(
- getUuid());
+ return Objects.hash(getUuid());
}
@Override
@@ -109,7 +93,6 @@ public class StructureElementCommandConfirm implements Serializable {
sb.append("{");
sb.append("\"uuid\": " + getUuid());
sb.append(", \"type\": " + getType());
- sb.append(", \"comment\": " + getComment());
sb.append("}");
return sb.toString();
}
diff --git a/src/main/java/org/openepics/names/rest/beans/element/StructureElementCommandCreate.java b/src/main/java/org/openepics/names/rest/beans/element/StructureElementCommandCreate.java
index 4c1acb23..543d5016 100644
--- a/src/main/java/org/openepics/names/rest/beans/element/StructureElementCommandCreate.java
+++ b/src/main/java/org/openepics/names/rest/beans/element/StructureElementCommandCreate.java
@@ -25,8 +25,6 @@ public class StructureElementCommandCreate implements Serializable {
private Integer ordering;
@Schema(description = "Description (verbose) of the structure entry.")
private String description;
- @Schema(description = "Comment of the structure entry command.")
- private String comment;
/**
* Public constructor.
@@ -42,19 +40,16 @@ public class StructureElementCommandCreate implements Serializable {
* @param mnemonic mnemonic
* @param ordering ordering
* @param description description
- * @param comment comment
*/
public StructureElementCommandCreate(
Type type, UUID parent,
- String mnemonic, Integer ordering,
- String description, String comment) {
+ String mnemonic, Integer ordering, String description) {
super();
this.type = type;
this.parent = parent;
this.mnemonic = mnemonic;
this.ordering = ordering;
this.description = description;
- this.comment = comment;
}
public Type getType() {
@@ -87,12 +82,6 @@ public class StructureElementCommandCreate implements Serializable {
public void setDescription(String description) {
this.description = description;
}
- public String getComment() {
- return comment;
- }
- public void setComment(String comment) {
- this.comment = comment;
- }
@Override
public boolean equals(Object obj) {
@@ -135,11 +124,6 @@ public class StructureElementCommandCreate implements Serializable {
return false;
} else if (!getDescription().equals(other.getDescription()))
return false;
- if (getComment() == null) {
- if (other.getComment() != null)
- return false;
- } else if (!getComment().equals(other.getComment()))
- return false;
return true;
}
@@ -147,7 +131,7 @@ public class StructureElementCommandCreate implements Serializable {
@Override
public int hashCode() {
return Objects.hash(
- getType(), getParent(), getMnemonic(), getDescription(), getComment());
+ getType(), getParent(), getMnemonic(), getDescription());
}
@Override
@@ -159,7 +143,6 @@ public class StructureElementCommandCreate implements Serializable {
sb.append(", \"mnemonic\": " + getMnemonic());
sb.append(", \"ordering\": " + getOrdering());
sb.append(", \"description\": " + getDescription());
- sb.append(", \"comment\": " + getComment());
sb.append("}");
return sb.toString();
}
diff --git a/src/main/java/org/openepics/names/rest/beans/element/StructureElementCommandUpdate.java b/src/main/java/org/openepics/names/rest/beans/element/StructureElementCommandUpdate.java
index 8766d469..4f42a70c 100644
--- a/src/main/java/org/openepics/names/rest/beans/element/StructureElementCommandUpdate.java
+++ b/src/main/java/org/openepics/names/rest/beans/element/StructureElementCommandUpdate.java
@@ -33,13 +33,11 @@ public class StructureElementCommandUpdate extends StructureElementCommandCreate
* @param mnemonic mnemonic
* @param ordering ordering
* @param description description
- * @param comment comment
*/
public StructureElementCommandUpdate(
UUID uuid, Type type, UUID parent,
- String mnemonic, Integer ordering,
- String description, String comment) {
- super(type, parent, mnemonic, ordering, description, comment);
+ String mnemonic, Integer ordering, String description) {
+ super(type, parent, mnemonic, ordering, description);
this.uuid = uuid;
}
@@ -94,7 +92,6 @@ public class StructureElementCommandUpdate extends StructureElementCommandCreate
sb.append(", \"mnemonic\": " + getMnemonic());
sb.append(", \"ordering\": " + getOrdering());
sb.append(", \"description\": " + getDescription());
- sb.append(", \"comment\": " + getComment());
sb.append("}");
return sb.toString();
}
diff --git a/src/main/java/org/openepics/names/service/DeviceGroupService.java b/src/main/java/org/openepics/names/service/DeviceGroupService.java
index ca8c4e0f..327190aa 100644
--- a/src/main/java/org/openepics/names/service/DeviceGroupService.java
+++ b/src/main/java/org/openepics/names/service/DeviceGroupService.java
@@ -94,7 +94,7 @@ public class DeviceGroupService {
// notification
//
// attributes
- // type, parent, mnemonic, ordering, description, comment
+ // type, parent, mnemonic, ordering, description
// note
// namingConvention.equivalenceClassRepresentative return null for null input
@@ -108,7 +108,7 @@ public class DeviceGroupService {
DeviceGroup deviceGroup = new DeviceGroup(UUID.randomUUID(), structureElementCommand.getParent(),
mnemonic, equivalenceClassRepresentative, structureElementCommand.getOrdering(),
structureElementCommand.getDescription(), Status.PENDING, Boolean.FALSE, Boolean.FALSE,
- when, username, structureElementCommand.getComment());
+ when, username, null);
deviceGroupRepository.createDeviceGroup(deviceGroup);
return new StructureElementNotification(
@@ -129,7 +129,7 @@ public class DeviceGroupService {
// notification
//
// attributes
- // uuid, type, parent, mnemonic, ordering, description, comment
+ // uuid, type, parent, mnemonic, ordering, description
// note
// namingConvention.equivalenceClassRepresentative return null for null input
@@ -143,7 +143,7 @@ public class DeviceGroupService {
DeviceGroup deviceGroup = new DeviceGroup(structureElementCommand.getUuid(), structureElementCommand.getParent(),
mnemonic, equivalenceClassRepresentative, structureElementCommand.getOrdering(),
structureElementCommand.getDescription(), Status.PENDING, Boolean.FALSE, Boolean.FALSE,
- when, username, structureElementCommand.getComment());
+ when, username, null);
deviceGroupRepository.createDeviceGroup(deviceGroup);
// previous
@@ -168,7 +168,7 @@ public class DeviceGroupService {
// notification
//
// attributes
- // uuid, comment
+ // uuid
// find
List<DeviceGroup> deviceGroups = deviceGroupRepository.readDeviceGroups(Status.APPROVED, Boolean.FALSE, structureElementCommand.getUuid().toString(), null, null, null, null, null, null);
@@ -181,7 +181,7 @@ public class DeviceGroupService {
DeviceGroup deviceGroup = new DeviceGroup(toBeDeleted.getUuid(), toBeDeleted.getParentUuid(),
toBeDeleted.getMnemonic(), toBeDeleted.getMnemonicEquivalence(), toBeDeleted.getOrdering(),
toBeDeleted.getDescription(), Status.PENDING, Boolean.FALSE, Boolean.TRUE,
- when, username, structureElementCommand.getComment());
+ when, username, null);
deviceGroupRepository.createDeviceGroup(deviceGroup);
return new StructureElementNotification(
@@ -219,7 +219,7 @@ public class DeviceGroupService {
// notification
//
// attributes
- // uuid, comment
+ // uuid
String uuid = structureElementCommand.getUuid().toString();
@@ -242,7 +242,7 @@ public class DeviceGroupService {
deviceGroup = deviceGroups.get(0);
// approve
- deviceGroup.setAttributesStatusProcessed(Status.APPROVED, when, username, structureElementCommand.getComment());
+ deviceGroup.setAttributesStatusProcessed(Status.APPROVED, when, username, null);
deviceGroup.setLatest(Boolean.TRUE);
deviceGroupRepository.updateDeviceGroup(deviceGroup);
@@ -258,7 +258,7 @@ public class DeviceGroupService {
List<StructureElementCommand> commands = Lists.newArrayList();
List<DeviceType> deviceTypes = iDeviceTypeRepository.findLatestNotDeletedByParent(uuid);
for (DeviceType deviceType : deviceTypes) {
- commands.add(new StructureElementCommand(deviceType.getUuid(), Type.DEVICETYPE, null, null, null, null, StructuresService.DELETE_AFTER_APPROVE_STRUCTURE_CHANGE));
+ commands.add(new StructureElementCommand(deviceType.getUuid(), Type.DEVICETYPE, null, null, null, null));
}
for (StructureElementCommand command : commands) {
deviceTypeService.deleteStructure(command, when, username, holderStructures);
@@ -289,7 +289,7 @@ public class DeviceGroupService {
// notification
//
// attributes
- // uuid, comment
+ // uuid
String uuid = structureElementCommand.getUuid().toString();
@@ -301,7 +301,7 @@ public class DeviceGroupService {
DeviceGroup deviceGroup = deviceGroups.get(0);
// cancel
- deviceGroup.setAttributesStatusProcessed(Status.CANCELLED, when, username, structureElementCommand.getComment());
+ deviceGroup.setAttributesStatusProcessed(Status.CANCELLED, when, username, null);
deviceGroupRepository.updateDeviceGroup(deviceGroup);
// previous
@@ -330,7 +330,7 @@ public class DeviceGroupService {
// notification
//
// attributes
- // uuid, comment
+ // uuid
String uuid = structureElementCommand.getUuid().toString();
@@ -342,7 +342,7 @@ public class DeviceGroupService {
DeviceGroup deviceGroup = deviceGroups.get(0);
// reject
- deviceGroup.setAttributesStatusProcessed(Status.REJECTED, when, username, structureElementCommand.getComment());
+ deviceGroup.setAttributesStatusProcessed(Status.REJECTED, when, username, null);
deviceGroupRepository.updateDeviceGroup(deviceGroup);
// previous
diff --git a/src/main/java/org/openepics/names/service/DeviceTypeService.java b/src/main/java/org/openepics/names/service/DeviceTypeService.java
index b7b2ee15..e12c110d 100644
--- a/src/main/java/org/openepics/names/service/DeviceTypeService.java
+++ b/src/main/java/org/openepics/names/service/DeviceTypeService.java
@@ -87,7 +87,7 @@ public class DeviceTypeService {
// notification
//
// attributes
- // type, parent, mnemonic, ordering, description, comment
+ // type, parent, mnemonic, ordering, description
// note
// namingConvention.equivalenceClassRepresentative return null for null input
@@ -101,7 +101,7 @@ public class DeviceTypeService {
DeviceType deviceType = new DeviceType(UUID.randomUUID(), structureElementCommand.getParent(),
mnemonic, equivalenceClassRepresentative, structureElementCommand.getOrdering(),
structureElementCommand.getDescription(), Status.PENDING, Boolean.FALSE, Boolean.FALSE,
- when, username, structureElementCommand.getComment());
+ when, username, null);
deviceTypeRepository.createDeviceType(deviceType);
return new StructureElementNotification(
@@ -122,7 +122,7 @@ public class DeviceTypeService {
// notification
//
// attributes
- // uuid, type, parent, mnemonic, ordering, description, comment
+ // uuid, type, parent, mnemonic, ordering, description
// note
// namingConvention.equivalenceClassRepresentative return null for null input
@@ -136,7 +136,7 @@ public class DeviceTypeService {
DeviceType deviceType = new DeviceType(structureElementCommand.getUuid(), structureElementCommand.getParent(),
mnemonic, equivalenceClassRepresentative, structureElementCommand.getOrdering(),
structureElementCommand.getDescription(), Status.PENDING, Boolean.FALSE, Boolean.FALSE,
- when, username, structureElementCommand.getComment());
+ when, username, null);
deviceTypeRepository.createDeviceType(deviceType);
// previous
@@ -161,7 +161,7 @@ public class DeviceTypeService {
// notification
//
// attributes
- // uuid, comment
+ // uuid
// find
List<DeviceType> deviceTypes = deviceTypeRepository.readDeviceTypes(Status.APPROVED, Boolean.FALSE, structureElementCommand.getUuid().toString(), null, null, null, null, null, null);
@@ -174,7 +174,7 @@ public class DeviceTypeService {
DeviceType deviceType = new DeviceType(toBeDeleted.getUuid(), toBeDeleted.getParentUuid(),
toBeDeleted.getMnemonic(), toBeDeleted.getMnemonicEquivalence(), toBeDeleted.getOrdering(),
toBeDeleted.getDescription(), Status.PENDING, Boolean.FALSE, Boolean.TRUE,
- when, username, structureElementCommand.getComment());
+ when, username, null);
deviceTypeRepository.createDeviceType(deviceType);
return new StructureElementNotification(
@@ -212,7 +212,7 @@ public class DeviceTypeService {
// notification
//
// attributes
- // uuid, comment
+ // uuid
String uuid = structureElementCommand.getUuid().toString();
@@ -235,7 +235,7 @@ public class DeviceTypeService {
deviceType = deviceTypes.get(0);
// approve
- deviceType.setAttributesStatusProcessed(Status.APPROVED, when, username, structureElementCommand.getComment());
+ deviceType.setAttributesStatusProcessed(Status.APPROVED, when, username, null);
deviceType.setLatest(Boolean.TRUE);
deviceTypeRepository.updateDeviceType(deviceType);
@@ -272,7 +272,7 @@ public class DeviceTypeService {
// notification
//
// attributes
- // uuid, comment
+ // uuid
String uuid = structureElementCommand.getUuid().toString();
@@ -283,7 +283,7 @@ public class DeviceTypeService {
DeviceType deviceType = deviceTypes.get(0);
// cancel
- deviceType.setAttributesStatusProcessed(Status.CANCELLED, when, username, structureElementCommand.getComment());
+ deviceType.setAttributesStatusProcessed(Status.CANCELLED, when, username, null);
deviceTypeRepository.updateDeviceType(deviceType);
// previous
@@ -312,7 +312,7 @@ public class DeviceTypeService {
// notification
//
// attributes
- // uuid, comment
+ // uuid
String uuid = structureElementCommand.getUuid().toString();
@@ -324,7 +324,7 @@ public class DeviceTypeService {
DeviceType deviceType = deviceTypes.get(0);
// reject
- deviceType.setAttributesStatusProcessed(Status.REJECTED, when, username, structureElementCommand.getComment());
+ deviceType.setAttributesStatusProcessed(Status.REJECTED, when, username, null);
deviceTypeRepository.updateDeviceType(deviceType);
// previous
diff --git a/src/main/java/org/openepics/names/service/DisciplineService.java b/src/main/java/org/openepics/names/service/DisciplineService.java
index 468060fc..446ee6f5 100644
--- a/src/main/java/org/openepics/names/service/DisciplineService.java
+++ b/src/main/java/org/openepics/names/service/DisciplineService.java
@@ -97,7 +97,7 @@ public class DisciplineService {
// notification
//
// attributes
- // type, parent, mnemonic, ordering, description, comment
+ // type, parent, mnemonic, ordering, description
// note
// namingConvention.equivalenceClassRepresentative return null for null input
@@ -111,7 +111,7 @@ public class DisciplineService {
Discipline discipline = new Discipline(UUID.randomUUID(),
mnemonic, equivalenceClassRepresentative, structureElementCommand.getOrdering(),
structureElementCommand.getDescription(), Status.PENDING, Boolean.FALSE, Boolean.FALSE,
- when, username, structureElementCommand.getComment());
+ when, username, null);
disciplineRepository.createDiscipline(discipline);
return new StructureElementNotification(
@@ -132,7 +132,7 @@ public class DisciplineService {
// notification
//
// attributes
- // uuid, type, parent, mnemonic, ordering, description, comment
+ // uuid, type, parent, mnemonic, ordering, description
// note
// namingConvention.equivalenceClassRepresentative return null for null input
@@ -146,7 +146,7 @@ public class DisciplineService {
Discipline discipline = new Discipline(structureElementCommand.getUuid(),
mnemonic, equivalenceClassRepresentative, structureElementCommand.getOrdering(),
structureElementCommand.getDescription(), Status.PENDING, Boolean.FALSE, Boolean.FALSE,
- when, username, structureElementCommand.getComment());
+ when, username, null);
disciplineRepository.createDiscipline(discipline);
// previous
@@ -171,7 +171,7 @@ public class DisciplineService {
// notification
//
// attributes
- // uuid, comment
+ // uuid
// find
List<Discipline> disciplines = disciplineRepository.readDisciplines(Status.APPROVED, Boolean.FALSE, structureElementCommand.getUuid().toString(), null, null, null, null, null);
@@ -184,7 +184,7 @@ public class DisciplineService {
Discipline discipline = new Discipline(toBeDeleted.getUuid(),
toBeDeleted.getMnemonic(), toBeDeleted.getMnemonicEquivalence(), toBeDeleted.getOrdering(),
toBeDeleted.getDescription(), Status.PENDING, Boolean.FALSE, Boolean.TRUE,
- when, username, structureElementCommand.getComment());
+ when, username, null);
disciplineRepository.createDiscipline(discipline);
return new StructureElementNotification(
@@ -222,7 +222,7 @@ public class DisciplineService {
// notification
//
// attributes
- // uuid, comment
+ // uuid
String uuid = structureElementCommand.getUuid().toString();
@@ -244,7 +244,7 @@ public class DisciplineService {
discipline = disciplines.get(0);
// approve
- discipline.setAttributesStatusProcessed(Status.APPROVED, when, username, structureElementCommand.getComment());
+ discipline.setAttributesStatusProcessed(Status.APPROVED, when, username, null);
discipline.setLatest(Boolean.TRUE);
disciplineRepository.updateDiscipline(discipline);
@@ -262,7 +262,7 @@ public class DisciplineService {
List<StructureElementCommand> commands = Lists.newArrayList();
List<DeviceGroup> deviceGroups = iDeviceGroupRepository.findLatestNotDeletedByParent(uuid);
for (DeviceGroup deviceGroup : deviceGroups) {
- commands.add(new StructureElementCommand(deviceGroup.getUuid(), Type.DEVICEGROUP, null, null, null, null, StructuresService.DELETE_AFTER_APPROVE_STRUCTURE_CHANGE));
+ commands.add(new StructureElementCommand(deviceGroup.getUuid(), Type.DEVICEGROUP, null, null, null, null));
}
for (StructureElementCommand command : commands) {
deviceGroupService.deleteStructure(command, when, username, holderStructures);
@@ -293,7 +293,7 @@ public class DisciplineService {
// notification
//
// attributes
- // uuid, comment
+ // uuid
String uuid = structureElementCommand.getUuid().toString();
@@ -305,7 +305,7 @@ public class DisciplineService {
Discipline discipline = disciplines.get(0);
// cancel
- discipline.setAttributesStatusProcessed(Status.CANCELLED, when, username, structureElementCommand.getComment());
+ discipline.setAttributesStatusProcessed(Status.CANCELLED, when, username, null);
disciplineRepository.updateDiscipline(discipline);
// previous
@@ -334,7 +334,7 @@ public class DisciplineService {
// notification
//
// attributes
- // uuid, comment
+ // uuid
String uuid = structureElementCommand.getUuid().toString();
@@ -346,7 +346,7 @@ public class DisciplineService {
Discipline discipline = disciplines.get(0);
// reject
- discipline.setAttributesStatusProcessed(Status.REJECTED, when, username, structureElementCommand.getComment());
+ discipline.setAttributesStatusProcessed(Status.REJECTED, when, username, null);
disciplineRepository.updateDiscipline(discipline);
// previous
diff --git a/src/main/java/org/openepics/names/service/NamesService.java b/src/main/java/org/openepics/names/service/NamesService.java
index ea7d16ba..af5551e3 100644
--- a/src/main/java/org/openepics/names/service/NamesService.java
+++ b/src/main/java/org/openepics/names/service/NamesService.java
@@ -93,8 +93,6 @@ public class NamesService {
private static final Logger LOGGER = Logger.getLogger(NamesService.class.getName());
- private static final String UPDATE_AFTER_APPROVE_STRUCTURE_CHANGE = "Update after APPROVE structure change";
-
private HolderIRepositories holderIRepositories;
private HolderRepositories holderRepositories;
// convenience, also part of holderRepositories
@@ -183,13 +181,13 @@ public class NamesService {
// return name element for created name
//
// attributes
- // parentSystemStructure, parentDeviceStructure, index, description, comment
+ // parentSystemStructure, parentDeviceStructure, index, description
UUID parentSystemStructure = nameElementCommand.getParentSystemStructure();
UUID parentDeviceStructure = nameElementCommand.getParentDeviceStructure();
String index = nameElementCommand.getIndex();
String description = nameElementCommand.getDescription();
- String comment = nameElementCommand.getComment();
+ String comment = null;
// find
// system structure - system group, system, subsystem - one of the three expected to be non-null, other two expected to be null
@@ -217,8 +215,8 @@ public class NamesService {
system != null ? system.getUuid() : null,
subsystem != null ? subsystem.getUuid() : null,
parentDeviceStructure,
- index, derivedName, namingConvention.equivalenceClassRepresentative(derivedName),
- description, Status.APPROVED, Boolean.TRUE, Boolean.FALSE,
+ index, derivedName, namingConvention.equivalenceClassRepresentative(derivedName), description,
+ Status.APPROVED, Boolean.TRUE, Boolean.FALSE,
when, username, comment);
nameRepository.createName(name);
@@ -621,7 +619,7 @@ public class NamesService {
// return name elements for updated names
//
// attributes
- // uuid, parentSystemStructure, parentDeviceStructure, index, description, comment
+ // uuid, parentSystemStructure, parentDeviceStructure, index, description
// initiate holder of system and device structure content, for performance reasons
HolderStructures holderStructures = new HolderStructures(holderIRepositories);
@@ -637,7 +635,7 @@ public class NamesService {
UUID parentDeviceStructure = nameElementCommand.getParentDeviceStructure();
String index = nameElementCommand.getIndex();
String description = nameElementCommand.getDescription();
- String comment = nameElementCommand.getComment();
+ String comment = null;
Name name = holderIRepositories.nameRepository().findLatestByUuid(uuid.toString());
if (name == null) {
@@ -679,8 +677,8 @@ public class NamesService {
system != null ? system.getUuid() : null,
subsystem != null ? subsystem.getUuid() : null,
parentDeviceStructure,
- index, derivedName, namingConvention.equivalenceClassRepresentative(derivedName),
- description, Status.APPROVED, Boolean.TRUE, Boolean.FALSE,
+ index, derivedName, namingConvention.equivalenceClassRepresentative(derivedName), description,
+ Status.APPROVED, Boolean.TRUE, Boolean.FALSE,
when, username, comment);
nameRepository.createName(name);
@@ -730,7 +728,7 @@ public class NamesService {
nameElements.add(
new NameElementCommand(
name.getUuid(), name.getSystemGroupUuid(), name.getDeviceTypeUuid(),
- name.getInstanceIndex(), name.getDescription(), UPDATE_AFTER_APPROVE_STRUCTURE_CHANGE));
+ name.getInstanceIndex(), name.getDescription()));
}
} else if (previousStructure instanceof System && structure instanceof System) {
// find
@@ -740,7 +738,7 @@ public class NamesService {
nameElements.add(
new NameElementCommand(
name.getUuid(), name.getSystemUuid(), name.getDeviceTypeUuid(),
- name.getInstanceIndex(), name.getDescription(), UPDATE_AFTER_APPROVE_STRUCTURE_CHANGE));
+ name.getInstanceIndex(), name.getDescription()));
}
names = holderIRepositories.nameRepository().findLatestBySystemUuidThroughSubsystem(structure.getUuid().toString());
@@ -748,7 +746,7 @@ public class NamesService {
nameElements.add(
new NameElementCommand(
name.getUuid(), name.getSubsystemUuid(), name.getDeviceTypeUuid(),
- name.getInstanceIndex(), name.getDescription(), UPDATE_AFTER_APPROVE_STRUCTURE_CHANGE));
+ name.getInstanceIndex(), name.getDescription()));
}
} else if (previousStructure instanceof Subsystem && structure instanceof Subsystem) {
// find
@@ -758,7 +756,7 @@ public class NamesService {
nameElements.add(
new NameElementCommand(
name.getUuid(), name.getSubsystemUuid(), name.getDeviceTypeUuid(),
- name.getInstanceIndex(), name.getDescription(), UPDATE_AFTER_APPROVE_STRUCTURE_CHANGE));
+ name.getInstanceIndex(), name.getDescription()));
}
} else if (previousStructure instanceof Discipline && structure instanceof Discipline) {
// find
@@ -775,7 +773,7 @@ public class NamesService {
nameElements.add(
new NameElementCommand(
name.getUuid(), parentSystemStructure, name.getDeviceTypeUuid(),
- name.getInstanceIndex(), name.getDescription(), UPDATE_AFTER_APPROVE_STRUCTURE_CHANGE));
+ name.getInstanceIndex(), name.getDescription()));
}
} else if (previousStructure instanceof DeviceType && structure instanceof DeviceType) {
// find
@@ -792,7 +790,7 @@ public class NamesService {
nameElements.add(
new NameElementCommand(
name.getUuid(), parentSystemStructure, name.getDeviceTypeUuid(),
- name.getInstanceIndex(), name.getDescription(), UPDATE_AFTER_APPROVE_STRUCTURE_CHANGE));
+ name.getInstanceIndex(), name.getDescription()));
}
}
@@ -819,13 +817,13 @@ public class NamesService {
// return name elements for deleted names
//
// attributes
- // uuid, comment
+ // uuid
Date when = new Date();
final List<NameElement> deletedNameElements = Lists.newArrayList();
for (NameElementCommand nameElementCommand : nameElementCommands) {
UUID uuid = nameElementCommand.getUuid();
- String comment = nameElementCommand.getComment();
+ String comment = null;
Name name = holderIRepositories.nameRepository().findLatestByUuid(uuid.toString());
if (name == null) {
@@ -840,8 +838,8 @@ public class NamesService {
name.getSystemUuid(),
name.getSubsystemUuid(),
name.getDeviceTypeUuid(),
- name.getInstanceIndex(), name.getConventionName(), name.getConventionNameEquivalence(),
- name.getDescription(), Status.APPROVED, Boolean.TRUE, Boolean.TRUE,
+ name.getInstanceIndex(), name.getConventionName(), name.getConventionNameEquivalence(), name.getDescription(),
+ Status.APPROVED, Boolean.TRUE, Boolean.TRUE,
when, username, comment);
nameRepository.createName(name);
diff --git a/src/main/java/org/openepics/names/service/StructuresService.java b/src/main/java/org/openepics/names/service/StructuresService.java
index 2c027b0c..9c51bea2 100644
--- a/src/main/java/org/openepics/names/service/StructuresService.java
+++ b/src/main/java/org/openepics/names/service/StructuresService.java
@@ -90,7 +90,6 @@ public class StructuresService {
private static final Logger LOGGER = Logger.getLogger(StructuresService.class.getName());
protected static final String SYSTEM_STRUCTURE_ONLY = "System structure only";
- protected static final String DELETE_AFTER_APPROVE_STRUCTURE_CHANGE = "Delete after APPROVE structure change";
private HolderIRepositories holderIRepositories;
private HolderRepositories holderRepositories;
diff --git a/src/main/java/org/openepics/names/service/SubsystemService.java b/src/main/java/org/openepics/names/service/SubsystemService.java
index 475078e9..87363b31 100644
--- a/src/main/java/org/openepics/names/service/SubsystemService.java
+++ b/src/main/java/org/openepics/names/service/SubsystemService.java
@@ -88,7 +88,7 @@ public class SubsystemService {
// notification
//
// attributes
- // type, parent, mnemonic, ordering, description, comment
+ // type, parent, mnemonic, ordering, description
// note
// namingConvention.equivalenceClassRepresentative return null for null input
@@ -102,7 +102,7 @@ public class SubsystemService {
Subsystem subsystem = new Subsystem(UUID.randomUUID(), structureElementCommand.getParent(),
mnemonic, equivalenceClassRepresentative, structureElementCommand.getOrdering(),
structureElementCommand.getDescription(), Status.PENDING, Boolean.FALSE, Boolean.FALSE,
- when, username, structureElementCommand.getComment());
+ when, username, null);
subsystemRepository.createSubsystem(subsystem);
return new StructureElementNotification(
@@ -123,7 +123,7 @@ public class SubsystemService {
// notification
//
// attributes
- // uuid, type, parent, mnemonic, ordering, description, comment
+ // uuid, type, parent, mnemonic, ordering, description
// note
// namingConvention.equivalenceClassRepresentative return null for null input
@@ -137,7 +137,7 @@ public class SubsystemService {
Subsystem subsystem = new Subsystem(structureElementCommand.getUuid(), structureElementCommand.getParent(),
mnemonic, equivalenceClassRepresentative, structureElementCommand.getOrdering(),
structureElementCommand.getDescription(), Status.PENDING, Boolean.FALSE, Boolean.FALSE,
- when, username, structureElementCommand.getComment());
+ when, username, null);
subsystemRepository.createSubsystem(subsystem);
// previous
@@ -162,7 +162,7 @@ public class SubsystemService {
// notification
//
// attributes
- // uuid, comment
+ // uuid
// find
List<Subsystem> subsystems = subsystemRepository.readSubsystems(Status.APPROVED, Boolean.FALSE, structureElementCommand.getUuid().toString(), null, null, null, null, null, null);
@@ -175,7 +175,7 @@ public class SubsystemService {
Subsystem subsystem = new Subsystem(toBeDeleted.getUuid(), toBeDeleted.getParentUuid(),
toBeDeleted.getMnemonic(), toBeDeleted.getMnemonicEquivalence(), toBeDeleted.getOrdering(),
toBeDeleted.getDescription(), Status.PENDING, Boolean.FALSE, Boolean.TRUE,
- when, username, structureElementCommand.getComment());
+ when, username, null);
subsystemRepository.createSubsystem(subsystem);
return new StructureElementNotification(
@@ -213,7 +213,7 @@ public class SubsystemService {
// notification
//
// attributes
- // uuid, comment
+ // uuid
String uuid = structureElementCommand.getUuid().toString();
@@ -236,7 +236,7 @@ public class SubsystemService {
subsystem = subsystems.get(0);
// approve
- subsystem.setAttributesStatusProcessed(Status.APPROVED, when, username, structureElementCommand.getComment());
+ subsystem.setAttributesStatusProcessed(Status.APPROVED, when, username, null);
subsystem.setLatest(Boolean.TRUE);
subsystemRepository.updateSubsystem(subsystem);
@@ -250,7 +250,7 @@ public class SubsystemService {
boolean hasMnemonic = !StringUtils.isEmpty(subsystem.getMnemonic());
boolean existsName = hasMnemonic && namesService.existsName(StructureUtil.getMnemonicPath(subsystem, holderStructures));
if (hasMnemonic && !existsName) {
- NameElementCommand nameElement = new NameElementCommand(null, subsystem.getUuid(), null, null, StructuresService.SYSTEM_STRUCTURE_ONLY, null);
+ NameElementCommand nameElement = new NameElementCommand(null, subsystem.getUuid(), null, null, StructuresService.SYSTEM_STRUCTURE_ONLY);
namesService.createName(nameElement, when, username, holderStructures);
}
} else if (StructureCommand.UPDATE.equals(structureCommandCUD)) {
@@ -280,7 +280,7 @@ public class SubsystemService {
// notification
//
// attributes
- // uuid, comment
+ // uuid
String uuid = structureElementCommand.getUuid().toString();
@@ -292,7 +292,7 @@ public class SubsystemService {
Subsystem subsystem = subsystems.get(0);
// cancel
- subsystem.setAttributesStatusProcessed(Status.CANCELLED, when, username, structureElementCommand.getComment());
+ subsystem.setAttributesStatusProcessed(Status.CANCELLED, when, username, null);
subsystemRepository.updateSubsystem(subsystem);
// previous
@@ -321,7 +321,7 @@ public class SubsystemService {
// notification
//
// attributes
- // uuid, comment
+ // uuid
String uuid = structureElementCommand.getUuid().toString();
@@ -333,7 +333,7 @@ public class SubsystemService {
Subsystem subsystem = subsystems.get(0);
// reject
- subsystem.setAttributesStatusProcessed(Status.REJECTED, when, username, structureElementCommand.getComment());
+ subsystem.setAttributesStatusProcessed(Status.REJECTED, when, username, null);
subsystemRepository.updateSubsystem(subsystem);
// previous
diff --git a/src/main/java/org/openepics/names/service/SystemGroupService.java b/src/main/java/org/openepics/names/service/SystemGroupService.java
index 54cf4fce..41de569e 100644
--- a/src/main/java/org/openepics/names/service/SystemGroupService.java
+++ b/src/main/java/org/openepics/names/service/SystemGroupService.java
@@ -98,7 +98,7 @@ public class SystemGroupService {
// notification
//
// attributes
- // type, parent, mnemonic, ordering, description, comment
+ // type, parent, mnemonic, ordering, description
// note
// namingConvention.equivalenceClassRepresentative return null for null input
@@ -112,7 +112,7 @@ public class SystemGroupService {
SystemGroup systemGroup = new SystemGroup(UUID.randomUUID(),
mnemonic, equivalenceClassRepresentative, structureElementCommand.getOrdering(),
structureElementCommand.getDescription(), Status.PENDING, Boolean.FALSE, Boolean.FALSE,
- when, username, structureElementCommand.getComment());
+ when, username, null);
systemGroupRepository.createSystemGroup(systemGroup);
return new StructureElementNotification(
@@ -133,7 +133,7 @@ public class SystemGroupService {
// notification
//
// attributes
- // uuid, type, parent, mnemonic, ordering, description, comment
+ // uuid, type, parent, mnemonic, ordering, description
// note
// namingConvention.equivalenceClassRepresentative return null for null input
@@ -147,7 +147,7 @@ public class SystemGroupService {
SystemGroup systemGroup = new SystemGroup(structureElementCommand.getUuid(),
mnemonic, equivalenceClassRepresentative, structureElementCommand.getOrdering(),
structureElementCommand.getDescription(), Status.PENDING, Boolean.FALSE, Boolean.FALSE,
- when, username, structureElementCommand.getComment());
+ when, username, null);
systemGroupRepository.createSystemGroup(systemGroup);
// previous
@@ -172,7 +172,7 @@ public class SystemGroupService {
// notification
//
// attributes
- // uuid, comment
+ // uuid
// find
List<SystemGroup> systemGroups = systemGroupRepository.readSystemGroups(Status.APPROVED, Boolean.FALSE, structureElementCommand.getUuid().toString(), null, null, null, null, null);
@@ -185,7 +185,7 @@ public class SystemGroupService {
SystemGroup systemGroup = new SystemGroup(toBeDeleted.getUuid(),
toBeDeleted.getMnemonic(), toBeDeleted.getMnemonicEquivalence(), toBeDeleted.getOrdering(),
toBeDeleted.getDescription(), Status.PENDING, Boolean.FALSE, Boolean.TRUE,
- when, username, structureElementCommand.getComment());
+ when, username, null);
systemGroupRepository.createSystemGroup(systemGroup);
return new StructureElementNotification(
@@ -223,7 +223,7 @@ public class SystemGroupService {
// notification
//
// attributes
- // uuid, comment
+ // uuid
String uuid = structureElementCommand.getUuid().toString();
@@ -246,7 +246,7 @@ public class SystemGroupService {
systemGroup = systemGroups.get(0);
// approve
- systemGroup.setAttributesStatusProcessed(Status.APPROVED, when, username, structureElementCommand.getComment());
+ systemGroup.setAttributesStatusProcessed(Status.APPROVED, when, username, null);
systemGroup.setLatest(Boolean.TRUE);
systemGroupRepository.updateSystemGroup(systemGroup);
@@ -260,7 +260,7 @@ public class SystemGroupService {
boolean hasMnemonic = !StringUtils.isEmpty(systemGroup.getMnemonic());
boolean existsName = hasMnemonic && namesService.existsName(StructureUtil.getMnemonicPath(systemGroup, holderStructures));
if (hasMnemonic && !existsName) {
- NameElementCommand nameElement = new NameElementCommand(null, systemGroup.getUuid(), null, null, StructuresService.SYSTEM_STRUCTURE_ONLY, null);
+ NameElementCommand nameElement = new NameElementCommand(null, systemGroup.getUuid(), null, null, StructuresService.SYSTEM_STRUCTURE_ONLY);
namesService.createName(nameElement, when, username, holderStructures);
}
} else if (StructureCommand.UPDATE.equals(structureCommandCUD)) {
@@ -271,7 +271,7 @@ public class SystemGroupService {
List<StructureElementCommand> commands = Lists.newArrayList();
List<System> systems = iSystemRepository.findLatestNotDeletedByParent(uuid);
for (System system : systems) {
- commands.add(new StructureElementCommand(system.getUuid(), Type.SYSTEM, null, null, null, null, StructuresService.DELETE_AFTER_APPROVE_STRUCTURE_CHANGE));
+ commands.add(new StructureElementCommand(system.getUuid(), Type.SYSTEM, null, null, null, null));
}
for (StructureElementCommand command : commands) {
systemService.deleteStructure(command, when, username, holderStructures);
@@ -302,7 +302,7 @@ public class SystemGroupService {
// notification
//
// attributes
- // uuid, comment
+ // uuid
String uuid = structureElementCommand.getUuid().toString();
@@ -314,7 +314,7 @@ public class SystemGroupService {
SystemGroup systemGroup = systemGroups.get(0);
// cancel
- systemGroup.setAttributesStatusProcessed(Status.CANCELLED, when, username, structureElementCommand.getComment());
+ systemGroup.setAttributesStatusProcessed(Status.CANCELLED, when, username, null);
systemGroupRepository.updateSystemGroup(systemGroup);
// previous
@@ -343,7 +343,7 @@ public class SystemGroupService {
// notification
//
// attributes
- // uuid, comment
+ // uuid
String uuid = structureElementCommand.getUuid().toString();
@@ -355,7 +355,7 @@ public class SystemGroupService {
SystemGroup systemGroup = systemGroups.get(0);
// reject
- systemGroup.setAttributesStatusProcessed(Status.REJECTED, when, username, structureElementCommand.getComment());
+ systemGroup.setAttributesStatusProcessed(Status.REJECTED, when, username, null);
systemGroupRepository.updateSystemGroup(systemGroup);
// previous
diff --git a/src/main/java/org/openepics/names/service/SystemService.java b/src/main/java/org/openepics/names/service/SystemService.java
index eecb9a11..1baeed0d 100644
--- a/src/main/java/org/openepics/names/service/SystemService.java
+++ b/src/main/java/org/openepics/names/service/SystemService.java
@@ -98,7 +98,7 @@ public class SystemService {
// notification
//
// attributes
- // type, parent, mnemonic, ordering, description, comment
+ // type, parent, mnemonic, ordering, description
// note
// namingConvention.equivalenceClassRepresentative return null for null input
@@ -112,7 +112,7 @@ public class SystemService {
System system = new System(UUID.randomUUID(), structureElementCommand.getParent(),
mnemonic, equivalenceClassRepresentative, structureElementCommand.getOrdering(),
structureElementCommand.getDescription(), Status.PENDING, Boolean.FALSE, Boolean.FALSE,
- when, username, structureElementCommand.getComment());
+ when, username, null);
systemRepository.createSystem(system);
return new StructureElementNotification(
@@ -133,7 +133,7 @@ public class SystemService {
// notification
//
// attributes
- // uuid, type, parent, mnemonic, ordering, description, comment
+ // uuid, type, parent, mnemonic, ordering, description
// note
// namingConvention.equivalenceClassRepresentative return null for null input
@@ -147,7 +147,7 @@ public class SystemService {
System system = new System(structureElementCommand.getUuid(), structureElementCommand.getParent(),
mnemonic, equivalenceClassRepresentative, structureElementCommand.getOrdering(),
structureElementCommand.getDescription(), Status.PENDING, Boolean.FALSE, Boolean.FALSE,
- when, username, structureElementCommand.getComment());
+ when, username, null);
systemRepository.createSystem(system);
// previous
@@ -172,7 +172,7 @@ public class SystemService {
// notification
//
// attributes
- // uuid, comment
+ // uuid
// find
List<System> systems = systemRepository.readSystems(Status.APPROVED, Boolean.FALSE, structureElementCommand.getUuid().toString(), null, null, null, null, null, null);
@@ -185,7 +185,7 @@ public class SystemService {
System system = new System(toBeDeleted.getUuid(), toBeDeleted.getParentUuid(),
toBeDeleted.getMnemonic(), toBeDeleted.getMnemonicEquivalence(), toBeDeleted.getOrdering(),
toBeDeleted.getDescription(), Status.PENDING, Boolean.FALSE, Boolean.TRUE,
- when, username, structureElementCommand.getComment());
+ when, username, null);
systemRepository.createSystem(system);
return new StructureElementNotification(
@@ -223,7 +223,7 @@ public class SystemService {
// notification
//
// attributes
- // uuid, comment
+ // uuid
String uuid = structureElementCommand.getUuid().toString();
@@ -246,7 +246,7 @@ public class SystemService {
system = systems.get(0);
// approve
- system.setAttributesStatusProcessed(Status.APPROVED, when, username, structureElementCommand.getComment());
+ system.setAttributesStatusProcessed(Status.APPROVED, when, username, null);
system.setLatest(Boolean.TRUE);
systemRepository.updateSystem(system);
@@ -260,7 +260,7 @@ public class SystemService {
boolean hasMnemonic = !StringUtils.isEmpty(system.getMnemonic());
boolean existsName = hasMnemonic && namesService.existsName(StructureUtil.getMnemonicPath(system, holderStructures));
if (hasMnemonic && !existsName) {
- NameElementCommand nameElement = new NameElementCommand(null, system.getUuid(), null, null, StructuresService.SYSTEM_STRUCTURE_ONLY, null);
+ NameElementCommand nameElement = new NameElementCommand(null, system.getUuid(), null, null, StructuresService.SYSTEM_STRUCTURE_ONLY);
namesService.createName(nameElement, when, username, holderStructures);
}
} else if (StructureCommand.UPDATE.equals(structureCommandCUD)) {
@@ -271,7 +271,7 @@ public class SystemService {
List<StructureElementCommand> commands = Lists.newArrayList();
List<Subsystem> subsystems = iSubsystemRepository.findLatestNotDeletedByParent(uuid);
for (Subsystem subsystem : subsystems) {
- commands.add(new StructureElementCommand(subsystem.getUuid(), Type.SUBSYSTEM, null, null, null, null, StructuresService.DELETE_AFTER_APPROVE_STRUCTURE_CHANGE));
+ commands.add(new StructureElementCommand(subsystem.getUuid(), Type.SUBSYSTEM, null, null, null, null));
}
for (StructureElementCommand command : commands) {
subsystemService.deleteStructure(command, when, username, holderStructures);
@@ -302,7 +302,7 @@ public class SystemService {
// notification
//
// attributes
- // uuid, comment
+ // uuid
String uuid = structureElementCommand.getUuid().toString();
@@ -314,7 +314,7 @@ public class SystemService {
System system = systems.get(0);
// cancel
- system.setAttributesStatusProcessed(Status.CANCELLED, when, username, structureElementCommand.getComment());
+ system.setAttributesStatusProcessed(Status.CANCELLED, when, username, null);
systemRepository.updateSystem(system);
// previous
@@ -343,7 +343,7 @@ public class SystemService {
// notification
//
// attributes
- // uuid, comment
+ // uuid
String uuid = structureElementCommand.getUuid().toString();
@@ -355,7 +355,7 @@ public class SystemService {
System system = systems.get(0);
// reject
- system.setAttributesStatusProcessed(Status.REJECTED, when, username, structureElementCommand.getComment());
+ system.setAttributesStatusProcessed(Status.REJECTED, when, username, null);
systemRepository.updateSystem(system);
// previous
diff --git a/src/main/java/org/openepics/names/util/ExcelUtil.java b/src/main/java/org/openepics/names/util/ExcelUtil.java
index 4cfb4794..aa6765b0 100644
--- a/src/main/java/org/openepics/names/util/ExcelUtil.java
+++ b/src/main/java/org/openepics/names/util/ExcelUtil.java
@@ -70,14 +70,13 @@ public class ExcelUtil {
// column width 3.44 inch (to fit header text and uuid)
private static final int SHEET_COLUMN_WIDTH = 35 * 256 + 64;
- private static final int NAMEELEMENTCOMMAND_LENGTH = 6;
+ private static final int NAMEELEMENTCOMMAND_LENGTH = 5;
private static final String[][] NAMEELEMENT_HEADER_COMMENT = {
{"Uuid", "Identity (uuid) of the name entry. Value is created server-side."},
{"ParentSystemStructure", "Identity (uuid) for the system structure parent."},
{"ParentDeviceStructure", "Identity (uuid) for the device structure parent (if the name entry refers to device structure)."},
{"Index", "Index (instance) of the name entry (if the name entry refers to device structure)."},
{"Description", "Description (verbose) of the name entry."},
- {"Comment", "Comment of the name entry command."},
// above NameElementCommand
{"SystemStructure", "Mnemonic path for for the system structure."},
{"DeviceStructure", "Mnemonic path for for the device structure."},
@@ -86,9 +85,10 @@ public class ExcelUtil {
{"Latest", "If the name entry is latest (with status APPROVED) in its line of entries."},
{"Deleted", "If the name entry is deleted."},
{"When", "Date and time when the name entry was created."},
- {"Who", "Name (user) of who created the name entry."} };
+ {"Who", "Name (user) of who created the name entry."},
+ {"Comment", "Comment of the name entry command."} };
- private static final int STRUCTUREELEMENTCOMMAND_LENGTH = 7;
+ private static final int STRUCTUREELEMENTCOMMAND_LENGTH = 6;
private static final String[][] STRUCTUREELEMENT_HEADER_COMMENT = {
{"Uuid", "Identity (uuid) of the structure entry. Value is created server-side."},
{"Type", "Type of the structure entry. Valid values - SYSTEMGROUP, SYSTEM, SUBSYSTEM, DISCIPLINE, DEVICEGROUP, DEVICETYPE."},
@@ -96,7 +96,6 @@ public class ExcelUtil {
{"Mnemonic", "Mnemonic of the structure entry."},
{"Ordering", "Ordering of the structure entry."},
{"Description", "Description (verbose) of the structure entry."},
- {"Comment", "Comment of the structure entry command."},
// above StructureElementCommand
{"MnemonicPath", "Mnemonic path of the structure entry."},
{"Level", "Level of the structure entry."},
@@ -104,7 +103,8 @@ public class ExcelUtil {
{"Latest", "If the structure entry is latest (with status APPROVED) in its line of entries."},
{"Deleted", "If the structure entry is deleted."},
{"When", "Date and time when the structure entry was created."},
- {"Who", "Name (user) of who created the structure entry."} };
+ {"Who", "Name (user) of who created the structure entry."},
+ {"Comment", "Comment of the structure entry command."} };
private static final String ARIAL = "Arial";
private static final String SHEET = "Entries";
@@ -147,9 +147,9 @@ public class ExcelUtil {
// see validateHeaderNameElementCommand
// NameElementCommand
- // create - parentSystemStructure, parentDeviceStructure, index, description, comment
- // update - uuid, parentSystemStructure, parentDeviceStructure, index, description, comment
- // delete - uuid, comment
+ // create - parentSystemStructure, parentDeviceStructure, index, description
+ // update - uuid, parentSystemStructure, parentDeviceStructure, index, description
+ // delete - uuid
int rowIndex = 0;
int columnIndex = 0;
@@ -198,9 +198,6 @@ public class ExcelUtil {
case 4:
nameElementCommand.setDescription(value);
break;
- case 5:
- nameElementCommand.setComment(value);
- break;
default:
if (columnIndex > NAMEELEMENT_HEADER_COMMENT.length - 1) {
throw new IllegalArgumentException(
@@ -249,9 +246,9 @@ public class ExcelUtil {
// see validateHeaderStructureElementCommand
// StructureElementCommand
- // create - type, parent, mnemonic, ordering, description, comment
- // update - uuid, type, parent, mnemonic, ordering, description, comment
- // delete - uuid, type comment
+ // create - type, parent, mnemonic, ordering, description
+ // update - uuid, type, parent, mnemonic, ordering, description
+ // delete - uuid, type
int rowIndex = 0;
int columnIndex = 0;
@@ -303,9 +300,6 @@ public class ExcelUtil {
case 5:
structureElementCommand.setDescription(value);
break;
- case 6:
- structureElementCommand.setComment(value);
- break;
default:
if (columnIndex > STRUCTUREELEMENT_HEADER_COMMENT.length - 1) {
throw new IllegalArgumentException(
@@ -486,31 +480,31 @@ public class ExcelUtil {
cell.setCellValue(nameElement.getDescription());
break;
case 5:
- cell.setCellValue(nameElement.getComment());
+ cell.setCellValue(nameElement.getSystemStructure());
break;
case 6:
- cell.setCellValue(nameElement.getSystemStructure());
+ cell.setCellValue(nameElement.getDeviceStructure());
break;
case 7:
- cell.setCellValue(nameElement.getDeviceStructure());
+ cell.setCellValue(nameElement.getName());
break;
case 8:
- cell.setCellValue(nameElement.getName());
+ cell.setCellValue(nameElement.getStatus() != null ? nameElement.getStatus().toString() : null);
break;
case 9:
- cell.setCellValue(nameElement.getStatus() != null ? nameElement.getStatus().toString() : null);
+ cell.setCellValue(nameElement.isLatest());
break;
case 10:
- cell.setCellValue(nameElement.isLatest());
+ cell.setCellValue(nameElement.isDeleted());
break;
case 11:
- cell.setCellValue(nameElement.isDeleted());
+ cell.setCellValue(DateFormat.getDateTimeInstance().format(nameElement.getWhen()));
break;
case 12:
- cell.setCellValue(DateFormat.getDateTimeInstance().format(nameElement.getWhen()));
+ cell.setCellValue(nameElement.getWho());
break;
case 13:
- cell.setCellValue(nameElement.getWho());
+ cell.setCellValue(nameElement.getComment());
break;
default:
break;
@@ -616,28 +610,28 @@ public class ExcelUtil {
cell.setCellValue(structureElement.getDescription());
break;
case 6:
- cell.setCellValue(structureElement.getComment());
+ cell.setCellValue(structureElement.getMnemonicPath());
break;
case 7:
- cell.setCellValue(structureElement.getMnemonicPath());
+ cell.setCellValue(structureElement.getLevel());
break;
case 8:
- cell.setCellValue(structureElement.getLevel());
+ cell.setCellValue(structureElement.getStatus() != null ? structureElement.getStatus().toString() : null);
break;
case 9:
- cell.setCellValue(structureElement.getStatus() != null ? structureElement.getStatus().toString() : null);
+ cell.setCellValue(structureElement.isLatest());
break;
case 10:
- cell.setCellValue(structureElement.isLatest());
+ cell.setCellValue(structureElement.isDeleted());
break;
case 11:
- cell.setCellValue(structureElement.isDeleted());
+ cell.setCellValue(DateFormat.getDateTimeInstance().format(structureElement.getWhen()));
break;
case 12:
- cell.setCellValue(DateFormat.getDateTimeInstance().format(structureElement.getWhen()));
+ cell.setCellValue(structureElement.getWho());
break;
case 13:
- cell.setCellValue(structureElement.getWho());
+ cell.setCellValue(structureElement.getComment());
break;
default:
break;
diff --git a/src/main/java/org/openepics/names/util/NameElementUtil.java b/src/main/java/org/openepics/names/util/NameElementUtil.java
index 502f6b99..4d0948bd 100644
--- a/src/main/java/org/openepics/names/util/NameElementUtil.java
+++ b/src/main/java/org/openepics/names/util/NameElementUtil.java
@@ -92,12 +92,12 @@ public class NameElementUtil {
: null;
return getNameElement(
- name.getUuid(),
- parentSystemStructure, name.getDeviceTypeUuid(),
+ name.getUuid(), parentSystemStructure, name.getDeviceTypeUuid(),
+ name.getInstanceIndex(), name.getDescription(),
NamingConventionUtil.extractMnemonicPathSystemStructure(name.getConventionName()),
NamingConventionUtil.extractMnemonicPathDeviceStructure(name.getConventionName()),
- name.getInstanceIndex(), name.getConventionName(),
- name.getDescription(), Status.APPROVED, name.isLatest(), name.isDeleted(),
+ name.getConventionName(),
+ Status.APPROVED, name.isLatest(), name.isDeleted(),
name.getRequested(), name.getRequestedBy(), name.getRequestedComment());
}
@@ -107,11 +107,11 @@ public class NameElementUtil {
* @param uuid uuid
* @param parentSystemStructure parent system structure uuid (system group, system, subsystem)
* @param parentDeviceStructure parent device structure uuid (device type)
+ * @param index instance index
+ * @param description description
* @param systemStructure system structure mnemonic path
* @param deviceStructure device structure mnemonic path
- * @param index instance index
* @param name name
- * @param description description
* @param status status
* @param latest latest
* @param deleted deleted
@@ -121,19 +121,18 @@ public class NameElementUtil {
* @return name element
*/
protected static NameElement getNameElement(
- UUID uuid,
- UUID parentSystemStructure, UUID parentDeviceStructure,
- String systemStructure, String deviceStructure,
- String index, String name,
- String description, Status status, Boolean latest, Boolean deleted,
+ UUID uuid, UUID parentSystemStructure, UUID parentDeviceStructure,
+ String index, String description,
+ String systemStructure, String deviceStructure, String name,
+ Status status, Boolean latest, Boolean deleted,
Date when, String who, String comment) {
return new NameElement(
- uuid, parentSystemStructure, parentDeviceStructure, index,
- description, comment,
+ uuid, parentSystemStructure, parentDeviceStructure,
+ index, description,
systemStructure, deviceStructure, name,
status, latest, deleted,
- when, who);
+ when, who, comment);
}
/**
@@ -157,7 +156,6 @@ public class NameElementUtil {
// parentDeviceStructure
// index
// description
- // comment
// Name
// x systemgroup_uuid
// x system_uuid
@@ -203,7 +201,6 @@ public class NameElementUtil {
return false;
} else if (!nameElement.getDescription().equals(name.getDescription()))
return false;
- // no need to compare comment, it is comment to action that is taken, not considered state
return true;
}
@@ -222,8 +219,7 @@ public class NameElementUtil {
command.getParentSystemStructure(),
command.getParentDeviceStructure(),
command.getIndex(),
- command.getDescription(),
- command.getComment());
+ command.getDescription());
}
/**
@@ -252,8 +248,7 @@ public class NameElementUtil {
command.getParentSystemStructure(),
command.getParentDeviceStructure(),
command.getIndex(),
- command.getDescription(),
- command.getComment());
+ command.getDescription());
}
/**
@@ -282,8 +277,7 @@ public class NameElementUtil {
null,
null,
null,
- null,
- command.getComment());
+ null);
}
/**
@@ -313,8 +307,7 @@ public class NameElementUtil {
command.getParentSystemStructure(),
command.getParentDeviceStructure(),
command.getIndex(),
- command.getDescription(),
- command.getComment());
+ command.getDescription());
}
/**
@@ -343,8 +336,7 @@ public class NameElementUtil {
command.getParentSystemStructure(),
command.getParentDeviceStructure(),
command.getIndex(),
- command.getDescription(),
- command.getComment());
+ command.getDescription());
}
/**
@@ -369,8 +361,7 @@ public class NameElementUtil {
*/
public static NameElementCommandConfirm convertCommand2CommandConfirm(NameElementCommand command) {
return new NameElementCommandConfirm(
- command.getUuid(),
- command.getComment());
+ command.getUuid());
}
/**
@@ -400,8 +391,7 @@ public class NameElementUtil {
element.getParentSystemStructure(),
element.getParentDeviceStructure(),
element.getIndex(),
- element.getDescription(),
- element.getComment());
+ element.getDescription());
}
/**
@@ -430,8 +420,7 @@ public class NameElementUtil {
element.getParentSystemStructure(),
element.getParentDeviceStructure(),
element.getIndex(),
- element.getDescription(),
- element.getComment());
+ element.getDescription());
}
/**
@@ -456,8 +445,7 @@ public class NameElementUtil {
*/
public static NameElementCommandConfirm convertElement2CommandConfirm(NameElement element) {
return new NameElementCommandConfirm(
- element.getUuid(),
- element.getComment());
+ element.getUuid());
}
/**
diff --git a/src/main/java/org/openepics/names/util/StructureElementUtil.java b/src/main/java/org/openepics/names/util/StructureElementUtil.java
index 4d7db60d..8fe20cb6 100644
--- a/src/main/java/org/openepics/names/util/StructureElementUtil.java
+++ b/src/main/java/org/openepics/names/util/StructureElementUtil.java
@@ -282,11 +282,10 @@ public class StructureElementUtil {
String mnemonicPath = null;
return getStructureElement(
- systemGroup.getUuid(),
- Type.SYSTEMGROUP,
- null,
- systemGroup.getMnemonic(), mnemonicPath, systemGroup.getOrdering(), 1,
- systemGroup.getDescription(), Status.PENDING, Boolean.FALSE, systemGroup.isDeleted(),
+ systemGroup.getUuid(), Type.SYSTEMGROUP, null,
+ systemGroup.getMnemonic(), systemGroup.getOrdering(), systemGroup.getDescription(),
+ mnemonicPath, 1,
+ Status.PENDING, Boolean.FALSE, systemGroup.isDeleted(),
systemGroup.getRequested(), systemGroup.getRequestedBy(), systemGroup.getRequestedComment());
}
/**
@@ -311,11 +310,10 @@ public class StructureElementUtil {
: StructureUtil.getMnemonicPath(systemGroup, holderStructures);
return getStructureElement(
- systemGroup.getUuid(),
- Type.SYSTEMGROUP,
- null,
- systemGroup.getMnemonic(), mnemonicPath, systemGroup.getOrdering(), 1,
- systemGroup.getDescription(), systemGroup.getStatus(), systemGroup.isLatest(), systemGroup.isDeleted(),
+ systemGroup.getUuid(), Type.SYSTEMGROUP, null,
+ systemGroup.getMnemonic(), systemGroup.getOrdering(), systemGroup.getDescription(),
+ mnemonicPath, 1,
+ systemGroup.getStatus(), systemGroup.isLatest(), systemGroup.isDeleted(),
systemGroup.getProcessed(), systemGroup.getProcessedBy(), systemGroup.getProcessedComment());
}
/**
@@ -336,11 +334,10 @@ public class StructureElementUtil {
String mnemonicPath = null;
return getStructureElement(
- system.getUuid(),
- Type.SYSTEM,
- system.getParentUuid(),
- system.getMnemonic(), mnemonicPath, system.getOrdering(), 2,
- system.getDescription(), Status.PENDING, Boolean.FALSE, system.isDeleted(),
+ system.getUuid(), Type.SYSTEM, system.getParentUuid(),
+ system.getMnemonic(), system.getOrdering(), system.getDescription(),
+ mnemonicPath, 2,
+ Status.PENDING, Boolean.FALSE, system.isDeleted(),
system.getRequested(), system.getRequestedBy(), system.getRequestedComment());
}
/**
@@ -365,11 +362,10 @@ public class StructureElementUtil {
: StructureUtil.getMnemonicPath(system, holderStructures);
return getStructureElement(
- system.getUuid(),
- Type.SYSTEM,
- system.getParentUuid(),
- system.getMnemonic(), mnemonicPath, system.getOrdering(), 2,
- system.getDescription(), system.getStatus(), system.isLatest(), system.isDeleted(),
+ system.getUuid(), Type.SYSTEM, system.getParentUuid(),
+ system.getMnemonic(), system.getOrdering(), system.getDescription(),
+ mnemonicPath, 2,
+ system.getStatus(), system.isLatest(), system.isDeleted(),
system.getProcessed(), system.getProcessedBy(), system.getProcessedComment());
}
/**
@@ -390,11 +386,10 @@ public class StructureElementUtil {
String mnemonicPath = null;
return getStructureElement(
- subsystem.getUuid(),
- Type.SUBSYSTEM,
- subsystem.getParentUuid(),
- subsystem.getMnemonic(), mnemonicPath, subsystem.getOrdering(), 3,
- subsystem.getDescription(), Status.PENDING, Boolean.FALSE, subsystem.isDeleted(),
+ subsystem.getUuid(), Type.SUBSYSTEM, subsystem.getParentUuid(),
+ subsystem.getMnemonic(), subsystem.getOrdering(), subsystem.getDescription(),
+ mnemonicPath, 3,
+ Status.PENDING, Boolean.FALSE, subsystem.isDeleted(),
subsystem.getRequested(), subsystem.getRequestedBy(), subsystem.getRequestedComment());
}
/**
@@ -419,11 +414,10 @@ public class StructureElementUtil {
: StructureUtil.getMnemonicPath(subsystem, holderStructures);
return getStructureElement(
- subsystem.getUuid(),
- Type.SUBSYSTEM,
- subsystem.getParentUuid(),
- subsystem.getMnemonic(), mnemonicPath, subsystem.getOrdering(), 3,
- subsystem.getDescription(), subsystem.getStatus(), subsystem.isLatest(), subsystem.isDeleted(),
+ subsystem.getUuid(), Type.SUBSYSTEM, subsystem.getParentUuid(),
+ subsystem.getMnemonic(), subsystem.getOrdering(), subsystem.getDescription(),
+ mnemonicPath, 3,
+ subsystem.getStatus(), subsystem.isLatest(), subsystem.isDeleted(),
subsystem.getProcessed(), subsystem.getProcessedBy(), subsystem.getProcessedComment());
}
@@ -445,11 +439,10 @@ public class StructureElementUtil {
String mnemonicPath = null;
return getStructureElement(
- discipline.getUuid(),
- Type.DISCIPLINE,
- null,
- discipline.getMnemonic(), mnemonicPath, discipline.getOrdering(), 1,
- discipline.getDescription(), Status.PENDING, Boolean.FALSE, discipline.isDeleted(),
+ discipline.getUuid(), Type.DISCIPLINE, null,
+ discipline.getMnemonic(), discipline.getOrdering(), discipline.getDescription(),
+ mnemonicPath, 1,
+ Status.PENDING, Boolean.FALSE, discipline.isDeleted(),
discipline.getRequested(), discipline.getRequestedBy(), discipline.getRequestedComment());
}
/**
@@ -474,11 +467,10 @@ public class StructureElementUtil {
: StructureUtil.getMnemonicPath(discipline, holderStructures);
return getStructureElement(
- discipline.getUuid(),
- Type.DISCIPLINE,
- null,
- discipline.getMnemonic(), mnemonicPath, discipline.getOrdering(), 1,
- discipline.getDescription(), discipline.getStatus(), discipline.isLatest(), discipline.isDeleted(),
+ discipline.getUuid(), Type.DISCIPLINE, null,
+ discipline.getMnemonic(), discipline.getOrdering(), discipline.getDescription(),
+ mnemonicPath, 1,
+ discipline.getStatus(), discipline.isLatest(), discipline.isDeleted(),
discipline.getProcessed(), discipline.getProcessedBy(), discipline.getProcessedComment());
}
/**
@@ -499,11 +491,10 @@ public class StructureElementUtil {
String mnemonicPath = null;
return getStructureElement(
- deviceGroup.getUuid(),
- Type.DEVICEGROUP,
- deviceGroup.getParentUuid(),
- deviceGroup.getMnemonic(), mnemonicPath, deviceGroup.getOrdering(), 2,
- deviceGroup.getDescription(), Status.PENDING, Boolean.FALSE, deviceGroup.isDeleted(),
+ deviceGroup.getUuid(), Type.DEVICEGROUP, deviceGroup.getParentUuid(),
+ deviceGroup.getMnemonic(), deviceGroup.getOrdering(), deviceGroup.getDescription(),
+ mnemonicPath, 2,
+ Status.PENDING, Boolean.FALSE, deviceGroup.isDeleted(),
deviceGroup.getRequested(), deviceGroup.getRequestedBy(), deviceGroup.getRequestedComment());
}
/**
@@ -528,11 +519,10 @@ public class StructureElementUtil {
: StructureUtil.getMnemonicPath(deviceGroup, holderStructures);
return getStructureElement(
- deviceGroup.getUuid(),
- Type.DEVICEGROUP,
- deviceGroup.getParentUuid(),
- deviceGroup.getMnemonic(), mnemonicPath, deviceGroup.getOrdering(), 2,
- deviceGroup.getDescription(), deviceGroup.getStatus(), deviceGroup.isLatest(), deviceGroup.isDeleted(),
+ deviceGroup.getUuid(), Type.DEVICEGROUP, deviceGroup.getParentUuid(),
+ deviceGroup.getMnemonic(), deviceGroup.getOrdering(), deviceGroup.getDescription(),
+ mnemonicPath, 2,
+ deviceGroup.getStatus(), deviceGroup.isLatest(), deviceGroup.isDeleted(),
deviceGroup.getProcessed(), deviceGroup.getProcessedBy(), deviceGroup.getProcessedComment());
}
/**
@@ -553,11 +543,10 @@ public class StructureElementUtil {
String mnemonicPath = null;
return getStructureElement(
- deviceType.getUuid(),
- Type.DEVICETYPE,
- deviceType.getParentUuid(),
- deviceType.getMnemonic(), mnemonicPath, deviceType.getOrdering(), 3,
- deviceType.getDescription(), Status.PENDING, Boolean.FALSE, deviceType.isDeleted(),
+ deviceType.getUuid(), Type.DEVICETYPE, deviceType.getParentUuid(),
+ deviceType.getMnemonic(), deviceType.getOrdering(), deviceType.getDescription(),
+ mnemonicPath, 3,
+ Status.PENDING, Boolean.FALSE, deviceType.isDeleted(),
deviceType.getRequested(), deviceType.getRequestedBy(), deviceType.getRequestedComment());
}
/**
@@ -582,11 +571,10 @@ public class StructureElementUtil {
: StructureUtil.getMnemonicPath(deviceType, holderStructures);
return getStructureElement(
- deviceType.getUuid(),
- Type.DEVICETYPE,
- deviceType.getParentUuid(),
- deviceType.getMnemonic(), mnemonicPath, deviceType.getOrdering(), 3,
- deviceType.getDescription(), deviceType.getStatus(), deviceType.isLatest(), deviceType.isDeleted(),
+ deviceType.getUuid(), Type.DEVICETYPE, deviceType.getParentUuid(),
+ deviceType.getMnemonic(), deviceType.getOrdering(), deviceType.getDescription(),
+ mnemonicPath, 3,
+ deviceType.getStatus(), deviceType.isLatest(), deviceType.isDeleted(),
deviceType.getProcessed(), deviceType.getProcessedBy(), deviceType.getProcessedComment());
}
@@ -597,10 +585,10 @@ public class StructureElementUtil {
* @param type type
* @param parent parent uuid
* @param mnemonic mnemonic
- * @param mnemonicPath mnemonic path
* @param ordering ordering
- * @param level level
* @param description description
+ * @param mnemonicPath mnemonic path
+ * @param level level
* @param status status
* @param latest latest
* @param deleted deleted
@@ -610,19 +598,18 @@ public class StructureElementUtil {
* @return structure element
*/
protected static StructureElement getStructureElement(
- UUID uuid,
- Type type,
- UUID parent,
- String mnemonic, String mnemonicPath, Integer ordering, Integer level,
- String description, Status status, Boolean latest, Boolean deleted,
+ UUID uuid, Type type, UUID parent,
+ String mnemonic, Integer ordering, String description,
+ String mnemonicPath, Integer level,
+ Status status, Boolean latest, Boolean deleted,
Date when, String who, String comment) {
return new StructureElement(
- uuid, type, parent, mnemonic, ordering,
- description, comment,
+ uuid, type, parent,
+ mnemonic, ordering, description,
mnemonicPath, level,
status, latest, deleted,
- when, who);
+ when, who, comment);
}
// ----------------------------------------------------------------------------------------------------
@@ -640,8 +627,7 @@ public class StructureElementUtil {
command.getParent(),
command.getMnemonic(),
command.getOrdering(),
- command.getDescription(),
- command.getComment());
+ command.getDescription());
}
/**
@@ -671,8 +657,7 @@ public class StructureElementUtil {
command.getParent(),
command.getMnemonic(),
command.getOrdering(),
- command.getDescription(),
- command.getComment());
+ command.getDescription());
}
/**
@@ -702,8 +687,7 @@ public class StructureElementUtil {
null,
null,
null,
- null,
- command.getComment());
+ null);
}
/**
@@ -734,8 +718,7 @@ public class StructureElementUtil {
command.getParent(),
command.getMnemonic(),
command.getOrdering(),
- command.getDescription(),
- command.getComment());
+ command.getDescription());
}
/**
@@ -766,8 +749,7 @@ public class StructureElementUtil {
command.getParent(),
command.getMnemonic(),
command.getOrdering(),
- command.getDescription(),
- command.getComment());
+ command.getDescription());
}
/**
@@ -794,8 +776,7 @@ public class StructureElementUtil {
public static StructureElementCommandConfirm convertCommand2CommandConfirm(StructureElementCommand command) {
return new StructureElementCommandConfirm(
command.getUuid(),
- command.getType(),
- command.getComment());
+ command.getType());
}
/**
@@ -826,8 +807,7 @@ public class StructureElementUtil {
element.getParent(),
element.getMnemonic(),
element.getOrdering(),
- element.getDescription(),
- element.getComment());
+ element.getDescription());
}
/**
@@ -857,8 +837,7 @@ public class StructureElementUtil {
element.getParent(),
element.getMnemonic(),
element.getOrdering(),
- element.getDescription(),
- element.getComment());
+ element.getDescription());
}
/**
@@ -884,8 +863,7 @@ public class StructureElementUtil {
public static StructureElementCommandConfirm convertElement2CommandConfirm(StructureElement element) {
return new StructureElementCommandConfirm(
element.getUuid(),
- element.getType(),
- element.getComment());
+ element.getType());
}
/**
diff --git a/src/main/java/org/openepics/names/util/TextUtil.java b/src/main/java/org/openepics/names/util/TextUtil.java
index 938e3d6d..53fe89df 100644
--- a/src/main/java/org/openepics/names/util/TextUtil.java
+++ b/src/main/java/org/openepics/names/util/TextUtil.java
@@ -42,7 +42,6 @@ public class TextUtil {
public static final String DEVICEGROUP = "device group";
public static final String DEVICETYPE = "device type";
- public static final String COMMENT = "comment";
public static final String DESCRIPTION = "description";
public static final String INDEX = "index";
public static final String MNEMONIC = "mnemonic";
diff --git a/src/main/java/org/openepics/names/util/ValidateNameElementUtil.java b/src/main/java/org/openepics/names/util/ValidateNameElementUtil.java
index 200d14d3..248fb643 100644
--- a/src/main/java/org/openepics/names/util/ValidateNameElementUtil.java
+++ b/src/main/java/org/openepics/names/util/ValidateNameElementUtil.java
@@ -46,13 +46,14 @@ public class ValidateNameElementUtil {
// NameElement
// uuid,
// systemGroup, system, subsystem, deviceType, systemStructure, deviceStructure,
- // index, name,
- // description, status, latest, deleted, when, who, comment
+ // index, description, name,
+ // status, latest, deleted,
+ // when, who, comment
//
// NameElementCommand
- // create - parentSystemStructure, parentDeviceStructure, index, description, comment
- // update - uuid, parentSystemStructure, parentDeviceStructure, index, description, comment
- // delete - uuid, comment
+ // create - parentSystemStructure, parentDeviceStructure, index, description
+ // update - uuid, parentSystemStructure, parentDeviceStructure, index, description
+ // delete - uuid
/**
* This class is not to be instantiated.
@@ -125,9 +126,9 @@ public class ValidateNameElementUtil {
*/
private static void validateNameElementInput(NameElementCommand nameElementCommand, NameCommand nameCommand) {
// command - attributes
- // create - parentSystemStructure, parentDeviceStructure, index, description, comment
- // update - uuid, parentSystemStructure, parentDeviceStructure, index, description, comment
- // delete - uuid, comment
+ // create - parentSystemStructure, parentDeviceStructure, index, description
+ // update - uuid, parentSystemStructure, parentDeviceStructure, index, description
+ // delete - uuid
//
// create, update - optional - parentDeviceStructure, index
//
@@ -145,7 +146,6 @@ public class ValidateNameElementUtil {
UUID parentDeviceStructure = nameElementCommand.getParentDeviceStructure();
String index = nameElementCommand.getIndex();
String description = nameElementCommand.getDescription();
- String comment = nameElementCommand.getComment();
if (ValidateUtil.isAnyEqual(nameCommand, NameCommand.UPDATE, NameCommand.DELETE)) {
ValidateUtil.validateInputUuid(uuid != null ? uuid.toString() : null);
@@ -166,8 +166,6 @@ public class ValidateNameElementUtil {
ValidateUtil.validateInputDescription(description);
}
-
- ValidateUtil.validateInputComment(comment);
}
// ----------------------------------------------------------------------------------------------------
@@ -223,9 +221,9 @@ public class ValidateNameElementUtil {
*/
private static void validateNameElementData(NameElementCommand nameElementCommand, EssNamingConvention namingConvention, HolderIRepositories holderIRepositories, NameRepository nameRepository, HolderStructures holderStructures, NameCommand nameCommand) {
// command - attributes
- // create - parentSystemStructure, parentDeviceStructure, index, description, comment
- // update - uuid, parentSystemStructure, parentDeviceStructure, index, description, comment
- // delete - uuid, comment
+ // create - parentSystemStructure, parentDeviceStructure, index, description
+ // update - uuid, parentSystemStructure, parentDeviceStructure, index, description
+ // delete - uuid
//
// create, update - optional - parentDeviceStructure, index
//
@@ -351,7 +349,6 @@ public class ValidateNameElementUtil {
} else if (NameCommand.DELETE.equals(nameCommand)) {
// n.a.
// uuid - already handled
- // comment - already handled
}
}
diff --git a/src/main/java/org/openepics/names/util/ValidateStructureElementUtil.java b/src/main/java/org/openepics/names/util/ValidateStructureElementUtil.java
index 7a1de425..3bcea2a6 100644
--- a/src/main/java/org/openepics/names/util/ValidateStructureElementUtil.java
+++ b/src/main/java/org/openepics/names/util/ValidateStructureElementUtil.java
@@ -49,16 +49,18 @@ public class ValidateStructureElementUtil {
//
// StructureElement
// type, uuid, parent,
- // mnemonic, mnemonic path, ordering, level,
- // description, status, latest, deleted, when, who, comment
+ // mnemonic, ordering, description,
+ // mnemonic path, level,
+ // status, latest, deleted,
+ // when, who, comment
//
// StructureElementCommand
- // create - type, parent, mnemonic, ordering, description, comment
- // update - uuid, type, parent, mnemonic, ordering, description, comment
- // delete - uuid, type, comment
- // approve - uuid, type, comment
- // cancel - uuid, type, comment
- // reject - uuid, type, comment
+ // create - type, parent, mnemonic, ordering, description
+ // update - uuid, type, parent, mnemonic, ordering, description
+ // delete - uuid, type
+ // approve - uuid, type
+ // cancel - uuid, type
+ // reject - uuid, type
/**
* This class is not to be instantiated.
@@ -193,12 +195,12 @@ public class ValidateStructureElementUtil {
*/
private static void validateStructureElementInput(StructureElementCommand structureElementCommand, EssNamingConvention namingConvention, StructureCommand structureCommand) {
// command - attributes
- // create - type, parent, mnemonic, ordering, description, comment
- // update - uuid, type, parent, mnemonic, ordering, description, comment
- // delete - uuid, type, comment
- // approve - uuid, type, comment
- // cancel - uuid, type, comment
- // reject - uuid, type, comment
+ // create - type, parent, mnemonic, ordering, description
+ // update - uuid, type, parent, mnemonic, ordering, description
+ // delete - uuid, type
+ // approve - uuid, type
+ // cancel - uuid, type
+ // reject - uuid, type
//
// create, update - optional - parent, mnemonic
//
@@ -216,7 +218,6 @@ public class ValidateStructureElementUtil {
UUID parent = structureElementCommand.getParent();
String mnemonic = structureElementCommand.getMnemonic();
String description = structureElementCommand.getDescription();
- String comment = structureElementCommand.getComment();
if (ValidateUtil.isAnyEqual(structureCommand, StructureCommand.UPDATE, StructureCommand.DELETE, StructureCommand.APPROVE, StructureCommand.CANCEL, StructureCommand.REJECT)) {
ValidateUtil.validateInputUuid(uuid != null ? uuid.toString() : null);
@@ -240,8 +241,6 @@ public class ValidateStructureElementUtil {
ValidateUtil.validateInputDescription(description);
}
-
- ValidateUtil.validateInputComment(comment);
}
// ----------------------------------------------------------------------------------------------------
@@ -333,12 +332,12 @@ public class ValidateStructureElementUtil {
*/
public static void validateStructureElementDataInItself(StructureElementCommand structureElementCommand, HolderRepositories holderRepositories, StructureCommand structureCommand) {
// command - attributes
- // create - type, parent, mnemonic, ordering, description, comment
- // update - uuid, type, parent, mnemonic, ordering, description, comment
- // delete - uuid, type, comment
- // approve - uuid, type, comment
- // cancel - uuid, type, comment
- // reject - uuid, type, comment
+ // create - type, parent, mnemonic, ordering, description
+ // update - uuid, type, parent, mnemonic, ordering, description
+ // delete - uuid, type
+ // approve - uuid, type
+ // cancel - uuid, type
+ // reject - uuid, type
//
// create, update - optional - parent, mnemonic
//
@@ -432,12 +431,12 @@ public class ValidateStructureElementUtil {
*/
public static void validateStructureElementDataRelativeOtherData(StructureElementCommand structureElementCommand, EssNamingConvention namingConvention, HolderRepositories holderRepositories, HolderStructures holderStructures, StructureCommand structureCommand) {
// command - attributes
- // create - type, parent, mnemonic, ordering, description, comment
- // update - uuid, type, parent, mnemonic, ordering, description, comment
- // delete - uuid, type, comment
- // approve - uuid, type, comment
- // cancel - uuid, type, comment
- // reject - uuid, type, comment
+ // create - type, parent, mnemonic, ordering, description
+ // update - uuid, type, parent, mnemonic, ordering, description
+ // delete - uuid, type
+ // approve - uuid, type
+ // cancel - uuid, type
+ // reject - uuid, type
//
// create, update - optional - parent, mnemonic
//
@@ -454,7 +453,6 @@ public class ValidateStructureElementUtil {
// checks on mnemonic, mnemonic equivalence are to ensure can coexist, can move
// possibly
// additional checks if names are affected
- // comment not same as previous comment
if (ValidateUtil.isAnyNull(structureElementCommand, namingConvention, holderRepositories, holderStructures, structureCommand)) {
return;
diff --git a/src/main/java/org/openepics/names/util/ValidateUtil.java b/src/main/java/org/openepics/names/util/ValidateUtil.java
index 85a746e7..c56f81fe 100644
--- a/src/main/java/org/openepics/names/util/ValidateUtil.java
+++ b/src/main/java/org/openepics/names/util/ValidateUtil.java
@@ -40,17 +40,6 @@ public class ValidateUtil {
throw new IllegalStateException("Utility class");
}
- /**
- * Validate comment.
- *
- * @param comment comment
- */
- public static void validateInputComment(String comment) {
- // available
- ExceptionUtil.validateConditionInputNotAvailableException(!StringUtils.isEmpty(comment),
- TextUtil.VALUE_IS_NOT_AVAILABLE, comment, TextUtil.COMMENT);
- }
-
/**
* Validate description.
*
diff --git a/src/main/java/org/openepics/names/util/notification/NotificationName.java b/src/main/java/org/openepics/names/util/notification/NotificationName.java
index 93b0d671..46f2bf89 100644
--- a/src/main/java/org/openepics/names/util/notification/NotificationName.java
+++ b/src/main/java/org/openepics/names/util/notification/NotificationName.java
@@ -40,7 +40,6 @@ public class NotificationName {
private String newIndex;
private String newName;
private String newDescription;
- private String comment;
private Date when;
private String who;
@@ -55,7 +54,6 @@ public class NotificationName {
* @param newIndex new index
* @param newName new name
* @param newDescription new description
- * @param comment comment
* @param when when
* @param who who
*/
@@ -63,7 +61,7 @@ public class NotificationName {
UUID uuid,
String oldIndex, String oldName, String oldDescription,
String newIndex, String newName, String newDescription,
- String comment, Date when, String who) {
+ Date when, String who) {
super();
this.nameCommandCUD = nameCommandCUD;
this.uuid = uuid;
@@ -73,7 +71,6 @@ public class NotificationName {
this.newIndex = newIndex;
this.newName = newName;
this.newDescription = newDescription;
- this.comment = comment;
this.when = when;
this.who = who;
}
@@ -102,9 +99,6 @@ public class NotificationName {
public String getNewDescription() {
return newDescription;
}
- public String getComment() {
- return comment;
- }
public Date getWhen() {
return when;
}
@@ -124,7 +118,6 @@ public class NotificationName {
sb.append(", \"newIndex\": " + getNewIndex());
sb.append(", \"newName\": " + getNewName());
sb.append(", \"newDescription\": " + getNewDescription());
- sb.append(", \"comment\": " + getComment());
sb.append(", \"when\": " + getWhen());
sb.append(", \"who\": " + getWho());
sb.append("}");
diff --git a/src/main/java/org/openepics/names/util/notification/NotificationStructure.java b/src/main/java/org/openepics/names/util/notification/NotificationStructure.java
index 6c4d05b9..a3357a72 100644
--- a/src/main/java/org/openepics/names/util/notification/NotificationStructure.java
+++ b/src/main/java/org/openepics/names/util/notification/NotificationStructure.java
@@ -44,7 +44,6 @@ public class NotificationStructure {
private String newMnemonic;
private String newMnemonicpath;
private String newDescription;
- private String comment;
private Date when;
private String who;
@@ -61,7 +60,6 @@ public class NotificationStructure {
* @param newMnemonic new mnemonic
* @param newMnemonicpath new mnemonic path
* @param newDescription new description
- * @param comment comment
* @param when when
* @param who who
*/
@@ -69,7 +67,7 @@ public class NotificationStructure {
Type type, UUID uuid,
String oldMnemonic, String oldMnemonicpath, String oldDescription,
String newMnemonic, String newMnemonicpath, String newDescription,
- String comment, Date when, String who) {
+ Date when, String who) {
super();
this.structureCommandCUD = structureCommandCUD;
this.structureCommandACR = structureCommandACR;
@@ -81,7 +79,6 @@ public class NotificationStructure {
this.newMnemonic = newMnemonic;
this.newMnemonicpath = newMnemonicpath;
this.newDescription = newDescription;
- this.comment = comment;
this.when = when;
this.who = who;
}
@@ -116,9 +113,6 @@ public class NotificationStructure {
public String getNewDescription() {
return newDescription;
}
- public String getComment() {
- return comment;
- }
public Date getWhen() {
return when;
}
@@ -140,7 +134,6 @@ public class NotificationStructure {
sb.append(", \"newMnemonic\": " + getNewMnemonic());
sb.append(", \"newMnemonicpath\": " + getNewMnemonicpath());
sb.append(", \"newDescription\": " + getNewDescription());
- sb.append(", \"comment\": " + getComment());
sb.append(", \"when\": " + getWhen());
sb.append(", \"who\": " + getWho());
sb.append("}");
diff --git a/src/main/java/org/openepics/names/util/notification/NotificationUtil.java b/src/main/java/org/openepics/names/util/notification/NotificationUtil.java
index ba9798b3..b3fdad7a 100644
--- a/src/main/java/org/openepics/names/util/notification/NotificationUtil.java
+++ b/src/main/java/org/openepics/names/util/notification/NotificationUtil.java
@@ -154,7 +154,6 @@ public class NotificationUtil {
newIndex,
newName,
newDescription,
- name.getRequestedComment(),
name.getRequested(),
name.getRequestedBy());
}
@@ -254,21 +253,17 @@ public class NotificationUtil {
String newMnemonicpath = EMPTY;
String newDescription = EMPTY;
- String comment = EMPTY;
Date when = null;
String who = EMPTY;
if (structureCommandACR == null) {
- comment = structure.getRequestedComment();
when = structure.getRequested();
who = structure.getRequestedBy();
} else {
- comment = structure.getProcessedComment();
when = structure.getProcessed();
who = structure.getProcessedBy();
}
- comment = StringUtils.stripToEmpty(comment);
who = StringUtils.stripToEmpty(who);
if (ValidateUtil.isAnyEqual(structureCommandCUD, StructureCommand.UPDATE)) {
@@ -319,7 +314,6 @@ public class NotificationUtil {
newMnemonic,
newMnemonicpath,
newDescription,
- comment,
when,
who);
}
diff --git a/src/main/resources/templates/notification_names.html b/src/main/resources/templates/notification_names.html
index db809bdb..7958dfc7 100644
--- a/src/main/resources/templates/notification_names.html
+++ b/src/main/resources/templates/notification_names.html
@@ -55,7 +55,6 @@
<th/>
<th>New</th>
- <th>Comment</th>
<th>When</th>
<th>Who</th>
</tr>
@@ -80,7 +79,6 @@
</div>
</td>
- <td th:text="${row.getComment()}"/>
<td th:text="${#dates.format(row.getWhen(), 'yyyy.MM.dd HH:mm')}"/>
<td th:text="${row.getWho()}"/>
</tr>
@@ -104,7 +102,6 @@
<th/>
<th>New</th>
- <th>Comment</th>
<th>When</th>
<th>Who</th>
</tr>
@@ -129,7 +126,6 @@
</div>
</td>
- <td th:text="${row.getComment()}"/>
<td th:text="${#dates.format(row.getWhen(), 'yyyy.MM.dd HH:mm')}"/>
<td th:text="${row.getWho()}"/>
</tr>
@@ -153,7 +149,6 @@
<th/>
<th>New</th>
- <th>Comment</th>
<th>When</th>
<th>Who</th>
</tr>
@@ -178,7 +173,6 @@
</div>
</td>
- <td th:text="${row.getComment()}"/>
<td th:text="${#dates.format(row.getWhen(), 'yyyy.MM.dd HH:mm')}"/>
<td th:text="${row.getWho()}"/>
</tr>
diff --git a/src/main/resources/templates/notification_structures.html b/src/main/resources/templates/notification_structures.html
index 0e74bc79..3b6d4cc3 100644
--- a/src/main/resources/templates/notification_structures.html
+++ b/src/main/resources/templates/notification_structures.html
@@ -73,7 +73,6 @@
<th/>
<th>New</th>
- <th>Comment</th>
<th>When</th>
<th>Who</th>
</tr>
@@ -100,7 +99,6 @@
</div>
</td>
- <td th:text="${row.getComment()}"/>
<td th:text="${#dates.format(row.getWhen(), 'yyyy.MM.dd HH:mm')}"/>
<td th:text="${row.getWho()}"/>
</tr>
@@ -126,7 +124,6 @@
<th/>
<th>New</th>
- <th>Comment</th>
<th>When</th>
<th>Who</th>
</tr>
@@ -153,7 +150,6 @@
</div>
</td>
- <td th:text="${row.getComment()}"/>
<td th:text="${#dates.format(row.getWhen(), 'yyyy.MM.dd HH:mm')}"/>
<td th:text="${row.getWho()}"/>
</tr>
@@ -179,7 +175,6 @@
<th/>
<th>New</th>
- <th>Comment</th>
<th>When</th>
<th>Who</th>
</tr>
@@ -206,7 +201,6 @@
</div>
</td>
- <td th:text="${row.getComment()}"/>
<td th:text="${#dates.format(row.getWhen(), 'yyyy.MM.dd HH:mm')}"/>
<td th:text="${row.getWho()}"/>
</tr>
@@ -232,7 +226,6 @@
<th/>
<th>New</th>
- <th>Comment</th>
<th>When</th>
<th>Who</th>
</tr>
@@ -259,7 +252,6 @@
</div>
</td>
- <td th:text="${row.getComment()}"/>
<td th:text="${#dates.format(row.getWhen(), 'yyyy.MM.dd HH:mm')}"/>
<td th:text="${row.getWho()}"/>
</tr>
@@ -285,7 +277,6 @@
<th/>
<th>New</th>
- <th>Comment</th>
<th>When</th>
<th>Who</th>
</tr>
@@ -312,7 +303,6 @@
</div>
</td>
- <td th:text="${row.getComment()}"/>
<td th:text="${#dates.format(row.getWhen(), 'yyyy.MM.dd HH:mm')}"/>
<td th:text="${row.getWho()}"/>
</tr>
@@ -338,7 +328,6 @@
<th/>
<th>New</th>
- <th>Comment</th>
<th>When</th>
<th>Who</th>
</tr>
@@ -365,7 +354,6 @@
</div>
</td>
- <td th:text="${row.getComment()}"/>
<td th:text="${#dates.format(row.getWhen(), 'yyyy.MM.dd HH:mm')}"/>
<td th:text="${row.getWho()}"/>
</tr>
diff --git a/src/test/java/org/openepics/names/docker/ConvertIT.java b/src/test/java/org/openepics/names/docker/ConvertIT.java
index f051103f..91ae3f2f 100644
--- a/src/test/java/org/openepics/names/docker/ConvertIT.java
+++ b/src/test/java/org/openepics/names/docker/ConvertIT.java
@@ -76,83 +76,73 @@ class ConvertIT {
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEMGROUP, null,
- "Acc", null,
- "Accelerator. The ESS Linear Accelerator", "approved by alfio");
+ "Acc", null, "Accelerator. The ESS Linear Accelerator");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
systemGroupAcc = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEM, systemGroupAcc,
- "RFQ", null,
- "Radio Frequency Quadrupole", "empty");
+ "RFQ", null, "Radio Frequency Quadrupole");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
systemRFQ = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemRFQ,
- "010PRL", null,
- "01 Phase Reference Line", "Approved by Daniel Piso");
+ "010PRL", null, "01 Phase Reference Line");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemRFQ,
- "010", null,
- "RFQ-010", "Approved by Daniel Piso");
+ "010", null, "RFQ-010");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
subsystem010 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemRFQ,
- "N1U1", null,
- "Power switch board 01. Electrical power cabinets", "Approved by Daniel Piso");
+ "N1U1", null, "Power switch board 01. Electrical power cabinets");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
- "EMR", null,
- "Electromagnetic Resonators", "empty");
+ "EMR", null, "Electromagnetic Resonators");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
disciplineEMR = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, disciplineEMR,
- null, null,
- "Control", "These names are needed now, so I am approving, but please add a description to these later.");
+ null, null, "Control");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceGroupEMR = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupEMR,
- "FS", null,
- "Flow Switch", "Approve names added from misc device group");
+ "FS", null, "Flow Switch");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceTypeFS = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupEMR,
- "RFA", null,
- "RF Antenna", "Approve names added from misc device group");
+ "RFA", null, "RF Antenna");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupEMR,
- "TT", null,
- "Temperature Transmitter", "Approve names added from misc device group");
+ "TT", null, "Temperature Transmitter");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
nameElementCommandCreate = new NameElementCommandCreate(
- subsystem010, deviceTypeFS, "001",
- "description", "comment");
+ subsystem010, deviceTypeFS,
+ "001", "description");
ITUtilNames.assertCreate(nameElementCommandCreate);
nameElementCommandCreate = new NameElementCommandCreate(
- subsystem010, deviceTypeFS, "002",
- "description", "comment");
+ subsystem010, deviceTypeFS,
+ "002", "description");
ITUtilNames.assertCreate(nameElementCommandCreate);
nameElementCommandCreate = new NameElementCommandCreate(
- subsystem010, deviceTypeFS, "003",
- "description", "comment");
+ subsystem010, deviceTypeFS,
+ "003", "description");
ITUtilNames.assertCreate(nameElementCommandCreate);
}
diff --git a/src/test/java/org/openepics/names/docker/MetricsIT.java b/src/test/java/org/openepics/names/docker/MetricsIT.java
index 4e8062ec..aaf55f14 100644
--- a/src/test/java/org/openepics/names/docker/MetricsIT.java
+++ b/src/test/java/org/openepics/names/docker/MetricsIT.java
@@ -70,49 +70,43 @@ public class MetricsIT {
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEMGROUP, null,
- "Acc", null,
- "Accelerator. The ESS Linear Accelerator", "approved by alfio");
+ "Acc", null, "Accelerator. The ESS Linear Accelerator");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
systemGroupAcc = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEM, systemGroupAcc,
- "RFQ", null,
- "Radio Frequency Quadrupole", "empty");
+ "RFQ", null, "Radio Frequency Quadrupole");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
systemRFQ = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemRFQ,
- "010", null,
- "RFQ-010", "Approved by Daniel Piso");
+ "010", null, "RFQ-010");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
subsystem010 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
- "EMR", null,
- "Electromagnetic Resonators", "empty");
+ "EMR", null, "Electromagnetic Resonators");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
disciplineEMR = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, disciplineEMR,
- null, null,
- "Control", "These names are needed now, so I am approving, but please add a description to these later.");
+ null, null, "Control");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceGroupEMR = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupEMR,
- "FS", null,
- "Flow Switch", "Approve names added from misc device group");
+ "FS", null, "Flow Switch");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceTypeFS = approvedStructureElement.getUuid();
nameElementCommandCreate = new NameElementCommandCreate(
- subsystem010, deviceTypeFS, "001",
- "description", "comment");
+ subsystem010, deviceTypeFS,
+ "001", "description");
ITUtilNames.assertCreate(nameElementCommandCreate);
}
diff --git a/src/test/java/org/openepics/names/docker/NamesIT.java b/src/test/java/org/openepics/names/docker/NamesIT.java
index f04b28a4..c502f014 100644
--- a/src/test/java/org/openepics/names/docker/NamesIT.java
+++ b/src/test/java/org/openepics/names/docker/NamesIT.java
@@ -68,9 +68,9 @@ class NamesIT {
// NameElement, StructureElement
//
// NameElementCommand
- // create - parentSystemStructure, parentDeviceStructure, index, description, comment
- // update - uuid, parentSystemStructure, parentDeviceStructure, index, description, comment
- // delete - uuid, comment
+ // create - parentSystemStructure, parentDeviceStructure, index, description
+ // update - uuid, parentSystemStructure, parentDeviceStructure, index, description
+ // delete - uuid
//
// response status codes
@@ -98,71 +98,64 @@ class NamesIT {
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEMGROUP, null,
- "Acc", null,
- "Accelerator. The ESS Linear Accelerator", "approved by alfio");
+ "Acc", null, "Accelerator. The ESS Linear Accelerator");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
systemGroupAcc = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEM, systemGroupAcc,
- "RFQ", null,
- "Radio Frequency Quadrupole", "empty");
+ "RFQ", null, "Radio Frequency Quadrupole");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
systemRFQ = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemRFQ,
- "010PRL", null,
- "01 Phase Reference Line", "Approved by Daniel Piso");
+ "010PRL", null, "01 Phase Reference Line");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
subsystem010PRL = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemRFQ,
- "010", null,
- "RFQ-010", "Approved by Daniel Piso");
+ "010", null, "RFQ-010");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
subsystem010 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemRFQ,
- "N1U1", null,
- "Power switch board 01. Electrical power cabinets", "Approved by Daniel Piso");
+ "N1U1", null, "Power switch board 01. Electrical power cabinets");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
subsystemN1U1 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
- "EMR", null,
- "Electromagnetic Resonators", "empty");
+ "EMR", null, "Electromagnetic Resonators");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
disciplineEMR = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, disciplineEMR,
- null, null,
- "Control", "These names are needed now, so I am approving, but please add a description to these later.");
+ null, null, "Control");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceGroupEMR = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupEMR,
"FS", null,
- "Flow Switch", "Approve names added from misc device group");
+ "Flow Switch");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceTypeFS = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupEMR,
"RFA", null,
- "RF Antenna", "Approve names added from misc device group");
+ "RF Antenna");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceTypeRFA = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupEMR,
"TT", null,
- "Temperature Transmitter", "Approve names added from misc device group");
+ "Temperature Transmitter");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceTypeTT = approvedStructureElement.getUuid();
@@ -217,8 +210,8 @@ class NamesIT {
ResponsePageNameElements response, response2 = null;
nameElementCommand = new NameElementCommand(
- null, subsystemN1U1, deviceTypeRFA, "071",
- "description", "comment");
+ null, subsystemN1U1, deviceTypeRFA,
+ "071", "description");
nameElementCommandCreate = NameElementUtil.convertCommand2CommandCreate(nameElementCommand);
nameElementCommandUpdate = NameElementUtil.convertCommand2CommandUpdate(nameElementCommand);
nameElementCommandConfirm = NameElementUtil.convertCommand2CommandConfirm(nameElementCommand);
@@ -275,7 +268,7 @@ class NamesIT {
// delete, approve
structureElementCommandConfirm = new StructureElementCommandConfirm(
- subsystemN1U1, Type.SUBSYSTEM, "comment");
+ subsystemN1U1, Type.SUBSYSTEM);
ITUtilStructures.assertDelete(structureElementCommandConfirm);
@@ -467,7 +460,6 @@ class NamesIT {
// or system structure + device structure + index
// +
// description
- // comment
try {
NameElementCommandCreate nameElementCommandCreate = new NameElementCommandCreate();
@@ -488,16 +480,11 @@ class NamesIT {
// system structure
// subsystem
// description
- // comment
nameElementCommandCreate.setDescription("description");
ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, Boolean.FALSE);
ITUtilNames.assertCreate(nameElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
- nameElementCommandCreate.setComment("comment");
- ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, Boolean.FALSE);
- ITUtilNames.assertCreate(nameElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
-
// convention name exists
// already exists since create subsystem was approved
nameElementCommandCreate.setParentSystemStructure(subsystem010PRL);
@@ -508,7 +495,6 @@ class NamesIT {
// system structure + device structure + index
// subsystem, device type
// description
- // comment
nameElementCommandCreate.setIndex("051");
ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, Boolean.FALSE);
@@ -530,7 +516,6 @@ class NamesIT {
// system structure
// system
// description
- // comment
// convention name exists
// already exists since create system was approved
@@ -542,7 +527,6 @@ class NamesIT {
// system structure + device structure + index
// system, device type
// description
- // comment
nameElementCommandCreate.setIndex("051");
ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, Boolean.FALSE);
@@ -564,7 +548,6 @@ class NamesIT {
// system structure
// system group
// description
- // comment
// convention name exists
// already exists since create system group was approved
@@ -575,7 +558,6 @@ class NamesIT {
// system structure + device structure + index
// system group, device type
// description
- // comment
nameElementCommandCreate.setIndex("051");
ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.CREATE, Boolean.FALSE);
@@ -600,7 +582,6 @@ class NamesIT {
// system structure + device structure
// system, device type
// description
- // comment
// convention name exists
// already exists since create system was approved
@@ -653,12 +634,12 @@ class NamesIT {
NameElementCommandCreate nameElementCommandCreate2 = null;
nameElementCommandCreate = new NameElementCommandCreate(
- subsystem010PRL, deviceTypeRFA, "052",
- "description", "comment");
+ subsystem010PRL, deviceTypeRFA,
+ "052", "description");
nameElementCommandCreate2 = new NameElementCommandCreate(
- subsystem010PRL, deviceTypeRFA, "061",
- "description", "comment");
+ subsystem010PRL, deviceTypeRFA,
+ "061", "description");
ITUtilNames.assertExists("RFQ-010PRL:EMR-RFA-052", Boolean.FALSE);
ITUtilNames.assertIsLegacy("RFQ-010PRL:EMR-RFA-052", Boolean.FALSE);
@@ -708,7 +689,6 @@ class NamesIT {
// or system structure + device structure + index
// +
// description
- // comment
try {
NameElementCommandCreate nameElementCommandCreate = null;
@@ -716,8 +696,8 @@ class NamesIT {
NameElement createdNameElement = null;
nameElementCommandCreate = new NameElementCommandCreate(
- subsystem010PRL, deviceTypeRFA, "053",
- "description", "comment");
+ subsystem010PRL, deviceTypeRFA,
+ "053", "description");
// create
createdNameElement = ITUtilNames.assertCreate(nameElementCommandCreate);
@@ -739,13 +719,6 @@ class NamesIT {
nameElementCommandUpdate.setDescription("checkUpdate");
ITUtilNames.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.TRUE);
- nameElementCommandUpdate.setComment(null);
- ITUtilNames.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.FALSE);
- ITUtilNames.assertUpdate(nameElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
-
- nameElementCommandUpdate.setComment("checkUpdate");
- ITUtilNames.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.TRUE);
-
// ----------
nameElementCommandUpdate.setParentSystemStructure(null);
@@ -852,8 +825,8 @@ class NamesIT {
NameElement createdNameElement = null;
nameElementCommand = new NameElementCommand(
- null, subsystem010PRL, deviceTypeRFA, "054",
- "description", "comment");
+ null, subsystem010PRL, deviceTypeRFA,
+ "054", "description");
nameElementCommandCreate = NameElementUtil.convertCommand2CommandCreate(nameElementCommand);
nameElementCommandUpdate = NameElementUtil.convertCommand2CommandUpdate(nameElementCommand);
@@ -871,14 +844,12 @@ class NamesIT {
ITUtilNames.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.TRUE);
nameElementCommandUpdate.setDescription("updated description");
- nameElementCommandUpdate.setComment("updated comment");
ITUtilNames.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.TRUE);
// update
ITUtilNames.assertUpdate(nameElementCommandUpdate);
nameElementCommandUpdate.setDescription("another description");
- nameElementCommandUpdate.setComment("another comment");
ITUtilNames.assertValidate(nameElementCommandUpdate, NameCommand.UPDATE, Boolean.TRUE);
} catch (Exception e) {
@@ -902,7 +873,6 @@ class NamesIT {
//
// validate delete
// uuid
- // comment
try {
NameElementCommandCreate nameElementCommandCreate = null;
@@ -910,8 +880,8 @@ class NamesIT {
NameElement createdNameElement = null;
nameElementCommandCreate = new NameElementCommandCreate(
- subsystem010PRL, deviceTypeRFA, "055",
- "description", "comment");
+ subsystem010PRL, deviceTypeRFA,
+ "055", "description");
// create
createdNameElement = ITUtilNames.assertCreate(nameElementCommandCreate);
@@ -931,13 +901,6 @@ class NamesIT {
nameElementCommandConfirm.setUuid(createdNameElement.getUuid());
ITUtilNames.assertValidate(nameElementCommandConfirm, NameCommand.DELETE, Boolean.TRUE);
-
- nameElementCommandConfirm.setComment(null);
- ITUtilNames.assertValidate(nameElementCommandConfirm, NameCommand.DELETE, Boolean.FALSE);
- ITUtilNames.assertDelete(nameElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
-
- nameElementCommandConfirm.setComment("checkDelete");
- ITUtilNames.assertValidate(nameElementCommandConfirm, NameCommand.DELETE, Boolean.TRUE);
} catch (Exception e) {
fail();
}
@@ -963,8 +926,8 @@ class NamesIT {
NameElement createdNameElement = null;
nameElementCommandCreate = new NameElementCommandCreate(
- subsystem010PRL, deviceTypeRFA, "056",
- "description", "comment");
+ subsystem010PRL, deviceTypeRFA,
+ "056", "description");
ITUtilNames.assertValidate(nameElementCommandCreate, NameCommand.DELETE, Boolean.FALSE);
@@ -974,10 +937,6 @@ class NamesIT {
ITUtilNames.assertValidate(nameElementCommandConfirm, NameCommand.DELETE, Boolean.TRUE);
- nameElementCommandConfirm.setComment("deleted comment");
-
- ITUtilNames.assertValidate(nameElementCommandConfirm, NameCommand.DELETE, Boolean.TRUE);
-
// delete
ITUtilNames.assertDelete(nameElementCommandConfirm);
@@ -1010,58 +969,56 @@ class NamesIT {
NameElement nameElement1, nameElement7, nameElement8 = null;
nameElementCommandCreate = new NameElementCommandCreate(
- subsystem010, deviceTypeFS, "001",
- "description", "comment");
+ subsystem010, deviceTypeFS,
+ "001", "description");
// create
nameElement1 = ITUtilNames.assertCreate(nameElementCommandCreate);
uuid = nameElement1.getUuid();
nameElementCommandCreate = new NameElementCommandCreate(
- subsystem010, deviceTypeFS, "002",
- "description", "comment");
+ subsystem010, deviceTypeFS,
+ "002", "description");
responseNameElement = ITUtilNames.assertCreate(nameElementCommandCreate);
uuid2 = responseNameElement.getUuid();
nameElementCommandCreate = new NameElementCommandCreate(
- subsystem010, deviceTypeFS, "003",
- "description", "comment");
+ subsystem010, deviceTypeFS,
+ "003", "description");
ITUtilNames.assertCreate(nameElementCommandCreate);
nameElementCommandCreate = new NameElementCommandCreate(
- subsystem010, deviceTypeFS, "004",
- "description", "comment");
+ subsystem010, deviceTypeFS,
+ "004", "description");
ITUtilNames.assertCreate(nameElementCommandCreate);
nameElementCommandCreate = new NameElementCommandCreate(
- subsystem010, deviceTypeFS, "005",
- "description", "comment");
+ subsystem010, deviceTypeFS,
+ "005", "description");
ITUtilNames.assertCreate(nameElementCommandCreate);
nameElementCommandCreate = new NameElementCommandCreate(
- subsystem010, deviceTypeFS, "006",
- "description", "comment");
+ subsystem010, deviceTypeFS,
+ "006", "description");
ITUtilNames.assertCreate(nameElementCommandCreate);
nameElementCommandCreate = new NameElementCommandCreate(
- subsystem010, deviceTypeFS, "007",
- "description", "comment");
+ subsystem010, deviceTypeFS,
+ "007", "description");
nameElement7 = ITUtilNames.assertCreate(nameElementCommandCreate);
nameElementCommandCreate = new NameElementCommandCreate(
- subsystem010, deviceTypeFS, "008",
- "description", "comment");
+ subsystem010, deviceTypeFS,
+ "008", "description");
nameElement8 = ITUtilNames.assertCreate(nameElementCommandCreate);
// update element 1 twice
nameElementCommandUpdate = NameElementUtil.convertElement2CommandUpdate(nameElement1);
nameElementCommandUpdate.setDescription("updated description");
- nameElementCommandUpdate.setComment("updated comment");
ITUtilNames.assertUpdate(nameElementCommandUpdate);
nameElementCommandUpdate.setDescription("updated description again");
- nameElementCommandUpdate.setComment("updated comment again");
ITUtilNames.assertUpdate(nameElementCommandUpdate);
diff --git a/src/test/java/org/openepics/names/docker/PvNamesIT.java b/src/test/java/org/openepics/names/docker/PvNamesIT.java
index e3f3aa1d..6b59d273 100644
--- a/src/test/java/org/openepics/names/docker/PvNamesIT.java
+++ b/src/test/java/org/openepics/names/docker/PvNamesIT.java
@@ -65,43 +65,37 @@ public class PvNamesIT {
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEMGROUP, null,
- "Acc", null,
- "Accelerator. The ESS Linear Accelerator", "approved by alfio");
+ "Acc", null, "Accelerator. The ESS Linear Accelerator");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
systemGroupAcc = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEM, systemGroupAcc,
- "RFQ", null,
- "Radio Frequency Quadrupole", "empty");
+ "RFQ", null, "Radio Frequency Quadrupole");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
systemRFQ = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemRFQ,
- "010", null,
- "RFQ-010", "Approved by Daniel Piso");
+ "010", null, "RFQ-010");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
subsystem010 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
- "EMR", null,
- "Electromagnetic Resonators", "empty");
+ "EMR", null, "Electromagnetic Resonators");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
disciplineEMR = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, disciplineEMR,
- null, null,
- "Control", "These names are needed now, so I am approving, but please add a description to these later.");
+ null, null, "Control");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceGroupEMR = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupEMR,
- "FS", null,
- "Flow Switch", "Approve names added from misc device group");
+ "FS", null, "Flow Switch");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceTypeFS = approvedStructureElement.getUuid();
}
@@ -121,8 +115,8 @@ public class PvNamesIT {
NameElementCommandCreate nameElementCommandCreate = null;
nameElementCommandCreate = new NameElementCommandCreate(
- subsystem010, deviceTypeFS, "001",
- "description", "comment");
+ subsystem010, deviceTypeFS,
+ "001", "description");
ITUtilNames.assertCreate(nameElementCommandCreate);
diff --git a/src/test/java/org/openepics/names/docker/StructuresDeviceGroupIT.java b/src/test/java/org/openepics/names/docker/StructuresDeviceGroupIT.java
index 5249b5d5..e3c856ff 100644
--- a/src/test/java/org/openepics/names/docker/StructuresDeviceGroupIT.java
+++ b/src/test/java/org/openepics/names/docker/StructuresDeviceGroupIT.java
@@ -69,7 +69,7 @@ class StructuresDeviceGroupIT {
// attributes for entry for operations - create, update, delete, approve, cancel, reject
// some set client side, others set server side
// client side
- // type, uuid, parent uuid, name, mnemonic, description, comment
+ // type, uuid, parent uuid, name, mnemonic, description
// may be set client side for test purposes
// order of methods in test not known
// therefore mnemonic values chosen to not interfere with mnemonic values in other methods
@@ -79,12 +79,12 @@ class StructuresDeviceGroupIT {
// for such operations that send Command objects to backend, it is also possible to send StructureElement
//
// StructureElementCommand
- // create - type, parent, name, mnemonic, description, comment
- // update - uuid, type, parent, name, mnemonic, description, comment
- // delete - uuid, type, comment
- // approve - uuid, type, comment
- // cancel - uuid, type, comment
- // reject - uuid, type, comment
+ // create - type, parent, name, mnemonic, description
+ // update - uuid, type, parent, name, mnemonic, description
+ // delete - uuid, type
+ // approve - uuid, type
+ // cancel - uuid, type
+ // reject - uuid, type
//
// response status codes
@@ -103,15 +103,13 @@ class StructuresDeviceGroupIT {
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
- "Di", null,
- "description", "comment");
+ "Di", null, "description");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
disciplineUuid = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
- "Di2", null,
- "description", "comment");
+ "Di2", null, "description");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
discipline2Uuid = approvedStructureElement.getUuid();
@@ -149,7 +147,6 @@ class StructuresDeviceGroupIT {
// name
// mnemonic
// description
- // comment
try {
StructureElementCommandCreate structureElementCommandCreate = new StructureElementCommandCreate();
@@ -178,10 +175,6 @@ class StructuresDeviceGroupIT {
ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setDescription("description");
- ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
-
- structureElementCommandCreate.setComment("comment");
ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setType(null);
@@ -214,7 +207,6 @@ class StructuresDeviceGroupIT {
structureElementCommandCreate.setType(Type.DEVICEGROUP);
structureElementCommandCreate.setParent(disciplineUuid);
structureElementCommandCreate.setDescription("description");
- structureElementCommandCreate.setComment("comment");
// mnemonic rules
@@ -356,8 +348,7 @@ class StructuresDeviceGroupIT {
structureElementCommand = new StructureElementCommand(
null, Type.DEVICEGROUP, disciplineUuid,
- null, null,
- "description", "comment");
+ null, null, "description");
structureElementCommandCreate = StructureElementUtil.convertCommand2CommandCreate(structureElementCommand);
structureElementCommandConfirm = StructureElementUtil.convertCommand2CommandConfirm(structureElementCommand);
@@ -421,8 +412,7 @@ class StructuresDeviceGroupIT {
structureElementCommand = new StructureElementCommand(
null, Type.DEVICEGROUP, disciplineUuid,
- null, null,
- "description", "comment");
+ null, null, "description");
structureElementCommandCreate = StructureElementUtil.convertCommand2CommandCreate(structureElementCommand);
structureElementCommandConfirm = StructureElementUtil.convertCommand2CommandConfirm(structureElementCommand);
@@ -486,8 +476,7 @@ class StructuresDeviceGroupIT {
structureElementCommand = new StructureElementCommand(
null, Type.DEVICEGROUP, disciplineUuid,
- null, null,
- "description", "comment");
+ null, null, "description");
structureElementCommandCreate = StructureElementUtil.convertCommand2CommandCreate(structureElementCommand);
structureElementCommandConfirm = StructureElementUtil.convertCommand2CommandConfirm(structureElementCommand);
@@ -552,7 +541,6 @@ class StructuresDeviceGroupIT {
// name
// mnemonic
// description
- // comment
try {
UUID uuid = null;
@@ -564,8 +552,7 @@ class StructuresDeviceGroupIT {
// create, approve
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, disciplineUuid,
- null, null,
- "description", "comment");
+ null, null, "description");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElement);
uuid = approvedStructureElement.getUuid();
@@ -619,13 +606,6 @@ class StructuresDeviceGroupIT {
structureElementCommandUpdate.setDescription("description");
ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
-
- structureElementCommandUpdate.setComment(null);
- ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructures.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
-
- structureElementCommandUpdate.setComment("comment");
- ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
} catch (Exception e) {
fail();
}
@@ -656,14 +636,11 @@ class StructuresDeviceGroupIT {
// create, approve
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, disciplineUuid,
- null, null,
- "description", "comment");
+ null, null, "description");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElement);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
- structureElementCommandUpdate.setComment("comment update approve check");
-
ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
@@ -718,14 +695,11 @@ class StructuresDeviceGroupIT {
// create, approve
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, disciplineUuid,
- null, null,
- "description", "comment");
+ null, null, "description");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElement);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
- structureElementCommandUpdate.setComment("comment update cancel check");
-
ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
@@ -780,14 +754,11 @@ class StructuresDeviceGroupIT {
// create, approve
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, disciplineUuid,
- null, null,
- "description", "comment");
+ null, null, "description");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElement);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
- structureElementCommandUpdate.setComment("comment update reject check");
-
ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
@@ -834,7 +805,6 @@ class StructuresDeviceGroupIT {
// validate delete
// uuid
// type
- // comment
try {
UUID uuid = null;
@@ -846,8 +816,7 @@ class StructuresDeviceGroupIT {
// create, approve
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, disciplineUuid,
- null, null,
- "description", "comment");
+ null, null, "description");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
uuid = approvedStructureElement.getUuid();
@@ -877,13 +846,6 @@ class StructuresDeviceGroupIT {
structureElementCommandConfirm.setType(Type.DEVICEGROUP);
ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
-
- structureElementCommandConfirm.setComment(null);
- ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructures.assertDelete(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
-
- structureElementCommandConfirm.setComment("comment");
- ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
} catch (Exception e) {
fail();
}
@@ -913,13 +875,10 @@ class StructuresDeviceGroupIT {
// create, approve
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, disciplineUuid,
- null, null,
- "description", "comment");
+ null, null, "description");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
- structureElementCommandConfirm.setComment("comment delete approve check");
-
ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
@@ -973,13 +932,10 @@ class StructuresDeviceGroupIT {
// create, approve
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, disciplineUuid,
- null, null,
- "description", "comment");
+ null, null, "description");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
- structureElementCommandConfirm.setComment("comment update delete check");
-
ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
@@ -1033,13 +989,10 @@ class StructuresDeviceGroupIT {
// create, approve
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, disciplineUuid,
- null, null,
- "description", "comment");
+ null, null, "description");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
- structureElementCommandConfirm.setComment("comment delete reject check");
-
ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
@@ -1087,8 +1040,7 @@ class StructuresDeviceGroupIT {
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, disciplineUuid,
- null, 41,
- "description", "comment");
+ null, 41, "description");
// create
createdStructureElement = ITUtilStructures.assertCreate(structureElementCommandCreate);
@@ -1185,8 +1137,7 @@ class StructuresDeviceGroupIT {
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, disciplineUuid,
- null, 41,
- "description", "comment");
+ null, 41, "description");
// create
createdStructureElement = ITUtilStructures.assertCreate(structureElementCommandCreate);
@@ -1283,8 +1234,7 @@ class StructuresDeviceGroupIT {
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, disciplineUuid,
- null, 41,
- "description", "comment");
+ null, 41, "description");
// create
createdStructureElement = ITUtilStructures.assertCreate(structureElementCommandCreate);
@@ -1392,32 +1342,28 @@ class StructuresDeviceGroupIT {
// a number of entries for which the last entry has status PENDING
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, disciplineUuid,
- null, 1,
- "description", "comment");
+ null, 1, "description");
createdStructureElement = ITUtilStructures.assertCreate(structureElementCommandCreate);
uuid = createdStructureElement.getUuid();
// a number of entries for which the last entry has status CANCELLED
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, disciplineUuid,
- null, 2,
- "description", "comment");
+ null, 2, "description");
createdStructureElement = ITUtilStructures.assertCreateCancel(structureElementCommandCreate);
uuid2 = createdStructureElement.getUuid();
// a number of entries for which the last entry has status REJECTED
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, disciplineUuid,
- null, 3,
- "description", "comment");
+ null, 3, "description");
createdStructureElement = ITUtilStructures.assertCreateReject(structureElementCommandCreate);
uuid3 = createdStructureElement.getUuid();
// a number of entries for which the last entry has status APPROVED
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, disciplineUuid,
- null, 4,
- "description", "comment");
+ null, 4, "description");
createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
uuid4 = createdStructureElement.getUuid();
@@ -1486,105 +1432,101 @@ class StructuresDeviceGroupIT {
// a number of entries for which the last entry has status PENDING
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, disciplineUuid,
- null, null,
- "description", "comment");
+ null, null, "description");
responseStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
uuid = responseStructureElement.getUuid();
- structureElementCommandUpdate.setComment("comment 2");
+ structureElementCommandUpdate.setDescription("description 2");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 3");
+ structureElementCommandUpdate.setDescription("description 3");
ITUtilStructures.assertUpdateCancel(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 4");
+ structureElementCommandUpdate.setDescription("description 4");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 5");
+ structureElementCommandUpdate.setDescription("description 5");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 6");
+ structureElementCommandUpdate.setDescription("description 6");
ITUtilStructures.assertUpdateReject(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 7");
+ structureElementCommandUpdate.setDescription("description 7");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 8");
+ structureElementCommandUpdate.setDescription("description 8");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 9");
+ structureElementCommandUpdate.setDescription("description 9");
ITUtilStructures.assertUpdate(structureElementCommandUpdate);
// a number of entries for which the last entry has status CANCELLED
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, disciplineUuid,
- null, 2,
- "description", "comment");
+ null, 2, "description");
responseStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
uuid2 = responseStructureElement.getUuid();
- structureElementCommandUpdate.setComment("comment 2");
+ structureElementCommandUpdate.setDescription("description 2");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 3");
+ structureElementCommandUpdate.setDescription("description 3");
ITUtilStructures.assertUpdateCancel(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 4");
+ structureElementCommandUpdate.setDescription("description 4");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 5");
+ structureElementCommandUpdate.setDescription("description 5");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 6");
+ structureElementCommandUpdate.setDescription("description 6");
ITUtilStructures.assertUpdateReject(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 7");
+ structureElementCommandUpdate.setDescription("description 7");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 8");
+ structureElementCommandUpdate.setDescription("description 8");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 9");
+ structureElementCommandUpdate.setDescription("description 9");
ITUtilStructures.assertUpdateCancel(structureElementCommandUpdate);
// a number of entries for which the last entry has status REJECTED
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, disciplineUuid,
- null, 1,
- "description", "comment");
+ null, 1, "description");
responseStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
uuid3 = responseStructureElement.getUuid();
- structureElementCommandUpdate.setComment("comment 2");
+ structureElementCommandUpdate.setDescription("description 2");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 3");
+ structureElementCommandUpdate.setDescription("description 3");
ITUtilStructures.assertUpdateCancel(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 4");
+ structureElementCommandUpdate.setDescription("description 4");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 5");
+ structureElementCommandUpdate.setDescription("description 5");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 6");
+ structureElementCommandUpdate.setDescription("description 6");
ITUtilStructures.assertUpdateReject(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 7");
+ structureElementCommandUpdate.setDescription("description 7");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 8");
+ structureElementCommandUpdate.setDescription("description 8");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 9");
+ structureElementCommandUpdate.setDescription("description 9");
ITUtilStructures.assertUpdateReject(structureElementCommandUpdate);
// a number of entries for which the last entry has status APPROVED
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, disciplineUuid,
- null, 1,
- "description", "comment");
+ null, 1, "description");
responseStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responseStructureElement);
uuid4 = responseStructureElement.getUuid();
- structureElementCommandUpdate.setComment("comment 2");
+ structureElementCommandUpdate.setDescription("description 2");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 3");
+ structureElementCommandUpdate.setDescription("description 3");
ITUtilStructures.assertUpdateCancel(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 4");
+ structureElementCommandUpdate.setDescription("description 4");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 5");
+ structureElementCommandUpdate.setDescription("description 5");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 6");
+ structureElementCommandUpdate.setDescription("description 6");
ITUtilStructures.assertUpdateReject(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 7");
+ structureElementCommandUpdate.setDescription("description 7");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 8");
+ structureElementCommandUpdate.setDescription("description 8");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 9");
+ structureElementCommandUpdate.setDescription("description 9");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
try {
@@ -1654,73 +1596,69 @@ class StructuresDeviceGroupIT {
// create + approve
structureElementCommandsCreate = new StructureElementCommandCreate[] {
- new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 1, "description", "comment"),
- new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 1, "description", "comment"),
- new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 1, "description", "comment"),
- new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 1, "description", "comment"),
- new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 1, "description", "comment")
+ new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 1, "description"),
+ new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 1, "description"),
+ new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 1, "description"),
+ new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 1, "description"),
+ new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 1, "description")
};
approvedStructureElements = ITUtilStructures.assertCreateApprove(structureElementCommandsCreate);
uuid = approvedStructureElements[0].getUuid();
// create + cancel
structureElementCommandsCreate = new StructureElementCommandCreate[] {
- new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 2, "description", "comment"),
- new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 2, "description", "comment"),
- new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 2, "description", "comment"),
- new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 2, "description", "comment"),
- new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 2, "description", "comment")
+ new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 2, "description"),
+ new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 2, "description"),
+ new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 2, "description"),
+ new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 2, "description"),
+ new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 2, "description")
};
ITUtilStructures.assertCreateCancel(structureElementCommandsCreate);
// create + reject
structureElementCommandsCreate = new StructureElementCommandCreate[] {
- new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 3, "description", "comment"),
- new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 3, "description", "comment"),
- new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 3, "description", "comment"),
- new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 3, "description", "comment"),
- new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 3, "description", "comment"),
+ new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 3, "description"),
+ new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 3, "description"),
+ new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 3, "description"),
+ new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 3, "description"),
+ new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 3, "description"),
};
ITUtilStructures.assertCreateReject(structureElementCommandsCreate);
// create
structureElementCommandsCreate = new StructureElementCommandCreate[] {
- new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 4, "description", "comment"),
- new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 4, "description", "comment"),
- new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 4, "description", "comment"),
- new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 4, "description", "comment"),
- new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 4, "description", "comment")
+ new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 4, "description"),
+ new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 4, "description"),
+ new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 4, "description"),
+ new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 4, "description"),
+ new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 4, "description")
};
ITUtilStructures.assertCreate(structureElementCommandsCreate);
String description2 = "some other description";
- String comment2 = "some other comment";
String description3 = "more description";
- String comment3 = "more comment";
// create + approve
// update + approve
// update + approve
// delete + reject
structureElementCommandsCreate = new StructureElementCommandCreate[] {
- new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 5, "description", "comment"),
- new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 5, "description", "comment"),
- new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 5, "description", "comment"),
- new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 5, "description", "comment"),
- new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 5, "description", "comment")
+ new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 5, "description"),
+ new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 5, "description"),
+ new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 5, "description"),
+ new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 5, "description"),
+ new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 5, "description")
};
approvedStructureElements = ITUtilStructures.assertCreateApprove(structureElementCommandsCreate);
structureElementCommandsUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElements);
for (StructureElementCommandUpdate structureElementCommandUpdate : structureElementCommandsUpdate) {
structureElementCommandUpdate.setDescription(description2);
- structureElementCommandUpdate.setComment(comment2);
}
approvedStructureElements = ITUtilStructures.assertUpdateApprove(structureElementCommandsUpdate);
structureElementCommandsUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElements);
for (StructureElementCommandUpdate structureElementCommandUpdate : structureElementCommandsUpdate) {
structureElementCommandUpdate.setDescription(description3);
- structureElementCommandUpdate.setComment(comment3);
}
approvedStructureElements = ITUtilStructures.assertUpdateApprove(structureElementCommandsUpdate);
structureElementCommandsConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElements);
@@ -1729,11 +1667,11 @@ class StructuresDeviceGroupIT {
// create + approve
// delete + approve
structureElementCommandsCreate = new StructureElementCommandCreate[] {
- new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 6, "description", "comment"),
- new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 6, "description", "comment"),
- new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 6, "description", "comment"),
- new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 6, "description", "comment"),
- new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 6, "description", "comment")
+ new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 6, "description"),
+ new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 6, "description"),
+ new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 6, "description"),
+ new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 6, "description"),
+ new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 6, "description")
};
approvedStructureElements = ITUtilStructures.assertCreateApprove(structureElementCommandsCreate);
structureElementCommandsConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElements);
@@ -1742,11 +1680,11 @@ class StructuresDeviceGroupIT {
// create + approve
// delete
structureElementCommandsCreate = new StructureElementCommandCreate[] {
- new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 7, "description", "comment"),
- new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 7, "description", "comment"),
- new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 7, "description", "comment"),
- new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 7, "description", "comment"),
- new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 7, "description", "comment")
+ new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 7, "description"),
+ new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 7, "description"),
+ new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 7, "description"),
+ new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 7, "description"),
+ new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 7, "description")
};
approvedStructureElements = ITUtilStructures.assertCreateApprove(structureElementCommandsCreate);
structureElementCommandsConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElements);
@@ -1760,11 +1698,11 @@ class StructuresDeviceGroupIT {
// delete + reject
// delete
structureElementCommandsCreate = new StructureElementCommandCreate[] {
- new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 8, "description", "comment"),
- new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 8, "description", "comment"),
- new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 8, "description", "comment"),
- new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 8, "description", "comment"),
- new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 8, "description", "comment")
+ new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 8, "description"),
+ new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 8, "description"),
+ new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 8, "description"),
+ new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 8, "description"),
+ new StructureElementCommandCreate(Type.DEVICEGROUP, discipline2Uuid, null, 8, "description")
};
approvedStructureElements = ITUtilStructures.assertCreateApprove(structureElementCommandsCreate);
uuid2 = approvedStructureElements[0].getUuid();
@@ -1772,13 +1710,11 @@ class StructuresDeviceGroupIT {
structureElementCommandsUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElements);
for (StructureElementCommandUpdate structureElementCommandUpdate : structureElementCommandsUpdate) {
structureElementCommandUpdate.setDescription(description2);
- structureElementCommandUpdate.setComment(comment2);
}
approvedStructureElements = ITUtilStructures.assertUpdateApprove(structureElementCommandsUpdate);
structureElementCommandsUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElements);
for (StructureElementCommandUpdate structureElementCommandUpdate : structureElementCommandsUpdate) {
structureElementCommandUpdate.setDescription(description3);
- structureElementCommandUpdate.setComment(comment3);
}
approvedStructureElements = ITUtilStructures.assertUpdateApprove(structureElementCommandsUpdate);
structureElementCommandsConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElements);
diff --git a/src/test/java/org/openepics/names/docker/StructuresDeviceTypeIT.java b/src/test/java/org/openepics/names/docker/StructuresDeviceTypeIT.java
index 69044fde..7eace1db 100644
--- a/src/test/java/org/openepics/names/docker/StructuresDeviceTypeIT.java
+++ b/src/test/java/org/openepics/names/docker/StructuresDeviceTypeIT.java
@@ -69,7 +69,7 @@ class StructuresDeviceTypeIT {
// attributes for entry for operations - create, update, delete, approve, cancel, reject
// some set client side, others set server side
// client side
- // type, uuid, parent uuid, name, mnemonic, description, comment
+ // type, uuid, parent uuid, name, mnemonic, description
// may be set client side for test purposes
// order of methods in test not known
// therefore mnemonic values chosen to not interfere with mnemonic values in other methods
@@ -79,12 +79,12 @@ class StructuresDeviceTypeIT {
// for such operations that send Command objects to backend, it is also possible to send StructureElement
//
// StructureElementCommand
- // create - type, parent, name, mnemonic, description, comment
- // update - uuid, type, parent, name, mnemonic, description, comment
- // delete - uuid, type, comment
- // approve - uuid, type, comment
- // cancel - uuid, type, comment
- // reject - uuid, type, comment
+ // create - type, parent, name, mnemonic, description
+ // update - uuid, type, parent, name, mnemonic, description
+ // delete - uuid, type
+ // approve - uuid, type
+ // cancel - uuid, type
+ // reject - uuid, type
//
// response status codes
@@ -103,15 +103,13 @@ class StructuresDeviceTypeIT {
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
- "Di", null,
- "description", "comment");
+ "Di", null, "description");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
disciplineUuid = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, disciplineUuid,
- null, null,
- "description", "comment");
+ null, null, "description");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceGroupUuid = approvedStructureElement.getUuid();
@@ -149,7 +147,6 @@ class StructuresDeviceTypeIT {
// name
// mnemonic
// description
- // comment
try {
StructureElementCommandCreate structureElementCommandCreate = new StructureElementCommandCreate();
@@ -194,10 +191,6 @@ class StructuresDeviceTypeIT {
ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setDescription("description");
- ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
-
- structureElementCommandCreate.setComment("comment");
ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setType(null);
@@ -225,7 +218,6 @@ class StructuresDeviceTypeIT {
structureElementCommandCreate.setType(Type.DEVICETYPE);
structureElementCommandCreate.setParent(deviceGroupUuid);
structureElementCommandCreate.setDescription("description");
- structureElementCommandCreate.setComment("comment");
// mnemonic rules
@@ -354,8 +346,7 @@ class StructuresDeviceTypeIT {
structureElementCommand = new StructureElementCommand(
null, Type.DEVICETYPE, deviceGroupUuid,
- "Ca", null,
- "description", "comment");
+ "Ca", null, "description");
structureElementCommandCreate = StructureElementUtil.convertCommand2CommandCreate(structureElementCommand);
structureElementCommandConfirm = StructureElementUtil.convertCommand2CommandConfirm(structureElementCommand);
@@ -415,8 +406,7 @@ class StructuresDeviceTypeIT {
structureElementCommand = new StructureElementCommand(
null, Type.DEVICETYPE, deviceGroupUuid,
- "Cc", null,
- "description", "comment");
+ "Cc", null, "description");
structureElementCommandCreate = StructureElementUtil.convertCommand2CommandCreate(structureElementCommand);
structureElementCommandConfirm = StructureElementUtil.convertCommand2CommandConfirm(structureElementCommand);
@@ -481,8 +471,7 @@ class StructuresDeviceTypeIT {
structureElementCommand = new StructureElementCommand(
null, Type.DEVICETYPE, deviceGroupUuid,
- "Cr", null,
- "description", "comment");
+ "Cr", null, "description");
structureElementCommandCreate = StructureElementUtil.convertCommand2CommandCreate(structureElementCommand);
structureElementCommandConfirm = StructureElementUtil.convertCommand2CommandConfirm(structureElementCommand);
@@ -548,7 +537,6 @@ class StructuresDeviceTypeIT {
// name
// mnemonic
// description
- // comment
try {
UUID uuid = null;
@@ -560,8 +548,7 @@ class StructuresDeviceTypeIT {
// create, approve
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupUuid,
- "Cu", null,
- "description", "comment");
+ "Cu", null, "description");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElement);
uuid = approvedStructureElement.getUuid();
@@ -615,13 +602,6 @@ class StructuresDeviceTypeIT {
structureElementCommandUpdate.setDescription("description");
ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
-
- structureElementCommandUpdate.setComment(null);
- ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructures.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
-
- structureElementCommandUpdate.setComment("comment");
- ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
} catch (Exception e) {
fail();
}
@@ -652,14 +632,11 @@ class StructuresDeviceTypeIT {
// create, approve
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupUuid,
- "Ua", null,
- "description", "comment");
+ "Ua", null, "description");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElement);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
- structureElementCommandUpdate.setComment("comment update approve check");
-
ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
@@ -714,14 +691,11 @@ class StructuresDeviceTypeIT {
// create, approve
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupUuid,
- "Uc", null,
- "description", "comment");
+ "Uc", null, "description");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElement);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
- structureElementCommandUpdate.setComment("comment update cancel check");
-
ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
@@ -776,14 +750,11 @@ class StructuresDeviceTypeIT {
// create, approve
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupUuid,
- "Ur", null,
- "description", "comment");
+ "Ur", null, "description");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElement);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
- structureElementCommandUpdate.setComment("comment update reject check");
-
ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
@@ -830,7 +801,6 @@ class StructuresDeviceTypeIT {
// validate delete
// uuid
// type
- // comment
try {
UUID uuid = null;
@@ -842,8 +812,7 @@ class StructuresDeviceTypeIT {
// create, approve
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupUuid,
- "Cd", null,
- "description", "comment");
+ "Cd", null, "description");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
uuid = approvedStructureElement.getUuid();
@@ -873,13 +842,6 @@ class StructuresDeviceTypeIT {
structureElementCommandConfirm.setType(Type.DEVICETYPE);
ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
-
- structureElementCommandConfirm.setComment(null);
- ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructures.assertDelete(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
-
- structureElementCommandConfirm.setComment("comment");
- ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
} catch (Exception e) {
fail();
}
@@ -909,13 +871,10 @@ class StructuresDeviceTypeIT {
// create, approve
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupUuid,
- "Da", null,
- "description", "comment");
+ "Da", null, "description");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
- structureElementCommandConfirm.setComment("comment delete approve check");
-
ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
@@ -969,13 +928,10 @@ class StructuresDeviceTypeIT {
// create, approve
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupUuid,
- "Dc", null,
- "description", "comment");
+ "Dc", null, "description");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
- structureElementCommandConfirm.setComment("comment update delete check");
-
ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
@@ -1036,13 +992,10 @@ class StructuresDeviceTypeIT {
// create, approve
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupUuid,
- "Dr", null,
- "description", "comment");
+ "Dr", null, "description");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
- structureElementCommandConfirm.setComment("comment delete reject check");
-
ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
@@ -1083,8 +1036,7 @@ class StructuresDeviceTypeIT {
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupUuid,
- "Rsha", 41,
- "description", "comment");
+ "Rsha", 41, "description");
// create
createdStructureElement = ITUtilStructures.assertCreate(structureElementCommandCreate);
@@ -1183,8 +1135,7 @@ class StructuresDeviceTypeIT {
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupUuid,
- "Rshc", 41,
- "description", "comment");
+ "Rshc", 41, "description");
// create
createdStructureElement = ITUtilStructures.assertCreate(structureElementCommandCreate);
@@ -1283,8 +1234,7 @@ class StructuresDeviceTypeIT {
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupUuid,
- "Rshr", 41,
- "description", "comment");
+ "Rshr", 41, "description");
// create
createdStructureElement = ITUtilStructures.assertCreate(structureElementCommandCreate);
@@ -1394,32 +1344,28 @@ class StructuresDeviceTypeIT {
// a number of entries for which the last entry has status PENDING
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupUuid,
- "P1", 1,
- "description", "comment");
+ "P1", 1, "description");
createdStructureElement = ITUtilStructures.assertCreate(structureElementCommandCreate);
uuid = createdStructureElement.getUuid();
// a number of entries for which the last entry has status CANCELLED
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupUuid,
- "C1", 2,
- "description", "comment");
+ "C1", 2, "description");
createdStructureElement = ITUtilStructures.assertCreateCancel(structureElementCommandCreate);
uuid2 = createdStructureElement.getUuid();
// a number of entries for which the last entry has status REJECTED
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupUuid,
- "R1", 3,
- "description", "comment");
+ "R1", 3, "description");
createdStructureElement = ITUtilStructures.assertCreateReject(structureElementCommandCreate);
uuid3 = createdStructureElement.getUuid();
// a number of entries for which the last entry has status APPROVED
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupUuid,
- "A1", 4,
- "description", "comment");
+ "A1", 4, "description");
createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
uuid4 = createdStructureElement.getUuid();
@@ -1491,105 +1437,101 @@ class StructuresDeviceTypeIT {
// a number of entries for which the last entry has status PENDING
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupUuid,
- "P9", null,
- "description", "comment");
+ "P9", null, "description");
createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
uuid = createdStructureElement.getUuid();
- structureElementCommandUpdate.setComment("comment 2");
+ structureElementCommandUpdate.setDescription("description 2");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 3");
+ structureElementCommandUpdate.setDescription("description 3");
ITUtilStructures.assertUpdateCancel(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 4");
+ structureElementCommandUpdate.setDescription("description 4");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 5");
+ structureElementCommandUpdate.setDescription("description 5");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 6");
+ structureElementCommandUpdate.setDescription("description 6");
ITUtilStructures.assertUpdateReject(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 7");
+ structureElementCommandUpdate.setDescription("description 7");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 8");
+ structureElementCommandUpdate.setDescription("description 8");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 9");
+ structureElementCommandUpdate.setDescription("description 9");
ITUtilStructures.assertUpdate(structureElementCommandUpdate);
// a number of entries for which the last entry has status CANCELLED
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupUuid,
- "C9", 2,
- "description", "comment");
+ "C9", 2, "description");
createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
uuid2 = createdStructureElement.getUuid();
- structureElementCommandUpdate.setComment("comment 2");
+ structureElementCommandUpdate.setDescription("description 2");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 3");
+ structureElementCommandUpdate.setDescription("description 3");
ITUtilStructures.assertUpdateCancel(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 4");
+ structureElementCommandUpdate.setDescription("description 4");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 5");
+ structureElementCommandUpdate.setDescription("description 5");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 6");
+ structureElementCommandUpdate.setDescription("description 6");
ITUtilStructures.assertUpdateReject(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 7");
+ structureElementCommandUpdate.setDescription("description 7");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 8");
+ structureElementCommandUpdate.setDescription("description 8");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 9");
+ structureElementCommandUpdate.setDescription("description 9");
ITUtilStructures.assertUpdateCancel(structureElementCommandUpdate);
// a number of entries for which the last entry has status REJECTED
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupUuid,
- "R9", 1,
- "description", "comment");
+ "R9", 1, "description");
createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
uuid3 = createdStructureElement.getUuid();
- structureElementCommandUpdate.setComment("comment 2");
+ structureElementCommandUpdate.setDescription("description 2");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 3");
+ structureElementCommandUpdate.setDescription("description 3");
ITUtilStructures.assertUpdateCancel(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 4");
+ structureElementCommandUpdate.setDescription("description 4");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 5");
+ structureElementCommandUpdate.setDescription("description 5");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 6");
+ structureElementCommandUpdate.setDescription("description 6");
ITUtilStructures.assertUpdateReject(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 7");
+ structureElementCommandUpdate.setDescription("description 7");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 8");
+ structureElementCommandUpdate.setDescription("description 8");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 9");
+ structureElementCommandUpdate.setDescription("description 9");
ITUtilStructures.assertUpdateReject(structureElementCommandUpdate);
// a number of entries for which the last entry has status APPROVED
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupUuid,
- "A9", 1,
- "description", "comment");
+ "A9", 1, "description");
createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
uuid4 = createdStructureElement.getUuid();
- structureElementCommandUpdate.setComment("comment 2");
+ structureElementCommandUpdate.setDescription("description 2");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 3");
+ structureElementCommandUpdate.setDescription("description 3");
ITUtilStructures.assertUpdateCancel(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 4");
+ structureElementCommandUpdate.setDescription("description 4");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 5");
+ structureElementCommandUpdate.setDescription("description 5");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 6");
+ structureElementCommandUpdate.setDescription("description 6");
ITUtilStructures.assertUpdateReject(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 7");
+ structureElementCommandUpdate.setDescription("description 7");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 8");
+ structureElementCommandUpdate.setDescription("description 8");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 9");
+ structureElementCommandUpdate.setDescription("description 9");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
try {
@@ -1662,73 +1604,69 @@ class StructuresDeviceTypeIT {
// create + approve
structureElementCommandsCreate = new StructureElementCommandCreate[] {
- new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AA1", 1, "description", "comment"),
- new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AA2", 1, "description", "comment"),
- new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AA3", 1, "description", "comment"),
- new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AA4", 1, "description", "comment"),
- new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AA5", 1, "description", "comment")
+ new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AA1", 1, "description"),
+ new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AA2", 1, "description"),
+ new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AA3", 1, "description"),
+ new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AA4", 1, "description"),
+ new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AA5", 1, "description")
};
approvedStructureElements = ITUtilStructures.assertCreateApprove(structureElementCommandsCreate);
uuid = approvedStructureElements[0].getUuid();
// create + cancel
structureElementCommandsCreate = new StructureElementCommandCreate[] {
- new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AB1", 2, "description", "comment"),
- new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AB2", 2, "description", "comment"),
- new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AB3", 2, "description", "comment"),
- new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AB4", 2, "description", "comment"),
- new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AB5", 2, "description", "comment")
+ new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AB1", 2, "description"),
+ new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AB2", 2, "description"),
+ new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AB3", 2, "description"),
+ new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AB4", 2, "description"),
+ new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AB5", 2, "description")
};
ITUtilStructures.assertCreateCancel(structureElementCommandsCreate);
// create + reject
structureElementCommandsCreate = new StructureElementCommandCreate[] {
- new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AC1", 3, "description", "comment"),
- new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AC2", 3, "description", "comment"),
- new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AC3", 3, "description", "comment"),
- new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AC4", 3, "description", "comment"),
- new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AC5", 3, "description", "comment")
+ new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AC1", 3, "description"),
+ new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AC2", 3, "description"),
+ new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AC3", 3, "description"),
+ new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AC4", 3, "description"),
+ new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AC5", 3, "description")
};
ITUtilStructures.assertCreateReject(structureElementCommandsCreate);
// create
structureElementCommandsCreate = new StructureElementCommandCreate[] {
- new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AD1", 4, "description", "comment"),
- new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AD2", 4, "description", "comment"),
- new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AD3", 4, "description", "comment"),
- new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AD4", 4, "description", "comment"),
- new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AD5", 4, "description", "comment")
+ new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AD1", 4, "description"),
+ new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AD2", 4, "description"),
+ new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AD3", 4, "description"),
+ new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AD4", 4, "description"),
+ new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AD5", 4, "description")
};
ITUtilStructures.assertCreate(structureElementCommandsCreate);
String description2 = "some other description";
- String comment2 = "some other comment";
String description3 = "more description";
- String comment3 = "more comment";
// create + approve
// update + approve
// update + approve
// delete + reject
structureElementCommandsCreate = new StructureElementCommandCreate[] {
- new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AE1", 5, "description", "comment"),
- new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AE2", 5, "description", "comment"),
- new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AE3", 5, "description", "comment"),
- new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AE4", 5, "description", "comment"),
- new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AE5", 5, "description", "comment")
+ new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AE1", 5, "description"),
+ new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AE2", 5, "description"),
+ new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AE3", 5, "description"),
+ new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AE4", 5, "description"),
+ new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AE5", 5, "description")
};
approvedStructureElements = ITUtilStructures.assertCreateApprove(structureElementCommandsCreate);
structureElementCommandsUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElements);
for (StructureElementCommandUpdate structureElementCommandUpdate : structureElementCommandsUpdate) {
structureElementCommandUpdate.setDescription(description2);
- structureElementCommandUpdate.setComment(comment2);
}
approvedStructureElements = ITUtilStructures.assertUpdateApprove(structureElementCommandsUpdate);
structureElementCommandsUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElements);
for (StructureElementCommandUpdate structureElementCommandUpdate : structureElementCommandsUpdate) {
structureElementCommandUpdate.setDescription(description3);
- structureElementCommandUpdate.setComment(comment3);
}
approvedStructureElements = ITUtilStructures.assertUpdateApprove(structureElementCommandsUpdate);
structureElementCommandsConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElements);
@@ -1737,11 +1675,11 @@ class StructuresDeviceTypeIT {
// create + approve
// delete + approve
structureElementCommandsCreate = new StructureElementCommandCreate[] {
- new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AF1", 6, "description", "comment"),
- new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AF2", 6, "description", "comment"),
- new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AF3", 6, "description", "comment"),
- new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AF4", 6, "description", "comment"),
- new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AF5", 6, "description", "comment")
+ new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AF1", 6, "description"),
+ new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AF2", 6, "description"),
+ new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AF3", 6, "description"),
+ new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AF4", 6, "description"),
+ new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AF5", 6, "description")
};
approvedStructureElements = ITUtilStructures.assertCreateApprove(structureElementCommandsCreate);
structureElementCommandsConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElements);
@@ -1750,11 +1688,11 @@ class StructuresDeviceTypeIT {
// create + approve
// delete
structureElementCommandsCreate = new StructureElementCommandCreate[] {
- new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AG1", 7, "description", "comment"),
- new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AG2", 7, "description", "comment"),
- new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AG3", 7, "description", "comment"),
- new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AG4", 7, "description", "comment"),
- new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AG5", 7, "description", "comment")
+ new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AG1", 7, "description"),
+ new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AG2", 7, "description"),
+ new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AG3", 7, "description"),
+ new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AG4", 7, "description"),
+ new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AG5", 7, "description")
};
approvedStructureElements = ITUtilStructures.assertCreateApprove(structureElementCommandsCreate);
structureElementCommandsConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElements);
@@ -1768,11 +1706,11 @@ class StructuresDeviceTypeIT {
// delete + reject
// delete
structureElementCommandsCreate = new StructureElementCommandCreate[] {
- new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AH1", 8, "description", "comment"),
- new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AH2", 8, "description", "comment"),
- new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AH3", 8, "description", "comment"),
- new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AH4", 8, "description", "comment"),
- new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AH5", 8, "description", "comment")
+ new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AH1", 8, "description"),
+ new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AH2", 8, "description"),
+ new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AH3", 8, "description"),
+ new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AH4", 8, "description"),
+ new StructureElementCommandCreate(Type.DEVICETYPE, deviceGroupUuid, "AH5", 8, "description")
};
approvedStructureElements = ITUtilStructures.assertCreateApprove(structureElementCommandsCreate);
uuid2 = approvedStructureElements[0].getUuid();
@@ -1780,13 +1718,11 @@ class StructuresDeviceTypeIT {
structureElementCommandsUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElements);
for (StructureElementCommandUpdate structureElementCommandUpdate : structureElementCommandsUpdate) {
structureElementCommandUpdate.setDescription(description2);
- structureElementCommandUpdate.setComment(comment2);
}
approvedStructureElements = ITUtilStructures.assertUpdateApprove(structureElementCommandsUpdate);
structureElementCommandsUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElements);
for (StructureElementCommandUpdate structureElementCommandUpdate : structureElementCommandsUpdate) {
structureElementCommandUpdate.setDescription(description3);
- structureElementCommandUpdate.setComment(comment3);
}
approvedStructureElements = ITUtilStructures.assertUpdateApprove(structureElementCommandsUpdate);
structureElementCommandsConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElements);
diff --git a/src/test/java/org/openepics/names/docker/StructuresDisciplineIT.java b/src/test/java/org/openepics/names/docker/StructuresDisciplineIT.java
index c2994cb4..3a1ff290 100644
--- a/src/test/java/org/openepics/names/docker/StructuresDisciplineIT.java
+++ b/src/test/java/org/openepics/names/docker/StructuresDisciplineIT.java
@@ -68,7 +68,7 @@ class StructuresDisciplineIT {
// attributes for entry for operations - create, update, delete, approve, cancel, reject
// some set client side, others set server side
// client side
- // type, uuid, parent uuid, name, mnemonic, description, comment
+ // type, uuid, parent uuid, name, mnemonic, description
// may be set client side for test purposes
// order of methods in test not known
// therefore mnemonic values chosen to not interfere with mnemonic values in other methods
@@ -78,12 +78,12 @@ class StructuresDisciplineIT {
// for such operations that send Command objects to backend, it is also possible to send StructureElement
//
// StructureElementCommand
- // create - type, parent, name, mnemonic, description, comment
- // update - uuid, type, parent, name, mnemonic, description, comment
- // delete - uuid, type, comment
- // approve - uuid, type, comment
- // cancel - uuid, type, comment
- // reject - uuid, type, comment
+ // create - type, parent, name, mnemonic, description
+ // update - uuid, type, parent, name, mnemonic, description
+ // delete - uuid, type
+ // approve - uuid, type
+ // cancel - uuid, type
+ // reject - uuid, type
//
// response status codes
@@ -113,7 +113,6 @@ class StructuresDisciplineIT {
// name
// mnemonic
// description
- // comment
try {
StructureElementCommandCreate structureElementCommandCreate = new StructureElementCommandCreate();
@@ -142,10 +141,6 @@ class StructuresDisciplineIT {
ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setDescription("description");
- ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
-
- structureElementCommandCreate.setComment("comment");
ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setType(null);
@@ -172,7 +167,6 @@ class StructuresDisciplineIT {
structureElementCommandCreate.setType(Type.DISCIPLINE);
structureElementCommandCreate.setDescription("description");
- structureElementCommandCreate.setComment("comment");
// mnemonic rules
@@ -288,8 +282,7 @@ class StructuresDisciplineIT {
structureElementCommand = new StructureElementCommand(
null, Type.DISCIPLINE, null,
- "Ca", null,
- "description", "comment");
+ "Ca", null, "description");
structureElementCommandCreate = StructureElementUtil.convertCommand2CommandCreate(structureElementCommand);
structureElementCommandConfirm = StructureElementUtil.convertCommand2CommandConfirm(structureElementCommand);
@@ -349,8 +342,7 @@ class StructuresDisciplineIT {
structureElementCommand = new StructureElementCommand(
null, Type.DISCIPLINE, null,
- "Cc", null,
- "description", "comment");
+ "Cc", null, "description");
structureElementCommandCreate = StructureElementUtil.convertCommand2CommandCreate(structureElementCommand);
structureElementCommandConfirm = StructureElementUtil.convertCommand2CommandConfirm(structureElementCommand);
@@ -415,8 +407,7 @@ class StructuresDisciplineIT {
structureElementCommand = new StructureElementCommand(
null, Type.DISCIPLINE, null,
- "Cr", null,
- "description", "comment");
+ "Cr", null, "description");
structureElementCommandCreate = StructureElementUtil.convertCommand2CommandCreate(structureElementCommand);
structureElementCommandConfirm = StructureElementUtil.convertCommand2CommandConfirm(structureElementCommand);
@@ -481,7 +472,6 @@ class StructuresDisciplineIT {
// name
// mnemonic
// description
- // comment
try {
UUID uuid = null;
@@ -493,8 +483,7 @@ class StructuresDisciplineIT {
// create, approve
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
- "Cu", null,
- "description", "comment");
+ "Cu", null, "description");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElement);
uuid = approvedStructureElement.getUuid();
@@ -541,13 +530,6 @@ class StructuresDisciplineIT {
structureElementCommandUpdate.setDescription("description");
ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
-
- structureElementCommandUpdate.setComment(null);
- ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructures.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
-
- structureElementCommandUpdate.setComment("comment");
- ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
} catch (Exception e) {
fail();
}
@@ -578,14 +560,11 @@ class StructuresDisciplineIT {
// create, approve
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
- "Ua", null,
- "description", "comment");
+ "Ua", null, "description");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElement);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
- structureElementCommandUpdate.setComment("comment update approve check");
-
ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
@@ -640,14 +619,11 @@ class StructuresDisciplineIT {
// create, approve
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
- "Uc", null,
- "description", "comment");
+ "Uc", null, "description");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElement);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
- structureElementCommandUpdate.setComment("comment update cancel check");
-
ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
@@ -702,14 +678,11 @@ class StructuresDisciplineIT {
// create, approve
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
- "Ur", null,
- "description", "comment");
+ "Ur", null, "description");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElement);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
- structureElementCommandUpdate.setComment("comment update reject check");
-
ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
@@ -756,7 +729,6 @@ class StructuresDisciplineIT {
// validate delete
// uuid
// type
- // comment
try {
UUID uuid = null;
@@ -768,8 +740,7 @@ class StructuresDisciplineIT {
// create, approve
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
- "Cd", null,
- "description", "comment");
+ "Cd", null, "description");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
uuid = approvedStructureElement.getUuid();
@@ -799,13 +770,6 @@ class StructuresDisciplineIT {
structureElementCommandConfirm.setType(Type.DISCIPLINE);
ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
-
- structureElementCommandConfirm.setComment(null);
- ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructures.assertDelete(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
-
- structureElementCommandConfirm.setComment("comment");
- ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
} catch (Exception e) {
fail();
}
@@ -835,13 +799,10 @@ class StructuresDisciplineIT {
// create, approve
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
- "Da", null,
- "description", "comment");
+ "Da", null, "description");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
- structureElementCommandConfirm.setComment("comment delete approve check");
-
ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
@@ -895,13 +856,10 @@ class StructuresDisciplineIT {
// create, approve
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
- "Dc", null,
- "description", "comment");
+ "Dc", null, "description");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
- structureElementCommandConfirm.setComment("comment update delete check");
-
ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
@@ -955,13 +913,10 @@ class StructuresDisciplineIT {
// create, approve
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
- "Dr", null,
- "description", "comment");
+ "Dr", null, "description");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
- structureElementCommandConfirm.setComment("comment delete reject check");
-
ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
@@ -1009,8 +964,7 @@ class StructuresDisciplineIT {
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
- "Rsha", 41,
- "description", "comment");
+ "Rsha", 41, "description");
// create
createdStructureElement = ITUtilStructures.assertCreate(structureElementCommandCreate);
@@ -1091,8 +1045,7 @@ class StructuresDisciplineIT {
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
- "Rshc", 41,
- "description", "comment");
+ "Rshc", 41, "description");
// create
createdStructureElement = ITUtilStructures.assertCreate(structureElementCommandCreate);
@@ -1173,8 +1126,7 @@ class StructuresDisciplineIT {
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
- "Rshr", 41,
- "description", "comment");
+ "Rshr", 41, "description");
// create
createdStructureElement = ITUtilStructures.assertCreate(structureElementCommandCreate);
@@ -1266,32 +1218,28 @@ class StructuresDisciplineIT {
// a number of entries for which the last entry has status PENDING
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
- "P1", 1,
- "description", "comment");
+ "P1", 1, "description");
createdStructureElement = ITUtilStructures.assertCreate(structureElementCommandCreate);
uuid = createdStructureElement.getUuid();
// a number of entries for which the last entry has status CANCELLED
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
- "C1", 2,
- "description", "comment");
+ "C1", 2, "description");
createdStructureElement = ITUtilStructures.assertCreateCancel(structureElementCommandCreate);
uuid2 = createdStructureElement.getUuid();
// a number of entries for which the last entry has status REJECTED
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
- "R1", 3,
- "description", "comment");
+ "R1", 3, "description");
createdStructureElement = ITUtilStructures.assertCreateReject(structureElementCommandCreate);
uuid3 = createdStructureElement.getUuid();
// a number of entries for which the last entry has status APPROVED
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
- "A1", 4,
- "description", "comment");
+ "A1", 4, "description");
createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
uuid4 = createdStructureElement.getUuid();
@@ -1359,105 +1307,101 @@ class StructuresDisciplineIT {
// a number of entries for which the last entry has status PENDING
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
- "P9", null,
- "description", "comment");
+ "P9", null, "description");
createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
uuid = createdStructureElement.getUuid();
- structureElementCommandUpdate.setComment("comment 2");
+ structureElementCommandUpdate.setDescription("description 2");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 3");
+ structureElementCommandUpdate.setDescription("description 3");
ITUtilStructures.assertUpdateCancel(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 4");
+ structureElementCommandUpdate.setDescription("description 4");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 5");
+ structureElementCommandUpdate.setDescription("description 5");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 6");
+ structureElementCommandUpdate.setDescription("description 6");
ITUtilStructures.assertUpdateReject(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 7");
+ structureElementCommandUpdate.setDescription("description 7");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 8");
+ structureElementCommandUpdate.setDescription("description 8");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 9");
+ structureElementCommandUpdate.setDescription("description 9");
ITUtilStructures.assertUpdate(structureElementCommandUpdate);
// a number of entries for which the last entry has status CANCELLED
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
- "C9", 2,
- "description", "comment");
+ "C9", 2, "description");
createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
uuid2 = createdStructureElement.getUuid();
- structureElementCommandUpdate.setComment("comment 2");
+ structureElementCommandUpdate.setDescription("description 2");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 3");
+ structureElementCommandUpdate.setDescription("description 3");
ITUtilStructures.assertUpdateCancel(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 4");
+ structureElementCommandUpdate.setDescription("description 4");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 5");
+ structureElementCommandUpdate.setDescription("description 5");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 6");
+ structureElementCommandUpdate.setDescription("description 6");
ITUtilStructures.assertUpdateReject(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 7");
+ structureElementCommandUpdate.setDescription("description 7");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 8");
+ structureElementCommandUpdate.setDescription("description 8");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 9");
+ structureElementCommandUpdate.setDescription("description 9");
ITUtilStructures.assertUpdateCancel(structureElementCommandUpdate);
// a number of entries for which the last entry has status REJECTED
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
- "R9", 1,
- "description", "comment");
+ "R9", 1, "description");
createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
uuid3 = createdStructureElement.getUuid();
- structureElementCommandUpdate.setComment("comment 2");
+ structureElementCommandUpdate.setDescription("description 2");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 3");
+ structureElementCommandUpdate.setDescription("description 3");
ITUtilStructures.assertUpdateCancel(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 4");
+ structureElementCommandUpdate.setDescription("description 4");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 5");
+ structureElementCommandUpdate.setDescription("description 5");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 6");
+ structureElementCommandUpdate.setDescription("description 6");
ITUtilStructures.assertUpdateReject(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 7");
+ structureElementCommandUpdate.setDescription("description 7");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 8");
+ structureElementCommandUpdate.setDescription("description 8");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 9");
+ structureElementCommandUpdate.setDescription("description 9");
ITUtilStructures.assertUpdateReject(structureElementCommandUpdate);
// a number of entries for which the last entry has status APPROVED
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
- "A9", 1,
- "description", "comment");
+ "A9", 1, "description");
createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
uuid4 = createdStructureElement.getUuid();
- structureElementCommandUpdate.setComment("comment 2");
+ structureElementCommandUpdate.setDescription("description 2");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 3");
+ structureElementCommandUpdate.setDescription("description 3");
ITUtilStructures.assertUpdateCancel(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 4");
+ structureElementCommandUpdate.setDescription("description 4");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 5");
+ structureElementCommandUpdate.setDescription("description 5");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 6");
+ structureElementCommandUpdate.setDescription("description 6");
ITUtilStructures.assertUpdateReject(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 7");
+ structureElementCommandUpdate.setDescription("description 7");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 8");
+ structureElementCommandUpdate.setDescription("description 8");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 9");
+ structureElementCommandUpdate.setDescription("description 9");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
try {
@@ -1526,73 +1470,69 @@ class StructuresDisciplineIT {
// create + approve
structureElementCommandsCreate = new StructureElementCommandCreate[] {
- new StructureElementCommandCreate(Type.DISCIPLINE, null, "AA1", 1, "description", "comment"),
- new StructureElementCommandCreate(Type.DISCIPLINE, null, "AA2", 1, "description", "comment"),
- new StructureElementCommandCreate(Type.DISCIPLINE, null, "AA3", 1, "description", "comment"),
- new StructureElementCommandCreate(Type.DISCIPLINE, null, "AA4", 1, "description", "comment"),
- new StructureElementCommandCreate(Type.DISCIPLINE, null, "AA5", 1, "description", "comment")
+ new StructureElementCommandCreate(Type.DISCIPLINE, null, "AA1", 1, "description"),
+ new StructureElementCommandCreate(Type.DISCIPLINE, null, "AA2", 1, "description"),
+ new StructureElementCommandCreate(Type.DISCIPLINE, null, "AA3", 1, "description"),
+ new StructureElementCommandCreate(Type.DISCIPLINE, null, "AA4", 1, "description"),
+ new StructureElementCommandCreate(Type.DISCIPLINE, null, "AA5", 1, "description")
};
approvedStructureElements = ITUtilStructures.assertCreateApprove(structureElementCommandsCreate);
uuid = approvedStructureElements[0].getUuid();
// create + cancel
structureElementCommandsCreate = new StructureElementCommandCreate[] {
- new StructureElementCommandCreate(Type.DISCIPLINE, null, "AB1", 2, "description", "comment"),
- new StructureElementCommandCreate(Type.DISCIPLINE, null, "AB2", 2, "description", "comment"),
- new StructureElementCommandCreate(Type.DISCIPLINE, null, "AB3", 2, "description", "comment"),
- new StructureElementCommandCreate(Type.DISCIPLINE, null, "AB4", 2, "description", "comment"),
- new StructureElementCommandCreate(Type.DISCIPLINE, null, "AB5", 2, "description", "comment")
+ new StructureElementCommandCreate(Type.DISCIPLINE, null, "AB1", 2, "description"),
+ new StructureElementCommandCreate(Type.DISCIPLINE, null, "AB2", 2, "description"),
+ new StructureElementCommandCreate(Type.DISCIPLINE, null, "AB3", 2, "description"),
+ new StructureElementCommandCreate(Type.DISCIPLINE, null, "AB4", 2, "description"),
+ new StructureElementCommandCreate(Type.DISCIPLINE, null, "AB5", 2, "description")
};
ITUtilStructures.assertCreateCancel(structureElementCommandsCreate);
// create + reject
structureElementCommandsCreate = new StructureElementCommandCreate[] {
- new StructureElementCommandCreate(Type.DISCIPLINE, null, "AC1", 3, "description", "comment"),
- new StructureElementCommandCreate(Type.DISCIPLINE, null, "AC2", 3, "description", "comment"),
- new StructureElementCommandCreate(Type.DISCIPLINE, null, "AC3", 3, "description", "comment"),
- new StructureElementCommandCreate(Type.DISCIPLINE, null, "AC4", 3, "description", "comment"),
- new StructureElementCommandCreate(Type.DISCIPLINE, null, "AC5", 3, "description", "comment")
+ new StructureElementCommandCreate(Type.DISCIPLINE, null, "AC1", 3, "description"),
+ new StructureElementCommandCreate(Type.DISCIPLINE, null, "AC2", 3, "description"),
+ new StructureElementCommandCreate(Type.DISCIPLINE, null, "AC3", 3, "description"),
+ new StructureElementCommandCreate(Type.DISCIPLINE, null, "AC4", 3, "description"),
+ new StructureElementCommandCreate(Type.DISCIPLINE, null, "AC5", 3, "description")
};
ITUtilStructures.assertCreateReject(structureElementCommandsCreate);
// create
structureElementCommandsCreate = new StructureElementCommandCreate[] {
- new StructureElementCommandCreate(Type.DISCIPLINE, null, "AD1", 4, "description", "comment"),
- new StructureElementCommandCreate(Type.DISCIPLINE, null, "AD2", 4, "description", "comment"),
- new StructureElementCommandCreate(Type.DISCIPLINE, null, "AD3", 4, "description", "comment"),
- new StructureElementCommandCreate(Type.DISCIPLINE, null, "AD4", 4, "description", "comment"),
- new StructureElementCommandCreate(Type.DISCIPLINE, null, "AD5", 4, "description", "comment")
+ new StructureElementCommandCreate(Type.DISCIPLINE, null, "AD1", 4, "description"),
+ new StructureElementCommandCreate(Type.DISCIPLINE, null, "AD2", 4, "description"),
+ new StructureElementCommandCreate(Type.DISCIPLINE, null, "AD3", 4, "description"),
+ new StructureElementCommandCreate(Type.DISCIPLINE, null, "AD4", 4, "description"),
+ new StructureElementCommandCreate(Type.DISCIPLINE, null, "AD5", 4, "description")
};
ITUtilStructures.assertCreate(structureElementCommandsCreate);
String description2 = "some other description";
- String comment2 = "some other comment";
String description3 = "more description";
- String comment3 = "more comment";
// create + approve
// update + approve
// update + approve
// delete + reject
structureElementCommandsCreate = new StructureElementCommandCreate[] {
- new StructureElementCommandCreate(Type.DISCIPLINE, null, "AE1", 5, "description", "comment"),
- new StructureElementCommandCreate(Type.DISCIPLINE, null, "AE2", 5, "description", "comment"),
- new StructureElementCommandCreate(Type.DISCIPLINE, null, "AE3", 5, "description", "comment"),
- new StructureElementCommandCreate(Type.DISCIPLINE, null, "AE4", 5, "description", "comment"),
- new StructureElementCommandCreate(Type.DISCIPLINE, null, "AE5", 5, "description", "comment")
+ new StructureElementCommandCreate(Type.DISCIPLINE, null, "AE1", 5, "description"),
+ new StructureElementCommandCreate(Type.DISCIPLINE, null, "AE2", 5, "description"),
+ new StructureElementCommandCreate(Type.DISCIPLINE, null, "AE3", 5, "description"),
+ new StructureElementCommandCreate(Type.DISCIPLINE, null, "AE4", 5, "description"),
+ new StructureElementCommandCreate(Type.DISCIPLINE, null, "AE5", 5, "description")
};
approvedStructureElements = ITUtilStructures.assertCreateApprove(structureElementCommandsCreate);
structureElementCommandsUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElements);
for (StructureElementCommandUpdate structureElementCommandUpdate : structureElementCommandsUpdate) {
structureElementCommandUpdate.setDescription(description2);
- structureElementCommandUpdate.setComment(comment2);
}
approvedStructureElements = ITUtilStructures.assertUpdateApprove(structureElementCommandsUpdate);
structureElementCommandsUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElements);
for (StructureElementCommandUpdate structureElementCommandUpdate : structureElementCommandsUpdate) {
structureElementCommandUpdate.setDescription(description3);
- structureElementCommandUpdate.setComment(comment3);
}
approvedStructureElements = ITUtilStructures.assertUpdateApprove(structureElementCommandsUpdate);
structureElementCommandsConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElements);
@@ -1601,11 +1541,11 @@ class StructuresDisciplineIT {
// create + approve
// delete + approve
structureElementCommandsCreate = new StructureElementCommandCreate[] {
- new StructureElementCommandCreate(Type.DISCIPLINE, null, "AF1", 6, "description", "comment"),
- new StructureElementCommandCreate(Type.DISCIPLINE, null, "AF2", 6, "description", "comment"),
- new StructureElementCommandCreate(Type.DISCIPLINE, null, "AF3", 6, "description", "comment"),
- new StructureElementCommandCreate(Type.DISCIPLINE, null, "AF4", 6, "description", "comment"),
- new StructureElementCommandCreate(Type.DISCIPLINE, null, "AF5", 6, "description", "comment")
+ new StructureElementCommandCreate(Type.DISCIPLINE, null, "AF1", 6, "description"),
+ new StructureElementCommandCreate(Type.DISCIPLINE, null, "AF2", 6, "description"),
+ new StructureElementCommandCreate(Type.DISCIPLINE, null, "AF3", 6, "description"),
+ new StructureElementCommandCreate(Type.DISCIPLINE, null, "AF4", 6, "description"),
+ new StructureElementCommandCreate(Type.DISCIPLINE, null, "AF5", 6, "description")
};
approvedStructureElements = ITUtilStructures.assertCreateApprove(structureElementCommandsCreate);
structureElementCommandsConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElements);
@@ -1614,11 +1554,11 @@ class StructuresDisciplineIT {
// create + approve
// delete
structureElementCommandsCreate = new StructureElementCommandCreate[] {
- new StructureElementCommandCreate(Type.DISCIPLINE, null, "AG1", 7, "description", "comment"),
- new StructureElementCommandCreate(Type.DISCIPLINE, null, "AG2", 7, "description", "comment"),
- new StructureElementCommandCreate(Type.DISCIPLINE, null, "AG3", 7, "description", "comment"),
- new StructureElementCommandCreate(Type.DISCIPLINE, null, "AG4", 7, "description", "comment"),
- new StructureElementCommandCreate(Type.DISCIPLINE, null, "AG5", 7, "description", "comment")
+ new StructureElementCommandCreate(Type.DISCIPLINE, null, "AG1", 7, "description"),
+ new StructureElementCommandCreate(Type.DISCIPLINE, null, "AG2", 7, "description"),
+ new StructureElementCommandCreate(Type.DISCIPLINE, null, "AG3", 7, "description"),
+ new StructureElementCommandCreate(Type.DISCIPLINE, null, "AG4", 7, "description"),
+ new StructureElementCommandCreate(Type.DISCIPLINE, null, "AG5", 7, "description")
};
approvedStructureElements = ITUtilStructures.assertCreateApprove(structureElementCommandsCreate);
structureElementCommandsConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElements);
@@ -1632,11 +1572,11 @@ class StructuresDisciplineIT {
// delete + reject
// delete
structureElementCommandsCreate = new StructureElementCommandCreate[] {
- new StructureElementCommandCreate(Type.DISCIPLINE, null, "AH1", 8, "description", "comment"),
- new StructureElementCommandCreate(Type.DISCIPLINE, null, "AH2", 8, "description", "comment"),
- new StructureElementCommandCreate(Type.DISCIPLINE, null, "AH3", 8, "description", "comment"),
- new StructureElementCommandCreate(Type.DISCIPLINE, null, "AH4", 8, "description", "comment"),
- new StructureElementCommandCreate(Type.DISCIPLINE, null, "AH5", 8, "description", "comment")
+ new StructureElementCommandCreate(Type.DISCIPLINE, null, "AH1", 8, "description"),
+ new StructureElementCommandCreate(Type.DISCIPLINE, null, "AH2", 8, "description"),
+ new StructureElementCommandCreate(Type.DISCIPLINE, null, "AH3", 8, "description"),
+ new StructureElementCommandCreate(Type.DISCIPLINE, null, "AH4", 8, "description"),
+ new StructureElementCommandCreate(Type.DISCIPLINE, null, "AH5", 8, "description")
};
approvedStructureElements = ITUtilStructures.assertCreateApprove(structureElementCommandsCreate);
uuid2 = approvedStructureElements[0].getUuid();
@@ -1644,13 +1584,11 @@ class StructuresDisciplineIT {
structureElementCommandsUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElements);
for (StructureElementCommandUpdate structureElementCommandUpdate : structureElementCommandsUpdate) {
structureElementCommandUpdate.setDescription(description2);
- structureElementCommandUpdate.setComment(comment2);
}
approvedStructureElements = ITUtilStructures.assertUpdateApprove(structureElementCommandsUpdate);
structureElementCommandsUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElements);
for (StructureElementCommandUpdate structureElementCommandUpdate : structureElementCommandsUpdate) {
structureElementCommandUpdate.setDescription(description3);
- structureElementCommandUpdate.setComment(comment3);
}
approvedStructureElements = ITUtilStructures.assertUpdateApprove(structureElementCommandsUpdate);
structureElementCommandsConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElements);
diff --git a/src/test/java/org/openepics/names/docker/StructuresSubsystemIT.java b/src/test/java/org/openepics/names/docker/StructuresSubsystemIT.java
index 901eb97c..2b4bc4fd 100644
--- a/src/test/java/org/openepics/names/docker/StructuresSubsystemIT.java
+++ b/src/test/java/org/openepics/names/docker/StructuresSubsystemIT.java
@@ -69,7 +69,7 @@ class StructuresSubsystemIT {
// attributes for entry for operations - create, update, delete, approve, cancel, reject
// some set client side, others set server side
// client side
- // type, uuid, parent uuid, name, mnemonic, description, comment
+ // type, uuid, parent uuid, name, mnemonic, description
// may be set client side for test purposes
// order of methods in test not known
// therefore mnemonic values chosen to not interfere with mnemonic values in other methods
@@ -79,12 +79,12 @@ class StructuresSubsystemIT {
// for such operations that send Command objects to backend, it is also possible to send StructureElement
//
// StructureElementCommand
- // create - type, parent, name, mnemonic, description, comment
- // update - uuid, type, parent, name, mnemonic, description, comment
- // delete - uuid, type, comment
- // approve - uuid, type, comment
- // cancel - uuid, type, comment
- // reject - uuid, type, comment
+ // create - type, parent, name, mnemonic, description
+ // update - uuid, type, parent, name, mnemonic, description
+ // delete - uuid, type
+ // approve - uuid, type
+ // cancel - uuid, type
+ // reject - uuid, type
//
// response status codes
@@ -103,15 +103,13 @@ class StructuresSubsystemIT {
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEMGROUP, null,
- "Sg", null,
- "description", "comment");
+ "Sg", null, "description");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
systemGroupUuid = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEM, systemGroupUuid,
- "Sys", null,
- "description", "comment");
+ "Sys", null, "description");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
systemUuid = approvedStructureElement.getUuid();
@@ -150,7 +148,6 @@ class StructuresSubsystemIT {
// name
// mnemonic
// description
- // comment
try {
StructureElementCommandCreate structureElementCommandCreate = new StructureElementCommandCreate();
@@ -196,10 +193,6 @@ class StructuresSubsystemIT {
ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setDescription("description");
- ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
-
- structureElementCommandCreate.setComment("comment");
ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setType(null);
@@ -227,7 +220,6 @@ class StructuresSubsystemIT {
structureElementCommandCreate.setType(Type.SUBSYSTEM);
structureElementCommandCreate.setParent(systemUuid);
structureElementCommandCreate.setDescription("description");
- structureElementCommandCreate.setComment("comment");
// mnemonic rules
@@ -352,8 +344,7 @@ class StructuresSubsystemIT {
structureElementCommand = new StructureElementCommand(
null, Type.SUBSYSTEM, systemUuid,
- "Ca", null,
- "description", "comment");
+ "Ca", null, "description");
structureElementCommandCreate = StructureElementUtil.convertCommand2CommandCreate(structureElementCommand);
structureElementCommandConfirm = StructureElementUtil.convertCommand2CommandConfirm(structureElementCommand);
@@ -413,8 +404,7 @@ class StructuresSubsystemIT {
structureElementCommand = new StructureElementCommand(
null, Type.SUBSYSTEM, systemUuid,
- "Cc", null,
- "description", "comment");
+ "Cc", null, "description");
structureElementCommandCreate = StructureElementUtil.convertCommand2CommandCreate(structureElementCommand);
structureElementCommandConfirm = StructureElementUtil.convertCommand2CommandConfirm(structureElementCommand);
@@ -479,8 +469,7 @@ class StructuresSubsystemIT {
structureElementCommand = new StructureElementCommand(
null, Type.SUBSYSTEM, systemUuid,
- "Cr", null,
- "description", "comment");
+ "Cr", null, "description");
structureElementCommandCreate = StructureElementUtil.convertCommand2CommandCreate(structureElementCommand);
structureElementCommandConfirm = StructureElementUtil.convertCommand2CommandConfirm(structureElementCommand);
@@ -546,7 +535,6 @@ class StructuresSubsystemIT {
// name
// mnemonic
// description
- // comment
try {
UUID uuid = null;
@@ -558,8 +546,7 @@ class StructuresSubsystemIT {
// create, approve
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemUuid,
- "Cu", null,
- "description", "comment");
+ "Cu", null, "description");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElement);
uuid = approvedStructureElement.getUuid();
@@ -613,13 +600,6 @@ class StructuresSubsystemIT {
structureElementCommandUpdate.setDescription("description");
ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
-
- structureElementCommandUpdate.setComment(null);
- ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructures.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
-
- structureElementCommandUpdate.setComment("comment");
- ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
} catch (Exception e) {
fail();
}
@@ -650,14 +630,11 @@ class StructuresSubsystemIT {
// create, approve
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemUuid,
- "Ua", null,
- "description", "comment");
+ "Ua", null, "description");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElement);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
- structureElementCommandUpdate.setComment("comment update approve check");
-
ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
@@ -712,14 +689,11 @@ class StructuresSubsystemIT {
// create, approve
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemUuid,
- "Uc", null,
- "description", "comment");
+ "Uc", null, "description");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElement);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
- structureElementCommandUpdate.setComment("comment update cancel check");
-
ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
@@ -774,14 +748,11 @@ class StructuresSubsystemIT {
// create, approve
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemUuid,
- "Ur", null,
- "description", "comment");
+ "Ur", null, "description");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElement);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
- structureElementCommandUpdate.setComment("comment update reject check");
-
ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
@@ -828,7 +799,6 @@ class StructuresSubsystemIT {
// validate delete
// uuid
// type
- // comment
try {
UUID uuid = null;
@@ -840,8 +810,7 @@ class StructuresSubsystemIT {
// create, approve
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemUuid,
- "Cd", null,
- "description", "comment");
+ "Cd", null, "description");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
uuid = approvedStructureElement.getUuid();
@@ -871,13 +840,6 @@ class StructuresSubsystemIT {
structureElementCommandConfirm.setType(Type.SUBSYSTEM);
ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
-
- structureElementCommandConfirm.setComment(null);
- ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructures.assertDelete(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
-
- structureElementCommandConfirm.setComment("comment");
- ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
} catch (Exception e) {
fail();
}
@@ -907,13 +869,10 @@ class StructuresSubsystemIT {
// create, approve
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemUuid,
- "Da", null,
- "description", "comment");
+ "Da", null, "description");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
- structureElementCommandConfirm.setComment("comment delete approve check");
-
ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
@@ -967,13 +926,10 @@ class StructuresSubsystemIT {
// create, approve
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemUuid,
- "Dc", null,
- "description", "comment");
+ "Dc", null, "description");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
- structureElementCommandConfirm.setComment("comment update delete check");
-
ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
@@ -1027,13 +983,10 @@ class StructuresSubsystemIT {
// create, approve
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemUuid,
- "Dr", null,
- "description", "comment");
+ "Dr", null, "description");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
- structureElementCommandConfirm.setComment("comment delete reject check");
-
ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
@@ -1081,8 +1034,7 @@ class StructuresSubsystemIT {
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemUuid,
- "Rsha", 41,
- "description", "comment");
+ "Rsha", 41, "description");
// create
createdStructureElement = ITUtilStructures.assertCreate(structureElementCommandCreate);
@@ -1207,8 +1159,7 @@ class StructuresSubsystemIT {
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemUuid,
- "Rshc", 41,
- "description", "comment");
+ "Rshc", 41, "description");
// create
createdStructureElement = ITUtilStructures.assertCreate(structureElementCommandCreate);
@@ -1333,8 +1284,7 @@ class StructuresSubsystemIT {
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemUuid,
- "Rshr", 41,
- "description", "comment");
+ "Rshr", 41, "description");
// create
createdStructureElement = ITUtilStructures.assertCreate(structureElementCommandCreate);
@@ -1470,32 +1420,28 @@ class StructuresSubsystemIT {
// a number of entries for which the last entry has status PENDING
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemUuid,
- "P1", 1,
- "description", "comment");
+ "P1", 1, "description");
createdStructureElement = ITUtilStructures.assertCreate(structureElementCommandCreate);
uuid = createdStructureElement.getUuid();
// a number of entries for which the last entry has status CANCELLED
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemUuid,
- "C1", 2,
- "description", "comment");
+ "C1", 2, "description");
createdStructureElement = ITUtilStructures.assertCreateCancel(structureElementCommandCreate);
uuid2 = createdStructureElement.getUuid();
// a number of entries for which the last entry has status REJECTED
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemUuid,
- "R1", 3,
- "description", "comment");
+ "R1", 3, "description");
createdStructureElement = ITUtilStructures.assertCreateReject(structureElementCommandCreate);
uuid3 = createdStructureElement.getUuid();
// a number of entries for which the last entry has status APPROVED
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemUuid,
- "A1", 4,
- "description", "comment");
+ "A1", 4, "description");
createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
uuid4 = createdStructureElement.getUuid();
@@ -1571,105 +1517,101 @@ class StructuresSubsystemIT {
// a number of entries for which the last entry has status PENDING
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemUuid,
- "P9", null,
- "description", "comment");
+ "P9", null, "description");
createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
uuid = createdStructureElement.getUuid();
- structureElementCommandUpdate.setComment("comment 2");
+ structureElementCommandUpdate.setDescription("description 2");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 3");
+ structureElementCommandUpdate.setDescription("description 3");
ITUtilStructures.assertUpdateCancel(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 4");
+ structureElementCommandUpdate.setDescription("description 4");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 5");
+ structureElementCommandUpdate.setDescription("description 5");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 6");
+ structureElementCommandUpdate.setDescription("description 6");
ITUtilStructures.assertUpdateReject(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 7");
+ structureElementCommandUpdate.setDescription("description 7");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 8");
+ structureElementCommandUpdate.setDescription("description 8");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 9");
+ structureElementCommandUpdate.setDescription("description 9");
ITUtilStructures.assertUpdate(structureElementCommandUpdate);
// a number of entries for which the last entry has status CANCELLED
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemUuid,
- "C9", 2,
- "description", "comment");
+ "C9", 2, "description");
createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
uuid2 = createdStructureElement.getUuid();
- structureElementCommandUpdate.setComment("comment 2");
+ structureElementCommandUpdate.setDescription("description 2");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 3");
+ structureElementCommandUpdate.setDescription("description 3");
ITUtilStructures.assertUpdateCancel(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 4");
+ structureElementCommandUpdate.setDescription("description 4");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 5");
+ structureElementCommandUpdate.setDescription("description 5");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 6");
+ structureElementCommandUpdate.setDescription("description 6");
ITUtilStructures.assertUpdateReject(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 7");
+ structureElementCommandUpdate.setDescription("description 7");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 8");
+ structureElementCommandUpdate.setDescription("description 8");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 9");
+ structureElementCommandUpdate.setDescription("description 9");
ITUtilStructures.assertUpdateCancel(structureElementCommandUpdate);
// a number of entries for which the last entry has status REJECTED
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemUuid,
- "R9", 1,
- "description", "comment");
+ "R9", 1, "description");
createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
uuid3 = createdStructureElement.getUuid();
- structureElementCommandUpdate.setComment("comment 2");
+ structureElementCommandUpdate.setDescription("description 2");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 3");
+ structureElementCommandUpdate.setDescription("description 3");
ITUtilStructures.assertUpdateCancel(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 4");
+ structureElementCommandUpdate.setDescription("description 4");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 5");
+ structureElementCommandUpdate.setDescription("description 5");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 6");
+ structureElementCommandUpdate.setDescription("description 6");
ITUtilStructures.assertUpdateReject(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 7");
+ structureElementCommandUpdate.setDescription("description 7");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 8");
+ structureElementCommandUpdate.setDescription("description 8");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 9");
+ structureElementCommandUpdate.setDescription("description 9");
ITUtilStructures.assertUpdateReject(structureElementCommandUpdate);
// a number of entries for which the last entry has status APPROVED
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemUuid,
- "A9", 1,
- "description", "comment");
+ "A9", 1, "description");
createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
uuid4 = createdStructureElement.getUuid();
- structureElementCommandUpdate.setComment("comment 2");
+ structureElementCommandUpdate.setDescription("description 2");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 3");
+ structureElementCommandUpdate.setDescription("description 3");
ITUtilStructures.assertUpdateCancel(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 4");
+ structureElementCommandUpdate.setDescription("description 4");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 5");
+ structureElementCommandUpdate.setDescription("description 5");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 6");
+ structureElementCommandUpdate.setDescription("description 6");
ITUtilStructures.assertUpdateReject(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 7");
+ structureElementCommandUpdate.setDescription("description 7");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 8");
+ structureElementCommandUpdate.setDescription("description 8");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 9");
+ structureElementCommandUpdate.setDescription("description 9");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
try {
@@ -1746,73 +1688,69 @@ class StructuresSubsystemIT {
// create + approve
structureElementCommandsCreate = new StructureElementCommandCreate[] {
- new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AA1", 1, "description", "comment"),
- new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AA2", 1, "description", "comment"),
- new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AA3", 1, "description", "comment"),
- new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AA4", 1, "description", "comment"),
- new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AA5", 1, "description", "comment")
+ new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AA1", 1, "description"),
+ new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AA2", 1, "description"),
+ new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AA3", 1, "description"),
+ new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AA4", 1, "description"),
+ new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AA5", 1, "description")
};
approvedStructureElements = ITUtilStructures.assertCreateApprove(structureElementCommandsCreate);
uuid = approvedStructureElements[0].getUuid();
// create + cancel
structureElementCommandsCreate = new StructureElementCommandCreate[] {
- new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AB1", 2, "description", "comment"),
- new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AB2", 2, "description", "comment"),
- new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AB3", 2, "description", "comment"),
- new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AB4", 2, "description", "comment"),
- new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AB5", 2, "description", "comment")
+ new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AB1", 2, "description"),
+ new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AB2", 2, "description"),
+ new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AB3", 2, "description"),
+ new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AB4", 2, "description"),
+ new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AB5", 2, "description")
};
ITUtilStructures.assertCreateCancel(structureElementCommandsCreate);
// create + reject
structureElementCommandsCreate = new StructureElementCommandCreate[] {
- new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AC1", 3, "description", "comment"),
- new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AC2", 3, "description", "comment"),
- new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AC3", 3, "description", "comment"),
- new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AC4", 3, "description", "comment"),
- new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AC5", 3, "description", "comment")
+ new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AC1", 3, "description"),
+ new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AC2", 3, "description"),
+ new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AC3", 3, "description"),
+ new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AC4", 3, "description"),
+ new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AC5", 3, "description")
};
ITUtilStructures.assertCreateReject(structureElementCommandsCreate);
// create
structureElementCommandsCreate = new StructureElementCommandCreate[] {
- new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AD1", 4, "description", "comment"),
- new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AD2", 4, "description", "comment"),
- new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AD3", 4, "description", "comment"),
- new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AD4", 4, "description", "comment"),
- new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AD5", 4, "description", "comment")
+ new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AD1", 4, "description"),
+ new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AD2", 4, "description"),
+ new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AD3", 4, "description"),
+ new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AD4", 4, "description"),
+ new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AD5", 4, "description")
};
ITUtilStructures.assertCreate(structureElementCommandsCreate);
String description2 = "some other description";
- String comment2 = "some other comment";
String description3 = "more description";
- String comment3 = "more comment";
// create + approve
// update + approve
// update + approve
// delete + reject
structureElementCommandsCreate = new StructureElementCommandCreate[] {
- new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AE1", 5, "description", "comment"),
- new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AE2", 5, "description", "comment"),
- new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AE3", 5, "description", "comment"),
- new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AE4", 5, "description", "comment"),
- new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AE5", 5, "description", "comment")
+ new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AE1", 5, "description"),
+ new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AE2", 5, "description"),
+ new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AE3", 5, "description"),
+ new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AE4", 5, "description"),
+ new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AE5", 5, "description")
};
approvedStructureElements = ITUtilStructures.assertCreateApprove(structureElementCommandsCreate);
structureElementCommandsUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElements);
for (StructureElementCommandUpdate structureElementCommandUpdate : structureElementCommandsUpdate) {
structureElementCommandUpdate.setDescription(description2);
- structureElementCommandUpdate.setComment(comment2);
}
approvedStructureElements = ITUtilStructures.assertUpdateApprove(structureElementCommandsUpdate);
structureElementCommandsUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElements);
for (StructureElementCommandUpdate structureElementCommandUpdate : structureElementCommandsUpdate) {
structureElementCommandUpdate.setDescription(description3);
- structureElementCommandUpdate.setComment(comment3);
}
approvedStructureElements = ITUtilStructures.assertUpdateApprove(structureElementCommandsUpdate);
structureElementCommandsConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElements);
@@ -1821,11 +1759,11 @@ class StructuresSubsystemIT {
// create + approve
// delete + approve
structureElementCommandsCreate = new StructureElementCommandCreate[] {
- new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AF1", 6, "description", "comment"),
- new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AF2", 6, "description", "comment"),
- new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AF3", 6, "description", "comment"),
- new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AF4", 6, "description", "comment"),
- new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AF5", 6, "description", "comment")
+ new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AF1", 6, "description"),
+ new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AF2", 6, "description"),
+ new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AF3", 6, "description"),
+ new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AF4", 6, "description"),
+ new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AF5", 6, "description")
};
approvedStructureElements = ITUtilStructures.assertCreateApprove(structureElementCommandsCreate);
structureElementCommandsConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElements);
@@ -1834,11 +1772,11 @@ class StructuresSubsystemIT {
// create + approve
// delete
structureElementCommandsCreate = new StructureElementCommandCreate[] {
- new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AG1", 7, "description", "comment"),
- new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AG2", 7, "description", "comment"),
- new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AG3", 7, "description", "comment"),
- new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AG4", 7, "description", "comment"),
- new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AG5", 7, "description", "comment")
+ new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AG1", 7, "description"),
+ new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AG2", 7, "description"),
+ new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AG3", 7, "description"),
+ new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AG4", 7, "description"),
+ new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AG5", 7, "description")
};
approvedStructureElements = ITUtilStructures.assertCreateApprove(structureElementCommandsCreate);
structureElementCommandsConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElements);
@@ -1852,11 +1790,11 @@ class StructuresSubsystemIT {
// delete + reject
// delete
structureElementCommandsCreate = new StructureElementCommandCreate[] {
- new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AH1", 8, "description", "comment"),
- new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AH2", 8, "description", "comment"),
- new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AH3", 8, "description", "comment"),
- new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AH4", 8, "description", "comment"),
- new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AH5", 8, "description", "comment")
+ new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AH1", 8, "description"),
+ new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AH2", 8, "description"),
+ new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AH3", 8, "description"),
+ new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AH4", 8, "description"),
+ new StructureElementCommandCreate(Type.SUBSYSTEM, systemUuid, "AH5", 8, "description")
};
approvedStructureElements = ITUtilStructures.assertCreateApprove(structureElementCommandsCreate);
uuid2 = approvedStructureElements[0].getUuid();
@@ -1864,13 +1802,11 @@ class StructuresSubsystemIT {
structureElementCommandsUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElements);
for (StructureElementCommandUpdate structureElementCommandUpdate : structureElementCommandsUpdate) {
structureElementCommandUpdate.setDescription(description2);
- structureElementCommandUpdate.setComment(comment2);
}
approvedStructureElements = ITUtilStructures.assertUpdateApprove(structureElementCommandsUpdate);
structureElementCommandsUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElements);
for (StructureElementCommandUpdate structureElementCommandUpdate : structureElementCommandsUpdate) {
structureElementCommandUpdate.setDescription(description3);
- structureElementCommandUpdate.setComment(comment3);
}
approvedStructureElements = ITUtilStructures.assertUpdateApprove(structureElementCommandsUpdate);
structureElementCommandsConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElements);
diff --git a/src/test/java/org/openepics/names/docker/StructuresSystemGroupIT.java b/src/test/java/org/openepics/names/docker/StructuresSystemGroupIT.java
index 98359237..0609c7ae 100644
--- a/src/test/java/org/openepics/names/docker/StructuresSystemGroupIT.java
+++ b/src/test/java/org/openepics/names/docker/StructuresSystemGroupIT.java
@@ -69,7 +69,7 @@ class StructuresSystemGroupIT {
// attributes for entry for operations - create, update, delete, approve, cancel, reject
// some set client side, others set server side
// client side
- // type, uuid, parent uuid, name, mnemonic, description, comment
+ // type, uuid, parent uuid, name, mnemonic, description
// may be set client side for test purposes
// order of methods in test not known
// therefore mnemonic values chosen to not interfere with mnemonic values in other methods
@@ -79,12 +79,12 @@ class StructuresSystemGroupIT {
// for such operations that send Command objects to backend, it is also possible to send StructureElement
//
// StructureElementCommand
- // create - type, parent, name, mnemonic, description, comment
- // update - uuid, type, parent, name, mnemonic, description, comment
- // delete - uuid, type, comment
- // approve - uuid, type, comment
- // cancel - uuid, type, comment
- // reject - uuid, type, comment
+ // create - type, parent, name, mnemonic, description
+ // update - uuid, type, parent, name, mnemonic, description
+ // delete - uuid, type
+ // approve - uuid, type
+ // cancel - uuid, type
+ // reject - uuid, type
@Container
public static final ComposeContainer ENVIRONMENT = ITUtil.defaultComposeContainers();
@@ -115,7 +115,6 @@ class StructuresSystemGroupIT {
// name
// mnemonic
// description
- // comment
try {
StructureElementCommandCreate structureElementCommandCreate = new StructureElementCommandCreate();
@@ -146,10 +145,6 @@ class StructuresSystemGroupIT {
ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setDescription("description");
- ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
-
- structureElementCommandCreate.setComment("comment");
ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setMnemonic("");
@@ -182,7 +177,6 @@ class StructuresSystemGroupIT {
structureElementCommandCreate.setType(Type.SYSTEMGROUP);
structureElementCommandCreate.setDescription("description");
- structureElementCommandCreate.setComment("comment");
// mnemonic rules
@@ -317,8 +311,7 @@ class StructuresSystemGroupIT {
structureElementCommand = new StructureElementCommand(
null, Type.SYSTEMGROUP, null,
- "Ca", null,
- "description", "comment");
+ "Ca", null, "description");
structureElementCommandCreate = StructureElementUtil.convertCommand2CommandCreate(structureElementCommand);
structureElementCommandConfirm = StructureElementUtil.convertCommand2CommandConfirm(structureElementCommand);
@@ -356,16 +349,14 @@ class StructuresSystemGroupIT {
// create
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEMGROUP, null,
- null, null,
- "description2", "comment2");
+ null, null, "description2");
createdStructureElement = ITUtilStructures.assertCreate(structureElementCommandCreate);
uuid2 = createdStructureElement.getUuid();
// create
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEMGROUP, null,
- null, null,
- "description3", "comment3");
+ null, null, "description3");
createdStructureElement = ITUtilStructures.assertCreate(structureElementCommandCreate);
uuid3 = createdStructureElement.getUuid();
@@ -399,8 +390,7 @@ class StructuresSystemGroupIT {
structureElementCommand = new StructureElementCommand(
null, Type.SYSTEMGROUP, null,
- "Cc", null,
- "description", "comment");
+ "Cc", null, "description");
structureElementCommandCreate = StructureElementUtil.convertCommand2CommandCreate(structureElementCommand);
structureElementCommandConfirm = StructureElementUtil.convertCommand2CommandConfirm(structureElementCommand);
@@ -429,11 +419,6 @@ class StructuresSystemGroupIT {
ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
structureElementCommandConfirm.setType(Type.SYSTEMGROUP);
- ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.TRUE);
- structureElementCommandConfirm.setComment(null);
- ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
- structureElementCommandConfirm.setComment("comment");
-
// cancel
ITUtilStructures.assertCancel(structureElementCommandConfirm);
@@ -475,8 +460,7 @@ class StructuresSystemGroupIT {
structureElementCommand = new StructureElementCommand(
null, Type.SYSTEMGROUP, null,
- "Cr", null,
- "description", "comment");
+ "Cr", null, "description");
structureElementCommandCreate = StructureElementUtil.convertCommand2CommandCreate(structureElementCommand);
structureElementCommandConfirm = StructureElementUtil.convertCommand2CommandConfirm(structureElementCommand);
@@ -541,7 +525,6 @@ class StructuresSystemGroupIT {
// name
// mnemonic
// description
- // comment
try {
UUID uuid = null;
@@ -553,8 +536,7 @@ class StructuresSystemGroupIT {
// create, approve
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEMGROUP, null,
- "Cu", null,
- "description", "comment");
+ "Cu", null, "description");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElement);
uuid = approvedStructureElement.getUuid();
@@ -600,13 +582,6 @@ class StructuresSystemGroupIT {
structureElementCommandUpdate.setDescription("description");
ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
-
- structureElementCommandUpdate.setComment(null);
- ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructures.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
-
- structureElementCommandUpdate.setComment("comment");
- ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
} catch (Exception e) {
fail();
}
@@ -637,14 +612,12 @@ class StructuresSystemGroupIT {
// create, approve
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEMGROUP, null,
- "Ua", null,
- "description", "comment");
+ "Ua", null, "description");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElement);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
structureElementCommandUpdate.setDescription("description update approve check");
- structureElementCommandUpdate.setComment("comment update approve check");
ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
@@ -700,14 +673,12 @@ class StructuresSystemGroupIT {
// create, approve
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEMGROUP, null,
- "Uc", null,
- "description", "comment");
+ "Uc", null, "description");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElement);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
structureElementCommandUpdate.setDescription("description update cancel check");
- structureElementCommandUpdate.setComment("comment update cancel check");
ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
@@ -763,14 +734,12 @@ class StructuresSystemGroupIT {
// create, approve
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEMGROUP, null,
- "Ur", null,
- "description", "comment");
+ "Ur", null, "description");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElement);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
structureElementCommandUpdate.setDescription("description update reject check");
- structureElementCommandUpdate.setComment("comment update reject check");
ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
@@ -818,7 +787,6 @@ class StructuresSystemGroupIT {
// validate delete
// uuid
// type
- // comment
try {
UUID uuid = null;
@@ -830,8 +798,7 @@ class StructuresSystemGroupIT {
// create, approve
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEMGROUP, null,
- "Cd", null,
- "description", "comment");
+ "Cd", null, "description");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
uuid = approvedStructureElement.getUuid();
@@ -861,13 +828,6 @@ class StructuresSystemGroupIT {
structureElementCommandConfirm.setType(Type.SYSTEMGROUP);
ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
-
- structureElementCommandConfirm.setComment(null);
- ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructures.assertDelete(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
-
- structureElementCommandConfirm.setComment("comment");
- ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
} catch (Exception e) {
fail();
}
@@ -897,13 +857,10 @@ class StructuresSystemGroupIT {
// create, approve
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEMGROUP, null,
- "Da", null,
- "description", "comment");
+ "Da", null, "description");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
- structureElementCommandConfirm.setComment("comment delete approve check");
-
ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
@@ -957,13 +914,10 @@ class StructuresSystemGroupIT {
// create, approve
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEMGROUP, null,
- "Dc", null,
- "description", "comment");
+ "Dc", null, "description");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
- structureElementCommandConfirm.setComment("comment update delete check");
-
ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
@@ -1017,13 +971,10 @@ class StructuresSystemGroupIT {
// create, approve
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEMGROUP, null,
- "Dr", null,
- "description", "comment");
+ "Dr", null, "description");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
- structureElementCommandConfirm.setComment("comment delete reject check");
-
ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
@@ -1071,8 +1022,7 @@ class StructuresSystemGroupIT {
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEMGROUP, null,
- "Rsha", 41,
- "description", "comment");
+ "Rsha", 41, "description");
// create
createdStructureElement = ITUtilStructures.assertCreate(structureElementCommandCreate);
@@ -1153,8 +1103,7 @@ class StructuresSystemGroupIT {
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEMGROUP, null,
- "Rshc", 41,
- "description", "comment");
+ "Rshc", 41, "description");
// create
createdStructureElement = ITUtilStructures.assertCreate(structureElementCommandCreate);
@@ -1235,8 +1184,7 @@ class StructuresSystemGroupIT {
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEMGROUP, null,
- "Rshr", 41,
- "description", "comment");
+ "Rshr", 41, "description");
// create
createdStructureElement = ITUtilStructures.assertCreate(structureElementCommandCreate);
@@ -1328,32 +1276,28 @@ class StructuresSystemGroupIT {
// a number of entries for which the last entry has status PENDING
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEMGROUP, null,
- "P1", 1,
- "description", "comment");
+ "P1", 1, "description");
createdStructureElement = ITUtilStructures.assertCreate(structureElementCommandCreate);
uuid = createdStructureElement.getUuid();
// a number of entries for which the last entry has status CANCELLED
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEMGROUP, null,
- "C1", 2,
- "description", "comment");
+ "C1", 2, "description");
createdStructureElement = ITUtilStructures.assertCreateCancel(structureElementCommandCreate);
uuid2 = createdStructureElement.getUuid();
// a number of entries for which the last entry has status REJECTED
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEMGROUP, null,
- "R1", 3,
- "description", "comment");
+ "R1", 3, "description");
createdStructureElement = ITUtilStructures.assertCreateReject(structureElementCommandCreate);
uuid3 = createdStructureElement.getUuid();
// a number of entries for which the last entry has status APPROVED
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEMGROUP, null,
- "A1", 4,
- "description", "comment");
+ "A1", 4, "description");
createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
uuid4 = createdStructureElement.getUuid();
@@ -1421,105 +1365,101 @@ class StructuresSystemGroupIT {
// a number of entries for which the last entry has status PENDING
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEMGROUP, null,
- "P9", null,
- "description", "comment");
+ "P9", null, "description");
createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
uuid = createdStructureElement.getUuid();
- structureElementCommandUpdate.setComment("comment 2");
+ structureElementCommandUpdate.setDescription("description 2");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 3");
+ structureElementCommandUpdate.setDescription("description 3");
ITUtilStructures.assertUpdateCancel(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 4");
+ structureElementCommandUpdate.setDescription("description 4");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 5");
+ structureElementCommandUpdate.setDescription("description 5");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 6");
+ structureElementCommandUpdate.setDescription("description 6");
ITUtilStructures.assertUpdateReject(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 7");
+ structureElementCommandUpdate.setDescription("description 7");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 8");
+ structureElementCommandUpdate.setDescription("description 8");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 9");
+ structureElementCommandUpdate.setDescription("description 9");
ITUtilStructures.assertUpdate(structureElementCommandUpdate);
// a number of entries for which the last entry has status CANCELLED
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEMGROUP, null,
- "C9", 2,
- "description", "comment");
+ "C9", 2, "description");
createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
uuid2 = createdStructureElement.getUuid();
- structureElementCommandUpdate.setComment("comment 2");
+ structureElementCommandUpdate.setDescription("description 2");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 3");
+ structureElementCommandUpdate.setDescription("description 3");
ITUtilStructures.assertUpdateCancel(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 4");
+ structureElementCommandUpdate.setDescription("description 4");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 5");
+ structureElementCommandUpdate.setDescription("description 5");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 6");
+ structureElementCommandUpdate.setDescription("description 6");
ITUtilStructures.assertUpdateReject(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 7");
+ structureElementCommandUpdate.setDescription("description 7");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 8");
+ structureElementCommandUpdate.setDescription("description 8");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 9");
+ structureElementCommandUpdate.setDescription("description 9");
ITUtilStructures.assertUpdateCancel(structureElementCommandUpdate);
// a number of entries for which the last entry has status REJECTED
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEMGROUP, null,
- "R9", 1,
- "description", "comment");
+ "R9", 1, "description");
createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
uuid3 = createdStructureElement.getUuid();
- structureElementCommandUpdate.setComment("comment 2");
+ structureElementCommandUpdate.setDescription("description 2");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 3");
+ structureElementCommandUpdate.setDescription("description 3");
ITUtilStructures.assertUpdateCancel(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 4");
+ structureElementCommandUpdate.setDescription("description 4");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 5");
+ structureElementCommandUpdate.setDescription("description 5");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 6");
+ structureElementCommandUpdate.setDescription("description 6");
ITUtilStructures.assertUpdateReject(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 7");
+ structureElementCommandUpdate.setDescription("description 7");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 8");
+ structureElementCommandUpdate.setDescription("description 8");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 9");
+ structureElementCommandUpdate.setDescription("description 9");
ITUtilStructures.assertUpdateReject(structureElementCommandUpdate);
// a number of entries for which the last entry has status APPROVED
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEMGROUP, null,
- "A9", 1,
- "description", "comment");
+ "A9", 1, "description");
createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
uuid4 = createdStructureElement.getUuid();
- structureElementCommandUpdate.setComment("comment 2");
+ structureElementCommandUpdate.setDescription("description 2");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 3");
+ structureElementCommandUpdate.setDescription("description 3");
ITUtilStructures.assertUpdateCancel(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 4");
+ structureElementCommandUpdate.setDescription("description 4");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 5");
+ structureElementCommandUpdate.setDescription("description 5");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 6");
+ structureElementCommandUpdate.setDescription("description 6");
ITUtilStructures.assertUpdateReject(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 7");
+ structureElementCommandUpdate.setDescription("description 7");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 8");
+ structureElementCommandUpdate.setDescription("description 8");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 9");
+ structureElementCommandUpdate.setDescription("description 9");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
try {
@@ -1588,73 +1528,69 @@ class StructuresSystemGroupIT {
// create + approve
structureElementCommandsCreate = new StructureElementCommandCreate[] {
- new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AA1", 1, "description", "comment"),
- new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AA2", 1, "description", "comment"),
- new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AA3", 1, "description", "comment"),
- new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AA4", 1, "description", "comment"),
- new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AA5", 1, "description", "comment")
+ new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AA1", 1, "description"),
+ new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AA2", 1, "description"),
+ new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AA3", 1, "description"),
+ new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AA4", 1, "description"),
+ new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AA5", 1, "description")
};
approvedStructureElements = ITUtilStructures.assertCreateApprove(structureElementCommandsCreate);
uuid = approvedStructureElements[0].getUuid();
// create + cancel
structureElementCommandsCreate = new StructureElementCommandCreate[] {
- new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AB1", 2, "description", "comment"),
- new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AB2", 2, "description", "comment"),
- new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AB3", 2, "description", "comment"),
- new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AB4", 2, "description", "comment"),
- new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AB5", 2, "description", "comment"),
+ new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AB1", 2, "description"),
+ new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AB2", 2, "description"),
+ new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AB3", 2, "description"),
+ new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AB4", 2, "description"),
+ new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AB5", 2, "description"),
};
ITUtilStructures.assertCreateCancel(structureElementCommandsCreate);
// create + reject
structureElementCommandsCreate = new StructureElementCommandCreate[] {
- new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AC1", 3, "description", "comment"),
- new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AC2", 3, "description", "comment"),
- new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AC3", 3, "description", "comment"),
- new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AC4", 3, "description", "comment"),
- new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AC5", 3, "description", "comment")
+ new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AC1", 3, "description"),
+ new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AC2", 3, "description"),
+ new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AC3", 3, "description"),
+ new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AC4", 3, "description"),
+ new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AC5", 3, "description")
};
ITUtilStructures.assertCreateReject(structureElementCommandsCreate);
// create
structureElementCommandsCreate = new StructureElementCommandCreate[] {
- new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AD1", 4, "description", "comment"),
- new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AD2", 4, "description", "comment"),
- new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AD3", 4, "description", "comment"),
- new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AD4", 4, "description", "comment"),
- new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AD5", 4, "description", "comment")
+ new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AD1", 4, "description"),
+ new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AD2", 4, "description"),
+ new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AD3", 4, "description"),
+ new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AD4", 4, "description"),
+ new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AD5", 4, "description")
};
ITUtilStructures.assertCreate(structureElementCommandsCreate);
String description2 = "some other description";
- String comment2 = "some other comment";
String description3 = "more description";
- String comment3 = "more comment";
// create + approve
// update + approve
// update + approve
// delete + reject
structureElementCommandsCreate = new StructureElementCommandCreate[] {
- new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AE1", 5, "description", "comment"),
- new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AE2", 5, "description", "comment"),
- new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AE3", 5, "description", "comment"),
- new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AE4", 5, "description", "comment"),
- new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AE5", 5, "description", "comment")
+ new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AE1", 5, "description"),
+ new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AE2", 5, "description"),
+ new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AE3", 5, "description"),
+ new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AE4", 5, "description"),
+ new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AE5", 5, "description")
};
approvedStructureElements = ITUtilStructures.assertCreateApprove(structureElementCommandsCreate);
structureElementCommandsUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElements);
for (StructureElementCommandUpdate structureElementCommandUpdate : structureElementCommandsUpdate) {
structureElementCommandUpdate.setDescription(description2);
- structureElementCommandUpdate.setComment(comment2);
}
approvedStructureElements = ITUtilStructures.assertUpdateApprove(structureElementCommandsUpdate);
structureElementCommandsUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElements);
for (StructureElementCommandUpdate structureElementCommandUpdate : structureElementCommandsUpdate) {
structureElementCommandUpdate.setDescription(description3);
- structureElementCommandUpdate.setComment(comment3);
}
approvedStructureElements = ITUtilStructures.assertUpdateApprove(structureElementCommandsUpdate);
structureElementCommandsConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElements);
@@ -1663,11 +1599,11 @@ class StructuresSystemGroupIT {
// create + approve
// delete + approve
structureElementCommandsCreate = new StructureElementCommandCreate[] {
- new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AF1", 6, "description", "comment"),
- new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AF2", 6, "description", "comment"),
- new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AF3", 6, "description", "comment"),
- new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AF4", 6, "description", "comment"),
- new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AF5", 6, "description", "comment"),
+ new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AF1", 6, "description"),
+ new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AF2", 6, "description"),
+ new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AF3", 6, "description"),
+ new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AF4", 6, "description"),
+ new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AF5", 6, "description"),
};
approvedStructureElements = ITUtilStructures.assertCreateApprove(structureElementCommandsCreate);
structureElementCommandsConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElements);
@@ -1676,11 +1612,11 @@ class StructuresSystemGroupIT {
// create + approve
// delete
structureElementCommandsCreate = new StructureElementCommandCreate[] {
- new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AG1", 7, "description", "comment"),
- new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AG2", 7, "description", "comment"),
- new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AG3", 7, "description", "comment"),
- new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AG4", 7, "description", "comment"),
- new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AG5", 7, "description", "comment")
+ new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AG1", 7, "description"),
+ new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AG2", 7, "description"),
+ new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AG3", 7, "description"),
+ new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AG4", 7, "description"),
+ new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AG5", 7, "description")
};
approvedStructureElements = ITUtilStructures.assertCreateApprove(structureElementCommandsCreate);
structureElementCommandsConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElements);
@@ -1694,11 +1630,11 @@ class StructuresSystemGroupIT {
// delete + reject
// delete
structureElementCommandsCreate = new StructureElementCommandCreate[] {
- new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AH1", 8, "description", "comment"),
- new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AH2", 8, "description", "comment"),
- new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AH3", 8, "description", "comment"),
- new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AH4", 8, "description", "comment"),
- new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AH5", 8, "description", "comment")
+ new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AH1", 8, "description"),
+ new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AH2", 8, "description"),
+ new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AH3", 8, "description"),
+ new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AH4", 8, "description"),
+ new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "AH5", 8, "description")
};
approvedStructureElements = ITUtilStructures.assertCreateApprove(structureElementCommandsCreate);
uuid2 = approvedStructureElements[0].getUuid();
@@ -1706,13 +1642,11 @@ class StructuresSystemGroupIT {
structureElementCommandsUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElements);
for (StructureElementCommandUpdate structureElementCommandUpdate : structureElementCommandsUpdate) {
structureElementCommandUpdate.setDescription(description2);
- structureElementCommandUpdate.setComment(comment2);
}
approvedStructureElements = ITUtilStructures.assertUpdateApprove(structureElementCommandsUpdate);
structureElementCommandsUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElements);
for (StructureElementCommandUpdate structureElementCommandUpdate : structureElementCommandsUpdate) {
structureElementCommandUpdate.setDescription(description3);
- structureElementCommandUpdate.setComment(comment3);
}
approvedStructureElements = ITUtilStructures.assertUpdateApprove(structureElementCommandsUpdate);
structureElementCommandsConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElements);
diff --git a/src/test/java/org/openepics/names/docker/StructuresSystemIT.java b/src/test/java/org/openepics/names/docker/StructuresSystemIT.java
index 7d6facb0..dfbc26cb 100644
--- a/src/test/java/org/openepics/names/docker/StructuresSystemIT.java
+++ b/src/test/java/org/openepics/names/docker/StructuresSystemIT.java
@@ -69,7 +69,7 @@ class StructuresSystemIT {
// attributes for entry for operations - create, update, delete, approve, cancel, reject
// some set client side, others set server side
// client side
- // type, uuid, parent uuid, name, mnemonic, description, comment
+ // type, uuid, parent uuid, name, mnemonic, description
// may be set client side for test purposes
// order of methods in test not known
// therefore mnemonic values chosen to not interfere with mnemonic values in other methods
@@ -79,12 +79,12 @@ class StructuresSystemIT {
// for such operations that send Command objects to backend, it is also possible to send StructureElement
//
// StructureElementCommand
- // create - type, parent, name, mnemonic, description, comment
- // update - uuid, type, parent, name, mnemonic, description, comment
- // delete - uuid, type, comment
- // approve - uuid, type, comment
- // cancel - uuid, type, comment
- // reject - uuid, type, comment
+ // create - type, parent, name, mnemonic, description
+ // update - uuid, type, parent, name, mnemonic, description
+ // delete - uuid, type
+ // approve - uuid, type
+ // cancel - uuid, type
+ // reject - uuid, type
//
// response status codes
@@ -102,8 +102,7 @@ class StructuresSystemIT {
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEMGROUP, null,
- "Sg", null,
- "description", "comment");
+ "Sg", null, "description");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
systemGroupUuid = approvedStructureElement.getUuid();
@@ -141,7 +140,6 @@ class StructuresSystemIT {
// name
// mnemonic
// description
- // comment
try {
StructureElementCommandCreate structureElementCommandCreate = new StructureElementCommandCreate();
@@ -180,10 +178,6 @@ class StructuresSystemIT {
ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
structureElementCommandCreate.setDescription("description");
- ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.FALSE);
- ITUtilStructures.assertCreate(structureElementCommandCreate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
-
- structureElementCommandCreate.setComment("comment");
ITUtilStructures.assertValidate(structureElementCommandCreate, StructureCommand.CREATE, Boolean.TRUE);
structureElementCommandCreate.setType(null);
@@ -211,7 +205,6 @@ class StructuresSystemIT {
structureElementCommandCreate.setType(Type.SYSTEM);
structureElementCommandCreate.setParent(systemGroupUuid);
structureElementCommandCreate.setDescription("description");
- structureElementCommandCreate.setComment("comment");
// mnemonic rules
@@ -335,8 +328,7 @@ class StructuresSystemIT {
structureElementCommand = new StructureElementCommand(
null, Type.SYSTEM, systemGroupUuid,
- "Ca", null,
- "description", "comment");
+ "Ca", null, "description");
structureElementCommandCreate = StructureElementUtil.convertCommand2CommandCreate(structureElementCommand);
structureElementCommandConfirm = StructureElementUtil.convertCommand2CommandConfirm(structureElementCommand);
@@ -396,8 +388,7 @@ class StructuresSystemIT {
structureElementCommand = new StructureElementCommand(
null, Type.SYSTEM, systemGroupUuid,
- "Cc", null,
- "description", "comment");
+ "Cc", null, "description");
structureElementCommandCreate = StructureElementUtil.convertCommand2CommandCreate(structureElementCommand);
structureElementCommandConfirm = StructureElementUtil.convertCommand2CommandConfirm(structureElementCommand);
@@ -462,8 +453,7 @@ class StructuresSystemIT {
structureElementCommand = new StructureElementCommand(
null, Type.SYSTEM, systemGroupUuid,
- "Cr", null,
- "description", "comment");
+ "Cr", null, "description");
structureElementCommandCreate = StructureElementUtil.convertCommand2CommandCreate(structureElementCommand);
structureElementCommandConfirm = StructureElementUtil.convertCommand2CommandConfirm(structureElementCommand);
@@ -529,7 +519,6 @@ class StructuresSystemIT {
// name
// mnemonic
// description
- // comment
try {
UUID uuid = null;
@@ -541,8 +530,7 @@ class StructuresSystemIT {
// create, approve
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEM, systemGroupUuid,
- "Cu", null,
- "description", "comment");
+ "Cu", null, "description");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElement);
uuid = approvedStructureElement.getUuid();
@@ -596,13 +584,6 @@ class StructuresSystemIT {
structureElementCommandUpdate.setDescription("description");
ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
-
- structureElementCommandUpdate.setComment(null);
- ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- ITUtilStructures.assertUpdate(structureElementCommandUpdate, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
-
- structureElementCommandUpdate.setComment("comment");
- ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
} catch (Exception e) {
fail();
}
@@ -633,14 +614,11 @@ class StructuresSystemIT {
// create, approve
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEM, systemGroupUuid,
- "Ua", null,
- "description", "comment");
+ "Ua", null, "description");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElement);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
- structureElementCommandUpdate.setComment("comment update approve check");
-
ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
@@ -695,14 +673,11 @@ class StructuresSystemIT {
// create, approve
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEM, systemGroupUuid,
- "Uc", null,
- "description", "comment");
+ "Uc", null, "description");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElement);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
- structureElementCommandUpdate.setComment("comment update cancel check");
-
ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
@@ -757,14 +732,11 @@ class StructuresSystemIT {
// create, approve
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEM, systemGroupUuid,
- "Ur", null,
- "description", "comment");
+ "Ur", null, "description");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElement);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
- structureElementCommandUpdate.setComment("comment update reject check");
-
ITUtilStructures.assertValidate(structureElementCommandUpdate, StructureCommand.UPDATE, Boolean.TRUE);
ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
@@ -811,7 +783,6 @@ class StructuresSystemIT {
// validate delete
// uuid
// type
- // comment
try {
UUID uuid = null;
@@ -823,8 +794,7 @@ class StructuresSystemIT {
// create, approve
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEM, systemGroupUuid,
- "Cd", null,
- "description", "comment");
+ "Cd", null, "description");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
uuid = approvedStructureElement.getUuid();
@@ -854,13 +824,6 @@ class StructuresSystemIT {
structureElementCommandConfirm.setType(Type.SYSTEM);
ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
-
- structureElementCommandConfirm.setComment(null);
- ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.FALSE);
- ITUtilStructures.assertDelete(structureElementCommandConfirm, ITUtil.HTTP_UNPROCESSABLE_ENTITY);
-
- structureElementCommandConfirm.setComment("comment");
- ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
} catch (Exception e) {
fail();
}
@@ -890,13 +853,10 @@ class StructuresSystemIT {
// create, approve
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEM, systemGroupUuid,
- "Da", null,
- "description", "comment");
+ "Da", null, "description");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
- structureElementCommandConfirm.setComment("comment delete approve check");
-
ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.APPROVE, Boolean.FALSE);
@@ -950,13 +910,10 @@ class StructuresSystemIT {
// create, approve
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEM, systemGroupUuid,
- "Dc", null,
- "description", "comment");
+ "Dc", null, "description");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
- structureElementCommandConfirm.setComment("comment update delete check");
-
ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.CANCEL, Boolean.FALSE);
@@ -1010,13 +967,10 @@ class StructuresSystemIT {
// create, approve
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEM, systemGroupUuid,
- "Dr", null,
- "description", "comment");
+ "Dr", null, "description");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElement);
- structureElementCommandConfirm.setComment("comment delete reject check");
-
ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.DELETE, Boolean.TRUE);
ITUtilStructures.assertValidate(structureElementCommandConfirm, StructureCommand.REJECT, Boolean.FALSE);
@@ -1064,8 +1018,7 @@ class StructuresSystemIT {
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEM, systemGroupUuid,
- "Rsha", 41,
- "description", "comment");
+ "Rsha", 41, "description");
// create
createdStructureElement = ITUtilStructures.assertCreate(structureElementCommandCreate);
@@ -1164,8 +1117,7 @@ class StructuresSystemIT {
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEM, systemGroupUuid,
- "Rshc", 41,
- "description", "comment");
+ "Rshc", 41, "description");
// create
createdStructureElement = ITUtilStructures.assertCreate(structureElementCommandCreate);
@@ -1264,8 +1216,7 @@ class StructuresSystemIT {
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEM, systemGroupUuid,
- "Rshr", 41,
- "description", "comment");
+ "Rshr", 41, "description");
// create
createdStructureElement = ITUtilStructures.assertCreate(structureElementCommandCreate);
@@ -1375,32 +1326,28 @@ class StructuresSystemIT {
// a number of entries for which the last entry has status PENDING
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEM, systemGroupUuid,
- "P1", 1,
- "description", "comment");
+ "P1", 1, "description");
createdStructureElement = ITUtilStructures.assertCreate(structureElementCommandCreate);
uuid = createdStructureElement.getUuid();
// a number of entries for which the last entry has status CANCELLED
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEM, systemGroupUuid,
- "C1", 2,
- "description", "comment");
+ "C1", 2, "description");
createdStructureElement = ITUtilStructures.assertCreateCancel(structureElementCommandCreate);
uuid2 = createdStructureElement.getUuid();
// a number of entries for which the last entry has status REJECTED
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEM, systemGroupUuid,
- "R1", 3,
- "description", "comment");
+ "R1", 3, "description");
createdStructureElement = ITUtilStructures.assertCreateReject(structureElementCommandCreate);
uuid3 = createdStructureElement.getUuid();
// a number of entries for which the last entry has status APPROVED
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEM, systemGroupUuid,
- "A1", 4,
- "description", "comment");
+ "A1", 4, "description");
createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
uuid4 = createdStructureElement.getUuid();
@@ -1472,105 +1419,101 @@ class StructuresSystemIT {
// a number of entries for which the last entry has status PENDING
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEM, systemGroupUuid,
- "P9", null,
- "description", "comment");
+ "P9", null, "description");
createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
uuid = createdStructureElement.getUuid();
- structureElementCommandUpdate.setComment("comment 2");
+ structureElementCommandUpdate.setDescription("description 2");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 3");
+ structureElementCommandUpdate.setDescription("description 3");
ITUtilStructures.assertUpdateCancel(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 4");
+ structureElementCommandUpdate.setDescription("description 4");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 5");
+ structureElementCommandUpdate.setDescription("description 5");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 6");
+ structureElementCommandUpdate.setDescription("description 6");
ITUtilStructures.assertUpdateReject(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 7");
+ structureElementCommandUpdate.setDescription("description 7");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 8");
+ structureElementCommandUpdate.setDescription("description 8");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 9");
+ structureElementCommandUpdate.setDescription("description 9");
ITUtilStructures.assertUpdate(structureElementCommandUpdate);
// a number of entries for which the last entry has status CANCELLED
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEM, systemGroupUuid,
- "C9", 2,
- "description", "comment");
+ "C9", 2, "description");
createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
uuid2 = createdStructureElement.getUuid();
- structureElementCommandUpdate.setComment("comment 2");
+ structureElementCommandUpdate.setDescription("description 2");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 3");
+ structureElementCommandUpdate.setDescription("description 3");
ITUtilStructures.assertUpdateCancel(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 4");
+ structureElementCommandUpdate.setDescription("description 4");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 5");
+ structureElementCommandUpdate.setDescription("description 5");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 6");
+ structureElementCommandUpdate.setDescription("description 6");
ITUtilStructures.assertUpdateReject(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 7");
+ structureElementCommandUpdate.setDescription("description 7");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 8");
+ structureElementCommandUpdate.setDescription("description 8");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 9");
+ structureElementCommandUpdate.setDescription("description 9");
ITUtilStructures.assertUpdateCancel(structureElementCommandUpdate);
// a number of entries for which the last entry has status REJECTED
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEM, systemGroupUuid,
- "R9", 1,
- "description", "comment");
+ "R9", 1, "description");
createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
uuid3 = createdStructureElement.getUuid();
- structureElementCommandUpdate.setComment("comment 2");
+ structureElementCommandUpdate.setDescription("description 2");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 3");
+ structureElementCommandUpdate.setDescription("description 3");
ITUtilStructures.assertUpdateCancel(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 4");
+ structureElementCommandUpdate.setDescription("description 4");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 5");
+ structureElementCommandUpdate.setDescription("description 5");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 6");
+ structureElementCommandUpdate.setDescription("description 6");
ITUtilStructures.assertUpdateReject(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 7");
+ structureElementCommandUpdate.setDescription("description 7");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 8");
+ structureElementCommandUpdate.setDescription("description 8");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 9");
+ structureElementCommandUpdate.setDescription("description 9");
ITUtilStructures.assertUpdateReject(structureElementCommandUpdate);
// a number of entries for which the last entry has status APPROVED
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEM, systemGroupUuid,
- "A9", 1,
- "description", "comment");
+ "A9", 1, "description");
createdStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(createdStructureElement);
uuid4 = createdStructureElement.getUuid();
- structureElementCommandUpdate.setComment("comment 2");
+ structureElementCommandUpdate.setDescription("description 2");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 3");
+ structureElementCommandUpdate.setDescription("description 3");
ITUtilStructures.assertUpdateCancel(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 4");
+ structureElementCommandUpdate.setDescription("description 4");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 5");
+ structureElementCommandUpdate.setDescription("description 5");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 6");
+ structureElementCommandUpdate.setDescription("description 6");
ITUtilStructures.assertUpdateReject(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 7");
+ structureElementCommandUpdate.setDescription("description 7");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 8");
+ structureElementCommandUpdate.setDescription("description 8");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
- structureElementCommandUpdate.setComment("comment 9");
+ structureElementCommandUpdate.setDescription("description 9");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
try {
@@ -1643,73 +1586,69 @@ class StructuresSystemIT {
// create + approve
structureElementCommandsCreate = new StructureElementCommandCreate[] {
- new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AA1", 1, "description", "comment"),
- new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AA2", 1, "description", "comment"),
- new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AA3", 1, "description", "comment"),
- new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AA4", 1, "description", "comment"),
- new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AA5", 1, "description", "comment")
+ new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AA1", 1, "description"),
+ new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AA2", 1, "description"),
+ new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AA3", 1, "description"),
+ new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AA4", 1, "description"),
+ new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AA5", 1, "description")
};
approvedStructureElements = ITUtilStructures.assertCreateApprove(structureElementCommandsCreate);
uuid = approvedStructureElements[0].getUuid();
// create + cancel
structureElementCommandsCreate = new StructureElementCommandCreate[] {
- new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AB1", 2, "description", "comment"),
- new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AB2", 2, "description", "comment"),
- new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AB3", 2, "description", "comment"),
- new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AB4", 2, "description", "comment"),
- new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AB5", 2, "description", "comment")
+ new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AB1", 2, "description"),
+ new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AB2", 2, "description"),
+ new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AB3", 2, "description"),
+ new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AB4", 2, "description"),
+ new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AB5", 2, "description")
};
ITUtilStructures.assertCreateCancel(structureElementCommandsCreate);
// create + reject
structureElementCommandsCreate = new StructureElementCommandCreate[] {
- new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AC1", 3, "description", "comment"),
- new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AC2", 3, "description", "comment"),
- new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AC3", 3, "description", "comment"),
- new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AC4", 3, "description", "comment"),
- new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AC5", 3, "description", "comment")
+ new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AC1", 3, "description"),
+ new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AC2", 3, "description"),
+ new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AC3", 3, "description"),
+ new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AC4", 3, "description"),
+ new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AC5", 3, "description")
};
ITUtilStructures.assertCreateReject(structureElementCommandsCreate);
// create
structureElementCommandsCreate = new StructureElementCommandCreate[] {
- new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AD1", 4, "description", "comment"),
- new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AD2", 4, "description", "comment"),
- new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AD3", 4, "description", "comment"),
- new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AD4", 4, "description", "comment"),
- new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AD5", 4, "description", "comment")
+ new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AD1", 4, "description"),
+ new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AD2", 4, "description"),
+ new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AD3", 4, "description"),
+ new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AD4", 4, "description"),
+ new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AD5", 4, "description")
};
ITUtilStructures.assertCreate(structureElementCommandsCreate);
String description2 = "some other description";
- String comment2 = "some other comment";
String description3 = "more description";
- String comment3 = "more comment";
// create + approve
// update + approve
// update + approve
// delete + reject
structureElementCommandsCreate = new StructureElementCommandCreate[] {
- new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AE1", 5, "description", "comment"),
- new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AE2", 5, "description", "comment"),
- new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AE3", 5, "description", "comment"),
- new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AE4", 5, "description", "comment"),
- new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AE5", 5, "description", "comment")
+ new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AE1", 5, "description"),
+ new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AE2", 5, "description"),
+ new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AE3", 5, "description"),
+ new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AE4", 5, "description"),
+ new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AE5", 5, "description")
};
approvedStructureElements = ITUtilStructures.assertCreateApprove(structureElementCommandsCreate);
structureElementCommandsUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElements);
for (StructureElementCommandUpdate structureElementCommandUpdate : structureElementCommandsUpdate) {
structureElementCommandUpdate.setDescription(description2);
- structureElementCommandUpdate.setComment(comment2);
}
approvedStructureElements = ITUtilStructures.assertUpdateApprove(structureElementCommandsUpdate);
structureElementCommandsUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElements);
for (StructureElementCommandUpdate structureElementCommandUpdate : structureElementCommandsUpdate) {
structureElementCommandUpdate.setDescription(description3);
- structureElementCommandUpdate.setComment(comment3);
}
approvedStructureElements = ITUtilStructures.assertUpdateApprove(structureElementCommandsUpdate);
structureElementCommandsConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElements);
@@ -1718,11 +1657,11 @@ class StructuresSystemIT {
// create + approve
// delete + approve
structureElementCommandsCreate = new StructureElementCommandCreate[] {
- new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AF1", 6, "description", "comment"),
- new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AF2", 6, "description", "comment"),
- new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AF3", 6, "description", "comment"),
- new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AF4", 6, "description", "comment"),
- new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AF5", 6, "description", "comment")
+ new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AF1", 6, "description"),
+ new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AF2", 6, "description"),
+ new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AF3", 6, "description"),
+ new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AF4", 6, "description"),
+ new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AF5", 6, "description")
};
approvedStructureElements = ITUtilStructures.assertCreateApprove(structureElementCommandsCreate);
structureElementCommandsConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElements);
@@ -1731,11 +1670,11 @@ class StructuresSystemIT {
// create + approve
// delete
structureElementCommandsCreate = new StructureElementCommandCreate[] {
- new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AG1", 7, "description", "comment"),
- new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AG2", 7, "description", "comment"),
- new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AG3", 7, "description", "comment"),
- new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AG4", 7, "description", "comment"),
- new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AG5", 7, "description", "comment")
+ new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AG1", 7, "description"),
+ new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AG2", 7, "description"),
+ new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AG3", 7, "description"),
+ new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AG4", 7, "description"),
+ new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AG5", 7, "description")
};
approvedStructureElements = ITUtilStructures.assertCreateApprove(structureElementCommandsCreate);
structureElementCommandsConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElements);
@@ -1749,11 +1688,11 @@ class StructuresSystemIT {
// delete + reject
// delete
structureElementCommandsCreate = new StructureElementCommandCreate[] {
- new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AH1", 8, "description", "comment"),
- new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AH2", 8, "description", "comment"),
- new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AH3", 8, "description", "comment"),
- new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AH4", 8, "description", "comment"),
- new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AH5", 8, "description", "comment")
+ new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AH1", 8, "description"),
+ new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AH2", 8, "description"),
+ new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AH3", 8, "description"),
+ new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AH4", 8, "description"),
+ new StructureElementCommandCreate(Type.SYSTEM, systemGroupUuid, "AH5", 8, "description")
};
approvedStructureElements = ITUtilStructures.assertCreateApprove(structureElementCommandsCreate);
uuid2 = approvedStructureElements[0].getUuid();
@@ -1761,13 +1700,11 @@ class StructuresSystemIT {
structureElementCommandsUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElements);
for (StructureElementCommandUpdate structureElementCommandUpdate : structureElementCommandsUpdate) {
structureElementCommandUpdate.setDescription(description2);
- structureElementCommandUpdate.setComment(comment2);
}
approvedStructureElements = ITUtilStructures.assertUpdateApprove(structureElementCommandsUpdate);
structureElementCommandsUpdate = StructureElementUtil.convertElement2CommandUpdate(approvedStructureElements);
for (StructureElementCommandUpdate structureElementCommandUpdate : structureElementCommandsUpdate) {
structureElementCommandUpdate.setDescription(description3);
- structureElementCommandUpdate.setComment(comment3);
}
approvedStructureElements = ITUtilStructures.assertUpdateApprove(structureElementCommandsUpdate);
structureElementCommandsConfirm = StructureElementUtil.convertElement2CommandConfirm(approvedStructureElements);
diff --git a/src/test/java/org/openepics/names/docker/complex/NamesInstanceIndexIT.java b/src/test/java/org/openepics/names/docker/complex/NamesInstanceIndexIT.java
index 0279adee..f1706143 100644
--- a/src/test/java/org/openepics/names/docker/complex/NamesInstanceIndexIT.java
+++ b/src/test/java/org/openepics/names/docker/complex/NamesInstanceIndexIT.java
@@ -147,36 +147,31 @@ class NamesInstanceIndexIT {
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEMGROUP, null,
- "Acc", null,
- "Accelerator. The ESS Linear Accelerator", "approved by alfio");
+ "Acc", null, "Accelerator. The ESS Linear Accelerator");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
systemGroupAcc = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEM, systemGroupAcc,
- "RFQ", null,
- "Radio Frequency Quadrupole", "empty");
+ "RFQ", null, "Radio Frequency Quadrupole");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
systemRFQ = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemRFQ,
- "010PRL", null,
- "01 Phase Reference Line", "Approved by Daniel Piso");
+ "010PRL", null, "01 Phase Reference Line");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
subsystem010PRL = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemRFQ,
- "010", null,
- "RFQ-010", "Approved by Daniel Piso");
+ "010", null, "RFQ-010");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
subsystem010 = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemRFQ,
- "N1U1", null,
- "Power switch board 01. Electrical power cabinets", "Approved by Daniel Piso");
+ "N1U1", null, "Power switch board 01. Electrical power cabinets");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
subsystemN1U1 = approvedStructureElement.getUuid();
@@ -184,57 +179,49 @@ class NamesInstanceIndexIT {
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
- "Cryo", null,
- "Cryogenics", "empty");
+ "Cryo", null, "Cryogenics");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
disciplineCryo = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
- "EMR", null,
- "Electromagnetic Resonators", "empty");
+ "EMR", null, "Electromagnetic Resonators");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
disciplineEMR = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
- "HVAC", null,
- "Heating, Cooling and Air Conditioning", "empty");
+ "HVAC", null, "Heating, Cooling and Air Conditioning");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
disciplineHVAC = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
- "Proc", null,
- "General Process Control", "empty");
+ "Proc", null, "General Process Control");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
disciplineProc = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
- "SC", null,
- "Software Controllers", "empty");
+ "SC", null, "Software Controllers");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
disciplineSC = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
- "Vac", null,
- "Vacuum", "empty");
+ "Vac", null, "Vacuum");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
disciplineVac = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
- "WtrC", null,
- "Water Cooling", "empty");
+ "WtrC", null, "Water Cooling");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
disciplineWtrC = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
- "BMD", null,
- "Beam Magnets and Deflectors", "empty");
+ "BMD", null, "Beam Magnets and Deflectors");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
disciplineBMD = approvedStructureElement.getUuid();
@@ -243,57 +230,49 @@ class NamesInstanceIndexIT {
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, disciplineCryo,
- null, null,
- "empty", "empty");
+ null, null, "empty");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceGroupCryo = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, disciplineEMR,
- null, null,
- "empty", "empty");
+ null, null, "empty");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceGroupEMR = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, disciplineHVAC,
- null, null,
- "empty, empty", "empty");
+ null, null, "empty");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceGroupHVAC = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, disciplineProc,
- null, null,
- "empty", "empty");
+ null, null, "empty");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceGroupProc = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, disciplineSC,
- null, null,
- "empty", "empty");
+ null, null, "empty");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceGroupSC = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, disciplineVac,
- null, null,
- "empty", "empty");
+ null, null, "empty");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceGroupVac = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, disciplineWtrC,
- null, null,
- "empty", "empty");
+ null, null, "empty");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceGroupWtrC = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, disciplineBMD,
- null, null,
- "empty", "empty");
+ null, null, "empty");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceGroupBMD = approvedStructureElement.getUuid();
@@ -301,29 +280,25 @@ class NamesInstanceIndexIT {
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupCryo,
- "FS", null,
- "Flow Switch", "empty");
+ "FS", null, "Flow Switch");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceType_Cryo_FS = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupCryo,
- "IOC", null,
- "Input Output Controller", "empty");
+ "IOC", null, "Input Output Controller");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceType_Cryo_IOC = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupCryo,
- "RFA", null,
- "RF Antenna", "empty");
+ "RFA", null, "RF Antenna");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceType_Cryo_RFA = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupCryo,
- "TT", null,
- "Temperature Transmitter", "empty");
+ "TT", null, "Temperature Transmitter");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceType_Cryo_TT = approvedStructureElement.getUuid();
@@ -331,29 +306,25 @@ class NamesInstanceIndexIT {
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupEMR,
- "FS", null,
- "Flow Switch", "empty");
+ "FS", null, "Flow Switch");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceType_EMR_FS = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupEMR,
- "IOC", null,
- "Input Output Controller", "empty");
+ "IOC", null, "Input Output Controller");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceType_EMR_IOC = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupEMR,
- "RFA", null,
- "RF Antenna", "empty");
+ "RFA", null, "RF Antenna");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceType_EMR_RFA = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupEMR,
- "TT", null,
- "Temperature Transmitter", "empty");
+ "TT", null, "Temperature Transmitter");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceType_EMR_TT = approvedStructureElement.getUuid();
@@ -361,29 +332,25 @@ class NamesInstanceIndexIT {
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupHVAC,
- "FS", null,
- "Flow Switch", "empty");
+ "FS", null, "Flow Switch");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceType_HVAC_FS = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupHVAC,
- "IOC", null,
- "Input Output Controller", "empty");
+ "IOC", null, "Input Output Controller");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceType_HVAC_IOC = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupHVAC,
- "RFA", null,
- "RF Antenna", "empty");
+ "RFA", null, "RF Antenna");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceType_HVAC_RFA = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupHVAC,
- "TT", null,
- "Temperature Transmitter", "empty");
+ "TT", null, "Temperature Transmitter");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceType_HVAC_TT = approvedStructureElement.getUuid();
@@ -391,29 +358,25 @@ class NamesInstanceIndexIT {
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupProc,
- "FS", null,
- "Flow Switch", "empty");
+ "FS", null, "Flow Switch");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceType_Proc_FS = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupProc,
- "IOC", null,
- "Input Output Controller", "empty");
+ "IOC", null, "Input Output Controller");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceType_Proc_IOC = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupProc,
- "RFA", null,
- "RF Antenna", "empty");
+ "RFA", null, "RF Antenna");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceType_Proc_RFA = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupProc,
- "TT", null,
- "Temperature Transmitter", "empty");
+ "TT", null, "Temperature Transmitter");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceType_Proc_TT = approvedStructureElement.getUuid();
@@ -421,29 +384,25 @@ class NamesInstanceIndexIT {
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupSC,
- "FS", null,
- "Flow Switch", "empty");
+ "FS", null, "Flow Switch");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceType_SC_FS = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupSC,
- "IOC", null,
- "Input Output Controller", "empty");
+ "IOC", null, "Input Output Controller");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceType_SC_IOC = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupSC,
- "RFA", null,
- "RF Antenna", "empty");
+ "RFA", null, "RF Antenna");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceType_SC_RFA = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupSC,
- "TT", null,
- "Temperature Transmitter", "empty");
+ "TT", null, "Temperature Transmitter");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceType_SC_TT = approvedStructureElement.getUuid();
@@ -451,29 +410,25 @@ class NamesInstanceIndexIT {
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupVac,
- "FS", null,
- "Flow Switch", "empty");
+ "FS", null, "Flow Switch");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceType_Vac_FS = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupVac,
- "IOC", null,
- "Input Output Controller", "empty");
+ "IOC", null, "Input Output Controller");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceType_Vac_IOC = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupVac,
- "RFA", null,
- "RF Antenna", "empty");
+ "RFA", null, "RF Antenna");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceType_Vac_RFA = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupVac,
- "TT", null,
- "Temperature Transmitter", "empty");
+ "TT", null, "Temperature Transmitter");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceType_Vac_TT = approvedStructureElement.getUuid();
@@ -481,29 +436,25 @@ class NamesInstanceIndexIT {
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupWtrC,
- "FS", null,
- "Flow Switch", "empty");
+ "FS", null, "Flow Switch");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceType_WtrC_FS = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupWtrC,
- "IOC", null,
- "Input Output Controller", "empty");
+ "IOC", null, "Input Output Controller");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceType_WtrC_IOC = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupWtrC,
- "RFA", null,
- "RF Antenna", "empty");
+ "RFA", null, "RF Antenna");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceType_WtrC_RFA = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupWtrC,
- "TT", null,
- "Temperature Transmitter", "empty");
+ "TT", null, "Temperature Transmitter");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceType_WtrC_TT = approvedStructureElement.getUuid();
@@ -511,29 +462,25 @@ class NamesInstanceIndexIT {
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupBMD,
- "FS", null,
- "Flow Switch", "empty");
+ "FS", null, "Flow Switch");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceType_BMD_FS = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupBMD,
- "IOC", null,
- "Input Output Controller", "empty");
+ "IOC", null, "Input Output Controller");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceType_BMD_IOC = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupBMD,
- "RFA", null,
- "RF Antenna", "empty");
+ "RFA", null, "RF Antenna");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceType_BMD_RFA = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupBMD,
- "TT", null,
- "Temperature Transmitter", "empty");
+ "TT", null, "Temperature Transmitter");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceType_BMD_TT = approvedStructureElement.getUuid();
}
@@ -561,7 +508,6 @@ class NamesInstanceIndexIT {
NameElementCommandCreate nameElementCommandCreate = new NameElementCommandCreate();
nameElementCommandCreate.setParentSystemStructure(subsystem010PRL);
nameElementCommandCreate.setDescription("description");
- nameElementCommandCreate.setComment("comment");
// ----------------------------------------------------------------------------------------------------
@@ -700,7 +646,6 @@ class NamesInstanceIndexIT {
NameElementCommandCreate nameElementCommandCreate = new NameElementCommandCreate();
nameElementCommandCreate.setParentSystemStructure(subsystem010PRL);
nameElementCommandCreate.setDescription("description");
- nameElementCommandCreate.setComment("comment");
// ----------------------------------------------------------------------------------------------------
@@ -839,7 +784,6 @@ class NamesInstanceIndexIT {
NameElementCommandCreate nameElementCommandCreate = new NameElementCommandCreate();
nameElementCommandCreate.setParentSystemStructure(subsystem010PRL);
nameElementCommandCreate.setDescription("description");
- nameElementCommandCreate.setComment("comment");
// ----------------------------------------------------------------------------------------------------
@@ -978,7 +922,6 @@ class NamesInstanceIndexIT {
NameElementCommandCreate nameElementCommandCreate = new NameElementCommandCreate();
nameElementCommandCreate.setParentSystemStructure(subsystem010PRL);
nameElementCommandCreate.setDescription("description");
- nameElementCommandCreate.setComment("comment");
// ----------------------------------------------------------------------------------------------------
@@ -1117,7 +1060,6 @@ class NamesInstanceIndexIT {
NameElementCommandCreate nameElementCommandCreate = new NameElementCommandCreate();
nameElementCommandCreate.setParentSystemStructure(subsystem010PRL);
nameElementCommandCreate.setDescription("description");
- nameElementCommandCreate.setComment("comment");
// ----------------------------------------------------------------------------------------------------
@@ -1256,7 +1198,6 @@ class NamesInstanceIndexIT {
NameElementCommandCreate nameElementCommandCreate = new NameElementCommandCreate();
nameElementCommandCreate.setParentSystemStructure(subsystem010PRL);
nameElementCommandCreate.setDescription("description");
- nameElementCommandCreate.setComment("comment");
// ----------------------------------------------------------------------------------------------------
@@ -1395,7 +1336,6 @@ class NamesInstanceIndexIT {
NameElementCommandCreate nameElementCommandCreate = new NameElementCommandCreate();
nameElementCommandCreate.setParentSystemStructure(subsystem010PRL);
nameElementCommandCreate.setDescription("description");
- nameElementCommandCreate.setComment("comment");
// ----------------------------------------------------------------------------------------------------
@@ -1534,7 +1474,6 @@ class NamesInstanceIndexIT {
NameElementCommandCreate nameElementCommandCreate = new NameElementCommandCreate();
nameElementCommandCreate.setParentSystemStructure(subsystem010PRL);
nameElementCommandCreate.setDescription("description");
- nameElementCommandCreate.setComment("comment");
// ----------------------------------------------------------------------------------------------------
diff --git a/src/test/java/org/openepics/names/docker/complex/NamesLegacyIT.java b/src/test/java/org/openepics/names/docker/complex/NamesLegacyIT.java
index 777ac3b5..39016393 100644
--- a/src/test/java/org/openepics/names/docker/complex/NamesLegacyIT.java
+++ b/src/test/java/org/openepics/names/docker/complex/NamesLegacyIT.java
@@ -122,10 +122,9 @@ class NamesLegacyIT {
StructureElement approvedStructureElement = null;
String description = "description";
- String comment = "comment";
// sg0
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEMGROUP, null, null, null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEMGROUP, null, null, null, description);
ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
ITUtilStructures.assertRead("", 1);
@@ -138,48 +137,48 @@ class NamesLegacyIT {
// system group
// sg0 - no mnemonic
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "Sg1", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "Sg1", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
sg1 = approvedStructureElement.getUuid();
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEM, sg1, "Sys11", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEM, sg1, "Sys11", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
sys11 = approvedStructureElement.getUuid();
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEM, sg1, "Sys12", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEM, sg1, "Sys12", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
sys12 = approvedStructureElement.getUuid();
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEM, sg1, "Sys13", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEM, sg1, "Sys13", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
sys13 = approvedStructureElement.getUuid();
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys11, "Sub111", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys11, "Sub111", null, description);
ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys11, "Sub112", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys11, "Sub112", null, description);
ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys11, "Sub113", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys11, "Sub113", null, description);
ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys12, "Sub121", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys12, "Sub121", null, description);
ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys12, "Sub122", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys12, "Sub122", null, description);
ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys12, "Sub123", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys12, "Sub123", null, description);
ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys13, "Sub131", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys13, "Sub131", null, description);
ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys13, "Sub132", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys13, "Sub132", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
sub132 = approvedStructureElement.getUuid();
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys13, "Sub133", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys13, "Sub133", null, description);
ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
ITUtilStructures.assertRead("", 14);
@@ -206,49 +205,49 @@ class NamesLegacyIT {
// Sys12-Sub121, Sys12-Sub122, Sys12-Sub123
// Sys13-Sub131, Sys13-Sub132, Sys13-Sub133
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "Sg2", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "Sg2", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
sg2 = approvedStructureElement.getUuid();
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEM, sg2, "Sys21", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEM, sg2, "Sys21", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
sys21 = approvedStructureElement.getUuid();
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEM, sg2, "Sys22", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEM, sg2, "Sys22", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
sys22 = approvedStructureElement.getUuid();
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEM, sg2, "Sys23", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEM, sg2, "Sys23", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
sys23 = approvedStructureElement.getUuid();
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys21, "Sub211", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys21, "Sub211", null, description);
ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys21, "Sub212", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys21, "Sub212", null, description);
ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys21, "Sub213", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys21, "Sub213", null, description);
ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys22, "Sub221", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys22, "Sub221", null, description);
ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys22, "Sub222", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys22, "Sub222", null, description);
ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys22, "Sub223", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys22, "Sub223", null, description);
ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys23, "Sub231", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys23, "Sub231", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
sub231 = approvedStructureElement.getUuid();
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys23, "Sub232", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys23, "Sub232", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
sub232 = approvedStructureElement.getUuid();
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys23, "Sub233", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys23, "Sub233", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
sub233 = approvedStructureElement.getUuid();
@@ -276,55 +275,55 @@ class NamesLegacyIT {
// Sys22-Sub221, Sys22-Sub222, Sys22-Sub223
// Sys23-Sub231, Sys23-Sub232, Sys23-Sub233
- structureElementCommandCreate = new StructureElementCommandCreate(Type.DISCIPLINE, null, "Di2", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.DISCIPLINE, null, "Di2", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
di2 = approvedStructureElement.getUuid();
- structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICEGROUP, di2, "", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICEGROUP, di2, "", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
dg21 = approvedStructureElement.getUuid();
- structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICEGROUP, di2, "", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICEGROUP, di2, "", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
dg22 = approvedStructureElement.getUuid();
- structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICEGROUP, di2, "", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICEGROUP, di2, "", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
dg23 = approvedStructureElement.getUuid();
- structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg21, "Dt211", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg21, "Dt211", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
dt211 = approvedStructureElement.getUuid();
- structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg21, "Dt212", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg21, "Dt212", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
dt212 = approvedStructureElement.getUuid();
- structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg21, "Dt213", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg21, "Dt213", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
dt213 = approvedStructureElement.getUuid();
- structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg22, "Dt221", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg22, "Dt221", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
dt221 = approvedStructureElement.getUuid();
- structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg22, "Dt222", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg22, "Dt222", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
dt222 = approvedStructureElement.getUuid();
- structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg22, "Dt223", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg22, "Dt223", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
dt223 = approvedStructureElement.getUuid();
- structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg23, "Dt231", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg23, "Dt231", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
dt231 = approvedStructureElement.getUuid();
- structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg23, "Dt232", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg23, "Dt232", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
dt232 = approvedStructureElement.getUuid();
- structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg23, "Dt233", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg23, "Dt233", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
dt233 = approvedStructureElement.getUuid();
@@ -349,31 +348,31 @@ class NamesLegacyIT {
// Dt221, Dt222, Dt223
// Dt231, Dt232, Dt233
- nameElementCommandCreate = new NameElementCommandCreate(sg2, dt211, "211", description, comment);
+ nameElementCommandCreate = new NameElementCommandCreate(sg2, dt211, "211", description);
ITUtilNames.assertCreate(nameElementCommandCreate);
- nameElementCommandCreate = new NameElementCommandCreate(sg2, dt212, "212", description, comment);
+ nameElementCommandCreate = new NameElementCommandCreate(sg2, dt212, "212", description);
ITUtilNames.assertCreate(nameElementCommandCreate);
- nameElementCommandCreate = new NameElementCommandCreate(sg2, dt213, "213", description, comment);
+ nameElementCommandCreate = new NameElementCommandCreate(sg2, dt213, "213", description);
ITUtilNames.assertCreate(nameElementCommandCreate);
- nameElementCommandCreate = new NameElementCommandCreate(sys22, dt221, "221", description, comment);
+ nameElementCommandCreate = new NameElementCommandCreate(sys22, dt221, "221", description);
ITUtilNames.assertCreate(nameElementCommandCreate);
- nameElementCommandCreate = new NameElementCommandCreate(sys22, dt222, "222", description, comment);
+ nameElementCommandCreate = new NameElementCommandCreate(sys22, dt222, "222", description);
ITUtilNames.assertCreate(nameElementCommandCreate);
- nameElementCommandCreate = new NameElementCommandCreate(sys22, dt223, "223", description, comment);
+ nameElementCommandCreate = new NameElementCommandCreate(sys22, dt223, "223", description);
ITUtilNames.assertCreate(nameElementCommandCreate);
- nameElementCommandCreate = new NameElementCommandCreate(sub231, dt231, "231", description, comment);
+ nameElementCommandCreate = new NameElementCommandCreate(sub231, dt231, "231", description);
ITUtilNames.assertCreate(nameElementCommandCreate);
- nameElementCommandCreate = new NameElementCommandCreate(sub232, dt232, "232", description, comment);
+ nameElementCommandCreate = new NameElementCommandCreate(sub232, dt232, "232", description);
ITUtilNames.assertCreate(nameElementCommandCreate);
- nameElementCommandCreate = new NameElementCommandCreate(sub233, dt233, "233", description, comment);
+ nameElementCommandCreate = new NameElementCommandCreate(sub233, dt233, "233", description);
ITUtilNames.assertCreate(nameElementCommandCreate);
ITUtilStructures.assertRead("", 40);
diff --git a/src/test/java/org/openepics/names/docker/complex/NamesLegacyStructuresDeleteIT.java b/src/test/java/org/openepics/names/docker/complex/NamesLegacyStructuresDeleteIT.java
index 2a32a216..e44db19e 100644
--- a/src/test/java/org/openepics/names/docker/complex/NamesLegacyStructuresDeleteIT.java
+++ b/src/test/java/org/openepics/names/docker/complex/NamesLegacyStructuresDeleteIT.java
@@ -120,10 +120,9 @@ class NamesLegacyStructuresDeleteIT {
StructureElement approvedStructureElement = null;
String description = "description";
- String comment = "comment";
// sg0
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEMGROUP, null, null, null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEMGROUP, null, null, null, description);
ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
ITUtilStructures.assertRead("", 1);
@@ -136,48 +135,48 @@ class NamesLegacyStructuresDeleteIT {
// system group
// sg0 - no mnemonic
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "Sg1", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "Sg1", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
sg1 = approvedStructureElement.getUuid();
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEM, sg1, "Sys11", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEM, sg1, "Sys11", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
sys11 = approvedStructureElement.getUuid();
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEM, sg1, "Sys12", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEM, sg1, "Sys12", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
sys12 = approvedStructureElement.getUuid();
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEM, sg1, "Sys13", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEM, sg1, "Sys13", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
sys13 = approvedStructureElement.getUuid();
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys11, "Sub111", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys11, "Sub111", null, description);
ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys11, "Sub112", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys11, "Sub112", null, description);
ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys11, "Sub113", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys11, "Sub113", null, description);
ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys12, "Sub121", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys12, "Sub121", null, description);
ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys12, "Sub122", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys12, "Sub122", null, description);
ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys12, "Sub123", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys12, "Sub123", null, description);
ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys13, "Sub131", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys13, "Sub131", null, description);
ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys13, "Sub132", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys13, "Sub132", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
sub132 = approvedStructureElement.getUuid();
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys13, "Sub133", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys13, "Sub133", null, description);
ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
ITUtilStructures.assertRead("", 14);
@@ -204,49 +203,49 @@ class NamesLegacyStructuresDeleteIT {
// Sys12-Sub121, Sys12-Sub122, Sys12-Sub123
// Sys13-Sub131, Sys13-Sub132, Sys13-Sub133
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "Sg2", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "Sg2", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
sg2 = approvedStructureElement.getUuid();
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEM, sg2, "Sys21", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEM, sg2, "Sys21", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
sys21 = approvedStructureElement.getUuid();
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEM, sg2, "Sys22", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEM, sg2, "Sys22", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
sys22 = approvedStructureElement.getUuid();
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEM, sg2, "Sys23", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEM, sg2, "Sys23", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
sys23 = approvedStructureElement.getUuid();
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys21, "Sub211", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys21, "Sub211", null, description);
ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys21, "Sub212", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys21, "Sub212", null, description);
ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys21, "Sub213", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys21, "Sub213", null, description);
ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys22, "Sub221", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys22, "Sub221", null, description);
ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys22, "Sub222", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys22, "Sub222", null, description);
ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys22, "Sub223", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys22, "Sub223", null, description);
ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys23, "Sub231", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys23, "Sub231", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
sub231 = approvedStructureElement.getUuid();
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys23, "Sub232", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys23, "Sub232", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
sub232 = approvedStructureElement.getUuid();
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys23, "Sub233", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys23, "Sub233", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
sub233 = approvedStructureElement.getUuid();
@@ -274,55 +273,55 @@ class NamesLegacyStructuresDeleteIT {
// Sys22-Sub221, Sys22-Sub222, Sys22-Sub223
// Sys23-Sub231, Sys23-Sub232, Sys23-Sub233
- structureElementCommandCreate = new StructureElementCommandCreate(Type.DISCIPLINE, null, "Di2", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.DISCIPLINE, null, "Di2", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
di2 = approvedStructureElement.getUuid();
- structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICEGROUP, di2, "", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICEGROUP, di2, "", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
dg21 = approvedStructureElement.getUuid();
- structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICEGROUP, di2, "", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICEGROUP, di2, "", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
dg22 = approvedStructureElement.getUuid();
- structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICEGROUP, di2, "", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICEGROUP, di2, "", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
dg23 = approvedStructureElement.getUuid();
- structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg21, "Dt211", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg21, "Dt211", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
dt211 = approvedStructureElement.getUuid();
- structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg21, "Dt212", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg21, "Dt212", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
dt212 = approvedStructureElement.getUuid();
- structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg21, "Dt213", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg21, "Dt213", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
dt213 = approvedStructureElement.getUuid();
- structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg22, "Dt221", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg22, "Dt221", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
dt221 = approvedStructureElement.getUuid();
- structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg22, "Dt222", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg22, "Dt222", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
dt222 = approvedStructureElement.getUuid();
- structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg22, "Dt223", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg22, "Dt223", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
dt223 = approvedStructureElement.getUuid();
- structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg23, "Dt231", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg23, "Dt231", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
dt231 = approvedStructureElement.getUuid();
- structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg23, "Dt232", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg23, "Dt232", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
dt232 = approvedStructureElement.getUuid();
- structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg23, "Dt233", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg23, "Dt233", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
dt233 = approvedStructureElement.getUuid();
@@ -347,31 +346,31 @@ class NamesLegacyStructuresDeleteIT {
// Dt221, Dt222, Dt223
// Dt231, Dt232, Dt233
- nameElementCommandCreate = new NameElementCommandCreate(sg2, dt211, "211", description, comment);
+ nameElementCommandCreate = new NameElementCommandCreate(sg2, dt211, "211", description);
ITUtilNames.assertCreate(nameElementCommandCreate);
- nameElementCommandCreate = new NameElementCommandCreate(sg2, dt212, "212", description, comment);
+ nameElementCommandCreate = new NameElementCommandCreate(sg2, dt212, "212", description);
ITUtilNames.assertCreate(nameElementCommandCreate);
- nameElementCommandCreate = new NameElementCommandCreate(sg2, dt213, "213", description, comment);
+ nameElementCommandCreate = new NameElementCommandCreate(sg2, dt213, "213", description);
ITUtilNames.assertCreate(nameElementCommandCreate);
- nameElementCommandCreate = new NameElementCommandCreate(sys22, dt221, "221", description, comment);
+ nameElementCommandCreate = new NameElementCommandCreate(sys22, dt221, "221", description);
ITUtilNames.assertCreate(nameElementCommandCreate);
- nameElementCommandCreate = new NameElementCommandCreate(sys22, dt222, "222", description, comment);
+ nameElementCommandCreate = new NameElementCommandCreate(sys22, dt222, "222", description);
ITUtilNames.assertCreate(nameElementCommandCreate);
- nameElementCommandCreate = new NameElementCommandCreate(sys22, dt223, "223", description, comment);
+ nameElementCommandCreate = new NameElementCommandCreate(sys22, dt223, "223", description);
ITUtilNames.assertCreate(nameElementCommandCreate);
- nameElementCommandCreate = new NameElementCommandCreate(sub231, dt231, "231", description, comment);
+ nameElementCommandCreate = new NameElementCommandCreate(sub231, dt231, "231", description);
ITUtilNames.assertCreate(nameElementCommandCreate);
- nameElementCommandCreate = new NameElementCommandCreate(sub232, dt232, "232", description, comment);
+ nameElementCommandCreate = new NameElementCommandCreate(sub232, dt232, "232", description);
ITUtilNames.assertCreate(nameElementCommandCreate);
- nameElementCommandCreate = new NameElementCommandCreate(sub233, dt233, "233", description, comment);
+ nameElementCommandCreate = new NameElementCommandCreate(sub233, dt233, "233", description);
ITUtilNames.assertCreate(nameElementCommandCreate);
ITUtilStructures.assertRead("", 40);
diff --git a/src/test/java/org/openepics/names/docker/complex/NamesLegacyStructuresUpdateIT.java b/src/test/java/org/openepics/names/docker/complex/NamesLegacyStructuresUpdateIT.java
index d6724d35..01c0385a 100644
--- a/src/test/java/org/openepics/names/docker/complex/NamesLegacyStructuresUpdateIT.java
+++ b/src/test/java/org/openepics/names/docker/complex/NamesLegacyStructuresUpdateIT.java
@@ -120,10 +120,9 @@ class NamesLegacyStructuresUpdateIT {
StructureElement approvedStructureElement = null;
String description = "description";
- String comment = "comment";
// sg0
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEMGROUP, null, null, null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEMGROUP, null, null, null, description);
ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
ITUtilStructures.assertRead("", 1);
@@ -136,48 +135,48 @@ class NamesLegacyStructuresUpdateIT {
// system group
// sg0 - no mnemonic
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "Sg1", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "Sg1", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
sg1 = approvedStructureElement.getUuid();
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEM, sg1, "Sys11", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEM, sg1, "Sys11", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
sys11 = approvedStructureElement.getUuid();
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEM, sg1, "Sys12", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEM, sg1, "Sys12", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
sys12 = approvedStructureElement.getUuid();
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEM, sg1, "Sys13", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEM, sg1, "Sys13", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
sys13 = approvedStructureElement.getUuid();
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys11, "Sub111", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys11, "Sub111", null, description);
ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys11, "Sub112", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys11, "Sub112", null, description);
ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys11, "Sub113", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys11, "Sub113", null, description);
ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys12, "Sub121", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys12, "Sub121", null, description);
ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys12, "Sub122", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys12, "Sub122", null, description);
ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys12, "Sub123", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys12, "Sub123", null, description);
ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys13, "Sub131", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys13, "Sub131", null, description);
ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys13, "Sub132", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys13, "Sub132", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
sub132 = approvedStructureElement.getUuid();
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys13, "Sub133", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys13, "Sub133", null, description);
ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
ITUtilStructures.assertRead("", 14);
@@ -205,49 +204,49 @@ class NamesLegacyStructuresUpdateIT {
// Sys12-Sub121, Sys12-Sub122, Sys12-Sub123
// Sys13-Sub131, Sys13-Sub132, Sys13-Sub133
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "Sg2", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEMGROUP, null, "Sg2", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
sg2 = approvedStructureElement.getUuid();
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEM, sg2, "Sys21", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEM, sg2, "Sys21", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
sys21 = approvedStructureElement.getUuid();
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEM, sg2, "Sys22", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEM, sg2, "Sys22", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
sys22 = approvedStructureElement.getUuid();
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEM, sg2, "Sys23", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SYSTEM, sg2, "Sys23", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
sys23 = approvedStructureElement.getUuid();
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys21, "Sub211", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys21, "Sub211", null, description);
ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys21, "Sub212", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys21, "Sub212", null, description);
ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys21, "Sub213", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys21, "Sub213", null, description);
ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys22, "Sub221", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys22, "Sub221", null, description);
ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys22, "Sub222", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys22, "Sub222", null, description);
ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys22, "Sub223", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys22, "Sub223", null, description);
ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys23, "Sub231", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys23, "Sub231", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
sub231 = approvedStructureElement.getUuid();
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys23, "Sub232", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys23, "Sub232", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
sub232 = approvedStructureElement.getUuid();
- structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys23, "Sub233", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.SUBSYSTEM, sys23, "Sub233", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
sub233 = approvedStructureElement.getUuid();
@@ -275,55 +274,55 @@ class NamesLegacyStructuresUpdateIT {
// Sys22-Sub221, Sys22-Sub222, Sys22-Sub223
// Sys23-Sub231, Sys23-Sub232, Sys23-Sub233
- structureElementCommandCreate = new StructureElementCommandCreate(Type.DISCIPLINE, null, "Di2", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.DISCIPLINE, null, "Di2", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
di2 = approvedStructureElement.getUuid();
- structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICEGROUP, di2, "", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICEGROUP, di2, "", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
dg21 = approvedStructureElement.getUuid();
- structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICEGROUP, di2, "", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICEGROUP, di2, "", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
dg22 = approvedStructureElement.getUuid();
- structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICEGROUP, di2, "", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICEGROUP, di2, "", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
dg23 = approvedStructureElement.getUuid();
- structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg21, "Dt211", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg21, "Dt211", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
dt211 = approvedStructureElement.getUuid();
- structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg21, "Dt212", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg21, "Dt212", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
dt212 = approvedStructureElement.getUuid();
- structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg21, "Dt213", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg21, "Dt213", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
dt213 = approvedStructureElement.getUuid();
- structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg22, "Dt221", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg22, "Dt221", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
dt221 = approvedStructureElement.getUuid();
- structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg22, "Dt222", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg22, "Dt222", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
dt222 = approvedStructureElement.getUuid();
- structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg22, "Dt223", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg22, "Dt223", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
dt223 = approvedStructureElement.getUuid();
- structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg23, "Dt231", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg23, "Dt231", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
dt231 = approvedStructureElement.getUuid();
- structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg23, "Dt232", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg23, "Dt232", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
dt232 = approvedStructureElement.getUuid();
- structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg23, "Dt233", null, description, comment);
+ structureElementCommandCreate = new StructureElementCommandCreate(Type.DEVICETYPE, dg23, "Dt233", null, description);
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
dt233 = approvedStructureElement.getUuid();
@@ -348,31 +347,31 @@ class NamesLegacyStructuresUpdateIT {
// Dt221, Dt222, Dt223
// Dt231, Dt232, Dt233
- nameElementCommandCreate = new NameElementCommandCreate(sg2, dt211, "211", description, comment);
+ nameElementCommandCreate = new NameElementCommandCreate(sg2, dt211, "211", description);
ITUtilNames.assertCreate(nameElementCommandCreate);
- nameElementCommandCreate = new NameElementCommandCreate(sg2, dt212, "212", description, comment);
+ nameElementCommandCreate = new NameElementCommandCreate(sg2, dt212, "212", description);
ITUtilNames.assertCreate(nameElementCommandCreate);
- nameElementCommandCreate = new NameElementCommandCreate(sg2, dt213, "213", description, comment);
+ nameElementCommandCreate = new NameElementCommandCreate(sg2, dt213, "213", description);
ITUtilNames.assertCreate(nameElementCommandCreate);
- nameElementCommandCreate = new NameElementCommandCreate(sys22, dt221, "221", description, comment);
+ nameElementCommandCreate = new NameElementCommandCreate(sys22, dt221, "221", description);
ITUtilNames.assertCreate(nameElementCommandCreate);
- nameElementCommandCreate = new NameElementCommandCreate(sys22, dt222, "222", description, comment);
+ nameElementCommandCreate = new NameElementCommandCreate(sys22, dt222, "222", description);
ITUtilNames.assertCreate(nameElementCommandCreate);
- nameElementCommandCreate = new NameElementCommandCreate(sys22, dt223, "223", description, comment);
+ nameElementCommandCreate = new NameElementCommandCreate(sys22, dt223, "223", description);
ITUtilNames.assertCreate(nameElementCommandCreate);
- nameElementCommandCreate = new NameElementCommandCreate(sub231, dt231, "231", description, comment);
+ nameElementCommandCreate = new NameElementCommandCreate(sub231, dt231, "231", description);
ITUtilNames.assertCreate(nameElementCommandCreate);
- nameElementCommandCreate = new NameElementCommandCreate(sub232, dt232, "232", description, comment);
+ nameElementCommandCreate = new NameElementCommandCreate(sub232, dt232, "232", description);
ITUtilNames.assertCreate(nameElementCommandCreate);
- nameElementCommandCreate = new NameElementCommandCreate(sub233, dt233, "233", description, comment);
+ nameElementCommandCreate = new NameElementCommandCreate(sub233, dt233, "233", description);
ITUtilNames.assertCreate(nameElementCommandCreate);
ITUtilStructures.assertRead("", 40);
diff --git a/src/test/java/org/openepics/names/docker/complex/NamesMultipleIT.java b/src/test/java/org/openepics/names/docker/complex/NamesMultipleIT.java
index 42672e61..6fe8f70c 100644
--- a/src/test/java/org/openepics/names/docker/complex/NamesMultipleIT.java
+++ b/src/test/java/org/openepics/names/docker/complex/NamesMultipleIT.java
@@ -59,12 +59,12 @@ import org.testcontainers.junit.jupiter.Testcontainers;
class NamesMultipleIT {
// names for each of
- // system group + description + comment
- // system group + device type + index + description + comment
- // system + description + comment
- // system + device type + index + description + comment
- // subsystem + description + comment
- // subsystem + device type + index + description + comment
+ // system group + description
+ // system group + device type + index + description
+ // system + description
+ // system + device type + index + description
+ // subsystem + description
+ // subsystem + device type + index + description
@Container
public static final ComposeContainer ENVIRONMENT = ITUtil.defaultComposeContainers();
@@ -86,43 +86,37 @@ class NamesMultipleIT {
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEMGROUP, null,
- "Acc", null,
- "Accelerator. The ESS Linear Accelerator", "approved by alfio");
+ "Acc", null, "Accelerator. The ESS Linear Accelerator");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
systemGroupAcc = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEM, systemGroupAcc,
- "RFQ", null,
- "Radio Frequency Quadrupole", "empty");
+ "RFQ", null, "Radio Frequency Quadrupole");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
systemRFQ = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemRFQ,
- "010PRL", null,
- "01 Phase Reference Line", "Approved by Daniel Piso");
+ "010PRL", null, "01 Phase Reference Line");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
subsystem010PRL = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
- "Cryo", null,
- "Cryogenics", "empty");
+ "Cryo", null, "Cryogenics");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
disciplineCryo = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, disciplineCryo,
- null, null,
- "empty", "empty");
+ null, null, "empty");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceGroupCryo = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupCryo,
- "FS", null,
- "Flow Switch", "empty");
+ "FS", null, "Flow Switch");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceType_Cryo_FS = approvedStructureElement.getUuid();
}
@@ -158,15 +152,15 @@ class NamesMultipleIT {
String value = null;
nameElementCommands = new NameElementCommand[] {
- new NameElementCommand(null, systemGroupAcc, deviceType_Cryo_FS, "011", "checkCreate 1.3.011", "checkCreate 1.3.011"),
- new NameElementCommand(null, systemGroupAcc, deviceType_Cryo_FS, "012", "checkCreate 1.3.012", "checkCreate 1.3.012"),
- new NameElementCommand(null, systemGroupAcc, deviceType_Cryo_FS, "013", "checkCreate 1.3.013", "checkCreate 1.3.013"),
- new NameElementCommand(null, systemRFQ, deviceType_Cryo_FS, "011", "checkCreate 2.3.011", "checkCreate 2.3.011"),
- new NameElementCommand(null, systemRFQ, deviceType_Cryo_FS, "012", "checkCreate 2.3.012", "checkCreate 2.3.012"),
- new NameElementCommand(null, systemRFQ, deviceType_Cryo_FS, "013", "checkCreate 2.3.013", "checkCreate 2.3.013"),
- new NameElementCommand(null, subsystem010PRL, deviceType_Cryo_FS, "011", "checkCreate 3.3.011", "checkCreate 3.3.011"),
- new NameElementCommand(null, subsystem010PRL, deviceType_Cryo_FS, "012", "checkCreate 3.3.012", "checkCreate 3.3.012"),
- new NameElementCommand(null, subsystem010PRL, deviceType_Cryo_FS, "013", "checkCreate 3.3.013", "checkCreate 3.3.013")
+ new NameElementCommand(null, systemGroupAcc, deviceType_Cryo_FS, "011", "checkCreate 1.3.011"),
+ new NameElementCommand(null, systemGroupAcc, deviceType_Cryo_FS, "012", "checkCreate 1.3.012"),
+ new NameElementCommand(null, systemGroupAcc, deviceType_Cryo_FS, "013", "checkCreate 1.3.013"),
+ new NameElementCommand(null, systemRFQ, deviceType_Cryo_FS, "011", "checkCreate 2.3.011"),
+ new NameElementCommand(null, systemRFQ, deviceType_Cryo_FS, "012", "checkCreate 2.3.012"),
+ new NameElementCommand(null, systemRFQ, deviceType_Cryo_FS, "013", "checkCreate 2.3.013"),
+ new NameElementCommand(null, subsystem010PRL, deviceType_Cryo_FS, "011", "checkCreate 3.3.011"),
+ new NameElementCommand(null, subsystem010PRL, deviceType_Cryo_FS, "012", "checkCreate 3.3.012"),
+ new NameElementCommand(null, subsystem010PRL, deviceType_Cryo_FS, "013", "checkCreate 3.3.013")
};
nameElementCommandsCreate = NameElementUtil.convertCommand2CommandCreate(nameElementCommands);
nameElementCommandsUpdate = NameElementUtil.convertCommand2CommandUpdate(nameElementCommands);
@@ -202,12 +196,6 @@ class NamesMultipleIT {
ITUtilNames.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.FALSE);
nameElementCommandsCreate[3].setDescription(value);
ITUtilNames.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.TRUE);
-
- value = nameElementCommandsCreate[3].getComment();
- nameElementCommandsCreate[3].setComment(null);
- ITUtilNames.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.FALSE);
- nameElementCommandsCreate[3].setComment(value);
- ITUtilNames.assertValidate(nameElementCommandsCreate, NameCommand.CREATE, Boolean.TRUE);
} catch (Exception e) {
fail();
}
@@ -237,16 +225,16 @@ class NamesMultipleIT {
int nbrNames = -1;
nameElementCommands = new NameElementCommand[] {
- new NameElementCommand(null, systemGroupAcc, null, null, "create 1.0.0", "create 1.0.0"),
- new NameElementCommand(null, systemGroupAcc, deviceType_Cryo_FS, "021", "create 1.3.021", "create 1.3.021"),
- new NameElementCommand(null, systemGroupAcc, deviceType_Cryo_FS, "022", "create 1.3.022", "create 1.3.022"),
- new NameElementCommand(null, systemGroupAcc, deviceType_Cryo_FS, "023", "create 1.3.023", "create 1.3.023"),
- new NameElementCommand(null, systemRFQ, deviceType_Cryo_FS, "021", "create 2.3.021", "create 2.3.021"),
- new NameElementCommand(null, systemRFQ, deviceType_Cryo_FS, "022", "create 2.3.022", "create 2.3.022"),
- new NameElementCommand(null, systemRFQ, deviceType_Cryo_FS, "023", "create 2.3.023", "create 2.3.023"),
- new NameElementCommand(null, subsystem010PRL, deviceType_Cryo_FS, "021", "create 3.3.021", "create 3.3.021"),
- new NameElementCommand(null, subsystem010PRL, deviceType_Cryo_FS, "022", "create 3.3.022", "create 3.3.022"),
- new NameElementCommand(null, subsystem010PRL, deviceType_Cryo_FS, "023", "create 3.3.023", "create 3.3.023")
+ new NameElementCommand(null, systemGroupAcc, null, null, "create 1.0.0"),
+ new NameElementCommand(null, systemGroupAcc, deviceType_Cryo_FS, "021", "create 1.3.021"),
+ new NameElementCommand(null, systemGroupAcc, deviceType_Cryo_FS, "022", "create 1.3.022"),
+ new NameElementCommand(null, systemGroupAcc, deviceType_Cryo_FS, "023", "create 1.3.023"),
+ new NameElementCommand(null, systemRFQ, deviceType_Cryo_FS, "021", "create 2.3.021"),
+ new NameElementCommand(null, systemRFQ, deviceType_Cryo_FS, "022", "create 2.3.022"),
+ new NameElementCommand(null, systemRFQ, deviceType_Cryo_FS, "023", "create 2.3.023"),
+ new NameElementCommand(null, subsystem010PRL, deviceType_Cryo_FS, "021", "create 3.3.021"),
+ new NameElementCommand(null, subsystem010PRL, deviceType_Cryo_FS, "022", "create 3.3.022"),
+ new NameElementCommand(null, subsystem010PRL, deviceType_Cryo_FS, "023", "create 3.3.023")
};
nameElementCommandsCreate = NameElementUtil.convertCommand2CommandCreate(nameElementCommands);
nameElementCommandsUpdate = NameElementUtil.convertCommand2CommandUpdate(nameElementCommands);
@@ -325,15 +313,15 @@ class NamesMultipleIT {
String value = null;
nameElementCommands = new NameElementCommand[] {
- new NameElementCommand(null, systemGroupAcc, deviceType_Cryo_FS, "031", "checkUpdate 1.3.031", "checkUpdate 1.3.031"),
- new NameElementCommand(null, systemGroupAcc, deviceType_Cryo_FS, "032", "checkUpdate 1.3.032", "checkUpdate 1.3.032"),
- new NameElementCommand(null, systemGroupAcc, deviceType_Cryo_FS, "033", "checkUpdate 1.3.033", "checkUpdate 1.3.033"),
- new NameElementCommand(null, systemRFQ, deviceType_Cryo_FS, "031", "checkUpdate 2.3.031", "checkUpdate 2.3.031"),
- new NameElementCommand(null, systemRFQ, deviceType_Cryo_FS, "032", "checkUpdate 2.3.032", "checkUpdate 2.3.032"),
- new NameElementCommand(null, systemRFQ, deviceType_Cryo_FS, "033", "checkUpdate 2.3.033", "checkUpdate 2.3.033"),
- new NameElementCommand(null, subsystem010PRL, deviceType_Cryo_FS, "031", "checkUpdate 3.3.031", "checkUpdate 3.3.031"),
- new NameElementCommand(null, subsystem010PRL, deviceType_Cryo_FS, "032", "checkUpdate 3.3.032", "checkUpdate 3.3.032"),
- new NameElementCommand(null, subsystem010PRL, deviceType_Cryo_FS, "033", "checkUpdate 3.3.033", "checkUpdate 3.3.033")
+ new NameElementCommand(null, systemGroupAcc, deviceType_Cryo_FS, "031", "checkUpdate 1.3.031"),
+ new NameElementCommand(null, systemGroupAcc, deviceType_Cryo_FS, "032", "checkUpdate 1.3.032"),
+ new NameElementCommand(null, systemGroupAcc, deviceType_Cryo_FS, "033", "checkUpdate 1.3.033"),
+ new NameElementCommand(null, systemRFQ, deviceType_Cryo_FS, "031", "checkUpdate 2.3.031"),
+ new NameElementCommand(null, systemRFQ, deviceType_Cryo_FS, "032", "checkUpdate 2.3.032"),
+ new NameElementCommand(null, systemRFQ, deviceType_Cryo_FS, "033", "checkUpdate 2.3.033"),
+ new NameElementCommand(null, subsystem010PRL, deviceType_Cryo_FS, "031", "checkUpdate 3.3.031"),
+ new NameElementCommand(null, subsystem010PRL, deviceType_Cryo_FS, "032", "checkUpdate 3.3.032"),
+ new NameElementCommand(null, subsystem010PRL, deviceType_Cryo_FS, "033", "checkUpdate 3.3.033")
};
nameElementCommandsCreate = NameElementUtil.convertCommand2CommandCreate(nameElementCommands);
nameElementCommandsUpdate = NameElementUtil.convertCommand2CommandUpdate(nameElementCommands);
@@ -393,12 +381,6 @@ class NamesMultipleIT {
ITUtilNames.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.FALSE);
nameElementCommandsUpdate[3].setDescription(value);
ITUtilNames.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.TRUE);
-
- value = nameElementCommandsUpdate[3].getComment();
- nameElementCommandsUpdate[3].setComment(null);
- ITUtilNames.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.FALSE);
- nameElementCommandsUpdate[3].setComment(value);
- ITUtilNames.assertValidate(nameElementCommandsUpdate, NameCommand.UPDATE, Boolean.TRUE);
}
@Test
@@ -427,16 +409,16 @@ class NamesMultipleIT {
int nbrNames = -1;
nameElementCommands = new NameElementCommand[] {
- new NameElementCommand(null, systemGroupAcc, deviceType_Cryo_FS, "041", "update 1.3.041", "update 1.3.041"),
- new NameElementCommand(null, systemGroupAcc, deviceType_Cryo_FS, "042", "update 1.3.042", "update 1.3.042"),
- new NameElementCommand(null, systemGroupAcc, deviceType_Cryo_FS, "043", "update 1.3.043", "update 1.3.043"),
- new NameElementCommand(null, systemRFQ, null, null, "update 2.0.0", "update 2.0.0"),
- new NameElementCommand(null, systemRFQ, deviceType_Cryo_FS, "041", "update 2.3.041", "update 2.3.041"),
- new NameElementCommand(null, systemRFQ, deviceType_Cryo_FS, "042", "update 2.3.042", "update 2.3.042"),
- new NameElementCommand(null, systemRFQ, deviceType_Cryo_FS, "043", "update 2.3.043", "update 2.3.043"),
- new NameElementCommand(null, subsystem010PRL, deviceType_Cryo_FS, "041", "update 3.3.041", "update 3.3.041"),
- new NameElementCommand(null, subsystem010PRL, deviceType_Cryo_FS, "042", "update 3.3.042", "update 3.3.042"),
- new NameElementCommand(null, subsystem010PRL, deviceType_Cryo_FS, "043", "update 3.3.043", "update 3.3.043")
+ new NameElementCommand(null, systemGroupAcc, deviceType_Cryo_FS, "041", "update 1.3.041"),
+ new NameElementCommand(null, systemGroupAcc, deviceType_Cryo_FS, "042", "update 1.3.042"),
+ new NameElementCommand(null, systemGroupAcc, deviceType_Cryo_FS, "043", "update 1.3.043"),
+ new NameElementCommand(null, systemRFQ, null, null, "update 2.0.0"),
+ new NameElementCommand(null, systemRFQ, deviceType_Cryo_FS, "041", "update 2.3.041"),
+ new NameElementCommand(null, systemRFQ, deviceType_Cryo_FS, "042", "update 2.3.042"),
+ new NameElementCommand(null, systemRFQ, deviceType_Cryo_FS, "043", "update 2.3.043"),
+ new NameElementCommand(null, subsystem010PRL, deviceType_Cryo_FS, "041", "update 3.3.041"),
+ new NameElementCommand(null, subsystem010PRL, deviceType_Cryo_FS, "042", "update 3.3.042"),
+ new NameElementCommand(null, subsystem010PRL, deviceType_Cryo_FS, "043", "update 3.3.043")
};
nameElementCommandsCreate = NameElementUtil.convertCommand2CommandCreate(nameElementCommands);
nameElementCommandsUpdate = NameElementUtil.convertCommand2CommandUpdate(nameElementCommands);
@@ -535,7 +517,6 @@ class NamesMultipleIT {
// create in order to delete
// validate delete
// uuid
- // comment
NameElementCommandCreate[] nameElementCommandsCreate = null;
NameElementCommandUpdate[] nameElementCommandsUpdate = null;
@@ -544,18 +525,17 @@ class NamesMultipleIT {
NameElement[] createdNameElements = null;
int nbrNames = -1;
UUID uuid = null;
- String value = null;
nameElementCommands = new NameElementCommand[] {
- new NameElementCommand(null, systemGroupAcc, deviceType_Cryo_FS, "051", "checkDelete 1.3.051", "checkDelete 1.3.051"),
- new NameElementCommand(null, systemGroupAcc, deviceType_Cryo_FS, "052", "checkDelete 1.3.052", "checkDelete 1.3.052"),
- new NameElementCommand(null, systemGroupAcc, deviceType_Cryo_FS, "053", "checkDelete 1.3.053", "checkDelete 1.3.053"),
- new NameElementCommand(null, systemRFQ, deviceType_Cryo_FS, "051", "checkDelete 2.3.051", "checkDelete 2.3.051"),
- new NameElementCommand(null, systemRFQ, deviceType_Cryo_FS, "052", "checkDelete 2.3.052", "checkDelete 2.3.052"),
- new NameElementCommand(null, systemRFQ, deviceType_Cryo_FS, "053", "checkDelete 2.3.053", "checkDelete 2.3.053"),
- new NameElementCommand(null, subsystem010PRL, deviceType_Cryo_FS, "051", "checkDelete 3.3.051", "checkDelete 3.3.051"),
- new NameElementCommand(null, subsystem010PRL, deviceType_Cryo_FS, "052", "checkDelete 3.3.052", "checkDelete 3.3.052"),
- new NameElementCommand(null, subsystem010PRL, deviceType_Cryo_FS, "053", "checkDelete 3.3.053", "checkDelete 3.3.053")
+ new NameElementCommand(null, systemGroupAcc, deviceType_Cryo_FS, "051", "checkDelete 1.3.051"),
+ new NameElementCommand(null, systemGroupAcc, deviceType_Cryo_FS, "052", "checkDelete 1.3.052"),
+ new NameElementCommand(null, systemGroupAcc, deviceType_Cryo_FS, "053", "checkDelete 1.3.053"),
+ new NameElementCommand(null, systemRFQ, deviceType_Cryo_FS, "051", "checkDelete 2.3.051"),
+ new NameElementCommand(null, systemRFQ, deviceType_Cryo_FS, "052", "checkDelete 2.3.052"),
+ new NameElementCommand(null, systemRFQ, deviceType_Cryo_FS, "053", "checkDelete 2.3.053"),
+ new NameElementCommand(null, subsystem010PRL, deviceType_Cryo_FS, "051", "checkDelete 3.3.051"),
+ new NameElementCommand(null, subsystem010PRL, deviceType_Cryo_FS, "052", "checkDelete 3.3.052"),
+ new NameElementCommand(null, subsystem010PRL, deviceType_Cryo_FS, "053", "checkDelete 3.3.053")
};
nameElementCommandsCreate = NameElementUtil.convertCommand2CommandCreate(nameElementCommands);
nameElementCommandsUpdate = NameElementUtil.convertCommand2CommandUpdate(nameElementCommands);
@@ -592,12 +572,6 @@ class NamesMultipleIT {
ITUtilNames.assertValidate(nameElementCommandsConfirm, NameCommand.DELETE, Boolean.FALSE);
nameElementCommandsConfirm[3].setUuid(uuid);
ITUtilNames.assertValidate(nameElementCommandsConfirm, NameCommand.DELETE, Boolean.TRUE);
-
- value = nameElementCommandsConfirm[3].getComment();
- nameElementCommandsConfirm[3].setComment(null);
- ITUtilNames.assertValidate(nameElementCommandsConfirm, NameCommand.DELETE, Boolean.FALSE);
- nameElementCommandsConfirm[3].setComment(value);
- ITUtilNames.assertValidate(nameElementCommandsConfirm, NameCommand.DELETE, Boolean.TRUE);
}
@Test
@@ -618,12 +592,12 @@ class NamesMultipleIT {
// create in order to delete
//
// names for each of
- // system group + description + comment
- // system group + device type + index + description + comment
- // system + description + comment
- // system + device type + index + description + comment
- // subsystem + description + comment
- // subsystem + device type + index + description + comment
+ // system group + description
+ // system group + device type + index + description
+ // system + description
+ // system + device type + index + description
+ // subsystem + description
+ // subsystem + device type + index + description
NameElementCommandCreate[] nameElementCommandsCreate = null;
NameElementCommandUpdate[] nameElementCommandsUpdate = null;
@@ -633,16 +607,16 @@ class NamesMultipleIT {
int nbrNames = -1;
nameElementCommands = new NameElementCommand[] {
- new NameElementCommand(null, systemGroupAcc, deviceType_Cryo_FS, "061", "delete 1.3.061", "delete 1.3.061"),
- new NameElementCommand(null, systemGroupAcc, deviceType_Cryo_FS, "062", "delete 1.3.062", "delete 1.3.062"),
- new NameElementCommand(null, systemGroupAcc, deviceType_Cryo_FS, "063", "delete 1.3.063", "delete 1.3.063"),
- new NameElementCommand(null, systemRFQ, deviceType_Cryo_FS, "061", "delete 2.3.061", "delete 2.3.061"),
- new NameElementCommand(null, systemRFQ, deviceType_Cryo_FS, "062", "delete 2.3.062", "delete 2.3.062"),
- new NameElementCommand(null, systemRFQ, deviceType_Cryo_FS, "063", "delete 2.3.063", "delete 2.3.063"),
- new NameElementCommand(null, subsystem010PRL, null, null, "delete 3.0.0", "delete 3.0.0"),
- new NameElementCommand(null, subsystem010PRL, deviceType_Cryo_FS, "061", "delete 3.3.061", "delete 3.3.061"),
- new NameElementCommand(null, subsystem010PRL, deviceType_Cryo_FS, "062", "delete 3.3.062", "delete 3.3.062"),
- new NameElementCommand(null, subsystem010PRL, deviceType_Cryo_FS, "063", "delete 3.3.063", "delete 3.3.063")
+ new NameElementCommand(null, systemGroupAcc, deviceType_Cryo_FS, "061", "delete 1.3.061"),
+ new NameElementCommand(null, systemGroupAcc, deviceType_Cryo_FS, "062", "delete 1.3.062"),
+ new NameElementCommand(null, systemGroupAcc, deviceType_Cryo_FS, "063", "delete 1.3.063"),
+ new NameElementCommand(null, systemRFQ, deviceType_Cryo_FS, "061", "delete 2.3.061"),
+ new NameElementCommand(null, systemRFQ, deviceType_Cryo_FS, "062", "delete 2.3.062"),
+ new NameElementCommand(null, systemRFQ, deviceType_Cryo_FS, "063", "delete 2.3.063"),
+ new NameElementCommand(null, subsystem010PRL, null, null, "delete 3.0.0"),
+ new NameElementCommand(null, subsystem010PRL, deviceType_Cryo_FS, "061", "delete 3.3.061"),
+ new NameElementCommand(null, subsystem010PRL, deviceType_Cryo_FS, "062", "delete 3.3.062"),
+ new NameElementCommand(null, subsystem010PRL, deviceType_Cryo_FS, "063", "delete 3.3.063")
};
nameElementCommandsCreate = NameElementUtil.convertCommand2CommandCreate(nameElementCommands);
nameElementCommandsUpdate = NameElementUtil.convertCommand2CommandUpdate(nameElementCommands);
diff --git a/src/test/java/org/openepics/names/docker/complex/StructuresLevel3IT.java b/src/test/java/org/openepics/names/docker/complex/StructuresLevel3IT.java
index e46f713d..99fa99b5 100644
--- a/src/test/java/org/openepics/names/docker/complex/StructuresLevel3IT.java
+++ b/src/test/java/org/openepics/names/docker/complex/StructuresLevel3IT.java
@@ -134,15 +134,13 @@ class StructuresLevel3IT {
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEMGROUP, null,
- "Acc", null,
- "Accelerator. The ESS Linear Accelerator", "approved by alfio");
+ "Acc", null, "Accelerator. The ESS Linear Accelerator");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
systemGroupAcc = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEM, systemGroupAcc,
- "RFQ", null,
- "Radio Frequency Quadrupole", "empty");
+ "RFQ", null, "Radio Frequency Quadrupole");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
systemRFQ = approvedStructureElement.getUuid();
@@ -150,57 +148,49 @@ class StructuresLevel3IT {
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
- "Cryo", null,
- "Cryogenics", "empty");
+ "Cryo", null, "Cryogenics");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
disciplineCryo = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
- "EMR", null,
- "Electromagnetic Resonators", "empty");
+ "EMR", null, "Electromagnetic Resonators");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
disciplineEMR = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
- "HVAC", null,
- "Heating, Cooling and Air Conditioning", "empty");
+ "HVAC", null, "Heating, Cooling and Air Conditioning");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
disciplineHVAC = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
- "Proc", null,
- "General Process Control", "empty");
+ "Proc", null, "General Process Control");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
disciplineProc = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
- "SC", null,
- "Software Controllers", "empty");
+ "SC", null, "Software Controllers");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
disciplineSC = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
- "Vac", null,
- "Vacuum", "empty");
+ "Vac", null, "Vacuum");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
disciplineVac = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
- "WtrC", null,
- "Water Cooling", "empty");
+ "WtrC", null, "Water Cooling");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
disciplineWtrC = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
- "BMD", null,
- "Beam Magnets and Deflectors", "empty");
+ "BMD", null, "Beam Magnets and Deflectors");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
disciplineBMD = approvedStructureElement.getUuid();
@@ -208,57 +198,49 @@ class StructuresLevel3IT {
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, disciplineCryo,
- null, null,
- "empty", "empty");
+ null, null, "empty");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceGroupCryo = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, disciplineEMR,
- null, null,
- "empty", "empty");
+ null, null, "empty");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceGroupEMR = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, disciplineHVAC,
- null, null,
- "empty", "empty");
+ null, null, "empty");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceGroupHVAC = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, disciplineProc,
- null, null,
- "empty", "empty");
+ null, null, "empty");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceGroupProc = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, disciplineSC,
- null, null,
- "empty", "empty");
+ null, null, "empty");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceGroupSC = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, disciplineVac,
- null, null,
- "empty", "empty");
+ null, null, "empty");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceGroupVac = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, disciplineWtrC,
- null, null,
- "empty", "empty");
+ null, null, "empty");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceGroupWtrC = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, disciplineBMD,
- null, null,
- "empty", "empty");
+ null, null, "empty");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceGroupBMD = approvedStructureElement.getUuid();
}
@@ -295,20 +277,17 @@ class StructuresLevel3IT {
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemRFQ,
- "010PRL", null,
- "01 Phase Reference Line", "Approved by Daniel Piso");
+ "010PRL", null, "01 Phase Reference Line");
createdStructureElement_010PRL = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemRFQ,
- "010", null,
- "RFQ-010", "Approved by Daniel Piso");
+ "010", null, "RFQ-010");
createdStructureElement_010 = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemRFQ,
- "N1U1", null,
- "Power switch board 01. Electrical power cabinets", "Approved by Daniel Piso");
+ "N1U1", null, "Power switch board 01. Electrical power cabinets");
createdStructureElement_N1U1 = ITUtilStructures.assertCreate(structureElementCommandCreate);
approvedStructureElement = ITUtilStructures.assertApprove(StructureElementUtil.convertElement2CommandConfirm(createdStructureElement_010PRL));
@@ -393,208 +372,176 @@ class StructuresLevel3IT {
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupCryo,
- "FS", null,
- "Flow Switch", "empty");
+ "FS", null, "Flow Switch");
createdStructureElement_Cryo_FS = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupCryo,
- "IOC", null,
- "Input Output Controller", "empty");
+ "IOC", null, "Input Output Controller");
createdStructureElement_Cryo_IOC = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupCryo,
- "RFA", null,
- "RF Antenna", "empty");
+ "RFA", null, "RF Antenna");
createdStructureElement_Cryo_RFA = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupCryo,
- "TT", null,
- "Temperature Transmitter", "empty");
+ "TT", null, "Temperature Transmitter");
createdStructureElement_Cryo_TT = ITUtilStructures.assertCreate(structureElementCommandCreate);
// ----------------------------------------------------------------------------------------------------
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupEMR,
- "FS", null,
- "Flow Switch", "empty");
+ "FS", null, "Flow Switch");
createdStructureElement_EMR_FS = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupEMR,
- "IOC", null,
- "Input Output Controller", "empty");
+ "IOC", null, "Input Output Controller");
createdStructureElement_EMR_IOC = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupEMR,
- "RFA", null,
- "RF Antenna", "empty");
+ "RFA", null, "RF Antenna");
createdStructureElement_EMR_RFA = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupEMR,
- "TT", null,
- "Temperature Transmitter", "empty");
+ "TT", null, "Temperature Transmitter");
createdStructureElement_EMR_TT = ITUtilStructures.assertCreate(structureElementCommandCreate);
// ----------------------------------------------------------------------------------------------------
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupHVAC,
- "FS", null,
- "Flow Switch", "empty");
+ "FS", null, "Flow Switch");
createdStructureElement_HVAC_FS = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupHVAC,
- "IOC", null,
- "Input Output Controller", "empty");
+ "IOC", null, "Input Output Controller");
createdStructureElement_HVAC_IOC = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupHVAC,
- "RFA", null,
- "RF Antenna", "empty");
+ "RFA", null, "RF Antenna");
createdStructureElement_HVAC_RFA = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupHVAC,
- "TT", null,
- "Temperature Transmitter", "empty");
+ "TT", null, "Temperature Transmitter");
createdStructureElement_HVAC_TT = ITUtilStructures.assertCreate(structureElementCommandCreate);
// ----------------------------------------------------------------------------------------------------
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupProc,
- "FS", null,
- "Flow Switch", "empty");
+ "FS", null, "Flow Switch");
createdStructureElement_Proc_FS = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupProc,
- "IOC", null,
- "Input Output Controller", "empty");
+ "IOC", null, "Input Output Controller");
createdStructureElement_Proc_IOC = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupProc,
- "RFA", null,
- "RF Antenna", "empty");
+ "RFA", null, "RF Antenna");
createdStructureElement_Proc_RFA = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupProc,
- "TT", null,
- "Temperature Transmitter", "empty");
+ "TT", null, "Temperature Transmitter");
createdStructureElement_Proc_TT = ITUtilStructures.assertCreate(structureElementCommandCreate);
// ----------------------------------------------------------------------------------------------------
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupSC,
- "FS", null,
- "Flow Switch", "empty");
+ "FS", null, "Flow Switch");
createdStructureElement_SC_FS = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupSC,
- "IOC", null,
- "Input Output Controller", "empty");
+ "IOC", null, "Input Output Controller");
createdStructureElement_SC_IOC = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupSC,
- "RFA", null,
- "RF Antenna", "empty");
+ "RFA", null, "RF Antenna");
createdStructureElement_SC_RFA = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupSC,
- "TT", null,
- "Temperature Transmitter", "empty");
+ "TT", null, "Temperature Transmitter");
createdStructureElement_SC_TT = ITUtilStructures.assertCreate(structureElementCommandCreate);
// ----------------------------------------------------------------------------------------------------
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupVac,
- "FS", null,
- "Flow Switch", "empty");
+ "FS", null, "Flow Switch");
createdStructureElement_Vac_FS = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupVac,
- "IOC", null,
- "Input Output Controller", "empty");
+ "IOC", null, "Input Output Controller");
createdStructureElement_Vac_IOC = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupVac,
- "RFA", null,
- "RF Antenna", "empty");
+ "RFA", null, "RF Antenna");
createdStructureElement_Vac_RFA = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupVac,
- "TT", null,
- "Temperature Transmitter", "empty");
+ "TT", null, "Temperature Transmitter");
createdStructureElement_Vac_TT = ITUtilStructures.assertCreate(structureElementCommandCreate);
// ----------------------------------------------------------------------------------------------------
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupWtrC,
- "FS", null,
- "Flow Switch", "empty");
+ "FS", null, "Flow Switch");
createdStructureElement_WtrC_FS = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupWtrC,
- "IOC", null,
- "Input Output Controller", "empty");
+ "IOC", null, "Input Output Controller");
createdStructureElement_WtrC_IOC = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupWtrC,
- "RFA", null,
- "RF Antenna", "empty");
+ "RFA", null, "RF Antenna");
createdStructureElement_WtrC_RFA = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupWtrC,
- "TT", null,
- "Temperature Transmitter", "empty");
+ "TT", null, "Temperature Transmitter");
createdStructureElement_WtrC_TT = ITUtilStructures.assertCreate(structureElementCommandCreate);
// ----------------------------------------------------------------------------------------------------
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupBMD,
- "FS", null,
- "Flow Switch", "empty");
+ "FS", null, "Flow Switch");
createdStructureElement_BMD_FS = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupBMD,
- "IOC", null,
- "Input Output Controller", "empty");
+ "IOC", null, "Input Output Controller");
createdStructureElement_BMD_IOC = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupBMD,
- "RFA", null,
- "RF Antenna", "empty");
+ "RFA", null, "RF Antenna");
createdStructureElement_BMD_RFA = ITUtilStructures.assertCreate(structureElementCommandCreate);
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupBMD,
- "TT", null,
- "Temperature Transmitter", "empty");
+ "TT", null, "Temperature Transmitter");
createdStructureElement_BMD_TT = ITUtilStructures.assertCreate(structureElementCommandCreate);
// ----------------------------------------------------------------------------------------------------
diff --git a/src/test/java/org/openepics/names/docker/complex/StructuresMultipleIT.java b/src/test/java/org/openepics/names/docker/complex/StructuresMultipleIT.java
index 278063ed..ecfcf0de 100644
--- a/src/test/java/org/openepics/names/docker/complex/StructuresMultipleIT.java
+++ b/src/test/java/org/openepics/names/docker/complex/StructuresMultipleIT.java
@@ -76,43 +76,37 @@ class StructuresMultipleIT {
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEMGROUP, null,
- "Sg", null,
- "description", "comment");
+ "Sg", null, "description");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
systemGroupUuid = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SYSTEM, systemGroupUuid,
- "Sys", null,
- "description", "comment");
+ "Sys", null, "description");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
systemUuid = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.SUBSYSTEM, systemUuid,
- "Sub", null,
- "description", "comment");
+ "Sub", null, "description");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
subsystemUuid = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DISCIPLINE, null,
- "Di", null,
- "description", "comment");
+ "Di", null, "description");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
disciplineUuid = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICEGROUP, disciplineUuid,
- null, null,
- "description", "comment");
+ null, null, "description");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceGroupUuid = approvedStructureElement.getUuid();
structureElementCommandCreate = new StructureElementCommandCreate(
Type.DEVICETYPE, deviceGroupUuid,
- "Dt", null,
- "description", "comment");
+ "Dt", null, "description");
approvedStructureElement = ITUtilStructures.assertCreateApprove(structureElementCommandCreate);
deviceTypeUuid = approvedStructureElement.getUuid();
}
@@ -142,7 +136,6 @@ class StructuresMultipleIT {
// name
// mnemonic
// description
- // comment
try {
StructureElementCommandCreate[] structureElementCommandsCreate = null;
@@ -182,12 +175,12 @@ class StructuresMultipleIT {
ITUtilStructures.assertIsValidToCreate(Type.DEVICETYPE, "Di-DtChc", Boolean.TRUE);
structureElementCommands = new StructureElementCommand[] {
- new StructureElementCommand(null, Type.SYSTEMGROUP, null, "SgChc", null, "description", "comment"),
- new StructureElementCommand(null, Type.SYSTEM, systemGroupUuid, "SysChc", null, "description", "comment"),
- new StructureElementCommand(null, Type.SUBSYSTEM, systemUuid, "SubChc", null, "description", "comment"),
- new StructureElementCommand(null, Type.DISCIPLINE, null, "DiChc", null, "description", "comment"),
- new StructureElementCommand(null, Type.DEVICEGROUP, disciplineUuid, "", null, "description", "comment"),
- new StructureElementCommand(null, Type.DEVICETYPE, deviceGroupUuid, "DtChc", null, "description", "comment")
+ new StructureElementCommand(null, Type.SYSTEMGROUP, null, "SgChc", null, "description"),
+ new StructureElementCommand(null, Type.SYSTEM, systemGroupUuid, "SysChc", null, "description"),
+ new StructureElementCommand(null, Type.SUBSYSTEM, systemUuid, "SubChc", null, "description"),
+ new StructureElementCommand(null, Type.DISCIPLINE, null, "DiChc", null, "description"),
+ new StructureElementCommand(null, Type.DEVICEGROUP, disciplineUuid, "", null, "description"),
+ new StructureElementCommand(null, Type.DEVICETYPE, deviceGroupUuid, "DtChc", null, "description")
};
structureElementCommandsCreate = StructureElementUtil.convertCommand2CommandCreate(structureElementCommands);
structureElementCommandsUpdate = StructureElementUtil.convertCommand2CommandUpdate(structureElementCommands);
@@ -223,12 +216,6 @@ class StructuresMultipleIT {
ITUtilStructures.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
structureElementCommandsCreate[1].setDescription(value);
ITUtilStructures.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.TRUE);
-
- value = structureElementCommandsCreate[1].getComment();
- structureElementCommandsCreate[1].setComment(null);
- ITUtilStructures.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.FALSE);
- structureElementCommandsCreate[1].setComment(value);
- ITUtilStructures.assertValidate(structureElementCommandsCreate, StructureCommand.CREATE, Boolean.TRUE);
} catch (Exception e) {
fail();
}
@@ -259,12 +246,12 @@ class StructuresMultipleIT {
StructureElement[] approvedStructureElements = null;
structureElementCommands = new StructureElementCommand[] {
- new StructureElementCommand(null, Type.SYSTEMGROUP, null, "SgCa", null, "description", "comment"),
- new StructureElementCommand(null, Type.SYSTEM, systemGroupUuid, "SysCa", null, "description", "comment"),
- new StructureElementCommand(null, Type.SUBSYSTEM, systemUuid, "SubCa", null, "description", "comment"),
- new StructureElementCommand(null, Type.DISCIPLINE, null, "DiCa", null, "description", "comment"),
- new StructureElementCommand(null, Type.DEVICEGROUP, disciplineUuid, "", null, "description", "comment"),
- new StructureElementCommand(null, Type.DEVICETYPE, deviceGroupUuid, "DtCa", null, "description", "comment")
+ new StructureElementCommand(null, Type.SYSTEMGROUP, null, "SgCa", null, "description"),
+ new StructureElementCommand(null, Type.SYSTEM, systemGroupUuid, "SysCa", null, "description"),
+ new StructureElementCommand(null, Type.SUBSYSTEM, systemUuid, "SubCa", null, "description"),
+ new StructureElementCommand(null, Type.DISCIPLINE, null, "DiCa", null, "description"),
+ new StructureElementCommand(null, Type.DEVICEGROUP, disciplineUuid, "", null, "description"),
+ new StructureElementCommand(null, Type.DEVICETYPE, deviceGroupUuid, "DtCa", null, "description")
};
structureElementCommandsCreate = StructureElementUtil.convertCommand2CommandCreate(structureElementCommands);
structureElementCommandsUpdate = StructureElementUtil.convertCommand2CommandUpdate(structureElementCommands);
@@ -370,12 +357,12 @@ class StructuresMultipleIT {
StructureElement[] cancelledStructureElements = null;
structureElementCommands = new StructureElementCommand[] {
- new StructureElementCommand(null, Type.SYSTEMGROUP, null, "SgCc", null, "description", "comment"),
- new StructureElementCommand(null, Type.SYSTEM, systemGroupUuid, "SysCc", null, "description", "comment"),
- new StructureElementCommand(null, Type.SUBSYSTEM, systemUuid, "SubCc", null, "description", "comment"),
- new StructureElementCommand(null, Type.DISCIPLINE, null, "DiCc", null, "description", "comment"),
- new StructureElementCommand(null, Type.DEVICEGROUP, disciplineUuid, "", null, "description", "comment"),
- new StructureElementCommand(null, Type.DEVICETYPE, deviceGroupUuid, "DtCc", null, "description", "comment")
+ new StructureElementCommand(null, Type.SYSTEMGROUP, null, "SgCc", null, "description"),
+ new StructureElementCommand(null, Type.SYSTEM, systemGroupUuid, "SysCc", null, "description"),
+ new StructureElementCommand(null, Type.SUBSYSTEM, systemUuid, "SubCc", null, "description"),
+ new StructureElementCommand(null, Type.DISCIPLINE, null, "DiCc", null, "description"),
+ new StructureElementCommand(null, Type.DEVICEGROUP, disciplineUuid, "", null, "description"),
+ new StructureElementCommand(null, Type.DEVICETYPE, deviceGroupUuid, "DtCc", null, "description")
};
structureElementCommandsCreate = StructureElementUtil.convertCommand2CommandCreate(structureElementCommands);
structureElementCommandsUpdate = StructureElementUtil.convertCommand2CommandUpdate(structureElementCommands);
@@ -479,12 +466,12 @@ class StructuresMultipleIT {
StructureElement[] rejectedStructureElements = null;
structureElementCommands = new StructureElementCommand[] {
- new StructureElementCommand(null, Type.SYSTEMGROUP, null, "SgCr", null, "description", "comment"),
- new StructureElementCommand(null, Type.SYSTEM, systemGroupUuid, "SysCr", null, "description", "comment"),
- new StructureElementCommand(null, Type.SUBSYSTEM, systemUuid, "SubCr", null, "description", "comment"),
- new StructureElementCommand(null, Type.DISCIPLINE, null, "DiCr", null, "description", "comment"),
- new StructureElementCommand(null, Type.DEVICEGROUP, disciplineUuid, "", null, "description", "comment"),
- new StructureElementCommand(null, Type.DEVICETYPE, deviceGroupUuid, "DtCr", null, "description", "comment")
+ new StructureElementCommand(null, Type.SYSTEMGROUP, null, "SgCr", null, "description"),
+ new StructureElementCommand(null, Type.SYSTEM, systemGroupUuid, "SysCr", null, "description"),
+ new StructureElementCommand(null, Type.SUBSYSTEM, systemUuid, "SubCr", null, "description"),
+ new StructureElementCommand(null, Type.DISCIPLINE, null, "DiCr", null, "description"),
+ new StructureElementCommand(null, Type.DEVICEGROUP, disciplineUuid, "", null, "description"),
+ new StructureElementCommand(null, Type.DEVICETYPE, deviceGroupUuid, "DtCr", null, "description")
};
structureElementCommandsCreate = StructureElementUtil.convertCommand2CommandCreate(structureElementCommands);
structureElementCommandsUpdate = StructureElementUtil.convertCommand2CommandUpdate(structureElementCommands);
@@ -590,7 +577,6 @@ class StructuresMultipleIT {
// name
// mnemonic
// description
- // comment
try {
StructureElementCommandCreate[] structureElementCommandsCreate = null;
@@ -602,12 +588,12 @@ class StructuresMultipleIT {
String value = null;
structureElementCommands = new StructureElementCommand[] {
- new StructureElementCommand(null, Type.SYSTEMGROUP, null, "SgCu", null, "description", "comment"),
- new StructureElementCommand(null, Type.SYSTEM, systemGroupUuid, "SysCu", null, "description", "comment"),
- new StructureElementCommand(null, Type.SUBSYSTEM, systemUuid, "SubCu", null, "description", "comment"),
- new StructureElementCommand(null, Type.DISCIPLINE, null, "DiCu", null, "description", "comment"),
- new StructureElementCommand(null, Type.DEVICEGROUP, disciplineUuid, "", null, "description", "comment"),
- new StructureElementCommand(null, Type.DEVICETYPE, deviceGroupUuid, "DtCu", null, "description", "comment")
+ new StructureElementCommand(null, Type.SYSTEMGROUP, null, "SgCu", null, "description"),
+ new StructureElementCommand(null, Type.SYSTEM, systemGroupUuid, "SysCu", null, "description"),
+ new StructureElementCommand(null, Type.SUBSYSTEM, systemUuid, "SubCu", null, "description"),
+ new StructureElementCommand(null, Type.DISCIPLINE, null, "DiCu", null, "description"),
+ new StructureElementCommand(null, Type.DEVICEGROUP, disciplineUuid, "", null, "description"),
+ new StructureElementCommand(null, Type.DEVICETYPE, deviceGroupUuid, "DtCu", null, "description")
};
structureElementCommandsCreate = StructureElementUtil.convertCommand2CommandCreate(structureElementCommands);
structureElementCommandsUpdate = StructureElementUtil.convertCommand2CommandUpdate(structureElementCommands);
@@ -689,12 +675,6 @@ class StructuresMultipleIT {
ITUtilStructures.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.FALSE);
structureElementCommandsUpdate[1].setDescription(value);
ITUtilStructures.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.TRUE);
-
- value = structureElementCommandsUpdate[1].getComment();
- structureElementCommandsUpdate[1].setComment(null);
- ITUtilStructures.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.FALSE);
- structureElementCommandsUpdate[1].setComment(value);
- ITUtilStructures.assertValidate(structureElementCommandsUpdate, StructureCommand.UPDATE, Boolean.TRUE);
} catch (Exception e) {
fail();
}
@@ -727,12 +707,12 @@ class StructuresMultipleIT {
StructureElement[] updatedStructureElements = null;
structureElementCommands = new StructureElementCommand[] {
- new StructureElementCommand(null, Type.SYSTEMGROUP, null, "SgUa", null, "description", "comment"),
- new StructureElementCommand(null, Type.SYSTEM, systemGroupUuid, "SysUa", null, "description", "comment"),
- new StructureElementCommand(null, Type.SUBSYSTEM, systemUuid, "SubUa", null, "description", "comment"),
- new StructureElementCommand(null, Type.DISCIPLINE, null, "DiUa", null, "description", "comment"),
- new StructureElementCommand(null, Type.DEVICEGROUP, disciplineUuid, "", null, "description", "comment"),
- new StructureElementCommand(null, Type.DEVICETYPE, deviceGroupUuid, "DtUa", null, "description", "comment")
+ new StructureElementCommand(null, Type.SYSTEMGROUP, null, "SgUa", null, "description"),
+ new StructureElementCommand(null, Type.SYSTEM, systemGroupUuid, "SysUa", null, "description"),
+ new StructureElementCommand(null, Type.SUBSYSTEM, systemUuid, "SubUa", null, "description"),
+ new StructureElementCommand(null, Type.DISCIPLINE, null, "DiUa", null, "description"),
+ new StructureElementCommand(null, Type.DEVICEGROUP, disciplineUuid, "", null, "description"),
+ new StructureElementCommand(null, Type.DEVICETYPE, deviceGroupUuid, "DtUa", null, "description")
};
structureElementCommandsCreate = StructureElementUtil.convertCommand2CommandCreate(structureElementCommands);
structureElementCommandsUpdate = StructureElementUtil.convertCommand2CommandUpdate(structureElementCommands);
@@ -894,12 +874,12 @@ class StructuresMultipleIT {
StructureElement[] cancelledStructureElements = null;
structureElementCommands = new StructureElementCommand[] {
- new StructureElementCommand(null, Type.SYSTEMGROUP, null, "SgUc", null, "description", "comment"),
- new StructureElementCommand(null, Type.SYSTEM, systemGroupUuid, "SysUc", null, "description", "comment"),
- new StructureElementCommand(null, Type.SUBSYSTEM, systemUuid, "SubUc", null, "description", "comment"),
- new StructureElementCommand(null, Type.DISCIPLINE, null, "DiUc", null, "description", "comment"),
- new StructureElementCommand(null, Type.DEVICEGROUP, disciplineUuid, "", null, "description", "comment"),
- new StructureElementCommand(null, Type.DEVICETYPE, deviceGroupUuid, "DtUc", null, "description", "comment")
+ new StructureElementCommand(null, Type.SYSTEMGROUP, null, "SgUc", null, "description"),
+ new StructureElementCommand(null, Type.SYSTEM, systemGroupUuid, "SysUc", null, "description"),
+ new StructureElementCommand(null, Type.SUBSYSTEM, systemUuid, "SubUc", null, "description"),
+ new StructureElementCommand(null, Type.DISCIPLINE, null, "DiUc", null, "description"),
+ new StructureElementCommand(null, Type.DEVICEGROUP, disciplineUuid, "", null, "description"),
+ new StructureElementCommand(null, Type.DEVICETYPE, deviceGroupUuid, "DtUc", null, "description")
};
structureElementCommandsCreate = StructureElementUtil.convertCommand2CommandCreate(structureElementCommands);
structureElementCommandsUpdate = StructureElementUtil.convertCommand2CommandUpdate(structureElementCommands);
@@ -1061,12 +1041,12 @@ class StructuresMultipleIT {
StructureElement[] rejectedStructureElements = null;
structureElementCommands = new StructureElementCommand[] {
- new StructureElementCommand(null, Type.SYSTEMGROUP, null, "SgUr", null, "description", "comment"),
- new StructureElementCommand(null, Type.SYSTEM, systemGroupUuid, "SysUr", null, "description", "comment"),
- new StructureElementCommand(null, Type.SUBSYSTEM, systemUuid, "SubUr", null, "description", "comment"),
- new StructureElementCommand(null, Type.DISCIPLINE, null, "DiUr", null, "description", "comment"),
- new StructureElementCommand(null, Type.DEVICEGROUP, disciplineUuid, "", null, "description", "comment"),
- new StructureElementCommand(null, Type.DEVICETYPE, deviceGroupUuid, "DtUr", null, "description", "comment")
+ new StructureElementCommand(null, Type.SYSTEMGROUP, null, "SgUr", null, "description"),
+ new StructureElementCommand(null, Type.SYSTEM, systemGroupUuid, "SysUr", null, "description"),
+ new StructureElementCommand(null, Type.SUBSYSTEM, systemUuid, "SubUr", null, "description"),
+ new StructureElementCommand(null, Type.DISCIPLINE, null, "DiUr", null, "description"),
+ new StructureElementCommand(null, Type.DEVICEGROUP, disciplineUuid, "", null, "description"),
+ new StructureElementCommand(null, Type.DEVICETYPE, deviceGroupUuid, "DtUr", null, "description")
};
structureElementCommandsCreate = StructureElementUtil.convertCommand2CommandCreate(structureElementCommands);
structureElementCommandsUpdate = StructureElementUtil.convertCommand2CommandUpdate(structureElementCommands);
@@ -1217,7 +1197,6 @@ class StructuresMultipleIT {
// validate delete
// uuid
// type
- // comment
try {
StructureElementCommandCreate[] structureElementCommandsCreate = null;
@@ -1226,15 +1205,14 @@ class StructuresMultipleIT {
StructureElementCommand[] structureElementCommands = null;
StructureElement[] approvedStructureElements = null;
UUID uuid = null;
- String value = null;
structureElementCommands = new StructureElementCommand[] {
- new StructureElementCommand(null, Type.SYSTEMGROUP, null, "SgCd", null, "description", "comment"),
- new StructureElementCommand(null, Type.SYSTEM, systemGroupUuid, "SysCd", null, "description", "comment"),
- new StructureElementCommand(null, Type.SUBSYSTEM, systemUuid, "SubCd", null, "description", "comment"),
- new StructureElementCommand(null, Type.DISCIPLINE, null, "DiCd", null, "description", "comment"),
- new StructureElementCommand(null, Type.DEVICEGROUP, disciplineUuid, "", null, "description", "comment"),
- new StructureElementCommand(null, Type.DEVICETYPE, deviceGroupUuid, "DtCd", null, "description", "comment")
+ new StructureElementCommand(null, Type.SYSTEMGROUP, null, "SgCd", null, "description"),
+ new StructureElementCommand(null, Type.SYSTEM, systemGroupUuid, "SysCd", null, "description"),
+ new StructureElementCommand(null, Type.SUBSYSTEM, systemUuid, "SubCd", null, "description"),
+ new StructureElementCommand(null, Type.DISCIPLINE, null, "DiCd", null, "description"),
+ new StructureElementCommand(null, Type.DEVICEGROUP, disciplineUuid, "", null, "description"),
+ new StructureElementCommand(null, Type.DEVICETYPE, deviceGroupUuid, "DtCd", null, "description")
};
structureElementCommandsCreate = StructureElementUtil.convertCommand2CommandCreate(structureElementCommands);
structureElementCommandsUpdate = StructureElementUtil.convertCommand2CommandUpdate(structureElementCommands);
@@ -1292,12 +1270,6 @@ class StructuresMultipleIT {
ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.FALSE);
structureElementCommandsConfirm[1].setUuid(uuid);
ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.TRUE);
-
- value = structureElementCommandsConfirm[1].getComment();
- structureElementCommandsConfirm[1].setComment(null);
- ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.FALSE);
- structureElementCommandsConfirm[1].setComment(value);
- ITUtilStructures.assertValidate(structureElementCommandsConfirm, StructureCommand.DELETE, Boolean.TRUE);
} catch (Exception e) {
fail();
}
@@ -1329,12 +1301,12 @@ class StructuresMultipleIT {
StructureElement[] approvedStructureElements = null;
structureElementCommands = new StructureElementCommand[] {
- new StructureElementCommand(null, Type.SYSTEMGROUP, null, "SgDa", null, "description", "comment"),
- new StructureElementCommand(null, Type.SYSTEM, systemGroupUuid, "SysDa", null, "description", "comment"),
- new StructureElementCommand(null, Type.SUBSYSTEM, systemUuid, "SubDa", null, "description", "comment"),
- new StructureElementCommand(null, Type.DISCIPLINE, null, "DiDa", null, "description", "comment"),
- new StructureElementCommand(null, Type.DEVICEGROUP, disciplineUuid, "", null, "description", "comment"),
- new StructureElementCommand(null, Type.DEVICETYPE, deviceGroupUuid, "DtDa", null, "description", "comment")
+ new StructureElementCommand(null, Type.SYSTEMGROUP, null, "SgDa", null, "description"),
+ new StructureElementCommand(null, Type.SYSTEM, systemGroupUuid, "SysDa", null, "description"),
+ new StructureElementCommand(null, Type.SUBSYSTEM, systemUuid, "SubDa", null, "description"),
+ new StructureElementCommand(null, Type.DISCIPLINE, null, "DiDa", null, "description"),
+ new StructureElementCommand(null, Type.DEVICEGROUP, disciplineUuid, "", null, "description"),
+ new StructureElementCommand(null, Type.DEVICETYPE, deviceGroupUuid, "DtDa", null, "description")
};
structureElementCommandsCreate = StructureElementUtil.convertCommand2CommandCreate(structureElementCommands);
structureElementCommandsUpdate = StructureElementUtil.convertCommand2CommandUpdate(structureElementCommands);
@@ -1466,12 +1438,12 @@ class StructuresMultipleIT {
StructureElement[] cancelledStructureElements = null;
structureElementCommands = new StructureElementCommand[] {
- new StructureElementCommand(null, Type.SYSTEMGROUP, null, "SgDc", null, "description", "comment"),
- new StructureElementCommand(null, Type.SYSTEM, systemGroupUuid, "SysDc", null, "description", "comment"),
- new StructureElementCommand(null, Type.SUBSYSTEM, systemUuid, "SubDc", null, "description", "comment"),
- new StructureElementCommand(null, Type.DISCIPLINE, null, "DiDc", null, "description", "comment"),
- new StructureElementCommand(null, Type.DEVICEGROUP, disciplineUuid, "", null, "description", "comment"),
- new StructureElementCommand(null, Type.DEVICETYPE, deviceGroupUuid, "DtDc", null, "description", "comment")
+ new StructureElementCommand(null, Type.SYSTEMGROUP, null, "SgDc", null, "description"),
+ new StructureElementCommand(null, Type.SYSTEM, systemGroupUuid, "SysDc", null, "description"),
+ new StructureElementCommand(null, Type.SUBSYSTEM, systemUuid, "SubDc", null, "description"),
+ new StructureElementCommand(null, Type.DISCIPLINE, null, "DiDc", null, "description"),
+ new StructureElementCommand(null, Type.DEVICEGROUP, disciplineUuid, "", null, "description"),
+ new StructureElementCommand(null, Type.DEVICETYPE, deviceGroupUuid, "DtDc", null, "description")
};
structureElementCommandsCreate = StructureElementUtil.convertCommand2CommandCreate(structureElementCommands);
structureElementCommandsUpdate = StructureElementUtil.convertCommand2CommandUpdate(structureElementCommands);
@@ -1603,12 +1575,12 @@ class StructuresMultipleIT {
StructureElement[] rejectedStructureElements = null;
structureElementCommands = new StructureElementCommand[] {
- new StructureElementCommand(null, Type.SYSTEMGROUP, null, "SgDr", null, "description", "comment"),
- new StructureElementCommand(null, Type.SYSTEM, systemGroupUuid, "SysDr", null, "description", "comment"),
- new StructureElementCommand(null, Type.SUBSYSTEM, systemUuid, "SubDr", null, "description", "comment"),
- new StructureElementCommand(null, Type.DISCIPLINE, null, "DiDr", null, "description", "comment"),
- new StructureElementCommand(null, Type.DEVICEGROUP, disciplineUuid, "", null, "description", "comment"),
- new StructureElementCommand(null, Type.DEVICETYPE, deviceGroupUuid, "DtDr", null, "description", "comment")
+ new StructureElementCommand(null, Type.SYSTEMGROUP, null, "SgDr", null, "description"),
+ new StructureElementCommand(null, Type.SYSTEM, systemGroupUuid, "SysDr", null, "description"),
+ new StructureElementCommand(null, Type.SUBSYSTEM, systemUuid, "SubDr", null, "description"),
+ new StructureElementCommand(null, Type.DISCIPLINE, null, "DiDr", null, "description"),
+ new StructureElementCommand(null, Type.DEVICEGROUP, disciplineUuid, "", null, "description"),
+ new StructureElementCommand(null, Type.DEVICETYPE, deviceGroupUuid, "DtDr", null, "description")
};
structureElementCommandsCreate = StructureElementUtil.convertCommand2CommandCreate(structureElementCommands);
structureElementCommandsUpdate = StructureElementUtil.convertCommand2CommandUpdate(structureElementCommands);
diff --git a/src/test/java/org/openepics/names/repository/model/DeviceGroupTest.java b/src/test/java/org/openepics/names/repository/model/DeviceGroupTest.java
index 160dbfc5..6e54d0aa 100644
--- a/src/test/java/org/openepics/names/repository/model/DeviceGroupTest.java
+++ b/src/test/java/org/openepics/names/repository/model/DeviceGroupTest.java
@@ -46,13 +46,13 @@ class DeviceGroupTest {
s1 = new DeviceGroup(
UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"),
- "AA1", null, null,
- "description", Status.APPROVED, true, false,
+ "AA1", null, null, "description",
+ Status.APPROVED, true, false,
date, "test who", "comment");
s2 = new DeviceGroup(
UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"),
- "AA1", null, null,
- "description", Status.APPROVED, true, false,
+ "AA1", null, null, "description",
+ Status.APPROVED, true, false,
date, "test who", "comment");
assertEquals(s1, s2);
@@ -75,13 +75,13 @@ class DeviceGroupTest {
s1 = new DeviceGroup(
UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"),
- "AA1", null, null,
- "description", Status.APPROVED, true, false,
+ "AA1", null, null, "description",
+ Status.APPROVED, true, false,
date, "test who", "comment");
s2 = new DeviceGroup(
UUID.fromString("b14a8565-de10-4026-97e3-ab129ffaba96"), UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"),
- "AA1", null, null,
- "description", Status.APPROVED, true, false,
+ "AA1", null, null, "description",
+ Status.APPROVED, true, false,
date, "test who", "comment");
assertNotEquals(s1, s2);
@@ -105,13 +105,13 @@ class DeviceGroupTest {
s1 = new DeviceGroup(
UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"),
- "AA1", null, null,
- "description", Status.APPROVED, true, false,
+ "AA1", null, null, "description",
+ Status.APPROVED, true, false,
date, "test who", "comment");
s2 = new DeviceGroup(
UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"),
- "AA1", null, null,
- "description", Status.APPROVED, true, false,
+ "AA1", null, null, "description",
+ Status.APPROVED, true, false,
date, "test who", "comment");
assertNotNull(s1);
@@ -127,13 +127,13 @@ class DeviceGroupTest {
s1 = new DeviceGroup(
UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"),
- "AA1", null, null,
- "description", Status.APPROVED, true, false,
+ "AA1", null, null, "description",
+ Status.APPROVED, true, false,
date, "test who", "comment");
s2 = new DeviceGroup(
UUID.fromString("b14a8565-de10-4026-97e3-ab129ffaba96"), UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"),
- "AA1", null, null,
- "description", Status.APPROVED, true, false,
+ "AA1", null, null, "description",
+ Status.APPROVED, true, false,
date, "test who", "comment");
assertNotNull(s1);
@@ -149,8 +149,8 @@ class DeviceGroupTest {
s1 = new DeviceGroup(
UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"),
- "AA1", null, null,
- "description", Status.APPROVED, true, false,
+ "AA1", null, null, "description",
+ Status.APPROVED, true, false,
date, "test who", "comment");
String str = s1.toString();
@@ -168,8 +168,8 @@ class DeviceGroupTest {
s1 = new DeviceGroup(
UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"),
- "AA1", null, null,
- "description", Status.APPROVED, true, false,
+ "AA1", null, null, "description",
+ Status.APPROVED, true, false,
date, "test who", "comment");
String str = s1.toStringSimple();
diff --git a/src/test/java/org/openepics/names/repository/model/DeviceTypeTest.java b/src/test/java/org/openepics/names/repository/model/DeviceTypeTest.java
index 5506179a..e6733428 100644
--- a/src/test/java/org/openepics/names/repository/model/DeviceTypeTest.java
+++ b/src/test/java/org/openepics/names/repository/model/DeviceTypeTest.java
@@ -46,13 +46,13 @@ class DeviceTypeTest {
s1 = new DeviceType(
UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"),
- "AA1", "AA1", 41,
- "description", Status.APPROVED, true, false,
+ "AA1", "AA1", 41, "description",
+ Status.APPROVED, true, false,
date, "test who", "comment");
s2 = new DeviceType(
UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"),
- "AA1", "AA1", 41,
- "description", Status.APPROVED, true, false,
+ "AA1", "AA1", 41, "description",
+ Status.APPROVED, true, false,
date, "test who", "comment");
assertEquals(s1, s2);
@@ -75,13 +75,13 @@ class DeviceTypeTest {
s1 = new DeviceType(
UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"),
- "AA1", "AA1", 41,
- "description", Status.APPROVED, true, false,
+ "AA1", "AA1", 41, "description",
+ Status.APPROVED, true, false,
date, "test who", "comment");
s2 = new DeviceType(
UUID.fromString("b14a8565-de10-4026-97e3-ab129ffaba96"), UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"),
- "AA1", "AA1", 41,
- "description", Status.APPROVED, true, false,
+ "AA1", "AA1", 41, "description",
+ Status.APPROVED, true, false,
date, "test who", "comment");
assertNotEquals(s1, s2);
@@ -105,13 +105,13 @@ class DeviceTypeTest {
s1 = new DeviceType(
UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"),
- "AA1", "AA1", 41,
- "description", Status.APPROVED, true, false,
+ "AA1", "AA1", 41, "description",
+ Status.APPROVED, true, false,
date, "test who", "comment");
s2 = new DeviceType(
UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"),
- "AA1", "AA1", 41,
- "description", Status.APPROVED, true, false,
+ "AA1", "AA1", 41, "description",
+ Status.APPROVED, true, false,
date, "test who", "comment");
assertNotNull(s1);
@@ -127,13 +127,13 @@ class DeviceTypeTest {
s1 = new DeviceType(
UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"),
- "AA1", "AA1", 41,
- "description", Status.APPROVED, true, false,
+ "AA1", "AA1", 41, "description",
+ Status.APPROVED, true, false,
date, "test who", "comment");
s2 = new DeviceType(
UUID.fromString("b14a8565-de10-4026-97e3-ab129ffaba96"), UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"),
- "AA1", "AA1", 41,
- "description", Status.APPROVED, true, false,
+ "AA1", "AA1", 41, "description",
+ Status.APPROVED, true, false,
date, "test who", "comment");
assertNotNull(s1);
@@ -149,8 +149,8 @@ class DeviceTypeTest {
s1 = new DeviceType(
UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"),
- "AA1", "AA1", 41,
- "description", Status.APPROVED, true, false,
+ "AA1", "AA1", 41, "description",
+ Status.APPROVED, true, false,
date, "test who", "comment");
String str = s1.toString();
@@ -168,8 +168,8 @@ class DeviceTypeTest {
s1 = new DeviceType(
UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"),
- "AA1", "AA1", 41,
- "description", Status.APPROVED, true, false,
+ "AA1", "AA1", 41, "description",
+ Status.APPROVED, true, false,
date, "test who", "comment");
String str = s1.toStringSimple();
diff --git a/src/test/java/org/openepics/names/repository/model/DisciplineTest.java b/src/test/java/org/openepics/names/repository/model/DisciplineTest.java
index 82c504ee..4f74ed81 100644
--- a/src/test/java/org/openepics/names/repository/model/DisciplineTest.java
+++ b/src/test/java/org/openepics/names/repository/model/DisciplineTest.java
@@ -46,13 +46,13 @@ class DisciplineTest {
s1 = new Discipline(
UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"),
- "AA1", "AA1", 41,
- "description", Status.APPROVED, true, false,
+ "AA1", "AA1", 41, "description",
+ Status.APPROVED, true, false,
date, "test who", "comment");
s2 = new Discipline(
UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"),
- "AA1", "AA1", 41,
- "description", Status.APPROVED, true, false,
+ "AA1", "AA1", 41, "description",
+ Status.APPROVED, true, false,
date, "test who", "comment");
assertEquals(s1, s2);
@@ -75,13 +75,13 @@ class DisciplineTest {
s1 = new Discipline(
UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"),
- "AA1", "AA1", 41,
- "description", Status.APPROVED, true, false,
+ "AA1", "AA1", 41, "description",
+ Status.APPROVED, true, false,
date, "test who", "comment");
s2 = new Discipline(
UUID.fromString("b14a8565-de10-4026-97e3-ab129ffaba96"),
- "AA1", "AA1", 41,
- "description", Status.APPROVED, true, false,
+ "AA1", "AA1", 41, "description",
+ Status.APPROVED, true, false,
date, "test who", "comment");
assertNotEquals(s1, s2);
@@ -105,13 +105,13 @@ class DisciplineTest {
s1 = new Discipline(
UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"),
- "AA1", "AA1", 41,
- "description", Status.APPROVED, true, false,
+ "AA1", "AA1", 41, "description",
+ Status.APPROVED, true, false,
date, "test who", "comment");
s2 = new Discipline(
UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"),
- "AA1", "AA1", 41,
- "description", Status.APPROVED, true, false,
+ "AA1", "AA1", 41, "description",
+ Status.APPROVED, true, false,
date, "test who", "comment");
assertNotNull(s1);
@@ -127,13 +127,13 @@ class DisciplineTest {
s1 = new Discipline(
UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"),
- "AA1", "AA1", 41,
- "description", Status.APPROVED, true, false,
+ "AA1", "AA1", 41, "description",
+ Status.APPROVED, true, false,
date, "test who", "comment");
s2 = new Discipline(
UUID.fromString("b14a8565-de10-4026-97e3-ab129ffaba96"),
- "AA1", "AA1", 41,
- "description", Status.APPROVED, true, false,
+ "AA1", "AA1", 41, "description",
+ Status.APPROVED, true, false,
date, "test who", "comment");
assertNotNull(s1);
@@ -149,8 +149,8 @@ class DisciplineTest {
s1 = new Discipline(
UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"),
- "AA1", "AA1", 41,
- "description", Status.APPROVED, true, false,
+ "AA1", "AA1", 41, "description",
+ Status.APPROVED, true, false,
date, "test who", "comment");
String str = s1.toString();
@@ -168,8 +168,8 @@ class DisciplineTest {
s1 = new Discipline(
UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"),
- "AA1", "AA1", 41,
- "description", Status.APPROVED, true, false,
+ "AA1", "AA1", 41, "description",
+ Status.APPROVED, true, false,
date, "test who", "comment");
String str = s1.toStringSimple();
diff --git a/src/test/java/org/openepics/names/repository/model/NameTest.java b/src/test/java/org/openepics/names/repository/model/NameTest.java
index 6b312e64..43f34e2a 100644
--- a/src/test/java/org/openepics/names/repository/model/NameTest.java
+++ b/src/test/java/org/openepics/names/repository/model/NameTest.java
@@ -46,13 +46,13 @@ class NameTest {
n1 = new Name(
UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"), UUID.fromString("eb7e55c2-012b-419d-881a-58a858894e92"), null, null, null,
- null, "Acc", "ACC",
- null, Status.APPROVED, true, false,
+ null, "Acc", "ACC", null,
+ Status.APPROVED, true, false,
date, "test who", null);
n2 = new Name(
UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"), UUID.fromString("eb7e55c2-012b-419d-881a-58a858894e92"), null, null, null,
- null, "Acc", "ACC",
- null, Status.APPROVED, true, false,
+ null, "Acc", "ACC", null,
+ Status.APPROVED, true, false,
date, "test who", null);
assertEquals(n1, n2);
@@ -75,13 +75,13 @@ class NameTest {
n1 = new Name(
UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"), UUID.fromString("eb7e55c2-012b-419d-881a-58a858894e92"), null, null, null,
- null, "Acc", "ACC",
- null, Status.APPROVED, true, false,
+ null, "Acc", "ACC", null,
+ Status.APPROVED, true, false,
date, "test who", null);
n2 = new Name(
UUID.fromString("55bdc415-cf5a-4650-b6dd-478540830c2a"), UUID.fromString("eb7e55c2-012b-419d-881a-58a858894e92"), null, null, null,
- null, "Acc", "ACC",
- null, Status.APPROVED, true, false,
+ null, "Acc", "ACC", null,
+ Status.APPROVED, true, false,
date, "test who", null);
assertNotEquals(n1, n2);
@@ -105,13 +105,13 @@ class NameTest {
n1 = new Name(
UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"), UUID.fromString("eb7e55c2-012b-419d-881a-58a858894e92"), null, null, null,
- null, "Acc", "ACC",
- null, Status.APPROVED, true, false,
+ null, "Acc", "ACC", null,
+ Status.APPROVED, true, false,
date, "test who", null);
n2 = new Name(
UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"), UUID.fromString("eb7e55c2-012b-419d-881a-58a858894e92"), null, null, null,
- null, "Acc", "ACC",
- null, Status.APPROVED, true, false,
+ null, "Acc", "ACC", null,
+ Status.APPROVED, true, false,
date, "test who", null);
assertNotNull(n1);
@@ -127,13 +127,13 @@ class NameTest {
n1 = new Name(
UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"), UUID.fromString("eb7e55c2-012b-419d-881a-58a858894e92"), null, null, null,
- null, "Acc", "ACC",
- null, Status.APPROVED, true, false,
+ null, "Acc", "ACC", null,
+ Status.APPROVED, true, false,
date, "test who", null);
n2 = new Name(
UUID.fromString("55bdc415-cf5a-4650-b6dd-478540830c2a"), UUID.fromString("eb7e55c2-012b-419d-881a-58a858894e92"), null, null, null,
- null, "Acc", "ACC",
- null, Status.APPROVED, true, false,
+ null, "Acc", "ACC", null,
+ Status.APPROVED, true, false,
date, "test who", null);
assertNotNull(n1);
@@ -149,8 +149,8 @@ class NameTest {
n1 = new Name(
UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"), UUID.fromString("eb7e55c2-012b-419d-881a-58a858894e92"), null, null, null,
- null, "Acc", "ACC",
- null, Status.APPROVED, true, false,
+ null, "Acc", "ACC", null,
+ Status.APPROVED, true, false,
date, "test who", null);
String str = n1.toString();
@@ -168,8 +168,8 @@ class NameTest {
n1 = new Name(
UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"), UUID.fromString("eb7e55c2-012b-419d-881a-58a858894e92"), null, null, null,
- null, "Acc", "ACC",
- null, Status.APPROVED, true, false,
+ null, "Acc", "ACC", null,
+ Status.APPROVED, true, false,
date, "test who", null);
String str = n1.toStringSimple();
diff --git a/src/test/java/org/openepics/names/repository/model/StructureTest.java b/src/test/java/org/openepics/names/repository/model/StructureTest.java
index 55cfe7bc..68a32131 100644
--- a/src/test/java/org/openepics/names/repository/model/StructureTest.java
+++ b/src/test/java/org/openepics/names/repository/model/StructureTest.java
@@ -46,13 +46,13 @@ class StructureTest {
s1 = new Structure(
UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"),
- "AA1", "AA1", 41,
- "description", Status.APPROVED, true, false,
+ "AA1", "AA1", 41, "description",
+ Status.APPROVED, true, false,
date, "test who", "comment");
s2 = new Structure(
UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"),
- "AA1", "AA1", 41,
- "description", Status.APPROVED, true, false,
+ "AA1", "AA1", 41, "description",
+ Status.APPROVED, true, false,
date, "test who", "comment");
assertEquals(s1, s2);
@@ -75,13 +75,13 @@ class StructureTest {
s1 = new Structure(
UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"),
- "AA1", "AA1", 41,
- "description", Status.APPROVED, true, false,
+ "AA1", "AA1", 41, "description",
+ Status.APPROVED, true, false,
date, "test who", "comment");
s2 = new Structure(
UUID.fromString("b14a8565-de10-4026-97e3-ab129ffaba96"),
- "AA1", "AA1", 41,
- "description", Status.APPROVED, true, false,
+ "AA1", "AA1", 41, "description",
+ Status.APPROVED, true, false,
date, "test who", "comment");
assertNotEquals(s1, s2);
@@ -105,13 +105,13 @@ class StructureTest {
s1 = new Structure(
UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"),
- "AA1", "AA1", 41,
- "description", Status.APPROVED, true, false,
+ "AA1", "AA1", 41, "description",
+ Status.APPROVED, true, false,
date, "test who", "comment");
s2 = new Structure(
UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"),
- "AA1", "AA1", 41,
- "description", Status.APPROVED, true, false,
+ "AA1", "AA1", 41, "description",
+ Status.APPROVED, true, false,
date, "test who", "comment");
assertNotNull(s1);
@@ -127,13 +127,13 @@ class StructureTest {
s1 = new Structure(
UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"),
- "AA1", "AA1", 41,
- "description", Status.APPROVED, true, false,
+ "AA1", "AA1", 41, "description",
+ Status.APPROVED, true, false,
date, "test who", "comment");
s2 = new Structure(
UUID.fromString("b14a8565-de10-4026-97e3-ab129ffaba96"),
- "AA1", "AA1", 41,
- "description", Status.APPROVED, true, false,
+ "AA1", "AA1", 41, "description",
+ Status.APPROVED, true, false,
date, "test who", "comment");
assertNotNull(s1);
@@ -149,8 +149,8 @@ class StructureTest {
s1 = new Structure(
UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"),
- "AA1", "AA1", 41,
- "description", Status.APPROVED, true, false,
+ "AA1", "AA1", 41, "description",
+ Status.APPROVED, true, false,
date, "test who", "comment");
String str = s1.toString();
@@ -168,8 +168,8 @@ class StructureTest {
s1 = new Structure(
UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"),
- "AA1", "AA1", 41,
- "description", Status.APPROVED, true, false,
+ "AA1", "AA1", 41, "description",
+ Status.APPROVED, true, false,
date, "test who", "comment");
String str = s1.toStringSimple();
diff --git a/src/test/java/org/openepics/names/repository/model/SubsystemTest.java b/src/test/java/org/openepics/names/repository/model/SubsystemTest.java
index ae6ae8dd..1b0b3282 100644
--- a/src/test/java/org/openepics/names/repository/model/SubsystemTest.java
+++ b/src/test/java/org/openepics/names/repository/model/SubsystemTest.java
@@ -46,13 +46,13 @@ class SubsystemTest {
s1 = new Subsystem(
UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"),
- "AA1", "AA1", 41,
- "description", Status.APPROVED, true, false,
+ "AA1", "AA1", 41, "description",
+ Status.APPROVED, true, false,
date, "test who", "comment");
s2 = new Subsystem(
UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"),
- "AA1", "AA1", 41,
- "description", Status.APPROVED, true, false,
+ "AA1", "AA1", 41, "description",
+ Status.APPROVED, true, false,
date, "test who", "comment");
assertEquals(s1, s2);
@@ -75,13 +75,13 @@ class SubsystemTest {
s1 = new Subsystem(
UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"),
- "AA1", "AA1", 41,
- "description", Status.APPROVED, true, false,
+ "AA1", "AA1", 41, "description",
+ Status.APPROVED, true, false,
date, "test who", "comment");
s2 = new Subsystem(
UUID.fromString("b14a8565-de10-4026-97e3-ab129ffaba96"), UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"),
- "AA1", "AA1", 41,
- "description", Status.APPROVED, true, false,
+ "AA1", "AA1", 41, "description",
+ Status.APPROVED, true, false,
date, "test who", "comment");
assertNotEquals(s1, s2);
@@ -105,13 +105,13 @@ class SubsystemTest {
s1 = new Subsystem(
UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"),
- "AA1", "AA1", 41,
- "description", Status.APPROVED, true, false,
+ "AA1", "AA1", 41, "description",
+ Status.APPROVED, true, false,
date, "test who", "comment");
s2 = new Subsystem(
UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"),
- "AA1", "AA1", 41,
- "description", Status.APPROVED, true, false,
+ "AA1", "AA1", 41, "description",
+ Status.APPROVED, true, false,
date, "test who", "comment");
assertNotNull(s1);
@@ -127,13 +127,13 @@ class SubsystemTest {
s1 = new Subsystem(
UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"),
- "AA1", "AA1", 41,
- "description", Status.APPROVED, true, false,
+ "AA1", "AA1", 41, "description",
+ Status.APPROVED, true, false,
date, "test who", "comment");
s2 = new Subsystem(
UUID.fromString("b14a8565-de10-4026-97e3-ab129ffaba96"), UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"),
- "AA1", "AA1", 41,
- "description", Status.APPROVED, true, false,
+ "AA1", "AA1", 41, "description",
+ Status.APPROVED, true, false,
date, "test who", "comment");
assertNotNull(s1);
@@ -149,8 +149,8 @@ class SubsystemTest {
s1 = new Subsystem(
UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"),
- "AA1", "AA1", 41,
- "description", Status.APPROVED, true, false,
+ "AA1", "AA1", 41, "description",
+ Status.APPROVED, true, false,
date, "test who", "comment");
String str = s1.toString();
@@ -168,8 +168,8 @@ class SubsystemTest {
s1 = new Subsystem(
UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"),
- "AA1", "AA1", 41,
- "description", Status.APPROVED, true, false,
+ "AA1", "AA1", 41, "description",
+ Status.APPROVED, true, false,
date, "test who", "comment");
String str = s1.toStringSimple();
diff --git a/src/test/java/org/openepics/names/repository/model/SystemGroupTest.java b/src/test/java/org/openepics/names/repository/model/SystemGroupTest.java
index b75b495b..5b321bcc 100644
--- a/src/test/java/org/openepics/names/repository/model/SystemGroupTest.java
+++ b/src/test/java/org/openepics/names/repository/model/SystemGroupTest.java
@@ -46,13 +46,13 @@ class SystemGroupTest {
s1 = new SystemGroup(
UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"),
- "AA1", "AA1", 41,
- "description", Status.APPROVED, true, false,
+ "AA1", "AA1", 41, "description",
+ Status.APPROVED, true, false,
date, "test who", "comment");
s2 = new SystemGroup(
UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"),
- "AA1", "AA1", 41,
- "description", Status.APPROVED, true, false,
+ "AA1", "AA1", 41, "description",
+ Status.APPROVED, true, false,
date, "test who", "comment");
assertEquals(s1, s2);
@@ -75,13 +75,13 @@ class SystemGroupTest {
s1 = new SystemGroup(
UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"),
- "AA1", "AA1", 41,
- "description", Status.APPROVED, true, false,
+ "AA1", "AA1", 41, "description",
+ Status.APPROVED, true, false,
date, "test who", "comment");
s2 = new SystemGroup(
UUID.fromString("b14a8565-de10-4026-97e3-ab129ffaba96"),
- "AA1", "AA1", 41,
- "description", Status.APPROVED, true, false,
+ "AA1", "AA1", 41, "description",
+ Status.APPROVED, true, false,
date, "test who", "comment");
assertNotEquals(s1, s2);
@@ -105,13 +105,13 @@ class SystemGroupTest {
s1 = new SystemGroup(
UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"),
- "AA1", "AA1", 41,
- "description", Status.APPROVED, true, false,
+ "AA1", "AA1", 41, "description",
+ Status.APPROVED, true, false,
date, "test who", "comment");
s2 = new SystemGroup(
UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"),
- "AA1", "AA1", 41,
- "description", Status.APPROVED, true, false,
+ "AA1", "AA1", 41, "description",
+ Status.APPROVED, true, false,
date, "test who", "comment");
assertNotNull(s1);
@@ -127,13 +127,13 @@ class SystemGroupTest {
s1 = new SystemGroup(
UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"),
- "AA1", "AA1", 41,
- "description", Status.APPROVED, true, false,
+ "AA1", "AA1", 41, "description",
+ Status.APPROVED, true, false,
date, "test who", "comment");
s2 = new SystemGroup(
UUID.fromString("b14a8565-de10-4026-97e3-ab129ffaba96"),
- "AA1", "AA1", 41,
- "description", Status.APPROVED, true, false,
+ "AA1", "AA1", 41, "description",
+ Status.APPROVED, true, false,
date, "test who", "comment");
assertNotNull(s1);
@@ -149,8 +149,8 @@ class SystemGroupTest {
s1 = new SystemGroup(
UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"),
- "AA1", "AA1", 41,
- "description", Status.APPROVED, true, false,
+ "AA1", "AA1", 41, "description",
+ Status.APPROVED, true, false,
date, "test who", "comment");
String str = s1.toString();
@@ -168,8 +168,8 @@ class SystemGroupTest {
s1 = new SystemGroup(
UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"),
- "AA1", "AA1", 41,
- "description", Status.APPROVED, true, false,
+ "AA1", "AA1", 41, "description",
+ Status.APPROVED, true, false,
date, "test who", "comment");
String str = s1.toStringSimple();
diff --git a/src/test/java/org/openepics/names/repository/model/SystemTest.java b/src/test/java/org/openepics/names/repository/model/SystemTest.java
index ce6304f5..d7145b9e 100644
--- a/src/test/java/org/openepics/names/repository/model/SystemTest.java
+++ b/src/test/java/org/openepics/names/repository/model/SystemTest.java
@@ -46,13 +46,13 @@ class SystemTest {
s1 = new System(
UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"),
- "AA1", "AA1", 41,
- "description", Status.APPROVED, true, false,
+ "AA1", "AA1", 41, "description",
+ Status.APPROVED, true, false,
date, "test who", "comment");
s2 = new System(
UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"),
- "AA1", "AA1", 41,
- "description", Status.APPROVED, true, false,
+ "AA1", "AA1", 41, "description",
+ Status.APPROVED, true, false,
date, "test who", "comment");
assertEquals(s1, s2);
@@ -75,13 +75,13 @@ class SystemTest {
s1 = new System(
UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"),
- "AA1", "AA1", 41,
- "description", Status.APPROVED, true, false,
+ "AA1", "AA1", 41, "description",
+ Status.APPROVED, true, false,
date, "test who", "comment");
s2 = new System(
UUID.fromString("b14a8565-de10-4026-97e3-ab129ffaba96"), UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"),
- "AA1", "AA1", 41,
- "description", Status.APPROVED, true, false,
+ "AA1", "AA1", 41, "description",
+ Status.APPROVED, true, false,
date, "test who", "comment");
assertNotEquals(s1, s2);
@@ -105,13 +105,13 @@ class SystemTest {
s1 = new System(
UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"),
- "AA1", "AA1", 41,
- "description", Status.APPROVED, true, false,
+ "AA1", "AA1", 41, "description",
+ Status.APPROVED, true, false,
date, "test who", "comment");
s2 = new System(
UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"),
- "AA1", "AA1", 41,
- "description", Status.APPROVED, true, false,
+ "AA1", "AA1", 41, "description",
+ Status.APPROVED, true, false,
date, "test who", "comment");
assertNotNull(s1);
@@ -127,13 +127,13 @@ class SystemTest {
s1 = new System(
UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"),
- "AA1", "AA1", 41,
- "description", Status.APPROVED, true, false,
+ "AA1", "AA1", 41, "description",
+ Status.APPROVED, true, false,
date, "test who", "comment");
s2 = new System(
UUID.fromString("b14a8565-de10-4026-97e3-ab129ffaba96"), UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"),
- "AA1", "AA1", 41,
- "description", Status.APPROVED, true, false,
+ "AA1", "AA1", 41, "description",
+ Status.APPROVED, true, false,
date, "test who", "comment");
assertNotNull(s1);
@@ -149,8 +149,8 @@ class SystemTest {
s1 = new System(
UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"),
- "AA1", "AA1", 41,
- "description", Status.APPROVED, true, false,
+ "AA1", "AA1", 41, "description",
+ Status.APPROVED, true, false,
date, "test who", "comment");
String str = s1.toString();
@@ -168,8 +168,8 @@ class SystemTest {
s1 = new System(
UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"),
- "AA1", "AA1", 41,
- "description", Status.APPROVED, true, false,
+ "AA1", "AA1", 41, "description",
+ Status.APPROVED, true, false,
date, "test who", "comment");
String str = s1.toStringSimple();
diff --git a/src/test/java/org/openepics/names/rest/beans/element/NameElementCommandConfirmTest.java b/src/test/java/org/openepics/names/rest/beans/element/NameElementCommandConfirmTest.java
index efeea9dc..79dec121 100644
--- a/src/test/java/org/openepics/names/rest/beans/element/NameElementCommandConfirmTest.java
+++ b/src/test/java/org/openepics/names/rest/beans/element/NameElementCommandConfirmTest.java
@@ -46,9 +46,9 @@ class NameElementCommandConfirmTest {
NameElementCommandConfirm ne1 = null, ne2 = null;
ne1 = new NameElementCommandConfirm(
- UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"), null);
+ UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"));
ne2 = new NameElementCommandConfirm(
- UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"), null);
+ UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"));
assertEquals(ne1, ne2);
}
@@ -57,7 +57,7 @@ class NameElementCommandConfirmTest {
void equalsJson() {
ObjectMapper mapper = new ObjectMapper();
NameElementCommandConfirm ne1 = null, ne2 = null;
- String json = "{\"uuid\": \"45bdc415-cf5a-4650-b6dd-478540830c2a\", \"comment\": null}";
+ String json = "{\"uuid\": \"45bdc415-cf5a-4650-b6dd-478540830c2a\"}";
try {
ne1 = mapper.readValue(json, NameElementCommandConfirm.class);
@@ -86,9 +86,9 @@ class NameElementCommandConfirmTest {
NameElementCommandConfirm ne1 = null, ne2 = null;
ne1 = new NameElementCommandConfirm(
- UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"), null);
+ UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"));
ne2 = new NameElementCommandConfirm(
- UUID.fromString("55bdc415-cf5a-4650-b6dd-478540830c2a"), null);
+ UUID.fromString("55bdc415-cf5a-4650-b6dd-478540830c2a"));
assertNotEquals(ne1, ne2);
}
@@ -97,8 +97,8 @@ class NameElementCommandConfirmTest {
void notEqualsJson() {
ObjectMapper mapper = new ObjectMapper();
NameElementCommandConfirm ne1 = null, ne2 = null;
- String json = "{\"uuid\": \"45bdc415-cf5a-4650-b6dd-478540830c2a\", \"comment\": null}";
- String json2 = "{\"uuid\": \"55bdc415-cf5a-4650-b6dd-478540830c2a\", \"comment\": null}";
+ String json = "{\"uuid\": \"45bdc415-cf5a-4650-b6dd-478540830c2a\"}";
+ String json2 = "{\"uuid\": \"55bdc415-cf5a-4650-b6dd-478540830c2a\"}";
try {
ne1 = mapper.readValue(json, NameElementCommandConfirm.class);
@@ -128,9 +128,9 @@ class NameElementCommandConfirmTest {
NameElementCommandConfirm ne1 = null, ne2 = null;
ne1 = new NameElementCommandConfirm(
- UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"), null);
+ UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"));
ne2 = new NameElementCommandConfirm(
- UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"), null);
+ UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"));
assertNotNull(ne1);
assertNotNull(ne2);
@@ -143,9 +143,9 @@ class NameElementCommandConfirmTest {
NameElementCommandConfirm ne1 = null, ne2 = null;
ne1 = new NameElementCommandConfirm(
- UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"), null);
+ UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"));
ne2 = new NameElementCommandConfirm(
- UUID.fromString("55bdc415-cf5a-4650-b6dd-478540830c2a"), null);
+ UUID.fromString("55bdc415-cf5a-4650-b6dd-478540830c2a"));
assertNotNull(ne1);
assertNotNull(ne2);
@@ -158,13 +158,12 @@ class NameElementCommandConfirmTest {
NameElementCommandConfirm ne1 = null;
ne1 = new NameElementCommandConfirm(
- UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"), null);
+ UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"));
String str = ne1.toString();
assertNotNull(str);
assertTrue(str.contains("uuid"));
- assertTrue(str.contains("comment"));
}
}
diff --git a/src/test/java/org/openepics/names/rest/beans/element/NameElementCommandCreateTest.java b/src/test/java/org/openepics/names/rest/beans/element/NameElementCommandCreateTest.java
index ea310339..600e52b5 100644
--- a/src/test/java/org/openepics/names/rest/beans/element/NameElementCommandCreateTest.java
+++ b/src/test/java/org/openepics/names/rest/beans/element/NameElementCommandCreateTest.java
@@ -46,11 +46,11 @@ class NameElementCommandCreateTest {
NameElementCommandCreate ne1 = null, ne2 = null;
ne1 = new NameElementCommandCreate(
- UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"), null, null,
- "System structure only", null);
+ UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"), null,
+ null, "System structure only");
ne2 = new NameElementCommandCreate(
- UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"), null, null,
- "System structure only", null);
+ UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"), null,
+ null, "System structure only");
assertEquals(ne1, ne2);
}
@@ -59,7 +59,7 @@ class NameElementCommandCreateTest {
void equalsJson() {
ObjectMapper mapper = new ObjectMapper();
NameElementCommandCreate ne1 = null, ne2 = null;
- String json = "{\"parentSystemStructure\": \"45bdc415-cf5a-4650-b6dd-478540830c2a\", \"parentDeviceStructure\": null, \"index\": null, \"description\": \"System structure only\", \"comment\": null}";
+ String json = "{\"parentSystemStructure\": \"45bdc415-cf5a-4650-b6dd-478540830c2a\", \"parentDeviceStructure\": null, \"index\": null, \"description\": \"System structure only\"}";
try {
ne1 = mapper.readValue(json, NameElementCommandCreate.class);
@@ -88,11 +88,11 @@ class NameElementCommandCreateTest {
NameElementCommandCreate ne1 = null, ne2 = null;
ne1 = new NameElementCommandCreate(
- UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"), null, null,
- "System structure only", null);
+ UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"), null,
+ null, "System structure only");
ne2 = new NameElementCommandCreate(
- UUID.fromString("55bdc415-cf5a-4650-b6dd-478540830c2a"), null, null,
- "System structure only", null);
+ UUID.fromString("55bdc415-cf5a-4650-b6dd-478540830c2a"), null,
+ null, "System structure only");
assertNotEquals(ne1, ne2);
}
@@ -101,8 +101,8 @@ class NameElementCommandCreateTest {
void notEqualsJson() {
ObjectMapper mapper = new ObjectMapper();
NameElementCommandCreate ne1 = null, ne2 = null;
- String json = "{\"parentSystemStructure\": \"45bdc415-cf5a-4650-b6dd-478540830c2a\", \"parentDeviceStructure\": null, \"index\": null, \"description\": \"System structure only\", \"comment\": null}";
- String json2 = "{\"parentSystemStructure\": \"55bdc415-cf5a-4650-b6dd-478540830c2a\", \"parentDeviceStructure\": null, \"index\": null, \"description\": \"System structure only\", \"comment\": null}";
+ String json = "{\"parentSystemStructure\": \"45bdc415-cf5a-4650-b6dd-478540830c2a\", \"parentDeviceStructure\": null, \"index\": null, \"description\": \"System structure only\"}";
+ String json2 = "{\"parentSystemStructure\": \"55bdc415-cf5a-4650-b6dd-478540830c2a\", \"parentDeviceStructure\": null, \"index\": null, \"description\": \"System structure only\"}";
try {
ne1 = mapper.readValue(json, NameElementCommandCreate.class);
@@ -132,11 +132,11 @@ class NameElementCommandCreateTest {
NameElementCommandCreate ne1 = null, ne2 = null;
ne1 = new NameElementCommandCreate(
- UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"), null, null,
- "System structure only", null);
+ UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"), null,
+ null, "System structure only");
ne2 = new NameElementCommandCreate(
- UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"), null, null,
- "System structure only", null);
+ UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"), null,
+ null, "System structure only");
assertNotNull(ne1);
assertNotNull(ne2);
@@ -149,11 +149,11 @@ class NameElementCommandCreateTest {
NameElementCommandCreate ne1 = null, ne2 = null;
ne1 = new NameElementCommandCreate(
- UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"), null, null,
- "System structure only", null);
+ UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"), null,
+ null, "System structure only");
ne2 = new NameElementCommandCreate(
- UUID.fromString("55bdc415-cf5a-4650-b6dd-478540830c2a"), null, null,
- "System structure only", null);
+ UUID.fromString("55bdc415-cf5a-4650-b6dd-478540830c2a"), null,
+ null, "System structure only");
assertNotNull(ne1);
assertNotNull(ne2);
@@ -166,14 +166,13 @@ class NameElementCommandCreateTest {
NameElementCommandCreate ne1 = null;
ne1 = new NameElementCommandCreate(
- UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"), null, null,
- "System structure only", null);
+ UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"), null,
+ null, "System structure only");
String str = ne1.toString();
assertNotNull(str);
assertTrue(str.contains("parentSystemStructure"));
- assertTrue(str.contains("comment"));
}
}
diff --git a/src/test/java/org/openepics/names/rest/beans/element/NameElementCommandTest.java b/src/test/java/org/openepics/names/rest/beans/element/NameElementCommandTest.java
index a2c9f846..649bb0fd 100644
--- a/src/test/java/org/openepics/names/rest/beans/element/NameElementCommandTest.java
+++ b/src/test/java/org/openepics/names/rest/beans/element/NameElementCommandTest.java
@@ -46,11 +46,11 @@ class NameElementCommandTest {
NameElementCommand ne1 = null, ne2 = null;
ne1 = new NameElementCommand(
- UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"), UUID.fromString("eb7e55c2-012b-419d-881a-58a858894e92"), null, null,
- "System structure only", null);
+ UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"), UUID.fromString("eb7e55c2-012b-419d-881a-58a858894e92"), null,
+ null, "System structure only");
ne2 = new NameElementCommand(
- UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"), UUID.fromString("eb7e55c2-012b-419d-881a-58a858894e92"), null, null,
- "System structure only", null);
+ UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"), UUID.fromString("eb7e55c2-012b-419d-881a-58a858894e92"), null,
+ null, "System structure only");
assertEquals(ne1, ne2);
}
@@ -59,7 +59,7 @@ class NameElementCommandTest {
void equalsJson() {
ObjectMapper mapper = new ObjectMapper();
NameElementCommand ne1 = null, ne2 = null;
- String json = "{\"uuid\": \"45bdc415-cf5a-4650-b6dd-478540830c2a\", \"parentSystemStructure\": \"eb7e55c2-012b-419d-881a-58a858894e92\", \"parentDeviceStructure\": null, \"index\": null, \"description\": \"System structure only\", \"comment\": null}";
+ String json = "{\"uuid\": \"45bdc415-cf5a-4650-b6dd-478540830c2a\", \"parentSystemStructure\": \"eb7e55c2-012b-419d-881a-58a858894e92\", \"parentDeviceStructure\": null, \"index\": null, \"description\": \"System structure only\"}";
try {
ne1 = mapper.readValue(json, NameElementCommand.class);
@@ -88,11 +88,11 @@ class NameElementCommandTest {
NameElementCommand ne1 = null, ne2 = null;
ne1 = new NameElementCommand(
- UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"), UUID.fromString("eb7e55c2-012b-419d-881a-58a858894e92"), null, null,
- "System structure only", null);
+ UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"), UUID.fromString("eb7e55c2-012b-419d-881a-58a858894e92"), null,
+ null, "System structure only");
ne2 = new NameElementCommand(
- UUID.fromString("55bdc415-cf5a-4650-b6dd-478540830c2a"), UUID.fromString("eb7e55c2-012b-419d-881a-58a858894e92"), null, null,
- "System structure only", null);
+ UUID.fromString("55bdc415-cf5a-4650-b6dd-478540830c2a"), UUID.fromString("eb7e55c2-012b-419d-881a-58a858894e92"), null,
+ null, "System structure only");
assertNotEquals(ne1, ne2);
}
@@ -101,8 +101,8 @@ class NameElementCommandTest {
void notEqualsJson() {
ObjectMapper mapper = new ObjectMapper();
NameElementCommand ne1 = null, ne2 = null;
- String json = "{\"uuid\": \"45bdc415-cf5a-4650-b6dd-478540830c2a\", \"parentSystemStructure\": \"eb7e55c2-012b-419d-881a-58a858894e92\", \"parentDeviceStructure\": null, \"index\": null, \"description\": \"System structure only\", \"comment\": null}";
- String json2 = "{\"uuid\": \"55bdc415-cf5a-4650-b6dd-478540830c2a\", \"parentSystemStructure\": \"eb7e55c2-012b-419d-881a-58a858894e92\", \"parentDeviceStructure\": null, \"index\": null, \"description\": \"System structure only\", \"comment\": null}";
+ String json = "{\"uuid\": \"45bdc415-cf5a-4650-b6dd-478540830c2a\", \"parentSystemStructure\": \"eb7e55c2-012b-419d-881a-58a858894e92\", \"parentDeviceStructure\": null, \"index\": null, \"description\": \"System structure only\"}";
+ String json2 = "{\"uuid\": \"55bdc415-cf5a-4650-b6dd-478540830c2a\", \"parentSystemStructure\": \"eb7e55c2-012b-419d-881a-58a858894e92\", \"parentDeviceStructure\": null, \"index\": null, \"description\": \"System structure only\"}";
try {
ne1 = mapper.readValue(json, NameElementCommand.class);
@@ -132,11 +132,11 @@ class NameElementCommandTest {
NameElementCommand ne1 = null, ne2 = null;
ne1 = new NameElementCommand(
- UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"), UUID.fromString("eb7e55c2-012b-419d-881a-58a858894e92"), null, null,
- "System structure only", null);
+ UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"), UUID.fromString("eb7e55c2-012b-419d-881a-58a858894e92"), null,
+ null, "System structure only");
ne2 = new NameElementCommand(
- UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"), UUID.fromString("eb7e55c2-012b-419d-881a-58a858894e92"), null, null,
- "System structure only", null);
+ UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"), UUID.fromString("eb7e55c2-012b-419d-881a-58a858894e92"), null,
+ null, "System structure only");
assertNotNull(ne1);
assertNotNull(ne2);
@@ -149,11 +149,11 @@ class NameElementCommandTest {
NameElementCommand ne1 = null, ne2 = null;
ne1 = new NameElementCommand(
- UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"), UUID.fromString("eb7e55c2-012b-419d-881a-58a858894e92"), null, null,
- "System structure only", null);
+ UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"), UUID.fromString("eb7e55c2-012b-419d-881a-58a858894e92"), null,
+ null, "System structure only");
ne2 = new NameElementCommand(
- UUID.fromString("55bdc415-cf5a-4650-b6dd-478540830c2a"), UUID.fromString("eb7e55c2-012b-419d-881a-58a858894e92"), null, null,
- "System structure only", null);
+ UUID.fromString("55bdc415-cf5a-4650-b6dd-478540830c2a"), UUID.fromString("eb7e55c2-012b-419d-881a-58a858894e92"), null,
+ null, "System structure only");
assertNotNull(ne1);
assertNotNull(ne2);
@@ -166,14 +166,13 @@ class NameElementCommandTest {
NameElementCommand ne1 = null;
ne1 = new NameElementCommand(
- UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"), UUID.fromString("eb7e55c2-012b-419d-881a-58a858894e92"), null, null,
- "System structure only", null);
+ UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"), UUID.fromString("eb7e55c2-012b-419d-881a-58a858894e92"), null,
+ null, "System structure only");
String str = ne1.toString();
assertNotNull(str);
assertTrue(str.contains("uuid"));
- assertTrue(str.contains("comment"));
}
}
diff --git a/src/test/java/org/openepics/names/rest/beans/element/NameElementCommandUpdateTest.java b/src/test/java/org/openepics/names/rest/beans/element/NameElementCommandUpdateTest.java
index 8c585527..99885321 100644
--- a/src/test/java/org/openepics/names/rest/beans/element/NameElementCommandUpdateTest.java
+++ b/src/test/java/org/openepics/names/rest/beans/element/NameElementCommandUpdateTest.java
@@ -47,10 +47,10 @@ class NameElementCommandUpdateTest {
ne1 = new NameElementCommandUpdate(
UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"), UUID.fromString("eb7e55c2-012b-419d-881a-58a858894e92"), null, null,
- "System structure only", null);
+ "System structure only");
ne2 = new NameElementCommandUpdate(
UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"), UUID.fromString("eb7e55c2-012b-419d-881a-58a858894e92"), null, null,
- "System structure only", null);
+ "System structure only");
assertEquals(ne1, ne2);
}
@@ -59,7 +59,7 @@ class NameElementCommandUpdateTest {
void equalsJson() {
ObjectMapper mapper = new ObjectMapper();
NameElementCommandUpdate ne1 = null, ne2 = null;
- String json = "{\"uuid\": \"45bdc415-cf5a-4650-b6dd-478540830c2a\", \"parentSystemStructure\": \"eb7e55c2-012b-419d-881a-58a858894e92\", \"parentDeviceStructure\": null, \"index\": null, \"description\": \"System structure only\", \"comment\": null}";
+ String json = "{\"uuid\": \"45bdc415-cf5a-4650-b6dd-478540830c2a\", \"parentSystemStructure\": \"eb7e55c2-012b-419d-881a-58a858894e92\", \"parentDeviceStructure\": null, \"index\": null, \"description\": \"System structure only\"}";
try {
ne1 = mapper.readValue(json, NameElementCommandUpdate.class);
@@ -89,10 +89,10 @@ class NameElementCommandUpdateTest {
ne1 = new NameElementCommandUpdate(
UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"), UUID.fromString("eb7e55c2-012b-419d-881a-58a858894e92"), null, null,
- "System structure only", null);
+ "System structure only");
ne2 = new NameElementCommandUpdate(
UUID.fromString("55bdc415-cf5a-4650-b6dd-478540830c2a"), UUID.fromString("eb7e55c2-012b-419d-881a-58a858894e92"), null, null,
- "System structure only", null);
+ "System structure only");
assertNotEquals(ne1, ne2);
}
@@ -101,8 +101,8 @@ class NameElementCommandUpdateTest {
void notEqualsJson() {
ObjectMapper mapper = new ObjectMapper();
NameElementCommandUpdate ne1 = null, ne2 = null;
- String json = "{\"uuid\": \"45bdc415-cf5a-4650-b6dd-478540830c2a\", \"parentSystemStructure\": \"eb7e55c2-012b-419d-881a-58a858894e92\", \"parentDeviceStructure\": null, \"index\": null, \"description\": \"System structure only\", \"comment\": null}";
- String json2 = "{\"uuid\": \"55bdc415-cf5a-4650-b6dd-478540830c2a\", \"parentSystemStructure\": \"eb7e55c2-012b-419d-881a-58a858894e92\", \"parentDeviceStructure\": null, \"index\": null, \"description\": \"System structure only\", \"comment\": null}";
+ String json = "{\"uuid\": \"45bdc415-cf5a-4650-b6dd-478540830c2a\", \"parentSystemStructure\": \"eb7e55c2-012b-419d-881a-58a858894e92\", \"parentDeviceStructure\": null, \"index\": null, \"description\": \"System structure only\"}";
+ String json2 = "{\"uuid\": \"55bdc415-cf5a-4650-b6dd-478540830c2a\", \"parentSystemStructure\": \"eb7e55c2-012b-419d-881a-58a858894e92\", \"parentDeviceStructure\": null, \"index\": null, \"description\": \"System structure only\"}";
try {
ne1 = mapper.readValue(json, NameElementCommandUpdate.class);
@@ -133,10 +133,10 @@ class NameElementCommandUpdateTest {
ne1 = new NameElementCommandUpdate(
UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"), UUID.fromString("eb7e55c2-012b-419d-881a-58a858894e92"), null, null,
- "System structure only", null);
+ "System structure only");
ne2 = new NameElementCommandUpdate(
UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"), UUID.fromString("eb7e55c2-012b-419d-881a-58a858894e92"), null, null,
- "System structure only", null);
+ "System structure only");
assertNotNull(ne1);
assertNotNull(ne2);
@@ -150,10 +150,10 @@ class NameElementCommandUpdateTest {
ne1 = new NameElementCommandUpdate(
UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"), UUID.fromString("eb7e55c2-012b-419d-881a-58a858894e92"), null, null,
- "System structure only", null);
+ "System structure only");
ne2 = new NameElementCommandUpdate(
UUID.fromString("55bdc415-cf5a-4650-b6dd-478540830c2a"), UUID.fromString("eb7e55c2-012b-419d-881a-58a858894e92"), null, null,
- "System structure only", null);
+ "System structure only");
assertNotNull(ne1);
assertNotNull(ne2);
@@ -167,13 +167,12 @@ class NameElementCommandUpdateTest {
ne1 = new NameElementCommandUpdate(
UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"), UUID.fromString("eb7e55c2-012b-419d-881a-58a858894e92"), null, null,
- "System structure only", null);
+ "System structure only");
String str = ne1.toString();
assertNotNull(str);
assertTrue(str.contains("uuid"));
- assertTrue(str.contains("comment"));
}
}
diff --git a/src/test/java/org/openepics/names/rest/beans/element/NameElementTest.java b/src/test/java/org/openepics/names/rest/beans/element/NameElementTest.java
index 18d1e395..d5a4b220 100644
--- a/src/test/java/org/openepics/names/rest/beans/element/NameElementTest.java
+++ b/src/test/java/org/openepics/names/rest/beans/element/NameElementTest.java
@@ -50,17 +50,17 @@ class NameElementTest {
Date date = new Date();
ne1 = new NameElement(
- UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"), UUID.fromString("eb7e55c2-012b-419d-881a-58a858894e92"), null, null,
- "System structure only", null,
+ UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"), UUID.fromString("eb7e55c2-012b-419d-881a-58a858894e92"), null,
+ null, "System structure only",
"Acc", null, "Acc",
Status.APPROVED, true, false,
- date, "test who");
+ date, "test who", null);
ne2 = new NameElement(
- UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"), UUID.fromString("eb7e55c2-012b-419d-881a-58a858894e92"), null, null,
- "System structure only", null,
+ UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"), UUID.fromString("eb7e55c2-012b-419d-881a-58a858894e92"), null,
+ null, "System structure only",
"Acc", null, "Acc",
Status.APPROVED, true, false,
- date, "test who");
+ date, "test who", null);
assertEquals(ne1, ne2);
}
@@ -99,17 +99,17 @@ class NameElementTest {
Date date = new Date();
ne1 = new NameElement(
- UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"), UUID.fromString("eb7e55c2-012b-419d-881a-58a858894e92"), null, null,
- "System structure only", null,
+ UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"), UUID.fromString("eb7e55c2-012b-419d-881a-58a858894e92"), null,
+ null, "System structure only",
"Acc", null, "Acc",
Status.APPROVED, true, false,
- date, "test who");
+ date, "test who", null);
ne2 = new NameElement(
- UUID.fromString("55bdc415-cf5a-4650-b6dd-478540830c2a"), UUID.fromString("eb7e55c2-012b-419d-881a-58a858894e92"), null, null,
- "System structure only", null,
+ UUID.fromString("55bdc415-cf5a-4650-b6dd-478540830c2a"), UUID.fromString("eb7e55c2-012b-419d-881a-58a858894e92"), null,
+ null, "System structure only",
"Acc", null, "Acc",
Status.APPROVED, true, false,
- date, "test who");
+ date, "test who", null);
assertNotEquals(ne1, ne2);
}
@@ -150,17 +150,17 @@ class NameElementTest {
Date date = new Date();
ne1 = new NameElement(
- UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"), UUID.fromString("eb7e55c2-012b-419d-881a-58a858894e92"), null, null,
- "System structure only", null,
+ UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"), UUID.fromString("eb7e55c2-012b-419d-881a-58a858894e92"), null,
+ null, "System structure only",
"Acc", null, "Acc",
Status.APPROVED, true, false,
- date, "test who");
+ date, "test who", null);
ne2 = new NameElement(
- UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"), UUID.fromString("eb7e55c2-012b-419d-881a-58a858894e92"), null, null,
- "System structure only", null,
+ UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"), UUID.fromString("eb7e55c2-012b-419d-881a-58a858894e92"), null,
+ null, "System structure only",
"Acc", null, "Acc",
Status.APPROVED, true, false,
- date, "test who");
+ date, "test who", null);
assertNotNull(ne1);
assertNotNull(ne2);
@@ -174,17 +174,17 @@ class NameElementTest {
Date date = new Date();
ne1 = new NameElement(
- UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"), UUID.fromString("eb7e55c2-012b-419d-881a-58a858894e92"), null, null,
- "System structure only", null,
+ UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"), UUID.fromString("eb7e55c2-012b-419d-881a-58a858894e92"), null,
+ null, "System structure only",
"Acc", null, "Acc",
Status.APPROVED, true, false,
- date, "test who");
+ date, "test who", null);
ne2 = new NameElement(
- UUID.fromString("55bdc415-cf5a-4650-b6dd-478540830c2a"), UUID.fromString("eb7e55c2-012b-419d-881a-58a858894e92"), null, null,
- "System structure only", null,
+ UUID.fromString("55bdc415-cf5a-4650-b6dd-478540830c2a"), UUID.fromString("eb7e55c2-012b-419d-881a-58a858894e92"), null,
+ null, "System structure only",
"Acc", null, "Acc",
Status.APPROVED, true, false,
- date, "test who");
+ date, "test who", null);
assertNotNull(ne1);
assertNotNull(ne2);
@@ -198,11 +198,11 @@ class NameElementTest {
Date date = new Date();
ne1 = new NameElement(
- UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"), UUID.fromString("eb7e55c2-012b-419d-881a-58a858894e92"), null, null,
- "System structure only", null,
+ UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"), UUID.fromString("eb7e55c2-012b-419d-881a-58a858894e92"), null,
+ null, "System structure only",
"Acc", null, "Acc",
Status.APPROVED, true, false,
- date, "test who");
+ date, "test who", null);
String str = ne1.toString();
@@ -218,11 +218,11 @@ class NameElementTest {
Date date = new Date();
ne1 = new NameElement(
- UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"), UUID.fromString("eb7e55c2-012b-419d-881a-58a858894e92"), null, null,
- "System structure only", null,
+ UUID.fromString("45bdc415-cf5a-4650-b6dd-478540830c2a"), UUID.fromString("eb7e55c2-012b-419d-881a-58a858894e92"), null,
+ null, "System structure only",
"Acc", null, "Acc",
Status.APPROVED, true, false,
- date, "test who");
+ date, "test who", null);
String str = ne1.toStringSimple();
diff --git a/src/test/java/org/openepics/names/rest/beans/element/StructureElementCommandConfirmTest.java b/src/test/java/org/openepics/names/rest/beans/element/StructureElementCommandConfirmTest.java
index f5470fa2..08e6ea68 100644
--- a/src/test/java/org/openepics/names/rest/beans/element/StructureElementCommandConfirmTest.java
+++ b/src/test/java/org/openepics/names/rest/beans/element/StructureElementCommandConfirmTest.java
@@ -47,9 +47,9 @@ class StructureElementCommandConfirmTest {
StructureElementCommandConfirm se1 = null, se2 = null;
se1 = new StructureElementCommandConfirm(
- UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM, "comment");
+ UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM);
se2 = new StructureElementCommandConfirm(
- UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM, "comment");
+ UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM);
assertEquals(se1, se2);
}
@@ -58,7 +58,7 @@ class StructureElementCommandConfirmTest {
void equalsJson() {
ObjectMapper mapper = new ObjectMapper();
StructureElementCommandConfirm se1 = null, se2 = null;
- String json = "{\"uuid\": \"a14a8565-de10-4026-97e3-ab129ffaba96\", \"type\": \"SYSTEM\", \"comment\": \"comment\"};";
+ String json = "{\"uuid\": \"a14a8565-de10-4026-97e3-ab129ffaba96\", \"type\": \"SYSTEM\"};";
try {
se1 = mapper.readValue(json, StructureElementCommandConfirm.class);
@@ -87,9 +87,9 @@ class StructureElementCommandConfirmTest {
StructureElementCommandConfirm se1 = null, se2 = null;
se1 = new StructureElementCommandConfirm(
- UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM, "comment");
+ UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM);
se2 = new StructureElementCommandConfirm(
- UUID.fromString("b14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM, "comment");
+ UUID.fromString("b14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM);
assertNotEquals(se1, se2);
}
@@ -98,8 +98,8 @@ class StructureElementCommandConfirmTest {
void notEqualsJson() {
ObjectMapper mapper = new ObjectMapper();
StructureElementCommandConfirm se1 = null, se2 = null;
- String json = "{\"uuid\": \"a14a8565-de10-4026-97e3-ab129ffaba96\", \"type\": \"SYSTEM\", \"comment\": \"comment\"};";
- String json2 = "{\"uuid\": \"b14a8565-de10-4026-97e3-ab129ffaba96\", \"type\": \"SYSTEM\", \"comment\": \"comment\"};";
+ String json = "{\"uuid\": \"a14a8565-de10-4026-97e3-ab129ffaba96\", \"type\": \"SYSTEM\"};";
+ String json2 = "{\"uuid\": \"b14a8565-de10-4026-97e3-ab129ffaba96\", \"type\": \"SYSTEM\"};";
try {
se1 = mapper.readValue(json, StructureElementCommandConfirm.class);
@@ -129,9 +129,9 @@ class StructureElementCommandConfirmTest {
StructureElementCommandConfirm se1 = null, se2 = null;
se1 = new StructureElementCommandConfirm(
- UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM, "comment");
+ UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM);
se2 = new StructureElementCommandConfirm(
- UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM, "comment");
+ UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM);
assertNotNull(se1);
assertNotNull(se2);
@@ -144,9 +144,9 @@ class StructureElementCommandConfirmTest {
StructureElementCommandConfirm se1 = null, se2 = null;
se1 = new StructureElementCommandConfirm(
- UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM, "comment");
+ UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM);
se2 = new StructureElementCommandConfirm(
- UUID.fromString("b14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM, "comment");
+ UUID.fromString("b14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM);
assertNotNull(se1);
assertNotNull(se2);
@@ -159,13 +159,12 @@ class StructureElementCommandConfirmTest {
StructureElementCommandConfirm se1 = null;
se1 = new StructureElementCommandConfirm(
- UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM, "comment");
+ UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM);
String str = se1.toString();
assertNotNull(str);
assertTrue(str.contains("uuid"));
- assertTrue(str.contains("comment"));
}
}
diff --git a/src/test/java/org/openepics/names/rest/beans/element/StructureElementCommandCreateTest.java b/src/test/java/org/openepics/names/rest/beans/element/StructureElementCommandCreateTest.java
index da76f3c8..fdb45ae7 100644
--- a/src/test/java/org/openepics/names/rest/beans/element/StructureElementCommandCreateTest.java
+++ b/src/test/java/org/openepics/names/rest/beans/element/StructureElementCommandCreateTest.java
@@ -47,9 +47,11 @@ class StructureElementCommandCreateTest {
StructureElementCommandCreate se1 = null, se2 = null;
se1 = new StructureElementCommandCreate(
- Type.SYSTEM, UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), "AA1", 41, "description", "comment");
+ Type.SYSTEM, UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"),
+ "AA1", 41, "description");
se2 = new StructureElementCommandCreate(
- Type.SYSTEM, UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), "AA1", 41, "description", "comment");
+ Type.SYSTEM, UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"),
+ "AA1", 41, "description");
assertEquals(se1, se2);
}
@@ -58,7 +60,7 @@ class StructureElementCommandCreateTest {
void equalsJson() {
ObjectMapper mapper = new ObjectMapper();
StructureElementCommandCreate se1 = null, se2 = null;
- String json = "{\"type\": \"SYSTEM\", \"parent\": \"a14a8565-de10-4026-97e3-ab129ffaba96\", \"mnemonic\": \"AA1\", \"ordering\": \"41\", \"description\": \"description\", \"comment\": \"comment\"};";
+ String json = "{\"type\": \"SYSTEM\", \"parent\": \"a14a8565-de10-4026-97e3-ab129ffaba96\", \"mnemonic\": \"AA1\", \"ordering\": \"41\", \"description\": \"description\"};";
try {
se1 = mapper.readValue(json, StructureElementCommandCreate.class);
@@ -87,9 +89,11 @@ class StructureElementCommandCreateTest {
StructureElementCommandCreate se1 = null, se2 = null;
se1 = new StructureElementCommandCreate(
- Type.SYSTEM, UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), "AA1", 41, "description", "comment");
+ Type.SYSTEM, UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"),
+ "AA1", 41, "description");
se2 = new StructureElementCommandCreate(
- Type.SYSTEM, UUID.fromString("b14a8565-de10-4026-97e3-ab129ffaba96"), "AA1", 41, "description", "comment");
+ Type.SYSTEM, UUID.fromString("b14a8565-de10-4026-97e3-ab129ffaba96"),
+ "AA1", 41, "description");
assertNotEquals(se1, se2);
}
@@ -98,8 +102,8 @@ class StructureElementCommandCreateTest {
void notEqualsJson() {
ObjectMapper mapper = new ObjectMapper();
StructureElementCommandCreate se1 = null, se2 = null;
- String json = "{\"type\": \"SYSTEM\", \"parent\": \"a14a8565-de10-4026-97e3-ab129ffaba96\", \"mnemonic\": \"AA1\", \"ordering\": \"41\", \"description\": \"description\", \"comment\": \"comment\"};";
- String json2 = "{\"type\": \"SYSTEM\", \"parent\": \"b14a8565-de10-4026-97e3-ab129ffaba96\", \"mnemonic\": \"AA1\", \"ordering\": \"41\", \"description\": \"description\", \"comment\": \"comment\"};";
+ String json = "{\"type\": \"SYSTEM\", \"parent\": \"a14a8565-de10-4026-97e3-ab129ffaba96\", \"mnemonic\": \"AA1\", \"ordering\": \"41\", \"description\": \"description\"};";
+ String json2 = "{\"type\": \"SYSTEM\", \"parent\": \"b14a8565-de10-4026-97e3-ab129ffaba96\", \"mnemonic\": \"AA1\", \"ordering\": \"41\", \"description\": \"description\"};";
try {
se1 = mapper.readValue(json, StructureElementCommandCreate.class);
@@ -129,9 +133,11 @@ class StructureElementCommandCreateTest {
StructureElementCommandCreate se1 = null, se2 = null;
se1 = new StructureElementCommandCreate(
- Type.SYSTEM, UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), "AA1", 41, "description", "comment");
+ Type.SYSTEM, UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"),
+ "AA1", 41, "description");
se2 = new StructureElementCommandCreate(
- Type.SYSTEM, UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), "AA1", 41, "description", "comment");
+ Type.SYSTEM, UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"),
+ "AA1", 41, "description");
assertNotNull(se1);
assertNotNull(se2);
@@ -144,9 +150,11 @@ class StructureElementCommandCreateTest {
StructureElementCommandCreate se1 = null, se2 = null;
se1 = new StructureElementCommandCreate(
- Type.SYSTEM, UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), "AA1", 41, "description", "comment");
+ Type.SYSTEM, UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"),
+ "AA1", 41, "description");
se2 = new StructureElementCommandCreate(
- Type.SYSTEM, UUID.fromString("b14a8565-de10-4026-97e3-ab129ffaba96"), "AA1", 41, "description", "comment");
+ Type.SYSTEM, UUID.fromString("b14a8565-de10-4026-97e3-ab129ffaba96"),
+ "AA1", 41, "description");
assertNotNull(se1);
assertNotNull(se2);
@@ -159,13 +167,13 @@ class StructureElementCommandCreateTest {
StructureElementCommandCreate se1 = null;
se1 = new StructureElementCommandCreate(
- Type.SYSTEM, UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), "AA1", 41, "description", "comment");
+ Type.SYSTEM, UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"),
+ "AA1", 41, "description");
String str = se1.toString();
assertNotNull(str);
assertTrue(str.contains("parent"));
- assertTrue(str.contains("comment"));
}
}
diff --git a/src/test/java/org/openepics/names/rest/beans/element/StructureElementCommandTest.java b/src/test/java/org/openepics/names/rest/beans/element/StructureElementCommandTest.java
index fd65f7db..385f6373 100644
--- a/src/test/java/org/openepics/names/rest/beans/element/StructureElementCommandTest.java
+++ b/src/test/java/org/openepics/names/rest/beans/element/StructureElementCommandTest.java
@@ -47,9 +47,11 @@ class StructureElementCommandTest {
StructureElementCommand se1 = null, se2 = null;
se1 = new StructureElementCommand(
- UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM, UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"), "AA1", 41, "description", "comment");
+ UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM, UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"),
+ "AA1", 41, "description");
se2 = new StructureElementCommand(
- UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM, UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"), "AA1", 41, "description", "comment");
+ UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM, UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"),
+ "AA1", 41, "description");
assertEquals(se1, se2);
}
@@ -58,7 +60,7 @@ class StructureElementCommandTest {
void equalsJson() {
ObjectMapper mapper = new ObjectMapper();
StructureElementCommand se1 = null, se2 = null;
- String json = "{\"uuid\": \"a14a8565-de10-4026-97e3-ab129ffaba96\", \"type\": \"SYSTEM\", \"parent\": \"05d52f1c-391e-41e3-a48f-dc8f36f8329b\", \"mnemonic\": \"AA1\", \"ordering\": \"41\", \"description\": \"description\", \"comment\": \"comment\"};";
+ String json = "{\"uuid\": \"a14a8565-de10-4026-97e3-ab129ffaba96\", \"type\": \"SYSTEM\", \"parent\": \"05d52f1c-391e-41e3-a48f-dc8f36f8329b\", \"mnemonic\": \"AA1\", \"ordering\": \"41\", \"description\": \"description\"};";
try {
se1 = mapper.readValue(json, StructureElementCommand.class);
@@ -87,9 +89,11 @@ class StructureElementCommandTest {
StructureElementCommand se1 = null, se2 = null;
se1 = new StructureElementCommand(
- UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM, UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"), "AA1", 41, "description", "comment");
+ UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM, UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"),
+ "AA1", 41, "description");
se2 = new StructureElementCommand(
- UUID.fromString("b14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM, UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"), "AA1", 41, "description", "comment");
+ UUID.fromString("b14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM, UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"),
+ "AA1", 41, "description");
assertNotEquals(se1, se2);
}
@@ -98,8 +102,8 @@ class StructureElementCommandTest {
void notEqualsJson() {
ObjectMapper mapper = new ObjectMapper();
StructureElementCommand se1 = null, se2 = null;
- String json = "{\"uuid\": \"a14a8565-de10-4026-97e3-ab129ffaba96\", \"type\": \"SYSTEM\", \"parent\": \"05d52f1c-391e-41e3-a48f-dc8f36f8329b\", \"mnemonic\": \"AA1\", \"ordering\": \"41\", \"description\": \"description\", \"comment\": \"comment\"};";
- String json2 = "{\"uuid\": \"b14a8565-de10-4026-97e3-ab129ffaba96\", \"type\": \"SYSTEM\", \"parent\": \"05d52f1c-391e-41e3-a48f-dc8f36f8329b\", \"mnemonic\": \"AA1\", \"ordering\": \"41\", \"description\": \"description\", \"comment\": \"comment\"};";
+ String json = "{\"uuid\": \"a14a8565-de10-4026-97e3-ab129ffaba96\", \"type\": \"SYSTEM\", \"parent\": \"05d52f1c-391e-41e3-a48f-dc8f36f8329b\", \"mnemonic\": \"AA1\", \"ordering\": \"41\", \"description\": \"description\"};";
+ String json2 = "{\"uuid\": \"b14a8565-de10-4026-97e3-ab129ffaba96\", \"type\": \"SYSTEM\", \"parent\": \"05d52f1c-391e-41e3-a48f-dc8f36f8329b\", \"mnemonic\": \"AA1\", \"ordering\": \"41\", \"description\": \"description\"};";
try {
se1 = mapper.readValue(json, StructureElementCommand.class);
@@ -129,9 +133,11 @@ class StructureElementCommandTest {
StructureElementCommand se1 = null, se2 = null;
se1 = new StructureElementCommand(
- UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM, UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"), "AA1", 41, "description", "comment");
+ UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM, UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"),
+ "AA1", 41, "description");
se2 = new StructureElementCommand(
- UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM, UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"), "AA1", 41, "description", "comment");
+ UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM, UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"),
+ "AA1", 41, "description");
assertNotNull(se1);
assertNotNull(se2);
@@ -144,9 +150,11 @@ class StructureElementCommandTest {
StructureElementCommand se1 = null, se2 = null;
se1 = new StructureElementCommand(
- UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM, UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"), "AA1", 41, "description", "comment");
+ UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM, UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"),
+ "AA1", 41, "description");
se2 = new StructureElementCommand(
- UUID.fromString("b14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM, UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"), "AA1", 41, "description", "comment");
+ UUID.fromString("b14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM, UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"),
+ "AA1", 41, "description");
assertNotNull(se1);
assertNotNull(se2);
@@ -159,13 +167,13 @@ class StructureElementCommandTest {
StructureElementCommand se1 = null;
se1 = new StructureElementCommand(
- UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM, UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"), "AA1", 41, "description", "comment");
+ UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM, UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"),
+ "AA1", 41, "description");
String str = se1.toString();
assertNotNull(str);
assertTrue(str.contains("uuid"));
- assertTrue(str.contains("comment"));
}
}
diff --git a/src/test/java/org/openepics/names/rest/beans/element/StructureElementCommandUpdateTest.java b/src/test/java/org/openepics/names/rest/beans/element/StructureElementCommandUpdateTest.java
index 77d4cd5e..7b093e82 100644
--- a/src/test/java/org/openepics/names/rest/beans/element/StructureElementCommandUpdateTest.java
+++ b/src/test/java/org/openepics/names/rest/beans/element/StructureElementCommandUpdateTest.java
@@ -47,9 +47,11 @@ class StructureElementCommandUpdateTest {
StructureElementCommandUpdate se1 = null, se2 = null;
se1 = new StructureElementCommandUpdate(
- UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM, UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"), "AA1", 41, "description", "comment");
+ UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM, UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"),
+ "AA1", 41, "description");
se2 = new StructureElementCommandUpdate(
- UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM, UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"), "AA1", 41, "description", "comment");
+ UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM, UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"),
+ "AA1", 41, "description");
assertEquals(se1, se2);
}
@@ -58,7 +60,7 @@ class StructureElementCommandUpdateTest {
void equalsJson() {
ObjectMapper mapper = new ObjectMapper();
StructureElementCommandUpdate se1 = null, se2 = null;
- String json = "{\"uuid\": \"a14a8565-de10-4026-97e3-ab129ffaba96\", \"type\": \"SYSTEM\", \"parent\": \"05d52f1c-391e-41e3-a48f-dc8f36f8329b\", \"mnemonic\": \"AA1\", \"ordering\": \"41\", \"description\": \"description\", \"comment\": \"comment\"};";
+ String json = "{\"uuid\": \"a14a8565-de10-4026-97e3-ab129ffaba96\", \"type\": \"SYSTEM\", \"parent\": \"05d52f1c-391e-41e3-a48f-dc8f36f8329b\", \"mnemonic\": \"AA1\", \"ordering\": \"41\", \"description\": \"description\"};";
try {
se1 = mapper.readValue(json, StructureElementCommandUpdate.class);
@@ -87,9 +89,11 @@ class StructureElementCommandUpdateTest {
StructureElementCommandUpdate se1 = null, se2 = null;
se1 = new StructureElementCommandUpdate(
- UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM, UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"), "AA1", 41, "description", "comment");
+ UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM, UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"),
+ "AA1", 41, "description");
se2 = new StructureElementCommandUpdate(
- UUID.fromString("b14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM, UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"), "AA1", 41, "description", "comment");
+ UUID.fromString("b14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM, UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"),
+ "AA1", 41, "description");
assertNotEquals(se1, se2);
}
@@ -98,8 +102,8 @@ class StructureElementCommandUpdateTest {
void notEqualsJson() {
ObjectMapper mapper = new ObjectMapper();
StructureElementCommandUpdate se1 = null, se2 = null;
- String json = "{\"uuid\": \"a14a8565-de10-4026-97e3-ab129ffaba96\", \"type\": \"SYSTEM\", \"parent\": \"05d52f1c-391e-41e3-a48f-dc8f36f8329b\", \"mnemonic\": \"AA1\", \"ordering\": \"41\", \"description\": \"description\", \"comment\": \"comment\"};";
- String json2 = "{\"uuid\": \"b14a8565-de10-4026-97e3-ab129ffaba96\", \"type\": \"SYSTEM\", \"parent\": \"05d52f1c-391e-41e3-a48f-dc8f36f8329b\", \"mnemonic\": \"AA1\", \"ordering\": \"41\", \"description\": \"description\", \"comment\": \"comment\"};";
+ String json = "{\"uuid\": \"a14a8565-de10-4026-97e3-ab129ffaba96\", \"type\": \"SYSTEM\", \"parent\": \"05d52f1c-391e-41e3-a48f-dc8f36f8329b\", \"mnemonic\": \"AA1\", \"ordering\": \"41\", \"description\": \"description\"};";
+ String json2 = "{\"uuid\": \"b14a8565-de10-4026-97e3-ab129ffaba96\", \"type\": \"SYSTEM\", \"parent\": \"05d52f1c-391e-41e3-a48f-dc8f36f8329b\", \"mnemonic\": \"AA1\", \"ordering\": \"41\", \"description\": \"description\"};";
try {
se1 = mapper.readValue(json, StructureElementCommandUpdate.class);
@@ -129,9 +133,11 @@ class StructureElementCommandUpdateTest {
StructureElementCommandUpdate se1 = null, se2 = null;
se1 = new StructureElementCommandUpdate(
- UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM, UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"), "AA1", 41, "description", "comment");
+ UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM, UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"),
+ "AA1", 41, "description");
se2 = new StructureElementCommandUpdate(
- UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM, UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"), "AA1", 41, "description", "comment");
+ UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM, UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"),
+ "AA1", 41, "description");
assertNotNull(se1);
assertNotNull(se2);
@@ -144,9 +150,11 @@ class StructureElementCommandUpdateTest {
StructureElementCommandUpdate se1 = null, se2 = null;
se1 = new StructureElementCommandUpdate(
- UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM, UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"), "AA1", 41, "description", "comment");
+ UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM, UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"),
+ "AA1", 41, "description");
se2 = new StructureElementCommandUpdate(
- UUID.fromString("b14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM, UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"), "AA1", 41, "description", "comment");
+ UUID.fromString("b14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM, UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"),
+ "AA1", 41, "description");
assertNotNull(se1);
assertNotNull(se2);
@@ -159,13 +167,13 @@ class StructureElementCommandUpdateTest {
StructureElementCommandUpdate se1 = null;
se1 = new StructureElementCommandUpdate(
- UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM, UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"), "AA1", 41, "description", "comment");
+ UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM, UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"),
+ "AA1", 41, "description");
String str = se1.toString();
assertNotNull(str);
assertTrue(str.contains("uuid"));
- assertTrue(str.contains("comment"));
}
}
diff --git a/src/test/java/org/openepics/names/rest/beans/element/StructureElementTest.java b/src/test/java/org/openepics/names/rest/beans/element/StructureElementTest.java
index 31883038..9454bfbd 100644
--- a/src/test/java/org/openepics/names/rest/beans/element/StructureElementTest.java
+++ b/src/test/java/org/openepics/names/rest/beans/element/StructureElementTest.java
@@ -51,17 +51,17 @@ class StructureElementTest {
Date date = new Date();
se1 = new StructureElement(
- UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM, UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"), "AA1", 41,
- "description", "comment",
+ UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM, UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"),
+ "AA1", 41, "description",
"AA1", 2,
Status.APPROVED, true, false,
- date, "test who");
+ date, "test who", "comment");
se2 = new StructureElement(
- UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM, UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"), "AA1", 41,
- "description", "comment",
+ UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM, UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"),
+ "AA1", 41, "description",
"AA1", 2,
Status.APPROVED, true, false,
- date, "test who");
+ date, "test who", "comment");
assertEquals(se1, se2);
}
@@ -100,17 +100,17 @@ class StructureElementTest {
Date date = new Date();
se1 = new StructureElement(
- UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM, UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"), "AA1", 41,
- "description", "comment",
+ UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM, UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"),
+ "AA1", 41, "description",
"AA1", 2,
Status.APPROVED, true, false,
- date, "test who");
+ date, "test who", "comment");
se2 = new StructureElement(
- UUID.fromString("b14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM, UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"), "AA1", 41,
- "description", "comment",
+ UUID.fromString("b14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM, UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"),
+ "AA1", 41, "description",
"AA1", 2,
Status.APPROVED, true, false,
- date, "test who");
+ date, "test who", "comment");
assertNotEquals(se1, se2);
}
@@ -151,17 +151,17 @@ class StructureElementTest {
Date date = new Date();
se1 = new StructureElement(
- UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM, UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"), "AA1", 41,
- "description", "comment",
+ UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM, UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"),
+ "AA1", 41, "description",
"AA1", 2,
Status.APPROVED, true, false,
- date, "test who");
+ date, "test who", "comment");
se2 = new StructureElement(
- UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM, UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"), "AA1", 41,
- "description", "comment",
+ UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM, UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"),
+ "AA1", 41, "description",
"AA1", 2,
Status.APPROVED, true, false,
- date, "test who");
+ date, "test who", "comment");
assertNotNull(se1);
assertNotNull(se2);
@@ -175,17 +175,17 @@ class StructureElementTest {
Date date = new Date();
se1 = new StructureElement(
- UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM, UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"), "AA1", 41,
- "description", "comment",
+ UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM, UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"),
+ "AA1", 41, "description",
"AA1", 2,
Status.APPROVED, true, false,
- date, "test who");
+ date, "test who", "comment");
se2 = new StructureElement(
- UUID.fromString("b14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM, UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"), "AA1", 41,
- "description", "comment",
+ UUID.fromString("b14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM, UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"),
+ "AA1", 41, "description",
"AA1", 2,
Status.APPROVED, true, false,
- date, "test who");
+ date, "test who", "comment");
assertNotNull(se1);
assertNotNull(se2);
@@ -199,11 +199,11 @@ class StructureElementTest {
Date date = new Date();
se1 = new StructureElement(
- UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM, UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"), "AA1", 41,
- "description", "comment",
+ UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM, UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"),
+ "AA1", 41, "description",
"AA1", 2,
Status.APPROVED, true, false,
- date, "test who");
+ date, "test who", "comment");
String str = se1.toString();
@@ -219,11 +219,11 @@ class StructureElementTest {
Date date = new Date();
se1 = new StructureElement(
- UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM, UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"), "AA1", 41,
- "description", "comment",
+ UUID.fromString("a14a8565-de10-4026-97e3-ab129ffaba96"), Type.SYSTEM, UUID.fromString("05d52f1c-391e-41e3-a48f-dc8f36f8329b"),
+ "AA1", 41, "description",
"AA1", 2,
Status.APPROVED, true, false,
- date, "test who");
+ date, "test who", "comment");
String str = se1.toStringSimple();
diff --git a/src/test/java/org/openepics/names/util/NameElementUtilTest.java b/src/test/java/org/openepics/names/util/NameElementUtilTest.java
index 1c22959b..38ce1a5c 100644
--- a/src/test/java/org/openepics/names/util/NameElementUtilTest.java
+++ b/src/test/java/org/openepics/names/util/NameElementUtilTest.java
@@ -79,11 +79,11 @@ class NameElementUtilTest {
UUID uuid = UUID.randomUUID();
UUID parentSystemStructure = UUID.randomUUID();
UUID parentDeviceStructure = UUID.randomUUID();
+ String index = "ty";
+ String description = "op";
String systemStructure = "qw";
String deviceStructure = "er";
- String index = "ty";
String name = "ui";
- String description = "op";
Status status = Status.APPROVED;
Boolean latest = Boolean.TRUE;
Boolean deleted = Boolean.FALSE;
@@ -92,11 +92,10 @@ class NameElementUtilTest {
String comment = "df";
NameElement nameElement = NameElementUtil.getNameElement(
- uuid,
- parentSystemStructure, parentDeviceStructure,
- systemStructure, deviceStructure,
- index, name,
- description, status, latest, deleted,
+ uuid, parentSystemStructure, parentDeviceStructure,
+ index, description,
+ systemStructure, deviceStructure, name,
+ status, latest, deleted,
when, who, comment);
assertNotNull(nameElement);
@@ -127,9 +126,8 @@ class NameElementUtilTest {
UUID uuid3 = UUID.randomUUID();
String str1 = "qwer";
String str2 = "asdf";
- String str3 = "zxcv";
- NameElementCommandCreate commandCreate = new NameElementCommandCreate(uuid2, uuid3, str1, str2, str3);
+ NameElementCommandCreate commandCreate = new NameElementCommandCreate(uuid2, uuid3, str1, str2);
NameElementCommand command = NameElementUtil.convertCommandCreate2Command(commandCreate);
assertNotNull(command);
@@ -138,7 +136,6 @@ class NameElementUtilTest {
assertEquals(uuid3, command.getParentDeviceStructure());
assertEquals(str1, command.getIndex());
assertEquals(str2, command.getDescription());
- assertEquals(str3, command.getComment());
}
/**
@@ -151,9 +148,8 @@ class NameElementUtilTest {
UUID uuid3 = UUID.randomUUID();
String str1 = "qwer";
String str2 = "asdf";
- String str3 = "zxcv";
- NameElementCommandUpdate commandUpdate = new NameElementCommandUpdate(uuid1, uuid2, uuid3, str1, str2, str3);
+ NameElementCommandUpdate commandUpdate = new NameElementCommandUpdate(uuid1, uuid2, uuid3, str1, str2);
NameElementCommand command = NameElementUtil.convertCommandUpdate2Command(commandUpdate);
assertNotNull(command);
@@ -162,7 +158,6 @@ class NameElementUtilTest {
assertEquals(uuid3, command.getParentDeviceStructure());
assertEquals(str1, command.getIndex());
assertEquals(str2, command.getDescription());
- assertEquals(str3, command.getComment());
}
/**
@@ -171,9 +166,8 @@ class NameElementUtilTest {
@Test
void convertCommandConfirm2Command() {
UUID uuid1 = UUID.randomUUID();
- String str3 = "zxcv";
- NameElementCommandConfirm commandConfirm = new NameElementCommandConfirm(uuid1, str3);
+ NameElementCommandConfirm commandConfirm = new NameElementCommandConfirm(uuid1);
NameElementCommand command = NameElementUtil.convertCommandConfirm2Command(commandConfirm);
assertNotNull(command);
@@ -182,7 +176,6 @@ class NameElementUtilTest {
assertNull(command.getParentDeviceStructure());
assertNull(command.getIndex());
assertNull(command.getDescription());
- assertEquals(str3, command.getComment());
}
// ----------------------------------------------------------------------------------------------------
@@ -197,9 +190,8 @@ class NameElementUtilTest {
UUID uuid3 = UUID.randomUUID();
String str1 = "qwer";
String str2 = "asdf";
- String str3 = "zxcv";
- NameElementCommand command = new NameElementCommand(uuid1, uuid2, uuid3, str1, str2, str3);
+ NameElementCommand command = new NameElementCommand(uuid1, uuid2, uuid3, str1, str2);
NameElementCommandCreate commandCreate = NameElementUtil.convertCommand2CommandCreate(command);
assertNotNull(commandCreate);
@@ -207,7 +199,6 @@ class NameElementUtilTest {
assertEquals(uuid3, commandCreate.getParentDeviceStructure());
assertEquals(str1, commandCreate.getIndex());
assertEquals(str2, commandCreate.getDescription());
- assertEquals(str3, commandCreate.getComment());
NameElementCommandCreate[] commandCreate2 = NameElementUtil.convertCommand2CommandCreate(new NameElementCommand[] {command});
@@ -218,7 +209,6 @@ class NameElementUtilTest {
assertEquals(uuid3, commandCreate2[0].getParentDeviceStructure());
assertEquals(str1, commandCreate2[0].getIndex());
assertEquals(str2, commandCreate2[0].getDescription());
- assertEquals(str3, commandCreate2[0].getComment());
}
/**
@@ -231,9 +221,8 @@ class NameElementUtilTest {
UUID uuid3 = UUID.randomUUID();
String str1 = "qwer";
String str2 = "asdf";
- String str3 = "zxcv";
- NameElementCommand command = new NameElementCommand(uuid1, uuid2, uuid3, str1, str2, str3);
+ NameElementCommand command = new NameElementCommand(uuid1, uuid2, uuid3, str1, str2);
NameElementCommandUpdate commandUpdate = NameElementUtil.convertCommand2CommandUpdate(command);
assertNotNull(commandUpdate);
@@ -242,7 +231,6 @@ class NameElementUtilTest {
assertEquals(uuid3, commandUpdate.getParentDeviceStructure());
assertEquals(str1, commandUpdate.getIndex());
assertEquals(str2, commandUpdate.getDescription());
- assertEquals(str3, commandUpdate.getComment());
NameElementCommandUpdate[] commandUpdate2 = NameElementUtil.convertCommand2CommandUpdate(new NameElementCommand[] {command});
@@ -254,7 +242,6 @@ class NameElementUtilTest {
assertEquals(uuid3, commandUpdate2[0].getParentDeviceStructure());
assertEquals(str1, commandUpdate2[0].getIndex());
assertEquals(str2, commandUpdate2[0].getDescription());
- assertEquals(str3, commandUpdate2[0].getComment());
}
/**
@@ -267,14 +254,12 @@ class NameElementUtilTest {
UUID uuid3 = UUID.randomUUID();
String str1 = "qwer";
String str2 = "asdf";
- String str3 = "zxcv";
- NameElementCommand command = new NameElementCommand(uuid1, uuid2, uuid3, str1, str2, str3);
+ NameElementCommand command = new NameElementCommand(uuid1, uuid2, uuid3, str1, str2);
NameElementCommandConfirm commandConfirm = NameElementUtil.convertCommand2CommandConfirm(command);
assertNotNull(commandConfirm);
assertEquals(uuid1, commandConfirm.getUuid());
- assertEquals(str3, commandConfirm.getComment());
NameElementCommandConfirm[] commandConfirm2 = NameElementUtil.convertCommand2CommandConfirm(new NameElementCommand[] {command});
@@ -282,7 +267,6 @@ class NameElementUtilTest {
assertEquals(1, commandConfirm2.length);
assertNotNull(commandConfirm2[0]);
assertEquals(uuid1, commandConfirm2[0].getUuid());
- assertEquals(str3, commandConfirm2[0].getComment());
}
// ----------------------------------------------------------------------------------------------------
@@ -295,11 +279,11 @@ class NameElementUtilTest {
UUID uuid = UUID.randomUUID();
UUID parentSystemStructure = UUID.randomUUID();
UUID parentDeviceStructure = UUID.randomUUID();
+ String index = "ty";
+ String description = "op";
String systemStructure = "qw";
String deviceStructure = "er";
- String index = "ty";
String name = "ui";
- String description = "op";
Status status = Status.APPROVED;
Boolean latest = Boolean.TRUE;
Boolean deleted = Boolean.FALSE;
@@ -308,11 +292,10 @@ class NameElementUtilTest {
String comment = "df";
NameElement element = NameElementUtil.getNameElement(
- uuid,
- parentSystemStructure, parentDeviceStructure,
- systemStructure, deviceStructure,
- index, name,
- description, status, latest, deleted,
+ uuid, parentSystemStructure, parentDeviceStructure,
+ index, description,
+ systemStructure, deviceStructure, name,
+ status, latest, deleted,
when, who, comment);
NameElementCommandCreate commandCreate = NameElementUtil.convertElement2CommandCreate(element);
@@ -322,7 +305,6 @@ class NameElementUtilTest {
assertEquals(parentDeviceStructure, commandCreate.getParentDeviceStructure());
assertEquals(index, commandCreate.getIndex());
assertEquals(description, commandCreate.getDescription());
- assertEquals(comment, commandCreate.getComment());
NameElementCommandCreate[] commandCreate2 = NameElementUtil.convertElement2CommandCreate(new NameElement[] {element});
@@ -333,7 +315,6 @@ class NameElementUtilTest {
assertEquals(parentDeviceStructure, commandCreate2[0].getParentDeviceStructure());
assertEquals(index, commandCreate2[0].getIndex());
assertEquals(description, commandCreate2[0].getDescription());
- assertEquals(comment, commandCreate2[0].getComment());
}
/**
@@ -344,11 +325,11 @@ class NameElementUtilTest {
UUID uuid = UUID.randomUUID();
UUID parentSystemStructure = UUID.randomUUID();
UUID parentDeviceStructure = UUID.randomUUID();
+ String index = "ty";
+ String description = "op";
String systemStructure = "qw";
String deviceStructure = "er";
- String index = "ty";
String name = "ui";
- String description = "op";
Status status = Status.APPROVED;
Boolean latest = Boolean.TRUE;
Boolean deleted = Boolean.FALSE;
@@ -357,11 +338,10 @@ class NameElementUtilTest {
String comment = "df";
NameElement element = NameElementUtil.getNameElement(
- uuid,
- parentSystemStructure, parentDeviceStructure,
- systemStructure, deviceStructure,
- index, name,
- description, status, latest, deleted,
+ uuid, parentSystemStructure, parentDeviceStructure,
+ index, description,
+ systemStructure, deviceStructure, name,
+ status, latest, deleted,
when, who, comment);
NameElementCommandUpdate commandUpdate = NameElementUtil.convertElement2CommandUpdate(element);
@@ -372,7 +352,6 @@ class NameElementUtilTest {
assertEquals(parentDeviceStructure, commandUpdate.getParentDeviceStructure());
assertEquals(index, commandUpdate.getIndex());
assertEquals(description, commandUpdate.getDescription());
- assertEquals(comment, commandUpdate.getComment());
NameElementCommandUpdate[] commandUpdate2 = NameElementUtil.convertElement2CommandUpdate(new NameElement[] {element});
@@ -384,7 +363,6 @@ class NameElementUtilTest {
assertEquals(parentDeviceStructure, commandUpdate2[0].getParentDeviceStructure());
assertEquals(index, commandUpdate2[0].getIndex());
assertEquals(description, commandUpdate2[0].getDescription());
- assertEquals(comment, commandUpdate2[0].getComment());
}
/**
@@ -395,11 +373,11 @@ class NameElementUtilTest {
UUID uuid = UUID.randomUUID();
UUID parentSystemStructure = UUID.randomUUID();
UUID parentDeviceStructure = UUID.randomUUID();
+ String index = "ty";
+ String description = "op";
String systemStructure = "qw";
String deviceStructure = "er";
- String index = "ty";
String name = "ui";
- String description = "op";
Status status = Status.APPROVED;
Boolean latest = Boolean.TRUE;
Boolean deleted = Boolean.FALSE;
@@ -408,18 +386,16 @@ class NameElementUtilTest {
String comment = "df";
NameElement element = NameElementUtil.getNameElement(
- uuid,
- parentSystemStructure, parentDeviceStructure,
- systemStructure, deviceStructure,
- index, name,
- description, status, latest, deleted,
+ uuid, parentSystemStructure, parentDeviceStructure,
+ index, description,
+ systemStructure, deviceStructure, name,
+ status, latest, deleted,
when, who, comment);
NameElementCommandConfirm commandConfirm = NameElementUtil.convertElement2CommandConfirm(element);
assertNotNull(commandConfirm);
assertEquals(uuid, commandConfirm.getUuid());
- assertEquals(comment, commandConfirm.getComment());
NameElementCommandConfirm[] commandConfirm2 = NameElementUtil.convertElement2CommandConfirm(new NameElement[] {element});
@@ -427,7 +403,6 @@ class NameElementUtilTest {
assertEquals(1, commandConfirm2.length);
assertNotNull(commandConfirm2[0]);
assertEquals(uuid, commandConfirm2[0].getUuid());
- assertEquals(comment, commandConfirm2[0].getComment());
}
}
diff --git a/src/test/java/org/openepics/names/util/StructureElementUtilTest.java b/src/test/java/org/openepics/names/util/StructureElementUtilTest.java
index eed41ecd..eda0b66a 100644
--- a/src/test/java/org/openepics/names/util/StructureElementUtilTest.java
+++ b/src/test/java/org/openepics/names/util/StructureElementUtilTest.java
@@ -53,10 +53,10 @@ class StructureElementUtilTest {
Type type = Type.DEVICETYPE;
UUID parent = UUID.randomUUID();
String mnemonic = "jk";
- String mnemonicPath = "zx";
Integer ordering = 41;
- Integer level = 3;
String description = "cv";
+ String mnemonicPath = "zx";
+ Integer level = 3;
Status status = Status.PENDING;
Boolean latest = Boolean.FALSE;
Boolean deleted = Boolean.FALSE;
@@ -65,11 +65,10 @@ class StructureElementUtilTest {
String comment = "ml";
StructureElement structureElement = StructureElementUtil.getStructureElement(
- uuid,
- type,
- parent,
- mnemonic, mnemonicPath, ordering, level,
- description, status, latest, deleted,
+ uuid, type, parent,
+ mnemonic, ordering, description,
+ mnemonicPath, level,
+ status, latest, deleted,
when, who, comment);
assertNotNull(structureElement);
@@ -132,10 +131,9 @@ class StructureElementUtilTest {
UUID uuid2 = UUID.randomUUID();
String str2 = "asdf";
String str3 = "zxcv";
- String str4 = "tyui";
Integer int1 = 41;
- StructureElementCommandCreate commandCreate = new StructureElementCommandCreate(type, uuid2, str2, int1, str3, str4);
+ StructureElementCommandCreate commandCreate = new StructureElementCommandCreate(type, uuid2, str2, int1, str3);
StructureElementCommand command = StructureElementUtil.convertCommandCreate2Command(commandCreate);
assertNull(command.getUuid());
@@ -144,7 +142,6 @@ class StructureElementUtilTest {
assertEquals(str2, command.getMnemonic());
assertEquals(int1, command.getOrdering());
assertEquals(str3, command.getDescription());
- assertEquals(str4, command.getComment());
}
/**
@@ -157,10 +154,9 @@ class StructureElementUtilTest {
UUID uuid2 = UUID.randomUUID();
String str2 = "asdf";
String str3 = "zxcv";
- String str4 = "tyui";
Integer int1 = 41;
- StructureElementCommandUpdate commandUpdate = new StructureElementCommandUpdate(uuid1, type, uuid2, str2, int1, str3, str4);
+ StructureElementCommandUpdate commandUpdate = new StructureElementCommandUpdate(uuid1, type, uuid2, str2, int1, str3);
StructureElementCommand command = StructureElementUtil.convertCommandUpdate2Command(commandUpdate);
assertEquals(uuid1, command.getUuid());
@@ -169,7 +165,6 @@ class StructureElementUtilTest {
assertEquals(str2, command.getMnemonic());
assertEquals(int1, command.getOrdering());
assertEquals(str3, command.getDescription());
- assertEquals(str4, command.getComment());
}
/**
@@ -179,9 +174,8 @@ class StructureElementUtilTest {
void convertCommandConfirm2Command() {
UUID uuid1 = UUID.randomUUID();
Type type = Type.SUBSYSTEM;
- String str4 = "tyui";
- StructureElementCommandConfirm commandConfirm = new StructureElementCommandConfirm(uuid1, type, str4);
+ StructureElementCommandConfirm commandConfirm = new StructureElementCommandConfirm(uuid1, type);
StructureElementCommand command = StructureElementUtil.convertCommandConfirm2Command(commandConfirm);
assertEquals(uuid1, command.getUuid());
@@ -190,7 +184,6 @@ class StructureElementUtilTest {
assertNull(command.getMnemonic());
assertNull(command.getOrdering());
assertNull(command.getDescription());
- assertEquals(str4, command.getComment());
}
// ----------------------------------------------------------------------------------------------------
@@ -205,10 +198,9 @@ class StructureElementUtilTest {
UUID uuid2 = UUID.randomUUID();
String str2 = "asdf";
String str3 = "zxcv";
- String str4 = "tyui";
Integer int1 = 41;
- StructureElementCommand command = new StructureElementCommand(uuid1, type, uuid2, str2, int1, str3, str4);
+ StructureElementCommand command = new StructureElementCommand(uuid1, type, uuid2, str2, int1, str3);
StructureElementCommandCreate commandCreate = StructureElementUtil.convertCommand2CommandCreate(command);
assertNotNull(commandCreate);
@@ -217,7 +209,6 @@ class StructureElementUtilTest {
assertEquals(str2, commandCreate.getMnemonic());
assertEquals(int1, command.getOrdering());
assertEquals(str3, commandCreate.getDescription());
- assertEquals(str4, commandCreate.getComment());
StructureElementCommandCreate[] commandCreate2 = StructureElementUtil.convertCommand2CommandCreate(new StructureElementCommand[] {command});
@@ -229,7 +220,6 @@ class StructureElementUtilTest {
assertEquals(str2, commandCreate2[0].getMnemonic());
assertEquals(int1, commandCreate2[0].getOrdering());
assertEquals(str3, commandCreate2[0].getDescription());
- assertEquals(str4, commandCreate2[0].getComment());
}
/**
@@ -242,10 +232,9 @@ class StructureElementUtilTest {
UUID uuid2 = UUID.randomUUID();
String str2 = "asdf";
String str3 = "zxcv";
- String str4 = "tyui";
Integer int1 = 41;
- StructureElementCommand command = new StructureElementCommand(uuid1, type, uuid2, str2, int1, str3, str4);
+ StructureElementCommand command = new StructureElementCommand(uuid1, type, uuid2, str2, int1, str3);
StructureElementCommandUpdate commandUpdate = StructureElementUtil.convertCommand2CommandUpdate(command);
assertNotNull(commandUpdate);
@@ -255,7 +244,6 @@ class StructureElementUtilTest {
assertEquals(str2, commandUpdate.getMnemonic());
assertEquals(int1, commandUpdate.getOrdering());
assertEquals(str3, commandUpdate.getDescription());
- assertEquals(str4, commandUpdate.getComment());
StructureElementCommandUpdate[] commandUpdate2 = StructureElementUtil.convertCommand2CommandUpdate(new StructureElementCommand[] {command});
@@ -268,7 +256,6 @@ class StructureElementUtilTest {
assertEquals(str2, commandUpdate2[0].getMnemonic());
assertEquals(int1, commandUpdate2[0].getOrdering());
assertEquals(str3, commandUpdate2[0].getDescription());
- assertEquals(str4, commandUpdate2[0].getComment());
}
/**
@@ -281,16 +268,14 @@ class StructureElementUtilTest {
UUID uuid2 = UUID.randomUUID();
String str2 = "asdf";
String str3 = "zxcv";
- String str4 = "tyui";
Integer int1 = 41;
- StructureElementCommand command = new StructureElementCommand(uuid1, type, uuid2, str2, int1, str3, str4);
+ StructureElementCommand command = new StructureElementCommand(uuid1, type, uuid2, str2, int1, str3);
StructureElementCommandConfirm commandConfirm = StructureElementUtil.convertCommand2CommandConfirm(command);
assertNotNull(commandConfirm);
assertEquals(uuid1, commandConfirm.getUuid());
assertEquals(type, commandConfirm.getType());
- assertEquals(str4, commandConfirm.getComment());
StructureElementCommandConfirm[] commandConfirm2 = StructureElementUtil.convertCommand2CommandConfirm(new StructureElementCommand[] {command});
@@ -299,7 +284,6 @@ class StructureElementUtilTest {
assertNotNull(commandConfirm2[0]);
assertEquals(uuid1, commandConfirm2[0].getUuid());
assertEquals(type, commandConfirm2[0].getType());
- assertEquals(str4, commandConfirm2[0].getComment());
}
// ----------------------------------------------------------------------------------------------------
@@ -313,10 +297,10 @@ class StructureElementUtilTest {
Type type = Type.DEVICETYPE;
UUID parent = UUID.randomUUID();
String mnemonic = "jk";
- String mnemonicPath = "zx";
Integer ordering = 41;
- Integer level = 3;
String description = "cv";
+ String mnemonicPath = "zx";
+ Integer level = 3;
Status status = Status.PENDING;
Boolean latest = Boolean.FALSE;
Boolean deleted = Boolean.FALSE;
@@ -325,11 +309,10 @@ class StructureElementUtilTest {
String comment = "ml";
StructureElement element = StructureElementUtil.getStructureElement(
- uuid,
- type,
- parent,
- mnemonic, mnemonicPath, ordering, level,
- description, status, latest, deleted,
+ uuid, type, parent,
+ mnemonic, ordering, description,
+ mnemonicPath, level,
+ status, latest, deleted,
when, who, comment);
StructureElementCommandCreate commandCreate = StructureElementUtil.convertElement2CommandCreate(element);
@@ -340,7 +323,6 @@ class StructureElementUtilTest {
assertEquals(mnemonic, commandCreate.getMnemonic());
assertEquals(ordering, commandCreate.getOrdering());
assertEquals(description, commandCreate.getDescription());
- assertEquals(comment, commandCreate.getComment());
StructureElementCommandCreate[] commandCreate2 = StructureElementUtil.convertElement2CommandCreate(new StructureElement[] {element});
@@ -352,7 +334,6 @@ class StructureElementUtilTest {
assertEquals(mnemonic, commandCreate2[0].getMnemonic());
assertEquals(ordering, commandCreate2[0].getOrdering());
assertEquals(description, commandCreate2[0].getDescription());
- assertEquals(comment, commandCreate2[0].getComment());
}
/**
@@ -364,10 +345,10 @@ class StructureElementUtilTest {
Type type = Type.DEVICETYPE;
UUID parent = UUID.randomUUID();
String mnemonic = "jk";
- String mnemonicPath = "zx";
Integer ordering = 41;
- Integer level = 3;
String description = "cv";
+ String mnemonicPath = "zx";
+ Integer level = 3;
Status status = Status.PENDING;
Boolean latest = Boolean.FALSE;
Boolean deleted = Boolean.FALSE;
@@ -376,11 +357,10 @@ class StructureElementUtilTest {
String comment = "ml";
StructureElement element = StructureElementUtil.getStructureElement(
- uuid,
- type,
- parent,
- mnemonic, mnemonicPath, ordering, level,
- description, status, latest, deleted,
+ uuid, type, parent,
+ mnemonic, ordering, description,
+ mnemonicPath, level,
+ status, latest, deleted,
when, who, comment);
StructureElementCommandUpdate commandUpdate = StructureElementUtil.convertElement2CommandUpdate(element);
@@ -392,7 +372,6 @@ class StructureElementUtilTest {
assertEquals(mnemonic, commandUpdate.getMnemonic());
assertEquals(ordering, commandUpdate.getOrdering());
assertEquals(description, commandUpdate.getDescription());
- assertEquals(comment, commandUpdate.getComment());
StructureElementCommandUpdate[] commandUpdate2 = StructureElementUtil.convertElement2CommandUpdate(new StructureElement[] {element});
@@ -405,7 +384,6 @@ class StructureElementUtilTest {
assertEquals(mnemonic, commandUpdate2[0].getMnemonic());
assertEquals(ordering, commandUpdate2[0].getOrdering());
assertEquals(description, commandUpdate2[0].getDescription());
- assertEquals(comment, commandUpdate2[0].getComment());
}
/**
@@ -417,10 +395,10 @@ class StructureElementUtilTest {
Type type = Type.DEVICETYPE;
UUID parent = UUID.randomUUID();
String mnemonic = "jk";
- String mnemonicPath = "zx";
Integer ordering = 41;
- Integer level = 3;
String description = "cv";
+ String mnemonicPath = "zx";
+ Integer level = 3;
Status status = Status.PENDING;
Boolean latest = Boolean.FALSE;
Boolean deleted = Boolean.FALSE;
@@ -429,11 +407,10 @@ class StructureElementUtilTest {
String comment = "ml";
StructureElement element = StructureElementUtil.getStructureElement(
- uuid,
- type,
- parent,
- mnemonic, mnemonicPath, ordering, level,
- description, status, latest, deleted,
+ uuid, type, parent,
+ mnemonic, ordering, description,
+ mnemonicPath, level,
+ status, latest, deleted,
when, who, comment);
StructureElementCommandConfirm commandConfirm = StructureElementUtil.convertElement2CommandConfirm(element);
@@ -441,7 +418,6 @@ class StructureElementUtilTest {
assertNotNull(commandConfirm);
assertEquals(uuid, commandConfirm.getUuid());
assertEquals(type, commandConfirm.getType());
- assertEquals(comment, commandConfirm.getComment());
StructureElementCommandConfirm[] commandConfirm2 = StructureElementUtil.convertElement2CommandConfirm(new StructureElement[] {element});
@@ -450,7 +426,6 @@ class StructureElementUtilTest {
assertNotNull(commandConfirm2[0]);
assertEquals(uuid, commandConfirm2[0].getUuid());
assertEquals(type, commandConfirm2[0].getType());
- assertEquals(comment, commandConfirm2[0].getComment());
}
}
diff --git a/src/test/java/org/openepics/names/util/UtilitiesTest.java b/src/test/java/org/openepics/names/util/UtilitiesTest.java
index 9830c533..9bea5163 100644
--- a/src/test/java/org/openepics/names/util/UtilitiesTest.java
+++ b/src/test/java/org/openepics/names/util/UtilitiesTest.java
@@ -109,11 +109,10 @@ class UtilitiesTest {
assertFalse(Utilities.addToCollection(list, structureElement));
structureElement = StructureElementUtil.getStructureElement(
- null,
- null,
- null,
- null, null, null, null,
- null, null, null, null,
+ null, null, null,
+ null, null, null,
+ null, null,
+ null, null, null,
null, null, null);
assertFalse(Utilities.addToCollection(list, structureElement));
@@ -122,11 +121,10 @@ class UtilitiesTest {
assertFalse(Utilities.addToCollection(list, structureElement));
structureElement = StructureElementUtil.getStructureElement(
- null,
- null,
- null,
- null, null, null, null,
- null, null, null, null,
+ null, null, null,
+ null, null, null,
+ null, null,
+ null, null, null,
null, null, null);
assertTrue(Utilities.addToCollection(list, structureElement));
assertEquals(1, list.size());
diff --git a/src/test/java/org/openepics/names/util/ValidateUtilTest.java b/src/test/java/org/openepics/names/util/ValidateUtilTest.java
index dfc4823c..dea17fab 100644
--- a/src/test/java/org/openepics/names/util/ValidateUtilTest.java
+++ b/src/test/java/org/openepics/names/util/ValidateUtilTest.java
@@ -43,48 +43,6 @@ import org.openepics.names.rest.beans.Type;
*/
class ValidateUtilTest {
- /**
- * Test of validate input comment.
- */
- @Test
- void validateInputCommentNull() {
- try {
- ValidateUtil.validateInputComment(null);
- fail();
- } catch (InputNotAvailableException e) {
- assertEquals(TextUtil.VALUE_IS_NOT_AVAILABLE, e.getMessage());
- assertEquals(null, e.getDetails());
- assertEquals("comment", e.getField());
- assertEquals(null, e.getCause());
- } catch (Exception e) {
- fail();
- }
- }
- /**
- * Test of validate input comment.
- */
- @Test
- void validateInputCommentEmpty() {
- try {
- ValidateUtil.validateInputComment("");
- fail();
- } catch (InputNotAvailableException e) {
- assertEquals(TextUtil.VALUE_IS_NOT_AVAILABLE, e.getMessage());
- assertEquals("", e.getDetails());
- assertEquals("comment", e.getField());
- assertEquals(null, e.getCause());
- } catch (Exception e) {
- fail();
- }
- }
- /**
- * Test of validate input comment.
- */
- @Test
- void validateInputComment() {
- ValidateUtil.validateInputComment("asdf");
- }
-
/**
* Test of validate input description.
*/
diff --git a/src/test/java/org/openepics/names/util/notification/NotificationNameTest.java b/src/test/java/org/openepics/names/util/notification/NotificationNameTest.java
index 0e94bbd8..3eab2612 100644
--- a/src/test/java/org/openepics/names/util/notification/NotificationNameTest.java
+++ b/src/test/java/org/openepics/names/util/notification/NotificationNameTest.java
@@ -44,7 +44,7 @@ class NotificationNameTest {
UUID.randomUUID(),
"oldIndexQ", "oldNameW", "oldDescriptionE",
"newIndexR", "newNameT", "newDescriptionY",
- "commentU", new Date(), "whoI");
+ new Date(), "whoI");
assertNotNull(nn);
assertTrue(StringUtils.isNotEmpty(nn.toString()));
@@ -57,7 +57,7 @@ class NotificationNameTest {
UUID.randomUUID(),
"oldIndexO", "oldNameP", "oldDescriptionA",
"newIndexS", "newNameD", "newDescriptionF",
- "commentG", new Date(), "whoH");
+ new Date(), "whoH");
assertNotNull(nn);
assertTrue(StringUtils.isNotEmpty(nn.toString()));
@@ -70,7 +70,7 @@ class NotificationNameTest {
UUID.randomUUID(),
"oldIndexJ", "oldNameK", "oldDescriptionL",
"newIndexZ", "newNameX", "newDescriptionC",
- "commentV", new Date(), "whoB");
+ new Date(), "whoB");
assertNotNull(nn);
assertTrue(StringUtils.isNotEmpty(nn.toString()));
diff --git a/src/test/java/org/openepics/names/util/notification/NotificationStructureTest.java b/src/test/java/org/openepics/names/util/notification/NotificationStructureTest.java
index 9c44bdaf..1e9ce012 100644
--- a/src/test/java/org/openepics/names/util/notification/NotificationStructureTest.java
+++ b/src/test/java/org/openepics/names/util/notification/NotificationStructureTest.java
@@ -45,7 +45,7 @@ class NotificationStructureTest {
Type.SYSTEM, UUID.randomUUID(),
"oldMnemonicW", "oldMnemonicpathE", "oldDescriptionR",
"newMnemonicY", "newMnemonicpathU", "newDescriptionI",
- "commentO", new Date(), "whoP");
+ new Date(), "whoP");
assertNotNull(ns);
assertTrue(StringUtils.isNotEmpty(ns.toString()));
@@ -58,7 +58,7 @@ class NotificationStructureTest {
Type.DISCIPLINE, UUID.randomUUID(),
"oldMnemonicS", "oldMnemonicpathD", "oldDescriptionF",
"newMnemonicH", "newMnemonicpathJ", "newDescriptionK",
- "commentL", new Date(), "whoZ");
+ new Date(), "whoZ");
assertNotNull(ns);
assertTrue(StringUtils.isNotEmpty(ns.toString()));
@@ -71,7 +71,7 @@ class NotificationStructureTest {
Type.DEVICETYPE, UUID.randomUUID(),
"oldMnemonicC", "oldMnemonicpathV", "oldDescriptionB",
"newMnemonicM", "newMnemonicpathQ", "newDescriptionW",
- "commentE", new Date(), "whoR");
+ new Date(), "whoR");
assertNotNull(ns);
assertTrue(StringUtils.isNotEmpty(ns.toString()));
diff --git a/src/test/java/org/openepics/names/util/notification/NotificationUtilTest.java b/src/test/java/org/openepics/names/util/notification/NotificationUtilTest.java
index b4265f42..7f375634 100644
--- a/src/test/java/org/openepics/names/util/notification/NotificationUtilTest.java
+++ b/src/test/java/org/openepics/names/util/notification/NotificationUtilTest.java
@@ -48,19 +48,19 @@ class NotificationUtilTest {
UUID.randomUUID(),
"oldIndexQ", "oldNameW", "oldDescriptionE",
"newIndexR", "newNameT", "newDescriptionY",
- "commentU", new Date(), "whoI");
+ new Date(), "whoI");
NotificationName nn2 = new NotificationName(
NameCommand.UPDATE,
UUID.randomUUID(),
"oldIndexO", "oldNameP", "oldDescriptionA",
"newIndexS", "newNameD", "newDescriptionF",
- "commentG", new Date(), "whoH");
+ new Date(), "whoH");
NotificationName nn3 = new NotificationName(
NameCommand.DELETE,
UUID.randomUUID(),
"oldIndexJ", "oldNameK", "oldDescriptionL",
"newIndexZ", "newNameX", "newDescriptionC",
- "commentV", new Date(), "whoB");
+ new Date(), "whoB");
List<NotificationName> notifications = Lists.newArrayList();
notifications.add(nn1);
@@ -81,19 +81,19 @@ class NotificationUtilTest {
Type.SYSTEM, UUID.randomUUID(),
"oldMnemonicW", "oldMnemonicpathE", "oldDescriptionR",
"newMnemonicY", "newMnemonicpathU", "newDescriptionI",
- "commentO", new Date(), "whoP");
+ new Date(), "whoP");
NotificationStructure ns2 = new NotificationStructure(
StructureCommand.CREATE, StructureCommand.APPROVE,
Type.DISCIPLINE, UUID.randomUUID(),
"oldMnemonicS", "oldMnemonicpathD", "oldDescriptionF",
"newMnemonicH", "newMnemonicpathJ", "newDescriptionK",
- "commentL", new Date(), "whoZ");
+ new Date(), "whoZ");
NotificationStructure ns3 = new NotificationStructure(
StructureCommand.CREATE, StructureCommand.APPROVE,
Type.DEVICETYPE, UUID.randomUUID(),
"oldMnemonicC", "oldMnemonicpathV", "oldDescriptionB",
"newMnemonicM", "newMnemonicpathQ", "newDescriptionW",
- "commentE", new Date(), "whoR");
+ new Date(), "whoR");
List<NotificationStructure> notifications = Lists.newArrayList();
notifications.add(ns1);
diff --git a/src/test/resources/INTEGRATIONTEST_DOCKER_TUTORIAL.md b/src/test/resources/INTEGRATIONTEST_DOCKER_TUTORIAL.md
index 6d2a8820..9580f002 100644
--- a/src/test/resources/INTEGRATIONTEST_DOCKER_TUTORIAL.md
+++ b/src/test/resources/INTEGRATIONTEST_DOCKER_TUTORIAL.md
@@ -126,8 +126,7 @@ class StructuresDisciplineIT {
structureElementCommand = new StructureElementCommand(
null, Type.DISCIPLINE, null,
- "Ca", null,
- "description", "comment");
+ "Ca", null, "description");
structureElementCommandCreate = StructureElementUtil.convertCommand2CommandCreate(structureElementCommand);
structureElementCommandConfirm = StructureElementUtil.convertCommand2CommandConfirm(structureElementCommand);
@@ -328,8 +327,8 @@ class NamesIT {
void readSearchHistoryDeleted() {
NameElementCommandCreate nameElementCommandCreate = new NameElementCommandCreate(
- subsystem010, deviceTypeFS, "001",
- "description", "comment");
+ subsystem010, deviceTypeFS,
+ "001", "description");
ITUtilNames.assertCreate(nameElementCommandCreate);
diff --git a/src/test/resources/data/templates/NameElementCommand_create_name.xlsx b/src/test/resources/data/templates/NameElementCommand_create_name.xlsx
index 089976615f0091489c96f96b48db39a600dadb04..2100db36f6dd8955548c275608198c5f2eecb870 100644
GIT binary patch
delta 3374
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
Q7zbX3=Nw%J*Y8FC3lqp6a{vGU
delta 3411
zcmZ8kcUV))(@yA+5F#By?;uS<nu357gLI@wM?hMTj%bhrC@nN0a6x*LB25IrP$Dff
z0g*07dbyNK5u}L7Pw;uZ&wKZeGqdx~o^y6*=bha*3L^@%hPOz`7(rB2RG<PqwHjIh
zFzGK@D+`t(Ial0CH-9Tu6tHs$i=w;;=y`osfVXT_!~Oqu^SINOmfa_2Trw^BtV=EH
zept)L;T}HqBr)VCpO6z+nZYg13wy5=73RJ7mIn~NT65iLS&Haq7#h6yN$+StXg6Pe
zaD(?d<;v*~*4l3E4DDo55oofdkhq^zbm}VQP}Qqctz+#2b&^%e1_ZW64LuDo!12JC
z*RQ}w^g)i8z_U(#ii}jczEn$=;iehY#8(McK0P;R1D~YdY$HihYqZvPvBC)VA=_m6
zIl*KO>9I(I#Cgv*BlAZq{LNWi#v(~;Nb#>3Qwr~K^4EK15@*!Kg}>s&r}@3ZdObx8
zzq=|n8o9P{7h#Qy)k2u4#{~s-0q`c16D4A3hNh`Hx094T!&8c;<@=I|u859n-{#Gm
zESvE_3r$>9z+qIo+P56e)R+#Mqtv)kib3|%WLaDx$IwgXI|y!qgXkm+BZ+|-uwbW3
zV1H871ZA66duer3uO49!_qh3etMb->bkB0S7r6(R{wA`wE<becDQW`^I5m6YlCZo*
zBD&Fn()Wh_vnLOK#vi7wRPBms;A5z7Bn1OgRx_U`qRjYLI2AF&ec??e#4BkI7dvY&
zu@TEelLy*+tl)k=?#xv;h8m+1^ct#c14a`Yd2Cvs-lsUxfxaA8@qkLQm)qGwN>*=O
zYJ0D3yO^_7>R4c<>>0IzVHbwx@oJ0MF5_}3vFBU%bkGxtY&`8w`9?E#+bB9&?AW8z
zxyZ0M_=>Bwn8eo%bI<p#$)Hm=YlN(@l-6euB*kPTU6(~^iZ7q&iK%@)R*JE;u_{0^
z>iBpUeX9&N*J%2?l7f^g^*~CaW>HJ@?y^u;nNZFED3RE1>iPxH9vS+K2!GREQWFKN
z)o`H6O1K&v6KhQpKR71tnk0@*E);y*Hf%9#pFK_8HnER6Qofr;8rH>Se)gyhQ*}%{
zQq8N0y3Q%G_zh;wD>|{>p1>>IfsZOIT*o$5X~QHY%QLG|sgZW%6Hg_4>cci{csYhL
zx)x}w-4E?z0HP7JA0?cvU$xPaW=fqQD93YkRw}%FpYDAF6Z`tN+U)-NEf^1z`oXyE
zRa74d+8XS8!)_;h&<NL<n=$PgW%&5$<k6>n-ib?a54Qz@`PSUavmX7-iE%~g6`UK8
z2DtGp^&0ejwwPS6ps&h>joBWsgq>+<Oih}k=6yUINMR%8(6uhBbDKVJ#z(xAPoXip
zvHOa#ft;Z4Nblx8bmy*-;j0p|H>IPNcjB|27K@I@c*M?pMD?!=95ruA>M>#j%8H%$
z5*7(jFHRmG6f%DAU>I~;A}&Bf7!~ILm3COvs|vZwT<%FgK7XQ(wG-37#mlb8as0#H
z!J}eGVSR-y0vafwGCre|&|DlO>r*#HM_qlQ759_W@D?T2MA|DBCNdDng$4xr7r)ew
zKv;gW$UjgK;C{O_Tx08m=KX^O0l{Z^0vxKTkIFTUK<F0mtx04HEc{)yl_^t+m~z!Y
zyvsG;+7=w7=`PRJ!@pKy<7D=vS=S9DuH)ZDV`MOWhyb>0^*<6i8@`y_V7!z3$o)vM
z%ZFdEjV-%?AYEXP8A7E`kd4F^UCO)cuNAk+7b|Xs1WGDappm`ZPMLmk505X+Z64%#
z^aKtx^hRot_g?*?&RW&ewBV%2?>NyT^*7zN9{JvmcS-anyo1b#=8$fQtD1Qm=ri})
zmWw6wtG#m6{qkY{!4p5xQE|DEht)OWPbJH(#ow%Ik}F3ujjq3biMeaqkJh(MD}7(V
zV$T@8M6c|ge@sGNp>{p<<#^ui!<g3(i8n5ya^_3Yv@MJ2rXG`=E#(CkZU<g42sBOd
zpQXfV!1#dFf%~7Op`lx78g<ghy`i2}2iD7<H7CSX!#D#c16c%$neCC0H(hpeLj1F!
zHYQLUbhV9waDA6w5ZC-Ag1J7ux5T21&}<m`QD|ks@dX~RvI7iNQ3W!d7>hD6^2@lF
zPNsTm4;ejonK7+j!)ONTN!!r109L|lq$2BI&OpfMsIzPWy9TThFN!%(V&xu7alrW<
zWr<5><{E##)PXH3?=4sx-Xj+2YUf89a~Boz)RVTd82oSnv&pA6T8X3+xvXE%AbZ|2
z2vdKsThe@I?_ud?mS0yojwCt2G;QczU6T_!3`|dvFKm|+V&Eb&7iw*p>`=Wc8nke$
z1oGg^5--2EAur`nrhjXBVE#<5l~!FA?5va(rPz#a5>fdn?U^`BUEv@0u}wwA4*Nhs
z>Plj6l8cxfH&5=zkVgS^mp7FqX**e+4wj~Ub1x`i3A@&>j?E#<-s=)Mp?WgeM=Kp%
zK8v9wCD@*Fzs#D(V3~pr&i-HyFNRnt)XlZi-qWM`9~T8OA9wqHz<cL>=(MooSomo;
zxVqP+zI1(uj`3t78*OcLf;bCiY+=^zvR}cBp!jbv5pW40z4uoz;i|t9A`EAlVAgHK
zN2!L%i;`5$tnUsjc8#SbT+o>M>-Zbz@auBxI1bDxxqxf_Jzm9*hj|<8nf1xj8S<8)
zeMkjZbT`uz^-^bj{B`27$-LVQQ#C=69IV8|;=TRNsm8e%{`G^sFO8nx6Ra-Xzu3k;
z^h#RgiI^2&p6nm!-4A1iv;`eZqU)-+XC)S*c;y_nY0_wA$)DR)%h(KOWO@!L8!ax@
z&~69G8o@6lg4x}6Ap8mKNO&AEJLuW!R9^qo=xB;!nU-%!igHKQm#<$Gio;wsmBS3D
zP=fn+s5=n8_fzXxygm)7dpi^3W)+3IU<6gs!8jn>L7yFUCvkVWnNIC3$a?*PFb-~f
z`PtCoA}Wj$vcW#3$XK;v6XhaB5*epMjmVeIzAOw`pDVU}!b}m%U+72c>wIXcnfbyH
zzX-u<`dmvGp4y0@SQBrZh!@d)9^od9Z*549b&ly8@tH+kIn0b4$0PVmEG*1DX12!<
zZv!>-85Q)Jyhb8*=@8L=xr;{aV<DetCWGp2Ju{XwDl;TsORnLHHXf$gW<sD<vlP4L
zZ90BJ<mk;Ma3Q_s3cG_P%6OhI*kpx!e0jksdAJk&arRSdR|2_$nZcrZx8QPwh3Vsn
zMfXn=du#b&sbb;}$qTRCvomfO_Y4&FyaP0sL_V@xHehXklDX?5U0*k~!BBBz;Lvx~
z`pQ4o@D3mGDa6LC!S*B;0>6~Ei|p4Q$oZVPZ%1uimeo+A<M6$M+wPnGXli$E@1zi-
zPR;FF%F@bu;nh9vKrikZm3<0s7=@jK45VUG4i#!)k~$UBSnt6#|I=iL^ff^KNdUlI
z3r8_p?<dg;FRX@cyi=E3<ByG(CU`6gmZ+i>;Kyd2`a-KlcNcupVNDxuJcxrN0&SqL
z5*j6Yj+M-*ZUE}2VPQFC(Yp&_lMQ@wP)VtTlVrW{x!S|q(R#<7d{sXQgw<dcVbWT!
zE))mX$pN+e+<X7fec8P1J;{7c+Y=EbPS+80HT1NZ@BVqpxQlODKuJNM%Pjv*nY#=E
zfQ?r>598yRYS$pI{4oiLo5yPjl>w)i3<<QOcO@!<UbXx*q;5=KW@htf)_OA{IM6Vl
zj&j|p5RxK9rkVGUzo?3)&URoyn^EyYoqa%IzN)sjtJ(At(Qw)#s5TzFF8Ef2%uO37
zIy8>HaVanug24$W_`~JnP5UWbFQQn1QwOHmxM!3Vtuk%bI&ADwT^jxv#^5;Ft5yf#
zaK}=$uzgqw5_8(jRpBd7x7Qb8f&^r}M;<Y2AGGy;oUHd8)_>&j7QkF*u6`dfYO!|T
zl*8~jL?1`KjIdfhq<?A|x?sl6ZKe`!uF-mBWK43Sgp9K~t;M;habTkVNHYj1j3?Xi
zhqB4P9T6&3@-bo!gOTRGIOyGd@1D>X=QNV;bO~uLnm>ZpDbBSSSr5h6Mzn0;b)Gvv
zp1AN}BCx62Yc?d^jVynEctUz;<?GC;C;&d=DSNuX6q8>(75m?!V*&c3!9lg8OhUiQ
zxj6IK`E`Me<->2oIIG;50ZYfGbS`z-6wYN7n?CI?yT$(<5wP=YisuLyI|AH@Rbm(A
zKEwa4dyId46a*T@hO_g-&V2r#PO-J@(mZFTKer3wU&FZISTQ&!mInbncl>jT7yjkw
z$AI-=V8GfTpy$7JAAuktXTruJxX!y32n1Le+k@ac@BQ-&WMaY6a0pT?v7Wu<f4npn
A5dZ)H
diff --git a/src/test/resources/data/templates/NameElementCommand_create_name_NameElement.xlsx b/src/test/resources/data/templates/NameElementCommand_create_name_NameElement.xlsx
index 5fdb0d3d03c590949d85f9706087f05f3d79c594..3c6da31db53208e5521b92522af74f90f05b61d4 100644
GIT binary patch
delta 3276
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%0DoOdLQtQLd-&OG?ur2?Lim%3%RQ)%91D0{rq451
zjTX`B=yfgcF^A=PX)uGFtIL9kpYbKlACsMTo-CyH@bYpSrPo^94;ogIi5UG@g(-<H
zuBVM9Yfh9f%2$ir_N~XFFMsOfIi`u!Xq1_)Ai<gQtjn88OPkNY=kZwu+5XtI@$b6&
z409vDvT`wngx5BFe~o4HOCdP5az2E6<=h(5(9f%Rc~jCj*1(eYMa)@F!xhxZM)>EB
zb=5jJ-?X)XVpvHclMY)S@$;3_&5{<IIrN!m^o&RU`~6m1^j9X+WF`m~M{3N)CuO41
zirl#LHrC-pNWmSZT(t6{K(;oFD^p?mk&d1Ak3gz4j*t>O1D6W!#VzmE?a<0x^z%8;
z!IG@pcgrshH6>FCAv(ykj+OXw`!0%1j%$NwM3bk9f8v8#oh$wwTmF`iEd0P4O-NO6
zXKkkKln(9dxKe#W@SL0Y`?yz1ujve?4tIjKc(W-wpVn`DQVu-gCnb(q;cRoUzRbo+
z#gbqG0TF;$Jk)aI7CjVxuZ`fd%NLWdf`3wW^Qwr}?pgAmA*a^<^kkB$@MLa!z}tJ@
z+O0N?I3dA$YYf8@g8#5wQ7-%*x?EA(rMo`n9666WYd3q^+Rh_n^meDKij*C`=ev0W
zI_c%XY{zM)&c@UIj1!(4X!e0W3rB*e(R7Gqg2UX*Y3aj#5Z_|k{Re)R2GE){ZdCwx
zaR0-x0XcPn^58$LoIFCuT-q10cD=gfv99Ep3uV1j#_~d*^3{f9TPr7VdnI_8<EBz_
zj9xE%9j#Q=Yh;1EAJQ!M7pNBwbCP{}sv`1%pPY+<gQnIba|Pq@naTjWcW7%4MMzZ(
zp*#3t9lzV^X=^!oH+R{0z8`eE3Ntc0OKV!qe%a=W*<<m~l%DWZR*7Qeuz0=(3tq>v
zG~TML0tuwgB99!*ZOTFbH);{IuYCOIzfhH~^w9wTa|-``^vHk6_=uEwj;4c$y@|Jn
zrw@tB$3~bkZoR-Ayj6nQZN!1}OYgu;+eo7D+X{^%o2N<*pIO2p-ifVVx6r&0X7-
z@v%LVM=e4xk(GV=e{_ffq_O$F2?^CdMN$)+&x|HMt_+U`w<H7xEAxg&j<*&TaiGkn
zX`$H=UO3G9YMTTO&BpJa;O}z&F4o#>V*vQhld#&x_6!3yc46og(=(cA9$=50<CE;*
z#`sk&(q=z1(P9vU7-ohY1oF7e-xd0j#OD0shs$)%&vTs1p~%oO%+ovpoCV=9Eco0l
zi^;s_LrVqp@j-9~UZBc*rHnzuv@44d%5k8i;ZzB89HKZXZOWKaEyx;2zK>PD<^2$G
zNYDi_tgU{Lzw4Q6So*D<A(;L>R}h)1XWajtp=($L^3Y2V&h_1)cSsT;p5Z?H{a$hT
zgV)%mYw1*fTc(e86HASaS8i(#1A<~$5nsOg?5rHlH65cNbYs^9c}&5y{|^mrK)DkT
z{#zg8PK}&=<DF0U|4yh1Djg?C-hyf;wnR|n#C{Vr;ylWu{!w3&F6j5teGrJ2ft{2N
zl3+QmIMD%8KZu_ON}313PP*B^AewfPI2Z~&uK4$*0sXDnC$@*=2tIpK^Y5b^U!Q-*
s45=6_e6s7{(XPIvB{1|P;(~x^UXr9BA}5i_Q4~gUgTNWh1&@3G2ju+DhyVZp
delta 3237
zcmZ8jc{mhY7awNIzQh>JScmLH7&P{6j4ewj5~Gp95FxuMMV69G)<!j!#+rTCWXlp+
zv#&{;ee$*-e9`lKU+;JSxaXd8&vWj%=iKu<w+)$rWV12@g1`VqMn*uHrCtS_I34ge
ztx};=raxME0oVU5oQ|^}Z4vPd8if8{OLv|^ZnfE<RT0a&mO0#m$~dbWQ=97~mzM_1
zdoA$KWDWJ<%@H-_`D7AJ`(<a}8BS5@vma}b&}j&oKFPE4$@Kh_bYV*ENgh*0H%-xi
zUBkS+$%A&}H5yz@|KTxEJZbuY&6k?@-6C+M6tTxCAbWiUx4Z?rRl!W=XhQk6)Rlg$
zCN<E_kQ?by57~IPfH47H>%Ao>5&s$u!kFm&Je^Z0H+hNH^s`(SWm0pOa$?bkYC~)I
zq(#j*9&IL6WZm)}ULBRD>@oIQnSGA?{M`<-v?$ObIAz+}c(kVjxBFO>0Jb;DgfHH_
zTwoTLAzq%AqczF(O-prUnUJXyO}=<NVnAB^yOz10zVmgnWIx~e`tg-`W4;!hhXU^J
zCsR)7D2P(;ie4DzfA642OOODSm||mS@xr{M*;}0DRaq<tTvjD2jE(n2+IX1kj0y*R
z&G?wWt#39EnQjZ%@PuHJ9Vp|r)Me8<fc1K*HHNqlUr9&H;}11Q6$p^qO4-kRjzM?X
zex4feS-H0r0uwn7Z&<IVQ4vpqOC9@p&d~b0>5DI)AH9R=+D=4x&Q&O+^yv3Kf=Bu#
zNa0y-e$!pXE&upsYql@PY%^}gt@fmMSnf^IO&ea*8_YUV_Cqt;kCLu%2Zse&7lKq9
zBpv-3ckrOD9X2m(M`pseP=&1o0Y+dm6U7s_uZg65nERn?;~7;`&zf(OUM9kJx-jHo
zhus7`K?!|)4@yxA8=bOzs;e~0OQgnFJ~I&sPF)Q2QhEL2Qx`;fDLh(O9#h`1r8zhi
zp06jFB(SHGld%vct^aW<`?<vG8zy{1gM4e)X4m6@K{`m>sYt@@X=AyaI5f<E8bzu(
z5ggeO3aeNZQ<#b?i|lZR`Ol*+)|{B%iSvZf9E6p;#rB1)O2n4E0K?YbFo59)L0W*q
zpdeS2-L%)&M|Gneh941PD{r@Y0eQBAuYONM({v`3ykKCmrA0b0`2xy>;%{%O$6bTA
zV5o!R_y>asE0C(PX|r*9pXbe+VhW#OXTfePd@OOe8EwUBDd<1Eq-F<gkqXK}My7;{
zkaMQ2?NX|Y%e!?%)zGV@qMchZ8}-qZ?4^d!wnjmspNeSf=OWLTk+t#+@n2vwKFU_l
zaYl`$8T-yNk9=v4&hKjTr4emETYqI}qQob4Ys;$$pcw2MbCo(<g@?Le=s*&A;e$l0
z4!o%7K}$4K!B7+sXTTz~^3HUbJ&SYA!6bio?o48^_)B|bbeeNO9k@<9#>`RDX6$J#
zNHf1<m1_|0;O(hWsmNwfV4K5A5WM0!=Nb`QFp#$4e|Jl-{ouypKO=3wqJC!jfBV93
zEZ|w{f{6%SR5IO<fQM(e7*cV5>m9$EXrwG-<&Ukupt)lmrw8uG)-HS{U3pCH>J~ai
zaqFw@P>m^NvW?GdC3!V}KLA>pF)*%KEdWhH06-240Prsus^Vhh{R1{~Y?6et-ZP4v
zuQs;9#=);@#|TTV$UAa3^_gOPx<gf<U9qXFCSOw`b_?<!lA=>`^X4CgDr>%-r)C9Q
z7yXnz%3ji}aNZc=@M7ZAO|5<ErxbVX8>4=g<k?p5X*LO#g>4u>^2a#v?3kvWfcwh)
zo8v3S2&#FpGUwuu)~Bcd(9{6Iu$2^G4Yu%gt&nREs>8U#ug|W1tsI#>NUZqLJ8|H1
z?Y&yd1k#?iq|njX6*&|s)Tw;{jHKVEM<Gaa5h4N1zFp<Wo#?M7>Bqi!zZSM1@#YE@
zzwbM#KNHDCsDpA_oUEA7+(wRQ-#`P;(zUG<2cK|uQ|^W4DIYUsX&)h&dxl44jf+1A
z6mqEA3*0um6qLG9c{^6^4ts$&#;edmHt#jsTE4!>y+<}*Qo&z;&UJjuhIuHi`eeGZ
zMUjF;5;P~58Tnj7Pr&IMgFG^($UNX&p1&}hlrOy>^HVIlYaScHaF`D}k<n&%IshQ?
zcTWD7kE1p)#11-Y1H=hVb;7)Nch&%)ZYi+QD~Mw+dCF(E9=-sYhr%$DnBDPUbCaaz
zyj?46)HP7+U5|1PO`S~js9$f@`ZSU)ZCV4C<dv>5o-#7pRzMLnbsCti<;jHDDYl}M
z=Hd*WjOl24DXTa1v1?2PYZBcpvh*9-<dLGU>>KiNl?LsD1(LpB2=QxaY1n3x{7&%s
zWU6?&M3PX{ogV8z9!DLa(-(N<t*^@a<5F|eh1x$EZBL*qrFGH6FIz9qCn{ZHo$o%8
ziRbCAwsa~ugL)I4Ei-B8FZW~VZPIdwtUs0Mb$;08&AwQfVKRer;giMH#+;nn#bnf?
zD#}#Nj=3LQ7|0RumY|1r(lp<R^mp@fm3pBoS@*EQMseuF=XQwp$+61?yH;#xwY4_e
zQ`_OPeB7wlq9i$#laEqh4Nr=UNm9v#N$dB72z-Jss-d^r-aU#_Zm+=3gUsa<`|i7m
ztewZD+v&3P#Z0rKPf2pLr?N5Os|jO*S>5X5V_mn3P0D7X(+M@7D`V|>fTF2^2K;tc
zFR*d74Yb?G=jLwN-SHIbjZ_OmguTERZHF<JB^^_DIB|^T-Ek=;W$0@V7sF<PeQqHK
zW=M~zR&vFEslS!AO<ksqE{;9PQXt5Qekv>O_&6pGZS><!b@U19qcQWZWbW`wo?nY9
zaiTjVe4UL0R7FBIL<dsj7d0CJ<b8Zc`vCsXvQ&Hbf<U*+xltF_w@a=xr1)CR(iZ1P
zO`YE_*LMr=HhGg^ciKn8BkDin)?RR(<*fc@+bYh#+|N}I8LPLmrJReTMnOuSXPb2H
zlu??Vi0Je)yPRTv8UG&YU7>(u5T!t)xbA%*htPJzJDmvF18!`);)|Ol_eb1+30^pL
zNdhu?z;c0*AO~({?2qBj(k=0b&rY0BPx9r0k)GKhd!aY*ibfELi3yU%SY1cI5k4g(
zZ2~EZAaTL?jqt9&mCtifik)6!4e&0B7NUqOE|&Vn;#7@|S7i6=h%3O2kIUTVZD=f6
z6*v__V3yxp-l1v?8bhYGpIW^CU~$DDu|%mmOivwyK=<h(YP<Vm@vGaA$tK<FK{0qY
zNTqDzD!yAH%I(1m7A#Q~Yg?6UAy--Dliz~D9g0R|v08XYRpH@Tdwfn;Hli<Bd;vQS
z$l<h_fL_{O?WxYujoe-@yuBjZ3u>&Io_@?lSgy&u&9+)`v4!y&m(DV&3fD;Qr^iU`
z@|G%193P+1mqxR-eUF?b3+=>~9?%_@H)a0{upS5iOsM=_-oJl)#0{`G!TD;N2sm=S
z3>R{hT<QcF9>Y3CWc6^VI(_e4aGYd5dBgr-4>xM5JiorZaB)4xt<k}v8n}WjHhU-m
zGI|;+oA=zT+OdBT1=bj-cC{!b8#4Ie9A|lEtmYg;s!HirPS#6-JW&nOL!IFUO4lQR
z2@T@vft=%|c6|&uZ#*C20HeBaH<_WNMY&b8J<=85X&9IQj<~DhG|fsEeHo{F^E*2Q
zop8`BRB}y?gY|WcEt;U{HxdRx{g~?+nh0_p{%}imM(36A*7z$$FS($XGVBF1Aj%B=
zR%t171e3mei@)qW4q2T92g4S&k#C4q3cX+%<d%Eh&KtG9?a&ZHZViYQ$jGl&KO#|Z
z#^0LnrVxX+*~a!(@3q*XyI5idRtcRhP5z<rrpIIcpEItX@fgY7G8=ayc_nVwyJ>A)
z&5uCx1d+cFtNG;(e0X_ayGMT*^hU6hy6qvR(*Ix3&jbD%oPerih{T_k*T6e^1i26R
z2L1>xLlK7pA_;oth)zP)k0=;s$^Kh@{(o(h=m-0=RSbjCZ?F(WSp{UR%;@OBfdBsR
z&;Jeb;J;h|0GNmz0%F347X8%BMSFfbJ<AFJaQ;iDoM<f|e5CXDYl8htr;d1EK!)+q
z&f(>WtpX6bdg6qD$dS{#0x&vLBCnwE5vL&tql+fm3Br%KFhLl-BOmc89}lrakn^|<
I^w8{o0I^}QNB{r;
diff --git a/src/test/resources/data/templates/NameElementCommand_create_name_different_column_order.xlsx b/src/test/resources/data/templates/NameElementCommand_create_name_different_column_order.xlsx
index 009f4e823e97dc7285c00298aa3a3e4ce7520cf9..4ba89690fa70db00f9422546bfa0ec9468113989 100644
GIT binary patch
delta 3410
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
Fe*lYe1<n8f
delta 3541
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
diff --git a/src/test/resources/data/templates/NameElementCommand_create_name_empty_uuid.xlsx b/src/test/resources/data/templates/NameElementCommand_create_name_empty_uuid.xlsx
index 16f03e7acf4294650b9d044fb7a5e8f25a911c0b..6ca9f8fa05b6db03240dc08bab087d2d4eb9365f 100644
GIT binary patch
delta 3342
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
delta 3367
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
Q#4tc;6A)!2^8Nt-2YzJq8UO$Q
diff --git a/src/test/resources/data/templates/NameElementCommand_create_name_incorrect_uuid.xlsx b/src/test/resources/data/templates/NameElementCommand_create_name_incorrect_uuid.xlsx
index c61c8890bf487f750e0b49a90f746ec643d4913c..fbc0260bddf7e6e0be4830252073f72e47322ae6 100644
GIT binary patch
delta 3537
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
delta 3534
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
Uy&F;fi{ZjCaSBjuv7Z_K4;2<HH2?qr
diff --git a/src/test/resources/data/templates/NameElementCommand_create_name_incorrect_uuid_parentdevicestructure.xlsx b/src/test/resources/data/templates/NameElementCommand_create_name_incorrect_uuid_parentdevicestructure.xlsx
index 5468bc1552b4c32b2e65df699483475d4ead03f9..28aae6f65fcf194764801a1e57581ec672fe094c 100644
GIT binary patch
delta 3474
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
F?SHHB39<kH
delta 3482
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
Z79=+A+PWt0-<)6YLl7IzF!hb%{{R)tE+hZ|
diff --git a/src/test/resources/data/templates/NameElementCommand_create_name_incorrect_uuid_parentsystemstructure.xlsx b/src/test/resources/data/templates/NameElementCommand_create_name_incorrect_uuid_parentsystemstructure.xlsx
index e89fe3bf82e2cd39a83d32d0919496cac8d23473..47f435c451e4127138f64d55cd937bc564fa36ac 100644
GIT binary patch
delta 3520
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
Z1>)l3_rjZj|Fjt)^9##>%7wnW{SVifC<_1p
delta 3492
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
diff --git a/src/test/resources/data/templates/NameElementCommand_create_name_too_few_columns.xlsx b/src/test/resources/data/templates/NameElementCommand_create_name_too_few_columns.xlsx
index e433c6a758dbf253fdead9a1cbdd3514adbee0a0..bc801b23bfe34a66d0ba5bc1f15d28d6ef94f406 100644
GIT binary patch
delta 3123
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
delta 3222
zcmZ8kc{r3?7$0K`qX{!%?Af=H>`N$7bTbjz$vOrx6von*A!Fw@mKN*P5N%V!B>S43
zVQkq#c3E05$VJa{pStIt_kG^;JKuZW_nhbV`%aO{fC@X(n4SR!I&$O)DD#TmYj!a@
z`h8ohM0W;!=%DGp{c>(F9X*^P_%Z7Mi(aLS6t(DHd6KF%zm@)G?)?;j*@2a0TD+Yc
zuF=Wgx8c)V$79v$c#26Ej@hO=N?IK{)uIH^orzU^_YglW=rh(;S7UiX`jb(e)<^`4
zj%)Q3O=9+C7Dsx9WH-UIev9<0F6*2Or@73-8#2#%=*gY@E}@vpbZ*xeXV`KJpowrs
zwvhD5eLl6w3$=b^3#`2EFq1yL<nj5(_s#RqhvfUz<vm(bpeA-jPu?!>ooXyF48nc3
z<~1L@^itn=S*<N@ZqhvK1i*G$@0*!jrQrlC!RAco(wIM_xG!RSF~@NP_p?Z<pC~*6
z`eN=vFH0JisrC_~Y9q>*rHu1{AD`uj5b;~CP$k&cRhcSVvCewUofb!TgRXFC>KCRh
zYQ}@3oqT)U@necCsFL!V2~czya_0<dxTI&r8h4IUre5)1F%X|zlJ*nvMY!(=`R=ul
zwqZZWo8h>UNo~+QT;GTWE6<hr&Z-MdUy&N>>gS4D?^%LoPj)DL$XwwD8uok<Os9-u
z%&(}$!kT+~Xr0w}P`CZY?pGF7%8@l2?E-oGjkMJX^_k@-w&XG@;27=#R}LnI7dAYD
zki{8l%?^r9v9FCTDf>NTWRoj`cr#TOUUdfDh7D4DY%8|5wDbHri|0CT#^gns3vPhM
z=-Fds{oP#jtGriuUUdO*rc~q(!S0((Xxcwdn)Wm>>V@&L4s4GGnq+#`(ca>DuxXPi
zS`JQ2)0?Z$P+{PKE%)&DiQJK}*y4x1bJft0;d_}9mxR>S6Zw^~s_YS#_lefa;AJb7
zHNF@oa3ziT8e#>I!p{b#h)b;0z4MPOn`D4)Ybl{d-FlUVHE_U-W}jxkHP58R*M^i3
z{Rh{xZP#@q(}SGWq6b^_{F(&|m|FxwG6cl96N)T7B$nT-n~6)kPWU9oGd$*o!s3s6
zRoZdMq`I9lvaaJ+E7DC$l<2f+Tc1jJIzR3ZGo}D(4|C4A(z&bLpAbCCxgC=|;NF7W
z!?(Uly-*00n$dupS|FIwP>;rfyP@5Uwj$kEgKSweHrPw=q?gpKhZOrFvfU4FaR`5d
z>9*Rn<!NUYznCGX66JcA-Ha@JD#d~;s>8SA($8Ds^Bebv?p$V6OEnY~Y3?T@>)1o5
z%F7wJuk$Siui44>ciWPOYdUhbNU#BTz33Otd9;G1pE+=P70*zD>MLJEFs8s6`!881
z>2xo(8yf-RM`yK-;lz&BwlR*YVYZv&fjVecowJjJ%C!QCeazy~JKyP4)XZ)d&+kq)
z?7cV2qiYgTarr6mPp{Z&*M?weqfs6v%c}Lp`Sq~vd9FF*C_^qu;@-(<nn~4?57L<V
zNb*O+GmJ0>5J-g;1p0$JitE_8e=)=eL=vb))1QXuuk5nsg*Z#%k+@}kQ*foKkYfe9
zpOj{2%txtC;<BDA^h$~tLm9l;_RQ*I<SRILv|pB<RXR<iXQ+05cXJ0EE8cx9|J>XJ
z8}E;wEsAjq7Ea807e_rhFb(`c<}#+)p($w*w}v_&dDbheMoVESe9omBc>NrwhfbIH
zz4SU#&bn*upnTM^+tGs<_Scdd0`beZiE&iTGwS4vDl;JY)rZ$anO*XQo!seou{cZT
z{=Ma#H1#T*o&4K-Wz}>C1tZN2@l7BQ=mp*X>Lm=Zp8yCQ=z0Z6^GXQoR4oenj3C%F
zcR%GN5jl7Rzf2dOrxZ1KH0?1lgeLu$Vkz9fM_cS75T>uwb}8*ep(VXwNwIX2JBPbt
zYFo)@!OpIC$leEDCJ%orbv9`o@VaXNLCPI6csG7QKEDEzYkwrXh(Q!HgC@bGGgK9m
z7dOD3093J=Q}}^Vd)}NLPoeyZrrhv|14VpeJ;IGoa|cyEFREocEt1kXg>sSOh)_nr
z_(1kbQ9gLAlxbD0`eJVYwpA3(lS34f*?9G>&ZPfC>`~cC+>;l1bp+D7wMC}I#k^<E
zr#dzDQYoSk4@^O{*|YB2Q>3)m#5ClwP<k!k;}E~KN>8aKmeFj6^|+Cv1tRA=1K<)^
zhWVz{<F3Kct!U*dhc}ST`Medu$_(wbI&p5}MsTq3X~(@!K$XTG6B293TuzvsOLuzy
zD)F^ollr*5s?@I8UQV>bhW|H(ZScVvaGDf=Z|wK~HU0n3z#S?NSQz^});(6WaXqJl
zI(SzI6ODlpWBumNqep-6yhv~Ks#p>Z@b(45+_{&MjZ@B3XB;Ef6p}Kx+-3-sWDnN)
zWh{~LX=G&m-5}f37w-*=O*b!$WpkPE6`9KDtwr*aB~;s>Y<y8d#Hp}z0jaUdZCJe$
zha(o@QSF<M*dPbsB4w-A^G>oWZtcq=PfvviPBlK;wC~1hR5GF{MUH#ha`x@?4ARf!
z2@BQ>Tp{=uOuxbT?iK4DgNCbWY`E|cPN<U|qR%S({v$1sM%_|_A^)Z6s50zjMw>6%
z;mBcru`H`2^|Fd@3_@bd3Q;m-#g``rB^m~=K~g5$2U)oQ(_9x(gUWIfVSbRLw$tAa
zlkbN|%7}3D+RKs7yj6bkW%@@=9QR$3eA9FCuu?M#v0{#weVlI<$o!}6Jd-u+U$I$x
zN3M%^UFJ_{u18rv%A@G=GH+VP^-W`7Iq-46lPc;OUHI^?)QJJOd|3Jk3$o=v$oOj0
z=C#-SMdV{1fXr3tx0Y<u?IN95>!}zo>AtMd>mTz=+};<R@6WY2ZY}i=@ji9Tww3+I
ztGk&qmsv}fztdffdCQhSk}s8>dY<q_BG7AQUw0@mqWbp&8B01CA3Q7Y>&7%_!QcPm
zlWglvOB*|Tjbv8nYTt^A8BOo&D34irVi%Xxhg?~tu>c~^Z95!l2C3-DF4AmuWXp;#
zdiX+UGcm02-ED2VDEd<fXhqFvPtD_Z?qr@!t>-J9HQJ?KSQFw*XFy-h?R%m$tZbu!
z{B@+Yr%CUS&~TXvS-=pFC)BGxO%FG>sjaI|kh%73!9_9)sk5^EkObT#5n8CSk?fMS
zt7uxg{h+T(MmFzuH4oo+-Z&h9jfoTpB5c$Qt+o#VjYC6TG=%%?)$QWonI+AMC34pg
zi=RsD7}Pya6%!B%<fjAsG|GI$uyy@?B^U(ah5Y}DU*{ADOd=GH-Pw309EJz`8?cb{
zJF;w@-pC`y(IL*}){lOul<tjz`O3*<+jqXbA1m2f%2{xP_O}>ti^Vu`-knKEE|>Wb
ztPEYbG?DC4yI^o$FLC0-^NN;tEkVwos47fyM!w-t%E_sGVH<tI)rHODF#o>;QKxPq
zp78{uWYIi(fE&D9DRJc~*aat&XXl7&()Wvng~lss+HBC_%%19n8yFI#a;xnbo{doH
zE7zL~#RS=HOR^e!!hHRdO1=3?2xAK?+1(qBZEu8>Q_5}N%%(Fq_YrV?Q=0lNTc~^u
zMwXqH3Y}#9gz30d@^xEU55MT@!&`XstFk|N)#oknx3FN+*(uh*Vg39owiAXQqQbi<
zAE)QB%95^#g0dSKQJ6PIlU|S9dhtmw=UsKjhwAJD9Eg`C!v;742Lj%AotjW<R{}fa
zH6WO1wm-LZK0^<Belo0)YPL@+ar=G$L&_}o`ToCg3<N6P;u8NQZ6a{$;cxL4yz5t>
zja%g)Kw#j}IJ9~^YKJzI=L-9N-11N_59E?Cz@sjF5HVTZ3a0FTU3@<);=e2h4vCG>
z!^Tgz%nK1Z0RFB#us?vUgg{==L(K2YxWCcg28HmBSLhJ)`_<z64FLjS2phaIhnU}6
z!SM$skf4hYKHT`WXJ`a%f9~;q%l^#80wdf-2p-m*i{Jz6!3hd*xE#`$4h#eR_qMPc
dq(>$u?XNXq27$Q#$iaJ@u!j(5n&&=<{tNpnr&Is{
diff --git a/src/test/resources/data/templates/NameElementCommand_create_name_too_many_columns.xlsx b/src/test/resources/data/templates/NameElementCommand_create_name_too_many_columns.xlsx
index 4853e4b24005aa95e17c6e9758f42dd4c3f937d7..0b16fab92f3d97e414a78775280b419244f89223 100644
GIT binary patch
delta 3418
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əEF1Man_2TSd+_|-ZSB@EopfW75oDY~2uOEU}T
zsZuP{Ejf>3+gGKhYw@58Y_$O{q{kEW54Pv-@)h|x4gR1;$H2_f>RI4}`z<kd%e}V&
z<#{}}*}=;_s-*q;NpWY~A)7OCX;~vGem--?-IFbbbK<3I?2i2NvVF}VF@3ZPXLTE=
zHo6>d2dqTD->fLJlU{RY`WjAfxls_dNynOzz<ezn<EunM%dhTUt2>{HrflGvQHnDP
zjS}{sqX!2m$-PyBhki0{+*vDasajqK)An&)?Sq}2HC*m&)vq;aZW$71jju(_`lKNH
z?P)8P$WEOslp(APjqT<e>a8O0Ukl#HEYe7HMF>&@0Lqa6vPh9#6gT1hK$azB!a;MF
ziRNOg;(c=E_C-9@vvR2vChnh`?}6++453N(m>CJy*tPrd742_=DWhAwk$XEyM~>lg
zEa6G*2l8D7W^qxU4h(rwPun<QvZExRBi!jl`A;`qYEEc%6P*VsoJ{8Il{L&7dO$h9
z#<bjK<ierP?4=8a;56!h>Fuj$E$`P&cX&X!(uE&qo<+#%q-T}x-8VBS)C|?r$4lhk
z>_Nq&W7PG2-z``ZX;-evP$t#kN?aqA@n227H@1*-BnoCYk;ibX)DR%~#!S{J)Wsz>
z&Ys#Kbuv7ecK-vC0{-Uv5mT|gCwVz?(bb!~@YcElw)&?x?(Jg}b^hRX{*^ig!l&z#
z`i=#mGJSh<JFW`ix;zC_vc@epY7N_^v)=Sh6H#}0d$5&dsbf}>eFhVlrm>2#l|^3A
zGdG_5uT7o7;=5)Cdm3#r$4)OqI_a1nrLI`uf1GX&_~TC=KLPAY~Z$iT@BVF=Rw
zZv|1rt$1v}PjM@sXdxc>iMHi2ra!V<A6Fsxavt>);~I}H!?E$?{KH@7RT4bz{h2>m
z{(uDl7Vv4jf<ni0{@fkBf6eJ*!T(_4hnXO#fb4+(-)XG>{IfHEy`YR2<P$mp&Wd@d
xw|g{}apZx&fxGbbe1a!SzR$-C1VQl35Dw=5K;WDCc&SG5V|-$?CEUjd{{z#X9EAV?
delta 3424
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
diff --git a/src/test/resources/data/templates/NameElementCommand_create_name_too_many_columns_uuid.xlsx b/src/test/resources/data/templates/NameElementCommand_create_name_too_many_columns_uuid.xlsx
index 316b20d5eab1e30310d617ed5d6db8ba267adf45..8418032a4634499e5a202f0a25bef1e76394d98a 100644
GIT binary patch
delta 3412
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
L(x4iFV<Z0q&R-QV
delta 3376
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
Z7x6?czH@Wotg;9HoeNHr#__BF{{Wcl4L1M)
diff --git a/src/test/resources/data/templates/NameElementCommand_create_names.xlsx b/src/test/resources/data/templates/NameElementCommand_create_names.xlsx
index 29185eabed54c2f3bc9795bf55d178c1980bab8f..c5357b75b3dbc1b877bc421ea17a2ff27f0c79ef 100644
GIT binary patch
delta 3531
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
delta 3566
zcmZ8kcU%(M7YEE$LTb2hn>%-=xN_t+9F$6q%oV1%Q!7*?lU%5UnmHrabML~Qfjcd?
z<;anyR<4XvY&d>ppU-=}-~H#Dd(Pe8d(ZuzLakR?U|TDuLr?%48yg@4VOR&21Ty`U
z4eG#?paaF1>Emz3nFVs-B4JqJxC`~9iLy$GuoZv2I^^xuBWpxnxg<7|a!K!J-?ns$
zPAdu|T{_y^R!6W2ygZwh8~pW~l;=Rcxe2oyWzT0#`_?niIjS>7zraBhU0taDmS454
zw_T5WDLQ43?Wob|igeC(0MPM><|}O)Lzkyi@{F%!NV~ffm)aSa$kM>MW}GD3)IGI#
z%nS75d*aV$?#??=<IYI36ML)Tlahm6@0z!#5kA>lhT1ngoztYdCqUACg>7Uyr$UP7
zzmzgjle>|!cRtuD)XO)zXNCqw-$nD%q-r^O-%ISXb!tgIE>2!4Bn}getoFq6ZmA&_
zkK)Nn>>i1&PATDDXEq0?t8uF`bO7PTWRg+M4Xwkf%<PCsVT-$Q*af$m5*BwL?p%m%
z-bRXLmpe0^hodZe0JeV@`o_+>wcOiIK(xzUZbFk26z&i)FA7S0#bOa5XMD|!d&btc
zafZ{>0}-_SG>j|&pA>4Sx&#JFv&&~`h{x!N`~47+xJa4q>5V}y;<~%;s$3qqnm2KY
z#<aimGVEepkA|v;*xij(oxyF!7WGxn_1h^AYwKHA_#OJ)Cl1pwX9*FQM6U*w&+mGK
za^(+?8(x|rX=F2+BVXCkDsDDzsddh5gk5n6e`Zj2Ldqb{4Z3=D-uiOk^|`@nC0ND-
z={NCqLO1i1=TI~wMPHm%F;&)^dK}vh2<%vX9YgCI&<Pfe6DzAPFm)k>ct3Z%(;YV=
zQSr7MBiEJnsUf;*l;bJCKa;GjX@8ej0J%_+yJw~do^yd{xv^Ad0y7~)S<Rd<%Pky@
zTeChxNrlGyw`DabhKXs-!RT^!?8z9#$3Z-(?P2&PL%Q`a9p@eY$%gBNxCGo}8p1_7
z*EufkaU&50=HdglGi|}xW4ALtSzTiKqJwv39D+$y-vEKR8uAU!bhgM0an7d>o>0Gz
zj+5@_`HuBrTeea+-jvc_D0$4~h!!J#fg#>pC|p*lpJhiu#G{CWc&aIS+GSH+o2hy2
z%3_#OwF|NuH{L9a&V_!LNfz^`%``oI6o}7vi=dr1|1M84#ju~`zLQtM&!UG|n7`==
zf#|1A+XeMu%tTVFG5cxWTq|ZiUg5SaY}MKNvU3hTe@!%Jyi5Tq8cN*ysEh3%LM{%S
z2$j&><Wc&rCF{85J?goxa_$rt?FQ!i{Z;<NrpD-69Q;#h`lnM~M{-P&=3|ifBbt0j
zD`WDJK!L=9K=@t;a;DD=k{p|NL6VT)0=<7<JwreSt{PoDa+!^yT(2mHJxlH>5BzxV
ztww2(eU|YGtT7X{m_FeOa!U8Dsx*a^Sb)ObzW)5!eeB(-Zny3Ax&$M9uvVCfsBI?B
z>Gj}I9PJ2MU$3pDG#8t-Bw|ANT9E3++L5ckr#NtQjg~XycZI`Kpl{z(JsZyW5nEhE
zF{;TyL)Gff(Cf0Bg|8#r{o3PsCm6FkWAS^;wpOfc3=vAyxkCUz4F>@5pMZn{{83;(
z^=lYqw~z)w4&d)#Bnp<nAp)nxI0+lOJiHMetqi3U%=@&zkbxN^J2CG3^_gQ6%q^CC
zQOnQVZFs13dP`r2`AOX<h4B?r@qr4_`;nZL5~&q=yFYqnqa&BH?N#xQgIx89Ya|J5
zHkCuQMBXe)Xi}<py{`KBMIZdv+JMC`MCT5WTwn)Q__4vIg*aK9;<yuga5-O=UPaJM
z6zu-p%GbL)p{4I>te^Wz#0N${mG*c}147q#EQ^AUYdl?V5MEISZv}qPpNn8y99>19
zZEPv2^?c1FY)&2WH`UJEd8Zf!y`v0O?Q?$qRQYYexOXqoq*7%>U<Im~m)UY^ESL!S
z#{MI;v<WF=&k&x(MR;k?!<`IfA5DZVK!bG)uT*{n!!BHwd`|hh`n-1nE=sNlYcV&c
z0B0NhtfAaIrWZsmt_Q&khDCVoZyUe(;J{w$9d7Jr(-PMm{2~2a{jx1yV$^mLI-R6(
z+j!%HcIwXNkpqxMH@v)n0D#I*p#A^}gfJx4LnLq+{Q*-d95EZ%!$wSm&7q!UcYd`g
zlW_$Dym0tLIG<z*?<EU@IhvjyeKnWE^&Cet$8sA>m;RUIQq3(halDVRdP`AdT`jgT
z!_w~;Jd3F~XE&U!0p{UJ|3p+7&|+pR&@#uUwdWAGXc-b5`uJrwCbn%zH;lil-a?B%
z(;FB4@};+W3d|T%MU_k3*5(&|mG0gg`Yl&MDW?EArP@I%s_1>VGO{^cbk>YaK#CR>
ziala#<+IsA0|hiQo;b^9O^dh`AGYYB9Ft)mbXzi^UGj6f;y`ZvYs><)o%r_}LT5!o
z`fGSrx@KX!hV(I!Y2HH9jdOH1TG0UNN)_$_=R3vn?`;;U`K(!6Pa_=DG+Mz%>OgPp
z+}m0$*uP~@@2U8w&aqcs#SgcgKJ7+|fGeL$Ex3c0cM}yW7>>RX)~NPTPYK+~@3p-&
z8&bffP3rpMQv1X4$h)9b#rzn=$-HmxJ4AvPV?d>(o{G?%x+jq*A9e`$MG6HTOH#&|
zuk82ke|x)gLNX`nS;!zYD1WdM<tDVSXFIUG*=@9>Pd^IX9nZtM*zF4bLNlo__k7t;
zG~-zQgXT{#6F3!dS<ZnuD$tlW+b7a~z>s2#NGGIyUis-Y3I7=eN~@bafOxds+K90l
zfibsqdwBY+t2CaH6<QaSGAKiGaUGA_)Myz2owsavH_)x-_cE$NeqNX#DB!XYELW2^
zq^GY@q{qJ;bsPgL7n2Z{V;Pp}FRmLlxv@Fm3B_~)XfLiLt*9y1GrZR2aQD=+*}~{p
z)*1nQjyiCxCIv%&-m~LN`jDGBy=M6_K|v}tEaq8Z!p-<=97E<wZ}@|u);BNBee8@i
zzQ^J{R#GHwW1*TxM22%rh4<$KpJg7L#)8O=lNM_YoCL?kX?cI;+46_?=blpp+CnXp
zg%k0}TmhU;NBa4RdXe{e*F|pz0V!k0twZFByu`?sy_4KWc_&UahW5A&B5tE=K!jVC
z?9ODBJT)n+)%g;qo4hPZ$H_;)A^u;z4J$Hisf$)5<HBJT*uBfj>bBBAYJkb*&yqr{
z9dgtqm&y?Jd@vKbqV0`C<K_%!LVNp@>92(G?owRhlC4x+k6MBexy#7hJ=`LNyPEML
zvu&(l%XhSK2;<sxr^!xP(t8kb!(T~-k}TNg2K4K{4_#{}u_jx3Rr%ezQfDEcD7X>6
z#OM|3BB>IEIeGGVFzcuo&oE=9t1ce-31P$b=G6|ah*A-GR7Kz2d#X+z45=_bSDD8n
znYb=9-@mrQ=(ogmDOxz7r&WdZ=?=m^w=}KGeso|#hj-ntm-u2?SLoWX&m8l|WR`sW
zgqf2q+WHfy)h4{o+1EQMmi>7F%7*JqN+W}Uat^+GfZ|u-l2v=u>pyO7)oD`n`6FZ3
zb!$DQYJnaIo^q}x|8d>UT_jzv9>+Wh$5G)oF;Eu{v~mxDG+$}Pa1$2{yVGR~@AjMP
zDmB1N9Q$#x(^`6=u=9~~5bZ@ipuSM4p3-J*jZP)r@OYCnF{!YYuxk@f{JS&7CUL^f
zW(~_F$ig@3N%LBGu&;2M$K#o+2bUvGTQ6_pEd|Y($r6q;+mFgN>8HLvg9Qz#SU(w(
zsELN=K^hk{4Y3#bLiSjHJ(`x99yEjr08r!m|3@=)ObTZctHK$*T_YBC8+5!|y_NeE
zHYB0<kxyjBI?<l2zV46Nf6A<JH8^m4_d~=}zc1hF%3_&NrB1GCl8F`or$*#*xmeDY
zM5Gx0Otn;vGniQmfBeg5B|bvJSbK#(7<GOQBw8eVtVB%5xI;F~gB2WcC&EWLz<DZY
zbI9Rk5FOWl;=vW6H=`_RRw=m*Jo!F%uNE><Ze-10?~u76nZTm1oo&p%yCpHvJ)^54
zi_0aplkhoXN$}=WYeaYT>capH)b8%F@6^Z(;6j4sb_KV=bC<)?3PBkE`=hkhaqisO
z=MUVz$zJ3V8Fz8S(h9h*QZ9fq6IL|cLT_8`o8p|AKhqaa1_ZrF)V}Lujy|LTiM%s=
z*=BH+S#A{G-wp>ac;$5}yg+3}Zz5`#2m`#3@_l*lYz|kMX}76$eVV}>eDqKx@vtBN
zvembZ{dE0bM^1@P%|ZT*Q%RuzJM#Zf1J0k+pdpm!clJWc=6!XLyoB%#{-z1W0vf*z
zq$mOH1NlS%ejv95tieC+sDJne$rh${;7Nv=Kn^_re0roeFm=~oravR+uX+D16vzQV
z@eK6$_YSxks;YF&A7g6;1VI7+WLT&_uaMxsU4Lo?q#!|g(O)zCxo58bv|*5%1;q{)
tI4vj$yiNKlD0)zX2?+veBn=^ngPOCDAm|<+3D3tvA_{S`pap)7@jn^hO(FmQ
diff --git a/src/test/resources/data/templates/StructureElementCommand_create_system.xlsx b/src/test/resources/data/templates/StructureElementCommand_create_system.xlsx
index df4ee25e05f030bee11b79506787baaf0d877262..9b013d4318ced2a47bd1347505fc9bda9d8cacc3 100644
GIT binary patch
delta 4310
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
LL?*)V+s6L@J#)N=
delta 4329
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
diff --git a/src/test/resources/data/templates/StructureElementCommand_create_system_StructureElement.xlsx b/src/test/resources/data/templates/StructureElementCommand_create_system_StructureElement.xlsx
index 950faf239ee29b7edcc642278a3a171c152f3baf..f0753712fc1fc340af9136b851f0eaff5294baf6 100644
GIT binary patch
delta 3088
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
delta 3004
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
diff --git a/src/test/resources/data/templates/StructureElementCommand_create_system_different_column_order.xlsx b/src/test/resources/data/templates/StructureElementCommand_create_system_different_column_order.xlsx
index f789a9e1a2e0fc3cdb2610f371d10313599f32fd..7baaa52d3e7865bb9e7c383d414491b14536dc14 100644
GIT binary patch
delta 4390
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
B&g=jH
delta 4483
zcmZ8l1ymI6_g)%ymu?mX2?^;~7Ep<$8w8d{K{}<=p+iB?g%1!|T`57jyJQI|5s@(H
zZctL-hkob$|N6b>%$Yee&wKBkcb@mT_fE0&wluk(CIKNGh?JBRB>GUXf}9JF;PPB0
zfhUgt>jLdezz&SKXNu5;PNPg7T8F3PZW8)f7H9=$6iKFD*ADh<4>Pjm{Op8mdk81S
z*KVva&C8?Ftu5P@KJ-lJ@bYXG;;nzHNHe6ka;1UlF2jCQxj>ZE<Kxpiq`8U$3Mt~O
zonXy?t1Xb+BHq>^QDb>=5#~;d!oA4(UPKSkGu7rUtzjV7f=+D}+skSSPM~p;C-S{s
zD(ekaVoJcT<zI?^#=dkTUlFmY*bcX*Epb~y-dz<6e3ci{0fi`GtHc9kw9XwrWaaD7
z<z~6P%a(`5;U9yxsKz|&?3IaX=OGHNSUUPBV>m)I9HFY{Oe;_<WK(#+?n6nx)$$Cc
zDU0m_1DOq|WkC8KK^bh{j7o#V152i)5TDW+G57-{ai(mvR`+Q2);*`S=C=C|_(tFE
zPZ4}fENxog7zr*f+30{1(nN?2QMK?P(>eG>HxyqS-*So6mw!+sQNeENZidtBN#?~t
zzB-BKSKDpLG=?PbwZLH~s*Qm`D0J!QCVB4~5Pq)1w5dHVCP`rUPxW(eq(NCVc}US6
zVk|^M%y>pM9u;we_037JVQdblCZ2sc;-;f>RhVhj#o)5$(}}2!eZ`kMW}(YqQ-+dN
ztCwEb$n5wiZr^*ic)S%RHY0}BrAplRWtqeFju?1Kdb7A#ruuz8t#TH8N!0z;dRtP4
z4S<bN9%egRN7ixLi#-Zd9QYROLMQ%+8JA$AB6=FPn?$*)yBbWA*Dc2@iAEZDAH2XJ
z&gPqL4IB>bj)o@fuKSn=S`W)<04@$EODY{xOKk(S<K{b3n^QhMZj|HpIWEJ#gKYjQ
z-WJ}^t(CUt3QjEt?h1nk=*>vmGJ*}K9K_ulI1H)nRfpg+&lriE_ghv$o<F%jKYak-
zmy;lg&tzs~;ieY8>1e#}3tD@<b)PWV$>^p|j!!P{6^4kZg7fM`?@+=I=SMvBG)YKh
zL!+j9@Ij#aj3Cfo<gdC%O!1rjXfF~0!22_ts^t*n8PHout!!4w9c$B_%2^=(WU(U4
zK3^&hq@17-fhXU$SGJ8mlh#|Ev)XaHcfscPVACAbG`l>WARWxXwRqh5L)CWtTHt`_
zpg-jBbboDrz&BS>S|wrm{_NFwA34>wXc8f-`x<dxAoetflu=Rr!A<4@E~Hl%0D1OS
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
diff --git a/src/test/resources/data/templates/StructureElementCommand_create_system_empty_uuid.xlsx b/src/test/resources/data/templates/StructureElementCommand_create_system_empty_uuid.xlsx
index b27e3424b99410f9d7ff6c72ecf0155f5c88a76c..c02d179b032e8561518d9e604418246f7a0baec9 100644
GIT binary patch
delta 4242
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
H{>J?WsW*z?
delta 4358
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
diff --git a/src/test/resources/data/templates/StructureElementCommand_create_system_incorrect_ordering.xlsx b/src/test/resources/data/templates/StructureElementCommand_create_system_incorrect_ordering.xlsx
index babc745622c370465c7e9f34ea747315a55e5fe0..0aa6a6fc499083d07548c7d76bb9dfe9c9bc1d87 100644
GIT binary patch
delta 3529
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
delta 3508
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
diff --git a/src/test/resources/data/templates/StructureElementCommand_create_system_incorrect_uuid.xlsx b/src/test/resources/data/templates/StructureElementCommand_create_system_incorrect_uuid.xlsx
index aa0029771fcc899724f0a67ada0984e95e2b2812..91cbb147ce21cf82be8493e4d3caf6e8d5e47a5b 100644
GIT binary patch
delta 3531
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
delta 3560
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
axqz*h>)d>2l<jXS6BEQOMB&2m$NYca#BZVi
diff --git a/src/test/resources/data/templates/StructureElementCommand_create_system_incorrect_uuid_parent.xlsx b/src/test/resources/data/templates/StructureElementCommand_create_system_incorrect_uuid_parent.xlsx
index 405ce3397f5093d3ffc772f6652139fb0d7a4f7c..d3f8c4454cdec354322c23107a48ad2c170bd3d2 100644
GIT binary patch
delta 3480
zcmZ8kc{~)_7azlnJ%d3ESt7zjktj=J-<PMxo_!f+?8{hcWS3+ZOYtQ8tE}0{o)Fo`
zF6%?c*w^A0eLnB^diRfe&OPUR&gU-Ye9t}aWI|-<^|i<;pa3c=DgX#=SW3@NM*fqQ
zNs>tb&lzX(^<Rt`_`<o0fTk3|X}L{ELmEiM5btG_i`>>bLlc#ip$X7{bkrcc<d$iU
zC?E87LL%4F2nj#bg*2d$Ltl6%E%Du95#|}u*`AW%e}|8SC1_oZ(6>+3OOY3JXTMPn
zKCSmq5B1@?O$ea|$Mfm*`APg*cn}iAJ5CNLT6~o0<HJQEETSGgq<jw-7J7y4oiazV
zC+sgxrm$~$2_TP)55NLhlYUeqTkwl~y(m>z6=X`73nd@55=V;>sPJCQUdVJ<q`<h+
z8;ooy#4SCqHKs=mEATl-pKpYqov7n9FY4I5Ce(W)P|Hdnq1R{kQm}}+s}ehr5|*8D
zh4nikK*m0`qZp`U;rRgvC9?>xwA0zC`n0l3zyc6&FAVTIN##@L-OapOC#WI6@0PV{
zj}|RxR!CeU&P*7FkBad&r1BD5OlB<;=I(r=R<9_4&1R2^Q5*x6n>sm!PXwBbMeyEc
zcf<VnN4RoS({5Vx4^lAf7dn4#>O9hSrC0@scN%;yrzV@E9{YszgKSPNMd*U@SvRh+
zhFvG*k?cS2xivM)?$;afe)5U9h=;1oT0L~D%Fv`w_gm(1)}nP%>Pzh^VVoO_qH}e6
zVpk@<gX}Q>^9s$h63<k;eCnfbl>sYihWLgDVC=zEvI9zwF0s}cXndesdTsG!%=<=6
z_E(}xJJZkt?e(WPr9MaI>fvJj800{S80Tj{JGG0W6Ydc=n*7E<YU_g(LihJZ@Ll@3
z+J_u{1xV9G9rM_NR~MO23>$}0(GTdVJm@lpB(DsHU#L{S>z6X;?JOM-YUX$C%gXNi
zU5<~A>GLICoGJv`!27_I%2hV?Y{_^Vk_Ifti*#{iaJ@qTN8M&}n#D1EDx}ddRV~p@
zbq$0ErLm~{p`KIRVYaf}M4=hE%tSx3ZkD!v8=YGlo!cIr`#x$TQ(3(%3bZQD7C*sV
z{SKXI%0gJB2vWqti*%_t%(V4>PTgmm@+`Gd^GwtI1kd_6Yu~qNoT|mkj==Tb(zahy
zL@4{gabY>dAub<S#qULPn)6}Vol;|29;ZoK#!vp?-i@YZ5HzZsRW}OprB3f{5WP0{
zcAeo<6(h&Wu7r;Dk}3n9Hj{GoRhp*{=yL_1r;g=pNKbH0UVK^}I^WXkN4CS*&AZbQ
z5E0Z5tI{Ps(5y%Y>$9gh_=1N9-9I$d;f&#x^*C#xz=qj_K!ndNeL1WGU4#)>Cx};b
zThhSc#NFn*X71;q>f$bXkNQlcoxiX=ybYt0+4e$toMR_J`(EOxA<$g9GCBD&!=P;B
zZ4b=mvAEeL&3td&$v{qY(`fA19WLRw47A6`>uT_wNI@)*5b09HX|@pK>2^HY`baCk
zT+i14eLBUDV6cT)h&M($NpG(0hlXQH60Dv(ri#B)8O!v~@!v{q=?{CcKJK|Mt#eAQ
zuSH4K#L%!JN&x`O&;S6x!A{u<E!!_}p`gEl8)()g=Y@c0>huuRX0?}|qKpGd0-Uoo
zswm?+bnE!Lg1bvf-NXXKU(%_~*q$s<*8iX@Gv*=0jdr<KBm?`}`sZ^~@@EhC5HvP1
z+3A-R#ftBGy0}U*#ssjuPGR;M7gBKzu|lyhTgl0^bBd1GHwbC6uc<QwB2A_WNA`tr
z#&LgC8{=Kjf+~npgPBdgR;Ml1(=fD<iBZ`qG~|7-Wd595;i%JY?8)QSn+WEh3U++j
zG8wP(P7!tE0;4CqjG7c|z8Ae}CV4nN;eov^+27WaTNpi6;^t{FQNGqI8nJc3hSYy@
zRfi~M*YNWuD5)qR7ZD@?01ylW0Debgg6xIMxM`OOaY+00z7Z9@Dy`1Kj`h=SUlg<B
z#qpb>8kun|wL?HNsoOF!`y-_9E_S)$Pvs7pRsCv@O*4woV~sM4?014yES?AV=3R2M
zN>D^?Gi^-y-aKq!zl}=lrXeRQCOgzQXx4ioOF54>XlxG7?@99F71!WRk%nuEOO}bD
zao4!Q_f)J<2w`n9^Ow;sy~m=Sujxt9MK$|g0|VqqP6a)UU{;rFL}WvOxv4QHn0H%6
zfdec#LO$u@jRQJZb8k$rJ6f0&0N3MRg<fVcsIwTP$CZY5cZkN(Y8KKsqnWFaT?L)r
z?2F23wI1Ax=1*eH6id6w-mh5$e)KFCr`=(yh$x|)u`Y1BK2BWAdQ)C&*Y>go>covs
zs{RDT#Fy<RK0K1%ZjkRR0OrLD*oBj~nKIr%6k4s&j>yIoJwxo|6yr&%YF~y0-nYwG
zITQc7AB-NzbbEPgVtIBVu6^ogh2MkNyS{!@O`o#qz*tP0CmC?7>231eMy)g9CYF4>
zi!d?$n7|)-efe9-;RT76CO%#MnbYMja+zMNiHP-9Sjp6a7{FUC%M0~YOWJrRZ@k*u
zrUB}`44$|Bh~(gCVs5tOr^d3V#tVzQEgQGaUcI&|cV>VL0C)rbPd*s`426FN3_w6Z
zxN%c%gW`~;=|d5|?Qy%qweb=tZ{G)UZYDbHpXTkDZca;R9p<BD@0d;<T}~-w`7ZDM
z@jpqI_tHs%YW3JD;=sffl2#uS9fHT2Ul$5DWm}ja<|<r%DRnRDUdSA%=I_+^58hXo
zSRdTKJ<V!2_{O~K$;iFq3M;siF?$9g-3{lW5ukwWU_gpAV{vzsz2l;0xaQlh`WhTW
z;kn8MOw7?<7X1-v6A^(~q8&bLb4%kNthHsq%Q<ag-O|tUtff5~KZKg!0{aZ-XXXj3
z%f$y~b4u@dw(oC0XLYUKXAT=!M9xXLSYx$%3i{>S%&N+v=Im8`)mNiR4X^7zk-*s+
z8RJ<6U>;J&``4*cf(b<)@glqe<kT3%gQAUA#kxpe`rN>+lgDBt0Xmr^CSOHs8G8g$
zss&y_2B(u!(@o)6__$$o6EmWCm{6>JNl*jg7%L-0FX<oEnl7Z1q&6rj-EPp<R;##V
zf;TpzKPk$MB{_7k>=EA<x?vrIaBqx3m<KWM690mliiSfMrHb`iiPj^UqyCi^n55)X
z%(#51{MX!^H3v%zGn($g1#p*9tE$%(P#t?B8G*^3o5S`#S|@=hUprl`1Sfc>_783L
z%@JFAdO*@6cmKZ8&b633I;0f3;4D{8H=Y?DD-6d9WYe=+{!vA=I6;o%im+<*yYgZ<
z8yX|m&lydlJu6#rC4Vb~z5X(nhhp1g3EXQ~jD7o+FBR)?V^h(ujk#CP&@b*<&olYq
zK-(Fnn9Ay$KfE08IQ0dDr|tZRg}PK!hkP`pO#O25NZ}~>n}<6V=Y0UIQ*k09OQ>zM
zh|a|;_JWtT8(a?JM^6>exYQnQK34WvQdGJlLW=2F`@=^i8-tA{^)+a;oC3%$n{g~(
z(f3LFGI>W&Z>Yc2%Xfm!=o@yd9=q9tGIsOvqxpQkQZXld!wjL~b=gueA>MZ}lJpMq
z2FK>3d4XtnVFxB+02(Q+sYf<xN3s99DOOQd=Tya2DoEv0^Fv*C-Lk-$xvtWT&$^V8
z-W2<tO*&bPr_o2ulisqPdJ&Uf<ve@gHQR%{w*sLxjuvpXMzXUE!x#GE;p6~-65D?=
zj4;j2k27;?;ekGyE_TAYT_vt5j;Eqy^dwBOx{~X!OCu{4sb3Ls3ggcCFWi>uHn@5o
z2UQyRl#{R8Wz#ArKviD(U(P9_*{Muz-xu<HiE3U^ReF43rmx_AXHDk&(hX-A`LLF|
z0oA}WPs3NS`w=#42Vkg|hWj#45$x@AhCbw|IPRoXxXC2-iw)={^&<N^&{pC~mTk_A
zZO+(uEdzv8iJqq1?>RrkslS}@-$j>}lO*yJPON6$?D9WbuP0=eVkUCZcZS_@AquQw
zU5|#0S6uIN>c61XtpP2<%oYzg!%TzcksRDe`6xE!rkjIAskM9xu10uZm%2|{@r&)4
z4V<bA_1q@pMv;5Fj=s-AmN<|LEU!T#<S!99lT1=|<|Sh~Tc2ou<<AZa^3@R|Kk8xi
zeRnKu?>pkh<>7~^`f&tak9?sDaTa?>PySH&^hd@P+u5ZbF=&z*{)DxdpT+FAGXEQ_
zK>%gJELVP2{nxC-^Je2QTkkJ{A-mL>fbf+4_Brijmp-Qy9J&{N%8md3lOR}e{8FWH
zz<~X<ghN_R5q&K(AQbRVQ)B$^>I(e_SI?ML!YRjP?lX`7#$w2CHk<?mjQiZ?-_Zp7
z%|?`fg9%fe`8hj0p%lhSmPP1*@tkjZ6$T@dBv5j4pRcZR!pP7B6;8hMl`|&{sLV#d
Qv#}8V<b;5s>}PKO2W5C7b^rhX
delta 3514
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
M`PokB@*Ji857yo|$p8QV
diff --git a/src/test/resources/data/templates/StructureElementCommand_create_system_too_few_columns.xlsx b/src/test/resources/data/templates/StructureElementCommand_create_system_too_few_columns.xlsx
index cac4280d03ccbf24f7114571d75dc1ff97972036..87ceb370b73f631630836108b04806ba6bf56814 100644
GIT binary patch
delta 3185
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
delta 3322
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
diff --git a/src/test/resources/data/templates/StructureElementCommand_create_system_too_many_columns.xlsx b/src/test/resources/data/templates/StructureElementCommand_create_system_too_many_columns.xlsx
index 1af2f202793a6b0bfd72391c40f12f892aa270b6..1638a2572f24697339226cbffae4c5e871327e02 100644
GIT binary patch
delta 2943
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
delta 2969
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
diff --git a/src/test/resources/data/templates/StructureElementCommand_create_system_too_many_columns_uuid.xlsx b/src/test/resources/data/templates/StructureElementCommand_create_system_too_many_columns_uuid.xlsx
index a50491adef9f45ac5269d3589602a3198fed2776..e4cd24426f50ec45a26fccf9efb614ae521ecd58 100644
GIT binary patch
delta 3018
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
delta 2905
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
U$X%3x0+nz!67uX!(I4jj1w5KG<^TWy
diff --git a/src/test/resources/data/templates/StructureElementCommand_create_systems.xlsx b/src/test/resources/data/templates/StructureElementCommand_create_systems.xlsx
index e9c4898620b30b3cb3987c8471fc5ea2bafaeee4..a90e58144e771d9a5ef2ad78186d5fa80339661e 100644
GIT binary patch
delta 3570
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
delta 3667
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
--
GitLab