You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2019/12/05 20:13:21 UTC
[isis] 03/10: ISIS-2215: fixes compile issues
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2215
in repository https://gitbox.apache.org/repos/asf/isis.git
commit b4444cef3ae118b9af2adb72e6e24496db5c92f7
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Dec 5 17:18:44 2019 +0000
ISIS-2215: fixes compile issues
---
.../test/java/org/apache/isis/testdomain/rest/RestServiceTest.java | 2 +-
.../isis/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java | 3 ++-
.../demomodule/fixturescripts/FakeDataDemoObjectWithAll_create3.java | 2 +-
.../data/FakeDataDemoObjectWithAll_create_withFakeData.java | 2 +-
.../data/FakeDataDemoObjectWithAll_update_withFakeData.java | 2 +-
.../fakedata/dom/{ => services}/AbstractRandomValueGenerator.java | 2 +-
.../isis/extensions/fakedata/dom/{types => services}/Addresses.java | 5 +----
.../extensions/fakedata/dom/{types => services}/BigDecimals.java | 4 +---
.../extensions/fakedata/dom/{types => services}/BigIntegers.java | 4 +---
.../isis/extensions/fakedata/dom/{types => services}/Books.java | 5 +----
.../isis/extensions/fakedata/dom/{types => services}/Booleans.java | 5 +----
.../isis/extensions/fakedata/dom/{types => services}/Bytes.java | 4 +---
.../isis/extensions/fakedata/dom/{types => services}/Chars.java | 4 +---
.../extensions/fakedata/dom/{types => services}/Collections.java | 4 +---
.../isis/extensions/fakedata/dom/{types => services}/Comms.java | 5 +----
.../extensions/fakedata/dom/{types => services}/CreditCards.java | 4 +---
.../isis/extensions/fakedata/dom/{types => services}/Doubles.java | 4 +---
.../isis/extensions/fakedata/dom/{types => services}/Enums.java | 4 +---
.../isis/extensions/fakedata/dom/{ => services}/FakeDataService.java | 3 +--
.../isis/extensions/fakedata/dom/{types => services}/Floats.java | 4 +---
.../isis/extensions/fakedata/dom/{types => services}/Integers.java | 4 +---
.../isis/extensions/fakedata/dom/{types => services}/IsisBlobs.java | 4 +---
.../isis/extensions/fakedata/dom/{types => services}/IsisClobs.java | 4 +---
.../isis/extensions/fakedata/dom/{types => services}/IsisMoneys.java | 4 +---
.../extensions/fakedata/dom/{types => services}/IsisPasswords.java | 4 +---
.../extensions/fakedata/dom/{types => services}/J8DateTimes.java | 4 +---
.../extensions/fakedata/dom/{types => services}/J8LocalDates.java | 4 +---
.../isis/extensions/fakedata/dom/{types => services}/J8Periods.java | 4 +---
.../extensions/fakedata/dom/{types => services}/JavaSqlDates.java | 4 +---
.../fakedata/dom/{types => services}/JavaSqlTimestamps.java | 4 +---
.../extensions/fakedata/dom/{types => services}/JavaUtilDates.java | 4 +---
.../isis/extensions/fakedata/dom/{types => services}/Longs.java | 4 +---
.../isis/extensions/fakedata/dom/{types => services}/Lorem.java | 5 +----
.../isis/extensions/fakedata/dom/{types => services}/Names.java | 4 +---
.../isis/extensions/fakedata/dom/{types => services}/Shorts.java | 4 +---
.../isis/extensions/fakedata/dom/{types => services}/Strings.java | 4 +---
.../isis/extensions/fakedata/dom/{types => services}/Urls.java | 4 +---
.../isis/extensions/fakedata/dom/{types => services}/Uuids.java | 5 +----
.../extensions/fakedata/dom/{ => services}/FakeDataServiceTest.java | 4 +---
39 files changed, 40 insertions(+), 110 deletions(-)
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/rest/RestServiceTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/rest/RestServiceTest.java
index 4808357..1595fdb 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/rest/RestServiceTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/rest/RestServiceTest.java
@@ -46,7 +46,7 @@ import lombok.val;
webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
@Import({
Configuration_usingJdo.class,
- IsisBootViewerRestfulObjects.class
+ IsisModuleRestfulObjectsViewer.class
})
class RestServiceTest {
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java
index c6f4de3..c62e74a 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java
@@ -20,6 +20,7 @@ package org.apache.isis.testdomain.shiro;
import javax.inject.Inject;
+import org.apache.isis.viewer.restfulobjects.viewer.IsisModuleRestfulObjectsViewer;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
@@ -69,7 +70,7 @@ import lombok.val;
@Import({
// Restful server
- IsisBootViewerRestfulObjects.class,
+ IsisModuleRestfulObjectsViewer.class,
RestEndpointService.class,
// Embedded LDAP server for testing
diff --git a/extensions/lib/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/FakeDataDemoObjectWithAll_create3.java b/extensions/lib/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/FakeDataDemoObjectWithAll_create3.java
index 98a8aee..1018539 100644
--- a/extensions/lib/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/FakeDataDemoObjectWithAll_create3.java
+++ b/extensions/lib/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/FakeDataDemoObjectWithAll_create3.java
@@ -7,7 +7,7 @@ import com.google.common.collect.Lists;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
-import org.apache.isis.extensions.fakedata.dom.FakeDataService;
+import org.apache.isis.extensions.fakedata.dom.services.FakeDataService;
import org.isisaddons.module.fakedata.fixture.demoapp.demomodule.dom.FakeDataDemoObjectWithAll;
import org.isisaddons.module.fakedata.fixture.demoapp.demomodule.fixturescripts.data.FakeDataDemoObjectWithAll_create_withFakeData;
diff --git a/extensions/lib/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/data/FakeDataDemoObjectWithAll_create_withFakeData.java b/extensions/lib/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/data/FakeDataDemoObjectWithAll_create_withFakeData.java
index 581906d..3c49306 100644
--- a/extensions/lib/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/data/FakeDataDemoObjectWithAll_create_withFakeData.java
+++ b/extensions/lib/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/data/FakeDataDemoObjectWithAll_create_withFakeData.java
@@ -3,7 +3,7 @@ package org.isisaddons.module.fakedata.fixture.demoapp.demomodule.fixturescripts
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
-import org.apache.isis.extensions.fakedata.dom.FakeDataService;
+import org.apache.isis.extensions.fakedata.dom.services.FakeDataService;
import org.isisaddons.module.fakedata.fixture.demoapp.demomodule.dom.FakeDataDemoObjectWithAll;
import org.isisaddons.module.fakedata.fixture.demoapp.demomodule.dom.FakeDataDemoObjectWithAllMenu;
diff --git a/extensions/lib/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/data/FakeDataDemoObjectWithAll_update_withFakeData.java b/extensions/lib/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/data/FakeDataDemoObjectWithAll_update_withFakeData.java
index f2874f2..7fbcf6a 100644
--- a/extensions/lib/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/data/FakeDataDemoObjectWithAll_update_withFakeData.java
+++ b/extensions/lib/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/data/FakeDataDemoObjectWithAll_update_withFakeData.java
@@ -17,7 +17,7 @@ import org.apache.isis.applib.value.Clob;
import org.apache.isis.applib.value.Money;
import org.apache.isis.applib.value.Password;
-import org.apache.isis.extensions.fakedata.dom.FakeDataService;
+import org.apache.isis.extensions.fakedata.dom.services.FakeDataService;
import org.isisaddons.module.fakedata.fixture.demoapp.demomodule.dom.FakeDataDemoObjectWithAll;
import org.isisaddons.module.fakedata.fixture.demoapp.demomodule.dom.EnumOf3;
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/AbstractRandomValueGenerator.java b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/AbstractRandomValueGenerator.java
similarity index 75%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/AbstractRandomValueGenerator.java
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/AbstractRandomValueGenerator.java
index bbb598b..b24a460 100644
--- a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/AbstractRandomValueGenerator.java
+++ b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/AbstractRandomValueGenerator.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.fakedata.dom;
+package org.apache.isis.extensions.fakedata.dom.services;
abstract class AbstractRandomValueGenerator {
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/Addresses.java b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Addresses.java
similarity index 88%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/Addresses.java
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Addresses.java
index b0631ab..796c8d5 100644
--- a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/Addresses.java
+++ b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Addresses.java
@@ -1,7 +1,4 @@
-package org.apache.isis.extensions.fakedata.dom.types;
-
-import org.apache.isis.extensions.fakedata.dom.AbstractRandomValueGenerator;
-import org.apache.isis.extensions.fakedata.dom.FakeDataService;
+package org.apache.isis.extensions.fakedata.dom.services;
public class Addresses extends AbstractRandomValueGenerator {
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/BigDecimals.java b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/BigDecimals.java
similarity index 80%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/BigDecimals.java
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/BigDecimals.java
index a685fc7..cd6d4ac 100644
--- a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/BigDecimals.java
+++ b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/BigDecimals.java
@@ -1,9 +1,7 @@
-package org.apache.isis.extensions.fakedata.dom.types;
+package org.apache.isis.extensions.fakedata.dom.services;
import java.math.BigDecimal;
import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.extensions.fakedata.dom.AbstractRandomValueGenerator;
-import org.apache.isis.extensions.fakedata.dom.FakeDataService;
public class BigDecimals extends AbstractRandomValueGenerator {
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/BigIntegers.java b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/BigIntegers.java
similarity index 66%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/BigIntegers.java
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/BigIntegers.java
index 0c740f0..39fed23 100644
--- a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/BigIntegers.java
+++ b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/BigIntegers.java
@@ -1,9 +1,7 @@
-package org.apache.isis.extensions.fakedata.dom.types;
+package org.apache.isis.extensions.fakedata.dom.services;
import java.math.BigInteger;
import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.extensions.fakedata.dom.AbstractRandomValueGenerator;
-import org.apache.isis.extensions.fakedata.dom.FakeDataService;
public class BigIntegers extends AbstractRandomValueGenerator {
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/Books.java b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Books.java
similarity index 67%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/Books.java
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Books.java
index f12bd48..9157258 100644
--- a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/Books.java
+++ b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Books.java
@@ -1,7 +1,4 @@
-package org.apache.isis.extensions.fakedata.dom.types;
-
-import org.apache.isis.extensions.fakedata.dom.AbstractRandomValueGenerator;
-import org.apache.isis.extensions.fakedata.dom.FakeDataService;
+package org.apache.isis.extensions.fakedata.dom.services;
public class Books extends AbstractRandomValueGenerator {
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/Booleans.java b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Booleans.java
similarity index 73%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/Booleans.java
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Booleans.java
index 3913c5a..451062c 100644
--- a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/Booleans.java
+++ b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Booleans.java
@@ -1,7 +1,4 @@
-package org.apache.isis.extensions.fakedata.dom.types;
-
-import org.apache.isis.extensions.fakedata.dom.AbstractRandomValueGenerator;
-import org.apache.isis.extensions.fakedata.dom.FakeDataService;
+package org.apache.isis.extensions.fakedata.dom.services;
public class Booleans extends AbstractRandomValueGenerator {
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/Bytes.java b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Bytes.java
similarity index 73%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/Bytes.java
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Bytes.java
index 861965d..dfc1449 100644
--- a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/Bytes.java
+++ b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Bytes.java
@@ -1,8 +1,6 @@
-package org.apache.isis.extensions.fakedata.dom.types;
+package org.apache.isis.extensions.fakedata.dom.services;
import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.extensions.fakedata.dom.AbstractRandomValueGenerator;
-import org.apache.isis.extensions.fakedata.dom.FakeDataService;
public class Bytes extends AbstractRandomValueGenerator {
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/Chars.java b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Chars.java
similarity index 80%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/Chars.java
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Chars.java
index 4895df5..bf8fe95 100644
--- a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/Chars.java
+++ b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Chars.java
@@ -1,8 +1,6 @@
-package org.apache.isis.extensions.fakedata.dom.types;
+package org.apache.isis.extensions.fakedata.dom.services;
import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.extensions.fakedata.dom.AbstractRandomValueGenerator;
-import org.apache.isis.extensions.fakedata.dom.FakeDataService;
public class Chars extends AbstractRandomValueGenerator {
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/Collections.java b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Collections.java
similarity index 97%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/Collections.java
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Collections.java
index 07468ed..b279af1 100644
--- a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/Collections.java
+++ b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Collections.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.fakedata.dom.types;
+package org.apache.isis.extensions.fakedata.dom.services;
import java.util.Collection;
import java.util.List;
@@ -6,8 +6,6 @@ import java.util.concurrent.Callable;
import java.util.function.Predicate;
import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.extensions.fakedata.dom.AbstractRandomValueGenerator;
-import org.apache.isis.extensions.fakedata.dom.FakeDataService;
public class Collections extends AbstractRandomValueGenerator {
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/Comms.java b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Comms.java
similarity index 79%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/Comms.java
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Comms.java
index fb77280..6ff1a85 100644
--- a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/Comms.java
+++ b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Comms.java
@@ -1,7 +1,4 @@
-package org.apache.isis.extensions.fakedata.dom.types;
-
-import org.apache.isis.extensions.fakedata.dom.AbstractRandomValueGenerator;
-import org.apache.isis.extensions.fakedata.dom.FakeDataService;
+package org.apache.isis.extensions.fakedata.dom.services;
public class Comms extends AbstractRandomValueGenerator {
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/CreditCards.java b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/CreditCards.java
similarity index 78%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/CreditCards.java
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/CreditCards.java
index ed0a125..cdff8ec 100644
--- a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/CreditCards.java
+++ b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/CreditCards.java
@@ -1,9 +1,7 @@
-package org.apache.isis.extensions.fakedata.dom.types;
+package org.apache.isis.extensions.fakedata.dom.services;
import com.github.javafaker.service.FakeValuesService;
import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.extensions.fakedata.dom.AbstractRandomValueGenerator;
-import org.apache.isis.extensions.fakedata.dom.FakeDataService;
public class CreditCards extends AbstractRandomValueGenerator {
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/Doubles.java b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Doubles.java
similarity index 74%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/Doubles.java
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Doubles.java
index e4e57d1..27b85c2 100644
--- a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/Doubles.java
+++ b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Doubles.java
@@ -1,9 +1,7 @@
-package org.apache.isis.extensions.fakedata.dom.types;
+package org.apache.isis.extensions.fakedata.dom.services;
import org.apache.commons.lang3.RandomUtils;
import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.extensions.fakedata.dom.AbstractRandomValueGenerator;
-import org.apache.isis.extensions.fakedata.dom.FakeDataService;
public class Doubles extends AbstractRandomValueGenerator {
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/Enums.java b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Enums.java
similarity index 67%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/Enums.java
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Enums.java
index 7321b51..e56ffa2 100644
--- a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/Enums.java
+++ b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Enums.java
@@ -1,8 +1,6 @@
-package org.apache.isis.extensions.fakedata.dom.types;
+package org.apache.isis.extensions.fakedata.dom.services;
import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.extensions.fakedata.dom.AbstractRandomValueGenerator;
-import org.apache.isis.extensions.fakedata.dom.FakeDataService;
public class Enums extends AbstractRandomValueGenerator {
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/FakeDataService.java b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/FakeDataService.java
similarity index 98%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/FakeDataService.java
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/FakeDataService.java
index 4079bdb..161f997 100644
--- a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/FakeDataService.java
+++ b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/FakeDataService.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.fakedata.dom;
+package org.apache.isis.extensions.fakedata.dom.services;
import java.util.Locale;
import java.util.Random;
@@ -12,7 +12,6 @@ import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.services.clock.ClockService;
import org.apache.isis.applib.services.repository.RepositoryService;
-import org.apache.isis.extensions.fakedata.dom.types.*;
@DomainService(nature = NatureOfService.DOMAIN)
public class FakeDataService {
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/Floats.java b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Floats.java
similarity index 64%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/Floats.java
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Floats.java
index ff5890a..1409331 100644
--- a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/Floats.java
+++ b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Floats.java
@@ -1,9 +1,7 @@
-package org.apache.isis.extensions.fakedata.dom.types;
+package org.apache.isis.extensions.fakedata.dom.services;
import org.apache.commons.lang3.RandomUtils;
import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.extensions.fakedata.dom.AbstractRandomValueGenerator;
-import org.apache.isis.extensions.fakedata.dom.FakeDataService;
public class Floats extends AbstractRandomValueGenerator {
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/Integers.java b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Integers.java
similarity index 75%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/Integers.java
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Integers.java
index e5fd161..4baca00 100644
--- a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/Integers.java
+++ b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Integers.java
@@ -1,9 +1,7 @@
-package org.apache.isis.extensions.fakedata.dom.types;
+package org.apache.isis.extensions.fakedata.dom.services;
import org.apache.commons.lang3.RandomUtils;
import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.extensions.fakedata.dom.AbstractRandomValueGenerator;
-import org.apache.isis.extensions.fakedata.dom.FakeDataService;
public class Integers extends AbstractRandomValueGenerator {
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/IsisBlobs.java b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/IsisBlobs.java
similarity index 92%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/IsisBlobs.java
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/IsisBlobs.java
index e4a9eb0..d76698a 100644
--- a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/IsisBlobs.java
+++ b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/IsisBlobs.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.fakedata.dom.types;
+package org.apache.isis.extensions.fakedata.dom.services;
import java.io.IOException;
import java.net.URL;
@@ -8,8 +8,6 @@ import java.util.stream.Collectors;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.value.Blob;
-import org.apache.isis.extensions.fakedata.dom.AbstractRandomValueGenerator;
-import org.apache.isis.extensions.fakedata.dom.FakeDataService;
import com.google.common.io.ByteSource;
import com.google.common.io.Resources;
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/IsisClobs.java b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/IsisClobs.java
similarity index 93%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/IsisClobs.java
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/IsisClobs.java
index be52086..a97ab69 100644
--- a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/IsisClobs.java
+++ b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/IsisClobs.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.fakedata.dom.types;
+package org.apache.isis.extensions.fakedata.dom.services;
import java.io.IOException;
import java.net.URL;
@@ -11,8 +11,6 @@ import com.google.common.io.CharSource;
import com.google.common.io.Resources;
import org.apache.isis.applib.value.Clob;
-import org.apache.isis.extensions.fakedata.dom.AbstractRandomValueGenerator;
-import org.apache.isis.extensions.fakedata.dom.FakeDataService;
public class IsisClobs extends AbstractRandomValueGenerator {
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/IsisMoneys.java b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/IsisMoneys.java
similarity index 68%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/IsisMoneys.java
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/IsisMoneys.java
index c0406ad..b78ffee 100644
--- a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/IsisMoneys.java
+++ b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/IsisMoneys.java
@@ -1,9 +1,7 @@
-package org.apache.isis.extensions.fakedata.dom.types;
+package org.apache.isis.extensions.fakedata.dom.services;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.value.Money;
-import org.apache.isis.extensions.fakedata.dom.AbstractRandomValueGenerator;
-import org.apache.isis.extensions.fakedata.dom.FakeDataService;
public class IsisMoneys extends AbstractRandomValueGenerator {
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/IsisPasswords.java b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/IsisPasswords.java
similarity index 66%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/IsisPasswords.java
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/IsisPasswords.java
index c20bae1..0ead153 100644
--- a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/IsisPasswords.java
+++ b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/IsisPasswords.java
@@ -1,9 +1,7 @@
-package org.apache.isis.extensions.fakedata.dom.types;
+package org.apache.isis.extensions.fakedata.dom.services;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.value.Password;
-import org.apache.isis.extensions.fakedata.dom.AbstractRandomValueGenerator;
-import org.apache.isis.extensions.fakedata.dom.FakeDataService;
public class IsisPasswords extends AbstractRandomValueGenerator {
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/J8DateTimes.java b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/J8DateTimes.java
similarity index 84%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/J8DateTimes.java
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/J8DateTimes.java
index 5658d86..ee14b7d 100644
--- a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/J8DateTimes.java
+++ b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/J8DateTimes.java
@@ -1,11 +1,9 @@
-package org.apache.isis.extensions.fakedata.dom.types;
+package org.apache.isis.extensions.fakedata.dom.services;
import java.time.OffsetDateTime;
import java.time.Period;
import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.extensions.fakedata.dom.AbstractRandomValueGenerator;
-import org.apache.isis.extensions.fakedata.dom.FakeDataService;
public class J8DateTimes extends AbstractRandomValueGenerator {
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/J8LocalDates.java b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/J8LocalDates.java
similarity index 82%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/J8LocalDates.java
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/J8LocalDates.java
index d44e50a..e13c631 100644
--- a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/J8LocalDates.java
+++ b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/J8LocalDates.java
@@ -1,11 +1,9 @@
-package org.apache.isis.extensions.fakedata.dom.types;
+package org.apache.isis.extensions.fakedata.dom.services;
import java.time.LocalDate;
import java.time.Period;
import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.extensions.fakedata.dom.AbstractRandomValueGenerator;
-import org.apache.isis.extensions.fakedata.dom.FakeDataService;
public class J8LocalDates extends AbstractRandomValueGenerator {
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/J8Periods.java b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/J8Periods.java
similarity index 84%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/J8Periods.java
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/J8Periods.java
index ea6d980..01b36aa 100644
--- a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/J8Periods.java
+++ b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/J8Periods.java
@@ -1,10 +1,8 @@
-package org.apache.isis.extensions.fakedata.dom.types;
+package org.apache.isis.extensions.fakedata.dom.services;
import java.time.Period;
import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.extensions.fakedata.dom.AbstractRandomValueGenerator;
-import org.apache.isis.extensions.fakedata.dom.FakeDataService;
public class J8Periods extends AbstractRandomValueGenerator {
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/JavaSqlDates.java b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/JavaSqlDates.java
similarity index 76%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/JavaSqlDates.java
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/JavaSqlDates.java
index 86a032b..45d68d5 100644
--- a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/JavaSqlDates.java
+++ b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/JavaSqlDates.java
@@ -1,11 +1,9 @@
-package org.apache.isis.extensions.fakedata.dom.types;
+package org.apache.isis.extensions.fakedata.dom.services;
import java.sql.Date;
import java.time.OffsetDateTime;
import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.extensions.fakedata.dom.AbstractRandomValueGenerator;
-import org.apache.isis.extensions.fakedata.dom.FakeDataService;
public class JavaSqlDates extends AbstractRandomValueGenerator {
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/JavaSqlTimestamps.java b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/JavaSqlTimestamps.java
similarity index 69%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/JavaSqlTimestamps.java
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/JavaSqlTimestamps.java
index 12937ed..31e284a 100644
--- a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/JavaSqlTimestamps.java
+++ b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/JavaSqlTimestamps.java
@@ -1,10 +1,8 @@
-package org.apache.isis.extensions.fakedata.dom.types;
+package org.apache.isis.extensions.fakedata.dom.services;
import java.sql.Timestamp;
import java.util.Date;
import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.extensions.fakedata.dom.AbstractRandomValueGenerator;
-import org.apache.isis.extensions.fakedata.dom.FakeDataService;
public class JavaSqlTimestamps extends AbstractRandomValueGenerator {
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/JavaUtilDates.java b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/JavaUtilDates.java
similarity index 72%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/JavaUtilDates.java
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/JavaUtilDates.java
index bbbe391..5f38063 100644
--- a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/JavaUtilDates.java
+++ b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/JavaUtilDates.java
@@ -1,10 +1,8 @@
-package org.apache.isis.extensions.fakedata.dom.types;
+package org.apache.isis.extensions.fakedata.dom.services;
import java.time.OffsetDateTime;
import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.extensions.fakedata.dom.AbstractRandomValueGenerator;
-import org.apache.isis.extensions.fakedata.dom.FakeDataService;
import lombok.val;
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/Longs.java b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Longs.java
similarity index 63%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/Longs.java
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Longs.java
index 6524976..a486ba3 100644
--- a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/Longs.java
+++ b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Longs.java
@@ -1,9 +1,7 @@
-package org.apache.isis.extensions.fakedata.dom.types;
+package org.apache.isis.extensions.fakedata.dom.services;
import org.apache.commons.lang3.RandomUtils;
import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.extensions.fakedata.dom.AbstractRandomValueGenerator;
-import org.apache.isis.extensions.fakedata.dom.FakeDataService;
public class Longs extends AbstractRandomValueGenerator {
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/Lorem.java b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Lorem.java
similarity index 82%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/Lorem.java
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Lorem.java
index 2e6d7d1..bca205b 100644
--- a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/Lorem.java
+++ b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Lorem.java
@@ -1,10 +1,7 @@
-package org.apache.isis.extensions.fakedata.dom.types;
+package org.apache.isis.extensions.fakedata.dom.services;
import java.util.List;
-import org.apache.isis.extensions.fakedata.dom.AbstractRandomValueGenerator;
-import org.apache.isis.extensions.fakedata.dom.FakeDataService;
-
public class Lorem extends AbstractRandomValueGenerator {
com.github.javafaker.Lorem javaFakerLorem;
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/Names.java b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Names.java
similarity index 80%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/Names.java
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Names.java
index ffb2575..1501301 100644
--- a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/Names.java
+++ b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Names.java
@@ -1,8 +1,6 @@
-package org.apache.isis.extensions.fakedata.dom.types;
+package org.apache.isis.extensions.fakedata.dom.services;
import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.extensions.fakedata.dom.AbstractRandomValueGenerator;
-import org.apache.isis.extensions.fakedata.dom.FakeDataService;
public class Names extends AbstractRandomValueGenerator {
com.github.javafaker.Name javaFakerName;
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/Shorts.java b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Shorts.java
similarity index 74%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/Shorts.java
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Shorts.java
index 2bf2627..6492214 100644
--- a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/Shorts.java
+++ b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Shorts.java
@@ -1,8 +1,6 @@
-package org.apache.isis.extensions.fakedata.dom.types;
+package org.apache.isis.extensions.fakedata.dom.services;
import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.extensions.fakedata.dom.AbstractRandomValueGenerator;
-import org.apache.isis.extensions.fakedata.dom.FakeDataService;
public class Shorts extends AbstractRandomValueGenerator {
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/Strings.java b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Strings.java
similarity index 81%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/Strings.java
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Strings.java
index f0daa2c..33cdfab 100644
--- a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/Strings.java
+++ b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Strings.java
@@ -1,8 +1,6 @@
-package org.apache.isis.extensions.fakedata.dom.types;
+package org.apache.isis.extensions.fakedata.dom.services;
import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.extensions.fakedata.dom.AbstractRandomValueGenerator;
-import org.apache.isis.extensions.fakedata.dom.FakeDataService;
public class Strings extends AbstractRandomValueGenerator {
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/Urls.java b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Urls.java
similarity index 77%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/Urls.java
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Urls.java
index 8fc70df..2a6267d 100644
--- a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/Urls.java
+++ b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Urls.java
@@ -1,10 +1,8 @@
-package org.apache.isis.extensions.fakedata.dom.types;
+package org.apache.isis.extensions.fakedata.dom.services;
import java.net.MalformedURLException;
import java.net.URL;
import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.extensions.fakedata.dom.AbstractRandomValueGenerator;
-import org.apache.isis.extensions.fakedata.dom.FakeDataService;
public class Urls extends AbstractRandomValueGenerator {
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/Uuids.java b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Uuids.java
similarity index 55%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/Uuids.java
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Uuids.java
index a578311..78f5a21 100644
--- a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/types/Uuids.java
+++ b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Uuids.java
@@ -1,10 +1,7 @@
-package org.apache.isis.extensions.fakedata.dom.types;
+package org.apache.isis.extensions.fakedata.dom.services;
import java.util.UUID;
-import org.apache.isis.extensions.fakedata.dom.AbstractRandomValueGenerator;
-import org.apache.isis.extensions.fakedata.dom.FakeDataService;
-
public class Uuids extends AbstractRandomValueGenerator {
public Uuids(final FakeDataService fakeDataService) {
diff --git a/extensions/lib/fakedata/impl/src/test/java/org/apache/isis/extensions/fakedata/dom/FakeDataServiceTest.java b/extensions/lib/fakedata/impl/src/test/java/org/apache/isis/extensions/fakedata/dom/services/FakeDataServiceTest.java
similarity index 98%
rename from extensions/lib/fakedata/impl/src/test/java/org/apache/isis/extensions/fakedata/dom/FakeDataServiceTest.java
rename to extensions/lib/fakedata/impl/src/test/java/org/apache/isis/extensions/fakedata/dom/services/FakeDataServiceTest.java
index 46d32af..28ffe88 100644
--- a/extensions/lib/fakedata/impl/src/test/java/org/apache/isis/extensions/fakedata/dom/FakeDataServiceTest.java
+++ b/extensions/lib/fakedata/impl/src/test/java/org/apache/isis/extensions/fakedata/dom/services/FakeDataServiceTest.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.fakedata.dom;
+package org.apache.isis.extensions.fakedata.dom.services;
import java.net.URL;
import java.sql.Timestamp;
@@ -14,8 +14,6 @@ import java.util.UUID;
import java.util.function.Predicate;
import org.apache.isis.applib.services.repository.RepositoryService;
-import org.apache.isis.extensions.fakedata.dom.types.IsisBlobs;
-import org.apache.isis.extensions.fakedata.dom.types.IsisClobs;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import org.jmock.Expectations;
import org.jmock.auto.Mock;