You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@polygene.apache.org by ni...@apache.org on 2016/10/24 00:25:51 UTC
[1/2] zest-java git commit: ZEST-189 - Removing the
org.apache.zest.spi.uuid.UuidIdentityGeneratorService in Core SPI,
as it is no longer needed.
Repository: zest-java
Updated Branches:
refs/heads/develop 103c59cbe -> acfef9239
ZEST-189 - Removing the org.apache.zest.spi.uuid.UuidIdentityGeneratorService in Core SPI, as it is no longer needed.
Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/4e44de11
Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/4e44de11
Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/4e44de11
Branch: refs/heads/develop
Commit: 4e44de11121e9c0a98d7589bce297e4fdd94c173
Parents: 103c59c
Author: Niclas Hedhman <ni...@hedhman.org>
Authored: Mon Oct 24 08:22:42 2016 +0800
Committer: Niclas Hedhman <ni...@hedhman.org>
Committed: Mon Oct 24 08:22:42 2016 +0800
----------------------------------------------------------------------
.../apache/zest/api/identity/Identifiable.java | 19 ++++++++
.../org/apache/zest/api/identity/Identity.java | 19 ++++++++
.../zest/api/identity/StringIdentity.java | 19 ++++++++
.../zest/api/identity/UuidGeneratorMixin.java | 19 ++++++++
.../association/AssociationAssignmentTest.java | 7 +--
.../runtime/value/AssociationToValueTest.java | 2 -
.../value/ValueSerializationRegressionTest.java | 2 -
.../runtime/value/ValueWithAssociationTest.java | 2 -
.../visibility/VisibilityInUnitOfWorkTest.java | 2 -
.../memory/MemoryEntityStoreTest.java | 2 -
.../spi/uuid/UuidIdentityGeneratorMixin.java | 46 --------------------
.../spi/uuid/UuidIdentityGeneratorService.java | 34 ---------------
.../java/org/apache/zest/spi/uuid/package.html | 24 ----------
.../apache/zest/test/EntityTestAssembler.java | 4 +-
...bstractConfigurationDeserializationTest.java | 2 -
.../test/entity/AbstractEntityStoreTest.java | 2 -
.../layered/assembly/AccountModule.java | 2 -
.../indexing/layered/assembly/FamilyModule.java | 2 -
.../AbstractPlainValueSerializationTest.java | 2 -
.../file/assembly/FileEntityStoreAssembler.java | 4 +-
.../assembly/GeodeEntityStoreAssembler.java | 4 +-
.../assembly/HazelcastEntityStoreAssembler.java | 4 +-
.../assembly/JCloudsEntityStoreAssembler.java | 4 +-
.../jdbm/assembly/JdbmEntityStoreAssembler.java | 6 +--
.../assembly/LevelDBEntityStoreAssembler.java | 4 +-
.../assembly/MemoryEntityStoreAssembler.java | 4 +-
.../assembly/MongoDBEntityStoreAssembler.java | 4 +-
.../PreferenceEntityStoreAssembler.java | 4 +-
.../assembly/RedisEntityStoreAssembler.java | 4 +-
.../riak/assembly/RiakEntityStoreAssembler.java | 5 +--
.../AbstractSQLEntityStoreAssembler.java | 8 +---
.../zest/library/logging/DebuggingTest.java | 2 -
.../zest/library/logging/TracingTest.java | 2 -
.../library/rest/admin/DomainAssembler.java | 2 -
.../restlet/assembly/CrudServiceAssembler.java | 2 -
.../configuration/ConfigurationModule.java | 2 -
.../infrastructue/SerializationModule.java | 2 -
.../restlet/identity/IdentityManager.java | 4 +-
.../rental/web/assembly/StorageModule.java | 2 -
.../persistence/PersistenceConfigAssembler.java | 6 +--
.../persistence/PersistenceAssembler.java | 2 -
.../app/templates/ConfigModule/bootstrap.tmpl | 2 -
.../JacksonSerializationModule/bootstrap.tmpl | 2 -
.../project/common/ConfigModuleWriter.java | 2 -
.../common/SerializationModuleWriter.java | 2 -
45 files changed, 96 insertions(+), 204 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zest-java/blob/4e44de11/core/api/src/main/java/org/apache/zest/api/identity/Identifiable.java
----------------------------------------------------------------------
diff --git a/core/api/src/main/java/org/apache/zest/api/identity/Identifiable.java b/core/api/src/main/java/org/apache/zest/api/identity/Identifiable.java
index 23c733e..f111570 100644
--- a/core/api/src/main/java/org/apache/zest/api/identity/Identifiable.java
+++ b/core/api/src/main/java/org/apache/zest/api/identity/Identifiable.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.apache.zest.api.identity;
public interface Identifiable
http://git-wip-us.apache.org/repos/asf/zest-java/blob/4e44de11/core/api/src/main/java/org/apache/zest/api/identity/Identity.java
----------------------------------------------------------------------
diff --git a/core/api/src/main/java/org/apache/zest/api/identity/Identity.java b/core/api/src/main/java/org/apache/zest/api/identity/Identity.java
index a0a15b3..6cf549e 100644
--- a/core/api/src/main/java/org/apache/zest/api/identity/Identity.java
+++ b/core/api/src/main/java/org/apache/zest/api/identity/Identity.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.apache.zest.api.identity;
/**
http://git-wip-us.apache.org/repos/asf/zest-java/blob/4e44de11/core/api/src/main/java/org/apache/zest/api/identity/StringIdentity.java
----------------------------------------------------------------------
diff --git a/core/api/src/main/java/org/apache/zest/api/identity/StringIdentity.java b/core/api/src/main/java/org/apache/zest/api/identity/StringIdentity.java
index d7acb09..a3e5002 100644
--- a/core/api/src/main/java/org/apache/zest/api/identity/StringIdentity.java
+++ b/core/api/src/main/java/org/apache/zest/api/identity/StringIdentity.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.apache.zest.api.identity;
import java.nio.charset.StandardCharsets;
http://git-wip-us.apache.org/repos/asf/zest-java/blob/4e44de11/core/api/src/main/java/org/apache/zest/api/identity/UuidGeneratorMixin.java
----------------------------------------------------------------------
diff --git a/core/api/src/main/java/org/apache/zest/api/identity/UuidGeneratorMixin.java b/core/api/src/main/java/org/apache/zest/api/identity/UuidGeneratorMixin.java
index 854fe95..5caddc0 100644
--- a/core/api/src/main/java/org/apache/zest/api/identity/UuidGeneratorMixin.java
+++ b/core/api/src/main/java/org/apache/zest/api/identity/UuidGeneratorMixin.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.apache.zest.api.identity;
import java.util.UUID;
http://git-wip-us.apache.org/repos/asf/zest-java/blob/4e44de11/core/runtime/src/test/java/org/apache/zest/runtime/association/AssociationAssignmentTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/association/AssociationAssignmentTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/association/AssociationAssignmentTest.java
index 3ba2097..b46c3bf 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/association/AssociationAssignmentTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/association/AssociationAssignmentTest.java
@@ -24,13 +24,11 @@ import org.apache.zest.api.association.Association;
import org.apache.zest.api.entity.EntityBuilder;
import org.apache.zest.api.entity.EntityComposite;
import org.apache.zest.api.identity.Identity;
-import org.apache.zest.api.identity.StringIdentity;
import org.apache.zest.api.unitofwork.UnitOfWork;
import org.apache.zest.api.value.ValueSerialization;
import org.apache.zest.bootstrap.AssemblyException;
import org.apache.zest.bootstrap.ModuleAssembly;
import org.apache.zest.entitystore.memory.MemoryEntityStoreService;
-import org.apache.zest.spi.uuid.UuidIdentityGeneratorService;
import org.apache.zest.test.AbstractZestTest;
import org.apache.zest.valueserialization.orgjson.OrgJsonValueSerializationService;
import org.junit.Test;
@@ -47,7 +45,6 @@ public class AssociationAssignmentTest extends AbstractZestTest
throws AssemblyException
{
module.services( MemoryEntityStoreService.class );
- module.services( UuidIdentityGeneratorService.class );
module.services( OrgJsonValueSerializationService.class )
.taggedWith( ValueSerialization.Formats.JSON );
module.entities( TheAssociatedType.class );
@@ -76,11 +73,11 @@ public class AssociationAssignmentTest extends AbstractZestTest
work.discard();
}
- public interface TheAssociatedType extends EntityComposite
+ interface TheAssociatedType extends EntityComposite
{
}
- public interface TheMainType extends EntityComposite
+ interface TheMainType extends EntityComposite
{
Association<TheAssociatedType> assoc();
}
http://git-wip-us.apache.org/repos/asf/zest-java/blob/4e44de11/core/runtime/src/test/java/org/apache/zest/runtime/value/AssociationToValueTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/value/AssociationToValueTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/value/AssociationToValueTest.java
index 8be089f..47854aa 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/value/AssociationToValueTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/value/AssociationToValueTest.java
@@ -39,7 +39,6 @@ import org.apache.zest.api.value.ValueSerialization;
import org.apache.zest.bootstrap.AssemblyException;
import org.apache.zest.bootstrap.ModuleAssembly;
import org.apache.zest.entitystore.memory.MemoryEntityStoreService;
-import org.apache.zest.spi.uuid.UuidIdentityGeneratorService;
import org.apache.zest.test.AbstractZestTest;
import org.apache.zest.valueserialization.orgjson.OrgJsonValueSerializationService;
import org.junit.Test;
@@ -104,7 +103,6 @@ public class AssociationToValueTest extends AbstractZestTest
module.values( Person.class );
module.services( PersonRepository.class ).withConcerns( UnitOfWorkConcern.class );
module.services( OrgJsonValueSerializationService.class ).taggedWith( ValueSerialization.Formats.JSON );
- module.services( UuidIdentityGeneratorService.class );
module.services( MemoryEntityStoreService.class );
module.services( Runnable.class )
http://git-wip-us.apache.org/repos/asf/zest-java/blob/4e44de11/core/runtime/src/test/java/org/apache/zest/runtime/value/ValueSerializationRegressionTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/value/ValueSerializationRegressionTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/value/ValueSerializationRegressionTest.java
index d581d5e..fbc59da 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/value/ValueSerializationRegressionTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/value/ValueSerializationRegressionTest.java
@@ -32,7 +32,6 @@ import org.apache.zest.api.value.ValueSerialization;
import org.apache.zest.bootstrap.AssemblyException;
import org.apache.zest.bootstrap.ModuleAssembly;
import org.apache.zest.entitystore.memory.MemoryEntityStoreService;
-import org.apache.zest.spi.uuid.UuidIdentityGeneratorService;
import org.apache.zest.test.AbstractZestTest;
import org.apache.zest.valueserialization.orgjson.OrgJsonValueSerializationService;
@@ -46,7 +45,6 @@ public class ValueSerializationRegressionTest extends AbstractZestTest
module.entities( DualFaced.class );
module.values( DualFaced.class );
module.services( MemoryEntityStoreService.class );
- module.services( UuidIdentityGeneratorService.class );
module.services( OrgJsonValueSerializationService.class ).taggedWith( ValueSerialization.Formats.JSON );
}
http://git-wip-us.apache.org/repos/asf/zest-java/blob/4e44de11/core/runtime/src/test/java/org/apache/zest/runtime/value/ValueWithAssociationTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/value/ValueWithAssociationTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/value/ValueWithAssociationTest.java
index 40ccef6..00de555 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/value/ValueWithAssociationTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/value/ValueWithAssociationTest.java
@@ -39,7 +39,6 @@ import org.apache.zest.api.value.ValueSerialization;
import org.apache.zest.bootstrap.AssemblyException;
import org.apache.zest.bootstrap.ModuleAssembly;
import org.apache.zest.entitystore.memory.MemoryEntityStoreService;
-import org.apache.zest.spi.uuid.UuidIdentityGeneratorService;
import org.apache.zest.test.AbstractZestTest;
import org.apache.zest.valueserialization.orgjson.OrgJsonValueSerializationService;
@@ -57,7 +56,6 @@ public class ValueWithAssociationTest extends AbstractZestTest
module.values( SimpleName.class );
module.values( DualFaced.class );
module.services( MemoryEntityStoreService.class );
- module.services( UuidIdentityGeneratorService.class );
module.services( OrgJsonValueSerializationService.class ).taggedWith( ValueSerialization.Formats.JSON );
}
http://git-wip-us.apache.org/repos/asf/zest-java/blob/4e44de11/core/runtime/src/test/java/org/apache/zest/runtime/visibility/VisibilityInUnitOfWorkTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/visibility/VisibilityInUnitOfWorkTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/visibility/VisibilityInUnitOfWorkTest.java
index 3c574bd..5058f0a 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/visibility/VisibilityInUnitOfWorkTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/visibility/VisibilityInUnitOfWorkTest.java
@@ -38,7 +38,6 @@ import org.apache.zest.bootstrap.LayerAssembly;
import org.apache.zest.bootstrap.ModuleAssembly;
import org.apache.zest.bootstrap.unitofwork.DefaultUnitOfWorkAssembler;
import org.apache.zest.entitystore.memory.MemoryEntityStoreService;
-import org.apache.zest.spi.uuid.UuidIdentityGeneratorService;
import org.apache.zest.valueserialization.orgjson.OrgJsonValueSerializationService;
import org.junit.Test;
@@ -156,7 +155,6 @@ public class VisibilityInUnitOfWorkTest
yourModule.services( YourService.class ).visibleIn( Visibility.layer );
new DefaultUnitOfWorkAssembler().assemble( yourModule );
infraModule.services( MemoryEntityStoreService.class ).visibleIn( Visibility.layer );
- infraModule.services( UuidIdentityGeneratorService.class ).visibleIn( Visibility.layer );
infraModule.services( OrgJsonValueSerializationService.class )
.visibleIn( Visibility.layer )
.taggedWith( ValueSerialization.Formats.JSON );
http://git-wip-us.apache.org/repos/asf/zest-java/blob/4e44de11/core/runtime/src/test/java/org/apache/zest/test/performance/entitystore/memory/MemoryEntityStoreTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/test/performance/entitystore/memory/MemoryEntityStoreTest.java b/core/runtime/src/test/java/org/apache/zest/test/performance/entitystore/memory/MemoryEntityStoreTest.java
index 51cd822..dcef40b 100644
--- a/core/runtime/src/test/java/org/apache/zest/test/performance/entitystore/memory/MemoryEntityStoreTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/test/performance/entitystore/memory/MemoryEntityStoreTest.java
@@ -26,7 +26,6 @@ import org.apache.zest.bootstrap.ModuleAssembly;
import org.apache.zest.entitystore.memory.MemoryEntityStoreService;
import org.apache.zest.spi.entity.EntityState;
import org.apache.zest.spi.entitystore.StateChangeListener;
-import org.apache.zest.spi.uuid.UuidIdentityGeneratorService;
import org.apache.zest.test.entity.AbstractEntityStoreTest;
import org.apache.zest.valueserialization.orgjson.OrgJsonValueSerializationService;
@@ -44,7 +43,6 @@ public class MemoryEntityStoreTest
{
super.assemble( module );
- module.services( MemoryEntityStoreService.class, UuidIdentityGeneratorService.class );
module.services( OrgJsonValueSerializationService.class ).taggedWith( ValueSerialization.Formats.JSON );
module.importedServices( StatePrinter.class ).importedBy( NEW_OBJECT );
module.objects( StatePrinter.class );
http://git-wip-us.apache.org/repos/asf/zest-java/blob/4e44de11/core/spi/src/main/java/org/apache/zest/spi/uuid/UuidIdentityGeneratorMixin.java
----------------------------------------------------------------------
diff --git a/core/spi/src/main/java/org/apache/zest/spi/uuid/UuidIdentityGeneratorMixin.java b/core/spi/src/main/java/org/apache/zest/spi/uuid/UuidIdentityGeneratorMixin.java
deleted file mode 100644
index de7252b..0000000
--- a/core/spi/src/main/java/org/apache/zest/spi/uuid/UuidIdentityGeneratorMixin.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.apache.zest.spi.uuid;
-
-import java.util.UUID;
-import org.apache.zest.api.identity.Identity;
-import org.apache.zest.api.identity.IdentityGenerator;
-import org.apache.zest.api.identity.StringIdentity;
-
-/**
- * UUID based Identity generator mixin.
- */
-public class UuidIdentityGeneratorMixin
- implements IdentityGenerator
-{
- protected String uuid;
- private int count;
-
- public UuidIdentityGeneratorMixin()
- {
- uuid = UUID.randomUUID().toString() + "-";
- }
-
- @Override
- public Identity generate(Class<?> compositeType )
- {
- return new StringIdentity(uuid + Integer.toHexString( count++ ));
- }
-}
http://git-wip-us.apache.org/repos/asf/zest-java/blob/4e44de11/core/spi/src/main/java/org/apache/zest/spi/uuid/UuidIdentityGeneratorService.java
----------------------------------------------------------------------
diff --git a/core/spi/src/main/java/org/apache/zest/spi/uuid/UuidIdentityGeneratorService.java b/core/spi/src/main/java/org/apache/zest/spi/uuid/UuidIdentityGeneratorService.java
deleted file mode 100644
index 08a4c7d..0000000
--- a/core/spi/src/main/java/org/apache/zest/spi/uuid/UuidIdentityGeneratorService.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.apache.zest.spi.uuid;
-
-import org.apache.zest.api.identity.IdentityGenerator;
-import org.apache.zest.api.mixin.Mixins;
-import org.apache.zest.api.service.ServiceComposite;
-
-/**
- * UUID based Identity generator Service.
- */
-@Mixins( UuidIdentityGeneratorMixin.class )
-public interface UuidIdentityGeneratorService
- extends IdentityGenerator, ServiceComposite
-{
-}
http://git-wip-us.apache.org/repos/asf/zest-java/blob/4e44de11/core/spi/src/main/java/org/apache/zest/spi/uuid/package.html
----------------------------------------------------------------------
diff --git a/core/spi/src/main/java/org/apache/zest/spi/uuid/package.html b/core/spi/src/main/java/org/apache/zest/spi/uuid/package.html
deleted file mode 100644
index 10cd7b2..0000000
--- a/core/spi/src/main/java/org/apache/zest/spi/uuid/package.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you 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.
- ~
- ~
- -->
-<html>
- <body>
- <h2>UUID Identity SPI.</h2>
- </body>
-</html>
http://git-wip-us.apache.org/repos/asf/zest-java/blob/4e44de11/core/testsupport/src/main/java/org/apache/zest/test/EntityTestAssembler.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/zest/test/EntityTestAssembler.java b/core/testsupport/src/main/java/org/apache/zest/test/EntityTestAssembler.java
index bd84719..9817871 100644
--- a/core/testsupport/src/main/java/org/apache/zest/test/EntityTestAssembler.java
+++ b/core/testsupport/src/main/java/org/apache/zest/test/EntityTestAssembler.java
@@ -25,7 +25,6 @@ import org.apache.zest.bootstrap.AssemblyException;
import org.apache.zest.bootstrap.ModuleAssembly;
import org.apache.zest.bootstrap.ServiceDeclaration;
import org.apache.zest.entitystore.memory.MemoryEntityStoreService;
-import org.apache.zest.spi.uuid.UuidIdentityGeneratorService;
import org.apache.zest.valueserialization.orgjson.OrgJsonValueSerializationService;
/**
@@ -41,9 +40,8 @@ public class EntityTestAssembler
ServiceDeclaration service = module.services( MemoryEntityStoreService.class ).visibleIn( visibility() );
if( hasIdentity() )
{
- service.identifiedBy( identity().toString() );
+ service.identifiedBy( identity() );
}
- module.services( UuidIdentityGeneratorService.class ).visibleIn( visibility() );
module.services( OrgJsonValueSerializationService.class ).taggedWith( ValueSerialization.Formats.JSON );
}
}
http://git-wip-us.apache.org/repos/asf/zest-java/blob/4e44de11/core/testsupport/src/main/java/org/apache/zest/test/entity/AbstractConfigurationDeserializationTest.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/zest/test/entity/AbstractConfigurationDeserializationTest.java b/core/testsupport/src/main/java/org/apache/zest/test/entity/AbstractConfigurationDeserializationTest.java
index f93180b..139b5f0 100644
--- a/core/testsupport/src/main/java/org/apache/zest/test/entity/AbstractConfigurationDeserializationTest.java
+++ b/core/testsupport/src/main/java/org/apache/zest/test/entity/AbstractConfigurationDeserializationTest.java
@@ -32,7 +32,6 @@ import org.apache.zest.api.value.ValueSerialization;
import org.apache.zest.bootstrap.AssemblyException;
import org.apache.zest.bootstrap.ModuleAssembly;
import org.apache.zest.entitystore.memory.MemoryEntityStoreService;
-import org.apache.zest.spi.uuid.UuidIdentityGeneratorService;
import org.apache.zest.test.AbstractZestTest;
import org.apache.zest.valueserialization.orgjson.OrgJsonValueSerializationService;
@@ -54,7 +53,6 @@ public abstract class AbstractConfigurationDeserializationTest extends AbstractZ
module.services( MyService.class ).identifiedBy( "configtest" );
storageModule.services( MemoryEntityStoreService.class ).visibleIn( Visibility.layer );
storageModule.services( OrgJsonValueSerializationService.class ).taggedWith( ValueSerialization.Formats.JSON );
- storageModule.services( UuidIdentityGeneratorService.class );
}
@Test
http://git-wip-us.apache.org/repos/asf/zest-java/blob/4e44de11/core/testsupport/src/main/java/org/apache/zest/test/entity/AbstractEntityStoreTest.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/zest/test/entity/AbstractEntityStoreTest.java b/core/testsupport/src/main/java/org/apache/zest/test/entity/AbstractEntityStoreTest.java
index faf706e..ab05f39 100644
--- a/core/testsupport/src/main/java/org/apache/zest/test/entity/AbstractEntityStoreTest.java
+++ b/core/testsupport/src/main/java/org/apache/zest/test/entity/AbstractEntityStoreTest.java
@@ -52,7 +52,6 @@ import org.apache.zest.api.value.ValueComposite;
import org.apache.zest.bootstrap.AssemblyException;
import org.apache.zest.bootstrap.ModuleAssembly;
import org.apache.zest.spi.entitystore.EntityStore;
-import org.apache.zest.spi.uuid.UuidIdentityGeneratorService;
import org.apache.zest.test.AbstractZestTest;
import org.junit.After;
import org.junit.Test;
@@ -82,7 +81,6 @@ public abstract class AbstractEntityStoreTest
public void assemble( ModuleAssembly module )
throws AssemblyException
{
- module.services( UuidIdentityGeneratorService.class );
module.entities( TestEntity.class );
module.values( TestValue.class, TestValue2.class, TjabbaValue.class );
module.objects( getClass() );
http://git-wip-us.apache.org/repos/asf/zest-java/blob/4e44de11/core/testsupport/src/main/java/org/apache/zest/test/indexing/layered/assembly/AccountModule.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/zest/test/indexing/layered/assembly/AccountModule.java b/core/testsupport/src/main/java/org/apache/zest/test/indexing/layered/assembly/AccountModule.java
index 9f1053c..bccd710 100644
--- a/core/testsupport/src/main/java/org/apache/zest/test/indexing/layered/assembly/AccountModule.java
+++ b/core/testsupport/src/main/java/org/apache/zest/test/indexing/layered/assembly/AccountModule.java
@@ -25,7 +25,6 @@ import org.apache.zest.bootstrap.AssemblyException;
import org.apache.zest.bootstrap.LayerAssembly;
import org.apache.zest.bootstrap.ModuleAssembly;
import org.apache.zest.bootstrap.layered.ModuleAssembler;
-import org.apache.zest.spi.uuid.UuidIdentityGeneratorService;
import org.apache.zest.test.indexing.model.Account;
import org.apache.zest.test.indexing.model.Domain;
import org.apache.zest.test.indexing.model.File;
@@ -46,7 +45,6 @@ class AccountModule
module.entities( Account.class, Domain.class ).visibleIn( Visibility.layer );
module.values( File.class, Host.class, Port.class, Protocol.class, QueryParam.class, URL.class )
.visibleIn( Visibility.layer );
- module.services( UuidIdentityGeneratorService.class );
return module;
}
}
http://git-wip-us.apache.org/repos/asf/zest-java/blob/4e44de11/core/testsupport/src/main/java/org/apache/zest/test/indexing/layered/assembly/FamilyModule.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/zest/test/indexing/layered/assembly/FamilyModule.java b/core/testsupport/src/main/java/org/apache/zest/test/indexing/layered/assembly/FamilyModule.java
index a780dcb..dd98306 100644
--- a/core/testsupport/src/main/java/org/apache/zest/test/indexing/layered/assembly/FamilyModule.java
+++ b/core/testsupport/src/main/java/org/apache/zest/test/indexing/layered/assembly/FamilyModule.java
@@ -25,7 +25,6 @@ import org.apache.zest.bootstrap.AssemblyException;
import org.apache.zest.bootstrap.LayerAssembly;
import org.apache.zest.bootstrap.ModuleAssembly;
import org.apache.zest.bootstrap.layered.ModuleAssembler;
-import org.apache.zest.spi.uuid.UuidIdentityGeneratorService;
import org.apache.zest.test.indexing.model.Address;
import org.apache.zest.test.indexing.model.Cat;
import org.apache.zest.test.indexing.model.City;
@@ -48,7 +47,6 @@ class FamilyModule
Dog.class ).visibleIn( Visibility.application );
module.values( Address.class ).visibleIn( Visibility.application );
- module.services( UuidIdentityGeneratorService.class );
return module;
}
}
http://git-wip-us.apache.org/repos/asf/zest-java/blob/4e44de11/core/testsupport/src/main/java/org/apache/zest/test/value/AbstractPlainValueSerializationTest.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/zest/test/value/AbstractPlainValueSerializationTest.java b/core/testsupport/src/main/java/org/apache/zest/test/value/AbstractPlainValueSerializationTest.java
index 48a0994..108d420 100644
--- a/core/testsupport/src/main/java/org/apache/zest/test/value/AbstractPlainValueSerializationTest.java
+++ b/core/testsupport/src/main/java/org/apache/zest/test/value/AbstractPlainValueSerializationTest.java
@@ -39,7 +39,6 @@ import org.apache.zest.api.value.ValueSerialization;
import org.apache.zest.bootstrap.AssemblyException;
import org.apache.zest.bootstrap.ModuleAssembly;
import org.apache.zest.entitystore.memory.MemoryEntityStoreService;
-import org.apache.zest.spi.uuid.UuidIdentityGeneratorService;
import org.apache.zest.test.AbstractZestTest;
import org.junit.Test;
@@ -66,7 +65,6 @@ public abstract class AbstractPlainValueSerializationTest
module.entities( Regression142Type.class );
module.services( MemoryEntityStoreService.class );
- module.services( UuidIdentityGeneratorService.class );
}
@Test
http://git-wip-us.apache.org/repos/asf/zest-java/blob/4e44de11/extensions/entitystore-file/src/main/java/org/apache/zest/entitystore/file/assembly/FileEntityStoreAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-file/src/main/java/org/apache/zest/entitystore/file/assembly/FileEntityStoreAssembler.java b/extensions/entitystore-file/src/main/java/org/apache/zest/entitystore/file/assembly/FileEntityStoreAssembler.java
index 5af7bc6..5116412 100644
--- a/extensions/entitystore-file/src/main/java/org/apache/zest/entitystore/file/assembly/FileEntityStoreAssembler.java
+++ b/extensions/entitystore-file/src/main/java/org/apache/zest/entitystore/file/assembly/FileEntityStoreAssembler.java
@@ -25,7 +25,6 @@ import org.apache.zest.bootstrap.ModuleAssembly;
import org.apache.zest.bootstrap.ServiceDeclaration;
import org.apache.zest.entitystore.file.FileEntityStoreConfiguration;
import org.apache.zest.entitystore.file.FileEntityStoreService;
-import org.apache.zest.spi.uuid.UuidIdentityGeneratorService;
public class FileEntityStoreAssembler
extends Assemblers.VisibilityIdentityConfig<FileEntityStoreAssembler>
@@ -34,11 +33,10 @@ public class FileEntityStoreAssembler
public void assemble( ModuleAssembly module )
throws AssemblyException
{
- module.services( UuidIdentityGeneratorService.class ).visibleIn( visibility() );
ServiceDeclaration service = module.services( FileEntityStoreService.class ).visibleIn( visibility() );
if( hasIdentity() )
{
- service.identifiedBy( identity().toString() );
+ service.identifiedBy( identity() );
}
if( hasConfig() )
{
http://git-wip-us.apache.org/repos/asf/zest-java/blob/4e44de11/extensions/entitystore-geode/src/main/java/org/apache/zest/entitystore/geode/assembly/GeodeEntityStoreAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-geode/src/main/java/org/apache/zest/entitystore/geode/assembly/GeodeEntityStoreAssembler.java b/extensions/entitystore-geode/src/main/java/org/apache/zest/entitystore/geode/assembly/GeodeEntityStoreAssembler.java
index 778af1f..6f607b1 100644
--- a/extensions/entitystore-geode/src/main/java/org/apache/zest/entitystore/geode/assembly/GeodeEntityStoreAssembler.java
+++ b/extensions/entitystore-geode/src/main/java/org/apache/zest/entitystore/geode/assembly/GeodeEntityStoreAssembler.java
@@ -25,7 +25,6 @@ import org.apache.zest.bootstrap.ModuleAssembly;
import org.apache.zest.bootstrap.ServiceDeclaration;
import org.apache.zest.entitystore.geode.GeodeConfiguration;
import org.apache.zest.entitystore.geode.GeodeEntityStoreService;
-import org.apache.zest.spi.uuid.UuidIdentityGeneratorService;
/**
* Assembler for the Geode EntityStore.
@@ -37,11 +36,10 @@ public class GeodeEntityStoreAssembler
public void assemble( ModuleAssembly module )
throws AssemblyException
{
- module.services( UuidIdentityGeneratorService.class ).visibleIn( visibility() );
ServiceDeclaration service = module.services( GeodeEntityStoreService.class ).visibleIn( visibility() );
if( hasIdentity() )
{
- service.identifiedBy( identity().toString() );
+ service.identifiedBy( identity() );
}
if( hasConfig() )
{
http://git-wip-us.apache.org/repos/asf/zest-java/blob/4e44de11/extensions/entitystore-hazelcast/src/main/java/org/apache/zest/entitystore/hazelcast/assembly/HazelcastEntityStoreAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-hazelcast/src/main/java/org/apache/zest/entitystore/hazelcast/assembly/HazelcastEntityStoreAssembler.java b/extensions/entitystore-hazelcast/src/main/java/org/apache/zest/entitystore/hazelcast/assembly/HazelcastEntityStoreAssembler.java
index 9d255a6..972d358 100644
--- a/extensions/entitystore-hazelcast/src/main/java/org/apache/zest/entitystore/hazelcast/assembly/HazelcastEntityStoreAssembler.java
+++ b/extensions/entitystore-hazelcast/src/main/java/org/apache/zest/entitystore/hazelcast/assembly/HazelcastEntityStoreAssembler.java
@@ -25,7 +25,6 @@ import org.apache.zest.bootstrap.ModuleAssembly;
import org.apache.zest.bootstrap.ServiceDeclaration;
import org.apache.zest.entitystore.hazelcast.HazelcastConfiguration;
import org.apache.zest.entitystore.hazelcast.HazelcastEntityStoreService;
-import org.apache.zest.spi.uuid.UuidIdentityGeneratorService;
public class HazelcastEntityStoreAssembler
extends Assemblers.VisibilityIdentityConfig<HazelcastEntityStoreAssembler>
@@ -34,13 +33,12 @@ public class HazelcastEntityStoreAssembler
public void assemble( ModuleAssembly module )
throws AssemblyException
{
- module.services( UuidIdentityGeneratorService.class ).visibleIn( visibility() );
ServiceDeclaration service = module.services( HazelcastEntityStoreService.class ).
visibleIn( visibility() ).
instantiateOnStartup();
if( hasIdentity() )
{
- service.identifiedBy( identity().toString() );
+ service.identifiedBy( identity() );
}
if( hasConfig() )
{
http://git-wip-us.apache.org/repos/asf/zest-java/blob/4e44de11/extensions/entitystore-jclouds/src/main/java/org/apache/zest/entitystore/jclouds/assembly/JCloudsEntityStoreAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-jclouds/src/main/java/org/apache/zest/entitystore/jclouds/assembly/JCloudsEntityStoreAssembler.java b/extensions/entitystore-jclouds/src/main/java/org/apache/zest/entitystore/jclouds/assembly/JCloudsEntityStoreAssembler.java
index a9b2f78..40e0292 100644
--- a/extensions/entitystore-jclouds/src/main/java/org/apache/zest/entitystore/jclouds/assembly/JCloudsEntityStoreAssembler.java
+++ b/extensions/entitystore-jclouds/src/main/java/org/apache/zest/entitystore/jclouds/assembly/JCloudsEntityStoreAssembler.java
@@ -26,7 +26,6 @@ import org.apache.zest.bootstrap.ModuleAssembly;
import org.apache.zest.bootstrap.ServiceDeclaration;
import org.apache.zest.entitystore.jclouds.JCloudsMapEntityStoreConfiguration;
import org.apache.zest.entitystore.jclouds.JCloudsMapEntityStoreService;
-import org.apache.zest.spi.uuid.UuidIdentityGeneratorService;
public class JCloudsEntityStoreAssembler
extends Assemblers.VisibilityIdentityConfig<JCloudsEntityStoreAssembler>
@@ -35,13 +34,12 @@ public class JCloudsEntityStoreAssembler
public void assemble( ModuleAssembly module )
throws AssemblyException
{
- module.services( UuidIdentityGeneratorService.class );
ServiceDeclaration service = module.services( JCloudsMapEntityStoreService.class ).
visibleIn( visibility() ).
instantiateOnStartup();
if( hasIdentity() )
{
- service.identifiedBy( identity().toString() );
+ service.identifiedBy( identity() );
}
if( hasConfig() )
{
http://git-wip-us.apache.org/repos/asf/zest-java/blob/4e44de11/extensions/entitystore-jdbm/src/main/java/org/apache/zest/entitystore/jdbm/assembly/JdbmEntityStoreAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-jdbm/src/main/java/org/apache/zest/entitystore/jdbm/assembly/JdbmEntityStoreAssembler.java b/extensions/entitystore-jdbm/src/main/java/org/apache/zest/entitystore/jdbm/assembly/JdbmEntityStoreAssembler.java
index 609ac87..1472fd0 100644
--- a/extensions/entitystore-jdbm/src/main/java/org/apache/zest/entitystore/jdbm/assembly/JdbmEntityStoreAssembler.java
+++ b/extensions/entitystore-jdbm/src/main/java/org/apache/zest/entitystore/jdbm/assembly/JdbmEntityStoreAssembler.java
@@ -25,7 +25,6 @@ import org.apache.zest.bootstrap.ModuleAssembly;
import org.apache.zest.bootstrap.ServiceDeclaration;
import org.apache.zest.entitystore.jdbm.JdbmConfiguration;
import org.apache.zest.entitystore.jdbm.JdbmEntityStoreService;
-import org.apache.zest.spi.uuid.UuidIdentityGeneratorService;
public class JdbmEntityStoreAssembler
extends Assemblers.VisibilityIdentityConfig<JdbmEntityStoreAssembler>
@@ -34,11 +33,10 @@ public class JdbmEntityStoreAssembler
public void assemble( ModuleAssembly module )
throws AssemblyException
{
- module.services( JdbmEntityStoreService.class ).visibleIn( visibility() );
- ServiceDeclaration service = module.services( UuidIdentityGeneratorService.class ).visibleIn( visibility() );
+ ServiceDeclaration service = module.services( JdbmEntityStoreService.class ).visibleIn( visibility() );
if( hasIdentity() )
{
- service.identifiedBy( identity().toString() );
+ service.identifiedBy( identity() );
}
if( hasConfig() )
{
http://git-wip-us.apache.org/repos/asf/zest-java/blob/4e44de11/extensions/entitystore-leveldb/src/main/java/org/apache/zest/entitystore/leveldb/assembly/LevelDBEntityStoreAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-leveldb/src/main/java/org/apache/zest/entitystore/leveldb/assembly/LevelDBEntityStoreAssembler.java b/extensions/entitystore-leveldb/src/main/java/org/apache/zest/entitystore/leveldb/assembly/LevelDBEntityStoreAssembler.java
index 032da7c..c2d0613 100644
--- a/extensions/entitystore-leveldb/src/main/java/org/apache/zest/entitystore/leveldb/assembly/LevelDBEntityStoreAssembler.java
+++ b/extensions/entitystore-leveldb/src/main/java/org/apache/zest/entitystore/leveldb/assembly/LevelDBEntityStoreAssembler.java
@@ -25,7 +25,6 @@ import org.apache.zest.bootstrap.ModuleAssembly;
import org.apache.zest.bootstrap.ServiceDeclaration;
import org.apache.zest.entitystore.leveldb.LevelDBEntityStoreConfiguration;
import org.apache.zest.entitystore.leveldb.LevelDBEntityStoreService;
-import org.apache.zest.spi.uuid.UuidIdentityGeneratorService;
/**
* LevelDB EntityStore assembly.
@@ -37,11 +36,10 @@ public class LevelDBEntityStoreAssembler
public void assemble( ModuleAssembly module )
throws AssemblyException
{
- module.services( UuidIdentityGeneratorService.class );
ServiceDeclaration service = module.services( LevelDBEntityStoreService.class ).visibleIn( visibility() );
if( hasIdentity() )
{
- service.identifiedBy( identity().toString() );
+ service.identifiedBy( identity() );
}
if( hasConfig() )
{
http://git-wip-us.apache.org/repos/asf/zest-java/blob/4e44de11/extensions/entitystore-memory/src/main/java/org/apache/zest/entitystore/memory/assembly/MemoryEntityStoreAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-memory/src/main/java/org/apache/zest/entitystore/memory/assembly/MemoryEntityStoreAssembler.java b/extensions/entitystore-memory/src/main/java/org/apache/zest/entitystore/memory/assembly/MemoryEntityStoreAssembler.java
index ddeaa10..50de4b0 100644
--- a/extensions/entitystore-memory/src/main/java/org/apache/zest/entitystore/memory/assembly/MemoryEntityStoreAssembler.java
+++ b/extensions/entitystore-memory/src/main/java/org/apache/zest/entitystore/memory/assembly/MemoryEntityStoreAssembler.java
@@ -24,7 +24,6 @@ import org.apache.zest.bootstrap.AssemblyException;
import org.apache.zest.bootstrap.ModuleAssembly;
import org.apache.zest.bootstrap.ServiceDeclaration;
import org.apache.zest.entitystore.memory.MemoryEntityStoreService;
-import org.apache.zest.spi.uuid.UuidIdentityGeneratorService;
/**
* Assemble an in-memory EntityStore.
@@ -36,11 +35,10 @@ public class MemoryEntityStoreAssembler
public void assemble( ModuleAssembly module )
throws AssemblyException
{
- module.services( UuidIdentityGeneratorService.class ).visibleIn( visibility() );
ServiceDeclaration service = module.services( MemoryEntityStoreService.class ).visibleIn( visibility() );
if( hasIdentity() )
{
- service.identifiedBy( identity().toString() );
+ service.identifiedBy( identity() );
}
}
}
http://git-wip-us.apache.org/repos/asf/zest-java/blob/4e44de11/extensions/entitystore-mongodb/src/main/java/org/apache/zest/entitystore/mongodb/assembly/MongoDBEntityStoreAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-mongodb/src/main/java/org/apache/zest/entitystore/mongodb/assembly/MongoDBEntityStoreAssembler.java b/extensions/entitystore-mongodb/src/main/java/org/apache/zest/entitystore/mongodb/assembly/MongoDBEntityStoreAssembler.java
index 3546fe3..6fb089e 100644
--- a/extensions/entitystore-mongodb/src/main/java/org/apache/zest/entitystore/mongodb/assembly/MongoDBEntityStoreAssembler.java
+++ b/extensions/entitystore-mongodb/src/main/java/org/apache/zest/entitystore/mongodb/assembly/MongoDBEntityStoreAssembler.java
@@ -25,7 +25,6 @@ import org.apache.zest.bootstrap.ModuleAssembly;
import org.apache.zest.bootstrap.ServiceDeclaration;
import org.apache.zest.entitystore.mongodb.MongoEntityStoreConfiguration;
import org.apache.zest.entitystore.mongodb.MongoMapEntityStoreService;
-import org.apache.zest.spi.uuid.UuidIdentityGeneratorService;
public class MongoDBEntityStoreAssembler
extends Assemblers.VisibilityIdentityConfig<MongoDBEntityStoreAssembler>
@@ -34,11 +33,10 @@ public class MongoDBEntityStoreAssembler
public void assemble( ModuleAssembly module )
throws AssemblyException
{
- module.services( UuidIdentityGeneratorService.class ).visibleIn( visibility() );
ServiceDeclaration service = module.services( MongoMapEntityStoreService.class ).visibleIn( visibility() );
if( hasIdentity() )
{
- service.identifiedBy( identity().toString() );
+ service.identifiedBy( identity() );
}
if( hasConfig() )
{
http://git-wip-us.apache.org/repos/asf/zest-java/blob/4e44de11/extensions/entitystore-preferences/src/main/java/org/apache/zest/entitystore/prefs/assembly/PreferenceEntityStoreAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-preferences/src/main/java/org/apache/zest/entitystore/prefs/assembly/PreferenceEntityStoreAssembler.java b/extensions/entitystore-preferences/src/main/java/org/apache/zest/entitystore/prefs/assembly/PreferenceEntityStoreAssembler.java
index 5953d96..e5786fc 100644
--- a/extensions/entitystore-preferences/src/main/java/org/apache/zest/entitystore/prefs/assembly/PreferenceEntityStoreAssembler.java
+++ b/extensions/entitystore-preferences/src/main/java/org/apache/zest/entitystore/prefs/assembly/PreferenceEntityStoreAssembler.java
@@ -26,7 +26,6 @@ import org.apache.zest.bootstrap.ModuleAssembly;
import org.apache.zest.bootstrap.ServiceDeclaration;
import org.apache.zest.entitystore.prefs.PreferencesEntityStoreInfo;
import org.apache.zest.entitystore.prefs.PreferencesEntityStoreService;
-import org.apache.zest.spi.uuid.UuidIdentityGeneratorService;
public class PreferenceEntityStoreAssembler
extends Assemblers.VisibilityIdentity<PreferenceEntityStoreAssembler>
@@ -46,8 +45,7 @@ public class PreferenceEntityStoreAssembler
.instantiateOnStartup();
if( hasIdentity() )
{
- service.identifiedBy( identity().toString() );
+ service.identifiedBy( identity() );
}
- module.services( UuidIdentityGeneratorService.class ).visibleIn( visibility() );
}
}
http://git-wip-us.apache.org/repos/asf/zest-java/blob/4e44de11/extensions/entitystore-redis/src/main/java/org/apache/zest/entitystore/redis/assembly/RedisEntityStoreAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-redis/src/main/java/org/apache/zest/entitystore/redis/assembly/RedisEntityStoreAssembler.java b/extensions/entitystore-redis/src/main/java/org/apache/zest/entitystore/redis/assembly/RedisEntityStoreAssembler.java
index 38ab411..6e50c9c 100644
--- a/extensions/entitystore-redis/src/main/java/org/apache/zest/entitystore/redis/assembly/RedisEntityStoreAssembler.java
+++ b/extensions/entitystore-redis/src/main/java/org/apache/zest/entitystore/redis/assembly/RedisEntityStoreAssembler.java
@@ -25,7 +25,6 @@ import org.apache.zest.bootstrap.ModuleAssembly;
import org.apache.zest.bootstrap.ServiceDeclaration;
import org.apache.zest.entitystore.redis.RedisEntityStoreConfiguration;
import org.apache.zest.entitystore.redis.RedisMapEntityStoreService;
-import org.apache.zest.spi.uuid.UuidIdentityGeneratorService;
/**
* Redis EntityStore assembly.
@@ -37,11 +36,10 @@ public class RedisEntityStoreAssembler
public void assemble( ModuleAssembly module )
throws AssemblyException
{
- module.services( UuidIdentityGeneratorService.class ).visibleIn( visibility() );
ServiceDeclaration service = module.services( RedisMapEntityStoreService.class ).visibleIn( visibility() );
if( hasIdentity() )
{
- service.identifiedBy( identity().toString() );
+ service.identifiedBy( identity() );
}
if( hasConfig() )
{
http://git-wip-us.apache.org/repos/asf/zest-java/blob/4e44de11/extensions/entitystore-riak/src/main/java/org/apache/zest/entitystore/riak/assembly/RiakEntityStoreAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-riak/src/main/java/org/apache/zest/entitystore/riak/assembly/RiakEntityStoreAssembler.java b/extensions/entitystore-riak/src/main/java/org/apache/zest/entitystore/riak/assembly/RiakEntityStoreAssembler.java
index b449f42..57b5821 100644
--- a/extensions/entitystore-riak/src/main/java/org/apache/zest/entitystore/riak/assembly/RiakEntityStoreAssembler.java
+++ b/extensions/entitystore-riak/src/main/java/org/apache/zest/entitystore/riak/assembly/RiakEntityStoreAssembler.java
@@ -24,7 +24,6 @@ import org.apache.zest.bootstrap.ServiceDeclaration;
import org.apache.zest.entitystore.riak.RiakEntityStoreConfiguration;
import org.apache.zest.entitystore.riak.RiakMapEntityStoreMixin;
import org.apache.zest.entitystore.riak.RiakMapEntityStoreService;
-import org.apache.zest.spi.uuid.UuidIdentityGeneratorService;
/**
* Riak EntityStore assembly.
@@ -35,14 +34,12 @@ public class RiakEntityStoreAssembler
@Override
public void assemble(ModuleAssembly module) throws AssemblyException
{
- module.services( UuidIdentityGeneratorService.class ).
- visibleIn( visibility() );
ServiceDeclaration service = module.services( RiakMapEntityStoreService.class ).
withMixins( RiakMapEntityStoreMixin.class ).
visibleIn( visibility() );
if( hasIdentity() )
{
- service.identifiedBy( identity().toString() );
+ service.identifiedBy( identity() );
}
if( hasConfig() )
{
http://git-wip-us.apache.org/repos/asf/zest-java/blob/4e44de11/extensions/entitystore-sql/src/main/java/org/apache/zest/entitystore/sql/assembly/AbstractSQLEntityStoreAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-sql/src/main/java/org/apache/zest/entitystore/sql/assembly/AbstractSQLEntityStoreAssembler.java b/extensions/entitystore-sql/src/main/java/org/apache/zest/entitystore/sql/assembly/AbstractSQLEntityStoreAssembler.java
index a546f36..f763d7c 100644
--- a/extensions/entitystore-sql/src/main/java/org/apache/zest/entitystore/sql/assembly/AbstractSQLEntityStoreAssembler.java
+++ b/extensions/entitystore-sql/src/main/java/org/apache/zest/entitystore/sql/assembly/AbstractSQLEntityStoreAssembler.java
@@ -33,7 +33,6 @@ import org.apache.zest.entitystore.sql.internal.DatabaseSQLServiceSpi;
import org.apache.zest.entitystore.sql.internal.DatabaseSQLServiceStatementsMixin;
import org.apache.zest.entitystore.sql.internal.DatabaseSQLStringsBuilder;
import org.apache.zest.library.sql.common.SQLConfiguration;
-import org.apache.zest.spi.uuid.UuidIdentityGeneratorService;
import org.sql.generation.api.vendor.SQLVendor;
import org.sql.generation.api.vendor.SQLVendorProvider;
@@ -85,13 +84,10 @@ abstract class AbstractSQLEntityStoreAssembler<AssemblerType>
{
throw new AssemblyException( ioe );
}
- module.services( SQLEntityStoreService.class,
- UuidIdentityGeneratorService.class ).
- visibleIn( visibility() );
+ module.services( SQLEntityStoreService.class ).visibleIn( visibility() );
if( hasConfig() )
{
- configModule().entities( SQLConfiguration.class ).
- visibleIn( configVisibility() );
+ configModule().entities( SQLConfiguration.class ).visibleIn( configVisibility() );
}
}
}
http://git-wip-us.apache.org/repos/asf/zest-java/blob/4e44de11/libraries/logging/src/test/java/org/apache/zest/library/logging/DebuggingTest.java
----------------------------------------------------------------------
diff --git a/libraries/logging/src/test/java/org/apache/zest/library/logging/DebuggingTest.java b/libraries/logging/src/test/java/org/apache/zest/library/logging/DebuggingTest.java
index b76c3e0..ae75fb4 100644
--- a/libraries/logging/src/test/java/org/apache/zest/library/logging/DebuggingTest.java
+++ b/libraries/logging/src/test/java/org/apache/zest/library/logging/DebuggingTest.java
@@ -40,7 +40,6 @@ import org.apache.zest.library.logging.debug.service.DebugServiceConfiguration;
import org.apache.zest.library.logging.debug.service.DebuggingServiceComposite;
import org.apache.zest.spi.entity.EntityState;
import org.apache.zest.spi.entitystore.EntityStore;
-import org.apache.zest.spi.uuid.UuidIdentityGeneratorService;
import org.apache.zest.test.AbstractZestTest;
import org.apache.zest.test.EntityTestAssembler;
@@ -57,7 +56,6 @@ public class DebuggingTest
module.services( SomeService.class ).withMixins( Debug.class ).withConcerns( DebugConcern.class );
module.entities( DebugServiceConfiguration.class );
module.entities( ServiceDebugRecordEntity.class );
- module.services( UuidIdentityGeneratorService.class );
}
@Test
http://git-wip-us.apache.org/repos/asf/zest-java/blob/4e44de11/libraries/logging/src/test/java/org/apache/zest/library/logging/TracingTest.java
----------------------------------------------------------------------
diff --git a/libraries/logging/src/test/java/org/apache/zest/library/logging/TracingTest.java b/libraries/logging/src/test/java/org/apache/zest/library/logging/TracingTest.java
index fd5f739..01ce301 100644
--- a/libraries/logging/src/test/java/org/apache/zest/library/logging/TracingTest.java
+++ b/libraries/logging/src/test/java/org/apache/zest/library/logging/TracingTest.java
@@ -39,7 +39,6 @@ import org.apache.zest.library.logging.trace.records.CompositeTraceRecordEntity;
import org.apache.zest.library.logging.trace.records.EntityTraceRecordEntity;
import org.apache.zest.library.logging.trace.records.ServiceTraceRecordEntity;
import org.apache.zest.library.logging.trace.records.TraceRecord;
-import org.apache.zest.spi.uuid.UuidIdentityGeneratorService;
import org.apache.zest.test.AbstractZestTest;
import java.util.Iterator;
@@ -60,7 +59,6 @@ public class TracingTest
new TracingAssembler().assemble( module );
new EntityTestAssembler().assemble( module );
new RdfMemoryStoreAssembler().assemble( module );
- module.services( UuidIdentityGeneratorService.class );
module.entities( CompositeTraceRecordEntity.class );
module.entities( EntityTraceRecordEntity.class );
module.entities( ServiceTraceRecordEntity.class );
http://git-wip-us.apache.org/repos/asf/zest-java/blob/4e44de11/libraries/rest/src/test/java/org/apache/zest/library/rest/admin/DomainAssembler.java
----------------------------------------------------------------------
diff --git a/libraries/rest/src/test/java/org/apache/zest/library/rest/admin/DomainAssembler.java b/libraries/rest/src/test/java/org/apache/zest/library/rest/admin/DomainAssembler.java
index bec6cec..e3a8931 100644
--- a/libraries/rest/src/test/java/org/apache/zest/library/rest/admin/DomainAssembler.java
+++ b/libraries/rest/src/test/java/org/apache/zest/library/rest/admin/DomainAssembler.java
@@ -26,7 +26,6 @@ import org.apache.zest.bootstrap.ModuleAssembly;
import org.apache.zest.entitystore.memory.MemoryEntityStoreService;
import org.apache.zest.index.rdf.RdfIndexingEngineService;
import org.apache.zest.library.rdf.repository.MemoryRepositoryService;
-import org.apache.zest.spi.uuid.UuidIdentityGeneratorService;
import static org.apache.zest.api.common.Visibility.application;
import static org.apache.zest.api.common.Visibility.layer;
@@ -42,7 +41,6 @@ public class DomainAssembler
{
module.services(
MemoryEntityStoreService.class,
- UuidIdentityGeneratorService.class,
RdfIndexingEngineService.class
).visibleIn( application );
module.services( MemoryRepositoryService.class ).identifiedBy( "rdf-indexing" ).visibleIn( layer );
http://git-wip-us.apache.org/repos/asf/zest-java/blob/4e44de11/libraries/restlet/src/main/java/org/apache/zest/library/restlet/assembly/CrudServiceAssembler.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/main/java/org/apache/zest/library/restlet/assembly/CrudServiceAssembler.java b/libraries/restlet/src/main/java/org/apache/zest/library/restlet/assembly/CrudServiceAssembler.java
index 8a9461f..16e4112 100644
--- a/libraries/restlet/src/main/java/org/apache/zest/library/restlet/assembly/CrudServiceAssembler.java
+++ b/libraries/restlet/src/main/java/org/apache/zest/library/restlet/assembly/CrudServiceAssembler.java
@@ -26,7 +26,6 @@ import org.apache.zest.bootstrap.ModuleAssembly;
import org.apache.zest.library.restlet.identity.IdentityManager;
import org.apache.zest.library.restlet.identity.IdentityMappingConfiguration;
import org.apache.zest.library.restlet.repository.RepositoryLocator;
-import org.apache.zest.spi.uuid.UuidIdentityGeneratorService;
public class CrudServiceAssembler
implements Assembler
@@ -35,7 +34,6 @@ public class CrudServiceAssembler
public void assemble( ModuleAssembly module )
throws AssemblyException
{
- module.services( UuidIdentityGeneratorService.class );
module.entities( IdentityMappingConfiguration.class );
module.services( IdentityManager.class ).visibleIn( Visibility.application ).instantiateOnStartup();
module.services( RepositoryLocator.class ).visibleIn( Visibility.application );
http://git-wip-us.apache.org/repos/asf/zest-java/blob/4e44de11/libraries/restlet/src/main/java/org/apache/zest/library/restlet/assembly/configuration/ConfigurationModule.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/main/java/org/apache/zest/library/restlet/assembly/configuration/ConfigurationModule.java b/libraries/restlet/src/main/java/org/apache/zest/library/restlet/assembly/configuration/ConfigurationModule.java
index 466ce7b..84e0555 100644
--- a/libraries/restlet/src/main/java/org/apache/zest/library/restlet/assembly/configuration/ConfigurationModule.java
+++ b/libraries/restlet/src/main/java/org/apache/zest/library/restlet/assembly/configuration/ConfigurationModule.java
@@ -26,7 +26,6 @@ import org.apache.zest.bootstrap.LayerAssembly;
import org.apache.zest.bootstrap.ModuleAssembly;
import org.apache.zest.bootstrap.layered.ModuleAssembler;
import org.apache.zest.entitystore.memory.MemoryEntityStoreService;
-import org.apache.zest.spi.uuid.UuidIdentityGeneratorService;
import org.apache.zest.valueserialization.jackson.JacksonValueSerializationAssembler;
public class ConfigurationModule
@@ -39,7 +38,6 @@ public class ConfigurationModule
{
module.services( MemoryEntityStoreService.class ).visibleIn( Visibility.layer );
new JacksonValueSerializationAssembler().visibleIn( Visibility.layer ).assemble( module );
- module.services( UuidIdentityGeneratorService.class ).visibleIn( Visibility.layer );
return module;
}
}
http://git-wip-us.apache.org/repos/asf/zest-java/blob/4e44de11/libraries/restlet/src/main/java/org/apache/zest/library/restlet/assembly/infrastructue/SerializationModule.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/main/java/org/apache/zest/library/restlet/assembly/infrastructue/SerializationModule.java b/libraries/restlet/src/main/java/org/apache/zest/library/restlet/assembly/infrastructue/SerializationModule.java
index 1b87911..1f0bc4b 100644
--- a/libraries/restlet/src/main/java/org/apache/zest/library/restlet/assembly/infrastructue/SerializationModule.java
+++ b/libraries/restlet/src/main/java/org/apache/zest/library/restlet/assembly/infrastructue/SerializationModule.java
@@ -28,7 +28,6 @@ import org.apache.zest.bootstrap.AssemblyException;
import org.apache.zest.bootstrap.LayerAssembly;
import org.apache.zest.bootstrap.ModuleAssembly;
import org.apache.zest.bootstrap.layered.ModuleAssembler;
-import org.apache.zest.spi.uuid.UuidIdentityGeneratorService;
import org.apache.zest.valueserialization.jackson.JacksonValueSerializationAssembler;
public class SerializationModule
@@ -50,7 +49,6 @@ public class SerializationModule
.visibleIn( Visibility.layer )
.withValuesModuleFinder( typeFinder )
.assemble( module );
- module.services( UuidIdentityGeneratorService.class ).visibleIn( Visibility.layer );
return module;
}
}
http://git-wip-us.apache.org/repos/asf/zest-java/blob/4e44de11/libraries/restlet/src/main/java/org/apache/zest/library/restlet/identity/IdentityManager.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/main/java/org/apache/zest/library/restlet/identity/IdentityManager.java b/libraries/restlet/src/main/java/org/apache/zest/library/restlet/identity/IdentityManager.java
index b984459..a9df076 100644
--- a/libraries/restlet/src/main/java/org/apache/zest/library/restlet/identity/IdentityManager.java
+++ b/libraries/restlet/src/main/java/org/apache/zest/library/restlet/identity/IdentityManager.java
@@ -27,13 +27,13 @@ import org.apache.zest.api.common.Optional;
import org.apache.zest.api.concern.Concerns;
import org.apache.zest.api.configuration.Configuration;
import org.apache.zest.api.identity.Identity;
+import org.apache.zest.api.identity.IdentityGenerator;
import org.apache.zest.api.identity.StringIdentity;
import org.apache.zest.api.injection.scope.Service;
import org.apache.zest.api.injection.scope.This;
import org.apache.zest.api.mixin.Mixins;
import org.apache.zest.api.unitofwork.concern.UnitOfWorkConcern;
import org.apache.zest.api.unitofwork.concern.UnitOfWorkPropagation;
-import org.apache.zest.spi.uuid.UuidIdentityGeneratorService;
import static org.apache.zest.functional.Iterables.filter;
import static org.apache.zest.functional.Iterables.first;
@@ -60,7 +60,7 @@ public interface IdentityManager
implements IdentityManager
{
@Service
- private UuidIdentityGeneratorService uuidService;
+ private IdentityGenerator uuidService;
@This
private Configuration<IdentityMappingConfiguration> config;
http://git-wip-us.apache.org/repos/asf/zest-java/blob/4e44de11/samples/rental/src/main/java/org/apache/zest/sample/rental/web/assembly/StorageModule.java
----------------------------------------------------------------------
diff --git a/samples/rental/src/main/java/org/apache/zest/sample/rental/web/assembly/StorageModule.java b/samples/rental/src/main/java/org/apache/zest/sample/rental/web/assembly/StorageModule.java
index ca11469..f4b64bf 100644
--- a/samples/rental/src/main/java/org/apache/zest/sample/rental/web/assembly/StorageModule.java
+++ b/samples/rental/src/main/java/org/apache/zest/sample/rental/web/assembly/StorageModule.java
@@ -27,7 +27,6 @@ import org.apache.zest.bootstrap.Assembler;
import org.apache.zest.bootstrap.AssemblyException;
import org.apache.zest.bootstrap.ModuleAssembly;
import org.apache.zest.entitystore.memory.MemoryEntityStoreService;
-import org.apache.zest.spi.uuid.UuidIdentityGeneratorService;
import org.apache.zest.valueserialization.orgjson.OrgJsonValueSerializationAssembler;
public class StorageModule
@@ -39,7 +38,6 @@ public class StorageModule
throws AssemblyException
{
module.services( MemoryEntityStoreService.class ).visibleIn( Visibility.application );
- module.services( UuidIdentityGeneratorService.class ).visibleIn( Visibility.application );
new OrgJsonValueSerializationAssembler().
visibleIn( Visibility.application ).
withValuesModuleFinder( app -> app.findModule( "DomainLayer", "RentalModule" ) ).
http://git-wip-us.apache.org/repos/asf/zest-java/blob/4e44de11/tools/envisage/src/test/java/org/apache/zest/envisage/school/config/persistence/PersistenceConfigAssembler.java
----------------------------------------------------------------------
diff --git a/tools/envisage/src/test/java/org/apache/zest/envisage/school/config/persistence/PersistenceConfigAssembler.java b/tools/envisage/src/test/java/org/apache/zest/envisage/school/config/persistence/PersistenceConfigAssembler.java
index 03c938a..b2ff39a 100644
--- a/tools/envisage/src/test/java/org/apache/zest/envisage/school/config/persistence/PersistenceConfigAssembler.java
+++ b/tools/envisage/src/test/java/org/apache/zest/envisage/school/config/persistence/PersistenceConfigAssembler.java
@@ -24,7 +24,6 @@ import org.apache.zest.bootstrap.Assembler;
import org.apache.zest.bootstrap.AssemblyException;
import org.apache.zest.bootstrap.ModuleAssembly;
import org.apache.zest.entitystore.memory.MemoryEntityStoreService;
-import org.apache.zest.spi.uuid.UuidIdentityGeneratorService;
import static org.apache.zest.api.common.Visibility.layer;
@@ -35,9 +34,6 @@ public class PersistenceConfigAssembler
public void assemble( ModuleAssembly module )
throws AssemblyException
{
- module.services(
- UuidIdentityGeneratorService.class,
- MemoryEntityStoreService.class
- ).visibleIn( layer ).instantiateOnStartup();
+ module.services( MemoryEntityStoreService.class ).visibleIn( layer ).instantiateOnStartup();
}
}
http://git-wip-us.apache.org/repos/asf/zest-java/blob/4e44de11/tools/envisage/src/test/java/org/apache/zest/envisage/school/infrastructure/persistence/PersistenceAssembler.java
----------------------------------------------------------------------
diff --git a/tools/envisage/src/test/java/org/apache/zest/envisage/school/infrastructure/persistence/PersistenceAssembler.java b/tools/envisage/src/test/java/org/apache/zest/envisage/school/infrastructure/persistence/PersistenceAssembler.java
index b997773..646fde1 100644
--- a/tools/envisage/src/test/java/org/apache/zest/envisage/school/infrastructure/persistence/PersistenceAssembler.java
+++ b/tools/envisage/src/test/java/org/apache/zest/envisage/school/infrastructure/persistence/PersistenceAssembler.java
@@ -29,7 +29,6 @@ import org.apache.zest.index.rdf.query.RdfQueryParserFactory;
import org.apache.zest.library.rdf.entity.EntityStateSerializer;
import org.apache.zest.library.rdf.entity.EntityTypeSerializer;
import org.apache.zest.library.rdf.repository.MemoryRepositoryService;
-import org.apache.zest.spi.uuid.UuidIdentityGeneratorService;
import static org.apache.zest.api.common.Visibility.application;
@@ -43,7 +42,6 @@ public class PersistenceAssembler
module.objects( EntityStateSerializer.class, EntityTypeSerializer.class );
module.services(
- UuidIdentityGeneratorService.class,
MemoryEntityStoreService.class,
// Query
RdfQueryParserFactory.class, RdfIndexingEngineService.class,
http://git-wip-us.apache.org/repos/asf/zest-java/blob/4e44de11/tools/generator-zest/app/templates/ConfigModule/bootstrap.tmpl
----------------------------------------------------------------------
diff --git a/tools/generator-zest/app/templates/ConfigModule/bootstrap.tmpl b/tools/generator-zest/app/templates/ConfigModule/bootstrap.tmpl
index cbad162..6ed98eb 100644
--- a/tools/generator-zest/app/templates/ConfigModule/bootstrap.tmpl
+++ b/tools/generator-zest/app/templates/ConfigModule/bootstrap.tmpl
@@ -25,7 +25,6 @@ import org.apache.zest.bootstrap.LayerAssembly;
import org.apache.zest.bootstrap.ModuleAssembly;
import org.apache.zest.bootstrap.layered.ModuleAssembler;
import org.apache.zest.entitystore.memory.MemoryEntityStoreService;
-import org.apache.zest.spi.uuid.UuidIdentityGeneratorService;
import org.apache.zest.valueserialization.jackson.JacksonValueSerializationAssembler;
public class ConfigModule
@@ -37,7 +36,6 @@ public class ConfigModule
{
module.services( MemoryEntityStoreService.class ).visibleIn( Visibility.layer );
new JacksonValueSerializationAssembler().visibleIn( Visibility.layer ).assemble( module );
- module.services( UuidIdentityGeneratorService.class ).visibleIn( Visibility.layer );
return module;
}
}
http://git-wip-us.apache.org/repos/asf/zest-java/blob/4e44de11/tools/generator-zest/app/templates/JacksonSerializationModule/bootstrap.tmpl
----------------------------------------------------------------------
diff --git a/tools/generator-zest/app/templates/JacksonSerializationModule/bootstrap.tmpl b/tools/generator-zest/app/templates/JacksonSerializationModule/bootstrap.tmpl
index 1210cde..97e3d98 100644
--- a/tools/generator-zest/app/templates/JacksonSerializationModule/bootstrap.tmpl
+++ b/tools/generator-zest/app/templates/JacksonSerializationModule/bootstrap.tmpl
@@ -27,7 +27,6 @@ import org.apache.zest.bootstrap.AssemblyException;
import org.apache.zest.bootstrap.LayerAssembly;
import org.apache.zest.bootstrap.ModuleAssembly;
import org.apache.zest.bootstrap.layered.ModuleAssembler;
-import org.apache.zest.spi.uuid.UuidIdentityGeneratorService;
import org.apache.zest.valueserialization.jackson.JacksonValueSerializationAssembler;
public class JacksonSerializationModule
@@ -49,7 +48,6 @@ public class JacksonSerializationModule
.visibleIn( Visibility.application )
.withValuesModuleFinder( typeFinder )
.assemble( module );
- module.services( UuidIdentityGeneratorService.class ).visibleIn( Visibility.layer );
return module;
}
}
http://git-wip-us.apache.org/repos/asf/zest-java/blob/4e44de11/tools/shell/src/main/java/org/apache/zest/tools/shell/create/project/common/ConfigModuleWriter.java
----------------------------------------------------------------------
diff --git a/tools/shell/src/main/java/org/apache/zest/tools/shell/create/project/common/ConfigModuleWriter.java b/tools/shell/src/main/java/org/apache/zest/tools/shell/create/project/common/ConfigModuleWriter.java
index 4093d5d..7f5d6ff 100644
--- a/tools/shell/src/main/java/org/apache/zest/tools/shell/create/project/common/ConfigModuleWriter.java
+++ b/tools/shell/src/main/java/org/apache/zest/tools/shell/create/project/common/ConfigModuleWriter.java
@@ -46,7 +46,6 @@ public class ConfigModuleWriter
"import org.apache.zest.bootstrap.ModuleAssembly;\n" +
"import org.apache.zest.bootstrap.layered.ModuleAssembler;\n" +
"import org.apache.zest.entitystore.memory.MemoryEntityStoreService;\n" +
- "import org.apache.zest.spi.uuid.UuidIdentityGeneratorService;\n" +
"import org.apache.zest.valueserialization.jackson.JacksonValueSerializationAssembler;\n" +
"\n" +
"public class ConfigModule\n" +
@@ -58,7 +57,6 @@ public class ConfigModuleWriter
" {\n" +
" module.services( MemoryEntityStoreService.class ).visibleIn( Visibility.layer );\n" +
" new JacksonValueSerializationAssembler().visibleIn( Visibility.layer ).assemble( module );\n" +
- " module.services( UuidIdentityGeneratorService.class ).visibleIn( Visibility.layer );\n" +
" return module;\n" +
" }\n" +
"}\n");
http://git-wip-us.apache.org/repos/asf/zest-java/blob/4e44de11/tools/shell/src/main/java/org/apache/zest/tools/shell/create/project/common/SerializationModuleWriter.java
----------------------------------------------------------------------
diff --git a/tools/shell/src/main/java/org/apache/zest/tools/shell/create/project/common/SerializationModuleWriter.java b/tools/shell/src/main/java/org/apache/zest/tools/shell/create/project/common/SerializationModuleWriter.java
index 1b042fb..a507d25 100644
--- a/tools/shell/src/main/java/org/apache/zest/tools/shell/create/project/common/SerializationModuleWriter.java
+++ b/tools/shell/src/main/java/org/apache/zest/tools/shell/create/project/common/SerializationModuleWriter.java
@@ -48,7 +48,6 @@ public class SerializationModuleWriter
"import org.apache.zest.bootstrap.LayerAssembly;\n" +
"import org.apache.zest.bootstrap.ModuleAssembly;\n" +
"import org.apache.zest.bootstrap.layered.ModuleAssembler;\n" +
- "import org.apache.zest.spi.uuid.UuidIdentityGeneratorService;\n" +
"import org.apache.zest.valueserialization.jackson.JacksonValueSerializationAssembler;\n" +
"\n" +
"public class SerializationModule\n" +
@@ -70,7 +69,6 @@ public class SerializationModuleWriter
" .visibleIn( Visibility.application )\n" +
" .withValuesModuleFinder( typeFinder )\n" +
" .assemble( module );\n" +
- " module.services( UuidIdentityGeneratorService.class ).visibleIn( Visibility.layer );\n" +
" return module;\n" +
" }\n" +
"}\n"
[2/2] zest-java git commit: Missing license headers, reported by RAT
Posted by ni...@apache.org.
Missing license headers, reported by RAT
Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/acfef923
Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/acfef923
Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/acfef923
Branch: refs/heads/develop
Commit: acfef923901624aa04d5ada0b5bb6462ef410ee1
Parents: 4e44de1
Author: Niclas Hedhman <ni...@hedhman.org>
Authored: Mon Oct 24 08:24:21 2016 +0800
Committer: Niclas Hedhman <ni...@hedhman.org>
Committed: Mon Oct 24 08:24:21 2016 +0800
----------------------------------------------------------------------
.../org/apache/zest/api/time/SystemTime.java | 19 +++++++++++++++++++
.../DefaultIdentityGeneratorAssembler.java | 19 +++++++++++++++++++
.../zest/dci/moneytransfer/test/AccountIds.java | 19 +++++++++++++++++++
3 files changed, 57 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zest-java/blob/acfef923/core/api/src/main/java/org/apache/zest/api/time/SystemTime.java
----------------------------------------------------------------------
diff --git a/core/api/src/main/java/org/apache/zest/api/time/SystemTime.java b/core/api/src/main/java/org/apache/zest/api/time/SystemTime.java
index 4601551..129bb12 100644
--- a/core/api/src/main/java/org/apache/zest/api/time/SystemTime.java
+++ b/core/api/src/main/java/org/apache/zest/api/time/SystemTime.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.apache.zest.api.time;
import java.time.Clock;
http://git-wip-us.apache.org/repos/asf/zest-java/blob/acfef923/core/bootstrap/src/main/java/org/apache/zest/bootstrap/identity/DefaultIdentityGeneratorAssembler.java
----------------------------------------------------------------------
diff --git a/core/bootstrap/src/main/java/org/apache/zest/bootstrap/identity/DefaultIdentityGeneratorAssembler.java b/core/bootstrap/src/main/java/org/apache/zest/bootstrap/identity/DefaultIdentityGeneratorAssembler.java
index dbcb34c..94b9f3b 100644
--- a/core/bootstrap/src/main/java/org/apache/zest/bootstrap/identity/DefaultIdentityGeneratorAssembler.java
+++ b/core/bootstrap/src/main/java/org/apache/zest/bootstrap/identity/DefaultIdentityGeneratorAssembler.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.apache.zest.bootstrap.identity;
import org.apache.zest.api.identity.IdentityGenerator;
http://git-wip-us.apache.org/repos/asf/zest-java/blob/acfef923/samples/dci/src/test/java/org/apache/zest/dci/moneytransfer/test/AccountIds.java
----------------------------------------------------------------------
diff --git a/samples/dci/src/test/java/org/apache/zest/dci/moneytransfer/test/AccountIds.java b/samples/dci/src/test/java/org/apache/zest/dci/moneytransfer/test/AccountIds.java
index 437c551..cd34a9e 100644
--- a/samples/dci/src/test/java/org/apache/zest/dci/moneytransfer/test/AccountIds.java
+++ b/samples/dci/src/test/java/org/apache/zest/dci/moneytransfer/test/AccountIds.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.apache.zest.dci.moneytransfer.test;
import org.apache.zest.api.identity.Identity;