Skip to content

Commit

Permalink
fix package refectory
Browse files Browse the repository at this point in the history
  • Loading branch information
rmpestano committed Sep 11, 2016
1 parent f2a0cea commit 4dfbb1a
Show file tree
Hide file tree
Showing 91 changed files with 279 additions and 299 deletions.
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package com.github.dbunit.rules.cdi.cdi;
package com.github.dbunit.rules.cdi;

import com.github.dbunit.rules.cdi.api.dataset.DataSet;
import com.github.dbunit.rules.cdi.api.dataset.ExpectedDataSet;
import com.github.dbunit.rules.cdi.api.leak.LeakHunter;
import com.github.dbunit.rules.cdi.cdi.api.DBUnitInterceptor;
import com.github.dbunit.rules.api.dataset.DataSet;
import com.github.dbunit.rules.api.dataset.ExpectedDataSet;
import com.github.dbunit.rules.api.leak.LeakHunter;
import com.github.dbunit.rules.cdi.api.DBUnitInterceptor;
import com.github.dbunit.rules.configuration.DBUnitConfig;
import com.github.dbunit.rules.cdi.leak.LeakHunterException;
import com.github.dbunit.rules.leak.LeakHunterException;
import com.github.dbunit.rules.configuration.DataSetConfig;
import com.github.dbunit.rules.cdi.leak.LeakHunterFactory;
import com.github.dbunit.rules.leak.LeakHunterFactory;

import javax.inject.Inject;
import javax.interceptor.AroundInvoke;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.github.dbunit.rules.cdi.cdi;
package com.github.dbunit.rules.cdi;

import com.github.dbunit.rules.cdi.api.dataset.DataSetExecutor;
import com.github.dbunit.rules.api.dataset.DataSetExecutor;
import com.github.dbunit.rules.configuration.DBUnitConfig;
import com.github.dbunit.rules.configuration.DataSetConfig;
import com.github.dbunit.rules.cdi.connection.ConnectionHolderImpl;
import com.github.dbunit.rules.cdi.dataset.DataSetExecutorImpl;
import com.github.dbunit.rules.connection.ConnectionHolderImpl;
import com.github.dbunit.rules.dataset.DataSetExecutorImpl;
import org.dbunit.DatabaseUnitException;
import org.hibernate.Session;
import org.hibernate.internal.SessionImpl;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.dbunit.rules.cdi.cdi.api;
package com.github.dbunit.rules.cdi.api;

import javax.interceptor.InterceptorBinding;
import java.lang.annotation.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.github.dbunit.rules.cdi;

import com.github.dbunit.rules.cdi.api.dataset.DataSet;
import com.github.dbunit.rules.cdi.api.dataset.SeedStrategy;
import com.github.dbunit.rules.cdi.cdi.api.DBUnitInterceptor;
import com.github.dbunit.rules.api.dataset.DataSet;
import com.github.dbunit.rules.api.dataset.SeedStrategy;
import com.github.dbunit.rules.cdi.api.DBUnitInterceptor;
import com.github.dbunit.rules.model.User;
import org.apache.deltaspike.testcontrol.api.junit.CdiTestRunner;
import org.junit.After;
Expand Down
4 changes: 2 additions & 2 deletions cdi/src/test/java/com/github/dbunit/rules/cdi/CrudCDIIt.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
import javax.inject.Inject;
import javax.persistence.EntityManager;

import com.github.dbunit.rules.cdi.cdi.api.DBUnitInterceptor;
import com.github.dbunit.rules.cdi.api.DBUnitInterceptor;
import com.github.dbunit.rules.model.User;
import org.apache.deltaspike.testcontrol.api.junit.CdiTestRunner;
import org.junit.Test;
import org.junit.runner.RunWith;

import com.github.dbunit.rules.cdi.api.dataset.DataSet;
import com.github.dbunit.rules.api.dataset.DataSet;

/**
* Created by pestano on 23/07/15.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.github.dbunit.rules.cdi;

import com.github.dbunit.rules.cdi.api.dataset.DataSet;
import com.github.dbunit.rules.cdi.api.dataset.SeedStrategy;
import com.github.dbunit.rules.cdi.cdi.api.DBUnitInterceptor;
import com.github.dbunit.rules.cdi.exception.DataBaseSeedingException;
import com.github.dbunit.rules.api.dataset.DataSet;
import com.github.dbunit.rules.api.dataset.SeedStrategy;
import com.github.dbunit.rules.cdi.api.DBUnitInterceptor;
import com.github.dbunit.rules.exception.DataBaseSeedingException;
import com.github.dbunit.rules.model.Tweet;
import com.github.dbunit.rules.model.User;
import org.apache.deltaspike.testcontrol.api.junit.CdiTestRunner;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.github.dbunit.rules.cdi;


import com.github.dbunit.rules.cdi.util.EntityManagerProvider;
import com.github.dbunit.rules.util.EntityManagerProvider;

import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.inject.Produces;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.github.dbunit.rules.cdi;

import com.github.dbunit.rules.cdi.api.dataset.SeedStrategy;
import com.github.dbunit.rules.cdi.api.dataset.DataSet;
import com.github.dbunit.rules.cdi.cdi.api.DBUnitInterceptor;
import com.github.dbunit.rules.api.dataset.SeedStrategy;
import com.github.dbunit.rules.api.dataset.DataSet;
import com.github.dbunit.rules.cdi.api.DBUnitInterceptor;
import com.github.dbunit.rules.model.User;
import org.apache.deltaspike.testcontrol.api.junit.CdiTestRunner;
import org.junit.After;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.github.dbunit.rules.cdi;

import com.github.dbunit.rules.cdi.api.dataset.ExpectedDataSet;
import com.github.dbunit.rules.cdi.api.dataset.DataSet;
import com.github.dbunit.rules.cdi.cdi.api.DBUnitInterceptor;
import com.github.dbunit.rules.api.dataset.ExpectedDataSet;
import com.github.dbunit.rules.api.dataset.DataSet;
import com.github.dbunit.rules.cdi.api.DBUnitInterceptor;
import com.github.dbunit.rules.model.User;
import org.apache.deltaspike.testcontrol.api.junit.CdiTestRunner;
import org.junit.Test;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.github.dbunit.rules.cdi;

import com.github.dbunit.rules.cdi.api.configuration.DBUnit;
import com.github.dbunit.rules.cdi.api.dataset.DataSet;
import com.github.dbunit.rules.cdi.cdi.api.DBUnitInterceptor;
import com.github.dbunit.rules.cdi.leak.LeakHunterException;
import com.github.dbunit.rules.api.configuration.DBUnit;
import com.github.dbunit.rules.api.dataset.DataSet;
import com.github.dbunit.rules.cdi.api.DBUnitInterceptor;
import com.github.dbunit.rules.leak.LeakHunterException;
import org.apache.deltaspike.testcontrol.api.junit.CdiTestRunner;
import org.junit.Rule;
import org.junit.Test;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.github.dbunit.rules.cdi;

import com.github.dbunit.rules.cdi.api.dataset.DataSet;
import com.github.dbunit.rules.cdi.api.dataset.ExpectedDataSet;
import com.github.dbunit.rules.cdi.cdi.api.DBUnitInterceptor;
import com.github.dbunit.rules.api.dataset.DataSet;
import com.github.dbunit.rules.api.dataset.ExpectedDataSet;
import com.github.dbunit.rules.cdi.api.DBUnitInterceptor;
import com.github.dbunit.rules.model.User;
import org.apache.deltaspike.testcontrol.api.junit.CdiTestRunner;
import org.junit.Test;
Expand Down
2 changes: 1 addition & 1 deletion cdi/src/test/resources/META-INF/beans.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">

<interceptors>
<class>com.github.dbunit.rules.cdi.cdi.DBUnitInterceptorImpl</class>
<class>com.github.dbunit.rules.cdi.DBUnitInterceptorImpl</class>
</interceptors>
</beans>
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
package com.github.dbunit.rules.cdi;

import com.github.dbunit.rules.cdi.api.configuration.DBUnit;
import com.github.dbunit.rules.cdi.api.connection.ConnectionHolder;
import com.github.dbunit.rules.cdi.api.dataset.DataSet;
import com.github.dbunit.rules.cdi.api.dataset.DataSetExecutor;
import com.github.dbunit.rules.cdi.api.dataset.ExpectedDataSet;
import com.github.dbunit.rules.cdi.api.leak.LeakHunter;
package com.github.dbunit.rules;

import com.github.dbunit.rules.api.configuration.DBUnit;
import com.github.dbunit.rules.api.connection.ConnectionHolder;
import com.github.dbunit.rules.api.dataset.DataSet;
import com.github.dbunit.rules.api.dataset.DataSetExecutor;
import com.github.dbunit.rules.api.dataset.ExpectedDataSet;
import com.github.dbunit.rules.api.leak.LeakHunter;
import com.github.dbunit.rules.configuration.DBUnitConfig;
import com.github.dbunit.rules.configuration.DataSetConfig;
import com.github.dbunit.rules.cdi.connection.ConnectionHolderImpl;
import com.github.dbunit.rules.cdi.dataset.DataSetExecutorImpl;
import com.github.dbunit.rules.cdi.leak.LeakHunterException;
import com.github.dbunit.rules.cdi.leak.LeakHunterFactory;
import com.github.dbunit.rules.connection.ConnectionHolderImpl;
import com.github.dbunit.rules.dataset.DataSetExecutorImpl;
import com.github.dbunit.rules.leak.LeakHunterException;
import com.github.dbunit.rules.leak.LeakHunterFactory;
import org.dbunit.DatabaseUnitException;
import org.junit.rules.TestRule;
import org.junit.runner.Description;
Expand All @@ -20,8 +20,8 @@

import java.sql.Connection;

import static com.github.dbunit.rules.cdi.util.EntityManagerProvider.em;
import static com.github.dbunit.rules.cdi.util.EntityManagerProvider.isEntityManagerActive;
import static com.github.dbunit.rules.util.EntityManagerProvider.em;
import static com.github.dbunit.rules.util.EntityManagerProvider.isEntityManagerActive;

/**
* Created by rafael-pestano on 22/07/2015.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.github.dbunit.rules.cdi.api.configuration;
package com.github.dbunit.rules.api.configuration;

import com.github.dbunit.rules.cdi.dataset.DataSetExecutorImpl;
import com.github.dbunit.rules.dataset.DataSetExecutorImpl;

import java.lang.annotation.*;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.dbunit.rules.cdi.api.connection;
package com.github.dbunit.rules.api.connection;

import java.io.Serializable;
import java.sql.Connection;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.github.dbunit.rules.cdi.api.dataset;
package com.github.dbunit.rules.api.dataset;

import com.github.dbunit.rules.cdi.dataset.DataSetExecutorImpl;
import com.github.dbunit.rules.dataset.DataSetExecutorImpl;

import java.lang.annotation.*;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.github.dbunit.rules.cdi.api.dataset;
package com.github.dbunit.rules.api.dataset;

import com.github.dbunit.rules.cdi.api.connection.ConnectionHolder;
import com.github.dbunit.rules.api.connection.ConnectionHolder;

import com.github.dbunit.rules.configuration.DBUnitConfig;
import com.github.dbunit.rules.configuration.DataSetConfig;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.dbunit.rules.cdi.api.dataset;
package com.github.dbunit.rules.api.dataset;

/**
* Created by pestano on 09/09/16.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.dbunit.rules.cdi.api.dataset;
package com.github.dbunit.rules.api.dataset;

import java.lang.annotation.*;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.dbunit.rules.cdi.api.dataset;
package com.github.dbunit.rules.api.dataset;

import org.codehaus.jackson.map.ObjectMapper;
import org.dbunit.dataset.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.dbunit.rules.cdi.api.dataset;
package com.github.dbunit.rules.api.dataset;

/**
* Created by pestano on 23/07/15.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.dbunit.rules.cdi.api.dataset;
package com.github.dbunit.rules.api.dataset;

/**
* Created by rafael-pestano on 22/07/2015.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.github.dbunit.rules.cdi.api.expoter;
package com.github.dbunit.rules.api.expoter;

import com.github.dbunit.rules.cdi.dataset.DataSetExecutorImpl;
import com.github.dbunit.rules.dataset.DataSetExecutorImpl;

import java.lang.annotation.*;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.github.dbunit.rules.cdi.api.expoter;
package com.github.dbunit.rules.api.expoter;

import com.github.dbunit.rules.cdi.api.dataset.DataSetFormat;
import com.github.dbunit.rules.api.dataset.DataSetFormat;

/**
* Created by pestano on 09/09/16.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.dbunit.rules.cdi.api.expoter;
package com.github.dbunit.rules.api.expoter;

import org.dbunit.DatabaseUnitException;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.dbunit.rules.cdi.api.leak;
package com.github.dbunit.rules.api.leak;

/**
* Created by pestano on 07/09/16.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.dbunit.rules.cdi.api.replacer;
package com.github.dbunit.rules.api.replacer;

/**
* Created by pestano on 22/07/15.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.dbunit.rules.cdi.api.replacer;
package com.github.dbunit.rules.api.replacer;

/**
* Created by pestano on 22/07/15.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.dbunit.rules.cdi.api.replacer;
package com.github.dbunit.rules.api.replacer;

/**
* Created by pestano on 22/07/15.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.dbunit.rules.cdi.api.replacer;
package com.github.dbunit.rules.api.replacer;

/**
* Created by pestano on 22/07/15.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.dbunit.rules.cdi.api.replacer;
package com.github.dbunit.rules.api.replacer;

/**
* Created by pestano on 22/07/15.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.dbunit.rules.cdi.assertion;
package com.github.dbunit.rules.assertion;

import org.dbunit.assertion.DbUnitAssert;
import org.dbunit.assertion.Difference;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.dbunit.rules.cdi.assertion;
package com.github.dbunit.rules.assertion;

import org.dbunit.DatabaseUnitException;
import org.dbunit.dataset.ITable;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.github.dbunit.rules.configuration;

import com.github.dbunit.rules.cdi.api.configuration.DBUnit;
import com.github.dbunit.rules.cdi.dataset.DataSetExecutorImpl;
import com.github.dbunit.rules.api.configuration.DBUnit;
import com.github.dbunit.rules.dataset.DataSetExecutorImpl;

import java.lang.reflect.Method;
import java.util.HashMap;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.github.dbunit.rules.configuration;

import com.github.dbunit.rules.cdi.api.dataset.DataSet;
import com.github.dbunit.rules.cdi.api.dataset.SeedStrategy;
import com.github.dbunit.rules.cdi.dataset.DataSetExecutorImpl;
import com.github.dbunit.rules.api.dataset.DataSet;
import com.github.dbunit.rules.api.dataset.SeedStrategy;
import com.github.dbunit.rules.dataset.DataSetExecutorImpl;

/**
* Created by pestano on 26/07/15.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.github.dbunit.rules.cdi.connection;
package com.github.dbunit.rules.connection;

import com.github.dbunit.rules.cdi.api.connection.ConnectionHolder;
import com.github.dbunit.rules.api.connection.ConnectionHolder;

import java.sql.Connection;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
package com.github.dbunit.rules.cdi.dataset;
package com.github.dbunit.rules.dataset;

import com.github.dbunit.rules.cdi.api.connection.ConnectionHolder;
import com.github.dbunit.rules.cdi.api.dataset.DataSetExecutor;
import com.github.dbunit.rules.cdi.api.dataset.JSONDataSet;
import com.github.dbunit.rules.cdi.api.dataset.YamlDataSet;
import com.github.dbunit.rules.cdi.assertion.DataSetAssertion;
import com.github.dbunit.rules.api.connection.ConnectionHolder;
import com.github.dbunit.rules.api.dataset.DataSetExecutor;
import com.github.dbunit.rules.api.dataset.JSONDataSet;
import com.github.dbunit.rules.api.dataset.YamlDataSet;
import com.github.dbunit.rules.assertion.DataSetAssertion;
import com.github.dbunit.rules.configuration.DBUnitConfig;
import com.github.dbunit.rules.configuration.DataSetConfig;
import com.github.dbunit.rules.cdi.exception.DataBaseSeedingException;
import com.github.dbunit.rules.cdi.replacer.DateTimeReplacer;
import com.github.dbunit.rules.cdi.util.DriverUtils;
import com.github.dbunit.rules.cdi.replacer.ScriptReplacer;
import com.github.dbunit.rules.exception.DataBaseSeedingException;
import com.github.dbunit.rules.replacer.DateTimeReplacer;
import com.github.dbunit.rules.util.DriverUtils;
import com.github.dbunit.rules.replacer.ScriptReplacer;
import org.dbunit.DatabaseUnitException;
import org.dbunit.database.AmbiguousTableNameException;
import org.dbunit.database.DatabaseConfig;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.dbunit.rules.cdi.exception;
package com.github.dbunit.rules.exception;

/**
* Created by pestano on 19/06/16.
Expand Down
Loading

0 comments on commit 4dfbb1a

Please sign in to comment.