Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Jan Smejkal
Pa165 Secret Archive
Commits
a3069daf
Commit
a3069daf
authored
Mar 26, 2022
by
tbilos
Browse files
fix: make Skill abstract, remove redundant ID
parent
109866ad
Pipeline
#122667
waiting for manual action with stage
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/main/java/cz/fi/muni/pa165/seminar4/group7/secretservice/entity/LanguageSkill.java
View file @
a3069daf
...
@@ -5,20 +5,12 @@ import lombok.Getter;
...
@@ -5,20 +5,12 @@ import lombok.Getter;
import
lombok.Setter
;
import
lombok.Setter
;
import
javax.persistence.Entity
;
import
javax.persistence.Entity
;
import
javax.persistence.GeneratedValue
;
import
javax.persistence.GenerationType
;
import
javax.persistence.Id
;
/**
/**
* @author Juraj Fiala
* @author Juraj Fiala
*/
*/
@Entity
@Entity
public
class
LanguageSkill
extends
Skill
{
public
class
LanguageSkill
extends
Skill
{
@Id
@GeneratedValue
(
strategy
=
GenerationType
.
IDENTITY
)
@Getter
@Setter
private
Long
id
;
@Getter
@Getter
@Setter
@Setter
...
...
src/main/java/cz/fi/muni/pa165/seminar4/group7/secretservice/entity/PerformanceEvaluation.java
View file @
a3069daf
...
@@ -26,7 +26,6 @@ public class PerformanceEvaluation {
...
@@ -26,7 +26,6 @@ public class PerformanceEvaluation {
@Setter
@Setter
private
String
evaluation
;
private
String
evaluation
;
//on a scale of 0 upto 100
@Getter
@Getter
@Setter
@Setter
private
int
rating
;
private
int
rating
;
...
...
src/main/java/cz/fi/muni/pa165/seminar4/group7/secretservice/entity/Skill.java
View file @
a3069daf
...
@@ -9,7 +9,7 @@ import javax.persistence.*;
...
@@ -9,7 +9,7 @@ import javax.persistence.*;
* @author Juraj Fiala
* @author Juraj Fiala
*/
*/
@Entity
@Entity
public
class
Skill
{
public
abstract
class
Skill
{
@Id
@Id
@GeneratedValue
(
strategy
=
GenerationType
.
IDENTITY
)
@GeneratedValue
(
strategy
=
GenerationType
.
IDENTITY
)
@Getter
@Getter
...
...
src/main/java/cz/fi/muni/pa165/seminar4/group7/secretservice/entity/WeaponSkill.java
View file @
a3069daf
package
cz.fi.muni.pa165.seminar4.group7.secretservice.entity
;
package
cz.fi.muni.pa165.seminar4.group7.secretservice.entity
;
import
cz.fi.muni.pa165.seminar4.group7.secretservice.enums.LanguageCode
;
import
cz.fi.muni.pa165.seminar4.group7.secretservice.enums.WeaponCategory
;
import
cz.fi.muni.pa165.seminar4.group7.secretservice.enums.WeaponCategory
;
import
lombok.Getter
;
import
lombok.Getter
;
import
lombok.Setter
;
import
lombok.Setter
;
import
javax.persistence.Entity
;
import
javax.persistence.Entity
;
import
javax.persistence.GeneratedValue
;
import
javax.persistence.GenerationType
;
import
javax.persistence.Id
;
/**
/**
* @author Juraj Fiala
* @author Juraj Fiala
*/
*/
@Entity
@Entity
public
class
WeaponSkill
extends
Skill
{
public
class
WeaponSkill
extends
Skill
{
@Id
@GeneratedValue
(
strategy
=
GenerationType
.
IDENTITY
)
@Getter
@Setter
private
Long
id
;
@Getter
@Getter
@Setter
@Setter
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment