import org.sonar.server.platform.DefaultServerFileSystem;
import org.sonar.updatecenter.common.PluginReferential;
-import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
import java.io.File;
import java.io.IOException;
import java.util.Arrays;
import java.util.Map;
import java.util.Set;
-import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.collect.Iterables.transform;
import static com.google.common.collect.Lists.newArrayList;
import static java.lang.String.format;
INSTANCE;
@Override
- public String apply(@Nullable File file) {
- return checkNotNull(file).getName();
+ public String apply(@Nonnull File file) {
+ return file.getName();
}
}
}
import org.sonar.api.platform.PluginMetadata;
import org.sonar.api.utils.text.JsonWriter;
-import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
public class PluginWSCommons {
static final String PROPERTY_KEY = "key";
INSTANCE;
@Override
- public String apply(@Nullable PluginMetadata input) {
- if (input == null) {
- return null;
- }
+ public String apply(@Nonnull PluginMetadata input) {
return input.getName();
}
}
INSTANCE;
@Override
- public String apply(@Nullable PluginMetadata input) {
- if (input == null) {
- return null;
- }
+ public String apply(@Nonnull PluginMetadata input) {
return input.getKey();
}
}
import org.sonar.api.utils.SonarException;
import org.sonar.updatecenter.common.PluginManifest;
+import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.io.File;
import java.io.IOException;
import java.util.Arrays;
-import static com.google.common.base.Preconditions.checkNotNull;
-
public abstract class PluginJarInstaller implements BatchComponent, ServerComponent {
protected static final String FAIL_TO_INSTALL_PLUGIN = "Fail to install plugin: ";
private final Function<File, DefaultPluginMetadata> jarFileToCorePlugin = new Function<File, DefaultPluginMetadata>() {
@Override
- public DefaultPluginMetadata apply(@Nullable File file) {
- return extractMetadata(checkNotNull(file), true);
+ public DefaultPluginMetadata apply(@Nonnull File file) {
+ return extractMetadata(file, true);
}
};
private final Function<File, DefaultPluginMetadata> jarFileToPlugin = new Function<File, DefaultPluginMetadata>() {
@Override
- public DefaultPluginMetadata apply(@Nullable File file) {
- return extractMetadata(checkNotNull(file), false);
+ public DefaultPluginMetadata apply(@Nonnull File file) {
+ return extractMetadata(file, false);
}
};
}