Просмотр исходного кода

Remove javax.Inject dependency

vvmk 8 лет назад
Родитель
Сommit
9908dd7026

+ 0
- 6
pom.xml Просмотреть файл

37
             <artifactId>hsqldb</artifactId>
37
             <artifactId>hsqldb</artifactId>
38
             <scope>runtime</scope>
38
             <scope>runtime</scope>
39
         </dependency>
39
         </dependency>
40
-
41
-        <dependency>
42
-            <groupId>javax.inject</groupId>
43
-            <artifactId>javax.inject</artifactId>
44
-            <version>1</version>
45
-        </dependency>
46
     </dependencies>
40
     </dependencies>
47
 
41
 
48
 
42
 

+ 2
- 1
src/main/java/io/zipcoder/tc_spring_poll_application/controllers/PollController.java Просмотреть файл

28
     @RequestMapping(name = "/polls", method = RequestMethod.GET)
28
     @RequestMapping(name = "/polls", method = RequestMethod.GET)
29
     public ResponseEntity<Iterable<Poll>> getAllPolls() {
29
     public ResponseEntity<Iterable<Poll>> getAllPolls() {
30
         Iterable<Poll> allPolls = pollRepository.findAll();
30
         Iterable<Poll> allPolls = pollRepository.findAll();
31
-        return new ResponseEntity<Iterable<Poll>>(allPolls, HttpStatus.OK);
31
+        return new ResponseEntity<>(allPolls, HttpStatus.OK);
32
     }
32
     }
33
 
33
 
34
+
34
 }
35
 }

+ 4
- 0
src/main/java/io/zipcoder/tc_spring_poll_application/domain/Option.java Просмотреть файл

22
     @Column(name="OPTION_VALUE")
22
     @Column(name="OPTION_VALUE")
23
     private String value;
23
     private String value;
24
 
24
 
25
+    public Option() {
26
+        //y
27
+    }
28
+
25
     public Long getId() {
29
     public Long getId() {
26
         return Id;
30
         return Id;
27
     }
31
     }

+ 4
- 4
src/main/java/io/zipcoder/tc_spring_poll_application/domain/Poll.java Просмотреть файл

14
 
14
 
15
     @Id
15
     @Id
16
     @GeneratedValue
16
     @GeneratedValue
17
-    @Column(name="POLL_ID")
17
+    @Column(name = "POLL_ID")
18
     private Long Id;
18
     private Long Id;
19
 
19
 
20
-    @Column(name="QUESTION")
20
+    @Column(name = "QUESTION")
21
     private String question;
21
     private String question;
22
 
22
 
23
-    @ManyToOne(cascade = CascadeType.ALL)
24
-    @JoinColumn(name="POLL_ID")
23
+    @OneToMany(cascade = CascadeType.ALL)
24
+    @JoinColumn(name = "POLL_ID")
25
     @OrderBy
25
     @OrderBy
26
     private Set<Option> options;
26
     private Set<Option> options;
27
 
27
 

+ 9
- 5
src/main/java/io/zipcoder/tc_spring_poll_application/domain/Vote.java Просмотреть файл

13
 
13
 
14
     @Id
14
     @Id
15
     @GeneratedValue
15
     @GeneratedValue
16
-    @Column(name="VOTE_ID")
16
+    @Column(name = "VOTE_ID")
17
     private Long Id;
17
     private Long Id;
18
 
18
 
19
+    @ManyToOne
20
+    @JoinColumn(name = "OPTION_ID")
21
+    private Option option;
22
+
23
+    public Vote() {
24
+        //stahp
25
+    }
26
+
19
     public Long getId() {
27
     public Long getId() {
20
         return Id;
28
         return Id;
21
     }
29
     }
31
     public void setOption(Option option) {
39
     public void setOption(Option option) {
32
         this.option = option;
40
         this.option = option;
33
     }
41
     }
34
-
35
-    @ManyToOne
36
-    @JoinColumn(name="OPTION_ID")
37
-    private Option option;
38
 }
42
 }