From 76899b44777160ec8c12c682af4e940388a72c60 Mon Sep 17 00:00:00 2001 From: Dominik Frantisek Bucik Date: Wed, 23 Mar 2022 07:03:37 +0100 Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20Allow=20Group=20descripti?= =?UTF-8?q?on=20to=20be=20empty=20string?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cz/muni/ics/oidc/models/Group.java | 4 ++-- .../java/cz/muni/ics/oidc/models/mappers/RpcMapper.java | 2 +- .../ics/oidc/server/adapters/impl/PerunAdapterLdap.java | 9 ++++++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/perun-oidc-server/src/main/java/cz/muni/ics/oidc/models/Group.java b/perun-oidc-server/src/main/java/cz/muni/ics/oidc/models/Group.java index a70a7b630..f5ec7fe10 100644 --- a/perun-oidc-server/src/main/java/cz/muni/ics/oidc/models/Group.java +++ b/perun-oidc-server/src/main/java/cz/muni/ics/oidc/models/Group.java @@ -60,8 +60,8 @@ public class Group extends Model { } public void setDescription(String description) { - if (Strings.isNullOrEmpty(description)) { - throw new IllegalArgumentException("description cannot be null nor empty"); + if (null == description) { + throw new IllegalArgumentException("description cannot be null"); } this.description = description; diff --git a/perun-oidc-server/src/main/java/cz/muni/ics/oidc/models/mappers/RpcMapper.java b/perun-oidc-server/src/main/java/cz/muni/ics/oidc/models/mappers/RpcMapper.java index 9375a2fdf..c10ce43a6 100644 --- a/perun-oidc-server/src/main/java/cz/muni/ics/oidc/models/mappers/RpcMapper.java +++ b/perun-oidc-server/src/main/java/cz/muni/ics/oidc/models/mappers/RpcMapper.java @@ -114,7 +114,7 @@ public class RpcMapper { Long id = getRequiredFieldAsLong(json, ID); Long parentGroupId = getFieldAsLong(json, PARENT_GROUP_ID); - String name = getRequiredFieldAsString(json, NAME); + String name = getFieldAsString(json, NAME); String description = getFieldAsString(json, DESCRIPTION); Long voId = getRequiredFieldAsLong(json, VO_ID); String uuid = getRequiredFieldAsString(json, UUID); diff --git a/perun-oidc-server/src/main/java/cz/muni/ics/oidc/server/adapters/impl/PerunAdapterLdap.java b/perun-oidc-server/src/main/java/cz/muni/ics/oidc/server/adapters/impl/PerunAdapterLdap.java index ce81b2598..c078e594f 100644 --- a/perun-oidc-server/src/main/java/cz/muni/ics/oidc/server/adapters/impl/PerunAdapterLdap.java +++ b/perun-oidc-server/src/main/java/cz/muni/ics/oidc/server/adapters/impl/PerunAdapterLdap.java @@ -557,15 +557,18 @@ public class PerunAdapterLdap extends PerunAdapterWithMappingServices implements PERUN_VO_ID, PERUN_PARENT_GROUP_ID, UUID}; EntryMapper mapper = e -> { - if (!checkHasAttributes(e, new String[]{ - PERUN_GROUP_ID, CN, DESCRIPTION, PERUN_UNIQUE_GROUP_NAME, PERUN_VO_ID, UUID })) + if (!checkHasAttributes(e, + new String[]{ PERUN_GROUP_ID, CN, PERUN_UNIQUE_GROUP_NAME, PERUN_VO_ID, UUID })) { return null; } Long id = Long.valueOf(e.get(PERUN_GROUP_ID).getString()); String name = e.get(CN).getString(); - String description = e.get(DESCRIPTION).getString(); + String description = ""; + if (e.containsAttribute(DESCRIPTION)) { + description = e.get(DESCRIPTION).getString(); + } String uniqueName = e.get(PERUN_UNIQUE_GROUP_NAME).getString(); Long voId = Long.valueOf(e.get(PERUN_VO_ID).getString()); Long parentGroupId = null;