gaspersic/java-design-patterns
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

squid:S1213 - The members of an interface declaration or class should appear in a pre-defined order

Browse Source
This commit is contained in:
Mohammed Ezzat
2016-02-06 01:10:56 +02:00
parent 33224dd7d7
commit 9c5745763d
11 changed files with 106 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
builder/src/main/java/com/iluwatar/builder/Hero.java
View File

@ -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.

17
naked-objects/dom/src/main/java/domainapp/dom/app/homepage/HomePageService.java
View File

@ -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());
}
}

17
naked-objects/dom/src/main/java/domainapp/dom/app/homepage/HomePageViewModel.java
View File

@ -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
}

11
naked-objects/dom/src/main/java/domainapp/dom/modules/simple/SimpleObject.java
View File

@ -48,18 +48,17 @@ import org.apache.isis.applib.util.ObjectContracts;
@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")
@Property(editing = Editing.DISABLED)

16
naked-objects/dom/src/main/java/domainapp/dom/modules/simple/SimpleObjects.java
View File

@ -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
}

18
naked-objects/fixture/src/main/java/domainapp/fixture/modules/simple/SimpleObjectCreate.java
View File

@ -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;
@ -37,12 +46,6 @@ public class SimpleObjectCreate extends FixtureScript {
return this;
}
// endregion
// region > simpleObject (output)
private SimpleObject simpleObject;
/**
* The created simple object (output).
*/
@ -63,7 +66,4 @@ public class SimpleObjectCreate extends FixtureScript {
ec.addResult(this, simpleObject);
}
@javax.inject.Inject
private SimpleObjects simpleObjects;
}

7
naked-objects/fixture/src/main/java/domainapp/fixture/modules/simple/SimpleObjectsTearDown.java
View File

@ -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;
}

16
naked-objects/fixture/src/main/java/domainapp/fixture/scenarios/RecreateSimpleObjects.java
View File

@ -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"));
// region > number (optional input)
private Integer number;
// endregion
// region > simpleObjects (output)
private final List<SimpleObject> simpleObjects = Lists.newArrayList();
public RecreateSimpleObjects() {
withDiscoverability(Discoverability.DISCOVERABLE);
}
// region > number (optional input)
private Integer number;
/**
* The number of objects to create, up to 10; optional, defaults to 3.
*/
@ -51,11 +56,6 @@ public class RecreateSimpleObjects extends FixtureScript {
return this;
}
// endregion
// region > simpleObjects (output)
private final List<SimpleObject> simpleObjects = Lists.newArrayList();
/**
* The simpleobjects created by this fixture (output).
*/

18
service-layer/src/main/java/com/iluwatar/servicelayer/spell/Spell.java
View File

@ -44,6 +44,15 @@ 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) {
@ -51,11 +60,6 @@ public class Spell extends BaseEntity {
this.name = name;
}
@Id
@GeneratedValue
@Column(name = "SPELL_ID")
private Long id;
public Long getId() {
return id;
}
@ -64,10 +68,6 @@ public class Spell extends BaseEntity {
this.id = id;
}
@ManyToOne
@JoinColumn(name = "SPELLBOOK_ID_FK", referencedColumnName = "SPELLBOOK_ID")
private Spellbook spellbook;
public String getName() {
return name;
}

26
service-layer/src/main/java/com/iluwatar/servicelayer/spellbook/Spellbook.java
View File

@ -48,6 +48,19 @@ import com.iluwatar.servicelayer.wizard.Wizard;
@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<>();
@ -58,11 +71,6 @@ public class Spellbook extends BaseEntity {
this.name = name;
}
@Id
@GeneratedValue
@Column(name = "SPELLBOOK_ID")
private Long id;
public Long getId() {
return id;
}
@ -71,14 +79,6 @@ public class Spellbook extends BaseEntity {
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;
}

20
service-layer/src/main/java/com/iluwatar/servicelayer/wizard/Wizard.java
View File

@ -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<Spellbook> spellbooks;
public Wizard() {
spellbooks = new HashSet<>();
}
@ -54,11 +64,6 @@ public class Wizard extends BaseEntity {
this.name = name;
}
@Id
@GeneratedValue
@Column(name = "WIZARD_ID")
private Long id;
public Long getId() {
return id;
}
@ -67,11 +72,6 @@ public class Wizard extends BaseEntity {
this.id = id;
}
private String name;
@ManyToMany(cascade = CascadeType.ALL)
private Set<Spellbook> spellbooks;
public String getName() {
return name;
}