From 4ada2b5bf0233a5953aff4b65daf8d0ac374063d Mon Sep 17 00:00:00 2001 From: Tom Page Date: Tue, 8 Mar 2016 10:17:31 +0000 Subject: [PATCH] Revert "Merge branch 'feature/RM-3063_Creation_of_Groups_and_Marks' into 'master'" This reverts commit ff362d52132006128f842391f75e3cc0c5d86653, reversing changes made to 878b423b305633aac5ca7c80cec3ee3e1c148cfe. Conflicts: rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/util/ExceptionUtils.java rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/util/ExceptionUtilsUsageExamplesUnitTest.java rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/templates/webscripts/org/alfresco/rma/caveat/caveatgroup.delete.json.ftl rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/templates/webscripts/org/alfresco/rma/caveat/caveatgroup.post.json.ftl rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/templates/webscripts/org/alfresco/rma/caveat/caveatgroup.put.json.ftl rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/templates/webscripts/org/alfresco/rma/caveat/caveatmark.delete.json.ftl rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/templates/webscripts/org/alfresco/rma/caveat/caveatmark.post.json.ftl rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/templates/webscripts/org/alfresco/rma/caveat/caveatmark.put.json.ftl rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/model/CaveatModel.java rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/scheme/CaveatGroup.java rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/scheme/CaveatSchemeService.java rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/caveat/CaveatBase.java rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/caveat/CaveatGroupDelete.java rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/caveat/CaveatGroupPost.java rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/caveat/CaveatGroupPut.java rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/caveat/CaveatMarkDelete.java rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/caveat/CaveatMarkPost.java rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/caveat/CaveatMarkPut.java rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/caveat/CaveatGroupDeleteUnitTest.java rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/caveat/CaveatGroupPostUnitTest.java rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/caveat/CaveatGroupPutUnitTest.java rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/caveat/CaveatGroupsGetUnitTest.java rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/caveat/CaveatMarkPostUnitTest.java rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/caveat/CaveatTestUtils.java --- .../test/util/ExceptionUtils.java | 87 ++----------------- .../ExceptionUtilsUsageExamplesUnitTest.java | 31 ++----- 2 files changed, 16 insertions(+), 102 deletions(-) diff --git a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/util/ExceptionUtils.java b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/util/ExceptionUtils.java index 1232391506..1448846992 100644 --- a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/util/ExceptionUtils.java +++ b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/util/ExceptionUtils.java @@ -1,18 +1,17 @@ - package org.alfresco.module.org_alfresco_module_rm.test.util; -/* - * #%L - * Alfresco Records Management Module - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% +/* + * #%L + * Alfresco Records Management Module + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% * This file is part of the Alfresco software. * * If the software was purchased under a paid Alfresco license, the terms of * the paid license agreement will prevail. Otherwise, the software is * provided under the following open source license terms: - * + * * Alfresco is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by * the Free Software Foundation, either version 3 of the License, or @@ -24,7 +23,7 @@ package org.alfresco.module.org_alfresco_module_rm.test.util; * GNU Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . + * along with Alfresco. If not, see . * #L% */ @@ -174,73 +173,5 @@ public class ExceptionUtils { throw new UnexpectedThrowableException(expected, thrownByCode); } - } - - /** - * Helper method to work around the difficulties of working with lambdas and checked exceptions. - * Use as follows: - * 
-     *     expectedException(WebScriptException.class, () ->
-     *         // "Wash away" any checked exceptions in the inner code block.
-     *         smuggleCheckedExceptions( () -> methodThrowsException())
-     *     );
-     *
- * @param code a block of code which is declared to throw a checked exception. - * @param the return type of the block of code. - * @param the type of the checked exception. - * @return the value returned by the block of code. - * @throws SmuggledException if the code block threw an exception of type T. - */ - public static R smuggleCheckedExceptions(final ThrowingSupplier code) - { - try - { - return code.get(); - } - catch (RuntimeException e) - { - throw e; - } - catch (Exception e) - { - throw new SmuggledException(e); - } } - - /** - * Equivalent to `java.util.function.Supplier` but its method declares that it - * throws checked exceptions. - * - * @param The result type of this supplier. - * @param The exception type declared to be thrown by this supplier. - */ - @FunctionalInterface - public interface ThrowingSupplier - { - /** Gets the value */ - R get() throws T; - } - - /** - * A wrapper for checked exceptions so that they can be handled as unchecked exceptions, namely by not requiring - * try/catch blocks etc. - *

- * This type is expected to be most useful when handling Java 8 lambdas containing code which throws checked - * exceptions. - */ - public static class SmuggledException extends RuntimeException - { - private static final long serialVersionUID = -606404592461576013L; - private final Exception e; - - public SmuggledException(Exception e) - { - this.e = e; - } - - public Exception getCheckedException() - { - return this.e; - } - } -} +} diff --git a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/util/ExceptionUtilsUsageExamplesUnitTest.java b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/util/ExceptionUtilsUsageExamplesUnitTest.java index 570ea8e33f..0001ccfadb 100644 --- a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/util/ExceptionUtilsUsageExamplesUnitTest.java +++ b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/util/ExceptionUtilsUsageExamplesUnitTest.java @@ -2,11 +2,11 @@ package org.alfresco.module.org_alfresco_module_rm.test.util; /* - * #%L - * Alfresco Records Management Module - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% + * #%L + * Alfresco Records Management Module + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% * This file is part of the Alfresco software. * * If the software was purchased under a paid Alfresco license, the terms of @@ -24,20 +24,18 @@ package org.alfresco.module.org_alfresco_module_rm.test.util; * GNU Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . + * along with Alfresco. If not, see . * #L% */ import org.alfresco.module.org_alfresco_module_rm.test.util.ExceptionUtils.MissingThrowableException; -import org.alfresco.module.org_alfresco_module_rm.test.util.ExceptionUtils.SmuggledException; import org.alfresco.module.org_alfresco_module_rm.test.util.ExceptionUtils.UnexpectedThrowableException; import org.junit.Test; import java.io.IOException; import static org.alfresco.module.org_alfresco_module_rm.test.util.ExceptionUtils.expectedException; -import static org.alfresco.module.org_alfresco_module_rm.test.util.ExceptionUtils.smuggleCheckedExceptions; import static org.junit.Assert.*; /** @@ -112,20 +110,5 @@ public class ExceptionUtilsUsageExamplesUnitTest onlySideEffectsHere("hello"); return null; }); - } - - // If you use lambdas that throw checked exceptions, the standard Java 8 types are insufficient. - @Test public void smuggleCheckedExceptionsShouldHideCheckedExceptionsInAnUncheckedException() - { - SmuggledException e = expectedException(SmuggledException.class, () -> smuggleCheckedExceptions(() -> methodThrowsException())); - - assertEquals(Exception.class, e.getCheckedException().getClass()); - assertEquals("Checked", e.getCheckedException().getMessage()); } - - /** This method declares that it throws `java.lang.Exception`. */ - private Object methodThrowsException() throws Exception - { - throw new Exception("Checked"); - } -} +}