This is an automated email from the ASF dual-hosted git repository.
mbien pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/roller.git
commit 675364602034c0b69b308f78126aeca9fa0d6b82
Author: Michael Bien <mbie...@gmail.com>
AuthorDate: Sat Jul 10 11:02:29 2021 +0200
fixed remaining rawtype warnings in atomprotocol and xmlrpc packages.
---
.../webservices/atomprotocol/MediaCollection.java | 14 +++++++-------
.../webservices/atomprotocol/RollerAtomService.java | 2 +-
.../weblogger/webservices/xmlrpc/BloggerAPIHandler.java | 10 +++++-----
.../webservices/xmlrpc/MetaWeblogAPIHandler.java | 16 ++++++++--------
4 files changed, 21 insertions(+), 21 deletions(-)
diff --git
a/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/MediaCollection.java
b/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/MediaCollection.java
index 6a589dd..9603d77 100644
---
a/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/MediaCollection.java
+++
b/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/MediaCollection.java
@@ -289,7 +289,7 @@ public class MediaCollection {
}
Set<MediaFile> files = dir.getMediaFiles();
- SortedSet sortedSet = new TreeSet(new Comparator() {
+ SortedSet<MediaFile> sortedSet = new TreeSet<>(new
Comparator<Object>() {
@Override
public int compare(Object o1, Object o2) {
MediaFile f1 = (MediaFile)o1;
@@ -313,7 +313,7 @@ public class MediaCollection {
int count = 0;
MediaFile[] sortedResources =
(MediaFile[])sortedSet.toArray(new
MediaFile[sortedSet.size()]);
- List atomEntries = new ArrayList();
+ List<Entry> atomEntries = new ArrayList<>();
for (int i=start; i<(start + max) &&
i<(sortedResources.length); i++) {
Entry entry = createAtomResourceEntry(website,
sortedResources[i]);
atomEntries.add(entry);
@@ -324,7 +324,7 @@ public class MediaCollection {
count++;
}
- List otherLinks = new ArrayList();
+ List<Link> otherLinks = new ArrayList<>();
if (start + count < files.size()) {
// add next link
int nextOffset = start + max;
@@ -500,11 +500,11 @@ public class MediaCollection {
Link altlink = new Link();
altlink.setRel("alternate");
altlink.setHref(file.getPermalink());
- List altlinks = new ArrayList();
+ List<Link> altlinks = new ArrayList<>();
altlinks.add(altlink);
entry.setAlternateLinks(altlinks);
- List otherlinks = new ArrayList();
+ List<Link> otherlinks = new ArrayList<>();
entry.setOtherLinks(otherlinks);
Link editlink = new Link();
editlink.setRel("edit");
@@ -518,11 +518,11 @@ public class MediaCollection {
Content content = new Content();
content.setSrc(file.getPermalink());
content.setType(contentType);
- List contents = new ArrayList();
+ List<Content> contents = new ArrayList<>();
contents.add(content);
entry.setContents(contents);
- List modules = new ArrayList();
+ List<com.rometools.rome.feed.module.Module> modules = new
ArrayList<>();
AppModule app = new AppModuleImpl();
app.setDraft(false);
app.setEdited(entry.getUpdated());
diff --git
a/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomService.java
b/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomService.java
index ee50a27..92e9b11 100644
---
a/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomService.java
+++
b/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomService.java
@@ -65,7 +65,7 @@ public class RollerAtomService extends AtomService {
} catch (WebloggerException re) {
throw new AtomException("Getting user's weblogs", re);
}
- List uploadAccepts;
+ List<String> uploadAccepts;
try {
uploadAccepts = getAcceptedContentTypeRange();
} catch (WebloggerException re) {
diff --git
a/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/BloggerAPIHandler.java
b/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/BloggerAPIHandler.java
index f2fa7d4..ee7d40a 100644
---
a/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/BloggerAPIHandler.java
+++
b/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/BloggerAPIHandler.java
@@ -247,7 +247,7 @@ public class BloggerAPIHandler extends BaseAPIHandler {
// TODO: Should screen name be renamed nickname and used here?
// populates user information to return as a result
- Hashtable result = new Hashtable();
+ Hashtable<String, String> result = new Hashtable<>();
result.put("nickname", user.getUserName());
result.put("userid", user.getUserName());
result.put("email", "");
@@ -279,7 +279,7 @@ public class BloggerAPIHandler extends BaseAPIHandler {
mLogger.debug(" Appkey: " + appkey);
mLogger.debug(" UserId: " + userid);
- Vector result = new Vector();
+ Vector<Object> result = new Vector<>();
if (validateUser(userid, password)) {
try {
UserManager umgr =
WebloggerFactory.getWeblogger().getUserManager();
@@ -290,7 +290,7 @@ public class BloggerAPIHandler extends BaseAPIHandler {
for (Weblog website : websites) {
// only include weblog's that have client API support
enabled
if (Boolean.TRUE.equals(website.getEnableBloggerApi())) {
- Hashtable blog = new Hashtable(3);
+ Hashtable<String, String> blog = new Hashtable<>(3);
blog.put("url", website.getURL());
blog.put("blogid", website.getHandle());
blog.put("blogName", website.getName());
@@ -466,7 +466,7 @@ public class BloggerAPIHandler extends BaseAPIHandler {
Weblog weblog = validate(blogid, userid,password);
try {
- Vector results = new Vector();
+ Vector<Object> results = new Vector<>();
Weblogger roller = WebloggerFactory.getWeblogger();
WeblogEntryManager weblogMgr = roller.getWeblogEntryManager();
@@ -478,7 +478,7 @@ public class BloggerAPIHandler extends BaseAPIHandler {
for (List<WeblogEntry> weList : entries.values()) {
for (WeblogEntry entry : weList) {
- Hashtable result = new Hashtable();
+ Hashtable<String, Object> result = new Hashtable<>();
if (entry.getPubTime() != null) {
result.put("dateCreated", entry.getPubTime());
}
diff --git
a/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java
b/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java
index 91f1cda..7b5d234 100644
---
a/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java
+++
b/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java
@@ -85,7 +85,7 @@ public class MetaWeblogAPIHandler extends BloggerAPIHandler {
Weblog website = validate(blogid, userid,password);
Weblogger roller = WebloggerFactory.getWeblogger();
try {
- Hashtable result = new Hashtable();
+ Hashtable<String, Object> result = new Hashtable<>();
WeblogEntryManager weblogMgr = roller.getWeblogEntryManager();
List<WeblogCategory> cats = weblogMgr.getWeblogCategories(website);
for (WeblogCategory category : cats) {
@@ -395,7 +395,7 @@ public class MetaWeblogAPIHandler extends BloggerAPIHandler
{
roller.flush();
- Hashtable returnStruct = new Hashtable(1);
+ Hashtable<String, String> returnStruct = new Hashtable<>(1);
returnStruct.put("url", fileLink);
return returnStruct;
@@ -428,7 +428,7 @@ public class MetaWeblogAPIHandler extends BloggerAPIHandler
{
Weblog website = validate(blogid, userid,password);
try {
- Vector results = new Vector();
+ Vector<Object> results = new Vector<>();
Weblogger roller = WebloggerFactory.getWeblogger();
WeblogEntryManager weblogMgr = roller.getWeblogEntryManager();
@@ -453,12 +453,12 @@ public class MetaWeblogAPIHandler extends
BloggerAPIHandler {
}
- private Hashtable createPostStruct(WeblogEntry entry, String userid) {
+ private Hashtable<String, Object> createPostStruct(WeblogEntry entry,
String userid) {
String permalink =
WebloggerRuntimeConfig.getAbsoluteContextURL() +
entry.getPermaLink();
- Hashtable struct = new Hashtable();
+ Hashtable<String, Object> struct = new Hashtable<>();
struct.put("title", entry.getTitle());
if (entry.getLink() != null) {
struct.put("link", Utilities.escapeHTML(entry.getLink()));
@@ -476,7 +476,7 @@ public class MetaWeblogAPIHandler extends BloggerAPIHandler
{
struct.put("author", entry.getCreator().getEmailAddress());
if ( entry.getCategory() != null ) {
- Vector catArray = new Vector();
+ Vector<Object> catArray = new Vector<>();
catArray.addElement(entry.getCategory().getName());
struct.put("categories", catArray);
@@ -488,9 +488,9 @@ public class MetaWeblogAPIHandler extends BloggerAPIHandler
{
}
- private Hashtable createCategoryStruct(WeblogCategory category, String
userid) {
+ private Hashtable<String, String> createCategoryStruct(WeblogCategory
category, String userid) {
- Hashtable struct = new Hashtable();
+ Hashtable<String, String> struct = new Hashtable<>();
struct.put("title", category.getName());
struct.put("description", category.getName());
