#20 [Performance] Add StopWatch to every methods in SqlProvider.

pom.xml

@@ -144,6 +144,7 @@ ABC-List is a JavaFX &amp; Maven application, written in NetBeans IDE.</descript
             <version>1.10.19</version>
             <scope>test</scope>
         </dependency>
+
         <dependency>
             <groupId>com.airhacks</groupId>
             <artifactId>afterburner.fx</artifactId>

release/Release_v0.4.0_2017-03-dd_HH-mm.md

@@ -21,6 +21,7 @@ topic through `key terms`.
 
 
 #### Enhancement
+#20 [Performance] Add StopWatch to every methods in SqlProvider.
 
 
 

src/main/java/com/github/naoghuman/abclist/sql/ExerciseTermSqlService.java

@@ -21,6 +21,7 @@
 import com.github.naoghuman.abclist.model.ExerciseTerm;
 import com.github.naoghuman.abclist.model.Term;
 import com.github.naoghuman.lib.database.api.DatabaseFacade;
+import com.github.naoghuman.lib.logger.api.LoggerFacade;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -29,6 +30,7 @@
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javax.persistence.Query;
+import org.apache.commons.lang3.time.StopWatch;
 
 /**
  *
@@ -73,6 +75,9 @@ void create(ExerciseTerm exerciseTerm) {
     }
 
     void deleteAllExerciseTermsWithExerciseId(long exerciseId) {
+        final StopWatch stopWatch = new StopWatch();
+        stopWatch.start();
+
         final ObservableList<ExerciseTerm> exerciseTerms = SqlProvider.getDefault().findAllExerciseTermsWithExerciseId(exerciseId);
 
         DatabaseFacade.getDefault().getCrudService().beginTransaction();
@@ -81,6 +86,11 @@ void deleteAllExerciseTermsWithExerciseId(long exerciseId) {
                     DatabaseFacade.getDefault().getCrudService().getEntityManager().remove(exerciseTerm);
                 });
         DatabaseFacade.getDefault().getCrudService().commitTransaction();
+
+        stopWatch.split();
+        LoggerFacade.getDefault().debug(this.getClass(), "  + Need " + stopWatch.toSplitString() + " for executing [deleteAllExerciseTermsWithExerciseId(long)]"); // NOI18N
+        this.printToLog(stopWatch.toSplitString(), exerciseTerms.size(), "deleteAllExerciseTermsWithExerciseId(long exerciseId)"); // NOI18N
+        stopWatch.stop();
     }
 
     ObservableList<ExerciseTerm> findAllExerciseTermsWithExerciseId(long exerciseId) {
@@ -160,6 +170,19 @@ boolean isExerciseTermMarkAsWrong(long exerciseId, long termId) {
 
         return isExerciseTermMarkAsWrong;
     }
+
+    private void printToLog(String split, int entities, String method) {
+        final StringBuilder sb = new StringBuilder();
+        sb.append("  + Need "); // NOI18N
+        sb.append(split);
+        sb.append(" for [");
+        sb.append(entities);
+        sb.append("] entities in [");
+        sb.append(method);
+        sb.append("]");
+
+        LoggerFacade.getDefault().debug(this.getClass(), sb.toString());
+    }
 
     void update(ExerciseTerm exerciseTerm) {
         DatabaseFacade.getDefault().getCrudService().update(exerciseTerm);

src/main/java/com/github/naoghuman/abclist/sql/SqlProvider.java

@@ -23,81 +23,169 @@
 import com.github.naoghuman.abclist.model.Term;
 import com.github.naoghuman.abclist.model.Topic;
 import com.github.naoghuman.lib.database.api.DatabaseFacade;
+import com.github.naoghuman.lib.logger.api.LoggerFacade;
 import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.Optional;
 import java.util.Set;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
+import org.apache.commons.lang3.time.StopWatch;
 
 /**
  *
  * @author Naoghuman
  */
 public class SqlProvider implements IDefaultConfiguration, IExerciseTermConfiguration {
 
-    private static final Optional<SqlProvider> instance = Optional.of(new SqlProvider());
+    private static final Optional<SqlProvider> INSTANCE = Optional.of(new SqlProvider());
 
     public static final SqlProvider getDefault() {
-        return instance.get();
+        return INSTANCE.get();
     }
 
     private SqlProvider() {
 
     }
 
-    public long countAllExerciseTermsWithTermId(long termId) {
-        return ExerciseTermSqlService.getDefault().countAllExerciseTermsWithTermId(termId);
-    }
+//    public long countAllExerciseTermsWithTermId(long termId) {
+//        return ExerciseTermSqlService.getDefault().countAllExerciseTermsWithTermId(termId);
+//    }
 
     public void createExercise(Exercise exercise) {
+        final StopWatch stopWatch = new StopWatch();
+        stopWatch.start();
+
         ExerciseSqlService.getDefault().create(exercise);
+
+        stopWatch.split();
+        this.printToLog(stopWatch.toSplitString(), 1, "createExercise(Exercise exercise)"); // NOI18N
+        stopWatch.stop();
     }
 
     public void createExerciseTerm(ExerciseTerm exerciseTerm) {
+        final StopWatch stopWatch = new StopWatch();
+        stopWatch.start();
+
         ExerciseTermSqlService.getDefault().create(exerciseTerm);
+
+        stopWatch.split();
+        this.printToLog(stopWatch.toSplitString(), 1, "createExerciseTerm(ExerciseTerm exerciseTerm)"); // NOI18N
+        stopWatch.stop();
     }
 
     public void createTerm(Term term) {
+        final StopWatch stopWatch = new StopWatch();
+        stopWatch.start();
+
         TermSqlService.getDefault().create(term);
+
+        stopWatch.split();
+        this.printToLog(stopWatch.toSplitString(), 1, "createTerm(Term term)"); // NOI18N
+        stopWatch.stop();
     }
 
     public void createTopic(Topic topic) {
+        final StopWatch stopWatch = new StopWatch();
+        stopWatch.start();
+
         TopicSqlService.getDefault().create(topic);
+
+        stopWatch.split();
+        this.printToLog(stopWatch.toSplitString(), 1, "createTopic(Topic topic)"); // NOI18N
+        stopWatch.stop();
     }
 
     public void deleteAllExerciseTermsWithExerciseId(long exerciseId) {
+        // StopWatch is in delegated method
         ExerciseTermSqlService.getDefault().deleteAllExerciseTermsWithExerciseId(exerciseId);
     }
 
     public ObservableList<ExerciseTerm> findAllExerciseTermsWithExerciseId(long exerciseId) {
-        return ExerciseTermSqlService.getDefault().findAllExerciseTermsWithExerciseId(exerciseId);
+        final StopWatch stopWatch = new StopWatch();
+        stopWatch.start();
+
+        final ObservableList<ExerciseTerm>  exerciseTerms = ExerciseTermSqlService.getDefault().findAllExerciseTermsWithExerciseId(exerciseId);
+
+        stopWatch.split();
+        this.printToLog(stopWatch.toSplitString(), exerciseTerms.size(), "findAllExerciseTermsWithExerciseId(long exerciseId)"); // NOI18N
+        stopWatch.stop();
+
+        return exerciseTerms;
     }
 
     public ObservableList<Exercise> findAllExercisesWithTopicId(long topicId) {
-        return ExerciseSqlService.getDefault().findAllExercisesWithTopicId(topicId);
+        final StopWatch stopWatch = new StopWatch();
+        stopWatch.start();
+
+        final ObservableList<Exercise> exercises =  ExerciseSqlService.getDefault().findAllExercisesWithTopicId(topicId);
+
+        stopWatch.split();
+        this.printToLog(stopWatch.toSplitString(), exercises.size(), "findAllExercisesWithTopicId(long topicId)"); // NOI18N
+        stopWatch.stop();
+
+        return exercises;
     }
 
     public ObservableList<Term> findAllTerms() {
-        return TermSqlService.getDefault().findAllTerms();
+        final StopWatch stopWatch = new StopWatch();
+        stopWatch.start();
+
+        final ObservableList<Term> terms = TermSqlService.getDefault().findAllTerms();
+
+        stopWatch.split();
+        this.printToLog(stopWatch.toSplitString(), terms.size(), "findAllTerms()"); // NOI18N
+        stopWatch.stop();
+
+        return terms;
     }
 
     public ObservableList<Term> findAllTermsInExerciseTerm(ObservableList<ExerciseTerm> exerciseTerms) {
-        return ExerciseTermSqlService.getDefault().findAllTermsInExerciseTerm(exerciseTerms);
+        final StopWatch stopWatch = new StopWatch();
+        stopWatch.start();
+
+        final ObservableList<Term> terms = ExerciseTermSqlService.getDefault().findAllTermsInExerciseTerm(exerciseTerms);
+
+        stopWatch.split();
+        this.printToLog(stopWatch.toSplitString(), terms.size(), "findAllTermsInExerciseTerm(ObservableList<ExerciseTerm> exerciseTerms)"); // NOI18N
+        stopWatch.stop();
+
+        return terms;
     }
 
     public ObservableList<Term> findAllTermsInExerciseTermWithoutParent() {
-        final ObservableList<Term> terms = FXCollections.observableArrayList();
-        terms.addAll(this.findAllTerms());
+        final StopWatch stopWatch = new StopWatch();
+        stopWatch.start();
+
+        final ObservableList<Term> allTerms = FXCollections.observableArrayList();
+        allTerms.addAll(this.findAllTerms());
+
+        final ObservableList<Term> terms = ExerciseTermSqlService.getDefault().findAllTermsInExerciseTermWithoutParent(allTerms);
 
-        return ExerciseTermSqlService.getDefault().findAllTermsInExerciseTermWithoutParent(terms);
+        stopWatch.split();
+        this.printToLog(stopWatch.toSplitString(), terms.size(), "findAllTermsInExerciseTermWithoutParent()"); // NOI18N
+        stopWatch.stop();
+
+        return terms;
     }
 
     public ObservableList<Term> findAllTermsWithTitle(String title) {
-        return TermSqlService.getDefault().findAllTermsWithTitle(title);
+        final StopWatch stopWatch = new StopWatch();
+        stopWatch.start();
+
+        final ObservableList<Term> terms = TermSqlService.getDefault().findAllTermsWithTitle(title);
+
+        stopWatch.split();
+        this.printToLog(stopWatch.toSplitString(), terms.size(), "findAllTermsWithTitle(String title)"); // NOI18N
+        stopWatch.stop();
+
+        return terms;
     }
 
     public ObservableList<Term> findAllTermsWithTopicId(long topicId) {
+        final StopWatch stopWatch = new StopWatch();
+        stopWatch.start();
+
         final ObservableList<Term> allTermsWithTopicId = FXCollections.observableArrayList();
 
         final ObservableList<Exercise> observableListExercises = this.findAllExercisesWithTopicId(topicId);
@@ -116,40 +204,112 @@ public ObservableList<Term> findAllTermsWithTopicId(long topicId) {
                     allTermsWithTopicId.add(TermSqlService.getDefault().findById(termId));
                 });
         Collections.sort(allTermsWithTopicId);
+
+        stopWatch.split();
+        this.printToLog(stopWatch.toSplitString(), allTermsWithTopicId.size(), "findAllTermsWithTopicId(long topicId)"); // NOI18N
+        stopWatch.stop();
 
         return allTermsWithTopicId;
     }
 
     public ObservableList<Topic> findAllTopics() {
-        return TopicSqlService.getDefault().findAllTopics();
+        final StopWatch stopWatch = new StopWatch();
+        stopWatch.start();
+
+        final ObservableList<Topic> topics = TopicSqlService.getDefault().findAllTopics();
+
+        stopWatch.split();
+        this.printToLog(stopWatch.toSplitString(), topics.size(), "findAllTopics()"); // NOI18N
+        stopWatch.stop();
+
+        return topics;
     }
 
     public <T extends Object> Optional<T> findById(Class<T> type, long entityId) {
-        return Optional.ofNullable(DatabaseFacade.getDefault().getCrudService().findById(type, entityId));
+        final StopWatch stopWatch = new StopWatch();
+        stopWatch.start();
+
+        final Optional<T> optional = Optional.ofNullable(DatabaseFacade.getDefault().getCrudService().findById(type, entityId));
+
+        stopWatch.split();
+        this.printToLog(stopWatch.toSplitString(), 1, "findById(Class<T> type, long entityId)"); // NOI18N
+        stopWatch.stop();
+
+        return optional;
     }
 
     public Optional<ExerciseTerm> findExerciseTerm(long exerciseId, long termId) {
-        return ExerciseTermSqlService.getDefault().findExerciseTerm(exerciseId, termId);
+        final StopWatch stopWatch = new StopWatch();
+        stopWatch.start();
+
+        final Optional<ExerciseTerm> optional = ExerciseTermSqlService.getDefault().findExerciseTerm(exerciseId, termId);
+
+        stopWatch.split();
+        this.printToLog(stopWatch.toSplitString(), 1, "findExerciseTerm(long exerciseId, long termId)"); // NOI18N
+        stopWatch.stop();
+
+        return optional;
     }
 
-    public boolean isExerciseTermMarkAsWrong(long exerciseId, long termId) {
-        return ExerciseTermSqlService.getDefault().isExerciseTermMarkAsWrong(exerciseId, termId);
+//    public boolean isExerciseTermMarkAsWrong(long exerciseId, long termId) {
+//        return ExerciseTermSqlService.getDefault().isExerciseTermMarkAsWrong(exerciseId, termId);
+//    }
+
+    private void printToLog(String split, int entities, String method) {
+        final StringBuilder sb = new StringBuilder();
+        sb.append("  + Need "); // NOI18N
+        sb.append(split);
+        sb.append(" for [");
+        sb.append(entities);
+        sb.append("] entities in [");
+        sb.append(method);
+        sb.append("]");
+
+        LoggerFacade.getDefault().debug(this.getClass(), sb.toString());
     }
 
     public void updateExercise(Exercise exercise) {
+        final StopWatch stopWatch = new StopWatch();
+        stopWatch.start();
+
         ExerciseSqlService.getDefault().update(exercise);
+
+        stopWatch.split();
+        this.printToLog(stopWatch.toSplitString(), 1, "updateExercise(Exercise exercise)"); // NOI18N
+        stopWatch.stop();
     }
 
     public void updateExerciseTerm(ExerciseTerm exerciseTerm) {
+        final StopWatch stopWatch = new StopWatch();
+        stopWatch.start();
+
         ExerciseTermSqlService.getDefault().update(exerciseTerm);
+
+        stopWatch.split();
+        this.printToLog(stopWatch.toSplitString(), 1, "updateExerciseTerm(ExerciseTerm exerciseTerm)"); // NOI18N
+        stopWatch.stop();
     }
 
     public void updateTerm(Term term) {
+        final StopWatch stopWatch = new StopWatch();
+        stopWatch.start();
+
         TermSqlService.getDefault().update(term);
+
+        stopWatch.split();
+        this.printToLog(stopWatch.toSplitString(), 1, "updateTerm(Term term)"); // NOI18N
+        stopWatch.stop();
     }
 
     public void updateTopic(Topic topic) {
+        final StopWatch stopWatch = new StopWatch();
+        stopWatch.start();
+
         TopicSqlService.getDefault().update(topic);
+
+        stopWatch.split();
+        this.printToLog(stopWatch.toSplitString(), 1, "updateTopic(Topic topic)"); // NOI18N
+        stopWatch.stop();
     }
 
 }

todo/TODO.txt

@@ -4,11 +4,11 @@ TODO
 ERROR
  - In TestdataApplication the %Xy message in the ComboBox ExerciseTerms isn't 
    correct.
+ - NavigationTabTerms
+    - findAllTermsInExerciseTermWithoutParent need to much time
 
 --------------------------------------------------------------------------------
 REFACTORING
-NavigationTabTerms
- - findAllTermsInExerciseTermWithoutParent need to much time
 
 ExerciseView
  - [Term]s have more options in the [ContextMenu]