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:42 UTC
[3/3] polygene-java git commit: Remove various redundant object creations, unused imports etc…
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
{