Skip to content

Commit

Permalink
Fix package naming
Browse files Browse the repository at this point in the history
  • Loading branch information
user4223 committed Apr 21, 2024
1 parent 5d57f30 commit 69d2c2e
Show file tree
Hide file tree
Showing 46 changed files with 175 additions and 249 deletions.
Original file line number Diff line number Diff line change
@@ -1,45 +1,44 @@
package org.insaneheadoflettuce.balanceAnalyzer;
package org.insaneheadoflettuce.balance_analyzer;

import org.insaneheadoflettuce.balanceAnalyzer.model.Account;
import org.insaneheadoflettuce.balanceAnalyzer.model.Transaction;
import org.insaneheadoflettuce.balance_analyzer.model.Account;
import org.insaneheadoflettuce.balance_analyzer.model.Transaction;

import java.util.List;
import java.util.stream.Collectors;

public abstract class AbstractTransactionCollection implements TransactionCollection {

@Override
final public int getSize() {
public final int getSize() {
return getTransactions().size();
}

@Override
final public List<String> getAccountColors() {
public final List<String> getAccountColors() {
return getTransactions().stream()
.map(Transaction::getAccount)
.distinct()
.map(Account::getColor)
.collect(Collectors.toList());
.toList();
}

@Override
final public Number getDifferentialMovement() {
public final Number getDifferentialMovement() {
return new Number(getTransactions().stream()
.map(Transaction::getAmount)
.mapToDouble(Number::getValue)
.sum());
}

@Override
final public Number getAbsoluteMovement() {
public final Number getAbsoluteMovement() {
return new Number(getTransactions().stream()
.map(Transaction::getAmount)
.mapToDouble(a -> Math.abs(a.getValue()))
.sum(), true);
}

@Override
final public Number getPositiveMovement() {
public final Number getPositiveMovement() {
return new Number(getTransactions().stream()
.map(Transaction::getAmount)
.filter(Number::isPositive)
Expand All @@ -48,7 +47,7 @@ final public Number getPositiveMovement() {
}

@Override
final public Number getNegativeMovement() {
public final Number getNegativeMovement() {
return new Number(getTransactions().stream()
.map(Transaction::getAmount)
.filter(Number::isNegative)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package org.insaneheadoflettuce.balanceAnalyzer;

import org.insaneheadoflettuce.balanceAnalyzer.dao.AccountRepository;
import org.insaneheadoflettuce.balanceAnalyzer.dao.ClusterDescriptionRepository;
import org.insaneheadoflettuce.balanceAnalyzer.dao.ClusterRepository;
import org.insaneheadoflettuce.balanceAnalyzer.dao.TransactionRepository;
import org.insaneheadoflettuce.balanceAnalyzer.model.Account;
import org.insaneheadoflettuce.balanceAnalyzer.model.Cluster;
import org.insaneheadoflettuce.balanceAnalyzer.model.ClusterDescription;
import org.insaneheadoflettuce.balanceAnalyzer.model.Transaction;
import org.insaneheadoflettuce.balanceAnalyzer.utility.FileUtilities;
package org.insaneheadoflettuce.balance_analyzer;

import org.insaneheadoflettuce.balance_analyzer.dao.AccountRepository;
import org.insaneheadoflettuce.balance_analyzer.dao.ClusterDescriptionRepository;
import org.insaneheadoflettuce.balance_analyzer.dao.ClusterRepository;
import org.insaneheadoflettuce.balance_analyzer.dao.TransactionRepository;
import org.insaneheadoflettuce.balance_analyzer.model.Account;
import org.insaneheadoflettuce.balance_analyzer.model.Cluster;
import org.insaneheadoflettuce.balance_analyzer.model.ClusterDescription;
import org.insaneheadoflettuce.balance_analyzer.model.Transaction;
import org.insaneheadoflettuce.balance_analyzer.utility.FileUtilities;
import org.insaneheadoflettuce.input.DataImporter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.insaneheadoflettuce.balanceAnalyzer;
package org.insaneheadoflettuce.balance_analyzer;

import org.springframework.data.util.Pair;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.insaneheadoflettuce.balanceAnalyzer;
package org.insaneheadoflettuce.balance_analyzer;

import java.util.Objects;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.insaneheadoflettuce.balanceAnalyzer;
package org.insaneheadoflettuce.balance_analyzer;

import org.insaneheadoflettuce.balanceAnalyzer.model.Transaction;
import org.insaneheadoflettuce.balance_analyzer.model.Transaction;

import java.util.List;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package org.insaneheadoflettuce.balanceAnalyzer;
package org.insaneheadoflettuce.balance_analyzer;

import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.insaneheadoflettuce.balanceAnalyzer.model.Cluster;
import org.insaneheadoflettuce.balanceAnalyzer.model.Transaction;
import org.insaneheadoflettuce.balance_analyzer.model.Cluster;
import org.insaneheadoflettuce.balance_analyzer.model.Transaction;

import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
package org.insaneheadoflettuce.balanceAnalyzer.controller;
package org.insaneheadoflettuce.balance_analyzer.controller;

import com.google.common.collect.Streams;
import io.micrometer.core.annotation.Timed;
import io.micrometer.core.instrument.Counter;
import io.micrometer.core.instrument.Metrics;
import org.insaneheadoflettuce.balanceAnalyzer.IntervalChopper;
import org.insaneheadoflettuce.balanceAnalyzer.TransactionCollection;
import org.insaneheadoflettuce.balanceAnalyzer.TransactionInterval;
import org.insaneheadoflettuce.balanceAnalyzer.dao.AccountRepository;
import org.insaneheadoflettuce.balanceAnalyzer.dao.ClusterRepository;
import org.insaneheadoflettuce.balanceAnalyzer.dao.TransactionRepository;
import org.insaneheadoflettuce.balanceAnalyzer.model.Cluster;
import org.insaneheadoflettuce.balance_analyzer.IntervalChopper;
import org.insaneheadoflettuce.balance_analyzer.TransactionCollection;
import org.insaneheadoflettuce.balance_analyzer.TransactionInterval;
import org.insaneheadoflettuce.balance_analyzer.dao.AccountRepository;
import org.insaneheadoflettuce.balance_analyzer.dao.ClusterRepository;
import org.insaneheadoflettuce.balance_analyzer.dao.TransactionRepository;
import org.insaneheadoflettuce.balance_analyzer.model.Cluster;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.insaneheadoflettuce.balanceAnalyzer.dao;
package org.insaneheadoflettuce.balance_analyzer.dao;

import org.insaneheadoflettuce.balanceAnalyzer.model.Account;
import org.insaneheadoflettuce.balance_analyzer.model.Account;
import org.springframework.data.repository.CrudRepository;
import org.springframework.stereotype.Repository;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.insaneheadoflettuce.balanceAnalyzer.dao;
package org.insaneheadoflettuce.balance_analyzer.dao;

import org.insaneheadoflettuce.balanceAnalyzer.model.ClusterDescription;
import org.insaneheadoflettuce.balance_analyzer.model.ClusterDescription;
import org.springframework.data.repository.CrudRepository;
import org.springframework.stereotype.Repository;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.insaneheadoflettuce.balanceAnalyzer.dao;
package org.insaneheadoflettuce.balance_analyzer.dao;

import org.insaneheadoflettuce.balanceAnalyzer.model.Cluster;
import org.insaneheadoflettuce.balance_analyzer.model.Cluster;
import org.springframework.data.repository.CrudRepository;
import org.springframework.stereotype.Repository;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.insaneheadoflettuce.balanceAnalyzer.dao;
package org.insaneheadoflettuce.balance_analyzer.dao;

import org.insaneheadoflettuce.balanceAnalyzer.model.Transaction;
import org.insaneheadoflettuce.balance_analyzer.model.Transaction;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.CrudRepository;
import org.springframework.data.repository.query.Param;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.insaneheadoflettuce.balanceAnalyzer.dao;
package org.insaneheadoflettuce.balance_analyzer.dao;

import org.insaneheadoflettuce.balanceAnalyzer.model.Transaction;
import org.insaneheadoflettuce.balance_analyzer.model.Transaction;
import org.springframework.data.util.Pair;

import java.time.LocalDate;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.insaneheadoflettuce.balanceAnalyzer.dao;
package org.insaneheadoflettuce.balance_analyzer.dao;

import jakarta.persistence.EntityManager;
import org.insaneheadoflettuce.balanceAnalyzer.model.Transaction;
import org.insaneheadoflettuce.balance_analyzer.model.Transaction;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.data.util.Pair;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.insaneheadoflettuce.balanceAnalyzer.model;
package org.insaneheadoflettuce.balance_analyzer.model;

import jakarta.persistence.*;
import org.insaneheadoflettuce.balanceAnalyzer.utility.IBANValidator;
import org.insaneheadoflettuce.balance_analyzer.utility.IBANValidator;

import java.util.Set;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.insaneheadoflettuce.balanceAnalyzer.model;
package org.insaneheadoflettuce.balance_analyzer.model;

import jakarta.persistence.*;
import org.insaneheadoflettuce.balanceAnalyzer.AbstractTransactionCollection;
import org.insaneheadoflettuce.balance_analyzer.AbstractTransactionCollection;

import java.util.ArrayList;
import java.util.Comparator;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.insaneheadoflettuce.balanceAnalyzer.model;
package org.insaneheadoflettuce.balance_analyzer.model;

import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.insaneheadoflettuce.balanceAnalyzer.model;
package org.insaneheadoflettuce.balance_analyzer.model;

import jakarta.persistence.*;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.insaneheadoflettuce.balanceAnalyzer.model;
package org.insaneheadoflettuce.balance_analyzer.model;

import jakarta.persistence.*;
import org.insaneheadoflettuce.balanceAnalyzer.Number;
import org.insaneheadoflettuce.balance_analyzer.Number;

import java.time.LocalDate;
import java.util.HashSet;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.insaneheadoflettuce.balanceAnalyzer.utility;
package org.insaneheadoflettuce.balance_analyzer.utility;

import com.google.common.io.MoreFiles;
import com.google.gson.Gson;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.insaneheadoflettuce.balanceAnalyzer.utility;
package org.insaneheadoflettuce.balance_analyzer.utility;

import org.apache.commons.validator.routines.checkdigit.IBANCheckDigit;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.insaneheadoflettuce.balanceAnalyzer.utility;
package org.insaneheadoflettuce.balance_analyzer.utility;

import com.google.gson.*;

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/insaneheadoflettuce/input/DataImporter.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.insaneheadoflettuce.input;

import org.insaneheadoflettuce.balanceAnalyzer.model.Account;
import org.insaneheadoflettuce.balanceAnalyzer.model.Transaction;
import org.insaneheadoflettuce.balance_analyzer.model.Account;
import org.insaneheadoflettuce.balance_analyzer.model.Transaction;
import org.insaneheadoflettuce.input.api.TransactionImporter;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.insaneheadoflettuce.input.api;

import org.insaneheadoflettuce.balanceAnalyzer.model.Transaction;
import org.insaneheadoflettuce.balance_analyzer.model.Transaction;

import java.util.List;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.insaneheadoflettuce.input.api;

import org.insaneheadoflettuce.balanceAnalyzer.model.Account;
import org.insaneheadoflettuce.balanceAnalyzer.model.Transaction;
import org.insaneheadoflettuce.balance_analyzer.model.Account;
import org.insaneheadoflettuce.balance_analyzer.model.Transaction;

import java.nio.file.Path;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.insaneheadoflettuce.input.common;

import org.insaneheadoflettuce.balanceAnalyzer.model.Transaction;
import org.insaneheadoflettuce.balance_analyzer.model.Transaction;
import org.insaneheadoflettuce.input.api.TransactionFileReader;
import org.insaneheadoflettuce.input.api.TransactionFileReaderFactory;
import org.slf4j.Logger;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.insaneheadoflettuce.input.csv;

import org.insaneheadoflettuce.balanceAnalyzer.model.Transaction;
import org.insaneheadoflettuce.balance_analyzer.model.Transaction;

public interface CSVTransactionEntry {
Transaction toTransaction();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.insaneheadoflettuce.input.csv;

import com.opencsv.bean.CsvToBean;
import org.insaneheadoflettuce.balanceAnalyzer.model.Transaction;
import org.insaneheadoflettuce.balance_analyzer.model.Transaction;
import org.insaneheadoflettuce.input.api.ChecksumProvider;
import org.insaneheadoflettuce.input.api.TransactionFileReader;
import org.insaneheadoflettuce.input.common.SimpleChecksumProvider;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.insaneheadoflettuce.input.csv.lbb;

import com.opencsv.bean.AbstractBeanField;
import org.insaneheadoflettuce.balanceAnalyzer.model.Transaction;
import org.insaneheadoflettuce.balance_analyzer.model.Transaction;

import java.util.Map;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

import com.opencsv.bean.CsvBindByName;
import com.opencsv.bean.CsvCustomBindByName;
import org.insaneheadoflettuce.balanceAnalyzer.model.Transaction;
import org.insaneheadoflettuce.balanceAnalyzer.utility.IBANValidator;
import org.insaneheadoflettuce.balance_analyzer.model.Transaction;
import org.insaneheadoflettuce.balance_analyzer.utility.IBANValidator;
import org.insaneheadoflettuce.input.csv.CSVTransactionEntry;

import java.time.LocalDate;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.insaneheadoflettuce.input.csv.lbb;

import org.insaneheadoflettuce.balanceAnalyzer.model.Account;
import org.insaneheadoflettuce.balanceAnalyzer.model.Transaction;
import org.insaneheadoflettuce.balance_analyzer.model.Account;
import org.insaneheadoflettuce.balance_analyzer.model.Transaction;
import org.insaneheadoflettuce.input.api.TransactionImporter;
import org.insaneheadoflettuce.input.common.FileCollector;
import org.insaneheadoflettuce.input.common.HomogenizingTransactionReader;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import com.opencsv.bean.CsvBindByName;
import com.opencsv.bean.CsvCustomBindByName;
import org.insaneheadoflettuce.balanceAnalyzer.model.Transaction;
import org.insaneheadoflettuce.balance_analyzer.model.Transaction;
import org.insaneheadoflettuce.input.csv.CSVTransactionEntry;

import java.time.LocalDate;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.insaneheadoflettuce.input.csv.postbank;

import org.insaneheadoflettuce.balanceAnalyzer.model.Account;
import org.insaneheadoflettuce.balanceAnalyzer.model.Transaction;
import org.insaneheadoflettuce.balance_analyzer.model.Account;
import org.insaneheadoflettuce.balance_analyzer.model.Transaction;
import org.insaneheadoflettuce.input.api.TransactionImporter;
import org.insaneheadoflettuce.input.common.FileCollector;
import org.insaneheadoflettuce.input.common.HomogenizingTransactionReader;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package org.insaneheadoflettuce.input.csv.postbank;

import com.opencsv.bean.CsvToBeanBuilder;
import org.insaneheadoflettuce.balanceAnalyzer.model.Transaction;
import org.insaneheadoflettuce.balanceAnalyzer.utility.IBANValidator;
import org.insaneheadoflettuce.balance_analyzer.model.Transaction;
import org.insaneheadoflettuce.balance_analyzer.utility.IBANValidator;
import org.insaneheadoflettuce.input.api.TransactionFileReader;
import org.insaneheadoflettuce.input.api.TransactionFileReaderFactory;
import org.insaneheadoflettuce.input.csv.CSVTransactionReader;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.insaneheadoflettuce.balanceAnalyzer;
package org.insaneheadoflettuce.balance_analyzer;

/*@SpringBootTest
class BalanceAnalyzerApplicationTests
Expand Down
Loading

0 comments on commit 69d2c2e

Please sign in to comment.