From c77dc2f991acfad732afd61746687d294f7a6c29 Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Sat, 24 Sep 2022 11:11:33 +0200 Subject: [PATCH] Code reformatting and cleanup --- .../categorization/CategoryIdResolver.java | 43 +++-- .../categorization/DomainIdResolver.java | 43 +++-- .../libreccm/core/CcmObjectIdResolver.java | 40 ++-- .../org/libreccm/core/ResourceIdResolver.java | 44 +++-- .../libreccm/core/ResourceTypeIdResolver.java | 44 +++-- .../org/libreccm/imexport/ImportExport.java | 181 ++++++++++-------- .../libreccm/security/GroupIdResolver.java | 36 ++-- .../libreccm/security/PartyIdResolver.java | 35 ++-- .../security/PermissionIdResolver.java | 36 ++-- .../org/libreccm/security/RoleIdResolver.java | 36 ++-- .../org/libreccm/security/UserIdResolver.java | 36 ++-- .../libreccm/web/ApplicationIdResolver.java | 41 ++-- .../workflow/AssignableTaskIdResolver.java | 33 ++-- .../workflow/TaskCommentIdResolver.java | 44 +++-- .../org/libreccm/workflow/TaskIdResolver.java | 36 ++-- .../libreccm/workflow/WorkflowIdResolver.java | 36 ++-- 16 files changed, 460 insertions(+), 304 deletions(-) diff --git a/ccm-core/src/main/java/org/libreccm/categorization/CategoryIdResolver.java b/ccm-core/src/main/java/org/libreccm/categorization/CategoryIdResolver.java index c3078e77b..35b97425f 100644 --- a/ccm-core/src/main/java/org/libreccm/categorization/CategoryIdResolver.java +++ b/ccm-core/src/main/java/org/libreccm/categorization/CategoryIdResolver.java @@ -26,42 +26,51 @@ import javax.enterprise.context.RequestScoped; import java.io.Serializable; /** + * Used by the {@link CategorizationImExporter} to resolve categories based on + * their UUIDs. + * * @author Tobias Osmers - * @version created on 3/23/17 + * @author Jens Pelzetter */ -@Deprecated @RequestScoped public class CategoryIdResolver implements Serializable, ObjectIdResolver { - private static final long serialVersionUID = -5750627754502675522L; + + private static final long serialVersionUID = 1L; @Override - public void bindItem(ObjectIdGenerator.IdKey idKey, - Object pojo) { + public void bindItem( + final ObjectIdGenerator.IdKey idKey, + final Object object + ) { // According to the Jackson JavaDoc, this method can be used to keep // track of objects directly in a resolver implementation. We don't need // this here therefore this method is empty. } @Override - public Object resolveId(ObjectIdGenerator.IdKey id) { - final CdiUtil cdiUtil = CdiUtil.createCdiUtil(); - final CategoryRepository categoryRepository = cdiUtil - .findBean(CategoryRepository.class); - - return categoryRepository - .findByUuid(id.key.toString()) - .orElseThrow(() -> new IllegalArgumentException(String - .format("No Category with uuid %s in the database.", - id.key.toString()))); + public Object resolveId(final ObjectIdGenerator.IdKey id) { + return CdiUtil + .createCdiUtil() + .findBean(CategoryRepository.class) + .findByUuid(id.key.toString()) + .orElseThrow( + () -> new IllegalArgumentException( + String.format( + "No Category with uuid %s in the database.", + id.key.toString() + ) + ) + ); } @Override - public ObjectIdResolver newForDeserialization(Object context) { + public ObjectIdResolver newForDeserialization(final Object context) { return new CategoryIdResolver(); } @Override - public boolean canUseFor(ObjectIdResolver resolverType) { + public boolean canUseFor(final ObjectIdResolver resolverType) { return resolverType instanceof CategoryIdResolver; } + } diff --git a/ccm-core/src/main/java/org/libreccm/categorization/DomainIdResolver.java b/ccm-core/src/main/java/org/libreccm/categorization/DomainIdResolver.java index 88ef6949d..471f814c6 100644 --- a/ccm-core/src/main/java/org/libreccm/categorization/DomainIdResolver.java +++ b/ccm-core/src/main/java/org/libreccm/categorization/DomainIdResolver.java @@ -26,41 +26,50 @@ import javax.enterprise.context.RequestScoped; import java.io.Serializable; /** - * @author Tobias Osmers + * @author Jens Pelzetter */ -@Deprecated @RequestScoped public class DomainIdResolver implements Serializable, ObjectIdResolver { - private static final long serialVersionUID = -8504371142795445708L; + + private static final long serialVersionUID = 1L; @Override - public void bindItem(ObjectIdGenerator.IdKey idKey, Object o) { + public void bindItem( + final ObjectIdGenerator.IdKey idKey, + final Object object + ) { // According to the Jackson JavaDoc, this method can be used to keep // track of objects directly in a resolver implementation. We don't need // this here therefore this method is empty. } @Override - public Object resolveId(ObjectIdGenerator.IdKey id) { - final CdiUtil cdiUtil = CdiUtil.createCdiUtil(); - final DomainRepository domainRepository = cdiUtil - .findBean(DomainRepository.class); - - return domainRepository - .findByUuid(id.key.toString()) - .orElseThrow(() -> new IllegalArgumentException(String - .format("No Domain with uuid %s in the database.", - id.key.toString()))); + public Object resolveId(final ObjectIdGenerator.IdKey id) { + return CdiUtil + .createCdiUtil() + .findBean(DomainRepository.class) + .findByUuid(id.key.toString()) + .orElseThrow( + () -> new IllegalArgumentException( + String.format( + "No Domain with uuid %s in the database.", + id.key.toString() + ) + ) + ); } @Override - public ObjectIdResolver newForDeserialization(Object o) { + public ObjectIdResolver newForDeserialization(final Object context) { return new DomainIdResolver(); } @Override - public boolean canUseFor(ObjectIdResolver resolverType) { + public boolean canUseFor(final ObjectIdResolver resolverType) { return resolverType instanceof DomainIdResolver; } + } diff --git a/ccm-core/src/main/java/org/libreccm/core/CcmObjectIdResolver.java b/ccm-core/src/main/java/org/libreccm/core/CcmObjectIdResolver.java index ecbf5a9fa..d5e390128 100644 --- a/ccm-core/src/main/java/org/libreccm/core/CcmObjectIdResolver.java +++ b/ccm-core/src/main/java/org/libreccm/core/CcmObjectIdResolver.java @@ -26,32 +26,41 @@ import javax.enterprise.context.RequestScoped; import java.io.Serializable; /** - * @author Tobias Osmers + * @author Jens Pelzetter */ @RequestScoped public class CcmObjectIdResolver implements Serializable, ObjectIdResolver { - private static final long serialVersionUID = 246452778202614974L; + + private static final long serialVersionUID = 1L; @Override - public void bindItem(ObjectIdGenerator.IdKey idKey, - Object pojo) { + public void bindItem( + final ObjectIdGenerator.IdKey idKey, + final Object object + ) { // According to the Jackson JavaDoc, this method can be used to keep // track of objects directly in a resolver implementation. We don't need // this here therefore this method is empty. } @Override - public Object resolveId(ObjectIdGenerator.IdKey id) { - final CdiUtil cdiUtil = CdiUtil.createCdiUtil(); - final CcmObjectRepository ccmObjectRepository = cdiUtil - .findBean(CcmObjectRepository.class); - - return ccmObjectRepository - .findObjectByUuid(id.key.toString()) - .orElseThrow(() -> new IllegalArgumentException(String - .format("No CcmObject with uuid %s in the database.", - id.key.toString()))); + public Object resolveId(final ObjectIdGenerator.IdKey id) { + return CdiUtil + .createCdiUtil() + .findBean(CcmObjectRepository.class) + .findObjectByUuid(id.key.toString()) + .orElseThrow( + () -> new IllegalArgumentException( + String.format( + "No CcmObject with uuid %s in the database.", + id.key.toString() + ) + ) + ); } @Override @@ -63,4 +72,5 @@ public class CcmObjectIdResolver implements Serializable, ObjectIdResolver { public boolean canUseFor(ObjectIdResolver resolverType) { return resolverType instanceof CcmObjectIdResolver; } + } diff --git a/ccm-core/src/main/java/org/libreccm/core/ResourceIdResolver.java b/ccm-core/src/main/java/org/libreccm/core/ResourceIdResolver.java index 7f7c4f33e..519b15277 100644 --- a/ccm-core/src/main/java/org/libreccm/core/ResourceIdResolver.java +++ b/ccm-core/src/main/java/org/libreccm/core/ResourceIdResolver.java @@ -26,40 +26,52 @@ import javax.enterprise.context.RequestScoped; import java.io.Serializable; /** - * @author Tobias Osmers + * @author Jens Pelzetter + * */ @RequestScoped public class ResourceIdResolver implements Serializable, ObjectIdResolver { - private static final long serialVersionUID = -402304483886269532L; + + private static final long serialVersionUID = 1L; @Override - public void bindItem(ObjectIdGenerator.IdKey idKey, Object o) { + public void bindItem( + final ObjectIdGenerator.IdKey idKey, + final Object object + ) { // According to the Jackson JavaDoc, this method can be used to keep // track of objects directly in a resolver implementation. We don't need // this here therefore this method is empty. } @Override - public Object resolveId(ObjectIdGenerator.IdKey id) { - final CdiUtil cdiUtil = CdiUtil.createCdiUtil(); - final ResourceRepository resourceRepository = cdiUtil - .findBean(ResourceRepository.class); - - return resourceRepository - .findByUuid(id.key.toString()) - .orElseThrow(() -> new IllegalArgumentException(String - .format("No Resource with uuid %s in the database.", - id.key.toString()))); + public Object resolveId(final ObjectIdGenerator.IdKey id) { + return CdiUtil + .createCdiUtil() + .findBean(ResourceRepository.class) + .findByUuid(id.key.toString()) + .orElseThrow( + () -> new IllegalArgumentException( + String.format( + "No Resource with uuid %s in the database.", + id.key.toString() + ) + ) + ); } @Override - public ObjectIdResolver newForDeserialization(Object o) { + public ObjectIdResolver newForDeserialization(final Object context) { return new ResourceIdResolver(); } @Override - public boolean canUseFor(ObjectIdResolver resolverType) { + public boolean canUseFor(final ObjectIdResolver resolverType) { return resolverType instanceof ResourceIdResolver; } + } diff --git a/ccm-core/src/main/java/org/libreccm/core/ResourceTypeIdResolver.java b/ccm-core/src/main/java/org/libreccm/core/ResourceTypeIdResolver.java index a79786673..efab62f72 100644 --- a/ccm-core/src/main/java/org/libreccm/core/ResourceTypeIdResolver.java +++ b/ccm-core/src/main/java/org/libreccm/core/ResourceTypeIdResolver.java @@ -26,41 +26,51 @@ import javax.enterprise.context.RequestScoped; import java.io.Serializable; /** - * @author Tobias Osmers + * @author Jens Pelzetter */ @RequestScoped public class ResourceTypeIdResolver implements Serializable, ObjectIdResolver { - private static final long serialVersionUID = -3756063950193704821L; + + private static final long serialVersionUID = 1L; @Override - public void bindItem(ObjectIdGenerator.IdKey idKey, Object o) { + public void bindItem( + final ObjectIdGenerator.IdKey idKey, + final Object object + ) { // According to the Jackson JavaDoc, this method can be used to keep // track of objects directly in a resolver implementation. We don't need // this here therefore this method is empty. } @Override - public Object resolveId(ObjectIdGenerator.IdKey id) { - final CdiUtil cdiUtil = CdiUtil.createCdiUtil(); - final ResourceTypeRepository resourceTypeRepository = cdiUtil - .findBean(ResourceTypeRepository.class); - - return resourceTypeRepository - .findByUuid(id.key.toString()) - .orElseThrow(() -> new IllegalArgumentException(String - .format("No ResourceType with uuid %s in the " + - "database.", - id.key.toString()))); + public Object resolveId(final ObjectIdGenerator.IdKey id) { + return CdiUtil + .createCdiUtil() + .findBean(ResourceTypeRepository.class) + .findByUuid(id.key.toString()) + .orElseThrow( + () -> new IllegalArgumentException( + String.format( + "No ResourceType with uuid %s in the database.", + id.key.toString() + ) + ) + ); } @Override - public ObjectIdResolver newForDeserialization(Object o) { + public ObjectIdResolver newForDeserialization(final Object context) { return new ResourceTypeIdResolver(); } @Override - public boolean canUseFor(ObjectIdResolver resolverType) { + public boolean canUseFor(final ObjectIdResolver resolverType) { return resolverType instanceof ResourceTypeIdResolver; } + } diff --git a/ccm-core/src/main/java/org/libreccm/imexport/ImportExport.java b/ccm-core/src/main/java/org/libreccm/imexport/ImportExport.java index bb79e0d17..b58108d91 100644 --- a/ccm-core/src/main/java/org/libreccm/imexport/ImportExport.java +++ b/ccm-core/src/main/java/org/libreccm/imexport/ImportExport.java @@ -110,14 +110,19 @@ public class ImportExport { */ @Transactional(Transactional.TxType.REQUIRED) public void exportEntities( - final Collection entities, final String exportName + final Collection entities, + final String exportName ) { final JsonObjectBuilder manifestBuilder = Json.createObjectBuilder(); - manifestBuilder.add("created", - LocalDateTime.now(ZoneId.of("UTC")).toString()); + manifestBuilder.add( + "created", + LocalDateTime.now(ZoneId.of("UTC")).toString() + ); try { - manifestBuilder.add("onServer", - InetAddress.getLocalHost().getHostName()); + manifestBuilder.add( + "onServer", + InetAddress.getLocalHost().getHostName() + ); } catch (UnknownHostException ex) { throw new UnexpectedErrorException(ex); } @@ -134,9 +139,13 @@ public class ImportExport { ccmFiles.createDirectory(String.format("exports/%s", exportName)); for (final String type : types) { - ccmFiles.createDirectory(String.format("exports/%s/%s", - exportName, - type)); + ccmFiles.createDirectory( + String.format( + "exports/%s/%s", + exportName, + type + ) + ); typesArrayBuilder.add(type); final List entitiesOfType = entities @@ -149,9 +158,13 @@ public class ImportExport { manifestBuilder.add("types", typesArrayBuilder); final OutputStream manifestOutputStream = ccmFiles - .createOutputStream(String.format("exports/%s/ccm-export.json", - exportName)); - try (JsonWriter manifestWriter = Json. + .createOutputStream( + String.format( + "exports/%s/ccm-export.json", + exportName + ) + ); + try ( JsonWriter manifestWriter = Json. createWriter(manifestOutputStream)) { manifestWriter.writeObject(manifestBuilder.build()); @@ -165,9 +178,11 @@ public class ImportExport { for (final Map.Entry> entry : typeEntityMap.entrySet()) { - createExportedEntities(exportName, - entry.getKey(), - entry.getValue()); + createExportedEntities( + exportName, + entry.getKey(), + entry.getValue() + ); } } @@ -190,15 +205,15 @@ public class ImportExport { try { if (!ccmFiles.isDirectory(importsPath)) { - - throw new IllegalArgumentException(String.format( - "No imports with name \"%s\" available.", - importName)); + throw new IllegalArgumentException( + String.format( + "No imports with name \"%s\" available.", + importName) + ); } } catch (FileAccessException | FileDoesNotExistException | InsufficientPermissionsException ex) { - throw new UnexpectedErrorException(ex); } @@ -224,16 +239,21 @@ public class ImportExport { importers .stream() .map(EntityImExporterTreeNode::getEntityImExporter) - .forEach(imExporter -> importEntitiesOfType(importName, - imExporter)); + .forEach( + imExporter -> importEntitiesOfType( + importName, + imExporter + ) + ); } catch (DependencyException ex) { throw new UnexpectedErrorException(ex); } } - private boolean filterImporters(final ImportManifest manifest, - final EntityImExporterTreeNode node) { - + private boolean filterImporters( + final ImportManifest manifest, + final EntityImExporterTreeNode node + ) { final AbstractEntityImExporter imExporter = node .getEntityImExporter(); final String type = imExporter.getEntityClass().getName(); @@ -243,53 +263,60 @@ public class ImportExport { private void importEntitiesOfType( final String importName, - final AbstractEntityImExporter entityImExporter) { - + final AbstractEntityImExporter entityImExporter + ) { final String type = entityImExporter.getEntityClass().getName(); - try (final InputStream tocInputStream = ccmFiles - .createInputStream(String.format("imports/%s/%s/%s.json", - importName, - type, - type))) { - + final String tocPath = String.format( + "imports/%s/%s/%s.json", + importName, + type, + type + ); + try (final InputStream tocInputStream = ccmFiles.createInputStream( + tocPath + )) { final JsonReader tocReader = Json.createReader(tocInputStream); final JsonObject toc = tocReader.readObject(); final JsonArray files = toc.getJsonArray("files"); - files.forEach(value -> importEntity(importName, - type, - ((JsonString) value).getString(), - entityImExporter)); - + files.forEach( + value -> importEntity( + importName, + type, + ((JsonString) value).getString(), + entityImExporter + ) + ); } catch (IOException | FileDoesNotExistException | FileAccessException | InsufficientPermissionsException ex) { - throw new UnexpectedErrorException(ex); } } - private void importEntity(final String importName, - final String type, - final String fileName, - final AbstractEntityImExporter imExporter) { - - final String filePath = String.format("imports/%s/%s/%s", - importName, - type, - fileName); - try (final InputStream inputStream - = ccmFiles.createInputStream(filePath)) { - + private void importEntity( + final String importName, + final String type, + final String fileName, + final AbstractEntityImExporter imExporter + ) { + final String filePath = String.format( + "imports/%s/%s/%s", + importName, + type, + fileName + ); + try (final InputStream inputStream = ccmFiles.createInputStream( + filePath + )) { final String data = new BufferedReader( new InputStreamReader(inputStream, StandardCharsets.UTF_8)) .lines() .collect(Collectors.joining("\n")); imExporter.importEntity(data); - } catch (IOException | FileDoesNotExistException | FileAccessException @@ -301,14 +328,12 @@ public class ImportExport { } public List listAvailableImportArchivies() { - final List importArchivePaths; try { importArchivePaths = ccmFiles.listFiles("imports"); } catch (FileAccessException | FileDoesNotExistException | InsufficientPermissionsException ex) { - throw new UnexpectedErrorException(ex); } @@ -337,14 +362,20 @@ public class ImportExport { final AbstractEntityImExporter imExporter; if (instance.isUnsatisfied()) { - throw new UnexpectedErrorException(String.format( - "No EntityImExporter for entity type \"%s\" available.", - type)); + throw new UnexpectedErrorException( + String.format( + "No EntityImExporter for entity type \"%s\" available.", + type + ) + ); } else if (instance.isAmbiguous()) { - throw new UnexpectedErrorException(String.format( - "Instance reference for EntityImExporter for entity " - + "type \"%s\" is ambiguous.", - type)); + throw new UnexpectedErrorException( + String.format( + "Instance reference for EntityImExporter for entity " + + "type \"%s\" is ambiguous.", + type + ) + ); } else { imExporter = instance.get(); } @@ -354,11 +385,14 @@ public class ImportExport { final String filename = String.format("%s.json", entity.getUuid()); final OutputStream outputStream; try { - outputStream = ccmFiles.createOutputStream(String.format( - "exports/%s/%s/%s", - exportName, - type, - filename)); + outputStream = ccmFiles.createOutputStream( + String.format( + "exports/%s/%s/%s", + exportName, + type, + filename + ) + ); filesArrayBuilder.add(filename); } catch (FileAccessException | InsufficientPermissionsException ex) { @@ -372,10 +406,10 @@ public class ImportExport { throw new UnexpectedErrorException(ex); } try (final OutputStreamWriter writer = new OutputStreamWriter( - outputStream, StandardCharsets.UTF_8)) { - + outputStream, + StandardCharsets.UTF_8 + )) { writer.write(exportedEntity); - } catch (IOException ex) { throw new UnexpectedErrorException(ex); } @@ -385,15 +419,15 @@ public class ImportExport { } private boolean isImportArchive(final String path) { - - final String manifestPath = String.format("imports/%s/ccm-export.json", - path); + final String manifestPath = String.format( + "imports/%s/ccm-export.json", + path + ); final boolean result; try { result = ccmFiles.existsFile(manifestPath); } catch (FileAccessException | InsufficientPermissionsException ex) { - throw new UnexpectedErrorException(ex); } @@ -401,7 +435,6 @@ public class ImportExport { } private ImportManifest createImportManifest(final String path) { - final String manifestPath = String.format( "imports/%s/ccm-export.json", path ); @@ -465,7 +498,6 @@ public class ImportExport { | FileAccessException | FileDoesNotExistException | InsufficientPermissionsException ex) { - throw new UnexpectedErrorException(ex); } } @@ -484,7 +516,6 @@ public class ImportExport { @Override public Class value() { - return value; } diff --git a/ccm-core/src/main/java/org/libreccm/security/GroupIdResolver.java b/ccm-core/src/main/java/org/libreccm/security/GroupIdResolver.java index 955d72785..791c66f5b 100644 --- a/ccm-core/src/main/java/org/libreccm/security/GroupIdResolver.java +++ b/ccm-core/src/main/java/org/libreccm/security/GroupIdResolver.java @@ -26,16 +26,21 @@ import javax.enterprise.context.RequestScoped; import java.io.Serializable; /** + * Used to resolve {@link Group}s when importing or exporting them. + * * @author Tobias Osmers - * @version created on 3/23/17 + * @author Jens Pelzetter */ @RequestScoped public class GroupIdResolver implements Serializable, ObjectIdResolver { - private static final long serialVersionUID = 3700628942920771114L; + + private static final long serialVersionUID = 1L; @Override - public void bindItem(final ObjectIdGenerator.IdKey id, - final Object pojo) { + public void bindItem( + final ObjectIdGenerator.IdKey id, + final Object object + ) { // According to the Jackson JavaDoc, this method can be used to keep // track of objects directly in a resolver implementation. We don't need // this here therefore this method is empty. @@ -43,16 +48,18 @@ public class GroupIdResolver implements Serializable, ObjectIdResolver { @Override public Object resolveId(final ObjectIdGenerator.IdKey id) { - - final CdiUtil cdiUtil = CdiUtil.createCdiUtil(); - final GroupRepository groupRepo = cdiUtil - .findBean(GroupRepository.class); - - return groupRepo - .findByUuid(id.key.toString()) - .orElseThrow(() -> new IllegalArgumentException(String - .format("No Group with uuid %s in the database.", - id.key.toString()))); + return CdiUtil + .createCdiUtil() + .findBean(GroupRepository.class) + .findByUuid(id.key.toString()) + .orElseThrow( + () -> new IllegalArgumentException( + String.format( + "No Group with uuid %s in the database.", + id.key.toString() + ) + ) + ); } @Override @@ -64,4 +71,5 @@ public class GroupIdResolver implements Serializable, ObjectIdResolver { public boolean canUseFor(final ObjectIdResolver objectIdResolver) { return objectIdResolver instanceof GroupIdResolver; } + } diff --git a/ccm-core/src/main/java/org/libreccm/security/PartyIdResolver.java b/ccm-core/src/main/java/org/libreccm/security/PartyIdResolver.java index 5d8d73ddb..7159a352d 100644 --- a/ccm-core/src/main/java/org/libreccm/security/PartyIdResolver.java +++ b/ccm-core/src/main/java/org/libreccm/security/PartyIdResolver.java @@ -26,17 +26,21 @@ import javax.enterprise.context.RequestScoped; import java.io.Serializable; /** + * Used to resolve {@link Party} entities when import or exporting them. + * * @author Tobias Osmers * @version created on 3/23/17 */ -@Deprecated @RequestScoped public class PartyIdResolver implements Serializable, ObjectIdResolver { - private static final long serialVersionUID = -1208121020457080214L; + + private static final long serialVersionUID = 1L; @Override - public void bindItem(final ObjectIdGenerator.IdKey id, - final Object pojo) { + public void bindItem( + final ObjectIdGenerator.IdKey id, + final Object object + ) { // According to the Jackson JavaDoc, this method can be used to keep // track of objects directly in a resolver implementation. We don't need // this here therefore this method is empty. @@ -44,16 +48,18 @@ public class PartyIdResolver implements Serializable, ObjectIdResolver { @Override public Object resolveId(final ObjectIdGenerator.IdKey id) { - - final CdiUtil cdiUtil = CdiUtil.createCdiUtil(); - final PartyRepository partyRepository = cdiUtil - .findBean(PartyRepository.class); - - return partyRepository - .findByUuid(id.key.toString()) - .orElseThrow(() -> new IllegalArgumentException(String - .format("No Party with uuid %s in the database.", - id.key.toString()))); + return CdiUtil + .createCdiUtil() + .findBean(PartyRepository.class) + .findByUuid(id.key.toString()) + .orElseThrow( + () -> new IllegalArgumentException( + String.format( + "No Party with uuid %s in the database.", + id.key.toString() + ) + ) + ); } @Override @@ -65,4 +71,5 @@ public class PartyIdResolver implements Serializable, ObjectIdResolver { public boolean canUseFor(final ObjectIdResolver resolverType) { return resolverType instanceof PartyIdResolver; } + } diff --git a/ccm-core/src/main/java/org/libreccm/security/PermissionIdResolver.java b/ccm-core/src/main/java/org/libreccm/security/PermissionIdResolver.java index 73c464a8d..9cbf3a76c 100644 --- a/ccm-core/src/main/java/org/libreccm/security/PermissionIdResolver.java +++ b/ccm-core/src/main/java/org/libreccm/security/PermissionIdResolver.java @@ -27,17 +27,22 @@ import javax.enterprise.context.RequestScoped; import java.io.Serializable; /** + * Used to resolve {@link Permission}s based on their UUID when importing or + * exporting them. + * * @author Tobias Osmers - * @version created on 3/23/17 + * @author Jens Pelzetter */ -@Deprecated @RequestScoped public class PermissionIdResolver implements Serializable, ObjectIdResolver { - private static final long serialVersionUID = -8397366681202009916L; + + private static final long serialVersionUID = 1L; @Override - public void bindItem(final ObjectIdGenerator.IdKey id, - final Object pojo) { + public void bindItem( + final ObjectIdGenerator.IdKey id, + final Object object + ) { // According to the Jackson JavaDoc, this method can be used to keep // track of objects directly in a resolver implementation. We don't need // this here therefore this method is empty. @@ -45,16 +50,18 @@ public class PermissionIdResolver implements Serializable, ObjectIdResolver { @Override public Object resolveId(final ObjectIdGenerator.IdKey id) { - - final CdiUtil cdiUtil = CdiUtil.createCdiUtil(); - final PermissionRepository permissionRepository = cdiUtil - .findBean(PermissionRepository.class); - - return permissionRepository + return CdiUtil + .createCdiUtil() + .findBean(PermissionRepository.class) .findByUuid(id.key.toString()) - .orElseThrow(() -> new IllegalArgumentException(String - .format("No Permission with UUID %s in the database.", - id.key.toString()))); + .orElseThrow( + () -> new IllegalArgumentException( + String.format( + "No Permission with UUID %s in the database.", + id.key.toString() + ) + ) + ); } @Override @@ -66,4 +73,5 @@ public class PermissionIdResolver implements Serializable, ObjectIdResolver { public boolean canUseFor(final ObjectIdResolver resolverType) { return resolverType instanceof PermissionIdResolver; } + } diff --git a/ccm-core/src/main/java/org/libreccm/security/RoleIdResolver.java b/ccm-core/src/main/java/org/libreccm/security/RoleIdResolver.java index 79360d00d..1c2323df1 100644 --- a/ccm-core/src/main/java/org/libreccm/security/RoleIdResolver.java +++ b/ccm-core/src/main/java/org/libreccm/security/RoleIdResolver.java @@ -26,17 +26,21 @@ import javax.enterprise.context.RequestScoped; import java.io.Serializable; /** + * Used to resolve {@link Role}s based on their UUIDs for import and export. + * * @author Tobias Osmers - * @version created on 3/23/17 + * @author Jens Pelzetter */ -@Deprecated @RequestScoped public class RoleIdResolver implements Serializable, ObjectIdResolver { - private static final long serialVersionUID = -1651704701257277011L; + + private static final long serialVersionUID = 1L; @Override - public void bindItem(final ObjectIdGenerator.IdKey id, - final Object pojo) { + public void bindItem( + final ObjectIdGenerator.IdKey id, + final Object object + ) { // According to the Jackson JavaDoc, this method can be used to keep // track of objects directly in a resolver implementation. We don't need // this here therefore this method is empty. @@ -44,15 +48,18 @@ public class RoleIdResolver implements Serializable, ObjectIdResolver { @Override public Object resolveId(final ObjectIdGenerator.IdKey id) { - final CdiUtil cdiUtil = CdiUtil.createCdiUtil(); - final RoleRepository roleRepository = cdiUtil - .findBean(RoleRepository.class); - - return roleRepository - .findByUuid(id.key.toString()) - .orElseThrow(() -> new IllegalArgumentException(String - .format("No Role with uuid %s in the database.", - id.key.toString()))); + return CdiUtil + .createCdiUtil() + .findBean(RoleRepository.class) + .findByUuid(id.key.toString()) + .orElseThrow( + () -> new IllegalArgumentException( + String.format( + "No Role with uuid %s in the database.", + id.key.toString() + ) + ) + ); } @Override @@ -64,4 +71,5 @@ public class RoleIdResolver implements Serializable, ObjectIdResolver { public boolean canUseFor(final ObjectIdResolver resolverType) { return resolverType instanceof RoleIdResolver; } + } diff --git a/ccm-core/src/main/java/org/libreccm/security/UserIdResolver.java b/ccm-core/src/main/java/org/libreccm/security/UserIdResolver.java index c9d03f2fd..ae47ea746 100644 --- a/ccm-core/src/main/java/org/libreccm/security/UserIdResolver.java +++ b/ccm-core/src/main/java/org/libreccm/security/UserIdResolver.java @@ -26,18 +26,21 @@ import javax.enterprise.context.RequestScoped; import java.io.Serializable; /** + * Used to resolve {@link User}s for import and export based on their UUIDs. + * * @author Tobias Osmers * @author Jens Pelzetter */ -@Deprecated @RequestScoped public class UserIdResolver implements Serializable, ObjectIdResolver { - - private static final long serialVersionUID = -2541656707906049331L; + + private static final long serialVersionUID = 1L; @Override - public void bindItem(final ObjectIdGenerator.IdKey id, - final Object pojo) { + public void bindItem( + final ObjectIdGenerator.IdKey id, + final Object object + ) { // According to the Jackson JavaDoc, this method can be used to keep // track of objects directly in a resolver implementation. We don't need // this here therefore this method is empty. @@ -45,16 +48,18 @@ public class UserIdResolver implements Serializable, ObjectIdResolver { @Override public Object resolveId(final ObjectIdGenerator.IdKey id) { - - final CdiUtil cdiUtil = CdiUtil.createCdiUtil(); - final UserRepository userRepository = cdiUtil - .findBean(UserRepository.class); - - return userRepository - .findByUuid(id.key.toString()) - .orElseThrow(() -> new IllegalArgumentException(String - .format("No User with name %s in the database.", - id.key.toString()))); + return CdiUtil + .createCdiUtil() + .findBean(UserRepository.class) + .findByUuid(id.key.toString()) + .orElseThrow( + () -> new IllegalArgumentException( + String.format( + "No User with name %s in the database.", + id.key.toString() + ) + ) + ); } @Override @@ -66,4 +71,5 @@ public class UserIdResolver implements Serializable, ObjectIdResolver { public boolean canUseFor(final ObjectIdResolver resolverType) { return resolverType instanceof UserIdResolver; } + } diff --git a/ccm-core/src/main/java/org/libreccm/web/ApplicationIdResolver.java b/ccm-core/src/main/java/org/libreccm/web/ApplicationIdResolver.java index c121ad1b3..135b2b258 100644 --- a/ccm-core/src/main/java/org/libreccm/web/ApplicationIdResolver.java +++ b/ccm-core/src/main/java/org/libreccm/web/ApplicationIdResolver.java @@ -26,41 +26,48 @@ import javax.enterprise.context.RequestScoped; import java.io.Serializable; /** - * @author Tobias Osmers + * @author Jens Pelzetter */ -@Deprecated @RequestScoped public class ApplicationIdResolver implements Serializable, ObjectIdResolver { - private static final long serialVersionUID = 464933392877186401L; + + private static final long serialVersionUID = 1L; @Override - public void bindItem(ObjectIdGenerator.IdKey idKey, Object o) { + public void bindItem( + final ObjectIdGenerator.IdKey idKey, + final Object object + ) { // According to the Jackson JavaDoc, this method can be used to keep // track of objects directly in a resolver implementation. We don't need // this here therefore this method is empty. } @Override - public Object resolveId(ObjectIdGenerator.IdKey id) { - final CdiUtil cdiUtil = CdiUtil.createCdiUtil(); - final ApplicationRepository applicationRepository = cdiUtil - .findBean(ApplicationRepository.class); - - return applicationRepository - .findByUuid(id.key.toString()) - .orElseThrow(() -> new IllegalArgumentException(String - .format("No ccmApplications with uuid %s in the " + - "database.", id.key.toString()))); + public Object resolveId(final ObjectIdGenerator.IdKey id) { + return CdiUtil + .createCdiUtil() + .findBean(ApplicationRepository.class) + .findByUuid(id.key.toString()) + .orElseThrow( + () -> new IllegalArgumentException( + String.format( + "No ccmApplications with uuid %s in the database.", + id.key.toString() + ) + ) + ); } @Override - public ObjectIdResolver newForDeserialization(Object o) { + public ObjectIdResolver newForDeserialization(final Object object) { return new ApplicationIdResolver(); } @Override - public boolean canUseFor(ObjectIdResolver objectIdResolver) { + public boolean canUseFor(final ObjectIdResolver objectIdResolver) { return objectIdResolver instanceof ApplicationIdResolver; } + } diff --git a/ccm-core/src/main/java/org/libreccm/workflow/AssignableTaskIdResolver.java b/ccm-core/src/main/java/org/libreccm/workflow/AssignableTaskIdResolver.java index a18fbd18c..6a9c04709 100644 --- a/ccm-core/src/main/java/org/libreccm/workflow/AssignableTaskIdResolver.java +++ b/ccm-core/src/main/java/org/libreccm/workflow/AssignableTaskIdResolver.java @@ -26,19 +26,23 @@ import javax.enterprise.context.RequestScoped; import java.io.Serializable; /** + * Used to resolve {@link AssignableTask}s when import or exporting based on + * their UUIDs. + * * @author Tobias Osmers - * @version created on 3/23/17 + * @author Jens Pelzetter */ @RequestScoped -@Deprecated public class AssignableTaskIdResolver implements Serializable, ObjectIdResolver { - private static final long serialVersionUID = -4634332219001315735L; + private static final long serialVersionUID = 1L; @Override - public void bindItem(final ObjectIdGenerator.IdKey id, - final Object pojo) { + public void bindItem( + final ObjectIdGenerator.IdKey id, + final Object object + ) { // According to the Jackson JavaDoc, this method can be used to keep // track of objects directly in a resolver implementation. We don't need // this here therefore this method is empty. @@ -46,15 +50,18 @@ public class AssignableTaskIdResolver implements Serializable, @Override public Object resolveId(final ObjectIdGenerator.IdKey id) { - final CdiUtil cdiUtil = CdiUtil.createCdiUtil(); - final AssignableTaskRepository assignableTaskRepository = cdiUtil - .findBean(AssignableTaskRepository.class); - - return assignableTaskRepository + return CdiUtil + .createCdiUtil() + .findBean(AssignableTaskRepository.class) .findByUuid(id.key.toString()) - .orElseThrow(() -> new IllegalArgumentException(String - .format("No assignable tasks with uuid %s in the " + "database.", - id.key.toString()))); + .orElseThrow( + () -> new IllegalArgumentException( + String.format( + "No assignable tasks with uuid %s in the database.", + id.key.toString() + ) + ) + ); } @Override diff --git a/ccm-core/src/main/java/org/libreccm/workflow/TaskCommentIdResolver.java b/ccm-core/src/main/java/org/libreccm/workflow/TaskCommentIdResolver.java index 22073a48a..a3530da92 100644 --- a/ccm-core/src/main/java/org/libreccm/workflow/TaskCommentIdResolver.java +++ b/ccm-core/src/main/java/org/libreccm/workflow/TaskCommentIdResolver.java @@ -25,41 +25,49 @@ import org.libreccm.cdi.utils.CdiUtil; import java.io.Serializable; /** - * @author Tobias Osmers + * @author Jens Pelzetter */ -@Deprecated public class TaskCommentIdResolver implements Serializable, ObjectIdResolver { - private static final long serialVersionUID = 1057961565308988397L; + + private static final long serialVersionUID = 1L; @Override - public void bindItem(ObjectIdGenerator.IdKey id, - Object pojo) { + public void bindItem( + final ObjectIdGenerator.IdKey id, final Object object + ) { // According to the Jackson JavaDoc, this method can be used to keep // track of objects directly in a resolver implementation. We don't need // this here therefore this method is empty. } @Override - public Object resolveId(ObjectIdGenerator.IdKey id) { - final CdiUtil cdiUtil = CdiUtil.createCdiUtil(); - final TaskCommentRepository taskCommentRepository = cdiUtil - .findBean(TaskCommentRepository.class); - - return taskCommentRepository - .findByUuid(id.key.toString()) - .orElseThrow(() -> new IllegalArgumentException(String - .format("No task comments with uuid %s in the " + - "database.", id.key.toString()))); + public Object resolveId(final ObjectIdGenerator.IdKey id) { + return CdiUtil + .createCdiUtil() + .findBean(TaskCommentRepository.class) + .findByUuid(id.key.toString()) + .orElseThrow( + () -> new IllegalArgumentException( + String.format( + "No task comments with uuid %s in the database.", + id.key.toString() + ) + ) + ); } @Override - public ObjectIdResolver newForDeserialization(Object context) { + public ObjectIdResolver newForDeserialization(final Object context) { return new TaskCommentIdResolver(); } @Override - public boolean canUseFor(ObjectIdResolver resolverType) { + public boolean canUseFor(final ObjectIdResolver resolverType) { return resolverType instanceof TaskCommentIdResolver; } + } diff --git a/ccm-core/src/main/java/org/libreccm/workflow/TaskIdResolver.java b/ccm-core/src/main/java/org/libreccm/workflow/TaskIdResolver.java index 75505ad05..9a73508d3 100644 --- a/ccm-core/src/main/java/org/libreccm/workflow/TaskIdResolver.java +++ b/ccm-core/src/main/java/org/libreccm/workflow/TaskIdResolver.java @@ -26,17 +26,21 @@ import javax.enterprise.context.RequestScoped; import java.io.Serializable; /** + * Used to resolve {@link Task}s based on the UUIDs for export or import. + * * @author Tobias Osmers - * @version created on 3/23/17 + * @author Jens Pelzetter */ -@Deprecated @RequestScoped public class TaskIdResolver implements Serializable, ObjectIdResolver { - private static final long serialVersionUID = 6444989953192198987L; + + private static final long serialVersionUID = 1L; @Override - public void bindItem(final ObjectIdGenerator.IdKey id, - final Object pojo) { + public void bindItem( + final ObjectIdGenerator.IdKey id, + final Object object + ) { // According to the Jackson JavaDoc, this method can be used to keep // track of objects directly in a resolver implementation. We don't need // this here therefore this method is empty. @@ -44,15 +48,18 @@ public class TaskIdResolver implements Serializable, ObjectIdResolver { @Override public Object resolveId(final ObjectIdGenerator.IdKey id) { - final CdiUtil cdiUtil = CdiUtil.createCdiUtil(); - final TaskRepository taskRepository = cdiUtil - .findBean(TaskRepository.class); - - return taskRepository - .findByUuid(id.key.toString()) - .orElseThrow(() -> new IllegalArgumentException(String - .format("No tasks with uuid %s in the " + - "database.", id.key.toString()))); + return CdiUtil + .createCdiUtil() + .findBean(TaskRepository.class) + .findByUuid(id.key.toString()) + .orElseThrow( + () -> new IllegalArgumentException( + String.format( + "No tasks with uuid %s in the database.", + id.key.toString() + ) + ) + ); } @Override @@ -64,4 +71,5 @@ public class TaskIdResolver implements Serializable, ObjectIdResolver { public boolean canUseFor(final ObjectIdResolver resolverType) { return resolverType instanceof TaskIdResolver; } + } diff --git a/ccm-core/src/main/java/org/libreccm/workflow/WorkflowIdResolver.java b/ccm-core/src/main/java/org/libreccm/workflow/WorkflowIdResolver.java index ca10336d8..f2e48b4a6 100644 --- a/ccm-core/src/main/java/org/libreccm/workflow/WorkflowIdResolver.java +++ b/ccm-core/src/main/java/org/libreccm/workflow/WorkflowIdResolver.java @@ -26,20 +26,21 @@ import javax.enterprise.context.RequestScoped; import java.io.Serializable; /** - * - * + * Used to resolve {@link Workflow}s based on their UUIDs for import or export. + * * @author Tobias Osmers - * @version created on 3/23/17 + * @author Jens Pelzetter */ -@Deprecated @RequestScoped public class WorkflowIdResolver implements Serializable, ObjectIdResolver { - private static final long serialVersionUID = 1951611806946125510L; + private static final long serialVersionUID = 1L; @Override - public void bindItem(final ObjectIdGenerator.IdKey id, - final Object pojo) { + public void bindItem( + final ObjectIdGenerator.IdKey id, + final Object pojo + ) { // According to the Jackson JavaDoc, this method can be used to keep // track of objects directly in a resolver implementation. We don't need // this here therefore this method is empty. @@ -48,15 +49,22 @@ public class WorkflowIdResolver implements Serializable, ObjectIdResolver { @Override public Object resolveId(final ObjectIdGenerator.IdKey id) { final CdiUtil cdiUtil = CdiUtil.createCdiUtil(); - final WorkflowRepository workflowRepository = cdiUtil - .findBean(WorkflowRepository.class); + final WorkflowRepository workflowRepository = cdiUtil.findBean( + WorkflowRepository.class + ); - return workflowRepository + return CdiUtil + .createCdiUtil() + .findBean(WorkflowRepository.class) .findByUuid(id.key.toString()) - .orElseThrow(() -> new IllegalArgumentException(String - .format("No workflows with uuid %s in the " - + "database.", - id.key.toString()))); + .orElseThrow( + () -> new IllegalArgumentException( + String.format( + "No workflows with uuid %s in the database.", + id.key.toString() + ) + ) + ); } @Override