Perform clean code of bundles/org.eclipse.equinox.p2.publisher

Author: eclipse-equinox-bot

bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/AbstractPublisherAction.java

@@ -213,8 +213,7 @@ protected String createCUIdString(String id, String type, String flavor, String
 	protected Collection<IRequirement> createIURequirements(Collection<? extends IVersionedId> children) {
 		ArrayList<IRequirement> result = new ArrayList<>(children.size());
 		for (IVersionedId next : children) {
-			if (next instanceof IInstallableUnit) {
-				IInstallableUnit iu = (IInstallableUnit) next;
+			if (next instanceof IInstallableUnit iu) {
 				VersionRange range = new VersionRange(iu.getVersion(), true, iu.getVersion(), true);
 				result.add(MetadataFactory.createRequirement(IInstallableUnit.NAMESPACE_IU_ID, iu.getId(), range,
 						iu.getFilter() == null ? null : iu.getFilter(), false, false));
@@ -471,11 +470,10 @@ protected static void processCapabilityAdvice(InstallableUnitDescription iu, IPu
 	}
 
 	protected static IRequiredCapability toRequiredCapability(IRequirement requirement) {
-		if (!(requirement instanceof IRequiredCapability)) {
+		if (!(requirement instanceof IRequiredCapability requiredCapability)) {
 			return null;
 		}
 
-		IRequiredCapability requiredCapability = (IRequiredCapability) requirement;
 		if (!RequiredCapability.isVersionRangeRequirement(requiredCapability.getMatches())) {
 			return null;
 		}

bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/actions/RootIUAction.java

@@ -141,8 +141,7 @@ private Collection<? extends IVersionedId> getChildren(IPublisherResult result)
 				for (Object object : list) {
 					// if the advice is a string, look it up in the result.  if not there then 
 					// query the known metadata repos
-					if (object instanceof String) {
-						String childId = (String) object;
+					if (object instanceof String childId) {
 						IInstallableUnit iu = queryForIU(result, childId, getVersionAdvice(childId));
 						if (iu != null) {
 							children.add(iu);

bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/actions/VersionAdvice.java

@@ -109,10 +109,9 @@ public void setVersion(String namespace, String id, Version version) {
 	}
 
 	public IPublisherAdvice merge(IPublisherAdvice advice) {
-		if (!(advice instanceof VersionAdvice)) {
+		if (!(advice instanceof VersionAdvice source)) {
 			return this;
 		}
-		VersionAdvice source = (VersionAdvice) advice;
 		for (String namespace : source.versions.keySet()) {
 			Map<String, Version> myValues = versions.get(namespace);
 			Map<String, Version> sourceValues = source.versions.get(namespace);