more cleanup in the core section.
Change-Id: I2a7b457b7634cc5d27b3a55eeeb0087f1096c836
Signed-off-by: Jacques Bouthillier <lmcbout@gmail.com>
diff --git a/org.eclipse.egerrit.core/src/org/eclipse/egerrit/internal/core/GerritFactory.java b/org.eclipse.egerrit.core/src/org/eclipse/egerrit/internal/core/GerritFactory.java
index 4a3a266..ac82a31 100644
--- a/org.eclipse.egerrit.core/src/org/eclipse/egerrit/internal/core/GerritFactory.java
+++ b/org.eclipse.egerrit.core/src/org/eclipse/egerrit/internal/core/GerritFactory.java
@@ -108,7 +108,7 @@
default:
// Downgrade the version as per logic above
- if (!workVersion.getQualifier().equals("")) { //$NON-NLS-1$
+ if (!workVersion.getQualifier().isEmpty()) {
// Remove [qualifier]
workVersion = new Version(version.getMajor(), version.getMinor(), version.getMicro(), null);
} else if (workVersion.getMicro() > 0) {
diff --git a/org.eclipse.egerrit.core/src/org/eclipse/egerrit/internal/core/GerritHttpClient.java b/org.eclipse.egerrit.core/src/org/eclipse/egerrit/internal/core/GerritHttpClient.java
index 763d034..1d4200d 100644
--- a/org.eclipse.egerrit.core/src/org/eclipse/egerrit/internal/core/GerritHttpClient.java
+++ b/org.eclipse.egerrit.core/src/org/eclipse/egerrit/internal/core/GerritHttpClient.java
@@ -316,7 +316,7 @@
* @return
*/
private List<NameValuePair> getAuthParams(boolean dev) {
- List<NameValuePair> params = new ArrayList<NameValuePair>();
+ List<NameValuePair> params = new ArrayList<>();
String userName = fCredentials.getUsername();
if (dev) {
String field = "user_name"; //$NON-NLS-1$
@@ -427,7 +427,7 @@
if (header != null) {
HeaderElement[] elements = header.getElements();
for (HeaderElement headerElement : elements) {
- if (headerElement.getName().equals("XSRF_TOKEN")) { //$NON-NLS-1$
+ if (("XSRF_TOKEN").equals(headerElement.getName())) { //$NON-NLS-1$
fKey = headerElement.getValue();
gotKey = true;
}
diff --git a/org.eclipse.egerrit.core/src/org/eclipse/egerrit/internal/core/command/BaseCommand.java b/org.eclipse.egerrit.core/src/org/eclipse/egerrit/internal/core/command/BaseCommand.java
index 60972eb..dc913e1 100644
--- a/org.eclipse.egerrit.core/src/org/eclipse/egerrit/internal/core/command/BaseCommand.java
+++ b/org.eclipse.egerrit.core/src/org/eclipse/egerrit/internal/core/command/BaseCommand.java
@@ -58,6 +58,8 @@
private static final Logger logger = LoggerFactory.getLogger(BaseCommand.class);
+ private static final String UNIVERSAL_CHARSET = "UTF-8"; //$NON-NLS-1$
+
private HttpRequestBase request;
private GerritRepository server;
@@ -114,7 +116,7 @@
GsonBuilder builder = new GsonBuilder();
builder.registerTypeAdapterFactory(new EMFTypeAdapterFactory());
Gson gson = builder.create();
- InputStreamReader reader = new InputStreamReader(myEntity.getContent(), "UTF-8");//$NON-NLS-1$
+ InputStreamReader reader = new InputStreamReader(myEntity.getContent(), UNIVERSAL_CHARSET);
return gson.fromJson(reader, fResultType);
}
@@ -243,7 +245,7 @@
private void setInput() {
if (input != null) {
if (request instanceof HttpEntityEnclosingRequestBase) {
- StringEntity entity = new StringEntity(new Gson().toJson(input), "UTF-8"); //$NON-NLS-1$
+ StringEntity entity = new StringEntity(new Gson().toJson(input), UNIVERSAL_CHARSET);
entity.setContentType(new BasicHeader(HTTP.CONTENT_TYPE, BaseCommand.JSON_HEADER));
((HttpEntityEnclosingRequestBase) request).setEntity(entity);
} else {
@@ -297,7 +299,7 @@
protected void setSegmentToEncode(String key, String value) {
try {
- parameters.put(key, URLEncoder.encode(value, "UTF-8")); //$NON-NLS-1$
+ parameters.put(key, URLEncoder.encode(value, UNIVERSAL_CHARSET));
} catch (UnsupportedEncodingException e) {
logger.debug("Can't URL encode value: " + value); //$NON-NLS-1$
throw new IllegalArgumentException(e);
diff --git a/org.eclipse.egerrit.core/src/org/eclipse/egerrit/internal/core/command/EMFTypeAdapterFactory.java b/org.eclipse.egerrit.core/src/org/eclipse/egerrit/internal/core/command/EMFTypeAdapterFactory.java
index 4b39d97..1e6f13c 100644
--- a/org.eclipse.egerrit.core/src/org/eclipse/egerrit/internal/core/command/EMFTypeAdapterFactory.java
+++ b/org.eclipse.egerrit.core/src/org/eclipse/egerrit/internal/core/command/EMFTypeAdapterFactory.java
@@ -64,14 +64,14 @@
private EClass toEClass() {
EClassifier classifier = ModelPackage.eINSTANCE.getEClassifier(
expectedType.getTypeName().substring(expectedType.getTypeName().lastIndexOf('.') + 1));
- return ((EClass) classifier);
+ return (EClass) classifier;
}
private EStructuralFeature getAttributeWithName(EClass eclass, String name) {
return eclass.getEStructuralFeature(name);
}
- private TypeAdapter getTypeAdapter(EObject instance, EStructuralFeature feature) {
+ private TypeAdapter<?> getTypeAdapter(EObject instance, EStructuralFeature feature) {
if (!feature.isMany()) {
return gson.getAdapter(feature.getEType().getInstanceClass());
}
@@ -135,7 +135,7 @@
@Override
public void write(JsonWriter out, EObject value) throws IOException {
- new UnsupportedOperationException("Serialization is not supported"); //$NON-NLS-1$
+ throw new UnsupportedOperationException("Serialization is not supported"); //$NON-NLS-1$
}
}
diff --git a/org.eclipse.egerrit.core/src/org/eclipse/egerrit/internal/core/command/GetDiffCommand.java b/org.eclipse.egerrit.core/src/org/eclipse/egerrit/internal/core/command/GetDiffCommand.java
index 6304b91..30043d1 100644
--- a/org.eclipse.egerrit.core/src/org/eclipse/egerrit/internal/core/command/GetDiffCommand.java
+++ b/org.eclipse.egerrit.core/src/org/eclipse/egerrit/internal/core/command/GetDiffCommand.java
@@ -26,9 +26,9 @@
public GetDiffCommand(GerritRepository gerritRepository, String changeId, String revisionId, String fileName,
int base) {
- super(gerritRepository, AuthentificationRequired.NO, HttpGet.class, DiffInfo.class, changeId, revisionId,
+ super( gerritRepository, AuthentificationRequired.NO, HttpGet.class, DiffInfo.class, changeId, revisionId,
fileName);
- setSegment("baseRevision", Integer.toString(base));
+ setSegment("baseRevision", Integer.toString(base)); //$NON-NLS-1$
if (base == 0) {
setPathFormat("/changes/{change-id}/revisions/{revision-id}/files/{file-id}/diff?context=ALL&intraline"); //$NON-NLS-1$
diff --git a/org.eclipse.egerrit.core/src/org/eclipse/egerrit/internal/core/command/NoResult.java b/org.eclipse.egerrit.core/src/org/eclipse/egerrit/internal/core/command/NoResult.java
index 3548422..2517d77 100644
--- a/org.eclipse.egerrit.core/src/org/eclipse/egerrit/internal/core/command/NoResult.java
+++ b/org.eclipse.egerrit.core/src/org/eclipse/egerrit/internal/core/command/NoResult.java
@@ -14,6 +14,6 @@
/**
* Place holder type for commands that don't return results.
*/
-public class NoResult {
+class NoResult {
}
diff --git a/org.eclipse.egerrit.core/src/org/eclipse/egerrit/internal/core/utils/Utils.java b/org.eclipse.egerrit.core/src/org/eclipse/egerrit/internal/core/utils/Utils.java
index d670973..452cf12 100644
--- a/org.eclipse.egerrit.core/src/org/eclipse/egerrit/internal/core/utils/Utils.java
+++ b/org.eclipse.egerrit.core/src/org/eclipse/egerrit/internal/core/utils/Utils.java
@@ -35,6 +35,12 @@
private static final SimpleDateFormat differentYearFormatTimeOut = new SimpleDateFormat("MMM dd, yyyy"); //$NON-NLS-1$
/**
+ * The default constructor. Do not allow to build an object of this class
+ */
+ private Utils() {
+ }
+
+ /**
* Format the UTC time from Gerrit data structure to a new desired format
*
* @param inDate
@@ -53,7 +59,7 @@
} catch (ParseException ex) {
EGerritCorePlugin.logError(ex.getMessage());
}
- return formatOut.format(dateNew).toString();
+ return formatOut.format(dateNew);
}
/**
