Skip to content

Commit e8c7c9e

Browse files
fixed #271
1 parent b5720ec commit e8c7c9e

File tree

284 files changed

+686
-1255
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

284 files changed

+686
-1255
lines changed

src/main/java/org/woehlke/twitterwall/ScheduledTasks.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import org.springframework.scheduling.annotation.Scheduled;
77
import org.springframework.stereotype.Component;
88
import org.woehlke.twitterwall.conf.properties.SchedulerProperties;
9-
import org.woehlke.twitterwall.oodm.entities.Task;
9+
import org.woehlke.twitterwall.oodm.model.Task;
1010
import org.woehlke.twitterwall.scheduled.mq.endpoint.tasks.AsyncStartTask;
1111

1212
/**

src/main/java/org/woehlke/twitterwall/frontend/controller/common/ControllerHelper.java renamed to src/main/java/org/woehlke/twitterwall/frontend/common/ControllerHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.woehlke.twitterwall.frontend.controller.common;
1+
package org.woehlke.twitterwall.frontend.common;
22

33
import org.springframework.ui.Model;
44
import org.springframework.web.servlet.ModelAndView;

src/main/java/org/woehlke/twitterwall/frontend/controller/common/Symbols.java renamed to src/main/java/org/woehlke/twitterwall/frontend/common/Symbols.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.woehlke.twitterwall.frontend.controller.common;
1+
package org.woehlke.twitterwall.frontend.common;
22

33
/**
44
* Created by tw on 01.07.17.

src/main/java/org/woehlke/twitterwall/frontend/controller/common/impl/ControllerHelperImpl.java renamed to src/main/java/org/woehlke/twitterwall/frontend/common/impl/ControllerHelperImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.woehlke.twitterwall.frontend.controller.common.impl;
1+
package org.woehlke.twitterwall.frontend.common.impl;
22

33
import org.slf4j.Logger;
44
import org.slf4j.LoggerFactory;
@@ -8,7 +8,7 @@
88
import org.springframework.web.servlet.ModelAndView;
99
import org.woehlke.twitterwall.conf.properties.TwitterProperties;
1010
import org.woehlke.twitterwall.conf.properties.FrontendProperties;
11-
import org.woehlke.twitterwall.frontend.controller.common.ControllerHelper;
11+
import org.woehlke.twitterwall.frontend.common.ControllerHelper;
1212
import org.woehlke.twitterwall.frontend.model.Page;
1313

1414
/**

src/main/java/org/woehlke/twitterwall/frontend/controller/ApplicationController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
import org.springframework.ui.Model;
66
import org.springframework.web.bind.annotation.RequestMapping;
77
import org.woehlke.twitterwall.conf.properties.TwitterProperties;
8-
import org.woehlke.twitterwall.frontend.controller.common.Symbols;
9-
import org.woehlke.twitterwall.frontend.controller.common.ControllerHelper;
8+
import org.woehlke.twitterwall.frontend.common.Symbols;
9+
import org.woehlke.twitterwall.frontend.common.ControllerHelper;
1010

1111
/**
1212
* Created by tw on 03.07.17.

src/main/java/org/woehlke/twitterwall/frontend/controller/CountedEntitiesController.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
import org.springframework.web.bind.annotation.RequestParam;
1111
import org.woehlke.twitterwall.conf.properties.FrontendProperties;
1212
import org.woehlke.twitterwall.conf.properties.TwitterProperties;
13-
import org.woehlke.twitterwall.frontend.controller.common.Symbols;
14-
import org.woehlke.twitterwall.frontend.controller.common.ControllerHelper;
15-
import org.woehlke.twitterwall.oodm.entities.*;
16-
import org.woehlke.twitterwall.oodm.entities.parts.CountedEntities;
17-
import org.woehlke.twitterwall.oodm.entities.transients.Object2Entity;
13+
import org.woehlke.twitterwall.frontend.common.Symbols;
14+
import org.woehlke.twitterwall.frontend.common.ControllerHelper;
15+
import org.woehlke.twitterwall.oodm.model.*;
16+
import org.woehlke.twitterwall.oodm.model.parts.CountedEntities;
17+
import org.woehlke.twitterwall.oodm.model.transients.Object2Entity;
1818
import org.woehlke.twitterwall.oodm.service.*;
1919

2020
import java.util.ArrayList;

src/main/java/org/woehlke/twitterwall/frontend/controller/HashTagController.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
import org.springframework.web.bind.annotation.RequestParam;
1515
import org.woehlke.twitterwall.conf.properties.TwitterProperties;
1616
import org.woehlke.twitterwall.conf.properties.FrontendProperties;
17-
import org.woehlke.twitterwall.frontend.controller.common.Symbols;
18-
import org.woehlke.twitterwall.frontend.controller.common.ControllerHelper;
19-
import org.woehlke.twitterwall.oodm.entities.transients.HashTagCounted;
20-
import org.woehlke.twitterwall.oodm.entities.Tweet;
21-
import org.woehlke.twitterwall.oodm.entities.User;
22-
import org.woehlke.twitterwall.oodm.entities.HashTag;
17+
import org.woehlke.twitterwall.frontend.common.Symbols;
18+
import org.woehlke.twitterwall.frontend.common.ControllerHelper;
19+
import org.woehlke.twitterwall.oodm.model.transients.HashTagCounted;
20+
import org.woehlke.twitterwall.oodm.model.Tweet;
21+
import org.woehlke.twitterwall.oodm.model.User;
22+
import org.woehlke.twitterwall.oodm.model.HashTag;
2323
import org.woehlke.twitterwall.oodm.service.TweetService;
2424
import org.woehlke.twitterwall.oodm.service.UserService;
2525
import org.woehlke.twitterwall.oodm.service.HashTagService;
@@ -28,8 +28,8 @@
2828
import java.util.regex.Matcher;
2929
import java.util.regex.Pattern;
3030

31-
import static org.woehlke.twitterwall.frontend.controller.common.ControllerHelper.FIRST_PAGE_NUMBER;
32-
import static org.woehlke.twitterwall.oodm.entities.HashTag.HASHTAG_TEXT_PATTERN;
31+
import static org.woehlke.twitterwall.frontend.common.ControllerHelper.FIRST_PAGE_NUMBER;
32+
import static org.woehlke.twitterwall.oodm.model.HashTag.HASHTAG_TEXT_PATTERN;
3333

3434
/**
3535
* Created by tw on 12.07.17.

src/main/java/org/woehlke/twitterwall/frontend/controller/ImprintController.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
import org.springframework.ui.Model;
88
import org.springframework.web.bind.annotation.RequestMapping;
99
import org.woehlke.twitterwall.conf.properties.FrontendProperties;
10-
import org.woehlke.twitterwall.frontend.controller.common.Symbols;
11-
import org.woehlke.twitterwall.frontend.controller.common.ControllerHelper;
12-
import org.woehlke.twitterwall.oodm.entities.User;
10+
import org.woehlke.twitterwall.frontend.common.Symbols;
11+
import org.woehlke.twitterwall.frontend.common.ControllerHelper;
12+
import org.woehlke.twitterwall.oodm.model.User;
1313
import org.woehlke.twitterwall.scheduled.mq.endpoint.tasks.StartTask;
1414

1515

src/main/java/org/woehlke/twitterwall/frontend/controller/LoginController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import org.springframework.stereotype.Controller;
77
import org.springframework.ui.Model;
88
import org.springframework.web.bind.annotation.RequestMapping;
9-
import org.woehlke.twitterwall.frontend.controller.common.ControllerHelper;
10-
import org.woehlke.twitterwall.frontend.controller.common.Symbols;
9+
import org.woehlke.twitterwall.frontend.common.ControllerHelper;
10+
import org.woehlke.twitterwall.frontend.common.Symbols;
1111

1212
@Controller
1313
public class LoginController {

src/main/java/org/woehlke/twitterwall/frontend/controller/MediaController.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,18 @@
1313
import org.springframework.web.bind.annotation.RequestMapping;
1414
import org.springframework.web.bind.annotation.RequestParam;
1515
import org.woehlke.twitterwall.conf.properties.FrontendProperties;
16-
import org.woehlke.twitterwall.frontend.controller.common.Symbols;
17-
import org.woehlke.twitterwall.frontend.controller.common.ControllerHelper;
18-
import org.woehlke.twitterwall.oodm.entities.Media;
19-
import org.woehlke.twitterwall.oodm.entities.Tweet;
20-
import org.woehlke.twitterwall.oodm.entities.User;
16+
import org.woehlke.twitterwall.frontend.common.Symbols;
17+
import org.woehlke.twitterwall.frontend.common.ControllerHelper;
18+
import org.woehlke.twitterwall.oodm.model.Media;
19+
import org.woehlke.twitterwall.oodm.model.Tweet;
20+
import org.woehlke.twitterwall.oodm.model.User;
2121
import org.woehlke.twitterwall.oodm.service.MediaService;
2222
import org.woehlke.twitterwall.oodm.service.TweetService;
2323
import org.woehlke.twitterwall.oodm.service.UserService;
2424

2525
import javax.persistence.EntityNotFoundException;
2626

27-
import static org.woehlke.twitterwall.frontend.controller.common.ControllerHelper.FIRST_PAGE_NUMBER;
27+
import static org.woehlke.twitterwall.frontend.common.ControllerHelper.FIRST_PAGE_NUMBER;
2828

2929
/**
3030
* Created by tw on 16.07.17.

0 commit comments

Comments
 (0)