[PLXCOMP-174] Switched to simpler solution

krosenvold · krosenvold · commit c860779bddbc · 2011-06-25T18:33:28.000+02:00
Original fix was troubling me. Using an Integer in the interface is much prettier
diff --git a/src/main/java/org/codehaus/plexus/components/io/attributes/FileAttributes.java b/src/main/java/org/codehaus/plexus/components/io/attributes/FileAttributes.java
@@ -95,38 +95,19 @@ protected void setLsModeParts( char[] mode )
         }
     }
 
-    public int getGroupId()
+    public Integer getGroupId()
     {
-        if ( !hasGroupId() )
-        {
-            throw new IllegalStateException( "Cannot get the group id because it has not been set" );
-        }
-        return groupId.intValue();
+        return groupId;
     }
 
     public String getGroupName()
     {
         return groupName;
     }
 
-    public int getUserId()
-    {
-        if ( !hasUserId() )
-        {
-            throw new IllegalStateException( "Cannot get the user id because it has not been set" );
-        }
-
-        return userId.intValue();
-    }
-
-    public boolean hasGroupId()
-    {
-        return groupId != null;
-    }
-
-    public boolean hasUserId()
+    public Integer getUserId()
     {
-        return userId != null;
+        return userId;
     }
 
     public String getUserName()
@@ -192,9 +173,9 @@ public String toString()
         sb.append( "\ngroup: " );
         sb.append( groupName == null ? "" : groupName );
         sb.append( "\nuid: " );
-        sb.append( hasUserId() ?  userId.toString() : "");
+        sb.append( userId != null ?  userId.toString() : "");
         sb.append( "\ngid: " );
-        sb.append( hasGroupId() ? groupId.toString() : "");
+        sb.append( groupId != null ? groupId.toString() : "");
         sb.append( "\nmode: " );
         sb.append( mode == null ? "" : String.valueOf( mode ) );
 
@@ -264,7 +245,7 @@ public PlexusIoResourceAttributes setGroupExecutable( boolean flag )
         return this;
     }
 
-    public PlexusIoResourceAttributes setGroupId( int gid )
+    public PlexusIoResourceAttributes setGroupId( Integer gid )
     {
         this.groupId = new Integer( gid );
         return this;
@@ -306,7 +287,7 @@ public PlexusIoResourceAttributes setOwnerWritable( boolean flag )
         return this;
     }
 
-    public PlexusIoResourceAttributes setUserId( int uid )
+    public PlexusIoResourceAttributes setUserId( Integer uid )
     {
         this.userId = new Integer( uid );
         return this;
diff --git a/src/main/java/org/codehaus/plexus/components/io/attributes/PlexusIoResourceAttributeUtils.java b/src/main/java/org/codehaus/plexus/components/io/attributes/PlexusIoResourceAttributeUtils.java
@@ -55,9 +55,9 @@ public static PlexusIoResourceAttributes mergeAttributes( PlexusIoResourceAttrib
         }
         else
         {
-            result = new SimpleResourceAttributes( base.hasUserId() ? new Integer( base.getUserId() ) : null,
+            result = new SimpleResourceAttributes( base.getUserId(),
                                                    base.getUserName(),
-                                                   base.hasGroupId() ? new Integer( base.getGroupId() ) : null,
+                                                   base.getGroupId(),
                                                    base.getGroupName(), base.getOctalMode() );
         }
 
diff --git a/src/main/java/org/codehaus/plexus/components/io/attributes/PlexusIoResourceAttributes.java b/src/main/java/org/codehaus/plexus/components/io/attributes/PlexusIoResourceAttributes.java
@@ -35,14 +35,18 @@ public interface PlexusIoResourceAttributes
     boolean isWorldWritable();
     
     boolean isWorldExecutable();
-    
-    int getUserId();
-    
-    int getGroupId();
 
-    boolean hasGroupId();
+    /**
+     * Gets the unix user id.
+     * @return The unix user id, may be null ("not set"), even on unix
+     */
+    Integer getUserId();
     
-    boolean hasUserId();
+    /**
+     * Gets the unix group id.
+     * @return The unix group id, may be null ("not set"), even on unix
+     */
+    Integer getGroupId();
 
     String getUserName();
     
@@ -70,9 +74,9 @@ public interface PlexusIoResourceAttributes
 
     PlexusIoResourceAttributes setWorldExecutable( boolean flag );
 
-    PlexusIoResourceAttributes setUserId( int uid );
+    PlexusIoResourceAttributes setUserId( Integer uid );
 
-    PlexusIoResourceAttributes setGroupId( int gid );
+    PlexusIoResourceAttributes setGroupId( Integer gid );
 
     PlexusIoResourceAttributes setUserName( String name );
 
diff --git a/src/main/java/org/codehaus/plexus/components/io/attributes/SimpleResourceAttributes.java b/src/main/java/org/codehaus/plexus/components/io/attributes/SimpleResourceAttributes.java
@@ -48,18 +48,9 @@ public int getOctalMode()
         return mode;
     }
 
-    public boolean hasGroupId()
+    public Integer getGroupId()
     {
-        return gid != null;
-    }
-
-    public int getGroupId()
-    {
-        if ( !hasGroupId() )
-        {
-            throw new IllegalStateException( "Cannot get the groupid because it has not been set" );
-        }
-        return gid.intValue();
+        return gid;
     }
 
     public String getGroupName()
@@ -68,20 +59,10 @@ public String getGroupName()
     }
 
 
-    public boolean hasUserId()
+    public Integer getUserId()
     {
-        return uid != null;
+        return uid;
     }
-    public int getUserId()
-    {
-        if ( !hasUserId() )
-        {
-            throw new IllegalStateException( "Cannot get the userid because it has not been set" );
-        }
-        return uid.intValue();
-    }
-
-
 
     public String getUserName()
     {
@@ -150,9 +131,9 @@ public PlexusIoResourceAttributes setGroupExecutable( boolean flag )
         return this;
     }
 
-    public PlexusIoResourceAttributes setGroupId( int gid )
+    public PlexusIoResourceAttributes setGroupId( Integer gid )
     {
-        this.gid = new Integer( gid);
+        this.gid = gid;
         return this;
     }
 
@@ -192,9 +173,9 @@ public PlexusIoResourceAttributes setOwnerWritable( boolean flag )
         return this;
     }
 
-    public PlexusIoResourceAttributes setUserId( int uid )
+    public PlexusIoResourceAttributes setUserId( Integer uid )
     {
-        this.uid = new Integer( uid);
+        this.uid = uid;
         return this;
     }
 
diff --git a/src/test/java/org/codehaus/plexus/components/io/attributes/AbstractResourceAttributesTCK.java b/src/test/java/org/codehaus/plexus/components/io/attributes/AbstractResourceAttributesTCK.java
@@ -32,26 +32,26 @@ public void testSetAndGetUserId()
     {
         PlexusIoResourceAttributes attrs = newAttributes();
         
-        assertFalse( attrs.hasUserId());
+        assertNull( attrs.getUserId());
         
         int uid = 501;
         attrs.setUserId( uid );
         
-        assertTrue( attrs.hasUserId());
-        assertEquals( uid, attrs.getUserId() );
+        assertNotNull( attrs.getUserId());
+        assertEquals( uid, attrs.getUserId().intValue() );
     }
     
     public final void testSetAndGetGroupId()
     {
         PlexusIoResourceAttributes attrs = newAttributes();
         
-        assertFalse( attrs.hasGroupId());
+        assertNull( attrs.getGroupId());
 
         int gid = 501;
         attrs.setGroupId( gid );
-        
-        assertTrue( attrs.hasGroupId());
-        assertEquals( gid, attrs.getGroupId() );
+
+        assertNotNull( attrs.getGroupId());
+        assertEquals( gid, attrs.getGroupId().intValue() );
     }
     
     public final void testSetAndGetUserName()
diff --git a/src/test/java/org/codehaus/plexus/components/io/attributes/PlexusIoResourceAttributeUtilsTest.java b/src/test/java/org/codehaus/plexus/components/io/attributes/PlexusIoResourceAttributeUtilsTest.java
@@ -94,8 +94,8 @@ public void testParserUbuntu10_04_en()
 
         // -rw-r--r--  1 1020 1030   11108 Mar 16 22:42 build.xml
         assertEquals( "-rw-rw-r--", new String( o.getLsModeParts() ) );
-        assertEquals( 1020, o.getUserId() );
-        assertEquals( 1030, o.getGroupId() );
+        assertEquals( 1020, o.getUserId().intValue() );
+        assertEquals( 1030, o.getGroupId().intValue() );
         // Should probably test pass 2 too...
     }
 
@@ -128,8 +128,8 @@ public void testParserCygwin()
 
         // -rw-r--r--  1 1020 1030   11108 Mar 16 22:42 build.xml
         assertEquals( "-rw-r--r--", new String( o.getLsModeParts() ) );
-        assertEquals( 203222, o.getUserId() );
-        assertEquals( 10513, o.getGroupId() );
+        assertEquals( 203222, o.getUserId().intValue() );
+        assertEquals( 10513, o.getGroupId().intValue() );
     }
 
     public void testParserSolaris()

Original file line number	Diff line number	Diff line change
`@@ -95,38 +95,19 @@ protected void setLsModeParts( char[] mode )`
`95`	`95`	`}`
`96`	`96`	`}`
`97`	`97`
`98`		`- public int getGroupId()`
	`98`	`+ public Integer getGroupId()`
`99`	`99`	`{`
`100`		`- if ( !hasGroupId() )`
`101`		`- {`
`102`		`- throw new IllegalStateException( "Cannot get the group id because it has not been set" );`
`103`		`- }`
`104`		`- return groupId.intValue();`
	`100`	`+ return groupId;`
`105`	`101`	`}`
`106`	`102`
`107`	`103`	`public String getGroupName()`
`108`	`104`	`{`
`109`	`105`	`return groupName;`
`110`	`106`	`}`
`111`	`107`
`112`		`- public int getUserId()`
`113`		`- {`
`114`		`- if ( !hasUserId() )`
`115`		`- {`
`116`		`- throw new IllegalStateException( "Cannot get the user id because it has not been set" );`
`117`		`- }`
`118`		`-`
`119`		`- return userId.intValue();`
`120`		`- }`
`121`		`-`
`122`		`- public boolean hasGroupId()`
`123`		`- {`
`124`		`- return groupId != null;`
`125`		`- }`
`126`		`-`
`127`		`- public boolean hasUserId()`
	`108`	`+ public Integer getUserId()`
`128`	`109`	`{`
`129`		`- return userId != null;`
	`110`	`+ return userId;`
`130`	`111`	`}`
`131`	`112`
`132`	`113`	`public String getUserName()`
`@@ -192,9 +173,9 @@ public String toString()`
`192`	`173`	`sb.append( "\ngroup: " );`
`193`	`174`	`sb.append( groupName == null ? "" : groupName );`
`194`	`175`	`sb.append( "\nuid: " );`
`195`		`- sb.append( hasUserId() ? userId.toString() : "");`
	`176`	`+ sb.append( userId != null ? userId.toString() : "");`
`196`	`177`	`sb.append( "\ngid: " );`
`197`		`- sb.append( hasGroupId() ? groupId.toString() : "");`
	`178`	`+ sb.append( groupId != null ? groupId.toString() : "");`
`198`	`179`	`sb.append( "\nmode: " );`
`199`	`180`	`sb.append( mode == null ? "" : String.valueOf( mode ) );`
`200`	`181`
`@@ -264,7 +245,7 @@ public PlexusIoResourceAttributes setGroupExecutable( boolean flag )`
`264`	`245`	`return this;`
`265`	`246`	`}`
`266`	`247`
`267`		`- public PlexusIoResourceAttributes setGroupId( int gid )`
	`248`	`+ public PlexusIoResourceAttributes setGroupId( Integer gid )`
`268`	`249`	`{`
`269`	`250`	`this.groupId = new Integer( gid );`
`270`	`251`	`return this;`
`@@ -306,7 +287,7 @@ public PlexusIoResourceAttributes setOwnerWritable( boolean flag )`
`306`	`287`	`return this;`
`307`	`288`	`}`
`308`	`289`
`309`		`- public PlexusIoResourceAttributes setUserId( int uid )`
	`290`	`+ public PlexusIoResourceAttributes setUserId( Integer uid )`
`310`	`291`	`{`
`311`	`292`	`this.userId = new Integer( uid );`
`312`	`293`	`return this;`
Original file line number	Diff line number	Diff line change
`@@ -55,9 +55,9 @@ public static PlexusIoResourceAttributes mergeAttributes( PlexusIoResourceAttrib`
`55`	`55`	`}`
`56`	`56`	`else`
`57`	`57`	`{`
`58`		`- result = new SimpleResourceAttributes( base.hasUserId() ? new Integer( base.getUserId() ) : null,`
	`58`	`+ result = new SimpleResourceAttributes( base.getUserId(),`
`59`	`59`	`base.getUserName(),`
`60`		`- base.hasGroupId() ? new Integer( base.getGroupId() ) : null,`
	`60`	`+ base.getGroupId(),`
`61`	`61`	`base.getGroupName(), base.getOctalMode() );`
`62`	`62`	`}`
`63`	`63`
Original file line number	Diff line number	Diff line change
`@@ -48,18 +48,9 @@ public int getOctalMode()`
`48`	`48`	`return mode;`
`49`	`49`	`}`
`50`	`50`
`51`		`- public boolean hasGroupId()`
	`51`	`+ public Integer getGroupId()`
`52`	`52`	`{`
`53`		`- return gid != null;`
`54`		`- }`
`55`		`-`
`56`		`- public int getGroupId()`
`57`		`- {`
`58`		`- if ( !hasGroupId() )`
`59`		`- {`
`60`		`- throw new IllegalStateException( "Cannot get the groupid because it has not been set" );`
`61`		`- }`
`62`		`- return gid.intValue();`
	`53`	`+ return gid;`
`63`	`54`	`}`
`64`	`55`
`65`	`56`	`public String getGroupName()`
`@@ -68,20 +59,10 @@ public String getGroupName()`
`68`	`59`	`}`
`69`	`60`
`70`	`61`
`71`		`- public boolean hasUserId()`
	`62`	`+ public Integer getUserId()`
`72`	`63`	`{`
`73`		`- return uid != null;`
	`64`	`+ return uid;`
`74`	`65`	`}`
`75`		`- public int getUserId()`
`76`		`- {`
`77`		`- if ( !hasUserId() )`
`78`		`- {`
`79`		`- throw new IllegalStateException( "Cannot get the userid because it has not been set" );`
`80`		`- }`
`81`		`- return uid.intValue();`
`82`		`- }`
`83`		`-`
`84`		`-`
`85`	`66`
`86`	`67`	`public String getUserName()`
`87`	`68`	`{`
`@@ -150,9 +131,9 @@ public PlexusIoResourceAttributes setGroupExecutable( boolean flag )`
`150`	`131`	`return this;`
`151`	`132`	`}`
`152`	`133`
`153`		`- public PlexusIoResourceAttributes setGroupId( int gid )`
	`134`	`+ public PlexusIoResourceAttributes setGroupId( Integer gid )`
`154`	`135`	`{`
`155`		`- this.gid = new Integer( gid);`
	`136`	`+ this.gid = gid;`
`156`	`137`	`return this;`
`157`	`138`	`}`
`158`	`139`
`@@ -192,9 +173,9 @@ public PlexusIoResourceAttributes setOwnerWritable( boolean flag )`
`192`	`173`	`return this;`
`193`	`174`	`}`
`194`	`175`
`195`		`- public PlexusIoResourceAttributes setUserId( int uid )`
	`176`	`+ public PlexusIoResourceAttributes setUserId( Integer uid )`
`196`	`177`	`{`
`197`		`- this.uid = new Integer( uid);`
	`178`	`+ this.uid = uid;`
`198`	`179`	`return this;`
`199`	`180`	`}`
`200`	`181`