refactoring

Author: raydac

jcp/pom.xml

@@ -380,6 +380,10 @@
                 <filter>
                   <artifact>*:*</artifact>
                   <excludes>
+                    <exclude>META-INF/LICENSE.txt</exclude>
+                    <exclude>META-INF/NOTICE.txt</exclude>
+                    <exclude>META-INF/MANIFEST.MF</exclude>
+                    <exclude>META-INF/MANIFEST.txt</exclude>
                     <exclude>META-INF/*.SF</exclude>
                     <exclude>META-INF/*.DSA</exclude>
                     <exclude>META-INF/*.RSA</exclude>

jcp/src/main/java/com/igormaznitsa/jcp/context/PreprocessorContext.java

@@ -127,13 +127,13 @@ public PreprocessorContext(final File baseDir) {
     this.preprocessedResources = new ArrayList<>();
     this.activatedConfigFiles = new ArrayList<>();
     this.baseDir = Objects.requireNonNull(baseDir, "Base folder must not be null");
-    this.preprocessingState
-        .set(new PreprocessingState(this, this.sourceEncoding, this.targetEncoding));
-    setSources(DEFAULT_SOURCE_DIRECTORY).setTarget(new File(DEFAULT_DEST_DIRECTORY));
-    registerSpecialVariableProcessor(new JCPSpecialVariableProcessor());
-    registerSpecialVariableProcessor(new EnvironmentVariableProcessor());
+    this.setSources(DEFAULT_SOURCE_DIRECTORY).setTarget(new File(DEFAULT_DEST_DIRECTORY));
+    this.registerSpecialVariableProcessor(new JCPSpecialVariableProcessor());
+    this.registerSpecialVariableProcessor(new EnvironmentVariableProcessor());
     this.cloned = false;
     this.currentInCloneSource = null;
+    this.preprocessingState
+            .set(new PreprocessingState(this, this.sourceEncoding, this.targetEncoding));
   }
 
   /**

jcp/src/test/java/com/igormaznitsa/jcp/cmdline/ExcludeFoldersHandlerTest.java

@@ -54,7 +54,7 @@ public void testExecution() throws Exception {
 
     assertTrue(HANDLER.processCommandLineKey("/ed:testdir/**/hd" + File.pathSeparator + "zoom" + File.pathSeparator + "g?df", mock));
 
-    final ArgumentCaptor<List> captor = ArgumentCaptor.forClass(List.class);
+    final ArgumentCaptor<List<String>> captor = ArgumentCaptor.forClass(List.class);
 
     verify(mock).setExcludeFolders(captor.capture());
     assertArrayEquals(new String[] {"testdir/**/hd", "zoom", "g?df"}, captor.getValue().toArray(new String[0]));

jcp/src/test/java/com/igormaznitsa/jcp/context/PreprocessorContextTest.java

@@ -52,9 +52,9 @@ public class PreprocessorContextTest {
 
   private static final Random RND = new Random(776655);
 
-  private static Set<Field> extractDeclaredNonStaticNonFinalFields(final Class<?> klazz) throws Exception {
+  private static Set<Field> extractDeclaredNonStaticNonFinalFields(final Class<?> targetClass) {
     final Set<Field> result = new HashSet<>();
-    for (final Field f : PreprocessorContext.class.getDeclaredFields()) {
+    for (final Field f : targetClass.getDeclaredFields()) {
       if ((f.getModifiers() & (Modifier.STATIC | Modifier.FINAL)) != 0) {
         continue;
       }
@@ -150,7 +150,7 @@ private static void assertPreprocessorContextMaps(final PreprocessorContext etal
     assertEquals(4, detected);
   }
 
-  private static void assertContextEquals(final Map<Field, Object> etalon, final Map<Field, Object> value) throws Exception {
+  private static void assertContextEquals(final Map<Field, Object> etalon, final Map<Field, Object> value) {
     assertEquals("Must have same number of elements", etalon.size(), value.size());
 
     for (final Field f : etalon.keySet()) {
@@ -168,6 +168,7 @@ private static String randomString() {
     return result.toString();
   }
 
+  @SuppressWarnings("unchecked")
   private static void fillByRandomValues(final PreprocessorContext context) throws Exception {
 
     for (final Field f : extractDeclaredNonStaticNonFinalFields(PreprocessorContext.class)) {
@@ -207,7 +208,6 @@ private static void fillByRandomValues(final PreprocessorContext context) throws
         try {
           f.set(context, new HashSet<>(Arrays.asList(arr)));
         } catch (Exception ex) {
-          ex.printStackTrace();
           fail("Can't set value to '" + f.getName() + '\'');
         }
       } else if (type == Charset.class) {