From 0d5bb4123c21dd62fcc45a89aec79949612de48c Mon Sep 17 00:00:00 2001 From: Alex Mukha Date: Mon, 5 Mar 2018 15:27:26 +0000 Subject: [PATCH] REPO-3125 Remove wrong exception class imports (#85) --- .../alfresco/repo/config/ConfigDataCache.java | 52 +++++++++-------- .../executer/AbstractRenderingEngine.java | 2 - .../repo/virtual/ref/NodeRefRadixHasher.java | 2 - .../util/ContextDependencyLister.java | 54 +++++++++--------- .../alfresco/util/schemacomp/SchemaToXML.java | 52 +++++++++-------- .../ConnectionPoolOverloadTest.java | 56 +++++++++---------- .../DbObjectXMLTransformerTest.java | 52 +++++++++-------- 7 files changed, 128 insertions(+), 142 deletions(-) diff --git a/src/main/java/org/alfresco/repo/config/ConfigDataCache.java b/src/main/java/org/alfresco/repo/config/ConfigDataCache.java index 2eee01723b..925b6ef31d 100644 --- a/src/main/java/org/alfresco/repo/config/ConfigDataCache.java +++ b/src/main/java/org/alfresco/repo/config/ConfigDataCache.java @@ -1,28 +1,28 @@ -/* - * #%L - * Alfresco Repository - * %% - * 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 - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * 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 . - * #L% - */ +/* + * #%L + * Alfresco Repository + * %% + * 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 + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * 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 . + * #L% + */ package org.alfresco.repo.config; import java.util.Collections; @@ -41,8 +41,6 @@ import org.springframework.extensions.config.ConfigService; import org.springframework.extensions.config.evaluator.Evaluator; import org.springframework.extensions.config.xml.elementreader.ConfigElementReader; -import com.sun.star.uno.RuntimeException; - /** * An innder class that uses the {@link RepoXMLConfigService config service} to asynchronously * refresh tenant config data. diff --git a/src/main/java/org/alfresco/repo/rendition/executer/AbstractRenderingEngine.java b/src/main/java/org/alfresco/repo/rendition/executer/AbstractRenderingEngine.java index c83ecaa2cb..7fb7844b0b 100644 --- a/src/main/java/org/alfresco/repo/rendition/executer/AbstractRenderingEngine.java +++ b/src/main/java/org/alfresco/repo/rendition/executer/AbstractRenderingEngine.java @@ -79,8 +79,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.extensions.surf.util.I18NUtil; -import com.sun.star.lang.NullPointerException; - /** * This class adds some new behaviour to the standard ActionExecuterAbstractBase * in order to support the RenditionService. diff --git a/src/main/java/org/alfresco/repo/virtual/ref/NodeRefRadixHasher.java b/src/main/java/org/alfresco/repo/virtual/ref/NodeRefRadixHasher.java index b28c3872ae..8e4eb101b1 100644 --- a/src/main/java/org/alfresco/repo/virtual/ref/NodeRefRadixHasher.java +++ b/src/main/java/org/alfresco/repo/virtual/ref/NodeRefRadixHasher.java @@ -33,8 +33,6 @@ import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.util.Pair; import org.apache.commons.lang.StringUtils; -import com.sun.star.uno.RuntimeException; - /** * Creates string-pair hashes of {@link NodeRef}s where the first string is a * stored hash combination for {@link NodeRef} store elements (protocol and id) diff --git a/src/main/java/org/alfresco/util/ContextDependencyLister.java b/src/main/java/org/alfresco/util/ContextDependencyLister.java index cf77db1c96..f51d97382d 100644 --- a/src/main/java/org/alfresco/util/ContextDependencyLister.java +++ b/src/main/java/org/alfresco/util/ContextDependencyLister.java @@ -1,28 +1,28 @@ -/* - * #%L - * Alfresco Repository - * %% - * 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 - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * 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 . - * #L% - */ +/* + * #%L + * Alfresco Repository + * %% + * 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 + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * 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 . + * #L% + */ package org.alfresco.util; import java.io.FileNotFoundException; @@ -53,8 +53,6 @@ import org.springframework.beans.factory.support.ManagedList; import org.springframework.beans.factory.xml.XmlBeanDefinitionReader; import org.springframework.context.support.ClassPathXmlApplicationContext; -import com.sun.star.io.IOException; - /** * Helper class to list the dependencies between different * spring context files that make up a full or partial @@ -300,7 +298,7 @@ public class ContextDependencyLister /** * Renders the dependencies as GraphViz DotXML */ - public void graphVizDependencies(String outFile) throws IOException, FileNotFoundException { + public void graphVizDependencies(String outFile) throws FileNotFoundException { calculateDependencies(); // We need to know one bean from each context that we'll output diff --git a/src/main/java/org/alfresco/util/schemacomp/SchemaToXML.java b/src/main/java/org/alfresco/util/schemacomp/SchemaToXML.java index 6a2d4f6cde..bf11d3ae5c 100644 --- a/src/main/java/org/alfresco/util/schemacomp/SchemaToXML.java +++ b/src/main/java/org/alfresco/util/schemacomp/SchemaToXML.java @@ -1,28 +1,28 @@ -/* - * #%L - * Alfresco Repository - * %% - * 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 - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * 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 . - * #L% - */ +/* + * #%L + * Alfresco Repository + * %% + * 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 + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * 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 . + * #L% + */ package org.alfresco.util.schemacomp; import javax.xml.transform.OutputKeys; @@ -36,8 +36,6 @@ import javax.xml.transform.stream.StreamResult; import org.alfresco.util.schemacomp.model.Schema; import org.xml.sax.SAXException; -import com.sun.star.uno.RuntimeException; - /** * Converts an in-memory Schema to an XML output stream. * diff --git a/src/test/java/org/alfresco/repo/transaction/ConnectionPoolOverloadTest.java b/src/test/java/org/alfresco/repo/transaction/ConnectionPoolOverloadTest.java index 81017a7edf..c1ff3f3a69 100644 --- a/src/test/java/org/alfresco/repo/transaction/ConnectionPoolOverloadTest.java +++ b/src/test/java/org/alfresco/repo/transaction/ConnectionPoolOverloadTest.java @@ -1,28 +1,28 @@ -/* - * #%L - * Alfresco Repository - * %% - * 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 - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * 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 . - * #L% - */ +/* + * #%L + * Alfresco Repository + * %% + * 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 + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * 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 . + * #L% + */ package org.alfresco.repo.transaction; import static org.junit.Assert.*; @@ -44,8 +44,6 @@ import org.junit.Before; import org.junit.Test; import org.springframework.context.ApplicationContext; -import com.sun.star.auth.InvalidArgumentException; - /** * A test designed to catch ConnectionPoolException * @@ -80,7 +78,7 @@ public class ConnectionPoolOverloadTest } else { - throw new InvalidArgumentException("The db.pool.max property is not valid."); + throw new IllegalArgumentException("The db.pool.max property is not valid."); } String dbPoolWaitMaxProp = properties.getProperty("db.pool.wait.max"); @@ -90,7 +88,7 @@ public class ConnectionPoolOverloadTest } else { - throw new InvalidArgumentException("The db.pool.wait.max property is not valid."); + throw new IllegalArgumentException("The db.pool.wait.max property is not valid."); } dbPoolWaitMax = dbPoolWaitMax == -1 ? 100 : dbPoolWaitMax; diff --git a/src/test/java/org/alfresco/util/schemacomp/DbObjectXMLTransformerTest.java b/src/test/java/org/alfresco/util/schemacomp/DbObjectXMLTransformerTest.java index b40cf5ebe9..8ef3e34b08 100644 --- a/src/test/java/org/alfresco/util/schemacomp/DbObjectXMLTransformerTest.java +++ b/src/test/java/org/alfresco/util/schemacomp/DbObjectXMLTransformerTest.java @@ -1,28 +1,28 @@ -/* - * #%L - * Alfresco Repository - * %% - * 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 - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * 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 . - * #L% - */ +/* + * #%L + * Alfresco Repository + * %% + * 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 + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * 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 . + * #L% + */ package org.alfresco.util.schemacomp; @@ -65,8 +65,6 @@ import org.alfresco.util.schemacomp.validator.NameValidator; import org.junit.Before; import org.junit.Test; -import com.sun.star.uno.RuntimeException; - /** * Tests for the {@link DbObjectXMLTransformer} class. *