spring-gen 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09f568bcce438f10eadb24b9f744caa7ce7ea192
-  data.tar.gz: d896cec36aded99c24308a588ac1cae35cb44b09
+  metadata.gz: 18946e444ddd8e8e936c8e80f5ae11eee8c1f491
+  data.tar.gz: b6d635ada116d41f68976848010575825cca9b07
 SHA512:
-  metadata.gz: d5da0583538330ea77db8864df58a2017ca252595fce7ce30f96360222ff08dee2d4c34c5cb0440e10e61e3f0dfee27079ee361cf6e52c25821da5db8c8bd097
-  data.tar.gz: d37f257a8efc153ee39a5448ca2e8d4286dfb6d6aab80eba5b156e86ee6ea8bd718e969bbc6f6a5d38edd3c23e6e9de0daa361a3bb693fe4ffa279c3d1c041ef
+  metadata.gz: 76472927a0b2646fdba38ec9945ea3acd12a72a180dbd44af9706832158a3e406fb4de25958e52ae38b94db2cb85ba2af3e63c5c80cfffca78cf38b1ed512490
+  data.tar.gz: aee3fb4f3c1c6384bc43732f4e7f2ab3e4aef7a6f7aa3e45c6c7705ab20e807654c7fd636ad337c9908a04f2d94d648f768de507fc2ee3d86287324fdf7b2c50

data/lib/commands/resource.rb

@@ -60,13 +60,16 @@ class Resource < Thor::Group
 
       case config.repository_technique
         when 'jpa'
+          @id_type = "Long"
           #TODO unify sample data. This check should not need to exist.
           template "templates/src/test/java/integration/#{config.repository_technique}/sampleData.xml.erb",
                    "#{content_root}/src/test/resources/sampledata/#{@model_name.downcase}SampleData.xml"
         when "mongodb"
+          @id_type = "String"
           template "templates/src/test/java/integration/#{config.repository_technique}/SampleData.java.erb",
                    "#{content_root}/src/test/java/#{fs_path}/integration/#{@model_name.downcase}/#{@model_name}SampleData.java"
         when "neo4j"
+          @id_type = "Long"
           template "templates/src/test/java/integration/#{config.repository_technique}/SampleData.java.erb",
                    "#{content_root}/src/test/java/#{fs_path}/integration/#{@model_name.downcase}/#{@model_name}SampleData.java"
         else
@@ -111,4 +114,15 @@ class Resource < Thor::Group
     end
   end
 
+  no_tasks do
+    def augment_test_id(id)
+      case @id_type
+        when "String" then "String.valueOf(#{id})"
+        when "Long" then "Long.valueOf(#{id})"
+        else id
+      end
+    end
+  end
+
+
 end

data/lib/templates/src/main/java/controller/BaseController.java.erb

@@ -2,7 +2,6 @@ package <%=@package%>.controller;
 
 <%=@licence%>
 
-import <%=@package%>.exception.NotCreatedException;
 import <%=@package%>.model.BaseEntity;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.rest.webmvc.ResourceNotFoundException;
@@ -42,12 +41,4 @@ public abstract class BaseController {
   public String handleNotFound(ResourceNotFoundException ex) {
    return ex.toString();
   }
-
-
-
-  @ExceptionHandler(NotCreatedException.class)
-  @ResponseStatus(HttpStatus.NOT_ACCEPTABLE)
-  public String handleNotCreated(NotCreatedException ex) {
-    return "couldn't create resource";
-  }
 }

data/lib/templates/src/main/java/controller/Controller.java.erb

@@ -71,21 +71,22 @@ public class <%=@model_name%>Controller extends BaseController {
    * @return a response.
    */
   @RequestMapping(value = "/{id}", method = RequestMethod.GET)
-  public ResponseEntity<<%=@model_name%>Resource> getOne(@PathVariable Long id) {
+  public ResponseEntity<<%=@model_name%>Resource> getOne(@PathVariable <%=@id_type%> id) {
     <%=@model_name%>Resource result
         = <%=@model_name.downcase%>Assembler.toResource(<%=@model_name.downcase%>Repository.findOne(id));
     return ResponseEntity.ok().body(result);
   }
 
   @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
-  public ResponseEntity<?> delete(@PathVariable Long id) {
+  public ResponseEntity<?> delete(@PathVariable <%=@id_type%> id) {
     <%=@model_name.downcase%>Repository.delete(id);
     return ResponseEntity.noContent().build();
   }
 
   @RequestMapping(value = "/{id}", method = RequestMethod.PUT)
-  public ResponseEntity<?> update(@PathVariable Long id,
+  public ResponseEntity<?> update(@PathVariable <%=@id_type%> id,
                                   @RequestBody <%=@model_name%> newValues) {
+    newValues.setId(id);
     <%=@model_name.downcase%>Repository.save(newValues);
     return ResponseEntity.noContent().build();
   }

data/lib/templates/src/test/java/unit/assembler/AssemblerUnitTest.java.erb

@@ -32,7 +32,7 @@ public class <%=@model_name%>AssemblerUnitTest {
   @Test
   public void testToResource() throws Exception {
     <%=@model_name%> instance = new <%=@model_name%>();
-    instance.setId(1L);
+    instance.setId(<%=augment_test_id(1)%>);
     ResourceSupport resourceSupport = testInstance.toResource(instance);
     assertEquals("self",resourceSupport.getId().getRel());
   }

data/lib/templates/src/test/java/unit/controller/ControllerUnitTest.java.erb

@@ -70,7 +70,7 @@ public class <%=@model_name%>ControllerUnitTest {
     List<<%=@model_name%>> sampleData = new ArrayList<>();
     for (int i = 0; i < 10; i++) {
       <%=@model_name%> instance = new <%=@model_name%>();
-      instance.setId(i);
+      instance.setId(<%=augment_test_id("i")%>);
       sampleData.add(instance);
     }
     Page<<%=@model_name%>> page = new PageImpl<>(sampleData);
@@ -91,13 +91,13 @@ public class <%=@model_name%>ControllerUnitTest {
   @Test
   public void getOneShouldReturnResponseContainingTheDataOfOne<%=@model_name%>AsJson() throws Exception {
     <%=@model_name%> instance = new <%=@model_name%>();
-    instance.setId(1L);
+    instance.setId(<%=augment_test_id(1)%>);
     <%=@model_name%>Resource testResource = new <%=@model_name%>Resource(instance);
-    when(<%=@model_name.downcase%>Repository.findOne(1L)).thenReturn(instance);
+    when(<%=@model_name.downcase%>Repository.findOne(<%=augment_test_id(1)%>)).thenReturn(instance);
     when(<%=@model_name.downcase%>Assembler.toResource(instance)).thenReturn(testResource);
-    ResponseEntity response = testInstance.getOne(1L);
+    ResponseEntity response = testInstance.getOne(<%=augment_test_id(1)%>);
     assertEquals(200,response.getStatusCode().value());
-    verify(<%=@model_name.downcase%>Repository, times(1)).findOne(1L);
+    verify(<%=@model_name.downcase%>Repository, times(1)).findOne(<%=augment_test_id(1)%>);
     verify(<%=@model_name.downcase%>Assembler, times(1)).toResource(instance);
   }
 }

data/lib/version.rb

@@ -1,3 +1,3 @@
 module SpringGen
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spring-gen
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Rene Richter
@@ -168,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Generator for spring microservices