rhbz912583 relax requirement for non-null project type on put project

zanata · Feb 21, 2013 · abfd586 · abfd586
1 parent 8b81728
commit abfd586
Showing 1 changed file with 25 additions and 17 deletions.
diff --git a/zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java b/zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java
@@ -221,23 +221,28 @@ else if (Objects.equal(hProject.getStatus(), READONLY))
          response = Response.ok();
       }
 
-      if (project.getDefaultType() == null || project.getDefaultType().isEmpty())
+      // null project type accepted for compatibility with old clients
+      if (project.getDefaultType() != null)
       {
-         return Response.status(Status.BAD_REQUEST)
-               .entity("No valid default project type was specified.")
-               .build();
-      }
-      try
-      {
-         ProjectType.getValueOf(project.getDefaultType());
-      }
-      catch (Exception e)
-      {
-         String validTypes = StringUtils.join(ProjectType.values(), ", ");
-         return Response.status(Status.BAD_REQUEST)
-               .entity("Project type \"" + project.getDefaultType() + "\" not valid for this server." +
-                       " Valid types: [" + validTypes + "]")
-               .build();
+         if (project.getDefaultType().isEmpty())
+         {
+            return Response.status(Status.BAD_REQUEST)
+                  .entity("No valid default project type was specified.")
+                  .build();
+         }
+
+         try
+         {
+            ProjectType.getValueOf(project.getDefaultType());
+         }
+         catch (Exception e)
+         {
+            String validTypes = StringUtils.join(ProjectType.values(), ", ");
+            return Response.status(Status.BAD_REQUEST)
+                  .entity("Project type \"" + project.getDefaultType() + "\" not valid for this server." +
+                        " Valid types: [" + validTypes + "]")
+                        .build();
+         }
       }
 
       transfer(project, hProject);
@@ -264,7 +269,10 @@ public static void transfer(Project from, HProject to)
    {
       to.setName(from.getName());
       to.setDescription(from.getDescription());
-      to.setDefaultProjectType(ProjectType.valueOf(from.getDefaultType()));
+      if (from.getDefaultType() != null)
+      {
+         to.setDefaultProjectType(ProjectType.valueOf(from.getDefaultType()));
+      }
       // TODO Currently all Projects are created as Current
       // to.setStatus(from.getStatus());