This is an automated email from the ASF dual-hosted git repository. jamesbognar pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/juneau-petstore.git
commit eb87f8b7b0d5c79b188a072b2314fda876190f59 Author: JamesBognar <[email protected]> AuthorDate: Wed Dec 11 16:40:54 2019 -0500 Move PetStore to Juneau 8.1.2 --- .../src/main/java/org/apache/juneau/petstore/PetStore.java | 2 +- .../java/org/apache/juneau/petstore/dto/CreateOrder.java | 2 +- .../src/main/java/org/apache/juneau/petstore/Main.java | 2 +- juneau-petstore-server/pom.xml | 2 +- .../apache/juneau/petstore/config/SpringSecurityConfig.java | 3 +++ .../apache/juneau/petstore/repository/OrderRepository.java | 3 +++ .../org/apache/juneau/petstore/repository/PetRepository.java | 12 +++++++++--- .../apache/juneau/petstore/repository/UserRepository.java | 8 +++++++- .../org/apache/juneau/petstore/rest/PetStoreResource.java | 2 +- .../java/org/apache/juneau/petstore/rest/RootResources.java | 2 +- pom.xml | 2 +- 11 files changed, 29 insertions(+), 11 deletions(-) diff --git a/juneau-petstore-api/src/main/java/org/apache/juneau/petstore/PetStore.java b/juneau-petstore-api/src/main/java/org/apache/juneau/petstore/PetStore.java index f7faf0f..ce8a0a1 100644 --- a/juneau-petstore-api/src/main/java/org/apache/juneau/petstore/PetStore.java +++ b/juneau-petstore-api/src/main/java/org/apache/juneau/petstore/PetStore.java @@ -37,7 +37,7 @@ import org.apache.juneau.http.response.*; * <li class='extlink'>{@source} * </ul> */ -@RemoteResource(path="/petstore") +@Remote(path="/petstore") public interface PetStore { //------------------------------------------------------------------------------------------------------------------ diff --git a/juneau-petstore-api/src/main/java/org/apache/juneau/petstore/dto/CreateOrder.java b/juneau-petstore-api/src/main/java/org/apache/juneau/petstore/dto/CreateOrder.java index db9686e..108d632 100644 --- a/juneau-petstore-api/src/main/java/org/apache/juneau/petstore/dto/CreateOrder.java +++ b/juneau-petstore-api/src/main/java/org/apache/juneau/petstore/dto/CreateOrder.java @@ -33,7 +33,7 @@ public class CreateOrder { * @param petId The <bc>petId</bc> property value. * @param username The <bc>username</bc> property value. */ - @BeanConstructor(properties="petId,username") + @Beanc(properties="petId,username") public CreateOrder(long petId, String username) { this.petId = petId; this.username = username; diff --git a/juneau-petstore-client/src/main/java/org/apache/juneau/petstore/Main.java b/juneau-petstore-client/src/main/java/org/apache/juneau/petstore/Main.java index 882de17..e97eb52 100644 --- a/juneau-petstore-client/src/main/java/org/apache/juneau/petstore/Main.java +++ b/juneau-petstore-client/src/main/java/org/apache/juneau/petstore/Main.java @@ -40,7 +40,7 @@ public class Main { try (RestClient rc = RestClient.create(SimpleJsonSerializer.class, JsonParser.class).build()) { // Instantiate our proxy. - PetStore petStore = rc.getRemoteResource(PetStore.class, "http://localhost:5000";); + PetStore petStore = rc.getRemote(PetStore.class, "http://localhost:5000";); // Print out the pets in the store. Collection<Pet> pets = petStore.getPets(); diff --git a/juneau-petstore-server/pom.xml b/juneau-petstore-server/pom.xml index 2bd9952..5c4df0c 100644 --- a/juneau-petstore-server/pom.xml +++ b/juneau-petstore-server/pom.xml @@ -41,7 +41,7 @@ <maven.javadoc.skip>true</maven.javadoc.skip> - <juneau.version>8.1.1</juneau.version> + <juneau.version>8.1.2</juneau.version> <javax.inject.version>1</javax.inject.version> <servlet.version>3.1.0</servlet.version> <hibernate.version>5.0.9.Final</hibernate.version> diff --git a/juneau-petstore-server/src/main/java/org/apache/juneau/petstore/config/SpringSecurityConfig.java b/juneau-petstore-server/src/main/java/org/apache/juneau/petstore/config/SpringSecurityConfig.java index 112a3b7..37218b4 100644 --- a/juneau-petstore-server/src/main/java/org/apache/juneau/petstore/config/SpringSecurityConfig.java +++ b/juneau-petstore-server/src/main/java/org/apache/juneau/petstore/config/SpringSecurityConfig.java @@ -6,6 +6,9 @@ import org.springframework.security.config.annotation.authentication.builders.Au import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +/** + * TODO - Needs documentation + */ @Configuration public class SpringSecurityConfig extends WebSecurityConfigurerAdapter{ diff --git a/juneau-petstore-server/src/main/java/org/apache/juneau/petstore/repository/OrderRepository.java b/juneau-petstore-server/src/main/java/org/apache/juneau/petstore/repository/OrderRepository.java index 7fd1545..bbcfa6d 100644 --- a/juneau-petstore-server/src/main/java/org/apache/juneau/petstore/repository/OrderRepository.java +++ b/juneau-petstore-server/src/main/java/org/apache/juneau/petstore/repository/OrderRepository.java @@ -4,6 +4,9 @@ import org.apache.juneau.petstore.dto.Order; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; +/** + * TODO - Needs documentation + */ @Repository public interface OrderRepository extends JpaRepository <Order, Long>{ diff --git a/juneau-petstore-server/src/main/java/org/apache/juneau/petstore/repository/PetRepository.java b/juneau-petstore-server/src/main/java/org/apache/juneau/petstore/repository/PetRepository.java index 49e125b..b200f71 100644 --- a/juneau-petstore-server/src/main/java/org/apache/juneau/petstore/repository/PetRepository.java +++ b/juneau-petstore-server/src/main/java/org/apache/juneau/petstore/repository/PetRepository.java @@ -9,11 +9,17 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +/** + * TODO - Needs documentation + */ @Repository public interface PetRepository extends JpaRepository <Pet, Long> { + + @SuppressWarnings("javadoc") @Query("select X from PetstorePet X where X.tags in :tags") - List<Pet> findByTags(@Param("tags") String[] tags); - + List<Pet> findByTags(@Param("tags") String[] tags); + + @SuppressWarnings("javadoc") @Query("select X from PetstorePet X where X.status in :status") - List<Pet> findByStatus(@Param("status") PetStatus[] status); + List<Pet> findByStatus(@Param("status") PetStatus[] status); } diff --git a/juneau-petstore-server/src/main/java/org/apache/juneau/petstore/repository/UserRepository.java b/juneau-petstore-server/src/main/java/org/apache/juneau/petstore/repository/UserRepository.java index 76948ea..4842ed2 100644 --- a/juneau-petstore-server/src/main/java/org/apache/juneau/petstore/repository/UserRepository.java +++ b/juneau-petstore-server/src/main/java/org/apache/juneau/petstore/repository/UserRepository.java @@ -6,9 +6,15 @@ import org.apache.juneau.petstore.dto.User; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; +/** + * TODO - Needs documentation + */ @Repository public interface UserRepository extends JpaRepository <User, Long>{ - + + @SuppressWarnings("javadoc") User findByUsername(String username); + + @SuppressWarnings("javadoc") Long deleteByUsername(String username); } diff --git a/juneau-petstore-server/src/main/java/org/apache/juneau/petstore/rest/PetStoreResource.java b/juneau-petstore-server/src/main/java/org/apache/juneau/petstore/rest/PetStoreResource.java index 5982d88..790e684 100644 --- a/juneau-petstore-server/src/main/java/org/apache/juneau/petstore/rest/PetStoreResource.java +++ b/juneau-petstore-server/src/main/java/org/apache/juneau/petstore/rest/PetStoreResource.java @@ -45,7 +45,7 @@ import org.apache.juneau.rest.converters.*; * <li class='extlink'>{@source} * </ul> */ -@RestResource( +@Rest( path="/petstore", title="Petstore application", description={ diff --git a/juneau-petstore-server/src/main/java/org/apache/juneau/petstore/rest/RootResources.java b/juneau-petstore-server/src/main/java/org/apache/juneau/petstore/rest/RootResources.java index a92d9de..620efd8 100644 --- a/juneau-petstore-server/src/main/java/org/apache/juneau/petstore/rest/RootResources.java +++ b/juneau-petstore-server/src/main/java/org/apache/juneau/petstore/rest/RootResources.java @@ -25,7 +25,7 @@ import org.apache.juneau.serializer.annotation.*; * <li class='extlink'>{@source} * </ul> */ -@RestResource( +@Rest( path="/*", title="Root resources", description="Example of a router resource page.", diff --git a/pom.xml b/pom.xml index b70355f..32a0465 100644 --- a/pom.xml +++ b/pom.xml @@ -38,7 +38,7 @@ <junit.version>4.11</junit.version> <servlet.version>3.1.0</servlet.version> <httpclient.version>4.5.6</httpclient.version> - <juneau.version>8.1.1</juneau.version> + <juneau.version>8.1.2</juneau.version> <derby.version>10.10.2.0</derby.version> <hibernate.version>5.0.9.Final</hibernate.version> <javax.inject.version>1</javax.inject.version>
