From f18055a4c9f77f045c3ab4b4d0707293674945a6 Mon Sep 17 00:00:00 2001
From: Oliver Gierke <ogierke@vmware.com>
Date: Tue, 29 Jan 2013 10:44:42 +0100
Subject: [PATCH] DATACMNS-274 - Fixed package cycle in mapping subsystem.

Updated Sonargraph architecture description along the way.
---
 Spring Data Commons.sonargraph                | 177 +++++++++++++-----
 .../MappingContextIsNewStrategyFactory.java   |   5 +-
 ...gContextIsNewStrategyFactoryUnitTests.java |   8 +-
 3 files changed, 138 insertions(+), 52 deletions(-)
 rename src/main/java/org/springframework/data/mapping/{model => context}/MappingContextIsNewStrategyFactory.java (97%)
 rename src/test/java/org/springframework/data/mapping/{model => context}/MappingContextIsNewStrategyFactoryUnitTests.java (89%)

diff --git a/Spring Data Commons.sonargraph b/Spring Data Commons.sonargraph
index ba449bdd36..a06757e419 100644
--- a/Spring Data Commons.sonargraph	
+++ b/Spring Data Commons.sonargraph	
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<context version="7.0.3.1152">
-    <scope name="spring-data-commons-core" type="Project">
+<context version="7.1.7.187">
+    <scope name="spring-data-commons" type="Project">
         <architecture>
             <element name="Web" type="Layer">
                 <element name="Assignment" type="TypeFilter">
                     <element name="**.web.**" type="IncludeTypePattern"/>
                 </element>
                 <dependency type="AllowedDependency" toName="External|External"/>
-                <dependency type="AllowedDependency" toName="Project|spring-data-commons-core::Layer|Application"/>
+                <dependency type="AllowedDependency" toName="Project|spring-data-commons::Layer|Application"/>
                 <dependency type="AllowedDependency" toName="External|External::Subsystem|Java Beans"/>
                 <dependency type="AllowedDependency" toName="External|External::Subsystem|Reflection"/>
                 <dependency type="AllowedDependency" toName="External|External::Subsystem|Servlet API"/>
@@ -21,78 +21,74 @@
                     <element name="Assignment" type="TypeFilter">
                         <element name="**.repository.*" type="IncludeTypePattern"/>
                     </element>
-                    <dependency type="AllowedDependency" toName="Project|spring-data-commons-core::Layer|Application::Subsystem|Domain"/>
+                    <stereotype name="Public"/>
+                    <dependency type="AllowedDependency" toName="Project|spring-data-commons::Layer|Application::Subsystem|Domain"/>
                 </element>
                 <element name="Core" type="Subsystem">
                     <element name="Assignment" type="TypeFilter">
                         <element name="**.util.**" type="IncludeTypePattern"/>
                         <element name="**.core.*" type="IncludeTypePattern"/>
                     </element>
-                    <dependency type="AllowedDependency" toName="Project|spring-data-commons-core::Layer|Repositories::Subsystem|API"/>
                 </element>
                 <element name="Query" type="Subsystem">
                     <element name="Assignment" type="TypeFilter">
                         <element name="**.query.**" type="IncludeTypePattern"/>
                     </element>
-                    <dependency type="AllowedDependency" toName="Project|spring-data-commons-core::Layer|Application::Subsystem|Domain"/>
-                    <dependency type="AllowedDependency" toName="Project|spring-data-commons-core::Layer|Repositories::Subsystem|Core"/>
+                    <dependency type="AllowedDependency" toName="Project|spring-data-commons::Layer|Application::Subsystem|Domain"/>
+                    <dependency type="AllowedDependency" toName="Project|spring-data-commons::Layer|Repositories::Subsystem|Core"/>
                 </element>
                 <element name="Implementation" type="Subsystem">
                     <element name="Assignment" type="TypeFilter">
                         <element name="**.core.support.**" type="IncludeTypePattern"/>
                     </element>
-                    <dependency type="AllowedDependency" toName="Project|spring-data-commons-core::Layer|Application::Subsystem|Domain"/>
-                    <dependency type="AllowedDependency" toName="Project|spring-data-commons-core::Layer|Repositories::Subsystem|API"/>
-                    <dependency type="AllowedDependency" toName="Project|spring-data-commons-core::Layer|Repositories::Subsystem|Core"/>
-                    <dependency type="AllowedDependency" toName="Project|spring-data-commons-core::Layer|Repositories::Subsystem|Query"/>
+                    <dependency type="AllowedDependency" toName="Project|spring-data-commons::Layer|Application::Subsystem|Domain"/>
+                    <dependency type="AllowedDependency" toName="Project|spring-data-commons::Layer|Repositories::Subsystem|Core"/>
+                    <dependency type="AllowedDependency" toName="Project|spring-data-commons::Layer|Repositories::Subsystem|Query"/>
                 </element>
                 <element name="Support" type="Subsystem">
                     <element name="Assignment" type="TypeFilter">
                         <element name="**.support.**" type="WeakTypePattern"/>
                     </element>
-                    <dependency type="AllowedDependency" toName="Project|spring-data-commons-core::Layer|Repositories::Subsystem|API"/>
-                    <dependency type="AllowedDependency" toName="Project|spring-data-commons-core::Layer|Repositories::Subsystem|Core"/>
-                    <dependency type="AllowedDependency" toName="Project|spring-data-commons-core::Layer|Repositories::Subsystem|Implementation"/>
-                    <dependency type="AllowedDependency" toName="Project|spring-data-commons-core::Layer|Repositories::Subsystem|Query"/>
+                    <dependency type="AllowedDependency" toName="Project|spring-data-commons::Layer|Repositories::Subsystem|Core"/>
+                    <dependency type="AllowedDependency" toName="Project|spring-data-commons::Layer|Repositories::Subsystem|Implementation"/>
+                    <dependency type="AllowedDependency" toName="Project|spring-data-commons::Layer|Repositories::Subsystem|Query"/>
                 </element>
-                <element name="Configuration" type="Subsystem">
+                <element name="History" type="Subsystem">
                     <element name="Assignment" type="TypeFilter">
-                        <element name="**.config.**" type="IncludeTypePattern"/>
+                        <element name="**.history.**" type="IncludeTypePattern"/>
                     </element>
-                    <dependency type="AllowedDependency" toName="Project|spring-data-commons-core::Layer|Repositories::Subsystem|API"/>
-                    <dependency type="AllowedDependency" toName="Project|spring-data-commons-core::Layer|Repositories::Subsystem|Core"/>
-                    <dependency type="AllowedDependency" toName="Project|spring-data-commons-core::Layer|Repositories::Subsystem|Implementation"/>
-                    <dependency type="AllowedDependency" toName="Project|spring-data-commons-core::Layer|Repositories::Subsystem|Query"/>
-                </element>
-                <dependency type="AllowedDependency" toName="Project|spring-data-commons-core::Layer|Application"/>
-                <dependency type="AllowedDependency" toName="Project|spring-data-commons-core::Layer|Core"/>
-                <dependency type="AllowedDependency" toName="Project|spring-data-commons-core::Layer|Mapping"/>
-            </element>
-            <element name="Application" type="Layer">
-                <element name="Assignment" type="TypeFilter"/>
-                <element name="Domain" type="Subsystem">
+                </element>
+                <element name="CDI" type="Subsystem">
                     <element name="Assignment" type="TypeFilter">
-                        <element name="**.domain.**" type="IncludeTypePattern"/>
+                        <element name="**.cdi.**" type="IncludeTypePattern"/>
                     </element>
+                    <dependency type="AllowedDependency" toName="External|External::Subsystem|JavaEE"/>
+                    <dependency type="AllowedDependency" toName="External|External::Subsystem|Logging"/>
+                    <dependency type="AllowedDependency" toName="External|External::Subsystem|Reflection"/>
+                    <dependency type="AllowedDependency" toName="External|External::Subsystem|Spring"/>
                 </element>
-                <element name="Querydsl" type="Subsystem">
+                <element name="Init" type="Subsystem">
                     <element name="Assignment" type="TypeFilter">
-                        <element name="**.querydsl.**" type="IncludeTypePattern"/>
+                        <element name="**.init.**" type="IncludeTypePattern"/>
                     </element>
-                    <dependency type="AllowedDependency" toName="Project|spring-data-commons-core::Layer|Application::Subsystem|Domain"/>
+                    <dependency type="AllowedDependency" toName="Project|spring-data-commons::Layer|Repositories::Subsystem|Support"/>
                 </element>
-                <element name="Cross store" type="Subsystem">
+                <element name="Configuration" type="Subsystem">
                     <element name="Assignment" type="TypeFilter">
-                        <element name="**.crossstore.**" type="IncludeTypePattern"/>
+                        <element name="**.config.**" type="IncludeTypePattern"/>
                     </element>
+                    <stereotype name="Unrestricted"/>
                 </element>
+                <dependency type="AllowedDependency" toName="Project|spring-data-commons::Layer|Application"/>
+                <dependency type="AllowedDependency" toName="Project|spring-data-commons::Layer|Core"/>
+                <dependency type="AllowedDependency" toName="Project|spring-data-commons::Layer|Mapping"/>
             </element>
             <element name="Conversion" type="Layer">
                 <element name="Assignment" type="TypeFilter">
                     <element name="**.convert.**" type="IncludeTypePattern"/>
                 </element>
-                <dependency type="AllowedDependency" toName="Project|spring-data-commons-core::Layer|Core"/>
-                <dependency type="AllowedDependency" toName="Project|spring-data-commons-core::Layer|Mapping"/>
+                <dependency type="AllowedDependency" toName="Project|spring-data-commons::Layer|Core"/>
+                <dependency type="AllowedDependency" toName="Project|spring-data-commons::Layer|Mapping"/>
             </element>
             <element name="Mapping" type="Layer">
                 <element name="Assignment" type="TypeFilter">
@@ -108,9 +104,9 @@
                     <element name="Assignment" type="TypeFilter">
                         <element name="**.context.**" type="IncludeTypePattern"/>
                     </element>
-                    <dependency type="AllowedDependency" toName="Project|spring-data-commons-core::Layer|Mapping::Subsystem|Model"/>
+                    <dependency type="AllowedDependency" toName="Project|spring-data-commons::Layer|Mapping::Subsystem|Model"/>
                 </element>
-                <dependency type="AllowedDependency" toName="Project|spring-data-commons-core::Layer|Core"/>
+                <dependency type="AllowedDependency" toName="Project|spring-data-commons::Layer|Core"/>
             </element>
             <element name="Core" type="Layer">
                 <element name="Assignment" type="TypeFilter"/>
@@ -118,6 +114,7 @@
                     <element name="Assignment" type="TypeFilter">
                         <element name="**.util.**" type="WeakTypePattern"/>
                     </element>
+                    <stereotype name="Public"/>
                 </element>
                 <element name="Annotations" type="Subsystem">
                     <element name="Assignment" type="TypeFilter">
@@ -128,7 +125,6 @@
                     <element name="Assignment" type="TypeFilter">
                         <element name="**.authentication.**" type="IncludeTypePattern"/>
                     </element>
-                    <stereotype name="Unrestricted"/>
                 </element>
                 <element name="Configuration" type="Subsystem">
                     <element name="Assignment" type="TypeFilter">
@@ -140,20 +136,81 @@
                     <element name="Assignment" type="TypeFilter">
                         <element name="**.history.**" type="WeakTypePattern"/>
                     </element>
+                </element>
+                <element name="Support" type="Subsystem">
+                    <element name="Assignment" type="TypeFilter">
+                        <element name="**.support.**" type="WeakTypePattern"/>
+                    </element>
+                </element>
+                <element name="Auditing" type="Subsystem">
+                    <element name="Assignment" type="TypeFilter">
+                        <element name="**.auditing.**" type="IncludeTypePattern"/>
+                    </element>
                     <stereotype name="Unrestricted"/>
                 </element>
+                <dependency type="AllowedDependency" toName="Project|spring-data-commons::Layer|Application"/>
+            </element>
+            <element name="Application" type="Layer">
+                <element name="Assignment" type="TypeFilter"/>
+                <element name="Domain" type="Subsystem">
+                    <element name="Assignment" type="TypeFilter">
+                        <element name="**.domain.**" type="WeakTypePattern"/>
+                    </element>
+                </element>
+                <element name="JAXB" type="Subsystem">
+                    <element name="Assignment" type="TypeFilter">
+                        <element name="**.domain.jaxb.**" type="IncludeTypePattern"/>
+                    </element>
+                    <dependency type="AllowedDependency" toName="Project|spring-data-commons::Layer|Application::Subsystem|Domain"/>
+                    <dependency type="AllowedDependency" toName="External|External::Subsystem|JAXB"/>
+                    <dependency type="AllowedDependency" toName="External|External::Subsystem|Spring"/>
+                </element>
+                <element name="Querydsl" type="Subsystem">
+                    <element name="Assignment" type="TypeFilter">
+                        <element name="**.querydsl.**" type="IncludeTypePattern"/>
+                    </element>
+                    <dependency type="AllowedDependency" toName="Project|spring-data-commons::Layer|Application::Subsystem|Domain"/>
+                </element>
+                <element name="Cross store" type="Subsystem">
+                    <element name="Assignment" type="TypeFilter">
+                        <element name="**.crossstore.**" type="IncludeTypePattern"/>
+                    </element>
+                </element>
             </element>
         </architecture>
         <workspace>
-            <element name="spring-data-commons-core/src/main/java" type="JavaRootDirectory">
-                <reference name="Project|spring-data-commons-core::BuildUnit|spring-data-commons-core"/>
+            <element name="src/main/java" type="JavaRootDirectory">
+                <reference name="Project|spring-data-commons::BuildUnit|spring-data-commons"/>
             </element>
-            <element name="spring-data-commons-core/target/classes" type="JavaRootDirectory">
-                <reference name="Project|spring-data-commons-core::BuildUnit|spring-data-commons-core"/>
+            <element name="target/classes" type="JavaRootDirectory">
+                <reference name="Project|spring-data-commons::BuildUnit|spring-data-commons"/>
             </element>
         </workspace>
+        <itemDefinition>
+            <item type="IgnoreWarningFilterItem">
+                <property name="AttributeId" value="NoAttachedSourceFile"/>
+                <property name="Comment" value="Ignore generated classes"/>
+                <property name="Date" value="2013-01-29 10:28:36"/>
+                <property name="ElementType" value="Class"/>
+                <property name="Pattern" value="org.springframework.data.querydsl.QSimpleEntityPathResolverUnitTests_Sample"/>
+            </item>
+            <item type="IgnoreWarningFilterItem">
+                <property name="AttributeId" value="NoAttachedSourceFile"/>
+                <property name="Comment" value="Ignore generated classes"/>
+                <property name="Date" value="2013-01-29 10:28:36"/>
+                <property name="ElementType" value="Class"/>
+                <property name="Pattern" value="org.springframework.data.querydsl.QUser"/>
+            </item>
+            <item type="IgnoreWarningFilterItem">
+                <property name="AttributeId" value="NoAttachedSourceFile"/>
+                <property name="Comment" value="Ignore generated classes"/>
+                <property name="Date" value="2013-01-29 10:28:36"/>
+                <property name="ElementType" value="Class"/>
+                <property name="Pattern" value="org.springframework.data.querydsl.QSimpleEntityPathResolverUnitTests_NamedUser"/>
+            </item>
+        </itemDefinition>
         <physical>
-            <element name="spring-data-commons-core" type="BuildUnit"/>
+            <element name="spring-data-commons" type="BuildUnit"/>
         </physical>
     </scope>
     <scope name="External" type="External">
@@ -215,7 +272,7 @@
             </element>
             <element name="Logging" type="Subsystem">
                 <element name="Assignment" type="TypeFilter">
-                    <element name="org.apache.commons.logging.**" type="IncludeTypePattern"/>
+                    <element name="org.slf4j.**" type="IncludeTypePattern"/>
                 </element>
             </element>
             <element name="AOP" type="Subsystem">
@@ -223,6 +280,22 @@
                     <element name="org.aopalliance.**" type="IncludeTypePattern"/>
                 </element>
             </element>
+            <element name="JavaEE" type="Subsystem">
+                <element name="Assignment" type="TypeFilter">
+                    <element name="javax.enterprise.**" type="IncludeTypePattern"/>
+                    <element name="javax.inject.**" type="IncludeTypePattern"/>
+                </element>
+            </element>
+            <element name="JAXB" type="Subsystem">
+                <element name="Assignment" type="TypeFilter">
+                    <element name="javax.xml.**" type="IncludeTypePattern"/>
+                </element>
+            </element>
+            <element name="Jackson" type="Subsystem">
+                <element name="Assignment" type="TypeFilter">
+                    <element name="org.codehaus.jackson.**" type="IncludeTypePattern"/>
+                </element>
+            </element>
         </architecture>
     </scope>
     <scope name="Global" type="Global">
@@ -281,6 +354,18 @@
             </item>
         </itemDefinition>
     </scope>
+    <itemDefinition>
+        <item type="MoveTypeItem">
+            <property name="AssignedTo" value=""/>
+            <property name="Comment" value=""/>
+            <property name="Date" value="2013-01-29 09:59:22"/>
+            <property name="Priority" value="Medium"/>
+            <property name="SourceScope" value="spring-data-commons"/>
+            <property name="TargetNamespace" value="org.springframework.data.mapping.context"/>
+            <property name="TargetScope" value="spring-data-commons"/>
+            <property name="Type" value="org.springframework.data.mapping.model.MappingContextIsNewStrategyFactory"/>
+        </item>
+    </itemDefinition>
     <attributeConfiguration type="AttributeConfiguration">
         <property name="ExtendedCyclomaticComplexity" value="disabled"/>
         <property name="MaxExtendedCyclomaticComplexityPerMethod" value="disabled"/>
diff --git a/src/main/java/org/springframework/data/mapping/model/MappingContextIsNewStrategyFactory.java b/src/main/java/org/springframework/data/mapping/context/MappingContextIsNewStrategyFactory.java
similarity index 97%
rename from src/main/java/org/springframework/data/mapping/model/MappingContextIsNewStrategyFactory.java
rename to src/main/java/org/springframework/data/mapping/context/MappingContextIsNewStrategyFactory.java
index ecece05f2c..0cbddf8f3a 100644
--- a/src/main/java/org/springframework/data/mapping/model/MappingContextIsNewStrategyFactory.java
+++ b/src/main/java/org/springframework/data/mapping/context/MappingContextIsNewStrategyFactory.java
@@ -13,11 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.mapping.model;
+package org.springframework.data.mapping.context;
 
 import org.springframework.data.mapping.PersistentEntity;
 import org.springframework.data.mapping.PersistentProperty;
-import org.springframework.data.mapping.context.MappingContext;
+import org.springframework.data.mapping.model.BeanWrapper;
+import org.springframework.data.mapping.model.MappingException;
 import org.springframework.data.support.IsNewStrategy;
 import org.springframework.data.support.IsNewStrategyFactory;
 import org.springframework.data.support.IsNewStrategyFactorySupport;
diff --git a/src/test/java/org/springframework/data/mapping/model/MappingContextIsNewStrategyFactoryUnitTests.java b/src/test/java/org/springframework/data/mapping/context/MappingContextIsNewStrategyFactoryUnitTests.java
similarity index 89%
rename from src/test/java/org/springframework/data/mapping/model/MappingContextIsNewStrategyFactoryUnitTests.java
rename to src/test/java/org/springframework/data/mapping/context/MappingContextIsNewStrategyFactoryUnitTests.java
index 4bb7527189..15b696a6d1 100644
--- a/src/test/java/org/springframework/data/mapping/model/MappingContextIsNewStrategyFactoryUnitTests.java
+++ b/src/test/java/org/springframework/data/mapping/context/MappingContextIsNewStrategyFactoryUnitTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.mapping.model;
+package org.springframework.data.mapping.context;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
@@ -23,9 +23,9 @@
 import org.springframework.data.annotation.Id;
 import org.springframework.data.annotation.Version;
 import org.springframework.data.domain.Persistable;
-import org.springframework.data.mapping.context.SampleMappingContext;
-import org.springframework.data.mapping.model.MappingContextIsNewStrategyFactory.PropertyIsNullIsNewStrategy;
-import org.springframework.data.mapping.model.MappingContextIsNewStrategyFactory.PropertyIsNullOrZeroNumberIsNewStrategy;
+import org.springframework.data.mapping.context.MappingContextIsNewStrategyFactory;
+import org.springframework.data.mapping.context.MappingContextIsNewStrategyFactory.PropertyIsNullIsNewStrategy;
+import org.springframework.data.mapping.context.MappingContextIsNewStrategyFactory.PropertyIsNullOrZeroNumberIsNewStrategy;
 import org.springframework.data.support.IsNewStrategy;
 import org.springframework.data.support.IsNewStrategyFactory;