Merge pull request iluwatar#375 from DevFactory/release/The-members-of-an-interface-declaration-or-class-should-appear-in-a-pre-defined-order-fix-1

iluwatar · iluwatar · commit 57be8aa522f3 · 2016-02-08T20:40:16.000+02:00
squid:S1213 - The members of an interface declaration or class should…
diff --git 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 String toString() {
     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
@@ -24,14 +24,6 @@
 @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 HomePageViewModel homePage() {
   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
@@ -24,6 +24,15 @@
 @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 List<SimpleObject> getObjects() {
     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
@@ -48,17 +48,16 @@
 @DomainObjectLayout(bookmarking = BookmarkPolicy.AS_ROOT, cssClassFa = "fa-flag")
 public class SimpleObject implements Comparable<SimpleObject> {
 
-
-  // 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
@@ -33,6 +33,14 @@
 @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 SimpleObject create(@ParameterLayout(named = "Name") final String name) {
     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
@@ -22,6 +22,15 @@
 
 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 SimpleObjectCreate setName(final String name) {
     this.name = name;
     return this;
   }
-
-  // endregion
-
-
-  // region > simpleObject (output)
-  private SimpleObject simpleObject;
-
+  
   /**
    * The created simple object (output).
    */
@@ -62,8 +65,5 @@ protected void execute(final ExecutionContext ec) {
     // 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
@@ -20,13 +20,12 @@
 
 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
@@ -32,13 +32,18 @@ public class RecreateSimpleObjects extends FixtureScript {
   public final List<String> 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<SimpleObject> 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 RecreateSimpleObjects setNumber(final Integer number) {
     this.number = number;
     return this;
   }
-
-  // endregion
-
-  // region > simpleObjects (output)
-  private final List<SimpleObject> 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
@@ -44,30 +44,30 @@ 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;
   }
 
   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
@@ -48,6 +48,19 @@
 @Table(name = "SPELLBOOK")
 public class Spellbook extends BaseEntity {
 
+  @Id
+  @GeneratedValue
+  @Column(name = "SPELLBOOK_ID")
+  private Long id;
+
+  private String name;
+
+  @ManyToMany(mappedBy = "spellbooks", fetch = FetchType.EAGER)
+  private Set<Wizard> wizards;
+
+  @OneToMany(mappedBy = "spellbook", orphanRemoval = true, cascade = CascadeType.ALL)
+  private Set<Spell> spells;
+
   public Spellbook() {
     spells = new HashSet<>();
     wizards = new HashSet<>();
@@ -57,28 +70,15 @@ 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)
-  private Set<Wizard> wizards;
-
-  @OneToMany(mappedBy = "spellbook", orphanRemoval = true, cascade = CascadeType.ALL)
-  private Set<Spell> spells;
-
+  
   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
@@ -45,6 +45,16 @@
 @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<Spellbook> spellbooks;
+
   public Wizard() {
     spellbooks = new HashSet<>();
   }
@@ -53,25 +63,15 @@ public Wizard(String name) {
     this();
     this.name = name;
   }
-
-  @Id
-  @GeneratedValue
-  @Column(name = "WIZARD_ID")
-  private Long id;
-
+  
   public Long getId() {
     return id;
   }
 
   public void setId(Long id) {
     this.id = id;
   }
-
-  private String name;
-
-  @ManyToMany(cascade = CascadeType.ALL)
-  private Set<Spellbook> spellbooks;
-
+  
   public String getName() {
     return name;
   }
