Skip to content

Commit

Permalink
update of parent version to 4.5
Browse files Browse the repository at this point in the history
- removed log4j2 dependencies
- formatted, javadoc, sort members and organize imports
  • Loading branch information
astrapi69 committed Jan 5, 2019
1 parent 6672656 commit 4e586c0
Show file tree
Hide file tree
Showing 20 changed files with 370 additions and 394 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@
Version 5.1-SNAPSHOT
-------------

CHANGED:

- update of parent version to 4.5
- removed log4j2 dependencies

Version 5
-------------

Expand Down
8 changes: 1 addition & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>de.alpharogroup</groupId>
<artifactId>mvn-java-parent</artifactId>
<version>4.4</version>
<version>4.5</version>
<relativePath></relativePath>
</parent>

Expand Down Expand Up @@ -98,12 +98,6 @@
<artifactId>meanbean</artifactId>
<scope>test</scope>
</dependency>
<!-- LOG4J-TO-SLF4J DEPENDENCY -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-to-slf4j</artifactId>
<scope>test</scope>
</dependency>

</dependencies>

Expand Down
132 changes: 66 additions & 66 deletions src/main/java/de/alpharogroup/test/objects/Customer.java
Original file line number Diff line number Diff line change
@@ -1,66 +1,66 @@
/**
* The MIT License
*
* Copyright (C) 2015 Asterios Raptis
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, sublicense, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
*
* The above copyright notice and this permission notice shall be
* included in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
* LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
package de.alpharogroup.test.objects;

import java.io.Serializable;

import de.alpharogroup.test.objects.annotations.Mandatory;
import de.alpharogroup.test.objects.enums.Brands;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;

/**
* The class {@link Customer} is a class intended for use in unit tests.
*/
@Getter
@Setter
@EqualsAndHashCode
@ToString
@NoArgsConstructor
@AllArgsConstructor
@Builder(toBuilder = true)
public class Customer implements Serializable
{

/** The Constant serialVersionUID. */
private static final long serialVersionUID = 1L;

/** The name. */
@Mandatory
@Builder.Default
public String name = "";

/** The car. */
@Builder.Default
public Brands car = Brands.FERRARI;

/** The premium. */
public boolean premium;
}
/**
* The MIT License
*
* Copyright (C) 2015 Asterios Raptis
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, sublicense, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
*
* The above copyright notice and this permission notice shall be
* included in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
* LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
package de.alpharogroup.test.objects;

import java.io.Serializable;

import de.alpharogroup.test.objects.annotations.Mandatory;
import de.alpharogroup.test.objects.enums.Brands;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;

/**
* The class {@link Customer} is a class intended for use in unit tests.
*/
@Getter
@Setter
@EqualsAndHashCode
@ToString
@NoArgsConstructor
@AllArgsConstructor
@Builder(toBuilder = true)
public class Customer implements Serializable
{

/** The Constant serialVersionUID. */
private static final long serialVersionUID = 1L;

/** The car. */
@Builder.Default
public Brands car = Brands.FERRARI;

/** The name. */
@Mandatory
@Builder.Default
public String name = "";

/** The premium. */
public boolean premium;
}
120 changes: 60 additions & 60 deletions src/main/java/de/alpharogroup/test/objects/Employee.java
Original file line number Diff line number Diff line change
@@ -1,60 +1,60 @@
/**
* The MIT License
*
* Copyright (C) 2015 Asterios Raptis
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, sublicense, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
*
* The above copyright notice and this permission notice shall be
* included in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
* LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
package de.alpharogroup.test.objects;

import java.io.Serializable;

import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;

/**
* The class {@link Employee} is a class intended for use in unit tests.
*/
@Getter
@Setter
@EqualsAndHashCode
@ToString
@NoArgsConstructor
@AllArgsConstructor
@Builder(toBuilder = true)
public class Employee implements Serializable
{
/**
* The serialVersionUID.
*/
private static final long serialVersionUID = 1L;

/** The person. */
private Person person;

/** The id. */
private String id;

}
/**
* The MIT License
*
* Copyright (C) 2015 Asterios Raptis
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, sublicense, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
*
* The above copyright notice and this permission notice shall be
* included in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
* LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
package de.alpharogroup.test.objects;

import java.io.Serializable;

import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;

/**
* The class {@link Employee} is a class intended for use in unit tests.
*/
@Getter
@Setter
@EqualsAndHashCode
@ToString
@NoArgsConstructor
@AllArgsConstructor
@Builder(toBuilder = true)
public class Employee implements Serializable
{
/**
* The serialVersionUID.
*/
private static final long serialVersionUID = 1L;

/** The id. */
private String id;

/** The person. */
private Person person;

}
18 changes: 9 additions & 9 deletions src/main/java/de/alpharogroup/test/objects/Member.java
Original file line number Diff line number Diff line change
Expand Up @@ -63,26 +63,26 @@ public Member()
/**
* Instantiates a new {@link Member} object with the given parameters.
*
* @param name
* the name
* @param nickname
* the nickname
* @param gender
* the gender
* @param about
* the about
* @param gender
* the gender
* @param married
* the married
* @param name
* the name
* @param nickname
* the nickname
* @param dateofbirth
* the dateofbirth
* @param dateofMarriage
* the dateof marriage
*/
@Builder(builderMethodName = "buildMember")
public Member(final String name, final String nickname, final Gender gender, final String about,
final Boolean married, final Date dateofbirth, final Date dateofMarriage)
public Member(final String about, final Gender gender, final Boolean married, final String name,
final String nickname, final Date dateofbirth, final Date dateofMarriage)
{
super(name, nickname, gender, about, married);
super(about, gender, married, name, nickname);
this.dateofbirth = dateofbirth;
this.dateofMarriage = dateofMarriage;
}
Expand Down
Loading

0 comments on commit 4e586c0

Please sign in to comment.