Skip to content

Commit 622b42f

Browse files
michael-simonsmichael-simons
authored
refactor: Polish assertj bits, optimise source pattern URL.
1 parent 958e5cf commit 622b42f

File tree

2 files changed

+40
-40
lines changed

2 files changed

+40
-40
lines changed

‎src/main/java/ac/simons/spring/boot/wro4j/processors/RemoveSourceMapsProcessor.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ public class RemoveSourceMapsProcessor implements ResourcePreProcessor {
3838
/**
3939
* Pattern to match sourceMappingUrls.
4040
*/
41-
public static final Pattern SOURCE_MAP_PATTERN = Pattern.compile("^/[*/]?[#@] sourceMappingURL=.+(?:\\s+\\*/)?$");
41+
public static final Pattern SOURCE_MAP_PATTERN = Pattern
42+
.compile("^/[*/]?[#@] sourceMappingURL=[\\S]++(?:\\s++\\*/)?$");
4243

4344
@Override
4445
public void process(Resource resource, Reader reader, Writer writer) throws IOException {

‎src/test/java/ac/simons/spring/boot/wro4j/Wro4jAutoConfigurationTests.java‎

Lines changed: 38 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
*/
1616
package ac.simons.spring.boot.wro4j;
1717

18-
import java.util.Arrays;
1918
import java.util.Collection;
19+
import java.util.List;
2020
import java.util.Optional;
2121
import java.util.Properties;
2222

@@ -68,35 +68,35 @@ void processorsFactoryShouldWork() {
6868
final WroManagerFactoryProperties managerFactory = new WroManagerFactoryProperties();
6969
wro4jProperties.setManagerFactory(managerFactory);
7070
processorsFactory = wro4jAutoConfiguration.processorsFactory(wro4jProperties);
71-
assertThat(processorsFactory instanceof ConfigurableProcessorsFactory).isTrue();
72-
assertThat(processorsFactory.getPreProcessors().isEmpty()).isTrue();
73-
assertThat(processorsFactory.getPostProcessors().isEmpty()).isTrue();
71+
assertThat(processorsFactory).isInstanceOf(ConfigurableProcessorsFactory.class);
72+
assertThat(processorsFactory.getPreProcessors()).isEmpty();
73+
assertThat(processorsFactory.getPostProcessors()).isEmpty();
7474

7575
managerFactory.setPreProcessors("semicolonAppender");
7676
managerFactory.setPostProcessors("jsMin");
7777

7878
processorsFactory = wro4jAutoConfiguration.processorsFactory(wro4jProperties);
79-
assertThat(processorsFactory instanceof ConfigurableProcessorsFactory).isTrue();
80-
assertThat(processorsFactory.getPreProcessors().size()).isEqualTo(1);
81-
assertThat(processorsFactory.getPreProcessors().iterator().next() instanceof SemicolonAppenderPreProcessor)
82-
.isTrue();
83-
assertThat(processorsFactory.getPostProcessors().size()).isEqualTo(1);
79+
assertThat(processorsFactory).isInstanceOf(ConfigurableProcessorsFactory.class);
80+
assertThat(processorsFactory.getPreProcessors()).hasSize(1);
81+
assertThat(processorsFactory.getPreProcessors().iterator().next())
82+
.isInstanceOf(SemicolonAppenderPreProcessor.class);
83+
assertThat(processorsFactory.getPostProcessors()).hasSize(1);
8484
assertThat(((ProcessorDecorator) processorsFactory.getPostProcessors().iterator().next())
8585
.getDecoratedObject() instanceof JSMinProcessor).isTrue();
8686

8787
wro4jProperties.setManagerFactory(null);
8888
processorsFactory = wro4jAutoConfiguration.processorsFactory(wro4jProperties);
89-
assertThat(processorsFactory instanceof DefaultProcessorsFactory).isTrue();
89+
assertThat(processorsFactory).isInstanceOf(DefaultProcessorsFactory.class);
9090

91-
wro4jProperties.setPreProcessors(Arrays.asList(SemicolonAppenderPreProcessor.class));
92-
wro4jProperties.setPostProcessors(Arrays.asList(JSMinProcessor.class));
91+
wro4jProperties.setPreProcessors(List.of(SemicolonAppenderPreProcessor.class));
92+
wro4jProperties.setPostProcessors(List.of(JSMinProcessor.class));
9393
processorsFactory = wro4jAutoConfiguration.processorsFactory(wro4jProperties);
9494
assertThat(processorsFactory instanceof SimpleProcessorsFactory).isTrue();
95-
assertThat(processorsFactory.getPreProcessors().size()).isEqualTo(1);
96-
assertThat(processorsFactory.getPreProcessors().iterator().next() instanceof SemicolonAppenderPreProcessor)
97-
.isTrue();
98-
assertThat(processorsFactory.getPostProcessors().size()).isEqualTo(1);
99-
assertThat(processorsFactory.getPostProcessors().iterator().next() instanceof JSMinProcessor).isTrue();
95+
assertThat(processorsFactory.getPreProcessors()).hasSize(1);
96+
assertThat(processorsFactory.getPreProcessors().iterator().next())
97+
.isInstanceOf(SemicolonAppenderPreProcessor.class);
98+
assertThat(processorsFactory.getPostProcessors()).hasSize(1);
99+
assertThat(processorsFactory.getPostProcessors().iterator().next()).isInstanceOf(JSMinProcessor.class);
100100
}
101101

102102
@Test
@@ -118,23 +118,23 @@ void wroFilterPropertiesShouldWork() {
118118
Properties p;
119119

120120
p = new Wro4jAutoConfiguration(this.applicationContext, Optional.empty()).wroFilterProperties(wro4jProperties);
121-
assertThat(p.get(ConfigConstants.debug.name())).isEqualTo("true");
122-
assertThat(p.get(ConfigConstants.minimizeEnabled.name())).isEqualTo("true");
123-
assertThat(p.get(ConfigConstants.gzipResources.name())).isEqualTo("true");
124-
assertThat(p.get(ConfigConstants.resourceWatcherUpdatePeriod.name())).isEqualTo("0");
125-
assertThat(p.get(ConfigConstants.resourceWatcherAsync.name())).isEqualTo("false");
126-
assertThat(p.get(ConfigConstants.cacheUpdatePeriod.name())).isEqualTo("0");
127-
assertThat(p.get(ConfigConstants.modelUpdatePeriod.name())).isEqualTo("0");
128-
assertThat(p.get(ConfigConstants.header.name())).isNull();
129-
assertThat(p.get(ConfigConstants.parallelPreprocessing.name())).isEqualTo("false");
130-
assertThat(p.get(ConfigConstants.connectionTimeout.name())).isEqualTo("2000");
131-
assertThat(p.get(ConfigConstants.encoding.name())).isEqualTo("UTF-8");
132-
assertThat(p.get(ConfigConstants.ignoreMissingResources.name())).isEqualTo("true");
133-
assertThat(p.get(ConfigConstants.ignoreEmptyGroup.name())).isEqualTo("true");
134-
assertThat(p.get(ConfigConstants.ignoreFailingProcessor.name())).isEqualTo("false");
135-
assertThat(p.get(ConfigConstants.cacheGzippedContent.name())).isEqualTo("true");
136-
assertThat(p.get(ConfigConstants.jmxEnabled.name())).isEqualTo("false");
137-
assertThat(p.get(ConfigConstants.mbeanName.name())).isNull();
121+
assertThat(p).containsEntry(ConfigConstants.debug.name(), "true");
122+
assertThat(p).containsEntry(ConfigConstants.minimizeEnabled.name(), "true");
123+
assertThat(p).containsEntry(ConfigConstants.gzipResources.name(), "true");
124+
assertThat(p).containsEntry(ConfigConstants.resourceWatcherUpdatePeriod.name(), "0");
125+
assertThat(p).containsEntry(ConfigConstants.resourceWatcherAsync.name(), "false");
126+
assertThat(p).containsEntry(ConfigConstants.cacheUpdatePeriod.name(), "0");
127+
assertThat(p).containsEntry(ConfigConstants.modelUpdatePeriod.name(), "0");
128+
assertThat(p).doesNotContainKey(ConfigConstants.header.name());
129+
assertThat(p).containsEntry(ConfigConstants.parallelPreprocessing.name(), "false");
130+
assertThat(p).containsEntry(ConfigConstants.connectionTimeout.name(), "2000");
131+
assertThat(p).containsEntry(ConfigConstants.encoding.name(), "UTF-8");
132+
assertThat(p).containsEntry(ConfigConstants.ignoreMissingResources.name(), "true");
133+
assertThat(p).containsEntry(ConfigConstants.ignoreEmptyGroup.name(), "true");
134+
assertThat(p).containsEntry(ConfigConstants.ignoreFailingProcessor.name(), "false");
135+
assertThat(p).containsEntry(ConfigConstants.cacheGzippedContent.name(), "true");
136+
assertThat(p).containsEntry(ConfigConstants.jmxEnabled.name(), "false");
137+
assertThat(p).doesNotContainKey(ConfigConstants.mbeanName.name());
138138

139139
wro4jProperties.setResourceWatcherUpdatePeriod(null);
140140
wro4jProperties.setCacheUpdatePeriod(null);
@@ -156,9 +156,9 @@ void wroFilterPropertiesShouldWork() {
156156
wro4jProperties.setEncoding("ISO-8859-1");
157157
wro4jProperties.setMbeanName("wro4j-bean");
158158
p = new Wro4jAutoConfiguration(this.applicationContext, Optional.empty()).wroFilterProperties(wro4jProperties);
159-
assertThat(p.get(ConfigConstants.header.name())).isEqualTo(wro4jProperties.getHeader());
160-
assertThat(p.get(ConfigConstants.encoding.name())).isEqualTo(wro4jProperties.getEncoding());
161-
assertThat(p.get(ConfigConstants.mbeanName.name())).isEqualTo(wro4jProperties.getMbeanName());
159+
assertThat(p).containsEntry(ConfigConstants.header.name(), wro4jProperties.getHeader());
160+
assertThat(p).containsEntry(ConfigConstants.encoding.name(), wro4jProperties.getEncoding());
161+
assertThat(p).containsEntry(ConfigConstants.mbeanName.name(), wro4jProperties.getMbeanName());
162162

163163
wro4jProperties.setEncoding(null);
164164
p = new Wro4jAutoConfiguration(this.applicationContext, Optional.empty()).wroFilterProperties(wro4jProperties);
@@ -173,8 +173,7 @@ void wro4jFilterRegistrationShouldWork() {
173173
Optional.empty())
174174
.wro4jFilterRegistration(wroFilter, new Wro4jProperties());
175175
final Collection<String> urlPatterns = filterRegistrationBean.getUrlPatterns();
176-
assertThat(urlPatterns.size()).isEqualTo(1);
177-
assertThat(urlPatterns.iterator().next()).isEqualTo("/wro4j/*");
176+
assertThat(urlPatterns).hasSize(1).first().isEqualTo("/wro4j/*");
178177
}
179178

180179
}

0 commit comments

Comments
 (0)