Author: cschneider
Date: Tue Jul 14 16:19:30 2015
New Revision: 1691025
URL: http://svn.apache.org/r1691025
Log:
[ARIES-1346] Correct indents
Modified:
aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/src/main/java/org/apache/aries/jpa/itest/testbundle/entities/Car.java
aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/src/main/java/org/apache/aries/jpa/itest/testbundle/service/impl/CarServiceWithMethodImpl.java
aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/src/main/java/org/apache/aries/jpa/itest/testbundle/service/impl/CarServiceWithMultiAnnotationImpl.java
aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/src/main/java/org/apache/aries/jpa/itest/testbundle/service/impl/CarServiceWithSupplierImpl.java
aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/src/main/resources/OSGI-INF/blueprint/config.xml
aries/trunk/jpa/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/blueprint/aries/itest/BlueprintWithMethodTest.java
Modified:
aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/src/main/java/org/apache/aries/jpa/itest/testbundle/entities/Car.java
URL:
http://svn.apache.org/viewvc/aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/src/main/java/org/apache/aries/jpa/itest/testbundle/entities/Car.java?rev=1691025&r1=1691024&r2=1691025&view=diff
==============================================================================
---
aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/src/main/java/org/apache/aries/jpa/itest/testbundle/entities/Car.java
(original)
+++
aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/src/main/java/org/apache/aries/jpa/itest/testbundle/entities/Car.java
Tue Jul 14 16:19:30 2015
@@ -23,46 +23,45 @@ import javax.persistence.Id;
@Entity
public class Car {
- @Id
- private String numberPlate;
-
- private String colour;
-
- private int engineSize;
-
- private int numberOfSeats;
-
- public String getNumberPlate() {
- return numberPlate;
- }
-
- public void setNumberPlate(String numberPlate) {
- this.numberPlate = numberPlate;
- }
-
- public String getColour() {
- return colour;
- }
-
- public void setColour(String colour) {
- this.colour = colour;
- }
-
- public int getEngineSize() {
- return engineSize;
- }
-
- public void setEngineSize(int engineSize) {
- this.engineSize = engineSize;
- }
-
- public int getNumberOfSeats() {
- return numberOfSeats;
- }
-
- public void setNumberOfSeats(int numberOfSeats) {
- this.numberOfSeats = numberOfSeats;
- }
-
-
+ @Id
+ private String numberPlate;
+
+ private String colour;
+
+ private int engineSize;
+
+ private int numberOfSeats;
+
+ public String getNumberPlate() {
+ return numberPlate;
+ }
+
+ public void setNumberPlate(String numberPlate) {
+ this.numberPlate = numberPlate;
+ }
+
+ public String getColour() {
+ return colour;
+ }
+
+ public void setColour(String colour) {
+ this.colour = colour;
+ }
+
+ public int getEngineSize() {
+ return engineSize;
+ }
+
+ public void setEngineSize(int engineSize) {
+ this.engineSize = engineSize;
+ }
+
+ public int getNumberOfSeats() {
+ return numberOfSeats;
+ }
+
+ public void setNumberOfSeats(int numberOfSeats) {
+ this.numberOfSeats = numberOfSeats;
+ }
+
}
Modified:
aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/src/main/java/org/apache/aries/jpa/itest/testbundle/service/impl/CarServiceWithMethodImpl.java
URL:
http://svn.apache.org/viewvc/aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/src/main/java/org/apache/aries/jpa/itest/testbundle/service/impl/CarServiceWithMethodImpl.java?rev=1691025&r1=1691024&r2=1691025&view=diff
==============================================================================
---
aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/src/main/java/org/apache/aries/jpa/itest/testbundle/service/impl/CarServiceWithMethodImpl.java
(original)
+++
aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/src/main/java/org/apache/aries/jpa/itest/testbundle/service/impl/CarServiceWithMethodImpl.java
Tue Jul 14 16:19:30 2015
@@ -26,40 +26,38 @@ import javax.persistence.PersistenceCont
import org.apache.aries.jpa.itest.testbundle.entities.Car;
import org.apache.aries.jpa.itest.testbundle.service.CarService;
-
public class CarServiceWithMethodImpl implements CarService {
- EntityManager em;
-
- @Override
- public Car getCar(String id) {
- return em.find(Car.class, id);
- }
-
- @Override
- public void addCar(Car car) {
- em.persist(car);
- em.flush();
- }
-
- public Collection<Car> getCars() {
- return em.createQuery("select c from Car c", Car.class)
- .getResultList();
- }
-
- @Override
- public void updateCar(Car car) {
- em.persist(car);
- }
-
- @Override
- public void deleteCar(String id) {
- em.remove(getCar(id));
- }
-
- @PersistenceContext(unitName="test_unit_blueprint")
- public void setEm(EntityManager em) {
- this.em = em;
- }
-
+ EntityManager em;
+
+ @Override
+ public Car getCar(String id) {
+ return em.find(Car.class, id);
+ }
+
+ @Override
+ public void addCar(Car car) {
+ em.persist(car);
+ em.flush();
+ }
+
+ public Collection<Car> getCars() {
+ return em.createQuery("select c from Car c",
Car.class).getResultList();
+ }
+
+ @Override
+ public void updateCar(Car car) {
+ em.persist(car);
+ }
+
+ @Override
+ public void deleteCar(String id) {
+ em.remove(getCar(id));
+ }
+
+ @PersistenceContext(unitName = "test_unit_blueprint")
+ public void setEm(EntityManager em) {
+ this.em = em;
+ }
+
}
Modified:
aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/src/main/java/org/apache/aries/jpa/itest/testbundle/service/impl/CarServiceWithMultiAnnotationImpl.java
URL:
http://svn.apache.org/viewvc/aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/src/main/java/org/apache/aries/jpa/itest/testbundle/service/impl/CarServiceWithMultiAnnotationImpl.java?rev=1691025&r1=1691024&r2=1691025&view=diff
==============================================================================
---
aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/src/main/java/org/apache/aries/jpa/itest/testbundle/service/impl/CarServiceWithMultiAnnotationImpl.java
(original)
+++
aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/src/main/java/org/apache/aries/jpa/itest/testbundle/service/impl/CarServiceWithMultiAnnotationImpl.java
Tue Jul 14 16:19:30 2015
@@ -29,55 +29,53 @@ import org.apache.aries.jpa.itest.testbu
import org.apache.aries.jpa.itest.testbundle.service.CarService;
import org.apache.aries.jpa.supplier.EmSupplier;
-
public class CarServiceWithMultiAnnotationImpl implements CarService {
- @PersistenceContext(unitName="test_unit_blueprint")
- EntityManager em;
-
- @PersistenceUnit(unitName="test_unit_blueprint")
- EntityManagerFactory emf;
-
- @PersistenceContext(unitName="test_unit_blueprint")
- EmSupplier ems;
-
- @Override
- public Car getCar(String id) {
- return em.find(Car.class, id);
- }
-
- @Override
- public void addCar(Car car) {
- EntityManager localEm = emf.createEntityManager();
- localEm.persist(car);
- localEm.flush();
- localEm.close();
- }
-
- public Collection<Car> getCars() {
- return em.createQuery("select c from Car c", Car.class)
- .getResultList();
- }
-
- @Override
- public void updateCar(Car car) {
- em.persist(car);
- }
-
- @Override
- public void deleteCar(String id) {
- ems.get().remove(getCar(id));
- }
-
- public void setEm(EntityManager em) {
- this.em = em;
- }
-
- public void setEmf(EntityManagerFactory emf) {
- this.emf = emf;
- }
-
- public void setEms(EmSupplier ems) {
- this.ems = ems;
- }
+ @PersistenceContext(unitName = "test_unit_blueprint")
+ EntityManager em;
+
+ @PersistenceUnit(unitName = "test_unit_blueprint")
+ EntityManagerFactory emf;
+
+ @PersistenceContext(unitName = "test_unit_blueprint")
+ EmSupplier ems;
+
+ @Override
+ public Car getCar(String id) {
+ return em.find(Car.class, id);
+ }
+
+ @Override
+ public void addCar(Car car) {
+ EntityManager localEm = emf.createEntityManager();
+ localEm.persist(car);
+ localEm.flush();
+ localEm.close();
+ }
+
+ public Collection<Car> getCars() {
+ return em.createQuery("select c from Car c",
Car.class).getResultList();
+ }
+
+ @Override
+ public void updateCar(Car car) {
+ em.persist(car);
+ }
+
+ @Override
+ public void deleteCar(String id) {
+ ems.get().remove(getCar(id));
+ }
+
+ public void setEm(EntityManager em) {
+ this.em = em;
+ }
+
+ public void setEmf(EntityManagerFactory emf) {
+ this.emf = emf;
+ }
+
+ public void setEms(EmSupplier ems) {
+ this.ems = ems;
+ }
}
Modified:
aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/src/main/java/org/apache/aries/jpa/itest/testbundle/service/impl/CarServiceWithSupplierImpl.java
URL:
http://svn.apache.org/viewvc/aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/src/main/java/org/apache/aries/jpa/itest/testbundle/service/impl/CarServiceWithSupplierImpl.java?rev=1691025&r1=1691024&r2=1691025&view=diff
==============================================================================
---
aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/src/main/java/org/apache/aries/jpa/itest/testbundle/service/impl/CarServiceWithSupplierImpl.java
(original)
+++
aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/src/main/java/org/apache/aries/jpa/itest/testbundle/service/impl/CarServiceWithSupplierImpl.java
Tue Jul 14 16:19:30 2015
@@ -28,39 +28,38 @@ import org.apache.aries.jpa.supplier.EmS
public class CarServiceWithSupplierImpl implements CarService {
- Collection<String> colours;
+ Collection<String> colours;
- @PersistenceContext(unitName = "test_unit_blueprint")
- EmSupplier em;
+ @PersistenceContext(unitName = "test_unit_blueprint")
+ EmSupplier em;
- @Override
- public Car getCar(String id) {
- return em.get().find(Car.class, id);
- }
-
- @Override
- public void addCar(Car car) {
- em.get().persist(car);
- em.get().flush();
- }
-
- public Collection<Car> getCars() {
- return em.get().createQuery("select c from Car c", Car.class)
- .getResultList();
- }
-
- @Override
- public void updateCar(Car car) {
- em.get().persist(car);
- }
-
- @Override
- public void deleteCar(String id) {
- em.get().remove(getCar(id));
- }
-
- public void setEm(EmSupplier em) {
- this.em = em;
- }
+ @Override
+ public Car getCar(String id) {
+ return em.get().find(Car.class, id);
+ }
+
+ @Override
+ public void addCar(Car car) {
+ em.get().persist(car);
+ em.get().flush();
+ }
+
+ public Collection<Car> getCars() {
+ return em.get().createQuery("select c from Car c",
Car.class).getResultList();
+ }
+
+ @Override
+ public void updateCar(Car car) {
+ em.get().persist(car);
+ }
+
+ @Override
+ public void deleteCar(String id) {
+ em.get().remove(getCar(id));
+ }
+
+ public void setEm(EmSupplier em) {
+ this.em = em;
+ }
}
Modified:
aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/src/main/resources/OSGI-INF/blueprint/config.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/src/main/resources/OSGI-INF/blueprint/config.xml?rev=1691025&r1=1691024&r2=1691025&view=diff
==============================================================================
---
aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/src/main/resources/OSGI-INF/blueprint/config.xml
(original)
+++
aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/src/main/resources/OSGI-INF/blueprint/config.xml
Tue Jul 14 16:19:30 2015
@@ -1,71 +1,70 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0";
- xmlns:jpa="http://aries.apache.org/xmlns/jpan/v1.0.0";
- xmlns:tx="http://aries.apache.org/xmlns/transactions/v1.2.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0";>
-
- <jpa:enable />
-
- <service ref="carServiceEmf"
-
interface="org.apache.aries.jpa.itest.testbundle.service.CarService">
- <service-properties>
- <entry key="type" value="emf" />
- </service-properties>
- </service>
-
- <bean id="carServiceEmf"
-
class="org.apache.aries.jpa.itest.testbundle.service.impl.CarServiceWithEmfImpl">
- <tx:transaction method="*" value="Required" />
- </bean>
-
- <service ref="carServiceEm"
-
interface="org.apache.aries.jpa.itest.testbundle.service.CarService">
- <service-properties>
- <entry key="type" value="em" />
- </service-properties>
- </service>
-
- <bean id="carServiceEm"
-
class="org.apache.aries.jpa.itest.testbundle.service.impl.CarServiceImpl">
- <tx:transaction method="*" value="Required" />
- </bean>
-
- <service ref="carServiceEmSupplier"
-
interface="org.apache.aries.jpa.itest.testbundle.service.CarService">
- <service-properties>
- <entry key="type" value="supplier" />
- </service-properties>
- </service>
-
- <bean id="carServiceEmSupplier"
-
class="org.apache.aries.jpa.itest.testbundle.service.impl.CarServiceWithSupplierImpl">
- <tx:transaction method="*" value="Required" />
- </bean>
-
- <service ref="carServiceMulti"
-
interface="org.apache.aries.jpa.itest.testbundle.service.CarService">
- <service-properties>
- <entry key="type" value="multiannotation" />
- </service-properties>
- </service>
-
- <bean id="carServiceMulti"
-
class="org.apache.aries.jpa.itest.testbundle.service.impl.CarServiceWithMultiAnnotationImpl">
- <tx:transaction method="*" value="Required" />
- </bean>
-
- <service ref="carServiceMethod"
-
interface="org.apache.aries.jpa.itest.testbundle.service.CarService">
- <service-properties>
- <entry key="type" value="method" />
- </service-properties>
- </service>
-
- <bean id="carServiceMethod"
-
class="org.apache.aries.jpa.itest.testbundle.service.impl.CarServiceWithMethodImpl">
- <tx:transaction method="*" value="Required" />
- </bean>
-
+ xmlns:jpa="http://aries.apache.org/xmlns/jpan/v1.0.0";
xmlns:tx="http://aries.apache.org/xmlns/transactions/v1.2.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0";>
+
+ <jpa:enable />
+
+ <service ref="carServiceEmf"
+ interface="org.apache.aries.jpa.itest.testbundle.service.CarService">
+ <service-properties>
+ <entry key="type" value="emf" />
+ </service-properties>
+ </service>
+
+ <bean id="carServiceEmf"
+
class="org.apache.aries.jpa.itest.testbundle.service.impl.CarServiceWithEmfImpl">
+ <tx:transaction method="*" value="Required" />
+ </bean>
+
+ <service ref="carServiceEm"
+ interface="org.apache.aries.jpa.itest.testbundle.service.CarService">
+ <service-properties>
+ <entry key="type" value="em" />
+ </service-properties>
+ </service>
+
+ <bean id="carServiceEm"
+
class="org.apache.aries.jpa.itest.testbundle.service.impl.CarServiceImpl">
+ <tx:transaction method="*" value="Required" />
+ </bean>
+
+ <service ref="carServiceEmSupplier"
+ interface="org.apache.aries.jpa.itest.testbundle.service.CarService">
+ <service-properties>
+ <entry key="type" value="supplier" />
+ </service-properties>
+ </service>
+
+ <bean id="carServiceEmSupplier"
+
class="org.apache.aries.jpa.itest.testbundle.service.impl.CarServiceWithSupplierImpl">
+ <tx:transaction method="*" value="Required" />
+ </bean>
+
+ <service ref="carServiceMulti"
+ interface="org.apache.aries.jpa.itest.testbundle.service.CarService">
+ <service-properties>
+ <entry key="type" value="multiannotation" />
+ </service-properties>
+ </service>
+
+ <bean id="carServiceMulti"
+
class="org.apache.aries.jpa.itest.testbundle.service.impl.CarServiceWithMultiAnnotationImpl">
+ <tx:transaction method="*" value="Required" />
+ </bean>
+
+ <service ref="carServiceMethod"
+ interface="org.apache.aries.jpa.itest.testbundle.service.CarService">
+ <service-properties>
+ <entry key="type" value="method" />
+ </service-properties>
+ </service>
+
+ <bean id="carServiceMethod"
+
class="org.apache.aries.jpa.itest.testbundle.service.impl.CarServiceWithMethodImpl">
+ <tx:transaction method="*" value="Required" />
+ </bean>
+
</blueprint>
Modified:
aries/trunk/jpa/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/blueprint/aries/itest/BlueprintWithMethodTest.java
URL:
http://svn.apache.org/viewvc/aries/trunk/jpa/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/blueprint/aries/itest/BlueprintWithMethodTest.java?rev=1691025&r1=1691024&r2=1691025&view=diff
==============================================================================
---
aries/trunk/jpa/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/blueprint/aries/itest/BlueprintWithMethodTest.java
(original)
+++
aries/trunk/jpa/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/blueprint/aries/itest/BlueprintWithMethodTest.java
Tue Jul 14 16:19:30 2015
@@ -25,11 +25,11 @@ import org.ops4j.pax.exam.Option;
public class BlueprintWithMethodTest extends AbstractJPAItest {
- @Test
+ @Test
public void testEmfAddQuery() throws Exception {
- CarService carService = getService(CarService.class,
"(type=method)");
-
- resolveBundles();
+ CarService carService = getService(CarService.class, "(type=method)");
+
+ resolveBundles();
Car c = new Car();
c.setColour("Blue");
c.setNumberPlate("AB11EMF");
@@ -42,7 +42,7 @@ public class BlueprintWithMethodTest ext
Assert.assertEquals(c.getNumberPlate(), car2.getNumberPlate());
}
- @Configuration
+ @Configuration
public Option[] configuration() {
return new Option[] {
baseOptions(), //
@@ -50,7 +50,7 @@ public class BlueprintWithMethodTest ext
hibernate(), //
derbyDSF(), //
testBundleBlueprint(),
- //debug()
+ // debug()
};
}
}
