add tests + cleaning

Author: lecousin

core.loaders/maven/src/main/java/net/lecousin/core/loaders/maven/MavenPOM.java

@@ -694,54 +694,39 @@ private Repository readRepository(XMLStreamReader xml) throws MavenPOMException,
 				} else if (xml.event.text.equals("url")) {
 					repo.url = xml.readInnerText().trim().asString();
 				} else if (xml.event.text.equals("releases")) {
-					readRepositoryReleases(xml, ctx, repo);
+					readRepositoryType(xml, ctx, repo, true);
 				} else if (xml.event.text.equals("snapshots")) {
-					readRepositorySnapshots(xml, ctx, repo);
+					readRepositoryType(xml, ctx, repo, false);
 				} else {
 					xml.closeElement();
 				}
 			} while (true);
 			return repo;
 		}
 
-		private void readRepositoryReleases(XMLStreamReader xml, ElementContext ctx, Repository repo)
-		throws XMLException, MavenPOMException, IOException {
-			if (xml.event.isClosed)
-				return;
-			do {
-				if (!xml.nextInnerElement(ctx)) {
-					if (!Type.END_ELEMENT.equals(xml.event.type))
-						throw new MavenPOMException(pomFile,
-							"Invalid POM: missing closing releases tag");
-					break;
-				}
-				if (xml.event.text.equals("enabled")) {
-					String s = xml.readInnerText().trim().asString();
-					if (s.equalsIgnoreCase("false"))
-						repo.releasesEnabled = false;
-				}
-			} while (true);
-		}
-
-		private void readRepositorySnapshots(XMLStreamReader xml, ElementContext ctx, Repository repo)
+		private void readRepositoryType(XMLStreamReader xml, ElementContext ctx, Repository repo, boolean isReleases)
 		throws XMLException, MavenPOMException, IOException {
 			if (xml.event.isClosed) return;
 			do {
 				if (!xml.nextInnerElement(ctx)) {
 					if (!Type.END_ELEMENT.equals(xml.event.type))
 						throw new MavenPOMException(pomFile,
-							"Invalid POM: missing closing snapshots tag");
+							"Invalid POM: missing closing " + (isReleases ? "releases" : "snapshots") + " tag");
 					break;
 				}
 				if (xml.event.text.equals("enabled")) {
 					String s = xml.readInnerText().trim().asString();
-					if (s.equalsIgnoreCase("false"))
-						repo.snapshotsEnabled = false;
+					if (s.equalsIgnoreCase("false")) {
+						if (isReleases)
+							repo.releasesEnabled = false;
+						else
+							repo.snapshotsEnabled = false;
+					}
 				}
 			} while (true);
 		}
 	}
-	
+
 	private class Finalize extends Task.Cpu<Void, NoException> {
 		public Finalize(AsyncSupplier<MavenPOM, LibraryManagementException> result, byte priority) {
 			super("Finalize POM loading", priority);

core.loaders/maven/src/test/java/net/lecousin/core/loaders/maven/tests/TestRemoteRepository.java

@@ -1,6 +1,7 @@
 package net.lecousin.core.loaders.maven.tests;
 
 import java.io.File;
+import java.net.URI;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.zip.ZipFile;
@@ -16,6 +17,10 @@
 import net.lecousin.framework.application.libraries.artifacts.LibraryDescriptor.Dependency;
 import net.lecousin.framework.concurrent.Task;
 import net.lecousin.framework.core.test.LCCoreAbstractTest;
+import net.lecousin.framework.io.FileIO;
+import net.lecousin.framework.io.IOUtil;
+import net.lecousin.framework.io.provider.IOProvider;
+import net.lecousin.framework.io.provider.IOProviderFromURI;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -192,5 +197,34 @@ public void testLoadFile() throws Exception {
 		Assert.assertNull(repo.loadFileSync("junit", "junit", junit.runner.Version.id(), null, "test-jar"));
 		Assert.assertNull(repo.loadFile("junit", "junit", junit.runner.Version.id(), null, "test-jar", Task.PRIORITY_NORMAL).blockResult(30000));
 	}
+	
+	@Test
+	public void testErrors() throws Exception {
+		File dir = new File("./target/test-remote");
+		dir.mkdirs();
+		testMetaDataError(dir, "error1", "not-metadata");
+		testMetaDataError(dir, "error1", "empty");
+	}
+	
+	private static void testMetaDataError(File repoDir, String groupId, String testName) throws Exception {
+		File dir = new File(repoDir + "/" + groupId + "/" + testName);
+		dir.mkdirs();
+		File outFile = new File(dir, "maven-metadata.xml");
+		outFile.createNewFile();
+		outFile.deleteOnExit();
+		try {
+			FileIO.WriteOnly out = new FileIO.WriteOnly(outFile, Task.PRIORITY_NORMAL);
+			IOUtil.copy(
+				((IOProvider.Readable)IOProviderFromURI.getInstance().get(new URI("classpath:test-maven/remote/error/" + testName + ".maven-metadata.xml"))).provideIOReadable(Task.PRIORITY_NORMAL),
+				out,
+				-1, true, null, 0).blockThrow(15000);
+			
+			MavenRemoteRepository repo = new MavenRemoteRepository(repoDir.toURI().toString(), true, true);
+			List<String> versions = repo.getAvailableVersions(groupId, testName, Task.PRIORITY_NORMAL).blockResult(0);
+			Assert.assertNull(versions);
+		} finally {
+			outFile.delete();
+		}
+	}
 
 }

core.loaders/maven/src/test/resources/test-maven/remote/error/empty.maven-metadata.xml

@@ -0,0 +1,3 @@
+<hello>
+	<world/>
+</hello>

core.loaders/maven/src/test/resources/test-maven/remote/error/not-metadata.maven-metadata.xml

@@ -1,3 +1,4 @@
+<!-- we can have a comment at the beginning -->
 <settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
@@ -20,4 +21,9 @@
       </activation>
     </profile>
   </profiles>
-</settings>
+  
+  <activeProfiles>
+  	<unknown/>
+  </activeProfiles>
+</settings>
+<!-- we can have a comment at the end -->

core.loaders/maven/src/test/resources/test-maven/settings.xml

@@ -168,22 +168,11 @@ public void run() {
 		}
 
 		private void loadPoweredBy() {
-			int pos = 0;
-			int size = 4363;
-			byte[] buffer = new byte[size];
-			try (InputStream in = getClass().getClassLoader().getResourceAsStream("net/lecousin/framework/core/logo_110x40.png")) {
-				do {
-					int nb = in.read(buffer, pos, size - pos);
-					if (nb <= 0) break;
-					pos += nb;
-				} while (pos < size);
-			} catch (IOException e) {
-				// ignore, no logo
-			}
-			if (pos == size) {
+			ImageIcon image = loadImage("logo_110x40.png", 4363);
+			if (image != null) {
 				synchronized (SplashScreen.this) {
 					if (win != null)
-						poweredBy = new ImageIcon(buffer);
+						poweredBy = image;
 				}
 			}
 		}
@@ -263,13 +252,11 @@ public synchronized void setLogo(ImageIcon logo, boolean isCustom) {
 		this.isCustomLogo = isCustom;
 		update();
 	}
-
-	/** Load the default logo. */
-	public void loadDefaultLogo() {
+	
+	private ImageIcon loadImage(String filename, int size) {
 		int pos = 0;
-		int size = 18296;
 		byte[] buffer = new byte[size];
-		try (InputStream in = getClass().getClassLoader().getResourceAsStream("net/lecousin/framework/core/logo_200x200.png")) {
+		try (InputStream in = getClass().getClassLoader().getResourceAsStream("net/lecousin/framework/core/" + filename)) {
 			do {
 				int nb = in.read(buffer, pos, size - pos);
 				if (nb <= 0) break;
@@ -279,7 +266,15 @@ public void loadDefaultLogo() {
 			// ignore, no logo
 		}
 		if (pos == size)
-			setLogo(new ImageIcon(buffer), false);
+			return new ImageIcon(buffer);
+		return null;
+	}
+
+	/** Load the default logo. */
+	public void loadDefaultLogo() {
+		ImageIcon image = loadImage("logo_200x200.png", 18296);
+		if (image != null)
+			setLogo(image, false);
 	}
 
 	/** Show application name. */

net.lecousin.core/src/main/java/net/lecousin/framework/application/SplashScreen.java

@@ -232,18 +232,7 @@ public boolean containsAll(Collection<?> c) {
 
 	@Override
 	public T get(int index) {
-		if (head == null) throw new IndexOutOfBoundsException(Integer.toString(index));
-		if (index < 0) throw new IndexOutOfBoundsException(Integer.toString(index));
-		Array<T> a = head;
-		int i = 0;
-		while (i + a.size <= index && a.next != null) {
-			i += a.size;
-			a = a.next;
-		}
-		i = index - i;
-		if (i >= a.size)
-			throw new IndexOutOfBoundsException(Integer.toString(index));
-		return a.elements[i];
+		return getlong(index);
 	}
 
 	/** Get an element using a long index. */
@@ -300,20 +289,7 @@ private void shiftLeft(Array<T> a, int i) {
 
 	@Override
 	public T remove(int index) {
-		if (head == null) throw new IndexOutOfBoundsException(Integer.toString(index));
-		if (index < 0) throw new IndexOutOfBoundsException(Integer.toString(index));
-		Array<T> a = head;
-		int i = 0;
-		while (i + a.size <= index && a.next != null) {
-			i += a.size;
-			a = a.next;
-		}
-		i = index - i;
-		if (i >= a.size) throw new IndexOutOfBoundsException(Integer.toString(index));
-		T element = a.elements[i];
-		shiftLeft(a, i);
-		size--;
-		return element;
+		return removelong(index);
 	}
 
 	@Override

net.lecousin.core/src/main/java/net/lecousin/framework/collections/LinkedArrayList.java

@@ -0,0 +1,29 @@
+package net.lecousin.framework.event;
+
+import java.util.ArrayList;
+import java.util.function.Consumer;
+
+/** Abstract class implementing Listenable, containing 2 lists of listeners.
+ * @param <T> type of event
+ */
+public abstract class AbstractListenable<T> extends AbstractSimpleListenable implements Listenable<T> {
+
+	protected ArrayList<Consumer<T>> listenersConsumer = null;
+
+	@Override
+	public synchronized void addListener(Consumer<T> listener) {
+		if (listenersConsumer == null) listenersConsumer = new ArrayList<>(5);
+		listenersConsumer.add(listener);
+	}
+	
+	@Override
+	public synchronized void removeListener(Consumer<T> listener) {
+		if (listenersConsumer == null) return;
+		listenersConsumer.remove(listener);
+		if (listenersConsumer.isEmpty()) listenersConsumer = null;
+	}
+	
+	@Override
+	public boolean hasListeners() { return listenersConsumer != null || listenersRunnable != null; }
+	
+}

net.lecousin.core/src/main/java/net/lecousin/framework/event/AbstractListenable.java

@@ -0,0 +1,26 @@
+package net.lecousin.framework.event;
+
+import java.util.ArrayList;
+
+/** Abstract class implementaing SimpleListenable, containing a list of listeners. */
+public abstract class AbstractSimpleListenable implements SimpleListenable {
+
+	protected ArrayList<Runnable> listenersRunnable = null;
+
+	@Override
+	public synchronized void addListener(Runnable listener) {
+		if (listenersRunnable == null) listenersRunnable = new ArrayList<>(5);
+		listenersRunnable.add(listener);
+	}
+
+	@Override
+	public synchronized void removeListener(Runnable listener) {
+		if (listenersRunnable == null) return;
+		listenersRunnable.remove(listener);
+		if (listenersRunnable.isEmpty()) listenersRunnable = null;
+	}
+
+	@Override
+	public boolean hasListeners() { return listenersRunnable != null; }
+	
+}

net.lecousin.core/src/main/java/net/lecousin/framework/event/AbstractSimpleListenable.java

@@ -9,47 +9,15 @@
  * An event allows to call listeners that previously registered themselves when the event is fired.
  * @param <T> type of data fired with the event
  */
-public class Event<T> implements Listenable<T> {
+public class Event<T> extends AbstractListenable<T> {
 
-	private ArrayList<Consumer<T>> listeners = null;
-	private ArrayList<Runnable> listenersRunnable = null;
-
-	@Override
-	public synchronized void addListener(Consumer<T> listener) {
-		if (listeners == null) listeners = new ArrayList<>(5);
-		listeners.add(listener);
-	}
-
-	@Override
-	public synchronized void addListener(Runnable listener) {
-		if (listenersRunnable == null) listenersRunnable = new ArrayList<>(5);
-		listenersRunnable.add(listener);
-	}
-	
-	@Override
-	public synchronized void removeListener(Consumer<T> listener) {
-		if (listeners == null) return;
-		listeners.remove(listener);
-		if (listeners.isEmpty()) listeners = null;
-	}
-
-	@Override
-	public synchronized void removeListener(Runnable listener) {
-		if (listenersRunnable == null) return;
-		listenersRunnable.remove(listener);
-		if (listenersRunnable.isEmpty()) listenersRunnable = null;
-	}
-	
-	@Override
-	public boolean hasListeners() { return listeners != null || listenersRunnable != null; }
-	
 	/** Fire the event (call the listeners). */
 	public void fire(T event) {
 		ArrayList<Consumer<T>> list1;
 		ArrayList<Runnable> list2;
 		synchronized (this) {
-			if (listeners == null) list1 = null;
-			else list1 = new ArrayList<>(listeners);
+			if (listenersConsumer == null) list1 = null;
+			else list1 = new ArrayList<>(listenersConsumer);
 			if (listenersRunnable == null) list2 = null;
 			else list2 = new ArrayList<>(listenersRunnable);
 		}