From 9bf5a75e2c6ac963c00d183402bcd49bd830b2c4 Mon Sep 17 00:00:00 2001 From: Patrick Gotthard Date: Sun, 13 Apr 2014 14:47:07 +0200 Subject: [PATCH] Refactored some code --- .../propono/atom/common/rome/AppModule.java | 3 ++- .../rometools/propono/atom/server/AtomRequest.java | 6 +++--- .../propono/atom/server/AtomRequestImpl.java | 10 +++++++--- .../blogclient/metaweblog/MetaWeblogBlog.java | 12 ++++++------ 4 files changed, 18 insertions(+), 13 deletions(-) diff --git a/src/main/java/org/rometools/propono/atom/common/rome/AppModule.java b/src/main/java/org/rometools/propono/atom/common/rome/AppModule.java index 2bc6dab..a1c8b4e 100644 --- a/src/main/java/org/rometools/propono/atom/common/rome/AppModule.java +++ b/src/main/java/org/rometools/propono/atom/common/rome/AppModule.java @@ -1,6 +1,6 @@ /* * Copyright 2007 Apache Software Foundation - * + * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. The ASF licenses this file to You * under the Apache License, Version 2.0 (the "License"); you may not @@ -27,6 +27,7 @@ import com.sun.syndication.feed.module.Module; * ROME Extension Module to Atom protocol extensions to Atom format. */ public interface AppModule extends Module { + public static final String URI = "http://www.w3.org/2007/app"; /** True if entry is a draft */ diff --git a/src/main/java/org/rometools/propono/atom/server/AtomRequest.java b/src/main/java/org/rometools/propono/atom/server/AtomRequest.java index 6bd9ddc..a6c4d73 100644 --- a/src/main/java/org/rometools/propono/atom/server/AtomRequest.java +++ b/src/main/java/org/rometools/propono/atom/server/AtomRequest.java @@ -91,7 +91,7 @@ public interface AtomRequest { * Returns an Enumeration of String objects containing the names of the parameters contained in * this request. */ - public Enumeration getParameterNames(); + public Enumeration getParameterNames(); /** * Returns an array of String objects containing all of the values the given request parameter @@ -123,12 +123,12 @@ public interface AtomRequest { /** * Returns all the values of the specified request header as an Enumeration of String objects. */ - public Enumeration getHeaders(String arg0); + public Enumeration getHeaders(String arg0); /** * Returns an enumeration of all the header names this request contains. */ - public Enumeration getHeaderNames(); + public Enumeration getHeaderNames(); /** * Returns the value of the specified request header as an int. diff --git a/src/main/java/org/rometools/propono/atom/server/AtomRequestImpl.java b/src/main/java/org/rometools/propono/atom/server/AtomRequestImpl.java index 07e26e1..b4cce9f 100644 --- a/src/main/java/org/rometools/propono/atom/server/AtomRequestImpl.java +++ b/src/main/java/org/rometools/propono/atom/server/AtomRequestImpl.java @@ -89,7 +89,8 @@ public class AtomRequestImpl implements AtomRequest { } @Override - public Enumeration getParameterNames() { + @SuppressWarnings("unchecked") + public Enumeration getParameterNames() { return wrapped.getParameterNames(); } @@ -99,6 +100,7 @@ public class AtomRequestImpl implements AtomRequest { } @Override + @SuppressWarnings("unchecked") public Map getParameterMap() { return wrapped.getParameterMap(); } @@ -119,12 +121,14 @@ public class AtomRequestImpl implements AtomRequest { } @Override - public Enumeration getHeaders(final String arg0) { + @SuppressWarnings("unchecked") + public Enumeration getHeaders(final String arg0) { return wrapped.getHeaders(arg0); } @Override - public Enumeration getHeaderNames() { + @SuppressWarnings("unchecked") + public Enumeration getHeaderNames() { return wrapped.getHeaderNames(); } diff --git a/src/main/java/org/rometools/propono/blogclient/metaweblog/MetaWeblogBlog.java b/src/main/java/org/rometools/propono/blogclient/metaweblog/MetaWeblogBlog.java index a409b6f..080b301 100644 --- a/src/main/java/org/rometools/propono/blogclient/metaweblog/MetaWeblogBlog.java +++ b/src/main/java/org/rometools/propono/blogclient/metaweblog/MetaWeblogBlog.java @@ -408,7 +408,7 @@ public class MetaWeblogBlog implements Blog { private int pos = 0; private boolean eod = false; private static final int BUFSIZE = 30; - private List results = null; + private List> results = null; /** * Iterator for looping over MetaWeblog API entries. @@ -436,9 +436,7 @@ public class MetaWeblogBlog implements Blog { */ @Override public BlogEntry next() { - @SuppressWarnings("unchecked") - final Map entryHash = (Map) results.get(pos++); - return new MetaWeblogEntry(MetaWeblogBlog.this, entryHash); + return new MetaWeblogEntry(MetaWeblogBlog.this, results.get(pos++)); } /** @@ -451,8 +449,10 @@ public class MetaWeblogBlog implements Blog { private void getNextEntries() throws BlogClientException { final int requestSize = pos + BUFSIZE; try { - final Object[] resultsArray = (Object[]) getXmlRpcClient().execute("metaWeblog.getRecentPosts", - new Object[] { blogid, userName, password, new Integer(requestSize) }); + final Object[] params = new Object[] { blogid, userName, password, new Integer(requestSize) }; + final Object response = getXmlRpcClient().execute("metaWeblog.getRecentPosts", params); + @SuppressWarnings("unchecked") + final Map[] resultsArray = (Map[]) response; results = Arrays.asList(resultsArray); } catch (final Exception e) { throw new BlogClientException("ERROR: XML-RPC error getting entry", e);