From f56932170535e86b8406b6e5f0cfee93db787fc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= <timo.westkamper@mysema.com>
Date: Sun, 8 Sep 2013 22:40:59 +0300
Subject: [PATCH] Made RESOURCE the default IDType #48

---
 .../src/main/java/com/mysema/rdfbean/annotations/Id.java   | 2 +-
 .../java/com/mysema/rdfbean/domains/ContextDomain.java     | 7 ++++---
 .../rdfbean/domains/EntityDocumentRevisionDomain.java      | 4 ++--
 .../java/com/mysema/rdfbean/domains/InferenceDomain.java   | 3 ++-
 .../test/java/com/mysema/rdfbean/domains/LoadDomain.java   | 7 ++++---
 .../java/com/mysema/rdfbean/domains/PropertiesDomain.java  | 7 ++++---
 .../test/java/com/mysema/rdfbean/domains/SimpleDomain.java | 5 +++--
 .../rdfbean/domains/UserDepartmentCompanyDomain.java       | 7 ++++---
 .../test/java/com/mysema/rdfbean/model/RDFUpdateTest.java  | 1 -
 .../src/test/java/com/mysema/rdfbean/object/ArrayTest.java | 3 ++-
 .../test/java/com/mysema/rdfbean/object/ContextTest.java   | 3 ++-
 .../test/java/com/mysema/rdfbean/object/DeleteTest.java    | 5 +++--
 .../java/com/mysema/rdfbean/object/ListContainerTest.java  | 7 ++++---
 .../test/java/com/mysema/rdfbean/object/MixinIdTest.java   | 5 +++--
 .../src/test/java/com/mysema/rdfbean/object/MixinTest.java | 5 +++--
 .../java/com/mysema/rdfbean/object/SessionListTest.java    | 3 ++-
 .../src/main/java/com/mysema/rdf/demo/domain/Party.java    | 3 ++-
 .../src/test/java/com/mysema/rdfbean/domain/Party.java     | 3 ++-
 18 files changed, 47 insertions(+), 33 deletions(-)

diff --git a/rdfbean-core/src/main/java/com/mysema/rdfbean/annotations/Id.java b/rdfbean-core/src/main/java/com/mysema/rdfbean/annotations/Id.java
index ff1455c4..b1763f31 100644
--- a/rdfbean-core/src/main/java/com/mysema/rdfbean/annotations/Id.java
+++ b/rdfbean-core/src/main/java/com/mysema/rdfbean/annotations/Id.java
@@ -48,7 +48,7 @@
     /**
      * @return
      */
-    IDType value() default IDType.LOCAL;
+    IDType value() default IDType.RESOURCE;
 
     /**
      * Namespace of the mapped ids. When ns is not empty local names will be
diff --git a/rdfbean-core/src/test/java/com/mysema/rdfbean/domains/ContextDomain.java b/rdfbean-core/src/test/java/com/mysema/rdfbean/domains/ContextDomain.java
index 6cfb8d11..8ac085fe 100644
--- a/rdfbean-core/src/test/java/com/mysema/rdfbean/domains/ContextDomain.java
+++ b/rdfbean-core/src/test/java/com/mysema/rdfbean/domains/ContextDomain.java
@@ -4,6 +4,7 @@
 import com.mysema.rdfbean.annotations.Context;
 import com.mysema.rdfbean.annotations.Id;
 import com.mysema.rdfbean.annotations.Predicate;
+import com.mysema.rdfbean.model.IDType;
 
 public interface ContextDomain {
 
@@ -17,7 +18,7 @@ public interface ContextDomain {
     @Context(NS1)
     public static class Entity1 {
 
-        @Id
+        @Id(IDType.LOCAL)
         String id;
 
         @Predicate
@@ -39,7 +40,7 @@ public Entity2 getEntity() {
     @ClassMapping
     public static class Entity2 {
 
-        @Id
+        @Id(IDType.LOCAL)
         String id;
 
         @Predicate(context = NS2)
@@ -61,7 +62,7 @@ public Entity3 getEntity() {
     @ClassMapping
     public static class Entity3 {
 
-        @Id
+        @Id(IDType.LOCAL)
         String id;
 
         @Predicate(context = NS3)
diff --git a/rdfbean-core/src/test/java/com/mysema/rdfbean/domains/EntityDocumentRevisionDomain.java b/rdfbean-core/src/test/java/com/mysema/rdfbean/domains/EntityDocumentRevisionDomain.java
index dc6c9441..3fdf89d4 100644
--- a/rdfbean-core/src/test/java/com/mysema/rdfbean/domains/EntityDocumentRevisionDomain.java
+++ b/rdfbean-core/src/test/java/com/mysema/rdfbean/domains/EntityDocumentRevisionDomain.java
@@ -53,7 +53,7 @@ public Entity getRevisionOf() {
     @ClassMapping
     public static class Entity {
 
-        @Id
+        @Id(IDType.LOCAL)
         public String id;
 
         @Predicate
@@ -72,7 +72,7 @@ public Document getDocument() {
     @ClassMapping
     public static class Document {
 
-        @Id
+        @Id(IDType.LOCAL)
         public String id;
 
         public String getId() {
diff --git a/rdfbean-core/src/test/java/com/mysema/rdfbean/domains/InferenceDomain.java b/rdfbean-core/src/test/java/com/mysema/rdfbean/domains/InferenceDomain.java
index e8174fca..f796858a 100644
--- a/rdfbean-core/src/test/java/com/mysema/rdfbean/domains/InferenceDomain.java
+++ b/rdfbean-core/src/test/java/com/mysema/rdfbean/domains/InferenceDomain.java
@@ -12,12 +12,13 @@
 import com.mysema.query.types.path.StringPath;
 import com.mysema.rdfbean.annotations.ClassMapping;
 import com.mysema.rdfbean.annotations.Id;
+import com.mysema.rdfbean.model.IDType;
 
 public interface InferenceDomain {
 
     @ClassMapping
     public static class Entity1 {
-        @Id
+        @Id(IDType.LOCAL)
         public String id;
     }
 
diff --git a/rdfbean-core/src/test/java/com/mysema/rdfbean/domains/LoadDomain.java b/rdfbean-core/src/test/java/com/mysema/rdfbean/domains/LoadDomain.java
index 61451a18..9ac8bacd 100644
--- a/rdfbean-core/src/test/java/com/mysema/rdfbean/domains/LoadDomain.java
+++ b/rdfbean-core/src/test/java/com/mysema/rdfbean/domains/LoadDomain.java
@@ -15,12 +15,13 @@
 import com.mysema.rdfbean.annotations.ClassMapping;
 import com.mysema.rdfbean.annotations.Id;
 import com.mysema.rdfbean.annotations.Predicate;
+import com.mysema.rdfbean.model.IDType;
 
 public interface LoadDomain {
 
     @ClassMapping
     public class Document {
-        @Id
+        @Id(IDType.LOCAL)
         public String id;
 
         @Predicate
@@ -29,7 +30,7 @@ public class Document {
 
     @ClassMapping
     public class Entity {
-        @Id
+        @Id(IDType.LOCAL)
         public String id;
 
         @Predicate
@@ -42,7 +43,7 @@ public class Entity {
 
     @ClassMapping
     public class Revision {
-        @Id
+        @Id(IDType.LOCAL)
         public String id;
 
         @Predicate
diff --git a/rdfbean-core/src/test/java/com/mysema/rdfbean/domains/PropertiesDomain.java b/rdfbean-core/src/test/java/com/mysema/rdfbean/domains/PropertiesDomain.java
index d27dde3f..ef5b95f2 100644
--- a/rdfbean-core/src/test/java/com/mysema/rdfbean/domains/PropertiesDomain.java
+++ b/rdfbean-core/src/test/java/com/mysema/rdfbean/domains/PropertiesDomain.java
@@ -11,6 +11,7 @@
 import com.mysema.rdfbean.annotations.Id;
 import com.mysema.rdfbean.annotations.Predicate;
 import com.mysema.rdfbean.annotations.Properties;
+import com.mysema.rdfbean.model.IDType;
 import com.mysema.rdfbean.model.NODE;
 import com.mysema.rdfbean.model.UID;
 
@@ -28,7 +29,7 @@ public interface PropertiesDomain {
     @ClassMapping
     public static class Person {
 
-        @Id
+        @Id(IDType.LOCAL)
         public String id;
 
         @Predicate
@@ -38,7 +39,7 @@ public static class Person {
     @ClassMapping
     public static class Iteration {
 
-        @Id
+        @Id(IDType.LOCAL)
         String id;
 
         @Predicate
@@ -48,7 +49,7 @@ public static class Iteration {
     @ClassMapping
     public static class Project {
 
-        @Id
+        @Id(IDType.LOCAL)
         public String id;
 
         @Predicate
diff --git a/rdfbean-core/src/test/java/com/mysema/rdfbean/domains/SimpleDomain.java b/rdfbean-core/src/test/java/com/mysema/rdfbean/domains/SimpleDomain.java
index e9e36a88..1bfb36dc 100644
--- a/rdfbean-core/src/test/java/com/mysema/rdfbean/domains/SimpleDomain.java
+++ b/rdfbean-core/src/test/java/com/mysema/rdfbean/domains/SimpleDomain.java
@@ -29,12 +29,13 @@
 import com.mysema.rdfbean.annotations.MapElements;
 import com.mysema.rdfbean.annotations.Path;
 import com.mysema.rdfbean.annotations.Predicate;
+import com.mysema.rdfbean.model.IDType;
 
 public interface SimpleDomain {
 
     @ClassMapping(ns = TEST.NS, ln = "TestType1")
     public class SimpleType {
-        @Id
+        @Id(IDType.LOCAL)
         public String id;
 
         @Predicate(ln = "directProperty1")
@@ -155,7 +156,7 @@ public void setDateProperty(Date dateProperty) {
     @ClassMapping(ns = TEST.NS, ln = "TestType2")
     public class SimpleType2 {
 
-        @Id
+        @Id(IDType.LOCAL)
         public String id;
 
         @Path({ @Predicate(ln = "testType"), @Predicate(ln = "directProperty") })
diff --git a/rdfbean-core/src/test/java/com/mysema/rdfbean/domains/UserDepartmentCompanyDomain.java b/rdfbean-core/src/test/java/com/mysema/rdfbean/domains/UserDepartmentCompanyDomain.java
index 5fd2e7a0..8092f4d9 100644
--- a/rdfbean-core/src/test/java/com/mysema/rdfbean/domains/UserDepartmentCompanyDomain.java
+++ b/rdfbean-core/src/test/java/com/mysema/rdfbean/domains/UserDepartmentCompanyDomain.java
@@ -8,13 +8,14 @@
 import com.mysema.rdfbean.annotations.ClassMapping;
 import com.mysema.rdfbean.annotations.Id;
 import com.mysema.rdfbean.annotations.Predicate;
+import com.mysema.rdfbean.model.IDType;
 
 public interface UserDepartmentCompanyDomain {
 
     @ClassMapping
     public static class User {
 
-        @Id
+        @Id(IDType.LOCAL)
         public String id;
 
         @Predicate
@@ -40,7 +41,7 @@ public String getUserName() {
     @ClassMapping
     public static class Department {
 
-        @Id
+        @Id(IDType.LOCAL)
         public String id;
 
         @Predicate
@@ -59,7 +60,7 @@ public Company getCompany() {
     @ClassMapping
     public static class Company {
 
-        @Id
+        @Id(IDType.LOCAL)
         public String id;
 
         public String getId() {
diff --git a/rdfbean-core/src/test/java/com/mysema/rdfbean/model/RDFUpdateTest.java b/rdfbean-core/src/test/java/com/mysema/rdfbean/model/RDFUpdateTest.java
index b29682df..725d49dc 100644
--- a/rdfbean-core/src/test/java/com/mysema/rdfbean/model/RDFUpdateTest.java
+++ b/rdfbean-core/src/test/java/com/mysema/rdfbean/model/RDFUpdateTest.java
@@ -11,7 +11,6 @@
 
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import com.mysema.rdfbean.AbstractConnectionTest;
diff --git a/rdfbean-core/src/test/java/com/mysema/rdfbean/object/ArrayTest.java b/rdfbean-core/src/test/java/com/mysema/rdfbean/object/ArrayTest.java
index 9f8ea6f4..2a85657d 100644
--- a/rdfbean-core/src/test/java/com/mysema/rdfbean/object/ArrayTest.java
+++ b/rdfbean-core/src/test/java/com/mysema/rdfbean/object/ArrayTest.java
@@ -8,13 +8,14 @@
 import com.mysema.rdfbean.annotations.ClassMapping;
 import com.mysema.rdfbean.annotations.Id;
 import com.mysema.rdfbean.annotations.Predicate;
+import com.mysema.rdfbean.model.IDType;
 import com.mysema.rdfbean.model.LID;
 import com.mysema.rdfbean.model.MiniRepository;
 
 @ClassMapping
 public class ArrayTest {
 
-    @Id
+    @Id(IDType.LOCAL)
     public String id;
 
     @Predicate
diff --git a/rdfbean-core/src/test/java/com/mysema/rdfbean/object/ContextTest.java b/rdfbean-core/src/test/java/com/mysema/rdfbean/object/ContextTest.java
index e7b38307..390fc372 100644
--- a/rdfbean-core/src/test/java/com/mysema/rdfbean/object/ContextTest.java
+++ b/rdfbean-core/src/test/java/com/mysema/rdfbean/object/ContextTest.java
@@ -13,6 +13,7 @@
 import com.mysema.rdfbean.annotations.ClassMapping;
 import com.mysema.rdfbean.annotations.Id;
 import com.mysema.rdfbean.annotations.Predicate;
+import com.mysema.rdfbean.model.IDType;
 import com.mysema.rdfbean.model.MiniRepository;
 import com.mysema.rdfbean.model.STMT;
 import com.mysema.rdfbean.model.UID;
@@ -22,7 +23,7 @@ public class ContextTest {
     @ClassMapping
     public static class Entity {
 
-        @Id
+        @Id(IDType.LOCAL)
         String id;
 
         @Predicate
diff --git a/rdfbean-core/src/test/java/com/mysema/rdfbean/object/DeleteTest.java b/rdfbean-core/src/test/java/com/mysema/rdfbean/object/DeleteTest.java
index 59d0b3ed..d5d74775 100644
--- a/rdfbean-core/src/test/java/com/mysema/rdfbean/object/DeleteTest.java
+++ b/rdfbean-core/src/test/java/com/mysema/rdfbean/object/DeleteTest.java
@@ -27,12 +27,13 @@
 import com.mysema.rdfbean.annotations.ContainerType;
 import com.mysema.rdfbean.annotations.Id;
 import com.mysema.rdfbean.annotations.Predicate;
+import com.mysema.rdfbean.model.IDType;
 import com.mysema.rdfbean.model.MiniRepository;
 
 @ClassMapping
 public class DeleteTest {
 
-    @Id
+    @Id(IDType.LOCAL)
     private String id;
 
     @Predicate
@@ -52,7 +53,7 @@ public class DeleteTest {
 
     @ClassMapping(ns = TEST.NS, ln = "DeleteTest")
     public static class DeleteDTO {
-        @Id
+        @Id(IDType.LOCAL)
         String id;
 
         public DeleteDTO() {
diff --git a/rdfbean-core/src/test/java/com/mysema/rdfbean/object/ListContainerTest.java b/rdfbean-core/src/test/java/com/mysema/rdfbean/object/ListContainerTest.java
index 4a455bd1..9fc2bd9f 100644
--- a/rdfbean-core/src/test/java/com/mysema/rdfbean/object/ListContainerTest.java
+++ b/rdfbean-core/src/test/java/com/mysema/rdfbean/object/ListContainerTest.java
@@ -10,13 +10,14 @@
 import com.mysema.rdfbean.annotations.ClassMapping;
 import com.mysema.rdfbean.annotations.Id;
 import com.mysema.rdfbean.annotations.Predicate;
+import com.mysema.rdfbean.model.IDType;
 
 public class ListContainerTest {
 
     @ClassMapping
     public static class Example {
 
-        @Id
+        @Id(IDType.LOCAL)
         public String id;
 
         @Predicate
@@ -27,7 +28,7 @@ public static class Example {
     @ClassMapping
     public static class ChildContainer {
 
-        @Id
+        @Id(IDType.LOCAL)
         public String id;
 
         @Predicate
@@ -38,7 +39,7 @@ public static class ChildContainer {
     @ClassMapping
     public static class Child {
 
-        @Id
+        @Id(IDType.LOCAL)
         public String id;
 
     }
diff --git a/rdfbean-core/src/test/java/com/mysema/rdfbean/object/MixinIdTest.java b/rdfbean-core/src/test/java/com/mysema/rdfbean/object/MixinIdTest.java
index 53108acf..54310596 100644
--- a/rdfbean-core/src/test/java/com/mysema/rdfbean/object/MixinIdTest.java
+++ b/rdfbean-core/src/test/java/com/mysema/rdfbean/object/MixinIdTest.java
@@ -9,6 +9,7 @@
 import com.mysema.rdfbean.annotations.ClassMapping;
 import com.mysema.rdfbean.annotations.Id;
 import com.mysema.rdfbean.annotations.Mixin;
+import com.mysema.rdfbean.model.IDType;
 
 public class MixinIdTest {
 
@@ -16,13 +17,13 @@ public class MixinIdTest {
     public static final class AType {
         @Mixin
         BType asBType = new BType();
-        @Id
+        @Id(IDType.LOCAL)
         String id;
     }
 
     @ClassMapping
     public static final class BType {
-        @Id
+        @Id(IDType.LOCAL)
         String id;
     }
 
diff --git a/rdfbean-core/src/test/java/com/mysema/rdfbean/object/MixinTest.java b/rdfbean-core/src/test/java/com/mysema/rdfbean/object/MixinTest.java
index 2895a839..3692fdf2 100644
--- a/rdfbean-core/src/test/java/com/mysema/rdfbean/object/MixinTest.java
+++ b/rdfbean-core/src/test/java/com/mysema/rdfbean/object/MixinTest.java
@@ -14,6 +14,7 @@
 import com.mysema.rdfbean.annotations.ClassMapping;
 import com.mysema.rdfbean.annotations.Id;
 import com.mysema.rdfbean.annotations.Mixin;
+import com.mysema.rdfbean.model.IDType;
 import com.mysema.rdfbean.model.LID;
 
 public class MixinTest {
@@ -22,7 +23,7 @@ public class MixinTest {
     public static final class AType {
         @Mixin
         BType asBType;
-        @Id
+        @Id(IDType.LOCAL)
         LID id;
     }
 
@@ -30,7 +31,7 @@ public static final class AType {
     public static final class BType {
         @Mixin
         AType asAType;
-        @Id
+        @Id(IDType.LOCAL)
         LID id;
     }
 
diff --git a/rdfbean-core/src/test/java/com/mysema/rdfbean/object/SessionListTest.java b/rdfbean-core/src/test/java/com/mysema/rdfbean/object/SessionListTest.java
index 67c7c633..7fa7ffa8 100644
--- a/rdfbean-core/src/test/java/com/mysema/rdfbean/object/SessionListTest.java
+++ b/rdfbean-core/src/test/java/com/mysema/rdfbean/object/SessionListTest.java
@@ -10,13 +10,14 @@
 import com.mysema.query.alias.Alias;
 import com.mysema.rdfbean.annotations.ClassMapping;
 import com.mysema.rdfbean.annotations.Id;
+import com.mysema.rdfbean.model.IDType;
 
 public class SessionListTest {
 
     @ClassMapping
     public static class Example {
 
-        @Id
+        @Id(IDType.LOCAL)
         public String id;
     }
 
diff --git a/rdfbean-demo/src/main/java/com/mysema/rdf/demo/domain/Party.java b/rdfbean-demo/src/main/java/com/mysema/rdf/demo/domain/Party.java
index d9837700..1ef220b9 100644
--- a/rdfbean-demo/src/main/java/com/mysema/rdf/demo/domain/Party.java
+++ b/rdfbean-demo/src/main/java/com/mysema/rdf/demo/domain/Party.java
@@ -4,11 +4,12 @@
 import com.mysema.rdfbean.annotations.ClassMapping;
 import com.mysema.rdfbean.annotations.Id;
 import com.mysema.rdfbean.annotations.Predicate;
+import com.mysema.rdfbean.model.IDType;
 
 @ClassMapping(ns = DEMO.NS)
 public abstract class Party {
 
-    @Id
+    @Id(IDType.LOCAL)
     private String id;
 
     public String getId() {
diff --git a/rdfbean-spring/src/test/java/com/mysema/rdfbean/domain/Party.java b/rdfbean-spring/src/test/java/com/mysema/rdfbean/domain/Party.java
index 6d7cec9d..82093620 100644
--- a/rdfbean-spring/src/test/java/com/mysema/rdfbean/domain/Party.java
+++ b/rdfbean-spring/src/test/java/com/mysema/rdfbean/domain/Party.java
@@ -3,11 +3,12 @@
 import com.mysema.rdfbean.annotations.ClassMapping;
 import com.mysema.rdfbean.annotations.Id;
 import com.mysema.rdfbean.annotations.Predicate;
+import com.mysema.rdfbean.model.IDType;
 
 @ClassMapping(ns = DEMO.NS)
 public abstract class Party {
 
-    @Id
+    @Id(IDType.LOCAL)
     private String id;
 
     public String getId() {