Fixing the restlet library in relation to the polygene generator to work.
diff --git a/core/runtime/src/main/java/org/apache/polygene/runtime/value/ValueInstance.java b/core/runtime/src/main/java/org/apache/polygene/runtime/value/ValueInstance.java
index 5e678c5..8af2e08 100644
--- a/core/runtime/src/main/java/org/apache/polygene/runtime/value/ValueInstance.java
+++ b/core/runtime/src/main/java/org/apache/polygene/runtime/value/ValueInstance.java
@@ -20,6 +20,7 @@
package org.apache.polygene.runtime.value;
import java.lang.reflect.Proxy;
+import java.util.Arrays;
import org.apache.polygene.api.composite.CompositeInstance;
import org.apache.polygene.api.serialization.Serializer;
import org.apache.polygene.runtime.composite.MixinsInstance;
@@ -144,10 +145,23 @@
return hash + state.hashCode() * 5; // State
}
+ public String toJsonString()
+ {
+ Serializer serialization = ( (ModuleSpi) module().instance() ).serialization();
+ if( serialization != null )
+ {
+ return serialization.serialize( Serializer.Options.NO_TYPE_INFO, proxy() );
+ }
+ return null;
+ }
+
@Override
public String toString()
{
- Serializer serialization = ( (ModuleSpi) module().instance() ).serialization();
- return serialization.serialize( Serializer.Options.NO_TYPE_INFO, proxy() );
+ return "ValueInstance{" +
+ "mixins=" + Arrays.toString( mixins ) +
+ ", state=" + state +
+ ", compositeModel=" + compositeModel +
+ '}';
}
}
diff --git a/libraries/restlet/build.gradle b/libraries/restlet/build.gradle
index 95ab44b..7a8705c 100644
--- a/libraries/restlet/build.gradle
+++ b/libraries/restlet/build.gradle
@@ -30,8 +30,6 @@
api polygene.core.bootstrap
- implementation polygene.extension( 'entitystore-file' )
- implementation polygene.extension( 'indexing-rdf' )
implementation libraries.restlet
runtimeOnly polygene.core.runtime
@@ -39,7 +37,8 @@
testImplementation polygene.core.testsupport
testImplementation polygene.library( 'http' )
testImplementation libraries.http_client
-
+ testImplementation polygene.extension( 'entitystore-file' )
+ testImplementation polygene.extension( 'indexing-rdf' )
testRuntimeOnly libraries.logback
}
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/PolygeneEntityRestlet.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/PolygeneEntityRestlet.java
index b76bfd3..da27d9e 100644
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/PolygeneEntityRestlet.java
+++ b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/PolygeneEntityRestlet.java
@@ -152,7 +152,6 @@
}
Representation representation = converter.toRepresentation( result, new Variant(), null );
response.setEntity( representation );
- response.setEntity( representation );
response.setStatus( Status.SUCCESS_OK );
}
else
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/PolygeneRestApplication.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/PolygeneRestApplication.java
index 854592e..0bfd614 100644
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/PolygeneRestApplication.java
+++ b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/PolygeneRestApplication.java
@@ -33,6 +33,7 @@
import org.apache.polygene.library.restlet.resource.ResourceFactory;
import org.apache.polygene.library.restlet.resource.ServerResource;
import org.apache.polygene.library.restlet.serialization.PolygeneConverter;
+import org.restlet.Component;
import org.restlet.Context;
import org.restlet.Restlet;
import org.restlet.data.ChallengeScheme;
@@ -59,10 +60,12 @@
protected ObjectFactory objectFactory;
protected Router router;
+ protected String basePath;
- protected PolygeneRestApplication( Context context )
+ protected PolygeneRestApplication( String basePath, Context context )
{
super( context );
+ this.basePath = basePath;
}
protected void printRoutes( PrintStream out )
@@ -105,25 +108,34 @@
router = new Router( context );
addRoutes( router );
- router.attach( "/", newPolygeneRestlet( EntryPointResource.class, EntryPoint.class ) );
-
- ChallengeAuthenticator guard = new ChallengeAuthenticator( context, ChallengeScheme.HTTP_BASIC, getName() + " Realm" );
+ router.attach( basePath, newPolygeneRestlet( EntryPointResource.class, EntryPoint.class ) );
Verifier verifier = createVerifier();
- if( verifier != null )
- {
- guard.setVerifier( verifier );
- }
-
Enroler enroler = createEnroler();
- if( enroler != null )
+ if( verifier == null && enroler == null )
{
- guard.setEnroler( enroler );
+ return createInterceptors(new Filter()
+ {
+ } );
}
- return createInterceptors( guard );
+ else
+ {
+ ChallengeAuthenticator guard = new ChallengeAuthenticator( context, ChallengeScheme.HTTP_BASIC, getName() + " Realm" );
+
+ if( verifier != null )
+ {
+ guard.setVerifier( verifier );
+ }
+
+ if( enroler != null )
+ {
+ guard.setEnroler( enroler );
+ }
+ return createInterceptors( guard );
+ }
}
- private Restlet createInterceptors( ChallengeAuthenticator guard )
+ private Restlet createInterceptors( Filter guard )
{
Filter inner = createInnerInterceptor();
if( inner != null )
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/PolygeneServerServlet.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/PolygeneServerServlet.java
index ce5cf03..4d2c125 100644
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/PolygeneServerServlet.java
+++ b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/PolygeneServerServlet.java
@@ -19,12 +19,16 @@
*/
package org.apache.polygene.library.restlet;
+import java.util.List;
import javax.servlet.Servlet;
import org.apache.polygene.api.injection.scope.Structure;
import org.apache.polygene.api.mixin.Mixins;
+import org.apache.polygene.api.object.ObjectFactory;
import org.apache.polygene.api.structure.Module;
import org.restlet.Context;
import org.restlet.ext.servlet.ServerServlet;
+import org.restlet.routing.VirtualHost;
+import org.restlet.util.ServerList;
/**
* Restlet ServerServlet backed by a org.restlet.Application object.
@@ -32,16 +36,17 @@
@Mixins( PolygeneServerServlet.Mixin.class )
public interface PolygeneServerServlet extends Servlet
{
- class Mixin
- extends ServerServlet
+ class Mixin extends ServerServlet
{
@Structure
- private Module module;
+ private ObjectFactory objectFactory;
@Override
protected org.restlet.Application createApplication( Context parentContext )
{
- return module.newObject( org.restlet.Application.class, parentContext.createChildContext() );
+ ServerList servers = getComponent().getServers();
+ System.out.println(servers);
+ return objectFactory.newObject( PolygeneRestApplication.class, parentContext.createChildContext() );
}
}
}
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/GenericRestLayer.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/GenericRestLayer.java
deleted file mode 100644
index bbe10ab..0000000
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/GenericRestLayer.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- *
- */
-
-package org.apache.polygene.library.restlet.assembly;
-
-import org.apache.polygene.bootstrap.LayerAssembly;
-import org.apache.polygene.bootstrap.layered.LayeredLayerAssembler;
-
-public class GenericRestLayer extends LayeredLayerAssembler
-{
-
- @Override
- public LayerAssembly assemble( LayerAssembly layer )
- {
- return null;
- }
-}
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/RestletCrudConnectivityAssembler.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/RestletCrudConnectivityAssembler.java
index 6da0361..0eb1d5e 100644
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/RestletCrudConnectivityAssembler.java
+++ b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/RestletCrudConnectivityAssembler.java
@@ -38,6 +38,9 @@
import org.apache.polygene.library.restlet.serialization.FormRepresentation;
import org.apache.polygene.library.restlet.serialization.JsonRepresentation;
+/** This assembler should go to a module in the layer of the {@link RestletCrudModuleAssembler}.
+ *
+ */
public class RestletCrudConnectivityAssembler
implements Assembler
{
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/RestletCrudModuleAssembler.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/RestletCrudModuleAssembler.java
index 562586f..490804b 100644
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/RestletCrudModuleAssembler.java
+++ b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/RestletCrudModuleAssembler.java
@@ -22,14 +22,17 @@
import org.apache.polygene.api.common.Visibility;
import org.apache.polygene.api.unitofwork.concern.UnitOfWorkConcern;
-import org.apache.polygene.bootstrap.Assembler;
+import org.apache.polygene.bootstrap.Assemblers;
import org.apache.polygene.bootstrap.ModuleAssembly;
+import org.apache.polygene.bootstrap.ServiceDeclaration;
import org.apache.polygene.library.restlet.repository.CrudRepository;
import org.apache.polygene.library.restlet.repository.EntityTypeDescriptor;
import org.apache.polygene.library.restlet.repository.SmallCrudRepositoryMixin;
-public class RestletCrudModuleAssembler
- implements Assembler
+/**
+ * This assembler should be used for each module that has CRUD types, reachable by the REST API.
+ */
+public class RestletCrudModuleAssembler extends Assemblers.VisibilityIdentity<RestletCrudModuleAssembler>
{
private final Class type;
private final Class repositoryType;
@@ -49,15 +52,21 @@
@Override
public void assemble( ModuleAssembly module )
{
- module
+ ServiceDeclaration declaration = module
.addServices( repositoryType )
- .identifiedBy( "repository_" + type.getSimpleName() )
.visibleIn( Visibility.application )
.withMixins( SmallCrudRepositoryMixin.class )
.withConcerns( UnitOfWorkConcern.class )
.taggedWith( type.getSimpleName() )
- .setMetaInfo( new EntityTypeDescriptor( type ) )
- ;
+ .setMetaInfo( new EntityTypeDescriptor( type ) );
+ if( hasIdentity() )
+ {
+ declaration.identifiedBy( identity() );
+ }
+ else
+ {
+ declaration.identifiedBy( "repository_" + type.getSimpleName() );
+ }
module.entities( type ).visibleIn( Visibility.layer );
module.values( type ).visibleIn( Visibility.layer );
}
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/crud/EntityListResource.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/crud/EntityListResource.java
index 6085c22..175ee7c 100644
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/crud/EntityListResource.java
+++ b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/crud/EntityListResource.java
@@ -93,13 +93,10 @@
name = nameField.value().get();
}
Reference base = parameters.request().get().getResourceRef();
-
- //noinspection unchecked
Class<T> entityType = parameters.entityType().get();
-
Identity identity = identityManager.generate(entityType, name);
locator.find( entityType ).create( identity );
- return resourceBuilder.createRestLink( identity, base, Method.GET );
+ return resourceBuilder.createRestLink( identity.toString(), base, Method.GET );
}
@SuppressWarnings( "unchecked" )
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/crud/EntityResource.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/crud/EntityResource.java
index 965a33a..91b05ea 100644
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/crud/EntityResource.java
+++ b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/crud/EntityResource.java
@@ -40,7 +40,6 @@
import org.apache.polygene.library.restlet.repository.RepositoryLocator;
import org.apache.polygene.library.restlet.resource.ResourceBuilder;
import org.apache.polygene.library.restlet.resource.ServerResource;
-import org.apache.polygene.spi.PolygeneSPI;
import org.restlet.data.Reference;
@Mixins( EntityResource.Mixin.class )
@@ -57,15 +56,9 @@
{
@Structure
- private PolygeneSPI spi;
-
- @Structure
private ValueBuilderFactory vbf;
@This
- private HasIdentity me;
-
- @This
private Parameters<T> parameters;
@This
@@ -95,7 +88,7 @@
@Override
public void delete()
{
- Class entityType = parameters.entityType().get();
+ Class<? extends HasIdentity> entityType = parameters.entityType().get();
String idOfEntity = parameters.id().get();
locator.find( entityType ).delete( StringIdentity.identityOf( idOfEntity ) );
}
@@ -137,10 +130,10 @@
throw new RuntimeException( message, e );
}
Reference base = parameters.request().get().getResourceRef();
- return resourceBuilder.createRestLink( StringIdentity.identityOf( "" ), base, org.restlet.data.Method.GET );
+ return resourceBuilder.createRestLink( "", base, org.restlet.data.Method.GET );
}
- private Object createParametersComposite( RestForm form, Class argType )
+ private Object createParametersComposite( RestForm form, Class<?> argType )
{
ValueBuilder<?> vb = vbf.newValueBuilderWithState(
argType,
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/resource/CreationResource.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/resource/CreationResource.java
index fe86473..cee4b23 100644
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/resource/CreationResource.java
+++ b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/resource/CreationResource.java
@@ -66,11 +66,11 @@
public RestLink post( RestForm form )
{
String name = form.field( "name" ).value().get();
- Class entityType = parameters.entityType().get();
+ Class<? extends HasIdentity> entityType = parameters.entityType().get();
Identity identity = identityManager.generate( entityType, name );
locator.find( entityType ).create( identity );
doParameterization( form, entityType, identity );
- return resourceBuilder.createRestLink( identity, parameters.request().get().getResourceRef(), Method.GET );
+ return resourceBuilder.createRestLink( identity.toString(), parameters.request().get().getResourceRef(), Method.GET );
}
private <P> void doParameterization( RestForm form, Class entityType, Identity identity )
@@ -79,7 +79,7 @@
{
return;
}
- //noinspection unchecked
+ @SuppressWarnings( "unchecked" )
CreationParameterized<P> created = (CreationParameterized<P>) locator.find( entityType ).get( identity );
P parameterization = createParameterizationValue( form, created );
created.parameterize( parameterization );
@@ -94,7 +94,7 @@
association -> null,
association -> null,
association -> null
- );
+ );
return vb.newInstance();
}
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/resource/EntryPointResource.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/resource/EntryPointResource.java
index b497ebd..2e56c8a 100644
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/resource/EntryPointResource.java
+++ b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/resource/EntryPointResource.java
@@ -80,11 +80,11 @@
RestLink link;
if( route.getDescription() == null )
{
- link = resourceBuilder.createRestLink( StringIdentity.identityOf( template.getPattern() ), hostRef, Method.GET );
+ link = resourceBuilder.createRestLink( template.getPattern(), hostRef, Method.GET );
}
else
{
- link = resourceBuilder.createRestLink( StringIdentity.identityOf( template.getPattern() ), hostRef, Method.GET, route.getDescription() );
+ link = resourceBuilder.createRestLink( template.getPattern(), hostRef, Method.GET, route.getDescription() );
}
entryPoints.put( route.getName(), link );
}
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/resource/ResourceBuilder.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/resource/ResourceBuilder.java
index be851a6..fded105 100644
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/resource/ResourceBuilder.java
+++ b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/resource/ResourceBuilder.java
@@ -24,7 +24,6 @@
import java.util.Collections;
import org.apache.polygene.api.identity.HasIdentity;
import org.apache.polygene.api.identity.Identity;
-import org.apache.polygene.api.identity.StringIdentity;
import org.apache.polygene.api.injection.scope.Service;
import org.apache.polygene.api.injection.scope.Structure;
import org.apache.polygene.api.mixin.Mixins;
@@ -48,13 +47,13 @@
@Mixins( ResourceBuilder.Mixin.class )
public interface ResourceBuilder
{
- EntityRef createEntityRef(Identity name, Reference base );
+ EntityRef createEntityRef( Identity name, Reference base );
EntityRef createEntityRef( Identity name, RestLink get, RestLink put, RestLink delete );
- RestLink createRestLink( Identity name, Reference base, Method method );
+ RestLink createRestLink( String name, Reference base, Method method );
- RestLink createRestLink( Identity name, Reference base, Method method, String description );
+ RestLink createRestLink( String name, Reference base, Method method, String description );
Command createCommand( Reference base );
@@ -62,9 +61,9 @@
FormField createFormField( String name, String type );
- <T extends HasIdentity> Representation toRepresentation(Class<T> type, T composite );
+ <T extends HasIdentity> Representation toRepresentation( Class<T> type, T composite );
- <T extends HasIdentity> T toObject(Class<T> type, Representation representation )
+ <T extends HasIdentity> T toObject( Class<T> type, Representation representation )
throws IOException;
Route findRoute( String name, Router router );
@@ -88,9 +87,11 @@
@Override
public EntityRef createEntityRef( Identity identity, Reference base )
{
- RestLink get = createRestLink( identity, base, Method.GET );
- RestLink put = createRestLink( identity, base, Method.PUT );
- RestLink delete = createRestLink( identity, base, Method.DELETE );
+ String name = identityManager.extractName( identity );
+
+ RestLink get = createRestLink( name, base, Method.GET );
+ RestLink put = createRestLink( name, base, Method.PUT );
+ RestLink delete = createRestLink( name, base, Method.DELETE );
return createEntityRef( identity, get, put, delete );
}
@@ -107,10 +108,8 @@
}
@Override
- public RestLink createRestLink( Identity identity, Reference base, Method method )
+ public RestLink createRestLink( String name, Reference base, Method method )
{
- String name = identityManager.extractName( identity );
-
ValueBuilder<RestLink> builder = vbf.newValueBuilder( RestLink.class );
RestLink prototype = builder.prototype();
String path = base.toUri().resolve( name ).getPath();
@@ -120,9 +119,8 @@
}
@Override
- public RestLink createRestLink( Identity identity, Reference base, Method method, String description )
+ public RestLink createRestLink( String name, Reference base, Method method, String description )
{
- String name = identityManager.extractName( identity );
ValueBuilder<RestLink> builder = vbf.newValueBuilder( RestLink.class );
RestLink prototype = builder.prototype();
prototype.path().set( base.toUri().resolve( name ).getPath() + "/" );
@@ -143,7 +141,7 @@
public RestForm createNameForm( Reference base )
{
ValueBuilder<RestForm> builder = vbf.newValueBuilder( RestForm.class );
- builder.prototype().link().set( createRestLink( StringIdentity.identityOf( "form" ), base, Method.POST ) );
+ builder.prototype().link().set( createRestLink( "form", base, Method.POST ) );
builder.prototype().fields().set( Collections.singletonList( createFormField( "name", FormField.TEXT ) ) );
return builder.newInstance();
}
@@ -157,13 +155,13 @@
}
@Override
- public <T extends HasIdentity> Representation toRepresentation(Class<T> type, T composite )
+ public <T extends HasIdentity> Representation toRepresentation( Class<T> type, T composite )
{
return converter.toRepresentation( composite, new Variant(), null );
}
@Override
- public <T extends HasIdentity> T toObject(Class<T> type, Representation representation )
+ public <T extends HasIdentity> T toObject( Class<T> type, Representation representation )
throws IOException
{
return converter.toObject( representation, type, null );
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/serialization/JsonRepresentation.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/serialization/JsonRepresentation.java
index ea0929b..fafabe4 100644
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/serialization/JsonRepresentation.java
+++ b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/serialization/JsonRepresentation.java
@@ -23,12 +23,12 @@
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStream;
-import java.io.OutputStreamWriter;
import org.apache.polygene.api.common.Optional;
import org.apache.polygene.api.injection.scope.Service;
import org.apache.polygene.api.injection.scope.Structure;
import org.apache.polygene.api.injection.scope.Uses;
import org.apache.polygene.api.serialization.Serialization;
+import org.apache.polygene.api.serialization.Serializer;
import org.apache.polygene.api.structure.ModuleDescriptor;
import org.apache.polygene.spi.PolygeneSPI;
import org.restlet.data.MediaType;
@@ -84,7 +84,7 @@
*
* @return The wrapped object.
*
- * @throws IOException
+ * @throws IOException if there is an underlying I/O problem.
*/
public T getObject()
throws IOException
@@ -123,8 +123,7 @@
}
else if( object != null )
{
- // TODO was WITHOUT TYPE INFO
- stateSerialization.serialize( new OutputStreamWriter( outputStream ), object );
+ stateSerialization.serialize( Serializer.Options.NO_TYPE_INFO, outputStream, object );
outputStream.write( '\n' );
}
}
diff --git a/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/TestApplication.java b/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/TestApplication.java
index 6d21d05..3b8fb2b 100644
--- a/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/TestApplication.java
+++ b/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/TestApplication.java
@@ -45,11 +45,11 @@
throws Exception
{
RestApplicationAssembler assembler = new RestApplicationAssembler( NAME, VERSION, MODE,
- ConfigurationLayer.class,
- InfrastructureLayer.class,
- DomainLayer.class,
- ResourceLayer.class,
- ConnectivityLayer.class
+ ConnectivityLayer.class,
+ ResourceLayer.class,
+ DomainLayer.class,
+ InfrastructureLayer.class,
+ ConfigurationLayer.class
);
assembler.initialize();
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/RestApplicationAssembler.java b/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/RestApplicationAssembler.java
similarity index 100%
rename from libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/RestApplicationAssembler.java
rename to libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/RestApplicationAssembler.java
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/configuration/ConfigurationLayer.java b/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/configuration/ConfigurationLayer.java
similarity index 100%
rename from libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/configuration/ConfigurationLayer.java
rename to libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/configuration/ConfigurationLayer.java
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/configuration/ConfigurationModule.java b/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/configuration/ConfigurationModule.java
similarity index 100%
rename from libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/configuration/ConfigurationModule.java
rename to libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/configuration/ConfigurationModule.java
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/connectivity/ConnectivityLayer.java b/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/connectivity/ConnectivityLayer.java
similarity index 100%
rename from libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/connectivity/ConnectivityLayer.java
rename to libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/connectivity/ConnectivityLayer.java
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/connectivity/RestModule.java b/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/connectivity/RestModule.java
similarity index 100%
rename from libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/connectivity/RestModule.java
rename to libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/connectivity/RestModule.java
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/connectivity/SecurityModule.java b/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/connectivity/SecurityModule.java
similarity index 100%
rename from libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/connectivity/SecurityModule.java
rename to libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/connectivity/SecurityModule.java
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/domain/CrudModule.java b/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/domain/CrudModule.java
similarity index 100%
rename from libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/domain/CrudModule.java
rename to libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/domain/CrudModule.java
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/domain/DomainLayer.java b/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/domain/DomainLayer.java
similarity index 100%
rename from libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/domain/DomainLayer.java
rename to libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/domain/DomainLayer.java
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/infrastructue/FileStorageModule.java b/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/infrastructue/FileStorageModule.java
similarity index 100%
rename from libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/infrastructue/FileStorageModule.java
rename to libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/infrastructue/FileStorageModule.java
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/infrastructue/IndexingModule.java b/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/infrastructue/IndexingModule.java
similarity index 100%
rename from libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/infrastructue/IndexingModule.java
rename to libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/infrastructue/IndexingModule.java
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/infrastructue/InfrastructureLayer.java b/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/infrastructue/InfrastructureLayer.java
similarity index 100%
rename from libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/infrastructue/InfrastructureLayer.java
rename to libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/infrastructue/InfrastructureLayer.java
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/infrastructue/SerializationModule.java b/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/infrastructue/SerializationModule.java
similarity index 100%
rename from libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/infrastructue/SerializationModule.java
rename to libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/infrastructue/SerializationModule.java
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/resource/ResourceLayer.java b/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/resource/ResourceLayer.java
similarity index 100%
rename from libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/resource/ResourceLayer.java
rename to libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/resource/ResourceLayer.java
diff --git a/tools/generator-polygene/app/templates/ConnectivityLayer/HttpServerModule/bootstrap.tmpl b/tools/generator-polygene/app/templates/ConnectivityLayer/HttpServerModule/bootstrap.tmpl
index d39b3c9..c7e161e 100644
--- a/tools/generator-polygene/app/templates/ConnectivityLayer/HttpServerModule/bootstrap.tmpl
+++ b/tools/generator-polygene/app/templates/ConnectivityLayer/HttpServerModule/bootstrap.tmpl
@@ -19,9 +19,7 @@
-%>
package <%= polygene.packageName %>.bootstrap.connectivity;
-import java.io.File;
import java.util.HashMap;
-import javax.servlet.Servlet;
<% if( hasFeature('security') ) { %>
import org.apache.polygene.library.http.SecureJettyConfiguration;
import org.apache.polygene.library.http.SecureJettyServiceAssembler;
@@ -36,7 +34,7 @@
import org.apache.polygene.bootstrap.LayerAssembly;
import org.apache.polygene.bootstrap.ModuleAssembly;
import org.apache.polygene.bootstrap.layered.ModuleAssembler;
-import org.restlet.ext.servlet.ServerServlet;
+import org.apache.polygene.library.restlet.PolygeneServerServlet;
import <%= polygene.packageName %>.rest.<%= polygene.name %>RestApplication;
@@ -61,7 +59,6 @@
public ModuleAssembly assemble( LayerAssembly layer, ModuleAssembly module )
throws AssemblyException
{
- module.services( Servlet.class ).withMixins( ServerServlet.class );
<% if( hasFeature('security') ) {
%> new HttpShiroAssembler()
.withConfig( module, Visibility.module );
@@ -89,7 +86,7 @@
defaults.port().set( DEFAULT_PORT );
HashMap<String, String> initParams = new HashMap<>();
initParams.put("org.restlet.application", <%= polygene.name %>RestApplication.class.getName() );
- addServlets( serve( "/" ).with(Servlet.class ).withInitParams( initParams ) ).to( module );
+ addServlets( serve( "/*" ).with(PolygeneServerServlet.class ).withInitParams( initParams ) ).to( module );
return module;
}
}
diff --git a/tools/generator-polygene/app/templates/ConnectivityLayer/RestApiModule/NullEnroler.tmpl b/tools/generator-polygene/app/templates/ConnectivityLayer/RestApiModule/NullEnroler.tmpl
deleted file mode 100644
index c24ddce..0000000
--- a/tools/generator-polygene/app/templates/ConnectivityLayer/RestApiModule/NullEnroler.tmpl
+++ /dev/null
@@ -1,32 +0,0 @@
-<%#
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- *
--%>
-package <%= polygene.packageName %>.rest.security;
-
-import org.restlet.data.ClientInfo;
-import org.restlet.security.Enroler;
-
-public class NullEnroler
- implements Enroler
-{
- @Override
- public void enrole( ClientInfo clientInfo )
- {
- }
-}
diff --git a/tools/generator-polygene/app/templates/ConnectivityLayer/RestApiModule/NullVerifier.tmpl b/tools/generator-polygene/app/templates/ConnectivityLayer/RestApiModule/NullVerifier.tmpl
deleted file mode 100644
index 5d6b349..0000000
--- a/tools/generator-polygene/app/templates/ConnectivityLayer/RestApiModule/NullVerifier.tmpl
+++ /dev/null
@@ -1,34 +0,0 @@
-<%#
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- *
--%>
-package <%= polygene.packageName %>.rest.security;
-
-import org.restlet.security.SecretVerifier;
-import org.restlet.security.Verifier;
-
-public class NullVerifier extends SecretVerifier
- implements Verifier
-{
-
- @Override
- public int verify( String user, char[] secret )
- {
- return RESULT_VALID;
- }
-}
diff --git a/tools/generator-polygene/app/templates/ConnectivityLayer/RestApiModule/bootstrap.tmpl b/tools/generator-polygene/app/templates/ConnectivityLayer/RestApiModule/bootstrap.tmpl
index 0594546..daa6755 100644
--- a/tools/generator-polygene/app/templates/ConnectivityLayer/RestApiModule/bootstrap.tmpl
+++ b/tools/generator-polygene/app/templates/ConnectivityLayer/RestApiModule/bootstrap.tmpl
@@ -18,14 +18,12 @@
*
-%>
package <%= polygene.packageName %>.bootstrap.connectivity;
-
<% if( hasFeature('security') ) { %>
import <%= polygene.packageName %>.rest.security.DefaultEnroler;
import <%= polygene.packageName %>.rest.security.DefaultVerifier;
-<% } else { %>
-import <%= polygene.packageName %>.rest.security.NullEnroler;
-import <%= polygene.packageName %>.rest.security.NullVerifier;
<% } %>
+import <%= polygene.packageName %>.rest.<%= polygene.name %>RestApplication;
+import org.apache.polygene.api.common.Visibility;
import org.apache.polygene.bootstrap.AssemblyException;
import org.apache.polygene.bootstrap.LayerAssembly;
import org.apache.polygene.bootstrap.ModuleAssembly;
@@ -44,10 +42,10 @@
{
<% if( hasFeature('security') ) { %>
module.objects( DefaultVerifier.class, DefaultEnroler.class);
-<% } else {%>
- module.objects( NullVerifier.class, NullEnroler.class);
<% } %>
new RestletCrudConnectivityAssembler().assemble( module );
+ module.objects( <%= polygene.name %>RestApplication.class )
+ .visibleIn( Visibility.layer );
module.values( EntryPoint.class );
module.values( /* add value types */ );
module.services( /* add services */ );
diff --git a/tools/generator-polygene/app/templates/ConnectivityLayer/RestApiModule/module.js b/tools/generator-polygene/app/templates/ConnectivityLayer/RestApiModule/module.js
index 8d4ad47..91e8104 100644
--- a/tools/generator-polygene/app/templates/ConnectivityLayer/RestApiModule/module.js
+++ b/tools/generator-polygene/app/templates/ConnectivityLayer/RestApiModule/module.js
@@ -27,10 +27,6 @@
copyFile(p, "DefaultEnroler");
copyFile(p, "DefaultVerifier");
}
- else {
- copyFile(p, "NullEnroler");
- copyFile(p, "NullVerifier");
- }
}
}
};
diff --git a/tools/generator-polygene/app/templates/DomainLayer/DomainModule/bootstrap.tmpl b/tools/generator-polygene/app/templates/DomainLayer/DomainModule/bootstrap.tmpl
index 5afbdd7..d23b640 100644
--- a/tools/generator-polygene/app/templates/DomainLayer/DomainModule/bootstrap.tmpl
+++ b/tools/generator-polygene/app/templates/DomainLayer/DomainModule/bootstrap.tmpl
@@ -23,6 +23,7 @@
import org.apache.polygene.bootstrap.LayerAssembly;
import org.apache.polygene.bootstrap.ModuleAssembly;
import org.apache.polygene.bootstrap.layered.ModuleAssembler;
+import org.apache.polygene.library.restlet.assembly.RestletCrudModuleAssembler;
<% for( var idx in polygene.current.cruds) {
%><%= "import " + polygene.packageName + ".model." + polygene.current.name + "." + polygene.current.cruds[idx].name + ";" %>
@@ -54,8 +55,7 @@
<%
} %>
-import static org.apache.polygene.api.common.Visibility.layer;
-import static org.apache.polygene.api.common.Visibility.application;
+import static org.apache.polygene.api.common.Visibility.*;
public class <%- firstUpper(polygene.current.name) %>Module
implements ModuleAssembler
@@ -69,8 +69,8 @@
for( var value in polygene.current.cruds ) {
var crud = polygene.current.cruds[value];
%>
- <%- "module.values( " + crud.name + ".class )" + (crud.visibility ? ".visibleIn( " + crud.visibility +" )" : "" ) %>;
- <%- "module.entities( " + crud.name + ".class )" + (crud.visibility ? ".visibleIn( " + crud.visibility +" )" : "" ) %>;
+ new RestletCrudModuleAssembler( <%- crud.name %>.class )
+ .assemble( module );
<%
}
}
diff --git a/tools/generator-polygene/app/templates/RestAPIApplication/application.java.tmpl b/tools/generator-polygene/app/templates/RestAPIApplication/application.java.tmpl
index 8b38091..e188755 100644
--- a/tools/generator-polygene/app/templates/RestAPIApplication/application.java.tmpl
+++ b/tools/generator-polygene/app/templates/RestAPIApplication/application.java.tmpl
@@ -38,19 +38,13 @@
%>import <%= polygene.packageName %>.rest.security.DefaultEnroler;
import <%= polygene.packageName %>.rest.security.DefaultVerifier;
<%
-} else {
-%>import <%= polygene.packageName %>.rest.security.NullEnroler;
-import <%= polygene.packageName %>.rest.security.NullVerifier;
-<%
}
%>
public class <%= polygene.name %>RestApplication extends PolygeneRestApplication
{
- private static final String BASEPATH = "/<%= polygene.name.toLowerCase() %>/";
-
- public <%= polygene.name %>RestApplication( Context context )
+ public <%= polygene.name %>RestApplication()
{
- super( context );
+ super( "/<%= polygene.name.toLowerCase() %>/", createContext() );
}
@Override
@@ -61,11 +55,18 @@
var module = polygene.modules[moduleName];
for( var idx2 in module.cruds ) {
var crud = module.cruds[idx2];
-%> addResourcePath( "<%= crud.name.toLowerCase() %>", <%= crud.name %>.class, BASEPATH );
+%> addResourcePath( "<%= crud.name.toLowerCase() %>", <%= crud.name %>.class, basePath );
<%
}
}
-%> System.out.println( "REST API defined;" );
+%> }
+
+ @Override
+ public synchronized void start()
+ throws Exception
+ {
+ super.start();
+ System.out.println( "REST API defined;" );
printRoutes( System.out );
}
@@ -74,7 +75,8 @@
<% if( hasFeature('security') ) {
%> return objectFactory.newObject(DefaultVerifier.class, this);
<% } else {
-%> return objectFactory.newObject(NullVerifier.class, this);
+%> // Security was not specified during generation, and Verifier is not needed.
+ return null;
<% }
%> }
@@ -83,7 +85,13 @@
<% if( hasFeature('security') ) {
%> return objectFactory.newObject(DefaultEnroler.class, this);
<% } else {
-%> return objectFactory.newObject(NullEnroler.class, this);
+%> // Security was not specified during generation, and Enroler is not needed.
+ return null;
<% }
%> }
+
+ private static Context createContext()
+ {
+ return new Context("<%= polygene.packageName %>.rest");
+ }
}
diff --git a/tools/generator-polygene/app/templates/buildtool/gradle-app.tmpl b/tools/generator-polygene/app/templates/buildtool/gradle-app.tmpl
index ad707f2..697a2b0 100644
--- a/tools/generator-polygene/app/templates/buildtool/gradle-app.tmpl
+++ b/tools/generator-polygene/app/templates/buildtool/gradle-app.tmpl
@@ -43,6 +43,7 @@
if( polygene.applicationtype === 'Rest API' ) {
%> implementation project( ":rest" )
implementation "org.apache.polygene.libraries:org.apache.polygene.library.restlet:$polygeneVersion"
+ runtimeOnly "org.restlet.jee:org.restlet.ext.servlet:$restletVersion"
<%
}
@@ -70,38 +71,37 @@
<%
}
if( polygene.entitystore == 'LevelDB' ) {
-%> implementation "org.fusesource.leveldbjni:leveldbjni-all:1.8"
+%> implementation "org.fusesource.leveldbjni:leveldbjni-all:$levelDbVersion"
<%
}
if( polygene.entitystore == 'DerbySQL' ) {
-%> implementation "org.apache.derby:derby:10.13.1.1"
+%> implementation "org.apache.derby:derby:$derbyVersion"
<%
}
if( polygene.entitystore == 'H2SQL' ) {
-%> implementation "com.h2database:h2:1.4.194"
+%> implementation "com.h2database:h2:$h2Version"
<%
}
if( polygene.entitystore == 'MySQL' ) {
-%> implementation "mysql:mysql-connector-java:6.0.6"
+%> implementation "mysql:mysql-connector-java:$mysqlVersion"
<%
}
if( polygene.entitystore == 'PostgreSQL' ) {
-%> implementation "org.postgresql:postgresql:42.0.0"
+%> implementation "org.postgresql:postgresql:$postgresVersion"
<%
}
if( polygene.entitystore == 'SQLite' ) {
-%> implementation "org.xerial:sqlite-jdbc:3.16.1"
+%> implementation "org.xerial:sqlite-jdbc:$sqliteVersion"
<%
}
%>
runtimeOnly "org.apache.polygene.core:org.apache.polygene.core.runtime:$polygeneVersion"
- runtimeOnly "org.restlet.jee:org.restlet.ext.servlet:2.3.4"
- runtimeOnly "org.apache.johnzon:johnzon-core:1.1.0"
- runtimeOnly "org.apache.johnzon:johnzon-mapper:1.1.0"
+ runtimeOnly "org.apache.johnzon:johnzon-core:$johnzonVersion"
+ runtimeOnly "org.apache.johnzon:johnzon-mapper:$johnzonVersion"
runtimeOnly "org.apache.geronimo.specs:geronimo-json_1.1_spec:1.0"
- implementation "ch.qos.logback:logback-classic:1.2.3"
- implementation "ch.qos.logback:logback-core:1.2.3"
+ runtimeOnly "ch.qos.logback:logback-classic:$logbackVersion"
+ runtimeOnly "ch.qos.logback:logback-core:$logbackVersion"
testImplementation "org.apache.polygene.tools:org.apache.polygene.tool.model-detail:$polygeneVersion"
testImplementation "org.apache.polygene.core:org.apache.polygene.core.testsupport:$polygeneVersion"
diff --git a/tools/generator-polygene/app/templates/buildtool/gradle-root.tmpl b/tools/generator-polygene/app/templates/buildtool/gradle-root.tmpl
index 357b607..6ec2b7f 100644
--- a/tools/generator-polygene/app/templates/buildtool/gradle-root.tmpl
+++ b/tools/generator-polygene/app/templates/buildtool/gradle-root.tmpl
@@ -25,8 +25,35 @@
rootProject.ext {
polygeneVersion = "<%= polygene.version %>"
+ logbackVersion = "1.2.3"
+ johnzonVersion = "1.1.0"
<% if( polygene.applicationtype === "Rest API" ) {
%> jettyVersion = "9.2.17.v20160517"
+ restletVersion = "2.3.4"
+<%
+}
+if( polygene.entitystore == 'DerbySQL' ) {
+%> derbyVersion "10.13.1.1"
+<%
+}
+if( polygene.entitystore == 'H2SQL' ) {
+%> h2Version = "1.4.194"
+<%
+}
+if( polygene.entitystore == 'MySQL' ) {
+%> mysqlVersion = "6.0.6"
+<%
+}
+if( polygene.entitystore == 'PostgreSQL' ) {
+%> postgresVersion = "42.0.0"
+<%
+}
+if( polygene.entitystore == 'LevelDB' ) {
+%> levelDbVersion = "1.8"
+<%
+}
+if( polygene.entitystore == 'SQLite' ) {
+%> sqliteVersion = "3.16.1"
<%
}
%>}
