Author: [email protected] Date: Thu Sep 22 10:56:53 2011 New Revision: 1405
Log: AMDATU-415 Adding in-memory storage provider for tenantmanager Added: trunk/amdatu-core/tenantstore-inmem/ (props changed) trunk/amdatu-core/tenantstore-inmem/LICENSE trunk/amdatu-core/tenantstore-inmem/NOTICE trunk/amdatu-core/tenantstore-inmem/pom.xml trunk/amdatu-core/tenantstore-inmem/src/ trunk/amdatu-core/tenantstore-inmem/src/main/ trunk/amdatu-core/tenantstore-inmem/src/main/java/ trunk/amdatu-core/tenantstore-inmem/src/main/java/org/ trunk/amdatu-core/tenantstore-inmem/src/main/java/org/amdatu/ trunk/amdatu-core/tenantstore-inmem/src/main/java/org/amdatu/core/ trunk/amdatu-core/tenantstore-inmem/src/main/java/org/amdatu/core/tenantstore/ trunk/amdatu-core/tenantstore-inmem/src/main/java/org/amdatu/core/tenantstore/inmem/ trunk/amdatu-core/tenantstore-inmem/src/main/java/org/amdatu/core/tenantstore/inmem/osgi/ trunk/amdatu-core/tenantstore-inmem/src/main/java/org/amdatu/core/tenantstore/inmem/osgi/Activator.java trunk/amdatu-core/tenantstore-inmem/src/main/java/org/amdatu/core/tenantstore/inmem/service/ trunk/amdatu-core/tenantstore-inmem/src/main/java/org/amdatu/core/tenantstore/inmem/service/InMemStorageProvider.java trunk/amdatu-core/tenantstore-inmem/src/test/ trunk/amdatu-core/tenantstore-inmem/src/test/java/ trunk/amdatu-core/tenantstore-inmem/src/test/java/org/ trunk/amdatu-core/tenantstore-inmem/src/test/java/org/amdatu/ trunk/amdatu-core/tenantstore-inmem/src/test/java/org/amdatu/core/ trunk/amdatu-core/tenantstore-inmem/src/test/java/org/amdatu/core/tenantstore/ trunk/amdatu-core/tenantstore-inmem/src/test/java/org/amdatu/core/tenantstore/inmem/ trunk/amdatu-core/tenantstore-inmem/src/test/java/org/amdatu/core/tenantstore/inmem/service/ trunk/amdatu-core/tenantstore-inmem/src/test/java/org/amdatu/core/tenantstore/inmem/service/InMemStorageProviderTest.java Added: trunk/amdatu-core/tenantstore-inmem/LICENSE ============================================================================== --- (empty file) +++ trunk/amdatu-core/tenantstore-inmem/LICENSE Thu Sep 22 10:56:53 2011 @@ -0,0 +1,202 @@ + + 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. Added: trunk/amdatu-core/tenantstore-inmem/NOTICE ============================================================================== --- (empty file) +++ trunk/amdatu-core/tenantstore-inmem/NOTICE Thu Sep 22 10:56:53 2011 @@ -0,0 +1,15 @@ +Amdatu Core Tenant In-Memory storage +Copyright 2010, 2011 The Amdatu Foundation + +I. Included Software + +II. Used Software + +This product uses software developed at +The OSGi Alliance (http://www.osgi.org/). +Copyright (c) OSGi Alliance (2000, 2007). +Licensed under the Apache License 2.0. + + +III. License Summary +- Apache License 2.0 Added: trunk/amdatu-core/tenantstore-inmem/pom.xml ============================================================================== --- (empty file) +++ trunk/amdatu-core/tenantstore-inmem/pom.xml Thu Sep 22 10:56:53 2011 @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright (c) 2010, 2011 The Amdatu Foundation + + 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.verning permissions and limitations + under the License. +--> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.amdatu.core</groupId> + <artifactId>org.amdatu.core</artifactId> + <version>0.2.1-SNAPSHOT</version> + </parent> + <artifactId>org.amdatu.core.tenantstore.inmem</artifactId> + <packaging>bundle</packaging> + <name>Amdatu Core - Tenant in-memory Backstore</name> + <description>This bundle provides a in-memory Tenant backstore</description> + + <dependencies> + <dependency> + <groupId>org.amdatu.core</groupId> + <artifactId>org.amdatu.core.tenant</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + <type>bundle</type> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <configuration> + <instructions> + <Bundle-Activator>org.amdatu.core.tenantstore.inmem.osgi.Activator</Bundle-Activator> + <Export-Package></Export-Package> + </instructions> + </configuration> + </plugin> + </plugins> + </build> +</project> Added: trunk/amdatu-core/tenantstore-inmem/src/main/java/org/amdatu/core/tenantstore/inmem/osgi/Activator.java ============================================================================== --- (empty file) +++ trunk/amdatu-core/tenantstore-inmem/src/main/java/org/amdatu/core/tenantstore/inmem/osgi/Activator.java Thu Sep 22 10:56:53 2011 @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2010, 2011 The Amdatu Foundation + * + * 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. + */ +package org.amdatu.core.tenantstore.inmem.osgi; + +import org.amdatu.core.tenant.TenantStorageProvider; +import org.amdatu.core.tenantstore.inmem.service.InMemStorageProvider; +import org.apache.felix.dm.DependencyActivatorBase; +import org.apache.felix.dm.DependencyManager; +import org.osgi.framework.BundleContext; + +/** + * This class represents the OSGi activator for the tenant service in-memory storage provider. + */ +public final class Activator extends DependencyActivatorBase { + + @Override + public void init(BundleContext context, DependencyManager manager) throws Exception { + + manager.add(createComponent() + .setInterface(TenantStorageProvider.class.getName(), null) + .setImplementation(InMemStorageProvider.class) + ); + } + + @Override + public void destroy(BundleContext context, DependencyManager manager) throws Exception { + } +} Added: trunk/amdatu-core/tenantstore-inmem/src/main/java/org/amdatu/core/tenantstore/inmem/service/InMemStorageProvider.java ============================================================================== --- (empty file) +++ trunk/amdatu-core/tenantstore-inmem/src/main/java/org/amdatu/core/tenantstore/inmem/service/InMemStorageProvider.java Thu Sep 22 10:56:53 2011 @@ -0,0 +1,34 @@ +package org.amdatu.core.tenantstore.inmem.service; + +import java.util.Collections; +import java.util.LinkedList; +import java.util.List; +import java.util.concurrent.ConcurrentHashMap; + +import org.amdatu.core.tenant.TenantEntity; +import org.amdatu.core.tenant.TenantStorageException; +import org.amdatu.core.tenant.TenantStorageProvider; + +public class InMemStorageProvider implements TenantStorageProvider { + + private ConcurrentHashMap<String, TenantEntity> m_entities = new ConcurrentHashMap<String, TenantEntity>(); + + public void store(TenantEntity tenant) throws TenantStorageException { + m_entities.put(tenant.getId(), tenant); + } + + public void delete(TenantEntity tenant) throws TenantStorageException { + m_entities.remove(tenant.getId()); + } + + public TenantEntity getById(String id) throws TenantStorageException { + if (id == null || "".equals(id)) + throw new TenantStorageException("Can not retrieve tenant with id: " + id); + return m_entities.get(id); + } + + public List<TenantEntity> getAll() throws TenantStorageException { + List<TenantEntity> all = new LinkedList<TenantEntity>(m_entities.values()); + return Collections.unmodifiableList(all); + } +} Added: trunk/amdatu-core/tenantstore-inmem/src/test/java/org/amdatu/core/tenantstore/inmem/service/InMemStorageProviderTest.java ============================================================================== --- (empty file) +++ trunk/amdatu-core/tenantstore-inmem/src/test/java/org/amdatu/core/tenantstore/inmem/service/InMemStorageProviderTest.java Thu Sep 22 10:56:53 2011 @@ -0,0 +1,199 @@ +/* + * Copyright (c) 2010, 2011 The Amdatu Foundation + * + * 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. + */ +package org.amdatu.core.tenantstore.inmem.service; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.amdatu.core.tenant.TenantEntity; +import org.amdatu.core.tenant.TenantStorageException; +import org.amdatu.core.tenant.TenantStorageProvider; +import org.junit.Assert; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.TestName; +import org.osgi.service.cm.ConfigurationException; + +public class InMemStorageProviderTest { + + @Rule + public TestName m_testName = new TestName(); + + private TenantStorageProvider m_tenantStorageProvider; + + @BeforeClass + public static void setUpOnce() throws TenantStorageException { + } + + @Before + public void setUp() throws TenantStorageException, ConfigurationException { + m_tenantStorageProvider = new InMemStorageProvider(); + } + + /** + * Comprehensive test of crud operations on tenants. + * + * @throws TenantStorageException + */ + @Test + public void testExtensiveCRUD() throws TenantStorageException { + + final int testSize = 197; + + // creating + for (int i = 0; i < testSize; i++) { + TenantEntity tenantEntity; + if (i % 3 == 0) { + // mod 3 entities get properties + Map<String, String> properties = new HashMap<String, String>(); + properties.put("key_" + i, "value_" + i); + properties.put("key_" + (i + 1), "value_" + (i + 1)); + tenantEntity = new TenantEntity("" + i, "Bram_" + i, properties); + } + else { + tenantEntity = new TenantEntity("" + i, "Bram_" + i); + } + m_tenantStorageProvider.store(tenantEntity); + } + + // testing + for (int i = 0; i < testSize; i++) { + TenantEntity tenantEntity = m_tenantStorageProvider.getById("" + i); + Assert.assertEquals("" + i, tenantEntity.getId()); + Assert.assertEquals("Bram_" + i, tenantEntity.getName()); + if (i % 3 == 0) { + // mod 3 entities have properties + Assert.assertEquals(2, tenantEntity.getProperties().size()); + Assert.assertEquals("value_" + i, tenantEntity.getProperties().get("key_" + i)); + Assert.assertEquals("value_" + (i + 1), tenantEntity.getProperties().get("key_" + (i + 1))); + } + } + + List<TenantEntity> tenantEntityList = m_tenantStorageProvider.getAll(); + Assert.assertEquals(testSize, tenantEntityList.size()); + + // updating + for (int i = 0; i < testSize; i++) { + if (i % 4 == 0) { + // mod 4 entities get updated + TenantEntity tenantEntity = m_tenantStorageProvider.getById("" + i); + tenantEntity.setName(tenantEntity.getName() + "_updated"); + if (i % 12 == 0) { + // mod 12 entities get (new) properties + tenantEntity.putProperty("key_" + i, "newvalue_" + i); + } + + m_tenantStorageProvider.store(tenantEntity); + } + } + + // testing + for (int i = 0; i < testSize; i++) { + if (i % 4 == 0) { + TenantEntity tenantEntity = m_tenantStorageProvider.getById("" + i); + Assert.assertEquals("Bram_" + i + "_updated", tenantEntity.getName()); + if (i % 3 == 0) { + if (i % 12 != 0) { + Assert.assertEquals("value_" + i, tenantEntity.getProperties().get("key_" + i)); + } + else { + // mod 12 entities have new properties + Assert.assertEquals("newvalue_" + i, tenantEntity.getProperties().get("key_" + i)); + } + Assert.assertEquals("value_" + (i + 1), tenantEntity.getProperties().get("key_" + (i + 1))); + } + } + } + + List<TenantEntity> tenantEntityList2 = m_tenantStorageProvider.getAll(); + Assert.assertEquals(testSize, tenantEntityList2.size()); + + // deleting + int deleted = 0; + for (int i = 0; i < testSize; i++) { + if (i % 5 == 0) { + TenantEntity tenantEntity = m_tenantStorageProvider.getById("" + i); + m_tenantStorageProvider.delete(tenantEntity); + deleted++; + } + } + + // testing + for (int i = 0; i < testSize; i++) { + if (i % 5 == 0) { + TenantEntity tenantEntity = m_tenantStorageProvider.getById("" + i); + Assert.assertNull(tenantEntity); + } + } + + List<TenantEntity> tenantEntityList3 = m_tenantStorageProvider.getAll(); + Assert.assertEquals(testSize - deleted, tenantEntityList3.size()); + + // test lenient behavior on delete of non existing + TenantEntity tenantEntity5 = m_tenantStorageProvider.getById("" + 6); + Assert.assertNotNull(tenantEntity5); + m_tenantStorageProvider.delete(tenantEntity5); + m_tenantStorageProvider.delete(tenantEntity5); + } + + /** + * Testing behavior on tenantEntities with same hashcode() for the id. This is based on knowledge of the + * implementation but as it is a likely pitfall let's test it anyway to catch future mistakes. + * + * @throws TenantStorageException + */ + @Test + public void testWithEqualHashcodes() throws TenantStorageException { + + // Assert the reason for this test + Assert.assertEquals("BB".hashCode(), "Aa".hashCode()); + + TenantEntity tenantEntity1 = new TenantEntity("Aa", "Bram"); + m_tenantStorageProvider.store(tenantEntity1); + + TenantEntity tenantEntity2 = new TenantEntity("BB", "Pipo"); + m_tenantStorageProvider.store(tenantEntity2); + + TenantEntity tenantEntity3 = m_tenantStorageProvider.getById("Aa"); + Assert.assertEquals("Aa", tenantEntity3.getId()); + Assert.assertEquals("Bram", tenantEntity3.getName()); + + TenantEntity tenantEntity4 = m_tenantStorageProvider.getById("BB"); + Assert.assertEquals("BB", tenantEntity4.getId()); + Assert.assertEquals("Pipo", tenantEntity4.getName()); + + List<TenantEntity> tenantEntityList1 = m_tenantStorageProvider.getAll(); + Assert.assertEquals(2, tenantEntityList1.size()); + + m_tenantStorageProvider.delete(tenantEntity4); + + List<TenantEntity> tenantEntityList2 = m_tenantStorageProvider.getAll(); + Assert.assertEquals(1, tenantEntityList2.size()); + + TenantEntity tenantEntity5 = m_tenantStorageProvider.getById("Aa"); + Assert.assertEquals("Aa", tenantEntity5.getId()); + Assert.assertEquals("Bram", tenantEntity5.getName()); + + TenantEntity tenantEntity6 = m_tenantStorageProvider.getById("BB"); + Assert.assertNull(tenantEntity6); + + // test lenient behavior on delete of non existing + m_tenantStorageProvider.delete(tenantEntity4); + } +} _______________________________________________ Amdatu-commits mailing list [email protected] http://lists.amdatu.org/mailman/listinfo/amdatu-commits
