From 9c5745763dd428935e063c30b1e3c223ef9cc611 Mon Sep 17 00:00:00 2001 From: Mohammed Ezzat Date: Sat, 6 Feb 2016 01:10:56 +0200 Subject: [PATCH] squid:S1213 - The members of an interface declaration or class should appear in a pre-defined order --- .../main/java/com/iluwatar/builder/Hero.java | 18 +++++----- .../dom/app/homepage/HomePageService.java | 17 ++++----- .../dom/app/homepage/HomePageViewModel.java | 17 ++++----- .../dom/modules/simple/SimpleObject.java | 11 +++--- .../dom/modules/simple/SimpleObjects.java | 16 ++++----- .../modules/simple/SimpleObjectCreate.java | 22 ++++++------ .../modules/simple/SimpleObjectsTearDown.java | 9 +++-- .../scenarios/RecreateSimpleObjects.java | 20 +++++------ .../iluwatar/servicelayer/spell/Spell.java | 22 ++++++------ .../servicelayer/spellbook/Spellbook.java | 36 +++++++++---------- .../iluwatar/servicelayer/wizard/Wizard.java | 24 ++++++------- 11 files changed, 106 insertions(+), 106 deletions(-) diff --git a/builder/src/main/java/com/iluwatar/builder/Hero.java b/builder/src/main/java/com/iluwatar/builder/Hero.java index f92e61761..a77e3bc6b 100644 --- a/builder/src/main/java/com/iluwatar/builder/Hero.java +++ b/builder/src/main/java/com/iluwatar/builder/Hero.java @@ -36,6 +36,15 @@ public class Hero { private final Armor armor; private final Weapon weapon; + private Hero(HeroBuilder builder) { + this.profession = builder.profession; + this.name = builder.name; + this.hairColor = builder.hairColor; + this.hairType = builder.hairType; + this.weapon = builder.weapon; + this.armor = builder.armor; + } + public Profession getProfession() { return profession; } @@ -88,15 +97,6 @@ public class Hero { return sb.toString(); } - private Hero(HeroBuilder builder) { - this.profession = builder.profession; - this.name = builder.name; - this.hairColor = builder.hairColor; - this.hairType = builder.hairType; - this.weapon = builder.weapon; - this.armor = builder.armor; - } - /** * * The builder class. diff --git a/naked-objects/dom/src/main/java/domainapp/dom/app/homepage/HomePageService.java b/naked-objects/dom/src/main/java/domainapp/dom/app/homepage/HomePageService.java index fa1e74048..162cd3bb4 100644 --- a/naked-objects/dom/src/main/java/domainapp/dom/app/homepage/HomePageService.java +++ b/naked-objects/dom/src/main/java/domainapp/dom/app/homepage/HomePageService.java @@ -24,14 +24,6 @@ import org.apache.isis.applib.annotation.SemanticsOf; @DomainService(nature = NatureOfService.VIEW_CONTRIBUTIONS_ONLY) public class HomePageService { - // region > homePage (action) - - @Action(semantics = SemanticsOf.SAFE) - @HomePage - public HomePageViewModel homePage() { - return container.injectServicesInto(new HomePageViewModel()); - } - // endregion // region > injected services @@ -40,4 +32,13 @@ public class HomePageService { DomainObjectContainer container; // endregion + + // region > homePage (action) + + @Action(semantics = SemanticsOf.SAFE) + @HomePage + public HomePageViewModel homePage() { + return container.injectServicesInto(new HomePageViewModel()); + } + } diff --git a/naked-objects/dom/src/main/java/domainapp/dom/app/homepage/HomePageViewModel.java b/naked-objects/dom/src/main/java/domainapp/dom/app/homepage/HomePageViewModel.java index 1391bac6a..f367a39fd 100644 --- a/naked-objects/dom/src/main/java/domainapp/dom/app/homepage/HomePageViewModel.java +++ b/naked-objects/dom/src/main/java/domainapp/dom/app/homepage/HomePageViewModel.java @@ -24,6 +24,15 @@ import domainapp.dom.modules.simple.SimpleObjects; @ViewModel public class HomePageViewModel { + // endregion + + // region > injected services + + @javax.inject.Inject + SimpleObjects simpleObjects; + + // endregion + // region > title public String title() { return getObjects().size() + " objects"; @@ -37,12 +46,4 @@ public class HomePageViewModel { return simpleObjects.listAll(); } - // endregion - - // region > injected services - - @javax.inject.Inject - SimpleObjects simpleObjects; - - // endregion } diff --git a/naked-objects/dom/src/main/java/domainapp/dom/modules/simple/SimpleObject.java b/naked-objects/dom/src/main/java/domainapp/dom/modules/simple/SimpleObject.java index 300e184fa..bbbd54b00 100644 --- a/naked-objects/dom/src/main/java/domainapp/dom/modules/simple/SimpleObject.java +++ b/naked-objects/dom/src/main/java/domainapp/dom/modules/simple/SimpleObject.java @@ -48,17 +48,16 @@ import org.apache.isis.applib.util.ObjectContracts; @DomainObjectLayout(bookmarking = BookmarkPolicy.AS_ROOT, cssClassFa = "fa-flag") public class SimpleObject implements Comparable { - - // region > identificatiom - public TranslatableString title() { - return TranslatableString.tr("Object: {name}", "name", getName()); - } - // endregion // region > name (property) private String name; + + // region > identificatiom + public TranslatableString title() { + return TranslatableString.tr("Object: {name}", "name", getName()); + } @javax.jdo.annotations.Column(allowsNull = "false", length = 40) @Title(sequence = "1") diff --git a/naked-objects/dom/src/main/java/domainapp/dom/modules/simple/SimpleObjects.java b/naked-objects/dom/src/main/java/domainapp/dom/modules/simple/SimpleObjects.java index 849f01c5d..5ebad0159 100644 --- a/naked-objects/dom/src/main/java/domainapp/dom/modules/simple/SimpleObjects.java +++ b/naked-objects/dom/src/main/java/domainapp/dom/modules/simple/SimpleObjects.java @@ -33,6 +33,14 @@ import org.apache.isis.applib.services.i18n.TranslatableString; @DomainService(repositoryFor = SimpleObject.class) @DomainServiceLayout(menuOrder = "10") public class SimpleObjects { + // endregion + + // region > injected services + + @javax.inject.Inject + DomainObjectContainer container; + + // endregion // region > title public TranslatableString title() { @@ -81,12 +89,4 @@ public class SimpleObjects { return obj; } - // endregion - - // region > injected services - - @javax.inject.Inject - DomainObjectContainer container; - - // endregion } diff --git a/naked-objects/fixture/src/main/java/domainapp/fixture/modules/simple/SimpleObjectCreate.java b/naked-objects/fixture/src/main/java/domainapp/fixture/modules/simple/SimpleObjectCreate.java index 9a922a7be..f0617fea2 100644 --- a/naked-objects/fixture/src/main/java/domainapp/fixture/modules/simple/SimpleObjectCreate.java +++ b/naked-objects/fixture/src/main/java/domainapp/fixture/modules/simple/SimpleObjectCreate.java @@ -22,6 +22,15 @@ import domainapp.dom.modules.simple.SimpleObjects; public class SimpleObjectCreate extends FixtureScript { + // endregion + + + // region > simpleObject (output) + private SimpleObject simpleObject; + + @javax.inject.Inject + private SimpleObjects simpleObjects; + // region > name (input) private String name; @@ -36,13 +45,7 @@ public class SimpleObjectCreate extends FixtureScript { this.name = name; return this; } - - // endregion - - - // region > simpleObject (output) - private SimpleObject simpleObject; - + /** * The created simple object (output). */ @@ -62,8 +65,5 @@ public class SimpleObjectCreate extends FixtureScript { // also make available to UI ec.addResult(this, simpleObject); } - - @javax.inject.Inject - private SimpleObjects simpleObjects; - + } diff --git a/naked-objects/fixture/src/main/java/domainapp/fixture/modules/simple/SimpleObjectsTearDown.java b/naked-objects/fixture/src/main/java/domainapp/fixture/modules/simple/SimpleObjectsTearDown.java index e844af9c7..7000bf4c0 100644 --- a/naked-objects/fixture/src/main/java/domainapp/fixture/modules/simple/SimpleObjectsTearDown.java +++ b/naked-objects/fixture/src/main/java/domainapp/fixture/modules/simple/SimpleObjectsTearDown.java @@ -20,13 +20,12 @@ import org.apache.isis.applib.services.jdosupport.IsisJdoSupport; public class SimpleObjectsTearDown extends FixtureScript { + @javax.inject.Inject + private IsisJdoSupport isisJdoSupport; + @Override protected void execute(ExecutionContext executionContext) { isisJdoSupport.executeUpdate("delete from \"simple\".\"SimpleObject\""); } - - - @javax.inject.Inject - private IsisJdoSupport isisJdoSupport; - + } diff --git a/naked-objects/fixture/src/main/java/domainapp/fixture/scenarios/RecreateSimpleObjects.java b/naked-objects/fixture/src/main/java/domainapp/fixture/scenarios/RecreateSimpleObjects.java index 6d17d9b63..62ad0405a 100644 --- a/naked-objects/fixture/src/main/java/domainapp/fixture/scenarios/RecreateSimpleObjects.java +++ b/naked-objects/fixture/src/main/java/domainapp/fixture/scenarios/RecreateSimpleObjects.java @@ -32,13 +32,18 @@ public class RecreateSimpleObjects extends FixtureScript { public final List names = Collections.unmodifiableList(Arrays.asList("Foo", "Bar", "Baz", "Frodo", "Froyo", "Fizz", "Bip", "Bop", "Bang", "Boo")); - public RecreateSimpleObjects() { - withDiscoverability(Discoverability.DISCOVERABLE); - } - // region > number (optional input) private Integer number; + // endregion + + // region > simpleObjects (output) + private final List simpleObjects = Lists.newArrayList(); + + public RecreateSimpleObjects() { + withDiscoverability(Discoverability.DISCOVERABLE); + } + /** * The number of objects to create, up to 10; optional, defaults to 3. */ @@ -50,12 +55,7 @@ public class RecreateSimpleObjects extends FixtureScript { this.number = number; return this; } - - // endregion - - // region > simpleObjects (output) - private final List simpleObjects = Lists.newArrayList(); - + /** * The simpleobjects created by this fixture (output). */ diff --git a/service-layer/src/main/java/com/iluwatar/servicelayer/spell/Spell.java b/service-layer/src/main/java/com/iluwatar/servicelayer/spell/Spell.java index 38d5aafc1..caf1b2c91 100644 --- a/service-layer/src/main/java/com/iluwatar/servicelayer/spell/Spell.java +++ b/service-layer/src/main/java/com/iluwatar/servicelayer/spell/Spell.java @@ -44,18 +44,22 @@ public class Spell extends BaseEntity { private String name; + @Id + @GeneratedValue + @Column(name = "SPELL_ID") + private Long id; + + @ManyToOne + @JoinColumn(name = "SPELLBOOK_ID_FK", referencedColumnName = "SPELLBOOK_ID") + private Spellbook spellbook; + public Spell() {} public Spell(String name) { this(); this.name = name; } - - @Id - @GeneratedValue - @Column(name = "SPELL_ID") - private Long id; - + public Long getId() { return id; } @@ -63,11 +67,7 @@ public class Spell extends BaseEntity { public void setId(Long id) { this.id = id; } - - @ManyToOne - @JoinColumn(name = "SPELLBOOK_ID_FK", referencedColumnName = "SPELLBOOK_ID") - private Spellbook spellbook; - + public String getName() { return name; } diff --git a/service-layer/src/main/java/com/iluwatar/servicelayer/spellbook/Spellbook.java b/service-layer/src/main/java/com/iluwatar/servicelayer/spellbook/Spellbook.java index 7b84d12b5..918ce4664 100644 --- a/service-layer/src/main/java/com/iluwatar/servicelayer/spellbook/Spellbook.java +++ b/service-layer/src/main/java/com/iluwatar/servicelayer/spellbook/Spellbook.java @@ -48,29 +48,11 @@ import com.iluwatar.servicelayer.wizard.Wizard; @Table(name = "SPELLBOOK") public class Spellbook extends BaseEntity { - public Spellbook() { - spells = new HashSet<>(); - wizards = new HashSet<>(); - } - - public Spellbook(String name) { - this(); - this.name = name; - } - @Id @GeneratedValue @Column(name = "SPELLBOOK_ID") private Long id; - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - private String name; @ManyToMany(mappedBy = "spellbooks", fetch = FetchType.EAGER) @@ -79,6 +61,24 @@ public class Spellbook extends BaseEntity { @OneToMany(mappedBy = "spellbook", orphanRemoval = true, cascade = CascadeType.ALL) private Set spells; + public Spellbook() { + spells = new HashSet<>(); + wizards = new HashSet<>(); + } + + public Spellbook(String name) { + this(); + this.name = name; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + public String getName() { return name; } diff --git a/service-layer/src/main/java/com/iluwatar/servicelayer/wizard/Wizard.java b/service-layer/src/main/java/com/iluwatar/servicelayer/wizard/Wizard.java index 15298b648..40e0b3ac7 100644 --- a/service-layer/src/main/java/com/iluwatar/servicelayer/wizard/Wizard.java +++ b/service-layer/src/main/java/com/iluwatar/servicelayer/wizard/Wizard.java @@ -45,6 +45,16 @@ import com.iluwatar.servicelayer.spellbook.Spellbook; @Table(name = "WIZARD") public class Wizard extends BaseEntity { + @Id + @GeneratedValue + @Column(name = "WIZARD_ID") + private Long id; + + private String name; + + @ManyToMany(cascade = CascadeType.ALL) + private Set spellbooks; + public Wizard() { spellbooks = new HashSet<>(); } @@ -53,12 +63,7 @@ public class Wizard extends BaseEntity { this(); this.name = name; } - - @Id - @GeneratedValue - @Column(name = "WIZARD_ID") - private Long id; - + public Long getId() { return id; } @@ -66,12 +71,7 @@ public class Wizard extends BaseEntity { public void setId(Long id) { this.id = id; } - - private String name; - - @ManyToMany(cascade = CascadeType.ALL) - private Set spellbooks; - + public String getName() { return name; }