Home Explore Help
Sign In
compsci-industry
/
TechEmpower.FrameworkBenchmarks
mirror of https://github.com/TechEmpower/FrameworkBenchmarks.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

clean up code

Nick Kasvosve 10 years ago
parent
9d04ff3bf8
commit
f9c08d2244
4 changed files with 12 additions and 11 deletions
Unified View Show Diff Stats
  1. 6 4
      frameworks/Java/beyondj/beyondj-service/src/main/java/com/techempower/beyondj/action/FortuneActionBean.java
  2. 5 3
      frameworks/Java/beyondj/beyondj-service/src/main/java/com/techempower/beyondj/action/HelloActionBean.java
  3. 0 3
      frameworks/Java/beyondj/beyondj-service/src/main/java/com/techempower/beyondj/action/WorldDatabaseActionBean.java
  4. 1 1
      frameworks/Java/beyondj/beyondj-service/src/main/webapp/index.html

+ 6 - 4
frameworks/Java/beyondj/beyondj-service/src/main/java/com/techempower/beyondj/action/FortuneActionBean.java
View File 

@@ -17,10 +17,9 @@ public class FortuneActionBean extends BaseActionBean {
 
     private List<Fortune> fortunes;
 
     private List<Fortune> fortunes;
 
 
 
     @DefaultHandler
 
     @DefaultHandler
 
-    @HandlesEvent("fortunes")
 
+    @HandlesEvent(FORTUNES)
 
     public Resolution fortunes() {
 
     public Resolution fortunes() {
 
-       // validateRepository();
 
-        Iterable<Fortune> it = this.fortuneRepository.findAll();
 
+         Iterable<Fortune> it = this.fortuneRepository.findAll();
 
         fortunes = new ArrayList<>();
 
         fortunes = new ArrayList<>();
 
         Iterator<Fortune> iterator = it.iterator();
 
         Iterator<Fortune> iterator = it.iterator();
 
         while (iterator.hasNext()) {
 
         while (iterator.hasNext()) {
 
@@ -29,7 +28,7 @@ public class FortuneActionBean extends BaseActionBean {
 
         fortunes.add(new Fortune(0, "Additional fortune added at request time."));
 
         fortunes.add(new Fortune(0, "Additional fortune added at request time."));
 
         Collections.sort(fortunes);
 
         Collections.sort(fortunes);
 
         setResponseDate();
 
         setResponseDate();
 
-        return new ForwardResolution("/WEB-INF/templates/fortunes.jsp");
 
+        return new ForwardResolution(JSP);
 
     }
 
     }
 
 
 
     public List<Fortune> getFortunes() {
 
     public List<Fortune> getFortunes() {
 
@@ -40,4 +39,7 @@ public class FortuneActionBean extends BaseActionBean {
 
     private EntityManagerFactory entityManagerFactory;
 
     private EntityManagerFactory entityManagerFactory;
 
     @SpringBean
 
     @SpringBean
 
     private FortuneRepository fortuneRepository;
 
     private FortuneRepository fortuneRepository;
 
+
 
+    public static final String JSP = "/WEB-INF/templates/fortunes.jsp";
 
+    public static final String FORTUNES = "fortunes";
 
 }
 
 }

+ 5 - 3
frameworks/Java/beyondj/beyondj-service/src/main/java/com/techempower/beyondj/action/HelloActionBean.java
View File 

@@ -8,15 +8,15 @@ import javax.servlet.http.HttpServletResponse;
 
 @UrlBinding("/perf/hello/{_eventName}")
 
 @UrlBinding("/perf/hello/{_eventName}")
 
 public class HelloActionBean extends BaseActionBean {
 
 public class HelloActionBean extends BaseActionBean {
 
 
 
-    @HandlesEvent("json")
 
+    @HandlesEvent(JSON)
 
     @DefaultHandler
 
     @DefaultHandler
 
     public Resolution json() {
 
     public Resolution json() {
 
-        Message message = new Message("Hello, World!");
 
+        Message message = new Message(HELLO_WORLD);
 
         setResponseDate();
 
         setResponseDate();
 
         return new JsonResolution(message);
 
         return new JsonResolution(message);
 
     }
 
     }
 
 
 
-    @HandlesEvent("plaintext")
 
+    @HandlesEvent(PLAINTEXT)
 
     public Resolution plaintext() {
 
     public Resolution plaintext() {
 
         return new StreamingResolution(TEXT_PLAIN) {
 
         return new StreamingResolution(TEXT_PLAIN) {
 
             public void stream(final HttpServletResponse response) {
 
             public void stream(final HttpServletResponse response) {
 
@@ -30,6 +30,8 @@ public class HelloActionBean extends BaseActionBean {
 
         };
 
         };
 
     }
 
     }
 
 
 
+    public static final String PLAINTEXT = "plaintext";
 
+    public static final String JSON = "json";
 
     private static final String HELLO_WORLD = "Hello, World!";
 
     private static final String HELLO_WORLD = "Hello, World!";
 
     private static final String TEXT_PLAIN = "text/plain";
 
     private static final String TEXT_PLAIN = "text/plain";
 
 }
 
 }

+ 0 - 3
frameworks/Java/beyondj/beyondj-service/src/main/java/com/techempower/beyondj/action/WorldDatabaseActionBean.java
View File 

@@ -31,7 +31,6 @@ public class WorldDatabaseActionBean extends BaseActionBean {
 
     @HandlesEvent(DB)
 
     @HandlesEvent(DB)
 
     @DefaultHandler
 
     @DefaultHandler
 
     public Resolution queryOne() {
 
     public Resolution queryOne() {
 
-        //  validateRepository();
 
         final Random random = ThreadLocalRandom.current();
 
         final Random random = ThreadLocalRandom.current();
 
         World world = (World) worldRepository.findOne(random.nextInt(DB_ROWS) + 1);
 
         World world = (World) worldRepository.findOne(random.nextInt(DB_ROWS) + 1);
 
         setResponseDate();
 
         setResponseDate();
 
@@ -41,7 +40,6 @@ public class WorldDatabaseActionBean extends BaseActionBean {
 
     @HandlesEvent(QUERIES)
 
     @HandlesEvent(QUERIES)
 
     @Transactional(readOnly = true)
 
     @Transactional(readOnly = true)
 
     public Resolution queries() {
 
     public Resolution queries() {
 
-        //    validateRepository();
 
         boundQueryCount();
 
         boundQueryCount();
 
         List<Future<World>> wfs = new ArrayList<>(queries);
 
         List<Future<World>> wfs = new ArrayList<>(queries);
 
         for (int i = 0; i < queries; i++) {
 
         for (int i = 0; i < queries; i++) {
 
@@ -62,7 +60,6 @@ public class WorldDatabaseActionBean extends BaseActionBean {
 
     @HandlesEvent(UPDATES)
 
     @HandlesEvent(UPDATES)
 
     @Transactional
 
     @Transactional
 
     public Resolution updates() {
 
     public Resolution updates() {
 
-        //   validateRepository();
 
         boundQueryCount();
 
         boundQueryCount();
 
         List<Future<World>> wfs = new ArrayList<>(queries);
 
         List<Future<World>> wfs = new ArrayList<>(queries);
 
         for (int i = 0; i < queries; i++) {
 
         for (int i = 0; i < queries; i++) {

+ 1 - 1
frameworks/Java/beyondj/beyondj-service/src/main/webapp/index.html
View File 

@@ -1,5 +1,5 @@
 
 <html>
 
 <html>
 
 <head>
 
 <head>
 
-<meta http-equiv="refresh" content="0;url=/beyondj-service/perf/hello" />
 
+<meta http-equiv="refresh" content="0;url=/beyondj-service/site.html" />
 
 </head>
 
 </head>
 
 </html>
 
 </html>