Repository: zest-java Updated Branches: refs/heads/develop 3c6c11f4d -> 30f555958
lib/scheduler: minor edits (unused imports, final members etc..) Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/3330314c Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/3330314c Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/3330314c Branch: refs/heads/develop Commit: 3330314c5158e1fed1f3fdb542c56561a06b90e7 Parents: 3c6c11f Author: Paul Merlin <[email protected]> Authored: Mon Nov 16 18:40:08 2015 +0100 Committer: Paul Merlin <[email protected]> Committed: Mon Nov 16 18:40:08 2015 +0100 ---------------------------------------------------------------------- .../zest/library/scheduler/ScheduleFactory.java | 2 -- .../library/scheduler/defaults/package.html | 21 ++++++++++++++++++++ .../library/scheduler/internal/Execution.java | 1 + .../scheduler/internal/ScheduleTime.java | 4 ++-- .../scheduler/internal/SchedulerMixin.java | 2 +- .../library/scheduler/internal/package.html | 21 ++++++++++++++++++++ .../library/scheduler/CronScheduleTest.java | 10 ++-------- 7 files changed, 48 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zest-java/blob/3330314c/libraries/scheduler/src/main/java/org/apache/zest/library/scheduler/ScheduleFactory.java ---------------------------------------------------------------------- diff --git a/libraries/scheduler/src/main/java/org/apache/zest/library/scheduler/ScheduleFactory.java b/libraries/scheduler/src/main/java/org/apache/zest/library/scheduler/ScheduleFactory.java index e891814..caaae9e 100644 --- a/libraries/scheduler/src/main/java/org/apache/zest/library/scheduler/ScheduleFactory.java +++ b/libraries/scheduler/src/main/java/org/apache/zest/library/scheduler/ScheduleFactory.java @@ -22,11 +22,9 @@ package org.apache.zest.library.scheduler; import org.apache.zest.api.concern.Concerns; import org.apache.zest.api.unitofwork.concern.UnitOfWorkConcern; import org.apache.zest.api.unitofwork.concern.UnitOfWorkPropagation; -import org.apache.zest.library.scheduler.Schedule; import org.apache.zest.library.scheduler.defaults.DefaultScheduleFactoryMixin; import org.joda.time.DateTime; import org.apache.zest.api.mixin.Mixins; -import org.apache.zest.library.scheduler.Task; import static org.apache.zest.api.unitofwork.concern.UnitOfWorkPropagation.Propagation.MANDATORY; http://git-wip-us.apache.org/repos/asf/zest-java/blob/3330314c/libraries/scheduler/src/main/java/org/apache/zest/library/scheduler/defaults/package.html ---------------------------------------------------------------------- diff --git a/libraries/scheduler/src/main/java/org/apache/zest/library/scheduler/defaults/package.html b/libraries/scheduler/src/main/java/org/apache/zest/library/scheduler/defaults/package.html new file mode 100644 index 0000000..647957c --- /dev/null +++ b/libraries/scheduler/src/main/java/org/apache/zest/library/scheduler/defaults/package.html @@ -0,0 +1,21 @@ +<!-- +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>Scheduler Defaults.</h2> + </body> +</html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/zest-java/blob/3330314c/libraries/scheduler/src/main/java/org/apache/zest/library/scheduler/internal/Execution.java ---------------------------------------------------------------------- diff --git a/libraries/scheduler/src/main/java/org/apache/zest/library/scheduler/internal/Execution.java b/libraries/scheduler/src/main/java/org/apache/zest/library/scheduler/internal/Execution.java index a92ee2b..5fd4c5e 100644 --- a/libraries/scheduler/src/main/java/org/apache/zest/library/scheduler/internal/Execution.java +++ b/libraries/scheduler/src/main/java/org/apache/zest/library/scheduler/internal/Execution.java @@ -203,6 +203,7 @@ public interface Execution this.taskExecutor.submit( taskRunner ); } + @Override public void dispatchForExecution( Schedule schedule ) { long now = System.currentTimeMillis(); http://git-wip-us.apache.org/repos/asf/zest-java/blob/3330314c/libraries/scheduler/src/main/java/org/apache/zest/library/scheduler/internal/ScheduleTime.java ---------------------------------------------------------------------- diff --git a/libraries/scheduler/src/main/java/org/apache/zest/library/scheduler/internal/ScheduleTime.java b/libraries/scheduler/src/main/java/org/apache/zest/library/scheduler/internal/ScheduleTime.java index b008de7..6d3c25b 100644 --- a/libraries/scheduler/src/main/java/org/apache/zest/library/scheduler/internal/ScheduleTime.java +++ b/libraries/scheduler/src/main/java/org/apache/zest/library/scheduler/internal/ScheduleTime.java @@ -24,8 +24,8 @@ import org.apache.zest.api.util.NullArgumentException; public final class ScheduleTime implements Comparable<ScheduleTime> { - private String scheduleIdentity; - private long nextTime; + private final String scheduleIdentity; + private final long nextTime; public ScheduleTime( String scheduleIdentity, long nextTime ) { http://git-wip-us.apache.org/repos/asf/zest-java/blob/3330314c/libraries/scheduler/src/main/java/org/apache/zest/library/scheduler/internal/SchedulerMixin.java ---------------------------------------------------------------------- diff --git a/libraries/scheduler/src/main/java/org/apache/zest/library/scheduler/internal/SchedulerMixin.java b/libraries/scheduler/src/main/java/org/apache/zest/library/scheduler/internal/SchedulerMixin.java index 3afafa5..4f2272b 100644 --- a/libraries/scheduler/src/main/java/org/apache/zest/library/scheduler/internal/SchedulerMixin.java +++ b/libraries/scheduler/src/main/java/org/apache/zest/library/scheduler/internal/SchedulerMixin.java @@ -121,7 +121,7 @@ public class SchedulerMixin public void cancelSchedule( String scheduleId ) { UnitOfWork uow = module.currentUnitOfWork(); - Schedule schedule = null; + Schedule schedule; try { schedule = uow.get( Schedule.class, scheduleId ); http://git-wip-us.apache.org/repos/asf/zest-java/blob/3330314c/libraries/scheduler/src/main/java/org/apache/zest/library/scheduler/internal/package.html ---------------------------------------------------------------------- diff --git a/libraries/scheduler/src/main/java/org/apache/zest/library/scheduler/internal/package.html b/libraries/scheduler/src/main/java/org/apache/zest/library/scheduler/internal/package.html new file mode 100644 index 0000000..8c42364 --- /dev/null +++ b/libraries/scheduler/src/main/java/org/apache/zest/library/scheduler/internal/package.html @@ -0,0 +1,21 @@ +<!-- +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>Scheduler Internals.</h2> + </body> +</html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/zest-java/blob/3330314c/libraries/scheduler/src/test/java/org/apache/zest/library/scheduler/CronScheduleTest.java ---------------------------------------------------------------------- diff --git a/libraries/scheduler/src/test/java/org/apache/zest/library/scheduler/CronScheduleTest.java b/libraries/scheduler/src/test/java/org/apache/zest/library/scheduler/CronScheduleTest.java index ad210a2..8166e32 100644 --- a/libraries/scheduler/src/test/java/org/apache/zest/library/scheduler/CronScheduleTest.java +++ b/libraries/scheduler/src/test/java/org/apache/zest/library/scheduler/CronScheduleTest.java @@ -22,13 +22,10 @@ package org.apache.zest.library.scheduler; import org.apache.zest.api.entity.EntityBuilder; 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.apache.zest.test.EntityTestAssembler; import org.joda.time.DateTime; import org.junit.Test; @@ -41,10 +38,7 @@ public class CronScheduleTest extends AbstractZestTest public void assemble( ModuleAssembly module ) throws AssemblyException { - module.services( OrgJsonValueSerializationService.class ) - .taggedWith( ValueSerialization.Formats.JSON ); - module.services( MemoryEntityStoreService.class ); - module.services( UuidIdentityGeneratorService.class ); + new EntityTestAssembler().assemble( module ); module.entities( CronSchedule.class ); module.entities( Task.class ).withMixins( DummyTask.class ); }
