Removed unused code

saw303 · Mar 30, 2017 · 0918546 · 0918546
1 parent a2a31c1
commit 0918546
Show file tree

Hide file tree

Showing 6 changed files with 316 additions and 314 deletions.
diff --git a/core/src/main/java/ch/silviowangler/dox/DocumentServiceImpl.java b/core/src/main/java/ch/silviowangler/dox/DocumentServiceImpl.java
@@ -33,7 +33,6 @@
 import static org.springframework.util.Assert.notEmpty;
 import static org.springframework.util.Assert.notNull;
 
-import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 
@@ -663,7 +662,7 @@ private Object makeAssignable(AttributeDataType desiredDataType, Object valueToC
     }
 
     private boolean isRangeCompatible(AttributeDataType desiredDataType) {
-        return Lists.newArrayList(DATE, DOUBLE, INTEGER, LONG, SHORT).contains(desiredDataType);
+        return newArrayList(DATE, DOUBLE, INTEGER, LONG, SHORT).contains(desiredDataType);
     }
 
     @SuppressWarnings("unchecked")

diff --git a/core/src/main/java/ch/silviowangler/dox/stats/StatisticsServiceImpl.java b/core/src/main/java/ch/silviowangler/dox/stats/StatisticsServiceImpl.java
@@ -31,7 +31,6 @@
 import ch.silviowangler.dox.api.stats.DocumentReferenceClickStats;
 import ch.silviowangler.dox.api.stats.StatisticsService;
 import ch.silviowangler.dox.domain.stats.ClickStats;
-import ch.silviowangler.dox.domain.stats.ReferenceType;
 import ch.silviowangler.dox.repository.stats.ClickStatsRepository;
 
 /**
@@ -41,50 +40,50 @@
 @Service("statisticsService")
 public class StatisticsServiceImpl implements StatisticsService {
 
-    @Autowired
-    private ClickStatsRepository clickStatsRepository;
+  @Autowired
+  private ClickStatsRepository clickStatsRepository;
 
-    @Override
-    @Transactional(readOnly = true, propagation = SUPPORTS)
-    @PreAuthorize("hasRole('ROLE_USER')")
-    public Long fetchDocumentReferenceClicksCount() {
-        return clickStatsRepository.countDocumentReferenceClicks();
-    }
+  @Override
+  @Transactional(readOnly = true, propagation = SUPPORTS)
+  @PreAuthorize("hasRole('ROLE_USER')")
+  public Long fetchDocumentReferenceClicksCount() {
+    return clickStatsRepository.countDocumentReferenceClicks();
+  }
 
-    @Override
-    @Transactional(readOnly = true, propagation = SUPPORTS)
-    @PreAuthorize("hasRole('ROLE_USER')")
-    public Long fetchLinkClicksCount() {
-        return clickStatsRepository.countLinkClicks();
-    }
+  @Override
+  @Transactional(readOnly = true, propagation = SUPPORTS)
+  @PreAuthorize("hasRole('ROLE_USER')")
+  public Long fetchLinkClicksCount() {
+    return clickStatsRepository.countLinkClicks();
+  }
 
-    @Override
-    @Transactional
-    @PreAuthorize("hasRole('ROLE_USER')")
-    public void registerDocumentReferenceClick(String documentReferenceId, String username) {
-        ClickStats stats = new ClickStats(documentReferenceId, DOCUMENT_REFERENCE, username);
-        clickStatsRepository.save(stats);
-    }
+  @Override
+  @Transactional
+  @PreAuthorize("hasRole('ROLE_USER')")
+  public void registerDocumentReferenceClick(String documentReferenceId, String username) {
+    ClickStats stats = new ClickStats(documentReferenceId, DOCUMENT_REFERENCE, username);
+    clickStatsRepository.save(stats);
+  }
 
-    @Override
-    @Transactional
-    @PreAuthorize("hasRole('ROLE_USER')")
-    public void registerLinkClick(String link, String username) {
-        ClickStats stats = new ClickStats(link, LINK, username);
-        clickStatsRepository.save(stats);
-    }
+  @Override
+  @Transactional
+  @PreAuthorize("hasRole('ROLE_USER')")
+  public void registerLinkClick(String link, String username) {
+    ClickStats stats = new ClickStats(link, LINK, username);
+    clickStatsRepository.save(stats);
+  }
 
-    @Override
-    @Transactional(readOnly = true, propagation = SUPPORTS)
-    @PreAuthorize("hasRole('ROLE_USER')")
-    public List<DocumentReferenceClickStats> fetchDocumentReferenceClickStats() {
+  @Override
+  @Transactional(readOnly = true, propagation = SUPPORTS)
+  @PreAuthorize("hasRole('ROLE_USER')")
+  public List<DocumentReferenceClickStats> fetchDocumentReferenceClickStats() {
 
-        final List<Object[]> documentReferenceClickStats = clickStatsRepository.fetchDocumentReferenceClickStatistics(ReferenceType.DOCUMENT_REFERENCE);
-        List<DocumentReferenceClickStats> result = Lists.newArrayListWithCapacity(documentReferenceClickStats.size());
+    final List<Object[]> documentReferenceClickStats = clickStatsRepository.fetchDocumentReferenceClickStatistics(DOCUMENT_REFERENCE);
+    List<DocumentReferenceClickStats> result = Lists.newArrayListWithCapacity(documentReferenceClickStats.size());
 
-        for (Object[] stats : documentReferenceClickStats) {
-            result.add(new DocumentReferenceClickStats((String) stats[1], ((Number) stats[0]).longValue()));
-        }
-        return result;
+    for (Object[] stats : documentReferenceClickStats) {
+      result.add(new DocumentReferenceClickStats((String) stats[1], ((Number) stats[0]).longValue()));
     }
+    return result;
+  }
 }
diff --git a/core/src/test/java/ch/silviowangler/dox/AbstractIntegrationTest.java b/core/src/test/java/ch/silviowangler/dox/AbstractIntegrationTest.java
@@ -121,7 +121,7 @@ protected DocumentReference importDocument(String fileName, String documentClass
 
     protected DocumentReference importDocument(String fileName, Map<TranslatableKey, DescriptiveIndex> indexes, String documentClassShortName) throws IOException, ValidationException, DocumentDuplicationException, DocumentClassNotFoundException {
         File singlePagePdf = loadFile(fileName);
-        PhysicalDocument doc = new PhysicalDocument(new DocumentClass(documentClassShortName), FileUtils.readFileToByteArray(singlePagePdf), indexes, singlePagePdf.getName());
+        PhysicalDocument doc = new PhysicalDocument(new DocumentClass(documentClassShortName), readFileToByteArray(singlePagePdf), indexes, singlePagePdf.getName());
         doc.setClient("wangler");
         return documentService.importDocument(doc);
     }