Skip to content

Commit

Permalink
Merge pull request #197 from tbak/master
Browse files Browse the repository at this point in the history 
Add more columns to jar info page.
  • Loading branch information
tbak committed Feb 27, 2015
2 parents ab8f799 + 2557313 commit 908d8a1
Show file tree
Hide file tree
Showing 2 changed files with 104 additions and 37 deletions.
124 changes: 93 additions & 31 deletions karyon2-admin-web/src/main/java/netflix/adminresources/resources/JarsInfoResource.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,9 @@

package netflix.adminresources.resources;

import com.google.common.annotations.Beta;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
Expand All @@ -37,6 +32,12 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;

import com.google.common.annotations.Beta;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

/**
* @author pkamath
* @author Nitesh Kant
Expand All @@ -50,21 +51,42 @@ public class JarsInfoResource {

private static final String JAR_PATTERN = "^jar:file:(.+)!/META-INF/MANIFEST.MF$";

private final List<JarManifest> jarManifests;
private final ArrayList<JarInfo> jarInfos;

public JarsInfoResource() {
jarManifests = loadJarManifests();
jarInfos = new ArrayList<>();
for (JarManifest jm : jarManifests) {
jarInfos.add(jm.toJarInfo());
}
}

@GET
public Response getAllJarsInfo() {
List<JarInfo> jarInfo = getJarInfo();
GsonBuilder gsonBuilder = new GsonBuilder().serializeNulls();
Gson gson = gsonBuilder.create();
String propsJson = gson.toJson(new KaryonAdminResponse(jarInfo));
String propsJson = gson.toJson(new KaryonAdminResponse(jarInfos));
return Response.ok(propsJson).build();
}

@GET
@Path("/{id}")
public Response getJarManifest(@PathParam("id") int jarId) {
GsonBuilder gsonBuilder = new GsonBuilder().serializeNulls();
Gson gson = gsonBuilder.create();
String propsJson = gson.toJson(new KaryonAdminResponse(jarManifests.get(jarId)));
return Response.ok(propsJson).build();
}

private List<JarInfo> getJarInfo() {
List<JarInfo> toReturn = new ArrayList<JarInfo>();
private static List<JarManifest> loadJarManifests() {
List<JarManifest> jarManifests = new ArrayList<>();

Pattern pattern = Pattern.compile(JAR_PATTERN);
try {
ClassLoader cl = Thread.currentThread().getContextClassLoader();
Enumeration<URL> urls = cl.getResources("META-INF/MANIFEST.MF");
int id = 0;
while (urls.hasMoreElements()) {
URL manifestURL = urls.nextElement();
InputStream is = manifestURL.openStream();
Expand All @@ -73,37 +95,64 @@ private List<JarInfo> getJarInfo() {
if (matcher.matches()) {
key = matcher.group(1);
}
Attributes mainAttributes = new Manifest(is).getMainAttributes();
toReturn.add(new JarInfo(key, mainAttributes));
jarManifests.add(new JarManifest(id, key, new Manifest(is)));
is.close();
id++;
}
} catch (Exception e) {
logger.error("Failed to load environment jar information.", e);
}
return toReturn;

return jarManifests;
}

private static class JarManifest {
private final int id;
private final String jarName;
private final Manifest manifest;

private JarManifest(int id, String jarName, Manifest manifest) {
this.id = id;
this.jarName = jarName;
this.manifest = manifest;
}

public String getJarName() {
return jarName;
}

public Manifest getManifest() {
return manifest;
}

public JarInfo toJarInfo() {
return new JarInfo(id, jarName, manifest.getMainAttributes());
}
}

private static class JarInfo {

public static final String MANIFEST_VERSION = "Manifest-Version";
public static final String CREATED_BY = "Created-By";
public static final String UNAVAILABLE = "Unavailable";
@SuppressWarnings("unused")
private String jar;
@SuppressWarnings("unused")
private String createdBy = UNAVAILABLE;
@SuppressWarnings("unused")
private String manifestVersion = UNAVAILABLE;

public JarInfo(String key, Attributes mainAttributes) {
jar = key;
if (null != mainAttributes.getValue(MANIFEST_VERSION)) {
manifestVersion = String.valueOf(mainAttributes.getValue(MANIFEST_VERSION));
}
public static final String BUILD_DATE = "Build-Date";
public static final String BUILD_NUMBER = "Build-Number";
public static final String BUILT_BY = "Built-By";
public static final String UNAVAILABLE = "-";

if (null != mainAttributes.getValue(CREATED_BY)) {
createdBy = String.valueOf(mainAttributes.getValue(CREATED_BY));
}
private final int id;
private final String jar;
private final String createdBy;
private final String buildDate;
private final String buildNumber;
private final String builtBy;

private JarInfo(int id, String jar, Attributes mainAttributes) {
this.id = id;
this.jar = jar;
createdBy = valueOf(mainAttributes, CREATED_BY);
buildDate = valueOf(mainAttributes, BUILD_DATE);
buildNumber = valueOf(mainAttributes, BUILD_NUMBER);
builtBy = valueOf(mainAttributes, BUILT_BY);
}

public String getJar() {
Expand All @@ -114,8 +163,21 @@ public String getCreatedBy() {
return createdBy;
}

public String getManifestVersion() {
return manifestVersion;
public String getBuildDate() {
return buildDate;
}

public String getBuildNumber() {
return buildNumber;
}

public String getBuiltBy() {
return builtBy;
}

private static String valueOf(Attributes mainAttributes, String tag) {
String value = mainAttributes.getValue(tag);
return value == null ? UNAVAILABLE : value;
}
}
}
17 changes: 11 additions & 6 deletions karyon2-admin-web/src/main/resources/webadmin/jars/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,11 @@ $(document).ready(function() {

var oTable = $('#jars-table').dataTable( {
"aoColumns": [
{ "sTitle": "Jar" , "mDataProp" : "name", "sDefaultContent": "", "sWidth" : "30%" },
{ "sTitle": "Owner" , "mDataProp" : "libraryOwner", "sDefaultContent": "", "sWidth" : "10%" },
{ "sTitle": "Version" , "mDataProp" : "implementationVersion", "sDefaultContent": "", "sWidth" : "10%" }
{ "sTitle": "Jar" , "mDataProp" : "name", "sDefaultContent": "", "sWidth" : "30%" },
{ "sTitle": "Created By" , "mDataProp" : "createdBy", "sDefaultContent": "", "sWidth" : "10%" },
{ "sTitle": "Build date" , "mDataProp" : "buildDate", "sDefaultContent": "", "sWidth" : "6%" },
{ "sTitle": "Build number" , "mDataProp" : "buildNumber", "sDefaultContent": "", "sWidth" : "5%" },
{ "sTitle": "Built by" , "mDataProp" : "builtBy", "sDefaultContent": "", "sWidth" : "5%" }
],
"sAjaxSource": source,
"fnServerData": function ( sSource, aoData, fnCallback ) {
Expand All @@ -26,9 +28,12 @@ $(document).ready(function() {
var items = [];
$.each(json.data, function(i, obj) {
items.push({
'id' : obj.id,
'name' : obj.jar,
'libraryOwner' : obj.createdBy,
'implementationVersion' : obj.manifestVersion
'createdBy' : obj.createdBy,
'buildDate' : obj.buildDate,
'buildNumber' : obj.buildNumber,
'builtBy' : obj.builtBy
});
});

Expand All @@ -50,7 +55,7 @@ $(document).ready(function() {
return "";
}
});

$(".bse-filter").val("");
$("#jars-table_filter").hide();

Expand Down

0 comments on commit 908d8a1

Please sign in to comment.