From ab2d0cebaf6d77edb45b1e6be4d7919d7535a7ea Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Tue, 15 Mar 2011 19:03:49 -0700 Subject: [PATCH 1/4] [maven-release-plugin] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ee9c7fa5ac..07d0d514b1 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ org.kohsuke github-api jar - 1.6 + 1.7-SNAPSHOT GitHub API for Java http://kohsuke.org/github-api/ GitHub API for Java From cffa552ba19af61a585c81230cdfca066e995e09 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Wed, 16 Mar 2011 17:12:22 -0700 Subject: [PATCH 2/4] renameTo wasn't updating some fields --- src/main/java/org/kohsuke/github/GHPerson.java | 6 +++++- src/main/java/org/kohsuke/github/GHRepository.java | 14 +++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/kohsuke/github/GHPerson.java b/src/main/java/org/kohsuke/github/GHPerson.java index 027c4529c3..3e905c05b1 100644 --- a/src/main/java/org/kohsuke/github/GHPerson.java +++ b/src/main/java/org/kohsuke/github/GHPerson.java @@ -43,11 +43,15 @@ public synchronized Map getRepositories() throws IOExceptio */ protected GHRepository refreshRepository(String name) throws IOException { if (repositories==null) getRepositories(); // fetch the base first - GHRepository r = root.retrieve("/repos/show/" + login + '/' + name, JsonRepository.class).wrap(root); + GHRepository r = fetchRepository(name); repositories.put(name,r); return r; } + protected GHRepository fetchRepository(String name) throws IOException { + return root.retrieve("/repos/show/" + login + '/' + name, JsonRepository.class).wrap(root); + } + public GHRepository getRepository(String name) throws IOException { return getRepositories().get(name); } diff --git a/src/main/java/org/kohsuke/github/GHRepository.java b/src/main/java/org/kohsuke/github/GHRepository.java index 8816fb4d9c..5c365c2bfd 100644 --- a/src/main/java/org/kohsuke/github/GHRepository.java +++ b/src/main/java/org/kohsuke/github/GHRepository.java @@ -33,6 +33,7 @@ import com.gargoylesoftware.htmlunit.html.HtmlPage; import java.io.IOException; +import java.lang.reflect.Field; import java.net.URL; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -236,7 +237,18 @@ public void renameTo(String newName) throws IOException { try { f.getInputByName("name").setValueAttribute(newName); f.submit((HtmlButton)f.getElementsByTagName("button").get(0)); - name = newName; + + // overwrite fields + final GHRepository r = getOwner().fetchRepository(newName); + for (Field fi : getClass().getDeclaredFields()) { + fi.setAccessible(true); + try { + fi.set(this,fi.get(r)); + } catch (IllegalAccessException e) { + throw (IllegalAccessError)new IllegalAccessError().initCause(e); + } + } + return; } catch (ElementNotFoundException e) { // continue From ecb71006d8f2a6579b817b15d649bf2d91bb443f Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Wed, 16 Mar 2011 22:03:55 -0700 Subject: [PATCH 3/4] ignore static fields --- src/main/java/org/kohsuke/github/GHRepository.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/org/kohsuke/github/GHRepository.java b/src/main/java/org/kohsuke/github/GHRepository.java index 5c365c2bfd..be17ed46dd 100644 --- a/src/main/java/org/kohsuke/github/GHRepository.java +++ b/src/main/java/org/kohsuke/github/GHRepository.java @@ -34,6 +34,7 @@ import java.io.IOException; import java.lang.reflect.Field; +import java.lang.reflect.Modifier; import java.net.URL; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -241,6 +242,7 @@ public void renameTo(String newName) throws IOException { // overwrite fields final GHRepository r = getOwner().fetchRepository(newName); for (Field fi : getClass().getDeclaredFields()) { + if (Modifier.isStatic(fi.getModifiers())) continue; fi.setAccessible(true); try { fi.set(this,fi.get(r)); From b953d0c831132a018c19a4ec61517a56172cecb1 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sat, 28 May 2011 15:25:37 +0200 Subject: [PATCH 4/4] [maven-release-plugin] prepare release github-api-1.7 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e50e6b6c05..7f3bb58efa 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ org.kohsuke github-api jar - 1.7-SNAPSHOT + 1.7 GitHub API for Java http://kohsuke.org/github-api/ GitHub API for Java