From 78f3ed57cc2543be75edfe9fa7011cafb1229ff9 Mon Sep 17 00:00:00 2001 From: Jens Wilke Date: Wed, 7 Aug 2019 14:46:56 +0200 Subject: [PATCH] fix CacheManager.setDefaultName(), closes: https://github.com/cache2k/cache2k/issues/108 --- .../cache2k/core/Cache2kCoreProviderImpl.java | 19 +- pom.xml | 1 + test-init/LICENSE.txt | 201 ++++++++++++++++++ test-init/pom.xml | 50 +++++ .../cache2k/core/CacheManagerInitTest.java | 58 +++++ test-init/src/test/resources/cache2k.xml | 28 +++ 6 files changed, 347 insertions(+), 10 deletions(-) create mode 100644 test-init/LICENSE.txt create mode 100644 test-init/pom.xml create mode 100644 test-init/src/test/java/org/cache2k/core/CacheManagerInitTest.java create mode 100644 test-init/src/test/resources/cache2k.xml diff --git a/cache2k-core/src/main/java/org/cache2k/core/Cache2kCoreProviderImpl.java b/cache2k-core/src/main/java/org/cache2k/core/Cache2kCoreProviderImpl.java index f071f69a7..df9fdd306 100644 --- a/cache2k-core/src/main/java/org/cache2k/core/Cache2kCoreProviderImpl.java +++ b/cache2k-core/src/main/java/org/cache2k/core/Cache2kCoreProviderImpl.java @@ -43,7 +43,6 @@ */ public class Cache2kCoreProviderImpl implements Cache2kCoreProvider { - public final static String STANDARD_DEFAULT_MANAGER_NAME = "default"; public static final CacheConfigurationProvider CACHE_CONFIGURATION_PROVIDER = SingleProviderResolver.resolve(CacheConfigurationProvider.class, DummyConfigurationProvider.class); @@ -93,7 +92,7 @@ public void setDefaultManagerName(ClassLoader cl, String s) { if (loader2defaultName.containsKey(cl)) { throw new IllegalStateException("a CacheManager was already created"); } - loader2defaultName.put(cl, s); + replaceDefaultName(cl, s); } } @@ -104,21 +103,21 @@ public String getDefaultManagerName(ClassLoader cl) { return n; } synchronized (getLockObject()) { - n = loader2defaultName.get(cl); - if (n != null) { - return n; - } n = CACHE_CONFIGURATION_PROVIDER.getDefaultManagerName(cl); if (n == null) { - n = STANDARD_DEFAULT_MANAGER_NAME; + n = CacheManager.STANDARD_DEFAULT_MANAGER_NAME; } - Map _copy = new WeakHashMap(loader2defaultName); - _copy.put(cl, n); - loader2defaultName = _copy; + replaceDefaultName(cl, n); } return n; } + private void replaceDefaultName(final ClassLoader cl, final String s) { + Map _copy = new WeakHashMap(loader2defaultName); + _copy.put(cl, s); + loader2defaultName = _copy; + } + @Override public ClassLoader getDefaultClassLoader() { return getClass().getClassLoader(); diff --git a/pom.xml b/pom.xml index 78835a957..fbbb67735 100644 --- a/pom.xml +++ b/pom.xml @@ -54,6 +54,7 @@ test-parent cache2k-jcache-tests test-osgi + test-init documentation cache2k-testing diff --git a/test-init/LICENSE.txt b/test-init/LICENSE.txt new file mode 100644 index 000000000..261eeb9e9 --- /dev/null +++ b/test-init/LICENSE.txt @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/test-init/pom.xml b/test-init/pom.xml new file mode 100644 index 000000000..bb0ae2b27 --- /dev/null +++ b/test-init/pom.xml @@ -0,0 +1,50 @@ + + 4.0.0 + + jar + + + org.cache2k + test-parent + 1.4-SNAPSHOT + ../test-parent/pom.xml + + + test-init + 1.4-SNAPSHOT + cache2k initialization tests + A few tests that check different default initialization and closing of cache managers. + + + + + + org.cache2k + cache2k-testing + ${project.version} + test + + + + ${project.groupId} + cache2k-api + ${project.version} + compile + + + + ${project.groupId} + cache2k-core + ${project.version} + runtime + + + + org.slf4j + slf4j-simple + 1.5.11 + + + + + diff --git a/test-init/src/test/java/org/cache2k/core/CacheManagerInitTest.java b/test-init/src/test/java/org/cache2k/core/CacheManagerInitTest.java new file mode 100644 index 000000000..f7031d0f0 --- /dev/null +++ b/test-init/src/test/java/org/cache2k/core/CacheManagerInitTest.java @@ -0,0 +1,58 @@ +package org.cache2k.core; + +/* + * #%L + * cache2k initialization tests + * %% + * Copyright (C) 2000 - 2019 headissue GmbH, Munich + * %% + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * #L% + */ + +import org.cache2k.Cache; +import org.cache2k.Cache2kBuilder; +import org.cache2k.CacheManager; +import static org.junit.Assert.*; +import org.junit.Test; + +/** + * @author Jens Wilke + */ +public class CacheManagerInitTest { + + public static final String OTHER_DEFAULT_CACHE_MANAGER_NAME = "main"; + + static { + CacheManager.setDefaultName(OTHER_DEFAULT_CACHE_MANAGER_NAME); + } + + @Test + public void differentCacheManagerName() { + assertEquals(CacheManager.getInstance().getName(), OTHER_DEFAULT_CACHE_MANAGER_NAME); + assertNotEquals(OTHER_DEFAULT_CACHE_MANAGER_NAME, CacheManager.STANDARD_DEFAULT_MANAGER_NAME); + } + + /** + * After the cache manager is closed, creating a cache, will create a new cache manager. + */ + @Test + public void closeAll() { + CacheManager cm1 = CacheManager.getInstance(); + CacheManager.closeAll(); + Cache c = Cache2kBuilder.forUnknownTypes().name("xy").build(); + assertNotSame(cm1, c.getCacheManager()); + c.close(); + } + +} diff --git a/test-init/src/test/resources/cache2k.xml b/test-init/src/test/resources/cache2k.xml new file mode 100644 index 000000000..712f9200b --- /dev/null +++ b/test-init/src/test/resources/cache2k.xml @@ -0,0 +1,28 @@ + + + 1.0 + true + + + testCache + + + \ No newline at end of file