Skip to content
This repository has been archived by the owner on Sep 13, 2024. It is now read-only.

Commit

Permalink
spotless:apply
Browse files Browse the repository at this point in the history
  • Loading branch information
@mcculls
mcculls committed Jan 7, 2024
1 parent 61f4924 commit 99754c2
Show file tree
Hide file tree
Showing 5 changed files with 53 additions and 59 deletions.
9 changes: 5 additions & 4 deletions ...a/org/codehaus/plexus/component/configurator/converters/basic/AbstractBasicConverter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,15 +59,16 @@ public Object fromConfiguration( final ConverterLookup lookup, final PlexusConfi
// ----------------------------------------------------------------------

protected Object fromString( final String str, final Class<?> type )
throws ComponentConfigurationException
throws ComponentConfigurationException
{
return fromString( str );
}

protected Object fromString( final String str )
throws ComponentConfigurationException
throws ComponentConfigurationException
{
throw new UnsupportedOperationException("The class " + this.getClass().getName() + " must implement one of the fromString(...) methods, but it doesn't");
throw new UnsupportedOperationException( "The class " + this.getClass().getName()
+ " must implement one of the fromString(...) methods, but it doesn't" );
}

// ----------------------------------------------------------------------
Expand All @@ -76,7 +77,7 @@ protected Object fromString( final String str )

@Override
protected Object fromExpression( final PlexusConfiguration configuration, final ExpressionEvaluator evaluator,
final Class<?> type )
final Class<?> type )
throws ComponentConfigurationException
{
String value = configuration.getValue();
Expand Down
18 changes: 9 additions & 9 deletions ...n/java/org/codehaus/plexus/component/configurator/converters/basic/TemporalConverter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,25 +37,25 @@ public class TemporalConverter
/**
* Supports all formats of {@link org.eclipse.sisu.plexus.PlexusDateTypeConverter}
*/
private static final DateTimeFormatter PLEXUS_DATE_TIME_FORMATTER = DateTimeFormatter
.ofPattern( "yyyy-MM-dd HH:mm:ss[[a][.S [a]]", Locale.US )
.withZone( ZoneId.systemDefault() );
private static final DateTimeFormatter PLEXUS_DATE_TIME_FORMATTER =
DateTimeFormatter.ofPattern( "yyyy-MM-dd HH:mm:ss[[a][.S [a]]", Locale.US ).withZone( ZoneId.systemDefault() );

public boolean canConvert( final Class<?> type )
{
return Temporal.class.isAssignableFrom( type );
}

@Override
protected final Object fromString( final String str, final Class<?> type ) throws ComponentConfigurationException
protected final Object fromString( final String str, final Class<?> type )
throws ComponentConfigurationException
{
return createTemporalFromString( str, type );
}

private Temporal createTemporalFromString( String value, final Class<?> type )
private Temporal createTemporalFromString( String value, final Class<?> type )
{
TemporalAccessor temporalAccessor;
try
try
{
temporalAccessor = DateTimeFormatter.ISO_OFFSET_DATE_TIME.parse( value );
}
Expand All @@ -67,11 +67,11 @@ private Temporal createTemporalFromString( String value, final Class<?> type )
if ( type.equals( LocalDate.class ) )
{
temporal = LocalDate.from( temporalAccessor );
}
}
else if ( type.equals( LocalDateTime.class ) )
{
temporal = LocalDateTime.from( temporalAccessor );
}
}
else if ( type.equals( LocalTime.class ) )
{
temporal = LocalTime.from( temporalAccessor );
Expand All @@ -88,7 +88,7 @@ else if ( type.equals( OffsetTime.class ) )
{
temporal = ZonedDateTime.from( temporalAccessor ).toOffsetDateTime().toOffsetTime();
}
else if ( type.equals(ZonedDateTime.class ) )
else if ( type.equals( ZonedDateTime.class ) )
{
temporal = ZonedDateTime.from( temporalAccessor );
}
Expand Down
12 changes: 8 additions & 4 deletions ...odehaus/plexus/component/configurator/converters/composite/ObjectWithFieldsConverter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,11 @@ public Object fromConfiguration( final ConverterLookup lookup, final PlexusConfi
}
else
{
new CompositeBeanHelper( lookup, loader, evaluator, listener ).setDefault( bean, value, configuration );
new CompositeBeanHelper( lookup, loader, evaluator, listener ).setDefault( bean, value,
configuration );
}
}
catch( ComponentConfigurationException e )
catch ( ComponentConfigurationException e )
{
// fallback: try with constructor taking single string
if ( configuration.getChildCount() == 0 && value instanceof String )
Expand All @@ -90,7 +91,9 @@ public Object fromConfiguration( final ConverterLookup lookup, final PlexusConfi
}
}

private Object fromConstructorTakingString( final Class<?> type, String value, ComponentConfigurationException precedingException ) throws ComponentConfigurationException
private Object fromConstructorTakingString( final Class<?> type, String value,
ComponentConfigurationException precedingException )
throws ComponentConfigurationException
{
try
{
Expand All @@ -114,7 +117,8 @@ private Object fromConstructorTakingString( final Class<?> type, String value, C
}
catch ( ReflectiveOperationException e )
{
ComponentConfigurationException cce = new ComponentConfigurationException( "Cannot create instance of " + type + " with public constructor having a single String argument", e );
ComponentConfigurationException cce = new ComponentConfigurationException( "Cannot create instance of "
+ type + " with public constructor having a single String argument", e );
if ( precedingException != null )
{
cce.addSuppressed( precedingException );
Expand Down
9 changes: 6 additions & 3 deletions org.eclipse.sisu.plexus/src/main/java/org/eclipse/sisu/plexus/PlexusAnnotatedMetadata.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,12 @@ private String interpolate( final String text )
return text;
}
// use same interpolation method as XML for sake of consistency
try ( Reader r = new InterpolationFilterReader( new StringReader( text ), variables ) ) {
return IOUtil.toString(r);
} catch ( IOException e ) {
try ( Reader r = new InterpolationFilterReader( new StringReader( text ), variables ) )
{
return IOUtil.toString( r );
}
catch ( IOException e )
{
return text; // should never actually happen, as no actual I/O involved
}
}
Expand Down
64 changes: 25 additions & 39 deletions ...pse.sisu.plexus/src/test/java/org/eclipse/sisu/plexus/BasicComponentConfiguratorTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,65 +75,51 @@ public void testTypeWithoutConverterButConstructorAcceptingString()
}

@Test
public void testTemporalConvertersWithoutMillisecondsAndOffset() throws ComponentConfigurationException
public void testTemporalConvertersWithoutMillisecondsAndOffset()
throws ComponentConfigurationException
{
TemporalComponent component = new TemporalComponent();
String dateString = "2023-01-02 03:04:05";
configure( component,
"localDateTime", dateString,
"localDate", dateString,
"localTime", dateString,
"instant", dateString,
"offsetDateTime", dateString,
"offsetTime", dateString,
"zonedDateTime", dateString );
assertEquals( LocalDateTime.of(2023, 1, 2, 3, 4, 5, 0), component.localDateTime );
assertEquals( LocalDate.of(2023, 1, 2), component.localDate );
assertEquals( LocalTime.of(3, 4, 5, 0), component.localTime );
configure( component, "localDateTime", dateString, "localDate", dateString, "localTime", dateString, "instant",
dateString, "offsetDateTime", dateString, "offsetTime", dateString, "zonedDateTime", dateString );
assertEquals( LocalDateTime.of( 2023, 1, 2, 3, 4, 5, 0 ), component.localDateTime );
assertEquals( LocalDate.of( 2023, 1, 2 ), component.localDate );
assertEquals( LocalTime.of( 3, 4, 5, 0 ), component.localTime );
ZoneOffset systemOffset = ZoneId.systemDefault().getRules().getOffset( component.localDateTime );
assertEquals( OffsetDateTime.of( component.localDateTime, systemOffset).toInstant(), component.instant );
assertEquals( OffsetDateTime.of( component.localDateTime, systemOffset), component.offsetDateTime );
assertEquals( OffsetDateTime.of( component.localDateTime, systemOffset ).toInstant(), component.instant );
assertEquals( OffsetDateTime.of( component.localDateTime, systemOffset ), component.offsetDateTime );
assertEquals( OffsetTime.of( component.localTime, systemOffset ), component.offsetTime );
assertEquals( ZonedDateTime.of( component.localDateTime, ZoneId.systemDefault() ), component.zonedDateTime );
}

@Test
public void testTemporalConvertersWithISO8601StringWithOffset() throws ComponentConfigurationException
public void testTemporalConvertersWithISO8601StringWithOffset()
throws ComponentConfigurationException
{
TemporalComponent component = new TemporalComponent();
String dateString = "2023-01-02T03:04:05.000000900+02:30";
configure( component,
"localDateTime", dateString,
"localDate", dateString,
"localTime", dateString,
"instant", dateString,
"offsetDateTime", dateString,
"offsetTime", dateString,
"zonedDateTime", dateString );
assertEquals( LocalDateTime.of(2023, 1, 2, 3, 4, 5, 900), component.localDateTime );
assertEquals( LocalDate.of(2023, 1, 2), component.localDate );
assertEquals( LocalTime.of(3, 4, 5, 900), component.localTime );
configure( component, "localDateTime", dateString, "localDate", dateString, "localTime", dateString, "instant",
dateString, "offsetDateTime", dateString, "offsetTime", dateString, "zonedDateTime", dateString );
assertEquals( LocalDateTime.of( 2023, 1, 2, 3, 4, 5, 900 ), component.localDateTime );
assertEquals( LocalDate.of( 2023, 1, 2 ), component.localDate );
assertEquals( LocalTime.of( 3, 4, 5, 900 ), component.localTime );
ZoneOffset offset = ZoneOffset.ofHoursMinutes( 2, 30 );
assertEquals( OffsetDateTime.of( component.localDateTime, offset).toInstant(), component.instant );
assertEquals( OffsetDateTime.of( component.localDateTime, offset), component.offsetDateTime );
assertEquals( OffsetDateTime.of( component.localDateTime, offset ).toInstant(), component.instant );
assertEquals( OffsetDateTime.of( component.localDateTime, offset ), component.offsetDateTime );
assertEquals( OffsetTime.of( component.localTime, offset ), component.offsetTime );
assertEquals( ZonedDateTime.of( component.localDateTime, offset ), component.zonedDateTime );
assertEquals( ZonedDateTime.of( component.localDateTime, offset ), component.zonedDateTime );
}

@Test
public void testTemporalConvertersWithInvalidString() throws ComponentConfigurationException
public void testTemporalConvertersWithInvalidString()
throws ComponentConfigurationException
{
TemporalComponent component = new TemporalComponent();
String dateString = "invalid";
assertThrows( ComponentConfigurationException.class,
() -> configure( component,
"localDateTime", dateString,
"localDate", dateString,
"localTime", dateString,
"instant", dateString,
"offsetDateTime", dateString,
"offsetTime", dateString,
"zonedDateTime", dateString ) );
assertThrows( ComponentConfigurationException.class,
() -> configure( component, "localDateTime", dateString, "localDate", dateString, "localTime",
dateString, "instant", dateString, "offsetDateTime", dateString, "offsetTime",
dateString, "zonedDateTime", dateString ) );
}

private void configure( Object component, String... keysAndValues )
Expand Down

0 comments on commit 99754c2

Please sign in to comment.