Visitar URL original
Remove various redundant object creations, unused imports etc… · apache/polygene-java@9d16d55 · GitHub
Skip to content
This repository was archived by the owner on May 12, 2021. It is now read-only.

Commit 9d16d55

Browse files
eskatoseskatos
committed
Remove various redundant object creations, unused imports etc…
1 parent 132a0b6 commit 9d16d55

24 files changed

Lines changed: 28 additions & 45 deletions

File tree

‎core/api/src/main/java/org/apache/polygene/api/constraint/ConstraintViolationException.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ public String[] localizedMessagesFrom( ResourceBundle bundle )
190190
String name = violation.name();
191191
Object value = violation.value();
192192
String classes;
193-
if( instanceTypes.stream().count() == 1 )
193+
if( instanceTypes.size() == 1 )
194194
{
195195
Type type = instanceTypes.stream().findFirst().get();
196196
classes = Classes.RAW_CLASS.apply( type ).getSimpleName();

‎core/api/src/main/java/org/apache/polygene/api/property/InvalidPropertyTypeException.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,12 @@ public class InvalidPropertyTypeException extends ConstructionException
2929
{
3030
public InvalidPropertyTypeException( AccessibleObject accessor )
3131
{
32-
super( createMessage(accessor) );
32+
super( createMessage( accessor ) );
3333
}
3434

3535
private static String createMessage( AccessibleObject accessor )
3636
{
37-
StringBuilder builder = new StringBuilder();
38-
builder.append( "Not allowed to subclass " + Property.class.getName() + ". Property accessor " + accessor + " is returning a Property subclass." );
39-
return builder.toString();
37+
return "Not allowed to subclass " + Property.class.getName() + ". Property accessor " +
38+
accessor + " is returning a Property subclass.";
4039
}
4140
}

‎core/api/src/main/java/org/apache/polygene/api/query/grammar/OrderBy.java‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,6 @@ public Order order()
8484
@Override
8585
public String toString()
8686
{
87-
return new StringBuilder()
88-
.append( propertyReference )
89-
.append( " " )
90-
.append( order )
91-
.toString();
87+
return String.valueOf( propertyReference ) + " " + order;
9288
}
9389
}

‎core/api/src/test/java/org/apache/polygene/api/composite/PropertyMapperTest.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,7 @@ public class PropertyMapperTest
4646
}
4747
catch( NoSuchMethodException e )
4848
{
49-
InternalError error = new InternalError();
50-
error.initCause( e );
51-
throw error;
49+
throw new InternalError( e );
5250
}
5351
}
5452

‎core/runtime/src/test/java/org/apache/polygene/runtime/injection/UnitOfWorkInjectionTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public void givenEntityInOneUnitOfWorkWhenCurrentUnitOfWorkHasChangedThenUnitOfW
6161
UnitOfWork uow2 = unitOfWorkFactory.newUnitOfWork( usecase );
6262
trial = uow.get( trial );
6363
trial.doSomething();
64-
assertEquals( "123", ( (EntityComposite) trial ).identity().get() );
64+
assertEquals( "123", ( (EntityComposite) trial ).identity().get().toString() );
6565
assertEquals( "usecase1", trial.usecaseName() );
6666
uow2.discard();
6767
}

‎core/runtime/src/test/java/org/apache/polygene/runtime/sideeffects/SpecificSideEffectTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020

2121
package org.apache.polygene.runtime.sideeffects;
2222

23-
import org.junit.Test;
2423
import org.apache.polygene.api.common.UseDefaults;
2524
import org.apache.polygene.api.composite.TransientComposite;
2625
import org.apache.polygene.api.injection.scope.This;
@@ -31,9 +30,9 @@
3130
import org.apache.polygene.bootstrap.AssemblyException;
3231
import org.apache.polygene.bootstrap.ModuleAssembly;
3332
import org.apache.polygene.test.AbstractPolygeneTest;
33+
import org.junit.Test;
3434

3535
import static org.hamcrest.CoreMatchers.equalTo;
36-
import static org.hamcrest.CoreMatchers.not;
3736
import static org.junit.Assert.assertThat;
3837

3938
/**

‎core/testsupport/src/main/java/org/apache/polygene/test/entity/AbstractEntityStoreTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ protected TestEntity createEntity( UnitOfWork unitOfWork )
114114
instance.bigDecimalValue().set( new BigDecimal( "42" ) );
115115
instance.instantValue().set( refDate.toInstant() );
116116
instance.dateTimeValue().set( refDate );
117-
instance.localDateTimeValue().set( LocalDateTime.of( 2020, 3, 4, 13, 23, 00 ) );
117+
instance.localDateTimeValue().set( LocalDateTime.of( 2020, 3, 4, 13, 23, 0 ) );
118118
instance.localDateValue().set( LocalDate.of( 2020, 3, 4 ) );
119119
instance.localTimeValue().set( LocalTime.of( 19, 20, 21 ) );
120120

‎core/testsupport/src/main/java/org/apache/polygene/test/indexing/AbstractEntityFinderTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ public void script18()
357357
Iterable<EntityReference> entities = entityFinder.findEntities(
358358
Nameable.class,
359359
ALL,
360-
Arrays.asList(orderBy( nameable.name() )),
360+
Collections.singletonList( orderBy( nameable.name() ) ),
361361
NO_FIRST_RESULT, NO_MAX_RESULTS,
362362
NO_VARIABLES ).collect( toList() );
363363
assertNames( false, entities, allNames );
@@ -380,7 +380,7 @@ public void script19()
380380
Iterable<EntityReference> entities = entityFinder.findEntities(
381381
Nameable.class,
382382
gt( nameable.name(), "B" ),
383-
Arrays.asList( orderBy( nameable.name() ) ),
383+
Collections.singletonList( orderBy( nameable.name() ) ),
384384
NO_FIRST_RESULT, NO_MAX_RESULTS,
385385
NO_VARIABLES ).collect( toList() );
386386
assertNames( false, entities, largerThanB.toArray( new String[ largerThanB.size() ] ) );
@@ -394,7 +394,7 @@ public void script20()
394394
Iterable<EntityReference> entities = entityFinder.findEntities(
395395
Person.class,
396396
gt( person.yearOfBirth(), 1973 ),
397-
Arrays.asList( orderBy( person.name(), OrderBy.Order.DESCENDING ) ),
397+
Collections.singletonList( orderBy( person.name(), OrderBy.Order.DESCENDING ) ),
398398
NO_FIRST_RESULT, NO_MAX_RESULTS,
399399
NO_VARIABLES ).collect( toList() );
400400
assertNames( false, entities, JOE, ANN );

‎extensions/cache-ehcache/src/main/java/org/apache/polygene/cache/ehcache/assembly/EhCacheAssembler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public void assemble( ModuleAssembly module )
3636
ServiceDeclaration service = module.services( EhCachePoolService.class ).visibleIn( visibility() );
3737
if( hasIdentity() )
3838
{
39-
service.identifiedBy( identity().toString() );
39+
service.identifiedBy( identity() );
4040
}
4141
if( hasConfig() )
4242
{

‎extensions/cache-memcache/src/main/java/org/apache/polygene/cache/memcache/MemcacheAssembler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public void assemble( ModuleAssembly module )
3737
ServiceDeclaration service = module.services( MemcachePoolService.class ).visibleIn( visibility() );
3838
if( hasIdentity() )
3939
{
40-
service.identifiedBy( identity().toString() );
40+
service.identifiedBy( identity() );
4141
}
4242
if( hasConfig() )
4343
{

0 commit comments

Comments
 (0)