POLYGENE-298 - Removed library-restlet.

Formatting in the other rest libraries

Author: niclash

libraries/rest-client/src/test/java/org/apache/polygene/library/rest/client/ContextResourceClientFactoryTest.java

@@ -125,7 +125,6 @@ public void assemble( ModuleAssembly module )
 
         module.objects( RootRestlet.class, RootResource.class, RootContext.class, SubResource1.class, PagesResource.class );
 
-
         module.objects( DescribableContext.class );
         module.transients( TestComposite.class );
 
@@ -146,18 +145,18 @@ public void startWebServer()
         server = new Server( Protocol.HTTP, port );
         ContextRestlet restlet = objectFactory.newObject( ContextRestlet.class, new org.restlet.Context() );
 
-        ChallengeAuthenticator guard = new ChallengeAuthenticator(null, ChallengeScheme.HTTP_BASIC, "testRealm");
+        ChallengeAuthenticator guard = new ChallengeAuthenticator( null, ChallengeScheme.HTTP_BASIC, "testRealm" );
         MapVerifier mapVerifier = new MapVerifier();
-        mapVerifier.getLocalSecrets().put("rickard", "secret".toCharArray());
-        guard.setVerifier(mapVerifier);
+        mapVerifier.getLocalSecrets().put( "rickard", "secret".toCharArray() );
+        guard.setVerifier( mapVerifier );
 
-        guard.setNext(restlet);
+        guard.setNext( restlet );
 
         server.setNext( guard );
         server.start();
 
         //START SNIPPET: client-create1
-        Client client =   new Client( Protocol.HTTP );
+        Client client = new Client( Protocol.HTTP );
 
         ContextResourceClientFactory contextResourceClientFactory = objectFactory.newObject( ContextResourceClientFactory.class, client );
         contextResourceClientFactory.setAcceptedMediaTypes( MediaType.APPLICATION_JSON );
@@ -171,14 +170,16 @@ public void startWebServer()
             @Override
             public HandlerCommand handleResponse( Response response, ContextResourceClient client )
             {
-                    if (tried)
-                        throw new ResourceException( response.getStatus() );
+                if( tried )
+                {
+                    throw new ResourceException( response.getStatus() );
+                }
 
-                    tried = true;
-                    client.getContextResourceClientFactory().getInfo().setUser( new User("rickard", "secret") );
+                tried = true;
+                client.getContextResourceClientFactory().getInfo().setUser( new User( "rickard", "secret" ) );
 
-                    // Try again
-                    return refresh();
+                // Try again
+                return refresh();
             }
         } ).onError( ErrorHandler.RECOVERABLE_ERROR, new ResponseHandler()
         {
@@ -222,15 +223,15 @@ public HandlerCommand handleResult( Resource result, ContextResourceClient clien
                 return query( "querywithoutvalue" );
             }
         } ).
-        onQuery( "querywithoutvalue", new ResultHandler<TestResult>()
-        {
-            @Override
-            public HandlerCommand handleResult( TestResult result, ContextResourceClient client )
-            {
-                Assert.assertThat( result.xyz().get(), CoreMatchers.equalTo( "bar" ) );
-                return null;
-            }
-        } );
+               onQuery( "querywithoutvalue", new ResultHandler<TestResult>()
+               {
+                   @Override
+                   public HandlerCommand handleResult( TestResult result, ContextResourceClient client )
+                   {
+                       Assert.assertThat( result.xyz().get(), CoreMatchers.equalTo( "bar" ) );
+                       return null;
+                   }
+               } );
 
         crc.start();
         //END SNIPPET: query-without-value
@@ -351,24 +352,23 @@ public HandlerCommand handleResponse( Response response, ContextResourceClient c
     @Test
     public void testIndexedResource()
     {
-        crc.newClient("subcontext/pages/").onResource( new ResultHandler<Resource>()
+        crc.newClient( "subcontext/pages/" ).onResource( new ResultHandler<Resource>()
         {
             @Override
             public HandlerCommand handleResult( Resource result, ContextResourceClient client )
             {
                 return query( "index" );
             }
         } ).onQuery( "index", new ResultHandler<Links>()
-                {
-                    @Override
-                    public HandlerCommand handleResult( Links result, ContextResourceClient client )
-                    {
-                        Assert.assertEquals( result.links().get().size(), 3 );
-                        return null;
-                    }
-                } )
-        .start();
-
+        {
+            @Override
+            public HandlerCommand handleResult( Links result, ContextResourceClient client )
+            {
+                Assert.assertEquals( result.links().get().size(), 3 );
+                return null;
+            }
+        } )
+           .start();
     }
 
     public interface TestQuery
@@ -441,10 +441,10 @@ public void commandwithvalue( TestCommand command )
 
         public Links commandwithvalue()
         {
-            return new LinksBuilder(module).
-                command( "commandwithvalue" ).
-                addLink( "Command ABC","right" ).
-                addLink( "Command XYZ", "wrong" ).newLinks();
+            return new LinksBuilder( module ).
+                                                 command( "commandwithvalue" ).
+                                                 addLink( "Command ABC", "right" ).
+                                                 addLink( "Command XYZ", "wrong" ).newLinks();
         }
 
         @Override
@@ -519,7 +519,7 @@ else if( name.equals( "notxyz" ) )
         }
 
         @Requires( File.class )
-        public TestResult queryWithRoleRequirement(TestQuery query)
+        public TestResult queryWithRoleRequirement( TestQuery query )
         {
             return context( SubContext.class ).queryWithRoleRequirement( query );
         }
@@ -549,7 +549,8 @@ public void subresource2()
         }
 
         @SubResource
-        public void pages() {
+        public void pages()
+        {
             subResource( PagesResource.class );
         }
     }
@@ -566,7 +567,7 @@ public static class RootContext
 
         public TestResult queryWithValue( TestQuery query )
         {
-            return vbf.newValueFromSerializedState( TestResult.class, "{\"xyz\":\""+query.abc().get()+"\"}" );
+            return vbf.newValueFromSerializedState( TestResult.class, "{\"xyz\":\"" + query.abc().get() + "\"}" );
         }
 
         public TestResult queryWithoutValue()
@@ -705,11 +706,11 @@ public static class PagesResource extends ContextResource
         @Override
         public Links index()
         {
-            return new LinksBuilder(module)
-                    .addLink( "Page1", "page1")
-                    .addLink( "Page2", "page2")
-                    .addLink( "Page3", "page3")
-                    .newLinks();
+            return new LinksBuilder( module )
+                .addLink( "Page1", "page1" )
+                .addLink( "Page2", "page2" )
+                .addLink( "Page3", "page3" )
+                .newLinks();
         }
     }
 

libraries/rest-server/src/main/java/org/apache/polygene/library/rest/server/restlet/responsewriter/TableResponseWriter.java

@@ -152,7 +152,7 @@ else if( columnList.get( idx ).columnType().get().equals( Table.TIME_OF_DAY )
                                     JsonObjectBuilder cellBuilder = jsonBuilderFactory.createObjectBuilder();
                                     if( value != null )
                                     {
-                                        cellBuilder.add( "v", jsonSerializer.toJson( Serializer.Options.ALL_TYPE_INFO, value ) );
+                                        cellBuilder.add( "v", jsonSerializer.toJson( Serializer.Options.NO_TYPE_INFO, value ) );
                                     }
                                     if( cellValue.f().get() != null )
                                     {

libraries/rest-server/src/main/java/org/apache/polygene/library/rest/server/restlet/responsewriter/ValueCompositeResponseWriter.java

@@ -63,7 +63,7 @@ public boolean writeResponse( final Object result, final Response response )
             MediaType type = getVariant( response.getRequest(), ENGLISH, supportedMediaTypes ).getMediaType();
             if( MediaType.APPLICATION_JSON.equals( type ) )
             {
-                StringRepresentation representation = new StringRepresentation( serializer.serialize( Serializer.Options.ALL_TYPE_INFO, result ),
+                StringRepresentation representation = new StringRepresentation( serializer.serialize( Serializer.Options.NO_TYPE_INFO, result ),
                                                                                 MediaType.APPLICATION_JSON );
                 response.setEntity( representation );
                 return true;

libraries/rest-server/src/main/resources/org/apache/polygene/library/rest/server/restlet/responsewriter/resource.htm

@@ -19,7 +19,7 @@
   -->
 
 <!-- Default resource template -->
-<html>
+<html xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <title>${request.resourceRef.remainingPart}</title>
 </head>

libraries/rest-server/src/main/resources/org/apache/polygene/library/rest/server/restlet/responsewriter/table.htm

@@ -18,7 +18,7 @@
   ~
   -->
 
-<html>
+<html xmlns="http://www.w3.org/1999/xhtml">
 <body>
 
 <table border="1">

libraries/rest-server/src/main/resources/org/apache/polygene/library/rest/server/restlet/responsewriter/value.htm

@@ -17,8 +17,7 @@
   ~
   ~
   -->
-
-<html>
+<html xmlns="http://www.w3.org/1999/xhtml">
 <body>
 
 <ul>