You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@polygene.apache.org by pa...@apache.org on 2017/02/03 07:57:40 UTC
[1/3] polygene-java git commit: Remove ValueSerialization “type finder” concept as there’s no implementation behind it
Repository: polygene-java
Updated Branches:
refs/heads/develop b61d0254f -> 9d16d5553
Remove ValueSerialization \u201ctype finder\u201d concept as there\u2019s no implementation behind it
No use of the meta info Function at all.
ValueDeserializer API takes the module to use as a parameter.
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/b675c1a5
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/b675c1a5
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/b675c1a5
Branch: refs/heads/develop
Commit: b675c1a5cb0d9ffb15fdb8e5ca233ad147215281
Parents: b61d025
Author: Paul Merlin <pa...@apache.org>
Authored: Sun Jan 15 20:01:48 2017 +0100
Committer: Paul Merlin <pa...@apache.org>
Committed: Sun Jan 15 20:02:24 2017 +0100
----------------------------------------------------------------------
.../api/value/DocumentationSupport.java | 10 --------
.../JacksonValueSerializationAssembler.java | 27 +++-----------------
.../OrgJsonValueSerializationAssembler.java | 27 +++-----------------
.../stax/StaxValueSerializationAssembler.java | 27 +++-----------------
.../restlet/assembly/domain/DomainLayer.java | 8 ------
.../infrastructue/InfrastructureLayer.java | 13 +++-------
.../infrastructue/SerializationModule.java | 10 --------
.../sample/forum/assembler/ForumAssembler.java | 1 -
.../rental/web/assembly/StorageModule.java | 1 -
.../app/templates/DomainLayer/bootstrap.tmpl | 8 ------
.../app/templates/Heroes/bootstrap.tmpl | 7 +----
.../InfrastructureLayer/bootstrap.tmpl | 9 ++-----
.../JacksonSerializationModule/bootstrap.tmpl | 10 --------
.../common/ApplicationAssemblerWriter.java | 6 +----
.../project/common/DomainLayerWriter.java | 8 ------
.../common/InfrastructureLayerWriter.java | 9 ++-----
.../common/SerializationModuleWriter.java | 10 --------
17 files changed, 18 insertions(+), 173 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/b675c1a5/core/api/src/test/java/org/apache/polygene/api/value/DocumentationSupport.java
----------------------------------------------------------------------
diff --git a/core/api/src/test/java/org/apache/polygene/api/value/DocumentationSupport.java b/core/api/src/test/java/org/apache/polygene/api/value/DocumentationSupport.java
index 67abae9..c822f68 100644
--- a/core/api/src/test/java/org/apache/polygene/api/value/DocumentationSupport.java
+++ b/core/api/src/test/java/org/apache/polygene/api/value/DocumentationSupport.java
@@ -229,17 +229,7 @@ public class DocumentationSupport
{
servicesModule -> {
servicesModule.setName( "SERVICES-Module" );
-
- Function<Application, Module> valuesModuleFinder = new Function<Application, Module>()
- {
- @Override
- public Module apply( Application app1 )
- {
- return app1.findModule( "SINGLE-Layer", "VALUES-Module" );
- }
- };
new OrgJsonValueSerializationAssembler().
- withValuesModuleFinder( valuesModuleFinder ).
assemble( servicesModule );
}
}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/b675c1a5/extensions/valueserialization-jackson/src/main/java/org/apache/polygene/valueserialization/jackson/JacksonValueSerializationAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/valueserialization-jackson/src/main/java/org/apache/polygene/valueserialization/jackson/JacksonValueSerializationAssembler.java b/extensions/valueserialization-jackson/src/main/java/org/apache/polygene/valueserialization/jackson/JacksonValueSerializationAssembler.java
index 9382581..8f6421d 100644
--- a/extensions/valueserialization-jackson/src/main/java/org/apache/polygene/valueserialization/jackson/JacksonValueSerializationAssembler.java
+++ b/extensions/valueserialization-jackson/src/main/java/org/apache/polygene/valueserialization/jackson/JacksonValueSerializationAssembler.java
@@ -19,9 +19,6 @@
*/
package org.apache.polygene.valueserialization.jackson;
-import java.util.function.Function;
-import org.apache.polygene.api.structure.Application;
-import org.apache.polygene.api.structure.Module;
import org.apache.polygene.api.value.ValueSerialization;
import org.apache.polygene.bootstrap.Assemblers;
import org.apache.polygene.bootstrap.AssemblyException;
@@ -33,30 +30,12 @@ import org.apache.polygene.bootstrap.ModuleAssembly;
public class JacksonValueSerializationAssembler
extends Assemblers.Visibility<JacksonValueSerializationAssembler>
{
- private Function<Application, Module> valuesModuleFinder;
-
- public JacksonValueSerializationAssembler withValuesModuleFinder( Function<Application, Module> valuesModuleFinder )
- {
- this.valuesModuleFinder = valuesModuleFinder;
- return this;
- }
-
@Override
public void assemble( ModuleAssembly module )
throws AssemblyException
{
- if( valuesModuleFinder == null )
- {
- module.services( JacksonValueSerializationService.class ).
- visibleIn( visibility() ).
- taggedWith( ValueSerialization.Formats.JSON );
- }
- else
- {
- module.services( JacksonValueSerializationService.class ).
- visibleIn( visibility() ).
- taggedWith( ValueSerialization.Formats.JSON ).
- setMetaInfo( valuesModuleFinder );
- }
+ module.services( JacksonValueSerializationService.class ).
+ visibleIn( visibility() ).
+ taggedWith( ValueSerialization.Formats.JSON );
}
}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/b675c1a5/extensions/valueserialization-orgjson/src/main/java/org/apache/polygene/valueserialization/orgjson/OrgJsonValueSerializationAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/valueserialization-orgjson/src/main/java/org/apache/polygene/valueserialization/orgjson/OrgJsonValueSerializationAssembler.java b/extensions/valueserialization-orgjson/src/main/java/org/apache/polygene/valueserialization/orgjson/OrgJsonValueSerializationAssembler.java
index 2773053..07e5151 100644
--- a/extensions/valueserialization-orgjson/src/main/java/org/apache/polygene/valueserialization/orgjson/OrgJsonValueSerializationAssembler.java
+++ b/extensions/valueserialization-orgjson/src/main/java/org/apache/polygene/valueserialization/orgjson/OrgJsonValueSerializationAssembler.java
@@ -19,9 +19,6 @@
*/
package org.apache.polygene.valueserialization.orgjson;
-import java.util.function.Function;
-import org.apache.polygene.api.structure.Application;
-import org.apache.polygene.api.structure.Module;
import org.apache.polygene.api.value.ValueSerialization;
import org.apache.polygene.bootstrap.Assemblers;
import org.apache.polygene.bootstrap.AssemblyException;
@@ -33,30 +30,12 @@ import org.apache.polygene.bootstrap.ModuleAssembly;
public class OrgJsonValueSerializationAssembler
extends Assemblers.Visibility<OrgJsonValueSerializationAssembler>
{
- private Function<Application, Module> valuesModuleFinder;
-
- public OrgJsonValueSerializationAssembler withValuesModuleFinder( Function<Application, Module> valuesModuleFinder )
- {
- this.valuesModuleFinder = valuesModuleFinder;
- return this;
- }
-
@Override
public void assemble( ModuleAssembly module )
throws AssemblyException
{
- if( valuesModuleFinder == null )
- {
- module.services( OrgJsonValueSerializationService.class ).
- visibleIn( visibility() ).
- taggedWith( ValueSerialization.Formats.JSON );
- }
- else
- {
- module.services( OrgJsonValueSerializationService.class ).
- visibleIn( visibility() ).
- taggedWith( ValueSerialization.Formats.JSON ).
- setMetaInfo( valuesModuleFinder );
- }
+ module.services( OrgJsonValueSerializationService.class ).
+ visibleIn( visibility() ).
+ taggedWith( ValueSerialization.Formats.JSON );
}
}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/b675c1a5/extensions/valueserialization-stax/src/main/java/org/apache/polygene/valueserialization/stax/StaxValueSerializationAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/valueserialization-stax/src/main/java/org/apache/polygene/valueserialization/stax/StaxValueSerializationAssembler.java b/extensions/valueserialization-stax/src/main/java/org/apache/polygene/valueserialization/stax/StaxValueSerializationAssembler.java
index 93e80be..e972acb 100644
--- a/extensions/valueserialization-stax/src/main/java/org/apache/polygene/valueserialization/stax/StaxValueSerializationAssembler.java
+++ b/extensions/valueserialization-stax/src/main/java/org/apache/polygene/valueserialization/stax/StaxValueSerializationAssembler.java
@@ -19,9 +19,6 @@
*/
package org.apache.polygene.valueserialization.stax;
-import java.util.function.Function;
-import org.apache.polygene.api.structure.Application;
-import org.apache.polygene.api.structure.Module;
import org.apache.polygene.api.value.ValueSerialization;
import org.apache.polygene.bootstrap.Assemblers;
import org.apache.polygene.bootstrap.AssemblyException;
@@ -33,30 +30,12 @@ import org.apache.polygene.bootstrap.ModuleAssembly;
public class StaxValueSerializationAssembler
extends Assemblers.Visibility<StaxValueSerializationAssembler>
{
- private Function<Application, Module> valuesModuleFinder;
-
- public StaxValueSerializationAssembler withValuesModuleFinder( Function<Application, Module> valuesModuleFinder )
- {
- this.valuesModuleFinder = valuesModuleFinder;
- return this;
- }
-
@Override
public void assemble( ModuleAssembly module )
throws AssemblyException
{
- if( valuesModuleFinder == null )
- {
- module.services( StaxValueSerializationService.class ).
- visibleIn( visibility() ).
- taggedWith( ValueSerialization.Formats.XML );
- }
- else
- {
- module.services( StaxValueSerializationService.class ).
- visibleIn( visibility() ).
- taggedWith( ValueSerialization.Formats.XML ).
- setMetaInfo( valuesModuleFinder );
- }
+ module.services( StaxValueSerializationService.class ).
+ visibleIn( visibility() ).
+ taggedWith( ValueSerialization.Formats.XML );
}
}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/b675c1a5/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/domain/DomainLayer.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/domain/DomainLayer.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/domain/DomainLayer.java
index c134fe1..80611dc 100644
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/domain/DomainLayer.java
+++ b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/domain/DomainLayer.java
@@ -19,9 +19,6 @@
*/
package org.apache.polygene.library.restlet.assembly.domain;
-import java.util.function.Function;
-import org.apache.polygene.api.structure.Application;
-import org.apache.polygene.api.structure.Module;
import org.apache.polygene.bootstrap.AssemblyException;
import org.apache.polygene.bootstrap.LayerAssembly;
import org.apache.polygene.bootstrap.layered.LayerAssembler;
@@ -39,9 +36,4 @@ public class DomainLayer extends LayeredLayerAssembler
createModule( layer, CrudModule.class );
return layer;
}
-
- public static Function<Application, Module> typeFinder()
- {
- return application -> application.findModule( "Domain Layer", "TypeFinder Module" );
- }
}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/b675c1a5/libraries/restlet/src/main/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/InfrastructureLayer.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/infrastructue/InfrastructureLayer.java
index 535e38a..ad3e56a 100644
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/infrastructue/InfrastructureLayer.java
+++ b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/infrastructue/InfrastructureLayer.java
@@ -20,9 +20,6 @@
package org.apache.polygene.library.restlet.assembly.infrastructue;
-import java.util.function.Function;
-import org.apache.polygene.api.structure.Application;
-import org.apache.polygene.api.structure.Module;
import org.apache.polygene.bootstrap.AssemblyException;
import org.apache.polygene.bootstrap.LayerAssembly;
import org.apache.polygene.bootstrap.ModuleAssembly;
@@ -30,26 +27,22 @@ import org.apache.polygene.bootstrap.layered.LayerAssembler;
import org.apache.polygene.bootstrap.layered.LayeredLayerAssembler;
import org.apache.polygene.library.restlet.assembly.configuration.ConfigurationLayer;
import org.apache.polygene.library.restlet.assembly.configuration.ConfigurationModule;
-import org.apache.polygene.library.restlet.assembly.domain.DomainLayer;
public class InfrastructureLayer extends LayeredLayerAssembler
implements LayerAssembler
{
public static final String NAME = "Infrastructure Layer";
private final ModuleAssembly configModule;
- private final Function<Application, Module> typeFinder;
public static InfrastructureLayer create( LayerAssembly layer )
{
- Function<Application, Module> typeFinder = DomainLayer.typeFinder();
ModuleAssembly config = layer.application().layer( ConfigurationLayer.NAME ).module( ConfigurationModule.NAME );
- return new InfrastructureLayer( config, typeFinder );
+ return new InfrastructureLayer( config );
}
- public InfrastructureLayer( ModuleAssembly configModule, Function<Application, Module> typeFinder )
+ public InfrastructureLayer( ModuleAssembly configModule )
{
this.configModule = configModule;
- this.typeFinder = typeFinder;
}
@Override
@@ -57,7 +50,7 @@ public class InfrastructureLayer extends LayeredLayerAssembler
throws AssemblyException
{
new IndexingModule( configModule ).assemble( layer, layer.module( IndexingModule.NAME ) );
- new SerializationModule( typeFinder ).assemble( layer, layer.module( SerializationModule.NAME ) );
+ new SerializationModule().assemble( layer, layer.module( SerializationModule.NAME ) );
return layer;
}
}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/b675c1a5/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/infrastructue/SerializationModule.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/infrastructue/SerializationModule.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/infrastructue/SerializationModule.java
index 1803495..736edaa 100644
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/infrastructue/SerializationModule.java
+++ b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/infrastructue/SerializationModule.java
@@ -20,10 +20,7 @@
package org.apache.polygene.library.restlet.assembly.infrastructue;
-import java.util.function.Function;
import org.apache.polygene.api.common.Visibility;
-import org.apache.polygene.api.structure.Application;
-import org.apache.polygene.api.structure.Module;
import org.apache.polygene.bootstrap.AssemblyException;
import org.apache.polygene.bootstrap.LayerAssembly;
import org.apache.polygene.bootstrap.ModuleAssembly;
@@ -34,12 +31,6 @@ public class SerializationModule
implements ModuleAssembler
{
public static final String NAME = "Serialization Module";
- private final Function<Application, Module> typeFinder;
-
- public SerializationModule( Function<Application, Module> typeFinder )
- {
- this.typeFinder = typeFinder;
- }
@Override
public ModuleAssembly assemble( LayerAssembly layer, ModuleAssembly module )
@@ -47,7 +38,6 @@ public class SerializationModule
{
new JacksonValueSerializationAssembler()
.visibleIn( Visibility.layer )
- .withValuesModuleFinder( typeFinder )
.assemble( module );
return module;
}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/b675c1a5/samples/forum/src/main/java/org/apache/polygene/sample/forum/assembler/ForumAssembler.java
----------------------------------------------------------------------
diff --git a/samples/forum/src/main/java/org/apache/polygene/sample/forum/assembler/ForumAssembler.java b/samples/forum/src/main/java/org/apache/polygene/sample/forum/assembler/ForumAssembler.java
index bf53c74..e3435b1 100644
--- a/samples/forum/src/main/java/org/apache/polygene/sample/forum/assembler/ForumAssembler.java
+++ b/samples/forum/src/main/java/org/apache/polygene/sample/forum/assembler/ForumAssembler.java
@@ -85,7 +85,6 @@ public class ForumAssembler
ModuleAssembly serialization = infrastructure.module( "Serialization" );
new OrgJsonValueSerializationAssembler().
visibleIn( Visibility.application ).
- withValuesModuleFinder( app -> app.findModule( "REST", "Values" ) ).
assemble( serialization );
ModuleAssembly entityStore = infrastructure.module( "EntityStore" );
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/b675c1a5/samples/rental/src/main/java/org/apache/polygene/sample/rental/web/assembly/StorageModule.java
----------------------------------------------------------------------
diff --git a/samples/rental/src/main/java/org/apache/polygene/sample/rental/web/assembly/StorageModule.java b/samples/rental/src/main/java/org/apache/polygene/sample/rental/web/assembly/StorageModule.java
index 422458d..7fd88ab 100644
--- a/samples/rental/src/main/java/org/apache/polygene/sample/rental/web/assembly/StorageModule.java
+++ b/samples/rental/src/main/java/org/apache/polygene/sample/rental/web/assembly/StorageModule.java
@@ -37,7 +37,6 @@ public class StorageModule
module.services( MemoryEntityStoreService.class ).visibleIn( Visibility.application );
new OrgJsonValueSerializationAssembler().
visibleIn( Visibility.application ).
- withValuesModuleFinder( app -> app.findModule( "DomainLayer", "RentalModule" ) ).
assemble( module );
}
}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/b675c1a5/tools/generator-polygene/app/templates/DomainLayer/bootstrap.tmpl
----------------------------------------------------------------------
diff --git a/tools/generator-polygene/app/templates/DomainLayer/bootstrap.tmpl b/tools/generator-polygene/app/templates/DomainLayer/bootstrap.tmpl
index 6285025..4e917f0 100644
--- a/tools/generator-polygene/app/templates/DomainLayer/bootstrap.tmpl
+++ b/tools/generator-polygene/app/templates/DomainLayer/bootstrap.tmpl
@@ -19,9 +19,6 @@
-%>
package <%= packageName %>.bootstrap.domain;
-import java.util.function.Function;
-import org.apache.polygene.api.structure.Application;
-import org.apache.polygene.api.structure.Module;
import org.apache.polygene.bootstrap.AssemblyException;
import org.apache.polygene.bootstrap.LayerAssembly;
import org.apache.polygene.bootstrap.layered.LayerAssembler;
@@ -38,9 +35,4 @@ public class DomainLayer extends LayeredLayerAssembler
createModule( layer, SecurityModule.class );
return layer;
}
-
- public static Function<Application, Module> typeFinder()
- {
- return application -> application.findModule( "Domain Layer", "Assets Module" );
- }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/b675c1a5/tools/generator-polygene/app/templates/Heroes/bootstrap.tmpl
----------------------------------------------------------------------
diff --git a/tools/generator-polygene/app/templates/Heroes/bootstrap.tmpl b/tools/generator-polygene/app/templates/Heroes/bootstrap.tmpl
index e3a9d06..f8bf77e 100644
--- a/tools/generator-polygene/app/templates/Heroes/bootstrap.tmpl
+++ b/tools/generator-polygene/app/templates/Heroes/bootstrap.tmpl
@@ -23,10 +23,6 @@ import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
-import java.util.function.Function;
-
-import org.apache.polygene.api.structure.Application;
-import org.apache.polygene.api.structure.Module;
import org.apache.polygene.bootstrap.ApplicationAssembly;
import org.apache.polygene.bootstrap.AssemblyException;
@@ -57,8 +53,7 @@ public class HeroesApplicationAssembler extends LayeredApplicationAssembler
LayerAssembly configLayer = createLayer( ConfigurationLayer.class );
ModuleAssembly configModule = assemblerOf( ConfigurationLayer.class ).configModule();
LayerAssembly domainLayer = createLayer( DomainLayer.class );
- Function<Application, Module> typeFinder = DomainLayer.typeFinder();
- LayerAssembly infraLayer = new InfrastructureLayer( configModule, typeFinder ).assemble( assembly.layer( InfrastructureLayer.NAME ) );
+ LayerAssembly infraLayer = new InfrastructureLayer( configModule ).assemble( assembly.layer( InfrastructureLayer.NAME ) );
LayerAssembly connectivityLayer = createLayer( ConnectivityLayer.class );
connectivityLayer.uses( domainLayer );
domainLayer.uses( infraLayer );
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/b675c1a5/tools/generator-polygene/app/templates/InfrastructureLayer/bootstrap.tmpl
----------------------------------------------------------------------
diff --git a/tools/generator-polygene/app/templates/InfrastructureLayer/bootstrap.tmpl b/tools/generator-polygene/app/templates/InfrastructureLayer/bootstrap.tmpl
index a1206a9..2b86a4d 100644
--- a/tools/generator-polygene/app/templates/InfrastructureLayer/bootstrap.tmpl
+++ b/tools/generator-polygene/app/templates/InfrastructureLayer/bootstrap.tmpl
@@ -19,9 +19,6 @@
-%>
package <%= packageName %>.bootstrap.infrastructure;
-import java.util.function.Function;
-import org.apache.polygene.api.structure.Application;
-import org.apache.polygene.api.structure.Module;
import org.apache.polygene.bootstrap.AssemblyException;
import org.apache.polygene.bootstrap.LayerAssembly;
import org.apache.polygene.bootstrap.ModuleAssembly;
@@ -33,12 +30,10 @@ public class InfrastructureLayer extends LayeredLayerAssembler
{
public static final String NAME = "Infrastructure Layer";
private final ModuleAssembly configModule;
- private final Function<Application, Module> typeFinder;
- public InfrastructureLayer( ModuleAssembly configModule, Function<Application, Module> typeFinder )
+ public InfrastructureLayer( ModuleAssembly configModule )
{
this.configModule = configModule;
- this.typeFinder = typeFinder;
}
@Override
@@ -49,7 +44,7 @@ public class InfrastructureLayer extends LayeredLayerAssembler
new <%= polygene.entitystore %>StorageModule( configModule ).assemble( layer, layer.module( <%= polygene.entitystore %>StorageModule.NAME ) );
new <%= polygene.indexing %>IndexingModule( configModule ).assemble( layer, layer.module( <%= polygene.indexing %>IndexingModule.NAME ) );
- new <%= polygene.serialization %>SerializationModule( typeFinder ).assemble( layer, layer.module( <%= polygene.serialization %>SerializationModule.NAME ) );
+ new <%= polygene.serialization %>SerializationModule().assemble( layer, layer.module( <%= polygene.serialization %>SerializationModule.NAME ) );
return layer;
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/b675c1a5/tools/generator-polygene/app/templates/JacksonSerializationModule/bootstrap.tmpl
----------------------------------------------------------------------
diff --git a/tools/generator-polygene/app/templates/JacksonSerializationModule/bootstrap.tmpl b/tools/generator-polygene/app/templates/JacksonSerializationModule/bootstrap.tmpl
index dd1d17c..afc0439 100644
--- a/tools/generator-polygene/app/templates/JacksonSerializationModule/bootstrap.tmpl
+++ b/tools/generator-polygene/app/templates/JacksonSerializationModule/bootstrap.tmpl
@@ -19,10 +19,7 @@
-%>
package <%= packageName %>.bootstrap.infrastructure;
-import java.util.function.Function;
import org.apache.polygene.api.common.Visibility;
-import org.apache.polygene.api.structure.Application;
-import org.apache.polygene.api.structure.Module;
import org.apache.polygene.bootstrap.AssemblyException;
import org.apache.polygene.bootstrap.LayerAssembly;
import org.apache.polygene.bootstrap.ModuleAssembly;
@@ -33,12 +30,6 @@ public class JacksonSerializationModule
implements ModuleAssembler
{
public static final String NAME = "Jackson Serialization Module";
- private final Function<Application, Module> typeFinder;
-
- public JacksonSerializationModule( Function<Application, Module> typeFinder )
- {
- this.typeFinder = typeFinder;
- }
@Override
public ModuleAssembly assemble( LayerAssembly layer, ModuleAssembly module )
@@ -46,7 +37,6 @@ public class JacksonSerializationModule
{
new JacksonValueSerializationAssembler()
.visibleIn( Visibility.application )
- .withValuesModuleFinder( typeFinder )
.assemble( module );
return module;
}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/b675c1a5/tools/shell/src/main/java/org/apache/polygene/tools/shell/create/project/common/ApplicationAssemblerWriter.java
----------------------------------------------------------------------
diff --git a/tools/shell/src/main/java/org/apache/polygene/tools/shell/create/project/common/ApplicationAssemblerWriter.java b/tools/shell/src/main/java/org/apache/polygene/tools/shell/create/project/common/ApplicationAssemblerWriter.java
index fe45232..d5ba78e 100644
--- a/tools/shell/src/main/java/org/apache/polygene/tools/shell/create/project/common/ApplicationAssemblerWriter.java
+++ b/tools/shell/src/main/java/org/apache/polygene/tools/shell/create/project/common/ApplicationAssemblerWriter.java
@@ -43,10 +43,7 @@ public class ApplicationAssemblerWriter
pw.println( "import java.nio.file.Files;" );
pw.println( "import java.nio.file.Path;" );
pw.println( "import java.nio.file.Paths;" );
- pw.println( "import java.util.function.Function;" );
pw.println();
- pw.println( "import org.apache.polygene.api.structure.Application;" );
- pw.println( "import org.apache.polygene.api.structure.Module;\n" );
pw.println( "import org.apache.polygene.bootstrap.ApplicationAssembly;" );
pw.println( "import org.apache.polygene.bootstrap.AssemblyException;" );
pw.println( "import org.apache.polygene.bootstrap.LayerAssembly;" );
@@ -82,8 +79,7 @@ public class ApplicationAssemblerWriter
pw.println( " LayerAssembly configLayer = createLayer( ConfigurationLayer.class );" );
pw.println( " ModuleAssembly configModule = assemblerOf( ConfigurationLayer.class ).configModule();" );
pw.println( " LayerAssembly domainLayer = createLayer( DomainLayer.class );" );
- pw.println( " Function<Application, Module> typeFinder = DomainLayer.typeFinder();" );
- pw.println( " LayerAssembly infraLayer = new InfrastructureLayer( configModule, typeFinder ).assemble( assembly.layer( InfrastructureLayer.NAME ) );" );
+ pw.println( " LayerAssembly infraLayer = new InfrastructureLayer( configModule ).assemble( assembly.layer( InfrastructureLayer.NAME ) );" );
pw.println( " LayerAssembly connectivityLayer = createLayer( ConnectivityLayer.class );" );
pw.println( " connectivityLayer.uses( domainLayer );" );
pw.println( " domainLayer.uses( infraLayer );" );
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/b675c1a5/tools/shell/src/main/java/org/apache/polygene/tools/shell/create/project/common/DomainLayerWriter.java
----------------------------------------------------------------------
diff --git a/tools/shell/src/main/java/org/apache/polygene/tools/shell/create/project/common/DomainLayerWriter.java b/tools/shell/src/main/java/org/apache/polygene/tools/shell/create/project/common/DomainLayerWriter.java
index c8ca11c..dd8a684 100644
--- a/tools/shell/src/main/java/org/apache/polygene/tools/shell/create/project/common/DomainLayerWriter.java
+++ b/tools/shell/src/main/java/org/apache/polygene/tools/shell/create/project/common/DomainLayerWriter.java
@@ -40,9 +40,6 @@ public class DomainLayerWriter
pw.println( ".bootstrap.domain;" );
pw.println();
pw.println(
- "import java.util.function.Function;\n" +
- "import org.apache.polygene.api.structure.Application;\n" +
- "import org.apache.polygene.api.structure.Module;\n" +
"import org.apache.polygene.bootstrap.AssemblyException;\n" +
"import org.apache.polygene.bootstrap.LayerAssembly;\n" +
"import org.apache.polygene.bootstrap.layered.LayerAssembler;\n" +
@@ -60,11 +57,6 @@ public class DomainLayerWriter
" createModule( layer, SecurityModule.class ); // This is a simple sample that you typically remove.\n" +
" return layer;\n" +
" }\n" +
- "\n" +
- " public static Function<Application, Module> typeFinder()\n" +
- " {\n" +
- " return application -> application.findModule( \"Domain Layer\", \"Assets Module\" );\n" +
- " }\n" +
"}\n"
);
}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/b675c1a5/tools/shell/src/main/java/org/apache/polygene/tools/shell/create/project/common/InfrastructureLayerWriter.java
----------------------------------------------------------------------
diff --git a/tools/shell/src/main/java/org/apache/polygene/tools/shell/create/project/common/InfrastructureLayerWriter.java b/tools/shell/src/main/java/org/apache/polygene/tools/shell/create/project/common/InfrastructureLayerWriter.java
index 18e0b50..464e938 100644
--- a/tools/shell/src/main/java/org/apache/polygene/tools/shell/create/project/common/InfrastructureLayerWriter.java
+++ b/tools/shell/src/main/java/org/apache/polygene/tools/shell/create/project/common/InfrastructureLayerWriter.java
@@ -40,9 +40,6 @@ public class InfrastructureLayerWriter
pw.println( ".bootstrap.infrastructure;" );
pw.println();
pw.println(
- "import java.util.function.Function;\n" +
- "import org.apache.polygene.api.structure.Application;\n" +
- "import org.apache.polygene.api.structure.Module;\n" +
"import org.apache.polygene.bootstrap.AssemblyException;\n" +
"import org.apache.polygene.bootstrap.LayerAssembly;\n" +
"import org.apache.polygene.bootstrap.ModuleAssembly;\n" +
@@ -54,12 +51,10 @@ public class InfrastructureLayerWriter
"{\n" +
" public static final String NAME = \"Infrastructure Layer\";\n" +
" private final ModuleAssembly configModule;\n" +
- " private final Function<Application, Module> typeFinder;\n" +
"\n" +
- " public InfrastructureLayer( ModuleAssembly configModule, Function<Application, Module> typeFinder )\n" +
+ " public InfrastructureLayer( ModuleAssembly configModule )\n" +
" {\n" +
" this.configModule = configModule;\n" +
- " this.typeFinder = typeFinder;\n" +
" }\n" +
"\n" +
" @Override\n" +
@@ -70,7 +65,7 @@ public class InfrastructureLayerWriter
"\n" +
" new StorageModule( configModule ).assemble( layer, layer.module( StorageModule.NAME ) );\n" +
" new IndexingModule( configModule ).assemble( layer, layer.module( IndexingModule.NAME ) );\n" +
- " new SerializationModule( typeFinder ).assemble( layer, layer.module( SerializationModule.NAME ) );\n" +
+ " new SerializationModule().assemble( layer, layer.module( SerializationModule.NAME ) );\n" +
"\n" +
" return layer;\n" +
" }\n" +
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/b675c1a5/tools/shell/src/main/java/org/apache/polygene/tools/shell/create/project/common/SerializationModuleWriter.java
----------------------------------------------------------------------
diff --git a/tools/shell/src/main/java/org/apache/polygene/tools/shell/create/project/common/SerializationModuleWriter.java b/tools/shell/src/main/java/org/apache/polygene/tools/shell/create/project/common/SerializationModuleWriter.java
index 30b1d8a..b604916 100644
--- a/tools/shell/src/main/java/org/apache/polygene/tools/shell/create/project/common/SerializationModuleWriter.java
+++ b/tools/shell/src/main/java/org/apache/polygene/tools/shell/create/project/common/SerializationModuleWriter.java
@@ -40,10 +40,7 @@ public class SerializationModuleWriter
pw.println( ".bootstrap.infrastructure;" );
pw.println();
pw.println(
- "import java.util.function.Function;\n" +
"import org.apache.polygene.api.common.Visibility;\n" +
- "import org.apache.polygene.api.structure.Application;\n" +
- "import org.apache.polygene.api.structure.Module;\n" +
"import org.apache.polygene.bootstrap.AssemblyException;\n" +
"import org.apache.polygene.bootstrap.LayerAssembly;\n" +
"import org.apache.polygene.bootstrap.ModuleAssembly;\n" +
@@ -54,12 +51,6 @@ public class SerializationModuleWriter
" implements ModuleAssembler\n" +
"{\n" +
" public static final String NAME = \"Serialization Module\";\n" +
- " private final Function<Application, Module> typeFinder;\n" +
- "\n" +
- " public SerializationModule( Function<Application, Module> typeFinder )\n" +
- " {\n" +
- " this.typeFinder = typeFinder;\n" +
- " }\n" +
"\n" +
" @Override\n" +
" public ModuleAssembly assemble( LayerAssembly layer, ModuleAssembly module )\n" +
@@ -67,7 +58,6 @@ public class SerializationModuleWriter
" {\n" +
" new JacksonValueSerializationAssembler()\n" +
" .visibleIn( Visibility.application )\n" +
- " .withValuesModuleFinder( typeFinder )\n" +
" .assemble( module );\n" +
" return module;\n" +
" }\n" +
[3/3] polygene-java git commit: Remove various redundant object creations, unused imports etc…
Posted by pa...@apache.org.
Remove various redundant object creations, unused imports etc\u2026
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/9d16d555
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/9d16d555
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/9d16d555
Branch: refs/heads/develop
Commit: 9d16d55531f41907a2c95ae4c8e48cf2374e5eee
Parents: 132a0b6
Author: Paul Merlin <pa...@apache.org>
Authored: Sun Jan 22 17:43:45 2017 +0100
Committer: Paul Merlin <pa...@apache.org>
Committed: Sun Jan 22 17:51:27 2017 +0100
----------------------------------------------------------------------
.../polygene/api/constraint/ConstraintViolationException.java | 2 +-
.../polygene/api/property/InvalidPropertyTypeException.java | 7 +++----
.../java/org/apache/polygene/api/query/grammar/OrderBy.java | 6 +-----
.../org/apache/polygene/api/composite/PropertyMapperTest.java | 4 +---
.../polygene/runtime/injection/UnitOfWorkInjectionTest.java | 2 +-
.../polygene/runtime/sideeffects/SpecificSideEffectTest.java | 3 +--
.../apache/polygene/test/entity/AbstractEntityStoreTest.java | 2 +-
.../polygene/test/indexing/AbstractEntityFinderTest.java | 6 +++---
.../polygene/cache/ehcache/assembly/EhCacheAssembler.java | 2 +-
.../org/apache/polygene/cache/memcache/MemcacheAssembler.java | 2 +-
.../elasticsearch/assembly/ESClusterIndexQueryAssembler.java | 2 +-
.../assembly/ESFilesystemIndexQueryAssembler.java | 2 +-
.../index/sql/assembly/AbstractSQLIndexQueryAssembler.java | 2 +-
.../index/sql/postgresql/PostgreSQLEntityFinderTest.java | 4 +---
.../apache/polygene/library/alarm/AlarmSystemAssembler.java | 2 +-
.../library/fileconfig/FileConfigurationAssembler.java | 2 +-
.../org/apache/polygene/library/http/AbstractJettyMixin.java | 4 +---
.../apache/polygene/library/http/JettyServiceAssembler.java | 2 +-
.../library/logging/trace/TraceOnConsoleSideEffect.java | 7 ++-----
.../library/shiro/assembly/PasswordDomainAssembler.java | 2 +-
.../library/shiro/assembly/StandaloneShiroAssembler.java | 2 +-
.../polygene/library/sql/liquibase/LiquibaseAssembler.java | 2 +-
.../assembly/AbstractPooledDataSourceServiceAssembler.java | 2 +-
.../shell/create/project/common/SecurityRepositoryWriter.java | 2 --
24 files changed, 28 insertions(+), 45 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/9d16d555/core/api/src/main/java/org/apache/polygene/api/constraint/ConstraintViolationException.java
----------------------------------------------------------------------
diff --git a/core/api/src/main/java/org/apache/polygene/api/constraint/ConstraintViolationException.java b/core/api/src/main/java/org/apache/polygene/api/constraint/ConstraintViolationException.java
index cc1b1b0..8f11602 100644
--- a/core/api/src/main/java/org/apache/polygene/api/constraint/ConstraintViolationException.java
+++ b/core/api/src/main/java/org/apache/polygene/api/constraint/ConstraintViolationException.java
@@ -190,7 +190,7 @@ public class ConstraintViolationException
String name = violation.name();
Object value = violation.value();
String classes;
- if( instanceTypes.stream().count() == 1 )
+ if( instanceTypes.size() == 1 )
{
Type type = instanceTypes.stream().findFirst().get();
classes = Classes.RAW_CLASS.apply( type ).getSimpleName();
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/9d16d555/core/api/src/main/java/org/apache/polygene/api/property/InvalidPropertyTypeException.java
----------------------------------------------------------------------
diff --git a/core/api/src/main/java/org/apache/polygene/api/property/InvalidPropertyTypeException.java b/core/api/src/main/java/org/apache/polygene/api/property/InvalidPropertyTypeException.java
index 56e78d0..1addfae 100644
--- a/core/api/src/main/java/org/apache/polygene/api/property/InvalidPropertyTypeException.java
+++ b/core/api/src/main/java/org/apache/polygene/api/property/InvalidPropertyTypeException.java
@@ -29,13 +29,12 @@ public class InvalidPropertyTypeException extends ConstructionException
{
public InvalidPropertyTypeException( AccessibleObject accessor )
{
- super( createMessage(accessor) );
+ super( createMessage( accessor ) );
}
private static String createMessage( AccessibleObject accessor )
{
- StringBuilder builder = new StringBuilder();
- builder.append( "Not allowed to subclass " + Property.class.getName() + ". Property accessor " + accessor + " is returning a Property subclass." );
- return builder.toString();
+ return "Not allowed to subclass " + Property.class.getName() + ". Property accessor " +
+ accessor + " is returning a Property subclass.";
}
}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/9d16d555/core/api/src/main/java/org/apache/polygene/api/query/grammar/OrderBy.java
----------------------------------------------------------------------
diff --git a/core/api/src/main/java/org/apache/polygene/api/query/grammar/OrderBy.java b/core/api/src/main/java/org/apache/polygene/api/query/grammar/OrderBy.java
index 7c1e4e1..7e9e39a 100644
--- a/core/api/src/main/java/org/apache/polygene/api/query/grammar/OrderBy.java
+++ b/core/api/src/main/java/org/apache/polygene/api/query/grammar/OrderBy.java
@@ -84,10 +84,6 @@ public class OrderBy
@Override
public String toString()
{
- return new StringBuilder()
- .append( propertyReference )
- .append( " " )
- .append( order )
- .toString();
+ return String.valueOf( propertyReference ) + " " + order;
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/9d16d555/core/api/src/test/java/org/apache/polygene/api/composite/PropertyMapperTest.java
----------------------------------------------------------------------
diff --git a/core/api/src/test/java/org/apache/polygene/api/composite/PropertyMapperTest.java b/core/api/src/test/java/org/apache/polygene/api/composite/PropertyMapperTest.java
index 0d87560..d285102 100644
--- a/core/api/src/test/java/org/apache/polygene/api/composite/PropertyMapperTest.java
+++ b/core/api/src/test/java/org/apache/polygene/api/composite/PropertyMapperTest.java
@@ -46,9 +46,7 @@ public class PropertyMapperTest
}
catch( NoSuchMethodException e )
{
- InternalError error = new InternalError();
- error.initCause( e );
- throw error;
+ throw new InternalError( e );
}
}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/9d16d555/core/runtime/src/test/java/org/apache/polygene/runtime/injection/UnitOfWorkInjectionTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/polygene/runtime/injection/UnitOfWorkInjectionTest.java b/core/runtime/src/test/java/org/apache/polygene/runtime/injection/UnitOfWorkInjectionTest.java
index 56af7ee..8a38d17 100644
--- a/core/runtime/src/test/java/org/apache/polygene/runtime/injection/UnitOfWorkInjectionTest.java
+++ b/core/runtime/src/test/java/org/apache/polygene/runtime/injection/UnitOfWorkInjectionTest.java
@@ -61,7 +61,7 @@ public class UnitOfWorkInjectionTest
UnitOfWork uow2 = unitOfWorkFactory.newUnitOfWork( usecase );
trial = uow.get( trial );
trial.doSomething();
- assertEquals( "123", ( (EntityComposite) trial ).identity().get() );
+ assertEquals( "123", ( (EntityComposite) trial ).identity().get().toString() );
assertEquals( "usecase1", trial.usecaseName() );
uow2.discard();
}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/9d16d555/core/runtime/src/test/java/org/apache/polygene/runtime/sideeffects/SpecificSideEffectTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/polygene/runtime/sideeffects/SpecificSideEffectTest.java b/core/runtime/src/test/java/org/apache/polygene/runtime/sideeffects/SpecificSideEffectTest.java
index 84df3e4..0c7daae 100644
--- a/core/runtime/src/test/java/org/apache/polygene/runtime/sideeffects/SpecificSideEffectTest.java
+++ b/core/runtime/src/test/java/org/apache/polygene/runtime/sideeffects/SpecificSideEffectTest.java
@@ -20,7 +20,6 @@
package org.apache.polygene.runtime.sideeffects;
-import org.junit.Test;
import org.apache.polygene.api.common.UseDefaults;
import org.apache.polygene.api.composite.TransientComposite;
import org.apache.polygene.api.injection.scope.This;
@@ -31,9 +30,9 @@ import org.apache.polygene.api.sideeffect.SideEffects;
import org.apache.polygene.bootstrap.AssemblyException;
import org.apache.polygene.bootstrap.ModuleAssembly;
import org.apache.polygene.test.AbstractPolygeneTest;
+import org.junit.Test;
import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.not;
import static org.junit.Assert.assertThat;
/**
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/9d16d555/core/testsupport/src/main/java/org/apache/polygene/test/entity/AbstractEntityStoreTest.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/polygene/test/entity/AbstractEntityStoreTest.java b/core/testsupport/src/main/java/org/apache/polygene/test/entity/AbstractEntityStoreTest.java
index 91add6b..a025d26 100644
--- a/core/testsupport/src/main/java/org/apache/polygene/test/entity/AbstractEntityStoreTest.java
+++ b/core/testsupport/src/main/java/org/apache/polygene/test/entity/AbstractEntityStoreTest.java
@@ -114,7 +114,7 @@ public abstract class AbstractEntityStoreTest
instance.bigDecimalValue().set( new BigDecimal( "42" ) );
instance.instantValue().set( refDate.toInstant() );
instance.dateTimeValue().set( refDate );
- instance.localDateTimeValue().set( LocalDateTime.of( 2020, 3, 4, 13, 23, 00 ) );
+ instance.localDateTimeValue().set( LocalDateTime.of( 2020, 3, 4, 13, 23, 0 ) );
instance.localDateValue().set( LocalDate.of( 2020, 3, 4 ) );
instance.localTimeValue().set( LocalTime.of( 19, 20, 21 ) );
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/9d16d555/core/testsupport/src/main/java/org/apache/polygene/test/indexing/AbstractEntityFinderTest.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/AbstractEntityFinderTest.java b/core/testsupport/src/main/java/org/apache/polygene/test/indexing/AbstractEntityFinderTest.java
index f605beb..630829e 100644
--- a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/AbstractEntityFinderTest.java
+++ b/core/testsupport/src/main/java/org/apache/polygene/test/indexing/AbstractEntityFinderTest.java
@@ -357,7 +357,7 @@ public abstract class AbstractEntityFinderTest
Iterable<EntityReference> entities = entityFinder.findEntities(
Nameable.class,
ALL,
- Arrays.asList(orderBy( nameable.name() )),
+ Collections.singletonList( orderBy( nameable.name() ) ),
NO_FIRST_RESULT, NO_MAX_RESULTS,
NO_VARIABLES ).collect( toList() );
assertNames( false, entities, allNames );
@@ -380,7 +380,7 @@ public abstract class AbstractEntityFinderTest
Iterable<EntityReference> entities = entityFinder.findEntities(
Nameable.class,
gt( nameable.name(), "B" ),
- Arrays.asList( orderBy( nameable.name() ) ),
+ Collections.singletonList( orderBy( nameable.name() ) ),
NO_FIRST_RESULT, NO_MAX_RESULTS,
NO_VARIABLES ).collect( toList() );
assertNames( false, entities, largerThanB.toArray( new String[ largerThanB.size() ] ) );
@@ -394,7 +394,7 @@ public abstract class AbstractEntityFinderTest
Iterable<EntityReference> entities = entityFinder.findEntities(
Person.class,
gt( person.yearOfBirth(), 1973 ),
- Arrays.asList( orderBy( person.name(), OrderBy.Order.DESCENDING ) ),
+ Collections.singletonList( orderBy( person.name(), OrderBy.Order.DESCENDING ) ),
NO_FIRST_RESULT, NO_MAX_RESULTS,
NO_VARIABLES ).collect( toList() );
assertNames( false, entities, JOE, ANN );
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/9d16d555/extensions/cache-ehcache/src/main/java/org/apache/polygene/cache/ehcache/assembly/EhCacheAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/cache-ehcache/src/main/java/org/apache/polygene/cache/ehcache/assembly/EhCacheAssembler.java b/extensions/cache-ehcache/src/main/java/org/apache/polygene/cache/ehcache/assembly/EhCacheAssembler.java
index baaa60f..077a24f 100644
--- a/extensions/cache-ehcache/src/main/java/org/apache/polygene/cache/ehcache/assembly/EhCacheAssembler.java
+++ b/extensions/cache-ehcache/src/main/java/org/apache/polygene/cache/ehcache/assembly/EhCacheAssembler.java
@@ -36,7 +36,7 @@ public class EhCacheAssembler
ServiceDeclaration service = module.services( EhCachePoolService.class ).visibleIn( visibility() );
if( hasIdentity() )
{
- service.identifiedBy( identity().toString() );
+ service.identifiedBy( identity() );
}
if( hasConfig() )
{
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/9d16d555/extensions/cache-memcache/src/main/java/org/apache/polygene/cache/memcache/MemcacheAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/cache-memcache/src/main/java/org/apache/polygene/cache/memcache/MemcacheAssembler.java b/extensions/cache-memcache/src/main/java/org/apache/polygene/cache/memcache/MemcacheAssembler.java
index af1fd4a..bbc58cb 100644
--- a/extensions/cache-memcache/src/main/java/org/apache/polygene/cache/memcache/MemcacheAssembler.java
+++ b/extensions/cache-memcache/src/main/java/org/apache/polygene/cache/memcache/MemcacheAssembler.java
@@ -37,7 +37,7 @@ public class MemcacheAssembler
ServiceDeclaration service = module.services( MemcachePoolService.class ).visibleIn( visibility() );
if( hasIdentity() )
{
- service.identifiedBy( identity().toString() );
+ service.identifiedBy( identity() );
}
if( hasConfig() )
{
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/9d16d555/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/assembly/ESClusterIndexQueryAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/assembly/ESClusterIndexQueryAssembler.java b/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/assembly/ESClusterIndexQueryAssembler.java
index f64d01d..018d199 100644
--- a/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/assembly/ESClusterIndexQueryAssembler.java
+++ b/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/assembly/ESClusterIndexQueryAssembler.java
@@ -35,7 +35,7 @@ public class ESClusterIndexQueryAssembler
throws AssemblyException
{
module.services( ESClusterIndexQueryService.class ).
- identifiedBy( identity().toString() ).
+ identifiedBy( identity() ).
visibleIn( visibility() ).
instantiateOnStartup();
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/9d16d555/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/assembly/ESFilesystemIndexQueryAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/assembly/ESFilesystemIndexQueryAssembler.java b/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/assembly/ESFilesystemIndexQueryAssembler.java
index 5c0ab39..acc5f4f 100644
--- a/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/assembly/ESFilesystemIndexQueryAssembler.java
+++ b/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/assembly/ESFilesystemIndexQueryAssembler.java
@@ -35,7 +35,7 @@ public class ESFilesystemIndexQueryAssembler
throws AssemblyException
{
module.services( ESFilesystemIndexQueryService.class ).
- identifiedBy( identity().toString() ).
+ identifiedBy( identity() ).
visibleIn( visibility() ).
instantiateOnStartup();
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/9d16d555/extensions/indexing-sql/src/main/java/org/apache/polygene/index/sql/assembly/AbstractSQLIndexQueryAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-sql/src/main/java/org/apache/polygene/index/sql/assembly/AbstractSQLIndexQueryAssembler.java b/extensions/indexing-sql/src/main/java/org/apache/polygene/index/sql/assembly/AbstractSQLIndexQueryAssembler.java
index c513a74..ca02bcb 100644
--- a/extensions/indexing-sql/src/main/java/org/apache/polygene/index/sql/assembly/AbstractSQLIndexQueryAssembler.java
+++ b/extensions/indexing-sql/src/main/java/org/apache/polygene/index/sql/assembly/AbstractSQLIndexQueryAssembler.java
@@ -72,7 +72,7 @@ public abstract class AbstractSQLIndexQueryAssembler<AssemblerType>
throw new AssemblyException( "SQL Vendor could not be determined." );
}
module.services( getIndexQueryServiceType() )
- .identifiedBy( identity().toString() )
+ .identifiedBy( identity() )
.setMetaInfo( sqlVendor )
.visibleIn( visibility() )
.instantiateOnStartup();
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/9d16d555/extensions/indexing-sql/src/test/java/org/apache/polygene/index/sql/postgresql/PostgreSQLEntityFinderTest.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-sql/src/test/java/org/apache/polygene/index/sql/postgresql/PostgreSQLEntityFinderTest.java b/extensions/indexing-sql/src/test/java/org/apache/polygene/index/sql/postgresql/PostgreSQLEntityFinderTest.java
index 90a4db9..8a0c3f2 100644
--- a/extensions/indexing-sql/src/test/java/org/apache/polygene/index/sql/postgresql/PostgreSQLEntityFinderTest.java
+++ b/extensions/indexing-sql/src/test/java/org/apache/polygene/index/sql/postgresql/PostgreSQLEntityFinderTest.java
@@ -19,14 +19,12 @@
*/
package org.apache.polygene.index.sql.postgresql;
-import org.apache.polygene.test.internal.DockerRule;
import org.apache.polygene.bootstrap.AssemblyException;
import org.apache.polygene.bootstrap.ModuleAssembly;
import org.apache.polygene.test.indexing.AbstractEntityFinderTest;
+import org.apache.polygene.test.internal.DockerRule;
import org.junit.ClassRule;
-import static org.apache.polygene.test.util.Assume.assumeConnectivity;
-
public class PostgreSQLEntityFinderTest
extends AbstractEntityFinderTest
{
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/9d16d555/libraries/alarm/src/main/java/org/apache/polygene/library/alarm/AlarmSystemAssembler.java
----------------------------------------------------------------------
diff --git a/libraries/alarm/src/main/java/org/apache/polygene/library/alarm/AlarmSystemAssembler.java b/libraries/alarm/src/main/java/org/apache/polygene/library/alarm/AlarmSystemAssembler.java
index d741ac7..8386b52 100644
--- a/libraries/alarm/src/main/java/org/apache/polygene/library/alarm/AlarmSystemAssembler.java
+++ b/libraries/alarm/src/main/java/org/apache/polygene/library/alarm/AlarmSystemAssembler.java
@@ -34,7 +34,7 @@ public class AlarmSystemAssembler
ServiceDeclaration alarmSystem = module.services( AlarmSystemService.class ).visibleIn( visibility() );
if( hasIdentity() )
{
- alarmSystem.identifiedBy( identity().toString() );
+ alarmSystem.identifiedBy( identity() );
}
module.services( SimpleAlarmModelService.class ).setMetaInfo( new AlarmModelDescriptor( "Simple", false ) );
module.services( StandardAlarmModelService.class ).setMetaInfo( new AlarmModelDescriptor( "Standard", true ) );
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/9d16d555/libraries/fileconfig/src/main/java/org/apache/polygene/library/fileconfig/FileConfigurationAssembler.java
----------------------------------------------------------------------
diff --git a/libraries/fileconfig/src/main/java/org/apache/polygene/library/fileconfig/FileConfigurationAssembler.java b/libraries/fileconfig/src/main/java/org/apache/polygene/library/fileconfig/FileConfigurationAssembler.java
index 9c9e6c8..36631c6 100644
--- a/libraries/fileconfig/src/main/java/org/apache/polygene/library/fileconfig/FileConfigurationAssembler.java
+++ b/libraries/fileconfig/src/main/java/org/apache/polygene/library/fileconfig/FileConfigurationAssembler.java
@@ -45,7 +45,7 @@ public class FileConfigurationAssembler
ServiceDeclaration service = module.services( FileConfigurationService.class ).visibleIn( visibility() );
if( hasIdentity() )
{
- service.identifiedBy( identity().toString() );
+ service.identifiedBy( identity() );
}
if( override != null )
{
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/9d16d555/libraries/http/src/main/java/org/apache/polygene/library/http/AbstractJettyMixin.java
----------------------------------------------------------------------
diff --git a/libraries/http/src/main/java/org/apache/polygene/library/http/AbstractJettyMixin.java b/libraries/http/src/main/java/org/apache/polygene/library/http/AbstractJettyMixin.java
index 182b201..adc3e97 100644
--- a/libraries/http/src/main/java/org/apache/polygene/library/http/AbstractJettyMixin.java
+++ b/libraries/http/src/main/java/org/apache/polygene/library/http/AbstractJettyMixin.java
@@ -157,9 +157,7 @@ public abstract class AbstractJettyMixin
}
catch( UnknownHostException e )
{
- InternalError error = new InternalError( "UnknownHost for local interface." );
- error.initCause( e );
- throw error;
+ throw new InternalError( "UnknownHost for local interface.", e );
}
}
}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/9d16d555/libraries/http/src/main/java/org/apache/polygene/library/http/JettyServiceAssembler.java
----------------------------------------------------------------------
diff --git a/libraries/http/src/main/java/org/apache/polygene/library/http/JettyServiceAssembler.java b/libraries/http/src/main/java/org/apache/polygene/library/http/JettyServiceAssembler.java
index 7d60803..8a7b765 100644
--- a/libraries/http/src/main/java/org/apache/polygene/library/http/JettyServiceAssembler.java
+++ b/libraries/http/src/main/java/org/apache/polygene/library/http/JettyServiceAssembler.java
@@ -61,7 +61,7 @@ public class JettyServiceAssembler
instantiateOnStartup();
if( hasIdentity() )
{
- service.identifiedBy( identity().toString() );
+ service.identifiedBy( identity() );
}
if( hasConfig() )
{
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/9d16d555/libraries/logging/src/main/java/org/apache/polygene/library/logging/trace/TraceOnConsoleSideEffect.java
----------------------------------------------------------------------
diff --git a/libraries/logging/src/main/java/org/apache/polygene/library/logging/trace/TraceOnConsoleSideEffect.java b/libraries/logging/src/main/java/org/apache/polygene/library/logging/trace/TraceOnConsoleSideEffect.java
index 420d09f..52f500d 100644
--- a/libraries/logging/src/main/java/org/apache/polygene/library/logging/trace/TraceOnConsoleSideEffect.java
+++ b/libraries/logging/src/main/java/org/apache/polygene/library/logging/trace/TraceOnConsoleSideEffect.java
@@ -51,11 +51,8 @@ public abstract class TraceOnConsoleSideEffect extends SideEffectOf<TraceService
@Override
public void traceException( Class compositeType, Composite object, Method method, Object[] args, Throwable t, Instant entryTime, Duration duration )
{
- StringBuffer buf = new StringBuffer();
- buf.append( "Exception: " );
- buf.append( duration );
- buf.append( " : " );
- OUT.println( buf.toString() );
+ String trace = "Exception: " + duration + " : ";
+ OUT.println( trace );
t.printStackTrace( OUT );
}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/9d16d555/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/assembly/PasswordDomainAssembler.java
----------------------------------------------------------------------
diff --git a/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/assembly/PasswordDomainAssembler.java b/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/assembly/PasswordDomainAssembler.java
index 1060304..67be79e 100644
--- a/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/assembly/PasswordDomainAssembler.java
+++ b/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/assembly/PasswordDomainAssembler.java
@@ -40,7 +40,7 @@ public class PasswordDomainAssembler
visibleIn( visibility() );
if( hasIdentity() )
{
- service.identifiedBy( identity().toString() );
+ service.identifiedBy( identity() );
}
if( hasConfig() )
{
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/9d16d555/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/assembly/StandaloneShiroAssembler.java
----------------------------------------------------------------------
diff --git a/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/assembly/StandaloneShiroAssembler.java b/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/assembly/StandaloneShiroAssembler.java
index 0dcdae7..2f35ea0 100644
--- a/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/assembly/StandaloneShiroAssembler.java
+++ b/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/assembly/StandaloneShiroAssembler.java
@@ -38,7 +38,7 @@ public class StandaloneShiroAssembler
instantiateOnStartup();
if( hasIdentity() )
{
- service.identifiedBy( identity().toString() );
+ service.identifiedBy( identity() );
}
if( hasConfig() )
{
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/9d16d555/libraries/sql-liquibase/src/main/java/org/apache/polygene/library/sql/liquibase/LiquibaseAssembler.java
----------------------------------------------------------------------
diff --git a/libraries/sql-liquibase/src/main/java/org/apache/polygene/library/sql/liquibase/LiquibaseAssembler.java b/libraries/sql-liquibase/src/main/java/org/apache/polygene/library/sql/liquibase/LiquibaseAssembler.java
index 8856bf6..15124f8 100644
--- a/libraries/sql-liquibase/src/main/java/org/apache/polygene/library/sql/liquibase/LiquibaseAssembler.java
+++ b/libraries/sql-liquibase/src/main/java/org/apache/polygene/library/sql/liquibase/LiquibaseAssembler.java
@@ -36,7 +36,7 @@ public class LiquibaseAssembler
instantiateOnStartup();
if( hasIdentity() )
{
- service.identifiedBy( identity().toString() );
+ service.identifiedBy( identity() );
}
if( hasConfig() )
{
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/9d16d555/libraries/sql/src/main/java/org/apache/polygene/library/sql/assembly/AbstractPooledDataSourceServiceAssembler.java
----------------------------------------------------------------------
diff --git a/libraries/sql/src/main/java/org/apache/polygene/library/sql/assembly/AbstractPooledDataSourceServiceAssembler.java b/libraries/sql/src/main/java/org/apache/polygene/library/sql/assembly/AbstractPooledDataSourceServiceAssembler.java
index 656633d..8a6e777 100644
--- a/libraries/sql/src/main/java/org/apache/polygene/library/sql/assembly/AbstractPooledDataSourceServiceAssembler.java
+++ b/libraries/sql/src/main/java/org/apache/polygene/library/sql/assembly/AbstractPooledDataSourceServiceAssembler.java
@@ -39,7 +39,7 @@ public abstract class AbstractPooledDataSourceServiceAssembler<AssemblerType>
{
configModule().entities( DataSourceConfiguration.class ).visibleIn( configVisibility() );
}
- onAssemble( module, identity() == null ? DEFAULT_DATASOURCE_SERVICE_IDENTITY : identity().toString(), visibility() );
+ onAssemble( module, identity() == null ? DEFAULT_DATASOURCE_SERVICE_IDENTITY : identity(), visibility() );
}
protected abstract void onAssemble( ModuleAssembly module, String identity, Visibility visibility );
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/9d16d555/tools/shell/src/main/java/org/apache/polygene/tools/shell/create/project/common/SecurityRepositoryWriter.java
----------------------------------------------------------------------
diff --git a/tools/shell/src/main/java/org/apache/polygene/tools/shell/create/project/common/SecurityRepositoryWriter.java b/tools/shell/src/main/java/org/apache/polygene/tools/shell/create/project/common/SecurityRepositoryWriter.java
index b2d5a3b..013286a 100644
--- a/tools/shell/src/main/java/org/apache/polygene/tools/shell/create/project/common/SecurityRepositoryWriter.java
+++ b/tools/shell/src/main/java/org/apache/polygene/tools/shell/create/project/common/SecurityRepositoryWriter.java
@@ -25,8 +25,6 @@ import java.io.PrintWriter;
import java.util.Map;
import org.apache.polygene.tools.shell.FileUtils;
-import static java.lang.String.format;
-
public class SecurityRepositoryWriter
{
[2/3] polygene-java git commit: Remove redundant casts and type
parameters
Posted by pa...@apache.org.
Remove redundant casts and type parameters
Thank you Java 8
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/132a0b6e
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/132a0b6e
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/132a0b6e
Branch: refs/heads/develop
Commit: 132a0b6edcb967b1e3bdfa6fe0ad7bd581ebc477
Parents: b675c1a
Author: Paul Merlin <pa...@apache.org>
Authored: Sun Jan 22 17:32:31 2017 +0100
Committer: Paul Merlin <pa...@apache.org>
Committed: Sun Jan 22 17:32:31 2017 +0100
----------------------------------------------------------------------
.../api/activation/PassivationExceptionTest.java | 2 +-
.../org/apache/polygene/api/util/ClassesTest.java | 6 +++---
.../runtime/association/AssociationsModel.java | 2 +-
.../runtime/bootstrap/CompositeAssemblyImpl.java | 2 +-
.../polygene/runtime/composite/ConcernsModel.java | 2 +-
.../runtime/composite/ConstraintsModel.java | 2 +-
.../runtime/composite/SideEffectsModel.java | 2 +-
.../runtime/composite/TransientBuilderInstance.java | 4 ++--
.../service/ImportedServiceReferenceInstance.java | 2 +-
.../runtime/unitofwork/EntityBuilderInstance.java | 2 +-
.../runtime/value/ValueBuilderInstance.java | 2 +-
.../runtime/value/ValueBuilderWithPrototype.java | 4 ++--
.../runtime/value/ValueBuilderWithState.java | 4 ++--
.../org/apache/polygene/api/common/PluginTest.java | 2 +-
.../runtime/injection/StateInjectionTest.java | 6 +++---
.../polygene/spi/property/DefaultValuesTest.java | 6 +++---
.../polygene/library/alarm/AlarmServiceTest.java | 6 +++---
.../library/alarm/SimpleAlarmModelTest.java | 12 ++++++------
.../library/alarm/StandardAlarmModelTest.java | 16 ++++++++--------
.../BreaksCircuitOnThrowableTest.java | 2 +-
.../jmx/CircuitBreakerManagementSample.java | 2 +-
.../apache/polygene/library/http/ServletInfo.java | 2 +-
.../library/rdf/model/ApplicationSerializer.java | 2 +-
.../restlet/responsewriter/LinksResponseWriter.java | 2 +-
.../apache/polygene/envisage/detail/MethodPane.java | 5 +----
.../envisage/graph/StackedGraphDisplay.java | 2 +-
26 files changed, 49 insertions(+), 52 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/132a0b6e/core/api/src/test/java/org/apache/polygene/api/activation/PassivationExceptionTest.java
----------------------------------------------------------------------
diff --git a/core/api/src/test/java/org/apache/polygene/api/activation/PassivationExceptionTest.java b/core/api/src/test/java/org/apache/polygene/api/activation/PassivationExceptionTest.java
index 1e4ee7d..ba7bca9 100644
--- a/core/api/src/test/java/org/apache/polygene/api/activation/PassivationExceptionTest.java
+++ b/core/api/src/test/java/org/apache/polygene/api/activation/PassivationExceptionTest.java
@@ -52,7 +52,7 @@ public class PassivationExceptionTest
@Test
public void testEmptyPassivationException()
{
- PassivationException empty = new PassivationException( Collections.<Exception>emptyList() );
+ PassivationException empty = new PassivationException( Collections.emptyList() );
assertThat( empty.getMessage(), containsString( "has 0 cause" ) );
}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/132a0b6e/core/api/src/test/java/org/apache/polygene/api/util/ClassesTest.java
----------------------------------------------------------------------
diff --git a/core/api/src/test/java/org/apache/polygene/api/util/ClassesTest.java b/core/api/src/test/java/org/apache/polygene/api/util/ClassesTest.java
index 24acbb5..834cc97 100644
--- a/core/api/src/test/java/org/apache/polygene/api/util/ClassesTest.java
+++ b/core/api/src/test/java/org/apache/polygene/api/util/ClassesTest.java
@@ -100,13 +100,13 @@ public class ClassesTest
switch( method.getName() )
{
case "type":
- assertThat( resolvedType, equalTo( (Type) String.class ) );
+ assertThat( resolvedType, equalTo( String.class ) );
break;
case "type1":
- assertThat( resolvedType, equalTo( (Type) String.class ) );
+ assertThat( resolvedType, equalTo( String.class ) );
break;
case "type2":
- assertThat( resolvedType, equalTo( (Type) Long.class ) );
+ assertThat( resolvedType, equalTo( Long.class ) );
break;
}
}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/132a0b6e/core/runtime/src/main/java/org/apache/polygene/runtime/association/AssociationsModel.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/polygene/runtime/association/AssociationsModel.java b/core/runtime/src/main/java/org/apache/polygene/runtime/association/AssociationsModel.java
index aad7d83..a9a53a0 100644
--- a/core/runtime/src/main/java/org/apache/polygene/runtime/association/AssociationsModel.java
+++ b/core/runtime/src/main/java/org/apache/polygene/runtime/association/AssociationsModel.java
@@ -111,7 +111,7 @@ public final class AssociationsModel
{
for( AssociationModel associationModel : mapAccessorAssociationModel.values() )
{
- Association<Object> association = state.<Object>associationFor( associationModel.accessor() );
+ Association<Object> association = state.associationFor( associationModel.accessor() );
associationModel.checkAssociationConstraints( association );
associationModel.checkConstraints( association.get() );
}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/132a0b6e/core/runtime/src/main/java/org/apache/polygene/runtime/bootstrap/CompositeAssemblyImpl.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/polygene/runtime/bootstrap/CompositeAssemblyImpl.java b/core/runtime/src/main/java/org/apache/polygene/runtime/bootstrap/CompositeAssemblyImpl.java
index 1e0fb26..3158cff 100644
--- a/core/runtime/src/main/java/org/apache/polygene/runtime/bootstrap/CompositeAssemblyImpl.java
+++ b/core/runtime/src/main/java/org/apache/polygene/runtime/bootstrap/CompositeAssemblyImpl.java
@@ -515,7 +515,7 @@ public abstract class CompositeAssemblyImpl
if( !constrained )
{
- return new ConstraintsModel( Collections.<ValueConstraintsModel>emptyList() );
+ return new ConstraintsModel( Collections.emptyList() );
}
else
{
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/132a0b6e/core/runtime/src/main/java/org/apache/polygene/runtime/composite/ConcernsModel.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/polygene/runtime/composite/ConcernsModel.java b/core/runtime/src/main/java/org/apache/polygene/runtime/composite/ConcernsModel.java
index aa8d3ce..9c16505 100644
--- a/core/runtime/src/main/java/org/apache/polygene/runtime/composite/ConcernsModel.java
+++ b/core/runtime/src/main/java/org/apache/polygene/runtime/composite/ConcernsModel.java
@@ -38,7 +38,7 @@ import org.apache.polygene.runtime.injection.DependencyModel;
public final class ConcernsModel
implements ConcernsDescriptor, Dependencies, VisitableHierarchy<Object, Object>
{
- public static final ConcernsModel EMPTY_CONCERNS = new ConcernsModel( Collections.<ConcernModel>emptyList() );
+ public static final ConcernsModel EMPTY_CONCERNS = new ConcernsModel( Collections.emptyList() );
private List<ConcernModel> concernsFor;
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/132a0b6e/core/runtime/src/main/java/org/apache/polygene/runtime/composite/ConstraintsModel.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/polygene/runtime/composite/ConstraintsModel.java b/core/runtime/src/main/java/org/apache/polygene/runtime/composite/ConstraintsModel.java
index 542217e..e704464 100644
--- a/core/runtime/src/main/java/org/apache/polygene/runtime/composite/ConstraintsModel.java
+++ b/core/runtime/src/main/java/org/apache/polygene/runtime/composite/ConstraintsModel.java
@@ -35,7 +35,7 @@ public final class ConstraintsModel
{
private List<ValueConstraintsModel> parameterConstraintModels;
- private static ConstraintsInstance EMPTY_CONSTRAINTS = new ConstraintsInstance( Collections.<ValueConstraintsInstance>emptyList() );
+ private static ConstraintsInstance EMPTY_CONSTRAINTS = new ConstraintsInstance( Collections.emptyList() );
public ConstraintsModel( List<ValueConstraintsModel> parameterConstraintModels )
{
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/132a0b6e/core/runtime/src/main/java/org/apache/polygene/runtime/composite/SideEffectsModel.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/polygene/runtime/composite/SideEffectsModel.java b/core/runtime/src/main/java/org/apache/polygene/runtime/composite/SideEffectsModel.java
index 73c910c..05a2c30 100644
--- a/core/runtime/src/main/java/org/apache/polygene/runtime/composite/SideEffectsModel.java
+++ b/core/runtime/src/main/java/org/apache/polygene/runtime/composite/SideEffectsModel.java
@@ -39,7 +39,7 @@ import org.apache.polygene.runtime.injection.DependencyModel;
public final class SideEffectsModel
implements SideEffectsDescriptor, Dependencies, VisitableHierarchy<Object, Object>
{
- public static final SideEffectsModel EMPTY_SIDEEFFECTS = new SideEffectsModel( Collections.<SideEffectModel>emptyList() );
+ public static final SideEffectsModel EMPTY_SIDEEFFECTS = new SideEffectsModel( Collections.emptyList() );
private List<SideEffectModel> sideEffectModels = null;
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/132a0b6e/core/runtime/src/main/java/org/apache/polygene/runtime/composite/TransientBuilderInstance.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/polygene/runtime/composite/TransientBuilderInstance.java b/core/runtime/src/main/java/org/apache/polygene/runtime/composite/TransientBuilderInstance.java
index a622a57..d6312d4 100644
--- a/core/runtime/src/main/java/org/apache/polygene/runtime/composite/TransientBuilderInstance.java
+++ b/core/runtime/src/main/java/org/apache/polygene/runtime/composite/TransientBuilderInstance.java
@@ -68,7 +68,7 @@ public final class TransientBuilderInstance<T>
prototypeInstance = model.newInstance( uses, state );
}
- return prototypeInstance.<T>proxy();
+ return prototypeInstance.proxy();
}
@Override
@@ -97,6 +97,6 @@ public final class TransientBuilderInstance<T>
model.checkConstraints( state );
CompositeInstance compositeInstance = model.newInstance( uses, state );
- return compositeInstance.<T>proxy();
+ return compositeInstance.proxy();
}
}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/132a0b6e/core/runtime/src/main/java/org/apache/polygene/runtime/service/ImportedServiceReferenceInstance.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/polygene/runtime/service/ImportedServiceReferenceInstance.java b/core/runtime/src/main/java/org/apache/polygene/runtime/service/ImportedServiceReferenceInstance.java
index 328e26b..cf13122 100644
--- a/core/runtime/src/main/java/org/apache/polygene/runtime/service/ImportedServiceReferenceInstance.java
+++ b/core/runtime/src/main/java/org/apache/polygene/runtime/service/ImportedServiceReferenceInstance.java
@@ -156,7 +156,7 @@ public final class ImportedServiceReferenceInstance<T>
{
if( serviceInstance == null )
{
- serviceInstance = serviceModel.<T>importInstance( module );
+ serviceInstance = serviceModel.importInstance( module );
instance = serviceInstance.instance();
try
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/132a0b6e/core/runtime/src/main/java/org/apache/polygene/runtime/unitofwork/EntityBuilderInstance.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/polygene/runtime/unitofwork/EntityBuilderInstance.java b/core/runtime/src/main/java/org/apache/polygene/runtime/unitofwork/EntityBuilderInstance.java
index 5044ff6..5dedfa2 100644
--- a/core/runtime/src/main/java/org/apache/polygene/runtime/unitofwork/EntityBuilderInstance.java
+++ b/core/runtime/src/main/java/org/apache/polygene/runtime/unitofwork/EntityBuilderInstance.java
@@ -86,7 +86,7 @@ public final class EntityBuilderInstance<T>
public T instance()
{
checkValid();
- return prototypeInstance.<T>proxy();
+ return prototypeInstance.proxy();
}
@Override
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/132a0b6e/core/runtime/src/main/java/org/apache/polygene/runtime/value/ValueBuilderInstance.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/polygene/runtime/value/ValueBuilderInstance.java b/core/runtime/src/main/java/org/apache/polygene/runtime/value/ValueBuilderInstance.java
index 7ecb745..248b97d 100644
--- a/core/runtime/src/main/java/org/apache/polygene/runtime/value/ValueBuilderInstance.java
+++ b/core/runtime/src/main/java/org/apache/polygene/runtime/value/ValueBuilderInstance.java
@@ -53,7 +53,7 @@ public final class ValueBuilderInstance<T>
@Override
public T prototype()
{
- return prototypeInstance.<T>proxy();
+ return prototypeInstance.proxy();
}
@Override
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/132a0b6e/core/runtime/src/main/java/org/apache/polygene/runtime/value/ValueBuilderWithPrototype.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/polygene/runtime/value/ValueBuilderWithPrototype.java b/core/runtime/src/main/java/org/apache/polygene/runtime/value/ValueBuilderWithPrototype.java
index c9a1023..9a786a3 100644
--- a/core/runtime/src/main/java/org/apache/polygene/runtime/value/ValueBuilderWithPrototype.java
+++ b/core/runtime/src/main/java/org/apache/polygene/runtime/value/ValueBuilderWithPrototype.java
@@ -84,7 +84,7 @@ public class ValueBuilderWithPrototype<T>
public T prototype()
{
verifyUnderConstruction();
- return prototypeInstance.<T>proxy();
+ return prototypeInstance.proxy();
}
@Override
@@ -115,7 +115,7 @@ public class ValueBuilderWithPrototype<T>
try
{
- return prototypeInstance.<T>proxy();
+ return prototypeInstance.proxy();
}
finally
{
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/132a0b6e/core/runtime/src/main/java/org/apache/polygene/runtime/value/ValueBuilderWithState.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/polygene/runtime/value/ValueBuilderWithState.java b/core/runtime/src/main/java/org/apache/polygene/runtime/value/ValueBuilderWithState.java
index 236e3b9..e371b04 100644
--- a/core/runtime/src/main/java/org/apache/polygene/runtime/value/ValueBuilderWithState.java
+++ b/core/runtime/src/main/java/org/apache/polygene/runtime/value/ValueBuilderWithState.java
@@ -46,7 +46,7 @@ public class ValueBuilderWithState<T> implements ValueBuilder<T>
public T prototype()
{
verifyUnderConstruction();
- return prototypeInstance.<T>proxy();
+ return prototypeInstance.proxy();
}
@Override
@@ -78,7 +78,7 @@ public class ValueBuilderWithState<T> implements ValueBuilder<T>
try
{
- return prototypeInstance.<T>proxy();
+ return prototypeInstance.proxy();
}
finally
{
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/132a0b6e/core/runtime/src/test/java/org/apache/polygene/api/common/PluginTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/polygene/api/common/PluginTest.java b/core/runtime/src/test/java/org/apache/polygene/api/common/PluginTest.java
index 03b4747..dcab32f 100644
--- a/core/runtime/src/test/java/org/apache/polygene/api/common/PluginTest.java
+++ b/core/runtime/src/test/java/org/apache/polygene/api/common/PluginTest.java
@@ -269,7 +269,7 @@ public class PluginTest
LayerAssembly layer = module.layer();
// In a real case you would "detect" the plugins somehow. Here the plugin assembler is hardcoded
- List<Assembler> pluginAssemblers = Collections.<Assembler>singletonList( new SimonAssembler() );
+ List<Assembler> pluginAssemblers = Collections.singletonList( new SimonAssembler() );
for( int i = 0; i < pluginAssemblers.size(); i++ )
{
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/132a0b6e/core/runtime/src/test/java/org/apache/polygene/runtime/injection/StateInjectionTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/polygene/runtime/injection/StateInjectionTest.java b/core/runtime/src/test/java/org/apache/polygene/runtime/injection/StateInjectionTest.java
index aac8dd6..f6a0663 100644
--- a/core/runtime/src/test/java/org/apache/polygene/runtime/injection/StateInjectionTest.java
+++ b/core/runtime/src/test/java/org/apache/polygene/runtime/injection/StateInjectionTest.java
@@ -63,9 +63,9 @@ public class StateInjectionTest
PropertyFieldInjectionComposite pfic = pficBuilder.newInstance();
assertThat( "Test field", pfic.testField().get(), is( equalTo( "X" ) ) );
assertThat( "Named fieldX", pfic.namedField().get(), is( equalTo( "X" ) ) );
- assertThat( "State", (String) pfic.getState()
- .propertyFor( PropertyFieldInjectionComposite.class.getMethod( "testField" ) )
- .get(), is( equalTo( "X" ) ) );
+ assertThat( "State", pfic.getState()
+ .propertyFor( PropertyFieldInjectionComposite.class.getMethod( "testField" ) )
+ .get(), is( equalTo( "X" ) ) );
}
@Mixins( PropertyFieldInjectionMixin.class )
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/132a0b6e/core/spi/src/test/java/org/apache/polygene/spi/property/DefaultValuesTest.java
----------------------------------------------------------------------
diff --git a/core/spi/src/test/java/org/apache/polygene/spi/property/DefaultValuesTest.java b/core/spi/src/test/java/org/apache/polygene/spi/property/DefaultValuesTest.java
index 831d0f8..5b7fc91 100644
--- a/core/spi/src/test/java/org/apache/polygene/spi/property/DefaultValuesTest.java
+++ b/core/spi/src/test/java/org/apache/polygene/spi/property/DefaultValuesTest.java
@@ -38,19 +38,19 @@ public class DefaultValuesTest
@Test
public void givenDefaultValuesWhenRequestStringThenGetEmptyString()
{
- assertThat( "Empty string", (String) DefaultValues.getDefaultValueOf( String.class ), equalTo( "" ) );
+ assertThat( "Empty string", DefaultValues.getDefaultValueOf( String.class ), equalTo( "" ) );
}
@Test
public void givenDefaultValuesWhenRequestListThenGetEmptyList()
{
- assertThat( "Empty list", (List<Object>) DefaultValues.getDefaultValueOf( List.class ), equalTo( Collections.emptyList() ) );
+ assertThat( "Empty list", DefaultValues.getDefaultValueOf( List.class ), equalTo( Collections.emptyList() ) );
}
@Test
public void givenDefaultValuesWhenRequestSetThenGetEmptySet()
{
- assertThat( "Empty set", (Set<Object>) DefaultValues.getDefaultValueOf( Set.class ), equalTo( Collections.emptySet() ) );
+ assertThat( "Empty set", DefaultValues.getDefaultValueOf( Set.class ), equalTo( Collections.emptySet() ) );
}
@Test
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/132a0b6e/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/AlarmServiceTest.java
----------------------------------------------------------------------
diff --git a/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/AlarmServiceTest.java b/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/AlarmServiceTest.java
index 3b5e79f..43af0b6 100644
--- a/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/AlarmServiceTest.java
+++ b/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/AlarmServiceTest.java
@@ -87,7 +87,7 @@ public class AlarmServiceTest
@Test
public void testGetAlarmModels()
{
- AlarmSystem alarmService = (AlarmSystem) serviceFinder.findService( AlarmSystem.class ).get();
+ AlarmSystem alarmService = serviceFinder.findService( AlarmSystem.class ).get();
List<AlarmModelDescriptor> models = alarmService.alarmModels();
assertNotNull( models );
assertEquals( 2, models.size() );
@@ -97,7 +97,7 @@ public class AlarmServiceTest
public void testDefaultModel()
throws Exception
{
- AlarmSystem alarmService = (AlarmSystem) serviceFinder.findService( AlarmSystem.class ).get();
+ AlarmSystem alarmService = serviceFinder.findService( AlarmSystem.class ).get();
List<AlarmModelDescriptor> models = alarmService.alarmModels();
assertNotNull( models );
assertEquals( 2, models.size() );
@@ -110,7 +110,7 @@ public class AlarmServiceTest
public void testListeners()
throws Exception
{
- AlarmSystem alarmService = (AlarmSystem) serviceFinder.findService( AlarmSystem.class ).get();
+ AlarmSystem alarmService = serviceFinder.findService( AlarmSystem.class ).get();
AlarmPoint alarm = alarmService.createAlarm( "TestAlarm", createCategory("AlarmServiceTest") );
CountingListener listener1 = new CountingListener();
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/132a0b6e/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/SimpleAlarmModelTest.java
----------------------------------------------------------------------
diff --git a/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/SimpleAlarmModelTest.java b/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/SimpleAlarmModelTest.java
index dd97c15..a4c402f 100644
--- a/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/SimpleAlarmModelTest.java
+++ b/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/SimpleAlarmModelTest.java
@@ -116,7 +116,7 @@ public class SimpleAlarmModelTest
public void testTriggers()
throws Exception
{
- AlarmModel provider = (AlarmModel) serviceFinder.findService( AlarmModel.class ).get();
+ AlarmModel provider = serviceFinder.findService( AlarmModel.class ).get();
AlarmPoint underTest = createAlarm( "Test AlarmPoint" );
List<String> triggers = provider.alarmTriggers();
assertEquals( 2, triggers.size() );
@@ -160,7 +160,7 @@ public class SimpleAlarmModelTest
public void testStateChangeFromNormal()
throws Exception
{
- AlarmModel provider = (AlarmModel) serviceFinder.findService( AlarmModel.class ).get();
+ AlarmModel provider = serviceFinder.findService( AlarmModel.class ).get();
AlarmPoint alarm = createAlarm( "Another 1" );
AlarmEvent event1 = provider.evaluate( alarm, AlarmPoint.TRIGGER_ACTIVATE );
assertEquals( AlarmPoint.EVENT_ACTIVATION, event1.systemName().get() );
@@ -186,7 +186,7 @@ public class SimpleAlarmModelTest
public void testStateChangeFromActivated()
throws Exception
{
- AlarmModel provider = (AlarmModel) serviceFinder.findService( AlarmModel.class ).get();
+ AlarmModel provider = serviceFinder.findService( AlarmModel.class ).get();
AlarmPoint alarm = createAlarm( "Another 1" );
alarm.activate();
@@ -205,7 +205,7 @@ public class SimpleAlarmModelTest
{
try
{
- AlarmModel provider = (AlarmModel) serviceFinder.findService( AlarmModel.class ).get();
+ AlarmModel provider = serviceFinder.findService( AlarmModel.class ).get();
AlarmPoint underTest = createAlarm( "Test AlarmPoint" );
provider.evaluate( underTest, "my-trigger" );
fail( "IllegalArgumentException not thrown." );
@@ -304,7 +304,7 @@ public class SimpleAlarmModelTest
public void testComputeCondition()
throws Exception
{
- AlarmModel provider = (AlarmModel) serviceFinder.findService( AlarmModel.class ).get();
+ AlarmModel provider = serviceFinder.findService( AlarmModel.class ).get();
AlarmStatus s1 = createStatus( AlarmPoint.STATUS_NORMAL );
assertFalse( provider.computeCondition( s1 ) );
AlarmStatus s2 = createStatus( AlarmPoint.STATUS_ACTIVATED );
@@ -315,7 +315,7 @@ public class SimpleAlarmModelTest
public void testComputeTrigger()
throws Exception
{
- AlarmModel provider = (AlarmModel) serviceFinder.findService( AlarmModel.class ).get();
+ AlarmModel provider = serviceFinder.findService( AlarmModel.class ).get();
AlarmStatus s1 = createStatus( AlarmPoint.STATUS_NORMAL );
AlarmStatus s2 = createStatus( AlarmPoint.STATUS_ACTIVATED );
String trigger1 = provider.computeTrigger( s1, true );
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/132a0b6e/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/StandardAlarmModelTest.java
----------------------------------------------------------------------
diff --git a/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/StandardAlarmModelTest.java b/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/StandardAlarmModelTest.java
index aa247cd..deaa8fe 100644
--- a/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/StandardAlarmModelTest.java
+++ b/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/StandardAlarmModelTest.java
@@ -124,7 +124,7 @@ public class StandardAlarmModelTest
public void testTriggers()
throws Exception
{
- AlarmModel provider = (AlarmModel) serviceFinder.findService( AlarmModel.class ).get();
+ AlarmModel provider = serviceFinder.findService( AlarmModel.class ).get();
AlarmPoint underTest = createAlarm( "Test AlarmPoint" );
List<String> triggers = provider.alarmTriggers();
assertEquals( 3, triggers.size() );
@@ -168,7 +168,7 @@ public class StandardAlarmModelTest
public void testStateChangeFromNormal()
throws Exception
{
- AlarmModel provider = (AlarmModel) serviceFinder.findService( AlarmModel.class ).get();
+ AlarmModel provider = serviceFinder.findService( AlarmModel.class ).get();
AlarmPoint alarm = createAlarm( "Another 1" );
AlarmEvent event1 = provider.evaluate( alarm, AlarmPoint.TRIGGER_ACTIVATE );
assertEquals( AlarmPoint.EVENT_ACTIVATION, event1.systemName().get() );
@@ -186,7 +186,7 @@ public class StandardAlarmModelTest
public void testStateChangeFromActivated()
throws Exception
{
- AlarmModel provider = (AlarmModel) serviceFinder.findService( AlarmModel.class ).get();
+ AlarmModel provider = serviceFinder.findService( AlarmModel.class ).get();
AlarmPoint alarm = createAlarm( "Another 1" );
alarm.activate();
@@ -208,7 +208,7 @@ public class StandardAlarmModelTest
public void testStateChangeFromAcknowledged()
throws Exception
{
- AlarmModel provider = (AlarmModel) serviceFinder.findService( AlarmModel.class ).get();
+ AlarmModel provider = serviceFinder.findService( AlarmModel.class ).get();
AlarmPoint alarm = createAlarm( "Another 1" );
alarm.activate();
alarm.acknowledge();
@@ -233,7 +233,7 @@ public class StandardAlarmModelTest
public void testStateChangeFromDeactivated()
throws Exception
{
- AlarmModel provider = (AlarmModel) serviceFinder.findService( AlarmModel.class ).get();
+ AlarmModel provider = serviceFinder.findService( AlarmModel.class ).get();
AlarmPoint alarm = createAlarm( "Another 1" );
alarm.activate();
alarm.deactivate();
@@ -259,7 +259,7 @@ public class StandardAlarmModelTest
{
try
{
- AlarmModel provider = (AlarmModel) serviceFinder.findService( AlarmModel.class ).get();
+ AlarmModel provider = serviceFinder.findService( AlarmModel.class ).get();
AlarmPoint underTest = createAlarm( "Test AlarmPoint" );
provider.evaluate( underTest, "my-trigger" );
fail( "IllegalArgumentException not thrown." );
@@ -417,7 +417,7 @@ public class StandardAlarmModelTest
public void testComputeCondition()
throws Exception
{
- AlarmModel provider = (AlarmModel) serviceFinder.findService( AlarmModel.class ).get();
+ AlarmModel provider = serviceFinder.findService( AlarmModel.class ).get();
AlarmStatus s1 = createStatus( AlarmPoint.STATUS_NORMAL );
assertFalse( provider.computeCondition( s1 ) );
AlarmStatus s2 = createStatus( AlarmPoint.STATUS_ACTIVATED );
@@ -432,7 +432,7 @@ public class StandardAlarmModelTest
public void testComputeTrigger()
throws Exception
{
- AlarmModel provider = (AlarmModel) serviceFinder.findService( AlarmModel.class ).get();
+ AlarmModel provider = serviceFinder.findService( AlarmModel.class ).get();
AlarmStatus s1 = createStatus( AlarmPoint.STATUS_NORMAL );
AlarmStatus s2 = createStatus( AlarmPoint.STATUS_ACTIVATED );
AlarmStatus s3 = createStatus( AlarmPoint.STATUS_DEACTIVATED );
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/132a0b6e/libraries/circuitbreaker/src/test/java/org/apache/polygene/library/circuitbreaker/BreaksCircuitOnThrowableTest.java
----------------------------------------------------------------------
diff --git a/libraries/circuitbreaker/src/test/java/org/apache/polygene/library/circuitbreaker/BreaksCircuitOnThrowableTest.java b/libraries/circuitbreaker/src/test/java/org/apache/polygene/library/circuitbreaker/BreaksCircuitOnThrowableTest.java
index d186597..6d944d5 100644
--- a/libraries/circuitbreaker/src/test/java/org/apache/polygene/library/circuitbreaker/BreaksCircuitOnThrowableTest.java
+++ b/libraries/circuitbreaker/src/test/java/org/apache/polygene/library/circuitbreaker/BreaksCircuitOnThrowableTest.java
@@ -49,7 +49,7 @@ public class BreaksCircuitOnThrowableTest
@Test
public void testSuccess()
{
- TestService service = ( TestService ) serviceFinder.findService( TestService.class ).get();
+ TestService service = serviceFinder.findService( TestService.class ).get();
service.successfulMethod();
service.successfulMethod();
service.successfulMethod();
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/132a0b6e/libraries/circuitbreaker/src/test/java/org/apache/polygene/library/circuitbreaker/jmx/CircuitBreakerManagementSample.java
----------------------------------------------------------------------
diff --git a/libraries/circuitbreaker/src/test/java/org/apache/polygene/library/circuitbreaker/jmx/CircuitBreakerManagementSample.java b/libraries/circuitbreaker/src/test/java/org/apache/polygene/library/circuitbreaker/jmx/CircuitBreakerManagementSample.java
index 2b2c027..2f4b6ed 100644
--- a/libraries/circuitbreaker/src/test/java/org/apache/polygene/library/circuitbreaker/jmx/CircuitBreakerManagementSample.java
+++ b/libraries/circuitbreaker/src/test/java/org/apache/polygene/library/circuitbreaker/jmx/CircuitBreakerManagementSample.java
@@ -65,7 +65,7 @@ public class CircuitBreakerManagementSample
};
- TestService service = assembler.module().<TestService>findService( TestService.class ).get();
+ TestService service = assembler.module().findService( TestService.class ).get();
int interval = 1; // Seconds
System.out.println( "CircuitBreaker JMX Support sample is now started." );
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/132a0b6e/libraries/http/src/main/java/org/apache/polygene/library/http/ServletInfo.java
----------------------------------------------------------------------
diff --git a/libraries/http/src/main/java/org/apache/polygene/library/http/ServletInfo.java b/libraries/http/src/main/java/org/apache/polygene/library/http/ServletInfo.java
index 4631430..5ad2136 100644
--- a/libraries/http/src/main/java/org/apache/polygene/library/http/ServletInfo.java
+++ b/libraries/http/src/main/java/org/apache/polygene/library/http/ServletInfo.java
@@ -37,7 +37,7 @@ public class ServletInfo
public ServletInfo( String mountPath )
{
- this( mountPath, Collections.<String, String>emptyMap() );
+ this( mountPath, Collections.emptyMap() );
}
public ServletInfo( String mountPath, Map<String, String> initParams )
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/132a0b6e/libraries/rdf/src/main/java/org/apache/polygene/library/rdf/model/ApplicationSerializer.java
----------------------------------------------------------------------
diff --git a/libraries/rdf/src/main/java/org/apache/polygene/library/rdf/model/ApplicationSerializer.java b/libraries/rdf/src/main/java/org/apache/polygene/library/rdf/model/ApplicationSerializer.java
index 6fa506b..7c65ae1 100644
--- a/libraries/rdf/src/main/java/org/apache/polygene/library/rdf/model/ApplicationSerializer.java
+++ b/libraries/rdf/src/main/java/org/apache/polygene/library/rdf/model/ApplicationSerializer.java
@@ -34,7 +34,7 @@ public class ApplicationSerializer
Graph graph = new GraphImpl();
SerializerContext context = new SerializerContext( graph );
ApplicationVisitor applicationVisitor = new ApplicationVisitor( context );
- ( (Application) app ).descriptor().accept( applicationVisitor );
+ app.descriptor().accept( applicationVisitor );
return graph;
}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/132a0b6e/libraries/rest-server/src/main/java/org/apache/polygene/library/rest/server/restlet/responsewriter/LinksResponseWriter.java
----------------------------------------------------------------------
diff --git a/libraries/rest-server/src/main/java/org/apache/polygene/library/rest/server/restlet/responsewriter/LinksResponseWriter.java b/libraries/rest-server/src/main/java/org/apache/polygene/library/rest/server/restlet/responsewriter/LinksResponseWriter.java
index 26c810f..dea6f15 100644
--- a/libraries/rest-server/src/main/java/org/apache/polygene/library/rest/server/restlet/responsewriter/LinksResponseWriter.java
+++ b/libraries/rest-server/src/main/java/org/apache/polygene/library/rest/server/restlet/responsewriter/LinksResponseWriter.java
@@ -61,7 +61,7 @@ public class LinksResponseWriter
MediaType type = getVariant( response.getRequest(), ENGLISH, supportedLinkMediaTypes ).getMediaType();
if( MediaType.APPLICATION_JSON.equals( type ) )
{
- response.setEntity( new StringRepresentation( ( (Link) result ).toString(), MediaType.APPLICATION_JSON ) );
+ response.setEntity( new StringRepresentation( result.toString(), MediaType.APPLICATION_JSON ) );
return true;
}
else
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/132a0b6e/tools/envisage/src/main/java/org/apache/polygene/envisage/detail/MethodPane.java
----------------------------------------------------------------------
diff --git a/tools/envisage/src/main/java/org/apache/polygene/envisage/detail/MethodPane.java b/tools/envisage/src/main/java/org/apache/polygene/envisage/detail/MethodPane.java
index 38fbfb1..afc17b3 100644
--- a/tools/envisage/src/main/java/org/apache/polygene/envisage/detail/MethodPane.java
+++ b/tools/envisage/src/main/java/org/apache/polygene/envisage/detail/MethodPane.java
@@ -205,10 +205,7 @@ import org.apache.polygene.tools.model.util.DescriptorUtilities;
clear();
// mixin type
- rows.add( new TableRow( 2, new Object[]
- {
- "return", Classes.simpleGenericNameOf( method.getGenericReturnType() )
- } ) );
+ rows.add( new TableRow( 2, "return", Classes.simpleGenericNameOf( method.getGenericReturnType() ) ) );
// method
StringBuilder parameters = new StringBuilder();
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/132a0b6e/tools/envisage/src/main/java/org/apache/polygene/envisage/graph/StackedGraphDisplay.java
----------------------------------------------------------------------
diff --git a/tools/envisage/src/main/java/org/apache/polygene/envisage/graph/StackedGraphDisplay.java b/tools/envisage/src/main/java/org/apache/polygene/envisage/graph/StackedGraphDisplay.java
index d1cc7a4..b7ce32f 100644
--- a/tools/envisage/src/main/java/org/apache/polygene/envisage/graph/StackedGraphDisplay.java
+++ b/tools/envisage/src/main/java/org/apache/polygene/envisage/graph/StackedGraphDisplay.java
@@ -504,7 +504,7 @@ import prefuse.visual.sort.TreeDepthItemSorter;
}
else
{
- Dimension size = ( (Component) container ).getSize();
+ Dimension size = container.getSize();
displayBounds.setRect( 0, 0, size.getWidth(), size.getHeight() );
}