Skip to content

Commit d989cd7

Browse files
phasenraum2010phasenraum2010
committed
bugfix wth javadoc
1 parent f14f8d8 commit d989cd7

File tree

6 files changed

+23
-120
lines changed

6 files changed

+23
-120
lines changed

‎src/main/java/org/woehlke/twitterwall/oodm/entities/transients/HashTagCounted.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,14 @@
77
/**
88
* Created by tw on 14.06.17.
99
*
10-
* @author Thomas Woehlke <thomas@woehlke.org>
11-
*
1210
* @see org.woehlke.twitterwall.oodm.entities.HashTag
1311
* @see org.woehlke.twitterwall.oodm.entities.parts.Entities
1412
* @see org.woehlke.twitterwall.oodm.entities.transients.mapper.CountAllTweets2HashTagsRowMapper#SQL_COUNT_ALL_TWEET_2_HASHTAG
1513
* @see org.woehlke.twitterwall.oodm.entities.transients.mapper.CountAllUsers2HashTagsRowMapper#SQL_COUNT_ALL_USER_2_HASHTAG
16-
* @see org.woehlke.twitterwall.oodm.entities.transients.HashTagOverviewPaged
1714
* @see org.woehlke.twitterwall.oodm.repositories.custom.impl.HashTagRepositoryImpl#countAllTweet2HashTag(Pageable)
1815
* @see org.woehlke.twitterwall.oodm.repositories.custom.impl.HashTagRepositoryImpl#countAllUser2HashTag(Pageable)
19-
* @see org.woehlke.twitterwall.oodm.service.impl.HashTagServiceImpl#getHashTagOverview(Pageable, Pageable)
16+
* @see org.woehlke.twitterwall.oodm.service.impl.HashTagServiceImpl#getHashTagsTweets(Pageable)
17+
* @see org.woehlke.twitterwall.oodm.service.impl.HashTagServiceImpl#getHashTagsUsers(Pageable)
2018
*/
2119
public class HashTagCounted implements Serializable, Comparable<HashTagCounted> {
2220

‎src/main/java/org/woehlke/twitterwall/oodm/entities/transients/HashTagOverviewPaged.java‎

Lines changed: 0 additions & 60 deletions
This file was deleted.

‎src/main/java/org/woehlke/twitterwall/oodm/repositories/custom/impl/HashTagRepositoryImpl.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,6 @@ public HashTag findByUniqueId(HashTag domainObject) {
4747
}
4848

4949
/**
50-
* @param pageRequest org.springframework.data.domain.Pageable
51-
* @return org.springframework.data.domain.Page<org.woehlke.twitterwall.oodm.entities.transients.HashTagCounted>
52-
*
5350
* @see org.woehlke.twitterwall.oodm.entities.transients.mapper.CountAllUsers2HashTagsRowMapper#SQL_COUNT_ALL_USER_2_HASHTAG
5451
*/
5552
@Override
@@ -65,9 +62,6 @@ public Page<HashTagCounted> countAllUser2HashTag(Pageable pageRequest) {
6562
}
6663

6764
/**
68-
* @param pageRequest org.springframework.data.domain.Pageable
69-
* @return org.springframework.data.domain.Page<org.woehlke.twitterwall.oodm.entities.transients.HashTagCounted>
70-
*
7165
* @see org.woehlke.twitterwall.oodm.entities.transients.mapper.CountAllTweets2HashTagsRowMapper#SQL_COUNT_ALL_TWEET_2_HASHTAG
7266
*/
7367
@Override

‎src/main/java/org/woehlke/twitterwall/oodm/service/HashTagService.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import org.springframework.data.domain.Pageable;
55
import org.woehlke.twitterwall.oodm.entities.HashTag;
66
import org.woehlke.twitterwall.oodm.entities.transients.HashTagCounted;
7-
import org.woehlke.twitterwall.oodm.entities.transients.HashTagOverviewPaged;
87
import org.woehlke.twitterwall.oodm.service.common.DomainObjectEntityService;
98
import org.woehlke.twitterwall.oodm.service.common.DomainService;
109

@@ -16,8 +15,6 @@ public interface HashTagService extends DomainService<HashTag>,DomainObjectEntit
1615

1716
HashTag findByText(String text);
1817

19-
HashTagOverviewPaged getHashTagOverview(Pageable pageRequestHashTagsTweets, Pageable pageRequestHashTagsUsers);
20-
2118
Page<HashTagCounted> getHashTagsTweets(Pageable pageRequestTweets);
2219

2320
Page<HashTagCounted> getHashTagsUsers(Pageable pageRequestUsers);

‎src/main/java/org/woehlke/twitterwall/oodm/service/impl/HashTagServiceImpl.java‎

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import org.springframework.transaction.annotation.Transactional;
1111
import org.woehlke.twitterwall.oodm.entities.HashTag;
1212
import org.woehlke.twitterwall.oodm.entities.transients.HashTagCounted;
13-
import org.woehlke.twitterwall.oodm.entities.transients.HashTagOverviewPaged;
1413
import org.woehlke.twitterwall.oodm.repositories.HashTagRepository;
1514
import org.woehlke.twitterwall.oodm.repositories.TaskRepository;
1615
import org.woehlke.twitterwall.oodm.service.HashTagService;
@@ -38,31 +37,28 @@ public HashTag findByText(String text) {
3837
}
3938

4039
/**
41-
* @param pageRequestHashTagsTweets org.springframework.data.domain.Pageable
42-
* @param pageRequestHashTagsUsers org.springframework.data.domain.Pageable
43-
* @return org.woehlke.twitterwall.oodm.entities.transients.HashTagOverviewPaged
40+
* @param pageRequestTweets org.springframework.data.domain.Pageable
41+
* @return HashTagCounted
4442
*
4543
* @see org.woehlke.twitterwall.oodm.entities.HashTag
4644
* @see org.woehlke.twitterwall.oodm.entities.parts.Entities
4745
* @see org.woehlke.twitterwall.oodm.entities.transients.mapper.CountAllTweets2HashTagsRowMapper#SQL_COUNT_ALL_TWEET_2_HASHTAG
48-
* @see org.woehlke.twitterwall.oodm.entities.transients.mapper.CountAllUsers2HashTagsRowMapper#SQL_COUNT_ALL_USER_2_HASHTAG
49-
* @see org.woehlke.twitterwall.oodm.entities.transients.HashTagOverviewPaged
5046
* @see org.woehlke.twitterwall.oodm.repositories.custom.impl.HashTagRepositoryImpl#countAllTweet2HashTag(Pageable)
51-
* @see org.woehlke.twitterwall.oodm.repositories.custom.impl.HashTagRepositoryImpl#countAllUser2HashTag(Pageable)
52-
* @see org.woehlke.twitterwall.oodm.service.impl.HashTagServiceImpl#getHashTagOverview(Pageable, Pageable)
5347
*/
54-
@Override
55-
public HashTagOverviewPaged getHashTagOverview(Pageable pageRequestHashTagsTweets, Pageable pageRequestHashTagsUsers) {
56-
Page<HashTagCounted> hashTagsTweets = hashTagRepository.countAllTweet2HashTag(pageRequestHashTagsTweets);
57-
Page<HashTagCounted> hashTagsUsers = hashTagRepository.countAllUser2HashTag(pageRequestHashTagsUsers);
58-
return new HashTagOverviewPaged(hashTagsTweets,hashTagsUsers);
59-
}
60-
6148
@Override
6249
public Page<HashTagCounted> getHashTagsTweets(Pageable pageRequestTweets) {
6350
return hashTagRepository.countAllTweet2HashTag(pageRequestTweets);
6451
}
6552

53+
/**
54+
* @param pageRequestUsers org.springframework.data.domain.Pageable
55+
* @return HashTagCounted
56+
*
57+
* @see org.woehlke.twitterwall.oodm.entities.HashTag
58+
* @see org.woehlke.twitterwall.oodm.entities.parts.Entities
59+
* @see org.woehlke.twitterwall.oodm.entities.transients.mapper.CountAllUsers2HashTagsRowMapper#SQL_COUNT_ALL_USER_2_HASHTAG
60+
* @see org.woehlke.twitterwall.oodm.repositories.custom.impl.HashTagRepositoryImpl#countAllUser2HashTag(Pageable)
61+
*/
6662
@Override
6763
public Page<HashTagCounted> getHashTagsUsers(Pageable pageRequestUsers) {
6864
return hashTagRepository.countAllUser2HashTag(pageRequestUsers);

‎src/test/java/org/woehlke/twitterwall/oodm/service/HashTagServiceTest.java‎

Lines changed: 10 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -10,38 +10,30 @@
1010
import org.springframework.data.domain.Page;
1111
import org.springframework.data.domain.PageRequest;
1212
import org.springframework.data.domain.Pageable;
13-
import org.springframework.test.annotation.Commit;
1413
import org.springframework.test.context.junit4.SpringRunner;
15-
import org.springframework.transaction.annotation.Propagation;
16-
import org.springframework.transaction.annotation.Transactional;
1714
import org.woehlke.twitterwall.conf.properties.TestdataProperties;
1815
import org.woehlke.twitterwall.oodm.entities.HashTag;
1916
import org.woehlke.twitterwall.oodm.entities.transients.HashTagCounted;
20-
import org.woehlke.twitterwall.oodm.entities.transients.HashTagOverviewPaged;
2117

2218
@RunWith(SpringRunner.class)
2319
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE)
24-
//@Transactional(propagation= Propagation.REQUIRES_NEW,readOnly=false)
2520
public class HashTagServiceTest {
2621

2722
private static final Logger log = LoggerFactory.getLogger(HashTagServiceTest.class);
2823

2924
@Autowired
3025
private HashTagService hashTagService;
3126

32-
//TODO: #198 https://github.com/phasenraum2010/twitterwall2/issues/198
3327
@Autowired
3428
private TestdataProperties testdataProperties;
3529

3630

37-
//@Commit
3831
@Test
3932
public void areDependenciesLoaded() throws Exception {
4033
Assert.assertNotNull(hashTagService);
4134
Assert.assertNotNull(testdataProperties);
4235
}
4336

44-
//@Commit
4537
@Test
4638
public void fetchTestData() throws Exception {
4739
String msg = "fetchTestData: ";
@@ -59,7 +51,6 @@ public void fetchTestData() throws Exception {
5951
}
6052
}
6153

62-
//@Commit
6354
@Test
6455
public void findByText() throws Exception {
6556
String msg = "findByText: ";
@@ -77,36 +68,14 @@ public void findByText() throws Exception {
7768
}
7869

7970
/**
80-
*
8171
* @throws Exception
8272
*
8373
* @see org.woehlke.twitterwall.oodm.entities.HashTag
8474
* @see org.woehlke.twitterwall.oodm.entities.parts.Entities
8575
* @see org.woehlke.twitterwall.oodm.entities.transients.mapper.CountAllTweets2HashTagsRowMapper#SQL_COUNT_ALL_TWEET_2_HASHTAG
86-
* @see org.woehlke.twitterwall.oodm.entities.transients.mapper.CountAllUsers2HashTagsRowMapper#SQL_COUNT_ALL_USER_2_HASHTAG
87-
* @see org.woehlke.twitterwall.oodm.entities.transients.HashTagOverviewPaged
8876
* @see org.woehlke.twitterwall.oodm.repositories.custom.impl.HashTagRepositoryImpl#countAllTweet2HashTag(Pageable)
89-
* @see org.woehlke.twitterwall.oodm.repositories.custom.impl.HashTagRepositoryImpl#countAllUser2HashTag(Pageable)
90-
* @see org.woehlke.twitterwall.oodm.service.impl.HashTagServiceImpl#getHashTagOverview(Pageable, Pageable)
77+
* @see org.woehlke.twitterwall.oodm.service.impl.HashTagServiceImpl#getHashTagsTweets(Pageable)
9178
*/
92-
@Test
93-
public void getHashTagOverview() throws Exception {
94-
String msg = "getHashTagOverview: ";
95-
int page=1;
96-
int size=30;
97-
Pageable pageRequestTweets = new PageRequest(page,size);
98-
Pageable pageRequestUsers = new PageRequest(page,size);
99-
HashTagOverviewPaged overview = hashTagService.getHashTagOverview(pageRequestTweets,pageRequestUsers);
100-
Page<HashTagCounted> hashTagsTweets = overview.getHashTagsTweets();
101-
Page<HashTagCounted> hashTagsUsers = overview.getHashTagsUsers();
102-
for(HashTagCounted counted:hashTagsTweets){
103-
log.info(msg+" hashTagsTweets: "+counted.getText());
104-
}
105-
for(HashTagCounted counted:hashTagsUsers){
106-
log.info(msg+" hashTagsUsers: "+counted.getText());
107-
}
108-
}
109-
11079
@Test
11180
public void getHashTagsTweets() throws Exception {
11281
String msg = "getHashTagsTweets: ";
@@ -119,6 +88,15 @@ public void getHashTagsTweets() throws Exception {
11988
}
12089
}
12190

91+
/**
92+
* @throws Exception
93+
*
94+
* @see org.woehlke.twitterwall.oodm.entities.HashTag
95+
* @see org.woehlke.twitterwall.oodm.entities.parts.Entities
96+
* @see org.woehlke.twitterwall.oodm.entities.transients.mapper.CountAllUsers2HashTagsRowMapper#SQL_COUNT_ALL_USER_2_HASHTAG
97+
* @see org.woehlke.twitterwall.oodm.repositories.custom.impl.HashTagRepositoryImpl#countAllUser2HashTag(Pageable)
98+
* @see org.woehlke.twitterwall.oodm.service.impl.HashTagServiceImpl#getHashTagsUsers(Pageable)
99+
*/
122100
@Test
123101
public void getHashTagsUsers() throws Exception {
124102
String msg = "getHashTagsUsers: ";

0 commit comments

Comments
 (0)