[liferay-labs#7] Change ImportPackageManager API, now should manage P…

…ackages imports, Packages classpathExports
cgoncas · Oct 24, 2016 · 7975354 · 7975354
1 parent 986737c
commit 7975354
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 111 deletions.
diff --git a/.../com/liferay/arquillian/container/osgi/remote/processor/service/ImportPackageManager.java b/.../com/liferay/arquillian/container/osgi/remote/processor/service/ImportPackageManager.java
@@ -14,20 +14,16 @@
 
 package com.liferay.arquillian.container.osgi.remote.processor.service;
 
-import java.io.IOException;
-
-import java.util.Collection;
-import java.util.jar.Manifest;
+import aQute.bnd.osgi.Packages;
 
-import org.jboss.shrinkwrap.api.Archive;
+import java.io.IOException;
 
 /**
  * @author Cristina González
  */
 public interface ImportPackageManager {
 
-	public Manifest cleanRepeatedImports(
-			Manifest manifest, Collection<Archive<?>> auxiliaryArchives)
+	public void cleanImports(Packages imports, Packages classpathExports)
 		throws IOException;
 
 }
diff --git a/.../liferay/arquillian/container/osgi/remote/processor/service/ImportPackageManagerImpl.java b/.../liferay/arquillian/container/osgi/remote/processor/service/ImportPackageManagerImpl.java
@@ -14,133 +14,47 @@
 
 package com.liferay.arquillian.container.osgi.remote.processor.service;
 
-import aQute.bnd.osgi.Jar;
+import aQute.bnd.osgi.Descriptors;
+import aQute.bnd.osgi.Packages;
 
 import java.io.IOException;
-import java.io.InputStream;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.jar.Attributes;
-import java.util.jar.Manifest;
-
-import org.jboss.arquillian.core.api.Instance;
-import org.jboss.arquillian.core.api.annotation.Inject;
-import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.exporter.ZipExporter;
 
 /**
  * @author Cristina González
  */
 public class ImportPackageManagerImpl implements ImportPackageManager {
 
 	@Override
-	public Manifest cleanRepeatedImports(
-			Manifest manifest, Collection<Archive<?>> auxiliaryArchives)
+	public void cleanImports(Packages imports, Packages classpathExports)
 		throws IOException {
 
-		List<String> auxiliaryArchivesPackages = getAuxiliaryArchivesPackages(
-			auxiliaryArchives);
-
-		Attributes mainAttributes = manifest.getMainAttributes();
-
-		String importPackages = mainAttributes.getValue(IMPORT_PACKAGE);
-
-		mainAttributes.remove(new Attributes.Name(IMPORT_PACKAGE));
-
-		Map<String, Set<String>> importsWithDirectivesMap =
-			toImportsWithDirectivesMap(importPackages);
-
-		List<String> resultImports = new ArrayList<>();
-
-		for (String importValue : importsWithDirectivesMap.keySet()) {
-			if (auxiliaryArchivesPackages.contains(importValue)) {
-				continue;
-			}
-
-			StringBuilder sb = new StringBuilder();
-			sb.append(importValue);
+		Packages importsFiltered = new Packages();
 
-			for (String directive : importsWithDirectivesMap.get(importValue)) {
-				sb.append(";");
-				sb.append(directive);
+		for (Descriptors.PackageRef importPackage : imports.keySet()) {
+			if (classpathExports.containsKey(importPackage)) {
+				importsFiltered.put(importPackage);
 			}
-
-			resultImports.add(sb.toString());
 		}
 
-		ManifestManager manifestManager = _manifestManagerInstance.get();
-
-		manifest = manifestManager.putAttributeValue(
-			manifest, IMPORT_PACKAGE,
-			resultImports.toArray(new String[resultImports.size()]));
-
-		return manifest;
-	}
-
-	private List<String> getAuxiliaryArchivesPackages(
-			Collection<Archive<?>> auxiliaryArchives)
-		throws IOException {
-
-		List<String> packages = new ArrayList<>();
-
-		for (Archive auxiliaryArchive : auxiliaryArchives) {
-			ZipExporter zipExporter = auxiliaryArchive.as(ZipExporter.class);
-
-			InputStream auxiliaryArchiveInputStream =
-				zipExporter.exportAsInputStream();
-
-			Jar jar = new Jar(
-				auxiliaryArchive.getName(), auxiliaryArchiveInputStream);
+		//Clean imports in classpath
 
-			packages.addAll(jar.getPackages());
+		for (Descriptors.PackageRef packageRef : importsFiltered.keySet()) {
+			imports.remove(packageRef);
 		}
 
-		return packages;
-	}
-
-	private Map<String, Set<String>> toImportsWithDirectivesMap(
-		String importsInManifest) {
-
-		List<String> packageNamesWithDirectives = Arrays.asList(
-			importsInManifest.split(","));
-
-		Map<String, Set<String>> packagesNameToDirectives = new HashMap<>();
+		importsFiltered = new Packages();
 
-		for (String packageNameWithDirectives : packageNamesWithDirectives) {
-			LinkedList<String> packageNameAndDirectives = new LinkedList<>();
-
-			Collections.addAll(
-				packageNameAndDirectives, packageNameWithDirectives.split(";"));
-
-			String packageName = packageNameAndDirectives.pop();
-
-			Set<String> currentDirectives = packagesNameToDirectives.get(
-				packageName);
-
-			if (currentDirectives == null) {
-				currentDirectives = new HashSet<>();
+		for (Descriptors.PackageRef importPackage : imports.keySet()) {
+			if (importPackage.getPath().endsWith("~")) {
+				importsFiltered.put(importPackage);
 			}
+		}
 
-			currentDirectives.addAll(packageNameAndDirectives);
+		//Clean repeated imports
 
-			packagesNameToDirectives.put(packageName, currentDirectives);
+		for (Descriptors.PackageRef packageRef : importsFiltered.keySet()) {
+			imports.remove(packageRef);
 		}
-
-		return packagesNameToDirectives;
 	}
 
-	private static final String IMPORT_PACKAGE = "Import-Package";
-
-	@Inject
-	private Instance<ManifestManager> _manifestManagerInstance;
-
 }