Repository: isis Updated Branches: refs/heads/master 56616d327 -> 0d9b74aa5
ISIS-928: optimize imports for todoapp and simpleapp... don't use wildcards. This addresses the issue for Eclipse/Java 8 compiler of the type 'Optional' being ambiguous in java.util.* and org.apache.isis.applib.annotation.* Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/b3e936c9 Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/b3e936c9 Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/b3e936c9 Branch: refs/heads/master Commit: b3e936c9aae28754fb46c2df52b1cb9b023f9ab8 Parents: 56616d3 Author: Dan Haywood <[email protected]> Authored: Sat Nov 15 10:25:56 2014 +0000 Committer: Dan Haywood <[email protected]> Committed: Sat Nov 15 10:25:56 2014 +0000 ---------------------------------------------------------------------- .../src/main/java/dom/simple/SimpleObjects.java | 1 - .../java/dom/simple/SimpleObjectTest_name.java | 6 ++--- .../dom/simple/SimpleObjectsTest_create.java | 12 ++++----- .../dom/simple/SimpleObjectsTest_listAll.java | 9 +++---- .../integration/glue/BootstrappingGlue.java | 2 +- .../glue/simple/SimpleObjectGlue.java | 12 ++++----- .../integration/tests/SimpleAppIntegTest.java | 1 - .../src/main/java/webapp/SimpleApplication.java | 1 - .../dom/src/main/java/app/ToDoAppDashboard.java | 1 - .../dom/src/main/java/app/ToDoItemAnalysis.java | 8 +++++- .../java/app/ToDoItemAnalysisContributions.java | 6 ++++- .../java/app/ToDoItemsByCategoryViewModel.java | 7 ++++- .../java/app/ToDoItemsByDateRangeViewModel.java | 17 ++++++------ .../dom/src/main/java/dom/todo/ToDoItem.java | 27 ++++++++++++++++++-- .../java/dom/todo/ToDoItemContributions.java | 11 +++++++- .../java/dom/todo/ToDoItemSubscriptions.java | 8 +++++- .../dom/src/main/java/dom/todo/ToDoItems.java | 11 +++++++- .../src/test/java/dom/todo/ToDoItemTest.java | 4 ++- .../fixture/todo/ToDoItemsFixturesService.java | 9 ++++++- .../integration/glue/BootstrappingGlue.java | 5 +--- .../integration/glue/CatalogOfFixturesGlue.java | 1 - .../integration/glue/todoitem/ToDoItemGlue.java | 21 ++++++--------- .../integration/tests/ToDoItemIntegTest.java | 13 ++++++++-- .../integration/tests/ToDoItemsIntegTest.java | 1 - .../prototyping/ExternalLinksService.java | 8 ++++-- 25 files changed, 133 insertions(+), 69 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/isis/blob/b3e936c9/example/application/simpleapp/dom/src/main/java/dom/simple/SimpleObjects.java ---------------------------------------------------------------------- diff --git a/example/application/simpleapp/dom/src/main/java/dom/simple/SimpleObjects.java b/example/application/simpleapp/dom/src/main/java/dom/simple/SimpleObjects.java index b3faaf0..264435c 100644 --- a/example/application/simpleapp/dom/src/main/java/dom/simple/SimpleObjects.java +++ b/example/application/simpleapp/dom/src/main/java/dom/simple/SimpleObjects.java @@ -19,7 +19,6 @@ package dom.simple; import java.util.List; - import org.apache.isis.applib.DomainObjectContainer; import org.apache.isis.applib.annotation.ActionSemantics; import org.apache.isis.applib.annotation.ActionSemantics.Of; http://git-wip-us.apache.org/repos/asf/isis/blob/b3e936c9/example/application/simpleapp/dom/src/test/java/dom/simple/SimpleObjectTest_name.java ---------------------------------------------------------------------- diff --git a/example/application/simpleapp/dom/src/test/java/dom/simple/SimpleObjectTest_name.java b/example/application/simpleapp/dom/src/test/java/dom/simple/SimpleObjectTest_name.java index 46f1a15..ac1905b 100644 --- a/example/application/simpleapp/dom/src/test/java/dom/simple/SimpleObjectTest_name.java +++ b/example/application/simpleapp/dom/src/test/java/dom/simple/SimpleObjectTest_name.java @@ -16,13 +16,13 @@ */ package dom.simple; +import org.junit.Before; +import org.junit.Test; + import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.nullValue; import static org.junit.Assert.assertThat; -import org.junit.Before; -import org.junit.Test; - public class SimpleObjectTest_name { private SimpleObject simpleObject; http://git-wip-us.apache.org/repos/asf/isis/blob/b3e936c9/example/application/simpleapp/dom/src/test/java/dom/simple/SimpleObjectsTest_create.java ---------------------------------------------------------------------- diff --git a/example/application/simpleapp/dom/src/test/java/dom/simple/SimpleObjectsTest_create.java b/example/application/simpleapp/dom/src/test/java/dom/simple/SimpleObjectsTest_create.java index ead1de9..4fcb268 100644 --- a/example/application/simpleapp/dom/src/test/java/dom/simple/SimpleObjectsTest_create.java +++ b/example/application/simpleapp/dom/src/test/java/dom/simple/SimpleObjectsTest_create.java @@ -16,18 +16,18 @@ */ package dom.simple; -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; - -import org.apache.isis.applib.DomainObjectContainer; -import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2; -import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode; import org.jmock.Expectations; import org.jmock.Sequence; import org.jmock.auto.Mock; import org.junit.Before; import org.junit.Rule; import org.junit.Test; +import org.apache.isis.applib.DomainObjectContainer; +import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2; +import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode; + +import static org.hamcrest.CoreMatchers.is; +import static org.junit.Assert.assertThat; public class SimpleObjectsTest_create { http://git-wip-us.apache.org/repos/asf/isis/blob/b3e936c9/example/application/simpleapp/dom/src/test/java/dom/simple/SimpleObjectsTest_listAll.java ---------------------------------------------------------------------- diff --git a/example/application/simpleapp/dom/src/test/java/dom/simple/SimpleObjectsTest_listAll.java b/example/application/simpleapp/dom/src/test/java/dom/simple/SimpleObjectsTest_listAll.java index d970432..8a1ffbd 100644 --- a/example/application/simpleapp/dom/src/test/java/dom/simple/SimpleObjectsTest_listAll.java +++ b/example/application/simpleapp/dom/src/test/java/dom/simple/SimpleObjectsTest_listAll.java @@ -16,23 +16,20 @@ */ package dom.simple; -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; - import java.util.List; - import com.google.common.collect.Lists; - import org.jmock.Expectations; import org.jmock.auto.Mock; import org.junit.Before; import org.junit.Rule; import org.junit.Test; - import org.apache.isis.applib.DomainObjectContainer; import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2; import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode; +import static org.hamcrest.CoreMatchers.is; +import static org.junit.Assert.assertThat; + public class SimpleObjectsTest_listAll { @Rule http://git-wip-us.apache.org/repos/asf/isis/blob/b3e936c9/example/application/simpleapp/integtests/src/test/java/integration/glue/BootstrappingGlue.java ---------------------------------------------------------------------- diff --git a/example/application/simpleapp/integtests/src/test/java/integration/glue/BootstrappingGlue.java b/example/application/simpleapp/integtests/src/test/java/integration/glue/BootstrappingGlue.java index d883763..1950881 100644 --- a/example/application/simpleapp/integtests/src/test/java/integration/glue/BootstrappingGlue.java +++ b/example/application/simpleapp/integtests/src/test/java/integration/glue/BootstrappingGlue.java @@ -16,9 +16,9 @@ O * Licensed to the Apache Software Foundation (ASF) under one or more */ package integration.glue; -import integration.SimpleAppSystemInitializer; import cucumber.api.java.After; import cucumber.api.java.Before; +import integration.SimpleAppSystemInitializer; import org.apache.isis.core.specsupport.scenarios.ScenarioExecutionScope; import org.apache.isis.core.specsupport.specs.CukeGlueAbstract; http://git-wip-us.apache.org/repos/asf/isis/blob/b3e936c9/example/application/simpleapp/integtests/src/test/java/integration/glue/simple/SimpleObjectGlue.java ---------------------------------------------------------------------- diff --git a/example/application/simpleapp/integtests/src/test/java/integration/glue/simple/SimpleObjectGlue.java b/example/application/simpleapp/integtests/src/test/java/integration/glue/simple/SimpleObjectGlue.java index 3a40b16..13831ae 100644 --- a/example/application/simpleapp/integtests/src/test/java/integration/glue/simple/SimpleObjectGlue.java +++ b/example/application/simpleapp/integtests/src/test/java/integration/glue/simple/SimpleObjectGlue.java @@ -16,25 +16,23 @@ */ package integration.glue.simple; -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; - -import java.util.List; -import java.util.UUID; - import cucumber.api.java.en.Given; import cucumber.api.java.en.When; import dom.simple.SimpleObject; import dom.simple.SimpleObjects; +import java.util.List; +import java.util.UUID; import org.hamcrest.Description; import org.jmock.Expectations; import org.jmock.api.Action; import org.jmock.api.Invocation; - import org.apache.isis.core.specsupport.scenarios.InMemoryDB; import org.apache.isis.core.specsupport.specs.CukeGlueAbstract; +import static org.hamcrest.CoreMatchers.is; +import static org.junit.Assert.assertThat; + public class SimpleObjectGlue extends CukeGlueAbstract { @Given("^there are.* (\\d+) simple objects$") http://git-wip-us.apache.org/repos/asf/isis/blob/b3e936c9/example/application/simpleapp/integtests/src/test/java/integration/tests/SimpleAppIntegTest.java ---------------------------------------------------------------------- diff --git a/example/application/simpleapp/integtests/src/test/java/integration/tests/SimpleAppIntegTest.java b/example/application/simpleapp/integtests/src/test/java/integration/tests/SimpleAppIntegTest.java index 301678b..634476c 100644 --- a/example/application/simpleapp/integtests/src/test/java/integration/tests/SimpleAppIntegTest.java +++ b/example/application/simpleapp/integtests/src/test/java/integration/tests/SimpleAppIntegTest.java @@ -21,7 +21,6 @@ package integration.tests; import integration.SimpleAppSystemInitializer; import org.junit.BeforeClass; - import org.apache.isis.core.integtestsupport.IntegrationTestAbstract; import org.apache.isis.core.integtestsupport.scenarios.ScenarioExecutionForIntegration; http://git-wip-us.apache.org/repos/asf/isis/blob/b3e936c9/example/application/simpleapp/webapp/src/main/java/webapp/SimpleApplication.java ---------------------------------------------------------------------- diff --git a/example/application/simpleapp/webapp/src/main/java/webapp/SimpleApplication.java b/example/application/simpleapp/webapp/src/main/java/webapp/SimpleApplication.java index fa557ea..439806a 100644 --- a/example/application/simpleapp/webapp/src/main/java/webapp/SimpleApplication.java +++ b/example/application/simpleapp/webapp/src/main/java/webapp/SimpleApplication.java @@ -40,7 +40,6 @@ import org.apache.wicket.request.IRequestParameters; import org.apache.wicket.request.Request; import org.apache.wicket.request.Response; import org.apache.wicket.request.http.WebRequest; - import org.apache.isis.viewer.wicket.viewer.IsisWicketApplication; import org.apache.isis.viewer.wicket.viewer.integration.wicket.AuthenticatedWebSessionForIsis; http://git-wip-us.apache.org/repos/asf/isis/blob/b3e936c9/example/application/todoapp/dom/src/main/java/app/ToDoAppDashboard.java ---------------------------------------------------------------------- diff --git a/example/application/todoapp/dom/src/main/java/app/ToDoAppDashboard.java b/example/application/todoapp/dom/src/main/java/app/ToDoAppDashboard.java index 9204605..47210ff 100644 --- a/example/application/todoapp/dom/src/main/java/app/ToDoAppDashboard.java +++ b/example/application/todoapp/dom/src/main/java/app/ToDoAppDashboard.java @@ -19,7 +19,6 @@ package app; import java.util.List; - import org.apache.isis.applib.AbstractViewModel; import org.apache.isis.applib.annotation.Disabled; import org.apache.isis.applib.annotation.Named; http://git-wip-us.apache.org/repos/asf/isis/blob/b3e936c9/example/application/todoapp/dom/src/main/java/app/ToDoItemAnalysis.java ---------------------------------------------------------------------- diff --git a/example/application/todoapp/dom/src/main/java/app/ToDoItemAnalysis.java b/example/application/todoapp/dom/src/main/java/app/ToDoItemAnalysis.java index 4126c5c..ebbcc5d 100644 --- a/example/application/todoapp/dom/src/main/java/app/ToDoItemAnalysis.java +++ b/example/application/todoapp/dom/src/main/java/app/ToDoItemAnalysis.java @@ -26,8 +26,14 @@ import com.google.common.base.Function; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import org.apache.isis.applib.DomainObjectContainer; -import org.apache.isis.applib.annotation.*; +import org.apache.isis.applib.annotation.ActionSemantics; import org.apache.isis.applib.annotation.ActionSemantics.Of; +import org.apache.isis.applib.annotation.Bookmarkable; +import org.apache.isis.applib.annotation.CssClassFa; +import org.apache.isis.applib.annotation.DomainService; +import org.apache.isis.applib.annotation.MemberOrder; +import org.apache.isis.applib.annotation.Named; +import org.apache.isis.applib.annotation.Programmatic; @Named("Analysis") @DomainService(menuOrder = "20") http://git-wip-us.apache.org/repos/asf/isis/blob/b3e936c9/example/application/todoapp/dom/src/main/java/app/ToDoItemAnalysisContributions.java ---------------------------------------------------------------------- diff --git a/example/application/todoapp/dom/src/main/java/app/ToDoItemAnalysisContributions.java b/example/application/todoapp/dom/src/main/java/app/ToDoItemAnalysisContributions.java index 7ba3336..b61daf4 100644 --- a/example/application/todoapp/dom/src/main/java/app/ToDoItemAnalysisContributions.java +++ b/example/application/todoapp/dom/src/main/java/app/ToDoItemAnalysisContributions.java @@ -20,9 +20,13 @@ package app; import dom.todo.ToDoItem; -import org.apache.isis.applib.annotation.*; +import org.apache.isis.applib.annotation.ActionSemantics; import org.apache.isis.applib.annotation.ActionSemantics.Of; +import org.apache.isis.applib.annotation.DomainService; +import org.apache.isis.applib.annotation.Hidden; +import org.apache.isis.applib.annotation.NotContributed; import org.apache.isis.applib.annotation.NotContributed.As; +import org.apache.isis.applib.annotation.NotInServiceMenu; @DomainService @Hidden http://git-wip-us.apache.org/repos/asf/isis/blob/b3e936c9/example/application/todoapp/dom/src/main/java/app/ToDoItemsByCategoryViewModel.java ---------------------------------------------------------------------- diff --git a/example/application/todoapp/dom/src/main/java/app/ToDoItemsByCategoryViewModel.java b/example/application/todoapp/dom/src/main/java/app/ToDoItemsByCategoryViewModel.java index 2129bb6..19abcac 100644 --- a/example/application/todoapp/dom/src/main/java/app/ToDoItemsByCategoryViewModel.java +++ b/example/application/todoapp/dom/src/main/java/app/ToDoItemsByCategoryViewModel.java @@ -30,8 +30,13 @@ import com.google.common.base.Joiner; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import org.apache.isis.applib.DomainObjectContainer; -import org.apache.isis.applib.annotation.*; +import org.apache.isis.applib.annotation.Bookmarkable; +import org.apache.isis.applib.annotation.MultiLine; +import org.apache.isis.applib.annotation.Named; +import org.apache.isis.applib.annotation.Render; import org.apache.isis.applib.annotation.Render.Type; +import org.apache.isis.applib.annotation.Title; +import org.apache.isis.applib.annotation.ViewModel; import org.apache.isis.applib.util.ObjectContracts; @Named("By Category") http://git-wip-us.apache.org/repos/asf/isis/blob/b3e936c9/example/application/todoapp/dom/src/main/java/app/ToDoItemsByDateRangeViewModel.java ---------------------------------------------------------------------- diff --git a/example/application/todoapp/dom/src/main/java/app/ToDoItemsByDateRangeViewModel.java b/example/application/todoapp/dom/src/main/java/app/ToDoItemsByDateRangeViewModel.java index 4768e14..12291af 100644 --- a/example/application/todoapp/dom/src/main/java/app/ToDoItemsByDateRangeViewModel.java +++ b/example/application/todoapp/dom/src/main/java/app/ToDoItemsByDateRangeViewModel.java @@ -18,23 +18,22 @@ */ package app; -import java.util.List; - import app.ToDoItemAnalysis.DateRange; +import dom.todo.ToDoItem; +import dom.todo.ToDoItems; +import java.util.List; import com.google.common.base.Objects; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; - -import dom.todo.ToDoItem; -import dom.todo.ToDoItems; - import org.joda.time.DateTime; - -import org.apache.isis.applib.AbstractViewModel; -import org.apache.isis.applib.annotation.*; +import org.apache.isis.applib.annotation.Bookmarkable; +import org.apache.isis.applib.annotation.Named; +import org.apache.isis.applib.annotation.Render; import org.apache.isis.applib.annotation.Render.Type; +import org.apache.isis.applib.annotation.Title; +import org.apache.isis.applib.annotation.ViewModel; import org.apache.isis.applib.services.clock.ClockService; import org.apache.isis.applib.util.ObjectContracts; http://git-wip-us.apache.org/repos/asf/isis/blob/b3e936c9/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItem.java ---------------------------------------------------------------------- diff --git a/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItem.java b/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItem.java index 8768a74..0adcbc4 100644 --- a/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItem.java +++ b/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItem.java @@ -21,7 +21,13 @@ package dom.todo; import java.math.BigDecimal; import java.net.MalformedURLException; import java.net.URL; -import java.util.*; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; +import java.util.SortedSet; +import java.util.TreeSet; import javax.jdo.JDOHelper; import javax.jdo.annotations.IdentityType; import javax.jdo.annotations.VersionStrategy; @@ -33,10 +39,27 @@ import org.apache.isis.applib.DomainObjectContainer; import org.apache.isis.applib.Identifier; import org.apache.isis.applib.NonRecoverableException; import org.apache.isis.applib.RecoverableException; -import org.apache.isis.applib.annotation.*; +import org.apache.isis.applib.annotation.ActionInteraction; +import org.apache.isis.applib.annotation.ActionSemantics; import org.apache.isis.applib.annotation.ActionSemantics.Of; +import org.apache.isis.applib.annotation.AutoComplete; +import org.apache.isis.applib.annotation.Bookmarkable; +import org.apache.isis.applib.annotation.Bulk; import org.apache.isis.applib.annotation.Bulk.AppliesTo; import org.apache.isis.applib.annotation.Bulk.InteractionContext.InvokedAs; +import org.apache.isis.applib.annotation.CollectionInteraction; +import org.apache.isis.applib.annotation.Disabled; +import org.apache.isis.applib.annotation.Hidden; +import org.apache.isis.applib.annotation.MinLength; +import org.apache.isis.applib.annotation.Named; +import org.apache.isis.applib.annotation.ObjectType; +import org.apache.isis.applib.annotation.Optional; +import org.apache.isis.applib.annotation.Programmatic; +import org.apache.isis.applib.annotation.PropertyInteraction; +import org.apache.isis.applib.annotation.Prototype; +import org.apache.isis.applib.annotation.RegEx; +import org.apache.isis.applib.annotation.SortedBy; +import org.apache.isis.applib.annotation.TypicalLength; import org.apache.isis.applib.security.UserMemento; import org.apache.isis.applib.services.eventbus.ActionInteractionEvent; import org.apache.isis.applib.services.eventbus.EventBusService; http://git-wip-us.apache.org/repos/asf/isis/blob/b3e936c9/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItemContributions.java ---------------------------------------------------------------------- diff --git a/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItemContributions.java b/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItemContributions.java index 71d9142..011ed2b 100644 --- a/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItemContributions.java +++ b/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItemContributions.java @@ -30,9 +30,18 @@ import com.google.common.collect.Lists; import com.google.common.collect.Ordering; import org.joda.time.LocalDate; import org.apache.isis.applib.AbstractFactoryAndRepository; -import org.apache.isis.applib.annotation.*; +import org.apache.isis.applib.annotation.ActionSemantics; import org.apache.isis.applib.annotation.ActionSemantics.Of; +import org.apache.isis.applib.annotation.DescribedAs; +import org.apache.isis.applib.annotation.Disabled; +import org.apache.isis.applib.annotation.DomainService; +import org.apache.isis.applib.annotation.Hidden; +import org.apache.isis.applib.annotation.Named; +import org.apache.isis.applib.annotation.NotContributed; import org.apache.isis.applib.annotation.NotContributed.As; +import org.apache.isis.applib.annotation.NotInServiceMenu; +import org.apache.isis.applib.annotation.Optional; +import org.apache.isis.applib.annotation.Where; import org.apache.isis.applib.query.QueryDefault; import org.apache.isis.applib.services.queryresultscache.QueryResultsCache; http://git-wip-us.apache.org/repos/asf/isis/blob/b3e936c9/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItemSubscriptions.java ---------------------------------------------------------------------- diff --git a/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItemSubscriptions.java b/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItemSubscriptions.java index d2fce51..f68616d 100644 --- a/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItemSubscriptions.java +++ b/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItemSubscriptions.java @@ -29,7 +29,13 @@ import com.google.common.eventbus.Subscribe; import org.apache.isis.applib.DomainObjectContainer; import org.apache.isis.applib.NonRecoverableException; import org.apache.isis.applib.RecoverableException; -import org.apache.isis.applib.annotation.*; +import org.apache.isis.applib.annotation.ActionSemantics; +import org.apache.isis.applib.annotation.DomainService; +import org.apache.isis.applib.annotation.MemberOrder; +import org.apache.isis.applib.annotation.Named; +import org.apache.isis.applib.annotation.NotContributed; +import org.apache.isis.applib.annotation.Programmatic; +import org.apache.isis.applib.annotation.Prototype; import org.apache.isis.applib.services.eventbus.ActionInteractionEvent; import org.apache.isis.applib.services.eventbus.CollectionInteractionEvent; import org.apache.isis.applib.services.eventbus.EventBusService; http://git-wip-us.apache.org/repos/asf/isis/blob/b3e936c9/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItems.java ---------------------------------------------------------------------- diff --git a/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItems.java b/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItems.java index 6452f6e..bc0aeaa 100644 --- a/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItems.java +++ b/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItems.java @@ -26,8 +26,17 @@ import java.util.List; import com.google.common.base.Predicates; import org.joda.time.LocalDate; import org.apache.isis.applib.DomainObjectContainer; -import org.apache.isis.applib.annotation.*; +import org.apache.isis.applib.annotation.ActionSemantics; import org.apache.isis.applib.annotation.ActionSemantics.Of; +import org.apache.isis.applib.annotation.Bookmarkable; +import org.apache.isis.applib.annotation.CssClassFa; +import org.apache.isis.applib.annotation.DomainService; +import org.apache.isis.applib.annotation.MemberOrder; +import org.apache.isis.applib.annotation.Named; +import org.apache.isis.applib.annotation.Optional; +import org.apache.isis.applib.annotation.Programmatic; +import org.apache.isis.applib.annotation.Prototype; +import org.apache.isis.applib.annotation.RegEx; import org.apache.isis.applib.query.QueryDefault; import org.apache.isis.applib.services.clock.ClockService; http://git-wip-us.apache.org/repos/asf/isis/blob/b3e936c9/example/application/todoapp/dom/src/test/java/dom/todo/ToDoItemTest.java ---------------------------------------------------------------------- diff --git a/example/application/todoapp/dom/src/test/java/dom/todo/ToDoItemTest.java b/example/application/todoapp/dom/src/test/java/dom/todo/ToDoItemTest.java index c0cc4b7..63512c1 100644 --- a/example/application/todoapp/dom/src/test/java/dom/todo/ToDoItemTest.java +++ b/example/application/todoapp/dom/src/test/java/dom/todo/ToDoItemTest.java @@ -25,7 +25,9 @@ import org.apache.isis.applib.services.eventbus.EventBusService; import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2; import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode; -import static org.hamcrest.CoreMatchers.*; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.not; +import static org.hamcrest.CoreMatchers.nullValue; import static org.junit.Assert.assertThat; public abstract class ToDoItemTest { http://git-wip-us.apache.org/repos/asf/isis/blob/b3e936c9/example/application/todoapp/fixture/src/main/java/fixture/todo/ToDoItemsFixturesService.java ---------------------------------------------------------------------- diff --git a/example/application/todoapp/fixture/src/main/java/fixture/todo/ToDoItemsFixturesService.java b/example/application/todoapp/fixture/src/main/java/fixture/todo/ToDoItemsFixturesService.java index ff47aef..137e12a 100644 --- a/example/application/todoapp/fixture/src/main/java/fixture/todo/ToDoItemsFixturesService.java +++ b/example/application/todoapp/fixture/src/main/java/fixture/todo/ToDoItemsFixturesService.java @@ -21,7 +21,14 @@ package fixture.todo; import fixture.todo.scenarios.RecreateToDoItemsAndCompleteSeveralForCurrent; import java.util.List; -import org.apache.isis.applib.annotation.*; +import org.apache.isis.applib.annotation.CssClassFa; +import org.apache.isis.applib.annotation.DescribedAs; +import org.apache.isis.applib.annotation.DomainService; +import org.apache.isis.applib.annotation.MemberOrder; +import org.apache.isis.applib.annotation.MultiLine; +import org.apache.isis.applib.annotation.Named; +import org.apache.isis.applib.annotation.Optional; +import org.apache.isis.applib.annotation.Prototype; import org.apache.isis.applib.fixturescripts.FixtureResult; import org.apache.isis.applib.fixturescripts.FixtureScript; import org.apache.isis.applib.fixturescripts.FixtureScripts; http://git-wip-us.apache.org/repos/asf/isis/blob/b3e936c9/example/application/todoapp/integtests/src/test/java/integration/glue/BootstrappingGlue.java ---------------------------------------------------------------------- diff --git a/example/application/todoapp/integtests/src/test/java/integration/glue/BootstrappingGlue.java b/example/application/todoapp/integtests/src/test/java/integration/glue/BootstrappingGlue.java index 7583d93..0c92dac 100644 --- a/example/application/todoapp/integtests/src/test/java/integration/glue/BootstrappingGlue.java +++ b/example/application/todoapp/integtests/src/test/java/integration/glue/BootstrappingGlue.java @@ -16,12 +16,9 @@ */ package integration.glue; -import integration.ToDoSystemInitializer; import cucumber.api.java.After; import cucumber.api.java.Before; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import integration.ToDoSystemInitializer; import org.apache.isis.core.specsupport.scenarios.ScenarioExecutionScope; import org.apache.isis.core.specsupport.specs.CukeGlueAbstract; http://git-wip-us.apache.org/repos/asf/isis/blob/b3e936c9/example/application/todoapp/integtests/src/test/java/integration/glue/CatalogOfFixturesGlue.java ---------------------------------------------------------------------- diff --git a/example/application/todoapp/integtests/src/test/java/integration/glue/CatalogOfFixturesGlue.java b/example/application/todoapp/integtests/src/test/java/integration/glue/CatalogOfFixturesGlue.java index e02e25b..01e5776 100644 --- a/example/application/todoapp/integtests/src/test/java/integration/glue/CatalogOfFixturesGlue.java +++ b/example/application/todoapp/integtests/src/test/java/integration/glue/CatalogOfFixturesGlue.java @@ -19,7 +19,6 @@ package integration.glue; import cucumber.api.java.Before; import dom.todo.ToDoItem; import fixture.todo.integtests.ToDoItemsIntegTestFixture; -import fixture.todo.scenarios.RecreateToDoItemsAndCompleteSeveralForCurrent; import org.apache.isis.core.specsupport.scenarios.InMemoryDB; import org.apache.isis.core.specsupport.specs.CukeGlueAbstract; http://git-wip-us.apache.org/repos/asf/isis/blob/b3e936c9/example/application/todoapp/integtests/src/test/java/integration/glue/todoitem/ToDoItemGlue.java ---------------------------------------------------------------------- diff --git a/example/application/todoapp/integtests/src/test/java/integration/glue/todoitem/ToDoItemGlue.java b/example/application/todoapp/integtests/src/test/java/integration/glue/todoitem/ToDoItemGlue.java index e3abf9a..1997ce1 100644 --- a/example/application/todoapp/integtests/src/test/java/integration/glue/todoitem/ToDoItemGlue.java +++ b/example/application/todoapp/integtests/src/test/java/integration/glue/todoitem/ToDoItemGlue.java @@ -16,32 +16,27 @@ */ package integration.glue.todoitem; -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; - -import java.util.Collections; -import java.util.List; - -import com.google.common.base.Predicate; -import com.google.common.base.Predicates; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; - import cucumber.api.java.en.Given; import cucumber.api.java.en.Then; import cucumber.api.java.en.When; import dom.todo.ToDoItem; import dom.todo.ToDoItems; +import java.util.List; +import com.google.common.base.Predicate; +import com.google.common.base.Predicates; +import com.google.common.collect.Iterables; +import com.google.common.collect.Lists; import org.jmock.Expectations; import org.junit.Assert; - import org.apache.isis.applib.annotation.Bulk; -import org.apache.isis.applib.annotation.Bulk.InteractionContext; import org.apache.isis.applib.services.eventbus.EventBusService; import org.apache.isis.core.specsupport.scenarios.InMemoryDB; import org.apache.isis.core.specsupport.specs.CukeGlueAbstract; +import static org.hamcrest.CoreMatchers.is; +import static org.junit.Assert.assertThat; + public class ToDoItemGlue extends CukeGlueAbstract { @Given("^there are a number of incomplete ToDo items$") http://git-wip-us.apache.org/repos/asf/isis/blob/b3e936c9/example/application/todoapp/integtests/src/test/java/integration/tests/ToDoItemIntegTest.java ---------------------------------------------------------------------- diff --git a/example/application/todoapp/integtests/src/test/java/integration/tests/ToDoItemIntegTest.java b/example/application/todoapp/integtests/src/test/java/integration/tests/ToDoItemIntegTest.java index d95c2ee..9bfdba9 100644 --- a/example/application/todoapp/integtests/src/test/java/integration/tests/ToDoItemIntegTest.java +++ b/example/application/todoapp/integtests/src/test/java/integration/tests/ToDoItemIntegTest.java @@ -44,10 +44,19 @@ import org.apache.isis.applib.RecoverableException; import org.apache.isis.applib.clock.Clock; import org.apache.isis.applib.fixturescripts.FixtureScripts; import org.apache.isis.applib.services.clock.ClockService; -import org.apache.isis.applib.services.eventbus.*; +import org.apache.isis.applib.services.eventbus.AbstractInteractionEvent; +import org.apache.isis.applib.services.eventbus.ActionInteractionEvent; +import org.apache.isis.applib.services.eventbus.CollectionInteractionEvent; +import org.apache.isis.applib.services.eventbus.EventBusService; +import org.apache.isis.applib.services.eventbus.PropertyInteractionEvent; import org.apache.isis.applib.value.Blob; -import static org.hamcrest.CoreMatchers.*; +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.not; +import static org.hamcrest.CoreMatchers.notNullValue; +import static org.hamcrest.CoreMatchers.nullValue; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; http://git-wip-us.apache.org/repos/asf/isis/blob/b3e936c9/example/application/todoapp/integtests/src/test/java/integration/tests/ToDoItemsIntegTest.java ---------------------------------------------------------------------- diff --git a/example/application/todoapp/integtests/src/test/java/integration/tests/ToDoItemsIntegTest.java b/example/application/todoapp/integtests/src/test/java/integration/tests/ToDoItemsIntegTest.java index aeec0e5..2c06dc0 100644 --- a/example/application/todoapp/integtests/src/test/java/integration/tests/ToDoItemsIntegTest.java +++ b/example/application/todoapp/integtests/src/test/java/integration/tests/ToDoItemsIntegTest.java @@ -27,7 +27,6 @@ import javax.inject.Inject; import org.hamcrest.Matchers; import org.junit.Before; import org.junit.Test; - import org.apache.isis.applib.fixturescripts.FixtureScripts; import static org.hamcrest.CoreMatchers.is; http://git-wip-us.apache.org/repos/asf/isis/blob/b3e936c9/example/application/todoapp/webapp/src/main/java/webapp/prototyping/ExternalLinksService.java ---------------------------------------------------------------------- diff --git a/example/application/todoapp/webapp/src/main/java/webapp/prototyping/ExternalLinksService.java b/example/application/todoapp/webapp/src/main/java/webapp/prototyping/ExternalLinksService.java index 3dbab69..6caa244 100644 --- a/example/application/todoapp/webapp/src/main/java/webapp/prototyping/ExternalLinksService.java +++ b/example/application/todoapp/webapp/src/main/java/webapp/prototyping/ExternalLinksService.java @@ -18,9 +18,13 @@ package webapp.prototyping; import java.net.MalformedURLException; import java.net.URL; - -import org.apache.isis.applib.annotation.*; +import org.apache.isis.applib.annotation.ActionSemantics; import org.apache.isis.applib.annotation.ActionSemantics.Of; +import org.apache.isis.applib.annotation.CssClassFa; +import org.apache.isis.applib.annotation.DomainService; +import org.apache.isis.applib.annotation.MemberOrder; +import org.apache.isis.applib.annotation.Named; +import org.apache.isis.applib.annotation.Prototype; @DomainService(menuOrder = "40.3") public class ExternalLinksService {
