ziver/zutil
1
0
Fork 0
Code Issues Pull requests Activity Actions

Some small cleanup

Browse source
This commit is contained in:
Ziver Koc 2020-11-11 22:18:17 +01:00
parent e0881247c4
commit 69d11634bd
4 changed files with 22 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/zutil/MimeTypeUtil.java
View file

@ -29,7 +29,6 @@ import zutil.parser.DataNode;
import zutil.parser.json.JSONParser; import zutil.parser.json.JSONParser;
import java.io.*; import java.io.*;
import java.lang.reflect.Array;
import java.util.*; import java.util.*;
/** /**
@ -40,7 +39,7 @@ public class MimeTypeUtil {
// Static variables // Static variables
private static final ArrayList<MimeType> mimes = new ArrayList<MimeType>(); private static final ArrayList<MimeType> mimes = new ArrayList<MimeType>();
private static final HashMap<String, MimeType> mimesByExtenion = new HashMap<>(); private static final HashMap<String, MimeType> mimesByExtension = new HashMap<>();
// Initialize mime types // Initialize mime types
static { static {
@ -74,13 +73,13 @@ public class MimeTypeUtil {
mimes.add(mime); mimes.add(mime);
for (String extension : mime.getExtensions()) { for (String extension : mime.getExtensions()) {
mimesByExtenion.put(extension, mime); mimesByExtension.put(extension, mime);
} }
} }
public static MimeType getMimeByExtension(String extension) { public static MimeType getMimeByExtension(String extension) {
return mimesByExtenion.get(extension); return mimesByExtension.get(extension);
} }

20
src/zutil/net/http/page/HttpJsonPage.java
View file

@ -6,11 +6,10 @@ import zutil.net.http.HttpPrintStream;
import zutil.parser.DataNode; import zutil.parser.DataNode;
import zutil.parser.json.JSONWriter; import zutil.parser.json.JSONWriter;
import java.io.IOException;
import java.util.Map; import java.util.Map;
/** /**
* @author Ziver on 2016-11-04. * A page handling responses in JSON format.
*/ */
public abstract class HttpJsonPage implements HttpPage { public abstract class HttpJsonPage implements HttpPage {
@ -19,16 +18,21 @@ public abstract class HttpJsonPage implements HttpPage {
HttpHeader headers, HttpHeader headers,
Map<String, Object> session, Map<String, Object> session,
Map<String, String> cookie, Map<String, String> cookie,
Map<String, String> request) throws IOException { Map<String, String> request) {
out.setHeader("Content-Type", "application/json"); out.setHeader(HttpHeader.HEADER_CONTENT_TYPE, "application/json");
JSONWriter writer = new JSONWriter(out); DataNode json = jsonRespond(out, headers, session, cookie, request);
writer.write(jsonRespond(headers, session, cookie, request));
writer.close(); if (json != null) {
JSONWriter writer = new JSONWriter(out);
writer.write(json);
writer.close();
}
} }
protected abstract DataNode jsonRespond(HttpHeader headers, protected abstract DataNode jsonRespond(HttpPrintStream out,
HttpHeader headers,
Map<String, Object> session, Map<String, Object> session,
Map<String, String> cookie, Map<String, String> cookie,
Map<String, String> request); Map<String, String> request);

8
src/zutil/ui/Configurator.java
View file

@ -197,13 +197,15 @@ public class Configurator<T> {
for(ConfigurationParam param : params){ for(ConfigurationParam param : params){
try { try {
param.apply(obj); param.apply(obj);
// Logging // Logging
if(logger.isLoggable(Level.FINE)) { if(logger.isLoggable(Level.FINE)) {
strParams.append(param.getName()); strParams.append(param.getName()).append(": ");
if(param.isTypeString()) if(param.isTypeString())
strParams.append(": '").append(param.getString()).append("', "); strParams.append("'").append(param.getString()).append("'");
else else
strParams.append(": ").append(param.getString()).append(", "); strParams.append(param.getString());
strParams.append(", ");
} }
} catch (IllegalAccessException e) { } catch (IllegalAccessException e) {
logger.log(Level.WARNING, null, e); logger.log(Level.WARNING, null, e);

3
test/zutil/net/http/page/HttpJsonPageTest.java
View file

@ -3,6 +3,7 @@ package zutil.net.http.page;
import org.junit.Test; import org.junit.Test;
import zutil.io.IOUtil; import zutil.io.IOUtil;
import zutil.net.http.HttpHeader; import zutil.net.http.HttpHeader;
import zutil.net.http.HttpPrintStream;
import zutil.net.http.HttpTestUtil; import zutil.net.http.HttpTestUtil;
import zutil.parser.DataNode; import zutil.parser.DataNode;
@ -18,7 +19,7 @@ public class HttpJsonPageTest {
private HttpJsonPage page = new HttpJsonPage() { private HttpJsonPage page = new HttpJsonPage() {
@Override @Override
protected DataNode jsonRespond(HttpHeader headers, Map<String, Object> session, Map<String, String> cookie, Map<String, String> request) { protected DataNode jsonRespond(HttpPrintStream out, HttpHeader headers, Map<String, Object> session, Map<String, String> cookie, Map<String, String> request) {
return new DataNode(DataNode.DataType.Map); return new DataNode(DataNode.DataType.Map);
} }
}; };